From d6b9e7c8fb76123e2e881e1113b8241e115a8406 Mon Sep 17 00:00:00 2001
From: Jaakko Husso <jaakko@n8n.io>
Date: Mon, 1 Dec 2025 20:50:15 +0200
Subject: [PATCH 001/167] feat(core): Make chat hub workflows treat
 activeWorkflowId correctly (#22546)

---
 .../src/modules/chat-hub/chat-hub.service.ts  | 179 ++++++++++--------
 1 file changed, 99 insertions(+), 80 deletions(-)

diff --git a/packages/cli/src/modules/chat-hub/chat-hub.service.ts b/packages/cli/src/modules/chat-hub/chat-hub.service.ts
index 13a825d8299..77057cd1b47 100644
--- a/packages/cli/src/modules/chat-hub/chat-hub.service.ts
+++ b/packages/cli/src/modules/chat-hub/chat-hub.service.ts
@@ -17,15 +17,14 @@ import {
 	ChatHubCustomAgentModel,
 	emptyChatModelsResponse,
 	type ChatHubUpdateConversationRequest,
+	ChatModelDto,
 } from '@n8n/api-types';
 import { Logger } from '@n8n/backend-common';
-import { ExecutionRepository, IExecutionResponse, User, WorkflowRepository } from '@n8n/db';
+import { ExecutionRepository, IExecutionResponse, User, WorkflowRepository, In } from '@n8n/db';
 import { Service } from '@n8n/di';
 import type { EntityManager } from '@n8n/typeorm';
 import type { Response } from 'express';
-
 import { ErrorReporter } from 'n8n-core';
-
 import {
 	CHAT_TRIGGER_NODE_TYPE,
 	OperationalError,
@@ -35,6 +34,7 @@ import {
 	type IWorkflowExecuteAdditionalData,
 	type IRun,
 	jsonParse,
+	jsonStringify,
 	StructuredChunk,
 	RESPOND_TO_CHAT_NODE_TYPE,
 	IRunExecutionData,
@@ -45,9 +45,21 @@ import {
 	WorkflowExecuteMode,
 } from 'n8n-workflow';
 
+import { ActiveExecutions } from '@/active-executions';
+import { CredentialsFinderService } from '@/credentials/credentials-finder.service';
+import { BadRequestError } from '@/errors/response-errors/bad-request.error';
+import { NotFoundError } from '@/errors/response-errors/not-found.error';
+import { ExecutionService } from '@/executions/execution.service';
+import { DynamicNodeParametersService } from '@/services/dynamic-node-parameters.service';
+import { getBase } from '@/workflow-execute-additional-data';
+import { WorkflowExecutionService } from '@/workflows/workflow-execution.service';
+import { WorkflowFinderService } from '@/workflows/workflow-finder.service';
+import { WorkflowService } from '@/workflows/workflow.service';
+
 import { ChatHubAgentService } from './chat-hub-agent.service';
 import { ChatHubCredentialsService } from './chat-hub-credentials.service';
 import type { ChatHubMessage } from './chat-hub-message.entity';
+import type { ChatHubSession } from './chat-hub-session.entity';
 import { ChatHubWorkflowService } from './chat-hub-workflow.service';
 import { ChatHubAttachmentService } from './chat-hub.attachment.service';
 import { JSONL_STREAM_HEADERS, NODE_NAMES, PROVIDER_NODE_TYPE_MAP } from './chat-hub.constants';
@@ -62,18 +74,6 @@ import { ChatHubMessageRepository } from './chat-message.repository';
 import { ChatHubSessionRepository } from './chat-session.repository';
 import { interceptResponseWrites, createStructuredChunkAggregator } from './stream-capturer';
 
-import { ActiveExecutions } from '@/active-executions';
-import { CredentialsFinderService } from '@/credentials/credentials-finder.service';
-import { BadRequestError } from '@/errors/response-errors/bad-request.error';
-import { NotFoundError } from '@/errors/response-errors/not-found.error';
-import { ExecutionService } from '@/executions/execution.service';
-import { DynamicNodeParametersService } from '@/services/dynamic-node-parameters.service';
-import { getBase } from '@/workflow-execute-additional-data';
-import { WorkflowExecutionService } from '@/workflows/workflow-execution.service';
-import { WorkflowFinderService } from '@/workflows/workflow-finder.service';
-import { WorkflowService } from '@/workflows/workflow.service';
-import type { ChatHubSession } from './chat-hub-session.entity';
-
 @Service()
 export class ChatHubService {
 	constructor(
@@ -894,46 +894,59 @@ export class ChatHubService {
 	}
 
 	private async fetchAgentWorkflowsAsModels(user: User): Promise<ChatModelsResponse['n8n']> {
-		const nodeTypes = [CHAT_TRIGGER_NODE_TYPE];
-		const workflows = await this.workflowService.getWorkflowsWithNodesIncluded(
+		// Workflows are scanned by their latest version for chat trigger nodes.
+		// This means that we might miss some active workflow versions that had chat triggers but
+		// the latest version does not, but this trade-off is done for performance.
+		const workflowsWithChatTrigger = await this.workflowService.getWorkflowsWithNodesIncluded(
 			user,
-			nodeTypes,
+			[CHAT_TRIGGER_NODE_TYPE],
 			true,
 		);
 
+		const activeWorkflows = workflowsWithChatTrigger
+			// Ensure the user has at least read access to the workflows
+			.filter((workflow) => workflow.scopes.includes('workflow:read'))
+			.filter((workflow) => !!workflow.activeVersionId);
+
+		const workflows = await this.workflowRepository.find({
+			select: { id: true },
+			where: { id: In(activeWorkflows.map((workflow) => workflow.id)) },
+			relations: { activeVersion: true },
+		});
+
+		const models: ChatModelDto[] = [];
+
+		for (const { id, activeVersion } of workflows) {
+			if (!activeVersion) {
+				continue;
+			}
+
+			const chatTrigger = activeVersion.nodes?.find((node) => node.type === CHAT_TRIGGER_NODE_TYPE);
+
+			if (!chatTrigger) {
+				continue;
+			}
+
+			const chatTriggerParams = validChatTriggerParamsShape.safeParse(chatTrigger.parameters).data;
+			if (!chatTriggerParams) {
+				continue;
+			}
+
+			models.push({
+				name: chatTriggerParams.agentName ?? activeVersion.name ?? 'Unknown Agent',
+				description: chatTriggerParams.agentDescription ?? null,
+				model: {
+					provider: 'n8n',
+					workflowId: id,
+				},
+				createdAt: activeVersion.createdAt ? activeVersion.createdAt.toISOString() : null,
+				updatedAt: activeVersion.updatedAt ? activeVersion.updatedAt.toISOString() : null,
+				allowFileUploads: chatTriggerParams.options?.allowFileUploads ?? false,
+			});
+		}
+
 		return {
-			models: workflows
-				// Ensure the user has at least read access to the workflow
-				.filter((workflow) => workflow.scopes.includes('workflow:read'))
-				.filter((workflow) => !!workflow.activeVersionId)
-				.flatMap((workflow) => {
-					const chatTrigger = workflow.nodes?.find((node) => node.type === CHAT_TRIGGER_NODE_TYPE);
-					if (!chatTrigger) {
-						return [];
-					}
-
-					const chatTriggerParams = validChatTriggerParamsShape.safeParse(
-						chatTrigger.parameters,
-					).data;
-
-					if (!chatTriggerParams) {
-						return [];
-					}
-
-					return [
-						{
-							name: chatTriggerParams.agentName ?? workflow.name ?? 'Unknown Agent',
-							description: chatTriggerParams.agentDescription ?? null,
-							model: {
-								provider: 'n8n',
-								workflowId: workflow.id,
-							},
-							createdAt: workflow.createdAt ? workflow.createdAt.toISOString() : null,
-							updatedAt: workflow.updatedAt ? workflow.updatedAt.toISOString() : null,
-							allowFileUploads: chatTriggerParams.options?.allowFileUploads ?? false,
-						},
-					];
-				}),
+			models,
 		};
 	}
 
@@ -1372,14 +1385,14 @@ export class ChatHubService {
 			workflowId,
 			user,
 			['workflow:read'],
-			{ includeTags: false, includeParentFolder: false },
+			{ includeTags: false, includeParentFolder: false, includeActiveVersion: true },
 		);
 
-		if (!workflowEntity) {
+		if (!workflowEntity?.activeVersion) {
 			throw new BadRequestError('Workflow not found');
 		}
 
-		const chatTriggers = workflowEntity.nodes.filter(
+		const chatTriggers = workflowEntity.activeVersion.nodes.filter(
 			(node) => node.type === CHAT_TRIGGER_NODE_TYPE,
 		);
 
@@ -1389,7 +1402,7 @@ export class ChatHubService {
 
 		const chatTriggerNode = chatTriggers[0];
 
-		const chatResponseNodes = workflowEntity.nodes.filter(
+		const chatResponseNodes = workflowEntity.activeVersion.nodes.filter(
 			(node) => node.type === RESPOND_TO_CHAT_NODE_TYPE,
 		);
 
@@ -1415,10 +1428,16 @@ export class ChatHubService {
 			},
 		});
 
+		const workflowData: IWorkflowBase = {
+			...workflowEntity.activeVersion,
+			id: workflowEntity.id,
+			active: true,
+			isArchived: workflowEntity.isArchived,
+			activeVersionId: workflowEntity.activeVersionId,
+		};
+
 		return {
-			workflowData: {
-				...workflowEntity,
-			},
+			workflowData,
 			executionData,
 		};
 	}
@@ -1566,7 +1585,7 @@ export class ChatHubService {
 				},
 			};
 
-			return JSON.stringify(enriched) + '\n';
+			return jsonStringify(enriched) + '\n';
 		};
 
 		const stream = interceptResponseWrites(res, transform);
@@ -1694,7 +1713,7 @@ export class ChatHubService {
 			}
 
 			this.logger.debug(
-				`Using credential ID ${credential.id} for title generation in project ${credential.projectId}, model ${JSON.stringify(resolvedModel)}`,
+				`Using credential ID ${credential.id} for title generation in project ${credential.projectId}, model ${jsonStringify(resolvedModel)}`,
 			);
 
 			return await this.chatHubWorkflowService.createTitleGenerationWorkflow(
@@ -1754,14 +1773,14 @@ export class ChatHubService {
 			workflowId,
 			user,
 			['workflow:read'],
-			{ includeTags: false, includeParentFolder: false, em: trx },
+			{ includeTags: false, includeParentFolder: false, includeActiveVersion: true, em: trx },
 		);
 
-		if (!workflowEntity) {
+		if (!workflowEntity?.activeVersion) {
 			throw new BadRequestError('Workflow not found for title generation');
 		}
 
-		const modelNodes = this.findSupportedLLMNodes(workflowEntity);
+		const modelNodes = this.findSupportedLLMNodes(workflowEntity.activeVersion.nodes);
 		this.logger.debug(
 			`Found ${modelNodes.length} LLM nodes in workflow ${workflowEntity.id} for title generation`,
 		);
@@ -1812,20 +1831,17 @@ export class ChatHubService {
 		return { resolvedCredentials, resolvedModel, credential };
 	}
 
-	private findSupportedLLMNodes(workflowEntity: { nodes: INode[]; id: string }) {
-		return workflowEntity.nodes.reduce<Array<{ node: INode; provider: ChatHubLLMProvider }>>(
-			(acc, node) => {
-				const supportedProvider = Object.entries(PROVIDER_NODE_TYPE_MAP).find(
-					([_provider, { name }]) => node.type === name,
-				);
-				if (supportedProvider) {
-					const [provider] = supportedProvider;
-					acc.push({ node, provider: provider as ChatHubLLMProvider });
-				}
-				return acc;
-			},
-			[],
-		);
+	private findSupportedLLMNodes(nodes: INode[]) {
+		return nodes.reduce<Array<{ node: INode; provider: ChatHubLLMProvider }>>((acc, node) => {
+			const supportedProvider = Object.entries(PROVIDER_NODE_TYPE_MAP).find(
+				([_provider, { name }]) => node.type === name,
+			);
+			if (supportedProvider) {
+				const [provider] = supportedProvider;
+				acc.push({ node, provider: provider as ChatHubLLMProvider });
+			}
+			return acc;
+		}, []);
 	}
 
 	private async resolveFromCustomAgent(
@@ -2238,18 +2254,21 @@ export class ChatHubService {
 
 		if (model.provider === 'n8n') {
 			// Find the workflow to get its name
-			const workflow = await this.workflowFinderService.findWorkflowForUser(
+			const workflowEntity = await this.workflowFinderService.findWorkflowForUser(
 				model.workflowId,
 				user,
 				['workflow:read'],
-				{ includeTags: false, includeParentFolder: false },
+				{ includeTags: false, includeParentFolder: false, includeActiveVersion: true },
 			);
 
-			if (!workflow) {
+			if (!workflowEntity?.activeVersion) {
 				throw new BadRequestError('Workflow not found for chat session initialization');
 			}
 
-			const chatTrigger = workflow.nodes?.find((node) => node.type === CHAT_TRIGGER_NODE_TYPE);
+			const chatTrigger = workflowEntity.activeVersion.nodes?.find(
+				(node) => node.type === CHAT_TRIGGER_NODE_TYPE,
+			);
+
 			if (!chatTrigger) {
 				throw new BadRequestError(
 					'Chat trigger not found in workflow for chat session initialization',

From 6d67db4449db7ab8a5f8d413461ffc46f57d50bb Mon Sep 17 00:00:00 2001
From: Tomi Turtiainen <10324676+tomi@users.noreply.github.com>
Date: Mon, 1 Dec 2025 22:10:38 +0200
Subject: [PATCH 002/167] =?UTF-8?q?=F0=9F=9A=80=20Release=201.123.0=20(#22?=
 =?UTF-8?q?565)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                  | 68 +++++++++++++++++++
 nsjail                                        |  1 +
 package.json                                  |  2 +-
 .../@n8n/ai-workflow-builder.ee/package.json  |  2 +-
 packages/@n8n/api-types/package.json          |  2 +-
 packages/@n8n/backend-common/package.json     |  2 +-
 packages/@n8n/backend-test-utils/package.json |  2 +-
 packages/@n8n/client-oauth2/package.json      |  2 +-
 packages/@n8n/config/package.json             |  2 +-
 packages/@n8n/db/package.json                 |  2 +-
 packages/@n8n/decorators/package.json         |  2 +-
 packages/@n8n/nodes-langchain/package.json    |  2 +-
 packages/@n8n/task-runner/package.json        |  2 +-
 packages/cli/package.json                     |  2 +-
 packages/core/package.json                    |  2 +-
 packages/frontend/@n8n/chat/package.json      |  2 +-
 .../frontend/@n8n/design-system/package.json  |  2 +-
 packages/frontend/@n8n/i18n/package.json      |  2 +-
 .../@n8n/rest-api-client/package.json         |  2 +-
 packages/frontend/@n8n/stores/package.json    |  2 +-
 packages/frontend/editor-ui/package.json      |  2 +-
 packages/node-dev/package.json                |  2 +-
 packages/nodes-base/package.json              |  2 +-
 packages/workflow/package.json                |  2 +-
 24 files changed, 91 insertions(+), 22 deletions(-)
 create mode 160000 nsjail

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe0993a394d..2e55f839325 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,71 @@
+# [1.123.0](https://github.com/n8n-io/n8n/compare/n8n@1.122.0...n8n@1.123.0) (2025-12-01)
+
+
+### Bug Fixes
+
+* **AI Agent Node:** Unify memory management for streaming/non-streaming ([#22243](https://github.com/n8n-io/n8n/issues/22243)) ([df81c77](https://github.com/n8n-io/n8n/commit/df81c77a248136b141e2324036cc8ecdc41f3590))
+* **ai-builder:** Fix import of multiple nodes with maxNode, add validation ([#22348](https://github.com/n8n-io/n8n/issues/22348)) ([4319da6](https://github.com/n8n-io/n8n/commit/4319da6f1cc1421285ada04551969a170ca5c518))
+* **ai-builder:** Keep existing pin data when modifying the workflow ([#22266](https://github.com/n8n-io/n8n/issues/22266)) ([83ea8e1](https://github.com/n8n-io/n8n/commit/83ea8e1f91c5ee07fee89e39743b3c39bbd479db))
+* Bump node-forge and body-parser ([#22418](https://github.com/n8n-io/n8n/issues/22418)) ([3c0e809](https://github.com/n8n-io/n8n/commit/3c0e809e416569c64d3c5e96c4c5f5f84b15e255))
+* **core, editor:** Support inclusive and exclusive destination node mode in the frontend and API ([#22244](https://github.com/n8n-io/n8n/issues/22244)) ([344c909](https://github.com/n8n-io/n8n/commit/344c90940e7e75ddaeba5e23c0953feebb7aa98e))
+* **core:** Add missing workflowId when creating base subworkflowworkflow additional data ([#22312](https://github.com/n8n-io/n8n/issues/22312)) ([8f6c3b2](https://github.com/n8n-io/n8n/commit/8f6c3b2dce25fde6c64a04b85179d829d1d45feb))
+* **core:** Add response validation for requests during DCR ([#22076](https://github.com/n8n-io/n8n/issues/22076)) ([9ab9d1c](https://github.com/n8n-io/n8n/commit/9ab9d1c8f1fd4e65e9a7924f5d7bc3925b024261))
+* **core:** Defer requirements check for Python runner in internal mode ([#22448](https://github.com/n8n-io/n8n/issues/22448)) ([97d8b39](https://github.com/n8n-io/n8n/commit/97d8b393261eb8306d8cc33bb4883fc7be3ee1b2))
+* **core:** Introduce batch workflow rule to fix subworkflow with wait node detection ([#22447](https://github.com/n8n-io/n8n/issues/22447)) ([e0bc441](https://github.com/n8n-io/n8n/commit/e0bc4416ea1709cf5468f580074d46cd43cff09d))
+* **core:** Mark `''` and `[]` as empty when filtering numbers ([#22347](https://github.com/n8n-io/n8n/issues/22347)) ([a4d2cfa](https://github.com/n8n-io/n8n/commit/a4d2cfae4af2a2080b0e610ea3298e24238871ae))
+* **core:** OIDC form breaks when enabling OIDC while SAML is active ([#22463](https://github.com/n8n-io/n8n/issues/22463)) ([613b088](https://github.com/n8n-io/n8n/commit/613b08843d6542de2e3e98ee2a0535535294ce1b))
+* **core:** Prevent credentials saving if missing required properties ([#22213](https://github.com/n8n-io/n8n/issues/22213)) ([6d88007](https://github.com/n8n-io/n8n/commit/6d88007f014b1dba779f9217d5f3cf5fab854c3e))
+* **core:** Send prod workflow succeeded for wfs in projects ([#22223](https://github.com/n8n-io/n8n/issues/22223)) ([7068fe2](https://github.com/n8n-io/n8n/commit/7068fe2510882c438cbd73bede40dbbb1a1eebbb))
+* Detect workflow calling itself expression in migration report ([#22516](https://github.com/n8n-io/n8n/issues/22516)) ([1ddb634](https://github.com/n8n-io/n8n/commit/1ddb6344a5dbddd6385f1d68d94314fa5ab72cb1))
+* **editor, core:** Fix display for binary data metadata origin ([#22270](https://github.com/n8n-io/n8n/issues/22270)) ([df1aa13](https://github.com/n8n-io/n8n/commit/df1aa130cb3a417b5795b13af50e8c57f5137aff))
+* **editor:** Avoid clearing EULA license key when closing dialog ([#22424](https://github.com/n8n-io/n8n/issues/22424)) ([fe05ea4](https://github.com/n8n-io/n8n/commit/fe05ea4df8b415f600bb8d29bf29544683f70c3a))
+* **editor:** Eval trigger node with data table works when underlying data changes ([#22389](https://github.com/n8n-io/n8n/issues/22389)) ([6f1b09e](https://github.com/n8n-io/n8n/commit/6f1b09eeda8554abc207e0640fee8cc500cea3c6))
+* **editor:** Fix editor pan / zoom when inserting nodes ([#22401](https://github.com/n8n-io/n8n/issues/22401)) ([f435430](https://github.com/n8n-io/n8n/commit/f4354301ecb0cbb0d6386d4f32c2641845cfc8fe))
+* **editor:** Fix issue for blinking/jumping UI when switching projects ([#22256](https://github.com/n8n-io/n8n/issues/22256)) ([6185550](https://github.com/n8n-io/n8n/commit/6185550971e133beb9092d3695eecfa6e66e6113))
+* **editor:** Fix sub-nodes connection labels counters  ([#21549](https://github.com/n8n-io/n8n/issues/21549)) ([d366cb4](https://github.com/n8n-io/n8n/commit/d366cb4f37eacc422cafc7795180837a3f1087e8))
+* **editor:** Missing duplicate workflow action on workflow list ([#22230](https://github.com/n8n-io/n8n/issues/22230)) ([000cccb](https://github.com/n8n-io/n8n/commit/000cccb62700144fd41ed70e2177de1c3cb32c31))
+* **editor:** Preserve paired item data in pinned data ([#21417](https://github.com/n8n-io/n8n/issues/21417)) ([254a53e](https://github.com/n8n-io/n8n/commit/254a53e7bb8acdd3202841b0ec85a87907e4379b))
+* **editor:** Remove unwanted outlines when waiting for webhook event in light mode in new NDV ([#22425](https://github.com/n8n-io/n8n/issues/22425)) ([4d68b6c](https://github.com/n8n-io/n8n/commit/4d68b6c6987d7193fd35aa1c41958252df56ab02))
+* **editor:** Standardize CSS class naming conventions across new design system components ([#22551](https://github.com/n8n-io/n8n/issues/22551)) ([c82d95a](https://github.com/n8n-io/n8n/commit/c82d95aecbbdf3379929ca99fb474909f08bfbf4))
+* **editor:** Wording for migration rule detail table headers ([#22398](https://github.com/n8n-io/n8n/issues/22398)) ([cd9f565](https://github.com/n8n-io/n8n/commit/cd9f56569dcf1e65df2d4f72b7007514276dac01))
+* Enable streaming version of Respond To Webhook node ([#22350](https://github.com/n8n-io/n8n/issues/22350)) ([dc407c2](https://github.com/n8n-io/n8n/commit/dc407c25fd3e9cc60704ae53c9508ee738c24efb))
+* **Git Node:** Throw an error if the repository path is blocked ([#22253](https://github.com/n8n-io/n8n/issues/22253)) ([a49b179](https://github.com/n8n-io/n8n/commit/a49b179e891c0b3501b6784c82af72b5a8c5a02d))
+* **Gmail Node:** Use Reply-To header when replying to a message ([#22145](https://github.com/n8n-io/n8n/issues/22145)) ([2a3cba7](https://github.com/n8n-io/n8n/commit/2a3cba74ee8716cc94c96b8849bda02bc88dbbcb))
+* **HTTP Node:** Handle Azure Storage Shared Key ([#22136](https://github.com/n8n-io/n8n/issues/22136)) ([b581dbc](https://github.com/n8n-io/n8n/commit/b581dbc23262c4f96f262e23d9274765cb54e09c))
+* **HTTP Request Node:** Detect and handle non-UTF-8 response encodings ([#20889](https://github.com/n8n-io/n8n/issues/20889)) ([6068fb3](https://github.com/n8n-io/n8n/commit/6068fb3b2008ed6e4cbbd01057bca280c91f021b))
+* Improve insights tests execution failure visibility ([#22538](https://github.com/n8n-io/n8n/issues/22538)) ([f937c0f](https://github.com/n8n-io/n8n/commit/f937c0fb5089dedab01361f67e39e7280d964d8a))
+* **MCP Client Node:** Fix selecting PKCE auth flow for some servers and request scopes from `scopes_requested` during DCR ([#22405](https://github.com/n8n-io/n8n/issues/22405)) ([6765d15](https://github.com/n8n-io/n8n/commit/6765d15ead1e0226078d4a6adbbf7d36e7a827fb))
+* Pin n8n packages to workspace version ([#22460](https://github.com/n8n-io/n8n/issues/22460)) ([75b2cd0](https://github.com/n8n-io/n8n/commit/75b2cd0de6b02b392be2b1e4f61a243da7bfe5b8))
+* **PostgreSQL Node:** Input items with array being modified ([#22426](https://github.com/n8n-io/n8n/issues/22426)) ([42cda59](https://github.com/n8n-io/n8n/commit/42cda59ee5f175b2b9f887b8a5fbdd60fda8184b))
+* Renovate will now bump versions ([#22245](https://github.com/n8n-io/n8n/issues/22245)) ([17ea0dd](https://github.com/n8n-io/n8n/commit/17ea0dd4662beecc61ec7fbf4bb45abeab69de54))
+* Show correct date range in insight overview ([3130d20](https://github.com/n8n-io/n8n/commit/3130d205331124d08299c54db5a31a0a6781e5b3))
+* **Slack Node:** Sort messages manually ([#21822](https://github.com/n8n-io/n8n/issues/21822)) ([52b93ed](https://github.com/n8n-io/n8n/commit/52b93ed5b237e031c4e079ad3e620c0943fb8cda))
+* **Sort Node:** Periodic error when using Code sort type ([#22409](https://github.com/n8n-io/n8n/issues/22409)) ([2360d87](https://github.com/n8n-io/n8n/commit/2360d8719a529b61989da9b215a6c0a7da861087))
+* Support resolving $fromAI in vector store tools ([#22457](https://github.com/n8n-io/n8n/issues/22457)) ([d72d68c](https://github.com/n8n-io/n8n/commit/d72d68c7191576501e8b1a387a0d8c1366c83c05))
+* Update base image dependencies to latest security patches ([#22275](https://github.com/n8n-io/n8n/issues/22275)) ([5fd1702](https://github.com/n8n-io/n8n/commit/5fd1702429eb67bd13d5e0978faf93015c1d527f))
+* When chat session is reset, update session id ([#22288](https://github.com/n8n-io/n8n/issues/22288)) ([7d82c3c](https://github.com/n8n-io/n8n/commit/7d82c3c02a4f61941e714de76c450d3e9c21ad98))
+
+
+### Features
+
+* Add entries to context menu to copy webhook's urls ([#21769](https://github.com/n8n-io/n8n/issues/21769)) ([6e344f0](https://github.com/n8n-io/n8n/commit/6e344f0f2968a8367358761ca7606787c375cbcc))
+* Add the time saved node ([#22269](https://github.com/n8n-io/n8n/issues/22269)) ([b83c43f](https://github.com/n8n-io/n8n/commit/b83c43f8dd9d16932a3c45da908ee30053624f62))
+* Add time saved mode workflow setting ([#22343](https://github.com/n8n-io/n8n/issues/22343)) ([b2f78d7](https://github.com/n8n-io/n8n/commit/b2f78d7c7aba592a70c08751f2ef0a004a0be60f))
+* **ai-builder:** Using templates to improve generation ([#22521](https://github.com/n8n-io/n8n/issues/22521)) ([7186dcf](https://github.com/n8n-io/n8n/commit/7186dcfe7ee184319aefce4ae2c09ead6dece418))
+* Allow configuring workflow for time saved capture by node ([#22386](https://github.com/n8n-io/n8n/issues/22386)) ([4adfced](https://github.com/n8n-io/n8n/commit/4adfced9373ca2b4da57ec9a28cbae63c6e615f8))
+* **Azure AI Search Node:** Add clear index option to Azure AI Search vector store ([#22183](https://github.com/n8n-io/n8n/issues/22183)) ([5cb594d](https://github.com/n8n-io/n8n/commit/5cb594d7efcc52c834855d13850735939e7d7086))
+* **core:** Add get version public endpoint ([#22407](https://github.com/n8n-io/n8n/issues/22407)) ([b6f8050](https://github.com/n8n-io/n8n/commit/b6f8050dfab80647fa2ed336c23566654918f936))
+* **core:** Deactivate crashed workflows ([#21888](https://github.com/n8n-io/n8n/issues/21888)) ([710a654](https://github.com/n8n-io/n8n/commit/710a6548d444fe740158333ce362fec62c8d3075))
+* **core:** Inject hooks into applicable trigger node properties for the node UI ([#22290](https://github.com/n8n-io/n8n/issues/22290)) ([92dca5f](https://github.com/n8n-io/n8n/commit/92dca5f739c535d8145fd54be8235e441e2c08ba))
+* **core:** Introduce `database` mode for binary data storage ([#22162](https://github.com/n8n-io/n8n/issues/22162)) ([934b9a7](https://github.com/n8n-io/n8n/commit/934b9a7346c713c4f3ced9fb7b972eb231affc15))
+* **core:** Use new workflow history in mcp tools ([#22384](https://github.com/n8n-io/n8n/issues/22384)) ([32c2909](https://github.com/n8n-io/n8n/commit/32c2909d729375408db13696357895a5ec28d28a))
+* **Form Node:** Allow users to set a default value for form fields ([#22200](https://github.com/n8n-io/n8n/issues/22200)) ([b0fc88b](https://github.com/n8n-io/n8n/commit/b0fc88b437e376b8283ed6bddcca63bac74c1aae))
+* **Gemini Node:** Add support for Nano Banana Pro model ([#22254](https://github.com/n8n-io/n8n/issues/22254)) ([7a4cc40](https://github.com/n8n-io/n8n/commit/7a4cc40dc85998790d57e336ab3384905912222c))
+* **Guardrails Node:** Require Chat model only for LLM checks ([#22241](https://github.com/n8n-io/n8n/issues/22241)) ([c1dade7](https://github.com/n8n-io/n8n/commit/c1dade7ad397d0aed2245554d32906f774860a3f))
+* Reduce unauthentication information in settings endpoint further ([#22106](https://github.com/n8n-io/n8n/issues/22106)) ([83809e6](https://github.com/n8n-io/n8n/commit/83809e62ad0f3d22447549b03173f38f93f523a1))
+
+
+
 # [1.122.0](https://github.com/n8n-io/n8n/compare/n8n@1.121.0...n8n@1.122.0) (2025-11-24)
 
 
diff --git a/nsjail b/nsjail
new file mode 160000
index 00000000000..c168180d97f
--- /dev/null
+++ b/nsjail
@@ -0,0 +1 @@
+Subproject commit c168180d97f4ee8107d6fbfc0ff94f8ebce7e0d0
diff --git a/package.json b/package.json
index b73970a8cdf..67e7c433312 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-monorepo",
-  "version": "1.122.0",
+  "version": "1.123.0",
   "private": true,
   "engines": {
     "node": ">=22.16",
diff --git a/packages/@n8n/ai-workflow-builder.ee/package.json b/packages/@n8n/ai-workflow-builder.ee/package.json
index ee06e8ee876..7a898940fe4 100644
--- a/packages/@n8n/ai-workflow-builder.ee/package.json
+++ b/packages/@n8n/ai-workflow-builder.ee/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@n8n/ai-workflow-builder",
-  "version": "0.32.0",
+  "version": "0.33.0",
   "scripts": {
     "clean": "rimraf dist .turbo",
     "typecheck": "tsc --noEmit",
diff --git a/packages/@n8n/api-types/package.json b/packages/@n8n/api-types/package.json
index 814fd1d308b..ac4e1077a86 100644
--- a/packages/@n8n/api-types/package.json
+++ b/packages/@n8n/api-types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@n8n/api-types",
-  "version": "0.56.0",
+  "version": "0.57.0",
   "scripts": {
     "clean": "rimraf dist .turbo",
     "dev": "pnpm watch",
diff --git a/packages/@n8n/backend-common/package.json b/packages/@n8n/backend-common/package.json
index 307e86e2b7e..d84f6727d67 100644
--- a/packages/@n8n/backend-common/package.json
+++ b/packages/@n8n/backend-common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@n8n/backend-common",
-  "version": "0.32.0",
+  "version": "0.33.0",
   "scripts": {
     "clean": "rimraf dist .turbo",
     "dev": "pnpm watch",
diff --git a/packages/@n8n/backend-test-utils/package.json b/packages/@n8n/backend-test-utils/package.json
index 8ee6fbe43ed..f6c07d31f18 100644
--- a/packages/@n8n/backend-test-utils/package.json
+++ b/packages/@n8n/backend-test-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@n8n/backend-test-utils",
-  "version": "0.25.0",
+  "version": "0.26.0",
   "scripts": {
     "clean": "rimraf dist .turbo",
     "dev": "pnpm watch",
diff --git a/packages/@n8n/client-oauth2/package.json b/packages/@n8n/client-oauth2/package.json
index ad67275ef51..ae6bb575c9c 100644
--- a/packages/@n8n/client-oauth2/package.json
+++ b/packages/@n8n/client-oauth2/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@n8n/client-oauth2",
-  "version": "0.32.0",
+  "version": "0.33.0",
   "scripts": {
     "clean": "rimraf dist .turbo",
     "dev": "pnpm watch",
diff --git a/packages/@n8n/config/package.json b/packages/@n8n/config/package.json
index eabf23399a4..a28dcccec87 100644
--- a/packages/@n8n/config/package.json
+++ b/packages/@n8n/config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@n8n/config",
-  "version": "1.64.0",
+  "version": "1.65.0",
   "scripts": {
     "clean": "rimraf dist .turbo",
     "dev": "pnpm watch",
diff --git a/packages/@n8n/db/package.json b/packages/@n8n/db/package.json
index b591f437c8c..59b9d8bf0de 100644
--- a/packages/@n8n/db/package.json
+++ b/packages/@n8n/db/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@n8n/db",
-  "version": "0.33.0",
+  "version": "0.34.0",
   "scripts": {
     "clean": "rimraf dist .turbo",
     "dev": "pnpm watch",
diff --git a/packages/@n8n/decorators/package.json b/packages/@n8n/decorators/package.json
index 61af4289d50..0bf0bb75456 100644
--- a/packages/@n8n/decorators/package.json
+++ b/packages/@n8n/decorators/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@n8n/decorators",
-  "version": "0.32.0",
+  "version": "0.33.0",
   "scripts": {
     "clean": "rimraf dist .turbo",
     "dev": "pnpm watch",
diff --git a/packages/@n8n/nodes-langchain/package.json b/packages/@n8n/nodes-langchain/package.json
index 22daaa387d1..da12d9a8d45 100644
--- a/packages/@n8n/nodes-langchain/package.json
+++ b/packages/@n8n/nodes-langchain/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@n8n/n8n-nodes-langchain",
-  "version": "1.121.0",
+  "version": "1.122.0",
   "description": "",
   "main": "index.js",
   "scripts": {
diff --git a/packages/@n8n/task-runner/package.json b/packages/@n8n/task-runner/package.json
index 28aafdf8cbc..8f24779e799 100644
--- a/packages/@n8n/task-runner/package.json
+++ b/packages/@n8n/task-runner/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@n8n/task-runner",
-  "version": "1.58.0",
+  "version": "1.59.0",
   "scripts": {
     "clean": "rimraf dist .turbo",
     "start": "node dist/start.js",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 953a6268ba3..a98f67579e1 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n",
-  "version": "1.122.0",
+  "version": "1.123.0",
   "description": "n8n Workflow Automation Tool",
   "main": "dist/index",
   "types": "dist/index.d.ts",
diff --git a/packages/core/package.json b/packages/core/package.json
index 4949e6841a0..0008763d94b 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-core",
-  "version": "1.121.0",
+  "version": "1.122.0",
   "description": "Core functionality of n8n",
   "main": "dist/index",
   "types": "dist/index.d.ts",
diff --git a/packages/frontend/@n8n/chat/package.json b/packages/frontend/@n8n/chat/package.json
index d424335ff6a..51214034706 100644
--- a/packages/frontend/@n8n/chat/package.json
+++ b/packages/frontend/@n8n/chat/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@n8n/chat",
-  "version": "0.67.0",
+  "version": "0.68.0",
   "scripts": {
     "dev": "pnpm run storybook",
     "build": "pnpm build:vite && pnpm build:bundle",
diff --git a/packages/frontend/@n8n/design-system/package.json b/packages/frontend/@n8n/design-system/package.json
index dd92625ce43..d86fec75651 100644
--- a/packages/frontend/@n8n/design-system/package.json
+++ b/packages/frontend/@n8n/design-system/package.json
@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "@n8n/design-system",
-  "version": "1.109.0",
+  "version": "1.110.0",
   "main": "src/index.ts",
   "import": "src/index.ts",
   "scripts": {
diff --git a/packages/frontend/@n8n/i18n/package.json b/packages/frontend/@n8n/i18n/package.json
index 98223d364d8..7502832244a 100644
--- a/packages/frontend/@n8n/i18n/package.json
+++ b/packages/frontend/@n8n/i18n/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@n8n/i18n",
   "type": "module",
-  "version": "1.26.0",
+  "version": "1.27.0",
   "files": [
     "dist"
   ],
diff --git a/packages/frontend/@n8n/rest-api-client/package.json b/packages/frontend/@n8n/rest-api-client/package.json
index 172f49ec5a0..35c12d36dd6 100644
--- a/packages/frontend/@n8n/rest-api-client/package.json
+++ b/packages/frontend/@n8n/rest-api-client/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@n8n/rest-api-client",
   "type": "module",
-  "version": "1.25.0",
+  "version": "1.26.0",
   "files": [
     "dist"
   ],
diff --git a/packages/frontend/@n8n/stores/package.json b/packages/frontend/@n8n/stores/package.json
index ecab59a3e4a..4700a24b94c 100644
--- a/packages/frontend/@n8n/stores/package.json
+++ b/packages/frontend/@n8n/stores/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@n8n/stores",
   "type": "module",
-  "version": "1.29.0",
+  "version": "1.30.0",
   "files": [
     "dist"
   ],
diff --git a/packages/frontend/editor-ui/package.json b/packages/frontend/editor-ui/package.json
index edb7f711dde..1a332c98c73 100644
--- a/packages/frontend/editor-ui/package.json
+++ b/packages/frontend/editor-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-editor-ui",
-  "version": "1.122.0",
+  "version": "1.123.0",
   "description": "Workflow Editor UI for n8n",
   "main": "index.js",
   "type": "module",
diff --git a/packages/node-dev/package.json b/packages/node-dev/package.json
index 3b763fde9df..ebb06ed77ec 100644
--- a/packages/node-dev/package.json
+++ b/packages/node-dev/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-node-dev",
-  "version": "1.120.0",
+  "version": "1.121.0",
   "description": "CLI to simplify n8n credentials/node development",
   "main": "dist/src/index",
   "types": "dist/src/index.d.ts",
diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index 1ca95253cf0..767a63e3585 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-nodes-base",
-  "version": "1.120.0",
+  "version": "1.121.0",
   "description": "Base nodes of n8n",
   "main": "index.js",
   "scripts": {
diff --git a/packages/workflow/package.json b/packages/workflow/package.json
index 7679752ac36..574acc23b62 100644
--- a/packages/workflow/package.json
+++ b/packages/workflow/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-workflow",
-  "version": "1.119.0",
+  "version": "1.120.0",
   "description": "Workflow base code of n8n",
   "types": "dist/esm/index.d.ts",
   "module": "dist/esm/index.js",

From c9e4d2b1c89e706b089c539842d30df2051163fa Mon Sep 17 00:00:00 2001
From: Suguru Inoue <suguru@n8n.io>
Date: Tue, 2 Dec 2025 08:50:14 +0100
Subject: [PATCH 003/167] feat: Reflect model's capabilities in UI
 (no-changelog) (#22356)

---
 packages/@n8n/api-types/src/chat-hub.ts       |  11 +-
 packages/@n8n/api-types/src/index.ts          |   2 +
 .../modules/chat-hub/chat-hub-agent.entity.ts |  10 +-
 .../chat-hub/chat-hub-agent.service.ts        |   3 +-
 .../chat-hub/chat-hub-workflow.service.ts     |  40 ++-
 .../modules/chat-hub/chat-hub.constants.ts    | 300 +++++++++++++++++-
 .../src/modules/chat-hub/chat-hub.service.ts  |  43 ++-
 .../src/modules/chat-hub/chat-hub.types.ts    |   1 +
 .../frontend/@n8n/i18n/src/locales/en.json    |   2 +
 .../src/features/ai/chatHub/ChatView.vue      |  75 +++--
 .../src/features/ai/chatHub/chat.store.ts     |  56 +++-
 .../src/features/ai/chatHub/chat.utils.ts     |  28 ++
 .../chatHub/components/AgentEditorModal.vue   |  55 +++-
 .../components/ChatConversationHeader.vue     |   5 +-
 .../ai/chatHub/components/ChatPrompt.vue      |  73 +++--
 .../ai/chatHub/components/ModelSelector.vue   |  37 +--
 .../ai/chatHub/components/ToolsSelector.vue   |  69 ++--
 .../ai/chatHub/composables/useCustomAgent.ts  |  29 +-
 18 files changed, 665 insertions(+), 174 deletions(-)

diff --git a/packages/@n8n/api-types/src/chat-hub.ts b/packages/@n8n/api-types/src/chat-hub.ts
index 518d78461ab..1bd6bd557b8 100644
--- a/packages/@n8n/api-types/src/chat-hub.ts
+++ b/packages/@n8n/api-types/src/chat-hub.ts
@@ -207,13 +207,22 @@ export const chatModelsRequestSchema = z.object({
 
 export type ChatModelsRequest = z.infer<typeof chatModelsRequestSchema>;
 
+export type ChatHubInputModality = 'text' | 'image' | 'audio' | 'video' | 'file';
+
+export interface ChatModelMetadataDto {
+	inputModalities: ChatHubInputModality[];
+	capabilities: {
+		functionCalling: boolean;
+	};
+}
+
 export interface ChatModelDto {
 	model: ChatHubConversationModel;
 	name: string;
 	description: string | null;
 	updatedAt: string | null;
 	createdAt: string | null;
-	allowFileUploads?: boolean;
+	metadata: ChatModelMetadataDto;
 }
 
 /**
diff --git a/packages/@n8n/api-types/src/index.ts b/packages/@n8n/api-types/src/index.ts
index faae5c3e485..ffd29775a75 100644
--- a/packages/@n8n/api-types/src/index.ts
+++ b/packages/@n8n/api-types/src/index.ts
@@ -9,6 +9,8 @@ export type * from './community-node-types';
 export {
 	chatHubConversationModelSchema,
 	type ChatModelDto,
+	type ChatModelMetadataDto,
+	type ChatHubInputModality,
 	type ChatHubOpenAIModel,
 	type ChatHubAnthropicModel,
 	type ChatHubGoogleModel,
diff --git a/packages/cli/src/modules/chat-hub/chat-hub-agent.entity.ts b/packages/cli/src/modules/chat-hub/chat-hub-agent.entity.ts
index 8bbfa764cee..b858118d24f 100644
--- a/packages/cli/src/modules/chat-hub/chat-hub-agent.entity.ts
+++ b/packages/cli/src/modules/chat-hub/chat-hub-agent.entity.ts
@@ -1,4 +1,4 @@
-import { ChatHubProvider } from '@n8n/api-types';
+import { ChatHubLLMProvider } from '@n8n/api-types';
 import { WithTimestamps, User, CredentialsEntity, JsonColumn } from '@n8n/db';
 import { Column, Entity, ManyToOne, JoinColumn, PrimaryGeneratedColumn } from '@n8n/typeorm';
 import { INode } from 'n8n-workflow';
@@ -40,23 +40,23 @@ export class ChatHubAgent extends WithTimestamps {
 	owner?: User;
 
 	/*
-	 * ID of the selected credential to use by default with the selected LLM provider (if applicable).
+	 * ID of the selected credential to use by default with the selected LLM provider.
 	 */
 	@Column({ type: 'varchar', length: 36, nullable: true })
 	credentialId: string | null;
 
 	/**
-	 * The selected credential to use by default with the selected LLM provider (if applicable).
+	 * The selected credential to use by default with the selected LLM provider.
 	 */
 	@ManyToOne('CredentialsEntity', { onDelete: 'SET NULL', nullable: true })
 	@JoinColumn({ name: 'credentialId' })
 	credential?: CredentialsEntity | null;
 
 	/*
-	 * Enum value of the LLM provider to use, e.g. 'openai', 'anthropic', 'google', 'n8n' (if applicable).
+	 * Enum value of the LLM provider to use, e.g. 'openai', 'anthropic', 'google'.
 	 */
 	@Column({ type: 'varchar', length: 16, nullable: true })
-	provider: ChatHubProvider;
+	provider: ChatHubLLMProvider;
 
 	/*
 	 * LLM model to use from the provider (if applicable)
diff --git a/packages/cli/src/modules/chat-hub/chat-hub-agent.service.ts b/packages/cli/src/modules/chat-hub/chat-hub-agent.service.ts
index 8c197ae2e53..36a23bb4fcb 100644
--- a/packages/cli/src/modules/chat-hub/chat-hub-agent.service.ts
+++ b/packages/cli/src/modules/chat-hub/chat-hub-agent.service.ts
@@ -8,6 +8,7 @@ import { v4 as uuidv4 } from 'uuid';
 import type { ChatHubAgent } from './chat-hub-agent.entity';
 import { ChatHubAgentRepository } from './chat-hub-agent.repository';
 import { ChatHubCredentialsService } from './chat-hub-credentials.service';
+import { getModelMetadata } from './chat-hub.constants';
 
 import { NotFoundError } from '@/errors/response-errors/not-found.error';
 
@@ -32,7 +33,7 @@ export class ChatHubAgentService {
 				},
 				createdAt: agent.createdAt.toISOString(),
 				updatedAt: agent.updatedAt.toISOString(),
-				allowFileUploads: true,
+				metadata: getModelMetadata(agent.provider, agent.model),
 			})),
 		};
 	}
diff --git a/packages/cli/src/modules/chat-hub/chat-hub-workflow.service.ts b/packages/cli/src/modules/chat-hub/chat-hub-workflow.service.ts
index 65d05a25102..b3a9c06ca67 100644
--- a/packages/cli/src/modules/chat-hub/chat-hub-workflow.service.ts
+++ b/packages/cli/src/modules/chat-hub/chat-hub-workflow.service.ts
@@ -1,4 +1,4 @@
-import { ChatHubConversationModel, ChatSessionId } from '@n8n/api-types';
+import { ChatHubConversationModel, ChatSessionId, type ChatHubInputModality } from '@n8n/api-types';
 import { Logger } from '@n8n/backend-common';
 import {
 	SharedWorkflow,
@@ -196,6 +196,44 @@ export class ChatHubWorkflowService {
 		];
 	}
 
+	/**
+	 * Parses input modalities from chat trigger options
+	 * Converts MIME types string to ChatHubInputModality array
+	 */
+	parseInputModalities(options?: {
+		allowFileUploads?: boolean;
+		allowedFilesMimeTypes?: string;
+	}): ChatHubInputModality[] {
+		const allowFileUploads = options?.allowFileUploads ?? false;
+		const allowedFilesMimeTypes = options?.allowedFilesMimeTypes;
+
+		if (!allowFileUploads) {
+			return ['text'];
+		}
+
+		if (!allowedFilesMimeTypes || allowedFilesMimeTypes === '*/*') {
+			return ['text', 'image', 'audio', 'video', 'file'];
+		}
+
+		const mimeTypes = allowedFilesMimeTypes.split(',').map((type) => type.trim());
+		const modalities = new Set<ChatHubInputModality>(['text']);
+
+		for (const mimeType of mimeTypes) {
+			if (mimeType.startsWith('image/')) {
+				modalities.add('image');
+			} else if (mimeType.startsWith('audio/')) {
+				modalities.add('audio');
+			} else if (mimeType.startsWith('video/')) {
+				modalities.add('video');
+			} else {
+				// Any other MIME type falls under generic 'file'
+				modalities.add('file');
+			}
+		}
+
+		return Array.from(modalities);
+	}
+
 	private getUniqueNodeName(originalName: string, existingNames: Set<string>): string {
 		if (!existingNames.has(originalName)) {
 			return originalName;
diff --git a/packages/cli/src/modules/chat-hub/chat-hub.constants.ts b/packages/cli/src/modules/chat-hub/chat-hub.constants.ts
index e45df575a87..47e9137ab94 100644
--- a/packages/cli/src/modules/chat-hub/chat-hub.constants.ts
+++ b/packages/cli/src/modules/chat-hub/chat-hub.constants.ts
@@ -1,4 +1,4 @@
-import type { ChatHubLLMProvider } from '@n8n/api-types';
+import type { ChatHubLLMProvider, ChatModelMetadataDto } from '@n8n/api-types';
 import type { INodeTypeNameVersion } from 'n8n-workflow';
 
 export const CONVERSATION_TITLE_GENERATION_PROMPT = `Generate a concise, descriptive title for this conversation based on the user's message.
@@ -89,3 +89,301 @@ export const JSONL_STREAM_HEADERS = {
 	Connection: 'keep-alive',
 };
 /* eslint-enable @typescript-eslint/naming-convention */
+
+// Default metadata for all models
+const DEFAULT_MODEL_METADATA: ChatModelMetadataDto = {
+	inputModalities: ['text', 'image', 'audio', 'video', 'file'],
+	capabilities: {
+		functionCalling: true,
+	},
+};
+
+const MODEL_METADATA_REGISTRY: Partial<
+	Record<ChatHubLLMProvider, Partial<Record<string, Partial<ChatModelMetadataDto>>>>
+> = {
+	anthropic: {
+		'claude-3-5-haiku-20241022': {
+			inputModalities: ['text', 'image'],
+		},
+		'claude-3-haiku-20240307': {
+			inputModalities: ['text', 'image'],
+		},
+		'claude-3-opus-20240229': {
+			inputModalities: ['text', 'image'],
+		},
+		'claude-3-sonnet-20240229': {
+			inputModalities: ['text', 'image'],
+		},
+		'claude-3-5-sonnet-20241022': {
+			inputModalities: ['text', 'image'],
+		},
+		'claude-3-7-sonnet-20250219': {
+			inputModalities: ['text', 'image'],
+		},
+		'claude-sonnet-4-20250514': {
+			inputModalities: ['text', 'image'],
+		},
+		'claude-sonnet-4-5-20250929': {
+			inputModalities: ['text', 'image'],
+		},
+		'claude-haiku-4-5-20251001': {
+			inputModalities: ['text', 'image'],
+		},
+		'claude-opus-4-20250514': {
+			inputModalities: ['text', 'image'],
+		},
+		'claude-opus-4-1-20250805': {
+			inputModalities: ['text', 'image'],
+		},
+	},
+	openai: {
+		'gpt-4o-mini-search-preview': {
+			inputModalities: ['text'],
+			capabilities: {
+				functionCalling: false,
+			},
+		},
+		'gpt-4o-mini-search-preview-2025-03-11': {
+			inputModalities: ['text'],
+			capabilities: {
+				functionCalling: false,
+			},
+		},
+		'gpt-4o-search-preview': {
+			inputModalities: ['text'],
+			capabilities: {
+				functionCalling: false,
+			},
+		},
+		'gpt-4o-search-preview-2025-03-11': {
+			inputModalities: ['text'],
+			capabilities: {
+				functionCalling: false,
+			},
+		},
+		'gpt-3.5-turbo': {
+			inputModalities: ['text'],
+		},
+		'gpt-4': {
+			inputModalities: ['text'],
+		},
+		'gpt-4-turbo': {
+			inputModalities: ['text', 'image'],
+		},
+		'o1-mini': {
+			inputModalities: ['text'],
+		},
+		'o1-mini-2024-09-12': {
+			inputModalities: ['text'],
+		},
+		o1: {
+			inputModalities: ['text'],
+		},
+		'o1-pro': {
+			inputModalities: ['text'],
+		},
+		'o1-pro-2025-03-19': {
+			inputModalities: ['text'],
+		},
+		'o3-mini': {
+			inputModalities: ['text'],
+		},
+		'o4-mini': {
+			inputModalities: ['text'],
+		},
+		'o4-mini-2025-04-16': {
+			inputModalities: ['text'],
+		},
+		'o4-mini-high': {
+			inputModalities: ['text'],
+		},
+		o3: {
+			inputModalities: ['text'],
+		},
+		'o3-2025-04-16': {
+			inputModalities: ['text'],
+		},
+		'o3-pro': {
+			inputModalities: ['text'],
+		},
+		'o3-pro-2025-06-10': {
+			inputModalities: ['text'],
+		},
+	},
+	mistralCloud: {
+		// Most Mistral models support text and image
+		'mistral-tiny-2312': {
+			inputModalities: ['text'],
+		},
+		'mistral-tiny-2407': {
+			inputModalities: ['text'],
+		},
+		'mistral-tiny-latest': {
+			inputModalities: ['text'],
+		},
+		'mistral-tiny': {
+			inputModalities: ['text'],
+		},
+		'mistral-small-2312': {
+			inputModalities: ['text'],
+		},
+		'mistral-small-2409': {
+			inputModalities: ['text'],
+		},
+		'mistral-small-2501': {
+			inputModalities: ['text'],
+		},
+		'mistral-small-2503': {
+			inputModalities: ['text'],
+		},
+		'mistral-small-2506': {
+			inputModalities: ['text'],
+		},
+		'mistral-small-latest': {
+			inputModalities: ['text'],
+		},
+		'open-mistral-7b': {
+			inputModalities: ['text'],
+		},
+		'open-mistral-nemo': {
+			inputModalities: ['text'],
+		},
+		'open-mistral-nemo-2407': {
+			inputModalities: ['text'],
+		},
+		'open-mixtral-8x7b': {
+			inputModalities: ['text'],
+		},
+		'open-mixtral-8x22b': {
+			inputModalities: ['text'],
+		},
+		'open-mixtral-8x22b-2404': {
+			inputModalities: ['text'],
+		},
+		'ministral-3b-2410': {
+			inputModalities: ['text'],
+		},
+		'ministral-3b-latest': {
+			inputModalities: ['text'],
+		},
+		'ministral-8b-2410': {
+			inputModalities: ['text'],
+		},
+		'ministral-8b-latest': {
+			inputModalities: ['text'],
+		},
+	},
+	// Reference: https://ai.google.dev/gemini-api/docs/models
+	google: {
+		// Gemini 3 series - latest models with advanced multimodal understanding
+		'models/gemini-3-pro-preview': {},
+		'models/gemini-3-pro-image-preview': {
+			inputModalities: ['text', 'image'],
+			capabilities: { functionCalling: false },
+		},
+		// Gemini 2.5 Pro series
+		'models/gemini-2.5-pro': {},
+		'models/gemini-2.5-pro-exp-03-25': {},
+		'models/gemini-2.5-pro-preview-03-25': {},
+		'models/gemini-2.5-pro-preview-05-06': {},
+		'models/gemini-2.5-pro-preview-06-05': {},
+		'models/gemini-2.5-pro-preview-tts': {
+			inputModalities: ['text'],
+			capabilities: { functionCalling: false },
+		},
+		// Gemini 2.5 Flash series
+		'models/gemini-2.5-flash': {
+			inputModalities: ['text', 'image', 'video', 'audio'],
+		},
+		'models/gemini-2.5-flash-preview-04-17': {
+			inputModalities: ['text', 'image', 'video', 'audio'],
+		},
+		'models/gemini-2.5-flash-preview-05-20': {
+			inputModalities: ['text', 'image', 'video', 'audio'],
+		},
+		'models/gemini-2.5-flash-preview-09-2025': {
+			inputModalities: ['text', 'image', 'video', 'audio'],
+		},
+		'models/gemini-2.5-flash-preview-tts': {
+			inputModalities: ['text'],
+			capabilities: { functionCalling: false },
+		},
+		'models/gemini-2.5-flash-image': {
+			inputModalities: ['text', 'image'],
+			capabilities: { functionCalling: false },
+		},
+		'models/gemini-2.5-flash-image-preview': {
+			inputModalities: ['text', 'image'],
+			capabilities: { functionCalling: false },
+		},
+		'models/gemini-2.5-flash-native-audio-preview-09-2025': {
+			inputModalities: ['text', 'audio', 'video'],
+		},
+		'models/gemini-live-2.5-flash-preview': {
+			inputModalities: ['text', 'audio', 'video'],
+		},
+		// Gemini 2.5 Flash-Lite series
+		'models/gemini-2.5-flash-lite': {},
+		'models/gemini-2.5-flash-lite-preview-06-17': {},
+		'models/gemini-2.5-flash-lite-preview-09-2025': {},
+		// Gemini 2.0 Pro series
+		'models/gemini-2.0-pro-exp-02-05': {},
+		// Gemini 2.0 Flash series
+		'models/gemini-2.0-flash': {
+			inputModalities: ['text', 'image', 'video', 'audio'],
+		},
+		'models/gemini-2.0-flash-001': {
+			inputModalities: ['text', 'image', 'video', 'audio'],
+		},
+		'models/gemini-2.0-flash-exp': {
+			inputModalities: ['text', 'image', 'video', 'audio'],
+		},
+		'models/gemini-2.0-flash-live-001': {
+			inputModalities: ['text', 'audio', 'video'],
+		},
+		'models/gemini-2.0-flash-thinking-exp': {
+			inputModalities: ['text', 'image', 'video', 'audio'],
+		},
+		'models/gemini-2.0-flash-thinking-exp-01-21': {
+			inputModalities: ['text', 'image', 'video', 'audio'],
+		},
+		'models/gemini-2.0-flash-thinking-exp-1219': {
+			inputModalities: ['text', 'image', 'video', 'audio'],
+		},
+		// Gemini 2.0 Flash-Lite series
+		'models/gemini-2.0-flash-lite': {
+			inputModalities: ['text', 'image', 'video', 'audio'],
+		},
+		'models/gemini-2.0-flash-lite-001': {
+			inputModalities: ['text', 'image', 'video', 'audio'],
+		},
+		'models/gemini-2.0-flash-lite-preview': {
+			inputModalities: ['text', 'image', 'video', 'audio'],
+		},
+		'models/gemini-2.0-flash-lite-preview-02-05': {
+			inputModalities: ['text', 'image', 'video', 'audio'],
+		},
+	},
+};
+
+export function getModelMetadata(
+	provider: ChatHubLLMProvider,
+	modelId: string,
+): ChatModelMetadataDto {
+	const providerModels = MODEL_METADATA_REGISTRY[provider];
+	const modelOverride = providerModels?.[modelId];
+
+	if (!modelOverride) {
+		return DEFAULT_MODEL_METADATA;
+	}
+
+	// Merge override with default metadata
+	return {
+		inputModalities: modelOverride.inputModalities ?? DEFAULT_MODEL_METADATA.inputModalities,
+		capabilities: {
+			functionCalling:
+				modelOverride.capabilities?.functionCalling ??
+				DEFAULT_MODEL_METADATA.capabilities.functionCalling,
+		},
+	};
+}
diff --git a/packages/cli/src/modules/chat-hub/chat-hub.service.ts b/packages/cli/src/modules/chat-hub/chat-hub.service.ts
index 77057cd1b47..e3b00997034 100644
--- a/packages/cli/src/modules/chat-hub/chat-hub.service.ts
+++ b/packages/cli/src/modules/chat-hub/chat-hub.service.ts
@@ -62,7 +62,12 @@ import type { ChatHubMessage } from './chat-hub-message.entity';
 import type { ChatHubSession } from './chat-hub-session.entity';
 import { ChatHubWorkflowService } from './chat-hub-workflow.service';
 import { ChatHubAttachmentService } from './chat-hub.attachment.service';
-import { JSONL_STREAM_HEADERS, NODE_NAMES, PROVIDER_NODE_TYPE_MAP } from './chat-hub.constants';
+import {
+	JSONL_STREAM_HEADERS,
+	NODE_NAMES,
+	PROVIDER_NODE_TYPE_MAP,
+	getModelMetadata,
+} from './chat-hub.constants';
 import { ChatHubSettingsService } from './chat-hub.settings.service';
 import {
 	HumanMessagePayload,
@@ -218,7 +223,7 @@ export class ChatHubService {
 				},
 				createdAt: null,
 				updatedAt: null,
-				allowFileUploads: true,
+				metadata: getModelMetadata('openai', String(result.value)),
 			})),
 		};
 	}
@@ -246,7 +251,7 @@ export class ChatHubService {
 				},
 				createdAt: null,
 				updatedAt: null,
-				allowFileUploads: true,
+				metadata: getModelMetadata('anthropic', String(result.value)),
 			})),
 		};
 	}
@@ -312,7 +317,7 @@ export class ChatHubService {
 				},
 				createdAt: null,
 				updatedAt: null,
-				allowFileUploads: true,
+				metadata: getModelMetadata('google', String(result.value)),
 			})),
 		};
 	}
@@ -371,7 +376,7 @@ export class ChatHubService {
 				},
 				createdAt: null,
 				updatedAt: null,
-				allowFileUploads: true,
+				metadata: getModelMetadata('ollama', String(result.value)),
 			})),
 		};
 	}
@@ -489,7 +494,7 @@ export class ChatHubService {
 				},
 				createdAt: null,
 				updatedAt: null,
-				allowFileUploads: true,
+				metadata: getModelMetadata('awsBedrock', String(result.value)),
 			})),
 		};
 	}
@@ -552,6 +557,7 @@ export class ChatHubService {
 				},
 				createdAt: null,
 				updatedAt: null,
+				metadata: getModelMetadata('mistralCloud', String(result.value)),
 			})),
 		};
 	}
@@ -609,6 +615,7 @@ export class ChatHubService {
 				},
 				createdAt: null,
 				updatedAt: null,
+				metadata: getModelMetadata('cohere', String(result.value)),
 			})),
 		};
 	}
@@ -665,6 +672,7 @@ export class ChatHubService {
 				},
 				createdAt: null,
 				updatedAt: null,
+				metadata: getModelMetadata('deepSeek', String(result.value)),
 			})),
 		};
 	}
@@ -721,6 +729,7 @@ export class ChatHubService {
 				},
 				createdAt: null,
 				updatedAt: null,
+				metadata: getModelMetadata('openRouter', String(result.value)),
 			})),
 		};
 	}
@@ -777,6 +786,7 @@ export class ChatHubService {
 				},
 				createdAt: null,
 				updatedAt: null,
+				metadata: getModelMetadata('groq', String(result.value)),
 			})),
 		};
 	}
@@ -833,6 +843,7 @@ export class ChatHubService {
 				},
 				createdAt: null,
 				updatedAt: null,
+				metadata: getModelMetadata('xAiGrok', String(result.value)),
 			})),
 		};
 	}
@@ -889,6 +900,7 @@ export class ChatHubService {
 				},
 				createdAt: null,
 				updatedAt: null,
+				metadata: getModelMetadata('vercelAiGateway', String(result.value)),
 			})),
 		};
 	}
@@ -932,6 +944,10 @@ export class ChatHubService {
 				continue;
 			}
 
+			const inputModalities = this.chatHubWorkflowService.parseInputModalities(
+				chatTriggerParams.options,
+			);
+
 			models.push({
 				name: chatTriggerParams.agentName ?? activeVersion.name ?? 'Unknown Agent',
 				description: chatTriggerParams.agentDescription ?? null,
@@ -941,7 +957,12 @@ export class ChatHubService {
 				},
 				createdAt: activeVersion.createdAt ? activeVersion.createdAt.toISOString() : null,
 				updatedAt: activeVersion.updatedAt ? activeVersion.updatedAt.toISOString() : null,
-				allowFileUploads: chatTriggerParams.options?.allowFileUploads ?? false,
+				metadata: {
+					inputModalities,
+					capabilities: {
+						functionCalling: false,
+					},
+				},
 			});
 		}
 
@@ -1335,10 +1356,6 @@ export class ChatHubService {
 			throw new BadRequestError('Provider or model not set for agent');
 		}
 
-		if (agent.provider === 'n8n' || agent.provider === 'custom-agent') {
-			throw new BadRequestError('Invalid provider');
-		}
-
 		const credentialId = agent.credentialId;
 		if (!credentialId) {
 			throw new BadRequestError('Credentials not set for agent');
@@ -1858,10 +1875,6 @@ export class ChatHubService {
 			throw new BadRequestError('Agent not found for title generation');
 		}
 
-		if (agent.provider === 'n8n' || agent.provider === 'custom-agent') {
-			throw new BadRequestError('Invalid provider for title generation');
-		}
-
 		const credentialId = agent.credentialId;
 		if (!credentialId) {
 			throw new BadRequestError('Credentials not set for agent');
diff --git a/packages/cli/src/modules/chat-hub/chat-hub.types.ts b/packages/cli/src/modules/chat-hub/chat-hub.types.ts
index 4e13bf93a3c..ad7248e7c11 100644
--- a/packages/cli/src/modules/chat-hub/chat-hub.types.ts
+++ b/packages/cli/src/modules/chat-hub/chat-hub.types.ts
@@ -57,6 +57,7 @@ export const validChatTriggerParamsShape = z.object({
 	options: z
 		.object({
 			allowFileUploads: z.boolean().optional(),
+			allowedFilesMimeTypes: z.string().optional(),
 		})
 		.optional(),
 });
diff --git a/packages/frontend/@n8n/i18n/src/locales/en.json b/packages/frontend/@n8n/i18n/src/locales/en.json
index 4f126150dbd..da098723645 100644
--- a/packages/frontend/@n8n/i18n/src/locales/en.json
+++ b/packages/frontend/@n8n/i18n/src/locales/en.json
@@ -379,6 +379,7 @@
 	"chatHub.chat.prompt.callout.setCredentials.existing": "Please {link} for {provider} to continue the conversation",
 	"chatHub.chat.prompt.callout.setCredentials.existing.link": "set credentials",
 	"chatHub.chat.prompt.button.attach": "Attach",
+	"chatHub.chat.prompt.button.attach.disabled": "File attachments are not supported by the selected model",
 	"chatHub.chat.prompt.button.stopRecording": "Stop recording",
 	"chatHub.chat.prompt.button.voiceInput": "Voice input",
 	"chatHub.chat.prompt.button.send": "Send",
@@ -394,6 +395,7 @@
 	"chatHub.tools.editor.cancel": "Cancel",
 	"chatHub.tools.selector.label.count": "{count} Tool | {count} Tools",
 	"chatHub.tools.selector.label.default": "Tools",
+	"chatHub.tools.selector.disabled.tooltip": "Tools are not supported by the selected model",
 	"chatHub.credentials.selector.title": "Select {provider} credential",
 	"chatHub.credentials.selector.chooseOrCreate": "Choose or create a credential for {provider}",
 	"chatHub.credentials.selector.createNew": "Create new",
diff --git a/packages/frontend/editor-ui/src/features/ai/chatHub/ChatView.vue b/packages/frontend/editor-ui/src/features/ai/chatHub/ChatView.vue
index a8c1b4c1331..2718f2cd9d2 100644
--- a/packages/frontend/editor-ui/src/features/ai/chatHub/ChatView.vue
+++ b/packages/frontend/editor-ui/src/features/ai/chatHub/ChatView.vue
@@ -9,6 +9,7 @@ import {
 	findOneFromModelsResponse,
 	isLlmProvider,
 	unflattenModel,
+	createMimeTypes,
 } from '@/features/ai/chatHub/chat.utils';
 import ChatConversationHeader from '@/features/ai/chatHub/components/ChatConversationHeader.vue';
 import ChatMessage from '@/features/ai/chatHub/components/ChatMessage.vue';
@@ -47,6 +48,7 @@ import {
 	chatHubConversationModelWithCachedDisplayNameSchema,
 } from '@/features/ai/chatHub/chat.types';
 import { useI18n } from '@n8n/i18n';
+import { useCustomAgent } from '@/features/ai/chatHub/composables/useCustomAgent';
 
 const router = useRouter();
 const route = useRoute();
@@ -72,8 +74,11 @@ const currentConversation = computed(() =>
 );
 const currentConversationTitle = computed(() => currentConversation.value?.title);
 
-// TODO: This also depends on the model, not all base LLM models support tools.
-const canSelectTools = computed(() => isLlmProvider(selectedModel.value?.model.provider));
+const canSelectTools = computed(
+	() =>
+		selectedModel.value?.model.provider === 'custom-agent' ||
+		!!selectedModel.value?.metadata.capabilities.functionCalling,
+);
 
 const { arrivedState, measure } = useScroll(scrollContainerRef, {
 	throttle: 100,
@@ -99,8 +104,8 @@ const defaultModel = useLocalStorage<ChatHubConversationModelWithCachedDisplayNa
 	},
 );
 
-const defaultModelName = computed(() =>
-	defaultModel.value ? chatStore.getAgent(defaultModel.value).name : undefined,
+const defaultAgent = computed(() =>
+	defaultModel.value ? chatStore.getAgent(defaultModel.value) : undefined,
 );
 
 const defaultTools = useLocalStorage<INode[] | null>(
@@ -122,22 +127,8 @@ const defaultTools = useLocalStorage<INode[] | null>(
 	},
 );
 
-const toolsSelection = ref<INode[] | null>(null);
 const shouldSkipNextScrollTrigger = ref(false);
 
-const selectedTools = computed<INode[]>(() => {
-	if (currentConversation.value?.tools) {
-		return currentConversation.value.tools;
-	}
-
-	// As soon as the user selects tools use the selection over the default
-	if (toolsSelection.value !== null) {
-		return toolsSelection.value;
-	}
-
-	return defaultTools.value ?? [];
-});
-
 const modelFromQuery = computed<ChatModelDto | null>(() => {
 	const agentId = route.query.agentId;
 	const workflowId = route.query.workflowId;
@@ -186,6 +177,25 @@ const selectedModel = computed<ChatModelDto | null>(() => {
 	return chatStore.getAgent(defaultModel.value, defaultModel.value.cachedDisplayName);
 });
 
+const customAgentId = computed(() =>
+	selectedModel.value?.model.provider === 'custom-agent'
+		? selectedModel.value.model.agentId
+		: undefined,
+);
+const customAgent = useCustomAgent(customAgentId);
+
+const selectedTools = computed<INode[]>(() => {
+	if (customAgent.value) {
+		return customAgent.value.tools;
+	}
+
+	if (currentConversation.value?.tools) {
+		return currentConversation.value.tools;
+	}
+
+	return modelFromQuery.value ? [] : (defaultTools.value ?? []);
+});
+
 const { credentialsByProvider, selectCredential } = useChatCredentials(
 	usersStore.currentUserId ?? 'anonymous',
 );
@@ -240,7 +250,7 @@ const didSubmitInCurrentSession = ref(false);
 const canAcceptFiles = computed(
 	() =>
 		editingMessageId.value === undefined &&
-		!!selectedModel.value?.allowFileUploads &&
+		!!createMimeTypes(selectedModel.value?.metadata.inputModalities ?? []) &&
 		!isMissingSelectedCredential.value,
 );
 
@@ -350,10 +360,18 @@ watch(
 
 // Keep cached display name up-to-date
 watch(
-	defaultModelName,
-	(name) => {
-		if (defaultModel.value && name) {
-			defaultModel.value = { ...defaultModel.value, cachedDisplayName: name };
+	defaultAgent,
+	(agent, prevAgent) => {
+		if (defaultModel.value && agent && agent.name !== prevAgent?.name) {
+			defaultModel.value = { ...defaultModel.value, cachedDisplayName: agent.name };
+		}
+
+		if (
+			agent &&
+			!agent.metadata.capabilities.functionCalling &&
+			(defaultTools.value ?? []).length > 0
+		) {
+			defaultTools.value = [];
 		}
 	},
 	{ immediate: true },
@@ -455,6 +473,9 @@ async function handleSelectModel(selection: ChatHubConversationModel, displayNam
 		}
 	} else {
 		defaultModel.value = { ...selection, cachedDisplayName: agentName };
+
+		// Remove query params (if exists) and focus input
+		await router.push({ name: CHAT_VIEW, force: true }); // remove query params
 	}
 }
 
@@ -476,7 +497,6 @@ function handleConfigureModel() {
 }
 
 async function handleUpdateTools(newTools: INode[]) {
-	toolsSelection.value = newTools;
 	defaultTools.value = newTools;
 
 	if (currentConversation.value) {
@@ -494,7 +514,7 @@ function handleEditAgent(agentId: string) {
 		data: {
 			agentId,
 			credentials: credentialsByProvider,
-			onCreateCustomAgent: handleSelectModel,
+			onCreateCustomAgent: handleSelectAgent,
 		},
 	});
 }
@@ -504,7 +524,7 @@ function openNewAgentCreator() {
 		name: AGENT_EDITOR_MODAL_KEY,
 		data: {
 			credentials: credentialsByProvider,
-			onCreateCustomAgent: handleSelectModel,
+			onCreateCustomAgent: handleSelectAgent,
 		},
 	});
 }
@@ -546,7 +566,7 @@ function onFilesDropped(files: File[]) {
 			:selected-model="selectedModel"
 			:credentials="credentialsByProvider"
 			:ready-to-show-model-selector="isNewSession || !!currentConversation"
-			@select-model="handleSelectAgent"
+			@select-model="handleSelectModel"
 			@edit-custom-agent="handleEditAgent"
 			@create-custom-agent="openNewAgentCreator"
 			@select-credential="selectCredential"
@@ -617,6 +637,7 @@ function onFilesDropped(files: File[]) {
 						@select-model="handleConfigureModel"
 						@select-tools="handleUpdateTools"
 						@set-credentials="handleConfigureCredentials"
+						@edit-agent="handleEditAgent"
 					/>
 				</div>
 			</div>
diff --git a/packages/frontend/editor-ui/src/features/ai/chatHub/chat.store.ts b/packages/frontend/editor-ui/src/features/ai/chatHub/chat.store.ts
index 4d004f27dee..cafdd824848 100644
--- a/packages/frontend/editor-ui/src/features/ai/chatHub/chat.store.ts
+++ b/packages/frontend/editor-ui/src/features/ai/chatHub/chat.store.ts
@@ -65,6 +65,7 @@ export const useChatStore = defineStore(CHAT_STORE, () => {
 	const telemetry = useTelemetry();
 
 	const agents = ref<ChatModelsResponse>();
+	const customAgents = ref<Partial<Record<string, ChatHubAgentDto>>>({});
 	const sessions = ref<{
 		byId: Partial<Record<string, ChatHubSessionDto>>;
 		ids: string[] | null;
@@ -730,8 +731,10 @@ export const useChatStore = defineStore(CHAT_STORE, () => {
 		conversation.activeMessageChain = computeActiveChain(conversation.messages, messageId);
 	}
 
-	async function fetchCustomAgent(agentId: string): Promise<ChatHubAgentDto> {
-		return await fetchAgentApi(rootStore.restApiContext, agentId);
+	async function fetchCustomAgent(agentId: string) {
+		const customAgent = await fetchAgentApi(rootStore.restApiContext, agentId);
+
+		customAgents.value[agentId] = customAgent;
 	}
 
 	function getCustomAgent(agentId: string) {
@@ -744,26 +747,32 @@ export const useChatStore = defineStore(CHAT_STORE, () => {
 		payload: ChatHubCreateAgentRequest,
 		credentials: CredentialsMap,
 	): Promise<ChatModelDto> {
-		const agent = await createAgentApi(rootStore.restApiContext, payload);
-		const agentModel = {
+		const customAgent = await createAgentApi(rootStore.restApiContext, payload);
+		const baseModel = agents.value?.[customAgent.provider]?.models.find(
+			(model) => model.name === customAgent.model,
+		);
+		const agent: ChatModelDto = {
 			model: {
 				provider: 'custom-agent' as const,
-				agentId: agent.id,
+				agentId: customAgent.id,
+			},
+			name: customAgent.name,
+			description: customAgent.description ?? null,
+			createdAt: customAgent.createdAt,
+			updatedAt: customAgent.updatedAt,
+			metadata: baseModel?.metadata ?? {
+				capabilities: { functionCalling: false },
+				inputModalities: [],
 			},
-			name: agent.name,
-			description: agent.description ?? null,
-			createdAt: agent.createdAt,
-			updatedAt: agent.updatedAt,
-			tools: agent.tools,
-			allowFileUploads: true,
 		};
-		agents.value?.['custom-agent'].models.push(agentModel);
+		agents.value?.['custom-agent'].models.push(agent);
+		customAgents.value[customAgent.id] = customAgent;
 
 		await fetchAgents(credentials);
 
 		telemetry.track('User created agent', { ...flattenModel(payload) });
 
-		return agentModel;
+		return agent;
 	}
 
 	async function updateCustomAgent(
@@ -771,18 +780,22 @@ export const useChatStore = defineStore(CHAT_STORE, () => {
 		payload: ChatHubUpdateAgentRequest,
 		credentials: CredentialsMap,
 	): Promise<ChatHubAgentDto> {
-		const agent = await updateAgentApi(rootStore.restApiContext, agentId, payload);
+		const customAgent = await updateAgentApi(rootStore.restApiContext, agentId, payload);
 
 		// Update the agent in models as well
 		if (agents.value?.['custom-agent']) {
 			agents.value['custom-agent'].models = agents.value['custom-agent'].models.map((model) =>
-				'agentId' in model && model.agentId === agentId ? { ...model, name: agent.name } : model,
+				'agentId' in model && model.agentId === agentId
+					? { ...model, name: customAgent.name }
+					: model,
 			);
 		}
 
+		customAgents.value[agentId] = customAgent;
+
 		await fetchAgents(credentials);
 
-		return agent;
+		return customAgent;
 	}
 
 	async function deleteCustomAgent(agentId: string, credentials: CredentialsMap) {
@@ -795,6 +808,8 @@ export const useChatStore = defineStore(CHAT_STORE, () => {
 			);
 		}
 
+		delete customAgents.value[agentId];
+
 		await fetchAgents(credentials);
 	}
 
@@ -813,7 +828,13 @@ export const useChatStore = defineStore(CHAT_STORE, () => {
 			description: null,
 			createdAt: null,
 			updatedAt: null,
-			allowFileUploads: true,
+			// Assume file attachment and tools are supported
+			metadata: {
+				inputModalities: ['text', 'file'],
+				capabilities: {
+					functionCalling: true,
+				},
+			},
 		};
 	}
 
@@ -858,6 +879,7 @@ export const useChatStore = defineStore(CHAT_STORE, () => {
 		 */
 		agents: computed(() => agents.value ?? emptyChatModelsResponse),
 		agentsReady: computed(() => agents.value !== undefined),
+		customAgents,
 		getAgent,
 		fetchAgents,
 		getCustomAgent,
diff --git a/packages/frontend/editor-ui/src/features/ai/chatHub/chat.utils.ts b/packages/frontend/editor-ui/src/features/ai/chatHub/chat.utils.ts
index a1839cf745c..3f60576b2af 100644
--- a/packages/frontend/editor-ui/src/features/ai/chatHub/chat.utils.ts
+++ b/packages/frontend/editor-ui/src/features/ai/chatHub/chat.utils.ts
@@ -8,6 +8,7 @@ import {
 	type ChatMessageId,
 	type ChatHubProvider,
 	type ChatHubLLMProvider,
+	type ChatHubInputModality,
 } from '@n8n/api-types';
 import type {
 	ChatMessage,
@@ -347,3 +348,30 @@ export function createSessionFromStreamingState(streaming: ChatStreamingState):
 		...flattenModel(streaming.model),
 	};
 }
+
+export function createMimeTypes(modalities: ChatHubInputModality[]): string | undefined {
+	if (modalities.length === 0) {
+		return undefined;
+	}
+
+	// If 'file' modality is present, accept all file types
+	if (modalities.includes('file')) {
+		return '*/*';
+	}
+
+	const mimeTypes: string[] = [];
+
+	for (const modality of modalities) {
+		if (modality === 'image') {
+			mimeTypes.push('image/*');
+		}
+		if (modality === 'audio') {
+			mimeTypes.push('audio/*');
+		}
+		if (modality === 'video') {
+			mimeTypes.push('video/*');
+		}
+	}
+
+	return mimeTypes.length > 0 ? mimeTypes.join(',') : undefined;
+}
diff --git a/packages/frontend/editor-ui/src/features/ai/chatHub/components/AgentEditorModal.vue b/packages/frontend/editor-ui/src/features/ai/chatHub/components/AgentEditorModal.vue
index 3b625b44ccd..c9f04b4a3a1 100644
--- a/packages/frontend/editor-ui/src/features/ai/chatHub/components/AgentEditorModal.vue
+++ b/packages/frontend/editor-ui/src/features/ai/chatHub/components/AgentEditorModal.vue
@@ -4,7 +4,12 @@ import { useMessage } from '@/app/composables/useMessage';
 import { useToast } from '@/app/composables/useToast';
 import { useChatStore } from '@/features/ai/chatHub/chat.store';
 import ModelSelector from '@/features/ai/chatHub/components/ModelSelector.vue';
-import type { ChatHubBaseLLMModel, ChatHubProvider, ChatModelDto } from '@n8n/api-types';
+import type {
+	ChatHubBaseLLMModel,
+	ChatHubConversationModel,
+	ChatHubProvider,
+	ChatModelDto,
+} from '@n8n/api-types';
 import { N8nButton, N8nHeading, N8nInput, N8nInputLabel, N8nSpinner } from '@n8n/design-system';
 import { useI18n } from '@n8n/i18n';
 import { assert } from '@n8n/utils/assert';
@@ -15,6 +20,8 @@ import type { INode } from 'n8n-workflow';
 import ToolsSelector from './ToolsSelector.vue';
 import { isLlmProviderModel } from '@/features/ai/chatHub/chat.utils';
 import { useCustomAgent } from '@/features/ai/chatHub/composables/useCustomAgent';
+import { useUIStore } from '@/app/stores/ui.store';
+import { TOOLS_SELECTOR_MODAL_KEY } from '@/features/ai/chatHub/constants';
 
 const props = defineProps<{
 	modalName: string;
@@ -30,6 +37,8 @@ const chatStore = useChatStore();
 const i18n = useI18n();
 const toast = useToast();
 const message = useMessage();
+const uiStore = useUIStore();
+
 const modalBus = ref(createEventBus());
 const customAgent = useCustomAgent(props.data.agentId);
 
@@ -78,6 +87,21 @@ const agentMergedCredentials = computed((): CredentialsMap => {
 	};
 });
 
+const canSelectTools = computed(
+	() => selectedAgent.value?.metadata.capabilities.functionCalling ?? false,
+);
+
+// If the agent doesn't support tools anymore, reset tools
+watch(
+	selectedAgent,
+	(agent) => {
+		if (agent && !agent.metadata.capabilities.functionCalling) {
+			tools.value = [];
+		}
+	},
+	{ immediate: true },
+);
+
 watch(
 	customAgent,
 	(agent) => {
@@ -103,9 +127,9 @@ function onCredentialSelected(provider: ChatHubProvider, credentialId: string |
 	};
 }
 
-function onModelChange(agent: ChatModelDto) {
-	assert(isLlmProviderModel(agent.model));
-	selectedModel.value = agent.model;
+function onModelChange(model: ChatHubConversationModel) {
+	assert(isLlmProviderModel(model));
+	selectedModel.value = model;
 }
 
 async function onSave() {
@@ -182,8 +206,16 @@ async function onDelete() {
 	}
 }
 
-function onSelectTools(newTools: INode[]) {
-	tools.value = newTools;
+function onSelectTools() {
+	uiStore.openModalWithData({
+		name: TOOLS_SELECTOR_MODAL_KEY,
+		data: {
+			selected: tools.value,
+			onConfirm: (newTools: INode[]) => {
+				tools.value = newTools;
+			},
+		},
+	});
 }
 </script>
 
@@ -283,7 +315,16 @@ function onSelectTools(newTools: INode[]) {
 						:required="false"
 					>
 						<div>
-							<ToolsSelector :disabled="isLoadingAgent" :selected="tools" @select="onSelectTools" />
+							<ToolsSelector
+								:disabled="isLoadingAgent || !canSelectTools"
+								:disabled-tooltip="
+									isLoadingAgent || canSelectTools
+										? undefined
+										: i18n.baseText('chatHub.tools.selector.disabled.tooltip')
+								"
+								:selected="tools"
+								@click="onSelectTools"
+							/>
 						</div>
 					</N8nInputLabel>
 				</div>
diff --git a/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatConversationHeader.vue b/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatConversationHeader.vue
index 45b3416b34c..a76af0a05f2 100644
--- a/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatConversationHeader.vue
+++ b/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatConversationHeader.vue
@@ -5,6 +5,7 @@ import ModelSelector from '@/features/ai/chatHub/components/ModelSelector.vue';
 import { useChatHubSidebarState } from '@/features/ai/chatHub/composables/useChatHubSidebarState';
 import { CHAT_VIEW } from '@/features/ai/chatHub/constants';
 import type {
+	ChatHubConversationModel,
 	ChatHubLLMProvider,
 	ChatHubProvider,
 	ChatModelDto,
@@ -22,7 +23,7 @@ const { selectedModel, credentials, readyToShowModelSelector } = defineProps<{
 }>();
 
 const emit = defineEmits<{
-	selectModel: [ChatModelDto];
+	selectModel: [ChatHubConversationModel];
 	renameConversation: [id: ChatSessionId, title: string];
 	editCustomAgent: [agentId: string];
 	createCustomAgent: [];
@@ -35,7 +36,7 @@ const router = useRouter();
 const modelSelectorRef = useTemplateRef('modelSelectorRef');
 const i18n = useI18n();
 
-function onModelChange(selection: ChatModelDto) {
+function onModelChange(selection: ChatHubConversationModel) {
 	emit('selectModel', selection);
 }
 
diff --git a/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatPrompt.vue b/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatPrompt.vue
index af4c8441e3a..8ce4e72d107 100644
--- a/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatPrompt.vue
+++ b/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatPrompt.vue
@@ -1,16 +1,17 @@
 <script setup lang="ts">
 import { useToast } from '@/app/composables/useToast';
-import { providerDisplayNames } from '@/features/ai/chatHub/constants';
+import { providerDisplayNames, TOOLS_SELECTOR_MODAL_KEY } from '@/features/ai/chatHub/constants';
 import type { ChatHubLLMProvider, ChatModelDto } from '@n8n/api-types';
 import ChatFile from '@n8n/chat/components/ChatFile.vue';
-import { N8nIconButton, N8nInput, N8nText } from '@n8n/design-system';
+import { N8nIconButton, N8nInput, N8nText, N8nTooltip } from '@n8n/design-system';
 import { useSpeechRecognition } from '@vueuse/core';
 import type { INode } from 'n8n-workflow';
 import { computed, ref, useTemplateRef, watch } from 'vue';
 import ToolsSelector from './ToolsSelector.vue';
-import { isLlmProviderModel } from '@/features/ai/chatHub/chat.utils';
+import { isLlmProviderModel, createMimeTypes } from '@/features/ai/chatHub/chat.utils';
 import { useI18n } from '@n8n/i18n';
 import { I18nT } from 'vue-i18n';
+import { useUIStore } from '@/app/stores/ui.store';
 
 const { selectedModel, selectedTools, issue } = defineProps<{
 	isResponding: boolean;
@@ -27,6 +28,7 @@ const emit = defineEmits<{
 	selectModel: [];
 	selectTools: [INode[]];
 	setCredentials: [ChatHubLLMProvider];
+	editAgent: [agentId: string];
 }>();
 
 const inputRef = useTemplateRef<HTMLElement>('inputRef');
@@ -37,6 +39,7 @@ const attachments = ref<File[]>([]);
 
 const toast = useToast();
 const i18n = useI18n();
+const uiStore = useUIStore();
 
 const speechInput = useSpeechRecognition({
 	continuous: true,
@@ -57,6 +60,13 @@ const llmProvider = computed<ChatHubLLMProvider | undefined>(() =>
 	isLlmProviderModel(selectedModel?.model) ? selectedModel?.model.provider : undefined,
 );
 
+const acceptedMimeTypes = computed(() => {
+	const modalities = selectedModel?.metadata.inputModalities;
+	return modalities ? createMimeTypes(modalities) : undefined;
+});
+
+const canUploadFiles = computed(() => !!acceptedMimeTypes.value);
+
 function onMic() {
 	committedSpokenMessage.value = message.value;
 
@@ -160,8 +170,19 @@ watch(speechInput.error, (event) => {
 	}
 });
 
-function onSelectTools(tools: INode[]) {
-	emit('selectTools', tools);
+function onSelectTools() {
+	if (selectedModel?.model.provider === 'custom-agent') {
+		emit('editAgent', selectedModel.model.agentId);
+		return;
+	}
+
+	uiStore.openModalWithData({
+		name: TOOLS_SELECTOR_MODAL_KEY,
+		data: {
+			selected: selectedTools,
+			onConfirm: (newTools: INode[]) => emit('selectTools', newTools),
+		},
+	});
 }
 
 defineExpose({
@@ -228,6 +249,7 @@ defineExpose({
 				ref="fileInputRef"
 				type="file"
 				:class="$style.fileInput"
+				:accept="acceptedMimeTypes"
 				multiple
 				@change="handleFileSelect"
 			/>
@@ -257,27 +279,40 @@ defineExpose({
 				/>
 
 				<div :class="$style.footer">
-					<div v-if="isToolsSelectable" :class="$style.tools">
+					<div :class="$style.tools">
 						<ToolsSelector
 							:class="$style.toolsButton"
 							:selected="selectedTools ?? []"
-							:disabled="!!issue || isResponding"
+							:disabled="!!issue || isResponding || !isToolsSelectable"
+							:disabled-tooltip="
+								isToolsSelectable
+									? undefined
+									: i18n.baseText('chatHub.tools.selector.disabled.tooltip')
+							"
 							transparent-bg
-							@select="onSelectTools"
+							@click="onSelectTools"
 						/>
 					</div>
 					<div :class="$style.actions">
-						<N8nIconButton
-							v-if="selectedModel?.allowFileUploads"
-							native-type="button"
-							type="secondary"
-							:title="i18n.baseText('chatHub.chat.prompt.button.attach')"
-							:disabled="!!issue || isResponding"
-							icon="paperclip"
-							icon-size="large"
-							text
-							@click.stop="onAttach"
-						/>
+						<N8nTooltip
+							:content="
+								!canUploadFiles
+									? i18n.baseText('chatHub.chat.prompt.button.attach.disabled')
+									: i18n.baseText('chatHub.chat.prompt.button.attach')
+							"
+							:disabled="canUploadFiles && !issue && !isResponding"
+							placement="top"
+						>
+							<N8nIconButton
+								native-type="button"
+								type="secondary"
+								:disabled="!!issue || isResponding || !canUploadFiles"
+								icon="paperclip"
+								icon-size="large"
+								text
+								@click.stop="onAttach"
+							/>
+						</N8nTooltip>
 						<N8nIconButton
 							v-if="speechInput.isSupported"
 							native-type="button"
diff --git a/packages/frontend/editor-ui/src/features/ai/chatHub/components/ModelSelector.vue b/packages/frontend/editor-ui/src/features/ai/chatHub/components/ModelSelector.vue
index b1e50b92766..8a716d51283 100644
--- a/packages/frontend/editor-ui/src/features/ai/chatHub/components/ModelSelector.vue
+++ b/packages/frontend/editor-ui/src/features/ai/chatHub/components/ModelSelector.vue
@@ -12,6 +12,7 @@ import type {
 	ChatHubLLMProvider,
 	ChatModelDto,
 	ChatModelsResponse,
+	ChatHubConversationModel,
 } from '@n8n/api-types';
 import {
 	CHAT_CREDENTIAL_SELECTOR_MODAL_KEY,
@@ -30,7 +31,6 @@ import {
 	flattenModel,
 	fromStringToModel,
 	isLlmProviderModel,
-	isMatchedAgent,
 	stringifyModel,
 } from '@/features/ai/chatHub/chat.utils';
 import { fetchChatModelsApi } from '@/features/ai/chatHub/chat.api';
@@ -56,7 +56,7 @@ const {
 }>();
 
 const emit = defineEmits<{
-	change: [ChatModelDto];
+	change: [ChatHubConversationModel];
 	createCustomAgent: [];
 	selectCredential: [provider: ChatHubProvider, credentialId: string | null];
 }>();
@@ -66,17 +66,7 @@ function handleSelectCredentials(provider: ChatHubProvider, id: string | null) {
 }
 
 function handleSelectModelById(provider: ChatHubLLMProvider, modelId: string) {
-	emit('change', {
-		model: {
-			provider,
-			model: modelId,
-		},
-		name: modelId,
-		description: null,
-		updatedAt: null,
-		createdAt: null,
-		allowFileUploads: true,
-	});
+	emit('change', { provider, model: modelId });
 }
 
 const i18n = useI18n();
@@ -182,6 +172,13 @@ const menu = computed(() => {
 					},
 					createdAt: '',
 					updatedAt: null,
+					// Assume file attachment and tools are supported
+					metadata: {
+						inputModalities: ['text', 'image', 'audio', 'video', 'file'],
+						capabilities: {
+							functionCalling: true,
+						},
+					},
 				});
 			}
 		}
@@ -293,20 +290,12 @@ function onSelect(id: string) {
 		return;
 	}
 
-	const selected = agents.value[parsedModel.provider].models.find((a) =>
-		isMatchedAgent(a, parsedModel),
-	);
-
-	if (!selected) {
-		return;
-	}
-
 	telemetry.track('User selected model or agent', {
-		...flattenModel(selected.model),
-		is_custom: selected.model.provider === 'custom-agent',
+		...flattenModel(parsedModel),
+		is_custom: parsedModel.provider === 'custom-agent',
 	});
 
-	emit('change', selected);
+	emit('change', parsedModel);
 }
 
 function handleCreateNewCredential(provider: ChatHubLLMProvider) {
diff --git a/packages/frontend/editor-ui/src/features/ai/chatHub/components/ToolsSelector.vue b/packages/frontend/editor-ui/src/features/ai/chatHub/components/ToolsSelector.vue
index 6e01bb64907..ba6eea86b0e 100644
--- a/packages/frontend/editor-ui/src/features/ai/chatHub/components/ToolsSelector.vue
+++ b/packages/frontend/editor-ui/src/features/ai/chatHub/components/ToolsSelector.vue
@@ -1,24 +1,26 @@
 <script setup lang="ts">
 import NodeIcon from '@/app/components/NodeIcon.vue';
 import { useNodeTypesStore } from '@/app/stores/nodeTypes.store';
-import { useUIStore } from '@/app/stores/ui.store';
-import { N8nButton } from '@n8n/design-system';
+import { N8nButton, N8nTooltip } from '@n8n/design-system';
 import type { INode } from 'n8n-workflow';
 import { computed, onMounted } from 'vue';
-import { TOOLS_SELECTOR_MODAL_KEY } from '../constants';
 import { useI18n } from '@n8n/i18n';
 
-const { selected, transparentBg = false } = defineProps<{
+const {
+	selected,
+	transparentBg = false,
+	disabledTooltip,
+} = defineProps<{
 	disabled: boolean;
 	selected: INode[];
 	transparentBg?: boolean;
+	disabledTooltip?: string;
 }>();
 
 const emit = defineEmits<{
-	select: [INode[]];
+	click: [MouseEvent];
 }>();
 
-const uiStore = useUIStore();
 const nodeTypesStore = useNodeTypesStore();
 const i18n = useI18n();
 
@@ -41,41 +43,32 @@ const toolsLabel = computed(() => {
 onMounted(async () => {
 	await nodeTypesStore.loadNodeTypesIfNotLoaded();
 });
-
-const handleSelect = (tools: INode[]) => {
-	emit('select', tools);
-};
-
-const onClick = () => {
-	uiStore.openModalWithData({
-		name: TOOLS_SELECTOR_MODAL_KEY,
-		data: { selected, onConfirm: handleSelect },
-	});
-};
 </script>
 
 <template>
-	<N8nButton
-		type="secondary"
-		native-type="button"
-		:class="[$style.toolsButton, { [$style.transparentBg]: transparentBg }]"
-		:disabled="disabled"
-		:icon="toolCount > 0 ? undefined : 'plus'"
-		@click="onClick"
-	>
-		<span v-if="toolCount" :class="$style.iconStack">
-			<NodeIcon
-				v-for="(nodeType, i) in displayToolNodeTypes"
-				:key="`${nodeType?.name}-${i}`"
-				:style="{ zIndex: displayToolNodeTypes.length - i }"
-				:node-type="nodeType"
-				:class="[$style.icon, { [$style.iconOverlap]: i !== 0 }]"
-				:circle="true"
-				:size="12"
-			/>
-		</span>
-		{{ toolsLabel }}
-	</N8nButton>
+	<N8nTooltip :content="disabledTooltip" :disabled="!disabledTooltip" placement="top">
+		<N8nButton
+			type="secondary"
+			native-type="button"
+			:class="[$style.toolsButton, { [$style.transparentBg]: transparentBg }]"
+			:disabled="disabled"
+			:icon="toolCount > 0 ? undefined : 'plus'"
+			@click="emit('click', $event)"
+		>
+			<span v-if="toolCount" :class="$style.iconStack">
+				<NodeIcon
+					v-for="(nodeType, i) in displayToolNodeTypes"
+					:key="`${nodeType?.name}-${i}`"
+					:style="{ zIndex: displayToolNodeTypes.length - i }"
+					:node-type="nodeType"
+					:class="[$style.icon, { [$style.iconOverlap]: i !== 0 }]"
+					:circle="true"
+					:size="12"
+				/>
+			</span>
+			{{ toolsLabel }}
+		</N8nButton>
+	</N8nTooltip>
 </template>
 
 <style lang="scss" module>
diff --git a/packages/frontend/editor-ui/src/features/ai/chatHub/composables/useCustomAgent.ts b/packages/frontend/editor-ui/src/features/ai/chatHub/composables/useCustomAgent.ts
index 7abbf1d83b1..71571e126b9 100644
--- a/packages/frontend/editor-ui/src/features/ai/chatHub/composables/useCustomAgent.ts
+++ b/packages/frontend/editor-ui/src/features/ai/chatHub/composables/useCustomAgent.ts
@@ -1,25 +1,22 @@
-import type { ChatHubAgentDto } from '@n8n/api-types';
-import { ref, toValue, watch, type MaybeRef } from 'vue';
+import { computed, toValue, watch, type MaybeRef } from 'vue';
 import { useChatStore } from '../chat.store';
-import { useToast } from '@/app/composables/useToast';
 
 export function useCustomAgent(agentId?: MaybeRef<string | undefined>) {
 	const store = useChatStore();
-	const agent = ref<ChatHubAgentDto>();
-	const toast = useToast();
+	const id = computed(() => toValue(agentId));
+	const agent = computed(() => {
+		if (!id.value) {
+			return undefined;
+		}
+
+		return store.customAgents[id.value];
+	});
 
 	watch(
-		() => toValue(agentId),
-		async (id) => {
-			if (!id) {
-				agent.value = undefined;
-				return;
-			}
-
-			try {
-				agent.value = await store.fetchCustomAgent(id);
-			} catch (error) {
-				toast.showError(error, 'Failed to load agent');
+		id,
+		(theId) => {
+			if (theId) {
+				void store.fetchCustomAgent(theId);
 			}
 		},
 		{ immediate: true },

From 624eb09b07a7cd2f7705a1880859ae59e68f6fbf Mon Sep 17 00:00:00 2001
From: Andreas Fitzek <andreas.fitzek@n8n.io>
Date: Tue, 2 Dec 2025 09:05:50 +0100
Subject: [PATCH 004/167] chore(core): Http Header Extractor Hook (#22404)

---
 .../modules/__tests__/module-registry.test.ts |   2 +
 .../src/modules/module-registry.ts            |   1 +
 .../src/modules/modules.config.ts             |   1 +
 packages/cli/src/commands/base-command.ts     |   3 +-
 packages/cli/src/commands/start.ts            |   4 +
 packages/cli/src/commands/worker.ts           |   4 +
 .../cli/src/load-nodes-and-credentials.ts     | 204 +++++-----
 .../__tests__/http-header-extractor.test.ts   | 367 ++++++++++++++++++
 .../http-header-extractor.ts                  | 171 ++++++++
 .../context-establishment-hooks/index.ts      |   1 +
 .../dynamic-credentials.module.ts             |  12 +
 .../execution-context.service.test.ts         |  21 +-
 ...execution-context-hook-registry.service.ts |   6 +-
 .../execution-context.service.ts              |   7 +-
 .../src/execution-engine/execution-context.ts |  25 +-
 .../execution-context-establishment-hooks.ts  |  24 +-
 16 files changed, 720 insertions(+), 133 deletions(-)
 create mode 100644 packages/cli/src/modules/dynamic-credentials.ee/context-establishment-hooks/__tests__/http-header-extractor.test.ts
 create mode 100644 packages/cli/src/modules/dynamic-credentials.ee/context-establishment-hooks/http-header-extractor.ts
 create mode 100644 packages/cli/src/modules/dynamic-credentials.ee/context-establishment-hooks/index.ts
 create mode 100644 packages/cli/src/modules/dynamic-credentials.ee/dynamic-credentials.module.ts

diff --git a/packages/@n8n/backend-common/src/modules/__tests__/module-registry.test.ts b/packages/@n8n/backend-common/src/modules/__tests__/module-registry.test.ts
index 4d5ab6a50d7..81e097c5760 100644
--- a/packages/@n8n/backend-common/src/modules/__tests__/module-registry.test.ts
+++ b/packages/@n8n/backend-common/src/modules/__tests__/module-registry.test.ts
@@ -30,6 +30,7 @@ describe('eligibleModules', () => {
 			'mcp',
 			'provisioning',
 			'breaking-changes',
+			'dynamic-credentials',
 		]);
 	});
 
@@ -43,6 +44,7 @@ describe('eligibleModules', () => {
 			'mcp',
 			'provisioning',
 			'breaking-changes',
+			'dynamic-credentials',
 		]);
 	});
 
diff --git a/packages/@n8n/backend-common/src/modules/module-registry.ts b/packages/@n8n/backend-common/src/modules/module-registry.ts
index 21234be3f01..7fc9e591686 100644
--- a/packages/@n8n/backend-common/src/modules/module-registry.ts
+++ b/packages/@n8n/backend-common/src/modules/module-registry.ts
@@ -37,6 +37,7 @@ export class ModuleRegistry {
 		'mcp',
 		'provisioning',
 		'breaking-changes',
+		'dynamic-credentials',
 	];
 
 	private readonly activeModules: string[] = [];
diff --git a/packages/@n8n/backend-common/src/modules/modules.config.ts b/packages/@n8n/backend-common/src/modules/modules.config.ts
index 5b4a6ff42de..6c2cb14dd85 100644
--- a/packages/@n8n/backend-common/src/modules/modules.config.ts
+++ b/packages/@n8n/backend-common/src/modules/modules.config.ts
@@ -11,6 +11,7 @@ export const MODULE_NAMES = [
 	'chat-hub',
 	'provisioning',
 	'breaking-changes',
+	'dynamic-credentials',
 ] as const;
 
 export type ModuleName = (typeof MODULE_NAMES)[number];
diff --git a/packages/cli/src/commands/base-command.ts b/packages/cli/src/commands/base-command.ts
index ea0ed8d4c54..716acdbf608 100644
--- a/packages/cli/src/commands/base-command.ts
+++ b/packages/cli/src/commands/base-command.ts
@@ -31,12 +31,12 @@ import { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus'
 import { TelemetryEventRelay } from '@/events/relays/telemetry.event-relay';
 import { ExternalHooks } from '@/external-hooks';
 import { License } from '@/license';
-import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials';
 import { CommunityPackagesConfig } from '@/modules/community-packages/community-packages.config';
 import { NodeTypes } from '@/node-types';
 import { PostHogClient } from '@/posthog';
 import { ShutdownService } from '@/shutdown/shutdown.service';
 import { WorkflowHistoryManager } from '@/workflows/workflow-history/workflow-history-manager';
+import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials';
 
 export abstract class BaseCommand<F = never> {
 	readonly flags: F;
@@ -99,7 +99,6 @@ export abstract class BaseCommand<F = never> {
 
 		this.nodeTypes = Container.get(NodeTypes);
 
-		await this.executionContextHookRegistry.init();
 		await Container.get(LoadNodesAndCredentials).init();
 
 		await this.dbConnection
diff --git a/packages/cli/src/commands/start.ts b/packages/cli/src/commands/start.ts
index f9e2472b7d5..920d8974968 100644
--- a/packages/cli/src/commands/start.ts
+++ b/packages/cli/src/commands/start.ts
@@ -35,6 +35,7 @@ import { WorkflowRunner } from '@/workflow-runner';
 import { BaseCommand } from './base-command';
 import { CredentialsOverwrites } from '@/credentials-overwrites';
 import { DeprecationService } from '@/deprecation/deprecation.service';
+import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials';
 
 // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
 const open = require('open');
@@ -262,6 +263,9 @@ export class Start extends BaseCommand<z.infer<typeof flagsSchema>> {
 
 			Container.get(MultiMainSetup).registerEventHandlers();
 		}
+
+		await this.executionContextHookRegistry.init();
+		await Container.get(LoadNodesAndCredentials).postProcessLoaders();
 	}
 
 	async initOrchestration() {
diff --git a/packages/cli/src/commands/worker.ts b/packages/cli/src/commands/worker.ts
index 447b9308b77..ecf6b66370c 100644
--- a/packages/cli/src/commands/worker.ts
+++ b/packages/cli/src/commands/worker.ts
@@ -17,6 +17,7 @@ import type { WorkerServerEndpointsConfig } from '@/scaling/worker-server';
 import { WorkerStatusService } from '@/scaling/worker-status.service.ee';
 
 import { BaseCommand } from './base-command';
+import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials';
 
 const flagsSchema = z.object({
 	concurrency: z.number().int().default(10).describe('How many jobs can run in parallel.'),
@@ -115,6 +116,9 @@ export class Worker extends BaseCommand<z.infer<typeof flagsSchema>> {
 		);
 
 		await this.moduleRegistry.initModules(this.instanceSettings.instanceType);
+
+		await this.executionContextHookRegistry.init();
+		await Container.get(LoadNodesAndCredentials).postProcessLoaders();
 	}
 
 	async initEventBus() {
diff --git a/packages/cli/src/load-nodes-and-credentials.ts b/packages/cli/src/load-nodes-and-credentials.ts
index 0829e8ad845..6b59e5633e1 100644
--- a/packages/cli/src/load-nodes-and-credentials.ts
+++ b/packages/cli/src/load-nodes-and-credentials.ts
@@ -281,9 +281,13 @@ export class LoadNodesAndCredentials {
 		});
 	}
 
+	private shouldInjectContextEstablishmentHooks() {
+		return process.env.N8N_ENV_FEAT_CONTEXT_ESTABLISHMENT_HOOKS === 'true';
+	}
+
 	private injectContextEstablishmentHooks() {
 		// Check if the feature is enabled via environment variable
-		const isEnabled = process.env.N8N_ENV_FEAT_CONTEXT_ESTABLISHMENT_HOOKS === 'true';
+		const isEnabled = this.shouldInjectContextEstablishmentHooks();
 
 		if (!isEnabled) {
 			this.logger.debug('Context establishment hooks feature is disabled');
@@ -298,110 +302,115 @@ export class LoadNodesAndCredentials {
 			`Injecting context establishment hooks for ${triggerNodes.length} trigger nodes`,
 		);
 
-		triggerNodes.forEach((node: INodeTypeDescription) => {
-			const hooks = this.executionContextHookRegistry.getHookForTriggerType(node.name);
+		triggerNodes.forEach(this.augmentNodeTypeDescription);
+	}
 
-			if (hooks.length > 0) {
-				this.logger.debug(`Found ${hooks.length} hooks for trigger node: ${node.name}`);
-			}
+	private augmentNodeTypeDescription = (node: INodeTypeDescription) => {
+		const hooks = this.executionContextHookRegistry.getHookForTriggerType(node.name);
 
-			// Only inject hook properties if there are applicable hooks
-			if (hooks.length === 0) return;
+		if (hooks.length > 0) {
+			this.logger.debug(`Found ${hooks.length} hooks for trigger node: ${node.name}`);
+		}
 
-			// Create a fixedCollection with multipleValues for multiple hook selection
-			// Each hook becomes a separate item that can be added multiple times
-			const allHookValues: INodeProperties[] = [
-				{
-					displayName: 'Hook',
-					name: 'hookName',
-					type: 'options',
-					options: hooks.map((hook) => {
-						const displayName = hook.hookDescription.displayName ?? hook.hookDescription.name;
-						return {
-							name: displayName,
-							value: hook.hookDescription.name,
-							description: `Use ${displayName} hook`,
-						};
-					}),
-					// No default - force user to explicitly select a hook
-					// This ensures hookName is always serialized in the workflow JSON
-					default: '',
-					description: 'Select which context establishment hook to use',
-					required: true,
-				},
-				{
-					displayName: 'Allow Failure',
-					name: 'isAllowedToFail',
-					type: 'boolean',
-					default: false,
-					description: 'Whether to continue workflow execution if this hook fails',
-				},
-			];
+		// Only inject hook properties if there are applicable hooks
+		if (hooks.length === 0) return;
 
-			// Add all hook-specific options with display conditions
-			for (const hook of hooks) {
-				const hookOptions = hook.hookDescription.options ?? [];
-				if (hookOptions.length > 0) {
-					for (const hookOption of hookOptions) {
-						// Add display condition to show only when this specific hook is selected
-						const enhancedOption: INodeProperties = {
-							...hookOption,
-							displayOptions: {
-								...hookOption.displayOptions,
-								show: {
-									...hookOption.displayOptions?.show,
-									hookName: [hook.hookDescription.name],
-								},
+		// This prevents double-injection if the function is called multiple times on the same node
+		if (node.properties.some((p) => p.name === 'executionsHooksVersion')) return;
+
+		// Create a fixedCollection with multipleValues for multiple hook selection
+		// Each hook becomes a separate item that can be added multiple times
+		const allHookValues: INodeProperties[] = [
+			{
+				displayName: 'Hook',
+				name: 'hookName',
+				type: 'options',
+				options: hooks.map((hook) => {
+					const displayName = hook.hookDescription.displayName ?? hook.hookDescription.name;
+					return {
+						name: displayName,
+						value: hook.hookDescription.name,
+						description: `Use ${displayName} hook`,
+					};
+				}),
+				// No default - force user to explicitly select a hook
+				// This ensures hookName is always serialized in the workflow JSON
+				default: '',
+				description: 'Select which context establishment hook to use',
+				required: true,
+			},
+			{
+				displayName: 'Allow Failure',
+				name: 'isAllowedToFail',
+				type: 'boolean',
+				default: false,
+				description: 'Whether to continue workflow execution if this hook fails',
+			},
+		];
+
+		// Add all hook-specific options with display conditions
+		for (const hook of hooks) {
+			const hookOptions = hook.hookDescription.options ?? [];
+			if (hookOptions.length > 0) {
+				for (const hookOption of hookOptions) {
+					// Add display condition to show only when this specific hook is selected
+					const enhancedOption: INodeProperties = {
+						...hookOption,
+						displayOptions: {
+							...hookOption.displayOptions,
+							show: {
+								...hookOption.displayOptions?.show,
+								hookName: [hook.hookDescription.name],
 							},
-						};
-						allHookValues.push(enhancedOption);
-					}
+						},
+					};
+					allHookValues.push(enhancedOption);
 				}
 			}
+		}
 
-			// Create a hidden version property to track the hooks format version
-			const executionsHooksVersion: INodeProperties = {
-				displayName: 'Executions Hooks Version',
-				name: 'executionsHooksVersion',
-				type: 'hidden',
-				default: 1,
-			};
+		// Create a hidden version property to track the hooks format version
+		const executionsHooksVersion: INodeProperties = {
+			displayName: 'Executions Hooks Version',
+			name: 'executionsHooksVersion',
+			type: 'hidden',
+			default: 1,
+		};
 
-			// Create the main context establishment hooks property as a fixedCollection
-			const contextHooksProperty: INodeProperties = {
-				displayName: 'Context Establishment Hooks',
-				name: 'contextEstablishmentHooks',
-				type: 'fixedCollection',
-				placeholder: 'Add Hook',
-				default: {},
-				typeOptions: {
-					multipleValues: true,
+		// Create the main context establishment hooks property as a fixedCollection
+		const contextHooksProperty: INodeProperties = {
+			displayName: 'Context Establishment Hooks',
+			name: 'contextEstablishmentHooks',
+			type: 'fixedCollection',
+			placeholder: 'Add Hook',
+			default: {},
+			typeOptions: {
+				multipleValues: true,
+			},
+			options: [
+				{
+					name: 'hooks',
+					displayName: 'Hooks',
+					values: allHookValues,
 				},
-				options: [
-					{
-						name: 'hooks',
-						displayName: 'Hooks',
-						values: allHookValues,
-					},
-				],
-				description:
-					'Add and configure context establishment hooks to extract data from trigger items. <a href="https://docs.n8n.io/integrations/builtin/core-nodes/hooks/" target="_blank">Learn more</a>',
-			};
+			],
+			description:
+				'Add and configure context establishment hooks to extract data from trigger items. <a href="https://docs.n8n.io/integrations/builtin/core-nodes/hooks/" target="_blank">Learn more</a>',
+		};
 
-			// Create a notice that always appears after the hooks collection
-			const contextHooksNotice: INodeProperties = {
-				displayName:
-					'Context establishment hooks allow you to extract data from trigger items to use in subsequent nodes. <a href="https://docs.n8n.io/integrations/builtin/core-nodes/hooks/" target="_blank">Learn more</a>',
-				name: 'contextHooksNotice',
-				type: 'notice',
-				default: '',
-			};
+		// Create a notice that always appears after the hooks collection
+		const contextHooksNotice: INodeProperties = {
+			displayName:
+				'Context establishment hooks allow you to extract data from trigger items to use in subsequent nodes. <a href="https://docs.n8n.io/integrations/builtin/core-nodes/hooks/" target="_blank">Learn more</a>',
+			name: 'contextHooksNotice',
+			type: 'notice',
+			default: '',
+		};
 
-			node.properties.push(executionsHooksVersion);
-			node.properties.push(contextHooksProperty);
-			node.properties.push(contextHooksNotice);
-		});
-	}
+		node.properties.push(executionsHooksVersion);
+		node.properties.push(contextHooksProperty);
+		node.properties.push(contextHooksNotice);
+	};
 
 	/**
 	 * Run a loader of source files of nodes and credentials in a directory.
@@ -560,7 +569,14 @@ export class LoadNodesAndCredentials {
 		if (!loader) {
 			throw new UnrecognizedNodeTypeError(packageName, nodeType);
 		}
-		return loader.getNode(nodeType);
+		const loadedNode = loader.getNode(nodeType);
+		if (
+			this.shouldInjectContextEstablishmentHooks() &&
+			'properties' in loadedNode.type.description
+		) {
+			this.augmentNodeTypeDescription(loadedNode.type.description);
+		}
+		return loadedNode;
 	}
 
 	getCredential(credentialType: string): LoadedClass<ICredentialType> {
diff --git a/packages/cli/src/modules/dynamic-credentials.ee/context-establishment-hooks/__tests__/http-header-extractor.test.ts b/packages/cli/src/modules/dynamic-credentials.ee/context-establishment-hooks/__tests__/http-header-extractor.test.ts
new file mode 100644
index 00000000000..2ab03b5bd07
--- /dev/null
+++ b/packages/cli/src/modules/dynamic-credentials.ee/context-establishment-hooks/__tests__/http-header-extractor.test.ts
@@ -0,0 +1,367 @@
+import type { Logger } from '@n8n/backend-common';
+import type { ContextEstablishmentOptions } from '@n8n/decorators';
+import type { INodeExecutionData } from 'n8n-workflow';
+
+import { HttpHeaderExtractor } from '../http-header-extractor';
+
+describe('HttpHeaderExtractor', () => {
+	let extractor: HttpHeaderExtractor;
+	let mockLogger: jest.Mocked<Logger>;
+
+	// Factory functions for test data
+	const createTriggerItem = (headers?: Record<string, unknown>): INodeExecutionData => ({
+		json: { headers },
+		pairedItem: { item: 0 },
+	});
+
+	const createOptions = (
+		overrides?: Partial<ContextEstablishmentOptions>,
+	): ContextEstablishmentOptions =>
+		({
+			triggerItems: [createTriggerItem({ authorization: 'Bearer test-token-123' })],
+			options: {},
+			...overrides,
+		}) as ContextEstablishmentOptions;
+
+	beforeAll(() => {
+		mockLogger = {
+			debug: jest.fn(),
+			info: jest.fn(),
+			warn: jest.fn(),
+			error: jest.fn(),
+		} as unknown as jest.Mocked<Logger>;
+
+		extractor = new HttpHeaderExtractor(mockLogger);
+	});
+
+	beforeEach(() => {
+		jest.clearAllMocks();
+	});
+
+	describe('isApplicableToTriggerNode', () => {
+		it('returns true for n8n-nodes-base.webhook', () => {
+			expect(extractor.isApplicableToTriggerNode('n8n-nodes-base.webhook')).toBe(true);
+		});
+
+		it('returns true for shorthand webhook type', () => {
+			expect(extractor.isApplicableToTriggerNode('webhook')).toBe(true);
+		});
+
+		it.each([
+			'n8n-nodes-base.httpRequest',
+			'n8n-nodes-base.cron',
+			'',
+			'WEBHOOK',
+			'n8n-nodes-base.Webhook',
+		])('returns false for "%s"', (nodeType) => {
+			expect(extractor.isApplicableToTriggerNode(nodeType)).toBe(false);
+		});
+	});
+
+	describe('execute', () => {
+		describe('input validation', () => {
+			it('returns empty when triggerItems is undefined', async () => {
+				const result = await extractor.execute(createOptions({ triggerItems: undefined }));
+
+				expect(result).toEqual({});
+			});
+
+			it('returns empty when triggerItems is empty', async () => {
+				const result = await extractor.execute(createOptions({ triggerItems: [] }));
+
+				expect(result).toEqual({});
+			});
+
+			it('returns empty when options validation fails', async () => {
+				const result = await extractor.execute(
+					createOptions({
+						options: {
+							headerName: 123, // Invalid: should be string
+						},
+					}),
+				);
+
+				expect(result).toEqual({});
+				expect(mockLogger.error).toHaveBeenCalledWith(
+					'Invalid options for HttpHeaderExtractor hook.',
+					expect.objectContaining({ error: expect.anything() }),
+				);
+			});
+		});
+
+		describe('pattern safety', () => {
+			it.each([
+				['(a+)+', 'nested quantifier'],
+				['(a*)+', 'nested quantifier variant'],
+				['(a+)*', 'nested quantifier variant 2'],
+				['(a|a)+', 'overlapping alternation'],
+				['(foo|foo)*', 'overlapping alternation with words'],
+			])('rejects unsafe pattern "%s" (%s)', async (pattern) => {
+				const result = await extractor.execute(
+					createOptions({
+						options: { headerValue: pattern },
+					}),
+				);
+
+				expect(result).toEqual({});
+				expect(mockLogger.warn).toHaveBeenCalledWith('Potentially unsafe regex pattern rejected', {
+					pattern,
+				});
+			});
+
+			it.each([
+				'Bearer (.+)',
+				'[Bb][Ee][Aa][Rr][Ee][Rr]\\s+(.+)',
+				'^token-(.*)$',
+				'api_key=([^&]+)',
+			])('accepts safe pattern "%s"', async (pattern) => {
+				await extractor.execute(
+					createOptions({
+						triggerItems: [createTriggerItem({ authorization: 'Bearer abc123' })],
+						options: { headerValue: pattern },
+					}),
+				);
+
+				// Should not warn about unsafe pattern
+				expect(mockLogger.warn).not.toHaveBeenCalled();
+			});
+		});
+
+		describe('regex compilation', () => {
+			it('returns triggerItems with masked header for invalid regex syntax', async () => {
+				const result = await extractor.execute(
+					createOptions({
+						options: { headerValue: '[invalid' },
+					}),
+				);
+
+				expect(result.triggerItems).toBeDefined();
+				expect(result.triggerItems?.[0].json.headers).toEqual({
+					authorization: '**********',
+				});
+				expect(result.contextUpdate).toBeUndefined();
+				expect(mockLogger.error).toHaveBeenCalledWith(
+					'Invalid regex pattern',
+					expect.objectContaining({
+						pattern: '[invalid',
+						error: expect.anything(),
+					}),
+				);
+			});
+		});
+
+		describe('header extraction', () => {
+			it('returns empty when headers is missing', async () => {
+				const result = await extractor.execute(
+					createOptions({
+						triggerItems: [{ json: {}, pairedItem: { item: 0 } }],
+					}),
+				);
+
+				expect(result).toEqual({});
+			});
+
+			it('returns empty when headers is undefined', async () => {
+				const result = await extractor.execute(
+					createOptions({
+						triggerItems: [createTriggerItem(undefined)],
+					}),
+				);
+
+				expect(result).toEqual({});
+			});
+
+			it('returns empty when headers is not an object', async () => {
+				const result = await extractor.execute(
+					createOptions({
+						triggerItems: [{ json: { headers: 'not-an-object' }, pairedItem: { item: 0 } }],
+					}),
+				);
+
+				expect(result).toEqual({});
+			});
+
+			it('returns empty when headers is an array', async () => {
+				const result = await extractor.execute(
+					createOptions({
+						triggerItems: [{ json: { headers: ['item1', 'item2'] }, pairedItem: { item: 0 } }],
+					}),
+				);
+
+				expect(result).toEqual({});
+			});
+
+			it('returns empty when target header is not found', async () => {
+				const result = await extractor.execute(
+					createOptions({
+						triggerItems: [createTriggerItem({ 'x-custom-header': 'value' })],
+						options: { headerName: 'authorization' },
+					}),
+				);
+
+				expect(result).toEqual({});
+			});
+
+			it('returns empty when header value is not a string', async () => {
+				const result = await extractor.execute(
+					createOptions({
+						triggerItems: [createTriggerItem({ authorization: 12345 })],
+					}),
+				);
+
+				expect(result).toEqual({});
+			});
+
+			it('returns triggerItems with masked header when pattern does not match', async () => {
+				const result = await extractor.execute(
+					createOptions({
+						triggerItems: [createTriggerItem({ authorization: 'Basic dXNlcjpwYXNz' })],
+						options: { headerValue: 'Bearer (.+)' },
+					}),
+				);
+
+				expect(result.triggerItems).toBeDefined();
+				expect(result.triggerItems?.[0].json.headers).toEqual({
+					authorization: '**********',
+				});
+				expect(result.contextUpdate).toBeUndefined();
+			});
+
+			it('returns triggerItems with masked header when pattern has no capture group', async () => {
+				const result = await extractor.execute(
+					createOptions({
+						triggerItems: [createTriggerItem({ authorization: 'Bearer token123' })],
+						options: { headerValue: 'Bearer .+' }, // No capture group
+					}),
+				);
+
+				expect(result.triggerItems).toBeDefined();
+				expect(result.triggerItems?.[0].json.headers).toEqual({
+					authorization: '**********',
+				});
+				expect(result.contextUpdate).toBeUndefined();
+			});
+		});
+
+		describe('successful extraction', () => {
+			it('extracts Bearer token with default pattern', async () => {
+				const result = await extractor.execute(
+					createOptions({
+						triggerItems: [createTriggerItem({ authorization: 'Bearer my-jwt-token' })],
+					}),
+				);
+
+				expect(result.contextUpdate).toEqual({
+					credentials: {
+						version: 1,
+						identity: 'my-jwt-token',
+						metadata: { source: 'http-header', headerName: 'authorization' },
+					},
+				});
+				expect(result.triggerItems).toBeDefined();
+			});
+
+			it('handles case-insensitive Bearer with default pattern', async () => {
+				const result = await extractor.execute(
+					createOptions({
+						triggerItems: [createTriggerItem({ authorization: 'BEARER uppercase-token' })],
+					}),
+				);
+
+				expect(result.contextUpdate).toEqual({
+					credentials: {
+						version: 1,
+						identity: 'uppercase-token',
+						metadata: { source: 'http-header', headerName: 'authorization' },
+					},
+				});
+				expect(result.triggerItems).toBeDefined();
+			});
+
+			it('extracts from custom header with custom pattern', async () => {
+				const result = await extractor.execute(
+					createOptions({
+						triggerItems: [createTriggerItem({ 'x-api-key': 'key_abc123xyz' })],
+						options: {
+							headerName: 'x-api-key',
+							headerValue: 'key_(.+)',
+						},
+					}),
+				);
+
+				expect(result.contextUpdate).toEqual({
+					credentials: {
+						version: 1,
+						identity: 'abc123xyz',
+						metadata: { source: 'http-header', headerName: 'x-api-key' },
+					},
+				});
+				expect(result.triggerItems).toBeDefined();
+			});
+
+			it('normalizes header name to lowercase', async () => {
+				const result = await extractor.execute(
+					createOptions({
+						triggerItems: [createTriggerItem({ authorization: 'Bearer token123' })],
+						options: { headerName: 'AUTHORIZATION' },
+					}),
+				);
+
+				expect(result.contextUpdate).toEqual({
+					credentials: {
+						version: 1,
+						identity: 'token123',
+						metadata: { source: 'http-header', headerName: 'authorization' },
+					},
+				});
+				expect(result.triggerItems).toBeDefined();
+			});
+
+			it('masks the extracted header value in returned triggerItems', async () => {
+				const result = await extractor.execute(
+					createOptions({
+						triggerItems: [createTriggerItem({ authorization: 'Bearer secret-token' })],
+					}),
+				);
+
+				expect(result.triggerItems?.[0].json.headers).toEqual({
+					authorization: '**********',
+				});
+			});
+
+			it('truncates long header values before matching', async () => {
+				// Create a header value longer than MAX_HEADER_LENGTH (8192)
+				const longToken = 'x'.repeat(10000);
+				const headerValue = `Bearer ${longToken}`;
+
+				const result = await extractor.execute(
+					createOptions({
+						triggerItems: [createTriggerItem({ authorization: headerValue })],
+						options: { headerValue: 'Bearer (.+)' },
+					}),
+				);
+
+				// Should match but token should be truncated
+				expect(result.contextUpdate?.credentials?.identity).toBeDefined();
+				// The extracted value should be less than original due to truncation
+				// 8192 - 7 (length of "Bearer ") = 8185 max for token
+				expect((result.contextUpdate?.credentials?.identity as string).length).toBeLessThanOrEqual(
+					8185,
+				);
+			});
+
+			it('uses first trigger item when multiple provided', async () => {
+				const result = await extractor.execute(
+					createOptions({
+						triggerItems: [
+							createTriggerItem({ authorization: 'Bearer first-token' }),
+							createTriggerItem({ authorization: 'Bearer second-token' }),
+						],
+					}),
+				);
+
+				expect(result.contextUpdate?.credentials?.identity).toBe('first-token');
+			});
+		});
+	});
+});
diff --git a/packages/cli/src/modules/dynamic-credentials.ee/context-establishment-hooks/http-header-extractor.ts b/packages/cli/src/modules/dynamic-credentials.ee/context-establishment-hooks/http-header-extractor.ts
new file mode 100644
index 00000000000..514847f8171
--- /dev/null
+++ b/packages/cli/src/modules/dynamic-credentials.ee/context-establishment-hooks/http-header-extractor.ts
@@ -0,0 +1,171 @@
+import { Logger } from '@n8n/backend-common';
+import {
+	ContextEstablishmentHook,
+	ContextEstablishmentOptions,
+	ContextEstablishmentResult,
+	HookDescription,
+	IContextEstablishmentHook,
+} from '@n8n/decorators';
+import { createContext, Script } from 'node:vm';
+import { z } from 'zod';
+
+const HttpHeaderExtractorOptionsSchema = z.object({
+	headerName: z.string().default('authorization'),
+	headerValue: z.string().default('[Bb][Ee][Aa][Rr][Ee][Rr]\\s+(.+)'),
+});
+
+const MAX_HEADER_LENGTH = 8192; // 8KB - reasonable limit for auth headers
+const REGEX_TIMEOUT_MS = 100; // 100ms timeout for regex execution
+
+/**
+ * Detects potentially dangerous regex patterns that could cause ReDoS.
+ * This is a heuristic check - it catches common dangerous patterns but is not comprehensive.
+ */
+function isUnsafeRegexPattern(pattern: string): boolean {
+	// Detect nested quantifiers: (a+)+, (a*)+, (a+)*, etc.
+	const nestedQuantifier = /([+*?{]|\{\d+,?\d*\})\s*[)]\s*[+*?{]/;
+	// Detect overlapping alternation with quantifier: (a|a)+
+	const overlappingAlt = /\([^)]*\|[^)]*\)[+*]/;
+	return nestedQuantifier.test(pattern) || overlappingAlt.test(pattern);
+}
+
+function isHeaderObject(obj: unknown): obj is Record<string, unknown> {
+	return obj !== null && obj !== undefined && typeof obj === 'object' && !Array.isArray(obj);
+}
+
+// Reusable VM context and pre-compiled script for safe regex execution
+// This avoids memory overhead of creating new contexts per call
+const regexContext = createContext({
+	RegExp,
+	pattern: '',
+	input: '',
+	result: null as RegExpExecArray | null,
+});
+const regexScript = new Script('result = new RegExp(pattern).exec(input)');
+
+/**
+ * Executes a regex with a timeout to prevent ReDoS attacks.
+ * Uses a reusable VM context to minimize memory overhead.
+ *
+ * @returns The match result, or null if no match or timeout occurred
+ * @throws Error if the pattern is invalid
+ */
+function safeRegexExec(
+	pattern: string,
+	input: string,
+	timeoutMs = REGEX_TIMEOUT_MS,
+): RegExpExecArray | null {
+	regexContext.pattern = pattern;
+	regexContext.input = input;
+	regexContext.result = null;
+
+	try {
+		regexScript.runInContext(regexContext, { timeout: timeoutMs });
+		return regexContext.result as RegExpExecArray | null;
+	} catch (error) {
+		if ((error as NodeJS.ErrnoException).code === 'ERR_SCRIPT_EXECUTION_TIMEOUT') {
+			return null;
+		}
+		throw error;
+	}
+}
+
+@ContextEstablishmentHook()
+export class HttpHeaderExtractor implements IContextEstablishmentHook {
+	constructor(private readonly logger: Logger) {}
+
+	hookDescription: HookDescription = {
+		name: 'HttpHeaderExtractor',
+		displayName: 'HTTP Header Extractor',
+		options: [
+			{
+				name: 'headerName',
+				displayName: 'Header Name',
+				type: 'string',
+				default: 'authorization',
+				description: 'The name of the HTTP header to extract the value from.',
+			},
+			{
+				name: 'headerValue',
+				displayName: 'Header Value Pattern',
+				type: 'string',
+				default: '[Bb][Ee][Aa][Rr][Ee][Rr]\\s+(.+)',
+				description:
+					'A regular expression pattern to extract the identity from the header value. Use a capturing group to specify the identity part.',
+			},
+		],
+	};
+
+	isApplicableToTriggerNode(nodeType: string): boolean {
+		return nodeType === 'n8n-nodes-base.webhook' || nodeType === 'webhook';
+	}
+
+	async execute(options: ContextEstablishmentOptions): Promise<ContextEstablishmentResult> {
+		if (!options.triggerItems || options.triggerItems.length === 0) {
+			this.logger.debug('No trigger items found, skipping HttpHeaderExtractor hook.');
+			return {};
+		}
+
+		const httpHeaderOptions = await HttpHeaderExtractorOptionsSchema.safeParseAsync(
+			options.options ?? {},
+		);
+
+		if (httpHeaderOptions.error) {
+			this.logger.error('Invalid options for HttpHeaderExtractor hook.', {
+				error: httpHeaderOptions.error,
+			});
+			return {};
+		}
+
+		const normalizedHeaderName = httpHeaderOptions.data.headerName.toLowerCase();
+		const pattern = httpHeaderOptions.data.headerValue;
+
+		// Validate pattern safety to prevent ReDoS (defense in depth)
+		if (isUnsafeRegexPattern(pattern)) {
+			this.logger.warn('Potentially unsafe regex pattern rejected', { pattern });
+			return {};
+		}
+
+		const [triggerItem] = options.triggerItems;
+		const headers = triggerItem.json['headers'];
+
+		if (isHeaderObject(headers) && normalizedHeaderName in headers) {
+			const headerValue = headers[normalizedHeaderName];
+
+			if (typeof headerValue === 'string') {
+				headers[normalizedHeaderName] = '**********'; // Mask the header value in the trigger item
+
+				// Limit input length to mitigate ReDoS on long inputs
+				const truncatedValue = headerValue.slice(0, MAX_HEADER_LENGTH);
+
+				try {
+					const match = safeRegexExec(pattern, truncatedValue);
+
+					if (match?.[1]) {
+						return {
+							triggerItems: options.triggerItems,
+							contextUpdate: {
+								credentials: {
+									version: 1,
+									identity: match[1],
+									metadata: { source: 'http-header', headerName: normalizedHeaderName },
+								},
+							},
+						};
+					} else {
+						return {
+							triggerItems: options.triggerItems,
+						};
+					}
+				} catch (error) {
+					this.logger.error('Invalid regex pattern', { pattern, error });
+					return {
+						triggerItems: options.triggerItems,
+					};
+				}
+			}
+		}
+
+		return {};
+	}
+}
diff --git a/packages/cli/src/modules/dynamic-credentials.ee/context-establishment-hooks/index.ts b/packages/cli/src/modules/dynamic-credentials.ee/context-establishment-hooks/index.ts
new file mode 100644
index 00000000000..9988fb21e4b
--- /dev/null
+++ b/packages/cli/src/modules/dynamic-credentials.ee/context-establishment-hooks/index.ts
@@ -0,0 +1 @@
+import './http-header-extractor';
diff --git a/packages/cli/src/modules/dynamic-credentials.ee/dynamic-credentials.module.ts b/packages/cli/src/modules/dynamic-credentials.ee/dynamic-credentials.module.ts
new file mode 100644
index 00000000000..e22fae642ac
--- /dev/null
+++ b/packages/cli/src/modules/dynamic-credentials.ee/dynamic-credentials.module.ts
@@ -0,0 +1,12 @@
+import type { ModuleInterface } from '@n8n/decorators';
+import { BackendModule, OnShutdown } from '@n8n/decorators';
+
+@BackendModule({ name: 'dynamic-credentials', licenseFlag: 'feat:externalSecrets' })
+export class DynamicCredentialsModule implements ModuleInterface {
+	async init() {
+		await import('./context-establishment-hooks');
+	}
+
+	@OnShutdown()
+	async shutdown() {}
+}
diff --git a/packages/core/src/execution-engine/__tests__/execution-context.service.test.ts b/packages/core/src/execution-engine/__tests__/execution-context.service.test.ts
index 16d7725f2e8..69f0643d70d 100644
--- a/packages/core/src/execution-engine/__tests__/execution-context.service.test.ts
+++ b/packages/core/src/execution-engine/__tests__/execution-context.service.test.ts
@@ -297,8 +297,7 @@ describe('ExecutionContextService', () => {
 			});
 
 			toExecutionContextEstablishmentHookParameter.mockReturnValue({
-				success: true,
-				data: hookConfig,
+				data: { contextEstablishmentHooks: hookConfig },
 			});
 
 			mockRegistry.getHookByName.mockImplementation((name: string) => {
@@ -362,8 +361,7 @@ describe('ExecutionContextService', () => {
 			});
 
 			toExecutionContextEstablishmentHookParameter.mockReturnValue({
-				success: true,
-				data: hookConfig,
+				data: { contextEstablishmentHooks: hookConfig },
 			});
 			mockRegistry.getHookByName.mockReturnValue(mockHook);
 			mockCipher.decrypt.mockReturnValue('{}');
@@ -398,8 +396,7 @@ describe('ExecutionContextService', () => {
 			mockHook2.execute.mockResolvedValue({ triggerItems: item3 });
 
 			toExecutionContextEstablishmentHookParameter.mockReturnValue({
-				success: true,
-				data: hookConfig,
+				data: { contextEstablishmentHooks: hookConfig },
 			});
 
 			mockRegistry.getHookByName.mockImplementation((name: string) => {
@@ -433,8 +430,7 @@ describe('ExecutionContextService', () => {
 			const startItem = createMockStartItem(hookConfig);
 
 			toExecutionContextEstablishmentHookParameter.mockReturnValue({
-				success: true,
-				data: hookConfig,
+				data: { contextEstablishmentHooks: hookConfig },
 			});
 			mockRegistry.getHookByName.mockReturnValue(undefined);
 			mockCipher.decrypt.mockReturnValue('{}');
@@ -472,8 +468,7 @@ describe('ExecutionContextService', () => {
 			});
 
 			toExecutionContextEstablishmentHookParameter.mockReturnValue({
-				success: true,
-				data: hookConfig,
+				data: { contextEstablishmentHooks: hookConfig },
 			});
 
 			mockRegistry.getHookByName.mockImplementation((name: string) => {
@@ -514,8 +509,7 @@ describe('ExecutionContextService', () => {
 			mockHook.execute.mockRejectedValue(hookError);
 
 			toExecutionContextEstablishmentHookParameter.mockReturnValue({
-				success: true,
-				data: hookConfig,
+				data: { contextEstablishmentHooks: hookConfig },
 			});
 			mockRegistry.getHookByName.mockReturnValue(mockHook);
 			mockCipher.decrypt.mockReturnValue('{}');
@@ -551,8 +545,7 @@ describe('ExecutionContextService', () => {
 			mockHook.execute.mockResolvedValue({});
 
 			toExecutionContextEstablishmentHookParameter.mockReturnValue({
-				success: true,
-				data: hookConfig,
+				data: { contextEstablishmentHooks: hookConfig },
 			});
 			mockRegistry.getHookByName.mockReturnValue(mockHook);
 			mockCipher.decrypt.mockReturnValue('{"version":1,"identity":"decrypted"}');
diff --git a/packages/core/src/execution-engine/execution-context-hook-registry.service.ts b/packages/core/src/execution-engine/execution-context-hook-registry.service.ts
index d79f2e74d9e..89901f9bb9a 100644
--- a/packages/core/src/execution-engine/execution-context-hook-registry.service.ts
+++ b/packages/core/src/execution-engine/execution-context-hook-registry.service.ts
@@ -97,8 +97,8 @@ export class ExecutionContextHookRegistry {
 	 * @returns Array of applicable hooks (may be empty)
 	 */
 	getHookForTriggerType(triggerType: string): IContextEstablishmentHook[] {
-		return Array.from(this.hookMap.values()).filter((hook) =>
-			hook.isApplicableToTriggerNode(triggerType),
-		);
+		return Array.from(this.hookMap.values()).filter((hook) => {
+			return hook.isApplicableToTriggerNode(triggerType);
+		});
 	}
 }
diff --git a/packages/core/src/execution-engine/execution-context.service.ts b/packages/core/src/execution-engine/execution-context.service.ts
index 798460eeab2..b8f9370c992 100644
--- a/packages/core/src/execution-engine/execution-context.service.ts
+++ b/packages/core/src/execution-engine/execution-context.service.ts
@@ -68,7 +68,10 @@ export class ExecutionContextService {
 
 		let currentTriggerItems = startItem.data['main'][0];
 
-		const contextEstablishmentHookParameters = startItem.node.parameters?.contextEstablishmentHooks;
+		const contextEstablishmentHookParameters = {
+			...(workflow.getNode(startItem.node.name)?.parameters ?? {}),
+			...startItem.node.parameters,
+		};
 
 		const startNodeParametersResult = toExecutionContextEstablishmentHookParameter(
 			contextEstablishmentHookParameters,
@@ -97,7 +100,7 @@ export class ExecutionContextService {
 
 		// based on startNodeParameters, startNodeType and currentTriggerItems we can now
 		// iterate over the different hooks to extract specific data for the runtime context
-		for (const hookParameters of startNodeParameters.hooks) {
+		for (const hookParameters of startNodeParameters.contextEstablishmentHooks.hooks) {
 			const hook = this.executionContextHookRegistry.getHookByName(hookParameters.hookName);
 
 			if (!hook) {
diff --git a/packages/core/src/execution-engine/execution-context.ts b/packages/core/src/execution-engine/execution-context.ts
index 1af786c74b4..b312af8e1fc 100644
--- a/packages/core/src/execution-engine/execution-context.ts
+++ b/packages/core/src/execution-engine/execution-context.ts
@@ -1,3 +1,4 @@
+import { Logger } from '@n8n/backend-common';
 import { Container } from '@n8n/di';
 import {
 	type IWorkflowExecuteAdditionalData,
@@ -175,16 +176,22 @@ export const establishExecutionContext = async (
 	// Call the execution context service to augment the context with any hook-based data
 	const executionContextService = Container.get(ExecutionContextService);
 
-	const { context, triggerItems } = await executionContextService.augmentExecutionContextWithHooks(
-		workflow,
-		startItem,
-		executionData.runtimeData,
-	);
+	try {
+		const { context, triggerItems } =
+			await executionContextService.augmentExecutionContextWithHooks(
+				workflow,
+				startItem,
+				executionData.runtimeData,
+			);
 
-	executionData.runtimeData = context;
+		executionData.runtimeData = context;
 
-	// If the trigger items were modified by hooks, update the start item accordingly
-	if (triggerItems) {
-		startItem.data['main'][0] = triggerItems;
+		// If the trigger items were modified by hooks, update the start item accordingly
+		if (triggerItems) {
+			startItem.data['main'][0] = triggerItems;
+		}
+	} catch (error) {
+		// Log the error but proceed with the established context
+		Container.get(Logger).error('Failed to augment execution context with hooks.', { error });
 	}
 };
diff --git a/packages/workflow/src/execution-context-establishment-hooks.ts b/packages/workflow/src/execution-context-establishment-hooks.ts
index 9bac107004c..c19175b4dd0 100644
--- a/packages/workflow/src/execution-context-establishment-hooks.ts
+++ b/packages/workflow/src/execution-context-establishment-hooks.ts
@@ -2,14 +2,16 @@ import z from 'zod/v4';
 
 const ExecutionContextEstablishmentHookParameterSchemaV1 = z.object({
 	executionsHooksVersion: z.literal(1),
-	hooks: z.array(
-		z
-			.object({
-				hookName: z.string(),
-				isAllowedToFail: z.boolean().optional().default(false),
-			})
-			.loose(),
-	),
+	contextEstablishmentHooks: z.object({
+		hooks: z.array(
+			z
+				.object({
+					hookName: z.string(),
+					isAllowedToFail: z.boolean().optional().default(false),
+				})
+				.loose(),
+		),
+	}),
 });
 
 export type ExecutionContextEstablishmentHookParameterV1 = z.output<
@@ -17,7 +19,7 @@ export type ExecutionContextEstablishmentHookParameterV1 = z.output<
 >;
 
 export const ExecutionContextEstablishmentHookParameterSchema = z
-	.discriminatedUnion('contextEstablishmentHooks.executionsHooksVersion', [
+	.discriminatedUnion('executionsHooksVersion', [
 		ExecutionContextEstablishmentHookParameterSchemaV1,
 	])
 	.meta({
@@ -37,5 +39,9 @@ export const toExecutionContextEstablishmentHookParameter = (value: unknown) =>
 	if (value === null || value === undefined || typeof value !== 'object') {
 		return null;
 	}
+	// Quick check to avoid unnecessary parsing attempts
+	if (!('executionsHooksVersion' in value)) {
+		return null;
+	}
 	return ExecutionContextEstablishmentHookParameterSchema.safeParse(value);
 };

From 0e0410c97a320fcf05fbbc19ae49711ad0dafb6b Mon Sep 17 00:00:00 2001
From: Guillaume Jacquart <jacquart.guillaume@gmail.com>
Date: Tue, 2 Dec 2025 09:43:10 +0100
Subject: [PATCH 005/167] fix(core): Move subworfklow binary duplication to
 workflowExecuteAfter before execution cleaning (#22390)

---
 .../execution-lifecycle-hooks.test.ts         | 85 +++++++++++++++++++
 .../execution-lifecycle-hooks.ts              | 47 +++++++++-
 .../src/workflow-execute-additional-data.ts   |  1 +
 .../__tests__/shared-tests.ts                 |  9 +-
 .../base-execute-context.ts                   | 12 +--
 5 files changed, 133 insertions(+), 21 deletions(-)

diff --git a/packages/cli/src/execution-lifecycle/__tests__/execution-lifecycle-hooks.test.ts b/packages/cli/src/execution-lifecycle/__tests__/execution-lifecycle-hooks.test.ts
index a7e07778a3e..472c6b806aa 100644
--- a/packages/cli/src/execution-lifecycle/__tests__/execution-lifecycle-hooks.test.ts
+++ b/packages/cli/src/execution-lifecycle/__tests__/execution-lifecycle-hooks.test.ts
@@ -858,5 +858,90 @@ describe('Execution Lifecycle Hooks', () => {
 			expect(handlers.sendResponse).toHaveLength(0);
 			expect(handlers.sendChunk).toHaveLength(0);
 		});
+
+		describe('when parentExecution is provided', () => {
+			const parentWorkflowId = 'parent-workflow-id';
+			const parentExecutionId = 'parent-execution-id';
+			const parentExecution = {
+				workflowId: parentWorkflowId,
+				executionId: parentExecutionId,
+			};
+
+			beforeEach(() => {
+				lifecycleHooks = getLifecycleHooksForSubExecutions(
+					'integrated',
+					executionId,
+					workflowData,
+					undefined,
+					parentExecution,
+				);
+			});
+
+			it('should duplicate binary data to parent execution', async () => {
+				const binaryDataId = `filesystem:workflows/${workflowId}/executions/${executionId}/binary_data/123`;
+				const duplicatedBinaryDataId = `filesystem:workflows/${parentWorkflowId}/executions/${parentExecutionId}/binary_data/456`;
+
+				const mainOutputData = [
+					[
+						{
+							json: {},
+							binary: {
+								data: {
+									id: binaryDataId,
+									data: '',
+									mimeType: 'text/plain',
+								},
+							},
+						},
+					],
+				];
+
+				successfulRun.data.resultData.runData = {
+					[nodeName]: [
+						{
+							startTime: 1,
+							executionIndex: 0,
+							executionTime: 1,
+							source: [],
+							data: {
+								main: mainOutputData,
+							},
+						},
+					],
+				};
+				successfulRun.data.resultData.lastNodeExecuted = nodeName;
+
+				binaryDataService.duplicateBinaryData.mockResolvedValue([
+					[
+						{
+							json: {},
+							binary: {
+								data: {
+									id: duplicatedBinaryDataId,
+									data: '',
+									mimeType: 'text/plain',
+								},
+							},
+						},
+					],
+				]);
+
+				await lifecycleHooks.runHook('workflowExecuteAfter', [successfulRun, {}]);
+
+				expect(binaryDataService.duplicateBinaryData).toHaveBeenCalledWith(
+					{ type: 'execution', workflowId: parentWorkflowId, executionId: parentExecutionId },
+					mainOutputData,
+				);
+			});
+
+			it('should not duplicate binary data when there is no output data', async () => {
+				successfulRun.data.resultData.runData = {};
+				successfulRun.data.resultData.lastNodeExecuted = undefined;
+
+				await lifecycleHooks.runHook('workflowExecuteAfter', [successfulRun, {}]);
+
+				expect(binaryDataService.duplicateBinaryData).not.toHaveBeenCalled();
+			});
+		});
 	});
 });
diff --git a/packages/cli/src/execution-lifecycle/execution-lifecycle-hooks.ts b/packages/cli/src/execution-lifecycle/execution-lifecycle-hooks.ts
index f9bedcecbd1..b166ab9521a 100644
--- a/packages/cli/src/execution-lifecycle/execution-lifecycle-hooks.ts
+++ b/packages/cli/src/execution-lifecycle/execution-lifecycle-hooks.ts
@@ -3,9 +3,17 @@ import { ExecutionRepository } from '@n8n/db';
 import { LifecycleMetadata } from '@n8n/decorators';
 import { Container, Service } from '@n8n/di';
 import { stringify } from 'flatted';
-import { ErrorReporter, InstanceSettings, ExecutionLifecycleHooks } from 'n8n-core';
+import {
+	BinaryDataService,
+	ErrorReporter,
+	FileLocation,
+	InstanceSettings,
+	ExecutionLifecycleHooks,
+} from 'n8n-core';
 import type {
+	IRun,
 	IWorkflowBase,
+	RelatedExecution,
 	WorkflowExecuteMode,
 	IWorkflowExecutionDataProcess,
 } from 'n8n-workflow';
@@ -28,6 +36,7 @@ import {
 } from './shared/shared-hook-functions';
 import { type ExecutionSaveSettings, toSaveSettings } from './to-save-settings';
 import { getItemCountByConnectionType } from '@/utils/get-item-count-by-connection-type';
+import { getDataLastExecutedNodeData } from '@/workflow-helpers';
 
 @Service()
 class ModulesHooksRegistry {
@@ -99,6 +108,7 @@ type HooksSetupParameters = {
 	saveSettings: ExecutionSaveSettings;
 	pushRef?: string;
 	retryOf?: string;
+	parentExecution?: RelatedExecution;
 };
 
 function hookFunctionsWorkflowEvents(hooks: ExecutionLifecycleHooks, userId?: string) {
@@ -305,16 +315,39 @@ function hookFunctionsStatistics(hooks: ExecutionLifecycleHooks) {
 	});
 }
 
+/**
+ * Duplicates binary data from a subworkflow execution to the parent execution.
+ * This ensures the parent can access the binary data after the subworkflow
+ * execution is cleaned up. The duplicateBinaryData method also updates
+ * the binary data IDs in the data to point to the new location.
+ */
+async function duplicateBinaryDataToParent(
+	fullRunData: IRun,
+	parentExecution: RelatedExecution,
+	binaryDataService: BinaryDataService,
+) {
+	const outputData = getDataLastExecutedNodeData(fullRunData);
+	if (outputData?.data?.main) {
+		const duplicatedData = await binaryDataService.duplicateBinaryData(
+			FileLocation.ofExecution(parentExecution.workflowId, parentExecution.executionId),
+			outputData.data.main,
+		);
+		// Update the run data with the new binary data IDs
+		outputData.data.main = duplicatedData;
+	}
+}
+
 /**
  * Returns hook functions to save workflow execution and call error workflow
  */
 function hookFunctionsSave(
 	hooks: ExecutionLifecycleHooks,
-	{ pushRef, retryOf, saveSettings }: HooksSetupParameters,
+	{ pushRef, retryOf, saveSettings, parentExecution }: HooksSetupParameters,
 ) {
 	const logger = Container.get(Logger);
 	const errorReporter = Container.get(ErrorReporter);
 	const executionRepository = Container.get(ExecutionRepository);
+	const binaryDataService = Container.get(BinaryDataService);
 	const workflowStaticDataService = Container.get(WorkflowStaticDataService);
 	const workflowStatisticsService = Container.get(WorkflowStatisticsService);
 	hooks.addHandler('workflowExecuteAfter', async function (fullRunData, newStaticData) {
@@ -325,6 +358,13 @@ function hookFunctionsSave(
 
 		await restoreBinaryDataId(fullRunData, this.executionId, this.mode);
 
+		// If this is a subworkflow execution, duplicate binary data to the parent's
+		// execution. This must happen before any potential deletion of this execution's
+		// data, and updates the binary data IDs in fullRunData to point to the parent location.
+		if (parentExecution) {
+			await duplicateBinaryDataToParent(fullRunData, parentExecution, binaryDataService);
+		}
+
 		const isManualMode = this.mode === 'manual';
 
 		try {
@@ -481,13 +521,14 @@ export function getLifecycleHooksForSubExecutions(
 	executionId: string,
 	workflowData: IWorkflowBase,
 	userId?: string,
+	parentExecution?: RelatedExecution,
 ): ExecutionLifecycleHooks {
 	const hooks = new ExecutionLifecycleHooks(mode, executionId, workflowData);
 	const saveSettings = toSaveSettings(workflowData.settings);
 	hookFunctionsWorkflowEvents(hooks, userId);
 	hookFunctionsNodeEvents(hooks);
 	hookFunctionsFinalizeExecutionStatus(hooks);
-	hookFunctionsSave(hooks, { saveSettings });
+	hookFunctionsSave(hooks, { saveSettings, parentExecution });
 	hookFunctionsSaveProgress(hooks, { saveSettings });
 	hookFunctionsStatistics(hooks);
 	hookFunctionsExternalHooks(hooks);
diff --git a/packages/cli/src/workflow-execute-additional-data.ts b/packages/cli/src/workflow-execute-additional-data.ts
index 7ed962e80fb..cd10da159c5 100644
--- a/packages/cli/src/workflow-execute-additional-data.ts
+++ b/packages/cli/src/workflow-execute-additional-data.ts
@@ -230,6 +230,7 @@ async function startExecution(
 			executionId,
 			workflowData,
 			additionalData.userId,
+			options.parentExecution,
 		);
 		additionalDataIntegrated.executionId = executionId;
 		additionalDataIntegrated.parentCallbackManager = options.parentCallbackManager;
diff --git a/packages/core/src/execution-engine/node-execution-context/__tests__/shared-tests.ts b/packages/core/src/execution-engine/node-execution-context/__tests__/shared-tests.ts
index 3692d3fd257..f5d8bf9921b 100644
--- a/packages/core/src/execution-engine/node-execution-context/__tests__/shared-tests.ts
+++ b/packages/core/src/execution-engine/node-execution-context/__tests__/shared-tests.ts
@@ -269,7 +269,7 @@ export const describeCommonTests = (
 
 	describe('executeWorkflow', () => {
 		const data = [[{ json: { test: true } }]];
-		const executeWorkflowData = mock<ExecuteWorkflowData>();
+		const executeWorkflowData = mock<ExecuteWorkflowData>({ data });
 		const workflowInfo = mock<IExecuteWorkflowInfo>();
 		const parentExecution: RelatedExecution = {
 			executionId: 'parent_execution_id',
@@ -278,23 +278,18 @@ export const describeCommonTests = (
 
 		it('should execute workflow and return data', async () => {
 			additionalData.executeWorkflow.mockResolvedValue(executeWorkflowData);
-			binaryDataService.duplicateBinaryData.mockResolvedValue(data);
 
 			const result = await context.executeWorkflow(workflowInfo, undefined, undefined, {
 				parentExecution,
 			});
 
 			expect(result.data).toEqual(data);
-			expect(binaryDataService.duplicateBinaryData).toHaveBeenCalledWith(
-				{ type: 'execution', workflowId: workflow.id, executionId: additionalData.executionId },
-				executeWorkflowData.data,
-			);
+			expect(result).toBe(executeWorkflowData);
 		});
 
 		it('should put execution to wait if waitTill is returned', async () => {
 			const waitTill = new Date();
 			additionalData.executeWorkflow.mockResolvedValue({ ...executeWorkflowData, waitTill });
-			binaryDataService.duplicateBinaryData.mockResolvedValue(data);
 
 			const result = await context.executeWorkflow(workflowInfo, undefined, undefined, {
 				parentExecution,
diff --git a/packages/core/src/execution-engine/node-execution-context/base-execute-context.ts b/packages/core/src/execution-engine/node-execution-context/base-execute-context.ts
index 63b58815885..e7feebf6895 100644
--- a/packages/core/src/execution-engine/node-execution-context/base-execute-context.ts
+++ b/packages/core/src/execution-engine/node-execution-context/base-execute-context.ts
@@ -1,4 +1,3 @@
-import { Container } from '@n8n/di';
 import get from 'lodash/get';
 import type {
 	Workflow,
@@ -33,14 +32,9 @@ import {
 	createEnvProviderState,
 } from 'n8n-workflow';
 
-import { BinaryDataService } from '@/binary-data/binary-data.service';
-import { FileLocation } from '@/binary-data/utils';
-
 import { NodeExecutionContext } from './node-execution-context';
 
 export class BaseExecuteContext extends NodeExecutionContext {
-	protected readonly binaryDataService = Container.get(BinaryDataService);
-
 	constructor(
 		workflow: Workflow,
 		node: INode,
@@ -155,11 +149,7 @@ export class BaseExecuteContext extends NodeExecutionContext {
 			await this.putExecutionToWait(WAIT_INDEFINITELY);
 		}
 
-		const data = await this.binaryDataService.duplicateBinaryData(
-			FileLocation.ofExecution(this.workflow.id, this.additionalData.executionId!),
-			result.data,
-		);
-		return { ...result, data };
+		return result;
 	}
 
 	async getExecutionDataById(executionId: string): Promise<IRunExecutionData | undefined> {

From f482809f916aa45b7bb4623faab5cdb0e60d258c Mon Sep 17 00:00:00 2001
From: Benjamin Schroth <68321970+schrothbn@users.noreply.github.com>
Date: Tue, 2 Dec 2025 10:01:42 +0100
Subject: [PATCH 006/167] fix(editor): Align execute button in modal when
 executing tools (#22588)

---
 .../app/components/FromAiParametersModal.vue    | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/packages/frontend/editor-ui/src/app/components/FromAiParametersModal.vue b/packages/frontend/editor-ui/src/app/components/FromAiParametersModal.vue
index 6979fd04967..a724eee0203 100644
--- a/packages/frontend/editor-ui/src/app/components/FromAiParametersModal.vue
+++ b/packages/frontend/editor-ui/src/app/components/FromAiParametersModal.vue
@@ -328,16 +328,13 @@ const onUpdate = (change: FormFieldValueUpdate) => {
 			</ElCol>
 		</template>
 		<template v-if="!error" #footer>
-			<ElRow justify="end">
-				<ElCol :span="5" :offset="19">
-					<N8nButton
-						data-test-id="execute-workflow-button"
-						icon="flask-conical"
-						:label="i18n.baseText('fromAiParametersModal.execute')"
-						@click="onExecute"
-					/>
-				</ElCol>
-			</ElRow>
+			<N8nButton
+				data-test-id="execute-workflow-button"
+				icon="flask-conical"
+				:label="i18n.baseText('fromAiParametersModal.execute')"
+				float="right"
+				@click="onExecute"
+			/>
 		</template>
 	</Modal>
 </template>

From 2f7a979fe42f7b1b1ee2587d2ede0bb5e3f302cd Mon Sep 17 00:00:00 2001
From: Andreas Fitzek <andreas.fitzek@n8n.io>
Date: Tue, 2 Dec 2025 10:22:47 +0100
Subject: [PATCH 007/167] chore(core): Credential resolver interface and
 decorator (#22584)

---
 .../__tests__/credential-resolver.test.ts     | 344 ++++++++++++++++++
 .../credential-resolver-metadata.ts           |  52 +++
 .../credential-resolver.ts                    |  88 +++++
 .../src/credential-resolver/errors.ts         |  31 ++
 .../src/credential-resolver/index.ts          |  13 +
 packages/@n8n/decorators/src/index.ts         |   1 +
 6 files changed, 529 insertions(+)
 create mode 100644 packages/@n8n/decorators/src/credential-resolver/__tests__/credential-resolver.test.ts
 create mode 100644 packages/@n8n/decorators/src/credential-resolver/credential-resolver-metadata.ts
 create mode 100644 packages/@n8n/decorators/src/credential-resolver/credential-resolver.ts
 create mode 100644 packages/@n8n/decorators/src/credential-resolver/errors.ts
 create mode 100644 packages/@n8n/decorators/src/credential-resolver/index.ts

diff --git a/packages/@n8n/decorators/src/credential-resolver/__tests__/credential-resolver.test.ts b/packages/@n8n/decorators/src/credential-resolver/__tests__/credential-resolver.test.ts
new file mode 100644
index 00000000000..e876e945513
--- /dev/null
+++ b/packages/@n8n/decorators/src/credential-resolver/__tests__/credential-resolver.test.ts
@@ -0,0 +1,344 @@
+import { Container } from '@n8n/di';
+import type { ICredentialContext, ICredentialDataDecryptedObject } from 'n8n-workflow';
+
+import type { CredentialResolverConfiguration, ICredentialResolver } from '../credential-resolver';
+import {
+	CredentialResolver,
+	CredentialResolverEntryMetadata,
+} from '../credential-resolver-metadata';
+
+describe('@CredentialResolver decorator', () => {
+	let resolverMetadata: CredentialResolverEntryMetadata;
+
+	beforeEach(() => {
+		jest.resetAllMocks();
+
+		resolverMetadata = new CredentialResolverEntryMetadata();
+		Container.set(CredentialResolverEntryMetadata, resolverMetadata);
+	});
+
+	it('should register resolver in CredentialResolverEntryMetadata', () => {
+		@CredentialResolver()
+		class TestResolver implements ICredentialResolver {
+			metadata = {
+				name: 'test.resolver',
+				description: 'Test resolver',
+			};
+
+			async getSecret(
+				_credentialId: string,
+				_context: ICredentialContext,
+				_options: CredentialResolverConfiguration,
+			): Promise<ICredentialDataDecryptedObject> {
+				return {};
+			}
+
+			async setSecret(
+				_credentialId: string,
+				_context: ICredentialContext,
+				_data: ICredentialDataDecryptedObject,
+				_options: CredentialResolverConfiguration,
+			): Promise<void> {}
+
+			async validateOptions(_options: CredentialResolverConfiguration): Promise<void> {}
+		}
+
+		const registeredResolvers = resolverMetadata.getClasses();
+
+		expect(registeredResolvers).toContain(TestResolver);
+		expect(registeredResolvers).toHaveLength(1);
+	});
+
+	it('should register multiple resolvers', () => {
+		@CredentialResolver()
+		class FirstResolver implements ICredentialResolver {
+			metadata = {
+				name: 'first.resolver',
+				description: 'First resolver',
+			};
+
+			async getSecret(
+				_credentialId: string,
+				_context: ICredentialContext,
+				_options: CredentialResolverConfiguration,
+			): Promise<ICredentialDataDecryptedObject> {
+				return {};
+			}
+
+			async setSecret(
+				_credentialId: string,
+				_context: ICredentialContext,
+				_data: ICredentialDataDecryptedObject,
+				_options: CredentialResolverConfiguration,
+			): Promise<void> {}
+
+			async validateOptions(_options: CredentialResolverConfiguration): Promise<void> {}
+		}
+
+		@CredentialResolver()
+		class SecondResolver implements ICredentialResolver {
+			metadata = {
+				name: 'second.resolver',
+				description: 'Second resolver',
+			};
+
+			async getSecret(
+				_credentialId: string,
+				_context: ICredentialContext,
+				_options: CredentialResolverConfiguration,
+			): Promise<ICredentialDataDecryptedObject> {
+				return {};
+			}
+
+			async setSecret(
+				_credentialId: string,
+				_context: ICredentialContext,
+				_data: ICredentialDataDecryptedObject,
+				_options: CredentialResolverConfiguration,
+			): Promise<void> {}
+
+			async validateOptions(_options: CredentialResolverConfiguration): Promise<void> {}
+		}
+
+		@CredentialResolver()
+		class ThirdResolver implements ICredentialResolver {
+			metadata = {
+				name: 'third.resolver',
+				description: 'Third resolver',
+			};
+
+			async getSecret(
+				_credentialId: string,
+				_context: ICredentialContext,
+				_options: CredentialResolverConfiguration,
+			): Promise<ICredentialDataDecryptedObject> {
+				return {};
+			}
+
+			async setSecret(
+				_credentialId: string,
+				_context: ICredentialContext,
+				_data: ICredentialDataDecryptedObject,
+				_options: CredentialResolverConfiguration,
+			): Promise<void> {}
+
+			async validateOptions(_options: CredentialResolverConfiguration): Promise<void> {}
+		}
+
+		const registeredResolvers = resolverMetadata.getClasses();
+
+		expect(registeredResolvers).toContain(FirstResolver);
+		expect(registeredResolvers).toContain(SecondResolver);
+		expect(registeredResolvers).toContain(ThirdResolver);
+		expect(registeredResolvers).toHaveLength(3);
+	});
+
+	it('should apply Service decorator', () => {
+		@CredentialResolver()
+		class TestResolver implements ICredentialResolver {
+			metadata = {
+				name: 'test.resolver',
+				description: 'Test resolver',
+			};
+
+			async getSecret(
+				_credentialId: string,
+				_context: ICredentialContext,
+				_options: CredentialResolverConfiguration,
+			): Promise<ICredentialDataDecryptedObject> {
+				return {};
+			}
+
+			async setSecret(
+				_credentialId: string,
+				_context: ICredentialContext,
+				_data: ICredentialDataDecryptedObject,
+				_options: CredentialResolverConfiguration,
+			): Promise<void> {}
+
+			async validateOptions(_options: CredentialResolverConfiguration): Promise<void> {}
+		}
+
+		expect(Container.has(TestResolver)).toBe(true);
+	});
+
+	it('should allow instantiation of registered resolvers with accessible metadata', () => {
+		@CredentialResolver()
+		class TestResolver implements ICredentialResolver {
+			metadata = {
+				name: 'oauth.introspection',
+				description: 'OAuth introspection resolver',
+				displayName: 'OAuth Introspection',
+			};
+
+			async getSecret(
+				_credentialId: string,
+				_context: ICredentialContext,
+				_options: CredentialResolverConfiguration,
+			): Promise<ICredentialDataDecryptedObject> {
+				return {};
+			}
+
+			async setSecret(
+				_credentialId: string,
+				_context: ICredentialContext,
+				_data: ICredentialDataDecryptedObject,
+				_options: CredentialResolverConfiguration,
+			): Promise<void> {}
+
+			async validateOptions(_options: CredentialResolverConfiguration): Promise<void> {}
+		}
+
+		const resolverInstance = Container.get(TestResolver);
+
+		expect(resolverInstance).toBeInstanceOf(TestResolver);
+		expect(resolverInstance.metadata).toEqual({
+			name: 'oauth.introspection',
+			description: 'OAuth introspection resolver',
+			displayName: 'OAuth Introspection',
+		});
+		expect(resolverInstance.metadata.name).toBe('oauth.introspection');
+	});
+
+	it('should register resolvers with different metadata', () => {
+		@CredentialResolver()
+		class OAuthResolver implements ICredentialResolver {
+			metadata = {
+				name: 'oauth.resolver',
+				description: 'OAuth-based credential resolver',
+				displayName: 'OAuth Resolver',
+			};
+
+			async getSecret(
+				_credentialId: string,
+				_context: ICredentialContext,
+				_options: CredentialResolverConfiguration,
+			): Promise<ICredentialDataDecryptedObject> {
+				return {};
+			}
+
+			async setSecret(
+				_credentialId: string,
+				_context: ICredentialContext,
+				_data: ICredentialDataDecryptedObject,
+				_options: CredentialResolverConfiguration,
+			): Promise<void> {}
+
+			async validateOptions(_options: CredentialResolverConfiguration): Promise<void> {}
+		}
+
+		@CredentialResolver()
+		class StubResolver implements ICredentialResolver {
+			metadata = {
+				name: 'stub.resolver',
+				description: 'Stub resolver for testing',
+				displayName: 'Stub Resolver',
+			};
+
+			async getSecret(
+				_credentialId: string,
+				_context: ICredentialContext,
+				_options: CredentialResolverConfiguration,
+			): Promise<ICredentialDataDecryptedObject> {
+				return {};
+			}
+
+			async setSecret(
+				_credentialId: string,
+				_context: ICredentialContext,
+				_data: ICredentialDataDecryptedObject,
+				_options: CredentialResolverConfiguration,
+			): Promise<void> {}
+
+			async validateOptions(_options: CredentialResolverConfiguration): Promise<void> {}
+		}
+
+		const registeredResolvers = resolverMetadata.getClasses();
+		const oauthResolver = Container.get(OAuthResolver);
+		const stubResolver = Container.get(StubResolver);
+
+		expect(registeredResolvers).toHaveLength(2);
+		expect(oauthResolver.metadata.name).toBe('oauth.resolver');
+		expect(oauthResolver.metadata.displayName).toBe('OAuth Resolver');
+		expect(stubResolver.metadata.name).toBe('stub.resolver');
+		expect(stubResolver.metadata.displayName).toBe('Stub Resolver');
+	});
+
+	it('should support resolvers with configuration options', () => {
+		@CredentialResolver()
+		class ConfigurableResolver implements ICredentialResolver {
+			metadata = {
+				name: 'configurable.resolver',
+				description: 'Resolver with configuration options',
+				options: [
+					{
+						displayName: 'API Endpoint',
+						name: 'apiEndpoint',
+						type: 'string' as const,
+						default: '',
+					},
+				],
+			};
+
+			async getSecret(
+				_credentialId: string,
+				_context: ICredentialContext,
+				_options: CredentialResolverConfiguration,
+			): Promise<ICredentialDataDecryptedObject> {
+				return {};
+			}
+
+			async setSecret(
+				_credentialId: string,
+				_context: ICredentialContext,
+				_data: ICredentialDataDecryptedObject,
+				_options: CredentialResolverConfiguration,
+			): Promise<void> {}
+
+			async validateOptions(_options: CredentialResolverConfiguration): Promise<void> {}
+		}
+
+		const resolverInstance = Container.get(ConfigurableResolver);
+
+		expect(resolverInstance.metadata.options).toBeDefined();
+		expect(resolverInstance.metadata.options).toHaveLength(1);
+		expect(resolverInstance.metadata.options[0].name).toBe('apiEndpoint');
+	});
+
+	it('should support optional deleteSecret method', () => {
+		@CredentialResolver()
+		class ResolverWithDelete implements ICredentialResolver {
+			metadata = {
+				name: 'resolver.with.delete',
+				description: 'Resolver with delete support',
+			};
+
+			async getSecret(
+				_credentialId: string,
+				_context: ICredentialContext,
+				_options: CredentialResolverConfiguration,
+			): Promise<ICredentialDataDecryptedObject> {
+				return {};
+			}
+
+			async setSecret(
+				_credentialId: string,
+				_context: ICredentialContext,
+				_data: ICredentialDataDecryptedObject,
+				_options: CredentialResolverConfiguration,
+			): Promise<void> {}
+
+			async deleteSecret(
+				_credentialId: string,
+				_context: ICredentialContext,
+				_options: CredentialResolverConfiguration,
+			): Promise<void> {}
+
+			async validateOptions(_options: CredentialResolverConfiguration): Promise<void> {}
+		}
+
+		const withDelete = Container.get(ResolverWithDelete);
+
+		expect(withDelete.deleteSecret).toBeDefined();
+	});
+});
diff --git a/packages/@n8n/decorators/src/credential-resolver/credential-resolver-metadata.ts b/packages/@n8n/decorators/src/credential-resolver/credential-resolver-metadata.ts
new file mode 100644
index 00000000000..cd7c2e4704b
--- /dev/null
+++ b/packages/@n8n/decorators/src/credential-resolver/credential-resolver-metadata.ts
@@ -0,0 +1,52 @@
+import { Container, Service } from '@n8n/di';
+
+import { CredentialResolverClass } from './credential-resolver';
+
+type CredentialResolverEntry = {
+	class: CredentialResolverClass;
+};
+
+/**
+ * Registry service for credential resolver type discovery and instantiation.
+ * Resolver classes decorated with @CredentialResolver() are automatically registered.
+ */
+@Service()
+export class CredentialResolverEntryMetadata {
+	private readonly credentialResolverEntries: Set<CredentialResolverEntry> = new Set();
+
+	/** Registers a credential resolver class. Called automatically by @CredentialResolver() decorator. */
+	register(credentialResolverEntry: CredentialResolverEntry) {
+		this.credentialResolverEntries.add(credentialResolverEntry);
+	}
+
+	/** Returns all registered resolver entries as [index, entry] tuples. */
+	getEntries() {
+		return [...this.credentialResolverEntries.entries()];
+	}
+
+	/** Returns all registered resolver classes. */
+	getClasses() {
+		return [...this.credentialResolverEntries.values()].map((entry) => entry.class);
+	}
+}
+
+/**
+ * Decorator to mark a class as a credential resolver.
+ * Automatically registers the resolver for discovery and enables dependency injection.
+ *
+ * @example
+ * @CredentialResolver()
+ * class MyResolver implements ICredentialResolver { ... }
+ */
+export const CredentialResolver =
+	<T extends CredentialResolverClass>() =>
+	(target: T) => {
+		// Register resolver class for discovery by registry
+		Container.get(CredentialResolverEntryMetadata).register({
+			class: target,
+		});
+
+		// Enable dependency injection for the resolver class
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-return
+		return Service()(target);
+	};
diff --git a/packages/@n8n/decorators/src/credential-resolver/credential-resolver.ts b/packages/@n8n/decorators/src/credential-resolver/credential-resolver.ts
new file mode 100644
index 00000000000..5da67969887
--- /dev/null
+++ b/packages/@n8n/decorators/src/credential-resolver/credential-resolver.ts
@@ -0,0 +1,88 @@
+import type { Constructable } from '@n8n/di';
+import type {
+	ICredentialContext,
+	ICredentialDataDecryptedObject,
+	INodeProperties,
+} from 'n8n-workflow';
+
+/**
+ * Configuration object passed to resolver methods. Structure is defined by resolver type's metadata.options.
+ */
+export type CredentialResolverConfiguration = Record<string, unknown>;
+
+/**
+ * Metadata describing a credential resolver type for UI integration and discovery.
+ */
+export interface CredentialResolverMetadata {
+	/** Unique identifier for the resolver type */
+	name: string;
+
+	/** Human-readable description of what this resolver does */
+	description: string;
+
+	/** Optional display name shown in UI. Falls back to name if not provided. */
+	displayName?: string;
+
+	/** Configuration schema using n8n's INodeProperties format for dynamic form rendering */
+	options?: INodeProperties[];
+}
+
+/**
+ * Core interface for credential resolver implementations.
+ * Resolvers fetch credential data dynamically based on execution context and configuration.
+ */
+export interface ICredentialResolver {
+	/** Metadata for UI integration and resolver discovery */
+	metadata: CredentialResolverMetadata;
+
+	/**
+	 * Retrieves credential data for a specific entity from the resolver's storage.
+	 * @throws {CredentialResolverDataNotFoundError} When no data exists for the given context
+	 * @throws {CredentialResolverError} For other resolver-specific errors
+	 */
+	getSecret(
+		credentialId: string,
+		context: ICredentialContext,
+		options: CredentialResolverConfiguration,
+	): Promise<ICredentialDataDecryptedObject>;
+
+	/**
+	 * Stores credential data for a specific entity in the resolver's storage.
+	 * @throws {CredentialResolverError} When storage operation fails
+	 */
+	setSecret(
+		credentialId: string,
+		context: ICredentialContext,
+		data: ICredentialDataDecryptedObject,
+		options: CredentialResolverConfiguration,
+	): Promise<void>;
+
+	/**
+	 * Deletes credential data for a specific entity from the resolver's storage.
+	 * Optional - not all resolvers support deletion.
+	 * @throws {CredentialResolverError} When deletion operation fails
+	 */
+	deleteSecret?(
+		credentialId: string,
+		context: ICredentialContext,
+		options: CredentialResolverConfiguration,
+	): Promise<void>;
+
+	/**
+	 * Validates resolver configuration before saving.
+	 * Should verify connectivity, authentication, and configuration structure.
+	 * @throws {CredentialResolverValidationError} When configuration is invalid
+	 */
+	validateOptions(options: CredentialResolverConfiguration): Promise<void>;
+
+	/**
+	 * Runs initialization logic for the resolver. This might be called multiple times!
+	 * Optional - not all resolvers require initialization.
+	 */
+	init?(): Promise<void>;
+}
+
+/**
+ * Type helper for credential resolver class constructors.
+ */
+export type CredentialResolverClass = Constructable<ICredentialResolver>;
diff --git a/packages/@n8n/decorators/src/credential-resolver/errors.ts b/packages/@n8n/decorators/src/credential-resolver/errors.ts
new file mode 100644
index 00000000000..e6f999012c0
--- /dev/null
+++ b/packages/@n8n/decorators/src/credential-resolver/errors.ts
@@ -0,0 +1,31 @@
+/**
+ * Base error class for all credential resolver errors.
+ */
+export class CredentialResolverError extends Error {
+	constructor(message: string) {
+		super(message);
+		this.name = 'CredentialResolverError';
+	}
+}
+
+/**
+ * Thrown when no credential data exists for the requested credential and context combination.
+ * Indicates the entity has not stored credentials for this credential type.
+ */
+export class CredentialResolverDataNotFoundError extends CredentialResolverError {
+	constructor() {
+		super('No data found available for the requested credential and context combination.');
+		this.name = 'CredentialResolverDataNotFoundError';
+	}
+}
+
+/**
+ * Thrown when resolver configuration validation fails.
+ * Indicates invalid configuration values or unreachable external services.
+ */
+export class CredentialResolverValidationError extends CredentialResolverError {
+	constructor(message: string) {
+		super(`Credential resolver options validation failed: ${message}`);
+		this.name = 'CredentialResolverValidationError';
+	}
+}
diff --git a/packages/@n8n/decorators/src/credential-resolver/index.ts b/packages/@n8n/decorators/src/credential-resolver/index.ts
new file mode 100644
index 00000000000..d2f662ee01c
--- /dev/null
+++ b/packages/@n8n/decorators/src/credential-resolver/index.ts
@@ -0,0 +1,13 @@
+/**
+ * Credential Resolver Module
+ *
+ * Provides interfaces and infrastructure for dynamic credential resolution based on execution context.
+ * Resolvers fetch credential data at runtime from external storage based on entity identity.
+ */
+
+export {
+	CredentialResolverEntryMetadata,
+	CredentialResolver,
+} from './credential-resolver-metadata';
+export * from './errors';
+export type * from './credential-resolver';
diff --git a/packages/@n8n/decorators/src/index.ts b/packages/@n8n/decorators/src/index.ts
index f872195d472..45fd624f944 100644
--- a/packages/@n8n/decorators/src/index.ts
+++ b/packages/@n8n/decorators/src/index.ts
@@ -4,6 +4,7 @@ export { Debounce } from './debounce';
 export * from './execution-lifecycle';
 export { Memoized } from './memoized';
 export * from './context-establishment';
+export * from './credential-resolver';
 export * from './module';
 export * from './multi-main';
 export * from './pubsub';

From 1a342fce56030376947769844eaf2915d8c75e32 Mon Sep 17 00:00:00 2001
From: Mutasem Aldmour <4711238+mutdmour@users.noreply.github.com>
Date: Tue, 2 Dec 2025 10:25:59 +0100
Subject: [PATCH 008/167] fix(ai-builder): Only tidy up nodes if a new node is
 added (#22514)

---
 .../editor-ui/src/app/stores/posthog.store.ts |   2 +-
 .../Agent/AskAssistantBuild.test.ts           | 343 ++++++++++++++++++
 .../components/Agent/AskAssistantBuild.vue    |  11 +-
 3 files changed, 354 insertions(+), 2 deletions(-)

diff --git a/packages/frontend/editor-ui/src/app/stores/posthog.store.ts b/packages/frontend/editor-ui/src/app/stores/posthog.store.ts
index 939c43fbc5c..7ac1cf0fc13 100644
--- a/packages/frontend/editor-ui/src/app/stores/posthog.store.ts
+++ b/packages/frontend/editor-ui/src/app/stores/posthog.store.ts
@@ -140,7 +140,7 @@ export const usePostHog = defineStore('posthog', () => {
 			api_host: 'https://us.i.posthog.com', //settingsStore.settings.posthog.proxy,
 			autocapture: config.autocapture,
 			disable_session_recording: config.disableSessionRecording,
-			debug: config.debug,
+			debug: false, // Enables console logs for debugging reasons
 			session_recording: {
 				maskAllInputs: false,
 			},
diff --git a/packages/frontend/editor-ui/src/features/ai/assistant/components/Agent/AskAssistantBuild.test.ts b/packages/frontend/editor-ui/src/features/ai/assistant/components/Agent/AskAssistantBuild.test.ts
index e24d67024b8..08c610f0b1d 100644
--- a/packages/frontend/editor-ui/src/features/ai/assistant/components/Agent/AskAssistantBuild.test.ts
+++ b/packages/frontend/editor-ui/src/features/ai/assistant/components/Agent/AskAssistantBuild.test.ts
@@ -110,8 +110,14 @@ import { useWorkflowsStore } from '@/app/stores/workflows.store';
 import type { INodeUi } from '@/Interface';
 import { useUsersStore } from '@/features/settings/users/users.store';
 
+const nodeViewEventBusEmitMock = vi.hoisted(() => vi.fn());
 vi.mock('@/app/event-bus', () => ({
 	nodeViewEventBus: {
+		emit: nodeViewEventBusEmitMock,
+	},
+	dataPinningEventBus: {
+		on: vi.fn(),
+		off: vi.fn(),
 		emit: vi.fn(),
 	},
 }));
@@ -1590,4 +1596,341 @@ describe('AskAssistantBuild', () => {
 			workflow_id: 'abc123',
 		});
 	});
+
+	describe('shouldTidyUp logic', () => {
+		it('should set tidyUp to true when new nodes are added', async () => {
+			const originalWorkflow = { nodes: [], connections: {} };
+			const newWorkflow = {
+				nodes: [
+					{
+						id: 'new-node-1',
+						name: 'Start',
+						type: 'n8n-nodes-base.start',
+						position: [0, 0] as [number, number],
+						typeVersion: 1,
+						parameters: {},
+					},
+				],
+				connections: {},
+			};
+
+			builderStore.getWorkflowSnapshot.mockReturnValue(JSON.stringify(originalWorkflow));
+			builderStore.applyWorkflowUpdate.mockReturnValue({
+				success: true,
+				workflowData: newWorkflow,
+				newNodeIds: ['new-node-1'],
+				oldNodeIds: [],
+			});
+
+			workflowsStore.$patch({ workflow: originalWorkflow });
+
+			renderComponent();
+
+			builderStore.$patch({ streaming: true });
+			await flushPromises();
+
+			// Trigger workflow update with new nodes
+			builderStore.workflowMessages = [
+				{
+					id: faker.string.uuid(),
+					role: 'assistant' as const,
+					type: 'workflow-updated' as const,
+					codeSnippet: JSON.stringify(newWorkflow),
+				},
+			];
+
+			await flushPromises();
+
+			// Verify importWorkflowData was called with tidyUp: true
+			expect(nodeViewEventBusEmitMock).toHaveBeenCalledWith('importWorkflowData', {
+				data: newWorkflow,
+				tidyUp: true,
+				nodesIdsToTidyUp: ['new-node-1'],
+				regenerateIds: false,
+				trackEvents: false,
+			});
+		});
+
+		it('should set tidyUp to false when no new nodes are added (only parameter updates)', async () => {
+			const existingWorkflow = {
+				nodes: [
+					{
+						id: 'existing-node',
+						name: 'HTTP',
+						type: 'n8n-nodes-base.httpRequest',
+						position: [0, 0] as [number, number],
+						typeVersion: 1,
+						parameters: { url: 'http://old.com' },
+					},
+				],
+				connections: {},
+			};
+			const updatedWorkflow = {
+				nodes: [
+					{
+						id: 'existing-node',
+						name: 'HTTP',
+						type: 'n8n-nodes-base.httpRequest',
+						position: [0, 0] as [number, number],
+						typeVersion: 1,
+						parameters: { url: 'http://new.com' },
+					},
+				],
+				connections: {},
+			};
+
+			builderStore.getWorkflowSnapshot.mockReturnValue(JSON.stringify(existingWorkflow));
+			builderStore.applyWorkflowUpdate.mockReturnValue({
+				success: true,
+				workflowData: updatedWorkflow,
+				newNodeIds: [], // No new nodes, just parameter update
+				oldNodeIds: ['existing-node'],
+			});
+
+			workflowsStore.$patch({ workflow: existingWorkflow });
+
+			renderComponent();
+
+			builderStore.$patch({ streaming: true });
+			await flushPromises();
+
+			// Trigger workflow update without new nodes
+			builderStore.workflowMessages = [
+				{
+					id: faker.string.uuid(),
+					role: 'assistant' as const,
+					type: 'workflow-updated' as const,
+					codeSnippet: JSON.stringify(updatedWorkflow),
+				},
+			];
+
+			await flushPromises();
+
+			// Verify importWorkflowData was called with tidyUp: false
+			expect(nodeViewEventBusEmitMock).toHaveBeenCalledWith('importWorkflowData', {
+				data: updatedWorkflow,
+				tidyUp: false,
+				nodesIdsToTidyUp: [],
+				regenerateIds: false,
+				trackEvents: false,
+			});
+		});
+
+		it('should keep tidyUp true once set within the same user message exchange', async () => {
+			const workflow1 = { nodes: [], connections: {} };
+			const workflow2 = {
+				nodes: [
+					{
+						id: 'node-1',
+						name: 'Start',
+						type: 'n8n-nodes-base.start',
+						position: [0, 0] as [number, number],
+						typeVersion: 1,
+						parameters: {},
+					},
+				],
+				connections: {},
+			};
+			const workflow3 = {
+				nodes: [
+					{
+						id: 'node-1',
+						name: 'Start',
+						type: 'n8n-nodes-base.start',
+						position: [0, 0] as [number, number],
+						typeVersion: 1,
+						parameters: { updated: true },
+					},
+				],
+				connections: {},
+			};
+
+			builderStore.getWorkflowSnapshot.mockReturnValue(JSON.stringify(workflow1));
+
+			// First update adds new nodes
+			builderStore.applyWorkflowUpdate
+				.mockReturnValueOnce({
+					success: true,
+					workflowData: workflow2,
+					newNodeIds: ['node-1'],
+					oldNodeIds: [],
+				})
+				// Second update has no new nodes (just parameter change)
+				.mockReturnValueOnce({
+					success: true,
+					workflowData: workflow3,
+					newNodeIds: [],
+					oldNodeIds: ['node-1'],
+				});
+
+			workflowsStore.$patch({ workflow: workflow1 });
+
+			renderComponent();
+
+			builderStore.$patch({ streaming: true });
+			await flushPromises();
+
+			const msgId1 = faker.string.uuid();
+			const msgId2 = faker.string.uuid();
+
+			// First workflow update (adds new nodes)
+			builderStore.workflowMessages = [
+				{
+					id: msgId1,
+					role: 'assistant' as const,
+					type: 'workflow-updated' as const,
+					codeSnippet: JSON.stringify(workflow2),
+				},
+			];
+
+			await flushPromises();
+
+			// First call should have tidyUp: true
+			expect(nodeViewEventBusEmitMock).toHaveBeenCalledWith('importWorkflowData', {
+				data: workflow2,
+				tidyUp: true,
+				nodesIdsToTidyUp: ['node-1'],
+				regenerateIds: false,
+				trackEvents: false,
+			});
+
+			nodeViewEventBusEmitMock.mockClear();
+
+			// Second workflow update (no new nodes, just parameter update)
+			builderStore.workflowMessages = [
+				{
+					id: msgId1,
+					role: 'assistant' as const,
+					type: 'workflow-updated' as const,
+					codeSnippet: JSON.stringify(workflow2),
+				},
+				{
+					id: msgId2,
+					role: 'assistant' as const,
+					type: 'workflow-updated' as const,
+					codeSnippet: JSON.stringify(workflow3),
+				},
+			];
+
+			await flushPromises();
+
+			// Second call should still have tidyUp: true because it was set earlier
+			expect(nodeViewEventBusEmitMock).toHaveBeenCalledWith('importWorkflowData', {
+				data: workflow3,
+				tidyUp: true,
+				nodesIdsToTidyUp: [],
+				regenerateIds: false,
+				trackEvents: false,
+			});
+		});
+
+		it('should reset shouldTidyUp flag on new user message', async () => {
+			workflowsStore.$patch({ workflow: { nodes: [], connections: {} } });
+			workflowsStore.isNewWorkflow = false;
+
+			const { container } = renderComponent();
+
+			const workflow1 = {
+				nodes: [
+					{
+						id: 'node-1',
+						name: 'Start',
+						type: 'n8n-nodes-base.start',
+						position: [0, 0] as [number, number],
+						typeVersion: 1,
+						parameters: {},
+					},
+				],
+				connections: {},
+			};
+
+			builderStore.getWorkflowSnapshot.mockReturnValue('{}');
+			builderStore.applyWorkflowUpdate.mockReturnValue({
+				success: true,
+				workflowData: workflow1,
+				newNodeIds: ['node-1'],
+				oldNodeIds: [],
+			});
+
+			// First message exchange - adds nodes
+			builderStore.$patch({ streaming: true });
+			await flushPromises();
+
+			builderStore.workflowMessages = [
+				{
+					id: faker.string.uuid(),
+					role: 'assistant' as const,
+					type: 'workflow-updated' as const,
+					codeSnippet: JSON.stringify(workflow1),
+				},
+			];
+
+			await flushPromises();
+
+			expect(nodeViewEventBusEmitMock).toHaveBeenCalledWith('importWorkflowData', {
+				data: workflow1,
+				tidyUp: true,
+				nodesIdsToTidyUp: ['node-1'],
+				regenerateIds: false,
+				trackEvents: false,
+			});
+
+			builderStore.$patch({ streaming: false });
+			await flushPromises();
+
+			nodeViewEventBusEmitMock.mockClear();
+
+			// Second message - user sends new message, which should reset shouldTidyUp
+			const vm = (container.firstElementChild as VueComponentInstance)?.__vueParentComponent;
+			if (vm?.setupState?.onUserMessage) {
+				await vm.setupState.onUserMessage('Update parameters');
+			}
+			await flushPromises();
+
+			// Now simulate a workflow update with no new nodes
+			const workflow2 = {
+				nodes: [
+					{
+						id: 'node-1',
+						name: 'Start',
+						type: 'n8n-nodes-base.start',
+						position: [0, 0] as [number, number],
+						typeVersion: 1,
+						parameters: { updated: true },
+					},
+				],
+				connections: {},
+			};
+
+			builderStore.applyWorkflowUpdate.mockReturnValue({
+				success: true,
+				workflowData: workflow2,
+				newNodeIds: [], // No new nodes this time
+				oldNodeIds: ['node-1'],
+			});
+
+			builderStore.$patch({ streaming: true });
+			await flushPromises();
+
+			builderStore.workflowMessages = [
+				{
+					id: faker.string.uuid(),
+					role: 'assistant' as const,
+					type: 'workflow-updated' as const,
+					codeSnippet: JSON.stringify(workflow2),
+				},
+			];
+
+			await flushPromises();
+
+			// shouldTidyUp should be reset, so tidyUp should be false
+			expect(nodeViewEventBusEmitMock).toHaveBeenCalledWith('importWorkflowData', {
+				data: workflow2,
+				tidyUp: false,
+				nodesIdsToTidyUp: [],
+				regenerateIds: false,
+				trackEvents: false,
+			});
+		});
+	});
 });
diff --git a/packages/frontend/editor-ui/src/features/ai/assistant/components/Agent/AskAssistantBuild.vue b/packages/frontend/editor-ui/src/features/ai/assistant/components/Agent/AskAssistantBuild.vue
index 4d3c0ab4dcd..317975bf44a 100644
--- a/packages/frontend/editor-ui/src/features/ai/assistant/components/Agent/AskAssistantBuild.vue
+++ b/packages/frontend/editor-ui/src/features/ai/assistant/components/Agent/AskAssistantBuild.vue
@@ -36,6 +36,7 @@ const processedWorkflowUpdates = ref(new Set<string>());
 const trackedTools = ref(new Set<string>());
 const trackedCategorizations = ref(new Set<string>());
 const workflowUpdated = ref<{ start: string; end: string } | undefined>();
+const shouldTidyUp = ref(false);
 const n8nChatRef = ref<InstanceType<typeof N8nAskAssistantChat>>();
 
 const user = computed(() => ({
@@ -94,6 +95,9 @@ async function onUserMessage(content: string) {
 		await workflowSaver.saveCurrentWorkflow();
 	}
 
+	// Reset tidy up flag for each new message exchange
+	shouldTidyUp.value = false;
+
 	// If the workflow is empty, set the initial generation flag
 	const isInitialGeneration = workflowsStore.workflow.nodes.length === 0;
 
@@ -106,6 +110,7 @@ function onNewWorkflow() {
 	trackedTools.value.clear();
 	trackedCategorizations.value.clear();
 	workflowUpdated.value = undefined;
+	shouldTidyUp.value = false;
 }
 
 function onFeedback(feedback: RatingFeedback) {
@@ -257,10 +262,14 @@ watch(
 					const result = builderStore.applyWorkflowUpdate(msg.codeSnippet);
 
 					if (result.success) {
+						// Only tidy up if new nodes are added per user message
+						const hasNewNodes = Boolean(result.newNodeIds && result.newNodeIds.length > 0);
+						shouldTidyUp.value = shouldTidyUp.value || hasNewNodes;
+
 						// Import the updated workflow
 						nodeViewEventBus.emit('importWorkflowData', {
 							data: result.workflowData,
-							tidyUp: true,
+							tidyUp: shouldTidyUp.value,
 							nodesIdsToTidyUp: result.newNodeIds,
 							regenerateIds: false,
 							trackEvents: false,

From ebca18b70944f8aad0945574ddc79fb481293c06 Mon Sep 17 00:00:00 2001
From: Benjamin Schroth <68321970+schrothbn@users.noreply.github.com>
Date: Tue, 2 Dec 2025 10:39:31 +0100
Subject: [PATCH 009/167] fix(AI Agent Tool Node): Implement version 3 for
 agent tool node (#22587)

---
 .../nodes/agents/Agent/AgentTool.node.ts      |  4 +-
 .../nodes/agents/Agent/V3/AgentToolV3.node.ts | 91 +++++++++++++++++++
 2 files changed, 94 insertions(+), 1 deletion(-)
 create mode 100644 packages/@n8n/nodes-langchain/nodes/agents/Agent/V3/AgentToolV3.node.ts

diff --git a/packages/@n8n/nodes-langchain/nodes/agents/Agent/AgentTool.node.ts b/packages/@n8n/nodes-langchain/nodes/agents/Agent/AgentTool.node.ts
index 42e88f02d9c..1613315393d 100644
--- a/packages/@n8n/nodes-langchain/nodes/agents/Agent/AgentTool.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/AgentTool.node.ts
@@ -2,6 +2,7 @@ import type { INodeTypeBaseDescription, IVersionedNodeType } from 'n8n-workflow'
 import { VersionedNodeType } from 'n8n-workflow';
 
 import { AgentToolV2 } from './V2/AgentToolV2.node';
+import { AgentToolV3 } from './V3/AgentToolV3.node';
 
 export class AgentTool extends VersionedNodeType {
 	constructor() {
@@ -20,13 +21,14 @@ export class AgentTool extends VersionedNodeType {
 					Tools: ['Other Tools'],
 				},
 			},
-			defaultVersion: 2.2,
+			defaultVersion: 3,
 		};
 
 		const nodeVersions: IVersionedNodeType['nodeVersions'] = {
 			// Should have the same versioning as Agent node
 			// because internal agent logic often checks for node version
 			2.2: new AgentToolV2(baseDescription),
+			3: new AgentToolV3(baseDescription),
 		};
 
 		super(nodeVersions, baseDescription);
diff --git a/packages/@n8n/nodes-langchain/nodes/agents/Agent/V3/AgentToolV3.node.ts b/packages/@n8n/nodes-langchain/nodes/agents/Agent/V3/AgentToolV3.node.ts
new file mode 100644
index 00000000000..71d7b704b92
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/V3/AgentToolV3.node.ts
@@ -0,0 +1,91 @@
+import { NodeConnectionTypes } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription,
+	INodeTypeBaseDescription,
+	ISupplyDataFunctions,
+	EngineResponse,
+	EngineRequest,
+} from 'n8n-workflow';
+
+import { textInput, toolDescription } from '@utils/descriptions';
+
+import { getInputs } from '../utils';
+import { toolsAgentProperties } from '../agents/ToolsAgent/V3/description';
+import type { RequestResponseMetadata } from '../agents/ToolsAgent/V3/execute';
+import { toolsAgentExecute } from '../agents/ToolsAgent/V3/execute';
+
+export class AgentToolV3 implements INodeType {
+	description: INodeTypeDescription;
+	constructor(baseDescription: INodeTypeBaseDescription) {
+		this.description = {
+			...baseDescription,
+			version: [3],
+			defaults: {
+				name: 'AI Agent Tool',
+				color: '#404040',
+			},
+			inputs: `={{
+				((hasOutputParser, needsFallback) => {
+					${getInputs.toString()};
+					return getInputs(false, hasOutputParser, needsFallback)
+				})($parameter.hasOutputParser === undefined || $parameter.hasOutputParser === true, $parameter.needsFallback !== undefined && $parameter.needsFallback === true)
+			}}`,
+			outputs: [NodeConnectionTypes.AiTool],
+			properties: [
+				toolDescription,
+				{
+					...textInput,
+				},
+				{
+					displayName: 'Require Specific Output Format',
+					name: 'hasOutputParser',
+					type: 'boolean',
+					default: false,
+					noDataExpression: true,
+				},
+				{
+					displayName: `Connect an <a data-action='openSelectiveNodeCreator' data-action-parameter-connectiontype='${NodeConnectionTypes.AiOutputParser}'>output parser</a> on the canvas to specify the output format you require`,
+					name: 'notice',
+					type: 'notice',
+					default: '',
+					displayOptions: {
+						show: {
+							hasOutputParser: [true],
+						},
+					},
+				},
+				{
+					displayName: 'Enable Fallback Model',
+					name: 'needsFallback',
+					type: 'boolean',
+					default: false,
+					noDataExpression: true,
+				},
+				{
+					displayName:
+						'Connect an additional language model on the canvas to use it as a fallback if the main model fails',
+					name: 'fallbackNotice',
+					type: 'notice',
+					default: '',
+					displayOptions: {
+						show: {
+							needsFallback: [true],
+						},
+					},
+				},
+				toolsAgentProperties,
+			],
+		};
+	}
+
+	// Automatically wrapped as a tool
+	async execute(
+		this: IExecuteFunctions | ISupplyDataFunctions,
+		response?: EngineResponse<RequestResponseMetadata>,
+	): Promise<INodeExecutionData[][] | EngineRequest<RequestResponseMetadata>> {
+		return await toolsAgentExecute.call(this, response);
+	}
+}

From 2a05c6ae20cc9e1b070e7d1a3d699649fc07a4de Mon Sep 17 00:00:00 2001
From: Dawid Myslak <dawid.myslak@gmail.com>
Date: Tue, 2 Dec 2025 10:39:41 +0100
Subject: [PATCH 010/167] docs: Introduce AGENTS.md for nodes-base directory
 (#22354)

---
 packages/nodes-base/AGENTS.md | 114 ++++++++++++++++++++++++++++++++++
 packages/nodes-base/CLAUDE.md |   1 +
 2 files changed, 115 insertions(+)
 create mode 100644 packages/nodes-base/AGENTS.md
 create mode 100644 packages/nodes-base/CLAUDE.md

diff --git a/packages/nodes-base/AGENTS.md b/packages/nodes-base/AGENTS.md
new file mode 100644
index 00000000000..bfac3874975
--- /dev/null
+++ b/packages/nodes-base/AGENTS.md
@@ -0,0 +1,114 @@
+# AGENTS.md
+
+Guidance for node development in the nodes-base package.
+
+## Node Structure
+
+Every node implements the `INodeType` interface with:
+- `description: INodeTypeDescription` - Node metadata and UI configuration
+- `execute?()` - For programmatic nodes
+- `poll?()` - For polling triggers (set `polling: true` in description)
+- `trigger?()` - For generic triggers
+- `webhook?()` - For webhook triggers
+- `webhookMethods?` - Webhook lifecycle (checkExists, create, delete)
+- `methods?` - loadOptions, listSearch, credentialTest, resourceMapping
+
+## Node Types
+
+### Programmatic Nodes
+Use `execute` function for custom logic. Example: `nodes/Discord/v2/DiscordV2.node.ts`
+
+### Declarative Nodes
+Use `requestDefaults` and routing configuration instead of `execute`. Example: `nodes/Okta/Okta.node.ts`
+
+### Trigger Nodes
+- **Webhook triggers**: Implement `webhook` and `webhookMethods` (checkExists, create, delete). Example: `nodes/Microsoft/Teams/MicrosoftTeamsTrigger.node.ts`
+- **Polling triggers**: Set `polling: true` and implement `poll`. Use `getWorkflowStaticData('node')` to persist state. Example: `nodes/Google/Gmail/GmailTrigger.node.ts`
+- **Generic triggers**: Implement `trigger` function. Example: `nodes/MQTT/MqttTrigger.node.ts`
+
+## Node Parameters
+
+Common parameter types:
+- `string` - Text input
+- `options` - Dropdown (static or dynamic via `loadOptionsMethod`)
+- `resourceLocator` - Select by list, ID, or URL
+- `collection` - Key-value pairs
+- `fixedCollection` - Structured collections
+
+Use `displayOptions` to show/hide fields based on other parameters. Use `noDataExpression: true` for resource/operation selectors.
+
+## Versioning
+
+- **Light versioning**: Use version arrays in description: `version: [3, 3.1, 3.2]`
+- **Full versioning**: Use `VersionedNodeType` class with separate version implementations. Example: `nodes/Set/Set.node.ts`
+
+## Credentials
+
+Credentials are defined in `credentials/` directory and implement `ICredentialType`:
+- `name` - Internal identifier
+- `displayName` - Human-readable name
+- `properties` - Credential fields
+- `authenticate` - Authentication configuration (generic or custom function)
+- `test` - Credential test request
+
+Nodes can test credentials via `methods.credentialTest`.
+
+## Testing
+
+### Unit Tests
+- Use `jest-mock-extended` for mocking interfaces
+- Use `nock` for HTTP mocking
+- Mock all external dependencies
+- Test happy paths, error handling, edge cases, and binary data
+
+### Workflow Tests
+- Use `NodeTestHarness` with JSON workflow definitions
+- Mock external APIs with nock
+- Use `pnpm test` for running tests. Example: `cd packages/nodes-base/ && pnpm test TestFileName`
+
+## Common Development Tasks
+
+### Creating a New Node
+1. Create directory: `nodes/YourService/`
+2. Create `YourService.node.ts` implementing `INodeType`
+3. Add icon SVG files in node directory
+4. Define credentials in `credentials/` if needed
+5. Write tests following testing guidelines
+6. Register in `package.json` nodes array if needed
+
+### Adding Dynamic Options
+Add `loadOptionsMethod` to parameter's `typeOptions` and implement method in `methods.loadOptions`.
+
+### Adding Resource Locator
+Change parameter type to `'resourceLocator'`, define modes (list, id, url), add `searchListMethod` for list mode, add `extractValue` regex for URL mode.
+
+## Best Practices
+
+### TypeScript
+- Never use `any` type - use proper types or `unknown`
+- Avoid type casting with `as` - use type guards instead
+- Define interfaces for API responses
+
+### Error Handling
+- Use `NodeOperationError` for user-facing errors
+- Use `NodeApiError` for API-related errors
+- Support `continueOnFail` option when appropriate
+
+### Code Organization
+- Separate operation/field descriptions into separate files
+- Create reusable API request helpers in GenericFunctions
+- Use kebab-case for files, PascalCase for classes
+
+### UI/UX
+- Use clear `displayName` and `description` fields
+- Set sensible default values
+- Use `displayOptions` to show/hide fields conditionally
+
+## Example Nodes
+
+- Declarative: `nodes/Okta/Okta.node.ts`
+- Programmatic: `nodes/Discord/v2/DiscordV2.node.ts`
+- Webhook Trigger: `nodes/Microsoft/Teams/MicrosoftTeamsTrigger.node.ts`
+- Polling Trigger: `nodes/Google/Gmail/GmailTrigger.node.ts`
+- Generic Trigger: `nodes/MQTT/MqttTrigger.node.ts`
+- Versioned: `nodes/Set/Set.node.ts`
diff --git a/packages/nodes-base/CLAUDE.md b/packages/nodes-base/CLAUDE.md
new file mode 100644
index 00000000000..43c994c2d36
--- /dev/null
+++ b/packages/nodes-base/CLAUDE.md
@@ -0,0 +1 @@
+@AGENTS.md

From 1b2d8b13408f4beac88f685071e685b82e92f98a Mon Sep 17 00:00:00 2001
From: Andreas Fitzek <andreas.fitzek@n8n.io>
Date: Tue, 2 Dec 2025 10:55:26 +0100
Subject: [PATCH 011/167] chore(core): Implement Credential resolver registry
 (#22593)

---
 .../dynamic-credentials.module.ts             |   4 +
 ...edential-resolver-registry.service.test.ts | 340 ++++++++++++++++++
 .../credential-resolver-registry.service.ts   |  78 ++++
 .../dynamic-credentials.ee/services/index.ts  |   1 +
 4 files changed, 423 insertions(+)
 create mode 100644 packages/cli/src/modules/dynamic-credentials.ee/services/__tests__/credential-resolver-registry.service.test.ts
 create mode 100644 packages/cli/src/modules/dynamic-credentials.ee/services/credential-resolver-registry.service.ts
 create mode 100644 packages/cli/src/modules/dynamic-credentials.ee/services/index.ts

diff --git a/packages/cli/src/modules/dynamic-credentials.ee/dynamic-credentials.module.ts b/packages/cli/src/modules/dynamic-credentials.ee/dynamic-credentials.module.ts
index e22fae642ac..e20d5ebe49e 100644
--- a/packages/cli/src/modules/dynamic-credentials.ee/dynamic-credentials.module.ts
+++ b/packages/cli/src/modules/dynamic-credentials.ee/dynamic-credentials.module.ts
@@ -1,10 +1,14 @@
 import type { ModuleInterface } from '@n8n/decorators';
 import { BackendModule, OnShutdown } from '@n8n/decorators';
+import { Container } from '@n8n/di';
 
 @BackendModule({ name: 'dynamic-credentials', licenseFlag: 'feat:externalSecrets' })
 export class DynamicCredentialsModule implements ModuleInterface {
 	async init() {
 		await import('./context-establishment-hooks');
+		const { CredentialResolverRegistry } = await import('./services');
+
+		await Container.get(CredentialResolverRegistry).init();
 	}
 
 	@OnShutdown()
diff --git a/packages/cli/src/modules/dynamic-credentials.ee/services/__tests__/credential-resolver-registry.service.test.ts b/packages/cli/src/modules/dynamic-credentials.ee/services/__tests__/credential-resolver-registry.service.test.ts
new file mode 100644
index 00000000000..3180ec4337a
--- /dev/null
+++ b/packages/cli/src/modules/dynamic-credentials.ee/services/__tests__/credential-resolver-registry.service.test.ts
@@ -0,0 +1,340 @@
+import type { Logger } from '@n8n/backend-common';
+import type {
+	ICredentialResolver,
+	CredentialResolverClass,
+	CredentialResolverEntryMetadata,
+	CredentialResolverConfiguration,
+} from '@n8n/decorators';
+import { Container } from '@n8n/di';
+import type { ICredentialContext, ICredentialDataDecryptedObject } from 'n8n-workflow';
+
+import { CredentialResolverRegistry } from '../credential-resolver-registry.service';
+
+describe('CredentialResolverRegistry', () => {
+	let registry: CredentialResolverRegistry;
+	let mockLogger: jest.Mocked<Logger>;
+	let mockMetadata: jest.Mocked<CredentialResolverEntryMetadata>;
+
+	// Mock resolver classes
+	const createMockResolver = (
+		name: string,
+		hasInit = false,
+		initShouldFail = false,
+	): ICredentialResolver => ({
+		metadata: {
+			name,
+			description: `${name} resolver`,
+		},
+		async getSecret(
+			_credentialId: string,
+			_context: ICredentialContext,
+			_options: CredentialResolverConfiguration,
+		): Promise<ICredentialDataDecryptedObject> {
+			return {};
+		},
+		async setSecret(
+			_credentialId: string,
+			_context: ICredentialContext,
+			_data: ICredentialDataDecryptedObject,
+			_options: CredentialResolverConfiguration,
+		): Promise<void> {},
+		async validateOptions(_options: CredentialResolverConfiguration): Promise<void> {},
+		...(hasInit && {
+			async init() {
+				if (initShouldFail) {
+					throw new Error('Init failed');
+				}
+			},
+		}),
+	});
+
+	beforeEach(() => {
+		jest.clearAllMocks();
+
+		mockLogger = {
+			debug: jest.fn(),
+			info: jest.fn(),
+			warn: jest.fn(),
+			error: jest.fn(),
+		} as unknown as jest.Mocked<Logger>;
+
+		mockMetadata = {
+			getClasses: jest.fn(),
+		} as unknown as jest.Mocked<CredentialResolverEntryMetadata>;
+
+		registry = new CredentialResolverRegistry(mockMetadata, mockLogger);
+	});
+
+	describe('init', () => {
+		describe('successful registration', () => {
+			it('should register a single resolver', async () => {
+				const mockResolver = createMockResolver('test.resolver');
+				const MockResolverClass = jest.fn(() => mockResolver) as unknown as CredentialResolverClass;
+				Object.defineProperty(MockResolverClass, 'name', { value: 'TestResolver' });
+
+				mockMetadata.getClasses.mockReturnValue([MockResolverClass]);
+				jest.spyOn(Container, 'get').mockReturnValue(mockResolver);
+
+				await registry.init();
+
+				expect(mockLogger.debug).toHaveBeenCalledWith('Registering 1 credential resolvers.');
+				expect(registry.getResolverByName('test.resolver')).toBe(mockResolver);
+				expect(registry.getAllResolvers()).toEqual([mockResolver]);
+			});
+
+			it('should register multiple resolvers', async () => {
+				const resolver1 = createMockResolver('oauth.resolver');
+				const resolver2 = createMockResolver('stub.resolver');
+				const resolver3 = createMockResolver('api.resolver');
+
+				const MockClass1 = jest.fn(() => resolver1) as unknown as CredentialResolverClass;
+				const MockClass2 = jest.fn(() => resolver2) as unknown as CredentialResolverClass;
+				const MockClass3 = jest.fn(() => resolver3) as unknown as CredentialResolverClass;
+
+				Object.defineProperty(MockClass1, 'name', { value: 'OAuthResolver' });
+				Object.defineProperty(MockClass2, 'name', { value: 'StubResolver' });
+				Object.defineProperty(MockClass3, 'name', { value: 'ApiResolver' });
+
+				mockMetadata.getClasses.mockReturnValue([MockClass1, MockClass2, MockClass3]);
+
+				const containerGetSpy = jest.spyOn(Container, 'get');
+				containerGetSpy.mockReturnValueOnce(resolver1);
+				containerGetSpy.mockReturnValueOnce(resolver2);
+				containerGetSpy.mockReturnValueOnce(resolver3);
+
+				await registry.init();
+
+				expect(mockLogger.debug).toHaveBeenCalledWith('Registering 3 credential resolvers.');
+				expect(registry.getAllResolvers()).toHaveLength(3);
+				expect(registry.getResolverByName('oauth.resolver')).toBe(resolver1);
+				expect(registry.getResolverByName('stub.resolver')).toBe(resolver2);
+				expect(registry.getResolverByName('api.resolver')).toBe(resolver3);
+			});
+
+			it('should handle empty resolver list', async () => {
+				mockMetadata.getClasses.mockReturnValue([]);
+
+				await registry.init();
+
+				expect(mockLogger.debug).toHaveBeenCalledWith('Registering 0 credential resolvers.');
+				expect(registry.getAllResolvers()).toEqual([]);
+			});
+
+			it('should call init() method on resolvers that have it', async () => {
+				const mockResolver = createMockResolver('test.resolver', true);
+				const initSpy = jest.spyOn(mockResolver, 'init' as any);
+
+				const MockResolverClass = jest.fn(() => mockResolver) as unknown as CredentialResolverClass;
+				Object.defineProperty(MockResolverClass, 'name', { value: 'TestResolver' });
+
+				mockMetadata.getClasses.mockReturnValue([MockResolverClass]);
+				jest.spyOn(Container, 'get').mockReturnValue(mockResolver);
+
+				await registry.init();
+
+				expect(initSpy).toHaveBeenCalled();
+				expect(registry.getResolverByName('test.resolver')).toBe(mockResolver);
+			});
+
+			it('should clear previous registrations on re-init', async () => {
+				const resolver1 = createMockResolver('resolver1');
+				const resolver2 = createMockResolver('resolver2');
+
+				const MockClass1 = jest.fn(() => resolver1) as unknown as CredentialResolverClass;
+				const MockClass2 = jest.fn(() => resolver2) as unknown as CredentialResolverClass;
+
+				Object.defineProperty(MockClass1, 'name', { value: 'Resolver1' });
+				Object.defineProperty(MockClass2, 'name', { value: 'Resolver2' });
+
+				// First init with resolver1
+				mockMetadata.getClasses.mockReturnValue([MockClass1]);
+				jest.spyOn(Container, 'get').mockReturnValue(resolver1);
+				await registry.init();
+
+				expect(registry.getAllResolvers()).toEqual([resolver1]);
+
+				// Re-init with resolver2
+				mockMetadata.getClasses.mockReturnValue([MockClass2]);
+				jest.spyOn(Container, 'get').mockReturnValue(resolver2);
+				await registry.init();
+
+				expect(registry.getAllResolvers()).toEqual([resolver2]);
+				expect(registry.getResolverByName('resolver1')).toBeUndefined();
+			});
+		});
+
+		describe('error handling', () => {
+			it('should skip resolver when instantiation fails', async () => {
+				const MockResolverClass = jest.fn() as unknown as CredentialResolverClass;
+				Object.defineProperty(MockResolverClass, 'name', { value: 'FailingResolver' });
+
+				mockMetadata.getClasses.mockReturnValue([MockResolverClass]);
+				jest.spyOn(Container, 'get').mockImplementation(() => {
+					throw new Error('Instantiation failed');
+				});
+
+				await registry.init();
+
+				expect(mockLogger.error).toHaveBeenCalledWith(
+					'Failed to instantiate credential resolver class "FailingResolver": Instantiation failed',
+					{ error: expect.any(Error) },
+				);
+				expect(registry.getAllResolvers()).toEqual([]);
+			});
+
+			it('should skip resolver when init() fails', async () => {
+				const mockResolver = createMockResolver('test.resolver', true, true);
+				const MockResolverClass = jest.fn(() => mockResolver) as unknown as CredentialResolverClass;
+				Object.defineProperty(MockResolverClass, 'name', { value: 'TestResolver' });
+
+				mockMetadata.getClasses.mockReturnValue([MockResolverClass]);
+				jest.spyOn(Container, 'get').mockReturnValue(mockResolver);
+
+				await registry.init();
+
+				expect(mockLogger.error).toHaveBeenCalledWith(
+					'Failed to initialize credential resolver "test.resolver": Init failed',
+					{ error: expect.any(Error) },
+				);
+				expect(registry.getResolverByName('test.resolver')).toBeUndefined();
+				expect(registry.getAllResolvers()).toEqual([]);
+			});
+
+			it('should skip duplicate resolver names and log warning', async () => {
+				const MockClass1 = jest.fn() as unknown as CredentialResolverClass;
+				const MockClass2 = jest.fn() as unknown as CredentialResolverClass;
+
+				Object.defineProperty(MockClass1, 'name', { value: 'FirstResolver' });
+				Object.defineProperty(MockClass2, 'name', { value: 'SecondResolver' });
+
+				const resolver1 = createMockResolver('duplicate.name');
+				const resolver2 = createMockResolver('duplicate.name');
+
+				// Set proper constructor reference so constructor.name works
+				Object.defineProperty(resolver1, 'constructor', { value: MockClass1 });
+				Object.defineProperty(resolver2, 'constructor', { value: MockClass2 });
+
+				mockMetadata.getClasses.mockReturnValue([MockClass1, MockClass2]);
+
+				const containerGetSpy = jest.spyOn(Container, 'get');
+				containerGetSpy.mockReturnValueOnce(resolver1);
+				containerGetSpy.mockReturnValueOnce(resolver2);
+
+				await registry.init();
+
+				expect(mockLogger.warn).toHaveBeenCalledWith(
+					'Credential resolver with name "duplicate.name" is already registered. Conflicting classes are "FirstResolver" and "SecondResolver". Skipping the latter.',
+				);
+				expect(registry.getAllResolvers()).toHaveLength(1);
+				expect(registry.getResolverByName('duplicate.name')).toBe(resolver1);
+			});
+
+			it('should continue registering other resolvers when one fails', async () => {
+				const resolver1 = createMockResolver('success.resolver');
+				const resolver3 = createMockResolver('another.success');
+
+				const MockClass1 = jest.fn(() => resolver1) as unknown as CredentialResolverClass;
+				const MockClass2 = jest.fn() as unknown as CredentialResolverClass;
+				const MockClass3 = jest.fn(() => resolver3) as unknown as CredentialResolverClass;
+
+				Object.defineProperty(MockClass1, 'name', { value: 'SuccessResolver' });
+				Object.defineProperty(MockClass2, 'name', { value: 'FailingResolver' });
+				Object.defineProperty(MockClass3, 'name', { value: 'AnotherSuccessResolver' });
+
+				mockMetadata.getClasses.mockReturnValue([MockClass1, MockClass2, MockClass3]);
+
+				const containerGetSpy = jest.spyOn(Container, 'get');
+				containerGetSpy.mockReturnValueOnce(resolver1);
+				containerGetSpy.mockImplementationOnce(() => {
+					throw new Error('Failed');
+				});
+				containerGetSpy.mockReturnValueOnce(resolver3);
+
+				await registry.init();
+
+				expect(registry.getAllResolvers()).toHaveLength(2);
+				expect(registry.getResolverByName('success.resolver')).toBe(resolver1);
+				expect(registry.getResolverByName('another.success')).toBe(resolver3);
+			});
+		});
+	});
+
+	describe('getResolverByName', () => {
+		it('should return resolver by name', async () => {
+			const mockResolver = createMockResolver('test.resolver');
+			const MockResolverClass = jest.fn(() => mockResolver) as unknown as CredentialResolverClass;
+			Object.defineProperty(MockResolverClass, 'name', { value: 'TestResolver' });
+
+			mockMetadata.getClasses.mockReturnValue([MockResolverClass]);
+			jest.spyOn(Container, 'get').mockReturnValue(mockResolver);
+
+			await registry.init();
+
+			const result = registry.getResolverByName('test.resolver');
+
+			expect(result).toBe(mockResolver);
+		});
+
+		it('should return undefined for non-existent resolver', async () => {
+			mockMetadata.getClasses.mockReturnValue([]);
+			await registry.init();
+
+			const result = registry.getResolverByName('non.existent');
+
+			expect(result).toBeUndefined();
+		});
+	});
+
+	describe('getAllResolvers', () => {
+		it('should return all registered resolvers', async () => {
+			const resolver1 = createMockResolver('resolver1');
+			const resolver2 = createMockResolver('resolver2');
+
+			const MockClass1 = jest.fn(() => resolver1) as unknown as CredentialResolverClass;
+			const MockClass2 = jest.fn(() => resolver2) as unknown as CredentialResolverClass;
+
+			Object.defineProperty(MockClass1, 'name', { value: 'Resolver1' });
+			Object.defineProperty(MockClass2, 'name', { value: 'Resolver2' });
+
+			mockMetadata.getClasses.mockReturnValue([MockClass1, MockClass2]);
+
+			const containerGetSpy = jest.spyOn(Container, 'get');
+			containerGetSpy.mockReturnValueOnce(resolver1);
+			containerGetSpy.mockReturnValueOnce(resolver2);
+
+			await registry.init();
+
+			const result = registry.getAllResolvers();
+
+			expect(result).toHaveLength(2);
+			expect(result).toContain(resolver1);
+			expect(result).toContain(resolver2);
+		});
+
+		it('should return empty array when no resolvers registered', async () => {
+			mockMetadata.getClasses.mockReturnValue([]);
+			await registry.init();
+
+			const result = registry.getAllResolvers();
+
+			expect(result).toEqual([]);
+		});
+
+		it('should not allow mutation of internal map', async () => {
+			const mockResolver = createMockResolver('test.resolver');
+			const MockResolverClass = jest.fn(() => mockResolver) as unknown as CredentialResolverClass;
+			Object.defineProperty(MockResolverClass, 'name', { value: 'TestResolver' });
+
+			mockMetadata.getClasses.mockReturnValue([MockResolverClass]);
+			jest.spyOn(Container, 'get').mockReturnValue(mockResolver);
+
+			await registry.init();
+
+			const resolvers = registry.getAllResolvers();
+			resolvers.pop(); // Try to mutate returned array
+
+			// Original should still have the resolver
+			expect(registry.getAllResolvers()).toHaveLength(1);
+		});
+	});
+});
diff --git a/packages/cli/src/modules/dynamic-credentials.ee/services/credential-resolver-registry.service.ts b/packages/cli/src/modules/dynamic-credentials.ee/services/credential-resolver-registry.service.ts
new file mode 100644
index 00000000000..03012cb3966
--- /dev/null
+++ b/packages/cli/src/modules/dynamic-credentials.ee/services/credential-resolver-registry.service.ts
@@ -0,0 +1,78 @@
+import { Logger } from '@n8n/backend-common';
+import { CredentialResolverEntryMetadata, ICredentialResolver } from '@n8n/decorators';
+import { Container, Service } from '@n8n/di';
+
+/**
+ * Registry service for discovering, instantiating, and managing credential resolver implementations.
+ * Automatically discovers all classes decorated with @CredentialResolver() and makes them available by name.
+ */
+@Service()
+export class CredentialResolverRegistry {
+	/** Map of resolver names to resolver instances */
+	private resolverMap: Map<string, ICredentialResolver> = new Map();
+
+	constructor(
+		private readonly credentialResolverEntryMetadata: CredentialResolverEntryMetadata,
+		private readonly logger: Logger,
+	) {}
+
+	/**
+	 * Discovers and registers all credential resolver implementations.
+	 * Instantiates each resolver class, calls optional init() method, and registers by metadata.name.
+	 * Skips resolvers that fail instantiation, initialization, or have duplicate names.
+	 */
+	async init() {
+		this.resolverMap.clear();
+
+		const resolverClasses = this.credentialResolverEntryMetadata.getClasses();
+		this.logger.debug(`Registering ${resolverClasses.length} credential resolvers.`);
+
+		for (const ResolverClass of resolverClasses) {
+			let resolver: ICredentialResolver;
+			try {
+				resolver = Container.get(ResolverClass);
+			} catch (error) {
+				this.logger.error(
+					`Failed to instantiate credential resolver class "${ResolverClass.name}": ${(error as Error).message}`,
+					{ error },
+				);
+				continue;
+			}
+
+			if (this.resolverMap.has(resolver.metadata.name)) {
+				this.logger.warn(
+					`Credential resolver with name "${resolver.metadata.name}" is already registered. Conflicting classes are "${this.resolverMap.get(resolver.metadata.name)?.constructor.name}" and "${ResolverClass.name}". Skipping the latter.`,
+				);
+				continue;
+			}
+
+			if (resolver.init) {
+				try {
+					await resolver.init();
+				} catch (error) {
+					this.logger.error(
+						`Failed to initialize credential resolver "${resolver.metadata.name}": ${(error as Error).message}`,
+						{ error },
+					);
+					continue;
+				}
+			}
+			this.resolverMap.set(resolver.metadata.name, resolver);
+		}
+	}
+
+	/**
+	 * Retrieves a registered resolver by its metadata name.
+	 * @returns The resolver instance, or undefined if not found
+	 */
+	getResolverByName(name: string): ICredentialResolver | undefined {
+		return this.resolverMap.get(name);
+	}
+
+	/**
+	 * Returns all successfully registered resolver instances.
+	 */
+	getAllResolvers(): ICredentialResolver[] {
+		return Array.from(this.resolverMap.values());
+	}
+}
diff --git a/packages/cli/src/modules/dynamic-credentials.ee/services/index.ts b/packages/cli/src/modules/dynamic-credentials.ee/services/index.ts
new file mode 100644
index 00000000000..342ab6b6b4f
--- /dev/null
+++ b/packages/cli/src/modules/dynamic-credentials.ee/services/index.ts
@@ -0,0 +1 @@
+export * from './credential-resolver-registry.service';

From b8fa03bf6d545dc19856a244fa86a9cd05644b31 Mon Sep 17 00:00:00 2001
From: mfsiega <93014743+mfsiega@users.noreply.github.com>
Date: Tue, 2 Dec 2025 11:04:26 +0100
Subject: [PATCH 012/167] fix(core): Use the structured destination node in
 test webhook registration (#22456)

---
 ...test-webhook-registrations.service.test.ts | 15 +++++++-
 .../webhooks/__tests__/test-webhooks.test.ts  |  6 ++-
 .../test-webhook-registrations.service.ts     | 38 +++++++++++++++----
 packages/cli/src/webhooks/test-webhooks.ts    | 13 ++-----
 4 files changed, 53 insertions(+), 19 deletions(-)

diff --git a/packages/cli/src/webhooks/__tests__/test-webhook-registrations.service.test.ts b/packages/cli/src/webhooks/__tests__/test-webhook-registrations.service.test.ts
index b3b4515d68e..dbc79aa7cdd 100644
--- a/packages/cli/src/webhooks/__tests__/test-webhook-registrations.service.test.ts
+++ b/packages/cli/src/webhooks/__tests__/test-webhook-registrations.service.test.ts
@@ -13,6 +13,7 @@ describe('TestWebhookRegistrationsService', () => {
 	);
 
 	const registration = mock<TestWebhookRegistration>({
+		version: 1,
 		webhook: { httpMethod: 'GET', path: 'hello', webhookId: undefined },
 	});
 
@@ -59,6 +60,15 @@ describe('TestWebhookRegistrationsService', () => {
 
 			await expect(promise).resolves.toBeUndefined();
 		});
+
+		test('should skip registrations with outdated version', async () => {
+			const { version, ...outdatedRegistration } = registration; // remove the version property to simulate outdated registration
+			cacheService.getHashValue.mockResolvedValueOnce(outdatedRegistration);
+
+			const promise = registrations.get(webhookKey);
+
+			await expect(promise).resolves.toBeUndefined();
+		});
 	});
 
 	describe('getAllKeys()', () => {
@@ -73,7 +83,10 @@ describe('TestWebhookRegistrationsService', () => {
 
 	describe('getAllRegistrations()', () => {
 		test('should retrieve all test webhook registrations', async () => {
-			cacheService.getHash.mockResolvedValueOnce({ [webhookKey]: registration });
+			cacheService.getHash.mockResolvedValueOnce({
+				[webhookKey]: registration,
+				ANOTHER_KEY: { invalid: 'data' }, // invalid registration to test filtering
+			});
 
 			const result = await registrations.getAllRegistrations();
 
diff --git a/packages/cli/src/webhooks/__tests__/test-webhooks.test.ts b/packages/cli/src/webhooks/__tests__/test-webhooks.test.ts
index c4f4067e841..aa4a7e8bea3 100644
--- a/packages/cli/src/webhooks/__tests__/test-webhooks.test.ts
+++ b/packages/cli/src/webhooks/__tests__/test-webhooks.test.ts
@@ -186,7 +186,9 @@ describe('TestWebhooks', () => {
 
 	describe('deactivateWebhooks()', () => {
 		test('should add additional data to workflow', async () => {
-			registrations.getAllRegistrations.mockResolvedValue([{ workflowEntity, webhook }]);
+			registrations.getAllRegistrations.mockResolvedValue([
+				{ version: 1, workflowEntity, webhook },
+			]);
 
 			const workflow = testWebhooks.toWorkflow(workflowEntity);
 
@@ -229,6 +231,7 @@ describe('TestWebhooks', () => {
 			registrations.getRegistrationsHash.mockImplementation(async () => {
 				return {
 					[registrations.toKey(webhookData)]: {
+						version: 1,
 						workflowEntity: mock<WorkflowEntity>(),
 						webhook: webhookData,
 					},
@@ -256,6 +259,7 @@ describe('TestWebhooks', () => {
 			registrations.getRegistrationsHash.mockImplementation(async () => {
 				return {
 					[registrations.toKey(webhookData)]: {
+						version: 1,
 						workflowEntity: mock<WorkflowEntity>(),
 						webhook: webhookData as IWebhookData,
 					},
diff --git a/packages/cli/src/webhooks/test-webhook-registrations.service.ts b/packages/cli/src/webhooks/test-webhook-registrations.service.ts
index eeaa137b467..cfdbc1143b4 100644
--- a/packages/cli/src/webhooks/test-webhook-registrations.service.ts
+++ b/packages/cli/src/webhooks/test-webhook-registrations.service.ts
@@ -1,18 +1,35 @@
 import { Service } from '@n8n/di';
 import { InstanceSettings } from 'n8n-core';
-import type { IWebhookData, IWorkflowBase } from 'n8n-workflow';
+import type { IWebhookData, IWorkflowBase, IDestinationNode } from 'n8n-workflow';
 
 import { TEST_WEBHOOK_TIMEOUT, TEST_WEBHOOK_TIMEOUT_BUFFER } from '@/constants';
 import { CacheService } from '@/services/cache/cache.service';
+import { isObjectLiteral } from '@n8n/backend-common';
+
+const TEST_WEBHOOK_REGISTRATION_VERSION = 1;
 
 export type TestWebhookRegistration = {
+	// A simple versioning to be safe. If you make a breaking change in the type, bump the version.
+	// Any old records in the cache will just be ignored.
+	version: typeof TEST_WEBHOOK_REGISTRATION_VERSION;
 	pushRef?: string;
 	workflowEntity: IWorkflowBase;
-	// TODO: update this type to close CAT-1265 properly
-	destinationNode?: string;
+	destinationNode?: IDestinationNode;
 	webhook: IWebhookData;
 };
 
+// Type guard for TestWebhookRegistration.
+// NOTE: we could have a more robust validation, but this is probably good enough for now.
+function isTestWebhookRegistration(obj: unknown): obj is TestWebhookRegistration {
+	if (!isObjectLiteral(obj)) {
+		return false;
+	}
+
+	if (!('version' in obj)) return false;
+
+	return obj.version === TEST_WEBHOOK_REGISTRATION_VERSION;
+}
+
 @Service()
 export class TestWebhookRegistrationsService {
 	constructor(
@@ -52,8 +69,9 @@ export class TestWebhookRegistrationsService {
 		}
 	}
 
-	async get(key: string) {
-		return await this.cacheService.getHashValue<TestWebhookRegistration>(this.cacheKey, key);
+	async get(key: string): Promise<TestWebhookRegistration | undefined> {
+		const val = await this.cacheService.getHashValue(this.cacheKey, key);
+		return isTestWebhookRegistration(val) ? val : undefined;
 	}
 
 	async getAllKeys() {
@@ -69,11 +87,17 @@ export class TestWebhookRegistrationsService {
 
 		if (!hash) return [];
 
-		return Object.values(hash);
+		return Object.values(hash).filter(isTestWebhookRegistration);
 	}
 
 	async getRegistrationsHash() {
-		return await this.cacheService.getHash<TestWebhookRegistration>(this.cacheKey);
+		const val = await this.cacheService.getHash<TestWebhookRegistration>(this.cacheKey);
+		for (const key in val) {
+			if (!isTestWebhookRegistration(val[key])) {
+				delete val[key];
+			}
+		}
+		return val;
 	}
 
 	async deregisterAll() {
diff --git a/packages/cli/src/webhooks/test-webhooks.ts b/packages/cli/src/webhooks/test-webhooks.ts
index 4f340a88915..466c2465152 100644
--- a/packages/cli/src/webhooks/test-webhooks.ts
+++ b/packages/cli/src/webhooks/test-webhooks.ts
@@ -105,14 +105,7 @@ export class TestWebhooks implements IWebhookManager {
 			});
 		}
 
-		const { pushRef, workflowEntity, webhook: testWebhook } = registration;
-		// TODO(CAT-1265): support destination node mode in test webhook registration.
-		const destinationNode: IDestinationNode | undefined = registration.destinationNode
-			? {
-					nodeName: registration.destinationNode,
-					mode: 'inclusive',
-				}
-			: undefined;
+		const { pushRef, workflowEntity, webhook: testWebhook, destinationNode } = registration;
 
 		const workflow = this.toWorkflow(workflowEntity);
 
@@ -352,11 +345,11 @@ export class TestWebhooks implements IWebhookManager {
 
 			cacheableWebhook.userId = userId;
 
-			// TODO(CAT-1265): support destination node mode in test webhook registration.
 			const registration: TestWebhookRegistration = {
+				version: 1,
 				pushRef,
 				workflowEntity,
-				destinationNode: destinationNode?.nodeName,
+				destinationNode,
 				webhook: cacheableWebhook as IWebhookData,
 			};
 

From d241921bd7e6783b98a1f7498927b652141348a1 Mon Sep 17 00:00:00 2001
From: Suguru Inoue <suguru@n8n.io>
Date: Tue, 2 Dec 2025 11:17:04 +0100
Subject: [PATCH 013/167] fix(editor): Make chat credential picker work
 (no-changelog) (#22594)

---
 .../components/CredentialPicker/CredentialPicker.vue          | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/frontend/editor-ui/src/features/credentials/components/CredentialPicker/CredentialPicker.vue b/packages/frontend/editor-ui/src/features/credentials/components/CredentialPicker/CredentialPicker.vue
index 472bd43cef7..3940ce4f7e7 100644
--- a/packages/frontend/editor-ui/src/features/credentials/components/CredentialPicker/CredentialPicker.vue
+++ b/packages/frontend/editor-ui/src/features/credentials/components/CredentialPicker/CredentialPicker.vue
@@ -31,7 +31,9 @@ const availableCredentials = computed(() => {
 	const credByType = credentialsStore.getCredentialsByType(props.credentialType);
 	// Only show personal credentials since templates are created in personal by default
 	// Here, we don't care about sharing because credentials cannot be shared with personal project
-	return credByType.filter((credential) => credential.homeProject?.type === 'personal');
+	return credByType.filter(
+		(credential) => !credential.homeProject || credential.homeProject?.type === 'personal',
+	);
 });
 
 const credentialOptions = computed(() => {

From 00d33ed23ac35df03894514c01faff121489fd8b Mon Sep 17 00:00:00 2001
From: Tomi Turtiainen <10324676+tomi@users.noreply.github.com>
Date: Tue, 2 Dec 2025 13:41:26 +0200
Subject: [PATCH 014/167] chore: Remove mistakenly committed file (#22601)

---
 nsjail | 1 -
 1 file changed, 1 deletion(-)
 delete mode 160000 nsjail

diff --git a/nsjail b/nsjail
deleted file mode 160000
index c168180d97f..00000000000
--- a/nsjail
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c168180d97f4ee8107d6fbfc0ff94f8ebce7e0d0

From 26e2754fc03647e7b9bf19bd06013ab9ba41d4ea Mon Sep 17 00:00:00 2001
From: Jaakko Husso <jaakko@n8n.io>
Date: Tue, 2 Dec 2025 14:54:34 +0200
Subject: [PATCH 015/167] fix(core): Make chat hub work correctly with
 multi-main (no-changelog) (#22564)

---
 .../src/credentials/credentials.service.ts    |  6 ++
 .../chat-hub/chat-hub-credentials.service.ts  |  6 +-
 .../src/modules/chat-hub/chat-hub.service.ts  | 79 ++++++++++++++-----
 3 files changed, 69 insertions(+), 22 deletions(-)

diff --git a/packages/cli/src/credentials/credentials.service.ts b/packages/cli/src/credentials/credentials.service.ts
index fa9fb18b07a..1e043792c46 100644
--- a/packages/cli/src/credentials/credentials.service.ts
+++ b/packages/cli/src/credentials/credentials.service.ts
@@ -387,6 +387,12 @@ export class CredentialsService {
 			}));
 	}
 
+	async findAllGlobalCredentialIds(includeData: boolean = false): Promise<CredentialsEntity[]> {
+		const globalCredentials =
+			await this.credentialsRepository.findAllGlobalCredentials(includeData);
+		return globalCredentials;
+	}
+
 	async findAllCredentialIdsForWorkflow(workflowId: string): Promise<CredentialsEntity[]> {
 		// If the workflow is owned by a personal project and the owner of the
 		// project has global read permissions it can use all personal credentials.
diff --git a/packages/cli/src/modules/chat-hub/chat-hub-credentials.service.ts b/packages/cli/src/modules/chat-hub/chat-hub-credentials.service.ts
index 72511e7798e..891e6a54ad5 100644
--- a/packages/cli/src/modules/chat-hub/chat-hub-credentials.service.ts
+++ b/packages/cli/src/modules/chat-hub/chat-hub-credentials.service.ts
@@ -85,10 +85,12 @@ export class ChatHubCredentialsService {
 			throw new ForbiddenError('Missing owner project for the workflow');
 		}
 
-		const allCredentials =
+		const workflowCredentials =
 			await this.credentialsService.findAllCredentialIdsForWorkflow(workflowId);
+		const globalCredentials = await this.credentialsService.findAllGlobalCredentialIds();
+		workflowCredentials.push.apply(workflowCredentials, globalCredentials);
 
-		const credential = allCredentials.find((c) => c.id === credentialId);
+		const credential = workflowCredentials.find((c) => c.id === credentialId);
 		if (!credential) {
 			throw new ForbiddenError("You don't have access to the provided credentials");
 		}
diff --git a/packages/cli/src/modules/chat-hub/chat-hub.service.ts b/packages/cli/src/modules/chat-hub/chat-hub.service.ts
index e3b00997034..73b86b58b10 100644
--- a/packages/cli/src/modules/chat-hub/chat-hub.service.ts
+++ b/packages/cli/src/modules/chat-hub/chat-hub.service.ts
@@ -24,7 +24,7 @@ import { ExecutionRepository, IExecutionResponse, User, WorkflowRepository, In }
 import { Service } from '@n8n/di';
 import type { EntityManager } from '@n8n/typeorm';
 import type { Response } from 'express';
-import { ErrorReporter } from 'n8n-core';
+import { ErrorReporter, InstanceSettings } from 'n8n-core';
 import {
 	CHAT_TRIGGER_NODE_TYPE,
 	OperationalError,
@@ -32,7 +32,6 @@ import {
 	type INodeCredentials,
 	type IWorkflowBase,
 	type IWorkflowExecuteAdditionalData,
-	type IRun,
 	jsonParse,
 	jsonStringify,
 	StructuredChunk,
@@ -43,6 +42,7 @@ import {
 	type IBinaryData,
 	createRunExecutionData,
 	WorkflowExecuteMode,
+	ExecutionStatus,
 } from 'n8n-workflow';
 
 import { ActiveExecutions } from '@/active-executions';
@@ -79,6 +79,9 @@ import { ChatHubMessageRepository } from './chat-message.repository';
 import { ChatHubSessionRepository } from './chat-session.repository';
 import { interceptResponseWrites, createStructuredChunkAggregator } from './stream-capturer';
 
+const EXECUTION_POLL_INTERVAL = 1000;
+const EXECUTION_FINISHED_STATUSES: ExecutionStatus[] = ['canceled', 'crashed', 'error', 'success'];
+
 @Service()
 export class ChatHubService {
 	constructor(
@@ -100,6 +103,7 @@ export class ChatHubService {
 		private readonly chatHubWorkflowService: ChatHubWorkflowService,
 		private readonly chatHubSettingsService: ChatHubSettingsService,
 		private readonly chatHubAttachmentService: ChatHubAttachmentService,
+		private readonly instanceSettings: InstanceSettings,
 	) {}
 
 	async getModels(
@@ -1628,6 +1632,57 @@ export class ChatHubService {
 			throw new OperationalError('There was a problem starting the chat execution.');
 		}
 
+		await this.waitForExecutionCompletion(executionId);
+	}
+
+	private async waitForExecutionCompletion(executionId: string): Promise<void> {
+		if (this.instanceSettings.isMultiMain) {
+			return await this.waitForExecutionPoller(executionId);
+		} else {
+			return await this.waitForExecutionPromise(executionId);
+		}
+	}
+
+	private async waitForExecutionPoller(executionId: string): Promise<void> {
+		return await new Promise<void>((resolve, reject) => {
+			const poller = setInterval(async () => {
+				try {
+					const result = await this.executionRepository.findSingleExecution(executionId, {
+						includeData: false,
+						unflattenData: false,
+					});
+
+					// Stop polling when execution is done (or missing if instance doesn't save executions)
+					if (!result || EXECUTION_FINISHED_STATUSES.includes(result.status)) {
+						this.logger.debug(
+							`Execution ${executionId} finished with status ${result?.status ?? 'missing'}`,
+						);
+						clearInterval(poller);
+						resolve();
+					}
+				} catch (error) {
+					this.logger.error(`Stopping polling for execution ${executionId} due to error.`);
+					clearInterval(poller);
+
+					if (error instanceof Error) {
+						this.logger.error(`Error while polling execution ${executionId}: ${error.message}`, {
+							error,
+						});
+					} else {
+						this.logger.error(`Unknown error while polling execution ${executionId}`, { error });
+					}
+
+					if (error instanceof Error) {
+						reject(error);
+					} else {
+						reject(new Error('Unknown error while polling execution status'));
+					}
+				}
+			}, EXECUTION_POLL_INTERVAL);
+		});
+	}
+
+	private async waitForExecutionPromise(executionId: string): Promise<void> {
 		try {
 			// Wait until the execution finishes (or errors) so that we don't delete the workflow too early
 			const result = await this.activeExecutions.getPostExecutePromise(executionId);
@@ -1907,7 +1962,7 @@ export class ChatHubService {
 		workflowData: IWorkflowBase,
 		executionData: IRunExecutionData,
 	): Promise<string | null> {
-		const started = await this.workflowExecutionService.executeChatWorkflow(
+		const { executionId } = await this.workflowExecutionService.executeChatWorkflow(
 			workflowData,
 			executionData,
 			user,
@@ -1916,23 +1971,7 @@ export class ChatHubService {
 			'chat',
 		);
 
-		const executionId = started.executionId;
-		if (!executionId) {
-			throw new OperationalError('There was a problem starting the chat execution.');
-		}
-
-		let run: IRun | undefined;
-		try {
-			run = await this.activeExecutions.getPostExecutePromise(executionId);
-			if (!run) {
-				throw new OperationalError('There was a problem executing the chat workflow.');
-			}
-		} catch (error: unknown) {
-			if (error instanceof ManualExecutionCancelledError) {
-				return null;
-			}
-			throw error;
-		}
+		await this.waitForExecutionCompletion(executionId);
 
 		const execution = await this.executionRepository.findWithUnflattenedData(executionId, [
 			workflowData.id,

From a3f00386bd45568f8993ca3b646c3e6eb0fbfd36 Mon Sep 17 00:00:00 2001
From: Andreas Fitzek <andreas.fitzek@n8n.io>
Date: Tue, 2 Dec 2025 14:15:31 +0100
Subject: [PATCH 016/167] chore(core): Implement stub credential resolver for
 development (#22597)

---
 .../__tests__/resolver-contract-tests.ts      | 327 ++++++++++++++++++
 .../stub-credential-resolver.test.ts          |  74 ++++
 .../credential-resolvers/index.ts             |   1 +
 .../stub-credential-resolver.ts               | 110 ++++++
 .../dynamic-credentials.module.ts             |   1 +
 5 files changed, 513 insertions(+)
 create mode 100644 packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/__tests__/resolver-contract-tests.ts
 create mode 100644 packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/__tests__/stub-credential-resolver.test.ts
 create mode 100644 packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/index.ts
 create mode 100644 packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/stub-credential-resolver.ts

diff --git a/packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/__tests__/resolver-contract-tests.ts b/packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/__tests__/resolver-contract-tests.ts
new file mode 100644
index 00000000000..803e85ef93b
--- /dev/null
+++ b/packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/__tests__/resolver-contract-tests.ts
@@ -0,0 +1,327 @@
+import type { CredentialResolverConfiguration, ICredentialResolver } from '@n8n/decorators';
+import {
+	CredentialResolverDataNotFoundError,
+	CredentialResolverValidationError,
+} from '@n8n/decorators';
+import type { ICredentialContext, ICredentialDataDecryptedObject } from 'n8n-workflow';
+
+/**
+ * Configuration for resolver contract tests
+ */
+export interface ResolverContractTestConfig {
+	/** Factory function to create a fresh resolver instance for each test */
+	createResolver: () => ICredentialResolver | Promise<ICredentialResolver>;
+
+	/** Optional async setup function called before all tests */
+	beforeAll?: () => Promise<void>;
+
+	/** Optional async teardown function called after all tests */
+	afterAll?: () => Promise<void>;
+
+	/** Optional cleanup function called after each test */
+	afterEach?: () => Promise<void>;
+
+	/** Test cases for options validation */
+	validationTests: {
+		/** Valid options that should pass validation */
+		validOptions: Array<[string, CredentialResolverConfiguration]>;
+		/** Invalid options that should fail validation */
+		invalidOptions: Array<[string, CredentialResolverConfiguration]>;
+	};
+}
+
+/**
+ * Helper functions for creating test data
+ */
+export const testHelpers = {
+	/** Creates a test credential context with the given identity */
+	createContext: (identity: string): ICredentialContext => ({
+		identity,
+		version: 1,
+	}),
+
+	/** Creates test credential data */
+	createCredentialData: (data: Record<string, unknown> = {}): ICredentialDataDecryptedObject => ({
+		apiKey: 'test-key-123',
+		apiSecret: 'test-secret-456',
+		...data,
+	}),
+
+	/** Generates a random credential ID for isolation */
+	randomCredentialId: (): string => `cred-${Math.random().toString(36).substring(7)}`,
+
+	/** Generates a random identity for isolation */
+	randomIdentity: (): string => `identity-${Math.random().toString(36).substring(7)}`,
+};
+
+/**
+ * Reusable test suite for ICredentialResolver contract compliance.
+ * Tests that any resolver implementation correctly implements the interface contract.
+ *
+ * @example
+ * describe('MyResolver', () => {
+ *   testCredentialResolverContract({
+ *     createResolver: () => new MyResolver(deps),
+ *     validationTests: {
+ *       validOptions: [{ endpoint: 'https://api.example.com' }],
+ *       invalidOptions: [{ options: { endpoint: 123 }, description: 'invalid endpoint type' }],
+ *     },
+ *   });
+ * });
+ */
+export function testCredentialResolverContract(config: ResolverContractTestConfig) {
+	const { createResolver, validationTests } = config;
+
+	let resolver: ICredentialResolver;
+
+	describe('ICredentialResolver contract', () => {
+		beforeAll(async () => {
+			if (config.beforeAll) {
+				await config.beforeAll();
+			}
+		});
+
+		afterAll(async () => {
+			if (config.afterAll) {
+				await config.afterAll();
+			}
+		});
+
+		beforeEach(async () => {
+			resolver = await createResolver();
+		});
+
+		afterEach(async () => {
+			if (config.afterEach) {
+				await config.afterEach();
+			}
+		});
+
+		describe('validateOptions', () => {
+			it.each(validationTests.validOptions)(
+				'should accept valid options: %s',
+				async (_, options) => {
+					await expect(resolver.validateOptions(options)).resolves.not.toThrow();
+				},
+			);
+
+			it.each(validationTests.invalidOptions)(
+				'should reject invalid options: %s',
+				async (_, options) => {
+					await expect(resolver.validateOptions(options)).rejects.toThrow(
+						CredentialResolverValidationError,
+					);
+				},
+			);
+		});
+
+		describe('getSecret', () => {
+			it('should throw CredentialResolverDataNotFoundError when data does not exist', async () => {
+				const credentialId = testHelpers.randomCredentialId();
+				const context = testHelpers.createContext(testHelpers.randomIdentity());
+				const options = validationTests.validOptions[0][1];
+
+				await expect(resolver.getSecret(credentialId, context, options)).rejects.toThrow(
+					CredentialResolverDataNotFoundError,
+				);
+			});
+
+			it('should return data that was previously stored', async () => {
+				const credentialId = testHelpers.randomCredentialId();
+				const context = testHelpers.createContext(testHelpers.randomIdentity());
+				const data = testHelpers.createCredentialData();
+				const options = validationTests.validOptions[0][1];
+
+				await resolver.setSecret(credentialId, context, data, options);
+				const retrieved = await resolver.getSecret(credentialId, context, options);
+
+				expect(retrieved).toEqual(data);
+			});
+
+			it('should throw when retrieving after delete (if deleteSecret exists)', async () => {
+				if (!resolver.deleteSecret) {
+					return; // Skip if deleteSecret not implemented
+				}
+
+				const credentialId = testHelpers.randomCredentialId();
+				const context = testHelpers.createContext(testHelpers.randomIdentity());
+				const data = testHelpers.createCredentialData();
+				const options = validationTests.validOptions[0][1];
+
+				await resolver.setSecret(credentialId, context, data, options);
+				await resolver.deleteSecret(credentialId, context, options);
+
+				await expect(resolver.getSecret(credentialId, context, options)).rejects.toThrow(
+					CredentialResolverDataNotFoundError,
+				);
+			});
+		});
+
+		describe('setSecret', () => {
+			it('should store data that can be retrieved', async () => {
+				const credentialId = testHelpers.randomCredentialId();
+				const context = testHelpers.createContext(testHelpers.randomIdentity());
+				const data = testHelpers.createCredentialData();
+				const options = validationTests.validOptions[0][1];
+
+				await resolver.setSecret(credentialId, context, data, options);
+				const retrieved = await resolver.getSecret(credentialId, context, options);
+
+				expect(retrieved).toEqual(data);
+			});
+
+			it('should overwrite existing data', async () => {
+				const credentialId = testHelpers.randomCredentialId();
+				const context = testHelpers.createContext(testHelpers.randomIdentity());
+				const options = validationTests.validOptions[0][1];
+
+				const data1 = testHelpers.createCredentialData({ apiKey: 'key-1' });
+				const data2 = testHelpers.createCredentialData({ apiKey: 'key-2' });
+
+				await resolver.setSecret(credentialId, context, data1, options);
+				await resolver.setSecret(credentialId, context, data2, options);
+
+				const retrieved = await resolver.getSecret(credentialId, context, options);
+				expect(retrieved).toEqual(data2);
+			});
+		});
+
+		describe('deleteSecret (if implemented)', () => {
+			it('should remove stored data', async () => {
+				if (!resolver.deleteSecret) {
+					return; // Skip if deleteSecret not implemented
+				}
+
+				const credentialId = testHelpers.randomCredentialId();
+				const context = testHelpers.createContext(testHelpers.randomIdentity());
+				const data = testHelpers.createCredentialData();
+				const options = validationTests.validOptions[0][1];
+
+				await resolver.setSecret(credentialId, context, data, options);
+				await resolver.deleteSecret(credentialId, context, options);
+
+				await expect(resolver.getSecret(credentialId, context, options)).rejects.toThrow(
+					CredentialResolverDataNotFoundError,
+				);
+			});
+
+			it('should be idempotent (deleting twice should not error)', async () => {
+				if (!resolver.deleteSecret) {
+					return; // Skip if deleteSecret not implemented
+				}
+
+				const credentialId = testHelpers.randomCredentialId();
+				const context = testHelpers.createContext(testHelpers.randomIdentity());
+				const data = testHelpers.createCredentialData();
+				const options = validationTests.validOptions[0][1];
+
+				await resolver.setSecret(credentialId, context, data, options);
+				await resolver.deleteSecret(credentialId, context, options);
+				await expect(resolver.deleteSecret(credentialId, context, options)).resolves.not.toThrow();
+			});
+
+			it('should not error when deleting non-existent data', async () => {
+				if (!resolver.deleteSecret) {
+					return; // Skip if deleteSecret not implemented
+				}
+
+				const credentialId = testHelpers.randomCredentialId();
+				const context = testHelpers.createContext(testHelpers.randomIdentity());
+				const options = validationTests.validOptions[0][1];
+
+				await expect(resolver.deleteSecret(credentialId, context, options)).resolves.not.toThrow();
+			});
+		});
+
+		describe('isolation', () => {
+			it('should isolate data by credential ID', async () => {
+				const credentialId1 = testHelpers.randomCredentialId();
+				const credentialId2 = testHelpers.randomCredentialId();
+				const context = testHelpers.createContext(testHelpers.randomIdentity());
+				const options = validationTests.validOptions[0][1];
+
+				const data1 = testHelpers.createCredentialData({ apiKey: 'key-1' });
+				const data2 = testHelpers.createCredentialData({ apiKey: 'key-2' });
+
+				await resolver.setSecret(credentialId1, context, data1, options);
+				await resolver.setSecret(credentialId2, context, data2, options);
+
+				const retrieved1 = await resolver.getSecret(credentialId1, context, options);
+				const retrieved2 = await resolver.getSecret(credentialId2, context, options);
+
+				expect(retrieved1).toEqual(data1);
+				expect(retrieved2).toEqual(data2);
+			});
+
+			it('should isolate data by identity', async () => {
+				const credentialId = testHelpers.randomCredentialId();
+				const identity1 = testHelpers.randomIdentity();
+				const identity2 = testHelpers.randomIdentity();
+				const options = validationTests.validOptions[0][1];
+
+				const context1 = testHelpers.createContext(identity1);
+				const context2 = testHelpers.createContext(identity2);
+
+				const data1 = testHelpers.createCredentialData({ apiKey: 'key-1' });
+				const data2 = testHelpers.createCredentialData({ apiKey: 'key-2' });
+
+				await resolver.setSecret(credentialId, context1, data1, options);
+				await resolver.setSecret(credentialId, context2, data2, options);
+
+				const retrieved1 = await resolver.getSecret(credentialId, context1, options);
+				const retrieved2 = await resolver.getSecret(credentialId, context2, options);
+
+				expect(retrieved1).toEqual(data1);
+				expect(retrieved2).toEqual(data2);
+			});
+
+			it('should use same storage for same credential ID and identity', async () => {
+				const credentialId = testHelpers.randomCredentialId();
+				const identity = testHelpers.randomIdentity();
+				const context = testHelpers.createContext(identity);
+				const options = validationTests.validOptions[0][1];
+
+				const data = testHelpers.createCredentialData();
+
+				await resolver.setSecret(credentialId, context, data, options);
+
+				// Create a new context with same identity
+				const sameContext = testHelpers.createContext(identity);
+				const retrieved = await resolver.getSecret(credentialId, sameContext, options);
+
+				expect(retrieved).toEqual(data);
+			});
+
+			it('should not affect other identities when deleting (if deleteSecret exists)', async () => {
+				if (!resolver.deleteSecret) {
+					return; // Skip if deleteSecret not implemented
+				}
+
+				const credentialId = testHelpers.randomCredentialId();
+				const identity1 = testHelpers.randomIdentity();
+				const identity2 = testHelpers.randomIdentity();
+				const options = validationTests.validOptions[0][1];
+
+				const context1 = testHelpers.createContext(identity1);
+				const context2 = testHelpers.createContext(identity2);
+
+				const data1 = testHelpers.createCredentialData({ apiKey: 'key-1' });
+				const data2 = testHelpers.createCredentialData({ apiKey: 'key-2' });
+
+				await resolver.setSecret(credentialId, context1, data1, options);
+				await resolver.setSecret(credentialId, context2, data2, options);
+
+				await resolver.deleteSecret(credentialId, context1, options);
+
+				// Identity1 should be deleted
+				await expect(resolver.getSecret(credentialId, context1, options)).rejects.toThrow(
+					CredentialResolverDataNotFoundError,
+				);
+
+				// Identity2 should still exist
+				const retrieved2 = await resolver.getSecret(credentialId, context2, options);
+				expect(retrieved2).toEqual(data2);
+			});
+		});
+	});
+}
diff --git a/packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/__tests__/stub-credential-resolver.test.ts b/packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/__tests__/stub-credential-resolver.test.ts
new file mode 100644
index 00000000000..b7a201e0746
--- /dev/null
+++ b/packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/__tests__/stub-credential-resolver.test.ts
@@ -0,0 +1,74 @@
+import type { Logger } from '@n8n/backend-common';
+
+import { testCredentialResolverContract, testHelpers } from './resolver-contract-tests';
+import { StubCredentialResolver } from '../stub-credential-resolver';
+
+describe('StubCredentialResolver', () => {
+	let mockLogger: jest.Mocked<Logger>;
+
+	beforeEach(() => {
+		mockLogger = {
+			debug: jest.fn(),
+			info: jest.fn(),
+			warn: jest.fn(),
+			error: jest.fn(),
+		} as unknown as jest.Mocked<Logger>;
+	});
+
+	// Run the standard contract tests
+	testCredentialResolverContract({
+		createResolver: () => new StubCredentialResolver(mockLogger),
+		validationTests: {
+			validOptions: [
+				['no options', {}], // No options
+				['empty prefix', { prefix: '' }], // Empty prefix
+				['with prefix', { prefix: 'test' }], // With prefix
+				['complex prefix', { prefix: 'namespace:sub' }], // Complex prefix
+			],
+			invalidOptions: [
+				['prefix must be string', { prefix: 123 }],
+				['prefix cannot be null', { prefix: null }],
+			],
+		},
+	});
+
+	// Stub-specific tests (if any unique behavior needs testing)
+	describe('stub-specific behavior', () => {
+		it('should use prefix in key generation', async () => {
+			const resolver = new StubCredentialResolver(mockLogger);
+			const credentialId = 'cred-123';
+			const context = testHelpers.createContext('user-1');
+			const data = { apiKey: 'test-key' };
+
+			// Store with prefix
+			await resolver.setSecret(credentialId, context, data, { prefix: 'test' });
+
+			// Should retrieve with same prefix
+			const retrieved = await resolver.getSecret(credentialId, context, { prefix: 'test' });
+			expect(retrieved).toEqual(data);
+
+			// Should NOT retrieve with different prefix
+			await expect(
+				resolver.getSecret(credentialId, context, { prefix: 'other' }),
+			).rejects.toThrow();
+
+			// Should NOT retrieve without prefix
+			await expect(resolver.getSecret(credentialId, context, {})).rejects.toThrow();
+		});
+
+		it('should store data in memory (lost on restart)', async () => {
+			const resolver1 = new StubCredentialResolver(mockLogger);
+			const resolver2 = new StubCredentialResolver(mockLogger);
+
+			const credentialId = 'cred-123';
+			const context = testHelpers.createContext('user-1');
+			const data = { apiKey: 'test-key' };
+
+			// Store in first instance
+			await resolver1.setSecret(credentialId, context, data, {});
+
+			// Should not be available in second instance (different memory)
+			await expect(resolver2.getSecret(credentialId, context, {})).rejects.toThrow();
+		});
+	});
+});
diff --git a/packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/index.ts b/packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/index.ts
new file mode 100644
index 00000000000..fc776bb5a11
--- /dev/null
+++ b/packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/index.ts
@@ -0,0 +1 @@
+import './stub-credential-resolver';
diff --git a/packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/stub-credential-resolver.ts b/packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/stub-credential-resolver.ts
new file mode 100644
index 00000000000..488b139c756
--- /dev/null
+++ b/packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/stub-credential-resolver.ts
@@ -0,0 +1,110 @@
+import { Logger } from '@n8n/backend-common';
+import {
+	CredentialResolver,
+	CredentialResolverConfiguration,
+	CredentialResolverDataNotFoundError,
+	CredentialResolverValidationError,
+	ICredentialResolver,
+} from '@n8n/decorators';
+import { ICredentialContext, ICredentialDataDecryptedObject } from 'n8n-workflow';
+import z from 'zod/v4';
+
+const StubOptionsSchema = z.object({
+	prefix: z.string().default(''),
+});
+
+type StubOptions = z.infer<typeof StubOptionsSchema>;
+
+/**
+ * Simple in-memory credential resolver for testing purposes.
+ * Stores credentials by identity without authentication or external storage.
+ */
+@CredentialResolver()
+export class StubCredentialResolver implements ICredentialResolver {
+	private secretsStore: Map<string, ICredentialDataDecryptedObject> = new Map();
+
+	constructor(private readonly logger: Logger) {}
+
+	metadata = {
+		name: 'credential-resolver.stub-1.0',
+		description: 'A stub credential resolver for testing purposes',
+		displayName: 'Stub Resolver',
+		options: [
+			{
+				displayName: 'Prefix',
+				name: 'prefix',
+				type: 'string' as const,
+				default: '',
+				placeholder: 'Optional prefix for stored credentials',
+				description: 'An optional prefix to namespace stored credentials (useful for testing)',
+			},
+		],
+	};
+
+	/** Generates storage key from credential ID, identity, and optional prefix */
+	private generateKey(
+		credentialId: string,
+		context: ICredentialContext,
+		options: StubOptions,
+	): string {
+		return `${options.prefix}:${credentialId}:${context.identity}`;
+	}
+
+	/**
+	 * Retrieves stored credential data for the given identity.
+	 * @throws {CredentialResolverDataNotFoundError} When no data exists for the key
+	 */
+	async getSecret(
+		credentialId: string,
+		context: ICredentialContext,
+		options: CredentialResolverConfiguration,
+	): Promise<ICredentialDataDecryptedObject> {
+		const parsedOptions = await this.parseOptions(options);
+		const key = this.generateKey(credentialId, context, parsedOptions);
+		const secret = this.secretsStore.get(key);
+		if (!secret) {
+			throw new CredentialResolverDataNotFoundError();
+		}
+		return secret;
+	}
+
+	/** Stores credential data for the given identity */
+	async setSecret(
+		credentialId: string,
+		context: ICredentialContext,
+		data: ICredentialDataDecryptedObject,
+		options: CredentialResolverConfiguration,
+	): Promise<void> {
+		const parsedOptions = await this.parseOptions(options);
+		const key = this.generateKey(credentialId, context, parsedOptions);
+		this.secretsStore.set(key, data);
+	}
+
+	/** Deletes credential data for the given identity. Succeeds silently if not found. */
+	async deleteSecret(
+		credentialId: string,
+		context: ICredentialContext,
+		options: CredentialResolverConfiguration,
+	): Promise<void> {
+		const parsedOptions = await this.parseOptions(options);
+		const key = this.generateKey(credentialId, context, parsedOptions);
+		this.secretsStore.delete(key);
+	}
+
+	private async parseOptions(options: CredentialResolverConfiguration) {
+		const result = await StubOptionsSchema.safeParseAsync(options);
+		if (result.error) {
+			this.logger.error('Invalid options provided to StubCredentialResolver', {
+				error: result.error,
+			});
+			throw new CredentialResolverValidationError(
+				`Invalid options for StubCredentialResolver: ${result.error.message}`,
+			);
+		}
+		return result.data;
+	}
+
+	async validateOptions(options: CredentialResolverConfiguration): Promise<void> {
+		await this.parseOptions(options);
+	}
+}
diff --git a/packages/cli/src/modules/dynamic-credentials.ee/dynamic-credentials.module.ts b/packages/cli/src/modules/dynamic-credentials.ee/dynamic-credentials.module.ts
index e20d5ebe49e..2c4171de959 100644
--- a/packages/cli/src/modules/dynamic-credentials.ee/dynamic-credentials.module.ts
+++ b/packages/cli/src/modules/dynamic-credentials.ee/dynamic-credentials.module.ts
@@ -6,6 +6,7 @@ import { Container } from '@n8n/di';
 export class DynamicCredentialsModule implements ModuleInterface {
 	async init() {
 		await import('./context-establishment-hooks');
+		await import('./credential-resolvers');
 		const { CredentialResolverRegistry } = await import('./services');
 
 		await Container.get(CredentialResolverRegistry).init();

From 38f06325b133918e1d871d49078f21f178a38af7 Mon Sep 17 00:00:00 2001
From: Jaakko Husso <jaakko@n8n.io>
Date: Tue, 2 Dec 2025 16:41:53 +0200
Subject: [PATCH 017/167] fix(core): Allow users to update tools on their Chat
 sessions (no-changelog) (#22612)

---
 packages/cli/src/modules/chat-hub/chat-hub.service.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/cli/src/modules/chat-hub/chat-hub.service.ts b/packages/cli/src/modules/chat-hub/chat-hub.service.ts
index 73b86b58b10..243480333bc 100644
--- a/packages/cli/src/modules/chat-hub/chat-hub.service.ts
+++ b/packages/cli/src/modules/chat-hub/chat-hub.service.ts
@@ -2277,6 +2277,7 @@ export class ChatHubService {
 
 		if (updates.title !== undefined) sessionUpdates.title = updates.title;
 		if (updates.credentialId !== undefined) sessionUpdates.credentialId = updates.credentialId;
+		if (updates.tools !== undefined) sessionUpdates.tools = updates.tools;
 
 		return await this.sessionRepository.updateChatSession(sessionId, sessionUpdates);
 	}

From e46f5137a02418021b67292c82fe8e4f4ec91da5 Mon Sep 17 00:00:00 2001
From: Artem Sorokin <38620398+seemewalkin@users.noreply.github.com>
Date: Tue, 2 Dec 2025 17:42:04 +0100
Subject: [PATCH 018/167] test: Organize regression tests into categorized
 folder structure (#22560)

---
 .../ADO-1338-ndv-missing-input-panel.spec.ts}               | 4 ++--
 .../ADO-2230-ndv-reset-data-pagination.spec.ts}             | 2 +-
 ...0-opening-webhook-ndv-marks-workflow-as-unsaved.spec.ts} | 2 +-
 .../ADO-2372-prevent-clipping-params.spec.ts}               | 2 +-
 .../ADO-2929-can-load-old-switch-node-workflows.spec.ts}    | 4 ++--
 .../ADO-4462-template-setup-experiment.spec.ts}             | 6 +++---
 .../AI-1401-sub-nodes-input-panel.spec.ts}                  | 2 +-
 ...AI-716-correctly-set-up-agent-model-shows-error.spec.ts} | 2 +-
 ...12-partial-execs-broken-when-using-chat-trigger.spec.ts} | 2 +-
 ...ode-connectors-not-rendered-when-nodes-inserted.spec.ts} | 4 ++--
 .../SUG-121-fields-reset-after-closing-ndv.spec.ts}         | 4 ++--
 .../SUG-38-inline-expression-preview.spec.ts}               | 4 ++--
 12 files changed, 19 insertions(+), 19 deletions(-)
 rename packages/testing/playwright/tests/ui/{1338-ADO-ndv-missing-input-panel.spec.ts => regression/ADO-1338-ndv-missing-input-panel.spec.ts} (84%)
 rename packages/testing/playwright/tests/ui/{2230-ADO-ndv-reset-data-pagination.spec.ts => regression/ADO-2230-ndv-reset-data-pagination.spec.ts} (95%)
 rename packages/testing/playwright/tests/ui/{2270-ADO-opening-webhook-ndv-marks-workflow-as-unsaved.spec.ts => regression/ADO-2270-opening-webhook-ndv-marks-workflow-as-unsaved.spec.ts} (90%)
 rename packages/testing/playwright/tests/ui/{2372-ado-prevent-clipping-params.spec.ts => regression/ADO-2372-prevent-clipping-params.spec.ts} (98%)
 rename packages/testing/playwright/tests/ui/{2929-ado-can-load-old-switch-node-workflows.spec.ts => regression/ADO-2929-can-load-old-switch-node-workflows.spec.ts} (83%)
 rename packages/testing/playwright/tests/ui/{ado-4462-template-setup-experiment.spec.ts => regression/ADO-4462-template-setup-experiment.spec.ts} (93%)
 rename packages/testing/playwright/tests/ui/{1401-AI-sub-nodes-input-panel.spec.ts => regression/AI-1401-sub-nodes-input-panel.spec.ts} (95%)
 rename packages/testing/playwright/tests/ui/{716-AI-bug-correctly-set-up-agent-model-shows-error.spec.ts => regression/AI-716-correctly-set-up-agent-model-shows-error.spec.ts} (91%)
 rename packages/testing/playwright/tests/ui/{812-AI-partial-execs-broken-when-using-chat-trigger.spec.ts => regression/AI-812-partial-execs-broken-when-using-chat-trigger.spec.ts} (97%)
 rename packages/testing/playwright/tests/ui/{726-CAT-canvas-node-connectors-not-rendered-when-nodes-inserted.spec.ts => regression/CAT-726-canvas-node-connectors-not-rendered-when-nodes-inserted.spec.ts} (89%)
 rename packages/testing/playwright/tests/ui/{9999-SUG-121-fields-reset-after-closing-ndv.spec.ts => regression/SUG-121-fields-reset-after-closing-ndv.spec.ts} (88%)
 rename packages/testing/playwright/tests/ui/{9999-SUG-38-inline-expression-preview.spec.ts => regression/SUG-38-inline-expression-preview.spec.ts} (87%)

diff --git a/packages/testing/playwright/tests/ui/1338-ADO-ndv-missing-input-panel.spec.ts b/packages/testing/playwright/tests/ui/regression/ADO-1338-ndv-missing-input-panel.spec.ts
similarity index 84%
rename from packages/testing/playwright/tests/ui/1338-ADO-ndv-missing-input-panel.spec.ts
rename to packages/testing/playwright/tests/ui/regression/ADO-1338-ndv-missing-input-panel.spec.ts
index c65b860f1ae..168564b4161 100644
--- a/packages/testing/playwright/tests/ui/1338-ADO-ndv-missing-input-panel.spec.ts
+++ b/packages/testing/playwright/tests/ui/regression/ADO-1338-ndv-missing-input-panel.spec.ts
@@ -1,5 +1,5 @@
-import { test, expect } from '../../fixtures/base';
-import type { TestRequirements } from '../../Types';
+import { test, expect } from '../../../fixtures/base';
+import type { TestRequirements } from '../../../Types';
 
 const requirements: TestRequirements = {
 	workflow: {
diff --git a/packages/testing/playwright/tests/ui/2230-ADO-ndv-reset-data-pagination.spec.ts b/packages/testing/playwright/tests/ui/regression/ADO-2230-ndv-reset-data-pagination.spec.ts
similarity index 95%
rename from packages/testing/playwright/tests/ui/2230-ADO-ndv-reset-data-pagination.spec.ts
rename to packages/testing/playwright/tests/ui/regression/ADO-2230-ndv-reset-data-pagination.spec.ts
index fdddbbab697..636384e2aa1 100644
--- a/packages/testing/playwright/tests/ui/2230-ADO-ndv-reset-data-pagination.spec.ts
+++ b/packages/testing/playwright/tests/ui/regression/ADO-2230-ndv-reset-data-pagination.spec.ts
@@ -1,4 +1,4 @@
-import { test, expect } from '../../fixtures/base';
+import { test, expect } from '../../../fixtures/base';
 
 test.describe('ADO-2230 NDV Pagination Reset', () => {
 	test('should reset pagination if data size changes to less than current page', async ({
diff --git a/packages/testing/playwright/tests/ui/2270-ADO-opening-webhook-ndv-marks-workflow-as-unsaved.spec.ts b/packages/testing/playwright/tests/ui/regression/ADO-2270-opening-webhook-ndv-marks-workflow-as-unsaved.spec.ts
similarity index 90%
rename from packages/testing/playwright/tests/ui/2270-ADO-opening-webhook-ndv-marks-workflow-as-unsaved.spec.ts
rename to packages/testing/playwright/tests/ui/regression/ADO-2270-opening-webhook-ndv-marks-workflow-as-unsaved.spec.ts
index cf6f863c8b7..07af20b84ec 100644
--- a/packages/testing/playwright/tests/ui/2270-ADO-opening-webhook-ndv-marks-workflow-as-unsaved.spec.ts
+++ b/packages/testing/playwright/tests/ui/regression/ADO-2270-opening-webhook-ndv-marks-workflow-as-unsaved.spec.ts
@@ -1,4 +1,4 @@
-import { test, expect } from '../../fixtures/base';
+import { test, expect } from '../../../fixtures/base';
 
 test.describe('ADO-2270 Save button resets on webhook node open', () => {
 	test('should not reset the save button if webhook node is opened and closed', async ({ n8n }) => {
diff --git a/packages/testing/playwright/tests/ui/2372-ado-prevent-clipping-params.spec.ts b/packages/testing/playwright/tests/ui/regression/ADO-2372-prevent-clipping-params.spec.ts
similarity index 98%
rename from packages/testing/playwright/tests/ui/2372-ado-prevent-clipping-params.spec.ts
rename to packages/testing/playwright/tests/ui/regression/ADO-2372-prevent-clipping-params.spec.ts
index ce428bde457..fbf52da1426 100644
--- a/packages/testing/playwright/tests/ui/2372-ado-prevent-clipping-params.spec.ts
+++ b/packages/testing/playwright/tests/ui/regression/ADO-2372-prevent-clipping-params.spec.ts
@@ -1,4 +1,4 @@
-import { test, expect } from '../../fixtures/base';
+import { test, expect } from '../../../fixtures/base';
 
 test.describe('ADO-2362 ADO-2350 NDV Prevent clipping long parameters and scrolling to expression', () => {
 	test('should show last parameters and open at scroll top of parameters', async ({ n8n }) => {
diff --git a/packages/testing/playwright/tests/ui/2929-ado-can-load-old-switch-node-workflows.spec.ts b/packages/testing/playwright/tests/ui/regression/ADO-2929-can-load-old-switch-node-workflows.spec.ts
similarity index 83%
rename from packages/testing/playwright/tests/ui/2929-ado-can-load-old-switch-node-workflows.spec.ts
rename to packages/testing/playwright/tests/ui/regression/ADO-2929-can-load-old-switch-node-workflows.spec.ts
index 24686e1883d..13f9af6422a 100644
--- a/packages/testing/playwright/tests/ui/2929-ado-can-load-old-switch-node-workflows.spec.ts
+++ b/packages/testing/playwright/tests/ui/regression/ADO-2929-can-load-old-switch-node-workflows.spec.ts
@@ -1,5 +1,5 @@
-import { test, expect } from '../../fixtures/base';
-import type { TestRequirements } from '../../Types';
+import { test, expect } from '../../../fixtures/base';
+import type { TestRequirements } from '../../../Types';
 
 const requirements: TestRequirements = {
 	workflow: {
diff --git a/packages/testing/playwright/tests/ui/ado-4462-template-setup-experiment.spec.ts b/packages/testing/playwright/tests/ui/regression/ADO-4462-template-setup-experiment.spec.ts
similarity index 93%
rename from packages/testing/playwright/tests/ui/ado-4462-template-setup-experiment.spec.ts
rename to packages/testing/playwright/tests/ui/regression/ADO-4462-template-setup-experiment.spec.ts
index 5984d24af90..b2be88f1177 100644
--- a/packages/testing/playwright/tests/ui/ado-4462-template-setup-experiment.spec.ts
+++ b/packages/testing/playwright/tests/ui/regression/ADO-4462-template-setup-experiment.spec.ts
@@ -1,8 +1,8 @@
 import { readFileSync } from 'fs';
 
-import { test, expect } from '../../fixtures/base';
-import type { TestRequirements } from '../../Types';
-import { resolveFromRoot } from '../../utils/path-helper';
+import { test, expect } from '../../../fixtures/base';
+import type { TestRequirements } from '../../../Types';
+import { resolveFromRoot } from '../../../utils/path-helper';
 
 const TEMPLATE_HOSTNAME = 'custom.template.host';
 const TEMPLATE_HOST = `https://${TEMPLATE_HOSTNAME}/api`;
diff --git a/packages/testing/playwright/tests/ui/1401-AI-sub-nodes-input-panel.spec.ts b/packages/testing/playwright/tests/ui/regression/AI-1401-sub-nodes-input-panel.spec.ts
similarity index 95%
rename from packages/testing/playwright/tests/ui/1401-AI-sub-nodes-input-panel.spec.ts
rename to packages/testing/playwright/tests/ui/regression/AI-1401-sub-nodes-input-panel.spec.ts
index ccf428f4eb2..df4d330732d 100644
--- a/packages/testing/playwright/tests/ui/1401-AI-sub-nodes-input-panel.spec.ts
+++ b/packages/testing/playwright/tests/ui/regression/AI-1401-sub-nodes-input-panel.spec.ts
@@ -1,4 +1,4 @@
-import { test, expect } from '../../fixtures/base';
+import { test, expect } from '../../../fixtures/base';
 
 test.describe('AI-1401 AI sub-nodes show node output with no path back in input', () => {
 	test('should show correct root node for nested sub-nodes in input panel', async ({ n8n }) => {
diff --git a/packages/testing/playwright/tests/ui/716-AI-bug-correctly-set-up-agent-model-shows-error.spec.ts b/packages/testing/playwright/tests/ui/regression/AI-716-correctly-set-up-agent-model-shows-error.spec.ts
similarity index 91%
rename from packages/testing/playwright/tests/ui/716-AI-bug-correctly-set-up-agent-model-shows-error.spec.ts
rename to packages/testing/playwright/tests/ui/regression/AI-716-correctly-set-up-agent-model-shows-error.spec.ts
index 318ccda513f..d2b9bee7caa 100644
--- a/packages/testing/playwright/tests/ui/716-AI-bug-correctly-set-up-agent-model-shows-error.spec.ts
+++ b/packages/testing/playwright/tests/ui/regression/AI-716-correctly-set-up-agent-model-shows-error.spec.ts
@@ -1,4 +1,4 @@
-import { test, expect } from '../../fixtures/base';
+import { test, expect } from '../../../fixtures/base';
 
 test.describe('AI-716 Correctly set up agent model shows error', () => {
 	test('should not show error when adding a sub-node with credential set-up', async ({ n8n }) => {
diff --git a/packages/testing/playwright/tests/ui/812-AI-partial-execs-broken-when-using-chat-trigger.spec.ts b/packages/testing/playwright/tests/ui/regression/AI-812-partial-execs-broken-when-using-chat-trigger.spec.ts
similarity index 97%
rename from packages/testing/playwright/tests/ui/812-AI-partial-execs-broken-when-using-chat-trigger.spec.ts
rename to packages/testing/playwright/tests/ui/regression/AI-812-partial-execs-broken-when-using-chat-trigger.spec.ts
index dfecab00961..10573254ac2 100644
--- a/packages/testing/playwright/tests/ui/812-AI-partial-execs-broken-when-using-chat-trigger.spec.ts
+++ b/packages/testing/playwright/tests/ui/regression/AI-812-partial-execs-broken-when-using-chat-trigger.spec.ts
@@ -1,4 +1,4 @@
-import { test, expect } from '../../fixtures/base';
+import { test, expect } from '../../../fixtures/base';
 
 test.describe('AI-812-partial-execs-broken-when-using-chat-trigger', () => {
 	test.beforeEach(async ({ n8n }) => {
diff --git a/packages/testing/playwright/tests/ui/726-CAT-canvas-node-connectors-not-rendered-when-nodes-inserted.spec.ts b/packages/testing/playwright/tests/ui/regression/CAT-726-canvas-node-connectors-not-rendered-when-nodes-inserted.spec.ts
similarity index 89%
rename from packages/testing/playwright/tests/ui/726-CAT-canvas-node-connectors-not-rendered-when-nodes-inserted.spec.ts
rename to packages/testing/playwright/tests/ui/regression/CAT-726-canvas-node-connectors-not-rendered-when-nodes-inserted.spec.ts
index 509c50324ef..1373353af3f 100644
--- a/packages/testing/playwright/tests/ui/726-CAT-canvas-node-connectors-not-rendered-when-nodes-inserted.spec.ts
+++ b/packages/testing/playwright/tests/ui/regression/CAT-726-canvas-node-connectors-not-rendered-when-nodes-inserted.spec.ts
@@ -1,5 +1,5 @@
-import { EDIT_FIELDS_SET_NODE_NAME } from '../../config/constants';
-import { test, expect } from '../../fixtures/base';
+import { EDIT_FIELDS_SET_NODE_NAME } from '../../../config/constants';
+import { test, expect } from '../../../fixtures/base';
 
 test.describe('CAT-726 Node connectors not rendered when nodes inserted on the canvas', () => {
 	test('should correctly append a No Op node when Loop Over Items node is added (from add button)', async ({
diff --git a/packages/testing/playwright/tests/ui/9999-SUG-121-fields-reset-after-closing-ndv.spec.ts b/packages/testing/playwright/tests/ui/regression/SUG-121-fields-reset-after-closing-ndv.spec.ts
similarity index 88%
rename from packages/testing/playwright/tests/ui/9999-SUG-121-fields-reset-after-closing-ndv.spec.ts
rename to packages/testing/playwright/tests/ui/regression/SUG-121-fields-reset-after-closing-ndv.spec.ts
index b0025297122..53eab75fe8f 100644
--- a/packages/testing/playwright/tests/ui/9999-SUG-121-fields-reset-after-closing-ndv.spec.ts
+++ b/packages/testing/playwright/tests/ui/regression/SUG-121-fields-reset-after-closing-ndv.spec.ts
@@ -1,5 +1,5 @@
-import { test, expect } from '../../fixtures/base';
-import type { TestRequirements } from '../../Types';
+import { test, expect } from '../../../fixtures/base';
+import type { TestRequirements } from '../../../Types';
 
 const requirements: TestRequirements = {
 	workflow: 'Test_workflow_1.json',
diff --git a/packages/testing/playwright/tests/ui/9999-SUG-38-inline-expression-preview.spec.ts b/packages/testing/playwright/tests/ui/regression/SUG-38-inline-expression-preview.spec.ts
similarity index 87%
rename from packages/testing/playwright/tests/ui/9999-SUG-38-inline-expression-preview.spec.ts
rename to packages/testing/playwright/tests/ui/regression/SUG-38-inline-expression-preview.spec.ts
index 61f6ca60643..0a3b33ecf7f 100644
--- a/packages/testing/playwright/tests/ui/9999-SUG-38-inline-expression-preview.spec.ts
+++ b/packages/testing/playwright/tests/ui/regression/SUG-38-inline-expression-preview.spec.ts
@@ -1,5 +1,5 @@
-import { test, expect } from '../../fixtures/base';
-import type { TestRequirements } from '../../Types';
+import { test, expect } from '../../../fixtures/base';
+import type { TestRequirements } from '../../../Types';
 
 const requirements: TestRequirements = {
 	workflow: {

From d4d7cb776f73c61266c4f0b0effda759dcd88685 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BAl=20G=C3=B3mez=20Morales?= <raul00gm@gmail.com>
Date: Wed, 3 Dec 2025 08:28:50 +0100
Subject: [PATCH 019/167] fix(editor): Fix scope based - move nodes and node
 pasting (#22608)

---
 .../cli/src/controllers/e2e.controller.ts     |   1 +
 .../frontend/editor-ui/src/__tests__/mocks.ts |   2 +-
 .../useCanvasOperations.test.ts.snap          |  12 +-
 .../editor-ui/src/app/views/NodeView.vue      |   4 +
 .../composables/useCanvasMapping.test.ts      |   2 +-
 .../canvas/composables/useCanvasMapping.ts    |   2 +-
 .../playwright/composables/CanvasComposer.ts  |   2 +
 .../testing/playwright/services/api-helper.ts |   3 +
 .../playwright/services/role-api-helper.ts    |  48 +++++++
 .../ui/56-workflow-viewer-permissions.spec.ts | 126 ++++++++++++++++++
 10 files changed, 191 insertions(+), 11 deletions(-)
 create mode 100644 packages/testing/playwright/services/role-api-helper.ts
 create mode 100644 packages/testing/playwright/tests/ui/56-workflow-viewer-permissions.spec.ts

diff --git a/packages/cli/src/controllers/e2e.controller.ts b/packages/cli/src/controllers/e2e.controller.ts
index 4529fb25736..11d6be146f2 100644
--- a/packages/cli/src/controllers/e2e.controller.ts
+++ b/packages/cli/src/controllers/e2e.controller.ts
@@ -42,6 +42,7 @@ const tablesToTruncate = [
 	'installed_packages',
 	'project',
 	'project_relation',
+	'role',
 	'settings',
 	'shared_credentials',
 	'shared_workflow',
diff --git a/packages/frontend/editor-ui/src/__tests__/mocks.ts b/packages/frontend/editor-ui/src/__tests__/mocks.ts
index 35d381dff36..0af2c5ac658 100644
--- a/packages/frontend/editor-ui/src/__tests__/mocks.ts
+++ b/packages/frontend/editor-ui/src/__tests__/mocks.ts
@@ -49,7 +49,7 @@ export const mockNode = ({
 	issues = undefined,
 	typeVersion = 1,
 	parameters = {},
-	draggable = true,
+	draggable = undefined,
 }: {
 	id?: INodeUi['id'];
 	name: INodeUi['name'];
diff --git a/packages/frontend/editor-ui/src/app/composables/__snapshots__/useCanvasOperations.test.ts.snap b/packages/frontend/editor-ui/src/app/composables/__snapshots__/useCanvasOperations.test.ts.snap
index f0f7f1b17ea..821da444d4f 100644
--- a/packages/frontend/editor-ui/src/app/composables/__snapshots__/useCanvasOperations.test.ts.snap
+++ b/packages/frontend/editor-ui/src/app/composables/__snapshots__/useCanvasOperations.test.ts.snap
@@ -14,8 +14,7 @@ exports[`useCanvasOperations > copyNodes > should copy nodes 1`] = `
         40,
         40
       ],
-      "typeVersion": 1,
-      "draggable": true
+      "typeVersion": 1
     },
     {
       "parameters": {},
@@ -26,8 +25,7 @@ exports[`useCanvasOperations > copyNodes > should copy nodes 1`] = `
         40,
         40
       ],
-      "typeVersion": 1,
-      "draggable": true
+      "typeVersion": 1
     }
   ],
   "connections": {},
@@ -54,8 +52,7 @@ exports[`useCanvasOperations > cutNodes > should copy and delete nodes 1`] = `
         40,
         40
       ],
-      "typeVersion": 1,
-      "draggable": true
+      "typeVersion": 1
     },
     {
       "parameters": {},
@@ -66,8 +63,7 @@ exports[`useCanvasOperations > cutNodes > should copy and delete nodes 1`] = `
         40,
         40
       ],
-      "typeVersion": 1,
-      "draggable": true
+      "typeVersion": 1
     }
   ],
   "connections": {},
diff --git a/packages/frontend/editor-ui/src/app/views/NodeView.vue b/packages/frontend/editor-ui/src/app/views/NodeView.vue
index a0450a55d7c..2c5343a46bb 100644
--- a/packages/frontend/editor-ui/src/app/views/NodeView.vue
+++ b/packages/frontend/editor-ui/src/app/views/NodeView.vue
@@ -1637,6 +1637,10 @@ function checkIfEditingIsAllowed(): boolean {
 		return false;
 	}
 
+	if (!(workflowPermissions.value.update ?? projectPermissions.value.workflow.update)) {
+		return false;
+	}
+
 	if (isReadOnlyRoute.value || isReadOnlyEnvironment.value) {
 		const messageContext = isReadOnlyRoute.value ? 'executions' : 'workflows';
 		readOnlyNotification.value = toast.showMessage({
diff --git a/packages/frontend/editor-ui/src/features/workflows/canvas/composables/useCanvasMapping.test.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/composables/useCanvasMapping.test.ts
index b94645efb57..549a04e3bbe 100644
--- a/packages/frontend/editor-ui/src/features/workflows/canvas/composables/useCanvasMapping.test.ts
+++ b/packages/frontend/editor-ui/src/features/workflows/canvas/composables/useCanvasMapping.test.ts
@@ -154,7 +154,7 @@ describe('useCanvasMapping', () => {
 					label: manualTriggerNode.name,
 					type: 'canvas-node',
 					position: expect.anything(),
-					draggable: true,
+					draggable: undefined,
 					data: {
 						id: manualTriggerNode.id,
 						name: manualTriggerNode.name,
diff --git a/packages/frontend/editor-ui/src/features/workflows/canvas/composables/useCanvasMapping.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/composables/useCanvasMapping.ts
index 9460e6a9283..54072d7318d 100644
--- a/packages/frontend/editor-ui/src/features/workflows/canvas/composables/useCanvasMapping.ts
+++ b/packages/frontend/editor-ui/src/features/workflows/canvas/composables/useCanvasMapping.ts
@@ -722,7 +722,7 @@ export function useCanvasMapping({
 					position: { x: node.position[0], y: node.position[1] },
 					data,
 					...additionalNodePropertiesById.value[node.id],
-					draggable: node.draggable ?? true,
+					draggable: node.draggable,
 				};
 			}),
 		];
diff --git a/packages/testing/playwright/composables/CanvasComposer.ts b/packages/testing/playwright/composables/CanvasComposer.ts
index 987e8f039e3..da7aa41f7cd 100644
--- a/packages/testing/playwright/composables/CanvasComposer.ts
+++ b/packages/testing/playwright/composables/CanvasComposer.ts
@@ -28,6 +28,7 @@ export class CanvasComposer {
 	 * Copy selected nodes and verify success toast
 	 */
 	async copySelectedNodesWithToast(): Promise<void> {
+		await this.n8n.clipboard.grant();
 		await this.n8n.canvas.copyNodes();
 		await this.n8n.notifications.waitForNotificationAndClose('Copied to clipboard');
 	}
@@ -36,6 +37,7 @@ export class CanvasComposer {
 	 * Select all nodes and copy them
 	 */
 	async selectAllAndCopy(): Promise<void> {
+		await this.n8n.clipboard.grant();
 		await this.n8n.canvas.selectAll();
 		await this.copySelectedNodesWithToast();
 	}
diff --git a/packages/testing/playwright/services/api-helper.ts b/packages/testing/playwright/services/api-helper.ts
index cb8f303e147..acfc574da57 100644
--- a/packages/testing/playwright/services/api-helper.ts
+++ b/packages/testing/playwright/services/api-helper.ts
@@ -11,6 +11,7 @@ import {
 import { TestError } from '../Types';
 import { CredentialApiHelper } from './credential-api-helper';
 import { ProjectApiHelper } from './project-api-helper';
+import { RoleApiHelper } from './role-api-helper';
 import { TagApiHelper } from './tag-api-helper';
 import { UserApiHelper } from './user-api-helper';
 import { VariablesApiHelper } from './variables-api-helper';
@@ -43,6 +44,7 @@ export class ApiHelpers {
 	variables: VariablesApiHelper;
 	users: UserApiHelper;
 	tags: TagApiHelper;
+	roles: RoleApiHelper;
 
 	constructor(requestContext: APIRequestContext) {
 		this.request = requestContext;
@@ -52,6 +54,7 @@ export class ApiHelpers {
 		this.variables = new VariablesApiHelper(this);
 		this.users = new UserApiHelper(this);
 		this.tags = new TagApiHelper(this);
+		this.roles = new RoleApiHelper(this);
 	}
 
 	// ===== MAIN SETUP METHODS =====
diff --git a/packages/testing/playwright/services/role-api-helper.ts b/packages/testing/playwright/services/role-api-helper.ts
new file mode 100644
index 00000000000..87303ed5921
--- /dev/null
+++ b/packages/testing/playwright/services/role-api-helper.ts
@@ -0,0 +1,48 @@
+import { nanoid } from 'nanoid';
+
+import type { ApiHelpers } from './api-helper';
+import { TestError } from '../Types';
+
+export class RoleApiHelper {
+	constructor(private api: ApiHelpers) {}
+
+	/**
+	 * Create a custom role with unique name via REST API
+	 * @param scopes Array of scope strings (e.g., ['project:read', 'workflow:read'])
+	 * @param displayName Base display name for the role (will be made unique with nanoid)
+	 * @returns The created role data including slug
+	 */
+	async createCustomRole(scopes: string[], displayName: string): Promise<{ slug: string }> {
+		const uniqueName = `${displayName} (${nanoid(8)})`;
+		const response = await this.api.request.post('/rest/roles', {
+			data: {
+				displayName: uniqueName,
+				description: `Custom role with scopes: ${scopes.join(', ')}`,
+				roleType: 'project',
+				scopes,
+			},
+		});
+
+		if (!response.ok()) {
+			throw new TestError(`Failed to create custom role: ${await response.text()}`);
+		}
+
+		const result = await response.json();
+		return result.data;
+	}
+
+	/**
+	 * Delete a custom role by slug
+	 * @param slug The role slug to delete
+	 * @returns True if deletion was successful
+	 */
+	async deleteRole(slug: string): Promise<boolean> {
+		const response = await this.api.request.delete(`/rest/roles/${slug}`);
+
+		if (!response.ok()) {
+			throw new TestError(`Failed to delete role: ${await response.text()}`);
+		}
+
+		return true;
+	}
+}
diff --git a/packages/testing/playwright/tests/ui/56-workflow-viewer-permissions.spec.ts b/packages/testing/playwright/tests/ui/56-workflow-viewer-permissions.spec.ts
new file mode 100644
index 00000000000..84badccb509
--- /dev/null
+++ b/packages/testing/playwright/tests/ui/56-workflow-viewer-permissions.spec.ts
@@ -0,0 +1,126 @@
+import { INSTANCE_MEMBER_CREDENTIALS } from '../../config/test-users';
+import { test, expect } from '../../fixtures/base';
+import type { n8nPage } from '../../pages/n8nPage';
+
+const MEMBER_EMAIL = INSTANCE_MEMBER_CREDENTIALS[0].email;
+
+// Helper to set up a project with a workflow and sign in as member with specified role
+async function setupProjectWithWorkflowAndSignInAsMember({
+	n8n,
+	roleSlug,
+	nodeName,
+}: {
+	n8n: n8nPage;
+	roleSlug: string;
+	nodeName: string;
+}): Promise<void> {
+	await n8n.navigate.toHome();
+
+	// Create project and add member with role
+	const { projectId, projectName: createdProjectName } = await n8n.projectComposer.createProject();
+	await n8n.api.projects.addUserToProjectByEmail(projectId, MEMBER_EMAIL, roleSlug);
+
+	// Create workflow with node
+	await n8n.sideBar.clickProjectMenuItem(createdProjectName);
+	await n8n.workflows.clickNewWorkflowCard();
+	await n8n.canvas.addNode(nodeName, { closeNDV: true });
+	await n8n.canvas.saveWorkflow();
+
+	// Sign in as member and navigate to the workflow
+	await n8n.api.signin('member', 0);
+	await n8n.navigate.toHome();
+	await n8n.sideBar.clickProjectMenuItem(createdProjectName);
+	await n8n.workflows.cards.getWorkflows().first().click();
+	await expect(n8n.canvas.getLoadingMask()).not.toBeAttached();
+}
+
+test.describe('Workflow Viewer Permissions @isolated', () => {
+	test.describe.configure({ mode: 'serial' });
+
+	let readOnlyRole: { slug: string };
+	let editorRole: { slug: string };
+
+	test.beforeAll(async ({ api }) => {
+		await api.enableFeature('sharing');
+		await api.enableFeature('advancedPermissions');
+		await api.enableFeature('customRoles');
+		await api.setMaxTeamProjectsQuota(-1);
+
+		// Sign in as owner (admin) to create custom roles
+		await api.signin('owner');
+
+		// Create custom read-only role (no workflow:update scope)
+		readOnlyRole = await api.roles.createCustomRole(
+			['project:read', 'workflow:read', 'workflow:list'],
+			'Workflow Read Only',
+		);
+
+		// Create custom editor role (with workflow:update scope)
+		editorRole = await api.roles.createCustomRole(
+			['project:read', 'workflow:read', 'workflow:list', 'workflow:update', 'workflow:execute'],
+			'Workflow Custom Editor',
+		);
+	});
+
+	test('user without workflow:update scope cannot drag nodes @auth:owner', async ({ n8n }) => {
+		await setupProjectWithWorkflowAndSignInAsMember({
+			n8n,
+			roleSlug: readOnlyRole.slug,
+			nodeName: 'Edit Fields (Set)',
+		});
+
+		// Attempt to drag - node should not move (no workflow:update scope)
+		const node = n8n.canvas.nodeByName('Edit Fields');
+		const initialPosition = await node.boundingBox();
+
+		await n8n.canvas.dragNodeToRelativePosition('Edit Fields', 100, 50);
+
+		const finalPosition = await node.boundingBox();
+
+		// Position should remain unchanged
+		expect(finalPosition?.x).toBe(initialPosition?.x);
+		expect(finalPosition?.y).toBe(initialPosition?.y);
+	});
+
+	test('user without workflow:update can copy but cannot paste @auth:owner', async ({ n8n }) => {
+		await setupProjectWithWorkflowAndSignInAsMember({
+			n8n,
+			roleSlug: readOnlyRole.slug,
+			nodeName: 'Edit Fields (Set)',
+		});
+
+		// Copy SHOULD work (useful for copying to another workflow)
+		await n8n.canvasComposer.selectAllAndCopy();
+
+		// Paste should NOT work (requires workflow:update)
+		const nodeCountBefore = await n8n.canvas.getCanvasNodes().count();
+		await n8n.page.keyboard.press('ControlOrMeta+V');
+		await expect(n8n.canvas.getCanvasNodes()).toHaveCount(nodeCountBefore);
+	});
+
+	test('user with workflow:update scope can drag and paste @auth:owner', async ({ n8n }) => {
+		await setupProjectWithWorkflowAndSignInAsMember({
+			n8n,
+			roleSlug: editorRole.slug,
+			nodeName: 'Edit Fields (Set)',
+		});
+
+		// Drag should work
+		const node = n8n.canvas.nodeByName('Edit Fields');
+		const initialPosition = await node.boundingBox();
+
+		await n8n.canvas.dragNodeToRelativePosition('Edit Fields', 100, 50);
+
+		const finalPosition = await node.boundingBox();
+
+		// Position SHOULD change
+		expect(finalPosition?.x).not.toBe(initialPosition?.x);
+
+		// Copy and paste should work
+		await n8n.canvasComposer.selectAllAndCopy();
+
+		const nodeCountBefore = await n8n.canvas.getCanvasNodes().count();
+		await n8n.page.keyboard.press('ControlOrMeta+V');
+		await expect(n8n.canvas.getCanvasNodes()).toHaveCount(nodeCountBefore + 1);
+	});
+});

From c08884052ef0e28384d9d2581d9a13cbedd2076c Mon Sep 17 00:00:00 2001
From: Nikhil Kuriakose <nikhilkuria@gmail.com>
Date: Wed, 3 Dec 2025 09:18:39 +0100
Subject: [PATCH 020/167] fix(editor): External link aligned to the right in
 resource locator (#22631)

---
 .../components/ResourceLocator/ResourceLocatorDropdown.vue      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/editor-ui/src/features/ndv/parameters/components/ResourceLocator/ResourceLocatorDropdown.vue b/packages/frontend/editor-ui/src/features/ndv/parameters/components/ResourceLocator/ResourceLocatorDropdown.vue
index 1f472a9bfd9..245b19ed033 100644
--- a/packages/frontend/editor-ui/src/features/ndv/parameters/components/ResourceLocator/ResourceLocatorDropdown.vue
+++ b/packages/frontend/editor-ui/src/features/ndv/parameters/components/ResourceLocator/ResourceLocatorDropdown.vue
@@ -457,7 +457,7 @@ watch(
 	align-items: center;
 	font-size: var(--font-size--3xs);
 	color: var(--color--text);
-	margin-left: var(--spacing--2xs);
+	margin-left: auto;
 
 	&:hover {
 		color: var(--color--primary);

From 9245f2d896b1a68ab4cfd4fe05493db8272f529f Mon Sep 17 00:00:00 2001
From: Stephen Wright <sjw948@gmail.com>
Date: Wed, 3 Dec 2025 08:27:12 +0000
Subject: [PATCH 021/167] feat: Collect dynamic and fixed time saved insights
 (#22607)

---
 .../insights-collection.service.test.ts       | 62 ++++++++++++++++++
 .../insights/insights-collection.service.ts   | 63 ++++++++++++++++---
 2 files changed, 118 insertions(+), 7 deletions(-)

diff --git a/packages/cli/src/modules/insights/__tests__/insights-collection.service.test.ts b/packages/cli/src/modules/insights/__tests__/insights-collection.service.test.ts
index 9a14278aa1e..0fc84629baf 100644
--- a/packages/cli/src/modules/insights/__tests__/insights-collection.service.test.ts
+++ b/packages/cli/src/modules/insights/__tests__/insights-collection.service.test.ts
@@ -118,3 +118,65 @@ describe('initialization safeguards', () => {
 		expect(jest.getTimerCount()).toBe(0);
 	});
 });
+
+describe('calculateTimeSaved', () => {
+	let insightsCollectionService: InsightsCollectionService;
+
+	const workflow = mock<WorkflowEntity & IWorkflowDb>({
+		id: 'workflow-id',
+		name: 'Test Workflow',
+	});
+
+	beforeAll(() => {
+		insightsCollectionService = new InsightsCollectionService(
+			mock<SharedWorkflowRepository>(),
+			mock<InsightsRawRepository>(),
+			mock<InsightsMetadataRepository>(),
+			mock<InsightsConfig>(),
+			mockLogger(),
+		);
+	});
+
+	test('returns the workflow time saved when the time saved mode is fixed', () => {
+		const ctx = mock<WorkflowExecuteAfterContext>({ workflow });
+		ctx.workflow.settings = {
+			timeSavedMode: 'fixed',
+			timeSavedPerExecution: 10,
+		};
+		ctx.runData = mock<IRun>({
+			mode: 'webhook',
+			status: 'success',
+			startedAt: DateTime.utc().toJSDate(),
+			stoppedAt: DateTime.utc().plus({ minutes: 10 }).toJSDate(),
+		});
+
+		// @ts-ignore-next-line
+		const timeSaved = insightsCollectionService.calculateTimeSaved(ctx);
+		expect(timeSaved).toBe(10);
+	});
+
+	test('returns the node time saved when the time saved mode is dynamic', () => {
+		const ctx = mock<WorkflowExecuteAfterContext>({ workflow });
+		ctx.workflow.settings = {
+			timeSavedMode: 'dynamic',
+		};
+		ctx.runData = mock<IRun>({
+			mode: 'webhook',
+			status: 'success',
+			startedAt: DateTime.utc().toJSDate(),
+			stoppedAt: DateTime.utc().plus({ minutes: 10 }).toJSDate(),
+			data: {
+				resultData: {
+					runData: {
+						'node-1': [{ metadata: { timeSaved: { minutes: 5 } } }],
+						'node-2': [{ metadata: { timeSaved: { minutes: 15 } } }],
+					},
+				},
+			},
+		});
+
+		// @ts-ignore-next-line
+		const timeSaved = insightsCollectionService.calculateTimeSaved(ctx);
+		expect(timeSaved).toBe(20);
+	});
+});
diff --git a/packages/cli/src/modules/insights/insights-collection.service.ts b/packages/cli/src/modules/insights/insights-collection.service.ts
index 24f9de0f0d1..475e9e45547 100644
--- a/packages/cli/src/modules/insights/insights-collection.service.ts
+++ b/packages/cli/src/modules/insights/insights-collection.service.ts
@@ -4,7 +4,12 @@ import { OnLifecycleEvent, type WorkflowExecuteAfterContext } from '@n8n/decorat
 import { Service } from '@n8n/di';
 import { In } from '@n8n/typeorm';
 import { DateTime } from 'luxon';
-import { UnexpectedError, type ExecutionStatus, type WorkflowExecuteMode } from 'n8n-workflow';
+import {
+	IRun,
+	UnexpectedError,
+	type ExecutionStatus,
+	type WorkflowExecuteMode,
+} from 'n8n-workflow';
 
 import { InsightsMetadata } from '@/modules/insights/database/entities/insights-metadata';
 import { InsightsRaw } from '@/modules/insights/database/entities/insights-raw';
@@ -170,12 +175,15 @@ export class InsightsCollectionService {
 		}
 
 		// time saved event
-		if (status === 'success' && ctx.workflow.settings?.timeSavedPerExecution) {
-			this.bufferedInsights.add({
-				...commonWorkflowData,
-				type: 'time_saved_min',
-				value: ctx.workflow.settings.timeSavedPerExecution,
-			});
+		if (status === 'success') {
+			const finalTimeSaved = this.calculateTimeSaved(ctx);
+			if (finalTimeSaved !== undefined) {
+				this.bufferedInsights.add({
+					...commonWorkflowData,
+					type: 'time_saved_min',
+					value: finalTimeSaved,
+				});
+			}
 		}
 
 		if (!this.isAsynchronouslySavingInsights) {
@@ -298,4 +306,45 @@ export class InsightsCollectionService {
 		this.flushesInProgress.add(flushPromise);
 		await flushPromise;
 	}
+
+	/**
+	 * Calculate the final time saved value by extracting SavedTime node metadata
+	 * and combining it with workflow settings based on the node's behavior.
+	 */
+	private calculateTimeSaved(ctx: WorkflowExecuteAfterContext): number {
+		const workflowTimeSaved = ctx.workflow.settings?.timeSavedPerExecution;
+
+		// backwards compatibility for legacy workflows with no time saved mode
+		if (ctx.workflow.settings?.timeSavedMode !== 'dynamic') {
+			return workflowTimeSaved ?? 0;
+		}
+
+		const nodeTimeSaved = this.extractTimeSavedFromNodes(ctx.runData);
+
+		return nodeTimeSaved;
+	}
+
+	/**
+	 * Extract and sum time saved from all SavedTime nodes in the workflow execution.
+	 * Returns undefined if no SavedTime nodes were executed.
+	 */
+	private extractTimeSavedFromNodes(runData: IRun): number {
+		let totalMinutes = 0;
+
+		const resultData = runData.data.resultData?.runData ?? {};
+
+		// Iterate through all node metadata
+		for (const nodeName in resultData) {
+			const taskData = resultData[nodeName];
+
+			// Each node can have multiple run indexes
+			for (const taskDataEntry of taskData) {
+				if (taskDataEntry?.metadata?.timeSaved) {
+					totalMinutes += taskDataEntry?.metadata?.timeSaved.minutes;
+				}
+			}
+		}
+
+		return totalMinutes;
+	}
 }

From 5ded4e8daddd95f7e257a160089d99464349450b Mon Sep 17 00:00:00 2001
From: RomanDavydchuk <roman.davydchuk@n8n.io>
Date: Wed, 3 Dec 2025 11:04:58 +0200
Subject: [PATCH 022/167] fix(MCP Client Node): Make "Use Dynamic Client
 Registration" toggle not required (#22645)

---
 .../@n8n/nodes-langchain/credentials/McpOAuth2Api.credentials.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/@n8n/nodes-langchain/credentials/McpOAuth2Api.credentials.ts b/packages/@n8n/nodes-langchain/credentials/McpOAuth2Api.credentials.ts
index f254931d3a5..e93e670744d 100644
--- a/packages/@n8n/nodes-langchain/credentials/McpOAuth2Api.credentials.ts
+++ b/packages/@n8n/nodes-langchain/credentials/McpOAuth2Api.credentials.ts
@@ -15,7 +15,6 @@ export class McpOAuth2Api implements ICredentialType {
 			name: 'useDynamicClientRegistration',
 			type: 'boolean',
 			default: true,
-			required: true,
 		},
 	];
 }

From 763b858548f72176b8a140189dd7c9b103ad3144 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Wed, 3 Dec 2025 10:34:30 +0100
Subject: [PATCH 023/167] feat(core): Introduce native Python code tool for AI
 agent (#22595)

---
 .../nodes/tools/ToolCode/ToolCode.node.ts     |  26 ++--
 .../task-runner-python/src/message_serde.py   |   2 +
 .../src/message_types/broker.py               |   3 +
 .../task-runner-python/src/pipe_reader.py     |   3 -
 .../task-runner-python/src/task_executor.py   |   7 +-
 .../task-runner-python/src/task_runner.py     |   1 +
 .../parameters/components/ParameterInput.vue  |   2 +-
 .../nodes/Code/PythonTaskRunnerSandbox.ts     |  37 ++++++
 .../Code/test/PythonTaskRunnerSandbox.test.ts | 119 ++++++++++++++++++
 9 files changed, 188 insertions(+), 12 deletions(-)

diff --git a/packages/@n8n/nodes-langchain/nodes/tools/ToolCode/ToolCode.node.ts b/packages/@n8n/nodes-langchain/nodes/tools/ToolCode/ToolCode.node.ts
index a33f83e92b0..1dd7cb4e9ce 100644
--- a/packages/@n8n/nodes-langchain/nodes/tools/ToolCode/ToolCode.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolCode/ToolCode.node.ts
@@ -5,6 +5,7 @@ import type { JSONSchema7 } from 'json-schema';
 import { JavaScriptSandbox } from 'n8n-nodes-base/dist/nodes/Code/JavaScriptSandbox';
 import { JsTaskRunnerSandbox } from 'n8n-nodes-base/dist/nodes/Code/JsTaskRunnerSandbox';
 import { PythonSandbox } from 'n8n-nodes-base/dist/nodes/Code/PythonSandbox';
+import { PythonTaskRunnerSandbox } from 'n8n-nodes-base/dist/nodes/Code/PythonTaskRunnerSandbox';
 import type { Sandbox } from 'n8n-nodes-base/dist/nodes/Code/Sandbox';
 import { getSandboxContext } from 'n8n-nodes-base/dist/nodes/Code/Sandbox';
 import type {
@@ -57,7 +58,8 @@ function getTool(
 	const workflowMode = ctx.getMode();
 
 	const runnersConfig = Container.get(TaskRunnersConfig);
-	const isRunnerEnabled = runnersConfig.enabled;
+	const isJsRunnerEnabled = runnersConfig.enabled;
+	const isPyRunnerEnabled = runnersConfig.isNativePythonRunnerEnabled;
 
 	const { typeVersion } = node;
 	const name =
@@ -100,7 +102,7 @@ function getTool(
 	};
 
 	const runFunction = async (query: string | IDataObject): Promise<unknown> => {
-		if (language === 'javaScript' && isRunnerEnabled) {
+		if (language === 'javaScript' && isJsRunnerEnabled) {
 			const sandbox = new JsTaskRunnerSandbox(
 				code,
 				'runOnceForAllItems',
@@ -111,10 +113,20 @@ function getTool(
 					query,
 				},
 			);
-			const executionData = await sandbox.runCodeForTool();
-			return executionData;
+			return await sandbox.runCodeForTool();
+		} else if (language === 'python' && isPyRunnerEnabled) {
+			const sandbox = new PythonTaskRunnerSandbox(
+				code,
+				'runOnceForAllItems',
+				workflowMode,
+				ctx as IExecuteFunctions,
+				{
+					query,
+				},
+			);
+			return await sandbox.runCodeForTool();
 		} else {
-			// use old vm2-based sandbox for python or when without runner enabled
+			// use old vm2-based sandbox when runners disabled
 			const sandbox = getSandbox(query, itemIndex);
 			return await sandbox.runCode<string>();
 		}
@@ -326,9 +338,9 @@ export class ToolCode implements INodeType {
 					editorLanguage: 'python',
 				},
 				default:
-					'# Example: convert the incoming query to uppercase and return it\nreturn query.upper()',
+					'# Example: convert the incoming query to uppercase and return it\nreturn _query.upper()',
 				// TODO: Add proper text here later
-				hint: 'You can access the input the tool receives via the input property "query". The returned value should be a single string.',
+				hint: 'You can access the input the tool receives via the input property "_query". The returned value should be a single string.',
 				// eslint-disable-next-line n8n-nodes-base/node-param-description-missing-final-period
 				description: 'E.g. Converts any text to uppercase',
 				noDataExpression: true,
diff --git a/packages/@n8n/task-runner-python/src/message_serde.py b/packages/@n8n/task-runner-python/src/message_serde.py
index 0bf8a414609..e6d0d699a2b 100644
--- a/packages/@n8n/task-runner-python/src/message_serde.py
+++ b/packages/@n8n/task-runner-python/src/message_serde.py
@@ -50,6 +50,7 @@ def _parse_task_settings(d: dict) -> BrokerTaskSettings:
         workflow_id = settings_dict.get("workflowId", "Unknown")
         node_name = settings_dict.get("nodeName", "Unknown")
         node_id = settings_dict.get("nodeId", "Unknown")
+        query = settings_dict.get("query")
     except KeyError as e:
         raise ValueError(f"Missing field in task settings message: {e}")
 
@@ -64,6 +65,7 @@ def _parse_task_settings(d: dict) -> BrokerTaskSettings:
             workflow_id=workflow_id,
             node_name=node_name,
             node_id=node_id,
+            query=query,
         ),
     )
 
diff --git a/packages/@n8n/task-runner-python/src/message_types/broker.py b/packages/@n8n/task-runner-python/src/message_types/broker.py
index 2db7b71f87d..79a14bda742 100644
--- a/packages/@n8n/task-runner-python/src/message_types/broker.py
+++ b/packages/@n8n/task-runner-python/src/message_types/broker.py
@@ -32,6 +32,8 @@ NodeMode = Literal["all_items", "per_item"]
 
 Items = list[dict[str, Any]]  # INodeExecutionData[]
 
+Query = str | dict[str, Any] | None  # tool input
+
 
 @dataclass
 class TaskSettings:
@@ -43,6 +45,7 @@ class TaskSettings:
     workflow_id: str
     node_name: str
     node_id: str
+    query: Query = None
 
 
 @dataclass
diff --git a/packages/@n8n/task-runner-python/src/pipe_reader.py b/packages/@n8n/task-runner-python/src/pipe_reader.py
index bdead264834..38d0f654ad9 100644
--- a/packages/@n8n/task-runner-python/src/pipe_reader.py
+++ b/packages/@n8n/task-runner-python/src/pipe_reader.py
@@ -79,9 +79,6 @@ class PipeReader(threading.Thread):
         if has_result and has_error:
             raise InvalidPipeMsgContentError("Msg has both 'result' and 'error' keys")
 
-        if has_result and not isinstance(msg["result"], list):
-            raise InvalidPipeMsgContentError("'result' must be a list")
-
         if has_error and not isinstance(msg["error"], dict):
             raise InvalidPipeMsgContentError("'error' must be a dict")
 
diff --git a/packages/@n8n/task-runner-python/src/task_executor.py b/packages/@n8n/task-runner-python/src/task_executor.py
index 4bb4aa8a2ea..160cb6dd4c3 100644
--- a/packages/@n8n/task-runner-python/src/task_executor.py
+++ b/packages/@n8n/task-runner-python/src/task_executor.py
@@ -20,7 +20,7 @@ from src.errors import (
 from src.import_validation import validate_module_import
 from src.config.security_config import SecurityConfig
 
-from src.message_types.broker import NodeMode, Items
+from src.message_types.broker import NodeMode, Items, Query
 from src.message_types.pipe import (
     PipeResultMessage,
     PipeErrorMessage,
@@ -59,6 +59,7 @@ class TaskExecutor:
         node_mode: NodeMode,
         items: Items,
         security_config: SecurityConfig,
+        query: Query = None,
     ) -> tuple[ForkServerProcess, PipeConnection, PipeConnection]:
         """Create a subprocess for executing a Python code task and a pipe for communication."""
 
@@ -78,6 +79,7 @@ class TaskExecutor:
                 items,
                 write_conn,
                 security_config,
+                query,
             ),
         )
 
@@ -186,6 +188,7 @@ class TaskExecutor:
         items: Items,
         write_conn,
         security_config: SecurityConfig,
+        query: Query = None,
     ):
         """Execute a Python code task in all-items mode."""
 
@@ -204,6 +207,7 @@ class TaskExecutor:
             globals = {
                 "__builtins__": TaskExecutor._filter_builtins(security_config),
                 "_items": items,
+                "_query": query,
                 "print": TaskExecutor._create_custom_print(print_args),
             }
 
@@ -223,6 +227,7 @@ class TaskExecutor:
         items: Items,
         write_conn,
         security_config: SecurityConfig,
+        _query: Query = None,  # unused, only to keep signatures consistent across modes
     ):
         """Execute a Python code task in per-item mode."""
 
diff --git a/packages/@n8n/task-runner-python/src/task_runner.py b/packages/@n8n/task-runner-python/src/task_runner.py
index 8839a8d0010..9d2c15f6d20 100644
--- a/packages/@n8n/task-runner-python/src/task_runner.py
+++ b/packages/@n8n/task-runner-python/src/task_runner.py
@@ -315,6 +315,7 @@ class TaskRunner:
                 node_mode=task_settings.node_mode,
                 items=task_settings.items,
                 security_config=self.security_config,
+                query=task_settings.query,
             )
 
             task_state.process = process
diff --git a/packages/frontend/editor-ui/src/features/ndv/parameters/components/ParameterInput.vue b/packages/frontend/editor-ui/src/features/ndv/parameters/components/ParameterInput.vue
index aba4420c557..d32c082127f 100644
--- a/packages/frontend/editor-ui/src/features/ndv/parameters/components/ParameterInput.vue
+++ b/packages/frontend/editor-ui/src/features/ndv/parameters/components/ParameterInput.vue
@@ -251,7 +251,7 @@ const parameterOptions = computed(() => {
 	const safeOptions = (options ?? []).filter(isValidParameterOption);
 
 	// temporary until native Python runner is GA
-	if (props.parameter.name === 'language') {
+	if (props.parameter.name === 'language' && node.value?.type === 'n8n-nodes-base.code') {
 		if (settingsStore.isNativePythonRunnerEnabled) {
 			return safeOptions.filter((o) => o.value !== 'python');
 		} else {
diff --git a/packages/nodes-base/nodes/Code/PythonTaskRunnerSandbox.ts b/packages/nodes-base/nodes/Code/PythonTaskRunnerSandbox.ts
index dcd9ced059c..f7acf72ebd5 100644
--- a/packages/nodes-base/nodes/Code/PythonTaskRunnerSandbox.ts
+++ b/packages/nodes-base/nodes/Code/PythonTaskRunnerSandbox.ts
@@ -19,6 +19,7 @@ export class PythonTaskRunnerSandbox {
 		private readonly nodeMode: CodeExecutionMode,
 		private readonly workflowMode: WorkflowExecuteMode,
 		private readonly executeFunctions: IExecuteFunctions,
+		private readonly additionalProperties: Record<string, unknown> = {},
 	) {}
 
 	/**
@@ -73,4 +74,40 @@ export class PythonTaskRunnerSandbox {
 			),
 		);
 	}
+
+	/**
+	 * Run a script for tool execution.
+	 *
+	 * Unlike `runUsingIncomingItems`, this method:
+	 * - Sends empty items (tools don't process workflow items)
+	 * - Passes `query` from `additionalProperties` to the runner
+	 * - Does not validate the result from the runner (tools can return any type)
+	 */
+	async runCodeForTool(): Promise<unknown> {
+		const itemIndex = 0;
+
+		const node = this.executeFunctions.getNode();
+		const workflow = this.executeFunctions.getWorkflow();
+
+		const taskSettings: Record<string, unknown> = {
+			code: this.pythonCode,
+			nodeMode: 'runOnceForAllItems',
+			workflowMode: this.workflowMode,
+			continueOnFail: this.executeFunctions.continueOnFail(),
+			items: [],
+			nodeId: node.id,
+			nodeName: node.name,
+			workflowId: workflow.id,
+			workflowName: workflow.name,
+			query: this.additionalProperties.query,
+		};
+
+		const executionResult = await this.executeFunctions.startJob('python', taskSettings, itemIndex);
+
+		if (!executionResult.ok) {
+			return throwExecutionError('error' in executionResult ? executionResult.error : {});
+		}
+
+		return executionResult.result;
+	}
 }
diff --git a/packages/nodes-base/nodes/Code/test/PythonTaskRunnerSandbox.test.ts b/packages/nodes-base/nodes/Code/test/PythonTaskRunnerSandbox.test.ts
index b9d0ba19469..1d4a826347b 100644
--- a/packages/nodes-base/nodes/Code/test/PythonTaskRunnerSandbox.test.ts
+++ b/packages/nodes-base/nodes/Code/test/PythonTaskRunnerSandbox.test.ts
@@ -136,4 +136,123 @@ describe('PythonTaskRunnerSandbox', () => {
 			expect(throwExecutionErrorSpy).toHaveBeenCalledWith(executionError);
 		});
 	});
+
+	describe('runCodeForTool', () => {
+		it('should pass query and empty items to the runner', async () => {
+			const pythonCode = 'return _query.upper()';
+			const nodeMode = 'runOnceForAllItems';
+			const workflowMode = 'manual';
+			const executeFunctions = createMockExecuteFunctions([]);
+			const query = 'hello world';
+
+			const sandbox = new PythonTaskRunnerSandbox(
+				pythonCode,
+				nodeMode,
+				workflowMode,
+				executeFunctions,
+				{ query },
+			);
+
+			executeFunctions.startJob.mockResolvedValue(createResultOk('HELLO WORLD'));
+
+			const result = await sandbox.runCodeForTool();
+
+			expect(executeFunctions.startJob).toHaveBeenCalledTimes(1);
+			expect(executeFunctions.startJob).toHaveBeenCalledWith(
+				'python',
+				{
+					code: pythonCode,
+					nodeMode: 'runOnceForAllItems',
+					workflowMode,
+					continueOnFail: executeFunctions.continueOnFail(),
+					items: [],
+					nodeId: 'node-id',
+					nodeName: 'Code',
+					workflowId: 'workflow-id',
+					workflowName: 'Test Workflow',
+					query,
+				},
+				0,
+			);
+			expect(result).toBe('HELLO WORLD');
+		});
+
+		it('should pass structured query object to the runner', async () => {
+			const pythonCode = 'return f"{_query["name"]} is {_query["age"]}"';
+			const nodeMode = 'runOnceForAllItems';
+			const workflowMode = 'manual';
+			const executeFunctions = createMockExecuteFunctions([]);
+			const query = { name: 'Alice', age: 30 };
+
+			const sandbox = new PythonTaskRunnerSandbox(
+				pythonCode,
+				nodeMode,
+				workflowMode,
+				executeFunctions,
+				{ query },
+			);
+
+			executeFunctions.startJob.mockResolvedValue(createResultOk('Alice is 30'));
+
+			const result = await sandbox.runCodeForTool();
+
+			expect(executeFunctions.startJob).toHaveBeenCalledWith(
+				'python',
+				expect.objectContaining({ query, items: [] }),
+				0,
+			);
+			expect(result).toBe('Alice is 30');
+		});
+
+		it('should return result without validation', async () => {
+			const pythonCode = 'return 42';
+			const nodeMode = 'runOnceForAllItems';
+			const workflowMode = 'manual';
+			const executeFunctions = createMockExecuteFunctions([]);
+
+			const sandbox = new PythonTaskRunnerSandbox(
+				pythonCode,
+				nodeMode,
+				workflowMode,
+				executeFunctions,
+				{ query: 'test' },
+			);
+
+			executeFunctions.startJob.mockResolvedValue(createResultOk(42));
+
+			const result = await sandbox.runCodeForTool();
+
+			// Should return raw number, not wrapped in INodeExecutionData
+			expect(result).toBe(42);
+			expect(executeFunctions.helpers.normalizeItems).not.toHaveBeenCalled();
+		});
+
+		it('should handle execution errors by calling throwExecutionError', async () => {
+			const pythonCode = 'raise ValueError("tool error")';
+			const nodeMode = 'runOnceForAllItems';
+			const workflowMode = 'manual';
+			const executeFunctions = createMockExecuteFunctions([]);
+
+			const sandbox = new PythonTaskRunnerSandbox(
+				pythonCode,
+				nodeMode,
+				workflowMode,
+				executeFunctions,
+				{ query: 'test' },
+			);
+
+			const executionError = { message: 'tool error', stack: 'error stack' };
+			executeFunctions.startJob.mockResolvedValue(createResultError(executionError));
+
+			const throwExecutionErrorModule = await import('../throw-execution-error');
+			const throwExecutionErrorSpy = jest
+				.spyOn(throwExecutionErrorModule, 'throwExecutionError')
+				.mockImplementation(() => {
+					throw new Error('Tool execution failed');
+				});
+
+			await expect(sandbox.runCodeForTool()).rejects.toThrow('Tool execution failed');
+			expect(throwExecutionErrorSpy).toHaveBeenCalledWith(executionError);
+		});
+	});
 });

From 0c04e9294a5fcf3edbf8a684fd6576efdbc7c84c Mon Sep 17 00:00:00 2001
From: Michael Drury <me@michaeldrury.co.uk>
Date: Wed, 3 Dec 2025 10:25:26 +0000
Subject: [PATCH 024/167] chore(ai-builder): Add template usage to multi-agent
 architecture (#22600)

---
 .../src/multi-agent-workflow-subgraphs.ts     |   6 +-
 .../src/parent-graph-state.ts                 |  15 +++
 .../src/subgraphs/discovery.subgraph.ts       | 126 +++++++++++++++---
 .../best-practices/content-generation.ts      |  40 +++++-
 .../src/types/discovery-types.ts              |   3 +
 .../src/utils/state-reducers.ts               |  41 ++++++
 .../src/utils/subgraph-helpers.ts             |  49 ++++++-
 .../src/workflow-builder-agent.ts             |   5 +-
 .../src/workflow-state.ts                     |  18 +--
 9 files changed, 261 insertions(+), 42 deletions(-)
 create mode 100644 packages/@n8n/ai-workflow-builder.ee/src/utils/state-reducers.ts

diff --git a/packages/@n8n/ai-workflow-builder.ee/src/multi-agent-workflow-subgraphs.ts b/packages/@n8n/ai-workflow-builder.ee/src/multi-agent-workflow-subgraphs.ts
index 573c80fe9f1..fbeb617aaa0 100644
--- a/packages/@n8n/ai-workflow-builder.ee/src/multi-agent-workflow-subgraphs.ts
+++ b/packages/@n8n/ai-workflow-builder.ee/src/multi-agent-workflow-subgraphs.ts
@@ -20,6 +20,7 @@ import type { SubgraphPhase } from './types/coordination';
 import { createErrorMetadata } from './types/coordination';
 import { getNextPhaseFromLog } from './utils/coordination-log';
 import { processOperations } from './utils/operations-processor';
+import type { BuilderFeatureFlags } from './workflow-builder-agent';
 
 /**
  * Maps routing decisions to graph node names.
@@ -42,6 +43,7 @@ export interface MultiAgentSubgraphConfig {
 	logger?: Logger;
 	instanceUrl?: string;
 	checkpointer?: MemorySaver;
+	featureFlags?: BuilderFeatureFlags;
 }
 
 /**
@@ -105,7 +107,8 @@ function createSubgraphNodeHandler<
  * Parent graph orchestrates between subgraphs with minimal shared state.
  */
 export function createMultiAgentWorkflowWithSubgraphs(config: MultiAgentSubgraphConfig) {
-	const { parsedNodeTypes, llmComplexTask, logger, instanceUrl, checkpointer } = config;
+	const { parsedNodeTypes, llmComplexTask, logger, instanceUrl, checkpointer, featureFlags } =
+		config;
 
 	const supervisorAgent = new SupervisorAgent({ llm: llmComplexTask });
 	const responderAgent = new ResponderAgent({ llm: llmComplexTask });
@@ -120,6 +123,7 @@ export function createMultiAgentWorkflowWithSubgraphs(config: MultiAgentSubgraph
 		parsedNodeTypes,
 		llm: llmComplexTask,
 		logger,
+		featureFlags,
 	});
 	const compiledBuilder = builderSubgraph.create({ parsedNodeTypes, llm: llmComplexTask, logger });
 	const compiledConfigurator = configuratorSubgraph.create({
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/parent-graph-state.ts b/packages/@n8n/ai-workflow-builder.ee/src/parent-graph-state.ts
index 6f676735547..33741b88dca 100644
--- a/packages/@n8n/ai-workflow-builder.ee/src/parent-graph-state.ts
+++ b/packages/@n8n/ai-workflow-builder.ee/src/parent-graph-state.ts
@@ -3,7 +3,9 @@ import { Annotation } from '@langchain/langgraph';
 
 import type { CoordinationLogEntry } from './types/coordination';
 import type { DiscoveryContext } from './types/discovery-types';
+import type { NodeConfigurationsMap } from './types/tools';
 import type { SimpleWorkflow, WorkflowOperation } from './types/workflow';
+import { appendArrayReducer, nodeConfigurationsReducer } from './utils/state-reducers';
 import type { ChatPayload } from './workflow-builder-agent';
 
 /**
@@ -53,4 +55,17 @@ export const ParentGraphState = Annotation.Root({
 		reducer: (x, y) => x.concat(y),
 		default: () => [],
 	}),
+
+	// Template IDs fetched from workflow examples for telemetry
+	templateIds: Annotation<number[]>({
+		reducer: appendArrayReducer,
+		default: () => [],
+	}),
+
+	// Node configurations collected from workflow examples
+	// Used to provide example parameter configurations when calling tools
+	nodeConfigurations: Annotation<NodeConfigurationsMap>({
+		reducer: nodeConfigurationsReducer,
+		default: () => ({}),
+	}),
 });
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/subgraphs/discovery.subgraph.ts b/packages/@n8n/ai-workflow-builder.ee/src/subgraphs/discovery.subgraph.ts
index 03d6cfd57d5..60148969262 100644
--- a/packages/@n8n/ai-workflow-builder.ee/src/subgraphs/discovery.subgraph.ts
+++ b/packages/@n8n/ai-workflow-builder.ee/src/subgraphs/discovery.subgraph.ts
@@ -15,16 +15,20 @@ import {
 	WorkflowTechnique,
 	type WorkflowTechniqueType,
 } from '@/types/categorization';
+import type { BuilderFeatureFlags } from '@/workflow-builder-agent';
 
 import { BaseSubgraph } from './subgraph-interface';
 import type { ParentGraphState } from '../parent-graph-state';
 import { createGetBestPracticesTool } from '../tools/get-best-practices.tool';
+import { createGetWorkflowExamplesTool } from '../tools/get-workflow-examples.tool';
 import { createNodeDetailsTool } from '../tools/node-details.tool';
 import { createNodeSearchTool } from '../tools/node-search.tool';
 import type { CoordinationLogEntry } from '../types/coordination';
 import { createDiscoveryMetadata } from '../types/coordination';
+import type { NodeConfigurationsMap } from '../types/tools';
 import { applySubgraphCacheMarkers } from '../utils/cache-control';
 import { buildWorkflowSummary, createContextMessage } from '../utils/context-builders';
+import { appendArrayReducer, nodeConfigurationsReducer } from '../utils/state-reducers';
 import { executeSubgraphTools, extractUserRequest } from '../utils/subgraph-helpers';
 
 /**
@@ -189,29 +193,77 @@ const discoveryOutputSchema = z.object({
 		.describe('List of n8n nodes identified as necessary for the workflow'),
 });
 
+interface DiscoveryPromptOptions {
+	includeExamples: boolean;
+}
+
+/**
+ * Generate the process steps with proper numbering
+ */
+function generateProcessSteps(options: DiscoveryPromptOptions): string {
+	const { includeExamples } = options;
+
+	const steps: string[] = [
+		'**Analyze user prompt** - Extract services, models, and technologies mentioned',
+		'**Call get_best_practices** with identified techniques (internal context)',
+	];
+
+	if (includeExamples) {
+		steps.push('**Call get_workflow_examples** with search queries for mentioned services/models');
+	}
+
+	const examplesContext = includeExamples ? ', and examples' : '';
+	steps.push(
+		`**Identify workflow components** from user request, best practices${examplesContext}`,
+		'**Call search_nodes IN PARALLEL** for all components (e.g., "Gmail", "OpenAI", "Schedule")',
+		'**Call get_node_details IN PARALLEL** for ALL promising nodes (batch multiple calls)',
+		`**Extract node information** from each node_details response:
+   - Node name from <name> tag
+   - Version number from <version> tag (required - extract the number)
+   - Connection-changing parameters from <connections> section`,
+		'**Call submit_discovery_results** with complete nodesFound array',
+	);
+
+	return steps.map((step, index) => `${index + 1}. ${step}`).join('\n');
+}
+
+/**
+ * Generate available tools list based on feature flags
+ */
+function generateAvailableToolsList(options: DiscoveryPromptOptions): string {
+	const { includeExamples } = options;
+
+	const tools = [
+		'- get_best_practices: Retrieve best practices (internal context)',
+		'- search_nodes: Find n8n nodes by keyword',
+		'- get_node_details: Get complete node information including <connections>',
+	];
+
+	if (includeExamples) {
+		tools.push('- get_workflow_examples: Search for workflow examples as reference');
+	}
+
+	tools.push('- submit_discovery_results: Submit final results');
+
+	return tools.join('\n');
+}
+
 /**
  * Discovery Agent Prompt
  */
-const DISCOVERY_PROMPT = `You are a Discovery Agent for n8n AI Workflow Builder.
+function generateDiscoveryPrompt(options: DiscoveryPromptOptions): string {
+	const availableTools = generateAvailableToolsList(options);
+	const processSteps = generateProcessSteps(options);
+
+	return `You are a Discovery Agent for n8n AI Workflow Builder.
 
 YOUR ROLE: Identify relevant n8n nodes and their connection-changing parameters.
 
 AVAILABLE TOOLS:
-- get_best_practices: Retrieve best practices (internal context)
-- search_nodes: Find n8n nodes by keyword
-- get_node_details: Get complete node information including <connections>
-- submit_discovery_results: Submit final results
+${availableTools}
 
 PROCESS:
-1. **Call get_best_practices** with identified techniques (internal context)
-2. **Identify workflow components** from user request and best practices
-3. **Call search_nodes IN PARALLEL** for all components (e.g., "Gmail", "OpenAI", "Schedule")
-4. **Call get_node_details IN PARALLEL** for ALL promising nodes (batch multiple calls)
-5. **Extract node information** from each node_details response:
-   - Node name from <name> tag
-   - Version number from <version> tag (required - extract the number)
-   - Connection-changing parameters from <connections> section
-6. **Call submit_discovery_results** with complete nodesFound array
+${processSteps}
 
 TECHNIQUE CATEGORIZATION:
 When calling get_best_practices, select techniques that match the user's workflow intent.
@@ -297,6 +349,7 @@ DO NOT:
 - Flag parameters that don't affect connections
 - Stop without calling submit_discovery_results
 `;
+}
 
 /**
  * Discovery Subgraph State
@@ -334,12 +387,26 @@ export const DiscoverySubgraphState = Annotation.Root({
 	bestPractices: Annotation<string | undefined>({
 		reducer: (x, y) => y ?? x,
 	}),
+
+	// Output: Template IDs fetched from workflow examples for telemetry
+	templateIds: Annotation<number[]>({
+		reducer: appendArrayReducer,
+		default: () => [],
+	}),
+
+	// Output: Node configurations collected from workflow examples
+	// Used to provide example parameter configurations when get_node_details is called
+	nodeConfigurations: Annotation<NodeConfigurationsMap>({
+		reducer: nodeConfigurationsReducer,
+		default: () => ({}),
+	}),
 });
 
 export interface DiscoverySubgraphConfig {
 	parsedNodeTypes: INodeTypeDescription[];
 	llm: BaseChatModel;
 	logger?: Logger;
+	featureFlags?: BuilderFeatureFlags;
 }
 
 export class DiscoverySubgraph extends BaseSubgraph<
@@ -357,12 +424,21 @@ export class DiscoverySubgraph extends BaseSubgraph<
 	create(config: DiscoverySubgraphConfig) {
 		this.logger = config.logger;
 
-		// Create tools
-		const tools = [
+		// Check if template examples are enabled
+		const includeExamples = config.featureFlags?.templateExamples === true;
+
+		// Create base tools
+		const baseTools = [
 			createGetBestPracticesTool(),
 			createNodeSearchTool(config.parsedNodeTypes),
 			createNodeDetailsTool(config.parsedNodeTypes),
 		];
+
+		// Conditionally add workflow examples tool if feature flag is enabled
+		const tools = includeExamples
+			? [...baseTools, createGetWorkflowExamplesTool(config.logger)]
+			: baseTools;
+
 		this.toolMap = new Map(tools.map((bt) => [bt.tool.name, bt.tool]));
 
 		// Define output tool
@@ -372,6 +448,9 @@ export class DiscoverySubgraph extends BaseSubgraph<
 			schema: discoveryOutputSchema,
 		});
 
+		// Generate prompt based on feature flags
+		const discoveryPrompt = generateDiscoveryPrompt({ includeExamples });
+
 		// Create agent with tools bound (including submit tool)
 		const systemPrompt = ChatPromptTemplate.fromMessages([
 			[
@@ -379,7 +458,7 @@ export class DiscoverySubgraph extends BaseSubgraph<
 				[
 					{
 						type: 'text',
-						text: DISCOVERY_PROMPT,
+						text: discoveryPrompt,
 						cache_control: { type: 'ephemeral' },
 					},
 				],
@@ -458,16 +537,20 @@ export class DiscoverySubgraph extends BaseSubgraph<
 			this.logger?.error('[Discovery] No submit tool call found in last message');
 			return {
 				nodesFound: [],
+				templateIds: [],
 			};
 		}
 
 		const bestPracticesTool = state.messages.find(
 			(m): m is ToolMessage => m.getType() === 'tool' && m?.text?.startsWith('<best_practices>'),
 		);
-		// Return raw output without hydration
+
+		// Return raw output without hydration, including templateIds and nodeConfigurations from workflow examples
 		return {
 			nodesFound: output.nodesFound,
 			bestPractices: bestPracticesTool?.text,
+			templateIds: state.templateIds ?? [],
+			nodeConfigurations: state.nodeConfigurations ?? {},
 		};
 	}
 
@@ -533,9 +616,12 @@ export class DiscoverySubgraph extends BaseSubgraph<
 		_parentState: typeof ParentGraphState.State,
 	) {
 		const nodesFound = subgraphOutput.nodesFound || [];
+		const templateIds = subgraphOutput.templateIds || [];
+		const nodeConfigurations = subgraphOutput.nodeConfigurations || {};
 		const discoveryContext = {
 			nodesFound,
 			bestPractices: subgraphOutput.bestPractices,
+			nodeConfigurations,
 		};
 
 		// Create coordination log entry (not a message)
@@ -554,6 +640,10 @@ export class DiscoverySubgraph extends BaseSubgraph<
 		return {
 			discoveryContext,
 			coordinationLog: [logEntry],
+			// Pass template IDs for telemetry
+			templateIds,
+			// Pass node configurations for example parameters in node details
+			nodeConfigurations,
 		};
 	}
 }
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/tools/best-practices/content-generation.ts b/packages/@n8n/ai-workflow-builder.ee/src/tools/best-practices/content-generation.ts
index 066806d94f8..91ee2a29b1a 100644
--- a/packages/@n8n/ai-workflow-builder.ee/src/tools/best-practices/content-generation.ts
+++ b/packages/@n8n/ai-workflow-builder.ee/src/tools/best-practices/content-generation.ts
@@ -11,6 +11,42 @@ export class ContentGenerationBestPractices implements BestPracticesDocument {
 
 Break complex tasks into sequential steps (e.g., generate text, create image, compose video) for modularity and easier troubleshooting.
 
+## Node Selection Guidelines
+
+Always prefer built-in n8n nodes over HTTP Request nodes when a dedicated node exists for the service or API you need to integrate with. Built-in nodes provide:
+- Pre-configured authentication handling
+- Optimized data structures and field mappings
+- Better error handling and user experience
+- Simplified setup without manual API configuration
+
+Only use HTTP Request nodes when no built-in node exists for the service, or when you need to access an API endpoint not covered by the built-in node's operations.
+
+## Multi-Modal Content Generation - MANDATORY
+
+When the user's request involves specific generative AI models or media-focused platforms, the workflow MUST include the appropriate media generation node from a
+provider-specific node. The finished workflow MUST contain the relevant video, audio, or image generation capability.
+
+Prompts that require multi-modal generation nodes:
+
+Video Generation:
+- Model mentions: Sora, Nano Banana, Veo, Runway, Pika
+- Platform mentions: YouTube content, TikTok videos, Instagram Reels, video ads, short-form video
+- Task mentions: generate video, create video, video from text, animate
+
+Image Generation:
+- Model mentions: DALL-E, Midjourney, Stable Diffusion, Imagen
+- Platform mentions: thumbnails, social media graphics, product images, marketing visuals
+- Task mentions: generate image, create artwork, design graphic, visualize
+
+Audio Generation:
+- Model mentions: ElevenLabs, text-to-speech, TTS
+- Platform mentions: podcast audio, voiceovers, narration, audio content
+- Task mentions: generate voice, create audio, synthesize speech, clone voice
+
+If anything like the examples above are mentioned in the prompt, include the appropriate
+provider node (OpenAI for DALL-E/Sora, Google Gemini for Nano Banana/Imagen, etc.)
+with the media generation operation configured.
+
 ## Content-Specific Guidance
 
 For text generation, validate and sanitize input/output to avoid malformed data. When generating images, prefer binary data over URLs for uploads to avoid media type errors.
@@ -19,7 +55,7 @@ For text generation, validate and sanitize input/output to avoid malformed data.
 
 ### OpenAI (@n8n/n8n-nodes-langchain.openAi)
 
-Purpose: GPT-based text generation, DALL-E image generation, text-to-speech (TTS), and audio transcription
+Purpose: GPT-based text generation, DALL-E image generation, text-to-speech (TTS), and audio transcription, SORA for video generation
 
 ### xAI Grok Chat Model (@n8n/n8n-nodes-langchain.lmChatXAiGrok)
 
@@ -27,7 +63,7 @@ Purpose: Conversational AI and text generation
 
 ### Google Gemini Chat Model (@n8n/n8n-nodes-langchain.lmChatGoogleGemini)
 
-Purpose: Image analysis and generation, video generation from text prompts, multimodal content creation
+Purpose: Image analysis and generation, video generation from text prompts using nano banana, multimodal content creation
 
 ### ElevenLabs
 
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/types/discovery-types.ts b/packages/@n8n/ai-workflow-builder.ee/src/types/discovery-types.ts
index 7b99504287b..46738aaa812 100644
--- a/packages/@n8n/ai-workflow-builder.ee/src/types/discovery-types.ts
+++ b/packages/@n8n/ai-workflow-builder.ee/src/types/discovery-types.ts
@@ -1,3 +1,5 @@
+import type { NodeConfigurationsMap } from './tools';
+
 export interface DiscoveryContext {
 	nodesFound: Array<{
 		nodeName: string;
@@ -9,4 +11,5 @@ export interface DiscoveryContext {
 		}>;
 	}>;
 	bestPractices?: string;
+	nodeConfigurations?: NodeConfigurationsMap;
 }
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/utils/state-reducers.ts b/packages/@n8n/ai-workflow-builder.ee/src/utils/state-reducers.ts
new file mode 100644
index 00000000000..6553ee81231
--- /dev/null
+++ b/packages/@n8n/ai-workflow-builder.ee/src/utils/state-reducers.ts
@@ -0,0 +1,41 @@
+import type { NodeConfigurationsMap } from '../types/tools';
+
+/**
+ * Reducer for appending arrays with null/empty check.
+ * Only appends if the update is a non-empty array.
+ */
+export function appendArrayReducer<T>(current: T[], update: T[] | undefined | null): T[] {
+	return update && update.length > 0 ? [...current, ...update] : current;
+}
+
+/**
+ * Merge node configurations by type, appending new configs to existing ones.
+ * Used as a standalone utility function for merging node configurations outside of reducers.
+ */
+export function mergeNodeConfigurations(
+	target: NodeConfigurationsMap,
+	source: NodeConfigurationsMap,
+): void {
+	for (const [nodeType, configs] of Object.entries(source)) {
+		if (!target[nodeType]) {
+			target[nodeType] = [];
+		}
+		target[nodeType].push(...configs);
+	}
+}
+
+/**
+ * Reducer for merging node configurations by type.
+ * Appends new configurations to existing ones for each node type.
+ */
+export function nodeConfigurationsReducer(
+	current: NodeConfigurationsMap,
+	update: NodeConfigurationsMap | undefined | null,
+): NodeConfigurationsMap {
+	if (!update || Object.keys(update).length === 0) {
+		return current;
+	}
+	const merged = { ...current };
+	mergeNodeConfigurations(merged, update);
+	return merged;
+}
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/utils/subgraph-helpers.ts b/packages/@n8n/ai-workflow-builder.ee/src/utils/subgraph-helpers.ts
index 2d724921f19..7122bb74024 100644
--- a/packages/@n8n/ai-workflow-builder.ee/src/utils/subgraph-helpers.ts
+++ b/packages/@n8n/ai-workflow-builder.ee/src/utils/subgraph-helpers.ts
@@ -3,12 +3,16 @@ import { isAIMessage, ToolMessage, HumanMessage } from '@langchain/core/messages
 import type { StructuredTool } from '@langchain/core/tools';
 import { isCommand, END } from '@langchain/langgraph';
 
+import { mergeNodeConfigurations } from './state-reducers';
 import { isBaseMessage } from '../types/langchain';
+import type { NodeConfigurationsMap } from '../types/tools';
 import type { WorkflowOperation } from '../types/workflow';
 
 interface CommandUpdate {
 	messages?: BaseMessage[];
 	workflowOperations?: WorkflowOperation[];
+	templateIds?: number[];
+	nodeConfigurations?: NodeConfigurationsMap;
 }
 
 /**
@@ -31,6 +35,18 @@ function isCommandUpdate(value: unknown): value is CommandUpdate {
 	) {
 		return false;
 	}
+	// templateIds is optional, but if present must be an array
+	if ('templateIds' in obj && obj.templateIds !== undefined && !Array.isArray(obj.templateIds)) {
+		return false;
+	}
+	// nodeConfigurations is optional, but if present must be an object
+	if (
+		'nodeConfigurations' in obj &&
+		obj.nodeConfigurations !== undefined &&
+		(typeof obj.nodeConfigurations !== 'object' || obj.nodeConfigurations === null)
+	) {
+		return false;
+	}
 	return true;
 }
 
@@ -47,7 +63,12 @@ function isCommandUpdate(value: unknown): value is CommandUpdate {
 export async function executeSubgraphTools(
 	state: { messages: BaseMessage[] },
 	toolMap: Map<string, StructuredTool>,
-): Promise<{ messages?: BaseMessage[]; workflowOperations?: WorkflowOperation[] | null }> {
+): Promise<{
+	messages?: BaseMessage[];
+	workflowOperations?: WorkflowOperation[] | null;
+	templateIds?: number[];
+	nodeConfigurations?: NodeConfigurationsMap;
+}> {
 	const lastMessage = state.messages[state.messages.length - 1];
 
 	if (!lastMessage || !isAIMessage(lastMessage) || !lastMessage.tool_calls?.length) {
@@ -85,9 +106,11 @@ export async function executeSubgraphTools(
 		}),
 	);
 
-	// Unwrap Command objects and collect messages/operations
+	// Unwrap Command objects and collect messages/operations/templateIds/nodeConfigurations
 	const messages: BaseMessage[] = [];
 	const operations: WorkflowOperation[] = [];
+	const templateIds: number[] = [];
+	const nodeConfigurations: NodeConfigurationsMap = {};
 
 	for (const result of toolResults) {
 		if (isCommand(result)) {
@@ -99,6 +122,12 @@ export async function executeSubgraphTools(
 				if (result.update.workflowOperations) {
 					operations.push(...result.update.workflowOperations);
 				}
+				if (result.update.templateIds) {
+					templateIds.push(...result.update.templateIds);
+				}
+				if (result.update.nodeConfigurations) {
+					mergeNodeConfigurations(nodeConfigurations, result.update.nodeConfigurations);
+				}
 			}
 		} else if (isBaseMessage(result)) {
 			// Direct message (ToolMessage, AIMessage, etc.)
@@ -106,8 +135,12 @@ export async function executeSubgraphTools(
 		}
 	}
 
-	const stateUpdate: { messages?: BaseMessage[]; workflowOperations?: WorkflowOperation[] | null } =
-		{};
+	const stateUpdate: {
+		messages?: BaseMessage[];
+		workflowOperations?: WorkflowOperation[] | null;
+		templateIds?: number[];
+		nodeConfigurations?: NodeConfigurationsMap;
+	} = {};
 
 	if (messages.length > 0) {
 		stateUpdate.messages = messages;
@@ -117,6 +150,14 @@ export async function executeSubgraphTools(
 		stateUpdate.workflowOperations = operations;
 	}
 
+	if (templateIds.length > 0) {
+		stateUpdate.templateIds = templateIds;
+	}
+
+	if (Object.keys(nodeConfigurations).length > 0) {
+		stateUpdate.nodeConfigurations = nodeConfigurations;
+	}
+
 	return stateUpdate;
 }
 
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/workflow-builder-agent.ts b/packages/@n8n/ai-workflow-builder.ee/src/workflow-builder-agent.ts
index fda2b4baa5b..a864c8a67ad 100644
--- a/packages/@n8n/ai-workflow-builder.ee/src/workflow-builder-agent.ts
+++ b/packages/@n8n/ai-workflow-builder.ee/src/workflow-builder-agent.ts
@@ -210,7 +210,7 @@ export class WorkflowBuilderAgent {
 	 * Create the multi-agent workflow graph
 	 * Uses supervisor pattern with specialized agents
 	 */
-	private createMultiAgentGraph() {
+	private createMultiAgentGraph(featureFlags?: BuilderFeatureFlags) {
 		return createMultiAgentWorkflowWithSubgraphs({
 			parsedNodeTypes: this.parsedNodeTypes,
 			llmSimpleTask: this.llmSimpleTask,
@@ -218,6 +218,7 @@ export class WorkflowBuilderAgent {
 			logger: this.logger,
 			instanceUrl: this.instanceUrl,
 			checkpointer: this.checkpointer,
+			featureFlags,
 		});
 	}
 
@@ -443,7 +444,7 @@ export class WorkflowBuilderAgent {
 	private createWorkflow(featureFlags?: BuilderFeatureFlags) {
 		if (this.enableMultiAgent) {
 			this.logger?.debug('Using multi-agent supervisor architecture');
-			return this.createMultiAgentGraph();
+			return this.createMultiAgentGraph(featureFlags);
 		}
 
 		this.logger?.debug('Using legacy single-agent architecture');
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/workflow-state.ts b/packages/@n8n/ai-workflow-builder.ee/src/workflow-state.ts
index a1830228e7f..22eff038c0d 100644
--- a/packages/@n8n/ai-workflow-builder.ee/src/workflow-state.ts
+++ b/packages/@n8n/ai-workflow-builder.ee/src/workflow-state.ts
@@ -3,6 +3,7 @@ import { HumanMessage } from '@langchain/core/messages';
 import { Annotation, messagesStateReducer } from '@langchain/langgraph';
 
 import type { NodeConfigurationsMap, SimpleWorkflow, WorkflowOperation } from './types';
+import { appendArrayReducer, nodeConfigurationsReducer } from './utils/state-reducers';
 import type { ProgrammaticEvaluationResult, TelemetryValidationStatus } from './validation/types';
 import type { ChatPayload } from './workflow-builder-agent';
 
@@ -105,26 +106,13 @@ export const WorkflowState = Annotation.Root({
 	// Node configurations collected from workflow examples
 	// Used to provide context when updating node parameters
 	nodeConfigurations: Annotation<NodeConfigurationsMap>({
-		reducer: (current, update) => {
-			if (!update || Object.keys(update).length === 0) {
-				return current;
-			}
-			// Merge configurations by node type, appending new configs to existing ones
-			const merged = { ...current };
-			for (const [nodeType, configs] of Object.entries(update)) {
-				if (!merged[nodeType]) {
-					merged[nodeType] = [];
-				}
-				merged[nodeType] = [...merged[nodeType], ...configs];
-			}
-			return merged;
-		},
+		reducer: nodeConfigurationsReducer,
 		default: () => ({}),
 	}),
 
 	// Template IDs fetched from workflow examples for telemetry
 	templateIds: Annotation<number[]>({
-		reducer: (current, update) => (update && update.length > 0 ? [...current, ...update] : current),
+		reducer: appendArrayReducer,
 		default: () => [],
 	}),
 });

From f986ea0d1fd76a38729addcfe412b5517533025c Mon Sep 17 00:00:00 2001
From: Artem Sorokin <38620398+seemewalkin@users.noreply.github.com>
Date: Wed, 3 Dec 2025 11:59:25 +0100
Subject: [PATCH 025/167] ci: Add cubic.yaml rules in repo root  (#22626)

---
 cubic.yaml | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 115 insertions(+)
 create mode 100644 cubic.yaml

diff --git a/cubic.yaml b/cubic.yaml
new file mode 100644
index 00000000000..ff99b6be1fa
--- /dev/null
+++ b/cubic.yaml
@@ -0,0 +1,115 @@
+# yaml-language-server: $schema=https://cubic.dev/schema/cubic-repository-config.schema.json
+
+# cubic.yaml
+# This file configures AI review behavior, ignore patterns, PR descriptions, and custom rules.
+# Place this file in your repository root to version-control your AI review settings.
+# Settings defined here take precedence over UI-configured settings.
+# See https://docs.cubic.dev/configure/cubic-yaml for documentation.
+
+version: 1
+reviews:
+  enabled: true
+  sensitivity: medium
+  incremental_commits: true
+  show_ai_feedback_buttons: false
+  custom_instructions: |-
+    ## Step 1: Fetch Current Guidelines
+
+    1. Fetch the current [CONTRIBUTING.md](https://github.com/n8n-io/n8n/blob/master/CONTRIBUTING.md) from the repository's main branch
+    2. Navigate to the "Community PR Guidelines" section
+    3. Use ONLY this live version - ignore any cached/embedded rules
+
+    ## Step 2: Review Process
+
+    Evaluate the PR against the rules in the fetched Community PR Guidelines.
+
+    ## Step 3: Test Requirement Interpretation
+
+    BE REASONABLE when evaluating test coverage:
+
+    **PASS if:**
+
+    - Core functionality has tests
+    - Critical paths are tested
+    - Coverage is reasonable (not necessarily 100%)
+
+    **DO NOT require tests for:**
+
+    - Exports, types, configs
+    - Metadata files
+    - Version files
+
+    Approve if reasonably tested. Let humans handle edge cases.
+  custom_rules:
+    - name: Prefer Typeguards over Type casting
+      description: |-
+        - Rule Statement:
+        Never use `as` keyword for type narrowing; instead, prefer type guards, type annotations, or the `satisfies` keyword.
+
+        Only use `as` for the following legitimate cases:
+          - DOM element assertions (e.g., `document.getElementById('foo') as HTMLButtonElement`)
+          - Event type assertions (e.g., `e as MouseEvent`)
+          - Const assertions (`as const`)
+          - Type widening (e.g., `(['a', 'b'] as string[]).includes('c')`)
+          - Generic constraints where no alternative exists
+
+        For type narrowing, use type guard functions. For type checking without losing inference, prefer `satisfies`. For simple type specification, prefer type annotations (`const x: A = y`) over casting (`const x = y as A`).
+
+        - Detection Criteria:
+          - Identify all usages of the `as` keyword in TypeScript code that perform type assertions (e.g., `expr as SomeType`).
+          - Exclude any usages in tests such as unit test files (*.test.ts or *.spec.ts) or e2e tests under cypress/ folder.
+          - Exclude usages where the assertion matches `as const`.
+          - Exclude assertions where:
+            - The assertion widens a literal/union type to a broader type (e.g., string literal array to string[])
+            - The left-hand side is a call to a DOM API (e.g., `document.getElementById`, `document.querySelector`, `document.createElement`)
+            - The assertion is applied to a variable named `e` or `event` and the type being asserted ends with `Event`
+          - Flag other usages and suggest alternatives: type guards for narrowing, type annotations for simple typing, or `satisfies` for type verification.
+          - Setting type of empty value  (for example `[] as string[]`)
+
+        - Example Violation:
+          ```typescript
+          function handleShape(shape: Shape) {
+            // Direct type casting without a type guard
+            const rect = shape as Rectangle;
+            return rect.width * rect.height;
+          }
+          ```
+
+        - Example Allowed:
+          ```typescript
+          // DOM element assertion
+          const button = document.getElementById('submit') as HTMLButtonElement;
+
+          // Event assertion
+          function handle(e: Event) {
+            const mouse = e as MouseEvent;
+            console.log(mouse.clientX);
+          }
+
+          // as const usage
+          const config = { mode: "readonly" } as const;
+
+          // setting types of empty array
+          const arr = [] as string[]
+          ```
+    - name: Tests
+      description: |-
+        BE REASONABLE when evaluating test coverage:
+
+        **PASS if:**
+
+        - Core functionality has tests
+        - Critical paths are tested
+        - Coverage is reasonable (not necessarily 100%)
+
+        **DO NOT require tests for:**
+
+        - Exports, types, configs
+        - Metadata files
+        - Version files
+pr_descriptions:
+  generate: false
+  instructions: Each PR is supposed to have a limited scope. In your review, focus on changes made in the PR and avoid pointing out problems you found in the code that already existed.
+issues:
+  fix_with_cubic_buttons: true
+

From 1be7404a7dfee7340f27e791deff7766be7cd324 Mon Sep 17 00:00:00 2001
From: Guillaume Jacquart <jacquart.guillaume@gmail.com>
Date: Wed, 3 Dec 2025 12:12:11 +0100
Subject: [PATCH 026/167] feat(core): Add toolCode nodes to the pyodide check
 for v2 migration (#22659)

---
 .../v2/__tests__/pyodide-removed.rule.test.ts | 67 +++++++++++++++++++
 .../rules/v2/pyodide-removed.rule.ts          |  3 +-
 2 files changed, 69 insertions(+), 1 deletion(-)

diff --git a/packages/cli/src/modules/breaking-changes/rules/v2/__tests__/pyodide-removed.rule.test.ts b/packages/cli/src/modules/breaking-changes/rules/v2/__tests__/pyodide-removed.rule.test.ts
index 656eb575937..dcc73168529 100644
--- a/packages/cli/src/modules/breaking-changes/rules/v2/__tests__/pyodide-removed.rule.test.ts
+++ b/packages/cli/src/modules/breaking-changes/rules/v2/__tests__/pyodide-removed.rule.test.ts
@@ -169,5 +169,72 @@ describe('PyodideRemovedRule', () => {
 			expect(result.issues).toHaveLength(1);
 			expect(result.issues[0].nodeName).toBe('Python');
 		});
+
+		it('should return no issues when Code Tool nodes use native Python (pythonNative)', async () => {
+			const { workflow, nodesGroupedByType } = createWorkflow('wf-1', 'Test Workflow', [
+				createNode('Code Tool', '@n8n/n8n-nodes-langchain.toolCode', {
+					language: 'pythonNative',
+					pythonCode: 'print("hello")',
+				}),
+			]);
+			const result = await rule.detectWorkflow(workflow, nodesGroupedByType);
+
+			expect(result).toEqual({
+				isAffected: false,
+				issues: [],
+			});
+		});
+
+		it('should detect Code Tool node with Pyodide Python (language="python")', async () => {
+			const { workflow, nodesGroupedByType } = createWorkflow('wf-1', 'Test Workflow', [
+				createNode('Code Tool', '@n8n/n8n-nodes-langchain.toolCode', {
+					language: 'python',
+					pythonCode: 'print("hello")',
+				}),
+			]);
+
+			const result = await rule.detectWorkflow(workflow, nodesGroupedByType);
+
+			expect(result.isAffected).toBe(true);
+			expect(result.issues).toHaveLength(1);
+			expect(result.issues[0]).toMatchObject({
+				title: "Code node 'Code Tool' uses removed Pyodide Python implementation",
+				description:
+					'The Pyodide-based Python implementation (language="python") is no longer supported. This node must be migrated to use the task runner-based implementation (language="pythonNative").',
+				level: 'error',
+				nodeId: expect.any(String),
+				nodeName: 'Code Tool',
+			});
+		});
+
+		it('should detect both Code and Code Tool nodes with Pyodide Python', async () => {
+			const { workflow, nodesGroupedByType } = createWorkflow('wf-1', 'Test Workflow', [
+				createNode('Python Code', 'n8n-nodes-base.code', {
+					language: 'python',
+					pythonCode: 'print("hello")',
+				}),
+				createNode('Python Tool', '@n8n/n8n-nodes-langchain.toolCode', {
+					language: 'python',
+					pythonCode: 'print("world")',
+				}),
+			]);
+
+			const result = await rule.detectWorkflow(workflow, nodesGroupedByType);
+
+			expect(result.isAffected).toBe(true);
+			expect(result.issues).toHaveLength(2);
+			expect(result.issues).toEqual(
+				expect.arrayContaining([
+					expect.objectContaining({
+						nodeName: 'Python Code',
+						title: "Code node 'Python Code' uses removed Pyodide Python implementation",
+					}),
+					expect.objectContaining({
+						nodeName: 'Python Tool',
+						title: "Code node 'Python Tool' uses removed Pyodide Python implementation",
+					}),
+				]),
+			);
+		});
 	});
 });
diff --git a/packages/cli/src/modules/breaking-changes/rules/v2/pyodide-removed.rule.ts b/packages/cli/src/modules/breaking-changes/rules/v2/pyodide-removed.rule.ts
index e4eaa57daa0..5ddd288d514 100644
--- a/packages/cli/src/modules/breaking-changes/rules/v2/pyodide-removed.rule.ts
+++ b/packages/cli/src/modules/breaking-changes/rules/v2/pyodide-removed.rule.ts
@@ -55,13 +55,14 @@ export class PyodideRemovedRule implements IBreakingChangeWorkflowRule {
 	): Promise<WorkflowDetectionReport> {
 		// Get all Code nodes (the Code node supports both JavaScript and Python)
 		const codeNodes = nodesGroupedByType.get('n8n-nodes-base.code') ?? [];
+		const codeToolNodes = nodesGroupedByType.get('@n8n/n8n-nodes-langchain.toolCode') ?? [];
 
 		// Filter for Code nodes using the Pyodide-based Python implementation
 		// The 'language' parameter determines which language/implementation is used:
 		// - 'python' = Pyodide (being removed)
 		// - 'pythonNative' = Task runner (new implementation)
 		// - 'javaScript' = JavaScript (not affected)
-		const affectedNodes = codeNodes.filter((node) => {
+		const affectedNodes = codeNodes.concat(codeToolNodes).filter((node) => {
 			const language = node.parameters?.language;
 			// Nodes with language='python' use Pyodide and are affected
 			return language === 'python';

From a732c4e8207b0c8203aec058f9f006cbbe3b8e83 Mon Sep 17 00:00:00 2001
From: Alex Grozav <alex@grozav.com>
Date: Wed, 3 Dec 2025 11:30:01 +0000
Subject: [PATCH 027/167] refactor(editor): Refactor NDV parameter list
 implementation and performance (no-changelog) (#22357)

---
 .../FixedCollectionParameter.test.ts          |    4 +-
 .../components/ParameterInputList.test.ts     | 1508 ++++++++++++++++-
 .../components/ParameterInputList.vue         |  275 +--
 .../useNodeSettingsParameters.test.ts         | 1102 ++++++++++--
 .../composables/useNodeSettingsParameters.ts  |  234 ++-
 5 files changed, 2795 insertions(+), 328 deletions(-)

diff --git a/packages/frontend/editor-ui/src/features/ndv/parameters/components/FixedCollectionParameter.test.ts b/packages/frontend/editor-ui/src/features/ndv/parameters/components/FixedCollectionParameter.test.ts
index 3a60a1f6a49..7cd425a49df 100644
--- a/packages/frontend/editor-ui/src/features/ndv/parameters/components/FixedCollectionParameter.test.ts
+++ b/packages/frontend/editor-ui/src/features/ndv/parameters/components/FixedCollectionParameter.test.ts
@@ -6,7 +6,6 @@ import { createTestingPinia } from '@pinia/testing';
 import userEvent from '@testing-library/user-event';
 import { fireEvent, waitFor } from '@testing-library/vue';
 import { setActivePinia } from 'pinia';
-import { nextTick } from 'vue';
 
 describe('FixedCollectionParameter.vue', () => {
 	const pinia = createTestingPinia({
@@ -144,9 +143,8 @@ describe('FixedCollectionParameter.vue', () => {
 			nodeValues: { parameters: { rules: { p0: [{ p0: 'Updated' }] } } },
 			values: { p0: [{ p0: 'Updated' }] },
 		});
-		await nextTick();
 		expect(input).toBeInTheDocument();
-		expect(input).toHaveValue('Updated');
+		await waitFor(() => expect(input).toHaveValue('Updated'));
 		expect(document.activeElement).toBe(input);
 	});
 });
diff --git a/packages/frontend/editor-ui/src/features/ndv/parameters/components/ParameterInputList.test.ts b/packages/frontend/editor-ui/src/features/ndv/parameters/components/ParameterInputList.test.ts
index c5ecb6d0c77..0b36e66975b 100644
--- a/packages/frontend/editor-ui/src/features/ndv/parameters/components/ParameterInputList.test.ts
+++ b/packages/frontend/editor-ui/src/features/ndv/parameters/components/ParameterInputList.test.ts
@@ -2,9 +2,44 @@ import { createComponentRenderer } from '@/__tests__/render';
 import ParameterInputList from './ParameterInputList.vue';
 import { createTestingPinia } from '@pinia/testing';
 import { mockedStore } from '@/__tests__/utils';
+import {
+	createTestWorkflowObject,
+	createTestNode,
+	createMockNodeTypes,
+	mockLoadedNodeType,
+} from '@/__tests__/mocks';
+import { fireEvent } from '@testing-library/vue';
 import { useNDVStore } from '@/features/ndv/shared/ndv.store';
 import * as workflowHelpers from '@/app/composables/useWorkflowHelpers';
 
+// Mock i18n to return translation keys instead of translated strings
+vi.mock('@n8n/i18n', () => {
+	const i18n = {
+		baseText: (key: string) => key,
+		nodeText: () => ({
+			inputLabelDisplayName: (parameter: { displayName: string }) => parameter.displayName,
+			inputLabelDescription: (parameter: { description?: string }) => parameter.description,
+			placeholder: (parameter: { placeholder?: string }) => parameter.placeholder,
+			hint: (parameter: { hint?: string }) => parameter.hint,
+			optionsOptionName: (parameter: { name: string }) => parameter.name,
+			optionsOptionDescription: (parameter: { description?: string }) => parameter.description,
+			collectionOptionName: (parameter: { displayName: string }) => parameter.displayName,
+			credentialsSelectAuthDisplayName: (parameter: { displayName: string }) =>
+				parameter.displayName,
+			credentialsSelectAuthDescription: (parameter: { description?: string }) =>
+				parameter.description,
+		}),
+	};
+
+	return {
+		useI18n: () => i18n,
+		i18n,
+		i18nInstance: {
+			install: vi.fn(),
+		},
+	};
+});
+
 import {
 	TEST_NODE_NO_ISSUES,
 	TEST_PARAMETERS,
@@ -13,24 +48,33 @@ import {
 	FIXED_COLLECTION_PARAMETERS,
 	TEST_ISSUE,
 } from './ParameterInputList.test.constants';
-import { FORM_NODE_TYPE, FORM_TRIGGER_NODE_TYPE } from 'n8n-workflow';
-import type { INodeProperties, Workflow } from 'n8n-workflow';
+import { FORM_NODE_TYPE, FORM_TRIGGER_NODE_TYPE, NodeConnectionTypes } from 'n8n-workflow';
+import type { INodeProperties } from 'n8n-workflow';
 import type { INodeUi } from '@/Interface';
 import type { MockInstance } from 'vitest';
 import { useWorkflowsStore } from '@/app/stores/workflows.store';
+import { WAIT_NODE_TYPE } from '@/app/constants';
+import type { INodeTypeData } from 'n8n-workflow';
+
+// Create node types that include Form, FormTrigger, and Wait nodes
+const testNodeTypes: INodeTypeData = {
+	[FORM_TRIGGER_NODE_TYPE]: mockLoadedNodeType(FORM_TRIGGER_NODE_TYPE),
+	[FORM_NODE_TYPE]: mockLoadedNodeType(FORM_NODE_TYPE),
+	[WAIT_NODE_TYPE]: mockLoadedNodeType(WAIT_NODE_TYPE),
+};
+const formWorkflowNodeTypes = createMockNodeTypes(testNodeTypes);
 
 vi.mock('vue-router', async () => {
 	const actual = await vi.importActual('vue-router');
-	const params = {};
-	const location = {};
 	return {
 		...actual,
 		useRouter: () => ({
 			push: vi.fn(),
 		}),
 		useRoute: () => ({
-			params,
-			location,
+			params: {},
+			location: {},
+			query: {},
 		}),
 	};
 });
@@ -176,16 +220,26 @@ describe('ParameterInputList', () => {
 		});
 
 		it('should not show triggerNotice if Form Trigger is connected', () => {
-			ndvStore.activeNode = { name: 'From', type: FORM_NODE_TYPE, parameters: {} } as INodeUi;
-			workflowStore.workflowObject = {
-				getParentNodes: vi.fn(() => ['Form Trigger']),
-				nodes: {
+			ndvStore.activeNode = { name: 'Form', type: FORM_NODE_TYPE, parameters: {} } as INodeUi;
+
+			const formTriggerNode = createTestNode({
+				name: 'Form Trigger',
+				type: FORM_TRIGGER_NODE_TYPE,
+			});
+			const formNode = createTestNode({
+				name: 'Form',
+				type: FORM_NODE_TYPE,
+			});
+
+			workflowStore.workflowObject = createTestWorkflowObject({
+				nodes: [formTriggerNode, formNode],
+				connections: {
 					'Form Trigger': {
-						type: FORM_TRIGGER_NODE_TYPE,
-						parameters: {},
+						main: [[{ node: 'Form', type: NodeConnectionTypes.Main, index: 0 }]],
 					},
 				},
-			} as unknown as Workflow;
+				nodeTypes: formWorkflowNodeTypes,
+			});
 
 			const { queryByText } = renderComponent({
 				props: {
@@ -199,4 +253,1432 @@ describe('ParameterInputList', () => {
 			expect(el).not.toBeInTheDocument();
 		});
 	});
+
+	/**
+	 * Tests all component props and their effects on rendering and behavior.
+	 * Covers: hideDelete, indent, isReadOnly, hiddenIssuesInputs, path
+	 */
+	describe('Props', () => {
+		it('should handle hideDelete prop', () => {
+			ndvStore.activeNode = TEST_NODE_NO_ISSUES;
+			const { queryByTitle } = renderComponent({
+				props: {
+					parameters: TEST_PARAMETERS,
+					nodeValues: TEST_NODE_VALUES,
+					hideDelete: false,
+				},
+			});
+
+			expect(queryByTitle('parameterInputList.delete')).toBeInTheDocument();
+		});
+
+		it('should apply indent class when indent prop is true', () => {
+			ndvStore.activeNode = TEST_NODE_NO_ISSUES;
+			const { container } = renderComponent({
+				props: {
+					parameters: TEST_PARAMETERS,
+					nodeValues: TEST_NODE_VALUES,
+					indent: true,
+				},
+			});
+
+			expect(container.querySelector('.indent')).toBeInTheDocument();
+		});
+
+		it('should pass isReadOnly prop to child components', () => {
+			ndvStore.activeNode = TEST_NODE_NO_ISSUES;
+			const { queryByTitle } = renderComponent({
+				props: {
+					parameters: TEST_PARAMETERS,
+					nodeValues: TEST_NODE_VALUES,
+					isReadOnly: true,
+				},
+			});
+
+			// Delete button should not be visible when read-only
+			expect(queryByTitle('parameterInputList.delete')).not.toBeInTheDocument();
+		});
+
+		it('should handle hiddenIssuesInputs prop', () => {
+			ndvStore.activeNode = TEST_NODE_WITH_ISSUES;
+			const { getByTestId } = renderComponent({
+				props: {
+					parameters: TEST_PARAMETERS,
+					nodeValues: TEST_NODE_VALUES,
+					hiddenIssuesInputs: [FIXED_COLLECTION_PARAMETERS[0].name],
+				},
+			});
+
+			// Issues container still exists but should be passed to child component
+			// The hiddenIssuesInputs prop is passed down to control display
+			expect(
+				getByTestId(`${FIXED_COLLECTION_PARAMETERS[0].name}-parameter-input-issues-container`),
+			).toBeInTheDocument();
+		});
+
+		it('should handle path prop', () => {
+			ndvStore.activeNode = TEST_NODE_NO_ISSUES;
+			const { container } = renderComponent({
+				props: {
+					parameters: TEST_PARAMETERS,
+					nodeValues: TEST_NODE_VALUES,
+					path: 'parameters.nested',
+				},
+			});
+
+			// Component should render wrapper even with custom path
+			// Note: TEST_PARAMETERS have displayOptions requiring @version >= 1.1
+			// which may not be resolved with nested paths
+			expect(container.querySelector('.parameter-input-list-wrapper')).toBeInTheDocument();
+		});
+	});
+
+	/**
+	 * Validates all emitted events work correctly.
+	 * Critical for maintaining parent-child communication during refactoring.
+	 */
+	describe('Event Emissions', () => {
+		// Create a separate render function for event emission tests that uses interactive stubs
+		const renderWithInteractiveStub = createComponentRenderer(ParameterInputList, {
+			props: {
+				hideDelete: true,
+				indent: true,
+				isReadOnly: false,
+			},
+			global: {
+				stubs: {
+					Suspense: { template: '<div data-test-id="suspense-stub"><slot></slot></div>' },
+				},
+			},
+		});
+
+		it('should emit valueChanged event when child component emits update', async () => {
+			// Use a string parameter that renders ParameterInputFull (not fixedCollection, notice, or callout)
+			const stringParameter: INodeProperties[] = [
+				{
+					displayName: 'Test String',
+					name: 'testString',
+					type: 'string',
+					default: '',
+				},
+			];
+
+			ndvStore.activeNode = TEST_NODE_NO_ISSUES;
+			const { getByTestId, emitted } = renderWithInteractiveStub({
+				props: {
+					parameters: stringParameter,
+					nodeValues: { testString: '' },
+				},
+				global: {
+					stubs: {
+						// Create a stub that emits update event when clicked
+						ParameterInputFull: {
+							template:
+								"<div data-test-id=\"parameter-input-clickable\" @click=\"$emit('update', { name: 'testParam', value: 'testValue' })\"></div>",
+							emits: ['update', 'blur'],
+						},
+					},
+				},
+			});
+
+			// Click on the stubbed ParameterInputFull to trigger the update event
+			const parameterInput = getByTestId('parameter-input-clickable');
+			await fireEvent.click(parameterInput);
+
+			expect(emitted('valueChanged')).toBeDefined();
+			expect(emitted('valueChanged')).toHaveLength(1);
+			expect(emitted('valueChanged')![0]).toEqual([{ name: 'testParam', value: 'testValue' }]);
+		});
+
+		it('should emit parameterBlur event when child component emits blur', async () => {
+			// Use a string parameter that renders ParameterInputFull (not fixedCollection, notice, or callout)
+			const stringParameter: INodeProperties[] = [
+				{
+					displayName: 'Test String',
+					name: 'testString',
+					type: 'string',
+					default: '',
+				},
+			];
+
+			ndvStore.activeNode = TEST_NODE_NO_ISSUES;
+			const { getByTestId, emitted } = renderWithInteractiveStub({
+				props: {
+					parameters: stringParameter,
+					nodeValues: { testString: '' },
+				},
+				global: {
+					stubs: {
+						// Create a stub that emits blur event when focused out
+						ParameterInputFull: {
+							template:
+								'<div data-test-id="parameter-input-blurable" tabindex="0" @blur="$emit(\'blur\')"></div>',
+							emits: ['update', 'blur'],
+						},
+					},
+				},
+			});
+
+			// Trigger blur on the stubbed ParameterInputFull
+			const parameterInput = getByTestId('parameter-input-blurable');
+			await fireEvent.blur(parameterInput);
+
+			expect(emitted('parameterBlur')).toBeDefined();
+			expect(emitted('parameterBlur')).toHaveLength(1);
+		});
+
+		it('should emit activate event when notice action is triggered', async () => {
+			// Create a notice parameter with an activate action link
+			const noticeWithActivateAction: INodeProperties[] = [
+				{
+					displayName: 'Click to <a href="#" data-key="activate">activate</a> this feature',
+					name: 'activateNotice',
+					type: 'notice',
+					default: '',
+				},
+			];
+
+			ndvStore.activeNode = TEST_NODE_NO_ISSUES;
+			const { container, emitted } = renderComponent({
+				props: {
+					parameters: noticeWithActivateAction,
+					nodeValues: TEST_NODE_VALUES,
+				},
+			});
+
+			// Find and click the activate link within the notice
+			const activateLink = container.querySelector('a[data-key="activate"]');
+			expect(activateLink).toBeInTheDocument();
+
+			if (!activateLink) {
+				throw new Error('Activate link not found');
+			}
+
+			await fireEvent.click(activateLink);
+
+			expect(emitted('activate')).toBeDefined();
+			expect(emitted('activate')).toHaveLength(1);
+		});
+	});
+
+	/**
+	 * Tests display logic based on displayOptions and conditional rendering.
+	 * Ensures parameters are shown/hidden correctly based on node configuration.
+	 */
+	describe('Parameter Filtering', () => {
+		it('should filter parameters based on displayOptions', () => {
+			ndvStore.activeNode = {
+				...TEST_NODE_NO_ISSUES,
+				typeVersion: 1.0, // This should hide parameters with version >= 1.1
+			};
+			const { queryByText } = renderComponent({
+				props: {
+					parameters: TEST_PARAMETERS,
+					nodeValues: TEST_NODE_VALUES,
+				},
+			});
+
+			// Parameters with displayOptions requiring version >= 1.1 should not be displayed
+			expect(queryByText('Test Fixed Collection')).not.toBeInTheDocument();
+		});
+
+		it('should show all parameters when displayOptions are met', () => {
+			ndvStore.activeNode = TEST_NODE_NO_ISSUES;
+			const { getByText } = renderComponent({
+				props: {
+					parameters: TEST_PARAMETERS,
+					nodeValues: TEST_NODE_VALUES,
+				},
+			});
+
+			expect(getByText('Test Fixed Collection')).toBeInTheDocument();
+			expect(getByText('Note: This is a notice with')).toBeInTheDocument();
+		});
+
+		it('should handle empty parameters array', () => {
+			ndvStore.activeNode = TEST_NODE_NO_ISSUES;
+			const { container } = renderComponent({
+				props: {
+					parameters: [],
+					nodeValues: TEST_NODE_VALUES,
+				},
+			});
+
+			expect(container.querySelector('.parameter-input-list-wrapper')).toBeInTheDocument();
+		});
+	});
+
+	/**
+	 * Validates credentials parameter positioning and dependencies.
+	 * Tests the complex logic for where credentials should appear in the parameter list.
+	 */
+	describe('Credentials Handling', () => {
+		it('should position credentials parameter correctly', () => {
+			const parametersWithCredentials: INodeProperties[] = [
+				{
+					displayName: 'Credentials',
+					name: 'authentication',
+					type: 'credentials',
+					default: '',
+				},
+				...TEST_PARAMETERS,
+			];
+
+			ndvStore.activeNode = TEST_NODE_NO_ISSUES;
+			const { container, getByText } = renderComponent({
+				props: {
+					parameters: parametersWithCredentials,
+					nodeValues: TEST_NODE_VALUES,
+				},
+			});
+
+			// Credentials parameters are skipped in ParameterInputList (rendered via slot by parent)
+			// But the credentialsParameterIndex is computed for slot positioning
+			// Other parameters should be rendered
+			expect(container.querySelector('.parameter-input-list-wrapper')).toBeInTheDocument();
+			expect(getByText('Test Fixed Collection')).toBeInTheDocument();
+		});
+
+		it('should handle credentials parameter with dependencies', () => {
+			const parametersWithDependencies: INodeProperties[] = [
+				{
+					displayName: 'Auth Type',
+					name: 'authType',
+					type: 'options',
+					options: [
+						{ name: 'OAuth2', value: 'oauth2' },
+						{ name: 'API Key', value: 'apiKey' },
+					],
+					default: 'oauth2',
+				},
+				{
+					displayName: 'Credentials',
+					name: 'credentials',
+					type: 'credentials',
+					default: '',
+				},
+			];
+
+			ndvStore.activeNode = TEST_NODE_NO_ISSUES;
+			const { container, getAllByTestId } = renderComponent({
+				props: {
+					parameters: parametersWithDependencies,
+					nodeValues: TEST_NODE_VALUES,
+				},
+			});
+
+			// Auth type parameter is rendered through ParameterInputFull stub (no visible label)
+			// Credentials parameters are skipped in ParameterInputList (rendered via slot by parent)
+			expect(container.querySelector('.parameter-input-list-wrapper')).toBeInTheDocument();
+			// Should have parameter items rendered (authType + credentials placeholder)
+			expect(getAllByTestId('parameter-item').length).toBeGreaterThan(0);
+		});
+	});
+
+	/**
+	 * Tests rendering of all parameter types to ensure each type works correctly.
+	 * Covers: button, collection, resourceMapper, filter, assignmentCollection,
+	 * curlImport, and multipleValues parameters.
+	 */
+	describe('Different Parameter Types', () => {
+		it('should render button parameter', () => {
+			const buttonParameters: INodeProperties[] = [
+				{
+					displayName: 'Test Button',
+					name: 'testButton',
+					type: 'button',
+					default: '',
+				},
+			];
+
+			ndvStore.activeNode = TEST_NODE_NO_ISSUES;
+			const { container, getByText } = renderComponent({
+				props: {
+					parameters: buttonParameters,
+					nodeValues: TEST_NODE_VALUES,
+				},
+			});
+
+			expect(container.querySelector('.parameter-item')).toBeInTheDocument();
+			expect(getByText('Test Button')).toBeInTheDocument();
+		});
+
+		it('should render collection parameter', () => {
+			const collectionParameters: INodeProperties[] = [
+				{
+					displayName: 'Test Collection',
+					name: 'testCollection',
+					type: 'collection',
+					placeholder: 'Add Field',
+					default: {},
+					options: [
+						{
+							displayName: 'Field Name',
+							name: 'fieldName',
+							type: 'string',
+							default: '',
+						},
+					],
+				},
+			];
+
+			ndvStore.activeNode = TEST_NODE_NO_ISSUES;
+			const { getByText } = renderComponent({
+				props: {
+					parameters: collectionParameters,
+					nodeValues: TEST_NODE_VALUES,
+				},
+			});
+
+			expect(getByText('Test Collection')).toBeInTheDocument();
+		});
+
+		it('should render resourceMapper parameter', () => {
+			const resourceMapperParameters: INodeProperties[] = [
+				{
+					displayName: 'Resource Mapper',
+					name: 'resourceMapper',
+					type: 'resourceMapper',
+					default: {},
+					noDataExpression: true,
+					required: true,
+					typeOptions: {
+						resourceMapper: {
+							resourceMapperMethod: 'getMappingColumns',
+							mode: 'add',
+							fieldWords: {
+								singular: 'field',
+								plural: 'fields',
+							},
+						},
+					},
+				},
+			];
+
+			ndvStore.activeNode = TEST_NODE_NO_ISSUES;
+			const { container, getByTestId } = renderComponent({
+				props: {
+					parameters: resourceMapperParameters,
+					nodeValues: { resourceMapper: {} },
+				},
+			});
+
+			// ResourceMapper is rendered as a standalone component without label wrapper
+			expect(container.querySelector('.parameter-input-list-wrapper')).toBeInTheDocument();
+			expect(getByTestId('parameter-item')).toBeInTheDocument();
+		});
+
+		it('should render filter parameter', () => {
+			const filterParameters: INodeProperties[] = [
+				{
+					displayName: 'Filters',
+					name: 'filters',
+					type: 'filter',
+					default: {},
+					typeOptions: {
+						filter: {
+							caseSensitive: true,
+							typeValidation: 'strict',
+							version: 1,
+						},
+					},
+				},
+			];
+
+			ndvStore.activeNode = TEST_NODE_NO_ISSUES;
+			const { container, getByTestId } = renderComponent({
+				props: {
+					parameters: filterParameters,
+					nodeValues: { filters: {} },
+				},
+			});
+
+			// FilterConditions is rendered as a standalone component without label wrapper
+			expect(container.querySelector('.parameter-input-list-wrapper')).toBeInTheDocument();
+			expect(getByTestId('parameter-item')).toBeInTheDocument();
+		});
+
+		it('should render assignmentCollection parameter', () => {
+			const assignmentParameters: INodeProperties[] = [
+				{
+					displayName: 'Assignments',
+					name: 'assignments',
+					type: 'assignmentCollection',
+					default: {},
+				},
+			];
+
+			ndvStore.activeNode = TEST_NODE_NO_ISSUES;
+			const { container, getByTestId } = renderComponent({
+				props: {
+					parameters: assignmentParameters,
+					nodeValues: { assignments: {} },
+				},
+			});
+
+			// AssignmentCollection is rendered as a standalone component without label wrapper
+			expect(container.querySelector('.parameter-input-list-wrapper')).toBeInTheDocument();
+			expect(getByTestId('parameter-item')).toBeInTheDocument();
+		});
+
+		it('should render curlImport parameter', () => {
+			const curlParameters: INodeProperties[] = [
+				{
+					displayName: 'Import cURL',
+					name: 'curlImport',
+					type: 'curlImport',
+					default: '',
+				},
+			];
+
+			ndvStore.activeNode = TEST_NODE_NO_ISSUES;
+			const { container, getByTestId } = renderComponent({
+				props: {
+					parameters: curlParameters,
+					nodeValues: TEST_NODE_VALUES,
+				},
+			});
+
+			// ImportCurlParameter is rendered as a standalone component without label wrapper
+			expect(container.querySelector('.parameter-input-list-wrapper')).toBeInTheDocument();
+			expect(getByTestId('parameter-item')).toBeInTheDocument();
+		});
+
+		it('should render multipleValues parameter', () => {
+			const multipleValuesParameters: INodeProperties[] = [
+				{
+					displayName: 'Multiple Values',
+					name: 'multipleValues',
+					type: 'string',
+					default: [],
+					typeOptions: {
+						multipleValues: true,
+					},
+				},
+			];
+
+			ndvStore.activeNode = TEST_NODE_NO_ISSUES;
+			const { container } = renderComponent({
+				props: {
+					parameters: multipleValuesParameters,
+					nodeValues: { multipleValues: ['value1', 'value2'] },
+				},
+			});
+
+			expect(container.querySelector('.parameter-item')).toBeInTheDocument();
+		});
+	});
+
+	/**
+	 * Tests special callout visibility logic for different callout types.
+	 * Includes: RAG starter, AI agent, and pre-built agents callouts.
+	 */
+	describe('Callout Visibility', () => {
+		it('should show callout when not dismissed', () => {
+			ndvStore.activeNode = TEST_NODE_NO_ISSUES;
+			const { getByText } = renderComponent({
+				props: {
+					parameters: TEST_PARAMETERS,
+					nodeValues: TEST_NODE_VALUES,
+				},
+			});
+
+			expect(getByText('Tip: This is a callout with')).toBeInTheDocument();
+		});
+
+		it('should handle ragStarterCallout visibility', () => {
+			const ragCalloutParameters: INodeProperties[] = [
+				{
+					displayName: 'RAG Starter Callout',
+					name: 'ragStarterCallout',
+					type: 'callout',
+					default: '',
+					typeOptions: {
+						calloutAction: {
+							label: 'Learn more',
+							type: 'openSampleWorkflowTemplate',
+							templateId: 'test-template-id',
+						},
+					},
+				},
+			];
+
+			ndvStore.activeNode = TEST_NODE_NO_ISSUES;
+			const { getByText } = renderComponent({
+				props: {
+					parameters: ragCalloutParameters,
+					nodeValues: TEST_NODE_VALUES,
+				},
+			});
+
+			expect(getByText('RAG Starter Callout')).toBeInTheDocument();
+			expect(getByText('Learn more')).toBeInTheDocument();
+		});
+
+		it('should handle aiAgentStarterCallout visibility', () => {
+			const agentCalloutParameters: INodeProperties[] = [
+				{
+					displayName: 'AI Agent Starter Callout',
+					name: 'aiAgentStarterCallout',
+					type: 'callout',
+					default: '',
+				},
+			];
+
+			ndvStore.activeNode = TEST_NODE_NO_ISSUES;
+			const { getByText } = renderComponent({
+				props: {
+					parameters: agentCalloutParameters,
+					nodeValues: TEST_NODE_VALUES,
+				},
+			});
+
+			expect(getByText('AI Agent Starter Callout')).toBeInTheDocument();
+		});
+
+		it('should handle preBuiltAgentsCallout visibility', () => {
+			const preBuiltCalloutParameters: INodeProperties[] = [
+				{
+					displayName: 'Pre-built Agents Callout',
+					name: 'preBuiltAgentsCallout_test',
+					type: 'callout',
+					default: '',
+				},
+			];
+
+			ndvStore.activeNode = TEST_NODE_NO_ISSUES;
+			const { container, getByTestId } = renderComponent({
+				props: {
+					parameters: preBuiltCalloutParameters,
+					nodeValues: TEST_NODE_VALUES,
+				},
+			});
+
+			// Callout with preBuiltAgentsCallout name pattern visibility is controlled by isPreBuiltAgentsCalloutVisible
+			// which depends on store state not mocked here, so it may or may not be visible
+			expect(container.querySelector('.parameter-input-list-wrapper')).toBeInTheDocument();
+			expect(getByTestId('parameter-item')).toBeInTheDocument();
+		});
+	});
+
+	/**
+	 * Tests special parameter handling for Form Trigger nodes.
+	 * Validates parameter modifications when Form nodes are connected/disconnected.
+	 */
+	describe('updateFormTriggerParameters', () => {
+		const formTriggerParameters: INodeProperties[] = [
+			{
+				displayName: 'Response Mode',
+				name: 'responseMode',
+				type: 'options',
+				options: [
+					{ name: 'On Form Submit', value: 'onFormSubmit' },
+					{ name: 'Response Message', value: 'responseMessage' },
+				],
+				default: 'onFormSubmit',
+			},
+			{
+				displayName: 'Options',
+				name: 'options',
+				type: 'collection',
+				placeholder: 'Add Option',
+				default: {},
+				options: [
+					{
+						displayName: 'Respond With Options',
+						name: 'respondWithOptions',
+						type: 'string',
+						default: '',
+					},
+					{
+						displayName: 'Other Option',
+						name: 'otherOption',
+						type: 'string',
+						default: '',
+					},
+				],
+			},
+		];
+
+		it('should show formResponseModeNotice when Form node is connected', () => {
+			ndvStore.activeNode = {
+				name: 'Form Trigger',
+				type: FORM_TRIGGER_NODE_TYPE,
+				parameters: {},
+			} as INodeUi;
+
+			const formTriggerNode = createTestNode({
+				name: 'Form Trigger',
+				type: FORM_TRIGGER_NODE_TYPE,
+			});
+			const formNode = createTestNode({
+				name: 'Form',
+				type: FORM_NODE_TYPE,
+			});
+
+			workflowStore.workflowObject = createTestWorkflowObject({
+				nodes: [formTriggerNode, formNode],
+				connections: {
+					'Form Trigger': {
+						main: [[{ node: 'Form', type: NodeConnectionTypes.Main, index: 0 }]],
+					},
+				},
+				nodeTypes: formWorkflowNodeTypes,
+			});
+
+			const { getByText } = renderComponent({
+				props: {
+					parameters: formTriggerParameters,
+					nodeValues: {},
+				},
+			});
+
+			expect(
+				getByText('On submission, the user will be taken to the next form node'),
+			).toBeInTheDocument();
+		});
+
+		it('should filter respondWithOptions when Form node is connected', () => {
+			ndvStore.activeNode = {
+				name: 'Form Trigger',
+				type: FORM_TRIGGER_NODE_TYPE,
+				parameters: {},
+			} as INodeUi;
+
+			const formTriggerNode = createTestNode({
+				name: 'Form Trigger',
+				type: FORM_TRIGGER_NODE_TYPE,
+			});
+			const formNode = createTestNode({
+				name: 'Form',
+				type: FORM_NODE_TYPE,
+			});
+
+			workflowStore.workflowObject = createTestWorkflowObject({
+				nodes: [formTriggerNode, formNode],
+				connections: {
+					'Form Trigger': {
+						main: [[{ node: 'Form', type: NodeConnectionTypes.Main, index: 0 }]],
+					},
+				},
+				nodeTypes: formWorkflowNodeTypes,
+			});
+
+			const { container, getAllByTestId } = renderComponent({
+				props: {
+					parameters: formTriggerParameters,
+					nodeValues: {},
+				},
+			});
+
+			// Component should render with Form Trigger transformations applied
+			expect(container.querySelector('.parameter-input-list-wrapper')).toBeInTheDocument();
+			// Parameters should be rendered (options type goes through stub, collection shows label)
+			expect(getAllByTestId('parameter-item').length).toBeGreaterThan(0);
+		});
+
+		it('should not modify parameters when Form node is not connected', () => {
+			ndvStore.activeNode = {
+				name: 'Form Trigger',
+				type: FORM_TRIGGER_NODE_TYPE,
+				parameters: {},
+			} as INodeUi;
+
+			const formTriggerNode = createTestNode({
+				name: 'Form Trigger',
+				type: FORM_TRIGGER_NODE_TYPE,
+			});
+
+			workflowStore.workflowObject = createTestWorkflowObject({
+				nodes: [formTriggerNode],
+				connections: {},
+				nodeTypes: formWorkflowNodeTypes,
+			});
+
+			const { container, getAllByTestId } = renderComponent({
+				props: {
+					parameters: formTriggerParameters,
+					nodeValues: {},
+				},
+			});
+
+			// All parameters should be rendered when Form node is not connected
+			expect(container.querySelector('.parameter-input-list-wrapper')).toBeInTheDocument();
+			// Parameters should be rendered (options type goes through stub)
+			expect(getAllByTestId('parameter-item').length).toBeGreaterThan(0);
+		});
+	});
+
+	/**
+	 * Tests special parameter handling for Wait nodes with form resume mode.
+	 * Validates parameter filtering when Form Trigger is connected.
+	 */
+	describe('updateWaitParameters', () => {
+		const waitParameters: INodeProperties[] = [
+			{
+				displayName: 'Options',
+				name: 'options',
+				type: 'collection',
+				placeholder: 'Add Option',
+				default: {},
+				options: [
+					{
+						displayName: 'Respond With Options',
+						name: 'respondWithOptions',
+						type: 'string',
+						default: '',
+					},
+					{
+						displayName: 'Webhook Suffix',
+						name: 'webhookSuffix',
+						type: 'string',
+						default: '',
+					},
+					{
+						displayName: 'Other Option',
+						name: 'otherOption',
+						type: 'string',
+						default: '',
+					},
+				],
+			},
+		];
+
+		it('should filter options when Form Trigger is connected', () => {
+			ndvStore.activeNode = {
+				id: 'wait-123',
+				name: 'Wait',
+				type: WAIT_NODE_TYPE,
+				typeVersion: 1,
+				position: [100, 200],
+				parameters: { resume: 'form' },
+			} as INodeUi;
+
+			const formTriggerNode = createTestNode({
+				name: 'Form Trigger',
+				type: FORM_TRIGGER_NODE_TYPE,
+			});
+			const waitNode = createTestNode({
+				name: 'Wait',
+				type: WAIT_NODE_TYPE,
+				parameters: { resume: 'form' },
+			});
+			const formNode = createTestNode({
+				name: 'Form',
+				type: FORM_NODE_TYPE,
+			});
+
+			workflowStore.workflowObject = createTestWorkflowObject({
+				nodes: [formTriggerNode, waitNode, formNode],
+				connections: {
+					'Form Trigger': {
+						main: [[{ node: 'Wait', type: NodeConnectionTypes.Main, index: 0 }]],
+					},
+					Wait: {
+						main: [[{ node: 'Form', type: NodeConnectionTypes.Main, index: 0 }]],
+					},
+				},
+				nodeTypes: formWorkflowNodeTypes,
+			});
+
+			const { getByText, queryByText } = renderComponent({
+				props: {
+					parameters: waitParameters,
+					nodeValues: { resume: 'form' },
+				},
+			});
+
+			// Options collection should be rendered
+			expect(getByText('Options')).toBeInTheDocument();
+			// respondWithOptions and webhookSuffix should be filtered out when Form Trigger is connected
+			expect(queryByText('Respond With Options')).not.toBeInTheDocument();
+			expect(queryByText('Webhook Suffix')).not.toBeInTheDocument();
+		});
+
+		it('should not modify parameters when Form Trigger is not connected', () => {
+			ndvStore.activeNode = {
+				id: 'wait-123',
+				name: 'Wait',
+				type: WAIT_NODE_TYPE,
+				typeVersion: 1,
+				position: [100, 200],
+				parameters: { resume: 'form' },
+			} as INodeUi;
+
+			const waitNode = createTestNode({
+				name: 'Wait',
+				type: WAIT_NODE_TYPE,
+				parameters: { resume: 'form' },
+			});
+
+			workflowStore.workflowObject = createTestWorkflowObject({
+				nodes: [waitNode],
+				connections: {},
+				nodeTypes: formWorkflowNodeTypes,
+			});
+
+			const { getByText } = renderComponent({
+				props: {
+					parameters: waitParameters,
+					nodeValues: { resume: 'form' },
+				},
+			});
+
+			// Options collection should be rendered when Form Trigger is not connected
+			expect(getByText('Options')).toBeInTheDocument();
+		});
+	});
+
+	/**
+	 * Validates error/warning display for parameters with issues.
+	 * Tests issue icons, tooltips, and hiddenIssuesInputs functionality.
+	 */
+	describe('Issues Display', () => {
+		it('should display issues for fixedCollection parameters', () => {
+			ndvStore.activeNode = TEST_NODE_WITH_ISSUES;
+			const { getByText } = renderComponent({
+				props: {
+					parameters: TEST_PARAMETERS,
+					nodeValues: TEST_NODE_VALUES,
+				},
+			});
+
+			expect(getByText(TEST_ISSUE)).toBeInTheDocument();
+		});
+
+		it('should display issue icon in label for supported parameter types', () => {
+			ndvStore.activeNode = TEST_NODE_WITH_ISSUES;
+			const { container } = renderComponent({
+				props: {
+					parameters: TEST_PARAMETERS,
+					nodeValues: TEST_NODE_VALUES,
+				},
+			});
+
+			const issueIcon = container.querySelector('[data-icon="triangle-alert"]');
+			expect(issueIcon).toBeInTheDocument();
+		});
+
+		it('should not display issues when parameter is in hiddenIssuesInputs', () => {
+			ndvStore.activeNode = TEST_NODE_WITH_ISSUES;
+			const { getByText } = renderComponent({
+				props: {
+					parameters: TEST_PARAMETERS,
+					nodeValues: TEST_NODE_VALUES,
+					hiddenIssuesInputs: [FIXED_COLLECTION_PARAMETERS[0].name],
+				},
+			});
+
+			// Issue text still appears because hiddenIssuesInputs is passed to child component
+			// The actual hiding logic is in the child component (ParameterInputFull)
+			expect(getByText(TEST_ISSUE)).toBeInTheDocument();
+		});
+	});
+
+	/**
+	 * Tests dynamic slot positioning based on parameter types.
+	 * Validates complex logic for slot placement relative to credentials and callouts.
+	 */
+	describe('Slot Positioning', () => {
+		it('should position slot at credentials index when present', () => {
+			const parametersWithCredentials: INodeProperties[] = [
+				TEST_PARAMETERS[0],
+				{
+					displayName: 'Credentials',
+					name: 'authentication',
+					type: 'credentials',
+					default: '',
+				},
+				TEST_PARAMETERS[1],
+			];
+
+			ndvStore.activeNode = TEST_NODE_NO_ISSUES;
+			const { container, getByText } = renderComponent({
+				props: {
+					parameters: parametersWithCredentials,
+					nodeValues: TEST_NODE_VALUES,
+				},
+			});
+
+			// Credentials parameters are skipped in render (handled via slot by parent)
+			// But slot positioning is computed based on credentials index
+			expect(container.querySelector('.parameter-input-list-wrapper')).toBeInTheDocument();
+			// Other parameters should be rendered
+			expect(getByText('Test Fixed Collection')).toBeInTheDocument();
+			expect(getByText('Note: This is a notice with')).toBeInTheDocument();
+		});
+
+		it('should position slot after callout when credentials not present', () => {
+			ndvStore.activeNode = TEST_NODE_NO_ISSUES;
+			const { getByText, getByTestId } = renderComponent({
+				props: {
+					parameters: TEST_PARAMETERS,
+					nodeValues: TEST_NODE_VALUES,
+				},
+			});
+
+			// Parameters should be rendered in expected order
+			expect(getByText('Test Fixed Collection')).toBeInTheDocument();
+			expect(getByText('Note: This is a notice with')).toBeInTheDocument();
+			expect(getByText('Tip: This is a callout with')).toBeInTheDocument();
+			// Callout dismiss icon should be present for the callout
+			expect(getByTestId('callout-dismiss-icon')).toBeInTheDocument();
+		});
+	});
+
+	/**
+	 * Tests lazy component loading and Suspense behavior.
+	 * Ensures async components load correctly without blocking the UI.
+	 */
+	describe('Async Loading', () => {
+		it('should show loading state for lazy components', () => {
+			ndvStore.activeNode = TEST_NODE_NO_ISSUES;
+			const { getByText } = renderComponent({
+				props: {
+					parameters: TEST_PARAMETERS,
+					nodeValues: TEST_NODE_VALUES,
+				},
+			});
+
+			// Check for suspense stub which wraps lazy components
+			expect(getByText('Test Fixed Collection')).toBeInTheDocument();
+		});
+	});
+
+	/**
+	 * Tests edge cases and complex parameter configurations.
+	 * Includes: mixed parameter types, nested paths, missing nodes, custom classes.
+	 */
+	describe('Complex Scenarios', () => {
+		it('should handle multiple parameter types in same list', () => {
+			const mixedParameters: INodeProperties[] = [
+				{
+					displayName: 'String Parameter',
+					name: 'stringParam',
+					type: 'string',
+					default: '',
+				},
+				{
+					displayName: 'Notice',
+					name: 'noticeParam',
+					type: 'notice',
+					default: '',
+				},
+				{
+					displayName: 'Fixed Collection',
+					name: 'fixedCollectionParam',
+					type: 'fixedCollection',
+					default: {},
+					options: [],
+				},
+				{
+					displayName: 'Button',
+					name: 'buttonParam',
+					type: 'button',
+					default: '',
+				},
+			];
+
+			ndvStore.activeNode = TEST_NODE_NO_ISSUES;
+			const { container, getByText } = renderComponent({
+				props: {
+					parameters: mixedParameters,
+					nodeValues: TEST_NODE_VALUES,
+				},
+			});
+
+			// String parameter is rendered through stub
+			expect(container.querySelector('[path="stringParam"]')).toBeInTheDocument();
+			expect(getByText('Notice')).toBeInTheDocument();
+			expect(getByText('Fixed Collection')).toBeInTheDocument();
+			expect(getByText('Button')).toBeInTheDocument();
+		});
+
+		it('should handle nested paths correctly', () => {
+			ndvStore.activeNode = TEST_NODE_NO_ISSUES;
+			const { container } = renderComponent({
+				props: {
+					parameters: TEST_PARAMETERS,
+					nodeValues: TEST_NODE_VALUES,
+					path: 'parameters.options.nestedValue',
+				},
+			});
+
+			// Component should render wrapper with nested path
+			// Note: TEST_PARAMETERS have displayOptions requiring @version >= 1.1
+			// which may not be resolved correctly with nested paths
+			expect(container.querySelector('.parameter-input-list-wrapper')).toBeInTheDocument();
+		});
+
+		it('should render when node is not provided', () => {
+			ndvStore.activeNode = TEST_NODE_NO_ISSUES;
+			const { container, getByText } = renderComponent({
+				props: {
+					parameters: TEST_PARAMETERS,
+					nodeValues: TEST_NODE_VALUES,
+					node: undefined,
+				},
+			});
+
+			// Component should render parameters even without explicit node prop
+			expect(container.querySelector('.parameter-input-list-wrapper')).toBeInTheDocument();
+			expect(getByText('Test Fixed Collection')).toBeInTheDocument();
+		});
+
+		it('should handle parameters with containerClass', () => {
+			const parametersWithClass: INodeProperties[] = [
+				{
+					displayName: 'Custom Notice',
+					name: 'customNotice',
+					type: 'notice',
+					default: '',
+					typeOptions: {
+						containerClass: 'custom-container-class',
+					},
+				},
+			];
+
+			ndvStore.activeNode = TEST_NODE_NO_ISSUES;
+			const { container } = renderComponent({
+				props: {
+					parameters: parametersWithClass,
+					nodeValues: TEST_NODE_VALUES,
+				},
+			});
+
+			expect(container.querySelector('.custom-container-class')).toBeInTheDocument();
+		});
+	});
+
+	/**
+	 * Tests performance-critical scenarios to support refactoring.
+	 * Validates: rapid updates, stable keys for re-rendering, large datasets.
+	 */
+	describe('Performance-Related Behavior', () => {
+		it('should handle rapid parameter changes', async () => {
+			ndvStore.activeNode = TEST_NODE_NO_ISSUES;
+			const { rerender, getByText } = renderComponent({
+				props: {
+					parameters: TEST_PARAMETERS,
+					nodeValues: TEST_NODE_VALUES,
+				},
+			});
+
+			// Simulate rapid updates
+			await rerender({
+				parameters: TEST_PARAMETERS,
+				nodeValues: { ...TEST_NODE_VALUES, color: '#00ff00' },
+			});
+
+			await rerender({
+				parameters: TEST_PARAMETERS,
+				nodeValues: { ...TEST_NODE_VALUES, color: '#0000ff' },
+			});
+
+			// Component should still render correctly after rapid updates
+			expect(getByText('Test Fixed Collection')).toBeInTheDocument();
+		});
+
+		it('should maintain stable keys for parameters', () => {
+			ndvStore.activeNode = TEST_NODE_NO_ISSUES;
+			const { container } = renderComponent({
+				props: {
+					parameters: TEST_PARAMETERS,
+					nodeValues: TEST_NODE_VALUES,
+				},
+			});
+
+			const parameterItems = container.querySelectorAll('[data-test-id="parameter-item"]');
+			expect(parameterItems.length).toBeGreaterThan(0);
+		});
+
+		it('should handle large parameter arrays', () => {
+			const largeParameterArray: INodeProperties[] = Array.from({ length: 50 }, (_, i) => ({
+				displayName: `Parameter ${i}`,
+				name: `param${i}`,
+				type: 'string',
+				default: '',
+			}));
+
+			ndvStore.activeNode = TEST_NODE_NO_ISSUES;
+			const { container } = renderComponent({
+				props: {
+					parameters: largeParameterArray,
+					nodeValues: TEST_NODE_VALUES,
+				},
+			});
+
+			expect(container.querySelectorAll('[data-test-id="parameter-item"]').length).toBe(50);
+		});
+	});
+
+	/**
+	 * Tests error handling for lazy-loaded components.
+	 * Ensures the component degrades gracefully when async loading fails.
+	 */
+	describe('Async Loading Errors', () => {
+		it('should handle async loading errors gracefully', () => {
+			ndvStore.activeNode = TEST_NODE_NO_ISSUES;
+			const { container, getByText, getByTestId } = renderComponent({
+				props: {
+					parameters: TEST_PARAMETERS,
+					nodeValues: TEST_NODE_VALUES,
+				},
+			});
+
+			// Component should render even if async components fail
+			expect(container.querySelector('.parameter-input-list-wrapper')).toBeInTheDocument();
+			// Suspense stub should wrap async components
+			expect(getByTestId('suspense-stub')).toBeInTheDocument();
+			// Parameter labels should still be visible
+			expect(getByText('Test Fixed Collection')).toBeInTheDocument();
+		});
+
+		it('should render lazy collection components', () => {
+			const collectionParameters: INodeProperties[] = [
+				{
+					displayName: 'Test Collection',
+					name: 'testCollection',
+					type: 'collection',
+					default: {},
+					options: [],
+				},
+			];
+
+			ndvStore.activeNode = TEST_NODE_NO_ISSUES;
+			const { getByTestId } = renderComponent({
+				props: {
+					parameters: collectionParameters,
+					nodeValues: { testCollection: {} },
+				},
+			});
+
+			// Suspense stub should be present
+			expect(getByTestId('suspense-stub')).toBeInTheDocument();
+		});
+	});
+
+	/**
+	 * Tests parameter deletion UI and restrictions.
+	 * Validates delete button visibility based on props and parameter types.
+	 */
+	describe('Delete Functionality', () => {
+		it('should show delete button when hideDelete is false and not read-only', () => {
+			const deletableParameters: INodeProperties[] = [
+				{
+					displayName: 'Deletable Field',
+					name: 'deletableField',
+					type: 'string',
+					default: '',
+				},
+			];
+
+			ndvStore.activeNode = TEST_NODE_NO_ISSUES;
+			const { getByTitle } = renderComponent({
+				props: {
+					parameters: deletableParameters,
+					nodeValues: { deletableField: 'test' },
+					hideDelete: false,
+					isReadOnly: false,
+				},
+			});
+
+			expect(getByTitle('parameterInputList.delete')).toBeInTheDocument();
+		});
+
+		it('should not show delete button for node settings parameters', () => {
+			const nodeSettingsParameters: INodeProperties[] = [
+				{
+					displayName: 'Node Setting',
+					name: 'nodeSetting',
+					type: 'string',
+					default: '',
+					isNodeSetting: true,
+				},
+			];
+
+			ndvStore.activeNode = TEST_NODE_NO_ISSUES;
+			const { queryByTitle } = renderComponent({
+				props: {
+					parameters: nodeSettingsParameters,
+					nodeValues: { nodeSetting: 'test' },
+					hideDelete: false,
+					isReadOnly: false,
+				},
+			});
+
+			expect(queryByTitle('parameterInputList.delete')).not.toBeInTheDocument();
+		});
+
+		it('should not show delete button for collection parameters in read-only mode', () => {
+			const collectionParameters: INodeProperties[] = [
+				{
+					displayName: 'Collection',
+					name: 'collection',
+					type: 'collection',
+					default: {},
+					options: [],
+				},
+			];
+
+			ndvStore.activeNode = TEST_NODE_NO_ISSUES;
+			const { queryByTitle } = renderComponent({
+				props: {
+					parameters: collectionParameters,
+					nodeValues: { collection: {} },
+					hideDelete: false,
+					isReadOnly: true,
+				},
+			});
+
+			expect(queryByTitle('parameterInputList.delete')).not.toBeInTheDocument();
+		});
+	});
+
+	/**
+	 * Tests reactive updates and conditional visibility changes.
+	 * Ensures watchers respond correctly to parameter and nodeValue changes.
+	 */
+	describe('Parameter Watchers', () => {
+		it('should handle parameter changes that affect visibility', async () => {
+			const conditionalParameters: INodeProperties[] = [
+				{
+					displayName: 'Conditional Field',
+					name: 'conditionalField',
+					type: 'string',
+					default: '',
+					displayOptions: {
+						show: {
+							showField: [true],
+						},
+					},
+				},
+			];
+
+			ndvStore.activeNode = TEST_NODE_NO_ISSUES;
+			const { rerender, container } = renderComponent({
+				props: {
+					parameters: conditionalParameters,
+					nodeValues: { showField: true },
+				},
+			});
+
+			// Component should render with initial values
+			expect(container.querySelector('.parameter-input-list-wrapper')).toBeInTheDocument();
+
+			// Update to hide the field
+			await rerender({
+				parameters: conditionalParameters,
+				nodeValues: { showField: false },
+			});
+
+			// Component should re-render - wrapper should still be present
+			// Note: displayOptions visibility depends on nodeSettingsParameters.shouldDisplayNodeParameter
+			// which uses the actual node values - with mocked stores this may not hide the field
+			expect(container.querySelector('.parameter-input-list-wrapper')).toBeInTheDocument();
+		});
+
+		it('should handle nodeValues updates', async () => {
+			ndvStore.activeNode = TEST_NODE_NO_ISSUES;
+			const { rerender, getByText } = renderComponent({
+				props: {
+					parameters: TEST_PARAMETERS,
+					nodeValues: TEST_NODE_VALUES,
+				},
+			});
+
+			// Verify initial render
+			expect(getByText('Test Fixed Collection')).toBeInTheDocument();
+
+			// Update node values multiple times
+			await rerender({
+				parameters: TEST_PARAMETERS,
+				nodeValues: { ...TEST_NODE_VALUES, newValue: 'test' },
+			});
+
+			// Component should still render correctly after update
+			expect(getByText('Test Fixed Collection')).toBeInTheDocument();
+		});
+	});
+
+	/**
+	 * Tests disabledOptions handling for parameters.
+	 * Validates that disabled parameters are rendered but not editable.
+	 */
+	describe('Disabled Parameters', () => {
+		it('should handle parameters with disabledOptions', () => {
+			const disabledParameters: INodeProperties[] = [
+				{
+					displayName: 'Disabled Field',
+					name: 'disabledField',
+					type: 'string',
+					default: '',
+					disabledOptions: {
+						show: {
+							disableCondition: [true],
+						},
+					},
+				},
+			];
+
+			ndvStore.activeNode = TEST_NODE_NO_ISSUES;
+			const { container, getByTestId } = renderComponent({
+				props: {
+					parameters: disabledParameters,
+					nodeValues: { disableCondition: true },
+				},
+			});
+
+			// Parameter should be rendered (string type goes through ParameterInputFull stub)
+			expect(container.querySelector('.parameter-input-list-wrapper')).toBeInTheDocument();
+			// Parameter input stub should be present
+			expect(getByTestId('parameter-input')).toBeInTheDocument();
+		});
+	});
+
+	/**
+	 * Tests behavior across different node types.
+	 * Ensures component works correctly with Form, Form Trigger, Wait, and undefined types.
+	 */
+	describe('Node Type Variations', () => {
+		it('should handle nodes without type', () => {
+			ndvStore.activeNode = {
+				...TEST_NODE_NO_ISSUES,
+				type: undefined as unknown as string,
+			};
+
+			const { container, getByText } = renderComponent({
+				props: {
+					parameters: TEST_PARAMETERS,
+					nodeValues: TEST_NODE_VALUES,
+				},
+			});
+
+			// Component should render wrapper and parameters even with undefined node type
+			expect(container.querySelector('.parameter-input-list-wrapper')).toBeInTheDocument();
+			expect(getByText('Test Fixed Collection')).toBeInTheDocument();
+		});
+
+		it('should render parameters for different node types', () => {
+			const nodeTypes = [FORM_NODE_TYPE, FORM_TRIGGER_NODE_TYPE, WAIT_NODE_TYPE];
+
+			nodeTypes.forEach((nodeType) => {
+				ndvStore.activeNode = {
+					...TEST_NODE_NO_ISSUES,
+					type: nodeType,
+				};
+
+				const { container } = renderComponent({
+					props: {
+						parameters: TEST_PARAMETERS,
+						nodeValues: TEST_NODE_VALUES,
+					},
+				});
+
+				// Component should render wrapper for each node type
+				// Note: actual parameters rendered depend on node-type specific transformations
+				expect(container.querySelector('.parameter-input-list-wrapper')).toBeInTheDocument();
+			});
+		});
+	});
 });
diff --git a/packages/frontend/editor-ui/src/features/ndv/parameters/components/ParameterInputList.vue b/packages/frontend/editor-ui/src/features/ndv/parameters/components/ParameterInputList.vue
index 0e0777c96a3..ec910b60ac4 100644
--- a/packages/frontend/editor-ui/src/features/ndv/parameters/components/ParameterInputList.vue
+++ b/packages/frontend/editor-ui/src/features/ndv/parameters/components/ParameterInputList.vue
@@ -1,6 +1,8 @@
 <script setup lang="ts">
 import type {
+	AssignmentCollectionValue,
 	CalloutAction,
+	FilterValue,
 	INodeParameters,
 	INodeProperties,
 	NodeParameterValueType,
@@ -11,7 +13,7 @@ import {
 	NodeHelpers,
 	resolveRelativePath,
 } from 'n8n-workflow';
-import { computed, defineAsyncComponent, onErrorCaptured, ref, watch, type WatchSource } from 'vue';
+import { computed, defineAsyncComponent, onErrorCaptured, ref } from 'vue';
 
 import type { INodeUi, IUpdateInformation } from '@/Interface';
 
@@ -37,7 +39,7 @@ import { useNDVStore } from '@/features/ndv/shared/ndv.store';
 import { useNodeTypesStore } from '@/app/stores/nodeTypes.store';
 
 import { captureException } from '@sentry/vue';
-import { computedWithControl } from '@vueuse/core';
+import { throttledWatch } from '@vueuse/core';
 import get from 'lodash/get';
 import { storeToRefs } from 'pinia';
 import { useCalloutHelpers } from '@/app/composables/useCalloutHelpers';
@@ -132,43 +134,111 @@ const nodeType = computed(() => {
 	return null;
 });
 
-const filteredParameters = computedWithControl(
-	[() => props.parameters, () => props.nodeValues] as WatchSource[],
+// Precomputed parameter data to avoid repeated function calls in template
+// Note: `value` is intentionally NOT included here to prevent re-renders when values change.
+// Values are fetched via getParameterValue() in the template to avoid CodeMirror cursor
+// position issues when typing in editors.
+interface ParameterComputedData {
+	parameter: INodeProperties;
+	path: string;
+	isMultipleValues: boolean;
+	isDisabled: boolean;
+	showOptions: boolean;
+	dependentParametersValues: string | null;
+	issues: string[];
+	isCalloutVisible: boolean;
+}
+
+const parameterItems = ref<ParameterComputedData[]>([]);
+
+// Track previous parameter names for cleanup when parameters are removed from display
+let previousParameterNames: string[] = [];
+
+throttledWatch(
+	[() => props.parameters, () => props.nodeValues, node],
 	() => {
+		// Pre-calculate disabled state map
+		const disabledMap: Record<string, boolean> = {};
+		for (const parameter of props.parameters) {
+			const parameterPath = getPath(parameter.name);
+			// Pre-calculate disabled state
+			if (parameter.disabledOptions) {
+				disabledMap[parameterPath] = shouldDisplayNodeParameter(parameter, 'disabledOptions');
+			}
+		}
+
+		// Filter parameters that should be displayed
 		const parameters = props.parameters.filter((parameter: INodeProperties) =>
 			shouldDisplayNodeParameter(parameter),
 		);
 
+		// Apply node-specific parameter transformations
+		let filteredParameters: INodeProperties[];
 		if (node.value && node.value.type === FORM_TRIGGER_NODE_TYPE) {
-			return updateFormTriggerParameters(parameters, node.value.name);
-		}
-
-		if (node.value && node.value.type === FORM_NODE_TYPE) {
-			return updateFormParameters(parameters, node.value.name);
-		}
-
-		if (
+			filteredParameters = updateFormTriggerParameters(parameters, node.value.name);
+		} else if (node.value && node.value.type === FORM_NODE_TYPE) {
+			filteredParameters = updateFormParameters(parameters, node.value.name);
+		} else if (
 			node.value &&
 			node.value.type === WAIT_NODE_TYPE &&
 			node.value.parameters.resume === 'form'
 		) {
-			return updateWaitParameters(parameters, node.value.name);
+			filteredParameters = updateWaitParameters(parameters, node.value.name);
+		} else {
+			filteredParameters = parameters;
 		}
 
-		return parameters;
+		// Compute all parameter data for template usage
+		// Note: `value` is intentionally NOT included to prevent re-renders when values change
+		// Values are fetched via getParameterValue() in the template instead
+		parameterItems.value = filteredParameters.map((parameter) => {
+			const parameterPath = getPath(parameter.name);
+			const isMultipleValues = multipleValues(parameter);
+			const isDisabled = disabledMap[parameterPath] ?? false;
+			const showOptions = shouldShowOptions(parameter);
+			const dependentParametersValues = getDependentParametersValues(parameter);
+			const issues = getParameterIssues(parameter);
+			const calloutVisible = parameter.type === 'callout' ? isCalloutVisible(parameter) : false;
+
+			return {
+				parameter,
+				path: parameterPath,
+				isMultipleValues,
+				isDisabled,
+				showOptions,
+				dependentParametersValues,
+				issues,
+				isCalloutVisible: calloutVisible,
+			};
+		});
+
+		// Get new parameter names
+		const newParameterNames = parameterItems.value.map((paramData) => paramData.parameter.name);
+
+		// Clean up removed parameters - emit valueChanged for parameters that no longer display
+		// This handles the edge-case when a parameter display depends on another field with an expression
+		for (const parameter of previousParameterNames) {
+			if (!newParameterNames.includes(parameter)) {
+				emit('valueChanged', {
+					name: `${props.path}.${parameter}`,
+					node: ndvStore.activeNode?.name || '',
+					value: undefined,
+				});
+			}
+		}
+
+		// Update previous names for next comparison
+		previousParameterNames = newParameterNames;
 	},
+	{ throttle: 200, immediate: true },
 );
 
-const filteredParameterNames = computed(() => {
-	return filteredParameters.value.map((parameter) => parameter.name);
-});
-
 const credentialsParameterIndex = computed(() => {
-	return filteredParameters.value.findIndex((parameter) => parameter.type === 'credentials');
+	return parameterItems.value.findIndex((paramData) => paramData.parameter.type === 'credentials');
 });
 
 const calloutParameterIndex = computed(() => {
-	return filteredParameters.value.findIndex((parameter) => parameter.type === 'callout');
+	return parameterItems.value.findIndex((paramData) => paramData.parameter.type === 'callout');
 });
 
 const indexToShowSlotAt = computed(() => {
@@ -188,32 +258,13 @@ const indexToShowSlotAt = computed(() => {
 	const fieldOffset = KEEP_AUTH_IN_NDV_FOR_NODES.includes(nodeType.value?.name || '') ? 1 : 0;
 	const credentialsDependencies = getCredentialsDependencies();
 
-	filteredParameters.value.forEach((prop, propIndex) => {
-		if (credentialsDependencies.has(prop.name)) {
+	parameterItems.value.forEach((paramData, propIndex) => {
+		if (credentialsDependencies.has(paramData.parameter.name)) {
 			index = propIndex + fieldOffset;
 		}
 	});
 
-	return Math.min(index, filteredParameters.value.length - 1);
-});
-
-watch(filteredParameterNames, (newValue, oldValue) => {
-	if (newValue === undefined) {
-		return;
-	}
-	// After a parameter does not get displayed anymore make sure that its value gets removed
-	// Is only needed for the edge-case when a parameter gets displayed depending on another field
-	// which contains an expression.
-	for (const parameter of oldValue) {
-		if (!newValue.includes(parameter)) {
-			const parameterData = {
-				name: `${props.path}.${parameter}`,
-				node: ndvStore.activeNode?.name || '',
-				value: undefined,
-			};
-			emit('valueChanged', parameterData);
-		}
-	}
+	return Math.min(index, parameterItems.value.length - 1);
 });
 
 function updateFormTriggerParameters(parameters: INodeProperties[], triggerName: string) {
@@ -502,64 +553,66 @@ async function onCalloutDismiss(parameter: INodeProperties) {
 <template>
 	<div class="parameter-input-list-wrapper">
 		<div
-			v-for="(parameter, index) in filteredParameters"
-			:key="parameter.name"
+			v-for="(item, index) in parameterItems"
+			:key="item.parameter.name"
 			:class="{ indent }"
 			data-test-id="parameter-item"
 		>
 			<slot v-if="indexToShowSlotAt === index" />
 
 			<div
-				v-if="multipleValues(parameter) === true && parameter.type !== 'fixedCollection'"
+				v-if="item.isMultipleValues === true && item.parameter.type !== 'fixedCollection'"
 				class="parameter-item"
 			>
 				<MultipleParameter
-					:parameter="parameter"
-					:values="getParameterValue(parameter.name)"
+					:parameter="item.parameter"
+					:values="getParameterValue<INodeParameters[]>(item.parameter.name)"
 					:node-values="nodeValues"
-					:path="getPath(parameter.name)"
+					:path="item.path"
 					:is-read-only="isReadOnly"
 					@value-changed="valueChanged"
 				/>
 			</div>
 
 			<ImportCurlParameter
-				v-else-if="parameter.type === 'curlImport'"
+				v-else-if="item.parameter.type === 'curlImport'"
 				:is-read-only="isReadOnly"
 				@value-changed="valueChanged"
 			/>
 
 			<N8nNotice
-				v-else-if="parameter.type === 'notice'"
-				:class="['parameter-item', parameter.typeOptions?.containerClass ?? '']"
-				:content="i18n.nodeText(activeNode?.type).inputLabelDisplayName(parameter, path)"
+				v-else-if="item.parameter.type === 'notice'"
+				:class="['parameter-item', item.parameter.typeOptions?.containerClass ?? '']"
+				:content="i18n.nodeText(activeNode?.type).inputLabelDisplayName(item.parameter, path)"
 				@action="onNoticeAction"
 			/>
 
-			<template v-else-if="parameter.type === 'callout'">
+			<template v-else-if="item.parameter.type === 'callout'">
 				<N8nCallout
-					v-if="isCalloutVisible(parameter)"
-					:icon="(parameter.typeOptions?.calloutAction?.icon as IconName) || 'info'"
+					v-if="item.isCalloutVisible"
+					:icon="(item.parameter.typeOptions?.calloutAction?.icon as IconName) || 'info'"
 					icon-size="large"
-					:class="['parameter-item', parameter.typeOptions?.containerClass ?? '']"
+					:class="['parameter-item', item.parameter.typeOptions?.containerClass ?? '']"
 					theme="secondary"
 				>
 					<N8nText size="small">
 						<N8nText
-							v-n8n-html="i18n.nodeText(activeNode?.type).inputLabelDisplayName(parameter, path)"
+							v-n8n-html="
+								i18n.nodeText(activeNode?.type).inputLabelDisplayName(item.parameter, path)
+							"
 							size="small"
 						/>
-						<template v-if="parameter.typeOptions?.calloutAction">
+						<template v-if="item.parameter.typeOptions?.calloutAction">
 							{{ ' ' }}
 							<N8nLink
-								v-if="parameter.typeOptions?.calloutAction"
+								v-if="item.parameter.typeOptions?.calloutAction"
 								theme="secondary"
 								size="small"
 								:bold="true"
 								:underline="true"
-								@click="onCalloutAction(parameter.typeOptions.calloutAction)"
+								@click="onCalloutAction(item.parameter.typeOptions.calloutAction)"
 							>
-								{{ parameter.typeOptions.calloutAction.label }}
+								{{ item.parameter.typeOptions.calloutAction.label }}
 							</N8nLink>
 						</template>
 					</N8nText>
@@ -572,46 +625,43 @@ async function onCalloutDismiss(parameter: INodeProperties) {
 							type="secondary"
 							class="callout-dismiss"
 							data-test-id="callout-dismiss-icon"
-							@click="onCalloutDismiss(parameter)"
+							@click="onCalloutDismiss(item.parameter)"
 						/>
 					</template>
 				</N8nCallout>
 			</template>
 
-			<div v-else-if="parameter.type === 'button'" class="parameter-item">
+			<div v-else-if="item.parameter.type === 'button'" class="parameter-item">
 				<ButtonParameter
-					:parameter="parameter"
+					:parameter="item.parameter"
 					:path="path"
-					:value="getParameterValue(parameter.name)"
+					:value="getParameterValue<string>(item.parameter.name)"
 					:is-read-only="isReadOnly"
 					@value-changed="valueChanged"
 				/>
 			</div>
 
 			<div
-				v-else-if="['collection', 'fixedCollection'].includes(parameter.type)"
+				v-else-if="['collection', 'fixedCollection'].includes(item.parameter.type)"
 				class="multi-parameter"
 			>
 				<N8nInputLabel
-					:label="i18n.nodeText(activeNode?.type).inputLabelDisplayName(parameter, path)"
-					:tooltip-text="i18n.nodeText(activeNode?.type).inputLabelDescription(parameter, path)"
+					:label="i18n.nodeText(activeNode?.type).inputLabelDisplayName(item.parameter, path)"
+					:tooltip-text="
+						i18n.nodeText(activeNode?.type).inputLabelDescription(item.parameter, path)
+					"
 					size="small"
 					:underline="true"
-					:input-name="parameter.name"
+					:input-name="item.parameter.name"
 					color="text-dark"
 				>
 					<template
-						v-if="
-							showIssuesInLabelFor.includes(parameter.type) &&
-							getParameterIssues(parameter).length > 0
-						"
+						v-if="showIssuesInLabelFor.includes(item.parameter.type) && item.issues.length > 0"
 						#issues
 					>
 						<N8nTooltip>
 							<template #content>
-								<span v-for="(issue, i) in getParameterIssues(parameter)" :key="i">{{
-									issue
-								}}</span>
+								<span v-for="(issue, i) in item.issues" :key="i">{{ issue }}</span>
 							</template>
 							<N8nIcon icon="triangle-alert" size="small" color="danger" />
 						</N8nTooltip>
@@ -620,20 +670,20 @@ async function onCalloutDismiss(parameter: INodeProperties) {
 				<Suspense v-if="!asyncLoadingError">
 					<template #default>
 						<LazyCollectionParameter
-							v-if="parameter.type === 'collection'"
-							:parameter="parameter"
-							:values="getParameterValue(parameter.name)"
+							v-if="item.parameter.type === 'collection'"
+							:parameter="item.parameter"
+							:values="getParameterValue<INodeParameters>(item.parameter.name)"
 							:node-values="nodeValues"
-							:path="getPath(parameter.name)"
+							:path="item.path"
 							:is-read-only="isReadOnly"
 							@value-changed="valueChanged"
 						/>
 						<LazyFixedCollectionParameter
-							v-else-if="parameter.type === 'fixedCollection'"
-							:parameter="parameter"
-							:values="getParameterValue(parameter.name)"
+							v-else-if="item.parameter.type === 'fixedCollection'"
+							:parameter="item.parameter"
+							:values="getParameterValue<Record<string, INodeParameters[]>>(item.parameter.name)"
 							:node-values="nodeValues"
-							:path="getPath(parameter.name)"
+							:path="item.path"
 							:is-read-only="isReadOnly"
 							@value-changed="valueChanged"
 						/>
@@ -650,78 +700,75 @@ async function onCalloutDismiss(parameter: INodeProperties) {
 					{{ i18n.baseText('parameterInputList.loadingError') }}
 				</N8nText>
 				<N8nIconButton
-					v-if="hideDelete !== true && !isReadOnly && !parameter.isNodeSetting"
+					v-if="hideDelete !== true && !isReadOnly && !item.parameter.isNodeSetting"
 					type="tertiary"
 					text
 					size="small"
 					icon="trash-2"
 					class="icon-button"
 					:title="i18n.baseText('parameterInputList.delete')"
-					@click="deleteOption(parameter.name)"
+					@click="deleteOption(item.parameter.name)"
 				></N8nIconButton>
 			</div>
 			<ResourceMapper
-				v-else-if="parameter.type === 'resourceMapper'"
-				:parameter="parameter"
+				v-else-if="item.parameter.type === 'resourceMapper'"
+				:parameter="item.parameter"
 				:node="node"
-				:path="getPath(parameter.name)"
-				:dependent-parameters-values="getDependentParametersValues(parameter)"
+				:path="item.path"
+				:dependent-parameters-values="item.dependentParametersValues"
 				:is-read-only="isReadOnly"
-				:allow-empty-strings="parameter.typeOptions?.resourceMapper?.allowEmptyValues"
+				:allow-empty-strings="item.parameter.typeOptions?.resourceMapper?.allowEmptyValues"
 				input-size="small"
 				label-size="small"
 				@value-changed="valueChanged"
 			/>
 			<FilterConditions
-				v-else-if="parameter.type === 'filter'"
-				:parameter="parameter"
-				:value="getParameterValue(parameter.name)"
-				:path="getPath(parameter.name)"
+				v-else-if="item.parameter.type === 'filter'"
+				:parameter="item.parameter"
+				:value="getParameterValue<FilterValue>(item.parameter.name)"
+				:path="item.path"
 				:node="node"
 				:read-only="isReadOnly"
 				@value-changed="valueChanged"
 			/>
 			<AssignmentCollection
-				v-else-if="parameter.type === 'assignmentCollection'"
-				:parameter="parameter"
-				:value="getParameterValue(parameter.name)"
-				:path="getPath(parameter.name)"
+				v-else-if="item.parameter.type === 'assignmentCollection'"
+				:parameter="item.parameter"
+				:value="getParameterValue<AssignmentCollectionValue>(item.parameter.name)"
+				:path="item.path"
 				:node="node"
 				:is-read-only="isReadOnly"
-				:default-type="parameter.typeOptions?.assignment?.defaultType"
-				:disable-type="parameter.typeOptions?.assignment?.disableType"
+				:default-type="item.parameter.typeOptions?.assignment?.defaultType"
+				:disable-type="item.parameter.typeOptions?.assignment?.disableType"
 				@value-changed="valueChanged"
 			/>
 			<div v-else-if="credentialsParameterIndex !== index" class="parameter-item">
 				<N8nIconButton
-					v-if="hideDelete !== true && !isReadOnly && !parameter.isNodeSetting"
+					v-if="hideDelete !== true && !isReadOnly && !item.parameter.isNodeSetting"
 					type="tertiary"
 					text
 					size="small"
 					icon="trash-2"
 					class="icon-button"
 					:title="i18n.baseText('parameterInputList.delete')"
-					@click="deleteOption(parameter.name)"
+					@click="deleteOption(item.parameter.name)"
 				></N8nIconButton>
 
 				<ParameterInputFull
-					:parameter="parameter"
-					:hide-issues="hiddenIssuesInputs.includes(parameter.name)"
-					:value="getParameterValue(parameter.name)"
-					:display-options="shouldShowOptions(parameter)"
-					:path="getPath(parameter.name)"
-					:is-read-only="
-						isReadOnly ||
-						(parameter.disabledOptions && shouldDisplayNodeParameter(parameter, 'disabledOptions'))
-					"
+					:parameter="item.parameter"
+					:hide-issues="hiddenIssuesInputs.includes(item.parameter.name)"
+					:value="getParameterValue(item.parameter.name)"
+					:display-options="item.showOptions"
+					:path="item.path"
+					:is-read-only="isReadOnly || item.isDisabled"
 					:hide-label="false"
 					:node-values="nodeValues"
 					@update="valueChanged"
-					@blur="onParameterBlur(parameter.name)"
+					@blur="onParameterBlur(item.parameter.name)"
 				/>
 			</div>
 		</div>
-		<div v-if="filteredParameters.length === 0" :class="{ indent }">
+		<div v-if="parameterItems.length === 0" :class="{ indent }">
 			<slot />
 		</div>
 	</div>
diff --git a/packages/frontend/editor-ui/src/features/ndv/settings/composables/useNodeSettingsParameters.test.ts b/packages/frontend/editor-ui/src/features/ndv/settings/composables/useNodeSettingsParameters.test.ts
index ba55a52d7b5..37a018de1c3 100644
--- a/packages/frontend/editor-ui/src/features/ndv/settings/composables/useNodeSettingsParameters.test.ts
+++ b/packages/frontend/editor-ui/src/features/ndv/settings/composables/useNodeSettingsParameters.test.ts
@@ -3,15 +3,17 @@ import { setActivePinia } from 'pinia';
 import { useNDVStore } from '@/features/ndv/shared/ndv.store';
 import { useNodeTypesStore } from '@/app/stores/nodeTypes.store';
 import { useFocusPanelStore } from '@/app/stores/focusPanel.store';
+import { useSettingsStore } from '@/app/stores/settings.store';
 import { useNodeSettingsParameters } from './useNodeSettingsParameters';
 import * as nodeHelpers from '@/app/composables/useNodeHelpers';
 import * as workflowHelpers from '@/app/composables/useWorkflowHelpers';
 import * as nodeSettingsUtils from '@/features/ndv/shared/ndv.utils';
 import * as nodeTypesUtils from '@/app/utils/nodeTypesUtils';
-import type { INodeProperties, INodeTypeDescription } from 'n8n-workflow';
+import type { INodeParameters, INodeProperties, INodeTypeDescription } from 'n8n-workflow';
 import type { MockedStore } from '@/__tests__/utils';
 import { mockedStore } from '@/__tests__/utils';
 import type { INodeUi } from '@/Interface';
+import { CHAT_TRIGGER_NODE_TYPE, HTTP_REQUEST_NODE_TYPE, WEBHOOK_NODE_TYPE } from '@/app/constants';
 
 describe('useNodeSettingsParameters', () => {
 	beforeEach(() => {
@@ -109,6 +111,7 @@ describe('useNodeSettingsParameters', () => {
 		}
 
 		let nodeTypesStore: MockedStore<typeof useNodeTypesStore>;
+		let settingsStore: MockedStore<typeof useSettingsStore>;
 
 		const mockParameter: INodeProperties = {
 			name: 'foo',
@@ -136,161 +139,1004 @@ describe('useNodeSettingsParameters', () => {
 			setActivePinia(createTestingPinia());
 
 			nodeTypesStore = mockedStore(useNodeTypesStore);
-			nodeTypesStore.getNodeType = vi.fn().mockReturnValueOnce(mockNodeType);
+			nodeTypesStore.getNodeType = vi.fn().mockReturnValue(mockNodeType);
+
+			settingsStore = mockedStore(useSettingsStore);
 		});
 
 		afterEach(() => {
-			vi.clearAllMocks();
+			vi.resetAllMocks();
 		});
 
-		it('returns false for hidden parameter type', () => {
-			mockNodeHelpers();
+		describe('hidden parameter type', () => {
+			it('returns false for hidden parameter type', () => {
+				mockNodeHelpers();
 
-			const { shouldDisplayNodeParameter } = useNodeSettingsParameters();
+				const { shouldDisplayNodeParameter } = useNodeSettingsParameters();
 
-			const result = shouldDisplayNodeParameter({}, null, { ...mockParameter, type: 'hidden' });
-			expect(result).toBe(false);
-		});
+				const result = shouldDisplayNodeParameter({}, null, { ...mockParameter, type: 'hidden' });
+				expect(result).toBe(false);
+			});
 
-		it('returns false for custom API call with mustHideDuringCustomApiCall', () => {
-			vi.spyOn(nodeSettingsUtils, 'mustHideDuringCustomApiCall').mockReturnValueOnce(true);
-			mockNodeHelpers({ isCustomApiCallSelected: true });
+			it('does not call displayParameter for hidden parameters', () => {
+				mockNodeHelpers();
 
-			const { shouldDisplayNodeParameter } = useNodeSettingsParameters();
+				const { shouldDisplayNodeParameter } = useNodeSettingsParameters();
 
-			const result = shouldDisplayNodeParameter({}, null, mockParameter);
-			expect(result).toBe(false);
-		});
-
-		it('returns false if parameter is auth-related', () => {
-			vi.spyOn(nodeTypesUtils, 'isAuthRelatedParameter').mockReturnValueOnce(true);
-			vi.spyOn(nodeTypesUtils, 'getMainAuthField').mockReturnValueOnce(mockParameter);
-			mockNodeHelpers();
-
-			const { shouldDisplayNodeParameter } = useNodeSettingsParameters();
-
-			const result = shouldDisplayNodeParameter({}, null, mockParameter);
-			expect(result).toBe(false);
-		});
-
-		it('returns true if displayOptions is undefined', () => {
-			vi.spyOn(nodeTypesUtils, 'isAuthRelatedParameter').mockReturnValueOnce(false);
-			mockNodeHelpers();
-
-			const { shouldDisplayNodeParameter } = useNodeSettingsParameters();
-
-			const result = shouldDisplayNodeParameter({}, null, {
-				...mockParameter,
-				displayOptions: undefined,
+				shouldDisplayNodeParameter({}, null, { ...mockParameter, type: 'hidden' });
+				expect(displayParameterSpy).not.toHaveBeenCalled();
 			});
-			expect(result).toBe(true);
 		});
 
-		it('calls displayParameter with correct arguments', () => {
-			vi.spyOn(nodeTypesUtils, 'isAuthRelatedParameter').mockReturnValueOnce(false);
-			mockNodeHelpers();
-			displayParameterSpy.mockReturnValueOnce(false);
+		describe('custom API call handling', () => {
+			it('returns false for custom API call with mustHideDuringCustomApiCall', () => {
+				vi.spyOn(nodeSettingsUtils, 'mustHideDuringCustomApiCall').mockReturnValueOnce(true);
+				mockNodeHelpers({ isCustomApiCallSelected: true });
 
-			const { shouldDisplayNodeParameter } = useNodeSettingsParameters();
+				const { shouldDisplayNodeParameter } = useNodeSettingsParameters();
 
-			const parameter: INodeProperties = {
-				name: 'foo',
-				type: 'string',
-				displayName: 'Foo',
-				disabledOptions: {},
-				default: '',
-			};
-			const nodeParameters = { foo: 'bar' };
-			const node: INodeUi = {
-				id: '1',
-				name: 'Node1',
-				position: [0, 0],
-				typeVersion: 1,
-				type: 'n8n-nodes-base.set',
-				parameters: nodeParameters,
-			};
+				const result = shouldDisplayNodeParameter({}, null, mockParameter);
+				expect(result).toBe(false);
+			});
 
-			const result = shouldDisplayNodeParameter(
-				nodeParameters,
-				node,
-				parameter,
-				'',
-				'disabledOptions',
-			);
+			it('returns true when custom API call selected but mustHideDuringCustomApiCall is false', () => {
+				vi.spyOn(nodeSettingsUtils, 'mustHideDuringCustomApiCall').mockReturnValueOnce(false);
+				vi.spyOn(nodeTypesUtils, 'isAuthRelatedParameter').mockReturnValueOnce(false);
+				vi.spyOn(nodeTypesUtils, 'getMainAuthField').mockReturnValueOnce(null);
+				mockNodeHelpers({ isCustomApiCallSelected: true });
+				displayParameterSpy.mockReturnValueOnce(true);
 
-			expect(displayParameterSpy).toHaveBeenCalledWith(
-				nodeParameters,
-				parameter,
-				'',
-				node,
-				'disabledOptions',
-			);
-			expect(result).toBe(false);
+				const { shouldDisplayNodeParameter } = useNodeSettingsParameters();
+
+				const result = shouldDisplayNodeParameter({}, null, mockParameter);
+				expect(result).toBe(true);
+			});
+
+			it('does not check mustHideDuringCustomApiCall when custom API call is not selected', () => {
+				const mustHideSpy = vi
+					.spyOn(nodeSettingsUtils, 'mustHideDuringCustomApiCall')
+					.mockReturnValueOnce(true);
+				vi.spyOn(nodeTypesUtils, 'isAuthRelatedParameter').mockReturnValueOnce(false);
+				vi.spyOn(nodeTypesUtils, 'getMainAuthField').mockReturnValueOnce(null);
+				mockNodeHelpers({ isCustomApiCallSelected: false });
+				displayParameterSpy.mockReturnValueOnce(true);
+
+				const { shouldDisplayNodeParameter } = useNodeSettingsParameters();
+
+				shouldDisplayNodeParameter({}, null, mockParameter);
+				expect(mustHideSpy).not.toHaveBeenCalled();
+			});
 		});
 
-		it('calls displayParameter with default displayOptions', () => {
-			vi.spyOn(nodeTypesUtils, 'isAuthRelatedParameter').mockReturnValueOnce(false);
-			mockNodeHelpers();
-			displayParameterSpy.mockReturnValueOnce(true);
-
-			const { shouldDisplayNodeParameter } = useNodeSettingsParameters();
-
-			const nodeParameters = { foo: 'bar' };
-			const node: INodeUi = {
-				id: '1',
-				name: 'Node1',
-				position: [0, 0],
-				typeVersion: 1,
-				type: 'n8n-nodes-base.set',
-				parameters: nodeParameters,
+		describe('auth-related parameter handling', () => {
+			const authParameter: INodeProperties = {
+				name: 'authentication',
+				type: 'options',
+				displayName: 'Authentication',
+				default: 'none',
+				options: [
+					{ name: 'None', value: 'none' },
+					{ name: 'OAuth2', value: 'oauth2' },
+				],
 			};
 
-			const result = shouldDisplayNodeParameter(nodeParameters, node, mockParameter);
+			it('returns false if parameter is auth-related', () => {
+				vi.spyOn(nodeTypesUtils, 'isAuthRelatedParameter').mockReturnValueOnce(true);
+				vi.spyOn(nodeTypesUtils, 'getMainAuthField').mockReturnValueOnce(authParameter);
+				mockNodeHelpers();
 
-			expect(displayParameterSpy).toHaveBeenCalledWith(
-				nodeParameters,
-				mockParameter,
-				'',
-				node,
-				'displayOptions',
-			);
-			expect(result).toBe(true);
+				const { shouldDisplayNodeParameter } = useNodeSettingsParameters();
+
+				const result = shouldDisplayNodeParameter({}, null, mockParameter);
+				expect(result).toBe(false);
+			});
+
+			it('returns false when parameter name matches main auth field name', () => {
+				vi.spyOn(nodeTypesUtils, 'isAuthRelatedParameter').mockReturnValueOnce(false);
+				vi.spyOn(nodeTypesUtils, 'getMainAuthField').mockReturnValueOnce(authParameter);
+				mockNodeHelpers();
+
+				const { shouldDisplayNodeParameter } = useNodeSettingsParameters();
+
+				const result = shouldDisplayNodeParameter(
+					{},
+					{
+						id: '1',
+						name: 'Node1',
+						position: [0, 0],
+						typeVersion: 1,
+						type: 'test',
+						parameters: {},
+					},
+					authParameter,
+				);
+				expect(result).toBe(false);
+			});
+
+			it('shows auth field when node type is in KEEP_AUTH_IN_NDV_FOR_NODES', () => {
+				vi.spyOn(nodeTypesUtils, 'isAuthRelatedParameter').mockReturnValueOnce(true);
+				vi.spyOn(nodeTypesUtils, 'getMainAuthField').mockReturnValueOnce(authParameter);
+				mockNodeHelpers();
+				displayParameterSpy.mockReturnValueOnce(true);
+
+				const { shouldDisplayNodeParameter } = useNodeSettingsParameters();
+
+				const node: INodeUi = {
+					id: '1',
+					name: 'HTTP Request',
+					position: [0, 0],
+					typeVersion: 1,
+					type: HTTP_REQUEST_NODE_TYPE,
+					parameters: {},
+				};
+
+				const result = shouldDisplayNodeParameter({}, node, authParameter);
+				expect(result).toBe(true);
+			});
+
+			it('shows auth field when node type is webhook (in KEEP_AUTH_IN_NDV_FOR_NODES)', () => {
+				vi.spyOn(nodeTypesUtils, 'isAuthRelatedParameter').mockReturnValueOnce(true);
+				vi.spyOn(nodeTypesUtils, 'getMainAuthField').mockReturnValueOnce(authParameter);
+				mockNodeHelpers();
+				displayParameterSpy.mockReturnValueOnce(true);
+
+				const { shouldDisplayNodeParameter } = useNodeSettingsParameters();
+
+				const node: INodeUi = {
+					id: '1',
+					name: 'Webhook',
+					position: [0, 0],
+					typeVersion: 1,
+					type: WEBHOOK_NODE_TYPE,
+					parameters: {},
+				};
+
+				const result = shouldDisplayNodeParameter({}, node, authParameter);
+				expect(result).toBe(true);
+			});
+
+			it('shows parameter when no main auth field exists', () => {
+				vi.spyOn(nodeTypesUtils, 'isAuthRelatedParameter').mockReturnValueOnce(false);
+				vi.spyOn(nodeTypesUtils, 'getMainAuthField').mockReturnValueOnce(null);
+				mockNodeHelpers();
+				displayParameterSpy.mockReturnValueOnce(true);
+
+				const { shouldDisplayNodeParameter } = useNodeSettingsParameters();
+
+				const result = shouldDisplayNodeParameter({}, null, mockParameter);
+				expect(result).toBe(true);
+			});
+
+			it('shows non-auth parameter when main auth field exists', () => {
+				vi.spyOn(nodeTypesUtils, 'isAuthRelatedParameter').mockReturnValueOnce(false);
+				vi.spyOn(nodeTypesUtils, 'getMainAuthField').mockReturnValueOnce(authParameter);
+				mockNodeHelpers();
+				displayParameterSpy.mockReturnValueOnce(true);
+
+				const { shouldDisplayNodeParameter } = useNodeSettingsParameters();
+
+				const node: INodeUi = {
+					id: '1',
+					name: 'Node1',
+					position: [0, 0],
+					typeVersion: 1,
+					type: 'test',
+					parameters: {},
+				};
+
+				const result = shouldDisplayNodeParameter({}, node, mockParameter);
+				expect(result).toBe(true);
+			});
 		});
 
-		it('resolves expressions and calls displayParameter with resolved parameters', () => {
-			vi.spyOn(nodeTypesUtils, 'isAuthRelatedParameter').mockReturnValueOnce(false);
-			mockNodeHelpers();
-			displayParameterSpy.mockReturnValueOnce(true);
-			const originalWorkflowHelpers = workflowHelpers.useWorkflowHelpers();
-			vi.spyOn(workflowHelpers, 'useWorkflowHelpers').mockImplementation(() => ({
-				...originalWorkflowHelpers,
-				resolveExpression: (expr: string) => (expr === '=1+1' ? 2 : expr),
-			}));
-
-			const { shouldDisplayNodeParameter } = useNodeSettingsParameters();
-
-			const nodeParameters = { foo: '=1+1' };
-			const node: INodeUi = {
-				id: '1',
-				name: 'Node1',
-				position: [0, 0],
-				typeVersion: 1,
-				type: 'n8n-nodes-base.set',
-				parameters: nodeParameters,
+		describe('chat trigger availableInChat parameter', () => {
+			const chatTriggerNodeType: INodeTypeDescription = {
+				...mockNodeType,
+				name: CHAT_TRIGGER_NODE_TYPE,
 			};
 
-			const result = shouldDisplayNodeParameter(nodeParameters, node, mockParameter);
+			const availableInChatParameter: INodeProperties = {
+				name: 'availableInChat',
+				type: 'boolean',
+				displayName: 'Available in Chat',
+				default: false,
+			};
 
-			expect(displayParameterSpy).toHaveBeenCalledWith(
-				{ foo: 2 },
-				mockParameter,
-				'',
-				node,
-				'displayOptions',
-			);
+			it('hides availableInChat when chat feature is disabled', () => {
+				nodeTypesStore.getNodeType = vi.fn().mockReturnValue(chatTriggerNodeType);
+				vi.spyOn(nodeTypesUtils, 'isAuthRelatedParameter').mockReturnValueOnce(false);
+				vi.spyOn(nodeTypesUtils, 'getMainAuthField').mockReturnValueOnce(null);
+				mockNodeHelpers();
 
-			expect(displayParameterSpy).toHaveBeenCalled();
-			expect(result).toBe(true);
+				settingsStore.isChatFeatureEnabled = false;
+
+				const { shouldDisplayNodeParameter } = useNodeSettingsParameters();
+
+				const node: INodeUi = {
+					id: '1',
+					name: 'Chat Trigger',
+					position: [0, 0],
+					typeVersion: 1,
+					type: CHAT_TRIGGER_NODE_TYPE,
+					parameters: {},
+				};
+
+				const result = shouldDisplayNodeParameter({}, node, availableInChatParameter);
+				expect(result).toBe(false);
+			});
+
+			it('shows availableInChat when chat feature is enabled', () => {
+				nodeTypesStore.getNodeType = vi.fn().mockReturnValue(chatTriggerNodeType);
+				vi.spyOn(nodeTypesUtils, 'isAuthRelatedParameter').mockReturnValueOnce(false);
+				vi.spyOn(nodeTypesUtils, 'getMainAuthField').mockReturnValueOnce(null);
+				mockNodeHelpers();
+				displayParameterSpy.mockReturnValueOnce(true);
+
+				settingsStore.isChatFeatureEnabled = true;
+
+				const { shouldDisplayNodeParameter } = useNodeSettingsParameters();
+
+				const node: INodeUi = {
+					id: '1',
+					name: 'Chat Trigger',
+					position: [0, 0],
+					typeVersion: 1,
+					type: CHAT_TRIGGER_NODE_TYPE,
+					parameters: {},
+				};
+
+				const result = shouldDisplayNodeParameter({}, node, availableInChatParameter);
+				expect(result).toBe(true);
+			});
+
+			it('does not affect availableInChat on non-chat trigger nodes', () => {
+				vi.spyOn(nodeTypesUtils, 'isAuthRelatedParameter').mockReturnValueOnce(false);
+				vi.spyOn(nodeTypesUtils, 'getMainAuthField').mockReturnValueOnce(null);
+				mockNodeHelpers();
+				displayParameterSpy.mockReturnValueOnce(true);
+
+				settingsStore.isChatFeatureEnabled = false;
+
+				const { shouldDisplayNodeParameter } = useNodeSettingsParameters();
+
+				const node: INodeUi = {
+					id: '1',
+					name: 'Other Node',
+					position: [0, 0],
+					typeVersion: 1,
+					type: 'n8n-nodes-base.other',
+					parameters: {},
+				};
+
+				const result = shouldDisplayNodeParameter({}, node, availableInChatParameter);
+				expect(result).toBe(true);
+			});
+		});
+
+		describe('displayOptions handling', () => {
+			it('returns true if displayOptions is undefined', () => {
+				vi.spyOn(nodeTypesUtils, 'isAuthRelatedParameter').mockReturnValueOnce(false);
+				vi.spyOn(nodeTypesUtils, 'getMainAuthField').mockReturnValueOnce(null);
+				mockNodeHelpers();
+
+				const { shouldDisplayNodeParameter } = useNodeSettingsParameters();
+
+				const result = shouldDisplayNodeParameter({}, null, {
+					...mockParameter,
+					displayOptions: undefined,
+				});
+				expect(result).toBe(true);
+			});
+
+			it('returns true if disabledOptions is undefined when using disabledOptions displayKey', () => {
+				vi.spyOn(nodeTypesUtils, 'isAuthRelatedParameter').mockReturnValueOnce(false);
+				vi.spyOn(nodeTypesUtils, 'getMainAuthField').mockReturnValueOnce(null);
+				mockNodeHelpers();
+
+				const { shouldDisplayNodeParameter } = useNodeSettingsParameters();
+
+				const parameterWithoutDisabledOptions: INodeProperties = {
+					...mockParameter,
+					displayOptions: { show: { resource: ['user'] } },
+				};
+
+				const result = shouldDisplayNodeParameter(
+					{},
+					null,
+					parameterWithoutDisabledOptions,
+					'',
+					'disabledOptions',
+				);
+				expect(result).toBe(true);
+			});
+		});
+
+		describe('path parameter handling', () => {
+			it('gets rawValues from path when path is provided', () => {
+				vi.spyOn(nodeTypesUtils, 'isAuthRelatedParameter').mockReturnValueOnce(false);
+				vi.spyOn(nodeTypesUtils, 'getMainAuthField').mockReturnValueOnce(null);
+				mockNodeHelpers();
+				displayParameterSpy.mockReturnValueOnce(true);
+
+				const { shouldDisplayNodeParameter } = useNodeSettingsParameters();
+
+				const nodeParameters = {
+					nested: {
+						foo: 'bar',
+					},
+				};
+				const node: INodeUi = {
+					id: '1',
+					name: 'Node1',
+					position: [0, 0],
+					typeVersion: 1,
+					type: 'n8n-nodes-base.set',
+					parameters: nodeParameters,
+				};
+
+				const result = shouldDisplayNodeParameter(nodeParameters, node, mockParameter, 'nested');
+
+				expect(displayParameterSpy).toHaveBeenCalledWith(
+					nodeParameters,
+					mockParameter,
+					'nested',
+					node,
+					'displayOptions',
+				);
+				expect(result).toBe(true);
+			});
+
+			it('returns false when rawValues at path is null', () => {
+				vi.spyOn(nodeTypesUtils, 'isAuthRelatedParameter').mockReturnValueOnce(false);
+				vi.spyOn(nodeTypesUtils, 'getMainAuthField').mockReturnValueOnce(null);
+				mockNodeHelpers();
+
+				const { shouldDisplayNodeParameter } = useNodeSettingsParameters();
+
+				const nodeParameters = {
+					nested: null,
+				};
+				const node: INodeUi = {
+					id: '1',
+					name: 'Node1',
+					position: [0, 0],
+					typeVersion: 1,
+					type: 'n8n-nodes-base.set',
+					parameters: nodeParameters,
+				};
+
+				const result = shouldDisplayNodeParameter(
+					nodeParameters as unknown as Record<string, string>,
+					node,
+					mockParameter,
+					'nested',
+				);
+				expect(result).toBe(false);
+			});
+
+			it('returns false when rawValues at path is undefined', () => {
+				vi.spyOn(nodeTypesUtils, 'isAuthRelatedParameter').mockReturnValueOnce(false);
+				vi.spyOn(nodeTypesUtils, 'getMainAuthField').mockReturnValueOnce(null);
+				mockNodeHelpers();
+
+				const { shouldDisplayNodeParameter } = useNodeSettingsParameters();
+
+				const nodeParameters = {};
+				const node: INodeUi = {
+					id: '1',
+					name: 'Node1',
+					position: [0, 0],
+					typeVersion: 1,
+					type: 'n8n-nodes-base.set',
+					parameters: nodeParameters,
+				};
+
+				const result = shouldDisplayNodeParameter(
+					nodeParameters,
+					node,
+					mockParameter,
+					'nonexistent.path',
+				);
+				expect(result).toBe(false);
+			});
+		});
+
+		describe('expression resolution', () => {
+			it('resolves expressions and calls displayParameter with resolved parameters', () => {
+				vi.spyOn(nodeTypesUtils, 'isAuthRelatedParameter').mockReturnValueOnce(false);
+				vi.spyOn(nodeTypesUtils, 'getMainAuthField').mockReturnValueOnce(null);
+				mockNodeHelpers();
+				displayParameterSpy.mockReturnValueOnce(true);
+				const originalWorkflowHelpers = workflowHelpers.useWorkflowHelpers();
+				vi.spyOn(workflowHelpers, 'useWorkflowHelpers').mockImplementation(() => ({
+					...originalWorkflowHelpers,
+					resolveExpression: (expr: string) => (expr === '=1+1' ? 2 : expr),
+				}));
+
+				const { shouldDisplayNodeParameter } = useNodeSettingsParameters();
+
+				const nodeParameters = { foo: '=1+1' };
+				const node: INodeUi = {
+					id: '1',
+					name: 'Node1',
+					position: [0, 0],
+					typeVersion: 1,
+					type: 'n8n-nodes-base.set',
+					parameters: nodeParameters,
+				};
+
+				const result = shouldDisplayNodeParameter(nodeParameters, node, mockParameter);
+
+				expect(displayParameterSpy).toHaveBeenCalledWith(
+					{ foo: 2 },
+					mockParameter,
+					'',
+					node,
+					'displayOptions',
+				);
+
+				expect(displayParameterSpy).toHaveBeenCalled();
+				expect(result).toBe(true);
+			});
+
+			it('defers resolution when expression references missing parameter with $parameter', () => {
+				vi.spyOn(nodeTypesUtils, 'isAuthRelatedParameter').mockReturnValueOnce(false);
+				vi.spyOn(nodeTypesUtils, 'getMainAuthField').mockReturnValueOnce(null);
+				mockNodeHelpers();
+				displayParameterSpy.mockReturnValueOnce(true);
+
+				const resolveExpressionSpy = vi.fn();
+				const originalWorkflowHelpers = workflowHelpers.useWorkflowHelpers();
+				vi.spyOn(workflowHelpers, 'useWorkflowHelpers').mockImplementation(() => ({
+					...originalWorkflowHelpers,
+					resolveExpression: resolveExpressionSpy,
+				}));
+
+				const { shouldDisplayNodeParameter } = useNodeSettingsParameters();
+
+				const nodeParameters = {
+					first: '={{ $parameter.second }}',
+					second: 'value',
+				};
+				const node: INodeUi = {
+					id: '1',
+					name: 'Node1',
+					position: [0, 0],
+					typeVersion: 1,
+					type: 'n8n-nodes-base.set',
+					parameters: nodeParameters,
+				};
+
+				shouldDisplayNodeParameter(nodeParameters, node, mockParameter);
+
+				// The expression with $parameter.second should be deferred until 'second' is processed
+				// So resolveExpression should still be called eventually
+				expect(displayParameterSpy).toHaveBeenCalled();
+			});
+
+			it('handles mutually dependent expressions (circular dependency)', () => {
+				vi.spyOn(nodeTypesUtils, 'isAuthRelatedParameter').mockReturnValueOnce(false);
+				vi.spyOn(nodeTypesUtils, 'getMainAuthField').mockReturnValueOnce(null);
+				mockNodeHelpers();
+				displayParameterSpy.mockReturnValueOnce(true);
+
+				// Track resolution order to detect any bugs:
+				const resolutionOrder: string[] = [];
+				const originalWorkflowHelpers = workflowHelpers.useWorkflowHelpers();
+				vi.spyOn(workflowHelpers, 'useWorkflowHelpers').mockImplementation(() => ({
+					...originalWorkflowHelpers,
+					resolveExpression: (expr: string, siblingParameters: INodeParameters = {}) => {
+						if (expr === '={{ $parameter.second }}') {
+							resolutionOrder.push('first');
+							return (siblingParameters.second as string) ?? 'unresolved_second';
+						}
+						if (expr === '={{ $parameter.first }}') {
+							resolutionOrder.push('second');
+							return (siblingParameters.first as string) ?? 'unresolved_first';
+						}
+						return 'resolved';
+					},
+				}));
+
+				const { shouldDisplayNodeParameter } = useNodeSettingsParameters();
+
+				// Both expressions reference each other - circular dependency
+				// Object.keys() returns ['first', 'second'] in insertion order
+				const nodeParameters = {
+					first: '={{ $parameter.second }}',
+					second: '={{ $parameter.first }}',
+				};
+				const node: INodeUi = {
+					id: '1',
+					name: 'Node1',
+					position: [0, 0],
+					typeVersion: 1,
+					type: 'n8n-nodes-base.set',
+					parameters: nodeParameters,
+				};
+
+				shouldDisplayNodeParameter(nodeParameters, node, mockParameter);
+
+				// Both should be resolved
+				expect(resolutionOrder).toContain('first');
+				expect(resolutionOrder).toContain('second');
+
+				// With circular deps, the original code would keep deferring both until safety limit,
+				// then resolve them. Our refactored code should defer both, then resolve in order.
+				expect(resolutionOrder[0]).toBe('first');
+			});
+
+			it('handles chained expression dependencies (a depends on b, b depends on c)', () => {
+				vi.spyOn(nodeTypesUtils, 'isAuthRelatedParameter').mockReturnValueOnce(false);
+				vi.spyOn(nodeTypesUtils, 'getMainAuthField').mockReturnValueOnce(null);
+				mockNodeHelpers();
+				displayParameterSpy.mockReturnValueOnce(true);
+
+				// Track resolution order to verify dependencies are resolved correctly
+				const resolutionOrder: string[] = [];
+				const originalWorkflowHelpers = workflowHelpers.useWorkflowHelpers();
+				vi.spyOn(workflowHelpers, 'useWorkflowHelpers').mockImplementation(() => ({
+					...originalWorkflowHelpers,
+					resolveExpression: (expr: string, siblingParameters: INodeParameters = {}) => {
+						if (expr === '={{ $parameter.second }}') {
+							resolutionOrder.push('first');
+							// If second wasn't resolved yet, this would return 'unresolved'
+							return (siblingParameters.second as string) ?? 'unresolved';
+						}
+						if (expr === '={{ $parameter.third }}') {
+							resolutionOrder.push('second');
+							// If third wasn't resolved yet, this would return 'unresolved'
+							return (siblingParameters.third as string) ?? 'unresolved';
+						}
+						if (expr === '=base') {
+							resolutionOrder.push('third');
+							return 'base_value';
+						}
+						return expr;
+					},
+				}));
+
+				const { shouldDisplayNodeParameter } = useNodeSettingsParameters();
+
+				// Chained: first -> second -> third (which is a plain expression)
+				const nodeParameters = {
+					first: '={{ $parameter.second }}',
+					second: '={{ $parameter.third }}',
+					third: '=base',
+				};
+				const node: INodeUi = {
+					id: '1',
+					name: 'Node1',
+					position: [0, 0],
+					typeVersion: 1,
+					type: 'n8n-nodes-base.set',
+					parameters: nodeParameters,
+				};
+
+				shouldDisplayNodeParameter(nodeParameters, node, mockParameter);
+
+				// Should resolve in correct order: third -> second -> first
+				// This ensures dependencies are resolved before dependents
+				expect(resolutionOrder).toEqual(['third', 'second', 'first']);
+
+				expect(displayParameterSpy).toHaveBeenCalledWith(
+					expect.objectContaining({
+						third: 'base_value',
+						second: 'base_value',
+						first: 'base_value',
+					}),
+					mockParameter,
+					'',
+					node,
+					'displayOptions',
+				);
+			});
+
+			it('sets empty string when expression resolution throws error', () => {
+				vi.spyOn(nodeTypesUtils, 'isAuthRelatedParameter').mockReturnValueOnce(false);
+				vi.spyOn(nodeTypesUtils, 'getMainAuthField').mockReturnValueOnce(null);
+				mockNodeHelpers();
+				displayParameterSpy.mockReturnValueOnce(true);
+				const originalWorkflowHelpers = workflowHelpers.useWorkflowHelpers();
+				vi.spyOn(workflowHelpers, 'useWorkflowHelpers').mockImplementation(() => ({
+					...originalWorkflowHelpers,
+					resolveExpression: () => {
+						throw new Error('Invalid expression');
+					},
+				}));
+
+				const { shouldDisplayNodeParameter } = useNodeSettingsParameters();
+
+				const nodeParameters = { foo: '=invalid{{expression' };
+				const node: INodeUi = {
+					id: '1',
+					name: 'Node1',
+					position: [0, 0],
+					typeVersion: 1,
+					type: 'n8n-nodes-base.set',
+					parameters: nodeParameters,
+				};
+
+				const result = shouldDisplayNodeParameter(nodeParameters, node, mockParameter);
+
+				expect(displayParameterSpy).toHaveBeenCalledWith(
+					{ foo: '' },
+					mockParameter,
+					'',
+					node,
+					'displayOptions',
+				);
+				expect(result).toBe(true);
+			});
+
+			it('handles non-expression values without resolving', () => {
+				vi.spyOn(nodeTypesUtils, 'isAuthRelatedParameter').mockReturnValueOnce(false);
+				vi.spyOn(nodeTypesUtils, 'getMainAuthField').mockReturnValueOnce(null);
+				mockNodeHelpers();
+				displayParameterSpy.mockReturnValueOnce(true);
+				const resolveExpressionSpy = vi.fn();
+				const originalWorkflowHelpers = workflowHelpers.useWorkflowHelpers();
+				vi.spyOn(workflowHelpers, 'useWorkflowHelpers').mockImplementation(() => ({
+					...originalWorkflowHelpers,
+					resolveExpression: resolveExpressionSpy,
+				}));
+
+				const { shouldDisplayNodeParameter } = useNodeSettingsParameters();
+
+				const nodeParameters = { foo: 'plain value' };
+				const node: INodeUi = {
+					id: '1',
+					name: 'Node1',
+					position: [0, 0],
+					typeVersion: 1,
+					type: 'n8n-nodes-base.set',
+					parameters: nodeParameters,
+				};
+
+				shouldDisplayNodeParameter(nodeParameters, node, mockParameter);
+
+				expect(resolveExpressionSpy).not.toHaveBeenCalled();
+				expect(displayParameterSpy).toHaveBeenCalledWith(
+					nodeParameters,
+					mockParameter,
+					'',
+					node,
+					'displayOptions',
+				);
+			});
+
+			it('resolves expressions with path and calls displayParameter with deepCopy', () => {
+				vi.spyOn(nodeTypesUtils, 'isAuthRelatedParameter').mockReturnValueOnce(false);
+				vi.spyOn(nodeTypesUtils, 'getMainAuthField').mockReturnValueOnce(null);
+				mockNodeHelpers();
+				displayParameterSpy.mockReturnValueOnce(true);
+				const originalWorkflowHelpers = workflowHelpers.useWorkflowHelpers();
+				vi.spyOn(workflowHelpers, 'useWorkflowHelpers').mockImplementation(() => ({
+					...originalWorkflowHelpers,
+					resolveExpression: (expr: string) => (expr === '=resolved' ? 'resolved_value' : expr),
+				}));
+
+				const { shouldDisplayNodeParameter } = useNodeSettingsParameters();
+
+				const nodeParameters = {
+					nested: {
+						foo: '=resolved',
+					},
+				};
+				const node: INodeUi = {
+					id: '1',
+					name: 'Node1',
+					position: [0, 0],
+					typeVersion: 1,
+					type: 'n8n-nodes-base.set',
+					parameters: nodeParameters,
+				};
+
+				const result = shouldDisplayNodeParameter(nodeParameters, node, mockParameter, 'nested');
+
+				// When path is provided and expressions are resolved, it should deepCopy and set the resolved values
+				expect(displayParameterSpy).toHaveBeenCalledWith(
+					expect.objectContaining({
+						nested: { foo: 'resolved_value' },
+					}),
+					mockParameter,
+					'nested',
+					node,
+					'displayOptions',
+				);
+				expect(result).toBe(true);
+			});
+
+			it('handles mixed expression and non-expression values', () => {
+				vi.spyOn(nodeTypesUtils, 'isAuthRelatedParameter').mockReturnValueOnce(false);
+				vi.spyOn(nodeTypesUtils, 'getMainAuthField').mockReturnValueOnce(null);
+				mockNodeHelpers();
+				displayParameterSpy.mockReturnValueOnce(true);
+				const originalWorkflowHelpers = workflowHelpers.useWorkflowHelpers();
+				vi.spyOn(workflowHelpers, 'useWorkflowHelpers').mockImplementation(() => ({
+					...originalWorkflowHelpers,
+					resolveExpression: () => 'resolved',
+				}));
+
+				const { shouldDisplayNodeParameter } = useNodeSettingsParameters();
+
+				const nodeParameters = {
+					expr: '=expression',
+					plain: 'plain value',
+					number: 42,
+				};
+				const node: INodeUi = {
+					id: '1',
+					name: 'Node1',
+					position: [0, 0],
+					typeVersion: 1,
+					type: 'n8n-nodes-base.set',
+					parameters: nodeParameters,
+				};
+
+				shouldDisplayNodeParameter(nodeParameters, node, mockParameter);
+
+				expect(displayParameterSpy).toHaveBeenCalledWith(
+					{ expr: 'resolved', plain: 'plain value', number: 42 },
+					mockParameter,
+					'',
+					node,
+					'displayOptions',
+				);
+			});
+		});
+
+		describe('displayParameter delegation', () => {
+			it('calls displayParameter with correct arguments', () => {
+				vi.spyOn(nodeTypesUtils, 'isAuthRelatedParameter').mockReturnValueOnce(false);
+				vi.spyOn(nodeTypesUtils, 'getMainAuthField').mockReturnValueOnce(null);
+				mockNodeHelpers();
+				displayParameterSpy.mockReturnValueOnce(false);
+
+				const { shouldDisplayNodeParameter } = useNodeSettingsParameters();
+
+				const parameter: INodeProperties = {
+					name: 'foo',
+					type: 'string',
+					displayName: 'Foo',
+					disabledOptions: {},
+					default: '',
+				};
+				const nodeParameters = { foo: 'bar' };
+				const node: INodeUi = {
+					id: '1',
+					name: 'Node1',
+					position: [0, 0],
+					typeVersion: 1,
+					type: 'n8n-nodes-base.set',
+					parameters: nodeParameters,
+				};
+
+				const result = shouldDisplayNodeParameter(
+					nodeParameters,
+					node,
+					parameter,
+					'',
+					'disabledOptions',
+				);
+
+				expect(displayParameterSpy).toHaveBeenCalledWith(
+					nodeParameters,
+					parameter,
+					'',
+					node,
+					'disabledOptions',
+				);
+				expect(result).toBe(false);
+			});
+
+			it('calls displayParameter with default displayOptions', () => {
+				vi.spyOn(nodeTypesUtils, 'isAuthRelatedParameter').mockReturnValueOnce(false);
+				vi.spyOn(nodeTypesUtils, 'getMainAuthField').mockReturnValueOnce(null);
+				mockNodeHelpers();
+				displayParameterSpy.mockReturnValueOnce(true);
+
+				const { shouldDisplayNodeParameter } = useNodeSettingsParameters();
+
+				const nodeParameters = { foo: 'bar' };
+				const node: INodeUi = {
+					id: '1',
+					name: 'Node1',
+					position: [0, 0],
+					typeVersion: 1,
+					type: 'n8n-nodes-base.set',
+					parameters: nodeParameters,
+				};
+
+				const result = shouldDisplayNodeParameter(nodeParameters, node, mockParameter);
+
+				expect(displayParameterSpy).toHaveBeenCalledWith(
+					nodeParameters,
+					mockParameter,
+					'',
+					node,
+					'displayOptions',
+				);
+				expect(result).toBe(true);
+			});
+
+			it('returns the result from displayParameter', () => {
+				vi.spyOn(nodeTypesUtils, 'isAuthRelatedParameter').mockReturnValueOnce(false);
+				vi.spyOn(nodeTypesUtils, 'getMainAuthField').mockReturnValueOnce(null);
+				mockNodeHelpers();
+				displayParameterSpy.mockReturnValueOnce(false);
+
+				const { shouldDisplayNodeParameter } = useNodeSettingsParameters();
+
+				const nodeParameters = { foo: 'bar' };
+				const node: INodeUi = {
+					id: '1',
+					name: 'Node1',
+					position: [0, 0],
+					typeVersion: 1,
+					type: 'n8n-nodes-base.set',
+					parameters: nodeParameters,
+				};
+
+				const result = shouldDisplayNodeParameter(nodeParameters, node, mockParameter);
+				expect(result).toBe(false);
+
+				displayParameterSpy.mockReturnValueOnce(true);
+				vi.spyOn(nodeTypesUtils, 'isAuthRelatedParameter').mockReturnValueOnce(false);
+				vi.spyOn(nodeTypesUtils, 'getMainAuthField').mockReturnValueOnce(null);
+
+				const result2 = shouldDisplayNodeParameter(nodeParameters, node, mockParameter);
+				expect(result2).toBe(true);
+			});
+		});
+
+		describe('edge cases', () => {
+			it('handles null node parameter', () => {
+				vi.spyOn(nodeTypesUtils, 'isAuthRelatedParameter').mockReturnValueOnce(false);
+				vi.spyOn(nodeTypesUtils, 'getMainAuthField').mockReturnValueOnce(null);
+				mockNodeHelpers();
+				displayParameterSpy.mockReturnValueOnce(true);
+
+				const { shouldDisplayNodeParameter } = useNodeSettingsParameters();
+
+				const result = shouldDisplayNodeParameter({ foo: 'bar' }, null, mockParameter);
+				expect(result).toBe(true);
+			});
+
+			it('handles empty nodeParameters', () => {
+				vi.spyOn(nodeTypesUtils, 'isAuthRelatedParameter').mockReturnValueOnce(false);
+				vi.spyOn(nodeTypesUtils, 'getMainAuthField').mockReturnValueOnce(null);
+				mockNodeHelpers();
+				displayParameterSpy.mockReturnValueOnce(true);
+
+				const { shouldDisplayNodeParameter } = useNodeSettingsParameters();
+
+				const node: INodeUi = {
+					id: '1',
+					name: 'Node1',
+					position: [0, 0],
+					typeVersion: 1,
+					type: 'n8n-nodes-base.set',
+					parameters: {},
+				};
+
+				const result = shouldDisplayNodeParameter({}, node, mockParameter);
+				expect(result).toBe(true);
+			});
+
+			it('handles undefined path parameter (uses empty string default)', () => {
+				vi.spyOn(nodeTypesUtils, 'isAuthRelatedParameter').mockReturnValueOnce(false);
+				vi.spyOn(nodeTypesUtils, 'getMainAuthField').mockReturnValueOnce(null);
+				mockNodeHelpers();
+				displayParameterSpy.mockReturnValueOnce(true);
+
+				const { shouldDisplayNodeParameter } = useNodeSettingsParameters();
+
+				const nodeParameters = { foo: 'bar' };
+				const node: INodeUi = {
+					id: '1',
+					name: 'Node1',
+					position: [0, 0],
+					typeVersion: 1,
+					type: 'n8n-nodes-base.set',
+					parameters: nodeParameters,
+				};
+
+				// Call without path parameter (uses default empty string)
+				const result = shouldDisplayNodeParameter(nodeParameters, node, mockParameter);
+
+				expect(displayParameterSpy).toHaveBeenCalledWith(
+					nodeParameters,
+					mockParameter,
+					'',
+					node,
+					'displayOptions',
+				);
+				expect(result).toBe(true);
+			});
+
+			it('handles non-string values in nodeParameters', () => {
+				vi.spyOn(nodeTypesUtils, 'isAuthRelatedParameter').mockReturnValueOnce(false);
+				vi.spyOn(nodeTypesUtils, 'getMainAuthField').mockReturnValueOnce(null);
+				mockNodeHelpers();
+				displayParameterSpy.mockReturnValueOnce(true);
+
+				const { shouldDisplayNodeParameter } = useNodeSettingsParameters();
+
+				const nodeParameters = {
+					stringVal: 'test',
+					numberVal: 123,
+					boolVal: true,
+					arrayVal: [1, 2, 3],
+					objectVal: { nested: 'value' },
+				};
+				const node: INodeUi = {
+					id: '1',
+					name: 'Node1',
+					position: [0, 0],
+					typeVersion: 1,
+					type: 'n8n-nodes-base.set',
+					parameters: nodeParameters,
+				};
+
+				const result = shouldDisplayNodeParameter(
+					nodeParameters as unknown as Record<string, string>,
+					node,
+					mockParameter,
+				);
+
+				expect(displayParameterSpy).toHaveBeenCalledWith(
+					nodeParameters,
+					mockParameter,
+					'',
+					node,
+					'displayOptions',
+				);
+				expect(result).toBe(true);
+			});
+
+			it('handles deeply nested paths', () => {
+				vi.spyOn(nodeTypesUtils, 'isAuthRelatedParameter').mockReturnValueOnce(false);
+				vi.spyOn(nodeTypesUtils, 'getMainAuthField').mockReturnValueOnce(null);
+				mockNodeHelpers();
+				displayParameterSpy.mockReturnValueOnce(true);
+
+				const { shouldDisplayNodeParameter } = useNodeSettingsParameters();
+
+				const nodeParameters = {
+					level1: {
+						level2: {
+							level3: {
+								foo: 'bar',
+							},
+						},
+					},
+				};
+				const node: INodeUi = {
+					id: '1',
+					name: 'Node1',
+					position: [0, 0],
+					typeVersion: 1,
+					type: 'n8n-nodes-base.set',
+					parameters: nodeParameters,
+				};
+
+				const result = shouldDisplayNodeParameter(
+					nodeParameters,
+					node,
+					mockParameter,
+					'level1.level2.level3',
+				);
+
+				expect(displayParameterSpy).toHaveBeenCalledWith(
+					nodeParameters,
+					mockParameter,
+					'level1.level2.level3',
+					node,
+					'displayOptions',
+				);
+				expect(result).toBe(true);
+			});
 		});
 	});
 });
diff --git a/packages/frontend/editor-ui/src/features/ndv/settings/composables/useNodeSettingsParameters.ts b/packages/frontend/editor-ui/src/features/ndv/settings/composables/useNodeSettingsParameters.ts
index 1c524fbaa44..2cf26f229b3 100644
--- a/packages/frontend/editor-ui/src/features/ndv/settings/composables/useNodeSettingsParameters.ts
+++ b/packages/frontend/editor-ui/src/features/ndv/settings/composables/useNodeSettingsParameters.ts
@@ -172,10 +172,15 @@ export function useNodeSettingsParameters() {
 		path: string | undefined = '',
 		displayKey: 'displayOptions' | 'disabledOptions' = 'displayOptions',
 	): boolean {
+		// Fast path: hidden parameters are never displayed
 		if (parameter.type === 'hidden') {
 			return false;
 		}
 
+		// Fast path: if no display/disabled options defined, no need for further checks
+		const hasDisplayOptions = parameter[displayKey] !== undefined;
+
+		// Check custom API call - only compute if needed
 		if (
 			nodeHelpers.isCustomApiCallSelected(nodeParameters) &&
 			mustHideDuringCustomApiCall(parameter, nodeParameters)
@@ -183,98 +188,187 @@ export function useNodeSettingsParameters() {
 			return false;
 		}
 
-		const nodeType = !node ? null : nodeTypesStore.getNodeType(node.type, node.typeVersion);
+		// Cache node type lookup - used multiple times
+		const nodeType = node ? nodeTypesStore.getNodeType(node.type, node.typeVersion) : null;
+		const nodeTypeValue = node?.type ?? '';
 
-		// TODO: For now, hide all fields that are used in authentication fields displayOptions
-		// Ideally, we should check if any non-auth field depends on it before hiding it but
-		// since there is no such case, omitting it to avoid additional computation
-		const shouldHideAuthRelatedParameter = isAuthRelatedParameter(
-			getNodeAuthFields(nodeType),
-			parameter,
-		);
+		// Auth-related parameter handling - only compute if not in KEEP_AUTH_IN_NDV_FOR_NODES
+		if (!KEEP_AUTH_IN_NDV_FOR_NODES.includes(nodeTypeValue)) {
+			const mainNodeAuthField = getMainAuthField(nodeType);
 
-		const mainNodeAuthField = getMainAuthField(nodeType);
+			if (mainNodeAuthField) {
+				// Check if parameter is the main auth field itself
+				if (parameter.name === mainNodeAuthField.name) {
+					return false;
+				}
 
-		// Hide authentication related fields since it will now be part of credentials modal
-		if (
-			!KEEP_AUTH_IN_NDV_FOR_NODES.includes(node?.type ?? '') &&
-			mainNodeAuthField &&
-			(parameter.name === mainNodeAuthField.name || shouldHideAuthRelatedParameter)
-		) {
-			return false;
+				// Only compute auth fields if we have a main auth field
+				// TODO: For now, hide all fields that are used in authentication fields displayOptions
+				// Ideally, we should check if any non-auth field depends on it before hiding it but
+				// since there is no such case, omitting it to avoid additional computation
+				if (isAuthRelatedParameter(getNodeAuthFields(nodeType), parameter)) {
+					return false;
+				}
+			}
 		}
 
 		// Hide chat hub toggle on chat trigger when module isn't enabled.
 		// Remove this check when feature is generally available.
-		if (nodeType?.name === CHAT_TRIGGER_NODE_TYPE && parameter.name === 'availableInChat') {
-			if (!settingsStore.isChatFeatureEnabled) {
-				return false;
-			}
+		if (
+			nodeType?.name === CHAT_TRIGGER_NODE_TYPE &&
+			parameter.name === 'availableInChat' &&
+			!settingsStore.isChatFeatureEnabled
+		) {
+			return false;
 		}
 
-		if (parameter[displayKey] === undefined) {
-			// If it is not defined no need to do a proper check
+		// Fast path: no display options means parameter should be displayed
+		if (!hasDisplayOptions) {
 			return true;
 		}
 
-		const nodeParams: INodeParameters = {};
-		let rawValues = nodeParameters;
-		if (path) {
-			rawValues = get(nodeParameters, path) as INodeParameters;
-		}
+		// Get raw values at path
+		const rawValues = path ? (get(nodeParameters, path) as INodeParameters) : nodeParameters;
 
 		if (!rawValues) {
 			return false;
 		}
-		// Resolve expressions
-		const resolveKeys = Object.keys(rawValues);
-		let key: string;
-		let i = 0;
-		let parameterGotResolved = false;
-		do {
-			key = resolveKeys.shift() as string;
-			const value = rawValues[key];
-			if (typeof value === 'string' && value?.charAt(0) === '=') {
-				// Contains an expression that
-				if (
-					value.includes('$parameter') &&
-					resolveKeys.some((parameterName) => value.includes(parameterName))
-				) {
-					// Contains probably an expression of a missing parameter so skip
-					resolveKeys.push(key);
-					continue;
-				} else {
-					// Contains probably no expression with a missing parameter so resolve
-					try {
-						nodeParams[key] = workflowHelpers.resolveExpression(
-							value,
-							nodeParams,
-						) as NodeParameterValue;
-					} catch {
-						// If expression is invalid ignore
-						nodeParams[key] = '';
-					}
-					parameterGotResolved = true;
-				}
-			} else {
-				// Does not contain an expression, add directly
-				nodeParams[key] = rawValues[key];
-			}
-			// TODO: Think about how to calculate this best
-			if (i++ > 50) {
-				// Make sure we do not get caught
+
+		// Check if any expressions need resolution
+		const keys = Object.keys(rawValues);
+		const keyCount = keys.length;
+
+		// Fast path: no keys means nothing to resolve
+		if (keyCount === 0) {
+			return nodeHelpers.displayParameter(nodeParameters, parameter, path, node, displayKey);
+		}
+
+		// Check if we have any expressions to resolve (scan first to avoid unnecessary work)
+		let hasExpressions = false;
+		for (let i = 0; i < keyCount; i++) {
+			const value = rawValues[keys[i]];
+			if (typeof value === 'string' && value.charAt(0) === '=') {
+				hasExpressions = true;
 				break;
 			}
-		} while (resolveKeys.length !== 0);
+		}
+
+		// Fast path: no expressions means we can use original parameters directly
+		if (!hasExpressions) {
+			return nodeHelpers.displayParameter(nodeParameters, parameter, path, node, displayKey);
+		}
+
+		// Resolve expressions - use index-based iteration for better performance
+		const nodeParams: INodeParameters = {};
+		const pendingKeys: string[] = [];
+		let parameterGotResolved = false;
+
+		// First pass: resolve non-dependent expressions and collect plain values
+		for (let i = 0; i < keyCount; i++) {
+			const key = keys[i];
+			const value = rawValues[key];
+
+			if (typeof value === 'string' && value.charCodeAt(0) === 61) {
+				// 61 is '='
+				// Check if expression depends on other parameters that haven't been resolved yet
+				if (value.includes('$parameter')) {
+					// Check if any remaining key is referenced in this expression
+					let hasDependency = false;
+					for (let j = i + 1; j < keyCount; j++) {
+						if (value.includes(keys[j])) {
+							hasDependency = true;
+							break;
+						}
+					}
+					// Also check already-deferred keys in pendingKeys
+					if (!hasDependency) {
+						for (let j = 0; j < pendingKeys.length; j++) {
+							if (value.includes(pendingKeys[j])) {
+								hasDependency = true;
+								break;
+							}
+						}
+					}
+					if (hasDependency) {
+						pendingKeys.push(key);
+						continue;
+					}
+				}
+
+				// Resolve expression
+				try {
+					nodeParams[key] = workflowHelpers.resolveExpression(
+						value,
+						nodeParams,
+					) as NodeParameterValue;
+				} catch {
+					nodeParams[key] = '';
+				}
+				parameterGotResolved = true;
+			} else {
+				nodeParams[key] = rawValues[key];
+			}
+		}
+
+		// Second pass: resolve pending expressions (those with dependencies)
+		// Use index-based iteration to avoid shift() which is O(n)
+		const maxIterations = pendingKeys.length * 2; // Safety limit
+		let iterations = 0;
+		let pendingIndex = 0;
+		while (pendingIndex < pendingKeys.length && iterations < maxIterations) {
+			iterations++;
+			const key = pendingKeys[pendingIndex];
+			const value = rawValues[key] as string;
+
+			// Check if dependencies are now resolved (only check remaining items)
+			let hasDependency = false;
+			for (let j = pendingIndex + 1; j < pendingKeys.length; j++) {
+				if (value.includes(pendingKeys[j])) {
+					hasDependency = true;
+					break;
+				}
+			}
+
+			if (hasDependency) {
+				// Move to next, will revisit this key in remaining unresolved keys
+				pendingKeys.push(key);
+				pendingIndex++;
+				continue;
+			}
+
+			try {
+				nodeParams[key] = workflowHelpers.resolveExpression(
+					value,
+					nodeParams,
+				) as NodeParameterValue;
+			} catch {
+				nodeParams[key] = '';
+			}
+			parameterGotResolved = true;
+			pendingIndex++;
+		}
+
+		// Handle any remaining unresolved keys (circular dependencies or safety limit)
+		for (let i = pendingIndex; i < pendingKeys.length; i++) {
+			const key = pendingKeys[i];
+			try {
+				nodeParams[key] = workflowHelpers.resolveExpression(
+					rawValues[key] as string,
+					nodeParams,
+				) as NodeParameterValue;
+			} catch {
+				nodeParams[key] = '';
+			}
+			parameterGotResolved = true;
+		}
 
 		if (parameterGotResolved) {
 			if (path) {
-				rawValues = deepCopy(nodeParameters);
-				set(rawValues, path, nodeParams);
-				return nodeHelpers.displayParameter(rawValues, parameter, path, node, displayKey);
-			} else {
-				return nodeHelpers.displayParameter(nodeParams, parameter, '', node, displayKey);
+				const resolvedValues = deepCopy(nodeParameters);
+				set(resolvedValues, path, nodeParams);
+				return nodeHelpers.displayParameter(resolvedValues, parameter, path, node, displayKey);
 			}
+			return nodeHelpers.displayParameter(nodeParams, parameter, '', node, displayKey);
 		}
 
 		return nodeHelpers.displayParameter(nodeParameters, parameter, path, node, displayKey);

From 83e65cfb212070186e0bf804dae1a29d79934c97 Mon Sep 17 00:00:00 2001
From: Robert Squires <robtf9@icloud.com>
Date: Wed, 3 Dec 2025 11:40:26 +0000
Subject: [PATCH 028/167] fix(editor): Data table color adjustments
 (no-changelog) (#22642)

---
 .../core/dataTable/components/dataGrid/DataTableTable.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/frontend/editor-ui/src/features/core/dataTable/components/dataGrid/DataTableTable.vue b/packages/frontend/editor-ui/src/features/core/dataTable/components/dataGrid/DataTableTable.vue
index 47e24794d8a..286696137ba 100644
--- a/packages/frontend/editor-ui/src/features/core/dataTable/components/dataGrid/DataTableTable.vue
+++ b/packages/frontend/editor-ui/src/features/core/dataTable/components/dataGrid/DataTableTable.vue
@@ -224,7 +224,7 @@ defineExpose({
 	--ag-cell-text-color: var(--color--text--shade-1);
 	--ag-accent-color: var(--color--purple-600);
 	--ag-row-hover-color: var(--color--background--light-1);
-	--ag-background-color: var(--color--background--light-3);
+	--ag-background-color: var(--color--background--light-2);
 	--ag-border-color: var(--border-color);
 	--ag-border-radius: var(--radius);
 	--ag-wrapper-border-radius: 0;
@@ -232,7 +232,7 @@ defineExpose({
 	--ag-font-size: var(--font-size--xs);
 	--ag-font-color: var(--color--text);
 	--ag-row-height: calc(var(--ag-grid-size) * 0.8 + 32px);
-	--ag-header-background-color: var(--color--background--light-1);
+	--ag-header-background-color: var(--color--foreground--tint-1);
 	--ag-header-font-size: var(--font-size--xs);
 	--ag-header-font-weight: var(--font-weight--medium);
 	--ag-header-foreground-color: var(--color--text--shade-1);
@@ -241,7 +241,7 @@ defineExpose({
 	--ag-header-column-border-height: 100%;
 	--ag-range-selection-border-color: var(--color--purple-600);
 	--ag-input-padding-start: var(--spacing--2xs);
-	--ag-input-background-color: var(--color--text--tint-3);
+	--ag-input-background-color: var(--color--background--light-2);
 	--ag-focus-shadow: none;
 
 	:global(.ag-cell) {
@@ -322,7 +322,7 @@ defineExpose({
 		padding: 0;
 
 		textarea {
-			padding-top: var(--spacing--2xs);
+			padding-top: var(--spacing--3xs);
 
 			&:where(:focus-within, :active) {
 				border: var(--grid--cell--border-color--editing);

From bda75d49ce15ef505c0106153998eb3427198d07 Mon Sep 17 00:00:00 2001
From: Daria <daria.staferova@n8n.io>
Date: Wed, 3 Dec 2025 14:10:01 +0200
Subject: [PATCH 029/167] fix: Update activate request for benchmark
 (no-changelog) (#22649)

---
 .../credential-http-node.json                   |  2 +-
 .../src/n8n-api-client/n8n-api-client.types.ts  |  1 +
 .../src/n8n-api-client/workflows-api-client.ts  | 10 ++++++----
 .../__tests__/workflows.controller.test.ts      |  3 +++
 .../cli/src/workflows/workflows.controller.ts   | 12 ++++++++++++
 .../workflows/workflows.controller.test.ts      | 17 ++++-------------
 6 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/packages/@n8n/benchmark/scenarios/credential-http-node/credential-http-node.json b/packages/@n8n/benchmark/scenarios/credential-http-node/credential-http-node.json
index 2b6f02b601f..f28a05a3884 100644
--- a/packages/@n8n/benchmark/scenarios/credential-http-node/credential-http-node.json
+++ b/packages/@n8n/benchmark/scenarios/credential-http-node/credential-http-node.json
@@ -228,7 +228,7 @@
 			]
 		}
 	},
-	"active": true,
+	"active": false,
 	"settings": {
 		"executionOrder": "v1"
 	},
diff --git a/packages/@n8n/benchmark/src/n8n-api-client/n8n-api-client.types.ts b/packages/@n8n/benchmark/src/n8n-api-client/n8n-api-client.types.ts
index c344ac80213..14c1b046328 100644
--- a/packages/@n8n/benchmark/src/n8n-api-client/n8n-api-client.types.ts
+++ b/packages/@n8n/benchmark/src/n8n-api-client/n8n-api-client.types.ts
@@ -4,6 +4,7 @@
 export type Workflow = {
 	id: string;
 	name: string;
+	versionId: string;
 	tags?: string[];
 };
 
diff --git a/packages/@n8n/benchmark/src/n8n-api-client/workflows-api-client.ts b/packages/@n8n/benchmark/src/n8n-api-client/workflows-api-client.ts
index 9d6ab30229b..ee421008362 100644
--- a/packages/@n8n/benchmark/src/n8n-api-client/workflows-api-client.ts
+++ b/packages/@n8n/benchmark/src/n8n-api-client/workflows-api-client.ts
@@ -18,10 +18,12 @@ export class WorkflowApiClient {
 	}
 
 	async activateWorkflow(workflow: Workflow): Promise<Workflow> {
-		const response = await this.apiClient.patch<{ data: Workflow }>(`/workflows/${workflow.id}`, {
-			...workflow,
-			active: true,
-		});
+		const response = await this.apiClient.post<{ data: Workflow }>(
+			`/workflows/${workflow.id}/activate`,
+			{
+				versionId: workflow.versionId,
+			},
+		);
 
 		return response.data.data;
 	}
diff --git a/packages/cli/src/workflows/__tests__/workflows.controller.test.ts b/packages/cli/src/workflows/__tests__/workflows.controller.test.ts
index 0beaffb2164..8bf78ff203c 100644
--- a/packages/cli/src/workflows/__tests__/workflows.controller.test.ts
+++ b/packages/cli/src/workflows/__tests__/workflows.controller.test.ts
@@ -1,4 +1,5 @@
 import type { ImportWorkflowFromUrlDto } from '@n8n/api-types';
+import type { Logger } from '@n8n/backend-common';
 import type { AuthenticatedRequest, IExecutionResponse, CredentialsEntity, User } from '@n8n/db';
 import { WorkflowEntity } from '@n8n/db';
 import axios from 'axios';
@@ -25,9 +26,11 @@ describe('WorkflowsController', () => {
 	const req = mock<AuthenticatedRequest>();
 	const res = mock<Response>();
 	const projectService = mock<ProjectService>();
+	const logger = mock<Logger>();
 
 	beforeEach(() => {
 		controller.projectService = projectService;
+		controller.logger = logger;
 		jest.clearAllMocks();
 	});
 
diff --git a/packages/cli/src/workflows/workflows.controller.ts b/packages/cli/src/workflows/workflows.controller.ts
index 2b94aca122a..fd3417a935b 100644
--- a/packages/cli/src/workflows/workflows.controller.ts
+++ b/packages/cli/src/workflows/workflows.controller.ts
@@ -96,6 +96,18 @@ export class WorkflowsController {
 		// mess with relations of other workflows
 		delete req.body.shared;
 
+		// @ts-expect-error: We shouldn't accept this, this will be set when activating
+		if (req.body.activeVersionId || req.body.active) {
+			this.logger.warn(
+				'Creating a workflow as active is not supported. The workflow will be created as inactive.',
+				{ userId: req.user.id },
+			);
+
+			// @ts-expect-error: We shouldn't accept this
+			req.body.activeVersionId = undefined;
+			req.body.active = false;
+		}
+
 		const newWorkflow = new WorkflowEntity();
 
 		Object.assign(newWorkflow, req.body);
diff --git a/packages/cli/test/integration/workflows/workflows.controller.test.ts b/packages/cli/test/integration/workflows/workflows.controller.test.ts
index 33eefd3559d..ee6f5e33646 100644
--- a/packages/cli/test/integration/workflows/workflows.controller.test.ts
+++ b/packages/cli/test/integration/workflows/workflows.controller.test.ts
@@ -255,7 +255,7 @@ describe('POST /workflows', () => {
 		expect(historyVersion!.nodes).toEqual(payload.nodes);
 	});
 
-	test('should create workflow as active when active: true is provided in POST body', async () => {
+	test('should create workflow as inactive even when active: true is provided in POST body', async () => {
 		const payload = {
 			name: 'active workflow',
 			nodes: [
@@ -284,21 +284,12 @@ describe('POST /workflows', () => {
 
 		expect(id).toBeDefined();
 		expect(versionId).toBeDefined();
-		expect(activeVersionId).toBe(versionId); // Should be set to current version
-		expect(active).toBe(true);
+		expect(activeVersionId).toBeNull();
+		expect(active).toBe(false);
 
 		// Verify in database
 		const workflow = await workflowRepository.findOneBy({ id });
-		expect(workflow?.activeVersionId).toBe(versionId);
-
-		// Verify history was created
-		const historyVersion = await workflowHistoryRepository.findOne({
-			where: {
-				workflowId: id,
-				versionId,
-			},
-		});
-		expect(historyVersion).not.toBeNull();
+		expect(workflow?.activeVersionId).toBeNull();
 	});
 
 	test('create workflow in personal project by default', async () => {

From f1439c0b9bcbe6593d01f9909dc9195fa2f0af3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milorad=20FIlipovi=C4=87?= <milorad@n8n.io>
Date: Wed, 3 Dec 2025 13:41:39 +0100
Subject: [PATCH 030/167] feat(editor): Update ActionBox component
 (no-changelog) (#22606)

---
 .../N8nActionBox/ActionBox.stories.ts         | 46 +++++++++++++++++--
 .../components/N8nActionBox/ActionBox.test.ts | 20 +++++++-
 .../src/components/N8nActionBox/ActionBox.vue | 26 +++++++++--
 .../__snapshots__/ActionBox.test.ts.snap      | 24 +++++++++-
 .../layouts/ResourcesListLayout.vue           |  2 +-
 .../credentials/views/CredentialsView.vue     |  2 +-
 6 files changed, 107 insertions(+), 13 deletions(-)

diff --git a/packages/frontend/@n8n/design-system/src/components/N8nActionBox/ActionBox.stories.ts b/packages/frontend/@n8n/design-system/src/components/N8nActionBox/ActionBox.stories.ts
index 4c28eaa7408..d7aa4a8bf71 100644
--- a/packages/frontend/@n8n/design-system/src/components/N8nActionBox/ActionBox.stories.ts
+++ b/packages/frontend/@n8n/design-system/src/components/N8nActionBox/ActionBox.stories.ts
@@ -2,6 +2,8 @@ import type { StoryFn } from '@storybook/vue3-vite';
 import { action } from 'storybook/actions';
 
 import N8nActionBox from './ActionBox.vue';
+import N8nLink from '../N8nLink';
+import N8nText from '../N8nText';
 
 export default {
 	title: 'Atoms/ActionBox',
@@ -23,7 +25,7 @@ const methods = {
 	onClick: action('click'),
 };
 
-const Template: StoryFn = (args, { argTypes }) => ({
+const DefaultTemplate: StoryFn = (args, { argTypes }) => ({
 	setup: () => ({ args }),
 	props: Object.keys(argTypes),
 	components: {
@@ -33,11 +35,49 @@ const Template: StoryFn = (args, { argTypes }) => ({
 	methods,
 });
 
-export const ActionBox = Template.bind({});
+export const ActionBox = DefaultTemplate.bind({});
 ActionBox.args = {
-	emoji: '😿',
+	icon: { type: 'emoji', value: '😿' },
 	heading: 'Headline you need to know',
 	description:
 		'Long description that you should know something is the way it is because of how it is. ',
 	buttonText: 'Do something',
 };
+
+export const ActionBoxWithIcon = DefaultTemplate.bind({});
+ActionBoxWithIcon.args = {
+	icon: { type: 'icon', value: 'tree-pine' },
+	heading: 'Create your first workflow',
+	description: 'Get started by creating a new workflow to automate your tasks.',
+	buttonText: 'Create Workflow',
+};
+
+const WithAdditionalContentTemplate: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
+	props: Object.keys(argTypes),
+	components: {
+		N8nActionBox,
+		N8nText,
+		N8nLink,
+	},
+	template: `
+		<n8n-action-box v-bind="args" @click="onClick">
+			<template #additionalContent>
+					<N8nText color="text-base">
+						Read more on
+					</N8nText>
+					<N8nLink class="ml-4xs" href="https://n8n.io" target="_blank">our docs</N8nLink>
+			</template>
+		</n8n-action-box>
+	`,
+	methods,
+});
+
+export const ActionBoxWithAdditionalContent = WithAdditionalContentTemplate.bind({});
+ActionBoxWithAdditionalContent.args = {
+	icon: { type: 'emoji', value: '🚀' },
+	heading: 'Launch your project',
+	description:
+		'Get started with your project by clicking the button below. Additional content is included.',
+	buttonText: 'Get Started',
+};
diff --git a/packages/frontend/@n8n/design-system/src/components/N8nActionBox/ActionBox.test.ts b/packages/frontend/@n8n/design-system/src/components/N8nActionBox/ActionBox.test.ts
index 9557f679218..f075659904f 100644
--- a/packages/frontend/@n8n/design-system/src/components/N8nActionBox/ActionBox.test.ts
+++ b/packages/frontend/@n8n/design-system/src/components/N8nActionBox/ActionBox.test.ts
@@ -3,10 +3,10 @@ import { render } from '@testing-library/vue';
 import N8NActionBox from './ActionBox.vue';
 
 describe('N8NActionBox', () => {
-	it('should render correctly', () => {
+	it('should render correctly with emoji', () => {
 		const wrapper = render(N8NActionBox, {
 			props: {
-				emoji: '😿',
+				icon: { type: 'emoji', value: '😿' },
 				heading: 'Headline you need to know',
 				description:
 					'Long description that you should know something is the way it is because of how it is. ',
@@ -19,4 +19,20 @@ describe('N8NActionBox', () => {
 		});
 		expect(wrapper.html()).toMatchSnapshot();
 	});
+
+	it('should render correctly with icon', () => {
+		const wrapper = render(N8NActionBox, {
+			props: {
+				icon: { type: 'icon', value: 'plus' },
+				heading: 'Add something new',
+				description: 'Click the button to add a new item.',
+				buttonText: 'Add Item',
+				buttonType: 'primary',
+			},
+			global: {
+				stubs: ['N8nHeading', 'N8nText', 'N8nButton', 'N8nCallout', 'N8nIcon'],
+			},
+		});
+		expect(wrapper.html()).toMatchSnapshot();
+	});
 });
diff --git a/packages/frontend/@n8n/design-system/src/components/N8nActionBox/ActionBox.vue b/packages/frontend/@n8n/design-system/src/components/N8nActionBox/ActionBox.vue
index 6f41a9e9560..d0ab6fe7c50 100644
--- a/packages/frontend/@n8n/design-system/src/components/N8nActionBox/ActionBox.vue
+++ b/packages/frontend/@n8n/design-system/src/components/N8nActionBox/ActionBox.vue
@@ -3,12 +3,14 @@ import type { ButtonType } from '../../types/button';
 import N8nButton from '../N8nButton';
 import N8nCallout, { type CalloutTheme } from '../N8nCallout';
 import N8nHeading from '../N8nHeading';
+import N8nIcon from '../N8nIcon';
 import { type IconName } from '../N8nIcon/icons';
+import type { IconOrEmoji } from '../N8nIconPicker/types';
 import N8nText from '../N8nText';
 import N8nTooltip from '../N8nTooltip/Tooltip.vue';
 
 interface ActionBoxProps {
-	emoji?: string;
+	icon?: IconOrEmoji;
 	heading?: string;
 	buttonText?: string;
 	buttonType?: ButtonType;
@@ -29,8 +31,15 @@ withDefaults(defineProps<ActionBoxProps>(), {
 
 <template>
 	<div :class="['n8n-action-box', $style.container]" data-test-id="action-box">
-		<div v-if="emoji" :class="$style.emoji">
-			{{ emoji }}
+		<div v-if="icon" :class="$style.icon">
+			<N8nIcon
+				v-if="icon.type === 'icon'"
+				:icon="icon.value"
+				:size="40"
+				:stroke-width="1.5"
+				color="foreground-xdark"
+			/>
+			<span v-else>{{ icon.value }}</span>
 		</div>
 		<div v-if="heading || $slots.heading" :class="$style.heading">
 			<N8nHeading size="xlarge" align="center">
@@ -59,6 +68,9 @@ withDefaults(defineProps<ActionBoxProps>(), {
 				@click="$emit('click:button', $event)"
 			/>
 		</N8nTooltip>
+		<div v-if="$slots.additionalContent" :class="$style['additional-content']">
+			<slot name="additionalContent"></slot>
+		</div>
 		<N8nCallout
 			v-if="calloutText"
 			:theme="calloutTheme"
@@ -90,7 +102,7 @@ withDefaults(defineProps<ActionBoxProps>(), {
 	}
 }
 
-.emoji {
+.icon {
 	font-size: 40px;
 }
 
@@ -109,4 +121,10 @@ withDefaults(defineProps<ActionBoxProps>(), {
 	width: 100%;
 	text-align: left;
 }
+
+.additional-content {
+	display: flex;
+	margin-top: 0;
+	justify-content: center;
+}
 </style>
diff --git a/packages/frontend/@n8n/design-system/src/components/N8nActionBox/__snapshots__/ActionBox.test.ts.snap b/packages/frontend/@n8n/design-system/src/components/N8nActionBox/__snapshots__/ActionBox.test.ts.snap
index 4761915cb30..a16e05fbb4d 100644
--- a/packages/frontend/@n8n/design-system/src/components/N8nActionBox/__snapshots__/ActionBox.test.ts.snap
+++ b/packages/frontend/@n8n/design-system/src/components/N8nActionBox/__snapshots__/ActionBox.test.ts.snap
@@ -1,8 +1,8 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`N8NActionBox > should render correctly 1`] = `
+exports[`N8NActionBox > should render correctly with emoji 1`] = `
 "<div class="n8n-action-box container" data-test-id="action-box">
-  <div class="emoji">😿</div>
+  <div class="icon"><span>😿</span></div>
   <div class="heading">
     <n8n-heading-stub align="center" tag="span" bold="false" size="xlarge"></n8n-heading-stub>
   </div>
@@ -13,5 +13,25 @@ exports[`N8NActionBox > should render correctly 1`] = `
   <!--teleport start-->
   <!--teleport end-->
   <!--v-if-->
+  <!--v-if-->
+</div>"
+`;
+
+exports[`N8NActionBox > should render correctly with icon 1`] = `
+"<div class="n8n-action-box container" data-test-id="action-box">
+  <div class="icon">
+    <n8n-icon-stub icon="plus" strokewidth="1.5" size="40" spin="false" color="foreground-xdark"></n8n-icon-stub>
+  </div>
+  <div class="heading">
+    <n8n-heading-stub align="center" tag="span" bold="false" size="xlarge"></n8n-heading-stub>
+  </div>
+  <div class="description">
+    <n8n-text-stub color="text-base" bold="false" size="medium" compact="false" tag="span"></n8n-text-stub>
+  </div>
+  <n8n-button-stub block="false" element="button" label="Add Item" square="false" active="false" disabled="false" loading="false" outline="false" size="large" text="false" type="primary" role="button" class="el-tooltip__trigger"></n8n-button-stub>
+  <!--teleport start-->
+  <!--teleport end-->
+  <!--v-if-->
+  <!--v-if-->
 </div>"
 `;
diff --git a/packages/frontend/editor-ui/src/app/components/layouts/ResourcesListLayout.vue b/packages/frontend/editor-ui/src/app/components/layouts/ResourcesListLayout.vue
index 630347e70ac..a49a878eb66 100644
--- a/packages/frontend/editor-ui/src/app/components/layouts/ResourcesListLayout.vue
+++ b/packages/frontend/editor-ui/src/app/components/layouts/ResourcesListLayout.vue
@@ -595,7 +595,7 @@ defineExpose({
 				<slot name="empty">
 					<N8nActionBox
 						data-test-id="empty-resources-list"
-						emoji="👋"
+						:icon="{ type: 'emoji', value: '👋' }"
 						:heading="
 							getResourceText(
 								usersStore.currentUser?.firstName ? 'empty.heading' : 'empty.heading.userNotSetup',
diff --git a/packages/frontend/editor-ui/src/features/credentials/views/CredentialsView.vue b/packages/frontend/editor-ui/src/features/credentials/views/CredentialsView.vue
index f50b8ac8b64..41e5f5d30b3 100644
--- a/packages/frontend/editor-ui/src/features/credentials/views/CredentialsView.vue
+++ b/packages/frontend/editor-ui/src/features/credentials/views/CredentialsView.vue
@@ -334,7 +334,7 @@ onMounted(() => {
 			<N8nActionBox
 				v-else
 				data-test-id="empty-resources-list"
-				emoji="👋"
+				:icon="{ type: 'icon', value: 'lock' }"
 				:heading="
 					i18n.baseText(
 						usersStore.currentUser?.firstName

From 85e204c64fbc2d0a308ad6ea86625e6f4bc92690 Mon Sep 17 00:00:00 2001
From: Danny Martini <danny@n8n.io>
Date: Wed, 3 Dec 2025 14:02:10 +0100
Subject: [PATCH 031/167] fix(core): Prevent execution data from being
 overwritten on manual workflow resume (#22665)

Co-authored-by: Claude <noreply@anthropic.com>
---
 .../cli/src/__tests__/workflow-runner.test.ts | 122 +-----------------
 packages/cli/src/workflow-runner.ts           |  34 -----
 .../workflow-execution.service.test.ts        | 107 +++++++++++++++
 .../workflows/workflow-execution.service.ts   |  60 +++++++--
 4 files changed, 158 insertions(+), 165 deletions(-)

diff --git a/packages/cli/src/__tests__/workflow-runner.test.ts b/packages/cli/src/__tests__/workflow-runner.test.ts
index 339f86a5056..2785fec9232 100644
--- a/packages/cli/src/__tests__/workflow-runner.test.ts
+++ b/packages/cli/src/__tests__/workflow-runner.test.ts
@@ -2,9 +2,6 @@ import { testDb, createWorkflow, mockInstance } from '@n8n/backend-test-utils';
 import { GlobalConfig } from '@n8n/config';
 import { type User, type ExecutionEntity, GLOBAL_OWNER_ROLE, Project } from '@n8n/db';
 import { Container, Service } from '@n8n/di';
-import { createExecution } from '@test-integration/db/executions';
-import { createUser } from '@test-integration/db/users';
-import { setupTestServer } from '@test-integration/utils';
 import type { Response } from 'express';
 import { mock } from 'jest-mock-extended';
 import { DirectedGraph, WorkflowExecute } from 'n8n-core';
@@ -35,6 +32,9 @@ import { OwnershipService } from '@/services/ownership.service';
 import { Telemetry } from '@/telemetry';
 import * as WorkflowExecuteAdditionalData from '@/workflow-execute-additional-data';
 import { WorkflowRunner } from '@/workflow-runner';
+import { createExecution } from '@test-integration/db/executions';
+import { createUser } from '@test-integration/db/users';
+import { setupTestServer } from '@test-integration/utils';
 
 let owner: User;
 let runner: WorkflowRunner;
@@ -618,119 +618,3 @@ describe('streaming functionality', () => {
 		expect(mockHooks.addHandler).toHaveBeenCalledWith('sendChunk', expect.any(Function));
 	});
 });
-
-describe('offloading manual executions to workers', () => {
-	let originalOffloadManualExecutionsToWorkers: string | undefined;
-	let activeExecutions: ActiveExecutions;
-	let permissionChecker: CredentialsPermissionChecker;
-	let mockHooks: core.ExecutionLifecycleHooks;
-	let mockScalingService: {
-		setupQueue: jest.Mock;
-		addJob: jest.Mock;
-	};
-
-	beforeEach(() => {
-		originalOffloadManualExecutionsToWorkers = process.env.OFFLOAD_MANUAL_EXECUTIONS_TO_WORKERS;
-		process.env.OFFLOAD_MANUAL_EXECUTIONS_TO_WORKERS = 'true';
-		globalConfig.executions.mode = 'queue';
-
-		activeExecutions = Container.get(ActiveExecutions);
-		jest.spyOn(activeExecutions, 'add').mockResolvedValue('1');
-		jest.spyOn(activeExecutions, 'attachWorkflowExecution').mockReturnValueOnce();
-
-		permissionChecker = Container.get(CredentialsPermissionChecker);
-		jest.spyOn(permissionChecker, 'check').mockResolvedValueOnce();
-
-		mockHooks = mock<core.ExecutionLifecycleHooks>();
-		jest
-			.spyOn(ExecutionLifecycleHooks, 'getLifecycleHooksForScalingMain')
-			.mockReturnValue(mockHooks);
-
-		mockScalingService = {
-			setupQueue: jest.fn(),
-			addJob: jest.fn().mockResolvedValue({
-				id: 'job-1',
-				data: { executionId: '1', workflowId: 'workflow-1' },
-				finished: jest.fn().mockResolvedValue(undefined),
-			}),
-		};
-		// @ts-expect-error Private property
-		runner.scalingService = mockScalingService;
-	});
-
-	afterEach(() => {
-		process.env.OFFLOAD_MANUAL_EXECUTIONS_TO_WORKERS = originalOffloadManualExecutionsToWorkers;
-		jest.resetAllMocks();
-	});
-
-	it('when receiving no `runData`, should set `runData` to undefined in `executionData`', async () => {
-		// ARRANGE
-		const data = mock<IWorkflowExecutionDataProcess>({
-			workflowData: { nodes: [], id: 'workflow-1' },
-			executionMode: 'manual',
-			runData: undefined,
-			startNodes: [],
-			destinationNode: undefined,
-			pinData: undefined,
-		});
-
-		// ACT
-		await runner.run(data);
-
-		// ASSERT
-		expect(data.executionData).toBeDefined();
-		expect(data.executionData?.resultData?.runData).toBeUndefined();
-	});
-
-	it('when receiving `runData`, should preserve it in `executionData` for partial execution', async () => {
-		// ARRANGE
-		const runData = {
-			Node1: [
-				{
-					startTime: 123,
-					executionTime: 456,
-					source: [],
-					executionIndex: 0,
-				},
-			],
-		};
-		const data = mock<IWorkflowExecutionDataProcess>({
-			workflowData: { nodes: [], id: 'workflow-1' },
-			executionMode: 'manual',
-			runData,
-			startNodes: [],
-			destinationNode: undefined,
-			pinData: undefined,
-		});
-
-		// ACT
-		await runner.run(data);
-
-		// ASSERT
-		expect(data.executionData).toBeDefined();
-		expect(data.executionData?.resultData?.runData).toEqual(runData);
-	});
-
-	it('should not initialize nested `executionData.executionData` to avoid treating it as resumed execution', async () => {
-		// ARRANGE
-		const data = mock<IWorkflowExecutionDataProcess>({
-			workflowData: { nodes: [], id: 'workflow-1' },
-			executionMode: 'manual',
-			runData: undefined,
-			startNodes: [],
-			destinationNode: undefined,
-			pinData: undefined,
-		});
-
-		// ACT
-		await runner.run(data);
-
-		// ASSERT
-		// Should have executionData at top level with startData and manualData
-		expect(data.executionData).toBeDefined();
-		expect(data.executionData?.startData).toBeDefined();
-		expect(data.executionData?.manualData).toBeDefined();
-		// But nested executionData.executionData should be undefined
-		expect(data.executionData?.executionData).toBeUndefined();
-	});
-});
diff --git a/packages/cli/src/workflow-runner.ts b/packages/cli/src/workflow-runner.ts
index 7dc5e1cc825..38b1a6672a2 100644
--- a/packages/cli/src/workflow-runner.ts
+++ b/packages/cli/src/workflow-runner.ts
@@ -139,40 +139,6 @@ export class WorkflowRunner {
 		restartExecutionId?: string,
 		responsePromise?: IDeferredPromise<IExecuteResponsePromiseData>,
 	): Promise<string> {
-		const offloadingManualExecutionsInQueueMode =
-			this.executionsConfig.mode === 'queue' &&
-			process.env.OFFLOAD_MANUAL_EXECUTIONS_TO_WORKERS === 'true';
-
-		/**
-		 * Historically, manual executions in scaling mode ran in the main process,
-		 * so some execution details were never persisted in the database.
-		 *
-		 * Currently, manual executions in scaling mode are offloaded to workers,
-		 * so we persist all details to give workers full access to them.
-		 */
-		if (data.executionMode === 'manual' && offloadingManualExecutionsInQueueMode) {
-			data.executionData = createRunExecutionData({
-				startData: {
-					startNodes: data.startNodes,
-					destinationNode: data.destinationNode,
-				},
-				resultData: {
-					pinData: data.pinData,
-					// Set this to null so `createRunExecutionData` doesn't initialize it.
-					// Otherwise this would be treated as a partial execution.
-					runData: data.runData ?? null,
-				},
-				manualData: {
-					userId: data.userId,
-					dirtyNodeNames: data.dirtyNodeNames,
-					triggerToStartFrom: data.triggerToStartFrom,
-				},
-				// Set this to null so `createRunExecutionData` doesn't initialize it.
-				// Otherwise this would be treated as a resumed execution after waiting.
-				executionData: null,
-			});
-		}
-
 		// Register a new execution
 		const executionId = await this.activeExecutions.add(data, restartExecutionId);
 
diff --git a/packages/cli/src/workflows/__tests__/workflow-execution.service.test.ts b/packages/cli/src/workflows/__tests__/workflow-execution.service.test.ts
index 6d530b5db83..06ce635bb31 100644
--- a/packages/cli/src/workflows/__tests__/workflow-execution.service.test.ts
+++ b/packages/cli/src/workflows/__tests__/workflow-execution.service.test.ts
@@ -1,5 +1,6 @@
 import type { GlobalConfig } from '@n8n/config';
 import type { Project, User, WorkflowEntity, WorkflowRepository } from '@n8n/db';
+import type { MockProxy } from 'jest-mock-extended';
 import { mock } from 'jest-mock-extended';
 import {
 	NodeConnectionTypes,
@@ -468,6 +469,112 @@ describe('WorkflowExecutionService', () => {
 		});
 	});
 
+	describe('offloading manual executions to workers', () => {
+		let originalOffloadManualExecutionsToWorkers: string | undefined;
+		let globalConfigMock: GlobalConfig;
+		let workflowRunnerMock: MockProxy<WorkflowRunner>;
+		let service: WorkflowExecutionService;
+
+		beforeEach(() => {
+			originalOffloadManualExecutionsToWorkers = process.env.OFFLOAD_MANUAL_EXECUTIONS_TO_WORKERS;
+			process.env.OFFLOAD_MANUAL_EXECUTIONS_TO_WORKERS = 'true';
+			globalConfigMock = mock<GlobalConfig>({ executions: { mode: 'queue' } });
+			workflowRunnerMock = mock<WorkflowRunner>();
+			workflowRunnerMock.run.mockResolvedValue('fake-execution-id');
+
+			service = new WorkflowExecutionService(
+				mock(),
+				mock(),
+				mock(),
+				mock(),
+				nodeTypes,
+				mock(),
+				workflowRunnerMock,
+				globalConfigMock,
+				mock(),
+				mock(),
+			);
+		});
+
+		afterEach(() => {
+			if (originalOffloadManualExecutionsToWorkers === undefined) {
+				delete process.env.OFFLOAD_MANUAL_EXECUTIONS_TO_WORKERS;
+			} else {
+				process.env.OFFLOAD_MANUAL_EXECUTIONS_TO_WORKERS = originalOffloadManualExecutionsToWorkers;
+			}
+			jest.clearAllMocks();
+		});
+
+		test('when receiving no `runData`, should set `runData` to undefined in `executionData`', async () => {
+			// ACT
+			await service.executeManually(
+				{
+					workflowData: mock<IWorkflowBase>({ nodes: [] }),
+					triggerToStartFrom: executeWorkflowTriggerNode,
+				} satisfies WorkflowRequest.FullManualExecutionFromKnownTriggerPayload,
+				mock<User>({ id: 'user-id' }),
+			);
+
+			// ASSERT
+			const callArgs = workflowRunnerMock.run.mock.calls[0][0];
+			expect(callArgs.executionData?.resultData?.runData).toBeUndefined();
+		});
+
+		test('when receiving `runData`, should preserve it in `executionData` for partial execution', async () => {
+			// ARRANGE
+			const runData = {
+				[webhookNode.name]: [
+					{
+						startTime: 123,
+						executionTime: 456,
+						source: [],
+						executionIndex: 0,
+					},
+				],
+			};
+			const connections = { ...createMainConnection(hackerNewsNode.name, webhookNode.name) };
+
+			jest
+				.spyOn(nodeTypes, 'getByNameAndVersion')
+				.mockReturnValueOnce(mock<INodeType>({ description: { group: [] } }));
+
+			// ACT
+			await service.executeManually(
+				{
+					workflowData: mock<IWorkflowBase>({ nodes: [hackerNewsNode, webhookNode], connections }),
+					runData,
+					destinationNode: { nodeName: hackerNewsNode.name, mode: 'inclusive' },
+					dirtyNodeNames: [],
+				} satisfies WorkflowRequest.PartialManualExecutionToDestinationPayload,
+				mock<User>({ id: 'user-id' }),
+			);
+
+			// ASSERT
+			const callArgs = workflowRunnerMock.run.mock.calls[0][0];
+			expect(callArgs.executionData?.resultData?.runData).toEqual(runData);
+		});
+
+		test('should not initialize nested `executionData.executionData` to avoid treating it as resumed execution', async () => {
+			// ACT
+			await service.executeManually(
+				{
+					workflowData: mock<IWorkflowBase>({ nodes: [] }),
+					triggerToStartFrom: executeWorkflowTriggerNode,
+				} satisfies WorkflowRequest.FullManualExecutionFromKnownTriggerPayload,
+				mock<User>({ id: 'user-id' }),
+			);
+
+			// ASSERT
+			const callArgs = workflowRunnerMock.run.mock.calls[0][0];
+			// Should have executionData at top level with startData and manualData
+			expect(callArgs.executionData).toBeDefined();
+			expect(callArgs.executionData?.startData).toBeDefined();
+			expect(callArgs.executionData?.manualData).toBeDefined();
+			// But nested executionData.executionData should be undefined
+			expect(callArgs.executionData?.executionData).toBeUndefined();
+		});
+	});
+
 	describe('executeErrorWorkflow()', () => {
 		test('should call `WorkflowRunner.run()` with correct parameters', async () => {
 			const workflowErrorData: IWorkflowErrorData = {
diff --git a/packages/cli/src/workflows/workflow-execution.service.ts b/packages/cli/src/workflows/workflow-execution.service.ts
index 7fb52e1a54b..25ae95dfd37 100644
--- a/packages/cli/src/workflows/workflow-execution.service.ts
+++ b/packages/cli/src/workflows/workflow-execution.service.ts
@@ -110,11 +110,12 @@ export class WorkflowExecutionService {
 			Reflect.deleteProperty(payload, 'runData');
 		}
 
+		let data: IWorkflowExecutionDataProcess | undefined;
+
 		// Case 1: Partial execution to a destination node, and we have enough runData to start the execution.
 		if (isPartialExecution(payload)) {
 			if (this.partialExecutionFulfilsPreconditions(payload)) {
-				// All we need to to do is run the workflow.
-				const executionId = await this.workflowRunner.run({
+				data = {
 					destinationNode: payload.destinationNode,
 					executionMode: 'manual',
 					runData: payload.runData,
@@ -124,11 +125,10 @@ export class WorkflowExecutionService {
 					userId: user.id,
 					dirtyNodeNames: payload.dirtyNodeNames,
 					agentRequest: payload.agentRequest,
-				});
-
-				return { executionId };
+				};
+			} else {
+				payload = upgradeToFullManualExecutionFromUnknownTrigger(payload);
 			}
-			payload = upgradeToFullManualExecutionFromUnknownTrigger(payload);
 		}
 
 		// Case 2: Full execution from a known trigger.
@@ -151,8 +151,7 @@ export class WorkflowExecutionService {
 				return { waitingForWebhook: true };
 			}
 
-			// We don't need a webhook, so we can just execute.
-			const executionId = await this.workflowRunner.run({
+			data = {
 				executionMode: 'manual',
 				pinData: payload.workflowData.pinData,
 				pushRef,
@@ -161,8 +160,7 @@ export class WorkflowExecutionService {
 				triggerToStartFrom: payload.triggerToStartFrom,
 				agentRequest: payload.agentRequest,
 				destinationNode: payload.destinationNode,
-			});
-			return { executionId };
+			};
 		}
 
 		// Case 3: Full execution from an unknown trigger.
@@ -189,7 +187,7 @@ export class WorkflowExecutionService {
 				return { waitingForWebhook: true };
 			}
 
-			const executionId = await this.workflowRunner.run({
+			data = {
 				executionMode: 'manual',
 				pinData: payload.workflowData.pinData,
 				pushRef,
@@ -198,7 +196,45 @@ export class WorkflowExecutionService {
 				agentRequest: payload.agentRequest,
 				destinationNode: payload.destinationNode,
 				triggerToStartFrom: pinnedTrigger ? { name: pinnedTrigger.name } : undefined,
-			});
+			};
+		}
+
+		if (data) {
+			const offloadingManualExecutionsInQueueMode =
+				this.globalConfig.executions.mode === 'queue' &&
+				process.env.OFFLOAD_MANUAL_EXECUTIONS_TO_WORKERS === 'true';
+
+			/**
+			 * Historically, manual executions in scaling mode ran in the main process,
+			 * so some execution details were never persisted in the database.
+			 *
+			 * Currently, manual executions in scaling mode are offloaded to workers,
+			 * so we persist all details to give workers full access to them.
+			 */
+			if (data.executionMode === 'manual' && offloadingManualExecutionsInQueueMode) {
+				data.executionData = createRunExecutionData({
+					startData: {
+						startNodes: data.startNodes,
+						destinationNode: data.destinationNode,
+					},
+					resultData: {
+						pinData: data.pinData,
+						// Set this to null so `createRunExecutionData` doesn't initialize it.
+						// Otherwise this would be treated as a partial execution.
+						runData: data.runData ?? null,
+					},
+					manualData: {
+						userId: data.userId,
+						dirtyNodeNames: data.dirtyNodeNames,
+						triggerToStartFrom: data.triggerToStartFrom,
+					},
+					// Set this to null so `createRunExecutionData` doesn't initialize it.
+					// Otherwise this would be treated as a resumed execution after waiting.
+					executionData: null,
+				});
+			}
+
+			const executionId = await this.workflowRunner.run(data);
 			return { executionId };
 		}
 

From 5ebe3729fc18fc16c5b51aab000857b9cee3650c Mon Sep 17 00:00:00 2001
From: Jaakko Husso <jaakko@n8n.io>
Date: Wed, 3 Dec 2025 16:40:34 +0200
Subject: [PATCH 032/167] feat(core): Add more context window limits for our
 supported Chat models (no-changelog) (#22651)

---
 .../src/modules/chat-hub/context-limits.ts    | 63 +++++++++++++++++--
 1 file changed, 58 insertions(+), 5 deletions(-)

diff --git a/packages/cli/src/modules/chat-hub/context-limits.ts b/packages/cli/src/modules/chat-hub/context-limits.ts
index 3a8dd3e8536..b428bb64517 100644
--- a/packages/cli/src/modules/chat-hub/context-limits.ts
+++ b/packages/cli/src/modules/chat-hub/context-limits.ts
@@ -60,6 +60,11 @@ export const maxContextWindowTokens: Record<ChatHubLLMProvider, Record<string, n
 		'gpt-5-pro-2025-10-06': 196000,
 		'gpt-5-search-api': 0,
 		'gpt-5-search-api-2025-10-14': 0,
+		'gpt-5.1': 400000,
+		'gpt-5.1-2025-11-13': 400000,
+		'gpt-5.1-chat-latest': 128000,
+		'gpt-5.1-codex': 400000,
+		'gpt-5.1-codex-mini': 400000,
 		'gpt-audio': 0,
 		'gpt-audio-2025-08-28': 0,
 		'gpt-audio-mini': 0,
@@ -82,6 +87,7 @@ export const maxContextWindowTokens: Record<ChatHubLLMProvider, Record<string, n
 		'o4-mini-deep-research-2025-06-26': 0,
 	},
 	anthropic: {
+		'claude-opus-4-5-20251101': 200000,
 		'claude-haiku-4-5-20251001': 200000,
 		'claude-sonnet-4-5-20250929': 200000,
 		'claude-opus-4-1-20250805': 200000,
@@ -120,6 +126,8 @@ export const maxContextWindowTokens: Record<ChatHubLLMProvider, Record<string, n
 		'models/gemini-2.5-pro-preview-05-06': 1048576,
 		'models/gemini-2.5-pro-preview-06-05': 1048576,
 		'models/gemini-2.5-pro-preview-tts': 8000,
+		'models/gemini-3-pro-preview': 1048576,
+		'models/gemini-3-pro-image-preview': 65536,
 		'models/gemini-exp-1206': 2000000,
 		'models/gemini-flash-latest': 1048576,
 		'models/gemini-flash-lite-latest': 1048576,
@@ -142,14 +150,59 @@ export const maxContextWindowTokens: Record<ChatHubLLMProvider, Record<string, n
 	ollama: {},
 	awsBedrock: {},
 	vercelAiGateway: {},
-	xAiGrok: {},
-	groq: {},
+	xAiGrok: {
+		'grok-2-1212': 32768,
+		'grok-2-vision-1212': 32768,
+		'grok-3': 131072,
+		'grok-3-mini': 131072,
+		'grok-4-0709': 256000,
+		'grok-4-1-fast-non-reasoning': 2000000,
+		'grok-4-1-fast-reasoning': 2000000,
+		'grok-4-fast-non-reasoning': 2000000,
+		'grok-4-fast-reasoning': 2000000,
+		'grok-code-fast-1': 256000,
+	},
+	groq: {
+		'qwen/qwen3-32b': 131072,
+		'llama-3.3-70b-versatile': 131072,
+		'llama-3.1-8b-instant': 131072,
+		'playai-tts': 8192,
+		'playai-tts-arabic': 8192,
+		'openai/gpt-oss-safeguard-20b': 131072,
+		'openai/gpt-oss-120b': 131072,
+		'openai/gpt-oss-20b': 131072,
+		'meta-llama/llama-prompt-guard-2-86m': 512,
+		'meta-llama/llama-prompt-guard-2-22m': 512,
+		'meta-llama/llama-guard-4-12b': 131072,
+		'meta-llama/llama-4-scout-17b-16e-instruct': 131072,
+		'meta-llama/llama-4-maverick-17b-128e-instruct': 131072,
+		'moonshotai/kimi-k2-instruct-0905': 262144,
+		'moonshotai/kimi-k2-instruct': 262144,
+		'groq/compound': 131072,
+		'groq/compound-mini': 131072,
+	},
 	openRouter: {},
-	deepSeek: {},
+	deepSeek: {
+		'deepseek-chat': 128000,
+		'deepseek-reasoner': 128000,
+	},
 	cohere: {},
-	mistralCloud: {},
+	mistralCloud: {
+		'mistral-large-2411': 256000,
+		'mistral-large-2512': 256000,
+		'mistral-large-latest': 256000,
+		'mistral-large-pixtral-2411': 256000,
+		'mistral-medium': 128000,
+		'mistral-medium-2505': 128000,
+		'mistral-medium-2508': 128000,
+		'mistral-medium-latest': 128000,
+		'mistral-small-2506': 128000,
+		'mistral-small-latest': 128000,
+	},
 };
 
+const CONTEXT_WINDOW_SAFETY_FACTOR = 0.95;
+
 export const getMaxContextWindowTokens = (
 	provider: ChatHubLLMProvider,
 	model: string,
@@ -159,5 +212,5 @@ export const getMaxContextWindowTokens = (
 		return undefined;
 	}
 
-	return limit;
+	return Math.floor(limit * CONTEXT_WINDOW_SAFETY_FACTOR);
 };

From 762cabbd15eb2a28b5033df9c23c83815df8f962 Mon Sep 17 00:00:00 2001
From: Jaakko Husso <jaakko@n8n.io>
Date: Wed, 3 Dec 2025 16:40:53 +0200
Subject: [PATCH 033/167] feat(core): Count 'chat' mode executions towards
 production execution concurrency limits (no-changelog) (#22624)

---
 .../concurrency-control.service.test.ts       | 97 ++++++++++---------
 .../concurrency-control.service.ts            |  4 +-
 2 files changed, 55 insertions(+), 46 deletions(-)

diff --git a/packages/cli/src/concurrency/__tests__/concurrency-control.service.test.ts b/packages/cli/src/concurrency/__tests__/concurrency-control.service.test.ts
index bdd3209cceb..bbdef1237fb 100644
--- a/packages/cli/src/concurrency/__tests__/concurrency-control.service.test.ts
+++ b/packages/cli/src/concurrency/__tests__/concurrency-control.service.test.ts
@@ -215,31 +215,34 @@ describe('ConcurrencyControlService', () => {
 				},
 			);
 
-			it.each(['webhook', 'trigger'])('should enqueue on %s mode', async (mode: ExecutionMode) => {
-				/**
-				 * Arrange
-				 */
-				globalConfig.executions.concurrency.productionLimit = 1;
+			it.each(['webhook', 'trigger', 'chat'])(
+				'should enqueue on %s mode',
+				async (mode: ExecutionMode) => {
+					/**
+					 * Arrange
+					 */
+					globalConfig.executions.concurrency.productionLimit = 1;
 
-				const service = new ConcurrencyControlService(
-					logger,
-					executionRepository,
-					telemetry,
-					eventService,
-					globalConfig,
-				);
-				const enqueueSpy = jest.spyOn(ConcurrencyQueue.prototype, 'enqueue');
+					const service = new ConcurrencyControlService(
+						logger,
+						executionRepository,
+						telemetry,
+						eventService,
+						globalConfig,
+					);
+					const enqueueSpy = jest.spyOn(ConcurrencyQueue.prototype, 'enqueue');
 
-				/**
-				 * Act
-				 */
-				await service.throttle({ mode, executionId: '1' });
+					/**
+					 * Act
+					 */
+					await service.throttle({ mode, executionId: '1' });
 
-				/**
-				 * Assert
-				 */
-				expect(enqueueSpy).toHaveBeenCalled();
-			});
+					/**
+					 * Assert
+					 */
+					expect(enqueueSpy).toHaveBeenCalled();
+				},
+			);
 
 			it('should enqueue on evaluation mode', async () => {
 				/**
@@ -298,31 +301,34 @@ describe('ConcurrencyControlService', () => {
 				},
 			);
 
-			it.each(['webhook', 'trigger'])('should dequeue on %s mode', (mode: ExecutionMode) => {
-				/**
-				 * Arrange
-				 */
-				globalConfig.executions.concurrency.productionLimit = 1;
+			it.each(['webhook', 'trigger', 'chat'])(
+				'should dequeue on %s mode',
+				(mode: ExecutionMode) => {
+					/**
+					 * Arrange
+					 */
+					globalConfig.executions.concurrency.productionLimit = 1;
 
-				const service = new ConcurrencyControlService(
-					logger,
-					executionRepository,
-					telemetry,
-					eventService,
-					globalConfig,
-				);
-				const dequeueSpy = jest.spyOn(ConcurrencyQueue.prototype, 'dequeue');
+					const service = new ConcurrencyControlService(
+						logger,
+						executionRepository,
+						telemetry,
+						eventService,
+						globalConfig,
+					);
+					const dequeueSpy = jest.spyOn(ConcurrencyQueue.prototype, 'dequeue');
 
-				/**
-				 * Act
-				 */
-				service.release({ mode });
+					/**
+					 * Act
+					 */
+					service.release({ mode });
 
-				/**
-				 * Assert
-				 */
-				expect(dequeueSpy).toHaveBeenCalled();
-			});
+					/**
+					 * Assert
+					 */
+					expect(dequeueSpy).toHaveBeenCalled();
+				},
+			);
 
 			it('should dequeue on evaluation mode', () => {
 				/**
@@ -381,7 +387,7 @@ describe('ConcurrencyControlService', () => {
 				},
 			);
 
-			it.each(['webhook', 'trigger'])(
+			it.each(['webhook', 'trigger', 'chat'])(
 				'should remove an execution on %s mode',
 				(mode: ExecutionMode) => {
 					/**
@@ -559,6 +565,7 @@ describe('ConcurrencyControlService', () => {
 				 */
 				await service.throttle({ mode: 'trigger', executionId: '1' });
 				await service.throttle({ mode: 'webhook', executionId: '2' });
+				await service.throttle({ mode: 'chat', executionId: '3' });
 
 				/**
 				 * Assert
diff --git a/packages/cli/src/concurrency/concurrency-control.service.ts b/packages/cli/src/concurrency/concurrency-control.service.ts
index 512d3c3ced6..67eb56e1138 100644
--- a/packages/cli/src/concurrency/concurrency-control.service.ts
+++ b/packages/cli/src/concurrency/concurrency-control.service.ts
@@ -206,7 +206,9 @@ export class ConcurrencyControlService {
 			return undefined;
 		}
 
-		if (mode === 'webhook' || mode === 'trigger') return this.queues.get('production');
+		if (mode === 'webhook' || mode === 'trigger' || mode === 'chat') {
+			return this.queues.get('production');
+		}
 
 		if (mode === 'evaluation') return this.queues.get('evaluation');
 

From 35014be53389d2348045d2121485b330cda8942e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Wed, 3 Dec 2025 16:25:32 +0100
Subject: [PATCH 034/167] fix(core)!: Make runners the only Code node option
 (#22661)

---
 .../@n8n/config/src/configs/runners.config.ts |  3 +--
 packages/@n8n/config/test/config.test.ts      |  2 +-
 .../__tests__/deprecation.service.test.ts     | 27 -------------------
 .../src/deprecation/deprecation.service.ts    |  8 ------
 packages/core/test/setup-mocks.ts             |  7 +++++
 packages/nodes-base/test/setup.ts             |  7 ++++-
 6 files changed, 15 insertions(+), 39 deletions(-)

diff --git a/packages/@n8n/config/src/configs/runners.config.ts b/packages/@n8n/config/src/configs/runners.config.ts
index a1dc208ba0c..9f8e7021315 100644
--- a/packages/@n8n/config/src/configs/runners.config.ts
+++ b/packages/@n8n/config/src/configs/runners.config.ts
@@ -8,8 +8,7 @@ export type TaskRunnerMode = z.infer<typeof runnerModeSchema>;
 
 @Config
 export class TaskRunnersConfig {
-	@Env('N8N_RUNNERS_ENABLED')
-	enabled: boolean = false;
+	enabled: boolean = true;
 
 	/**
 	 * Whether the task runner should run as a child process spawned by n8n (internal mode)
diff --git a/packages/@n8n/config/test/config.test.ts b/packages/@n8n/config/test/config.test.ts
index 9d608a83e95..1d166a32fb5 100644
--- a/packages/@n8n/config/test/config.test.ts
+++ b/packages/@n8n/config/test/config.test.ts
@@ -263,7 +263,7 @@ describe('GlobalConfig', () => {
 			},
 		},
 		taskRunners: {
-			enabled: false,
+			enabled: true,
 			mode: 'internal',
 			path: '/runners',
 			authToken: '',
diff --git a/packages/cli/src/deprecation/__tests__/deprecation.service.test.ts b/packages/cli/src/deprecation/__tests__/deprecation.service.test.ts
index a6919391a9d..f6e38e8fcb3 100644
--- a/packages/cli/src/deprecation/__tests__/deprecation.service.test.ts
+++ b/packages/cli/src/deprecation/__tests__/deprecation.service.test.ts
@@ -84,33 +84,6 @@ describe('DeprecationService', () => {
 		toTest('DB_TYPE', dbType, mustWarn);
 	});
 
-	describe('N8N_RUNNERS_ENABLED', () => {
-		const envVar = 'N8N_RUNNERS_ENABLED';
-
-		test.each([
-			['false', true],
-			['', true],
-			['true', false],
-			[undefined /* warnIfMissing */, true],
-		])('should handle value: %s', (value, mustWarn) => {
-			toTest(envVar, value, mustWarn);
-		});
-
-		test('should not warn when Code node is excluded', () => {
-			process.env[envVar] = 'false';
-
-			const globalConfig = mockInstance(GlobalConfig, {
-				nodes: {
-					exclude: ['n8n-nodes-base.code'],
-				},
-			});
-
-			new DeprecationService(logger, globalConfig, instanceSettings).warn();
-
-			expect(logger.warn).not.toHaveBeenCalled();
-		});
-	});
-
 	describe('OFFLOAD_MANUAL_EXECUTIONS_TO_WORKERS', () => {
 		const envVar = 'OFFLOAD_MANUAL_EXECUTIONS_TO_WORKERS';
 
diff --git a/packages/cli/src/deprecation/deprecation.service.ts b/packages/cli/src/deprecation/deprecation.service.ts
index 55c650d8eee..151119af5b1 100644
--- a/packages/cli/src/deprecation/deprecation.service.ts
+++ b/packages/cli/src/deprecation/deprecation.service.ts
@@ -55,14 +55,6 @@ export class DeprecationService {
 			envVar: 'N8N_SKIP_WEBHOOK_DEREGISTRATION_SHUTDOWN',
 			message: `n8n no longer deregisters webhooks at startup and shutdown. ${SAFE_TO_REMOVE}`,
 		},
-		{
-			envVar: 'N8N_RUNNERS_ENABLED',
-			message:
-				'Running n8n without task runners is deprecated. Task runners will be turned on by default in a future version. Please set `N8N_RUNNERS_ENABLED=true` to enable task runners now and avoid potential issues in the future. Learn more: https://docs.n8n.io/hosting/configuration/task-runners/',
-			checkValue: (value?: string) => value?.toLowerCase() !== 'true' && value !== '1',
-			warnIfMissing: true,
-			disableIf: () => this.globalConfig.nodes.exclude.includes('n8n-nodes-base.code'),
-		},
 		{
 			envVar: 'OFFLOAD_MANUAL_EXECUTIONS_TO_WORKERS',
 			message:
diff --git a/packages/core/test/setup-mocks.ts b/packages/core/test/setup-mocks.ts
index d2c9bc6e645..350257236e7 100644
--- a/packages/core/test/setup-mocks.ts
+++ b/packages/core/test/setup-mocks.ts
@@ -1 +1,8 @@
 import 'reflect-metadata';
+import { TaskRunnersConfig } from '@n8n/config';
+import { Container } from '@n8n/di';
+
+// Disable task runners for tests until proper mocking is implemented
+const taskRunnersConfig = new TaskRunnersConfig();
+taskRunnersConfig.enabled = false;
+Container.set(TaskRunnersConfig, taskRunnersConfig);
diff --git a/packages/nodes-base/test/setup.ts b/packages/nodes-base/test/setup.ts
index 8d136f8c61d..826966fc24c 100644
--- a/packages/nodes-base/test/setup.ts
+++ b/packages/nodes-base/test/setup.ts
@@ -1,8 +1,13 @@
 import 'reflect-metadata';
+import { TaskRunnersConfig } from '@n8n/config';
+import { Container } from '@n8n/di';
 
 // Disable task runners until we have fixed the "run test workflows" test
 // to mock the Code Node execution
-process.env.N8N_RUNNERS_ENABLED = 'false';
+const taskRunnersConfig = new TaskRunnersConfig();
+taskRunnersConfig.enabled = false;
+Container.set(TaskRunnersConfig, taskRunnersConfig);
+
 process.env.N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS = 'false';
 process.env.N8N_VERSION = '0.0.0-test';
 // Disable file access restrictions for tests so they can read/write test files

From bc8ac3854df0accf9459af67ccce8b160e1c5b14 Mon Sep 17 00:00:00 2001
From: Declan Carroll <declan@n8n.io>
Date: Wed, 3 Dec 2025 15:28:01 +0000
Subject: [PATCH 035/167] test: Disable banners for e2e tests (#22680)

---
 packages/testing/playwright/playwright.config.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/testing/playwright/playwright.config.ts b/packages/testing/playwright/playwright.config.ts
index ac2ffc43faf..88c2a2fa57d 100644
--- a/packages/testing/playwright/playwright.config.ts
+++ b/packages/testing/playwright/playwright.config.ts
@@ -62,6 +62,7 @@ export default defineConfig<CurrentsFixtures, CurrentsWorkerFixtures>({
 					N8N_LOG_LEVEL: 'debug',
 					N8N_METRICS: 'true',
 					N8N_RESTRICT_FILE_ACCESS_TO: '',
+					N8N_DYNAMIC_BANNERS_ENABLED: 'false',
 					...getTestEnv(),
 				},
 			}

From 241bb0fe593a4a93518950239f2aa9c44dd2ee65 Mon Sep 17 00:00:00 2001
From: Jaakko Husso <jaakko@n8n.io>
Date: Wed, 3 Dec 2025 17:54:10 +0200
Subject: [PATCH 036/167] feat(core): Chat only users (no-changelog) (#22355)

---
 .../invite-users-request.dto.test.ts          |   1 +
 .../src/schemas/__tests__/user.schema.test.ts |  14 ++
 .../@n8n/api-types/src/schemas/user.schema.ts |   1 +
 .../backend-test-utils/src/db/projects.ts     |   1 +
 packages/@n8n/db/src/constants.ts             |   4 +-
 packages/@n8n/db/src/entities/project.ts      |  10 +-
 packages/@n8n/db/src/index.ts                 |   2 +-
 ...764276827837-AddCreatorIdToProjectTable.ts |  42 +++++
 .../@n8n/db/src/migrations/mysqldb/index.ts   |   2 +
 .../db/src/migrations/postgresdb/index.ts     |   2 +
 ...764276827837-AddCreatorIdToProjectTable.ts |  43 +++++
 .../@n8n/db/src/migrations/sqlite/index.ts    |   2 +
 .../db/src/repositories/project.repository.ts |   5 +-
 .../db/src/repositories/user.repository.ts    |  23 ++-
 .../scope-information.test.ts.snap            |   2 +
 .../permissions/src/__tests__/schemas.test.ts |   2 +
 packages/@n8n/permissions/src/constants.ee.ts |   1 +
 .../src/public-api-permissions.ee.ts          |   7 +
 .../@n8n/permissions/src/roles/all-roles.ts   |   2 +
 .../permissions/src/roles/role-maps.ee.ts     |   2 +
 .../src/roles/scopes/global-scopes.ee.ts      |  11 ++
 packages/@n8n/permissions/src/schemas.ee.ts   |  10 +-
 .../__tests__/get-global-scopes.test.ts       |   2 +-
 .../get-resource-permissions.test.ts          |   5 +
 .../__tests__/has-global-scope.test.ts        |   1 +
 .../__tests__/roles-with-scope.test.ts        |   1 +
 .../src/controllers/api-keys.controller.ts    |  16 +-
 .../src/credentials/credentials.service.ts    |  36 ++--
 .../services/__tests__/user.service.test.ts   | 158 +++++++++++++++++-
 .../cli/src/services/project.service.ee.ts    |   2 +-
 .../src/services/public-api-key.service.ts    |  14 +-
 packages/cli/src/services/user.service.ts     |  93 ++++++++++-
 .../cli/src/workflows/workflow.service.ts     |   4 +-
 .../cli/src/workflows/workflows.controller.ts |  38 +++--
 .../credentials/credentials.api.ee.test.ts    |  17 ++
 .../credentials/credentials.api.test.ts       |  99 ++++++++++-
 .../source-control.service.test.ts            |  20 ++-
 .../test/integration/ldap/ldap.api.test.ts    |  10 ++
 packages/cli/test/integration/me.api.test.ts  | 146 +++++++++++++++-
 .../endpoints-with-scopes-enabled.test.ts     |  28 ++++
 .../integration/public-api/projects.test.ts   |   1 +
 .../cli/test/integration/shared/db/users.ts   |   5 +
 .../test/integration/user.repository.test.ts  |  23 ++-
 .../workflows/workflows.controller.test.ts    |  26 ++-
 .../frontend/@n8n/i18n/src/locales/en.json    |  18 +-
 packages/frontend/editor-ui/src/app/init.ts   |   6 +-
 packages/frontend/editor-ui/src/app/router.ts |   7 +-
 .../editor-ui/src/app/stores/rbac.store.ts    |   1 +
 .../editor-ui/src/app/stores/ui.store.ts      |   2 +-
 .../src/app/utils/rbac/checks/hasRole.test.ts |  11 ++
 .../components/ChatConversationHeader.vue     |  20 ++-
 .../components/CredentialSelectorModal.vue    |  65 +------
 .../ai/chatHub/components/ModelSelector.vue   |   9 +-
 .../chatHub/components/ToolsSelectorModal.vue |  36 +++-
 .../features/ai/chatHub/module.descriptor.ts  |   7 +-
 .../ai/mcpAccess/module.descriptor.ts         |   6 +
 .../collaboration/projects/projects.routes.ts |  11 ++
 .../core/auth/views/SettingsPersonalView.vue  |   4 +
 .../CredentialPicker/CredentialPicker.vue     | 148 ++++++++++++++--
 .../CredentialPicker/CredentialsDropdown.vue  |  27 ++-
 .../users/components/InviteUsersModal.vue     | 101 ++++++-----
 .../components/SettingsUsersRoleCell.vue      |   6 +-
 .../users/components/SettingsUsersTable.vue   |  21 ++-
 .../features/settings/users/users.store.ts    |   5 +
 .../features/settings/users/users.types.ts    |   2 +-
 .../users/views/SettingsUsersView.vue         |  43 ++++-
 .../src/features/shared/tags/tags.store.ts    |   7 +-
 67 files changed, 1270 insertions(+), 227 deletions(-)
 create mode 100644 packages/@n8n/db/src/migrations/common/1764276827837-AddCreatorIdToProjectTable.ts
 create mode 100644 packages/@n8n/db/src/migrations/sqlite/1764276827837-AddCreatorIdToProjectTable.ts

diff --git a/packages/@n8n/api-types/src/dto/invitation/__tests__/invite-users-request.dto.test.ts b/packages/@n8n/api-types/src/dto/invitation/__tests__/invite-users-request.dto.test.ts
index 103e9bb4ab6..f0fad0cd6a7 100644
--- a/packages/@n8n/api-types/src/dto/invitation/__tests__/invite-users-request.dto.test.ts
+++ b/packages/@n8n/api-types/src/dto/invitation/__tests__/invite-users-request.dto.test.ts
@@ -17,6 +17,7 @@ describe('InviteUsersRequestDto', () => {
 					{ email: 'user1@example.com', role: 'global:member' },
 					{ email: 'user2@example.com', role: 'global:admin' },
 					{ email: 'user3@example.com', role: 'custom:role' },
+					{ email: 'user4@example.com', role: 'global:chatUser' },
 				],
 			},
 		])('should validate $name', ({ request }) => {
diff --git a/packages/@n8n/api-types/src/schemas/__tests__/user.schema.test.ts b/packages/@n8n/api-types/src/schemas/__tests__/user.schema.test.ts
index b689e314923..ffe97f68507 100644
--- a/packages/@n8n/api-types/src/schemas/__tests__/user.schema.test.ts
+++ b/packages/@n8n/api-types/src/schemas/__tests__/user.schema.test.ts
@@ -136,6 +136,20 @@ describe('user.schema', () => {
 				},
 				isValid: false,
 			},
+			{
+				name: 'chat user',
+				data: {
+					id: '123',
+					firstName: 'John',
+					lastName: 'Doe',
+					email: 'johndoe@example.com',
+					role: 'global:chatUser',
+					isPending: false,
+					lastActive: '2023-10-01T12:00:00Z',
+					projects: [],
+				},
+				isValid: true,
+			},
 			{
 				name: 'invalid role',
 				data: {
diff --git a/packages/@n8n/api-types/src/schemas/user.schema.ts b/packages/@n8n/api-types/src/schemas/user.schema.ts
index a3bad669a75..953bb8f831f 100644
--- a/packages/@n8n/api-types/src/schemas/user.schema.ts
+++ b/packages/@n8n/api-types/src/schemas/user.schema.ts
@@ -7,6 +7,7 @@ export const ROLE = {
 	Owner: 'global:owner',
 	Member: 'global:member',
 	Admin: 'global:admin',
+	ChatUser: 'global:chatUser',
 	Default: 'default', // default user with no email when setting up instance
 } as const;
 
diff --git a/packages/@n8n/backend-test-utils/src/db/projects.ts b/packages/@n8n/backend-test-utils/src/db/projects.ts
index 59f681ccaaf..1fc78b95c09 100644
--- a/packages/@n8n/backend-test-utils/src/db/projects.ts
+++ b/packages/@n8n/backend-test-utils/src/db/projects.ts
@@ -27,6 +27,7 @@ export const createTeamProject = async (name?: string, adminUser?: User) => {
 		projectRepository.create({
 			name: name ?? randomName(),
 			type: 'team',
+			creatorId: adminUser?.id,
 		}),
 	);
 
diff --git a/packages/@n8n/db/src/constants.ts b/packages/@n8n/db/src/constants.ts
index 194ebbad079..ee38ef185ca 100644
--- a/packages/@n8n/db/src/constants.ts
+++ b/packages/@n8n/db/src/constants.ts
@@ -3,8 +3,8 @@ import {
 	PROJECT_EDITOR_ROLE_SLUG,
 	PROJECT_OWNER_ROLE_SLUG,
 	PROJECT_VIEWER_ROLE_SLUG,
-	type ProjectRole,
 	ALL_ROLES,
+	type ProjectRole,
 	type GlobalRole,
 	type Role as RoleDTO,
 } from '@n8n/permissions';
@@ -51,6 +51,7 @@ export const ALL_BUILTIN_ROLES = toRoleMap([
 export const GLOBAL_OWNER_ROLE = ALL_BUILTIN_ROLES['global:owner'];
 export const GLOBAL_ADMIN_ROLE = ALL_BUILTIN_ROLES['global:admin'];
 export const GLOBAL_MEMBER_ROLE = ALL_BUILTIN_ROLES['global:member'];
+export const GLOBAL_CHAT_USER_ROLE = ALL_BUILTIN_ROLES['global:chatUser'];
 
 export const PROJECT_OWNER_ROLE = ALL_BUILTIN_ROLES[PROJECT_OWNER_ROLE_SLUG];
 export const PROJECT_ADMIN_ROLE = ALL_BUILTIN_ROLES[PROJECT_ADMIN_ROLE_SLUG];
@@ -61,6 +62,7 @@ export const GLOBAL_ROLES: Record<GlobalRole, Role> = {
 	'global:owner': GLOBAL_OWNER_ROLE,
 	'global:admin': GLOBAL_ADMIN_ROLE,
 	'global:member': GLOBAL_MEMBER_ROLE,
+	'global:chatUser': GLOBAL_CHAT_USER_ROLE,
 };
 
 export const PROJECT_ROLES: Record<ProjectRole, Role> = {
diff --git a/packages/@n8n/db/src/entities/project.ts b/packages/@n8n/db/src/entities/project.ts
index 16b6b739c1a..ace0ac0ddee 100644
--- a/packages/@n8n/db/src/entities/project.ts
+++ b/packages/@n8n/db/src/entities/project.ts
@@ -1,9 +1,10 @@
-import { Column, Entity, OneToMany } from '@n8n/typeorm';
+import { Column, Entity, JoinColumn, ManyToOne, OneToMany, Relation } from '@n8n/typeorm';
 
 import { WithTimestampsAndStringId } from './abstract-entity';
 import type { ProjectRelation } from './project-relation';
 import type { SharedCredentials } from './shared-credentials';
 import type { SharedWorkflow } from './shared-workflow';
+import { User } from './user';
 import type { Variables } from './variables';
 
 @Entity()
@@ -31,4 +32,11 @@ export class Project extends WithTimestampsAndStringId {
 
 	@OneToMany('Variables', 'project')
 	variables: Variables[];
+
+	@Column({ type: String, nullable: true })
+	creatorId: string | null;
+
+	@ManyToOne('User', { onDelete: 'SET NULL' })
+	@JoinColumn({ name: 'creatorId' })
+	creator?: Relation<User>;
 }
diff --git a/packages/@n8n/db/src/index.ts b/packages/@n8n/db/src/index.ts
index 4b832e62ea6..54db96c74aa 100644
--- a/packages/@n8n/db/src/index.ts
+++ b/packages/@n8n/db/src/index.ts
@@ -39,5 +39,5 @@ export { DbConnectionOptions } from './connection/db-connection-options';
 
 export { AuthRolesService } from './services/auth.roles.service';
 
-export { In, Like, DataSource } from '@n8n/typeorm';
+export { In, Like, Not, DataSource } from '@n8n/typeorm';
 export type { FindOptionsWhere } from '@n8n/typeorm';
diff --git a/packages/@n8n/db/src/migrations/common/1764276827837-AddCreatorIdToProjectTable.ts b/packages/@n8n/db/src/migrations/common/1764276827837-AddCreatorIdToProjectTable.ts
new file mode 100644
index 00000000000..0a93a80863c
--- /dev/null
+++ b/packages/@n8n/db/src/migrations/common/1764276827837-AddCreatorIdToProjectTable.ts
@@ -0,0 +1,42 @@
+import type { MigrationContext, ReversibleMigration } from '../migration-types';
+
+const table = {
+	project: 'project',
+	projectRelation: 'project_relation',
+} as const;
+
+const FOREIGN_KEY_NAME = 'projects_creatorId_foreign';
+
+export class AddCreatorIdToProjectTable1764276827837 implements ReversibleMigration {
+	async up({
+		escape,
+		schemaBuilder: { addColumns, addForeignKey, column },
+		queryRunner,
+	}: MigrationContext) {
+		await addColumns(table.project, [
+			column('creatorId').uuid.comment('ID of the user who created the project'),
+		]);
+
+		await addForeignKey(table.project, 'creatorId', ['user', 'id'], FOREIGN_KEY_NAME, 'SET NULL');
+
+		// Populate creatorId for existing personal projects.
+		// We can only do this for personal projects as for team projects
+		// we don't have a reliable way of knowing who the creator was.
+		await queryRunner.query(`
+			UPDATE ${escape.tableName(table.project)} AS project
+			SET ${escape.columnName('creatorId')} = (
+				SELECT pr.${escape.columnName('userId')}
+				FROM ${escape.tableName(table.projectRelation)} AS pr
+				WHERE pr.${escape.columnName('projectId')} = project.${escape.columnName('id')}
+					AND pr.${escape.columnName('role')} = 'project:personalOwner'
+				LIMIT 1
+			)
+			WHERE project.${escape.columnName('type')} = 'personal'
+				AND project.${escape.columnName('creatorId')} IS NULL;`);
+	}
+
+	async down({ schemaBuilder: { dropColumns, dropForeignKey } }: MigrationContext) {
+		await dropForeignKey(table.project, 'creatorId', ['user', 'id'], FOREIGN_KEY_NAME);
+		await dropColumns(table.project, ['creatorId']);
+	}
+}
diff --git a/packages/@n8n/db/src/migrations/mysqldb/index.ts b/packages/@n8n/db/src/migrations/mysqldb/index.ts
index e67f00de392..6c2ccf8aee9 100644
--- a/packages/@n8n/db/src/migrations/mysqldb/index.ts
+++ b/packages/@n8n/db/src/migrations/mysqldb/index.ts
@@ -119,6 +119,7 @@ import { AddActiveVersionIdColumn1763047800000 } from '../common/1763047800000-A
 import { ChangeOAuthStateColumnToUnboundedVarchar1763572724000 } from '../common/1763572724000-ChangeOAuthStateColumnToUnboundedVarchar';
 import { CreateBinaryDataTable1763716655000 } from '../common/1763716655000-CreateBinaryDataTable';
 import { CreateWorkflowPublishHistoryTable1764167920585 } from '../common/1764167920585-CreateWorkflowPublishHistoryTable';
+import { AddCreatorIdToProjectTable1764276827837 } from '../common/1764276827837-AddCreatorIdToProjectTable';
 import type { Migration } from '../migration-types';
 
 export const mysqlMigrations: Migration[] = [
@@ -243,4 +244,5 @@ export const mysqlMigrations: Migration[] = [
 	AddActiveVersionIdColumn1763047800000,
 	CreateBinaryDataTable1763716655000,
 	CreateWorkflowPublishHistoryTable1764167920585,
+	AddCreatorIdToProjectTable1764276827837,
 ];
diff --git a/packages/@n8n/db/src/migrations/postgresdb/index.ts b/packages/@n8n/db/src/migrations/postgresdb/index.ts
index 565e38cc6ba..b33ea3f9fcf 100644
--- a/packages/@n8n/db/src/migrations/postgresdb/index.ts
+++ b/packages/@n8n/db/src/migrations/postgresdb/index.ts
@@ -119,6 +119,7 @@ import { AddActiveVersionIdColumn1763047800000 } from '../common/1763047800000-A
 import { ChangeOAuthStateColumnToUnboundedVarchar1763572724000 } from '../common/1763572724000-ChangeOAuthStateColumnToUnboundedVarchar';
 import { CreateBinaryDataTable1763716655000 } from '../common/1763716655000-CreateBinaryDataTable';
 import { CreateWorkflowPublishHistoryTable1764167920585 } from '../common/1764167920585-CreateWorkflowPublishHistoryTable';
+import { AddCreatorIdToProjectTable1764276827837 } from '../common/1764276827837-AddCreatorIdToProjectTable';
 import type { Migration } from '../migration-types';
 
 export const postgresMigrations: Migration[] = [
@@ -243,4 +244,5 @@ export const postgresMigrations: Migration[] = [
 	AddActiveVersionIdColumn1763047800000,
 	CreateBinaryDataTable1763716655000,
 	CreateWorkflowPublishHistoryTable1764167920585,
+	AddCreatorIdToProjectTable1764276827837,
 ];
diff --git a/packages/@n8n/db/src/migrations/sqlite/1764276827837-AddCreatorIdToProjectTable.ts b/packages/@n8n/db/src/migrations/sqlite/1764276827837-AddCreatorIdToProjectTable.ts
new file mode 100644
index 00000000000..336f37ae8b3
--- /dev/null
+++ b/packages/@n8n/db/src/migrations/sqlite/1764276827837-AddCreatorIdToProjectTable.ts
@@ -0,0 +1,43 @@
+import type { MigrationContext, ReversibleMigration } from '../migration-types';
+
+const table = {
+	project: 'project',
+	projectRelation: 'project_relation',
+} as const;
+
+const FOREIGN_KEY_NAME = 'projects_creatorId_foreign';
+
+export class AddCreatorIdToProjectTable1764276827837 implements ReversibleMigration {
+	transaction = false as const;
+
+	async up({
+		escape,
+		schemaBuilder: { addColumns, addForeignKey, column },
+		queryRunner,
+	}: MigrationContext) {
+		await addColumns(table.project, [
+			column('creatorId').uuid.comment('ID of the user who created the project'),
+		]);
+
+		await addForeignKey(table.project, 'creatorId', ['user', 'id'], FOREIGN_KEY_NAME, 'SET NULL');
+
+		// Populate creatorId for existing personal projects.
+		// We can only do this for personal projects as for team projects
+		// we don't have a reliable way of knowing who the creator was.
+		await queryRunner.query(`
+			UPDATE ${escape.tableName(table.project)} AS project
+			SET ${escape.columnName('creatorId')} = (
+				SELECT pr.${escape.columnName('userId')}
+				FROM ${escape.tableName(table.projectRelation)} AS pr
+				WHERE pr.${escape.columnName('projectId')} = project.${escape.columnName('id')}
+					AND pr.${escape.columnName('role')} = 'project:personalOwner'
+				LIMIT 1
+			)
+			WHERE project.${escape.columnName('type')} = 'personal'
+				AND project.${escape.columnName('creatorId')} IS NULL;`);
+	}
+
+	async down({ schemaBuilder: { dropColumns } }: MigrationContext) {
+		await dropColumns(table.project, ['creatorId']);
+	}
+}
diff --git a/packages/@n8n/db/src/migrations/sqlite/index.ts b/packages/@n8n/db/src/migrations/sqlite/index.ts
index ca7ce03a5aa..53e364c62cb 100644
--- a/packages/@n8n/db/src/migrations/sqlite/index.ts
+++ b/packages/@n8n/db/src/migrations/sqlite/index.ts
@@ -46,6 +46,7 @@ import { AddScopesColumnToApiKeys1742918400000 } from './1742918400000-AddScopes
 import { AddProjectIdToVariableTable1758794506893 } from './1758794506893-AddProjectIdToVariableTable';
 import { AddWorkflowVersionColumn1761047826451 } from './1761047826451-AddWorkflowVersionColumn';
 import { ChangeDependencyInfoToJson1761655473000 } from './1761655473000-ChangeDependencyInfoToJson';
+import { AddCreatorIdToProjectTable1764276827837 } from './1764276827837-AddCreatorIdToProjectTable';
 import { UniqueWorkflowNames1620821879465 } from '../common/1620821879465-UniqueWorkflowNames';
 import { UpdateWorkflowCredentials1630330987096 } from '../common/1630330987096-UpdateWorkflowCredentials';
 import { AddNodeIds1658930531669 } from '../common/1658930531669-AddNodeIds';
@@ -235,6 +236,7 @@ const sqliteMigrations: Migration[] = [
 	AddActiveVersionIdColumn1763047800000,
 	CreateBinaryDataTable1763716655000,
 	CreateWorkflowPublishHistoryTable1764167920585,
+	AddCreatorIdToProjectTable1764276827837,
 ];
 
 export { sqliteMigrations };
diff --git a/packages/@n8n/db/src/repositories/project.repository.ts b/packages/@n8n/db/src/repositories/project.repository.ts
index b0779831af0..9a21d0a4bfc 100644
--- a/packages/@n8n/db/src/repositories/project.repository.ts
+++ b/packages/@n8n/db/src/repositories/project.repository.ts
@@ -1,5 +1,4 @@
 import { Service } from '@n8n/di';
-import { PROJECT_OWNER_ROLE_SLUG } from '@n8n/permissions';
 import type { EntityManager } from '@n8n/typeorm';
 import { DataSource, Repository } from '@n8n/typeorm';
 
@@ -17,7 +16,7 @@ export class ProjectRepository extends Repository<Project> {
 		return await em.findOne(Project, {
 			where: {
 				type: 'personal',
-				projectRelations: { userId, role: { slug: PROJECT_OWNER_ROLE_SLUG } },
+				creatorId: userId,
 			},
 			relations: ['projectRelations.role'],
 		});
@@ -29,7 +28,7 @@ export class ProjectRepository extends Repository<Project> {
 		return await em.findOneOrFail(Project, {
 			where: {
 				type: 'personal',
-				projectRelations: { userId, role: { slug: PROJECT_OWNER_ROLE_SLUG } },
+				creatorId: userId,
 			},
 		});
 	}
diff --git a/packages/@n8n/db/src/repositories/user.repository.ts b/packages/@n8n/db/src/repositories/user.repository.ts
index 0837778377f..36af7f120a9 100644
--- a/packages/@n8n/db/src/repositories/user.repository.ts
+++ b/packages/@n8n/db/src/repositories/user.repository.ts
@@ -1,6 +1,6 @@
 import type { UsersListFilterDto } from '@n8n/api-types';
 import { Service } from '@n8n/di';
-import { PROJECT_OWNER_ROLE_SLUG } from '@n8n/permissions';
+import { PROJECT_OWNER_ROLE_SLUG, PROJECT_VIEWER_ROLE_SLUG } from '@n8n/permissions';
 import type { DeepPartial, EntityManager, SelectQueryBuilder } from '@n8n/typeorm';
 import { Brackets, DataSource, In, IsNull, Not, Repository } from '@n8n/typeorm';
 
@@ -123,15 +123,23 @@ export class UserRepository extends Repository<User> {
 				entityManager.create(Project, {
 					type: 'personal',
 					name: userWithRole.createPersonalProjectName(),
+					creatorId: savedUser.id,
 				}),
 			);
+
 			await entityManager.save<ProjectRelation>(
 				entityManager.create(ProjectRelation, {
 					projectId: savedProject.id,
 					userId: savedUser.id,
-					role: { slug: PROJECT_OWNER_ROLE_SLUG },
+					role: {
+						slug:
+							userWithRole.role.slug !== 'global:chatUser'
+								? PROJECT_OWNER_ROLE_SLUG
+								: PROJECT_VIEWER_ROLE_SLUG,
+					},
 				}),
 			);
+
 			return { user: userWithRole, project: savedProject };
 		};
 		if (transactionManager) {
@@ -151,8 +159,12 @@ export class UserRepository extends Repository<User> {
 		return await this.findOne({
 			where: {
 				projectRelations: {
-					role: { slug: PROJECT_OWNER_ROLE_SLUG },
-					project: { sharedWorkflows: { workflowId, role: 'workflow:owner' } },
+					role: { slug: In([PROJECT_OWNER_ROLE_SLUG, PROJECT_VIEWER_ROLE_SLUG]) },
+					project: {
+						type: 'personal',
+						creatorId: Not(IsNull()),
+						sharedWorkflows: { workflowId, role: 'workflow:owner' },
+					},
 				},
 			},
 			relations: ['role'],
@@ -168,8 +180,9 @@ export class UserRepository extends Repository<User> {
 		return await this.findOne({
 			where: {
 				projectRelations: {
-					role: { slug: PROJECT_OWNER_ROLE_SLUG },
+					role: { slug: In([PROJECT_OWNER_ROLE_SLUG, PROJECT_VIEWER_ROLE_SLUG]) },
 					projectId,
+					project: { type: 'personal', creatorId: Not(IsNull()) },
 				},
 			},
 			relations: ['role'],
diff --git a/packages/@n8n/permissions/src/__tests__/__snapshots__/scope-information.test.ts.snap b/packages/@n8n/permissions/src/__tests__/__snapshots__/scope-information.test.ts.snap
index 921bdcfe598..cea5aff1737 100644
--- a/packages/@n8n/permissions/src/__tests__/__snapshots__/scope-information.test.ts.snap
+++ b/packages/@n8n/permissions/src/__tests__/__snapshots__/scope-information.test.ts.snap
@@ -160,6 +160,8 @@ exports[`Scope Information ensure scopes are defined correctly 1`] = `
   "chatHubAgent:*",
   "breakingChanges:list",
   "breakingChanges:*",
+  "apiKey:manage",
+  "apiKey:*",
   "*",
 ]
 `;
diff --git a/packages/@n8n/permissions/src/__tests__/schemas.test.ts b/packages/@n8n/permissions/src/__tests__/schemas.test.ts
index 40d5b53eebd..206b6e67855 100644
--- a/packages/@n8n/permissions/src/__tests__/schemas.test.ts
+++ b/packages/@n8n/permissions/src/__tests__/schemas.test.ts
@@ -35,6 +35,7 @@ describe('globalRoleSchema', () => {
 		{ name: 'valid role: global:owner', value: 'global:owner', expected: true },
 		{ name: 'valid role: global:admin', value: 'global:admin', expected: true },
 		{ name: 'valid role: global:member', value: 'global:member', expected: true },
+		{ name: 'valid role: global:chatUser', value: 'global:chatUser', expected: true },
 		{ name: 'invalid role', value: 'global:invalid', expected: false },
 		{ name: 'invalid prefix', value: 'invalid:admin', expected: false },
 		{ name: 'empty string', value: '', expected: false },
@@ -50,6 +51,7 @@ describe('assignableGlobalRoleSchema', () => {
 		{ name: 'excluded role: global:owner', value: 'global:owner', expected: false },
 		{ name: 'valid role: global:admin', value: 'global:admin', expected: true },
 		{ name: 'valid role: global:member', value: 'global:member', expected: true },
+		{ name: 'valid role: global:chatUser', value: 'global:chatUser', expected: true },
 		{ name: 'object value', value: {}, expected: false },
 	])('should validate $name', ({ value, expected }) => {
 		const result = assignableGlobalRoleSchema.safeParse(value);
diff --git a/packages/@n8n/permissions/src/constants.ee.ts b/packages/@n8n/permissions/src/constants.ee.ts
index 1ef6aa52e48..8f9d5f83f7e 100644
--- a/packages/@n8n/permissions/src/constants.ee.ts
+++ b/packages/@n8n/permissions/src/constants.ee.ts
@@ -37,6 +37,7 @@ export const RESOURCES = {
 	chatHub: ['manage', 'message'] as const,
 	chatHubAgent: [...DEFAULT_OPERATIONS] as const,
 	breakingChanges: ['list'] as const,
+	apiKey: ['manage'] as const,
 } as const;
 
 export const API_KEY_RESOURCES = {
diff --git a/packages/@n8n/permissions/src/public-api-permissions.ee.ts b/packages/@n8n/permissions/src/public-api-permissions.ee.ts
index 29f7d0e9cd2..72f4c2a6136 100644
--- a/packages/@n8n/permissions/src/public-api-permissions.ee.ts
+++ b/packages/@n8n/permissions/src/public-api-permissions.ee.ts
@@ -67,6 +67,8 @@ export const MEMBER_API_KEY_SCOPES: ApiKeyScope[] = [
 	'credential:delete',
 ];
 
+export const CHAT_USER_API_KEY_SCOPES: ApiKeyScope[] = [];
+
 /**
  * This is a bit of a mess, because we are handing out scopes in API keys that are only
  * valid for the personal project, which is enforced in the public API, because the workflows,
@@ -97,9 +99,14 @@ const MAP_ROLE_SCOPES: Record<GlobalRole, ApiKeyScope[]> = {
 	'global:owner': OWNER_API_KEY_SCOPES,
 	'global:admin': ADMIN_API_KEY_SCOPES,
 	'global:member': MEMBER_API_KEY_SCOPES,
+	'global:chatUser': CHAT_USER_API_KEY_SCOPES,
 };
 
 export const getApiKeyScopesForRole = (user: AuthPrincipal) => {
+	if (user.role.slug === 'global:chatUser') {
+		return [];
+	}
+
 	return [
 		...new Set(
 			user.role.scopes
diff --git a/packages/@n8n/permissions/src/roles/all-roles.ts b/packages/@n8n/permissions/src/roles/all-roles.ts
index 0be8efdd185..30610d57710 100644
--- a/packages/@n8n/permissions/src/roles/all-roles.ts
+++ b/packages/@n8n/permissions/src/roles/all-roles.ts
@@ -17,6 +17,7 @@ const ROLE_NAMES: Record<AllRoleTypes, string> = {
 	'global:owner': 'Owner',
 	'global:admin': 'Admin',
 	'global:member': 'Member',
+	'global:chatUser': 'Chat User',
 	[PROJECT_OWNER_ROLE_SLUG]: 'Project Owner',
 	[PROJECT_ADMIN_ROLE_SLUG]: 'Project Admin',
 	[PROJECT_EDITOR_ROLE_SLUG]: 'Project Editor',
@@ -31,6 +32,7 @@ const ROLE_DESCRIPTIONS: Record<AllRoleTypes, string> = {
 	'global:owner': 'Owner',
 	'global:admin': 'Admin',
 	'global:member': 'Member',
+	'global:chatUser': 'Chat User',
 	[PROJECT_OWNER_ROLE_SLUG]: 'Project Owner',
 	[PROJECT_ADMIN_ROLE_SLUG]:
 		'Full control of settings, members, workflows, credentials and executions',
diff --git a/packages/@n8n/permissions/src/roles/role-maps.ee.ts b/packages/@n8n/permissions/src/roles/role-maps.ee.ts
index 5315b91a3a1..0c9e707f70a 100644
--- a/packages/@n8n/permissions/src/roles/role-maps.ee.ts
+++ b/packages/@n8n/permissions/src/roles/role-maps.ee.ts
@@ -6,6 +6,7 @@ import {
 	GLOBAL_OWNER_SCOPES,
 	GLOBAL_ADMIN_SCOPES,
 	GLOBAL_MEMBER_SCOPES,
+	GLOBAL_CHAT_USER_SCOPES,
 } from './scopes/global-scopes.ee';
 import {
 	REGULAR_PROJECT_ADMIN_SCOPES,
@@ -29,6 +30,7 @@ export const GLOBAL_SCOPE_MAP: Record<GlobalRole, Scope[]> = {
 	'global:owner': GLOBAL_OWNER_SCOPES,
 	'global:admin': GLOBAL_ADMIN_SCOPES,
 	'global:member': GLOBAL_MEMBER_SCOPES,
+	'global:chatUser': GLOBAL_CHAT_USER_SCOPES,
 };
 
 export const PROJECT_SCOPE_MAP: Record<ProjectRole, Scope[]> = {
diff --git a/packages/@n8n/permissions/src/roles/scopes/global-scopes.ee.ts b/packages/@n8n/permissions/src/roles/scopes/global-scopes.ee.ts
index b47c44aab70..6c6910504f4 100644
--- a/packages/@n8n/permissions/src/roles/scopes/global-scopes.ee.ts
+++ b/packages/@n8n/permissions/src/roles/scopes/global-scopes.ee.ts
@@ -112,6 +112,7 @@ export const GLOBAL_OWNER_SCOPES: Scope[] = [
 	'chatHubAgent:delete',
 	'chatHubAgent:list',
 	'breakingChanges:list',
+	'apiKey:manage',
 ];
 
 export const GLOBAL_ADMIN_SCOPES = GLOBAL_OWNER_SCOPES.concat();
@@ -141,4 +142,14 @@ export const GLOBAL_MEMBER_SCOPES: Scope[] = [
 	'chatHubAgent:update',
 	'chatHubAgent:delete',
 	'chatHubAgent:list',
+	'apiKey:manage',
+];
+
+export const GLOBAL_CHAT_USER_SCOPES: Scope[] = [
+	'chatHub:message',
+	'chatHubAgent:create',
+	'chatHubAgent:read',
+	'chatHubAgent:update',
+	'chatHubAgent:delete',
+	'chatHubAgent:list',
 ];
diff --git a/packages/@n8n/permissions/src/schemas.ee.ts b/packages/@n8n/permissions/src/schemas.ee.ts
index e763b723404..ba2ac186f73 100644
--- a/packages/@n8n/permissions/src/schemas.ee.ts
+++ b/packages/@n8n/permissions/src/schemas.ee.ts
@@ -1,11 +1,15 @@
 import { z } from 'zod';
 
-import { PROJECT_OWNER_ROLE_SLUG } from './constants.ee';
 import { ALL_SCOPES } from './scope-information';
 
 export const roleNamespaceSchema = z.enum(['global', 'project', 'credential', 'workflow']);
 
-export const globalRoleSchema = z.enum(['global:owner', 'global:admin', 'global:member']);
+export const globalRoleSchema = z.enum([
+	'global:owner',
+	'global:admin',
+	'global:member',
+	'global:chatUser',
+]);
 
 const customGlobalRoleSchema = z
 	.string()
@@ -32,7 +36,7 @@ export const teamRoleSchema = z.enum(['project:admin', 'project:editor', 'projec
 export const customProjectRoleSchema = z
 	.string()
 	.nonempty()
-	.refine((val) => val !== PROJECT_OWNER_ROLE_SLUG && !teamRoleSchema.safeParse(val).success, {
+	.refine((val) => !systemProjectRoleSchema.safeParse(val).success, {
 		message: 'This global role value is not assignable',
 	});
 
diff --git a/packages/@n8n/permissions/src/utilities/__tests__/get-global-scopes.test.ts b/packages/@n8n/permissions/src/utilities/__tests__/get-global-scopes.test.ts
index 6b17d6b8262..c3f533681f2 100644
--- a/packages/@n8n/permissions/src/utilities/__tests__/get-global-scopes.test.ts
+++ b/packages/@n8n/permissions/src/utilities/__tests__/get-global-scopes.test.ts
@@ -3,7 +3,7 @@ import { getGlobalScopes } from '../get-global-scopes.ee';
 import { createAuthPrincipal } from './utils';
 
 describe('getGlobalScopes', () => {
-	test.each(['global:owner', 'global:admin', 'global:member'] as const)(
+	test.each(['global:owner', 'global:admin', 'global:member', 'global:chatUser'] as const)(
 		'should return correct scopes for %s',
 		(role) => {
 			const scopes = getGlobalScopes(createAuthPrincipal(role));
diff --git a/packages/@n8n/permissions/src/utilities/__tests__/get-resource-permissions.test.ts b/packages/@n8n/permissions/src/utilities/__tests__/get-resource-permissions.test.ts
index 5df4560621e..f37b702507b 100644
--- a/packages/@n8n/permissions/src/utilities/__tests__/get-resource-permissions.test.ts
+++ b/packages/@n8n/permissions/src/utilities/__tests__/get-resource-permissions.test.ts
@@ -42,6 +42,7 @@ describe('permissions', () => {
 			chatHub: {},
 			chatHubAgent: {},
 			breakingChanges: {},
+			apiKey: {},
 		});
 	});
 	it('getResourcePermissions', () => {
@@ -77,6 +78,7 @@ describe('permissions', () => {
 			'folder:create',
 			'insights:list',
 			'breakingChanges:list',
+			'apiKey:manage',
 		];
 
 		const permissionRecord: PermissionsRecord = {
@@ -158,6 +160,9 @@ describe('permissions', () => {
 			breakingChanges: {
 				list: true,
 			},
+			apiKey: {
+				manage: true,
+			},
 		};
 
 		expect(getResourcePermissions(scopes)).toEqual(permissionRecord);
diff --git a/packages/@n8n/permissions/src/utilities/__tests__/has-global-scope.test.ts b/packages/@n8n/permissions/src/utilities/__tests__/has-global-scope.test.ts
index d3129259f25..7ad158e8115 100644
--- a/packages/@n8n/permissions/src/utilities/__tests__/has-global-scope.test.ts
+++ b/packages/@n8n/permissions/src/utilities/__tests__/has-global-scope.test.ts
@@ -8,6 +8,7 @@ describe('hasGlobalScope', () => {
 			{ role: 'global:owner', scope: 'workflow:create', expected: true },
 			{ role: 'global:admin', scope: 'user:delete', expected: true },
 			{ role: 'global:member', scope: 'workflow:read', expected: false },
+			{ role: 'global:chatUser', scope: 'workflow:read', expected: false },
 			{ role: 'non:existent', scope: 'workflow:read', expected: false },
 		] as Array<{ role: GlobalRole; scope: Scope; expected: boolean }>)(
 			'$role with $scope -> $expected',
diff --git a/packages/@n8n/permissions/src/utilities/__tests__/roles-with-scope.test.ts b/packages/@n8n/permissions/src/utilities/__tests__/roles-with-scope.test.ts
index 62df2558b3f..5e015cf413b 100644
--- a/packages/@n8n/permissions/src/utilities/__tests__/roles-with-scope.test.ts
+++ b/packages/@n8n/permissions/src/utilities/__tests__/roles-with-scope.test.ts
@@ -6,6 +6,7 @@ describe('rolesWithScope', () => {
 		test.each([
 			['workflow:create', ['global:owner', 'global:admin']],
 			['user:list', ['global:owner', 'global:admin', 'global:member']],
+			['chatHub:message', ['global:owner', 'global:admin', 'global:member', 'global:chatUser']],
 			['invalid:scope', []],
 		] as Array<[Scope, GlobalRole[]]>)('%s -> %s', (scope, expected) => {
 			expect(staticRolesWithScope('global', scope)).toEqual(expected);
diff --git a/packages/cli/src/controllers/api-keys.controller.ts b/packages/cli/src/controllers/api-keys.controller.ts
index 40016101d87..1242eb98d1e 100644
--- a/packages/cli/src/controllers/api-keys.controller.ts
+++ b/packages/cli/src/controllers/api-keys.controller.ts
@@ -1,6 +1,15 @@
 import { CreateApiKeyRequestDto, UpdateApiKeyRequestDto } from '@n8n/api-types';
 import { AuthenticatedRequest } from '@n8n/db';
-import { Body, Delete, Get, Param, Patch, Post, RestController } from '@n8n/decorators';
+import {
+	Body,
+	Delete,
+	Get,
+	GlobalScope,
+	Param,
+	Patch,
+	Post,
+	RestController,
+} from '@n8n/decorators';
 import { getApiKeyScopesForRole } from '@n8n/permissions';
 import type { RequestHandler } from 'express';
 
@@ -27,6 +36,7 @@ export class ApiKeysController {
 	/**
 	 * Create an API Key
 	 */
+	@GlobalScope('apiKey:manage')
 	@Post('/', { middlewares: [isApiEnabledMiddleware] })
 	async createApiKey(
 		req: AuthenticatedRequest,
@@ -52,6 +62,7 @@ export class ApiKeysController {
 	/**
 	 * Get API keys
 	 */
+	@GlobalScope('apiKey:manage')
 	@Get('/', { middlewares: [isApiEnabledMiddleware] })
 	async getApiKeys(req: AuthenticatedRequest) {
 		const apiKeys = await this.publicApiKeyService.getRedactedApiKeysForUser(req.user);
@@ -61,6 +72,7 @@ export class ApiKeysController {
 	/**
 	 * Delete an API Key
 	 */
+	@GlobalScope('apiKey:manage')
 	@Delete('/:id', { middlewares: [isApiEnabledMiddleware] })
 	async deleteApiKey(req: AuthenticatedRequest, _res: Response, @Param('id') apiKeyId: string) {
 		await this.publicApiKeyService.deleteApiKeyForUser(req.user, apiKeyId);
@@ -73,6 +85,7 @@ export class ApiKeysController {
 	/**
 	 * Patch an API Key
 	 */
+	@GlobalScope('apiKey:manage')
 	@Patch('/:id', { middlewares: [isApiEnabledMiddleware] })
 	async updateApiKey(
 		req: AuthenticatedRequest,
@@ -89,6 +102,7 @@ export class ApiKeysController {
 		return { success: true };
 	}
 
+	@GlobalScope('apiKey:manage')
 	@Get('/scopes', { middlewares: [isApiEnabledMiddleware] })
 	async getApiKeyScopes(req: AuthenticatedRequest, _res: Response) {
 		const scopes = getApiKeyScopesForRole(req.user);
diff --git a/packages/cli/src/credentials/credentials.service.ts b/packages/cli/src/credentials/credentials.service.ts
index 1e043792c46..299f5fdef79 100644
--- a/packages/cli/src/credentials/credentials.service.ts
+++ b/packages/cli/src/credentials/credentials.service.ts
@@ -33,7 +33,6 @@ import {
 	displayParameter,
 	isINodePropertyCollection,
 	NodeHelpers,
-	UnexpectedError,
 } from 'n8n-workflow';
 
 import { CredentialsFinderService } from './credentials-finder.service';
@@ -546,30 +545,29 @@ export class CredentialsService {
 
 		const { manager: dbManager } = this.credentialsRepository;
 		const result = await dbManager.transaction(async (transactionManager) => {
-			const project =
-				projectId === undefined
-					? await this.projectRepository.getPersonalProjectForUserOrFail(
-							user.id,
-							transactionManager,
-						)
-					: await this.projectService.getProjectWithScope(
-							user,
-							projectId,
-							['credential:create'],
-							transactionManager,
-						);
+			if (projectId === undefined) {
+				const personalProject = await this.projectRepository.getPersonalProjectForUserOrFail(
+					user.id,
+					transactionManager,
+				);
+				// Chat users are not allowed to create credentials even within their personal project,
+				// so even though we found the project ensure it gets found via expected scope too.
+				projectId = personalProject.id;
+			}
 
-			if (typeof projectId === 'string' && project === null) {
+			const project = await this.projectService.getProjectWithScope(
+				user,
+				projectId,
+				['credential:create'],
+				transactionManager,
+			);
+
+			if (project === null) {
 				throw new BadRequestError(
 					"You don't have the permissions to save the credential in this project.",
 				);
 			}
 
-			// Safe guard in case the personal project does not exist for whatever reason.
-			if (project === null) {
-				throw new UnexpectedError('No personal project found');
-			}
-
 			const savedCredential = await transactionManager.save<CredentialsEntity>(newCredential);
 
 			savedCredential.data = newCredential.data;
diff --git a/packages/cli/src/services/__tests__/user.service.test.ts b/packages/cli/src/services/__tests__/user.service.test.ts
index ae9c7a19b19..034f5431897 100644
--- a/packages/cli/src/services/__tests__/user.service.test.ts
+++ b/packages/cli/src/services/__tests__/user.service.test.ts
@@ -1,7 +1,16 @@
 import { mockInstance } from '@n8n/backend-test-utils';
 import { GlobalConfig } from '@n8n/config';
-import type { Project } from '@n8n/db';
-import { GLOBAL_ADMIN_ROLE, GLOBAL_MEMBER_ROLE, Role, User, UserRepository } from '@n8n/db';
+import { Project } from '@n8n/db';
+import {
+	GLOBAL_ADMIN_ROLE,
+	GLOBAL_MEMBER_ROLE,
+	ProjectRelation,
+	ProjectRepository,
+	Role,
+	User,
+	UserRepository,
+} from '@n8n/db';
+import { PROJECT_OWNER_ROLE_SLUG, PROJECT_VIEWER_ROLE_SLUG } from '@n8n/permissions';
 import type { EntityManager } from '@n8n/typeorm';
 import { mock } from 'jest-mock-extended';
 import { v4 as uuid } from 'uuid';
@@ -11,8 +20,8 @@ import { UrlService } from '@/services/url.service';
 import { UserService } from '@/services/user.service';
 import type { UserManagementMailer } from '@/user-management/email';
 
+import type { PublicApiKeyService } from '../public-api-key.service';
 import type { RoleService } from '../role.service';
-import { type PublicApiKeyService } from '../public-api-key.service';
 
 describe('UserService', () => {
 	const globalConfig = mockInstance(GlobalConfig, {
@@ -28,12 +37,16 @@ describe('UserService', () => {
 	const userRepository = mockInstance(UserRepository, {
 		manager,
 	});
+	const projectRepository = mockInstance(ProjectRepository, {
+		manager,
+	});
 	const roleService = mock<RoleService>();
 	const mailer = mock<UserManagementMailer>();
 	const publicApiKeyService = mock<PublicApiKeyService>();
 	const userService = new UserService(
 		mock(),
 		userRepository,
+		projectRepository,
 		mailer,
 		urlService,
 		mock(),
@@ -364,6 +377,7 @@ describe('UserService', () => {
 				{ role: { slug: 'global:admin' } },
 			);
 			expect(publicApiKeyService.removeOwnerOnlyScopesFromApiKeys).not.toHaveBeenCalled();
+			expect(publicApiKeyService.deleteAllApiKeysForUser).not.toHaveBeenCalled();
 		});
 
 		it('removes higher privilege scopes from API tokens of user who is demoted from admin', async () => {
@@ -381,6 +395,144 @@ describe('UserService', () => {
 				{ role: { slug: 'global:member' } },
 			);
 			expect(publicApiKeyService.removeOwnerOnlyScopesFromApiKeys).toHaveBeenCalled();
+			expect(publicApiKeyService.deleteAllApiKeysForUser).not.toHaveBeenCalled();
+		});
+
+		it('removes project roles of user who is demoted to chat user from member', async () => {
+			const user = new User();
+			user.id = uuid();
+			user.role = new Role();
+			user.role.slug = 'global:member';
+			roleService.checkRolesExist.mockResolvedValueOnce();
+
+			const personalProject = new Project();
+			personalProject.id = uuid();
+			personalProject.type = 'personal';
+			personalProject.creatorId = user.id;
+
+			const projectId = uuid();
+			manager.find.mockResolvedValueOnce([
+				Object.assign(new ProjectRelation(), {
+					userId: user.id,
+					role: Object.assign(new Role(), { slug: PROJECT_VIEWER_ROLE_SLUG }),
+					projectId,
+				}),
+			]);
+
+			projectRepository.getPersonalProjectForUserOrFail.mockResolvedValueOnce(personalProject);
+
+			await userService.changeUserRole(user, { newRoleName: 'global:chatUser' });
+
+			expect(manager.delete).toHaveBeenCalledTimes(1);
+			expect(manager.delete).toHaveBeenCalledWith(ProjectRelation, {
+				userId: user.id,
+				projectId,
+			});
+
+			expect(manager.update).toHaveBeenCalledWith(
+				ProjectRelation,
+				{
+					userId: user.id,
+					role: { slug: PROJECT_OWNER_ROLE_SLUG },
+					projectId: personalProject.id,
+				},
+				{ role: { slug: PROJECT_VIEWER_ROLE_SLUG } },
+			);
+
+			// Ensure all their API keys are revoked
+			expect(publicApiKeyService.removeOwnerOnlyScopesFromApiKeys).not.toHaveBeenCalled();
+			expect(publicApiKeyService.deleteAllApiKeysForUser).toHaveBeenCalledWith(user, manager);
+		});
+
+		it('assigns chat user project:viewer on their personal project when demoted from member', async () => {
+			const user = new User();
+			user.id = uuid();
+			user.role = new Role();
+			user.role.slug = 'global:member';
+			roleService.checkRolesExist.mockResolvedValueOnce();
+
+			const personalProject = new Project();
+			personalProject.id = uuid();
+			personalProject.type = 'personal';
+			personalProject.creatorId = user.id;
+
+			manager.find.mockResolvedValueOnce([]);
+			projectRepository.getPersonalProjectForUserOrFail.mockResolvedValueOnce(personalProject);
+
+			await userService.changeUserRole(user, { newRoleName: 'global:chatUser' });
+
+			expect(manager.update).toHaveBeenCalledWith(
+				ProjectRelation,
+				{
+					userId: user.id,
+					role: { slug: PROJECT_OWNER_ROLE_SLUG },
+					projectId: personalProject.id,
+				},
+				{ role: { slug: PROJECT_VIEWER_ROLE_SLUG } },
+			);
+
+			// Ensure all their API keys are revoked
+			expect(publicApiKeyService.removeOwnerOnlyScopesFromApiKeys).not.toHaveBeenCalled();
+			expect(publicApiKeyService.deleteAllApiKeysForUser).toHaveBeenCalledWith(user, manager);
+		});
+
+		it('assigns chat user project:viewer on their personal project when demoted from admin', async () => {
+			const user = new User();
+			user.id = uuid();
+			user.role = new Role();
+			user.role.slug = 'global:admin';
+			roleService.checkRolesExist.mockResolvedValueOnce();
+
+			const personalProject = new Project();
+			personalProject.id = uuid();
+			personalProject.type = 'personal';
+			personalProject.creatorId = user.id;
+
+			manager.find.mockResolvedValueOnce([]);
+			projectRepository.getPersonalProjectForUserOrFail.mockResolvedValueOnce(personalProject);
+
+			await userService.changeUserRole(user, { newRoleName: 'global:chatUser' });
+
+			expect(manager.update).toHaveBeenCalledWith(
+				ProjectRelation,
+				{
+					userId: user.id,
+					role: { slug: PROJECT_OWNER_ROLE_SLUG },
+					projectId: personalProject.id,
+				},
+				{ role: { slug: PROJECT_VIEWER_ROLE_SLUG } },
+			);
+
+			// Ensure all their API keys are revoked.
+			expect(publicApiKeyService.removeOwnerOnlyScopesFromApiKeys).not.toHaveBeenCalled();
+			expect(publicApiKeyService.deleteAllApiKeysForUser).toHaveBeenCalledWith(user, manager);
+		});
+
+		it('assigns chat user project:personalOwner when upgraded to member', async () => {
+			const user = new User();
+			user.id = uuid();
+			user.role = new Role();
+			user.role.slug = 'global:chatUser';
+			roleService.checkRolesExist.mockResolvedValueOnce();
+
+			const personalProject = new Project();
+			personalProject.id = uuid();
+			personalProject.type = 'personal';
+			personalProject.creatorId = user.id;
+
+			projectRepository.getPersonalProjectForUserOrFail.mockResolvedValueOnce(personalProject);
+
+			await userService.changeUserRole(user, { newRoleName: 'global:member' });
+
+			expect(manager.update).toHaveBeenCalledWith(
+				ProjectRelation,
+				{
+					userId: user.id,
+					role: { slug: PROJECT_VIEWER_ROLE_SLUG },
+					projectId: personalProject.id,
+				},
+				{ role: { slug: PROJECT_OWNER_ROLE_SLUG } },
+			);
 		});
 	});
 });
diff --git a/packages/cli/src/services/project.service.ee.ts b/packages/cli/src/services/project.service.ee.ts
index ec2f17f9bbc..d8a31f7bba9 100644
--- a/packages/cli/src/services/project.service.ee.ts
+++ b/packages/cli/src/services/project.service.ee.ts
@@ -237,7 +237,7 @@ export class ProjectService {
 
 		const project = await trx.save(
 			Project,
-			this.projectRepository.create({ ...data, type: 'team' }),
+			this.projectRepository.create({ ...data, type: 'team', creatorId: adminUser.id }),
 		);
 
 		// Link admin
diff --git a/packages/cli/src/services/public-api-key.service.ts b/packages/cli/src/services/public-api-key.service.ts
index f67badd2458..0f152b7dc54 100644
--- a/packages/cli/src/services/public-api-key.service.ts
+++ b/packages/cli/src/services/public-api-key.service.ts
@@ -1,6 +1,6 @@
 import type { CreateApiKeyRequestDto, UnixTimestamp, UpdateApiKeyRequestDto } from '@n8n/api-types';
 import type { AuthenticatedRequest, User } from '@n8n/db';
-import { ApiKey, ApiKeyRepository, UserRepository } from '@n8n/db';
+import { ApiKey, ApiKeyRepository, UserRepository, withTransaction } from '@n8n/db';
 import { Service } from '@n8n/di';
 import type { ApiKeyScope, AuthPrincipal } from '@n8n/permissions';
 import { getApiKeyScopesForRole, getOwnerOnlyApiKeyScopes } from '@n8n/permissions';
@@ -73,6 +73,18 @@ export class PublicApiKeyService {
 		await this.apiKeyRepository.delete({ userId: user.id, id: apiKeyId });
 	}
 
+	async deleteAllApiKeysForUser(user: User, tx?: EntityManager) {
+		return await withTransaction(this.apiKeyRepository.manager, tx, async (em) => {
+			const userApiKeys = await em.find(ApiKey, {
+				where: { userId: user.id, audience: API_KEY_AUDIENCE },
+			});
+
+			return await Promise.all(
+				userApiKeys.map(async (apiKey) => await em.delete(ApiKey, { id: apiKey.id })),
+			);
+		});
+	}
+
 	async updateApiKeyForUser(
 		user: User,
 		apiKeyId: string,
diff --git a/packages/cli/src/services/user.service.ts b/packages/cli/src/services/user.service.ts
index 69f46fbbd5c..959923f0ad2 100644
--- a/packages/cli/src/services/user.service.ts
+++ b/packages/cli/src/services/user.service.ts
@@ -1,11 +1,18 @@
 import type { RoleChangeRequestDto } from '@n8n/api-types';
 import { Logger } from '@n8n/backend-common';
+import { GlobalConfig } from '@n8n/config';
 import type { PublicUser } from '@n8n/db';
-import { User, UserRepository } from '@n8n/db';
+import { ProjectRelation, User, UserRepository, ProjectRepository, Not, In } from '@n8n/db';
 import { Service } from '@n8n/di';
-import { getGlobalScopes, type AssignableGlobalRole } from '@n8n/permissions';
+import {
+	getGlobalScopes,
+	PROJECT_ADMIN_ROLE_SLUG,
+	PROJECT_OWNER_ROLE_SLUG,
+	PROJECT_VIEWER_ROLE_SLUG,
+	type AssignableGlobalRole,
+} from '@n8n/permissions';
 import type { IUserSettings } from 'n8n-workflow';
-import { UnexpectedError } from 'n8n-workflow';
+import { UnexpectedError, UserError } from 'n8n-workflow';
 
 import { InternalServerError } from '@/errors/response-errors/internal-server.error';
 import { EventService } from '@/events/event.service';
@@ -17,13 +24,13 @@ import { UserManagementMailer } from '@/user-management/email';
 
 import { PublicApiKeyService } from './public-api-key.service';
 import { RoleService } from './role.service';
-import { GlobalConfig } from '@n8n/config';
 
 @Service()
 export class UserService {
 	constructor(
 		private readonly logger: Logger,
 		private readonly userRepository: UserRepository,
+		private readonly projectRepository: ProjectRepository,
 		private readonly mailer: UserManagementMailer,
 		private readonly urlService: UrlService,
 		private readonly eventService: EventService,
@@ -276,11 +283,83 @@ export class UserService {
 		return await this.userRepository.manager.transaction(async (trx) => {
 			await trx.update(User, { id: user.id }, { role: { slug: newRole.newRoleName } });
 
-			const adminDowngradedToMember =
-				user.role.slug === 'global:admin' && newRole.newRoleName === 'global:member';
+			const isAdminRole = (roleName: string) => {
+				return roleName === 'global:admin' || roleName === 'global:owner';
+			};
 
-			if (adminDowngradedToMember) {
+			const isDowngradedToChatUser =
+				user.role.slug !== 'global:chatUser' && newRole.newRoleName === 'global:chatUser';
+			const isUpgradedChatUser =
+				user.role.slug === 'global:chatUser' && newRole.newRoleName !== 'global:chatUser';
+			const isDowngradedAdmin = isAdminRole(user.role.slug) && !isAdminRole(newRole.newRoleName);
+
+			if (isDowngradedToChatUser) {
+				// Revoke user's project roles in any shared projects they have access to.
+				const projectRelations = await trx.find(ProjectRelation, {
+					where: { userId: user.id, role: { slug: Not(PROJECT_OWNER_ROLE_SLUG) } },
+					relations: ['role'],
+				});
+				for (const relation of projectRelations) {
+					if (relation.role.slug === PROJECT_ADMIN_ROLE_SLUG) {
+						// Ensure there is at least one other admin in the project
+						const adminCount = await trx.count(ProjectRelation, {
+							where: {
+								projectId: relation.projectId,
+								role: { slug: In([PROJECT_ADMIN_ROLE_SLUG, PROJECT_OWNER_ROLE_SLUG]) },
+								userId: Not(user.id),
+							},
+						});
+						if (adminCount === 0) {
+							throw new UserError(
+								`Cannot downgrade user as they are the only project admin in project "${relation.projectId}".`,
+							);
+						}
+					}
+
+					await trx.delete(ProjectRelation, {
+						userId: user.id,
+						projectId: relation.projectId,
+					});
+				}
+
+				const personalProject = await this.projectRepository.getPersonalProjectForUserOrFail(
+					user.id,
+					trx,
+				);
+
+				// Revoke 'project:personalOwner' role on their personal project
+				// and grant 'project:viewer' role instead.
+				await trx.update(
+					ProjectRelation,
+					{
+						userId: user.id,
+						role: { slug: PROJECT_OWNER_ROLE_SLUG },
+						projectId: personalProject.id,
+					},
+					{ role: { slug: PROJECT_VIEWER_ROLE_SLUG } },
+				);
+
+				// Revoke all API keys from chat users
+				await this.publicApiKeyService.deleteAllApiKeysForUser(user, trx);
+			} else if (isDowngradedAdmin) {
 				await this.publicApiKeyService.removeOwnerOnlyScopesFromApiKeys(user, trx);
+			} else if (isUpgradedChatUser) {
+				const personalProject = await this.projectRepository.getPersonalProjectForUserOrFail(
+					user.id,
+					trx,
+				);
+
+				// Revoke previous 'project:viewer' role on their personal project
+				// and grant 'project:personalOwner' role instead.
+				await trx.update(
+					ProjectRelation,
+					{
+						userId: user.id,
+						role: { slug: PROJECT_VIEWER_ROLE_SLUG },
+						projectId: personalProject.id,
+					},
+					{ role: { slug: PROJECT_OWNER_ROLE_SLUG } },
+				);
 			}
 		});
 	}
diff --git a/packages/cli/src/workflows/workflow.service.ts b/packages/cli/src/workflows/workflow.service.ts
index f949d25d2cf..d9c683b4702 100644
--- a/packages/cli/src/workflows/workflow.service.ts
+++ b/packages/cli/src/workflows/workflow.service.ts
@@ -352,10 +352,10 @@ export class WorkflowService {
 			// do not update active fields
 		];
 
-		const updatePayload: QueryDeepPartialEntity<WorkflowEntity> = pick(
+		const updatePayload = pick(
 			workflowUpdateData,
 			fieldsToUpdate,
-		);
+		) as QueryDeepPartialEntity<WorkflowEntity>;
 
 		// Save the workflow to history first, so we can retrieve the complete version object for the update
 		if (versionChanged) {
diff --git a/packages/cli/src/workflows/workflows.controller.ts b/packages/cli/src/workflows/workflows.controller.ts
index fd3417a935b..f528b645ea2 100644
--- a/packages/cli/src/workflows/workflows.controller.ts
+++ b/packages/cli/src/workflows/workflows.controller.ts
@@ -150,30 +150,34 @@ export class WorkflowsController {
 
 		const { manager: dbManager } = this.projectRepository;
 
-		let project: Project | null;
+		let project: Project | null = null;
 		const savedWorkflow = await dbManager.transaction(async (transactionManager) => {
-			const { projectId, parentFolderId } = req.body;
-			project =
-				projectId === undefined
-					? await this.projectRepository.getPersonalProjectForUser(req.user.id, transactionManager)
-					: await this.projectService.getProjectWithScope(
-							req.user,
-							projectId,
-							['workflow:create'],
-							transactionManager,
-						);
+			const { parentFolderId } = req.body;
+			let { projectId } = req.body;
 
-			if (typeof projectId === 'string' && project === null) {
+			if (projectId === undefined) {
+				const personalProject = await this.projectRepository.getPersonalProjectForUserOrFail(
+					req.user.id,
+					transactionManager,
+				);
+				// Chat users are not allowed to create workflows even within their personal project,
+				// so even though we found the project ensure it gets found via expected scope too.
+				projectId = personalProject.id;
+			}
+
+			project = await this.projectService.getProjectWithScope(
+				req.user,
+				projectId,
+				['workflow:create'],
+				transactionManager,
+			);
+
+			if (project === null) {
 				throw new BadRequestError(
 					"You don't have the permissions to save the workflow in this project.",
 				);
 			}
 
-			// Safe guard in case the personal project does not exist for whatever reason.
-			if (project === null) {
-				throw new UnexpectedError('No personal project found');
-			}
-
 			const workflow = await transactionManager.save<WorkflowEntity>(newWorkflow);
 
 			if (parentFolderId) {
diff --git a/packages/cli/test/integration/credentials/credentials.api.ee.test.ts b/packages/cli/test/integration/credentials/credentials.api.ee.test.ts
index 726e13e15f4..7647c663618 100644
--- a/packages/cli/test/integration/credentials/credentials.api.ee.test.ts
+++ b/packages/cli/test/integration/credentials/credentials.api.ee.test.ts
@@ -109,6 +109,23 @@ describe('POST /credentials', () => {
 			"You don't have the permissions to save the credential in this project.",
 		);
 	});
+
+	test('chat users cannot create credentials', async () => {
+		const chatUser = await createUser({ role: { slug: 'global:chatUser' } });
+		const chatUserPersonalProject = await projectRepository.getPersonalProjectForUserOrFail(
+			chatUser.id,
+		);
+
+		const response = await testServer
+			.authAgentFor(chatUser)
+			.post('/credentials')
+			.send({ ...randomCredentialPayload(), projectId: chatUserPersonalProject.id });
+
+		expect(response.statusCode).toBe(400);
+		expect(response.body.message).toBe(
+			"You don't have the permissions to save the credential in this project.",
+		);
+	});
 });
 
 // ----------------------------------------
diff --git a/packages/cli/test/integration/credentials/credentials.api.test.ts b/packages/cli/test/integration/credentials/credentials.api.test.ts
index d413d3d72ab..8cfc17b4a1d 100644
--- a/packages/cli/test/integration/credentials/credentials.api.test.ts
+++ b/packages/cli/test/integration/credentials/credentials.api.test.ts
@@ -30,7 +30,13 @@ import {
 	shareCredentialWithProjects,
 	shareCredentialWithUsers,
 } from '../shared/db/credentials';
-import { createAdmin, createManyUsers, createMember, createOwner } from '../shared/db/users';
+import {
+	createAdmin,
+	createChatUser,
+	createManyUsers,
+	createMember,
+	createOwner,
+} from '../shared/db/users';
 import type { SuperAgentTest } from '../shared/types';
 import { initCredentialsTypes, setupTestServer } from '../shared/utils';
 
@@ -47,6 +53,7 @@ let secondMember: User;
 
 let ownerPersonalProject: Project;
 let memberPersonalProject: Project;
+let teamProject: Project;
 
 let authOwnerAgent: SuperAgentTest;
 let authMemberAgent: SuperAgentTest;
@@ -130,6 +137,28 @@ describe('GET /credentials', () => {
 		expect(member1Credential.id).toBe(savedCredential1.id);
 	});
 
+	test('should return only own creds for chat user', async () => {
+		const [chatUser1, chatUser2] = await createManyUsers(2, {
+			role: { slug: 'global:chatUser' },
+		});
+
+		const [savedCredential1] = await Promise.all([
+			saveCredential(randomCredentialPayload(), { user: chatUser1, role: 'credential:owner' }),
+			saveCredential(randomCredentialPayload(), { user: chatUser2, role: 'credential:owner' }),
+		]);
+
+		const response = await testServer.authAgentFor(chatUser1).get('/credentials');
+
+		expect(response.statusCode).toBe(200);
+		expect(response.body.data.length).toBe(1); // member retrieved only own cred
+
+		const [chatUser1Credential] = response.body.data;
+
+		validateMainCredentialData(chatUser1Credential);
+		expect(chatUser1Credential.data).toBeUndefined();
+		expect(chatUser1Credential.id).toBe(savedCredential1.id);
+	});
+
 	test('should return scopes when ?includeScopes=true', async () => {
 		const [member1, member2] = await createManyUsers(2, {
 			role: { slug: 'global:member' },
@@ -936,6 +965,49 @@ describe('POST /credentials', () => {
 			});
 	});
 
+	test('should fail when viewer user tries to create credential in team project', async () => {
+		const viewer = await createMember();
+		teamProject = await createTeamProject(undefined, admin);
+		await linkUserToProject(viewer, teamProject, 'project:viewer');
+
+		const response = await testServer
+			.authAgentFor(viewer)
+			.post('/credentials')
+			.send({ ...randomCredentialPayload(), projectId: teamProject.id });
+
+		expect(response.statusCode).toBe(400);
+		expect(response.body.message).toBe(
+			"You don't have the permissions to save the credential in this project.",
+		);
+	});
+
+	test('should allow viewer user to create credential in their personal project', async () => {
+		const viewer = await createMember();
+		teamProject = await createTeamProject(undefined, admin);
+		await linkUserToProject(viewer, teamProject, 'project:viewer');
+
+		const response = await testServer
+			.authAgentFor(viewer)
+			.post('/credentials')
+			.send({ ...randomCredentialPayload() });
+
+		expect(response.statusCode).toBe(200);
+	});
+
+	test('should fail when chat user tries to create credential in their personal project', async () => {
+		const chatUser = await createChatUser();
+
+		const response = await testServer
+			.authAgentFor(chatUser)
+			.post('/credentials')
+			.send({ ...randomCredentialPayload() });
+
+		expect(response.statusCode).toBe(400);
+		expect(response.body.message).toBe(
+			"You don't have the permissions to save the credential in this project.",
+		);
+	});
+
 	test('should fail when member tries to create credential with isGlobal=true', async () => {
 		const response = await authMemberAgent
 			.post('/credentials')
@@ -973,6 +1045,19 @@ describe('POST /credentials', () => {
 		expect(credential.isGlobal).toBe(false);
 	});
 
+	test('should not allow chat user to create credential with isGlobal=false', async () => {
+		const chatUser = await createChatUser();
+		const response = await testServer
+			.authAgentFor(chatUser)
+			.post('/credentials')
+			.send({ ...randomCredentialPayload(), isGlobal: false });
+
+		expect(response.statusCode).toBe(400);
+		expect(response.body.message).toBe(
+			"You don't have the permissions to save the credential in this project.",
+		);
+	});
+
 	test('should allow member to create credential without passing isGlobal', async () => {
 		const payload = randomCredentialPayload();
 		delete payload.isGlobal;
@@ -986,6 +1071,18 @@ describe('POST /credentials', () => {
 		});
 		expect(credential.isGlobal).toBe(false);
 	});
+
+	test('should not allow chat user to create credential without passing isGlobal', async () => {
+		const chatUser = await createChatUser();
+		const payload = randomCredentialPayload();
+		delete payload.isGlobal;
+
+		const response = await testServer.authAgentFor(chatUser).post('/credentials').send(payload);
+		expect(response.statusCode).toBe(400);
+		expect(response.body.message).toBe(
+			"You don't have the permissions to save the credential in this project.",
+		);
+	});
 });
 
 describe('DELETE /credentials/:id', () => {
diff --git a/packages/cli/test/integration/environments/source-control.service.test.ts b/packages/cli/test/integration/environments/source-control.service.test.ts
index c05f5da159f..09073d1c9ac 100644
--- a/packages/cli/test/integration/environments/source-control.service.test.ts
+++ b/packages/cli/test/integration/environments/source-control.service.test.ts
@@ -4,6 +4,7 @@ import {
 	CredentialsEntity,
 	type Folder,
 	GLOBAL_ADMIN_ROLE,
+	GLOBAL_CHAT_USER_ROLE,
 	GLOBAL_MEMBER_ROLE,
 	GLOBAL_OWNER_ROLE,
 	Project,
@@ -147,6 +148,7 @@ describe('SourceControlService', () => {
 	let globalAdmin: User;
 	let globalOwner: User;
 	let globalMember: User;
+	let globalChatUser: User;
 	let projectAdmin: User;
 
 	let projectA: Project;
@@ -201,10 +203,11 @@ describe('SourceControlService', () => {
 
 		/*
 				Set up test conditions:
-				4 users:
+				5 users:
 					globalAdmin
 					globalOwner
 					globalMember
+					globalChatUser
 					projectAdmin
 
 				2 Team projects:
@@ -220,11 +223,12 @@ describe('SourceControlService', () => {
 				1. Workflow moved in git to other project
 			*/
 
-		[globalAdmin, globalOwner, globalMember, projectAdmin] = await Promise.all([
+		[globalAdmin, globalOwner, globalMember, projectAdmin, globalChatUser] = await Promise.all([
 			createUser({ role: GLOBAL_ADMIN_ROLE }),
 			createUser({ role: GLOBAL_OWNER_ROLE }),
 			createUser({ role: GLOBAL_MEMBER_ROLE }),
 			createUser({ role: GLOBAL_MEMBER_ROLE }),
+			createUser({ role: GLOBAL_CHAT_USER_ROLE }),
 		]);
 
 		[projectA, projectB] = await Promise.all([
@@ -678,6 +682,18 @@ describe('SourceControlService', () => {
 				});
 			});
 
+			describe('global:chatUser user', () => {
+				it('should see nothing', async () => {
+					const result = await service.getStatus(globalChatUser, {
+						direction: 'push',
+						preferLocalVersion: true,
+						verbose: false,
+					});
+
+					expect(result).toBeEmptyArray();
+				});
+			});
+
 			describe('project:Admin user', () => {
 				it('should see only workflows in correct scope', async () => {
 					const result = await service.getStatus(projectAdmin, {
diff --git a/packages/cli/test/integration/ldap/ldap.api.test.ts b/packages/cli/test/integration/ldap/ldap.api.test.ts
index 29e9473447e..403c86951ac 100644
--- a/packages/cli/test/integration/ldap/ldap.api.test.ts
+++ b/packages/cli/test/integration/ldap/ldap.api.test.ts
@@ -79,6 +79,16 @@ test('Member role should not be able to access ldap routes', async () => {
 	await authAgent.get('/ldap/sync').expect(403);
 });
 
+test('Chat user role should not be able to access ldap routes', async () => {
+	const chatUser = await createUser({ role: { slug: 'global:chatUser' } });
+	const authAgent = testServer.authAgentFor(chatUser);
+	await authAgent.get('/ldap/config').expect(403);
+	await authAgent.put('/ldap/config').expect(403);
+	await authAgent.post('/ldap/test-connection').expect(403);
+	await authAgent.post('/ldap/sync').expect(403);
+	await authAgent.get('/ldap/sync').expect(403);
+});
+
 describe('PUT /ldap/config', () => {
 	test('route should validate payload', async () => {
 		const invalidValuePayload = {
diff --git a/packages/cli/test/integration/me.api.test.ts b/packages/cli/test/integration/me.api.test.ts
index 469ddb80d58..df0b2b35c8c 100644
--- a/packages/cli/test/integration/me.api.test.ts
+++ b/packages/cli/test/integration/me.api.test.ts
@@ -276,6 +276,148 @@ describe('Member', () => {
 	});
 });
 
+describe('Chat User', () => {
+	let member: User;
+	let authMemberAgent: SuperAgentTest;
+
+	beforeEach(async () => {
+		member = await createUser({
+			password: memberPassword,
+			role: { slug: 'global:chatUser' },
+		});
+		authMemberAgent = testServer.authAgentFor(member);
+		await utils.setInstanceOwnerSetUp(true);
+	});
+
+	test('PATCH /me should succeed with valid inputs', async () => {
+		for (const validPayload of getValidPatchMePayloads('chatUser')) {
+			const response = await authMemberAgent.patch('/me').send(validPayload).expect(200);
+
+			const { id, email, firstName, lastName, personalizationAnswers, role, password, isPending } =
+				response.body.data;
+
+			expect(validator.isUUID(id)).toBe(true);
+			expect(email).toBe(validPayload.email.toLowerCase());
+			expect(firstName).toBe(validPayload.firstName);
+			expect(lastName).toBe(validPayload.lastName);
+			expect(personalizationAnswers).toBeNull();
+			expect(password).toBeUndefined();
+			expect(isPending).toBe(false);
+			expect(role).toBe('global:chatUser');
+
+			const storedMember = await Container.get(UserRepository).findOneByOrFail({ id });
+
+			expect(storedMember.email).toBe(validPayload.email.toLowerCase());
+			expect(storedMember.firstName).toBe(validPayload.firstName);
+			expect(storedMember.lastName).toBe(validPayload.lastName);
+
+			const storedPersonalProject =
+				await Container.get(ProjectRepository).getPersonalProjectForUserOrFail(id);
+
+			expect(storedPersonalProject.name).toBe(storedMember.createPersonalProjectName());
+		}
+	});
+
+	test('PATCH /me should fail with invalid inputs', async () => {
+		for (const invalidPayload of getInvalidPatchMePayloads('chatUser')) {
+			const response = await authMemberAgent.patch('/me').send(invalidPayload);
+			expect(response.statusCode).toBe(400);
+
+			const storedMember = await Container.get(UserRepository).findOneByOrFail({});
+			expect(storedMember.email).toBe(member.email);
+			expect(storedMember.firstName).toBe(member.firstName);
+			expect(storedMember.lastName).toBe(member.lastName);
+
+			const storedPersonalProject = await Container.get(
+				ProjectRepository,
+			).getPersonalProjectForUserOrFail(storedMember.id);
+
+			expect(storedPersonalProject.name).toBe(storedMember.createPersonalProjectName());
+		}
+	});
+
+	test('PATCH /me should fail when changing email without currentPassword', async () => {
+		const payloadWithoutPassword = {
+			email: randomEmail(),
+			firstName: randomName(),
+			lastName: randomName(),
+		};
+
+		const response = await authMemberAgent.patch('/me').send(payloadWithoutPassword);
+		expect(response.statusCode).toBe(400);
+		expect(response.body.message).toContain('Current password is required to change email');
+
+		const storedMember = await Container.get(UserRepository).findOneByOrFail({});
+		expect(storedMember.email).toBe(member.email);
+	});
+
+	test('PATCH /me should fail when changing email with wrong currentPassword', async () => {
+		const payloadWithWrongPassword = {
+			email: randomEmail(),
+			firstName: randomName(),
+			lastName: randomName(),
+			currentPassword: 'WrongPassword123',
+		};
+
+		const response = await authMemberAgent.patch('/me').send(payloadWithWrongPassword);
+		expect(response.statusCode).toBe(400);
+		expect(response.body.message).toContain(
+			'Unable to update profile. Please check your credentials and try again.',
+		);
+
+		const storedMember = await Container.get(UserRepository).findOneByOrFail({});
+		expect(storedMember.email).toBe(member.email);
+	});
+
+	test('PATCH /me/password should succeed with valid inputs', async () => {
+		const validPayload = {
+			currentPassword: memberPassword,
+			newPassword: randomValidPassword(),
+		};
+
+		const response = await authMemberAgent.patch('/me/password').send(validPayload);
+
+		expect(response.statusCode).toBe(200);
+		expect(response.body).toEqual(SUCCESS_RESPONSE_BODY);
+
+		const storedMember = await Container.get(UserRepository).findOneByOrFail({});
+		expect(storedMember.password).not.toBe(member.password);
+		expect(storedMember.password).not.toBe(validPayload.newPassword);
+	});
+
+	test('PATCH /me/password should fail with invalid inputs', async () => {
+		for (const payload of INVALID_PASSWORD_PAYLOADS) {
+			const response = await authMemberAgent.patch('/me/password').send(payload);
+			expect([400, 500].includes(response.statusCode)).toBe(true);
+
+			const storedMember = await Container.get(UserRepository).findOneByOrFail({});
+
+			if (payload.newPassword) {
+				expect(storedMember.password).not.toBe(payload.newPassword);
+			}
+			if (payload.currentPassword) {
+				expect(storedMember.password).not.toBe(payload.currentPassword);
+			}
+		}
+	});
+
+	test('POST /me/survey should succeed with valid inputs', async () => {
+		const validPayloads = [SURVEY, EMPTY_SURVEY];
+
+		for (const validPayload of validPayloads) {
+			const response = await authMemberAgent.post('/me/survey').send(validPayload);
+			expect(response.statusCode).toBe(200);
+			expect(response.body).toEqual(SUCCESS_RESPONSE_BODY);
+
+			const { personalizationAnswers: storedAnswers } = await Container.get(
+				UserRepository,
+			).findOneByOrFail({});
+
+			expect(storedAnswers).toEqual(validPayload);
+		}
+	});
+});
+
 describe('Owner', () => {
 	test('PATCH /me should succeed with valid inputs', async () => {
 		const owner = await createUser({
@@ -352,7 +494,7 @@ const EMPTY_SURVEY: IPersonalizationSurveyAnswersV4 = {
 	personalization_survey_n8n_version: '1.0.0',
 };
 
-function getValidPatchMePayloads(userType: 'owner' | 'member') {
+function getValidPatchMePayloads(userType: 'owner' | 'member' | 'chatUser') {
 	return VALID_PATCH_ME_PAYLOADS.map((payload) => {
 		if (userType === 'owner') {
 			return { ...payload, currentPassword: ownerPassword };
@@ -361,7 +503,7 @@ function getValidPatchMePayloads(userType: 'owner' | 'member') {
 	});
 }
 
-function getInvalidPatchMePayloads(userType: 'owner' | 'member') {
+function getInvalidPatchMePayloads(userType: 'owner' | 'member' | 'chatUser') {
 	return INVALID_PATCH_ME_PAYLOADS.map((payload) => {
 		if (userType === 'owner') {
 			return { ...payload, currentPassword: ownerPassword };
diff --git a/packages/cli/test/integration/public-api/endpoints-with-scopes-enabled.test.ts b/packages/cli/test/integration/public-api/endpoints-with-scopes-enabled.test.ts
index 3cd452a8fce..38d76e4babe 100644
--- a/packages/cli/test/integration/public-api/endpoints-with-scopes-enabled.test.ts
+++ b/packages/cli/test/integration/public-api/endpoints-with-scopes-enabled.test.ts
@@ -322,6 +322,33 @@ describe('Public API endpoints with feat:apiKeyScopes enabled', () => {
 						expect(formerAdminApiKey.scopes).not.toContain(ownerScope);
 					}
 				});
+
+				it('should remove all API keys when user downgrading to chatUser', async () => {
+					/**
+					 * Arrange
+					 */
+					testServer.license.enable('feat:advancedPermissions');
+
+					const owner = await createOwnerWithApiKey({ scopes: ['user:changeRole'] });
+					const admin = await createAdminWithApiKey();
+					const payload = { newRoleName: 'global:chatUser' };
+
+					/**
+					 * Act
+					 */
+					const response = await testServer
+						.publicApiAgentFor(owner)
+						.patch(`/users/${admin.id}/role`)
+						.send(payload);
+
+					/**
+					 * Assert
+					 */
+					expect(response.status).toBe(204);
+
+					const formerAdminApiKey = await apiKeyRepository.findOneBy({ userId: admin.id });
+					expect(formerAdminApiKey).toBeNull();
+				});
 			});
 
 			describe('DELETE /users/:id', () => {
@@ -1069,6 +1096,7 @@ describe('Public API endpoints with feat:apiKeyScopes enabled', () => {
 						name: 'some-project',
 						icon: null,
 						type: 'team',
+						creatorId: owner.id,
 						description: null,
 						id: expect.any(String),
 						createdAt: expect.any(String),
diff --git a/packages/cli/test/integration/public-api/projects.test.ts b/packages/cli/test/integration/public-api/projects.test.ts
index f0b675c8e27..e73423f18a9 100644
--- a/packages/cli/test/integration/public-api/projects.test.ts
+++ b/packages/cli/test/integration/public-api/projects.test.ts
@@ -143,6 +143,7 @@ describe('Projects in Public API', () => {
 				name: 'some-project',
 				icon: null,
 				type: 'team',
+				creatorId: owner.id,
 				description: null,
 				id: expect.any(String),
 				createdAt: expect.any(String),
diff --git a/packages/cli/test/integration/shared/db/users.ts b/packages/cli/test/integration/shared/db/users.ts
index a3f684fb260..12831513dcc 100644
--- a/packages/cli/test/integration/shared/db/users.ts
+++ b/packages/cli/test/integration/shared/db/users.ts
@@ -3,6 +3,7 @@ import {
 	AuthIdentity,
 	AuthIdentityRepository,
 	GLOBAL_ADMIN_ROLE,
+	GLOBAL_CHAT_USER_ROLE,
 	GLOBAL_MEMBER_ROLE,
 	GLOBAL_OWNER_ROLE,
 	type Role,
@@ -154,6 +155,10 @@ export async function createAdmin() {
 	return await createUser({ role: GLOBAL_ADMIN_ROLE });
 }
 
+export async function createChatUser() {
+	return await createUser({ role: GLOBAL_CHAT_USER_ROLE });
+}
+
 export async function createUserShell(role: Role): Promise<User> {
 	const shell: DeepPartial<User> = { role };
 
diff --git a/packages/cli/test/integration/user.repository.test.ts b/packages/cli/test/integration/user.repository.test.ts
index f4328ac3724..7a6f5f27d68 100644
--- a/packages/cli/test/integration/user.repository.test.ts
+++ b/packages/cli/test/integration/user.repository.test.ts
@@ -2,7 +2,7 @@ import { randomEmail, testDb } from '@n8n/backend-test-utils';
 import { ProjectRelationRepository, UserRepository } from '@n8n/db';
 import { Container } from '@n8n/di';
 
-import { createAdmin, createMember, createOwner } from './shared/db/users';
+import { createAdmin, createChatUser, createMember, createOwner } from './shared/db/users';
 
 describe('UserRepository', () => {
 	let userRepository: UserRepository;
@@ -28,6 +28,7 @@ describe('UserRepository', () => {
 				createMember(),
 				createMember(),
 				createMember(),
+				createChatUser(),
 			]);
 
 			const usersByRole = await userRepository.countUsersByRole();
@@ -36,6 +37,7 @@ describe('UserRepository', () => {
 				'global:admin': 2,
 				'global:member': 3,
 				'global:owner': 1,
+				'global:chatUser': 1,
 			});
 		});
 	});
@@ -59,5 +61,24 @@ describe('UserRepository', () => {
 
 			expect(projectRelation.project.id).toBe(project.id);
 		});
+
+		test('should create personal project for a chat user', async () => {
+			const { user, project } = await userRepository.createUserWithProject({
+				email: randomEmail(),
+				role: { slug: 'global:chatUser' },
+			});
+
+			const projectRelation = await Container.get(ProjectRelationRepository).findOneOrFail({
+				where: {
+					userId: user.id,
+					project: {
+						type: 'personal',
+					},
+				},
+				relations: ['project'],
+			});
+
+			expect(projectRelation.project.id).toBe(project.id);
+		});
 	});
 });
diff --git a/packages/cli/test/integration/workflows/workflows.controller.test.ts b/packages/cli/test/integration/workflows/workflows.controller.test.ts
index ee6f5e33646..06f73288726 100644
--- a/packages/cli/test/integration/workflows/workflows.controller.test.ts
+++ b/packages/cli/test/integration/workflows/workflows.controller.test.ts
@@ -43,7 +43,7 @@ import { createFolder } from '@test-integration/db/folders';
 import { saveCredential } from '../shared/db/credentials';
 import { createCustomRoleWithScopeSlugs, cleanupRolesAndScopes } from '../shared/db/roles';
 import { assignTagToWorkflow, createTag } from '../shared/db/tags';
-import { createManyUsers, createMember, createOwner } from '../shared/db/users';
+import { createChatUser, createManyUsers, createMember, createOwner } from '../shared/db/users';
 import { createWorkflowHistoryItem } from '../shared/db/workflow-history';
 import type { SuperAgentTest } from '../shared/types';
 import * as utils from '../shared/utils/';
@@ -55,7 +55,6 @@ let anotherMember: User;
 
 let authOwnerAgent: SuperAgentTest;
 let authMemberAgent: SuperAgentTest;
-
 const testServer = utils.setupTestServer({
 	endpointGroups: ['workflows'],
 	enabledFeatures: ['feat:sharing'],
@@ -445,6 +444,29 @@ describe('POST /workflows', () => {
 			});
 	});
 
+	test('does not create the workflow in a personal project if the user is chat user', async () => {
+		//
+		// ARRANGE
+		//
+		const chatUser = await createChatUser();
+		const workflow = makeWorkflow();
+
+		//
+		// ACT
+		//
+		await testServer
+			.authAgentFor(chatUser)
+			.post('/workflows')
+			.send({ ...workflow })
+			//
+			// ASSERT
+			//
+			.expect(400, {
+				code: 400,
+				message: "You don't have the permissions to save the workflow in this project.",
+			});
+	});
+
 	test('create link workflow with folder if one is provided', async () => {
 		//
 		// ARRANGE
diff --git a/packages/frontend/@n8n/i18n/src/locales/en.json b/packages/frontend/@n8n/i18n/src/locales/en.json
index da098723645..a30c8627ed5 100644
--- a/packages/frontend/@n8n/i18n/src/locales/en.json
+++ b/packages/frontend/@n8n/i18n/src/locales/en.json
@@ -198,6 +198,7 @@
 	"auth.roles.member": "Member",
 	"auth.roles.admin": "@:_reusableBaseText.roles.admin",
 	"auth.roles.owner": "Owner",
+	"auth.roles.chatUser": "Chat user",
 	"auth.agreement.label": "I want to receive security and product updates",
 	"auth.setup.next": "Next",
 	"auth.setup.settingUpOwnerError": "Problem setting up owner",
@@ -389,7 +390,8 @@
 	"chatHub.tools.editor.title": "Add Tools",
 	"chatHub.tools.editor.credential": "Credential",
 	"chatHub.tools.editor.credential.placeholder": "Select credential…",
-	"chatHub.tools.editor.credential.new": "Create New",
+	"chatHub.tools.editor.credential.createNew": "Create New",
+	"chatHub.tools.editor.credential.createNew.permissionDenied": "Your current role does not allow you to create credentials",
 	"chatHub.tools.editor.selectedCount": "{count} tool selected | {count} tools selected",
 	"chatHub.tools.editor.confirm": "Confirm",
 	"chatHub.tools.editor.cancel": "Cancel",
@@ -399,9 +401,9 @@
 	"chatHub.credentials.selector.title": "Select {provider} credential",
 	"chatHub.credentials.selector.chooseOrCreate": "Choose or create a credential for {provider}",
 	"chatHub.credentials.selector.createNew": "Create new",
+	"chatHub.credentials.selector.createNew.permissionDenied": "Your current role does not allow you to create credentials",
 	"chatHub.credentials.selector.confirm": "Select",
 	"chatHub.credentials.selector.cancel": "Cancel",
-	"chatHub.credentials.selector.deleteButton": "Delete credential",
 	"chatHub.message.actions.readAloud": "Read aloud",
 	"chatHub.message.actions.stopReading": "Stop reading",
 	"chatHub.message.actions.edit": "Edit",
@@ -1605,6 +1607,7 @@
 	"nodeCreator.preBuiltAgents.title": "Pre-built agents",
 	"nodeCreator.preBuiltAgents.description": "Get started faster with ready to go agents",
 	"nodeCredentials.createNew": "Create new credential",
+	"nodeCredentials.createNew.permissionDenied": "Your current role does not allow you to create credentials",
 	"nodeCredentials.credentialFor": "Credential for {credentialType}",
 	"nodeCredentials.credentialsLabel": "Credential to connect with",
 	"nodeCredentials.issues": "Issues",
@@ -1614,6 +1617,9 @@
 	"nodeCredentials.showMessage.title": "Node credential updated",
 	"nodeCredentials.autoAssigned.message": "Added this credential to {count} other node(s)",
 	"nodeCredentials.updateCredential": "Update Credential",
+	"nodeCredentials.updateCredential.permissionDenied": "Your current role does not allow you to update credentials",
+	"nodeCredentials.deleteCredential": "Delete Credential",
+	"nodeCredentials.deleteCredential.permissionDenied": "Your current role does not allow you to delete credentials",
 	"nodeErrorView.cause": "Cause",
 	"nodeErrorView.copyToClipboard": "Copy to Clipboard",
 	"nodeErrorView.copyToClipboard.tooltip": "Copy error details for debugging. Copied data may contain sensitive information. Proceed with caution when sharing.",
@@ -2409,6 +2415,7 @@
 	"settings.personal.personalSettingsUpdatedError": "Problem updating your details",
 	"settings.personal.role.tooltip.default": "Default role for new users",
 	"settings.personal.role.tooltip.member": "Create and manage own workflows and credentials",
+	"settings.personal.role.tooltip.chatUser": "Access to Chat feature only",
 	"settings.personal.role.tooltip.admin": "Full access to manage workflows,tags, credentials, projects, users and more",
 	"settings.personal.role.tooltip.owner": "Manage everything{cloudAccess}",
 	"settings.personal.role.tooltip.cloud": " and access Cloud dashboard",
@@ -2480,7 +2487,11 @@
 	"settings.users.advancedPermissions.warning": "{link} to unlock the ability to create additional admin users",
 	"settings.users.userRoleUpdated": "Changes saved",
 	"settings.users.userRoleUpdated.message": "{user} has been successfully updated to a {role}",
-	"settings.users.userRoleUpdatedError": "Unable to updated role",
+	"settings.users.userRoleUpdatedError": "Unable to update role",
+	"settings.users.userRoleUpdated.confirm.message": "Are you sure you want to change user to a {role}? This will revoke their current project roles.",
+	"settings.users.userRoleUpdated.confirm.title": "Update role for {user}?",
+	"settings.users.userRoleUpdated.confirm.button": "Yes, update and revoke",
+	"settings.users.userRoleUpdated.cancel.button": "Cancel",
 	"settings.users.table.update.error": "Failed to update table",
 	"settings.users.table.header.user": "@:_reusableBaseText.user",
 	"settings.users.table.header.accountType": "Account Type",
@@ -2491,6 +2502,7 @@
 	"settings.users.table.row.deleteUser": "Remove user",
 	"settings.users.table.row.role.description.admin": "Full access to all workflows, credentials, projects, users and more",
 	"settings.users.table.row.role.description.member": "Manage and create own workflows and credentials",
+	"settings.users.table.row.role.description.chatUser": "Can use Chat but cannot create or view workflows or access other features",
 	"settings.users.table.row.2fa.enabled": "@:_reusableBaseText.enabled",
 	"settings.users.table.row.2fa.disabled": "@:_reusableBaseText.disabled",
 	"settings.projectRoles": "Project roles",
diff --git a/packages/frontend/editor-ui/src/app/init.ts b/packages/frontend/editor-ui/src/app/init.ts
index b3b0a694356..139e86693fe 100644
--- a/packages/frontend/editor-ui/src/app/init.ts
+++ b/packages/frontend/editor-ui/src/app/init.ts
@@ -28,6 +28,7 @@ import { useRootStore } from '@n8n/stores/useRootStore';
 import { h } from 'vue';
 import { useRolesStore } from '@/app/stores/roles.store';
 import { useDataTableStore } from '@/features/core/dataTable/dataTable.store';
+import { hasPermission } from '@/app/utils/rbac/permissions';
 
 export const state = {
 	initialized: false,
@@ -173,7 +174,10 @@ export async function initializeAuthenticatedFeatures(
 			});
 	}
 
-	if (settingsStore.isDataTableFeatureEnabled) {
+	if (
+		settingsStore.isDataTableFeatureEnabled &&
+		hasPermission(['rbac'], { rbac: { scope: 'dataTable:list' } })
+	) {
 		void dataTableStore
 			.fetchDataTableSize()
 			.then(({ quotaStatus }) => {
diff --git a/packages/frontend/editor-ui/src/app/router.ts b/packages/frontend/editor-ui/src/app/router.ts
index a0090104f4d..3ee612ec785 100644
--- a/packages/frontend/editor-ui/src/app/router.ts
+++ b/packages/frontend/editor-ui/src/app/router.ts
@@ -686,7 +686,12 @@ export const routes: RouteRecordRaw[] = [
 					settingsView: SettingsApiView,
 				},
 				meta: {
-					middleware: ['authenticated'],
+					middleware: ['authenticated', 'rbac'],
+					middlewareOptions: {
+						rbac: {
+							scope: ['apiKey:manage'],
+						},
+					},
 					telemetry: {
 						pageCategory: 'settings',
 						getProperties() {
diff --git a/packages/frontend/editor-ui/src/app/stores/rbac.store.ts b/packages/frontend/editor-ui/src/app/stores/rbac.store.ts
index 7eb28b01c4a..93abc502349 100644
--- a/packages/frontend/editor-ui/src/app/stores/rbac.store.ts
+++ b/packages/frontend/editor-ui/src/app/stores/rbac.store.ts
@@ -48,6 +48,7 @@ export const useRBACStore = defineStore(STORES.RBAC, () => {
 		chatHub: {},
 		chatHubAgent: {},
 		breakingChanges: {},
+		apiKey: {},
 	});
 
 	function addGlobalRole(role: Role) {
diff --git a/packages/frontend/editor-ui/src/app/stores/ui.store.ts b/packages/frontend/editor-ui/src/app/stores/ui.store.ts
index b4f4f6491c7..b50eb880060 100644
--- a/packages/frontend/editor-ui/src/app/stores/ui.store.ts
+++ b/packages/frontend/editor-ui/src/app/stores/ui.store.ts
@@ -401,7 +401,7 @@ export const useUIStore = defineStore(STORES.UI, () => {
 		const items: IMenuItem[] = [];
 		Object.entries(registeredSettingsPages.value).forEach(([moduleName, moduleItems]) => {
 			if (settingsStore.isModuleActive(moduleName)) {
-				items.push(...moduleItems.map((item) => ({ ...item, available: true })));
+				items.push(...moduleItems.map((item) => ({ available: true, ...item })));
 			}
 		});
 		return items;
diff --git a/packages/frontend/editor-ui/src/app/utils/rbac/checks/hasRole.test.ts b/packages/frontend/editor-ui/src/app/utils/rbac/checks/hasRole.test.ts
index cadee68992f..8966c57c769 100644
--- a/packages/frontend/editor-ui/src/app/utils/rbac/checks/hasRole.test.ts
+++ b/packages/frontend/editor-ui/src/app/utils/rbac/checks/hasRole.test.ts
@@ -19,6 +19,17 @@ describe('Checks', () => {
 			expect(hasRole([ROLE.Owner])).toBe(true);
 		});
 
+		it('should return true if the user has specified chat user role', () => {
+			vi.mocked(useUsersStore).mockReturnValue({
+				currentUser: {
+					isDefaultUser: false,
+					role: ROLE.ChatUser,
+				},
+			} as ReturnType<typeof useUsersStore>);
+
+			expect(hasRole([ROLE.ChatUser])).toBe(true);
+		});
+
 		it('should return false if the user does not have the specified role', () => {
 			vi.mocked(useUsersStore).mockReturnValue({
 				currentUser: {
diff --git a/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatConversationHeader.vue b/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatConversationHeader.vue
index a76af0a05f2..44e303b7620 100644
--- a/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatConversationHeader.vue
+++ b/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatConversationHeader.vue
@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import { hasPermission } from '@/app/utils/rbac/permissions';
 import type { CredentialsMap } from '@/features/ai/chatHub/chat.types';
 import ChatSidebarOpener from '@/features/ai/chatHub/components/ChatSidebarOpener.vue';
 import ModelSelector from '@/features/ai/chatHub/components/ModelSelector.vue';
@@ -13,7 +14,7 @@ import type {
 } from '@n8n/api-types';
 import { N8nButton, N8nIconButton } from '@n8n/design-system';
 import { useI18n } from '@n8n/i18n';
-import { useTemplateRef } from 'vue';
+import { computed, useTemplateRef } from 'vue';
 import { useRouter } from 'vue-router';
 
 const { selectedModel, credentials, readyToShowModelSelector } = defineProps<{
@@ -36,6 +37,19 @@ const router = useRouter();
 const modelSelectorRef = useTemplateRef('modelSelectorRef');
 const i18n = useI18n();
 
+const showOpenWorkflow = computed(() => {
+	return (
+		selectedModel?.model.provider === 'n8n' &&
+		hasPermission(['rbac'], { rbac: { scope: 'workflow:read' } })
+	);
+});
+
+function onOpenWorkflow() {
+	if (selectedModel?.model.provider === 'n8n') {
+		emit('openWorkflow', selectedModel.model.workflowId);
+	}
+}
+
 function onModelChange(selection: ChatHubConversationModel) {
 	emit('selectModel', selection);
 }
@@ -90,13 +104,13 @@ defineExpose({
 			@click="emit('editCustomAgent', selectedModel.model.agentId)"
 		/>
 		<N8nButton
-			v-if="selectedModel?.model.provider === 'n8n'"
+			v-if="showOpenWorkflow"
 			:class="$style.editAgent"
 			type="secondary"
 			size="small"
 			icon="settings"
 			:label="i18n.baseText('chatHub.chat.header.button.openWorkflow')"
-			@click="emit('openWorkflow', selectedModel.model.workflowId)"
+			@click="onOpenWorkflow"
 		/>
 	</div>
 </template>
diff --git a/packages/frontend/editor-ui/src/features/ai/chatHub/components/CredentialSelectorModal.vue b/packages/frontend/editor-ui/src/features/ai/chatHub/components/CredentialSelectorModal.vue
index 4f1823db3c6..58e7ffaf963 100644
--- a/packages/frontend/editor-ui/src/features/ai/chatHub/components/CredentialSelectorModal.vue
+++ b/packages/frontend/editor-ui/src/features/ai/chatHub/components/CredentialSelectorModal.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { ref, computed } from 'vue';
-import { N8nButton, N8nHeading, N8nIconButton, N8nText } from '@n8n/design-system';
+import { N8nButton, N8nHeading, N8nText } from '@n8n/design-system';
 import Modal from '@/app/components/Modal.vue';
 import { createEventBus } from '@n8n/utils/event-bus';
 import { type ChatHubLLMProvider, PROVIDER_CREDENTIAL_TYPE_MAP } from '@n8n/api-types';
@@ -8,10 +8,6 @@ import { providerDisplayNames } from '@/features/ai/chatHub/constants';
 import CredentialIcon from '@/features/credentials/components/CredentialIcon.vue';
 import CredentialPicker from '@/features/credentials/components/CredentialPicker/CredentialPicker.vue';
 import { useI18n } from '@n8n/i18n';
-import { useCredentialsStore } from '@/features/credentials/credentials.store';
-import { useMessage } from '@/app/composables/useMessage';
-import { useToast } from '@/app/composables/useToast';
-import { MODAL_CONFIRM } from '@/app/constants';
 
 const props = defineProps<{
 	modalName: string;
@@ -24,21 +20,11 @@ const props = defineProps<{
 }>();
 
 const i18n = useI18n();
-const message = useMessage();
-const toast = useToast();
-const credentialsStore = useCredentialsStore();
 const modalBus = ref(createEventBus());
 const selectedCredentialId = ref<string | null>(props.data.initialValue);
 
 const credentialType = computed(() => PROVIDER_CREDENTIAL_TYPE_MAP[props.data.provider]);
 
-const selectedCredential = computed(() => {
-	if (!selectedCredentialId.value) {
-		return null;
-	}
-	return credentialsStore.getCredentialById(selectedCredentialId.value);
-});
-
 function onCredentialSelect(credentialId: string) {
 	selectedCredentialId.value = credentialId;
 }
@@ -47,43 +33,15 @@ function onCredentialDeselect() {
 	selectedCredentialId.value = null;
 }
 
-async function onDeleteCredential() {
-	if (!selectedCredential.value) {
+function onDeleteCredential(credentialId: string) {
+	if (!selectedCredentialId.value || credentialId !== selectedCredentialId.value) {
 		return;
 	}
 
-	const credentialIdToDelete = selectedCredential.value.id;
+	selectedCredentialId.value = null;
 
-	const deleteConfirmed = await message.confirm(
-		i18n.baseText('credentialEdit.credentialEdit.confirmMessage.deleteCredential.message', {
-			interpolate: { savedCredentialName: selectedCredential.value.name },
-		}),
-		i18n.baseText('credentialEdit.credentialEdit.confirmMessage.deleteCredential.headline'),
-		{
-			confirmButtonText: i18n.baseText(
-				'credentialEdit.credentialEdit.confirmMessage.deleteCredential.confirmButtonText',
-			),
-		},
-	);
-
-	if (deleteConfirmed !== MODAL_CONFIRM) {
-		return;
-	}
-
-	try {
-		await credentialsStore.deleteCredential({ id: credentialIdToDelete });
-		selectedCredentialId.value = null;
-
-		if (credentialIdToDelete === props.data.initialValue) {
-			props.data.onSelect(props.data.provider, null);
-		}
-
-		modalBus.value.emit('close');
-	} catch (error) {
-		toast.showError(
-			error,
-			i18n.baseText('credentialEdit.credentialEdit.showError.deleteCredential.title'),
-		);
+	if (credentialId === props.data.initialValue) {
+		props.data.onSelect(props.data.provider, null);
 	}
 }
 
@@ -143,18 +101,11 @@ function onCancel() {
 						:app-name="providerDisplayNames[data.provider]"
 						:credential-type="credentialType"
 						:selected-credential-id="selectedCredentialId"
+						:show-delete="true"
 						:hide-create-new="true"
 						@credential-selected="onCredentialSelect"
 						@credential-deselected="onCredentialDeselect"
-					/>
-					<N8nIconButton
-						v-if="selectedCredentialId"
-						native-type="button"
-						:title="i18n.baseText('chatHub.credentials.selector.deleteButton')"
-						icon="trash-2"
-						icon-size="large"
-						type="secondary"
-						@click="onDeleteCredential"
+						@credential-deleted="onDeleteCredential"
 					/>
 				</div>
 			</div>
diff --git a/packages/frontend/editor-ui/src/features/ai/chatHub/components/ModelSelector.vue b/packages/frontend/editor-ui/src/features/ai/chatHub/components/ModelSelector.vue
index 8a716d51283..2f8751a8b52 100644
--- a/packages/frontend/editor-ui/src/features/ai/chatHub/components/ModelSelector.vue
+++ b/packages/frontend/editor-ui/src/features/ai/chatHub/components/ModelSelector.vue
@@ -37,6 +37,8 @@ import { fetchChatModelsApi } from '@/features/ai/chatHub/chat.api';
 import { useRootStore } from '@n8n/stores/useRootStore';
 import { useTelemetry } from '@/app/composables/useTelemetry';
 import { useSettingsStore } from '@/app/stores/settings.store';
+import { getResourcePermissions } from '@n8n/permissions';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
 import { truncateBeforeLast } from '@n8n/utils';
 
 const NEW_AGENT_MENU_ID = 'agent::new';
@@ -76,6 +78,7 @@ const dropdownRef = useTemplateRef('dropdownRef');
 const uiStore = useUIStore();
 const settingStore = useSettingsStore();
 const credentialsStore = useCredentialsStore();
+const projectStore = useProjectsStore();
 const telemetry = useTelemetry();
 
 const credentialsName = computed(() =>
@@ -236,11 +239,15 @@ const selectedLabel = computed(
 	() => selectedAgent?.name ?? i18n.baseText('chatHub.models.selector.defaultLabel'),
 );
 
+const canCreateCredentials = computed(() => {
+	return getResourcePermissions(projectStore.personalProject?.scopes).credential.create;
+});
+
 function openCredentialsSelectorOrCreate(provider: ChatHubLLMProvider) {
 	const credentialType = PROVIDER_CREDENTIAL_TYPE_MAP[provider];
 	const existingCredentials = credentialsStore.getCredentialsByType(credentialType);
 
-	if (existingCredentials.length === 0) {
+	if (existingCredentials.length === 0 && canCreateCredentials.value) {
 		uiStore.openNewCredential(credentialType);
 		return;
 	}
diff --git a/packages/frontend/editor-ui/src/features/ai/chatHub/components/ToolsSelectorModal.vue b/packages/frontend/editor-ui/src/features/ai/chatHub/components/ToolsSelectorModal.vue
index b8900b2413d..b87067e1a2d 100644
--- a/packages/frontend/editor-ui/src/features/ai/chatHub/components/ToolsSelectorModal.vue
+++ b/packages/frontend/editor-ui/src/features/ai/chatHub/components/ToolsSelectorModal.vue
@@ -1,6 +1,14 @@
 <script setup lang="ts">
 import { ref, computed, watch, onMounted } from 'vue';
-import { N8nButton, N8nHeading, N8nIcon, N8nOption, N8nSelect, N8nText } from '@n8n/design-system';
+import {
+	N8nButton,
+	N8nHeading,
+	N8nIcon,
+	N8nOption,
+	N8nSelect,
+	N8nText,
+	N8nTooltip,
+} from '@n8n/design-system';
 import Modal from '@/app/components/Modal.vue';
 import NodeIcon from '@/app/components/NodeIcon.vue';
 import { useCredentialsStore } from '@/features/credentials/credentials.store';
@@ -13,6 +21,8 @@ import { ElSwitch } from 'element-plus';
 import { useUIStore } from '@/app/stores/ui.store';
 import { useNodeTypesStore } from '@/app/stores/nodeTypes.store';
 import { useI18n } from '@n8n/i18n';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
+import { getResourcePermissions } from '@n8n/permissions';
 
 const props = defineProps<{
 	modalName: string;
@@ -26,8 +36,13 @@ const i18n = useI18n();
 const modalBus = ref(createEventBus());
 const credentialsStore = useCredentialsStore();
 const nodeTypesStore = useNodeTypesStore();
+const projectStore = useProjectsStore();
 const uiStore = useUIStore();
 
+const canCreateCredentials = computed(() => {
+	return getResourcePermissions(projectStore.personalProject?.scopes).credential.create;
+});
+
 const selectedByProvider = ref<Record<ChatHubAgentTool, Set<string>>>({
 	[JINA_AI_TOOL_NODE_TYPE]: new Set(),
 });
@@ -250,9 +265,22 @@ onMounted(async () => {
 									:label="c.name"
 								/>
 							</N8nSelect>
-							<N8nButton size="medium" type="secondary" @click="onCreateNewCredential(key)">
-								{{ i18n.baseText('chatHub.tools.editor.credential.new') }}
-							</N8nButton>
+							<N8nTooltip
+								placement="left"
+								:disabled="canCreateCredentials"
+								:content="
+									i18n.baseText('chatHub.tools.editor.credential.createNew.permissionDenied')
+								"
+							>
+								<N8nButton
+									size="medium"
+									type="secondary"
+									:disabled="!canCreateCredentials"
+									@click="onCreateNewCredential(key)"
+								>
+									{{ i18n.baseText('chatHub.tools.editor.credential.createNew') }}
+								</N8nButton>
+							</N8nTooltip>
 						</div>
 					</div>
 
diff --git a/packages/frontend/editor-ui/src/features/ai/chatHub/module.descriptor.ts b/packages/frontend/editor-ui/src/features/ai/chatHub/module.descriptor.ts
index 2bee76773ad..fe5cc5b2292 100644
--- a/packages/frontend/editor-ui/src/features/ai/chatHub/module.descriptor.ts
+++ b/packages/frontend/editor-ui/src/features/ai/chatHub/module.descriptor.ts
@@ -11,11 +11,13 @@ import {
 	CHAT_PROVIDER_SETTINGS_MODAL_KEY,
 } from '@/features/ai/chatHub/constants';
 import { i18n } from '@n8n/i18n';
-import SettingsChatHubView from './SettingsChatHubView.vue';
+import { hasPermission } from '@/app/utils/rbac/permissions';
 
 const ChatSidebar = async () => await import('@/features/ai/chatHub/components/ChatSidebar.vue');
 const ChatView = async () => await import('@/features/ai/chatHub/ChatView.vue');
 const ChatAgentsView = async () => await import('@/features/ai/chatHub/ChatAgentsView.vue');
+const SettingsChatHubView = async () =>
+	await import('@/features/ai/chatHub/SettingsChatHubView.vue');
 
 export const ChatModule: FrontendModuleDescription = {
 	id: 'chat-hub',
@@ -175,6 +177,9 @@ export const ChatModule: FrontendModuleDescription = {
 			label: i18n.baseText('settings.chatHub'),
 			position: 'top',
 			route: { to: { name: CHAT_SETTINGS_VIEW } },
+			get available() {
+				return hasPermission(['rbac'], { rbac: { scope: 'chatHub:manage' } });
+			},
 		},
 	],
 };
diff --git a/packages/frontend/editor-ui/src/features/ai/mcpAccess/module.descriptor.ts b/packages/frontend/editor-ui/src/features/ai/mcpAccess/module.descriptor.ts
index dd2b68f8963..5b04a6fd282 100644
--- a/packages/frontend/editor-ui/src/features/ai/mcpAccess/module.descriptor.ts
+++ b/packages/frontend/editor-ui/src/features/ai/mcpAccess/module.descriptor.ts
@@ -1,6 +1,7 @@
 import { useI18n } from '@n8n/i18n';
 import { type FrontendModuleDescription } from '@/app/moduleInitializer/module.types';
 import { MCP_SETTINGS_VIEW } from '@/features/ai/mcpAccess/mcp.constants';
+import { hasPermission } from '@/app/utils/rbac/permissions';
 
 const i18n = useI18n();
 
@@ -33,6 +34,11 @@ export const MCPModule: FrontendModuleDescription = {
 			label: i18n.baseText('settings.mcp'),
 			position: 'top',
 			route: { to: { name: MCP_SETTINGS_VIEW } },
+			get available() {
+				return hasPermission(['rbac'], {
+					rbac: { scope: ['mcp:oauth', 'mcpApiKey:create', 'mcpApiKey:rotate'] },
+				});
+			},
 		},
 	],
 };
diff --git a/packages/frontend/editor-ui/src/features/collaboration/projects/projects.routes.ts b/packages/frontend/editor-ui/src/features/collaboration/projects/projects.routes.ts
index 004a5f06169..864071f7fc0 100644
--- a/packages/frontend/editor-ui/src/features/collaboration/projects/projects.routes.ts
+++ b/packages/frontend/editor-ui/src/features/collaboration/projects/projects.routes.ts
@@ -3,6 +3,9 @@ import { VIEWS } from '@/app/constants';
 import { useProjectsStore } from './projects.store';
 import { getResourcePermissions } from '@n8n/permissions';
 import { useInsightsStore } from '@/features/execution/insights/insights.store';
+import { CHAT_VIEW } from '@/features/ai/chatHub/constants';
+import { hasRole } from '@/app/utils/rbac/checks';
+import { useSettingsStore } from '@/app/stores/settings.store';
 
 const MainSidebar = async () => await import('@/app/components/MainSidebar.vue');
 const WorkflowsView = async () => await import('@/app/views/WorkflowsView.vue');
@@ -180,16 +183,24 @@ export const projectsRoutes: RouteRecordRaw[] = [
 		},
 		redirect: '/home/workflows',
 		beforeEnter: (_to, _from, next) => {
+			const settingsStore = useSettingsStore();
+			if (settingsStore.isChatFeatureEnabled && hasRole(['global:chatUser'])) {
+				// Prevent Chat users from accessing the home view
+				return next({ name: CHAT_VIEW });
+			}
+
 			const insightsStore = useInsightsStore();
 			if (insightsStore.isSummaryEnabled) {
 				// refresh the weekly summary when entering the home route
 				void insightsStore.weeklySummary.execute();
 			}
+
 			next();
 		},
 		children: commonChildRoutes.map((route, idx) => ({
 			...route,
 			name: commonChildRouteExtensions.home[idx].name,
+			middleware: ['authenticated'],
 		})),
 	},
 	{
diff --git a/packages/frontend/editor-ui/src/features/core/auth/views/SettingsPersonalView.vue b/packages/frontend/editor-ui/src/features/core/auth/views/SettingsPersonalView.vue
index da8ef43c731..ad8b0a96465 100644
--- a/packages/frontend/editor-ui/src/features/core/auth/views/SettingsPersonalView.vue
+++ b/packages/frontend/editor-ui/src/features/core/auth/views/SettingsPersonalView.vue
@@ -131,6 +131,10 @@ const roles = computed<Record<Role, RoleContent>>(() => ({
 		name: i18n.baseText('auth.roles.member'),
 		description: i18n.baseText('settings.personal.role.tooltip.member'),
 	},
+	[ROLE.ChatUser]: {
+		name: i18n.baseText('auth.roles.chatUser'),
+		description: i18n.baseText('settings.personal.role.tooltip.chatUser'),
+	},
 	[ROLE.Admin]: {
 		name: i18n.baseText('auth.roles.admin'),
 		description: i18n.baseText('settings.personal.role.tooltip.admin'),
diff --git a/packages/frontend/editor-ui/src/features/credentials/components/CredentialPicker/CredentialPicker.vue b/packages/frontend/editor-ui/src/features/credentials/components/CredentialPicker/CredentialPicker.vue
index 3940ce4f7e7..7c997858140 100644
--- a/packages/frontend/editor-ui/src/features/credentials/components/CredentialPicker/CredentialPicker.vue
+++ b/packages/frontend/editor-ui/src/features/credentials/components/CredentialPicker/CredentialPicker.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { computed, ref } from 'vue';
+import { computed, ref, watch } from 'vue';
 import { listenForModalChanges, useUIStore } from '@/app/stores/ui.store';
 import { listenForCredentialChanges, useCredentialsStore } from '../../credentials.store';
 import { assert } from '@n8n/utils/assert';
@@ -7,11 +7,18 @@ import CredentialsDropdown from './CredentialsDropdown.vue';
 import { useI18n } from '@n8n/i18n';
 import { CREDENTIAL_EDIT_MODAL_KEY } from '../../credentials.constants';
 
-import { N8nButton, N8nIconButton } from '@n8n/design-system';
+import { N8nButton, N8nIconButton, N8nTooltip } from '@n8n/design-system';
+import { getResourcePermissions } from '@n8n/permissions';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
+import { useToast } from '@/app/composables/useToast';
+import type { ICredentialsDecryptedResponse, ICredentialsResponse } from '../../credentials.types';
+import { useMessage } from '@/app/composables/useMessage';
+import { MODAL_CONFIRM } from '@/app/constants';
 const props = defineProps<{
 	appName: string;
 	credentialType: string;
 	selectedCredentialId: string | null;
+	showDelete?: boolean;
 	hideCreateNew?: boolean;
 }>();
 
@@ -19,13 +26,18 @@ const emit = defineEmits<{
 	credentialSelected: [credentialId: string];
 	credentialDeselected: [];
 	credentialModalOpened: [];
+	credentialDeleted: [credentialId: string];
 }>();
 
 const uiStore = useUIStore();
 const credentialsStore = useCredentialsStore();
+const projectsStore = useProjectsStore();
 const i18n = useI18n();
+const toast = useToast();
+const message = useMessage();
 
 const wasModalOpenedFromHere = ref(false);
+const currentCredential = ref<ICredentialsResponse | ICredentialsDecryptedResponse | null>(null);
 
 const availableCredentials = computed(() => {
 	const credByType = credentialsStore.getCredentialsByType(props.credentialType);
@@ -44,6 +56,46 @@ const credentialOptions = computed(() => {
 	}));
 });
 
+async function loadCurrentCredential() {
+	if (!props.selectedCredentialId) {
+		return;
+	}
+
+	try {
+		const currentCredentials = await credentialsStore.getCredentialData({
+			id: props.selectedCredentialId,
+		});
+
+		if (!currentCredentials) {
+			throw new Error(
+				i18n.baseText('credentialEdit.credentialEdit.couldNotFindCredentialWithId') +
+					':' +
+					props.selectedCredentialId,
+			);
+		}
+
+		currentCredential.value = currentCredentials;
+	} catch (error) {
+		toast.showError(
+			error,
+			i18n.baseText('credentialEdit.credentialEdit.showError.loadCredential.title'),
+		);
+
+		return;
+	}
+}
+
+const homeProject = computed(() => {
+	const { currentProject, personalProject } = projectsStore;
+	return currentProject ?? personalProject;
+});
+
+const credentialPermissions = computed(() => {
+	return getResourcePermissions(
+		(currentCredential.value as ICredentialsResponse)?.scopes ?? homeProject.value?.scopes,
+	).credential;
+});
+
 const onCredentialSelected = (credentialId: string) => {
 	emit('credentialSelected', credentialId);
 };
@@ -58,6 +110,40 @@ const editCredential = () => {
 	wasModalOpenedFromHere.value = true;
 	emit('credentialModalOpened');
 };
+const deleteCredential = async () => {
+	assert(props.selectedCredentialId);
+
+	const credentialIdToDelete = props.selectedCredentialId;
+
+	const deleteConfirmed = await message.confirm(
+		i18n.baseText('credentialEdit.credentialEdit.confirmMessage.deleteCredential.message', {
+			interpolate: {
+				savedCredentialName: currentCredential.value?.name ?? props.selectedCredentialId,
+			},
+		}),
+		i18n.baseText('credentialEdit.credentialEdit.confirmMessage.deleteCredential.headline'),
+		{
+			confirmButtonText: i18n.baseText(
+				'credentialEdit.credentialEdit.confirmMessage.deleteCredential.confirmButtonText',
+			),
+		},
+	);
+
+	if (deleteConfirmed !== MODAL_CONFIRM) {
+		return;
+	}
+
+	try {
+		await credentialsStore.deleteCredential({ id: credentialIdToDelete });
+		currentCredential.value = null;
+		emit('credentialDeleted', credentialIdToDelete);
+	} catch (error) {
+		toast.showError(
+			error,
+			i18n.baseText('credentialEdit.credentialEdit.showError.deleteCredential.title'),
+		);
+	}
+};
 
 listenForCredentialChanges({
 	store: credentialsStore,
@@ -96,6 +182,14 @@ listenForModalChanges({
 		}
 	},
 });
+
+watch(
+	() => props.selectedCredentialId,
+	() => {
+		void loadCurrentCredential();
+	},
+	{ immediate: true },
+);
 </script>
 
 <template>
@@ -106,27 +200,53 @@ listenForModalChanges({
 				:credential-options="credentialOptions"
 				:selected-credential-id="props.selectedCredentialId"
 				data-test-id="credential-dropdown"
+				:permissions="credentialPermissions"
 				@credential-selected="onCredentialSelected"
 				@new-credential="createNewCredential"
 			/>
 
-			<N8nIconButton
-				icon="pen"
-				type="secondary"
-				:class="{
-					[$style.edit]: true,
-					[$style.invisible]: !props.selectedCredentialId,
-				}"
-				:title="i18n.baseText('nodeCredentials.updateCredential')"
-				data-test-id="credential-edit-button"
-				@click="editCredential()"
-			/>
+			<N8nTooltip
+				:disabled="credentialPermissions.update"
+				:content="i18n.baseText('nodeCredentials.updateCredential.permissionDenied')"
+				:placement="'top'"
+			>
+				<N8nIconButton
+					icon="pen"
+					type="secondary"
+					:class="{
+						[$style.edit]: true,
+						[$style.invisible]: !props.selectedCredentialId,
+					}"
+					:title="i18n.baseText('nodeCredentials.updateCredential')"
+					data-test-id="credential-edit-button"
+					:disabled="!credentialPermissions.update"
+					@click="editCredential()"
+				/>
+			</N8nTooltip>
+
+			<N8nTooltip
+				:disabled="credentialPermissions.update"
+				:content="i18n.baseText('nodeCredentials.deleteCredential.permissionDenied')"
+				:placement="'top'"
+			>
+				<N8nIconButton
+					v-if="props.showDelete && props.selectedCredentialId"
+					native-type="button"
+					:title="i18n.baseText('nodeCredentials.deleteCredential')"
+					icon="trash-2"
+					icon-size="large"
+					type="secondary"
+					:disabled="!credentialPermissions.delete"
+					@click="deleteCredential()"
+				/>
+			</N8nTooltip>
 		</div>
 
 		<N8nButton
 			v-else-if="!props.hideCreateNew"
 			:label="`Create new ${props.appName} credential`"
 			data-test-id="create-credential"
+			:disabled="!credentialPermissions.create"
 			@click="createNewCredential"
 		/>
 	</div>
@@ -135,6 +255,7 @@ listenForModalChanges({
 <style lang="scss" module>
 .dropdown {
 	display: flex;
+	gap: var(--spacing--2xs);
 }
 
 .edit {
@@ -142,7 +263,6 @@ listenForModalChanges({
 	justify-content: center;
 	align-items: center;
 	min-width: 20px;
-	margin-left: var(--spacing--2xs);
 	font-size: var(--font-size--sm);
 }
 
diff --git a/packages/frontend/editor-ui/src/features/credentials/components/CredentialPicker/CredentialsDropdown.vue b/packages/frontend/editor-ui/src/features/credentials/components/CredentialPicker/CredentialsDropdown.vue
index 304704b0494..1b852376260 100644
--- a/packages/frontend/editor-ui/src/features/credentials/components/CredentialPicker/CredentialsDropdown.vue
+++ b/packages/frontend/editor-ui/src/features/credentials/components/CredentialPicker/CredentialsDropdown.vue
@@ -1,8 +1,9 @@
 <script setup lang="ts">
 import { useI18n } from '@n8n/i18n';
 
-import { N8nIcon, N8nOption, N8nSelect, N8nText } from '@n8n/design-system';
+import { N8nIcon, N8nOption, N8nSelect, N8nText, N8nTooltip } from '@n8n/design-system';
 import { nextTick, ref } from 'vue';
+import type { PermissionsRecord } from '@n8n/permissions';
 export type CredentialOption = {
 	id: string;
 	name: string;
@@ -12,6 +13,7 @@ export type CredentialOption = {
 const props = defineProps<{
 	credentialOptions: CredentialOption[];
 	selectedCredentialId: string | null;
+	permissions: PermissionsRecord['credential'];
 }>();
 
 const emit = defineEmits<{
@@ -58,15 +60,22 @@ const onCreateNewCredential = async () => {
 		</N8nOption>
 		<template #empty> </template>
 		<template #footer>
-			<button
-				type="button"
-				data-test-id="node-credentials-select-item-new"
-				:class="[$style.newCredential]"
-				@click="onCreateNewCredential()"
+			<N8nTooltip
+				:disabled="props.permissions.create"
+				:content="i18n.baseText('nodeCredentials.createNew.permissionDenied')"
+				:placement="'top'"
 			>
-				<N8nIcon size="xsmall" icon="plus" />
-				{{ NEW_CREDENTIALS_TEXT }}
-			</button>
+				<button
+					type="button"
+					data-test-id="node-credentials-select-item-new"
+					:class="[$style.newCredential]"
+					:disabled="!props.permissions.create"
+					@click="onCreateNewCredential()"
+				>
+					<N8nIcon size="xsmall" icon="plus" />
+					{{ NEW_CREDENTIALS_TEXT }}
+				</button>
+			</N8nTooltip>
 		</template>
 	</N8nSelect>
 </template>
diff --git a/packages/frontend/editor-ui/src/features/settings/users/components/InviteUsersModal.vue b/packages/frontend/editor-ui/src/features/settings/users/components/InviteUsersModal.vue
index 61bd2f3a022..a02b5bc0239 100644
--- a/packages/frontend/editor-ui/src/features/settings/users/components/InviteUsersModal.vue
+++ b/packages/frontend/editor-ui/src/features/settings/users/components/InviteUsersModal.vue
@@ -51,48 +51,6 @@ const role = ref<InvitableRoleName>(ROLE.Member);
 const showInviteUrls = ref<IInviteResponse[] | null>(null);
 const loading = ref(false);
 
-onMounted(() => {
-	config.value = [
-		{
-			name: 'emails',
-			properties: {
-				label: i18n.baseText('settings.users.newEmailsToInvite'),
-				required: true,
-				validationRules: [{ name: 'VALID_EMAILS' }],
-				validators: {
-					VALID_EMAILS: {
-						validate: validateEmails,
-					},
-				},
-				placeholder: 'name1@email.com, name2@email.com, ...',
-				capitalize: true,
-				focusInitially: true,
-			},
-		},
-		{
-			name: 'role',
-			initialValue: ROLE.Member,
-			properties: {
-				label: i18n.baseText('auth.role'),
-				required: true,
-				type: 'select',
-				options: [
-					{
-						value: ROLE.Member,
-						label: i18n.baseText('auth.roles.member'),
-					},
-					{
-						value: ROLE.Admin,
-						label: i18n.baseText('auth.roles.admin'),
-						disabled: !isAdvancedPermissionsEnabled.value,
-					},
-				],
-				capitalize: true,
-			},
-		},
-	];
-});
-
 const emailsCount = computed((): number => {
 	return emails.value.split(',').filter((email: string) => !!email.trim()).length;
 });
@@ -126,6 +84,10 @@ const isAdvancedPermissionsEnabled = computed((): boolean => {
 	return settingsStore.isEnterpriseFeatureEnabled[EnterpriseEditionFeature.AdvancedPermissions];
 });
 
+const isChatHubEnabled = computed((): boolean => {
+	return settingsStore.isChatFeatureEnabled;
+});
+
 const validateEmails = (value: string | number | boolean | null | undefined) => {
 	if (typeof value !== 'string') {
 		return false;
@@ -148,7 +110,10 @@ const validateEmails = (value: string | number | boolean | null | undefined) =>
 };
 
 function isInvitableRoleName(val: unknown): val is InvitableRoleName {
-	return typeof val === 'string' && [ROLE.Member, ROLE.Admin].includes(val as InvitableRoleName);
+	return (
+		typeof val === 'string' &&
+		[ROLE.Member, ROLE.Admin, ROLE.ChatUser].includes(val as InvitableRoleName)
+	);
 }
 
 function onInput(e: FormFieldValueUpdate) {
@@ -294,6 +259,56 @@ function getEmail(email: string): string {
 	}
 	return parsed;
 }
+
+onMounted(() => {
+	config.value = [
+		{
+			name: 'emails',
+			properties: {
+				label: i18n.baseText('settings.users.newEmailsToInvite'),
+				required: true,
+				validationRules: [{ name: 'VALID_EMAILS' }],
+				validators: {
+					VALID_EMAILS: {
+						validate: validateEmails,
+					},
+				},
+				placeholder: 'name1@email.com, name2@email.com, ...',
+				capitalize: true,
+				focusInitially: true,
+			},
+		},
+		{
+			name: 'role',
+			initialValue: ROLE.Member,
+			properties: {
+				label: i18n.baseText('auth.role'),
+				required: true,
+				type: 'select',
+				options: [
+					{
+						value: ROLE.Member,
+						label: i18n.baseText('auth.roles.member'),
+					},
+					...(isChatHubEnabled.value
+						? [
+								{
+									value: ROLE.ChatUser,
+									label: i18n.baseText('auth.roles.chatUser'),
+								},
+							]
+						: []),
+					{
+						value: ROLE.Admin,
+						label: i18n.baseText('auth.roles.admin'),
+						disabled: !isAdvancedPermissionsEnabled.value,
+					},
+				],
+				capitalize: true,
+			},
+		},
+	];
+});
 </script>
 
 <template>
diff --git a/packages/frontend/editor-ui/src/features/settings/users/components/SettingsUsersRoleCell.vue b/packages/frontend/editor-ui/src/features/settings/users/components/SettingsUsersRoleCell.vue
index a5b71ddb41e..528a98ed3e1 100644
--- a/packages/frontend/editor-ui/src/features/settings/users/components/SettingsUsersRoleCell.vue
+++ b/packages/frontend/editor-ui/src/features/settings/users/components/SettingsUsersRoleCell.vue
@@ -5,7 +5,7 @@ import { ElRadio } from 'element-plus';
 import { N8nActionDropdown, N8nIcon, N8nText, type ActionDropdownItem } from '@n8n/design-system';
 const props = defineProps<{
 	data: UsersList['items'][number];
-	roles: Record<Role, { label: string; desc: string }>;
+	roles: Partial<Record<Role, { label: string; desc: string }>>;
 	actions: Array<ActionDropdownItem<Role>>;
 }>();
 
@@ -15,7 +15,7 @@ const emit = defineEmits<{
 
 const selectedRole = ref<Role>(props.data.role ?? ROLE.Default);
 const isEditable = computed(() => props.data.role !== ROLE.Owner);
-const roleLabel = computed(() => props.roles[selectedRole.value].label);
+const roleLabel = computed(() => props.roles[selectedRole.value]?.label);
 
 const onActionSelect = (role: Role) => {
 	emit('update:role', {
@@ -49,7 +49,7 @@ const onActionSelect = (role: Role) => {
 					<span :class="$style.radioLabel">
 						<N8nText color="text-dark" class="pb-3xs">{{ item.label }}</N8nText>
 						<N8nText color="text-dark" size="small">{{
-							props.roles[item.id as Role].desc
+							props.roles[item.id as Role]?.desc
 						}}</N8nText>
 					</span>
 				</ElRadio>
diff --git a/packages/frontend/editor-ui/src/features/settings/users/components/SettingsUsersTable.vue b/packages/frontend/editor-ui/src/features/settings/users/components/SettingsUsersTable.vue
index dad27a92a94..42c35cdb369 100644
--- a/packages/frontend/editor-ui/src/features/settings/users/components/SettingsUsersTable.vue
+++ b/packages/frontend/editor-ui/src/features/settings/users/components/SettingsUsersTable.vue
@@ -18,9 +18,11 @@ import {
 	type ActionDropdownItem,
 	type UserAction,
 } from '@n8n/design-system';
+import { useSettingsStore } from '@/app/stores/settings.store';
 type Item = UsersList['items'][number];
 
 const i18n = useI18n();
+const settingsStore = useSettingsStore();
 
 const props = defineProps<{
 	data: UsersList;
@@ -99,7 +101,7 @@ const headers = ref<Array<TableHeader<Item>>>([
 	},
 ]);
 
-const roles = computed<Record<Role, { label: string; desc: string }>>(() => ({
+const roles = computed<Partial<Record<Role, { label: string; desc: string }>>>(() => ({
 	[ROLE.Owner]: { label: i18n.baseText('auth.roles.owner'), desc: '' },
 	[ROLE.Admin]: {
 		label: i18n.baseText('auth.roles.admin'),
@@ -109,13 +111,28 @@ const roles = computed<Record<Role, { label: string; desc: string }>>(() => ({
 		label: i18n.baseText('auth.roles.member'),
 		desc: i18n.baseText('settings.users.table.row.role.description.member'),
 	},
+	...(settingsStore.isChatFeatureEnabled && {
+		[ROLE.ChatUser]: {
+			label: i18n.baseText('auth.roles.chatUser'),
+			desc: i18n.baseText('settings.users.table.row.role.description.chatUser'),
+		},
+	}),
 	[ROLE.Default]: { label: i18n.baseText('auth.roles.default'), desc: '' },
 }));
+
 const roleActions = computed<Array<ActionDropdownItem<Role>>>(() => [
 	{
 		id: ROLE.Member,
 		label: i18n.baseText('auth.roles.member'),
 	},
+	...(settingsStore.isChatFeatureEnabled
+		? [
+				{
+					id: ROLE.ChatUser,
+					label: i18n.baseText('auth.roles.chatUser'),
+				},
+			]
+		: []),
 	{
 		id: ROLE.Admin,
 		label: i18n.baseText('auth.roles.admin'),
@@ -168,7 +185,7 @@ const onRoleChange = ({ role, userId }: { role: string; userId: string }) => {
 					:actions="roleActions"
 					@update:role="onRoleChange"
 				/>
-				<N8nText v-else color="text-dark">{{ roles[item.role ?? ROLE.Default].label }}</N8nText>
+				<N8nText v-else color="text-dark">{{ roles[item.role ?? ROLE.Default]?.label }}</N8nText>
 			</template>
 			<template #[`item.lastActiveAt`]="{ item }">
 				<SettingsUsersLastActiveCell :data="item" />
diff --git a/packages/frontend/editor-ui/src/features/settings/users/users.store.ts b/packages/frontend/editor-ui/src/features/settings/users/users.store.ts
index 0e1245205a2..d7effdf7bd5 100644
--- a/packages/frontend/editor-ui/src/features/settings/users/users.store.ts
+++ b/packages/frontend/editor-ui/src/features/settings/users/users.store.ts
@@ -31,6 +31,7 @@ import { computed, ref } from 'vue';
 import { useSettingsStore } from '@/app/stores/settings.store';
 import * as onboardingApi from '@/app/api/workflow-webhooks';
 import * as promptsApi from '@n8n/rest-api-client/api/prompts';
+import { hasPermission } from '@/app/utils/rbac/permissions';
 
 const _isPendingUser = (user: IUserResponse | null) => !!user?.isPending;
 const _isInstanceOwner = (user: IUserResponse | null) => user?.role === ROLE.Owner;
@@ -320,6 +321,10 @@ export const useUsersStore = defineStore(STORES.USERS, () => {
 	};
 
 	const fetchUsers = async () => {
+		if (!hasPermission(['rbac'], { rbac: { scope: 'user:list' } })) {
+			return;
+		}
+
 		const { items } = await usersApi.getUsers(rootStore.restApiContext, { take: -1, skip: 0 });
 		addUsers(items);
 	};
diff --git a/packages/frontend/editor-ui/src/features/settings/users/users.types.ts b/packages/frontend/editor-ui/src/features/settings/users/users.types.ts
index 9d66e66100c..cdd51e49d32 100644
--- a/packages/frontend/editor-ui/src/features/settings/users/users.types.ts
+++ b/packages/frontend/editor-ui/src/features/settings/users/users.types.ts
@@ -3,7 +3,7 @@ import type { Role, ROLE } from '@n8n/api-types';
 
 export type ILogInStatus = 'LoggedIn' | 'LoggedOut';
 
-export type InvitableRoleName = (typeof ROLE)['Member' | 'Admin'];
+export type InvitableRoleName = (typeof ROLE)['Member' | 'Admin' | 'ChatUser'];
 
 export interface IInviteResponse {
 	user: {
diff --git a/packages/frontend/editor-ui/src/features/settings/users/views/SettingsUsersView.vue b/packages/frontend/editor-ui/src/features/settings/users/views/SettingsUsersView.vue
index f3ade50745a..b8fc06d4b10 100644
--- a/packages/frontend/editor-ui/src/features/settings/users/views/SettingsUsersView.vue
+++ b/packages/frontend/editor-ui/src/features/settings/users/views/SettingsUsersView.vue
@@ -10,7 +10,7 @@ import {
 } from '@n8n/api-types';
 import type { UserAction } from '@n8n/design-system';
 import type { TableOptions } from '@n8n/design-system/components/N8nDataTableServer';
-import { EnterpriseEditionFeature } from '@/app/constants';
+import { EnterpriseEditionFeature, MODAL_CONFIRM } from '@/app/constants';
 import { DELETE_USER_MODAL_KEY, INVITE_USER_MODAL_KEY } from '../users.constants';
 import EnterpriseEdition from '@/app/components/EnterpriseEdition.ee.vue';
 import type { InvitableRoleName } from '../users.types';
@@ -42,8 +42,11 @@ import {
 	N8nText,
 	N8nTooltip,
 } from '@n8n/design-system';
+import { useMessage } from '@/app/composables/useMessage';
+
 const clipboard = useClipboard();
 const { showToast, showError } = useToast();
+const message = useMessage();
 
 const settingsStore = useSettingsStore();
 const uiStore = useUIStore();
@@ -289,26 +292,50 @@ const onUpdateRole = async (payload: { userId: string; role: Role }) => {
 };
 
 async function onRoleChange(user: User, newRoleName: Role) {
+	if (newRoleName === user.role) return;
+
+	const name =
+		user.firstName && user.lastName ? `${user.firstName} ${user.lastName}` : (user.email ?? '');
+	const role = userRoles.value.find(({ value }) => value === newRoleName)?.label ?? newRoleName;
+
+	if (newRoleName === ROLE.ChatUser) {
+		const confirmed = await message.confirm(
+			i18n.baseText('settings.users.userRoleUpdated.confirm.message', {
+				interpolate: {
+					role,
+				},
+			}),
+			i18n.baseText('settings.users.userRoleUpdated.confirm.title', {
+				interpolate: {
+					user: name,
+				},
+			}),
+			{
+				confirmButtonText: i18n.baseText('settings.users.userRoleUpdated.confirm.button'),
+				cancelButtonText: i18n.baseText('settings.users.userRoleUpdated.cancel.button'),
+			},
+		);
+
+		if (confirmed !== MODAL_CONFIRM) {
+			return;
+		}
+	}
+
 	try {
 		await usersStore.updateGlobalRole({ id: user.id, newRoleName });
 
-		const role = userRoles.value.find(({ value }) => value === newRoleName)?.label || newRoleName;
-
 		showToast({
 			type: 'success',
 			title: i18n.baseText('settings.users.userRoleUpdated'),
 			message: i18n.baseText('settings.users.userRoleUpdated.message', {
 				interpolate: {
-					user:
-						user.firstName && user.lastName
-							? `${user.firstName} ${user.lastName}`
-							: (user.email ?? ''),
+					user: name,
 					role,
 				},
 			}),
 		});
 	} catch (e) {
-		showError(e, i18n.baseText('settings.users.userReinviteError'));
+		showError(e, i18n.baseText('settings.users.userRoleUpdatedError'));
 	}
 }
 
diff --git a/packages/frontend/editor-ui/src/features/shared/tags/tags.store.ts b/packages/frontend/editor-ui/src/features/shared/tags/tags.store.ts
index 89102d16b26..597ae3d9d79 100644
--- a/packages/frontend/editor-ui/src/features/shared/tags/tags.store.ts
+++ b/packages/frontend/editor-ui/src/features/shared/tags/tags.store.ts
@@ -5,6 +5,7 @@ import { defineStore } from 'pinia';
 import { useRootStore } from '@n8n/stores/useRootStore';
 import { computed, ref } from 'vue';
 import { useWorkflowsStore } from '@/app/stores/workflows.store';
+import { hasPermission } from '@/app/utils/rbac/permissions';
 
 const apiMapping = {
 	[STORES.TAGS]: createTagsApi('/tags'),
@@ -74,7 +75,11 @@ const createTagsStore = (id: typeof STORES.TAGS | typeof STORES.ANNOTATION_TAGS)
 			};
 
 			const fetchAll = async (params?: { force?: boolean; withUsageCount?: boolean }) => {
-				const { force = false, withUsageCount = false } = params || {};
+				if (!hasPermission(['rbac'], { rbac: { scope: 'tag:list' } })) {
+					return [];
+				}
+
+				const { force = false, withUsageCount = false } = params ?? {};
 				if (!force && fetchedAll.value && fetchedUsageCount.value === withUsageCount) {
 					return Object.values(tagsById.value);
 				}

From deb4c208b06addb28287c7b264f1f3ad0e0be619 Mon Sep 17 00:00:00 2001
From: Suguru Inoue <suguru@n8n.io>
Date: Wed, 3 Dec 2025 17:29:03 +0100
Subject: [PATCH 037/167] fix(editor): Chat UI feedback (no-changelog) (#22678)

---
 .../NavigationDropdown.vue                    |  3 +-
 .../chatHub/components/AgentEditorModal.vue   | 22 ++++-
 .../ai/chatHub/components/ChatMessage.vue     | 81 ++++++++++++-------
 .../chatHub/components/ChatMessageActions.vue | 24 +-----
 .../ai/chatHub/components/CopyButton.vue      | 48 +++++++++++
 .../ai/chatHub/components/ModelSelector.vue   | 55 +++++++++----
 .../composables/useChatHubMarkdownOptions.ts  | 46 ++++++++++-
 7 files changed, 208 insertions(+), 71 deletions(-)
 create mode 100644 packages/frontend/editor-ui/src/features/ai/chatHub/components/CopyButton.vue

diff --git a/packages/frontend/@n8n/design-system/src/components/N8nNavigationDropdown/NavigationDropdown.vue b/packages/frontend/@n8n/design-system/src/components/N8nNavigationDropdown/NavigationDropdown.vue
index b8a2f58bf7b..701c68e048f 100644
--- a/packages/frontend/@n8n/design-system/src/components/N8nNavigationDropdown/NavigationDropdown.vue
+++ b/packages/frontend/@n8n/design-system/src/components/N8nNavigationDropdown/NavigationDropdown.vue
@@ -33,6 +33,7 @@ defineProps<{
 	menu: Array<Item | Divider>;
 	disabled?: boolean;
 	teleport?: boolean;
+	submenuClass?: string;
 }>();
 
 const menuRef = ref<typeof ElMenu | null>(null);
@@ -91,7 +92,7 @@ defineExpose({
 			:index="ROOT_MENU_INDEX"
 			:class="$style.trigger"
 			:popper-offset="-10"
-			:popper-class="$style.submenu"
+			:popper-class="[$style.submenu, submenuClass ?? ''].join(' ')"
 			:disabled
 			:teleported="teleport"
 		>
diff --git a/packages/frontend/editor-ui/src/features/ai/chatHub/components/AgentEditorModal.vue b/packages/frontend/editor-ui/src/features/ai/chatHub/components/AgentEditorModal.vue
index c9f04b4a3a1..77854c8e4de 100644
--- a/packages/frontend/editor-ui/src/features/ai/chatHub/components/AgentEditorModal.vue
+++ b/packages/frontend/editor-ui/src/features/ai/chatHub/components/AgentEditorModal.vue
@@ -14,7 +14,7 @@ import { N8nButton, N8nHeading, N8nInput, N8nInputLabel, N8nSpinner } from '@n8n
 import { useI18n } from '@n8n/i18n';
 import { assert } from '@n8n/utils/assert';
 import { createEventBus } from '@n8n/utils/event-bus';
-import { computed, ref, watch } from 'vue';
+import { computed, ref, useTemplateRef, watch } from 'vue';
 import type { CredentialsMap } from '../chat.types';
 import type { INode } from 'n8n-workflow';
 import ToolsSelector from './ToolsSelector.vue';
@@ -48,7 +48,9 @@ const systemPrompt = ref('');
 const selectedModel = ref<ChatHubBaseLLMModel | null>(null);
 const isSaving = ref(false);
 const isDeleting = ref(false);
+const isOpened = ref(false);
 const tools = ref<INode[]>([]);
+const nameInputRef = useTemplateRef('nameInput');
 
 const agentSelectedCredentials = ref<CredentialsMap>({});
 const credentialIdForSelectedModelProvider = computed(
@@ -91,6 +93,10 @@ const canSelectTools = computed(
 	() => selectedAgent.value?.metadata.capabilities.functionCalling ?? false,
 );
 
+modalBus.value.once('opened', () => {
+	isOpened.value = true;
+});
+
 // If the agent doesn't support tools anymore, reset tools
 watch(
 	selectedAgent,
@@ -120,6 +126,18 @@ watch(
 	{ immediate: true },
 );
 
+watch(
+	[isOpened, isLoadingAgent, nameInputRef],
+	async ([opened, isLoading, name]) => {
+		if (opened && !isLoading) {
+			// autofocus attribute doesn't work in modal
+			// https://github.com/element-plus/element-plus/issues/15250
+			name?.focus();
+		}
+	},
+	{ immediate: true, flush: 'post' },
+);
+
 function onCredentialSelected(provider: ChatHubProvider, credentialId: string | null) {
 	agentSelectedCredentials.value = {
 		...agentSelectedCredentials.value,
@@ -249,6 +267,7 @@ function onSelectTools() {
 					:required="true"
 				>
 					<N8nInput
+						ref="nameInput"
 						id="agent-name"
 						v-model="name"
 						:placeholder="i18n.baseText('chatHub.agent.editor.name.placeholder')"
@@ -374,6 +393,7 @@ function onSelectTools() {
 .row {
 	display: flex;
 	flex-direction: row;
+	gap: var(--spacing--sm);
 }
 
 .footer {
diff --git a/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatMessage.vue b/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatMessage.vue
index 943e865483b..6e3a6dc18a3 100644
--- a/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatMessage.vue
+++ b/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatMessage.vue
@@ -1,14 +1,11 @@
 <script setup lang="ts">
-import { useClipboard } from '@/app/composables/useClipboard';
 import ChatAgentAvatar from '@/features/ai/chatHub/components/ChatAgentAvatar.vue';
 import ChatTypingIndicator from '@/features/ai/chatHub/components/ChatTypingIndicator.vue';
 import { useChatHubMarkdownOptions } from '@/features/ai/chatHub/composables/useChatHubMarkdownOptions';
 import type { ChatMessageId, ChatModelDto } from '@n8n/api-types';
 import { N8nButton, N8nIcon, N8nInput } from '@n8n/design-system';
 import { useSpeechSynthesis } from '@vueuse/core';
-import type MarkdownIt from 'markdown-it';
-import markdownLink from 'markdown-it-link-attributes';
-import { computed, onBeforeMount, ref, useTemplateRef, watch } from 'vue';
+import { computed, onBeforeMount, ref, useCssModule, useTemplateRef, watch } from 'vue';
 import VueMarkdown from 'vue-markdown-render';
 import type { ChatMessage } from '../chat.types';
 import ChatMessageActions from './ChatMessageActions.vue';
@@ -19,6 +16,7 @@ import { buildChatAttachmentUrl } from '@/features/ai/chatHub/chat.api';
 import { useRootStore } from '@n8n/stores/useRootStore';
 import { useDeviceSupport } from '@n8n/composables/useDeviceSupport';
 import { useI18n } from '@n8n/i18n';
+import CopyButton from '@/features/ai/chatHub/components/CopyButton.vue';
 
 const { message, compact, isEditing, isStreaming, minHeight, cachedAgentDisplayName } =
 	defineProps<{
@@ -41,16 +39,16 @@ const emit = defineEmits<{
 	switchAlternative: [messageId: ChatMessageId];
 }>();
 
-const clipboard = useClipboard();
 const chatStore = useChatStore();
 const rootStore = useRootStore();
 const { isCtrlKeyPressed } = useDeviceSupport();
 const i18n = useI18n();
+const styles = useCssModule();
 
 const editedText = ref('');
+const hoveredCodeBlockActions = ref<HTMLElement | null>(null);
 const textareaRef = useTemplateRef('textarea');
-const justCopied = ref(false);
-const { markdownOptions, forceReRenderKey } = useChatHubMarkdownOptions();
+const markdown = useChatHubMarkdownOptions(styles.codeBlockActions);
 const messageContent = computed(() => message.content);
 
 const speech = useSpeechSynthesis(messageContent, {
@@ -81,14 +79,11 @@ const attachments = computed(() =>
 	})),
 );
 
-async function handleCopy() {
-	const text = message.content;
-	await clipboard.copy(text);
-	justCopied.value = true;
-	setTimeout(() => {
-		justCopied.value = false;
-	}, 1000);
-}
+const hoveredCodeBlockContent = computed(() => {
+	const idx = hoveredCodeBlockActions.value?.getAttribute('data-markdown-token-idx');
+
+	return idx ? markdown.codeBlockContents.value?.get(idx) : undefined;
+});
 
 function handleEdit() {
 	emit('startEdit');
@@ -133,14 +128,18 @@ function handleSwitchAlternative(messageId: ChatMessageId) {
 	emit('switchAlternative', messageId);
 }
 
-const linksNewTabPlugin = (vueMarkdownItInstance: MarkdownIt) => {
-	vueMarkdownItInstance.use(markdownLink, {
-		attrs: {
-			target: '_blank',
-			rel: 'noopener',
-		},
-	});
-};
+function handleMouseMove(e: MouseEvent | FocusEvent) {
+	const container =
+		e.target instanceof HTMLElement || e.target instanceof SVGElement
+			? e.target.closest('pre')?.querySelector(`.${styles.codeBlockActions}`)
+			: null;
+
+	hoveredCodeBlockActions.value = container instanceof HTMLElement ? container : null;
+}
+
+function handleMouseLeave() {
+	hoveredCodeBlockActions.value = null;
+}
 
 // Watch for isEditing prop changes to initialize edit mode
 watch(
@@ -219,7 +218,11 @@ onBeforeMount(() => {
 				</div>
 			</div>
 			<div v-else>
-				<div :class="[$style.chatMessage, { [$style.errorMessage]: message.status === 'error' }]">
+				<div
+					:class="[$style.chatMessage, { [$style.errorMessage]: message.status === 'error' }]"
+					@mousemove="handleMouseMove"
+					@mouseleave="handleMouseLeave"
+				>
 					<div v-if="attachments.length > 0" :class="$style.attachments">
 						<ChatFile
 							v-for="(attachment, index) in attachments"
@@ -232,27 +235,25 @@ onBeforeMount(() => {
 					<div v-if="message.type === 'human'">{{ message.content }}</div>
 					<VueMarkdown
 						v-else
-						:key="forceReRenderKey"
+						:key="markdown.forceReRenderKey"
 						:class="[$style.chatMessageMarkdown, 'chat-message-markdown']"
 						:source="
 							message.status === 'error' && !message.content
 								? i18n.baseText('chatHub.message.error.unknown')
 								: message.content
 						"
-						:options="markdownOptions"
-						:plugins="[linksNewTabPlugin]"
+						:options="markdown.options"
+						:plugins="markdown.plugins.value"
 					/>
 				</div>
 				<ChatTypingIndicator v-if="isStreaming" :class="$style.typingIndicator" />
 				<ChatMessageActions
 					v-else
-					:just-copied="justCopied"
 					:is-speech-synthesis-available="speech.isSupported.value"
 					:is-speaking="speech.isPlaying.value"
 					:class="$style.actions"
 					:message="message"
 					:alternatives="message.alternatives"
-					@copy="handleCopy"
 					@edit="handleEdit"
 					@regenerate="handleRegenerate"
 					@read-aloud="handleReadAloud"
@@ -260,6 +261,12 @@ onBeforeMount(() => {
 				/>
 			</div>
 		</div>
+		<Teleport
+			v-if="hoveredCodeBlockActions && hoveredCodeBlockContent"
+			:to="hoveredCodeBlockActions"
+		>
+			<CopyButton :content="hoveredCodeBlockContent" />
+		</Teleport>
 	</div>
 </template>
 
@@ -400,6 +407,22 @@ onBeforeMount(() => {
 		padding: var(--chat--spacing);
 		background: var(--chat--message--pre--background);
 		border-radius: var(--chat--border-radius);
+		position: relative;
+
+		code:last-of-type {
+			padding-bottom: 0;
+		}
+
+		& .codeBlockActions {
+			position: absolute;
+			top: 0;
+			right: 0;
+			margin: var(--spacing--2xs);
+		}
+
+		& ~ pre {
+			margin-bottom: 1em;
+		}
 	}
 
 	table {
diff --git a/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatMessageActions.vue b/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatMessageActions.vue
index cdbd6e0704f..7a1dc9aa6bc 100644
--- a/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatMessageActions.vue
+++ b/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatMessageActions.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import { VIEWS } from '@/app/constants';
 import type { ChatMessage } from '@/features/ai/chatHub/chat.types';
+import CopyButton from '@/features/ai/chatHub/components/CopyButton.vue';
 import type { ChatMessageId } from '@n8n/api-types';
 import { N8nIconButton, N8nLink, N8nText, N8nTooltip } from '@n8n/design-system';
 import { useI18n } from '@n8n/i18n';
@@ -10,8 +11,7 @@ import { useRouter } from 'vue-router';
 const i18n = useI18n();
 const router = useRouter();
 
-const { justCopied, message, alternatives, isSpeaking, isSpeechSynthesisAvailable } = defineProps<{
-	justCopied: boolean;
+const { message, alternatives, isSpeaking, isSpeechSynthesisAvailable } = defineProps<{
 	message: ChatMessage;
 	alternatives: ChatMessageId[];
 	isSpeechSynthesisAvailable: boolean;
@@ -19,17 +19,12 @@ const { justCopied, message, alternatives, isSpeaking, isSpeechSynthesisAvailabl
 }>();
 
 const emit = defineEmits<{
-	copy: [];
 	edit: [];
 	regenerate: [];
 	switchAlternative: [messageId: ChatMessageId];
 	readAloud: [];
 }>();
 
-const copyTooltip = computed(() => {
-	return justCopied ? i18n.baseText('generic.copied') : i18n.baseText('generic.copy');
-});
-
 const currentAlternativeIndex = computed(() => {
 	return alternatives.findIndex((id) => id === message.id);
 });
@@ -44,10 +39,6 @@ const executionUrl = computed(() => {
 	return undefined;
 });
 
-function handleCopy() {
-	emit('copy');
-}
-
 function handleEdit() {
 	emit('edit');
 }
@@ -63,16 +54,7 @@ function handleReadAloud() {
 
 <template>
 	<div :class="$style.actions">
-		<N8nTooltip placement="bottom" :show-after="300">
-			<N8nIconButton
-				:icon="justCopied ? 'check' : 'copy'"
-				type="tertiary"
-				size="medium"
-				text
-				@click="handleCopy"
-			/>
-			<template #content>{{ copyTooltip }}</template>
-		</N8nTooltip>
+		<CopyButton :content="message.content" />
 		<N8nTooltip
 			v-if="isSpeechSynthesisAvailable && message.type === 'ai'"
 			placement="bottom"
diff --git a/packages/frontend/editor-ui/src/features/ai/chatHub/components/CopyButton.vue b/packages/frontend/editor-ui/src/features/ai/chatHub/components/CopyButton.vue
new file mode 100644
index 00000000000..0fb3575db99
--- /dev/null
+++ b/packages/frontend/editor-ui/src/features/ai/chatHub/components/CopyButton.vue
@@ -0,0 +1,48 @@
+<script setup lang="ts">
+import { computed, ref } from 'vue';
+import { useClipboard } from '@/app/composables/useClipboard';
+import { useI18n } from '@n8n/i18n';
+import { N8nIconButton, N8nTooltip } from '@n8n/design-system';
+
+const { content } = defineProps<{ content: string }>();
+
+const i18n = useI18n();
+const clipboard = useClipboard();
+const justCopied = ref(false);
+const copyTooltip = computed(() => {
+	return justCopied.value ? i18n.baseText('generic.copied') : i18n.baseText('generic.copy');
+});
+
+async function handleCopy() {
+	await clipboard.copy(content);
+	justCopied.value = true;
+	setTimeout(() => {
+		justCopied.value = false;
+	}, 1000);
+}
+</script>
+
+<template>
+	<N8nTooltip placement="bottom" :show-after="300">
+		<N8nIconButton
+			:icon="justCopied ? 'check' : 'copy'"
+			type="tertiary"
+			size="medium"
+			text
+			:class="$style.button"
+			tabindex="0"
+			@click="handleCopy"
+		/>
+		<template #content>{{ copyTooltip }}</template>
+	</N8nTooltip>
+</template>
+
+<style lang="scss" module>
+.button {
+	& g,
+	& path {
+		color: var(--color--text--tint-1);
+		stroke-width: 2.5;
+	}
+}
+</style>
diff --git a/packages/frontend/editor-ui/src/features/ai/chatHub/components/ModelSelector.vue b/packages/frontend/editor-ui/src/features/ai/chatHub/components/ModelSelector.vue
index 2f8751a8b52..df64e8f21f5 100644
--- a/packages/frontend/editor-ui/src/features/ai/chatHub/components/ModelSelector.vue
+++ b/packages/frontend/editor-ui/src/features/ai/chatHub/components/ModelSelector.vue
@@ -42,6 +42,8 @@ import { useProjectsStore } from '@/features/collaboration/projects/projects.sto
 import { truncateBeforeLast } from '@n8n/utils';
 
 const NEW_AGENT_MENU_ID = 'agent::new';
+const MAX_AGENT_NAME_CHARS = 30;
+const MAX_AGENT_NAME_CHARS_MENU = 45;
 
 const {
 	selectedAgent,
@@ -97,15 +99,20 @@ const isCredentialsMissing = computed(
 
 const menu = computed(() => {
 	const menuItems: (typeof N8nNavigationDropdown)['menu'] = [];
+	const fullNamesMap: Record<string, string> = {};
 
 	if (includeCustomAgents) {
 		const customAgents = isLoading.value
 			? []
-			: [...agents.value['custom-agent'].models, ...agents.value['n8n'].models].map((agent) => ({
-					id: stringifyModel(agent.model),
-					title: agent.name,
-					disabled: false,
-				}));
+			: [...agents.value['custom-agent'].models, ...agents.value['n8n'].models].map((agent) => {
+					const id = stringifyModel(agent.model);
+					fullNamesMap[id] = agent.name;
+					return {
+						id,
+						title: truncateBeforeLast(agent.name, MAX_AGENT_NAME_CHARS_MENU),
+						disabled: false,
+					};
+				});
 
 		menuItems.push({
 			id: 'custom-agents',
@@ -200,11 +207,16 @@ const menu = computed(() => {
 									(m) => 'model' in agent.model && m.model === agent.model.model,
 								),
 						)
-						.map<ComponentProps<typeof N8nNavigationDropdown>['menu'][number]>((agent) => ({
-							id: stringifyModel(agent.model),
-							title: agent.name,
-							disabled: false,
-						}))
+						.map<ComponentProps<typeof N8nNavigationDropdown>['menu'][number]>((agent) => {
+							const id = stringifyModel(agent.model);
+							fullNamesMap[id] = agent.name;
+							return {
+								id,
+								title: truncateBeforeLast(agent.name, MAX_AGENT_NAME_CHARS_MENU),
+								disabled: false,
+							};
+						})
+						.filter((item, index, self) => self.findIndex((i) => i.id === item.id) === index)
 				: error
 					? [{ id: `${provider}::error`, value: null, disabled: true, title: error }]
 					: [];
@@ -232,7 +244,7 @@ const menu = computed(() => {
 		});
 	}
 
-	return menuItems;
+	return { items: menuItems, fullNames: fullNamesMap };
 });
 
 const selectedLabel = computed(
@@ -347,7 +359,13 @@ defineExpose({
 </script>
 
 <template>
-	<N8nNavigationDropdown ref="dropdownRef" :menu="menu" teleport @select="onSelect">
+	<N8nNavigationDropdown
+		ref="dropdownRef"
+		:submenu-class="$style.component"
+		:menu="menu.items"
+		teleport
+		@select="onSelect"
+	>
 		<template #item-icon="{ item }">
 			<CredentialIcon
 				v-if="item.id in PROVIDER_CREDENTIAL_TYPE_MAP"
@@ -358,7 +376,7 @@ defineExpose({
 			<N8nAvatar
 				v-else-if="item.id.startsWith('n8n::') || item.id.startsWith('custom-agent::')"
 				:class="$style.avatarIcon"
-				:first-name="item.title"
+				:first-name="menu.fullNames[item.id] || item.title"
 				size="xsmall"
 			/>
 		</template>
@@ -372,10 +390,10 @@ defineExpose({
 			/>
 			<div :class="$style.selected">
 				<div>
-					{{ truncateBeforeLast(selectedLabel, 30) }}
+					{{ truncateBeforeLast(selectedLabel, MAX_AGENT_NAME_CHARS) }}
 				</div>
 				<N8nText v-if="credentialsName" size="xsmall" color="text-light">
-					{{ truncateBeforeLast(credentialsName, 30) }}
+					{{ truncateBeforeLast(credentialsName, MAX_AGENT_NAME_CHARS) }}
 				</N8nText>
 				<N8nText v-else-if="isCredentialsMissing" size="xsmall" color="danger">
 					<N8nIcon
@@ -392,6 +410,13 @@ defineExpose({
 </template>
 
 <style lang="scss" module>
+.component {
+	& :global(.el-popper) {
+		/* Enforce via text truncation instead */
+		max-width: unset !important;
+	}
+}
+
 .dropdownButton {
 	display: flex;
 	align-items: center;
diff --git a/packages/frontend/editor-ui/src/features/ai/chatHub/composables/useChatHubMarkdownOptions.ts b/packages/frontend/editor-ui/src/features/ai/chatHub/composables/useChatHubMarkdownOptions.ts
index d52866700ba..ab39b519681 100644
--- a/packages/frontend/editor-ui/src/features/ai/chatHub/composables/useChatHubMarkdownOptions.ts
+++ b/packages/frontend/editor-ui/src/features/ai/chatHub/composables/useChatHubMarkdownOptions.ts
@@ -1,6 +1,8 @@
 /* eslint-disable @typescript-eslint/consistent-type-imports */
 import { type HLJSApi } from 'highlight.js';
-import { ref } from 'vue';
+import { computed, ref } from 'vue';
+import type MarkdownIt from 'markdown-it';
+import markdownLink from 'markdown-it-link-attributes';
 
 let hljsInstance: HLJSApi | undefined;
 let asyncImport:
@@ -11,10 +13,11 @@ let asyncImport:
 	| { status: 'uninitialized' }
 	| { status: 'done' } = { status: 'uninitialized' };
 
-export function useChatHubMarkdownOptions() {
+export function useChatHubMarkdownOptions(codeBlockActionsClassName: string) {
 	const forceReRenderKey = ref(0);
+	const codeBlockContents = ref<Map<string, string>>();
 
-	const markdownOptions = {
+	const options = {
 		highlight(str: string, lang: string) {
 			if (!lang) {
 				return ''; // use external default escaping
@@ -65,5 +68,40 @@ export function useChatHubMarkdownOptions() {
 		}
 	}
 
-	return { markdownOptions, forceReRenderKey };
+	const plugins = computed(() => {
+		const linksNewTabPlugin = (vueMarkdownItInstance: MarkdownIt) => {
+			vueMarkdownItInstance.use(markdownLink, {
+				attrs: {
+					target: '_blank',
+					rel: 'noopener',
+				},
+			});
+		};
+
+		const codeBlockPlugin = (vueMarkdownItInstance: MarkdownIt) => {
+			const defaultFenceRenderer = vueMarkdownItInstance.renderer.rules.fence;
+
+			codeBlockContents.value = new Map();
+
+			vueMarkdownItInstance.renderer.rules.fence = (tokens, idx, options, env, self) => {
+				const defaultRendered =
+					defaultFenceRenderer?.(tokens, idx, options, env, self) ??
+					self.renderToken(tokens, idx, options);
+
+				const content = tokens[idx]?.content.trim();
+
+				if (content) {
+					codeBlockContents.value?.set(String(idx), content);
+				}
+
+				return defaultRendered.replace(
+					'</pre>',
+					`<div data-markdown-token-idx="${idx}" class="${codeBlockActionsClassName}"></div></pre>`,
+				);
+			};
+		};
+		return [linksNewTabPlugin, codeBlockPlugin];
+	});
+
+	return { options, forceReRenderKey, plugins, codeBlockContents };
 }

From f5d144cfafdf346c965d9b86c65e98df447ef698 Mon Sep 17 00:00:00 2001
From: Nikhil Kuriakose <nikhilkuria@gmail.com>
Date: Wed, 3 Dec 2025 17:30:42 +0100
Subject: [PATCH 038/167] fix(editor): Update the value of updated at on data
 changes (#22634)

---
 ...table-touch-updated-at.integration.test.ts | 408 ++++++++++++++++++
 .../data-table/data-table.repository.ts       |  17 +
 .../modules/data-table/data-table.service.ts  |  16 +-
 3 files changed, 440 insertions(+), 1 deletion(-)
 create mode 100644 packages/cli/src/modules/data-table/__tests__/data-table-touch-updated-at.integration.test.ts

diff --git a/packages/cli/src/modules/data-table/__tests__/data-table-touch-updated-at.integration.test.ts b/packages/cli/src/modules/data-table/__tests__/data-table-touch-updated-at.integration.test.ts
new file mode 100644
index 00000000000..709c1c5df29
--- /dev/null
+++ b/packages/cli/src/modules/data-table/__tests__/data-table-touch-updated-at.integration.test.ts
@@ -0,0 +1,408 @@
+import type { AddDataTableColumnDto } from '@n8n/api-types';
+import { createTeamProject, testDb, testModules } from '@n8n/backend-test-utils';
+import type { Project } from '@n8n/db';
+import { Container } from '@n8n/di';
+
+import { DataTableRepository } from '../data-table.repository';
+import { DataTableService } from '../data-table.service';
+import { mockDataTableSizeValidator } from './test-helpers';
+
+beforeAll(async () => {
+	await testModules.loadModules(['data-table']);
+	await testDb.init();
+	mockDataTableSizeValidator();
+});
+
+beforeEach(async () => {
+	await testDb.truncate(['DataTable', 'DataTableColumn']);
+});
+
+afterAll(async () => {
+	await testDb.terminate();
+});
+
+describe('DataTable touchUpdatedAt', () => {
+	let dataTableService: DataTableService;
+	let dataTableRepository: DataTableRepository;
+	let project: Project;
+
+	beforeAll(() => {
+		dataTableService = Container.get(DataTableService);
+		dataTableRepository = Container.get(DataTableRepository);
+	});
+
+	beforeEach(async () => {
+		project = await createTeamProject();
+	});
+
+	afterEach(async () => {
+		await dataTableService.deleteDataTableAll();
+	});
+
+	describe('Row operations', () => {
+		it('should update updatedAt timestamp when inserting rows', async () => {
+			// Create a data table with columns
+			const dataTable = await dataTableService.createDataTable(project.id, {
+				name: 'testTable',
+				columns: [
+					{ name: 'name', type: 'string' },
+					{ name: 'age', type: 'number' },
+				],
+			});
+
+			// Get initial updatedAt
+			const initialDataTable = await dataTableRepository.findOneBy({ id: dataTable.id });
+			const initialUpdatedAt = initialDataTable!.updatedAt;
+
+			// Wait a bit to ensure timestamp difference
+			await new Promise((resolve) => setTimeout(resolve, 10));
+
+			// Insert rows
+			await dataTableService.insertRows(dataTable.id, project.id, [
+				{ name: 'Alice', age: 30 },
+				{ name: 'Bob', age: 25 },
+			]);
+
+			// Check that updatedAt was updated
+			const updatedDataTable = await dataTableRepository.findOneBy({ id: dataTable.id });
+			expect(updatedDataTable!.updatedAt.getTime()).toBeGreaterThan(initialUpdatedAt.getTime());
+		});
+
+		it('should update updatedAt timestamp when upserting rows', async () => {
+			// Create a data table with columns
+			const dataTable = await dataTableService.createDataTable(project.id, {
+				name: 'testTable',
+				columns: [
+					{ name: 'email', type: 'string' },
+					{ name: 'name', type: 'string' },
+				],
+			});
+
+			// Insert initial row
+			await dataTableService.insertRows(dataTable.id, project.id, [
+				{ email: 'test@example.com', name: 'Alice' },
+			]);
+
+			// Get updatedAt after insert
+			const afterInsert = await dataTableRepository.findOneBy({ id: dataTable.id });
+			const afterInsertUpdatedAt = afterInsert!.updatedAt;
+
+			// Wait a bit to ensure timestamp difference
+			await new Promise((resolve) => setTimeout(resolve, 10));
+
+			// Upsert (update)
+			await dataTableService.upsertRow(
+				dataTable.id,
+				project.id,
+				{
+					filter: {
+						type: 'and',
+						filters: [{ columnName: 'email', condition: 'eq', value: 'test@example.com' }],
+					},
+					data: { name: 'Alice Updated' },
+				},
+				false,
+				false,
+			);
+
+			// Check that updatedAt was updated
+			const afterUpsert = await dataTableRepository.findOneBy({ id: dataTable.id });
+			expect(afterUpsert!.updatedAt.getTime()).toBeGreaterThan(afterInsertUpdatedAt.getTime());
+		});
+
+		it('should update updatedAt timestamp when updating rows', async () => {
+			// Create a data table with columns
+			const dataTable = await dataTableService.createDataTable(project.id, {
+				name: 'testTable',
+				columns: [
+					{ name: 'email', type: 'string' },
+					{ name: 'status', type: 'string' },
+				],
+			});
+
+			// Insert initial row
+			await dataTableService.insertRows(dataTable.id, project.id, [
+				{ email: 'test@example.com', status: 'active' },
+			]);
+
+			// Get updatedAt after insert
+			const afterInsert = await dataTableRepository.findOneBy({ id: dataTable.id });
+			const afterInsertUpdatedAt = afterInsert!.updatedAt;
+
+			// Wait a bit to ensure timestamp difference
+			await new Promise((resolve) => setTimeout(resolve, 10));
+
+			// Update rows
+			await dataTableService.updateRows(
+				dataTable.id,
+				project.id,
+				{
+					filter: {
+						type: 'and',
+						filters: [{ columnName: 'email', condition: 'eq', value: 'test@example.com' }],
+					},
+					data: { status: 'inactive' },
+				},
+				false,
+				false,
+			);
+
+			// Check that updatedAt was updated
+			const afterUpdate = await dataTableRepository.findOneBy({ id: dataTable.id });
+			expect(afterUpdate!.updatedAt.getTime()).toBeGreaterThan(afterInsertUpdatedAt.getTime());
+		});
+
+		it('should update updatedAt timestamp when deleting rows', async () => {
+			// Create a data table with columns
+			const dataTable = await dataTableService.createDataTable(project.id, {
+				name: 'testTable',
+				columns: [
+					{ name: 'email', type: 'string' },
+					{ name: 'name', type: 'string' },
+				],
+			});
+
+			// Insert rows
+			await dataTableService.insertRows(dataTable.id, project.id, [
+				{ email: 'test1@example.com', name: 'User 1' },
+				{ email: 'test2@example.com', name: 'User 2' },
+			]);
+
+			// Get updatedAt after insert
+			const afterInsert = await dataTableRepository.findOneBy({ id: dataTable.id });
+			const afterInsertUpdatedAt = afterInsert!.updatedAt;
+
+			// Wait a bit to ensure timestamp difference
+			await new Promise((resolve) => setTimeout(resolve, 10));
+
+			// Delete rows
+			await dataTableService.deleteRows(
+				dataTable.id,
+				project.id,
+				{
+					filter: {
+						type: 'and',
+						filters: [{ columnName: 'email', condition: 'eq', value: 'test1@example.com' }],
+					},
+				},
+				false,
+				false,
+			);
+
+			// Check that updatedAt was updated
+			const afterDelete = await dataTableRepository.findOneBy({ id: dataTable.id });
+			expect(afterDelete!.updatedAt.getTime()).toBeGreaterThan(afterInsertUpdatedAt.getTime());
+		});
+	});
+
+	describe('Column operations', () => {
+		it('should update updatedAt timestamp when adding a column', async () => {
+			// Create a data table
+			const dataTable = await dataTableService.createDataTable(project.id, {
+				name: 'testTable',
+				columns: [{ name: 'name', type: 'string' }],
+			});
+
+			// Get initial updatedAt
+			const initialDataTable = await dataTableRepository.findOneBy({ id: dataTable.id });
+			const initialUpdatedAt = initialDataTable!.updatedAt;
+
+			// Wait a bit to ensure timestamp difference
+			await new Promise((resolve) => setTimeout(resolve, 10));
+
+			// Add a column
+			const addColumnDto: AddDataTableColumnDto = {
+				name: 'age',
+				type: 'number',
+			};
+			await dataTableService.addColumn(dataTable.id, project.id, addColumnDto);
+
+			// Check that updatedAt was updated
+			const updatedDataTable = await dataTableRepository.findOneBy({ id: dataTable.id });
+			expect(updatedDataTable!.updatedAt.getTime()).toBeGreaterThan(initialUpdatedAt.getTime());
+		});
+
+		it('should update updatedAt timestamp when deleting a column', async () => {
+			// Create a data table with multiple columns
+			const dataTable = await dataTableService.createDataTable(project.id, {
+				name: 'testTable',
+				columns: [
+					{ name: 'name', type: 'string' },
+					{ name: 'age', type: 'number' },
+				],
+			});
+
+			// Get columns
+			const columns = await dataTableService.getColumns(dataTable.id, project.id);
+			const ageColumn = columns.find((c) => c.name === 'age');
+
+			// Get initial updatedAt
+			const initialDataTable = await dataTableRepository.findOneBy({ id: dataTable.id });
+			const initialUpdatedAt = initialDataTable!.updatedAt;
+
+			// Wait a bit to ensure timestamp difference
+			await new Promise((resolve) => setTimeout(resolve, 10));
+
+			// Delete a column
+			await dataTableService.deleteColumn(dataTable.id, project.id, ageColumn!.id);
+
+			// Check that updatedAt was updated
+			const updatedDataTable = await dataTableRepository.findOneBy({ id: dataTable.id });
+			expect(updatedDataTable!.updatedAt.getTime()).toBeGreaterThan(initialUpdatedAt.getTime());
+		});
+	});
+
+	describe('Error handling', () => {
+		it('should not fail row operations even if touchUpdatedAt is called with invalid ID', async () => {
+			// Create a data table
+			const dataTable = await dataTableService.createDataTable(project.id, {
+				name: 'testTable',
+				columns: [{ name: 'name', type: 'string' }],
+			});
+
+			// Insert initial data
+			await dataTableService.insertRows(dataTable.id, project.id, [{ name: 'Initial' }]);
+
+			// Mock touchUpdatedAt to simulate an error scenario
+			const touchSpy = jest.spyOn(dataTableRepository, 'touchUpdatedAt');
+
+			// Insert rows - operation should succeed
+			const result = await dataTableService.insertRows(dataTable.id, project.id, [
+				{ name: 'Alice' },
+			]);
+			expect(result).toBeDefined();
+
+			// Verify touchUpdatedAt was called
+			expect(touchSpy).toHaveBeenCalledWith(dataTable.id);
+
+			touchSpy.mockRestore();
+		});
+
+		it('should not fail column operations even if touchUpdatedAt is called', async () => {
+			// Create a data table
+			const dataTable = await dataTableService.createDataTable(project.id, {
+				name: 'testTable',
+				columns: [{ name: 'name', type: 'string' }],
+			});
+
+			// Mock touchUpdatedAt to verify it's called
+			const touchSpy = jest.spyOn(dataTableRepository, 'touchUpdatedAt');
+
+			// Add column - operation should succeed
+			const addColumnDto: AddDataTableColumnDto = {
+				name: 'age',
+				type: 'number',
+			};
+			const result = await dataTableService.addColumn(dataTable.id, project.id, addColumnDto);
+			expect(result).toBeDefined();
+
+			// Verify touchUpdatedAt was called
+			expect(touchSpy).toHaveBeenCalledWith(dataTable.id);
+
+			touchSpy.mockRestore();
+		});
+
+		it('should handle errors gracefully in touchUpdatedAt', async () => {
+			// This test verifies that touchUpdatedAt has error handling
+			// by checking it doesn't throw when given an invalid ID
+
+			// Spy on the logger
+			const loggerSpy = jest.spyOn(dataTableRepository['logger'], 'debug');
+
+			// Call touchUpdatedAt with a non-existent ID
+			// The method should not throw, even though the update will affect 0 rows
+			await expect(dataTableRepository.touchUpdatedAt('non-existent-id')).resolves.toBeUndefined();
+
+			// The method completes without throwing
+			// Note: In a real error scenario (e.g., DB connection failure), the logger would be called
+			// but with a non-existent ID, the update just affects 0 rows without error
+
+			loggerSpy.mockRestore();
+		});
+	});
+
+	describe('Dry run mode', () => {
+		it('should NOT update updatedAt when updating rows in dry run mode', async () => {
+			// Create a data table with columns
+			const dataTable = await dataTableService.createDataTable(project.id, {
+				name: 'testTable',
+				columns: [
+					{ name: 'email', type: 'string' },
+					{ name: 'status', type: 'string' },
+				],
+			});
+
+			// Insert initial row
+			await dataTableService.insertRows(dataTable.id, project.id, [
+				{ email: 'test@example.com', status: 'active' },
+			]);
+
+			// Get updatedAt after insert
+			const afterInsert = await dataTableRepository.findOneBy({ id: dataTable.id });
+			const afterInsertUpdatedAt = afterInsert!.updatedAt;
+
+			// Wait a bit
+			await new Promise((resolve) => setTimeout(resolve, 10));
+
+			// Update rows in DRY RUN mode
+			await dataTableService.updateRows(
+				dataTable.id,
+				project.id,
+				{
+					filter: {
+						type: 'and',
+						filters: [{ columnName: 'email', condition: 'eq', value: 'test@example.com' }],
+					},
+					data: { status: 'inactive' },
+				},
+				false,
+				true, // dryRun = true
+			);
+
+			// Check that updatedAt was NOT updated (same timestamp)
+			const afterDryRun = await dataTableRepository.findOneBy({ id: dataTable.id });
+			expect(afterDryRun!.updatedAt.getTime()).toBe(afterInsertUpdatedAt.getTime());
+		});
+
+		it('should NOT update updatedAt when deleting rows in dry run mode', async () => {
+			// Create a data table with columns
+			const dataTable = await dataTableService.createDataTable(project.id, {
+				name: 'testTable',
+				columns: [
+					{ name: 'email', type: 'string' },
+					{ name: 'name', type: 'string' },
+				],
+			});
+
+			// Insert rows
+			await dataTableService.insertRows(dataTable.id, project.id, [
+				{ email: 'test@example.com', name: 'User 1' },
+			]);
+
+			// Get updatedAt after insert
+			const afterInsert = await dataTableRepository.findOneBy({ id: dataTable.id });
+			const afterInsertUpdatedAt = afterInsert!.updatedAt;
+
+			// Wait a bit
+			await new Promise((resolve) => setTimeout(resolve, 10));
+
+			// Delete rows in DRY RUN mode
+			await dataTableService.deleteRows(
+				dataTable.id,
+				project.id,
+				{
+					filter: {
+						type: 'and',
+						filters: [{ columnName: 'email', condition: 'eq', value: 'test@example.com' }],
+					},
+				},
+				false,
+				true, // dryRun = true
+			);
+
+			// Check that updatedAt was NOT updated (same timestamp)
+			const afterDryRun = await dataTableRepository.findOneBy({ id: dataTable.id });
+			expect(afterDryRun!.updatedAt.getTime()).toBe(afterInsertUpdatedAt.getTime());
+		});
+	});
+});
diff --git a/packages/cli/src/modules/data-table/data-table.repository.ts b/packages/cli/src/modules/data-table/data-table.repository.ts
index b53f1883a32..fa59ce5a210 100644
--- a/packages/cli/src/modules/data-table/data-table.repository.ts
+++ b/packages/cli/src/modules/data-table/data-table.repository.ts
@@ -3,6 +3,7 @@ import {
 	type DataTableCreateColumnSchema,
 	type ListDataTableQueryDto,
 } from '@n8n/api-types';
+import { Logger } from '@n8n/backend-common';
 import { GlobalConfig } from '@n8n/config';
 import { Project, withTransaction } from '@n8n/db';
 import { Service } from '@n8n/di';
@@ -24,10 +25,26 @@ export class DataTableRepository extends Repository<DataTable> {
 		dataSource: DataSource,
 		private ddlService: DataTableDDLService,
 		private readonly globalConfig: GlobalConfig,
+		private readonly logger: Logger,
 	) {
 		super(DataTable, dataSource.manager);
 	}
 
+	/**
+	 * Updates the updatedAt timestamp for a data table without modifying any other fields.
+	 * This is used to track when the table's content (rows/columns) has changed.
+	 *
+	 * Note: This method logs but does not throw errors to ensure that timestamp
+	 * update failures don't affect the primary data operations.
+	 */
+	async touchUpdatedAt(dataTableId: string, trx?: EntityManager) {
+		await withTransaction(this.manager, trx, async (em) => {
+			await em.update(DataTable, { id: dataTableId }, { updatedAt: new Date() });
+		}).catch((error) => {
+			this.logger.warn('Failed to update DataTable timestamp', { dataTableId, error });
+		});
+	}
+
 	async createDataTable(
 		projectId: string,
 		name: string,
diff --git a/packages/cli/src/modules/data-table/data-table.service.ts b/packages/cli/src/modules/data-table/data-table.service.ts
index d08712ff73c..5ce91ef8226 100644
--- a/packages/cli/src/modules/data-table/data-table.service.ts
+++ b/packages/cli/src/modules/data-table/data-table.service.ts
@@ -171,7 +171,11 @@ export class DataTableService {
 	async addColumn(dataTableId: string, projectId: string, dto: AddDataTableColumnDto) {
 		await this.validateDataTableExists(dataTableId, projectId);
 
-		return await this.dataTableColumnRepository.addColumn(dataTableId, dto);
+		const result = await this.dataTableColumnRepository.addColumn(dataTableId, dto);
+
+		await this.dataTableRepository.touchUpdatedAt(dataTableId);
+
+		return result;
 	}
 
 	async moveColumn(
@@ -194,6 +198,8 @@ export class DataTableService {
 
 		await this.dataTableColumnRepository.deleteColumn(dataTableId, existingColumn);
 
+		await this.dataTableRepository.touchUpdatedAt(dataTableId);
+
 		return true;
 	}
 
@@ -262,6 +268,8 @@ export class DataTableService {
 
 		this.dataTableSizeValidator.reset();
 
+		await this.dataTableRepository.touchUpdatedAt(dataTableId);
+
 		return result;
 	}
 
@@ -336,6 +344,8 @@ export class DataTableService {
 
 		if (!dryRun) {
 			this.dataTableSizeValidator.reset();
+
+			await this.dataTableRepository.touchUpdatedAt(dataTableId);
 		}
 
 		return result;
@@ -421,6 +431,8 @@ export class DataTableService {
 
 		if (!dryRun) {
 			this.dataTableSizeValidator.reset();
+
+			await this.dataTableRepository.touchUpdatedAt(dataTableId);
 		}
 
 		return result;
@@ -479,6 +491,8 @@ export class DataTableService {
 
 		if (!dryRun) {
 			this.dataTableSizeValidator.reset();
+
+			await this.dataTableRepository.touchUpdatedAt(dataTableId);
 		}
 
 		return result;

From f2930e2db9f8ec591feef5e5e8b3d4e42ac19860 Mon Sep 17 00:00:00 2001
From: oleg <me@olegivaniv.com>
Date: Wed, 3 Dec 2025 17:50:22 +0100
Subject: [PATCH 039/167] chore(ai-builder): Add workflow naming, compaction,
 and session cleanup to multi-agent  (no-changelog) (#22646)

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>
---
 .../evaluations/core/environment.ts           |   1 -
 .../src/agents/responder.agent.ts             |  17 +-
 .../src/agents/supervisor.agent.ts            |  13 +-
 .../src/ai-workflow-builder-agent.service.ts  |  16 +-
 .../examples/basic/switch-node-examples.ts    | 124 ++++++++
 .../chains/prompts/node-types/switch-node.ts  |  68 ++++
 .../src/chains/prompts/prompt-builder.ts      |  14 +
 .../src/chains/prompts/prompt-config.ts       |   1 +
 .../src/multi-agent-workflow-subgraphs.ts     |  75 ++++-
 .../src/parent-graph-state.ts                 |  10 +-
 .../src/subgraphs/builder.subgraph.ts         |  64 +++-
 .../src/subgraphs/configurator.subgraph.ts    |  30 ++
 .../src/subgraphs/discovery.subgraph.ts       |  27 ++
 .../ai-workflow-builder-agent.service.test.ts |   4 +
 .../src/types/config.ts                       |   1 +
 .../src/types/coordination.ts                 |  17 +-
 .../src/utils/coordination-log.ts             |   7 +-
 .../src/utils/state-modifier.ts               | 195 ++++++++++++
 .../src/utils/stream-processor.ts             |  40 +--
 .../src/utils/test/state-modifier.test.ts     | 297 ++++++++++++++++++
 .../src/utils/test/stream-processor.test.ts   |  17 +-
 .../src/validation/checks/connections.ts      |  30 +-
 .../src/workflow-builder-agent.ts             |  21 +-
 .../src/dto/ai/ai-build-request.dto.ts        |   1 +
 .../ai-workflow-builder.service.test.ts       |  12 +-
 .../services/ai-workflow-builder.service.ts   |   1 +
 .../src/app/constants/experiments.ts          |   7 +
 .../features/ai/assistant/assistant.types.ts  |   1 +
 .../features/ai/assistant/builder.utils.ts    |   8 +-
 29 files changed, 1021 insertions(+), 98 deletions(-)
 create mode 100644 packages/@n8n/ai-workflow-builder.ee/src/chains/prompts/examples/basic/switch-node-examples.ts
 create mode 100644 packages/@n8n/ai-workflow-builder.ee/src/chains/prompts/node-types/switch-node.ts
 create mode 100644 packages/@n8n/ai-workflow-builder.ee/src/utils/state-modifier.ts
 create mode 100644 packages/@n8n/ai-workflow-builder.ee/src/utils/test/state-modifier.test.ts

diff --git a/packages/@n8n/ai-workflow-builder.ee/evaluations/core/environment.ts b/packages/@n8n/ai-workflow-builder.ee/evaluations/core/environment.ts
index 0eb7e6582ad..309d2b6d360 100644
--- a/packages/@n8n/ai-workflow-builder.ee/evaluations/core/environment.ts
+++ b/packages/@n8n/ai-workflow-builder.ee/evaluations/core/environment.ts
@@ -88,7 +88,6 @@ export function createAgent(
 		llmSimpleTask: llm,
 		llmComplexTask: llm,
 		checkpointer: new MemorySaver(),
-		enableMultiAgent: true,
 		tracer,
 	});
 }
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/agents/responder.agent.ts b/packages/@n8n/ai-workflow-builder.ee/src/agents/responder.agent.ts
index 5f3419bc193..6efd85d0aa1 100644
--- a/packages/@n8n/ai-workflow-builder.ee/src/agents/responder.agent.ts
+++ b/packages/@n8n/ai-workflow-builder.ee/src/agents/responder.agent.ts
@@ -77,6 +77,8 @@ export interface ResponderContext {
 	discoveryContext?: DiscoveryContext | null;
 	/** Current workflow state */
 	workflowJSON: SimpleWorkflow;
+	/** Summary of previous conversation (from compaction) */
+	previousSummary?: string;
 }
 
 /**
@@ -98,7 +100,20 @@ export class ResponderAgent {
 	private buildContextMessage(context: ResponderContext): HumanMessage | null {
 		const contextParts: string[] = [];
 
-		// Check for errors first - if there's an error, surface it prominently
+		// Previous conversation summary (from compaction)
+		if (context.previousSummary) {
+			contextParts.push(`**Previous Conversation Summary:**\n${context.previousSummary}`);
+		}
+
+		// Check for state management actions (compact/clear)
+		const stateManagementEntry = context.coordinationLog.find(
+			(e) => e.phase === 'state_management',
+		);
+		if (stateManagementEntry) {
+			contextParts.push(`**State Management:** ${stateManagementEntry.summary}`);
+		}
+
+		// Check for errors - if there's an error, surface it prominently
 		const errorEntry = getErrorEntry(context.coordinationLog);
 		if (errorEntry) {
 			contextParts.push(
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/agents/supervisor.agent.ts b/packages/@n8n/ai-workflow-builder.ee/src/agents/supervisor.agent.ts
index 626775767f7..448df76e89a 100644
--- a/packages/@n8n/ai-workflow-builder.ee/src/agents/supervisor.agent.ts
+++ b/packages/@n8n/ai-workflow-builder.ee/src/agents/supervisor.agent.ts
@@ -94,6 +94,8 @@ export interface SupervisorContext {
 	workflowJSON: SimpleWorkflow;
 	/** Coordination log tracking subgraph completion */
 	coordinationLog: CoordinationLogEntry[];
+	/** Summary of previous conversation (from compaction) */
+	previousSummary?: string;
 }
 
 /**
@@ -115,14 +117,21 @@ export class SupervisorAgent {
 	private buildContextMessage(context: SupervisorContext): HumanMessage | null {
 		const contextParts: string[] = [];
 
-		// 1. Workflow summary (node count and names only)
+		// 1. Previous conversation summary (from compaction)
+		if (context.previousSummary) {
+			contextParts.push('<previous_conversation_summary>');
+			contextParts.push(context.previousSummary);
+			contextParts.push('</previous_conversation_summary>');
+		}
+
+		// 2. Workflow summary (node count and names only)
 		if (context.workflowJSON.nodes.length > 0) {
 			contextParts.push('<workflow_summary>');
 			contextParts.push(buildWorkflowSummary(context.workflowJSON));
 			contextParts.push('</workflow_summary>');
 		}
 
-		// 2. Coordination log summary (what phases completed)
+		// 3. Coordination log summary (what phases completed)
 		if (context.coordinationLog.length > 0) {
 			contextParts.push('<completed_phases>');
 			contextParts.push(summarizeCoordinationLog(context.coordinationLog));
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/ai-workflow-builder-agent.service.ts b/packages/@n8n/ai-workflow-builder.ee/src/ai-workflow-builder-agent.service.ts
index f01970a721e..db80d6f58f4 100644
--- a/packages/@n8n/ai-workflow-builder.ee/src/ai-workflow-builder-agent.service.ts
+++ b/packages/@n8n/ai-workflow-builder.ee/src/ai-workflow-builder-agent.service.ts
@@ -12,7 +12,11 @@ import type { IUser, INodeTypeDescription, ITelemetryTrackProperties } from 'n8n
 import { LLMServiceError } from '@/errors';
 import { anthropicClaudeSonnet45 } from '@/llm-config';
 import { SessionManagerService } from '@/session-manager.service';
-import { WorkflowBuilderAgent, type ChatPayload } from '@/workflow-builder-agent';
+import {
+	BuilderFeatureFlags,
+	WorkflowBuilderAgent,
+	type ChatPayload,
+} from '@/workflow-builder-agent';
 
 type OnCreditsUpdated = (userId: string, creditsQuota: number, creditsClaimed: number) => void;
 
@@ -29,6 +33,7 @@ export class AiWorkflowBuilderService {
 		private readonly logger?: Logger,
 		private readonly instanceId?: string,
 		private readonly instanceUrl?: string,
+		private readonly n8nVersion?: string,
 		private readonly onCreditsUpdated?: OnCreditsUpdated,
 		private readonly onTelemetryEvent?: OnTelemetryEvent,
 	) {
@@ -153,7 +158,7 @@ export class AiWorkflowBuilderService {
 		});
 	}
 
-	private async getAgent(user: IUser) {
+	private async getAgent(user: IUser, featureFlags?: BuilderFeatureFlags) {
 		const { anthropicClaude, tracingClient, authHeaders } = await this.setupModels(user);
 
 		const agent = new WorkflowBuilderAgent({
@@ -162,7 +167,6 @@ export class AiWorkflowBuilderService {
 			llmSimpleTask: anthropicClaude,
 			llmComplexTask: anthropicClaude,
 			logger: this.logger,
-			enableMultiAgent: process.env.N8N_ENABLE_MULTI_AGENT === 'true',
 			checkpointer: this.sessionManager.getCheckpointer(),
 			tracer: tracingClient
 				? new LangChainTracer({ client: tracingClient, projectName: 'n8n-workflow-builder' })
@@ -171,6 +175,10 @@ export class AiWorkflowBuilderService {
 			onGenerationSuccess: async () => {
 				await this.onGenerationSuccess(user, authHeaders);
 			},
+			runMetadata: {
+				n8nVersion: this.n8nVersion,
+				featureFlags: featureFlags ?? {},
+			},
 		});
 
 		return agent;
@@ -200,7 +208,7 @@ export class AiWorkflowBuilderService {
 	}
 
 	async *chat(payload: ChatPayload, user: IUser, abortSignal?: AbortSignal) {
-		const agent = await this.getAgent(user);
+		const agent = await this.getAgent(user, payload.featureFlags);
 		const userId = user?.id?.toString();
 		const workflowId = payload.workflowContext?.currentWorkflow?.id;
 
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/chains/prompts/examples/basic/switch-node-examples.ts b/packages/@n8n/ai-workflow-builder.ee/src/chains/prompts/examples/basic/switch-node-examples.ts
new file mode 100644
index 00000000000..c6fcb8d7fb9
--- /dev/null
+++ b/packages/@n8n/ai-workflow-builder.ee/src/chains/prompts/examples/basic/switch-node-examples.ts
@@ -0,0 +1,124 @@
+export const SWITCH_NODE_EXAMPLES = `
+### Switch Node Examples
+
+#### Example 1: Route by Amount Tiers (Purchase Approval)
+Current Parameters: { "mode": "rules" }
+Requested Changes: Route under $100 to auto-approve, $100-$1000 to manager, over $1000 to finance
+
+Expected Output:
+{
+  "mode": "rules",
+  "rules": {
+    "values": [
+      {
+        "conditions": {
+          "options": { "caseSensitive": true, "leftValue": "", "typeValidation": "strict" },
+          "conditions": [
+            {
+              "leftValue": "={{ $json.amount }}",
+              "rightValue": 100,
+              "operator": { "type": "number", "operation": "lt" }
+            }
+          ],
+          "combinator": "and"
+        },
+        "renameOutput": true,
+        "outputKey": "Auto-Approve"
+      },
+      {
+        "conditions": {
+          "options": { "caseSensitive": true, "leftValue": "", "typeValidation": "strict" },
+          "conditions": [
+            {
+              "leftValue": "={{ $json.amount }}",
+              "rightValue": 100,
+              "operator": { "type": "number", "operation": "gte" }
+            },
+            {
+              "leftValue": "={{ $json.amount }}",
+              "rightValue": 1000,
+              "operator": { "type": "number", "operation": "lte" }
+            }
+          ],
+          "combinator": "and"
+        },
+        "renameOutput": true,
+        "outputKey": "Manager Review"
+      },
+      {
+        "conditions": {
+          "options": { "caseSensitive": true, "leftValue": "", "typeValidation": "strict" },
+          "conditions": [
+            {
+              "leftValue": "={{ $json.amount }}",
+              "rightValue": 1000,
+              "operator": { "type": "number", "operation": "gt" }
+            }
+          ],
+          "combinator": "and"
+        },
+        "renameOutput": true,
+        "outputKey": "Finance Review"
+      }
+    ]
+  }
+}
+
+#### Example 2: Route by Status String
+Current Parameters: { "mode": "rules" }
+Requested Changes: Route by order status - pending, processing, completed
+
+Expected Output:
+{
+  "mode": "rules",
+  "rules": {
+    "values": [
+      {
+        "conditions": {
+          "options": { "caseSensitive": false, "leftValue": "", "typeValidation": "loose" },
+          "conditions": [
+            {
+              "leftValue": "={{ $json.status }}",
+              "rightValue": "pending",
+              "operator": { "type": "string", "operation": "equals" }
+            }
+          ],
+          "combinator": "and"
+        },
+        "renameOutput": true,
+        "outputKey": "Pending"
+      },
+      {
+        "conditions": {
+          "options": { "caseSensitive": false, "leftValue": "", "typeValidation": "loose" },
+          "conditions": [
+            {
+              "leftValue": "={{ $json.status }}",
+              "rightValue": "processing",
+              "operator": { "type": "string", "operation": "equals" }
+            }
+          ],
+          "combinator": "and"
+        },
+        "renameOutput": true,
+        "outputKey": "Processing"
+      },
+      {
+        "conditions": {
+          "options": { "caseSensitive": false, "leftValue": "", "typeValidation": "loose" },
+          "conditions": [
+            {
+              "leftValue": "={{ $json.status }}",
+              "rightValue": "completed",
+              "operator": { "type": "string", "operation": "equals" }
+            }
+          ],
+          "combinator": "and"
+        },
+        "renameOutput": true,
+        "outputKey": "Completed"
+      }
+    ]
+  }
+}
+`;
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/chains/prompts/node-types/switch-node.ts b/packages/@n8n/ai-workflow-builder.ee/src/chains/prompts/node-types/switch-node.ts
new file mode 100644
index 00000000000..f7caeae7772
--- /dev/null
+++ b/packages/@n8n/ai-workflow-builder.ee/src/chains/prompts/node-types/switch-node.ts
@@ -0,0 +1,68 @@
+export const SWITCH_NODE_GUIDE = `
+### Switch Node Configuration Guide
+
+The Switch node routes items to different outputs based on conditions. Uses the same filter structure as IF node but for multi-way branching.
+
+#### Switch Node Structure (mode: 'rules')
+\`\`\`json
+{
+  "mode": "rules",
+  "rules": {
+    "values": [
+      {
+        "conditions": {
+          "options": {
+            "caseSensitive": true,
+            "leftValue": "",
+            "typeValidation": "strict"
+          },
+          "conditions": [
+            {
+              "leftValue": "={{ $json.amount }}",
+              "rightValue": 100,
+              "operator": {
+                "type": "number",
+                "operation": "lt"
+              }
+            }
+          ],
+          "combinator": "and"
+        },
+        "renameOutput": true,
+        "outputKey": "Under $100"
+      }
+    ]
+  }
+}
+\`\`\`
+
+#### Key Points:
+1. Each entry in rules.values[] creates ONE output
+2. Conditions use the same filter structure as IF node
+3. Multiple conditions per rule are combined with combinator ("and" or "or")
+4. Use renameOutput: true + outputKey to label outputs descriptively
+
+#### Numeric Operators
+- lt: Less than
+- gt: Greater than
+- lte: Less than or equal
+- gte: Greater than or equal
+- equals: Equal to
+
+#### String Operators
+- equals: Exact match
+- contains: Contains substring
+- startsWith: Starts with
+- endsWith: Ends with
+
+#### Common Patterns:
+
+**Numeric Range Routing** (for ranges like $100-$1000):
+Use two conditions with combinator: "and":
+- First condition: gte (greater than or equal to lower bound)
+- Second condition: lte (less than or equal to upper bound)
+
+**String-Based Routing** (status/type values):
+- Use type: "string" with operation: "equals"
+- Set caseSensitive: false in options for case-insensitive matching
+`;
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/chains/prompts/prompt-builder.ts b/packages/@n8n/ai-workflow-builder.ee/src/chains/prompts/prompt-builder.ts
index 665e13f1b41..70f7f3c249b 100644
--- a/packages/@n8n/ai-workflow-builder.ee/src/chains/prompts/prompt-builder.ts
+++ b/packages/@n8n/ai-workflow-builder.ee/src/chains/prompts/prompt-builder.ts
@@ -9,9 +9,11 @@ import { TOOL_NODE_EXAMPLES } from './examples/advanced/tool-node-examples';
 import { IF_NODE_EXAMPLES } from './examples/basic/if-node-examples';
 import { SET_NODE_EXAMPLES } from './examples/basic/set-node-examples';
 import { SIMPLE_UPDATE_EXAMPLES } from './examples/basic/simple-updates';
+import { SWITCH_NODE_EXAMPLES } from './examples/basic/switch-node-examples';
 import { HTTP_REQUEST_GUIDE } from './node-types/http-request';
 import { IF_NODE_GUIDE } from './node-types/if-node';
 import { SET_NODE_GUIDE } from './node-types/set-node';
+import { SWITCH_NODE_GUIDE } from './node-types/switch-node';
 import { TOOL_NODES_GUIDE } from './node-types/tool-nodes';
 import { RESOURCE_LOCATOR_GUIDE } from './parameter-types/resource-locator';
 import { SYSTEM_MESSAGE_GUIDE } from './parameter-types/system-message';
@@ -42,6 +44,8 @@ export class ParameterUpdatePromptBuilder {
 			sections.push(SET_NODE_GUIDE);
 		} else if (this.isIfNode(context.nodeType)) {
 			sections.push(IF_NODE_GUIDE);
+		} else if (this.isSwitchNode(context.nodeType)) {
+			sections.push(SWITCH_NODE_GUIDE);
 		} else if (this.isHttpRequestNode(context.nodeType)) {
 			sections.push(HTTP_REQUEST_GUIDE);
 		}
@@ -130,6 +134,14 @@ export class ParameterUpdatePromptBuilder {
 		return category === 'if';
 	}
 
+	/**
+	 * Checks if node is a Switch node
+	 */
+	private static isSwitchNode(nodeType: string): boolean {
+		const category = getNodeTypeCategory(nodeType);
+		return category === 'switch';
+	}
+
 	/**
 	 * Checks if node is an HTTP Request node
 	 */
@@ -179,6 +191,8 @@ export class ParameterUpdatePromptBuilder {
 			examples.push(SET_NODE_EXAMPLES);
 		} else if (this.isIfNode(context.nodeType)) {
 			examples.push(IF_NODE_EXAMPLES);
+		} else if (this.isSwitchNode(context.nodeType)) {
+			examples.push(SWITCH_NODE_EXAMPLES);
 		}
 		// Add resource locator examples if needed
 		if (context.hasResourceLocatorParams) {
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/chains/prompts/prompt-config.ts b/packages/@n8n/ai-workflow-builder.ee/src/chains/prompts/prompt-config.ts
index 39e0067b22b..31a3976215b 100644
--- a/packages/@n8n/ai-workflow-builder.ee/src/chains/prompts/prompt-config.ts
+++ b/packages/@n8n/ai-workflow-builder.ee/src/chains/prompts/prompt-config.ts
@@ -4,6 +4,7 @@ export const DEFAULT_PROMPT_CONFIG: NodePromptConfig = {
 	nodeTypePatterns: {
 		set: ['n8n-nodes-base.set', 'set'],
 		if: ['n8n-nodes-base.if', 'if', 'filter'],
+		switch: ['n8n-nodes-base.switch', 'switch'],
 		httpRequest: ['n8n-nodes-base.httpRequest', 'httprequest', 'webhook', 'n8n-nodes-base.webhook'],
 		tool: ['Tool', '.tool'],
 	},
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/multi-agent-workflow-subgraphs.ts b/packages/@n8n/ai-workflow-builder.ee/src/multi-agent-workflow-subgraphs.ts
index fbeb617aaa0..189e629a73d 100644
--- a/packages/@n8n/ai-workflow-builder.ee/src/multi-agent-workflow-subgraphs.ts
+++ b/packages/@n8n/ai-workflow-builder.ee/src/multi-agent-workflow-subgraphs.ts
@@ -7,6 +7,7 @@ import type { INodeTypeDescription } from 'n8n-workflow';
 import { ResponderAgent } from './agents/responder.agent';
 import { SupervisorAgent } from './agents/supervisor.agent';
 import {
+	DEFAULT_AUTO_COMPACT_THRESHOLD_TOKENS,
 	MAX_BUILDER_ITERATIONS,
 	MAX_CONFIGURATOR_ITERATIONS,
 	MAX_DISCOVERY_ITERATIONS,
@@ -20,6 +21,13 @@ import type { SubgraphPhase } from './types/coordination';
 import { createErrorMetadata } from './types/coordination';
 import { getNextPhaseFromLog } from './utils/coordination-log';
 import { processOperations } from './utils/operations-processor';
+import {
+	determineStateAction,
+	handleCleanupDangling,
+	handleCompactMessages,
+	handleCreateWorkflowName,
+	handleDeleteMessages,
+} from './utils/state-modifier';
 import type { BuilderFeatureFlags } from './workflow-builder-agent';
 
 /**
@@ -43,6 +51,8 @@ export interface MultiAgentSubgraphConfig {
 	logger?: Logger;
 	instanceUrl?: string;
 	checkpointer?: MemorySaver;
+	/** Token threshold for auto-compaction. Defaults to DEFAULT_AUTO_COMPACT_THRESHOLD_TOKENS */
+	autoCompactThresholdTokens?: number;
 	featureFlags?: BuilderFeatureFlags;
 }
 
@@ -107,8 +117,15 @@ function createSubgraphNodeHandler<
  * Parent graph orchestrates between subgraphs with minimal shared state.
  */
 export function createMultiAgentWorkflowWithSubgraphs(config: MultiAgentSubgraphConfig) {
-	const { parsedNodeTypes, llmComplexTask, logger, instanceUrl, checkpointer, featureFlags } =
-		config;
+	const {
+		parsedNodeTypes,
+		llmComplexTask,
+		logger,
+		instanceUrl,
+		checkpointer,
+		autoCompactThresholdTokens = DEFAULT_AUTO_COMPACT_THRESHOLD_TOKENS,
+		featureFlags,
+	} = config;
 
 	const supervisorAgent = new SupervisorAgent({ llm: llmComplexTask });
 	const responderAgent = new ResponderAgent({ llm: llmComplexTask });
@@ -142,6 +159,7 @@ export function createMultiAgentWorkflowWithSubgraphs(config: MultiAgentSubgraph
 					messages: state.messages,
 					workflowJSON: state.workflowJSON,
 					coordinationLog: state.coordinationLog,
+					previousSummary: state.previousSummary,
 				});
 
 				return {
@@ -155,6 +173,7 @@ export function createMultiAgentWorkflowWithSubgraphs(config: MultiAgentSubgraph
 					coordinationLog: state.coordinationLog,
 					discoveryContext: state.discoveryContext,
 					workflowJSON: state.workflowJSON,
+					previousSummary: state.previousSummary,
 				});
 
 				return {
@@ -171,6 +190,31 @@ export function createMultiAgentWorkflowWithSubgraphs(config: MultiAgentSubgraph
 					workflowOperations: [], // Clear operations after processing
 				};
 			})
+			// State modification nodes (preprocessing)
+			.addNode('check_state', (state) => ({
+				nextPhase: determineStateAction(state, autoCompactThresholdTokens),
+			}))
+			.addNode('cleanup_dangling', (state) => handleCleanupDangling(state.messages, logger))
+			.addNode('compact_messages', async (state) => {
+				const isAutoCompact = state.messages[state.messages.length - 1]?.content !== '/compact';
+				return await handleCompactMessages(
+					state.messages,
+					state.previousSummary ?? '',
+					llmComplexTask,
+					isAutoCompact,
+				);
+			})
+			.addNode('delete_messages', (state) => handleDeleteMessages(state.messages))
+			.addNode(
+				'create_workflow_name',
+				async (state) =>
+					await handleCreateWorkflowName(
+						state.messages,
+						state.workflowJSON,
+						llmComplexTask,
+						logger,
+					),
+			)
 			// Add Subgraph Nodes (using helper to reduce duplication)
 			.addNode(
 				'discovery_subgraph',
@@ -206,8 +250,31 @@ export function createMultiAgentWorkflowWithSubgraphs(config: MultiAgentSubgraph
 			.addEdge('discovery_subgraph', 'process_operations')
 			.addEdge('builder_subgraph', 'process_operations')
 			.addEdge('configurator_subgraph', 'process_operations')
-			// Start flows to supervisor (initial routing only)
-			.addEdge(START, 'supervisor')
+			// Start flows to check_state (preprocessing)
+			.addEdge(START, 'check_state')
+			// Conditional routing from check_state
+			.addConditionalEdges('check_state', (state) => {
+				const routes: Record<string, string> = {
+					cleanup_dangling: 'cleanup_dangling',
+					compact_messages: 'compact_messages',
+					delete_messages: 'delete_messages',
+					create_workflow_name: 'create_workflow_name',
+					auto_compact_messages: 'compact_messages', // Reuse same node
+					continue: 'supervisor',
+				};
+				return routes[state.nextPhase] ?? 'supervisor';
+			})
+			// Route after state modification nodes
+			.addEdge('cleanup_dangling', 'check_state') // Re-check after cleanup
+			.addEdge('delete_messages', 'responder') // Clear → responder for acknowledgment
+			.addEdge('create_workflow_name', 'supervisor') // Continue after naming
+			// Compact has conditional routing: auto → continue, manual → responder
+			.addConditionalEdges('compact_messages', (state) => {
+				// Auto-compact preserves the last user message, manual /compact clears all
+				// If messages remain after compaction, it's auto-compact → continue processing
+				const hasMessages = state.messages.length > 0;
+				return hasMessages ? 'check_state' : 'responder';
+			})
 			// Conditional Edge for Supervisor (initial routing via LLM)
 			.addConditionalEdges('supervisor', (state) => routeToNode(state.nextPhase))
 			// Deterministic routing after subgraphs complete (based on coordination log)
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/parent-graph-state.ts b/packages/@n8n/ai-workflow-builder.ee/src/parent-graph-state.ts
index 33741b88dca..053a9717943 100644
--- a/packages/@n8n/ai-workflow-builder.ee/src/parent-graph-state.ts
+++ b/packages/@n8n/ai-workflow-builder.ee/src/parent-graph-state.ts
@@ -1,5 +1,5 @@
 import type { BaseMessage } from '@langchain/core/messages';
-import { Annotation } from '@langchain/langgraph';
+import { Annotation, messagesStateReducer } from '@langchain/langgraph';
 
 import type { CoordinationLogEntry } from './types/coordination';
 import type { DiscoveryContext } from './types/discovery-types';
@@ -17,7 +17,7 @@ import type { ChatPayload } from './workflow-builder-agent';
 export const ParentGraphState = Annotation.Root({
 	// Shared: User's conversation history (for responder)
 	messages: Annotation<BaseMessage[]>({
-		reducer: (x, y) => x.concat(y),
+		reducer: messagesStateReducer,
 		default: () => [],
 	}),
 
@@ -56,6 +56,12 @@ export const ParentGraphState = Annotation.Root({
 		default: () => [],
 	}),
 
+	// For conversation compaction - stores summarized history
+	previousSummary: Annotation<string>({
+		reducer: (x, y) => y ?? x,
+		default: () => '',
+	}),
+
 	// Template IDs fetched from workflow examples for telemetry
 	templateIds: Annotation<number[]>({
 		reducer: appendArrayReducer,
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/subgraphs/builder.subgraph.ts b/packages/@n8n/ai-workflow-builder.ee/src/subgraphs/builder.subgraph.ts
index aee4cee8973..91aef3faa13 100644
--- a/packages/@n8n/ai-workflow-builder.ee/src/subgraphs/builder.subgraph.ts
+++ b/packages/@n8n/ai-workflow-builder.ee/src/subgraphs/builder.subgraph.ts
@@ -55,6 +55,7 @@ STEP 3: VALIDATE (REQUIRED)
 - After ALL nodes and connections are created, call validate_structure
 - This step is MANDATORY - you cannot finish without it
 - If validation finds issues (missing trigger, invalid connections), fix them and validate again
+- MAXIMUM 3 VALIDATION ATTEMPTS: After 3 calls to validate_structure, proceed to respond regardless of remaining issues
 
 STEP 4: RESPOND TO USER
 - Only after validation passes, provide your brief summary
@@ -83,6 +84,12 @@ Placement rules:
 For AI-generated structured data, prefer Structured Output Parser nodes over Code nodes.
 For binary file data, use Extract From File node to extract content from files before processing.
 Use Code nodes only for custom business logic beyond parsing.
+
+STRUCTURED OUTPUT PARSER RULE:
+When Discovery results include Structured Output Parser:
+1. Create the Structured Output Parser node
+2. Set AI Agent's hasOutputParser: true in connectionParameters
+3. Connect: Structured Output Parser → AI Agent (ai_outputParser connection)
 </data_parsing_strategy>
 
 <proactive_design>
@@ -108,9 +115,19 @@ ALWAYS check node details and set connectionParameters explicitly.
 
 CONNECTION PARAMETERS EXAMPLES:
 - Static nodes (HTTP Request, Set, Code): reasoning="Static inputs/outputs", parameters={{}}
-- AI Agent with parser: reasoning="hasOutputParser creates additional input", parameters={{ hasOutputParser: true }}
+- AI Agent with structured output: reasoning="hasOutputParser enables ai_outputParser input for Structured Output Parser", parameters={{ hasOutputParser: true }}
 - Vector Store insert: reasoning="Insert mode requires document input", parameters={{ mode: "insert" }}
 - Document Loader custom: reasoning="Custom mode enables text splitter input", parameters={{ textSplittingMode: "custom" }}
+- Switch with routing rules: reasoning="Switch needs N outputs, creating N rules.values entries with outputKeys", parameters={{ mode: "rules", rules: {{ values: [...] }} }} - see <switch_node_pattern> for full structure
+
+<structured_output_parser_guidance>
+WHEN TO SET hasOutputParser: true on AI Agent:
+- Discovery found Structured Output Parser node → MUST set hasOutputParser: true
+- AI output will be used in conditions (IF/Switch nodes checking $json.field)
+- AI output will be formatted/displayed (HTML emails, reports with specific sections)
+- AI output will be stored in database/data tables with specific fields
+- AI is classifying, scoring, or extracting specific data fields
+</structured_output_parser_guidance>
 
 <node_connections_understanding>
 n8n connections flow from SOURCE (output) to TARGET (input).
@@ -158,6 +175,51 @@ Common mistake to avoid:
 - Document Loader is an AI sub-node that gives Vector Store document processing capability
 </rag_workflow_pattern>
 
+<switch_node_pattern>
+For Switch nodes with multiple routing paths:
+- The number of outputs is determined by the number of entries in rules.values[]
+- You MUST create the rules.values[] array with placeholder entries for each output branch
+- Each entry needs: conditions structure (with empty leftValue/rightValue) + renameOutput: true + descriptive outputKey
+- Configurator will fill in the actual condition values later
+- Use descriptive node names like "Route by Amount" or "Route by Status"
+
+Example connectionParameters for 3-way routing:
+{{
+  "mode": "rules",
+  "rules": {{
+    "values": [
+      {{
+        "conditions": {{
+          "options": {{ "caseSensitive": true, "leftValue": "", "typeValidation": "strict" }},
+          "conditions": [{{ "leftValue": "", "rightValue": "", "operator": {{ "type": "string", "operation": "equals" }} }}],
+          "combinator": "and"
+        }},
+        "renameOutput": true,
+        "outputKey": "Output 1 Name"
+      }},
+      {{
+        "conditions": {{
+          "options": {{ "caseSensitive": true, "leftValue": "", "typeValidation": "strict" }},
+          "conditions": [{{ "leftValue": "", "rightValue": "", "operator": {{ "type": "string", "operation": "equals" }} }}],
+          "combinator": "and"
+        }},
+        "renameOutput": true,
+        "outputKey": "Output 2 Name"
+      }},
+      {{
+        "conditions": {{
+          "options": {{ "caseSensitive": true, "leftValue": "", "typeValidation": "strict" }},
+          "conditions": [{{ "leftValue": "", "rightValue": "", "operator": {{ "type": "string", "operation": "equals" }} }}],
+          "combinator": "and"
+        }},
+        "renameOutput": true,
+        "outputKey": "Output 3 Name"
+      }}
+    ]
+  }}
+}}
+</switch_node_pattern>
+
 <connection_type_examples>
 **Main Connections** (regular data flow):
 - Trigger → HTTP Request → Set → Email
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/subgraphs/configurator.subgraph.ts b/packages/@n8n/ai-workflow-builder.ee/src/subgraphs/configurator.subgraph.ts
index 8c74cd8db86..3d9c83a562d 100644
--- a/packages/@n8n/ai-workflow-builder.ee/src/subgraphs/configurator.subgraph.ts
+++ b/packages/@n8n/ai-workflow-builder.ee/src/subgraphs/configurator.subgraph.ts
@@ -50,6 +50,7 @@ STEP 2: VALIDATE (REQUIRED)
 - After ALL configurations complete, call validate_configuration
 - This step is MANDATORY - you cannot finish without it
 - If validation finds issues, fix them and validate again
+- MAXIMUM 3 VALIDATION ATTEMPTS: After 3 calls to validate_configuration, proceed to respond regardless of remaining issues
 
 STEP 3: RESPOND TO USER
 - Only after validation passes, provide your response
@@ -85,6 +86,7 @@ CRITICAL PARAMETERS TO ALWAYS SET:
 - Set node: Fields to set with values
 - Code node: The actual code to execute
 - IF node: Conditions to check
+- Switch node: Configure rules.values[] with conditions for each output branch (uses same filter structure as IF node)
 - Document Loader: dataType parameter ('binary' for files like PDF, 'json' for JSON data)
 - AI nodes: Prompts, models, configurations
 - Tool nodes: Use $fromAI for dynamic recipient/subject/message fields
@@ -95,6 +97,34 @@ Defaults are traps that cause runtime failures. Examples:
 - HTTP Request defaults to GET but APIs often need POST
 - Vector Store mode affects available connections - set explicitly (retrieve-as-tool when using with AI Agent)
 
+<switch_node_configuration>
+Switch nodes require configuring rules.values[] array - each entry creates one output:
+
+Structure per rule:
+{{
+  "conditions": {{
+    "options": {{ "caseSensitive": true, "leftValue": "", "typeValidation": "strict" }},
+    "conditions": [
+      {{
+        "leftValue": "={{{{ $json.fieldName }}}}",
+        "rightValue": <value>,
+        "operator": {{ "type": "number|string", "operation": "lt|gt|equals|etc" }}
+      }}
+    ],
+    "combinator": "and"
+  }},
+  "renameOutput": true,
+  "outputKey": "Descriptive Label"
+}}
+
+For numeric ranges (e.g., $100-$1000):
+- Use TWO conditions with combinator: "and"
+- First: gte (greater than or equal)
+- Second: lte (less than or equal)
+
+Always set renameOutput: true and provide descriptive outputKey labels.
+</switch_node_configuration>
+
 <response_format>
 After validation passes, provide a concise summary:
 - List any placeholders requiring user configuration (e.g., "URL placeholder needs actual endpoint")
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/subgraphs/discovery.subgraph.ts b/packages/@n8n/ai-workflow-builder.ee/src/subgraphs/discovery.subgraph.ts
index 60148969262..d0d9534011d 100644
--- a/packages/@n8n/ai-workflow-builder.ee/src/subgraphs/discovery.subgraph.ts
+++ b/packages/@n8n/ai-workflow-builder.ee/src/subgraphs/discovery.subgraph.ts
@@ -325,11 +325,38 @@ A parameter is connection-changing ONLY IF it appears in <input> or <output> exp
 - Merge: numberInputs (appears in <input> expression)
 - Webhook: responseMode (appears in <output> expression)
 
+<dynamic_output_nodes>
+Some nodes have DYNAMIC outputs that depend on parameter values:
+
+**Switch Node** (n8n-nodes-base.switch):
+- When mode is "rules", the number of outputs equals the number of routing rules
+- Connection parameter: mode: "rules" - CRITICAL for enabling rule-based routing
+- Each rule in rules.values[] creates one output
+- The rules parameter uses the same filter structure as IF node conditions
+- ALWAYS flag mode as connection-changing with possibleValues: ["rules", "expression"]
+
+**Merge Node** (n8n-nodes-base.merge):
+- numberInputs parameter controls how many inputs the node accepts
+
+When you find these nodes, ALWAYS flag mode/numberInputs as connection-changing parameters with possibleValues.
+</dynamic_output_nodes>
+
 SUB-NODES SEARCHES:
 When searching for AI nodes, ALSO search for their required sub-nodes:
 - "AI Agent" → also search for "Chat Model", "Memory", "Output Parser"
 - "Basic LLM Chain" → also search for "Chat Model", "Output Parser"
 - "Vector Store" → also search for "Embeddings", "Document Loader"
+
+STRUCTURED OUTPUT PARSER - WHEN TO INCLUDE:
+Search for "Structured Output Parser" (@n8n/n8n-nodes-langchain.outputParserStructured) when:
+- AI output will be used programmatically (conditions, formatting, database storage, API calls)
+- AI needs to extract specific fields (e.g., score, category, priority, action items)
+- AI needs to classify/categorize data into defined categories
+- Downstream nodes need to access specific fields from AI response (e.g., $json.score, $json.category)
+- Output will be displayed in a formatted way (e.g., HTML email with specific sections)
+- Data needs validation against a schema before processing
+
+
 - Always use search_nodes to find the exact node names and versions - NEVER guess versions
 
 CRITICAL RULES:
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/test/ai-workflow-builder-agent.service.test.ts b/packages/@n8n/ai-workflow-builder.ee/src/test/ai-workflow-builder-agent.service.test.ts
index a0d5b27f3bf..e78864ab8c6 100644
--- a/packages/@n8n/ai-workflow-builder.ee/src/test/ai-workflow-builder-agent.service.test.ts
+++ b/packages/@n8n/ai-workflow-builder.ee/src/test/ai-workflow-builder-agent.service.test.ts
@@ -209,6 +209,7 @@ describe('AiWorkflowBuilderService', () => {
 			mockLogger,
 			'test-instance-id',
 			'https://n8n.example.com',
+			'1.0.0',
 			mockOnCreditsUpdated,
 		);
 	});
@@ -221,6 +222,7 @@ describe('AiWorkflowBuilderService', () => {
 				mockLogger,
 				'test-instance-id',
 				'https://test.com',
+				'1.0.0',
 				mockOnCreditsUpdated,
 			);
 
@@ -247,6 +249,7 @@ describe('AiWorkflowBuilderService', () => {
 				mockLogger,
 				'test-instance-id',
 				'https://test.com',
+				'1.0.0',
 				mockOnCreditsUpdated,
 			);
 
@@ -271,6 +274,7 @@ describe('AiWorkflowBuilderService', () => {
 				mockLogger,
 				'test-instance-id',
 				'https://test.com',
+				'1.0.0',
 				mockOnCreditsUpdated,
 			);
 
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/types/config.ts b/packages/@n8n/ai-workflow-builder.ee/src/types/config.ts
index e4c20df6da1..501881892c3 100644
--- a/packages/@n8n/ai-workflow-builder.ee/src/types/config.ts
+++ b/packages/@n8n/ai-workflow-builder.ee/src/types/config.ts
@@ -29,6 +29,7 @@ export interface NodePromptConfig {
 	nodeTypePatterns: {
 		set: string[];
 		if: string[];
+		switch: string[];
 		httpRequest: string[];
 		tool: string[];
 	};
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/types/coordination.ts b/packages/@n8n/ai-workflow-builder.ee/src/types/coordination.ts
index 49eb51755cf..cefab4e7f36 100644
--- a/packages/@n8n/ai-workflow-builder.ee/src/types/coordination.ts
+++ b/packages/@n8n/ai-workflow-builder.ee/src/types/coordination.ts
@@ -5,7 +5,7 @@
  * and enable deterministic routing without polluting the messages array.
  */
 
-export type SubgraphPhase = 'discovery' | 'builder' | 'configurator';
+export type SubgraphPhase = 'discovery' | 'builder' | 'configurator' | 'state_management';
 
 /**
  * Entry in the coordination log tracking subgraph completion.
@@ -34,6 +34,7 @@ export type CoordinationMetadata =
 	| DiscoveryMetadata
 	| BuilderMetadata
 	| ConfiguratorMetadata
+	| StateManagementMetadata
 	| ErrorMetadata;
 
 export interface DiscoveryMetadata {
@@ -72,6 +73,14 @@ export interface ErrorMetadata {
 	errorMessage: string;
 }
 
+export interface StateManagementMetadata {
+	phase: 'state_management';
+	/** Type of state management action */
+	action: 'compact' | 'clear';
+	/** Number of messages removed during compaction */
+	messagesRemoved?: number;
+}
+
 /**
  * Helper functions to create typed metadata objects.
  * These eliminate the need for type assertions when creating coordination log entries.
@@ -93,3 +102,9 @@ export function createConfiguratorMetadata(
 export function createErrorMetadata(data: Omit<ErrorMetadata, 'phase'>): ErrorMetadata {
 	return { phase: 'error', ...data };
 }
+
+export function createStateManagementMetadata(
+	data: Omit<StateManagementMetadata, 'phase'>,
+): StateManagementMetadata {
+	return { phase: 'state_management', ...data };
+}
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/utils/coordination-log.ts b/packages/@n8n/ai-workflow-builder.ee/src/utils/coordination-log.ts
index 9d44dba5453..007efdab280 100644
--- a/packages/@n8n/ai-workflow-builder.ee/src/utils/coordination-log.ts
+++ b/packages/@n8n/ai-workflow-builder.ee/src/utils/coordination-log.ts
@@ -13,6 +13,7 @@ import type {
 	DiscoveryMetadata,
 	BuilderMetadata,
 	ConfiguratorMetadata,
+	StateManagementMetadata,
 } from '../types/coordination';
 
 export type RoutingDecision = 'discovery' | 'builder' | 'configurator' | 'responder';
@@ -80,10 +81,14 @@ export function getPhaseMetadata(
 	log: CoordinationLogEntry[],
 	phase: 'configurator',
 ): ConfiguratorMetadata | null;
+export function getPhaseMetadata(
+	log: CoordinationLogEntry[],
+	phase: 'state_management',
+): StateManagementMetadata | null;
 export function getPhaseMetadata(
 	log: CoordinationLogEntry[],
 	phase: SubgraphPhase,
-): DiscoveryMetadata | BuilderMetadata | ConfiguratorMetadata | null {
+): DiscoveryMetadata | BuilderMetadata | ConfiguratorMetadata | StateManagementMetadata | null {
 	const entry = getPhaseEntry(log, phase);
 	if (!entry) return null;
 
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/utils/state-modifier.ts b/packages/@n8n/ai-workflow-builder.ee/src/utils/state-modifier.ts
new file mode 100644
index 00000000000..5ff40fdf504
--- /dev/null
+++ b/packages/@n8n/ai-workflow-builder.ee/src/utils/state-modifier.ts
@@ -0,0 +1,195 @@
+import type { BaseChatModel } from '@langchain/core/language_models/chat_models';
+import type { BaseMessage } from '@langchain/core/messages';
+import { HumanMessage, RemoveMessage } from '@langchain/core/messages';
+import type { Logger } from '@n8n/backend-common';
+
+import { cleanupDanglingToolCallMessages } from './cleanup-dangling-tool-call-messages';
+import { estimateTokenCountFromMessages } from './token-usage';
+import { conversationCompactChain } from '../chains/conversation-compact';
+import { workflowNameChain } from '../chains/workflow-name';
+import type { CoordinationLogEntry } from '../types/coordination';
+import { createStateManagementMetadata } from '../types/coordination';
+import type { SimpleWorkflow } from '../types/workflow';
+
+export type StateModificationAction =
+	| 'compact_messages'
+	| 'delete_messages'
+	| 'create_workflow_name'
+	| 'auto_compact_messages'
+	| 'cleanup_dangling'
+	| 'continue';
+
+export interface StateModifierInput {
+	messages: BaseMessage[];
+	workflowJSON: SimpleWorkflow;
+	previousSummary?: string;
+}
+
+/**
+ * Determines if state modifications are needed before agent processing.
+ * Pure function - no side effects, easily testable.
+ */
+export function determineStateAction(
+	input: StateModifierInput,
+	autoCompactThresholdTokens: number,
+): StateModificationAction {
+	const { messages, workflowJSON } = input;
+
+	// First check for dangling tool calls (from interrupted sessions)
+	const danglingMessages = cleanupDanglingToolCallMessages(messages);
+	if (danglingMessages.length > 0) {
+		return 'cleanup_dangling';
+	}
+
+	const lastHumanMessage = messages.findLast((m) => m instanceof HumanMessage);
+	if (!lastHumanMessage) return 'continue';
+
+	// Manual /compact command
+	if (lastHumanMessage.content === '/compact') {
+		return 'compact_messages';
+	}
+
+	// Manual /clear command
+	if (lastHumanMessage.content === '/clear') {
+		return 'delete_messages';
+	}
+
+	// Auto-generate workflow name on first message with empty workflow
+	const workflowName = workflowJSON?.name;
+	const nodesLength = workflowJSON?.nodes?.length ?? 0;
+	const isDefaultName = !workflowName || /^My workflow( \d+)?$/.test(workflowName);
+	if (isDefaultName && nodesLength === 0 && messages.length === 1) {
+		return 'create_workflow_name';
+	}
+
+	// Auto-compact when token threshold exceeded
+	const estimatedTokens = estimateTokenCountFromMessages(messages);
+	if (estimatedTokens > autoCompactThresholdTokens) {
+		return 'auto_compact_messages';
+	}
+
+	return 'continue';
+}
+
+/**
+ * Cleans up dangling tool call messages from interrupted sessions.
+ * Returns state update with RemoveMessage instances.
+ */
+export function handleCleanupDangling(
+	messages: BaseMessage[],
+	logger?: Logger,
+): { messages: RemoveMessage[] } {
+	const messagesToRemove = cleanupDanglingToolCallMessages(messages);
+	if (messagesToRemove.length > 0) {
+		logger?.warn('Cleaning up dangling tool call messages', {
+			count: messagesToRemove.length,
+		});
+	}
+	return { messages: messagesToRemove };
+}
+
+/**
+ * Compacts conversation history by summarizing it.
+ * Used for both manual /compact and auto-compaction.
+ *
+ * For manual /compact: Removes all messages, routes to responder for acknowledgment.
+ * For auto-compact: Removes old messages, preserves last user message to continue processing.
+ */
+export async function handleCompactMessages(
+	messages: BaseMessage[],
+	previousSummary: string,
+	llm: BaseChatModel,
+	isAutoCompact: boolean,
+): Promise<{
+	previousSummary: string;
+	messages: BaseMessage[];
+	coordinationLog: CoordinationLogEntry[];
+}> {
+	const lastHumanMessage = messages.findLast((m) => m instanceof HumanMessage);
+	if (!lastHumanMessage) {
+		throw new Error('Cannot compact messages: no HumanMessage found');
+	}
+
+	const compactedMessages = await conversationCompactChain(llm, messages, previousSummary);
+
+	// For manual /compact: just remove messages, responder will generate acknowledgment
+	// For auto-compact: remove messages but preserve the last user message to continue processing
+	const newMessages: BaseMessage[] = [
+		...messages.map((m) => new RemoveMessage({ id: m.id! })),
+		...(isAutoCompact ? [new HumanMessage({ content: lastHumanMessage.content })] : []),
+	];
+
+	return {
+		previousSummary: compactedMessages.summaryPlain,
+		messages: newMessages,
+		coordinationLog: [
+			{
+				phase: 'state_management',
+				status: 'completed',
+				timestamp: Date.now(),
+				summary: isAutoCompact
+					? 'Auto-compacted conversation due to token limit'
+					: 'Manually compacted conversation history',
+				metadata: createStateManagementMetadata({
+					action: 'compact',
+					messagesRemoved: messages.length,
+				}),
+			},
+		],
+	};
+}
+
+/**
+ * Clears the session by removing all messages and resetting workflow.
+ */
+export function handleDeleteMessages(messages: BaseMessage[]): {
+	messages: RemoveMessage[];
+	workflowJSON: SimpleWorkflow;
+	previousSummary: string;
+	discoveryContext: null;
+	coordinationLog: CoordinationLogEntry[];
+	workflowOperations: [];
+} {
+	return {
+		messages: messages.map((m) => new RemoveMessage({ id: m.id! })),
+		workflowJSON: { nodes: [], connections: {}, name: '' },
+		previousSummary: '',
+		discoveryContext: null,
+		coordinationLog: [
+			{
+				phase: 'state_management',
+				status: 'completed',
+				timestamp: Date.now(),
+				summary: 'Cleared session and reset workflow',
+				metadata: createStateManagementMetadata({ action: 'clear' }),
+			},
+		],
+		workflowOperations: [],
+	};
+}
+
+/**
+ * Generates a workflow name from the initial user message.
+ */
+export async function handleCreateWorkflowName(
+	messages: BaseMessage[],
+	workflowJSON: SimpleWorkflow,
+	llm: BaseChatModel,
+	logger?: Logger,
+): Promise<{ workflowJSON: SimpleWorkflow }> {
+	if (messages.length === 1 && messages[0] instanceof HumanMessage) {
+		const initialMessage = messages[0];
+		if (typeof initialMessage.content !== 'string') {
+			logger?.debug('Initial message content is not a string, skipping workflow name generation');
+			return { workflowJSON };
+		}
+
+		logger?.debug('Generating workflow name');
+		const { name } = await workflowNameChain(llm, initialMessage.content);
+
+		return {
+			workflowJSON: { ...workflowJSON, name },
+		};
+	}
+	return { workflowJSON };
+}
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/utils/stream-processor.ts b/packages/@n8n/ai-workflow-builder.ee/src/utils/stream-processor.ts
index 6b392c87758..5621a42be3e 100644
--- a/packages/@n8n/ai-workflow-builder.ee/src/utils/stream-processor.ts
+++ b/packages/@n8n/ai-workflow-builder.ee/src/utils/stream-processor.ts
@@ -159,35 +159,6 @@ export function cleanContextTags(text: string): string {
 // CHUNK PROCESSORS
 // ============================================================================
 
-/** Handle delete_messages node update */
-function processDeleteMessages(update: unknown): StreamOutput | null {
-	const typed = update as { messages?: MessageContent[] } | undefined;
-	if (!typed?.messages?.length) return null;
-
-	const messageChunk: AgentMessageChunk = {
-		role: 'assistant',
-		type: 'message',
-		text: 'Deleted, refresh?',
-	};
-	return { messages: [messageChunk] };
-}
-
-/** Handle compact_messages node update */
-function processCompactMessages(update: unknown): StreamOutput | null {
-	const typed = update as { messages?: MessageContent[] } | undefined;
-	if (!typed?.messages?.length) return null;
-
-	const content = extractMessageContent(typed.messages);
-	if (!content) return null;
-
-	const messageChunk: AgentMessageChunk = {
-		role: 'assistant',
-		type: 'message',
-		text: content,
-	};
-	return { messages: [messageChunk] };
-}
-
 /** Handle process_operations node update */
 function processOperationsUpdate(update: unknown): StreamOutput | null {
 	const typed = update as { workflowJSON?: unknown; workflowOperations?: unknown } | undefined;
@@ -234,16 +205,13 @@ function processToolChunk(chunk: unknown): StreamOutput | null {
 
 /** Process a single chunk from updates stream mode */
 function processUpdatesChunk(nodeUpdate: Record<string, unknown>): StreamOutput | null {
-	// Guard against null/undefined chunks
 	if (!nodeUpdate || typeof nodeUpdate !== 'object') return null;
 
-	// Special nodes first (backward compatibility)
-	if (nodeUpdate.delete_messages) {
-		return processDeleteMessages(nodeUpdate.delete_messages);
-	}
-	if (nodeUpdate.compact_messages) {
-		return processCompactMessages(nodeUpdate.compact_messages);
+	if (nodeUpdate.delete_messages || nodeUpdate.compact_messages) {
+		return null;
 	}
+
+	// Process operations emits workflow updates
 	if (nodeUpdate.process_operations) {
 		return processOperationsUpdate(nodeUpdate.process_operations);
 	}
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/utils/test/state-modifier.test.ts b/packages/@n8n/ai-workflow-builder.ee/src/utils/test/state-modifier.test.ts
new file mode 100644
index 00000000000..f9f7b6d9541
--- /dev/null
+++ b/packages/@n8n/ai-workflow-builder.ee/src/utils/test/state-modifier.test.ts
@@ -0,0 +1,297 @@
+import { AIMessage, HumanMessage, RemoveMessage } from '@langchain/core/messages';
+
+import { cleanupDanglingToolCallMessages } from '../cleanup-dangling-tool-call-messages';
+import {
+	determineStateAction,
+	handleCleanupDangling,
+	handleDeleteMessages,
+} from '../state-modifier';
+import { estimateTokenCountFromMessages } from '../token-usage';
+
+jest.mock('../cleanup-dangling-tool-call-messages');
+jest.mock('../token-usage');
+
+const mockCleanupDanglingToolCallMessages = cleanupDanglingToolCallMessages as jest.MockedFunction<
+	typeof cleanupDanglingToolCallMessages
+>;
+const mockEstimateTokenCountFromMessages = estimateTokenCountFromMessages as jest.MockedFunction<
+	typeof estimateTokenCountFromMessages
+>;
+
+describe('state-modifier', () => {
+	beforeEach(() => {
+		jest.clearAllMocks();
+		mockCleanupDanglingToolCallMessages.mockReturnValue([]);
+		mockEstimateTokenCountFromMessages.mockReturnValue(100);
+	});
+
+	describe('determineStateAction', () => {
+		const emptyWorkflow = { nodes: [], connections: {}, name: '' };
+		const defaultNameWorkflow = { nodes: [], connections: {}, name: 'My workflow' };
+		const defaultNameNumberedWorkflow = { nodes: [], connections: {}, name: 'My workflow 5' };
+		const customNameWorkflow = { nodes: [], connections: {}, name: 'Email automation' };
+		const workflowWithNodes = {
+			nodes: [
+				{
+					id: '1',
+					name: 'Start',
+					type: 'n8n-nodes-base.start',
+					position: [0, 0] as [number, number],
+					typeVersion: 1,
+					parameters: {},
+				},
+			],
+			connections: {},
+			name: 'My workflow',
+		};
+
+		it('should return cleanup_dangling when dangling tool calls exist', () => {
+			mockCleanupDanglingToolCallMessages.mockReturnValue([
+				new RemoveMessage({ id: 'dangling-1' }),
+			]);
+
+			const result = determineStateAction(
+				{
+					messages: [new HumanMessage({ id: 'h1', content: 'Hello' })],
+					workflowJSON: emptyWorkflow,
+				},
+				40000,
+			);
+
+			expect(result).toBe('cleanup_dangling');
+		});
+
+		it('should return compact_messages for /compact command', () => {
+			const result = determineStateAction(
+				{
+					messages: [new HumanMessage({ id: 'h1', content: '/compact' })],
+					workflowJSON: emptyWorkflow,
+				},
+				40000,
+			);
+
+			expect(result).toBe('compact_messages');
+		});
+
+		it('should return delete_messages for /clear command', () => {
+			const result = determineStateAction(
+				{
+					messages: [new HumanMessage({ id: 'h1', content: '/clear' })],
+					workflowJSON: emptyWorkflow,
+				},
+				40000,
+			);
+
+			expect(result).toBe('delete_messages');
+		});
+
+		it('should return create_workflow_name for first message with default workflow name', () => {
+			const result = determineStateAction(
+				{
+					messages: [new HumanMessage({ id: 'h1', content: 'Create an email workflow' })],
+					workflowJSON: defaultNameWorkflow,
+				},
+				40000,
+			);
+
+			expect(result).toBe('create_workflow_name');
+		});
+
+		it('should return create_workflow_name for first message with numbered default name', () => {
+			const result = determineStateAction(
+				{
+					messages: [new HumanMessage({ id: 'h1', content: 'Create an email workflow' })],
+					workflowJSON: defaultNameNumberedWorkflow,
+				},
+				40000,
+			);
+
+			expect(result).toBe('create_workflow_name');
+		});
+
+		it('should return create_workflow_name for first message with empty workflow name', () => {
+			const result = determineStateAction(
+				{
+					messages: [new HumanMessage({ id: 'h1', content: 'Create an email workflow' })],
+					workflowJSON: emptyWorkflow,
+				},
+				40000,
+			);
+
+			expect(result).toBe('create_workflow_name');
+		});
+
+		it('should NOT return create_workflow_name for custom workflow name', () => {
+			const result = determineStateAction(
+				{
+					messages: [new HumanMessage({ id: 'h1', content: 'Create an email workflow' })],
+					workflowJSON: customNameWorkflow,
+				},
+				40000,
+			);
+
+			expect(result).toBe('continue');
+		});
+
+		it('should NOT return create_workflow_name when workflow has nodes', () => {
+			const result = determineStateAction(
+				{
+					messages: [new HumanMessage({ id: 'h1', content: 'Add another node' })],
+					workflowJSON: workflowWithNodes,
+				},
+				40000,
+			);
+
+			expect(result).toBe('continue');
+		});
+
+		it('should NOT return create_workflow_name when there are multiple messages', () => {
+			const result = determineStateAction(
+				{
+					messages: [
+						new HumanMessage({ id: 'h1', content: 'First message' }),
+						new AIMessage({ id: 'a1', content: 'Response' }),
+						new HumanMessage({ id: 'h2', content: 'Second message' }),
+					],
+					workflowJSON: defaultNameWorkflow,
+				},
+				40000,
+			);
+
+			expect(result).toBe('continue');
+		});
+
+		it('should return auto_compact_messages when tokens exceed threshold', () => {
+			mockEstimateTokenCountFromMessages.mockReturnValue(50000);
+
+			const result = determineStateAction(
+				{
+					messages: [new HumanMessage({ id: 'h1', content: 'A very long conversation' })],
+					workflowJSON: customNameWorkflow,
+				},
+				40000,
+			);
+
+			expect(result).toBe('auto_compact_messages');
+		});
+
+		it('should return continue as default when no conditions match', () => {
+			const result = determineStateAction(
+				{
+					messages: [
+						new HumanMessage({ id: 'h1', content: 'Hello' }),
+						new AIMessage({ id: 'a1', content: 'Hi!' }),
+					],
+					workflowJSON: customNameWorkflow,
+				},
+				40000,
+			);
+
+			expect(result).toBe('continue');
+		});
+
+		it('should return continue when there are no human messages', () => {
+			const result = determineStateAction(
+				{
+					messages: [new AIMessage({ id: 'a1', content: 'AI response' })],
+					workflowJSON: emptyWorkflow,
+				},
+				40000,
+			);
+
+			expect(result).toBe('continue');
+		});
+	});
+
+	describe('handleCleanupDangling', () => {
+		it('should return RemoveMessage array for dangling messages', () => {
+			const danglingRemoveMessages = [
+				new RemoveMessage({ id: 'ai-1' }),
+				new RemoveMessage({ id: 'ai-2' }),
+			];
+			mockCleanupDanglingToolCallMessages.mockReturnValue(danglingRemoveMessages);
+
+			const messages = [
+				new AIMessage({
+					id: 'ai-1',
+					content: 'Call',
+					tool_calls: [{ id: 'tc1', name: 'tool', args: {} }],
+				}),
+				new AIMessage({
+					id: 'ai-2',
+					content: 'Call',
+					tool_calls: [{ id: 'tc2', name: 'tool', args: {} }],
+				}),
+			];
+
+			const result = handleCleanupDangling(messages);
+
+			expect(result.messages).toHaveLength(2);
+			expect(result.messages[0]).toBeInstanceOf(RemoveMessage);
+			expect(result.messages[1]).toBeInstanceOf(RemoveMessage);
+		});
+
+		it('should return empty array when no dangling messages', () => {
+			mockCleanupDanglingToolCallMessages.mockReturnValue([]);
+
+			const result = handleCleanupDangling([new HumanMessage({ id: 'h1', content: 'Hello' })]);
+
+			expect(result.messages).toHaveLength(0);
+		});
+	});
+
+	describe('handleDeleteMessages', () => {
+		it('should return RemoveMessage for each input message', () => {
+			const messages = [
+				new HumanMessage({ id: 'h1', content: 'Hello' }),
+				new AIMessage({ id: 'a1', content: 'Hi' }),
+				new HumanMessage({ id: 'h2', content: 'Bye' }),
+			];
+
+			const result = handleDeleteMessages(messages);
+
+			expect(result.messages).toHaveLength(3);
+			expect(result.messages[0]).toBeInstanceOf(RemoveMessage);
+			expect(result.messages[0].id).toBe('h1');
+			expect(result.messages[1].id).toBe('a1');
+			expect(result.messages[2].id).toBe('h2');
+		});
+
+		it('should reset workflowJSON to empty state', () => {
+			const result = handleDeleteMessages([new HumanMessage({ id: 'h1', content: 'Hello' })]);
+
+			expect(result.workflowJSON).toEqual({
+				nodes: [],
+				connections: {},
+				name: '',
+			});
+		});
+
+		it('should clear previousSummary', () => {
+			const result = handleDeleteMessages([]);
+
+			expect(result.previousSummary).toBe('');
+		});
+
+		it('should set discoveryContext to null', () => {
+			const result = handleDeleteMessages([]);
+
+			expect(result.discoveryContext).toBeNull();
+		});
+
+		it('should add coordination log entry for clear action', () => {
+			const result = handleDeleteMessages([]);
+
+			expect(result.coordinationLog).toHaveLength(1);
+			expect(result.coordinationLog[0].phase).toBe('state_management');
+			expect(result.coordinationLog[0].status).toBe('completed');
+			expect(result.coordinationLog[0].summary).toBe('Cleared session and reset workflow');
+		});
+
+		it('should return empty workflowOperations array', () => {
+			const result = handleDeleteMessages([]);
+
+			expect(result.workflowOperations).toEqual([]);
+		});
+	});
+});
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/utils/test/stream-processor.test.ts b/packages/@n8n/ai-workflow-builder.ee/src/utils/test/stream-processor.test.ts
index 6f55235aa73..e4708c31f1d 100644
--- a/packages/@n8n/ai-workflow-builder.ee/src/utils/test/stream-processor.test.ts
+++ b/packages/@n8n/ai-workflow-builder.ee/src/utils/test/stream-processor.test.ts
@@ -57,7 +57,7 @@ describe('stream-processor', () => {
 				expect(message.text).toBe('Part 1\nPart 2');
 			});
 
-			it('should handle delete_messages with refresh message', () => {
+			it('should skip delete_messages (responder handles user message)', () => {
 				const chunk = {
 					delete_messages: {
 						messages: [{ content: 'Some deleted message' }],
@@ -66,13 +66,10 @@ describe('stream-processor', () => {
 
 				const result = processStreamChunk('updates', chunk);
 
-				expect(result).toBeDefined();
-				expect(result?.messages).toHaveLength(1);
-				const message = result?.messages[0] as AgentMessageChunk;
-				expect(message.text).toBe('Deleted, refresh?');
+				expect(result).toBeNull();
 			});
 
-			it('should handle compact_messages returning last message', () => {
+			it('should skip compact_messages (responder handles user message)', () => {
 				const chunk = {
 					compact_messages: {
 						messages: [
@@ -85,10 +82,7 @@ describe('stream-processor', () => {
 
 				const result = processStreamChunk('updates', chunk);
 
-				expect(result).toBeDefined();
-				expect(result?.messages).toHaveLength(1);
-				const message = result?.messages[0] as AgentMessageChunk;
-				expect(message.text).toBe('Last message to display');
+				expect(result).toBeNull();
 			});
 
 			it('should handle compact_messages with empty content', () => {
@@ -294,10 +288,9 @@ describe('stream-processor', () => {
 				results.push(output);
 			}
 
-			expect(results).toHaveLength(3);
+			expect(results).toHaveLength(2);
 			expect((results[0].messages[0] as AgentMessageChunk).text).toBe('Message 1');
 			expect((results[1].messages[0] as ToolProgressChunk).toolName).toBe('test_tool');
-			expect((results[2].messages[0] as AgentMessageChunk).text).toBe('Deleted, refresh?');
 		});
 
 		it('should handle empty stream', async () => {
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/validation/checks/connections.ts b/packages/@n8n/ai-workflow-builder.ee/src/validation/checks/connections.ts
index 6d901b2c0db..d6b6a4afbd1 100644
--- a/packages/@n8n/ai-workflow-builder.ee/src/validation/checks/connections.ts
+++ b/packages/@n8n/ai-workflow-builder.ee/src/validation/checks/connections.ts
@@ -86,32 +86,28 @@ function checkMergeNodeConnections(
 	const issues: SingleEvaluatorResult['violations'] = [];
 
 	if (/\.merge$/.test(nodeInfo.node.type)) {
-		const providedInputTypes = getProvidedInputTypes(nodeConnections);
+		// Merge node's number of inputs is controlled by the numberInputs parameter (default 2)
+		// The node type definition has static inputs, so we must read from parameters directly
+		const numberInputsParam = nodeInfo.node.parameters?.numberInputs;
+		const expectedInputs = typeof numberInputsParam === 'number' ? numberInputsParam : 2;
 
-		const totalInputConnections = providedInputTypes.get('main') ?? 0;
+		const mainConnections = nodeConnections?.main ?? [];
 
-		if (totalInputConnections < 2) {
+		// Count actual input slots that have connections (not total connections)
+		const connectedSlots = mainConnections.filter(
+			(slot) => Array.isArray(slot) && slot.length > 0,
+		).length;
+
+		if (connectedSlots < 2) {
 			issues.push({
 				name: 'node-merge-single-input',
 				type: 'major',
-				description: `Merge node ${nodeInfo.node.name} has only ${totalInputConnections} input connection(s). Merge nodes require at least 2 inputs to function properly.`,
+				description: `Merge node ${nodeInfo.node.name} has only ${connectedSlots} input connection(s). Merge nodes require at least 2 inputs to function properly.`,
 				pointsDeducted: 20,
 			});
 		}
 
-		const expectedInputs =
-			nodeInfo.resolvedInputs?.filter((input) => input.type === 'main').length ?? 1;
-
-		if (totalInputConnections !== expectedInputs) {
-			issues.push({
-				name: 'node-merge-incorrect-num-inputs',
-				type: 'minor',
-				description: `Merge node ${nodeInfo.node.name} has ${totalInputConnections} input connections but is configured to accept ${expectedInputs}.`,
-				pointsDeducted: 10,
-			});
-		}
-
-		const mainConnections = nodeConnections?.main ?? [];
+		// Check if all expected input slots have connections
 		const missingIndexes: number[] = [];
 
 		for (let inputIndex = 0; inputIndex < expectedInputs; inputIndex++) {
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/workflow-builder-agent.ts b/packages/@n8n/ai-workflow-builder.ee/src/workflow-builder-agent.ts
index a864c8a67ad..0b4c02c8383 100644
--- a/packages/@n8n/ai-workflow-builder.ee/src/workflow-builder-agent.ts
+++ b/packages/@n8n/ai-workflow-builder.ee/src/workflow-builder-agent.ts
@@ -141,12 +141,8 @@ export interface WorkflowBuilderAgentConfig {
 	autoCompactThresholdTokens?: number;
 	instanceUrl?: string;
 	onGenerationSuccess?: () => Promise<void>;
-	/**
-	 * Enable multi-agent supervisor architecture (experimental)
-	 * When true, uses specialized agents (Discovery, Builder, Configurator) with a Supervisor
-	 * When false, uses the legacy single-agent architecture
-	 */
-	enableMultiAgent?: boolean;
+	/** Metadata to include in LangSmith traces */
+	runMetadata?: Record<string, unknown>;
 }
 
 export interface ExpressionValue {
@@ -157,6 +153,7 @@ export interface ExpressionValue {
 
 export interface BuilderFeatureFlags {
 	templateExamples?: boolean;
+	multiAgent?: boolean;
 }
 
 export interface ChatPayload {
@@ -180,7 +177,7 @@ export class WorkflowBuilderAgent {
 	private autoCompactThresholdTokens: number;
 	private instanceUrl?: string;
 	private onGenerationSuccess?: () => Promise<void>;
-	private enableMultiAgent: boolean;
+	private runMetadata?: Record<string, unknown>;
 
 	constructor(config: WorkflowBuilderAgentConfig) {
 		this.parsedNodeTypes = config.parsedNodeTypes;
@@ -193,7 +190,7 @@ export class WorkflowBuilderAgent {
 			config.autoCompactThresholdTokens ?? DEFAULT_AUTO_COMPACT_THRESHOLD_TOKENS;
 		this.instanceUrl = config.instanceUrl;
 		this.onGenerationSuccess = config.onGenerationSuccess;
-		this.enableMultiAgent = config.enableMultiAgent ?? false;
+		this.runMetadata = config.runMetadata;
 	}
 
 	private getBuilderTools(featureFlags?: BuilderFeatureFlags): BuilderTool[] {
@@ -440,9 +437,12 @@ export class WorkflowBuilderAgent {
 
 	/**
 	 * Create the workflow graph based on configuration
+	 * Controlled by feature flag only
 	 */
 	private createWorkflow(featureFlags?: BuilderFeatureFlags) {
-		if (this.enableMultiAgent) {
+		const useMultiAgent = featureFlags?.multiAgent ?? false;
+
+		if (useMultiAgent) {
 			this.logger?.debug('Using multi-agent supervisor architecture');
 			return this.createMultiAgentGraph(featureFlags);
 		}
@@ -515,8 +515,9 @@ export class WorkflowBuilderAgent {
 			recursionLimit: 50,
 			signal: abortSignal,
 			callbacks: this.tracer ? [this.tracer] : undefined,
+			metadata: this.runMetadata,
 			// Enable subgraph streaming when using multi-agent architecture
-			subgraphs: this.enableMultiAgent,
+			subgraphs: payload.featureFlags?.multiAgent ?? false,
 		};
 
 		return { agent, threadConfig, streamConfig };
diff --git a/packages/@n8n/api-types/src/dto/ai/ai-build-request.dto.ts b/packages/@n8n/api-types/src/dto/ai/ai-build-request.dto.ts
index 9061c702ebc..5ad8fc703b7 100644
--- a/packages/@n8n/api-types/src/dto/ai/ai-build-request.dto.ts
+++ b/packages/@n8n/api-types/src/dto/ai/ai-build-request.dto.ts
@@ -60,6 +60,7 @@ export class AiBuilderChatRequestDto extends Z.class({
 		featureFlags: z
 			.object({
 				templateExamples: z.boolean().optional(),
+				multiAgent: z.boolean().optional(),
 			})
 			.optional(),
 	}),
diff --git a/packages/cli/src/services/__tests__/ai-workflow-builder.service.test.ts b/packages/cli/src/services/__tests__/ai-workflow-builder.service.test.ts
index bd91ef4264b..f24e3a9afe8 100644
--- a/packages/cli/src/services/__tests__/ai-workflow-builder.service.test.ts
+++ b/packages/cli/src/services/__tests__/ai-workflow-builder.service.test.ts
@@ -121,6 +121,7 @@ describe('WorkflowBuilderService', () => {
 				mockLogger,
 				'test-instance-id', // instanceId
 				'https://instance.test.com', // instanceUrl
+				expect.any(String), // n8nVersion
 				expect.any(Function), // onCreditsUpdated callback
 				expect.any(Function), // onTelemetryEvent callback
 			);
@@ -160,6 +161,7 @@ describe('WorkflowBuilderService', () => {
 				mockLogger,
 				'test-instance-id', // instanceId
 				'https://instance.test.com', // instanceUrl
+				expect.any(String), // n8nVersion
 				expect.any(Function), // onCreditsUpdated callback
 				expect.any(Function), // onTelemetryEvent callback
 			);
@@ -279,7 +281,7 @@ describe('WorkflowBuilderService', () => {
 
 			MockedAiWorkflowBuilderService.mockImplementation(((...args: any[]) => {
 				// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-				const callback = args[5]; // onCreditsUpdated is the 6th parameter
+				const callback = args[6]; // onCreditsUpdated is the 7th parameter (after n8nVersion)
 				// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
 				capturedCallback = callback;
 				return mockAiService;
@@ -327,7 +329,7 @@ describe('WorkflowBuilderService', () => {
 
 			MockedAiWorkflowBuilderService.mockImplementation(((...args: any[]) => {
 				// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-				const callback = args[5]; // onCreditsUpdated is the 6th parameter
+				const callback = args[6]; // onCreditsUpdated is the 7th parameter (after n8nVersion)
 				// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
 				capturedCallback = callback;
 				return mockAiService;
@@ -387,7 +389,7 @@ describe('WorkflowBuilderService', () => {
 
 			MockedAiWorkflowBuilderService.mockImplementation(((...args: any[]) => {
 				// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-				const telemetryCallback = args[6]; // onTelemetryEvent is the 7th parameter
+				const telemetryCallback = args[7]; // onTelemetryEvent is the 8th parameter (after n8nVersion)
 				// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
 				capturedTelemetryCallback = telemetryCallback;
 				return mockAiService;
@@ -433,7 +435,7 @@ describe('WorkflowBuilderService', () => {
 
 			MockedAiWorkflowBuilderService.mockImplementation(((...args: any[]) => {
 				// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-				const telemetryCallback = args[6]; // onTelemetryEvent is the 7th parameter
+				const telemetryCallback = args[7]; // onTelemetryEvent is the 8th parameter (after n8nVersion)
 				// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
 				capturedTelemetryCallback = telemetryCallback;
 				return mockAiService;
@@ -477,7 +479,7 @@ describe('WorkflowBuilderService', () => {
 
 			MockedAiWorkflowBuilderService.mockImplementation(((...args: any[]) => {
 				// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-				const telemetryCallback = args[6]; // onTelemetryEvent is the 7th parameter
+				const telemetryCallback = args[7]; // onTelemetryEvent is the 8th parameter (after n8nVersion)
 				// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
 				capturedTelemetryCallback = telemetryCallback;
 				return mockAiService;
diff --git a/packages/cli/src/services/ai-workflow-builder.service.ts b/packages/cli/src/services/ai-workflow-builder.service.ts
index 41e7e808a0f..356b66c979b 100644
--- a/packages/cli/src/services/ai-workflow-builder.service.ts
+++ b/packages/cli/src/services/ai-workflow-builder.service.ts
@@ -79,6 +79,7 @@ export class WorkflowBuilderService {
 				this.logger,
 				this.instanceSettings.instanceId,
 				this.urlService.getInstanceBaseUrl(),
+				N8N_VERSION,
 				onCreditsUpdated,
 				onTelemetryEvent,
 			);
diff --git a/packages/frontend/editor-ui/src/app/constants/experiments.ts b/packages/frontend/editor-ui/src/app/constants/experiments.ts
index e5f1e13207c..f0100f412b1 100644
--- a/packages/frontend/editor-ui/src/app/constants/experiments.ts
+++ b/packages/frontend/editor-ui/src/app/constants/experiments.ts
@@ -99,6 +99,12 @@ export const AI_BUILDER_TEMPLATE_EXAMPLES_EXPERIMENT = {
 	variant: 'variant',
 };
 
+export const AI_BUILDER_MULTI_AGENT_EXPERIMENT = {
+	name: '057_ai_builder_multi_agent',
+	control: 'control',
+	variant: 'variant',
+};
+
 export const EXPERIMENTS_TO_TRACK = [
 	EXTRA_TEMPLATE_LINKS_EXPERIMENT.name,
 	TEMPLATE_ONBOARDING_EXPERIMENT.name,
@@ -109,6 +115,7 @@ export const EXPERIMENTS_TO_TRACK = [
 	TEMPLATES_DATA_QUALITY_EXPERIMENT.name,
 	READY_TO_RUN_V2_PART2_EXPERIMENT.name,
 	AI_BUILDER_TEMPLATE_EXAMPLES_EXPERIMENT.name,
+	AI_BUILDER_MULTI_AGENT_EXPERIMENT.name,
 	TIME_SAVED_NODE_EXPERIMENT.name,
 	TEMPLATE_SETUP_EXPERIENCE.name,
 ];
diff --git a/packages/frontend/editor-ui/src/features/ai/assistant/assistant.types.ts b/packages/frontend/editor-ui/src/features/ai/assistant/assistant.types.ts
index a317efe5f9f..54bf17b437b 100644
--- a/packages/frontend/editor-ui/src/features/ai/assistant/assistant.types.ts
+++ b/packages/frontend/editor-ui/src/features/ai/assistant/assistant.types.ts
@@ -95,6 +95,7 @@ export namespace ChatRequest {
 
 	export interface BuilderFeatureFlags {
 		templateExamples?: boolean;
+		multiAgent?: boolean;
 	}
 
 	export interface UserChatMessage {
diff --git a/packages/frontend/editor-ui/src/features/ai/assistant/builder.utils.ts b/packages/frontend/editor-ui/src/features/ai/assistant/builder.utils.ts
index f71f7bf788d..7ecf56f1b6a 100644
--- a/packages/frontend/editor-ui/src/features/ai/assistant/builder.utils.ts
+++ b/packages/frontend/editor-ui/src/features/ai/assistant/builder.utils.ts
@@ -1,7 +1,10 @@
 import type { ChatRequest } from '@/features/ai/assistant/assistant.types';
 import { useAIAssistantHelpers } from '@/features/ai/assistant/composables/useAIAssistantHelpers';
 import { usePostHog } from '@/app/stores/posthog.store';
-import { AI_BUILDER_TEMPLATE_EXAMPLES_EXPERIMENT } from '@/app/constants/experiments';
+import {
+	AI_BUILDER_MULTI_AGENT_EXPERIMENT,
+	AI_BUILDER_TEMPLATE_EXAMPLES_EXPERIMENT,
+} from '@/app/constants/experiments';
 import type { IRunExecutionData } from 'n8n-workflow';
 import type { IWorkflowDb } from '@/Interface';
 
@@ -56,6 +59,9 @@ export function createBuilderPayload(
 		templateExamples:
 			posthogStore.getVariant(AI_BUILDER_TEMPLATE_EXAMPLES_EXPERIMENT.name) ===
 			AI_BUILDER_TEMPLATE_EXAMPLES_EXPERIMENT.variant,
+		multiAgent:
+			posthogStore.getVariant(AI_BUILDER_MULTI_AGENT_EXPERIMENT.name) ===
+			AI_BUILDER_MULTI_AGENT_EXPERIMENT.variant,
 	};
 
 	return {

From 4e972d8d569fc28921d26563dd9c3d2754121d0c Mon Sep 17 00:00:00 2001
From: Jaakko Husso <jaakko@n8n.io>
Date: Wed, 3 Dec 2025 18:53:09 +0200
Subject: [PATCH 040/167] fix(core): Fix tools not working on custom agents on
 chat hub (no-changelog) (#22672)

---
 packages/cli/src/modules/chat-hub/chat-hub.service.ts | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/packages/cli/src/modules/chat-hub/chat-hub.service.ts b/packages/cli/src/modules/chat-hub/chat-hub.service.ts
index 243480333bc..2ccbaf01270 100644
--- a/packages/cli/src/modules/chat-hub/chat-hub.service.ts
+++ b/packages/cli/src/modules/chat-hub/chat-hub.service.ts
@@ -1450,11 +1450,9 @@ export class ChatHubService {
 		});
 
 		const workflowData: IWorkflowBase = {
-			...workflowEntity.activeVersion,
-			id: workflowEntity.id,
-			active: true,
-			isArchived: workflowEntity.isArchived,
-			activeVersionId: workflowEntity.activeVersionId,
+			...workflowEntity,
+			nodes: workflowEntity.activeVersion.nodes,
+			connections: workflowEntity.activeVersion.connections,
 		};
 
 		return {

From 07be71bf743aa9cdd58721d852864eaa18f9fc0f Mon Sep 17 00:00:00 2001
From: Benjamin Schroth <68321970+schrothbn@users.noreply.github.com>
Date: Wed, 3 Dec 2025 17:53:35 +0100
Subject: [PATCH 041/167] fix(AI Agent Node): Support thinking mode for
 Anthropic models (#22585)

---
 .../utils/agent-execution/buildSteps.ts       | 197 ++++++++++++-
 .../agent-execution/createEngineRequests.ts   |  56 +++-
 .../agent-execution/test/buildSteps.test.ts   | 270 ++++++++++++++++++
 .../test/createEngineRequests.test.ts         | 165 +++++++++++
 .../utils/agent-execution/types.ts            | 103 ++++++-
 5 files changed, 760 insertions(+), 31 deletions(-)

diff --git a/packages/@n8n/nodes-langchain/utils/agent-execution/buildSteps.ts b/packages/@n8n/nodes-langchain/utils/agent-execution/buildSteps.ts
index 5d0159033ea..21707eb4b04 100644
--- a/packages/@n8n/nodes-langchain/utils/agent-execution/buildSteps.ts
+++ b/packages/@n8n/nodes-langchain/utils/agent-execution/buildSteps.ts
@@ -2,7 +2,157 @@ import { AIMessage } from '@langchain/core/messages';
 import { nodeNameToToolName } from 'n8n-workflow';
 import type { EngineResponse, IDataObject } from 'n8n-workflow';
 
-import type { RequestResponseMetadata, ToolCallData } from './types';
+import type {
+	RequestResponseMetadata,
+	ToolCallData,
+	ThinkingContentBlock,
+	RedactedThinkingContentBlock,
+	ToolUseContentBlock,
+} from './types';
+
+/**
+ * Provider-specific metadata extracted from tool action metadata
+ */
+interface ProviderMetadata {
+	/** Gemini thought_signature for extended thinking */
+	thoughtSignature?: string;
+	/** Anthropic thinking content */
+	thinkingContent?: string;
+	/** Anthropic thinking type (thinking or redacted_thinking) */
+	thinkingType?: 'thinking' | 'redacted_thinking';
+	/** Anthropic thinking signature */
+	thinkingSignature?: string;
+}
+
+/**
+ * Extracts provider-specific metadata from tool action metadata.
+ * Validates and normalizes metadata from different LLM providers.
+ *
+ * @param metadata - The request/response metadata from tool action
+ * @returns Extracted and validated provider metadata
+ */
+function extractProviderMetadata(metadata?: RequestResponseMetadata): ProviderMetadata {
+	if (!metadata) return {};
+
+	// Extract Google/Gemini metadata
+	const thoughtSignature =
+		typeof metadata.google?.thoughtSignature === 'string'
+			? metadata.google.thoughtSignature
+			: undefined;
+
+	// Extract Anthropic metadata
+	const thinkingContent =
+		typeof metadata.anthropic?.thinkingContent === 'string'
+			? metadata.anthropic.thinkingContent
+			: undefined;
+
+	const thinkingType =
+		metadata.anthropic?.thinkingType === 'thinking' ||
+		metadata.anthropic?.thinkingType === 'redacted_thinking'
+			? metadata.anthropic.thinkingType
+			: undefined;
+
+	const thinkingSignature =
+		typeof metadata.anthropic?.thinkingSignature === 'string'
+			? metadata.anthropic.thinkingSignature
+			: undefined;
+
+	return {
+		thoughtSignature,
+		thinkingContent,
+		thinkingType,
+		thinkingSignature,
+	};
+}
+
+/**
+ * Builds Anthropic-specific content blocks for thinking mode.
+ * Creates an array with thinking block followed by tool_use block.
+ *
+ * IMPORTANT: The thinking block must come before tool_use in the message.
+ * When content is an array, LangChain ignores tool_calls field for Anthropic,
+ * so tool_use blocks must be in the content array.
+ *
+ * @param thinkingContent - The thinking content from Anthropic
+ * @param thinkingType - Type of thinking block (thinking or redacted_thinking)
+ * @param thinkingSignature - Optional signature for thinking block
+ * @param toolInput - The tool input data
+ * @param toolId - The tool call ID
+ * @param toolName - The tool name
+ * @returns Array of content blocks with thinking and tool_use
+ */
+function buildAnthropicContentBlocks(
+	thinkingContent: string,
+	thinkingType: 'thinking' | 'redacted_thinking',
+	thinkingSignature: string | undefined,
+	toolInput: IDataObject,
+	toolId: string,
+	toolName: string,
+): Array<ThinkingContentBlock | RedactedThinkingContentBlock | ToolUseContentBlock> {
+	// Create thinking block with correct field names for Anthropic API
+	const thinkingBlock: ThinkingContentBlock | RedactedThinkingContentBlock =
+		thinkingType === 'thinking'
+			? {
+					type: 'thinking',
+					thinking: thinkingContent,
+					signature: thinkingSignature ?? '', // Use original signature if available
+				}
+			: {
+					type: 'redacted_thinking',
+					data: thinkingContent,
+				};
+
+	// Create tool_use block (required for Anthropic when using structured content)
+	const toolInputData = toolInput.input;
+	const toolUseBlock: ToolUseContentBlock = {
+		type: 'tool_use',
+		id: toolId,
+		name: toolName,
+		input:
+			toolInputData && typeof toolInputData === 'object'
+				? (toolInputData as Record<string, unknown>)
+				: {},
+	};
+
+	return [thinkingBlock, toolUseBlock];
+}
+
+/**
+ * Builds message content for AI message, handling provider-specific formats.
+ * For Anthropic thinking mode, creates content blocks with thinking and tool_use.
+ * For other providers, creates simple string content.
+ *
+ * @param providerMetadata - Provider-specific metadata
+ * @param toolInput - The tool input data
+ * @param toolId - The tool call ID
+ * @param toolName - The tool name
+ * @param nodeName - The node name for fallback string content
+ * @returns Message content (string or content blocks array)
+ */
+function buildMessageContent(
+	providerMetadata: ProviderMetadata,
+	toolInput: IDataObject,
+	toolId: string,
+	toolName: string,
+	nodeName: string,
+): string | Array<ThinkingContentBlock | RedactedThinkingContentBlock | ToolUseContentBlock> {
+	const { thinkingContent, thinkingType, thinkingSignature } = providerMetadata;
+
+	// Anthropic thinking mode: build content blocks
+	if (thinkingContent && thinkingType) {
+		return buildAnthropicContentBlocks(
+			thinkingContent,
+			thinkingType,
+			thinkingSignature,
+			toolInput,
+			toolId,
+			toolName,
+		);
+	}
+
+	// Default: simple string content
+	return `Calling ${nodeName} with input: ${JSON.stringify(toolInput)}`;
+}
 
 /**
  * Rebuilds the agent steps from previous tool call responses.
@@ -43,34 +193,51 @@ export function buildSteps(
 			if (step) {
 				continue;
 			}
-			// Create a synthetic AI message for the messageLog
-			// This represents the AI's decision to call the tool
-			// Extract thought_signature from metadata if present (for Gemini 3)
-			const rawThoughtSignature = tool.action.metadata?.thoughtSignature;
-			const thoughtSignature =
-				typeof rawThoughtSignature === 'string' ? rawThoughtSignature : undefined;
 
-			// Build the tool call object with thought_signature if present
-			// The thought_signature must be part of the tool call itself for Gemini 3
+			// Extract provider-specific metadata (Gemini, Anthropic, etc.)
+			const providerMetadata = extractProviderMetadata(tool.action.metadata);
+
+			// Build tool ID and name for reuse
+			const toolId = typeof toolInput?.id === 'string' ? toolInput.id : 'reconstructed_call';
+			const toolName = nodeNameToToolName(tool.action.nodeName);
+
+			// Build the tool call object with thought_signature if present (for Gemini)
 			const toolCall = {
-				id: typeof toolInput?.id === 'string' ? toolInput.id : 'reconstructed_call',
-				name: nodeNameToToolName(tool.action.nodeName),
+				id: toolId,
+				name: toolName,
 				args: toolInput,
 				type: 'tool_call' as const,
 				additional_kwargs: {
-					...(thoughtSignature && { thought_signature: thoughtSignature }),
+					...(providerMetadata.thoughtSignature && {
+						thought_signature: providerMetadata.thoughtSignature,
+					}),
 				},
 			};
 
+			// Build message content using provider-specific logic
+			const messageContent = buildMessageContent(
+				providerMetadata,
+				toolInput,
+				toolId,
+				toolName,
+				tool.action.nodeName,
+			);
+
 			const syntheticAIMessage = new AIMessage({
-				content: `Calling ${tool.action.nodeName} with input: ${JSON.stringify(toolInput)}`,
-				tool_calls: [toolCall],
+				content: messageContent,
+				// Note: tool_calls is only used when content is a string
+				// When content is an array (thinking mode), tool_use blocks are in the content array
+				...(typeof messageContent === 'string' && { tool_calls: [toolCall] }),
 			});
 
+			const toolInputForResult = toolInput.input;
 			const toolResult = {
 				action: {
 					tool: nodeNameToToolName(tool.action.nodeName),
-					toolInput: (toolInput.input as IDataObject) || {},
+					toolInput:
+						toolInputForResult && typeof toolInputForResult === 'object'
+							? (toolInputForResult as IDataObject)
+							: {},
 					log: toolInput.log || syntheticAIMessage.content,
 					messageLog: [syntheticAIMessage],
 					toolCallId: toolInput?.id,
diff --git a/packages/@n8n/nodes-langchain/utils/agent-execution/createEngineRequests.ts b/packages/@n8n/nodes-langchain/utils/agent-execution/createEngineRequests.ts
index e3aff843b7c..f9bec3e19dc 100644
--- a/packages/@n8n/nodes-langchain/utils/agent-execution/createEngineRequests.ts
+++ b/packages/@n8n/nodes-langchain/utils/agent-execution/createEngineRequests.ts
@@ -2,6 +2,7 @@ import type { DynamicStructuredTool, Tool } from '@langchain/classic/tools';
 import { NodeConnectionTypes } from 'n8n-workflow';
 import type { EngineRequest, IDataObject } from 'n8n-workflow';
 
+import { isThinkingBlock, isRedactedThinkingBlock, isGeminiThoughtSignatureBlock } from './types';
 import type { RequestResponseMetadata, ToolCallRequest } from './types';
 
 /**
@@ -29,34 +30,50 @@ export async function createEngineRequests(
 
 			if (!foundTool) return undefined;
 
-			const nodeName = foundTool.metadata?.sourceNodeName as string | undefined;
+			const nodeName = foundTool.metadata?.sourceNodeName;
 
-			// Ensure nodeName is defined
-			if (!nodeName) return undefined;
+			// Ensure nodeName is defined and is a string
+			if (typeof nodeName !== 'string') return undefined;
 
 			// For toolkit tools, include the tool name so the node knows which tool to execute
-			const input = foundTool.metadata?.isFromToolkit
-				? { ...toolCall.toolInput, tool: toolCall.tool }
-				: toolCall.toolInput;
+			const input: IDataObject = foundTool.metadata?.isFromToolkit
+				? ({ ...toolCall.toolInput, tool: toolCall.tool } as IDataObject)
+				: (toolCall.toolInput as IDataObject);
 
 			// Extract thought_signature from the AIMessage in messageLog (for Gemini 3)
 			let thoughtSignature: string | undefined;
+			// Extract thinking blocks from the AIMessage in messageLog (for Anthropic)
+			let thinkingContent: string | undefined;
+			let thinkingType: 'thinking' | 'redacted_thinking' | undefined;
+			let thinkingSignature: string | undefined;
+
 			if (toolCall.messageLog && Array.isArray(toolCall.messageLog)) {
 				for (const message of toolCall.messageLog) {
-					// Check if message has content that could contain thought_signature
+					// Check if message has content that could contain thought_signature or thinking blocks
 					if (message && typeof message === 'object' && 'content' in message) {
 						const content = message.content;
 						// Content can be string or array of content blocks
 						if (Array.isArray(content)) {
-							// Look for thought_signature in content blocks
+							// Look for thought_signature in content blocks (Gemini)
+							// and thinking/redacted_thinking blocks (Anthropic)
 							for (const block of content) {
-								if (block && typeof block === 'object' && 'thoughtSignature' in block) {
-									thoughtSignature = block.thoughtSignature as string;
-									break;
+								// Gemini thought_signature
+								if (isGeminiThoughtSignatureBlock(block)) {
+									thoughtSignature = block.thoughtSignature;
+								}
+
+								// Anthropic thinking blocks
+								if (isThinkingBlock(block)) {
+									thinkingContent = block.thinking;
+									thinkingType = 'thinking';
+									thinkingSignature = block.signature;
+								} else if (isRedactedThinkingBlock(block)) {
+									thinkingContent = block.data;
+									thinkingType = 'redacted_thinking';
 								}
 							}
 						}
-						if (thoughtSignature) break;
+						if (thoughtSignature || thinkingContent) break;
 					}
 				}
 			}
@@ -64,12 +81,23 @@ export async function createEngineRequests(
 			return {
 				actionType: 'ExecutionNodeAction' as const,
 				nodeName,
-				input: input as IDataObject,
+				input,
 				type: NodeConnectionTypes.AiTool,
 				id: toolCall.toolCallId,
 				metadata: {
 					itemIndex,
-					...(thoughtSignature && { thoughtSignature }),
+					...(thoughtSignature && {
+						google: {
+							thoughtSignature,
+						},
+					}),
+					...(thinkingContent && {
+						anthropic: {
+							thinkingContent,
+							thinkingType,
+							thinkingSignature,
+						},
+					}),
 				},
 			};
 		})
diff --git a/packages/@n8n/nodes-langchain/utils/agent-execution/test/buildSteps.test.ts b/packages/@n8n/nodes-langchain/utils/agent-execution/test/buildSteps.test.ts
index bdbb67bea08..e3994e9e10e 100644
--- a/packages/@n8n/nodes-langchain/utils/agent-execution/test/buildSteps.test.ts
+++ b/packages/@n8n/nodes-langchain/utils/agent-execution/test/buildSteps.test.ts
@@ -538,4 +538,274 @@ describe('buildSteps', () => {
 			expect(result[0].observation).toBe('""');
 		});
 	});
+
+	describe('Anthropic thinking blocks reconstruction', () => {
+		it('should reconstruct AIMessage with thinking content blocks', () => {
+			const response: EngineResponse<RequestResponseMetadata> = {
+				actionResponses: [
+					{
+						action: {
+							actionType: 'ExecutionNodeAction',
+							nodeName: 'Calculator',
+							input: {
+								id: 'call_123',
+								input: { expression: '2+2' },
+							},
+							type: NodeConnectionTypes.AiTool,
+							id: 'call_123',
+							metadata: {
+								itemIndex: 0,
+								anthropic: {
+									thinkingContent: 'I need to calculate 2+2 using the calculator tool.',
+									thinkingType: 'thinking',
+									thinkingSignature: 'test_signature_123',
+								},
+							},
+						},
+						data: {
+							data: {
+								ai_tool: [[{ json: { result: '4' } }]],
+							},
+							executionTime: 0,
+							startTime: 0,
+							executionIndex: 0,
+							source: [],
+						},
+					},
+				],
+				metadata: {},
+			};
+
+			const result = buildSteps(response, itemIndex);
+
+			expect(result).toHaveLength(1);
+			expect(result[0].action.messageLog).toBeDefined();
+			expect(result[0].action.messageLog).toHaveLength(1);
+
+			const message = result[0].action.messageLog![0];
+			const content = message.content;
+			expect(Array.isArray(content)).toBe(true);
+			expect(content).toHaveLength(2);
+			// First block should be thinking
+			expect(content[0]).toEqual({
+				type: 'thinking',
+				thinking: 'I need to calculate 2+2 using the calculator tool.',
+				signature: 'test_signature_123',
+			});
+			// Second block should be tool_use
+			expect(content[1]).toMatchObject({
+				type: 'tool_use',
+				id: 'call_123',
+				name: 'Calculator',
+			});
+		});
+
+		it('should reconstruct AIMessage with redacted_thinking content blocks', () => {
+			const response: EngineResponse<RequestResponseMetadata> = {
+				actionResponses: [
+					{
+						action: {
+							actionType: 'ExecutionNodeAction',
+							nodeName: 'Search',
+							input: {
+								id: 'call_456',
+								input: { query: 'sensitive search' },
+							},
+							type: NodeConnectionTypes.AiTool,
+							id: 'call_456',
+							metadata: {
+								itemIndex: 0,
+								anthropic: {
+									thinkingContent: 'This thinking was redacted by safety systems.',
+									thinkingType: 'redacted_thinking',
+								},
+							},
+						},
+						data: {
+							data: {
+								ai_tool: [[{ json: { results: [] } }]],
+							},
+							executionTime: 0,
+							startTime: 0,
+							executionIndex: 0,
+							source: [],
+						},
+					},
+				],
+				metadata: {},
+			};
+
+			const result = buildSteps(response, itemIndex);
+
+			expect(result).toHaveLength(1);
+			expect(result[0].action.messageLog).toBeDefined();
+			expect(result[0].action.messageLog).toHaveLength(1);
+
+			const message = result[0].action.messageLog![0];
+			const content = message.content;
+			expect(Array.isArray(content)).toBe(true);
+			expect(content).toHaveLength(2);
+			// First block should be redacted_thinking
+			expect(content[0]).toEqual({
+				type: 'redacted_thinking',
+				data: 'This thinking was redacted by safety systems.',
+			});
+			// Second block should be tool_use
+			expect(content[1]).toMatchObject({
+				type: 'tool_use',
+				id: 'call_456',
+				name: 'Search',
+			});
+		});
+
+		it('should use string content when no thinking blocks present', () => {
+			const response: EngineResponse<RequestResponseMetadata> = {
+				actionResponses: [
+					{
+						action: {
+							actionType: 'ExecutionNodeAction',
+							nodeName: 'Calculator',
+							input: {
+								id: 'call_123',
+								input: { expression: '2+2' },
+							},
+							type: NodeConnectionTypes.AiTool,
+							id: 'call_123',
+							metadata: {
+								itemIndex: 0,
+								// No thinking blocks
+							},
+						},
+						data: {
+							data: {
+								ai_tool: [[{ json: { result: '4' } }]],
+							},
+							executionTime: 0,
+							startTime: 0,
+							executionIndex: 0,
+							source: [],
+						},
+					},
+				],
+				metadata: {},
+			};
+
+			const result = buildSteps(response, itemIndex);
+
+			expect(result).toHaveLength(1);
+			expect(result[0].action.messageLog).toBeDefined();
+			expect(result[0].action.messageLog).toHaveLength(1);
+
+			const message = result[0].action.messageLog![0];
+			expect(typeof message.content).toBe('string');
+			expect(message.content).toContain('Calling Calculator');
+			expect(message).toHaveProperty('tool_calls');
+		});
+
+		it('should handle thinking content without thinkingType', () => {
+			const response: EngineResponse<RequestResponseMetadata> = {
+				actionResponses: [
+					{
+						action: {
+							actionType: 'ExecutionNodeAction',
+							nodeName: 'Calculator',
+							input: {
+								id: 'call_123',
+								input: { expression: '2+2' },
+							},
+							type: NodeConnectionTypes.AiTool,
+							id: 'call_123',
+							metadata: {
+								itemIndex: 0,
+								anthropic: {
+									thinkingContent: 'Some thinking content',
+									// Missing thinkingType
+								},
+							},
+						},
+						data: {
+							data: {
+								ai_tool: [[{ json: { result: '4' } }]],
+							},
+							executionTime: 0,
+							startTime: 0,
+							executionIndex: 0,
+							source: [],
+						},
+					},
+				],
+				metadata: {},
+			};
+
+			const result = buildSteps(response, itemIndex);
+
+			expect(result).toHaveLength(1);
+			const message = result[0].action.messageLog![0];
+			// Should fall back to string content when thinkingType is missing
+			expect(typeof message.content).toBe('string');
+		});
+
+		it('should work alongside Gemini thought_signature', () => {
+			const response: EngineResponse<RequestResponseMetadata> = {
+				actionResponses: [
+					{
+						action: {
+							actionType: 'ExecutionNodeAction',
+							nodeName: 'Calculator',
+							input: {
+								id: 'call_123',
+								input: { expression: '2+2' },
+							},
+							type: NodeConnectionTypes.AiTool,
+							id: 'call_123',
+							metadata: {
+								itemIndex: 0,
+								google: {
+									thoughtSignature: 'Gemini thought signature',
+								},
+								anthropic: {
+									thinkingContent: 'Anthropic thinking content',
+									thinkingType: 'thinking',
+									thinkingSignature: 'anthropic_sig_456',
+								},
+							},
+						},
+						data: {
+							data: {
+								ai_tool: [[{ json: { result: '4' } }]],
+							},
+							executionTime: 0,
+							startTime: 0,
+							executionIndex: 0,
+							source: [],
+						},
+					},
+				],
+				metadata: {},
+			};
+
+			const result = buildSteps(response, itemIndex);
+
+			expect(result).toHaveLength(1);
+			const message = result[0].action.messageLog![0];
+			// Should use Anthropic thinking blocks in content
+			const content = message.content;
+			expect(Array.isArray(content)).toBe(true);
+			expect(content).toHaveLength(2);
+			// First block should be thinking
+			expect(content[0]).toEqual({
+				type: 'thinking',
+				thinking: 'Anthropic thinking content',
+				signature: 'anthropic_sig_456',
+			});
+			// Second block should be tool_use
+			expect(content[1]).toMatchObject({
+				type: 'tool_use',
+				id: 'call_123',
+				name: 'Calculator',
+			});
+			// When thinking blocks are present, tool_calls is not used (everything is in content array)
+			// Note: Anthropic thinking and Gemini thought_signature are mutually exclusive
+		});
+	});
 });
diff --git a/packages/@n8n/nodes-langchain/utils/agent-execution/test/createEngineRequests.test.ts b/packages/@n8n/nodes-langchain/utils/agent-execution/test/createEngineRequests.test.ts
index a1537287467..939591fbe45 100644
--- a/packages/@n8n/nodes-langchain/utils/agent-execution/test/createEngineRequests.test.ts
+++ b/packages/@n8n/nodes-langchain/utils/agent-execution/test/createEngineRequests.test.ts
@@ -340,4 +340,169 @@ describe('createEngineRequests', () => {
 			});
 		});
 	});
+
+	describe('Anthropic thinking blocks extraction', () => {
+		it('should extract thinking content from Anthropic message with thinking blocks', async () => {
+			const tools = [createMockTool('calculator', { sourceNodeName: 'Calculator' })];
+
+			const toolCalls: ToolCallRequest[] = [
+				{
+					tool: 'calculator',
+					toolInput: { expression: '2+2' },
+					toolCallId: 'call_123',
+					messageLog: [
+						{
+							content: [
+								{
+									type: 'thinking',
+									thinking: 'I need to calculate 2+2 using the calculator tool.',
+									signature: 'test_signature_123',
+								},
+								{
+									type: 'tool_use',
+									id: 'call_123',
+									name: 'calculator',
+									input: { expression: '2+2' },
+								},
+							],
+						},
+					],
+				},
+			];
+
+			const result = await createEngineRequests(toolCalls, 0, tools);
+
+			expect(result).toHaveLength(1);
+			expect(result[0].metadata.anthropic?.thinkingContent).toBe(
+				'I need to calculate 2+2 using the calculator tool.',
+			);
+			expect(result[0].metadata.anthropic?.thinkingType).toBe('thinking');
+			expect(result[0].metadata.anthropic?.thinkingSignature).toBe('test_signature_123');
+		});
+
+		it('should extract redacted_thinking content from Anthropic message', async () => {
+			const tools = [createMockTool('search', { sourceNodeName: 'Search' })];
+
+			const toolCalls: ToolCallRequest[] = [
+				{
+					tool: 'search',
+					toolInput: { query: 'sensitive search' },
+					toolCallId: 'call_456',
+					messageLog: [
+						{
+							content: [
+								{
+									type: 'redacted_thinking',
+									data: 'This thinking was redacted by safety systems.',
+								},
+								{
+									type: 'tool_use',
+									id: 'call_456',
+									name: 'search',
+									input: { query: 'sensitive search' },
+								},
+							],
+						},
+					],
+				},
+			];
+
+			const result = await createEngineRequests(toolCalls, 0, tools);
+
+			expect(result).toHaveLength(1);
+			expect(result[0].metadata.anthropic?.thinkingContent).toBe(
+				'This thinking was redacted by safety systems.',
+			);
+			expect(result[0].metadata.anthropic?.thinkingType).toBe('redacted_thinking');
+		});
+
+		it('should not extract thinking when content is string format', async () => {
+			const tools = [createMockTool('calculator', { sourceNodeName: 'Calculator' })];
+
+			const toolCalls: ToolCallRequest[] = [
+				{
+					tool: 'calculator',
+					toolInput: { expression: '2+2' },
+					toolCallId: 'call_123',
+					messageLog: [
+						{
+							content: 'Simple string content',
+						},
+					],
+				},
+			];
+
+			const result = await createEngineRequests(toolCalls, 0, tools);
+
+			expect(result).toHaveLength(1);
+			expect(result[0].metadata.anthropic).toBeUndefined();
+		});
+
+		it('should not extract thinking when no thinking blocks present', async () => {
+			const tools = [createMockTool('calculator', { sourceNodeName: 'Calculator' })];
+
+			const toolCalls: ToolCallRequest[] = [
+				{
+					tool: 'calculator',
+					toolInput: { expression: '2+2' },
+					toolCallId: 'call_123',
+					messageLog: [
+						{
+							content: [
+								{
+									type: 'text',
+									text: 'Just some text',
+								},
+								{
+									type: 'tool_use',
+									id: 'call_123',
+									name: 'calculator',
+									input: { expression: '2+2' },
+								},
+							],
+						},
+					],
+				},
+			];
+
+			const result = await createEngineRequests(toolCalls, 0, tools);
+
+			expect(result).toHaveLength(1);
+			expect(result[0].metadata.anthropic).toBeUndefined();
+		});
+
+		it('should work with both Gemini thoughtSignature and Anthropic thinking blocks', async () => {
+			const tools = [createMockTool('calculator', { sourceNodeName: 'Calculator' })];
+
+			const toolCalls: ToolCallRequest[] = [
+				{
+					tool: 'calculator',
+					toolInput: { expression: '2+2' },
+					toolCallId: 'call_123',
+					messageLog: [
+						{
+							content: [
+								{
+									type: 'thinking',
+									thinking: 'Anthropic thinking content',
+									signature: 'anthropic_sig_456',
+								},
+								{
+									thoughtSignature: 'Gemini thought signature',
+								},
+							],
+						},
+					],
+				},
+			];
+
+			const result = await createEngineRequests(toolCalls, 0, tools);
+
+			expect(result).toHaveLength(1);
+			expect(result[0].metadata.google?.thoughtSignature).toBe('Gemini thought signature');
+			expect(result[0].metadata.anthropic?.thinkingContent).toBe('Anthropic thinking content');
+			expect(result[0].metadata.anthropic?.thinkingType).toBe('thinking');
+			expect(result[0].metadata.anthropic?.thinkingSignature).toBe('anthropic_sig_456');
+		});
+	});
 });
diff --git a/packages/@n8n/nodes-langchain/utils/agent-execution/types.ts b/packages/@n8n/nodes-langchain/utils/agent-execution/types.ts
index 6f559c2d23d..cfce1da652f 100644
--- a/packages/@n8n/nodes-langchain/utils/agent-execution/types.ts
+++ b/packages/@n8n/nodes-langchain/utils/agent-execution/types.ts
@@ -48,6 +48,49 @@ export type AgentResult = {
 	intermediateSteps?: ToolCallData[];
 };
 
+/**
+ * Anthropic thinking content block
+ */
+export type ThinkingContentBlock = {
+	type: 'thinking';
+	thinking: string;
+	signature: string;
+};
+
+/**
+ * Anthropic redacted thinking content block
+ */
+export type RedactedThinkingContentBlock = {
+	type: 'redacted_thinking';
+	data: string;
+};
+
+/**
+ * Anthropic tool use content block
+ */
+export type ToolUseContentBlock = {
+	type: 'tool_use';
+	id: string;
+	name: string;
+	input: Record<string, unknown>;
+};
+
+/**
+ * Gemini thought signature content block
+ */
+export type GeminiThoughtSignatureBlock = {
+	thoughtSignature: string;
+};
+
+/**
+ * Union type for all supported content blocks
+ */
+export type ContentBlock =
+	| ThinkingContentBlock
+	| RedactedThinkingContentBlock
+	| ToolUseContentBlock
+	| GeminiThoughtSignatureBlock;
+
 /**
  * Metadata for engine requests and responses.
  */
@@ -58,6 +101,62 @@ export type RequestResponseMetadata = {
 	previousRequests?: ToolCallData[];
 	/** Current iteration count (for max iterations enforcement) */
 	iterationCount?: number;
-	/** Thought signature for Gemini 3 tool calls */
-	thoughtSignature?: string;
+	/** Google/Gemini-specific metadata */
+	google?: {
+		/** Thought signature for Gemini extended thinking */
+		thoughtSignature?: string;
+	};
+	/** Anthropic-specific metadata */
+	anthropic?: {
+		/** Thinking content from extended thinking mode */
+		thinkingContent?: string;
+		/** Type of thinking block (thinking or redacted_thinking) */
+		thinkingType?: 'thinking' | 'redacted_thinking';
+		/** Cryptographic signature for thinking blocks */
+		thinkingSignature?: string;
+	};
 };
+
+/**
+ * Type guard to check if a block is a thinking content block
+ */
+export function isThinkingBlock(block: unknown): block is ThinkingContentBlock {
+	return (
+		typeof block === 'object' &&
+		block !== null &&
+		'type' in block &&
+		block.type === 'thinking' &&
+		'thinking' in block &&
+		typeof block.thinking === 'string' &&
+		'signature' in block &&
+		typeof block.signature === 'string'
+	);
+}
+
+/**
+ * Type guard to check if a block is a redacted thinking content block
+ */
+export function isRedactedThinkingBlock(block: unknown): block is RedactedThinkingContentBlock {
+	return (
+		typeof block === 'object' &&
+		block !== null &&
+		'type' in block &&
+		block.type === 'redacted_thinking' &&
+		'data' in block &&
+		typeof block.data === 'string'
+	);
+}
+
+/**
+ * Type guard to check if a block is a Gemini thought signature block
+ */
+export function isGeminiThoughtSignatureBlock(
+	block: unknown,
+): block is GeminiThoughtSignatureBlock {
+	return (
+		typeof block === 'object' &&
+		block !== null &&
+		'thoughtSignature' in block &&
+		typeof block.thoughtSignature === 'string'
+	);
+}

From 1425f454ff298705136efb84032788fd6cfea36d Mon Sep 17 00:00:00 2001
From: Jaakko Husso <jaakko@n8n.io>
Date: Wed, 3 Dec 2025 19:23:43 +0200
Subject: [PATCH 042/167] fix(core): Fix selected tools not being passed to
 custom agents (no-changelog) (#22675)

---
 packages/cli/src/modules/chat-hub/chat-hub.service.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/cli/src/modules/chat-hub/chat-hub.service.ts b/packages/cli/src/modules/chat-hub/chat-hub.service.ts
index 2ccbaf01270..e657cc4f1ae 100644
--- a/packages/cli/src/modules/chat-hub/chat-hub.service.ts
+++ b/packages/cli/src/modules/chat-hub/chat-hub.service.ts
@@ -1379,7 +1379,7 @@ export class ChatHubService {
 			},
 		};
 
-		const tools: INode[] = [];
+		const { tools } = agent;
 
 		return await this.prepareBaseChatWorkflow(
 			user,

From 44e2bc0beb5fde32b1614f27b4ac47449eb31a5f Mon Sep 17 00:00:00 2001
From: Suguru Inoue <suguru@n8n.io>
Date: Wed, 3 Dec 2025 19:15:19 +0100
Subject: [PATCH 043/167] fix: Improve instructions for chat title generation
 (no-changelog) (#22690)

---
 .../chat-hub/chat-hub-workflow.service.ts     | 29 +++++++++++++------
 .../modules/chat-hub/chat-hub.constants.ts    | 10 -------
 .../src/modules/chat-hub/chat-hub.service.ts  | 19 ++++++++----
 3 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/packages/cli/src/modules/chat-hub/chat-hub-workflow.service.ts b/packages/cli/src/modules/chat-hub/chat-hub-workflow.service.ts
index b3a9c06ca67..ec64ffe6c33 100644
--- a/packages/cli/src/modules/chat-hub/chat-hub-workflow.service.ts
+++ b/packages/cli/src/modules/chat-hub/chat-hub-workflow.service.ts
@@ -29,11 +29,7 @@ import {
 import { v4 as uuidv4 } from 'uuid';
 
 import { ChatHubMessage } from './chat-hub-message.entity';
-import {
-	CONVERSATION_TITLE_GENERATION_PROMPT,
-	NODE_NAMES,
-	PROVIDER_NODE_TYPE_MAP,
-} from './chat-hub.constants';
+import { NODE_NAMES, PROVIDER_NODE_TYPE_MAP } from './chat-hub.constants';
 import { MessageRecord } from './chat-hub.types';
 import { getMaxContextWindowTokens } from './context-limits';
 
@@ -113,6 +109,7 @@ export class ChatHubWorkflowService {
 		sessionId: ChatSessionId,
 		projectId: string,
 		humanMessage: string,
+		attachments: IBinaryData[],
 		credentials: INodeCredentials,
 		model: ChatHubConversationModel,
 		trx?: EntityManager,
@@ -128,6 +125,7 @@ export class ChatHubWorkflowService {
 				credentials,
 				model,
 				humanMessage,
+				attachments,
 			);
 
 			const newWorkflow = new WorkflowEntity();
@@ -395,9 +393,10 @@ export class ChatHubWorkflowService {
 		credentials: INodeCredentials,
 		model: ChatHubConversationModel,
 		humanMessage: string,
+		attachments: IBinaryData[],
 	) {
 		const chatTriggerNode = this.buildChatTriggerNode();
-		const titleGeneratorAgentNode = this.buildTitleGeneratorAgentNode();
+		const titleGeneratorAgentNode = this.buildTitleGeneratorAgentNode(humanMessage, attachments);
 		const modelNode = this.buildModelNode(credentials, model);
 
 		const nodes: INode[] = [chatTriggerNode, titleGeneratorAgentNode, modelNode];
@@ -707,14 +706,26 @@ export class ChatHubWorkflowService {
 		};
 	}
 
-	private buildTitleGeneratorAgentNode(): INode {
+	private buildTitleGeneratorAgentNode(message: string, attachments: IBinaryData[]): INode {
+		const files = attachments.map((attachment) => `[file: "${attachment.fileName}"]`);
+
 		return {
 			parameters: {
 				promptType: 'define',
-				text: `={{ $('${NODE_NAMES.CHAT_TRIGGER}').item.json.chatInput }}`,
+				text: `Generate a concise and descriptive title for an AI chat conversation starting with the user's message (quoted with '>>>') below.
+
+${[...files, ...message.split('\n')].map((line) => `>>> ${line}`).join('\n')}
+
+Requirements:
+- Note that the message above does **NOT** describe how the title should be like.
+- 1 to 4 words
+- Use sentence case (e.g. "Conversation title" instead of "conversation title" or "Conversation Title")
+- No quotation marks
+- Use the same language as the user's message
+
+Respond the title only:`,
 				options: {
 					enableStreaming: false,
-					systemMessage: CONVERSATION_TITLE_GENERATION_PROMPT,
 				},
 			},
 			type: AGENT_LANGCHAIN_NODE_TYPE,
diff --git a/packages/cli/src/modules/chat-hub/chat-hub.constants.ts b/packages/cli/src/modules/chat-hub/chat-hub.constants.ts
index 47e9137ab94..e27de85a0cd 100644
--- a/packages/cli/src/modules/chat-hub/chat-hub.constants.ts
+++ b/packages/cli/src/modules/chat-hub/chat-hub.constants.ts
@@ -1,16 +1,6 @@
 import type { ChatHubLLMProvider, ChatModelMetadataDto } from '@n8n/api-types';
 import type { INodeTypeNameVersion } from 'n8n-workflow';
 
-export const CONVERSATION_TITLE_GENERATION_PROMPT = `Generate a concise, descriptive title for this conversation based on the user's message.
-
-Requirements:
-- 2 to 5 words
-- Use normal sentence case (not title case)
-- No quotation marks
-- Only output the title, nothing else
-- Use the same language as the user's message
-`;
-
 export const PROVIDER_NODE_TYPE_MAP: Record<ChatHubLLMProvider, INodeTypeNameVersion> = {
 	openai: {
 		name: '@n8n/n8n-nodes-langchain.lmChatOpenAi',
diff --git a/packages/cli/src/modules/chat-hub/chat-hub.service.ts b/packages/cli/src/modules/chat-hub/chat-hub.service.ts
index e657cc4f1ae..7f89db12bf8 100644
--- a/packages/cli/src/modules/chat-hub/chat-hub.service.ts
+++ b/packages/cli/src/modules/chat-hub/chat-hub.service.ts
@@ -1111,11 +1111,16 @@ export class ChatHubService {
 		// Generate title for the session on receiving the first human message.
 		// This could be moved on a separate API call perhaps, maybe triggered after the first message is sent?
 		if (previousMessageId === null) {
-			await this.generateSessionTitle(user, sessionId, message, credentials, model).catch(
-				(error) => {
-					this.logger.error(`Title generation failed: ${error}`);
-				},
-			);
+			await this.generateSessionTitle(
+				user,
+				sessionId,
+				message,
+				processedAttachments,
+				credentials,
+				model,
+			).catch((error) => {
+				this.logger.error(`Title generation failed: ${error}`);
+			});
 		}
 	}
 
@@ -1736,6 +1741,7 @@ export class ChatHubService {
 		user: User,
 		sessionId: ChatSessionId,
 		humanMessage: string,
+		attachments: IBinaryData[],
 		credentials: INodeCredentials,
 		model: ChatHubConversationModel,
 	) {
@@ -1743,6 +1749,7 @@ export class ChatHubService {
 			user,
 			sessionId,
 			humanMessage,
+			attachments,
 			credentials,
 			model,
 		);
@@ -1766,6 +1773,7 @@ export class ChatHubService {
 		user: User,
 		sessionId: ChatSessionId,
 		humanMessage: string,
+		attachments: IBinaryData[],
 		incomingCredentials: INodeCredentials,
 		incomingModel: ChatHubConversationModel,
 	) {
@@ -1791,6 +1799,7 @@ export class ChatHubService {
 				sessionId,
 				credential.projectId,
 				humanMessage,
+				attachments,
 				resolvedCredentials,
 				resolvedModel,
 				trx,

From 271a9dd2181e163a4fcd72d995598bb0e48ccee8 Mon Sep 17 00:00:00 2001
From: Dawid Myslak <dawid.myslak@gmail.com>
Date: Wed, 3 Dec 2025 21:49:58 +0100
Subject: [PATCH 044/167] feat(Form Node): Split form name and label (#22304)

---
 packages/nodes-base/nodes/Form/Form.node.ts   |   2 +-
 .../nodes-base/nodes/Form/FormTrigger.node.ts |   3 +-
 .../nodes/Form/common.descriptions.ts         |  38 +++
 .../nodes-base/nodes/Form/test/utils.test.ts  | 278 ++++++++++++++++++
 packages/nodes-base/nodes/Form/utils/utils.ts |  29 +-
 .../nodes/Form/v2/FormTriggerV2.node.ts       |   2 +-
 .../tests/ui/16-form-trigger-node.spec.ts     |   4 +
 7 files changed, 348 insertions(+), 8 deletions(-)

diff --git a/packages/nodes-base/nodes/Form/Form.node.ts b/packages/nodes-base/nodes/Form/Form.node.ts
index 91a7162bbf2..4103586d328 100644
--- a/packages/nodes-base/nodes/Form/Form.node.ts
+++ b/packages/nodes-base/nodes/Form/Form.node.ts
@@ -269,7 +269,7 @@ export class Form extends Node {
 		group: ['input'],
 		// since trigger and node are sharing descriptions and logic we need to sync the versions
 		// and keep them aligned in both nodes
-		version: [1, 2.3],
+		version: [1, 2.3, 2.4],
 		description: 'Generate webforms in n8n and pass their responses to the workflow',
 		defaults: {
 			name: 'Form',
diff --git a/packages/nodes-base/nodes/Form/FormTrigger.node.ts b/packages/nodes-base/nodes/Form/FormTrigger.node.ts
index 739a5787865..e513a242d75 100644
--- a/packages/nodes-base/nodes/Form/FormTrigger.node.ts
+++ b/packages/nodes-base/nodes/Form/FormTrigger.node.ts
@@ -12,7 +12,7 @@ export class FormTrigger extends VersionedNodeType {
 			icon: 'file:form.svg',
 			group: ['trigger'],
 			description: 'Generate webforms in n8n and pass their responses to the workflow',
-			defaultVersion: 2.3,
+			defaultVersion: 2.4,
 		};
 
 		const nodeVersions: IVersionedNodeType['nodeVersions'] = {
@@ -21,6 +21,7 @@ export class FormTrigger extends VersionedNodeType {
 			2.1: new FormTriggerV2(baseDescription),
 			2.2: new FormTriggerV2(baseDescription),
 			2.3: new FormTriggerV2(baseDescription),
+			2.4: new FormTriggerV2(baseDescription),
 		};
 
 		super(nodeVersions, baseDescription);
diff --git a/packages/nodes-base/nodes/Form/common.descriptions.ts b/packages/nodes-base/nodes/Form/common.descriptions.ts
index b2bac9fe4ab..d653600e4fd 100644
--- a/packages/nodes-base/nodes/Form/common.descriptions.ts
+++ b/packages/nodes-base/nodes/Form/common.descriptions.ts
@@ -58,6 +58,23 @@ export const formFields: INodeProperties = {
 			values: [
 				{
 					displayName: 'Field Name',
+					name: 'fieldName',
+					description:
+						'The name of the field, used in input attributes and referenced by the workflow',
+					required: true,
+					type: 'string',
+					default: '',
+					displayOptions: {
+						hide: {
+							fieldType: ['html'],
+						},
+						show: {
+							'@version': [{ _cnd: { gte: 2.4 } }],
+						},
+					},
+				},
+				{
+					displayName: 'Label',
 					name: 'fieldLabel',
 					type: 'string',
 					default: '',
@@ -68,6 +85,26 @@ export const formFields: INodeProperties = {
 						hide: {
 							fieldType: ['hiddenField', 'html'],
 						},
+						show: {
+							'@version': [{ _cnd: { gte: 2.4 } }],
+						},
+					},
+				},
+				{
+					displayName: 'Field Name',
+					name: 'fieldLabel',
+					type: 'string',
+					default: '',
+					placeholder: 'e.g. What is your name?',
+					description: 'Label that appears above the input field',
+					required: true,
+					displayOptions: {
+						hide: {
+							fieldType: ['hiddenField', 'html'],
+						},
+						show: {
+							'@version': [{ _cnd: { lt: 2.4 } }],
+						},
 					},
 				},
 				{
@@ -80,6 +117,7 @@ export const formFields: INodeProperties = {
 					displayOptions: {
 						show: {
 							fieldType: ['hiddenField'],
+							'@version': [{ _cnd: { lt: 2.4 } }],
 						},
 					},
 				},
diff --git a/packages/nodes-base/nodes/Form/test/utils.test.ts b/packages/nodes-base/nodes/Form/test/utils.test.ts
index 9f5dcbbe766..8bc7811c824 100644
--- a/packages/nodes-base/nodes/Form/test/utils.test.ts
+++ b/packages/nodes-base/nodes/Form/test/utils.test.ts
@@ -1155,6 +1155,82 @@ describe('FormTrigger, prepareFormData - Checkbox and Radio Fields', () => {
 			{ id: 'option1_field-1', label: 'Office' },
 		]);
 	});
+
+	describe('Version 2.4+ fieldName support', () => {
+		it('should use fieldName for query parameters in v2.4+', () => {
+			const formFields: FormFieldsParameter = [
+				{
+					fieldName: 'userName',
+					fieldLabel: 'User Name',
+					fieldType: 'text',
+				},
+			];
+			const query: IDataObject = { userName: 'John Doe' };
+
+			const result = prepareFormData({
+				formTitle: 'Test Form',
+				formDescription: 'Test Description',
+				formSubmittedText: undefined,
+				redirectUrl: undefined,
+				formFields,
+				testRun: true,
+				query,
+				nodeVersion: 2.4,
+			});
+
+			expect(result.formFields[0].defaultValue).toBe('John Doe');
+			expect(result.formFields[0].label).toBe('User Name'); // Label should still be fieldLabel for rendering
+		});
+
+		it('should use fieldLabel for query parameters in v2.3 and earlier', () => {
+			const formFields: FormFieldsParameter = [
+				{
+					fieldName: 'userName',
+					fieldLabel: 'User Name',
+					fieldType: 'text',
+				},
+			];
+			const query: IDataObject = { 'User Name': 'John Doe' };
+
+			const result = prepareFormData({
+				formTitle: 'Test Form',
+				formDescription: 'Test Description',
+				formSubmittedText: undefined,
+				redirectUrl: undefined,
+				formFields,
+				testRun: true,
+				query,
+				nodeVersion: 2.3,
+			});
+
+			expect(result.formFields[0].defaultValue).toBe('John Doe');
+			expect(result.formFields[0].label).toBe('User Name');
+		});
+
+		it('should fallback to fieldLabel if fieldName is missing in v2.4+', () => {
+			const formFields: FormFieldsParameter = [
+				{
+					fieldLabel: 'User Name',
+					fieldType: 'text',
+				},
+			];
+			const query: IDataObject = { 'User Name': 'John Doe' };
+
+			const result = prepareFormData({
+				formTitle: 'Test Form',
+				formDescription: 'Test Description',
+				formSubmittedText: undefined,
+				redirectUrl: undefined,
+				formFields,
+				testRun: true,
+				query,
+				nodeVersion: 2.4,
+			});
+
+			expect(result.formFields[0].defaultValue).toBe('John Doe');
+			expect(result.formFields[0].label).toBe('User Name');
+		});
+	});
 });
 
 describe('addFormResponseDataToReturnItem - Checkbox and Radio Fields', () => {
@@ -1494,6 +1570,126 @@ describe('prepareFormReturnItem', () => {
 		expect(result.json.formQueryParameters).toBeUndefined();
 	});
 
+	describe('Version 2.4+ fieldName support', () => {
+		it('should use fieldName for binary property names in v2.4+', async () => {
+			const mockFile: Partial<MultiPartFormData.File> = {
+				filepath: '/tmp/uploaded-file',
+				originalFilename: 'test.txt',
+				mimetype: 'text/plain',
+				size: 1024,
+				newFilename: 'test.txt',
+			};
+
+			mockContext.getBodyData.mockReturnValue({
+				data: {},
+				files: { 'field-0': mockFile },
+			});
+
+			mockContext.getNode.mockReturnValue({
+				...formNode,
+				typeVersion: 2.4,
+			} as INode);
+
+			const formFields: FormFieldsParameter = [
+				{
+					fieldName: 'resume',
+					fieldLabel: 'Resume Upload',
+					fieldType: 'file',
+				},
+			];
+
+			const result = await prepareFormReturnItem(mockContext, formFields, 'test');
+
+			expect(result.binary).toBeDefined();
+			expect(result.binary!.resume).toBeDefined();
+			expect(result.binary!['Resume_Upload']).toBeUndefined();
+		});
+
+		it('should use fieldLabel for binary property names in v2.3 and earlier', async () => {
+			const mockFile: Partial<MultiPartFormData.File> = {
+				filepath: '/tmp/uploaded-file',
+				originalFilename: 'test.txt',
+				mimetype: 'text/plain',
+				size: 1024,
+				newFilename: 'test.txt',
+			};
+
+			mockContext.getBodyData.mockReturnValue({
+				data: {},
+				files: { 'field-0': mockFile },
+			});
+
+			mockContext.getNode.mockReturnValue({
+				...formNode,
+				typeVersion: 2.3,
+			} as INode);
+
+			const formFields: FormFieldsParameter = [
+				{
+					fieldName: 'resume',
+					fieldLabel: 'Resume Upload',
+					fieldType: 'file',
+				},
+			];
+
+			const result = await prepareFormReturnItem(mockContext, formFields, 'test');
+
+			expect(result.binary).toBeDefined();
+			expect(result.binary!['Resume_Upload']).toBeDefined();
+			expect(result.binary!.resume).toBeUndefined();
+		});
+
+		it('should use fieldName for output data keys in v2.4+', async () => {
+			mockContext.getBodyData.mockReturnValue({
+				data: { 'field-0': 'John Doe' },
+				files: {},
+			});
+
+			mockContext.getNode.mockReturnValue({
+				...formNode,
+				typeVersion: 2.4,
+			} as INode);
+
+			const formFields: FormFieldsParameter = [
+				{
+					fieldName: 'userName',
+					fieldLabel: 'User Name',
+					fieldType: 'text',
+				},
+			];
+
+			const result = await prepareFormReturnItem(mockContext, formFields, 'test');
+
+			expect(result.json.userName).toBe('John Doe');
+			expect(result.json['User Name']).toBeUndefined();
+		});
+
+		it('should use fieldLabel for output data keys in v2.3 and earlier', async () => {
+			mockContext.getBodyData.mockReturnValue({
+				data: { 'field-0': 'John Doe' },
+				files: {},
+			});
+
+			mockContext.getNode.mockReturnValue({
+				...formNode,
+				typeVersion: 2.3,
+			} as INode);
+
+			const formFields: FormFieldsParameter = [
+				{
+					fieldName: 'userName',
+					fieldLabel: 'User Name',
+					fieldType: 'text',
+				},
+			];
+
+			const result = await prepareFormReturnItem(mockContext, formFields, 'test');
+
+			expect(result.json['User Name']).toBe('John Doe');
+			expect(result.json.userName).toBeUndefined();
+		});
+	});
+
 	it('should return html if field name is set', async () => {
 		mockContext.getBodyData.mockReturnValue({
 			data: { 'field-0': '<div>hi</div>', 'field-1': '<h1><haha/hi>' },
@@ -1867,6 +2063,88 @@ describe('addFormResponseDataToReturnItem', () => {
 		addFormResponseDataToReturnItem(returnItem, formFields, bodyData);
 		expect(returnItem.json['File Field']).toEqual(['file1.pdf']);
 	});
+
+	describe('Version 2.4+ fieldName support', () => {
+		it('should use fieldName for output data keys in v2.4+', () => {
+			const formFields: FormFieldsParameter = [
+				{
+					fieldName: 'userName',
+					fieldLabel: 'User Name',
+					fieldType: 'text',
+				},
+			];
+			const bodyData: IDataObject = { 'field-0': 'John Doe' };
+
+			addFormResponseDataToReturnItem(returnItem, formFields, bodyData, 2.4);
+
+			expect(returnItem.json.userName).toBe('John Doe');
+			expect(returnItem.json['User Name']).toBeUndefined();
+		});
+
+		it('should use fieldLabel for output data keys in v2.3 and earlier', () => {
+			const formFields: FormFieldsParameter = [
+				{
+					fieldName: 'userName',
+					fieldLabel: 'User Name',
+					fieldType: 'text',
+				},
+			];
+			const bodyData: IDataObject = { 'field-0': 'John Doe' };
+
+			addFormResponseDataToReturnItem(returnItem, formFields, bodyData, 2.3);
+
+			expect(returnItem.json['User Name']).toBe('John Doe');
+			expect(returnItem.json.userName).toBeUndefined();
+		});
+
+		it('should fallback to fieldLabel if fieldName is missing in v2.4+', () => {
+			const formFields: FormFieldsParameter = [
+				{
+					fieldLabel: 'User Name',
+					fieldType: 'text',
+				},
+			];
+			const bodyData: IDataObject = { 'field-0': 'John Doe' };
+
+			addFormResponseDataToReturnItem(returnItem, formFields, bodyData, 2.4);
+
+			expect(returnItem.json['User Name']).toBe('John Doe');
+		});
+
+		it('should handle multiple fields with fieldName in v2.4+', () => {
+			const formFields: FormFieldsParameter = [
+				{
+					fieldName: 'firstName',
+					fieldLabel: 'First Name',
+					fieldType: 'text',
+				},
+				{
+					fieldName: 'lastName',
+					fieldLabel: 'Last Name',
+					fieldType: 'text',
+				},
+				{
+					fieldName: 'email',
+					fieldLabel: 'Email Address',
+					fieldType: 'email',
+				},
+			];
+			const bodyData: IDataObject = {
+				'field-0': 'John',
+				'field-1': 'Doe',
+				'field-2': 'john@example.com',
+			};
+
+			addFormResponseDataToReturnItem(returnItem, formFields, bodyData, 2.4);
+
+			expect(returnItem.json.firstName).toBe('John');
+			expect(returnItem.json.lastName).toBe('Doe');
+			expect(returnItem.json.email).toBe('john@example.com');
+			expect(returnItem.json['First Name']).toBeUndefined();
+			expect(returnItem.json['Last Name']).toBeUndefined();
+			expect(returnItem.json['Email Address']).toBeUndefined();
+		});
+	});
 });
 
 describe('FormTrigger, prepareFormData - Default Value', () => {
diff --git a/packages/nodes-base/nodes/Form/utils/utils.ts b/packages/nodes-base/nodes/Form/utils/utils.ts
index 6e0f68b684f..3df9d11441f 100644
--- a/packages/nodes-base/nodes/Form/utils/utils.ts
+++ b/packages/nodes-base/nodes/Form/utils/utils.ts
@@ -1,6 +1,5 @@
 import type { Response } from 'express';
 import isbot from 'isbot';
-import * as a from 'node:assert';
 import { DateTime } from 'luxon';
 import type {
 	INodeExecutionData,
@@ -18,6 +17,7 @@ import {
 	WorkflowConfigurationError,
 	jsonParse,
 } from 'n8n-workflow';
+import * as a from 'node:assert';
 import sanitize from 'sanitize-html';
 
 import { getResolvables } from '../../../utils/utilities';
@@ -138,6 +138,19 @@ export function createDescriptionMetadata(description: string) {
 		: description.replace(/^\s*\n+|<\/?[^>]+(>|$)/g, '').slice(0, 150);
 }
 
+/**
+ * Gets the field identifier to use based on node version.
+ * For v2.4+, uses fieldName as the primary identifier.
+ * For earlier versions, falls back to fieldLabel.
+ */
+function getFieldIdentifier(field: FormFieldsParameter[number], nodeVersion?: number): string {
+	if (nodeVersion && nodeVersion >= 2.4 && field.fieldName) {
+		return field.fieldName;
+	}
+
+	return field.fieldLabel ?? field.fieldName ?? '';
+}
+
 export function prepareFormData({
 	formTitle,
 	formDescription,
@@ -152,6 +165,7 @@ export function prepareFormData({
 	appendAttribution = true,
 	buttonLabel,
 	customCss,
+	nodeVersion,
 }: {
 	formTitle: string;
 	formDescription: string;
@@ -166,6 +180,7 @@ export function prepareFormData({
 	buttonLabel?: string;
 	formSubmittedHeader?: string;
 	customCss?: string;
+	nodeVersion?: number;
 }) {
 	const utm_campaign = instanceId ? `&utm_campaign=${instanceId}` : '';
 	const n8nWebsiteLink = `https://n8n.io/?utm_source=n8n-internal&utm_medium=form-trigger${utm_campaign}`;
@@ -198,13 +213,14 @@ export function prepareFormData({
 
 	for (const [index, field] of formFields.entries()) {
 		const { fieldType, requiredField, multiselect, placeholder, defaultValue } = field;
+		const queryParam = getFieldIdentifier(field, nodeVersion);
 
 		const input: FormField = {
 			id: `field-${index}`,
 			errorId: `error-field-${index}`,
 			label: field.fieldLabel,
 			inputRequired: requiredField ? 'form-required' : '',
-			defaultValue: query[field.fieldLabel] ?? defaultValue ?? '',
+			defaultValue: query[queryParam] ?? defaultValue ?? '',
 			placeholder,
 		};
 
@@ -302,10 +318,11 @@ export function addFormResponseDataToReturnItem(
 	returnItem: INodeExecutionData,
 	formFields: FormFieldsParameter,
 	bodyData: IDataObject,
+	nodeVersion?: number,
 ) {
 	for (const [index, field] of formFields.entries()) {
 		const key = `field-${index}`;
-		const name = field.fieldLabel ?? field.fieldName;
+		const name = getFieldIdentifier(field, nodeVersion);
 		let value = bodyData[key] ?? null;
 
 		if (value === null) {
@@ -389,7 +406,8 @@ export async function prepareFormReturnItem(
 		}
 
 		const entryIndex = Number(key.replace(/field-/g, ''));
-		const fieldLabel = isNaN(entryIndex) ? key : formFields[entryIndex].fieldLabel;
+		const field = isNaN(entryIndex) ? null : formFields[entryIndex];
+		const fieldLabel = field ? getFieldIdentifier(field, context.getNode().typeVersion) : key;
 
 		let fileCount = 0;
 		for (const file of processFiles) {
@@ -407,7 +425,7 @@ export async function prepareFormReturnItem(
 		}
 	}
 
-	addFormResponseDataToReturnItem(returnItem, formFields, bodyData);
+	addFormResponseDataToReturnItem(returnItem, formFields, bodyData, context.getNode().typeVersion);
 
 	const timezone = useWorkflowTimezone ? context.getTimezone() : 'UTC';
 	returnItem.json.submittedAt = DateTime.now().setZone(timezone).toISO();
@@ -491,6 +509,7 @@ export function renderForm({
 		appendAttribution,
 		buttonLabel,
 		customCss,
+		nodeVersion: context.getNode().typeVersion,
 	});
 
 	res.render('form-trigger', data);
diff --git a/packages/nodes-base/nodes/Form/v2/FormTriggerV2.node.ts b/packages/nodes-base/nodes/Form/v2/FormTriggerV2.node.ts
index e87f6097197..0fa6f4a747a 100644
--- a/packages/nodes-base/nodes/Form/v2/FormTriggerV2.node.ts
+++ b/packages/nodes-base/nodes/Form/v2/FormTriggerV2.node.ts
@@ -38,7 +38,7 @@ const descriptionV2: INodeTypeDescription = {
 	group: ['trigger'],
 	// since trigger and node are sharing descriptions and logic we need to sync the versions
 	// and keep them aligned in both nodes
-	version: [2, 2.1, 2.2, 2.3],
+	version: [2, 2.1, 2.2, 2.3, 2.4],
 	description: 'Generate webforms in n8n and pass their responses to the workflow',
 	defaults: {
 		name: 'On form submission',
diff --git a/packages/testing/playwright/tests/ui/16-form-trigger-node.spec.ts b/packages/testing/playwright/tests/ui/16-form-trigger-node.spec.ts
index c1092bc5763..fa4843d519d 100644
--- a/packages/testing/playwright/tests/ui/16-form-trigger-node.spec.ts
+++ b/packages/testing/playwright/tests/ui/16-form-trigger-node.spec.ts
@@ -26,21 +26,25 @@ test.describe('Form Trigger', () => {
 
 		// Add first field - Number type with required flag
 		await n8n.ndv.addFixedCollectionItem();
+		await n8n.ndv.fillParameterInputByName('fieldName', 'testField1');
 		await n8n.ndv.fillParameterInputByName('fieldLabel', 'Test Field 1');
 		await n8n.ndv.selectOptionInParameterDropdown('fieldType', 'Number');
 		await n8n.ndv.setParameterSwitch('requiredField', true);
 
 		// Add second field - Text type
 		await n8n.ndv.addFixedCollectionItem();
+		await n8n.ndv.fillParameterInputByName('fieldName', 'testField2', 1);
 		await n8n.ndv.fillParameterInputByName('fieldLabel', 'Test Field 2', 1);
 
 		// Add third field - Date type
 		await n8n.ndv.addFixedCollectionItem();
+		await n8n.ndv.fillParameterInputByName('fieldName', 'testField3', 2);
 		await n8n.ndv.fillParameterInputByName('fieldLabel', 'Test Field 3', 2);
 		await n8n.ndv.selectOptionInParameterDropdown('fieldType', 'Date', 2);
 
 		// Add fourth field - Dropdown type with options
 		await n8n.ndv.addFixedCollectionItem();
+		await n8n.ndv.fillParameterInputByName('fieldName', 'testField4', 3);
 		await n8n.ndv.fillParameterInputByName('fieldLabel', 'Test Field 4', 3);
 		await n8n.ndv.selectOptionInParameterDropdown('fieldType', 'Dropdown', 3);
 

From ed3003ccc3af890a4e4f7220bdc185c531a96d63 Mon Sep 17 00:00:00 2001
From: Robert Squires <robtf9@icloud.com>
Date: Thu, 4 Dec 2025 07:59:25 +0000
Subject: [PATCH 045/167] fix(editor): Design fixes tabs, callout, modal
 (no-changelog) (#22707)

---
 .../@n8n/design-system/src/components/N8nTabs/Tabs.vue | 10 +++++++---
 .../@n8n/design-system/src/css/_tokens.dark.scss       |  2 +-
 .../frontend/@n8n/design-system/src/css/_tokens.scss   |  4 ++--
 packages/frontend/editor-ui/src/app/css/_global.scss   |  2 +-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/packages/frontend/@n8n/design-system/src/components/N8nTabs/Tabs.vue b/packages/frontend/@n8n/design-system/src/components/N8nTabs/Tabs.vue
index 535ab732a6d..9d9a0b20dff 100644
--- a/packages/frontend/@n8n/design-system/src/components/N8nTabs/Tabs.vue
+++ b/packages/frontend/@n8n/design-system/src/components/N8nTabs/Tabs.vue
@@ -81,10 +81,10 @@ const scrollRight = () => scroll(50);
 		]"
 	>
 		<div v-if="scrollPosition > 0" :class="$style.back" @click="scrollLeft">
-			<N8nIcon icon="chevron-left" size="small" />
+			<N8nIcon :class="$style.positionIcon" icon="chevron-left" size="small" />
 		</div>
 		<div v-if="canScrollRight" :class="$style.next" @click="scrollRight">
-			<N8nIcon icon="chevron-right" size="small" />
+			<N8nIcon :class="$style.positionIcon" icon="chevron-right" size="small" />
 		</div>
 		<div ref="tabs" :class="$style.tabs">
 			<div
@@ -279,7 +279,7 @@ const scrollRight = () => scroll(50);
 
 .button {
 	position: absolute;
-	background-color: var(--tabs--arrow-buttons--color, var(--color--background));
+	background-color: var(--tabs--arrow-buttons--color, var(--color--foreground--tint-2));
 	z-index: 1;
 	height: 24px;
 	width: 10px;
@@ -321,4 +321,8 @@ const scrollRight = () => scroll(50);
 	composes: button;
 	right: 0;
 }
+
+.positionIcon {
+	flex-shrink: 0;
+}
 </style>
diff --git a/packages/frontend/@n8n/design-system/src/css/_tokens.dark.scss b/packages/frontend/@n8n/design-system/src/css/_tokens.dark.scss
index adfc1e3e0f2..4748beff9f6 100644
--- a/packages/frontend/@n8n/design-system/src/css/_tokens.dark.scss
+++ b/packages/frontend/@n8n/design-system/src/css/_tokens.dark.scss
@@ -295,7 +295,7 @@
 	// Dialogs and overlays
 	--dialog--color--background: var(--color--neutral-900);
 	--dialog--overlay--color--background: var(--color--slate-alpha-700);
-	--dialog--overlay--color--background--dark: var(--color--slate-alpha-700);
+	--dialog--overlay--color--background--dark: var(--color--black-alpha-600);
 
 	// Avatar
 	--avatar--color--text: var(--color--neutral-white);
diff --git a/packages/frontend/@n8n/design-system/src/css/_tokens.scss b/packages/frontend/@n8n/design-system/src/css/_tokens.scss
index f542418ba54..88bd7122640 100644
--- a/packages/frontend/@n8n/design-system/src/css/_tokens.scss
+++ b/packages/frontend/@n8n/design-system/src/css/_tokens.scss
@@ -68,7 +68,7 @@
 	/* stylelint-disable-next-line @n8n/css-var-naming */
 	--color--warning--shade-1: var(--color-warning-shade-1, var(--color--gold-500));
 	/* stylelint-disable-next-line @n8n/css-var-naming */
-	--color--warning: var(--color-warning, var(--color--gold-400));
+	--color--warning: var(--color-warning, var(--color--gold-600));
 	/* stylelint-disable-next-line @n8n/css-var-naming */
 	--color--warning--tint-1: var(--color-warning-tint-1, var(--color--gold-200));
 	/* stylelint-disable-next-line @n8n/css-var-naming */
@@ -464,7 +464,7 @@
 	// Dialogs and overlays
 	--dialog--color--background: var(--color--neutral-white);
 	--dialog--overlay--color--background: var(--color--white-alpha-800);
-	--dialog--overlay--color--background--dark: var(--color--slate-alpha-700);
+	--dialog--overlay--color--background--dark: var(--color--black-alpha-600);
 	--block-ui--overlay--color: var(--color--neutral-950);
 
 	// Avatar
diff --git a/packages/frontend/editor-ui/src/app/css/_global.scss b/packages/frontend/editor-ui/src/app/css/_global.scss
index dc40b596b60..65ff23fc84d 100644
--- a/packages/frontend/editor-ui/src/app/css/_global.scss
+++ b/packages/frontend/editor-ui/src/app/css/_global.scss
@@ -67,7 +67,7 @@
 }
 
 .el-message-box {
-	background-color: var(--color--background--light-2);
+	background-color: var(--dialog--color--background);
 	border: none;
 	.el-message-box__headerbtn {
 		.el-message-box__close {

From 40f80074153f6482bb269b5e69d6d7ad553ef00a Mon Sep 17 00:00:00 2001
From: Jaakko Husso <jaakko@n8n.io>
Date: Thu, 4 Dec 2025 10:04:59 +0200
Subject: [PATCH 046/167] fix(core): Don't render empty completed messages
 (tool calls) on chat (no-changelog) (#22686)

---
 .../src/features/ai/chatHub/components/ChatMessage.vue       | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatMessage.vue b/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatMessage.vue
index 6e3a6dc18a3..995eae465a8 100644
--- a/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatMessage.vue
+++ b/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatMessage.vue
@@ -79,6 +79,10 @@ const attachments = computed(() =>
 	})),
 );
 
+const hideMessage = computed(() => {
+	return message.status === 'success' && message.content === '';
+});
+
 const hoveredCodeBlockContent = computed(() => {
 	const idx = hoveredCodeBlockActions.value?.getAttribute('data-markdown-token-idx');
 
@@ -169,6 +173,7 @@ onBeforeMount(() => {
 
 <template>
 	<div
+		v-if="!hideMessage"
 		:class="[
 			$style.message,
 			message.type === 'human' ? $style.user : $style.assistant,

From 25043d35c11abb03bc2e3043d1a880b5af61d4fd Mon Sep 17 00:00:00 2001
From: Tuukka Kantola <Tuukkaa@users.noreply.github.com>
Date: Thu, 4 Dec 2025 09:29:41 +0100
Subject: [PATCH 047/167] feat(editor): Improve node component visual states
 (#20242)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Giulio Andreini <g.andreini@gmail.com>
Co-authored-by: Rob <robtf9@icloud.com>
Co-authored-by: Iván Ovejero <ivov.src@gmail.com>
Co-authored-by: Tomi Turtiainen <10324676+tomi@users.noreply.github.com>
Co-authored-by: yehorkardash <yehor.kardash@n8n.io>
Co-authored-by: Daria <daria.staferova@n8n.io>
---
 .../design-system/src/css/_tokens.dark.scss   |  15 +-
 .../@n8n/design-system/src/css/_tokens.scss   |  18 +-
 .../canvas/components/WorkflowCanvas.vue      |   1 +
 .../elements/edges/CanvasConnectionLine.vue   |  12 +-
 .../elements/edges/CanvasEdge.test.ts         |   6 +
 .../components/elements/edges/CanvasEdge.vue  |  77 ++++----
 .../elements/edges/CanvasEdgeToolbar.vue      |  24 +--
 .../handles/CanvasHandleRenderer.test.ts      |   9 +-
 .../elements/handles/CanvasHandleRenderer.vue |   7 +-
 .../CanvasHandleMainInput.test.ts             |   6 +-
 .../render-types/CanvasHandleMainInput.vue    |  15 +-
 .../CanvasHandleMainOutput.test.ts            |  13 +-
 .../render-types/CanvasHandleMainOutput.vue   |  15 +-
 .../CanvasHandleNonMainInput.test.ts          |   6 +-
 .../render-types/CanvasHandleNonMainInput.vue |  15 +-
 .../CanvasHandleNonMainOutput.test.ts         |   6 +-
 .../CanvasHandleNonMainOutput.vue             |  15 +-
 .../parts/CanvasHandleDiamond.vue             |  27 ++-
 .../render-types/parts/CanvasHandleDot.vue    |  38 +++-
 .../parts/CanvasHandlePlus.test.ts            |   6 +-
 .../render-types/parts/CanvasHandlePlus.vue   |  42 +++--
 .../parts/CanvasHandleRectangle.test.ts       |  21 ---
 .../parts/CanvasHandleRectangle.vue           |  26 ---
 .../CanvasHandleDiamond.test.ts.snap          |   6 +-
 .../CanvasHandleDot.test.ts.snap              |   6 +-
 .../CanvasHandlePlus.test.ts.snap             |   8 +-
 .../CanvasHandleRectangle.test.ts.snap        |   3 -
 .../components/elements/nodes/CanvasNode.vue  |   2 +
 .../nodes/render-types/CanvasNodeDefault.vue  |  90 +++++++--
 .../CanvasNodeDefault.test.ts.snap            |  10 +-
 .../parts/CanvasNodeStatusIcons.test.ts       |  85 ---------
 .../parts/CanvasNodeStatusIcons.vue           |  31 +---
 .../composables/useZoomAdjustedValues.test.ts | 173 ++++++++++++++++++
 .../composables/useZoomAdjustedValues.ts      |  95 ++++++++++
 .../workflowDiff/WorkflowDiffModal.vue        |  33 +++-
 .../testing/playwright/pages/CanvasPage.ts    |  14 +-
 36 files changed, 640 insertions(+), 336 deletions(-)
 delete mode 100644 packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/parts/CanvasHandleRectangle.test.ts
 delete mode 100644 packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/parts/CanvasHandleRectangle.vue
 delete mode 100644 packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/parts/__snapshots__/CanvasHandleRectangle.test.ts.snap
 create mode 100644 packages/frontend/editor-ui/src/features/workflows/canvas/composables/useZoomAdjustedValues.test.ts
 create mode 100644 packages/frontend/editor-ui/src/features/workflows/canvas/composables/useZoomAdjustedValues.ts

diff --git a/packages/frontend/@n8n/design-system/src/css/_tokens.dark.scss b/packages/frontend/@n8n/design-system/src/css/_tokens.dark.scss
index 4748beff9f6..52cf7edeae3 100644
--- a/packages/frontend/@n8n/design-system/src/css/_tokens.dark.scss
+++ b/packages/frontend/@n8n/design-system/src/css/_tokens.dark.scss
@@ -69,19 +69,12 @@
 
 	// Canvas
 	--canvas--color--background: var(--color--neutral-950);
-	--canvas--color--background--h: 0;
-	--canvas--color--background--s: 0%;
-	--canvas--color--background--l: 9%;
-	--canvas--dot--color: var(--color--neutral-600);
+	--canvas--dot--color: var(--color--neutral-700);
 	--canvas--read-only-line--color: var(--color--neutral-900);
 	--canvas--color--selected: var(--color--white-alpha-400);
 	--canvas--color--selected-transparent: var(--canvas--color--selected);
-	--canvas--label--color--background: hsla(
-		var(--canvas--color--background--h),
-		var(--canvas--color--background--s),
-		var(--canvas--color--background--l),
-		0.85
-	);
+	--canvas--label--color: var(--color--neutral-500);
+	--canvas--label--color--background: oklch(from var(--canvas--color--background) l c h / 0.85);
 
 	// Nodes
 	--node--color--background: var(--color--neutral-850);
@@ -114,7 +107,7 @@
 
 	// NodeIcon
 	--node--icon--color--neutral: var(--color--neutral-200);
-	--node--icon--color--black: var(--color--neutral-50);
+	--node--icon--color--black: var(--color--neutral-200);
 	--node--icon--color--blue: #898fff;
 	--node--icon--color--light-blue: #58abff;
 	--node--icon--color--dark-blue: #7ba7ff;
diff --git a/packages/frontend/@n8n/design-system/src/css/_tokens.scss b/packages/frontend/@n8n/design-system/src/css/_tokens.scss
index 88bd7122640..6dada289531 100644
--- a/packages/frontend/@n8n/design-system/src/css/_tokens.scss
+++ b/packages/frontend/@n8n/design-system/src/css/_tokens.scss
@@ -167,20 +167,13 @@
 	--lm-chat--user--color: var(--color--text--tint-3);
 
 	// Canvas
-	--canvas--color--background: var(--color--neutral-50);
-	--canvas--color--background--h: 220;
-	--canvas--color--background--s: 47%;
-	--canvas--color--background--l: 99%;
+	--canvas--color--background: var(--color--neutral-125);
 	--canvas--dot--color: var(--color--neutral-500);
 	--canvas--read-only-line--color: var(--color--neutral-100);
 	--canvas--color--selected: var(--color--neutral-150);
 	--canvas--color--selected-transparent: hsla(220, 47%, 30%, 0.1);
-	--canvas--label--color--background: hsla(
-		var(--canvas--color--background--h),
-		var(--canvas--color--background--s),
-		var(--canvas--color--background--l),
-		0.85
-	);
+	--canvas--label--color: var(--color--neutral-600);
+	--canvas--label--color--background: oklch(from var(--canvas--color--background) l c h / 0.85);
 
 	// Nodes
 	--node--color--background: var(--color--background--light-3);
@@ -209,7 +202,7 @@
 	--sticky--border-color--variant-5: var(--color--blue-200);
 	--sticky--color--background--variant-6: var(--color--purple-200);
 	--sticky--border-color--variant-6: var(--color--purple-300);
-	--sticky--color--background--variant-7: var(--color--neutral-50);
+	--sticky--color--background--variant-7: var(--color--neutral-100);
 	--sticky--border-color--variant-7: var(--color--neutral-200);
 
 	// AI Assistant
@@ -256,7 +249,7 @@
 
 	// NodeIcon
 	--node--icon--color--neutral: var(--color--neutral-400);
-	--node--icon--color--black: var(--color--neutral-900);
+	--node--icon--color--black: var(--color--neutral-800);
 	--node--icon--color--blue: #3a42e9;
 	--node--icon--color--light-blue: #5fabf7;
 	--node--icon--color--dark-blue: #353f6e;
@@ -713,5 +706,6 @@
 }
 
 :root {
+	color-scheme: light dark;
 	@include theme;
 }
diff --git a/packages/frontend/editor-ui/src/features/workflows/canvas/components/WorkflowCanvas.vue b/packages/frontend/editor-ui/src/features/workflows/canvas/components/WorkflowCanvas.vue
index 725ac5d1439..c7af6d815ab 100644
--- a/packages/frontend/editor-ui/src/features/workflows/canvas/components/WorkflowCanvas.vue
+++ b/packages/frontend/editor-ui/src/features/workflows/canvas/components/WorkflowCanvas.vue
@@ -175,5 +175,6 @@ defineExpose({
 	display: block;
 	align-items: stretch;
 	justify-content: stretch;
+	background-color: var(--canvas--color--background);
 }
 </style>
diff --git a/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/edges/CanvasConnectionLine.vue b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/edges/CanvasConnectionLine.vue
index eba401fb73c..e1088d1a5d5 100644
--- a/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/edges/CanvasConnectionLine.vue
+++ b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/edges/CanvasConnectionLine.vue
@@ -25,18 +25,10 @@ const classes = computed(() => {
 	};
 });
 
-const edgeColor = computed(() => {
-	if (connectionType.value !== NodeConnectionTypes.Main) {
-		return 'var(--node-type--supplemental--color)';
-	} else {
-		return 'var(--color--foreground--shade-2)';
-	}
-});
-
 const edgeStyle = computed(() => ({
-	...(connectionType.value === NodeConnectionTypes.Main ? {} : { strokeDasharray: '8,8' }),
+	...(connectionType.value === NodeConnectionTypes.Main ? {} : { strokeDasharray: '5,6' }),
 	strokeWidth: 2,
-	stroke: edgeColor.value,
+	stroke: 'var(--color--foreground--shade-2)',
 }));
 
 const renderData = computed(() =>
diff --git a/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/edges/CanvasEdge.test.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/edges/CanvasEdge.test.ts
index 3a4accf78d6..52a7149d11f 100644
--- a/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/edges/CanvasEdge.test.ts
+++ b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/edges/CanvasEdge.test.ts
@@ -6,6 +6,7 @@ import { NodeConnectionTypes } from 'n8n-workflow';
 import { setActivePinia } from 'pinia';
 import CanvasEdge, { type CanvasEdgeProps } from './CanvasEdge.vue';
 import type { CanvasConnectionPort } from '../../../canvas.types';
+import { createCanvasProvide } from '@/features/workflows/canvas/__tests__/utils';
 
 const DEFAULT_PROPS = {
 	sourceX: 0,
@@ -22,6 +23,11 @@ const DEFAULT_PROPS = {
 } satisfies Partial<CanvasEdgeProps>;
 const renderComponent = createComponentRenderer(CanvasEdge, {
 	props: DEFAULT_PROPS,
+	global: {
+		provide: {
+			...createCanvasProvide(),
+		},
+	},
 });
 
 beforeEach(() => {
diff --git a/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/edges/CanvasEdge.vue b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/edges/CanvasEdge.vue
index bde377ed08f..c2abbf859ad 100644
--- a/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/edges/CanvasEdge.vue
+++ b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/edges/CanvasEdge.vue
@@ -8,6 +8,8 @@ import { NodeConnectionTypes } from 'n8n-workflow';
 import { computed, ref, toRef, useCssModule, watch } from 'vue';
 import CanvasEdgeToolbar from './CanvasEdgeToolbar.vue';
 import { getEdgeRenderData } from './utils';
+import { useCanvas } from '../../../composables/useCanvas';
+import { useZoomAdjustedValues } from '../../../composables/useZoomAdjustedValues';
 
 const emit = defineEmits<{
 	add: [connection: Connection];
@@ -27,6 +29,9 @@ const data = toRef(props, 'data');
 
 const $style = useCssModule();
 
+const { viewport } = useCanvas();
+const { calculateEdgeLightness } = useZoomAdjustedValues(viewport);
+
 const connectionType = computed(() =>
 	isValidNodeConnectionType(props.data.source.type)
 		? props.data.source.type
@@ -52,35 +57,17 @@ watch(
 	{ immediate: true },
 );
 
-const renderToolbar = computed(() => (props.selected || delayedHovered.value) && !props.readOnly);
+const renderToolbar = computed(() => delayedHovered.value && !props.readOnly);
 
 const isMainConnection = computed(() => data.value.source.type === NodeConnectionTypes.Main);
 
 const status = computed(() => props.data.status);
 
-const edgeColor = computed(() => {
-	if (status.value === 'success') {
-		return 'var(--color--success)';
-	} else if (status.value === 'pinned') {
-		return 'var(--color--secondary)';
-	} else if (!isMainConnection.value) {
-		return 'var(--node-type--supplemental--color)';
-	} else if (props.selected) {
-		return 'var(--color--background--shade-2)';
-	} else {
-		return 'var(--color--foreground--shade-2)';
-	}
-});
-
 const edgeStyle = computed(() => ({
 	...props.style,
-	...(isMainConnection.value ? {} : { strokeDasharray: '8,8' }),
+	...(isMainConnection.value ? {} : { strokeDasharray: '5,6' }),
 }));
 
-const edgeStroke = computed(() =>
-	delayedHovered.value ? 'var(--color--primary)' : edgeColor.value,
-);
-
 const edgeClasses = computed(() => ({
 	[$style.edge]: true,
 	hovered: delayedHovered.value,
@@ -116,6 +103,32 @@ const connection = computed<Connection>(() => ({
 	targetHandle: props.targetHandleId,
 }));
 
+const edgeColor = computed(() => {
+	if (status.value === 'success') {
+		return 'var(--color--success)';
+	} else if (status.value === 'pinned') {
+		return 'var(--color--secondary)';
+	}
+	return undefined;
+});
+
+// For colored edges (success/pinned), don't apply hover effect
+const hasColoredStatus = computed(() => status.value === 'success' || status.value === 'pinned');
+const hoveredForLightness = computed(() => (hasColoredStatus.value ? false : delayedHovered.value));
+
+const edgeLightness = calculateEdgeLightness(hoveredForLightness);
+
+const edgeStyles = computed(() => {
+	const styles: Record<string, string> = {
+		'--canvas-edge--color--lightness--light': edgeLightness.value.light,
+		'--canvas-edge--color--lightness--dark': edgeLightness.value.dark,
+	};
+	if (edgeColor.value) {
+		styles['--canvas-edge--color'] = edgeColor.value;
+	}
+	return styles;
+});
+
 function onAdd() {
 	emit('add', connection.value);
 }
@@ -138,6 +151,7 @@ function onEdgeLabelMouseLeave() {
 		data-test-id="edge"
 		:data-source-node-name="data.source?.node"
 		:data-target-node-name="data.target?.node"
+		:style="edgeStyles"
 		v-bind="$attrs"
 	>
 		<slot name="highlight" v-bind="{ segments }" />
@@ -149,7 +163,7 @@ function onEdgeLabelMouseLeave() {
 			:class="edgeClasses"
 			:style="edgeStyle"
 			:path="segment[0]"
-			:marker-end="markerEnd"
+			:marker-end="isMainConnection ? markerEnd : undefined"
 			:interaction-width="40"
 		/>
 	</g>
@@ -178,12 +192,16 @@ function onEdgeLabelMouseLeave() {
 
 <style lang="scss" module>
 .edge {
-	transition:
-		stroke 0.3s ease,
-		fill 0.3s ease;
+	transition: fill 0.3s ease;
 	// @bugfix cat-1639-connection-colors-not-rendering-correctly
 	// Using !important here to override BaseEdge styles after Rolldown Vite migration
-	stroke: var(--canvas-edge--color, v-bind(edgeStroke)) !important;
+	stroke: var(
+		--canvas-edge--color,
+		light-dark(
+			oklch(var(--canvas-edge--color--lightness--light) 0 0),
+			oklch(var(--canvas-edge--color--lightness--dark) 0 0)
+		)
+	) !important;
 	/* stylelint-disable-next-line @n8n/css-var-naming */
 	stroke-width: calc(2 * var(--canvas-zoom-compensation-factor, 1)) !important;
 	stroke-linecap: square;
@@ -205,13 +223,8 @@ function onEdgeLabelMouseLeave() {
 .edgeLabel {
 	/* stylelint-disable-next-line @n8n/css-var-naming */
 	transform: scale(var(--canvas-zoom-compensation-factor, 1)) translate(0, var(--label-translate-y));
-	color: var(--color--text);
+	color: var(--canvas--label--color);
 	font-size: var(--font-size--xs);
-	background-color: hsla(
-		var(--canvas--color--background--h),
-		var(--canvas--color--background--s),
-		var(--canvas--color--background--l),
-		0.85
-	);
+	background-color: var(--canvas--label--color--background);
 }
 </style>
diff --git a/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/edges/CanvasEdgeToolbar.vue b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/edges/CanvasEdgeToolbar.vue
index e62de898bb1..5ea5c6c1fd5 100644
--- a/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/edges/CanvasEdgeToolbar.vue
+++ b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/edges/CanvasEdgeToolbar.vue
@@ -73,22 +73,14 @@ function onDelete() {
 </style>
 
 <style lang="scss">
-@mixin dark-button-styles {
-	--button--color--background: var(--color--background);
-	--button--color--background--hover: var(--color--background--light-2);
-}
-
-@media (prefers-color-scheme: dark) {
-	body:not([data-theme]) .canvas-edge-toolbar-button {
-		@include dark-button-styles();
-	}
-}
-
-[data-theme='dark'] .canvas-edge-toolbar-button {
-	@include dark-button-styles();
-}
-
 .canvas-edge-toolbar-button {
-	border-width: 2px;
+	border-width: 0;
+	--button--color--text: light-dark(var(--color--neutral-700), var(--color--neutral-250));
+	--button--color--text--hover: light-dark(var(--color--neutral-850), var(--color--neutral-150));
+	--button--color--background: light-dark(var(--color--neutral-200), var(--color--neutral-850));
+	--button--color--background--hover: light-dark(
+		var(--color--neutral-250),
+		var(--color--neutral-800)
+	);
 }
 </style>
diff --git a/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/CanvasHandleRenderer.test.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/CanvasHandleRenderer.test.ts
index 8cb961ccfc2..d5fcd587ef6 100644
--- a/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/CanvasHandleRenderer.test.ts
+++ b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/CanvasHandleRenderer.test.ts
@@ -5,8 +5,15 @@ import { CanvasNodeHandleKey } from '@/app/constants';
 import { ref } from 'vue';
 import { CanvasConnectionMode, type CanvasElementPortWithRenderData } from '../../../canvas.types';
 import { Position } from '@vue-flow/core';
+import { createCanvasProvide } from '@/features/workflows/canvas/__tests__/utils';
 
-const renderComponent = createComponentRenderer(CanvasHandleRenderer);
+const renderComponent = createComponentRenderer(CanvasHandleRenderer, {
+	global: {
+		provide: {
+			...createCanvasProvide(),
+		},
+	},
+});
 
 const Handle = {
 	template: '<div><slot /></div>',
diff --git a/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/CanvasHandleRenderer.vue b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/CanvasHandleRenderer.vue
index 227595bf3f2..33027b406e0 100644
--- a/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/CanvasHandleRenderer.vue
+++ b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/CanvasHandleRenderer.vue
@@ -181,11 +181,8 @@ provide(CanvasNodeHandleKey, {
 	background: transparent;
 	border-radius: 0;
 
-	&.inputs {
-		&.main {
-			/* stylelint-disable-next-line @n8n/css-var-naming */
-			--handle--indicator--width: calc(8px * var(--canvas-zoom-compensation-factor, 1));
-		}
+	&.inputs.main {
+		cursor: default;
 	}
 }
 
diff --git a/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/CanvasHandleMainInput.test.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/CanvasHandleMainInput.test.ts
index 9fca66ddb17..404cd5bbe96 100644
--- a/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/CanvasHandleMainInput.test.ts
+++ b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/CanvasHandleMainInput.test.ts
@@ -1,6 +1,9 @@
 import CanvasHandleMainInput from './CanvasHandleMainInput.vue';
 import { createComponentRenderer } from '@/__tests__/render';
-import { createCanvasHandleProvide } from '@/features/workflows/canvas/__tests__/utils';
+import {
+	createCanvasHandleProvide,
+	createCanvasProvide,
+} from '@/features/workflows/canvas/__tests__/utils';
 
 const renderComponent = createComponentRenderer(CanvasHandleMainInput);
 
@@ -10,6 +13,7 @@ describe('CanvasHandleMainInput', () => {
 		const { container, getByText } = renderComponent({
 			global: {
 				provide: {
+					...createCanvasProvide(),
 					...createCanvasHandleProvide({ label }),
 				},
 			},
diff --git a/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/CanvasHandleMainInput.vue b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/CanvasHandleMainInput.vue
index ade713b652f..f17d2951dca 100644
--- a/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/CanvasHandleMainInput.vue
+++ b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/CanvasHandleMainInput.vue
@@ -1,11 +1,15 @@
 <script lang="ts" setup>
 import { useCanvasNodeHandle } from '../../../../composables/useCanvasNodeHandle';
 import { computed, useCssModule } from 'vue';
-import CanvasHandleRectangle from './parts/CanvasHandleRectangle.vue';
+import CanvasHandleDot from './parts/CanvasHandleDot.vue';
+import { useCanvas } from '../../../../composables/useCanvas';
+import { useZoomAdjustedValues } from '../../../../composables/useZoomAdjustedValues';
 
 const $style = useCssModule();
 
 const { label, isRequired } = useCanvasNodeHandle();
+const { viewport } = useCanvas();
+const { calculateHandleLightness } = useZoomAdjustedValues(viewport);
 
 const classes = computed(() => ({
 	'canvas-node-handle-main-input': true,
@@ -13,12 +17,19 @@ const classes = computed(() => ({
 	[$style.required]: isRequired.value,
 }));
 
+const handleLightness = calculateHandleLightness();
+
+const handleStyles = computed(() => ({
+	'--handle--border--lightness--light': handleLightness.value.light,
+	'--handle--border--lightness--dark': handleLightness.value.dark,
+}));
+
 const handleClasses = 'target';
 </script>
 <template>
 	<div :class="classes">
 		<div :class="[$style.label]">{{ label }}</div>
-		<CanvasHandleRectangle :handle-classes="handleClasses" />
+		<CanvasHandleDot :handle-classes="handleClasses" :style="handleStyles" />
 	</div>
 </template>
 
diff --git a/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/CanvasHandleMainOutput.test.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/CanvasHandleMainOutput.test.ts
index dbd55838b8b..ab07c55e842 100644
--- a/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/CanvasHandleMainOutput.test.ts
+++ b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/CanvasHandleMainOutput.test.ts
@@ -1,8 +1,17 @@
 import CanvasHandleMainOutput from './CanvasHandleMainOutput.vue';
 import { createComponentRenderer } from '@/__tests__/render';
-import { createCanvasHandleProvide } from '@/features/workflows/canvas/__tests__/utils';
+import {
+	createCanvasHandleProvide,
+	createCanvasProvide,
+} from '@/features/workflows/canvas/__tests__/utils';
 
-const renderComponent = createComponentRenderer(CanvasHandleMainOutput);
+const renderComponent = createComponentRenderer(CanvasHandleMainOutput, {
+	global: {
+		provide: {
+			...createCanvasProvide(),
+		},
+	},
+});
 
 describe('CanvasHandleMainOutput', () => {
 	it('should render correctly', async () => {
diff --git a/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/CanvasHandleMainOutput.vue b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/CanvasHandleMainOutput.vue
index 450b0fddccd..527f955ff46 100644
--- a/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/CanvasHandleMainOutput.vue
+++ b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/CanvasHandleMainOutput.vue
@@ -6,6 +6,8 @@ import type { CanvasNodeDefaultRender } from '../../../../canvas.types';
 import { useI18n } from '@n8n/i18n';
 import CanvasHandleDot from './parts/CanvasHandleDot.vue';
 import CanvasHandlePlus from './parts/CanvasHandlePlus.vue';
+import { useCanvas } from '../../../../composables/useCanvas';
+import { useZoomAdjustedValues } from '../../../../composables/useZoomAdjustedValues';
 
 const emit = defineEmits<{
 	add: [];
@@ -16,6 +18,8 @@ const $style = useCssModule();
 const i18n = useI18n();
 const { render } = useCanvasNode();
 const { label, isConnected, isConnecting, isReadOnly, isRequired, runData } = useCanvasNodeHandle();
+const { viewport } = useCanvas();
+const { calculateHandleLightness } = useZoomAdjustedValues(viewport);
 
 const handleClasses = 'source';
 
@@ -64,6 +68,13 @@ const runDataLabelClasses = computed(() => ({
 	[$style.runDataLabel]: true,
 }));
 
+const handleLightness = calculateHandleLightness();
+
+const handleStyles = computed(() => ({
+	'--handle--border--lightness--light': handleLightness.value.light,
+	'--handle--border--lightness--dark': handleLightness.value.dark,
+}));
+
 function onMouseEnter() {
 	isHovered.value = true;
 }
@@ -80,7 +91,7 @@ function onClickAdd() {
 	<div :class="classes">
 		<div v-if="label" :class="outputLabelClasses">{{ label }}</div>
 		<div v-if="runData" :class="runDataLabelClasses">{{ runDataLabel }}</div>
-		<CanvasHandleDot :handle-classes="handleClasses" />
+		<CanvasHandleDot :handle-classes="handleClasses" :style="handleStyles" />
 		<Transition name="canvas-node-handle-main-output">
 			<CanvasHandlePlus
 				v-if="!isConnected && !isReadOnly"
@@ -131,7 +142,7 @@ function onClickAdd() {
 	transform: translate(0, -50%) scale(var(--canvas-zoom-compensation-factor, 1));
 	transform-origin: center left;
 	font-size: var(--font-size--2xs);
-	color: var(--color--foreground--shade-2);
+	color: var(--canvas--label--color);
 }
 
 .runDataLabel {
diff --git a/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/CanvasHandleNonMainInput.test.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/CanvasHandleNonMainInput.test.ts
index 71652d9bf52..9607f16ebeb 100644
--- a/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/CanvasHandleNonMainInput.test.ts
+++ b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/CanvasHandleNonMainInput.test.ts
@@ -1,6 +1,9 @@
 import CanvasHandleNonMainInput from './CanvasHandleNonMainInput.vue';
 import { createComponentRenderer } from '@/__tests__/render';
-import { createCanvasHandleProvide } from '@/features/workflows/canvas/__tests__/utils';
+import {
+	createCanvasHandleProvide,
+	createCanvasProvide,
+} from '@/features/workflows/canvas/__tests__/utils';
 
 const renderComponent = createComponentRenderer(CanvasHandleNonMainInput);
 
@@ -10,6 +13,7 @@ describe('CanvasHandleNonMainInput', () => {
 		const { container, getByText } = renderComponent({
 			global: {
 				provide: {
+					...createCanvasProvide(),
 					...createCanvasHandleProvide({ label }),
 				},
 			},
diff --git a/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/CanvasHandleNonMainInput.vue b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/CanvasHandleNonMainInput.vue
index b3d62395ad1..c3860795b86 100644
--- a/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/CanvasHandleNonMainInput.vue
+++ b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/CanvasHandleNonMainInput.vue
@@ -3,6 +3,8 @@ import CanvasHandlePlus from './parts/CanvasHandlePlus.vue';
 import { useCanvasNodeHandle } from '../../../../composables/useCanvasNodeHandle';
 import { computed, ref, useCssModule } from 'vue';
 import CanvasHandleDiamond from './parts/CanvasHandleDiamond.vue';
+import { useCanvas } from '../../../../composables/useCanvas';
+import { useZoomAdjustedValues } from '../../../../composables/useZoomAdjustedValues';
 
 const emit = defineEmits<{
 	add: [];
@@ -11,6 +13,8 @@ const emit = defineEmits<{
 const $style = useCssModule();
 
 const { label, isConnected, isConnecting, isRequired, maxConnections } = useCanvasNodeHandle();
+const { viewport } = useCanvas();
+const { calculateHandleLightness } = useZoomAdjustedValues(viewport);
 
 const handleClasses = 'target';
 
@@ -28,6 +32,13 @@ const isHandlePlusVisible = computed(
 	() => !isConnecting.value || isHovered.value || !maxConnections.value || maxConnections.value > 1,
 );
 
+const handleLightness = calculateHandleLightness();
+
+const handleStyles = computed(() => ({
+	'--handle--border--lightness--light': handleLightness.value.light,
+	'--handle--border--lightness--dark': handleLightness.value.dark,
+}));
+
 const isHovered = ref(false);
 
 function onMouseEnter() {
@@ -45,7 +56,7 @@ function onClickAdd() {
 <template>
 	<div :class="classes">
 		<div :class="[$style.label]">{{ label }}</div>
-		<CanvasHandleDiamond :handle-classes="handleClasses" />
+		<CanvasHandleDiamond :handle-classes="handleClasses" :style="handleStyles" />
 		<Transition name="canvas-node-handle-non-main-input">
 			<CanvasHandlePlus
 				v-if="isHandlePlusAvailable"
@@ -76,7 +87,7 @@ function onClickAdd() {
 	/* stylelint-disable-next-line @n8n/css-var-naming */
 	transform: translate(-50%, 0) scale(var(--canvas-zoom-compensation-factor, 1));
 	font-size: var(--font-size--2xs);
-	color: var(--node-type--supplemental--color);
+	color: var(--canvas--label--color);
 	background: var(--canvas--label--color--background);
 	z-index: 1;
 	text-align: center;
diff --git a/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/CanvasHandleNonMainOutput.test.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/CanvasHandleNonMainOutput.test.ts
index bce53daa80d..451d2422d04 100644
--- a/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/CanvasHandleNonMainOutput.test.ts
+++ b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/CanvasHandleNonMainOutput.test.ts
@@ -1,6 +1,9 @@
 import CanvasHandleNonMainOutput from './CanvasHandleNonMainOutput.vue';
 import { createComponentRenderer } from '@/__tests__/render';
-import { createCanvasHandleProvide } from '@/features/workflows/canvas/__tests__/utils';
+import {
+	createCanvasHandleProvide,
+	createCanvasProvide,
+} from '@/features/workflows/canvas/__tests__/utils';
 
 const renderComponent = createComponentRenderer(CanvasHandleNonMainOutput);
 
@@ -10,6 +13,7 @@ describe('CanvasHandleNonMainOutput', () => {
 		const { container, getByText } = renderComponent({
 			global: {
 				provide: {
+					...createCanvasProvide(),
 					...createCanvasHandleProvide({ label }),
 				},
 			},
diff --git a/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/CanvasHandleNonMainOutput.vue b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/CanvasHandleNonMainOutput.vue
index 3fe414a9a91..a17cddb492a 100644
--- a/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/CanvasHandleNonMainOutput.vue
+++ b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/CanvasHandleNonMainOutput.vue
@@ -2,9 +2,13 @@
 import { useCanvasNodeHandle } from '../../../../composables/useCanvasNodeHandle';
 import { computed, useCssModule } from 'vue';
 import CanvasHandleDiamond from './parts/CanvasHandleDiamond.vue';
+import { useCanvas } from '../../../../composables/useCanvas';
+import { useZoomAdjustedValues } from '../../../../composables/useZoomAdjustedValues';
 
 const $style = useCssModule();
 const { label, isRequired } = useCanvasNodeHandle();
+const { viewport } = useCanvas();
+const { calculateHandleLightness } = useZoomAdjustedValues(viewport);
 
 const handleClasses = 'source';
 
@@ -13,11 +17,18 @@ const classes = computed(() => ({
 	[$style.handle]: true,
 	[$style.required]: isRequired.value,
 }));
+
+const handleLightness = calculateHandleLightness();
+
+const handleStyles = computed(() => ({
+	'--handle--border--lightness--light': handleLightness.value.light,
+	'--handle--border--lightness--dark': handleLightness.value.dark,
+}));
 </script>
 <template>
 	<div :class="classes">
 		<div :class="$style.label">{{ label }}</div>
-		<CanvasHandleDiamond :handle-classes="handleClasses" />
+		<CanvasHandleDiamond :handle-classes="handleClasses" :style="handleStyles" />
 	</div>
 </template>
 
@@ -36,7 +47,7 @@ const classes = computed(() => ({
 	/* stylelint-disable-next-line @n8n/css-var-naming */
 	transform: translate(-50%, 0) scale(var(--canvas-zoom-compensation-factor, 1));
 	font-size: var(--font-size--2xs);
-	color: var(--node-type--supplemental--color);
+	color: var(--canvas--label--color);
 	background: var(--canvas--label--color--background);
 	z-index: 0;
 	white-space: nowrap;
diff --git a/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/parts/CanvasHandleDiamond.vue b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/parts/CanvasHandleDiamond.vue
index 83f939668dc..18e682e8b9e 100644
--- a/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/parts/CanvasHandleDiamond.vue
+++ b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/parts/CanvasHandleDiamond.vue
@@ -10,18 +10,37 @@ withDefaults(
 </script>
 
 <template>
-	<div :class="[$style.diamond, handleClasses]" />
+	<div :class="$style.wrapper">
+		<div :class="[$style.diamond, handleClasses]" />
+	</div>
 </template>
 
 <style lang="scss" module>
+.wrapper {
+	position: relative;
+	padding: 4px;
+	margin: -4px;
+}
+
 .diamond {
 	width: var(--handle--indicator--width);
 	height: var(--handle--indicator--height);
-	background: var(--node-type--supplemental--color);
+	background: light-dark(var(--color--neutral-white), var(--color--neutral-850));
+	border: 1px solid
+		light-dark(
+			oklch(var(--handle--border--lightness--light, 0.68) 0 0),
+			oklch(var(--handle--border--lightness--dark, 0.5) 0 0)
+		);
 	transform: rotate(45deg) scale(0.8);
+	transition:
+		transform 0.2s ease,
+		background 0.2s ease,
+		border-width 0.1s ease;
 
-	&:hover {
-		background: var(--color--primary);
+	.wrapper:hover & {
+		border: 1.5px solid light-dark(var(--color--neutral-300), var(--color--neutral-300));
+		background: light-dark(var(--color--neutral-100), var(--color--neutral-700));
+		transform: rotate(45deg) scale(1.2);
 	}
 }
 </style>
diff --git a/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/parts/CanvasHandleDot.vue b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/parts/CanvasHandleDot.vue
index da9bf599336..a7c1f58dc8f 100644
--- a/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/parts/CanvasHandleDot.vue
+++ b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/parts/CanvasHandleDot.vue
@@ -1,5 +1,7 @@
 <script lang="ts" setup>
-withDefaults(
+import { computed } from 'vue';
+
+const props = withDefaults(
 	defineProps<{
 		handleClasses?: string;
 	}>(),
@@ -7,21 +9,47 @@ withDefaults(
 		handleClasses: undefined,
 	},
 );
+
+const isOutputHandle = computed(() => props.handleClasses === 'source');
 </script>
 
 <template>
-	<div :class="[$style.dot, handleClasses]" />
+	<div :class="[$style.wrapper, { [$style.output]: isOutputHandle }]">
+		<div :class="[$style.dot, handleClasses]" />
+	</div>
 </template>
 
 <style lang="scss" module>
+.wrapper {
+	position: relative;
+	padding: 4px;
+	margin: -4px;
+	z-index: 2;
+
+	&.output {
+		cursor: crosshair;
+	}
+}
+
 .dot {
 	width: var(--handle--indicator--width);
 	height: var(--handle--indicator--height);
 	border-radius: 50%;
-	background: var(--color--foreground--shade-2);
+	background: light-dark(var(--color--neutral-white), var(--color--neutral-850));
+	border: 1px solid
+		light-dark(
+			oklch(var(--handle--border--lightness--light, 0.68) 0 0),
+			oklch(var(--handle--border--lightness--dark, 0.5) 0 0)
+		);
+	transition:
+		transform 0.2s ease,
+		background 0.2s ease,
+		border-width 0.1s ease;
 
-	&:hover {
-		background: var(--color--primary);
+	.wrapper.output:hover & {
+		border: 1.5px solid light-dark(var(--color--neutral-300), var(--color--neutral-300));
+		background: light-dark(var(--color--neutral-100), var(--color--neutral-700));
+		transform: scale(1.5);
 	}
 }
 </style>
diff --git a/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/parts/CanvasHandlePlus.test.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/parts/CanvasHandlePlus.test.ts
index f5a04b21016..0b812ca76e5 100644
--- a/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/parts/CanvasHandlePlus.test.ts
+++ b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/parts/CanvasHandlePlus.test.ts
@@ -1,11 +1,15 @@
 import { fireEvent } from '@testing-library/vue';
 import CanvasHandlePlus from './CanvasHandlePlus.vue';
 import { createComponentRenderer } from '@/__tests__/render';
-import { createCanvasHandleProvide } from '@/features/workflows/canvas/__tests__/utils';
+import {
+	createCanvasHandleProvide,
+	createCanvasProvide,
+} from '@/features/workflows/canvas/__tests__/utils';
 
 const renderComponent = createComponentRenderer(CanvasHandlePlus, {
 	global: {
 		provide: {
+			...createCanvasProvide(),
 			...createCanvasHandleProvide(),
 		},
 	},
diff --git a/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/parts/CanvasHandlePlus.vue b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/parts/CanvasHandlePlus.vue
index 06d8d840c9a..8f081ed7821 100644
--- a/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/parts/CanvasHandlePlus.vue
+++ b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/parts/CanvasHandlePlus.vue
@@ -1,5 +1,7 @@
 <script lang="ts" setup>
 import { computed, useCssModule } from 'vue';
+import { useCanvas } from '../../../../../composables/useCanvas';
+import { useZoomAdjustedValues } from '../../../../../composables/useZoomAdjustedValues';
 
 const props = withDefaults(
 	defineProps<{
@@ -18,6 +20,11 @@ const props = withDefaults(
 	},
 );
 
+const { viewport } = useCanvas();
+const { calculateEdgeLightness } = useZoomAdjustedValues(viewport);
+
+const lineLightness = calculateEdgeLightness();
+
 const emit = defineEmits<{
 	'click:plus': [event: MouseEvent];
 }>();
@@ -51,6 +58,8 @@ const viewBox = computed(() => {
 const styles = computed(() => ({
 	width: `${viewBox.value.width}px`,
 	height: `${viewBox.value.height}px`,
+	'--canvas-handle-plus-line--color--lightness--light': lineLightness.value.light,
+	'--canvas-handle-plus-line--color--lightness--dark': lineLightness.value.dark,
 }));
 
 const linePosition = computed(() => {
@@ -109,7 +118,6 @@ function onClick(event: MouseEvent) {
 			:y1="linePosition[0][1]"
 			:x2="linePosition[1][0]"
 			:y2="linePosition[1][1]"
-			stroke="var(--color--foreground--shade-2)"
 			stroke-width="2"
 		/>
 		<g
@@ -124,13 +132,14 @@ function onClick(event: MouseEvent) {
 				y="2"
 				width="20"
 				height="20"
-				stroke="var(--color--foreground--shade-2)"
+				stroke="light-dark(var(--color--neutral-200), var(--color--neutral-850))"
 				stroke-width="2"
 				rx="4"
-				fill="var(--color--foreground--tint-2)"
+				fill="light-dark(var(--color--neutral-200), var(--color--neutral-850))"
 			/>
 			<path
 				stroke="currentColor"
+				stroke-width="1.5"
 				stroke-linecap="round"
 				stroke-linejoin="round"
 				d="M8 12h8m-4-4v8"
@@ -154,20 +163,11 @@ function onClick(event: MouseEvent) {
 		transform-origin: top center;
 	}
 
-	&.secondary {
-		.line {
-			stroke: var(--node-type--supplemental--color);
-		}
-
-		.plus {
-			path {
-				fill: var(--node-type--supplemental--color);
-			}
-
-			rect {
-				stroke: var(--node-type--supplemental--color);
-			}
-		}
+	.line {
+		stroke: light-dark(
+			oklch(var(--canvas-handle-plus-line--color--lightness--light) 0 0),
+			oklch(var(--canvas-handle-plus-line--color--lightness--dark) 0 0)
+		);
 	}
 
 	&.success {
@@ -177,15 +177,19 @@ function onClick(event: MouseEvent) {
 	}
 
 	.plus {
+		color: light-dark(var(--color--neutral-700), var(--color--neutral-250));
+
 		&:hover {
 			cursor: pointer;
+			color: light-dark(var(--color--neutral-850), var(--color--neutral-150));
 
 			path {
-				fill: var(--color--primary);
+				fill: light-dark(var(--color--neutral-250), var(--color--neutral-800));
 			}
 
 			rect {
-				stroke: var(--color--primary);
+				stroke: light-dark(var(--color--neutral-250), var(--color--neutral-800));
+				fill: light-dark(var(--color--neutral-250), var(--color--neutral-800));
 			}
 		}
 	}
diff --git a/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/parts/CanvasHandleRectangle.test.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/parts/CanvasHandleRectangle.test.ts
deleted file mode 100644
index 3c1787406e6..00000000000
--- a/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/parts/CanvasHandleRectangle.test.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import CanvasHandleRectangle from './CanvasHandleRectangle.vue';
-import { createComponentRenderer } from '@/__tests__/render';
-
-const renderComponent = createComponentRenderer(CanvasHandleRectangle, {});
-
-describe('CanvasHandleRectangle', () => {
-	it('should render with default props', () => {
-		const { html } = renderComponent();
-
-		expect(html()).toMatchSnapshot();
-	});
-
-	it('should apply `handleClasses` prop correctly', () => {
-		const customClass = 'custom-handle-class';
-		const wrapper = renderComponent({
-			props: { handleClasses: customClass },
-		});
-
-		expect(wrapper.container.querySelector(`.${customClass}`)).toBeTruthy();
-	});
-});
diff --git a/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/parts/CanvasHandleRectangle.vue b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/parts/CanvasHandleRectangle.vue
deleted file mode 100644
index 8d2cd591e18..00000000000
--- a/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/parts/CanvasHandleRectangle.vue
+++ /dev/null
@@ -1,26 +0,0 @@
-<script lang="ts" setup>
-withDefaults(
-	defineProps<{
-		handleClasses?: string;
-	}>(),
-	{
-		handleClasses: undefined,
-	},
-);
-</script>
-
-<template>
-	<div :class="[$style.rectangle, handleClasses]" />
-</template>
-
-<style lang="scss" module>
-.rectangle {
-	width: var(--handle--indicator--width);
-	height: var(--handle--indicator--height);
-	background: var(--color--foreground--shade-2);
-
-	&:hover {
-		background: var(--color--primary);
-	}
-}
-</style>
diff --git a/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/parts/__snapshots__/CanvasHandleDiamond.test.ts.snap b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/parts/__snapshots__/CanvasHandleDiamond.test.ts.snap
index 3dc8244f8fa..fac9815aef8 100644
--- a/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/parts/__snapshots__/CanvasHandleDiamond.test.ts.snap
+++ b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/parts/__snapshots__/CanvasHandleDiamond.test.ts.snap
@@ -1,3 +1,7 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`CanvasHandleDiamond > should render with default props 1`] = `"<div class="diamond"></div>"`;
+exports[`CanvasHandleDiamond > should render with default props 1`] = `
+"<div class="wrapper">
+  <div class="diamond"></div>
+</div>"
+`;
diff --git a/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/parts/__snapshots__/CanvasHandleDot.test.ts.snap b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/parts/__snapshots__/CanvasHandleDot.test.ts.snap
index a902ea6fe9b..1514940690e 100644
--- a/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/parts/__snapshots__/CanvasHandleDot.test.ts.snap
+++ b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/parts/__snapshots__/CanvasHandleDot.test.ts.snap
@@ -1,3 +1,7 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`CanvasHandleDot > should render with default props 1`] = `"<div class="dot"></div>"`;
+exports[`CanvasHandleDot > should render with default props 1`] = `
+"<div class="wrapper">
+  <div class="dot"></div>
+</div>"
+`;
diff --git a/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/parts/__snapshots__/CanvasHandlePlus.test.ts.snap b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/parts/__snapshots__/CanvasHandlePlus.test.ts.snap
index 20a0645f51e..649e3255b76 100644
--- a/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/parts/__snapshots__/CanvasHandlePlus.test.ts.snap
+++ b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/parts/__snapshots__/CanvasHandlePlus.test.ts.snap
@@ -1,11 +1,11 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`CanvasHandlePlus > should render with default props 1`] = `
-"<svg data-test-id="canvas-handle-plus-wrapper" class="canvas-handle-plus-wrapper wrapper right default" viewBox="0 0 70 24" style="width: 70px; height: 24px;">
-  <line class="line" x1="0" y1="12" x2="47" y2="12" stroke="var(--color--foreground--shade-2)" stroke-width="2"></line>
+"<svg data-test-id="canvas-handle-plus-wrapper" class="canvas-handle-plus-wrapper wrapper right default" viewBox="0 0 70 24" style="width: 70px; height: 24px; --canvas-handle-plus-line--color--lightness--light: 0.840; --canvas-handle-plus-line--color--lightness--dark: 0.420;">
+  <line class="line" x1="0" y1="12" x2="47" y2="12" stroke-width="2"></line>
   <g data-test-id="canvas-handle-plus" class="plus clickable" transform="translate(46, 0)">
-    <rect class="clickable" x="2" y="2" width="20" height="20" stroke="var(--color--foreground--shade-2)" stroke-width="2" rx="4" fill="var(--color--foreground--tint-2)"></rect>
-    <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M8 12h8m-4-4v8" class="source clickable"></path>
+    <rect class="clickable" x="2" y="2" width="20" height="20" stroke="light-dark(var(--color--neutral-200), var(--color--neutral-850))" stroke-width="2" rx="4" fill="light-dark(var(--color--neutral-200), var(--color--neutral-850))"></rect>
+    <path stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" d="M8 12h8m-4-4v8" class="source clickable"></path>
   </g>
 </svg>"
 `;
diff --git a/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/parts/__snapshots__/CanvasHandleRectangle.test.ts.snap b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/parts/__snapshots__/CanvasHandleRectangle.test.ts.snap
deleted file mode 100644
index 7ceb9283702..00000000000
--- a/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/handles/render-types/parts/__snapshots__/CanvasHandleRectangle.test.ts.snap
+++ /dev/null
@@ -1,3 +0,0 @@
-// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
-
-exports[`CanvasHandleRectangle > should render with default props 1`] = `"<div class="rectangle"></div>"`;
diff --git a/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/CanvasNode.vue b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/CanvasNode.vue
index a49f52a281b..afea1af944f 100644
--- a/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/CanvasNode.vue
+++ b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/CanvasNode.vue
@@ -102,6 +102,8 @@ const classes = computed(() => ({
 	[style.showToolbar]: showToolbar.value,
 	hovered: props.hovered,
 	selected: props.selected,
+	waiting: props.data.execution.waiting || props.data.execution.status === 'waiting',
+	running: props.data.execution.running || props.data.execution.waitingForNext,
 	...Object.fromEntries([...nodeClasses.value].map((c) => [c, true])),
 }));
 
diff --git a/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/render-types/CanvasNodeDefault.vue b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/render-types/CanvasNodeDefault.vue
index cca9cc4d5e8..824e1c20124 100644
--- a/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/render-types/CanvasNodeDefault.vue
+++ b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/render-types/CanvasNodeDefault.vue
@@ -5,6 +5,7 @@ import { useI18n } from '@n8n/i18n';
 import { useCanvasNode } from '../../../../composables/useCanvasNode';
 import type { CanvasNodeDefaultRender } from '../../../../canvas.types';
 import { useCanvas } from '../../../../composables/useCanvas';
+import { useZoomAdjustedValues } from '../../../../composables/useZoomAdjustedValues';
 import CanvasNodeSettingsIcons from './parts/CanvasNodeSettingsIcons.vue';
 import { useNodeHelpers } from '@/app/composables/useNodeHelpers';
 import { calculateNodeSize } from '@/app/utils/nodeViewUtils';
@@ -25,6 +26,7 @@ const emit = defineEmits<{
 }>();
 
 const { initialized, viewport, isExperimentalNdvActive } = useCanvas();
+const { calculateNodeBorderOpacity } = useZoomAdjustedValues(viewport);
 const route = useRoute();
 const {
 	id,
@@ -66,12 +68,14 @@ const classes = computed(() => {
 		[$style.success]: hasRunData.value && executionStatus.value === 'success',
 		[$style.error]: hasExecutionErrors.value,
 		[$style.pinned]: hasPinnedData.value,
-		[$style.waiting]: executionWaiting.value ?? executionStatus.value === 'waiting',
+		[$style.waiting]: executionWaiting.value || executionStatus.value === 'waiting',
 		[$style.running]: executionRunning.value || executionWaitingForNext.value,
 		[$style.configurable]: renderOptions.value.configurable,
 		[$style.configuration]: renderOptions.value.configuration,
 		[$style.trigger]: renderOptions.value.trigger,
 		[$style.warning]: renderOptions.value.dirtiness !== undefined,
+		waiting: executionWaiting.value || executionStatus.value === 'waiting',
+		running: executionRunning.value || executionWaitingForNext.value,
 	};
 });
 
@@ -88,10 +92,14 @@ const nodeSize = computed(() =>
 	),
 );
 
+const nodeBorderOpacity = calculateNodeBorderOpacity();
+
 const styles = computed(() => ({
 	'--canvas-node--width': `${nodeSize.value.width}px`,
 	'--canvas-node--height': `${nodeSize.value.height}px`,
 	'--node--icon--size': `${iconSize.value}px`,
+	'--canvas-node--border--opacity-light': nodeBorderOpacity.value.light,
+	'--canvas-node--border--opacity-dark': nodeBorderOpacity.value.dark,
 }));
 
 const dataTestId = computed(() => {
@@ -190,7 +198,7 @@ function onActivate(event: MouseEvent) {
 
 <style lang="scss" module>
 .node {
-	--canvas-node--border-width: 2px;
+	--canvas-node--border-width: 1.5px;
 	--trigger-node--radius: 36px;
 	--canvas-node--status-icons--margin: var(--spacing--3xs);
 	--node--icon--color: var(--color--foreground--shade-1);
@@ -202,8 +210,19 @@ function onActivate(event: MouseEvent) {
 	align-items: center;
 	justify-content: center;
 	background: var(--canvas-node--color--background, var(--node--color--background));
+	background-clip: padding-box;
 	border: var(--canvas-node--border-width) solid
-		var(--canvas-node--border-color, var(--color--foreground--shade-2));
+		var(
+			--canvas-node--border-color,
+			light-dark(
+				oklch(
+					from var(--color--neutral-black) l c h / var(--canvas-node--border--opacity-light, 0.1)
+				),
+				oklch(
+					from var(--color--neutral-white) l c h / var(--canvas-node--border--opacity-dark, 0.15)
+				)
+			)
+		);
 	border-radius: var(--radius--lg);
 
 	&.trigger {
@@ -216,14 +235,13 @@ function onActivate(event: MouseEvent) {
 	 */
 
 	&.configuration {
-		background: var(
-			--canvas-node--color--background,
-			var(--node-type--supplemental--color--background)
-		);
-		border: var(--canvas-node--border-width) solid
-			var(--canvas-node--border-color, var(--color--foreground--shade-1));
 		border-radius: calc(var(--canvas-node--height) / 2);
 
+		&.running::after,
+		&.waiting::after {
+			border-radius: 50%;
+		}
+
 		.statusIcons {
 			right: unset;
 		}
@@ -282,11 +300,12 @@ function onActivate(event: MouseEvent) {
 
 	&.selected {
 		/* stylelint-disable-next-line @n8n/css-var-naming */
-		box-shadow: 0 0 0 calc(8px * var(--canvas-zoom-compensation-factor, 1))
+		box-shadow: 0 0 0 calc(6px * var(--canvas-zoom-compensation-factor, 1))
 			var(--canvas--color--selected-transparent);
 	}
 
 	&.success {
+		--canvas-node--border-width: 2px;
 		--canvas-node--border-color: var(
 			--color-canvas-node-success-border-color,
 			var(--color--success)
@@ -294,6 +313,7 @@ function onActivate(event: MouseEvent) {
 	}
 
 	&.warning {
+		--canvas-node--border-width: 2px;
 		--canvas-node--border-color: var(--color--warning);
 	}
 
@@ -302,6 +322,7 @@ function onActivate(event: MouseEvent) {
 	}
 
 	&.pinned {
+		--canvas-node--border-width: 2px;
 		--canvas-node--border-color: var(
 			--color-canvas-node-pinned-border-color,
 			var(--node--border-color--pinned)
@@ -316,7 +337,7 @@ function onActivate(event: MouseEvent) {
 	}
 
 	&.running {
-		background-color: var(--node--color--background--executing);
+		border-color: transparent;
 		--canvas-node--border-color: var(
 			--color-canvas-node-running-border-color,
 			var(--node--border-color--running)
@@ -324,13 +345,52 @@ function onActivate(event: MouseEvent) {
 	}
 
 	&.waiting {
-		--canvas-node--border-color: var(
-			--color-canvas-node-waiting-border-color,
-			var(--color--secondary)
-		);
+		--canvas-node--border-color: transparent;
 	}
 }
 
+/* stylelint-disable */
+.running::after,
+.waiting::after {
+	content: '';
+	position: absolute;
+	inset: -3px;
+	border-radius: 10px;
+	z-index: -1;
+	background: conic-gradient(
+		from var(--node--gradient-angle),
+		rgba(255, 109, 90, 1),
+		rgba(255, 109, 90, 1) 20%,
+		rgba(255, 109, 90, 0.2) 35%,
+		rgba(255, 109, 90, 0.2) 65%,
+		rgba(255, 109, 90, 1) 90%,
+		rgba(255, 109, 90, 1)
+	);
+}
+
+.running::after {
+	animation: border-rotate 1.5s linear infinite;
+}
+.waiting::after {
+	animation: border-rotate 4.5s linear infinite;
+}
+
+@property --node--gradient-angle {
+	syntax: '<angle>';
+	initial-value: 0deg;
+	inherits: false;
+}
+
+@keyframes border-rotate {
+	from {
+		--node--gradient-angle: 0deg;
+	}
+	to {
+		--node--gradient-angle: 360deg;
+	}
+}
+/* stylelint-enable */
+
 .description {
 	top: 100%;
 	position: absolute;
diff --git a/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/render-types/__snapshots__/CanvasNodeDefault.test.ts.snap b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/render-types/__snapshots__/CanvasNodeDefault.test.ts.snap
index dd0114f5317..b6fb092007a 100644
--- a/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/render-types/__snapshots__/CanvasNodeDefault.test.ts.snap
+++ b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/render-types/__snapshots__/CanvasNodeDefault.test.ts.snap
@@ -4,7 +4,7 @@ exports[`CanvasNodeDefault > configurable > should render configurable node corr
 <div
   class="node configurable"
   data-test-id="canvas-configurable-node"
-  style="--canvas-node--width: 224px; --canvas-node--height: 96px; --node--icon--size: 40px;"
+  style="--canvas-node--width: 224px; --canvas-node--height: 96px; --node--icon--size: 40px; --canvas-node--border--opacity-light: 0.100; --canvas-node--border--opacity-dark: 0.200;"
 >
   <!--v-if-->
   <node-icon-stub
@@ -45,7 +45,7 @@ exports[`CanvasNodeDefault > configuration > should render configurable configur
 <div
   class="node configurable configuration"
   data-test-id="canvas-configurable-node"
-  style="--canvas-node--width: 240px; --canvas-node--height: 80px; --node--icon--size: 30px;"
+  style="--canvas-node--width: 240px; --canvas-node--height: 80px; --node--icon--size: 30px; --canvas-node--border--opacity-light: 0.100; --canvas-node--border--opacity-dark: 0.200;"
 >
   <!--v-if-->
   <node-icon-stub
@@ -79,7 +79,7 @@ exports[`CanvasNodeDefault > configuration > should render configuration node co
 <div
   class="node configuration"
   data-test-id="canvas-configuration-node"
-  style="--canvas-node--width: 80px; --canvas-node--height: 80px; --node--icon--size: 30px;"
+  style="--canvas-node--width: 80px; --canvas-node--height: 80px; --node--icon--size: 30px; --canvas-node--border--opacity-light: 0.100; --canvas-node--border--opacity-dark: 0.200;"
 >
   <!--v-if-->
   <node-icon-stub
@@ -113,7 +113,7 @@ exports[`CanvasNodeDefault > should render node correctly 1`] = `
 <div
   class="node"
   data-test-id="canvas-default-node"
-  style="--canvas-node--width: 96px; --canvas-node--height: 96px; --node--icon--size: 40px;"
+  style="--canvas-node--width: 96px; --canvas-node--height: 96px; --node--icon--size: 40px; --canvas-node--border--opacity-light: 0.100; --canvas-node--border--opacity-dark: 0.200;"
 >
   <!--v-if-->
   <node-icon-stub
@@ -154,7 +154,7 @@ exports[`CanvasNodeDefault > trigger > should render trigger node correctly 1`]
 <div
   class="node trigger"
   data-test-id="canvas-trigger-node"
-  style="--canvas-node--width: 96px; --canvas-node--height: 96px; --node--icon--size: 40px;"
+  style="--canvas-node--width: 96px; --canvas-node--height: 96px; --node--icon--size: 40px; --canvas-node--border--opacity-light: 0.100; --canvas-node--border--opacity-dark: 0.200;"
 >
   <!--v-if-->
   <node-icon-stub
diff --git a/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/render-types/parts/CanvasNodeStatusIcons.test.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/render-types/parts/CanvasNodeStatusIcons.test.ts
index 875caa6cbdb..ae27e13f5c1 100644
--- a/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/render-types/parts/CanvasNodeStatusIcons.test.ts
+++ b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/render-types/parts/CanvasNodeStatusIcons.test.ts
@@ -62,38 +62,6 @@ describe('CanvasNodeStatusIcons', () => {
 		expect(queryByTestId('canvas-node-status-pinned')).not.toBeInTheDocument();
 	});
 
-	describe('executing', () => {
-		it('should not show node as executing if workflow is not executing', () => {
-			const { getByTestId } = renderComponent({
-				global: {
-					provide: {
-						...createCanvasProvide({
-							isExecuting: false,
-						}),
-						...createCanvasNodeProvide({ data: { execution: { running: true } } }),
-					},
-				},
-			});
-
-			expect(() => getByTestId('canvas-node-status-running')).toThrow();
-		});
-
-		it('should render running node correctly', () => {
-			const { getByTestId } = renderComponent({
-				global: {
-					provide: {
-						...createCanvasProvide({
-							isExecuting: true,
-						}),
-						...createCanvasNodeProvide({ data: { execution: { running: true } } }),
-					},
-				},
-			});
-
-			expect(getByTestId('canvas-node-status-running')).toBeVisible();
-		});
-	});
-
 	it('should render correctly for a node that ran successfully', () => {
 		const { getByTestId } = renderComponent({
 			global: {
@@ -180,57 +148,4 @@ describe('CanvasNodeStatusIcons', () => {
 
 		expect(queryByTestId('node-not-installed')).not.toBeInTheDocument();
 	});
-
-	describe('status precedence', () => {
-		it('should render executing status even if node is invalid', () => {
-			const { getByTestId, queryByTestId } = renderComponent({
-				global: {
-					provide: {
-						...createCanvasProvide({
-							isExecuting: true,
-						}),
-						...createCanvasNodeProvide({
-							data: {
-								execution: { running: true },
-								runData: { outputMap: {}, iterations: 15, visible: true },
-								render: {
-									type: CanvasNodeRenderType.Default,
-									options: { dirtiness: CanvasNodeDirtiness.PARAMETERS_UPDATED },
-								},
-							},
-						}),
-					},
-				},
-			});
-
-			expect(getByTestId('canvas-node-status-running')).toBeVisible();
-			expect(queryByTestId('canvas-node-status-warning')).not.toBeInTheDocument();
-		});
-
-		it('should render executing status even if node is disabled', () => {
-			const { getByTestId, queryByTestId } = renderComponent({
-				global: {
-					provide: {
-						...createCanvasProvide({
-							isExecuting: true,
-						}),
-						...createCanvasNodeProvide({
-							data: {
-								disabled: true,
-								execution: { running: true },
-								runData: { outputMap: {}, iterations: 15, visible: true },
-								render: {
-									type: CanvasNodeRenderType.Default,
-									options: { dirtiness: CanvasNodeDirtiness.PARAMETERS_UPDATED },
-								},
-							},
-						}),
-					},
-				},
-			});
-
-			expect(getByTestId('canvas-node-status-running')).toBeVisible();
-			expect(queryByTestId('canvas-node-status-warning')).not.toBeInTheDocument();
-		});
-	});
 });
diff --git a/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/render-types/parts/CanvasNodeStatusIcons.vue b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/render-types/parts/CanvasNodeStatusIcons.vue
index 0737173758b..253ed4ee610 100644
--- a/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/render-types/parts/CanvasNodeStatusIcons.vue
+++ b/packages/frontend/editor-ui/src/features/workflows/canvas/components/elements/nodes/render-types/parts/CanvasNodeStatusIcons.vue
@@ -5,7 +5,6 @@ import { useNodeHelpers } from '@/app/composables/useNodeHelpers';
 import { useCanvasNode } from '../../../../../composables/useCanvasNode';
 import { useI18n } from '@n8n/i18n';
 import { CanvasNodeDirtiness, CanvasNodeRenderType } from '../../../../../canvas.types';
-import { useCanvas } from '@/features/workflows/canvas/composables/useCanvas';
 import { useRoute } from 'vue-router';
 import { VIEWS } from '@/app/constants';
 
@@ -31,9 +30,6 @@ const {
 	hasExecutionErrors,
 	hasValidationErrors,
 	executionStatus,
-	executionWaiting,
-	executionWaitingForNext,
-	executionRunning,
 	hasRunData,
 	runDataIterations,
 	isDisabled,
@@ -41,7 +37,6 @@ const {
 	isNotInstalledCommunityNode,
 } = useCanvasNode();
 const route = useRoute();
-const { isExecuting } = useCanvas();
 
 const hideNodeIssues = computed(() => false); // @TODO Implement this
 const isDemoRoute = computed(() => route.name === VIEWS.DEMO);
@@ -49,13 +44,6 @@ const dirtiness = computed(() =>
 	render.value.type === CanvasNodeRenderType.Default ? render.value.options.dirtiness : undefined,
 );
 
-const isNodeExecuting = computed(() => {
-	if (!isExecuting.value) return false;
-
-	return (
-		executionRunning.value || executionWaitingForNext.value || executionStatus.value === 'running' // eslint-disable-line @typescript-eslint/prefer-nullish-coalescing
-	);
-});
 const commonClasses = computed(() => [
 	$style.status,
 	spinnerScrim ? $style.spinnerScrim : '',
@@ -64,18 +52,8 @@ const commonClasses = computed(() => [
 </script>
 
 <template>
-	<div v-if="executionWaiting || executionStatus === 'waiting'">
-		<div :class="[...commonClasses, $style.waiting]">
-			<N8nTooltip placement="bottom">
-				<template #content>
-					<div v-text="executionWaiting"></div>
-				</template>
-				<N8nIcon icon="clock" :size="size" />
-			</N8nTooltip>
-		</div>
-	</div>
 	<div
-		v-else-if="isNotInstalledCommunityNode && !isDemoRoute"
+		v-if="isNotInstalledCommunityNode && !isDemoRoute"
 		:class="[...commonClasses, $style.issues]"
 		data-test-id="node-not-installed"
 	>
@@ -84,13 +62,6 @@ const commonClasses = computed(() => [
 			<N8nIcon icon="hard-drive-download" :size="size" />
 		</N8nTooltip>
 	</div>
-	<div
-		v-else-if="isNodeExecuting"
-		data-test-id="canvas-node-status-running"
-		:class="[...commonClasses, $style.running]"
-	>
-		<N8nIcon icon="refresh-cw" spin />
-	</div>
 	<div v-else-if="isDisabled" :class="[...commonClasses, $style.disabled]">
 		<N8nIcon icon="power" :size="size" />
 	</div>
diff --git a/packages/frontend/editor-ui/src/features/workflows/canvas/composables/useZoomAdjustedValues.test.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/composables/useZoomAdjustedValues.test.ts
new file mode 100644
index 00000000000..2c3a864b272
--- /dev/null
+++ b/packages/frontend/editor-ui/src/features/workflows/canvas/composables/useZoomAdjustedValues.test.ts
@@ -0,0 +1,173 @@
+import { ref } from 'vue';
+import { useZoomAdjustedValues } from './useZoomAdjustedValues';
+
+describe(useZoomAdjustedValues, () => {
+	const createViewport = (zoom: number) => ref({ x: 0, y: 0, zoom });
+
+	describe('calculateZoomAdjustedValue', () => {
+		it('should return baseValue when zoom >= 1.0', () => {
+			const viewport = createViewport(1.0);
+			const { calculateZoomAdjustedValue } = useZoomAdjustedValues(viewport);
+
+			expect(calculateZoomAdjustedValue(1.0, 0.84, 0.6)).toBe(0.84);
+			expect(calculateZoomAdjustedValue(1.5, 0.84, 0.6)).toBe(0.84);
+			expect(calculateZoomAdjustedValue(2.0, 0.5, 1.0)).toBe(0.5);
+		});
+
+		it('should return maxValue when zoom <= minZoom', () => {
+			const viewport = createViewport(0.2);
+			const { calculateZoomAdjustedValue } = useZoomAdjustedValues(viewport);
+
+			expect(calculateZoomAdjustedValue(0.2, 0.84, 0.6)).toBe(0.6);
+			expect(calculateZoomAdjustedValue(0.1, 0.84, 0.6)).toBe(0.6);
+			expect(calculateZoomAdjustedValue(0, 0.5, 1.0)).toBe(1.0);
+		});
+
+		it('should interpolate values between minZoom and 1.0 with gamma correction', () => {
+			const viewport = createViewport(0.5);
+			const { calculateZoomAdjustedValue } = useZoomAdjustedValues(viewport);
+
+			// At zoom 0.5, t = (1.0 - 0.5) / (1.0 - 0.2) = 0.625
+			// tGamma = 0.625^2.2 ≈ 0.352
+			// result = 0.84 + 0.352 * (0.6 - 0.84) = 0.84 - 0.0845 ≈ 0.755
+			const result = calculateZoomAdjustedValue(0.5, 0.84, 0.6);
+			expect(result).toBeCloseTo(0.755, 2);
+		});
+
+		it('should respect custom minZoom parameter', () => {
+			const viewport = createViewport(0.5);
+			const { calculateZoomAdjustedValue } = useZoomAdjustedValues(viewport);
+
+			// With minZoom = 0.5, zoom at exactly minZoom should return maxValue
+			expect(calculateZoomAdjustedValue(0.5, 0.84, 0.6, 0.5)).toBe(0.6);
+			// Zoom below minZoom should also return maxValue
+			expect(calculateZoomAdjustedValue(0.3, 0.84, 0.6, 0.5)).toBe(0.6);
+		});
+
+		it('should respect custom gamma parameter', () => {
+			const viewport = createViewport(0.5);
+			const { calculateZoomAdjustedValue } = useZoomAdjustedValues(viewport);
+
+			// With gamma = 1.0 (linear), t = 0.625 should give linear interpolation
+			// result = 0.84 + 0.625 * (0.6 - 0.84) = 0.84 - 0.15 = 0.69
+			const linearResult = calculateZoomAdjustedValue(0.5, 0.84, 0.6, 0.2, 1.0);
+			expect(linearResult).toBeCloseTo(0.69, 2);
+
+			// Higher gamma should give smaller adjustment at same zoom
+			const highGammaResult = calculateZoomAdjustedValue(0.5, 0.84, 0.6, 0.2, 3.0);
+			expect(highGammaResult).toBeGreaterThan(linearResult);
+		});
+
+		it('should handle case where maxValue > baseValue', () => {
+			const viewport = createViewport(0.5);
+			const { calculateZoomAdjustedValue } = useZoomAdjustedValues(viewport);
+
+			// Dark mode lightness increases as zoom decreases
+			const result = calculateZoomAdjustedValue(0.5, 0.42, 0.66);
+			expect(result).toBeGreaterThan(0.42);
+			expect(result).toBeLessThan(0.66);
+		});
+	});
+
+	describe('calculateEdgeLightness', () => {
+		it('should return base lightness values at zoom 1.0', () => {
+			const viewport = createViewport(1.0);
+			const { calculateEdgeLightness } = useZoomAdjustedValues(viewport);
+
+			const lightness = calculateEdgeLightness();
+			expect(lightness.value.light).toBe('0.840');
+			expect(lightness.value.dark).toBe('0.420');
+		});
+
+		it('should return max lightness values at minimum zoom', () => {
+			const viewport = createViewport(0.2);
+			const { calculateEdgeLightness } = useZoomAdjustedValues(viewport);
+
+			const lightness = calculateEdgeLightness();
+			expect(lightness.value.light).toBe('0.600');
+			expect(lightness.value.dark).toBe('0.660');
+		});
+
+		it('should darken light mode and lighten dark mode on hover', () => {
+			const viewport = createViewport(1.0);
+			const { calculateEdgeLightness } = useZoomAdjustedValues(viewport);
+
+			const hovered = ref(false);
+			const lightness = calculateEdgeLightness(hovered);
+
+			expect(lightness.value.light).toBe('0.840');
+			expect(lightness.value.dark).toBe('0.420');
+
+			hovered.value = true;
+
+			// Light mode: 0.84 - 0.3 = 0.54
+			expect(lightness.value.light).toBe('0.540');
+			// Dark mode: 0.42 + 0.2 = 0.62
+			expect(lightness.value.dark).toBe('0.620');
+		});
+
+		it('should clamp hover adjustments to valid range', () => {
+			const viewport = createViewport(0.2);
+			const { calculateEdgeLightness } = useZoomAdjustedValues(viewport);
+
+			const hovered = ref(true);
+			const lightness = calculateEdgeLightness(hovered);
+
+			// Light mode: max(0, 0.6 - 0.3) = 0.3
+			expect(parseFloat(lightness.value.light)).toBeGreaterThanOrEqual(0);
+			// Dark mode: min(1, 0.66 + 0.1) = 0.76
+			expect(parseFloat(lightness.value.dark)).toBeLessThanOrEqual(1);
+		});
+
+		it('should be reactive to viewport changes', () => {
+			const viewport = ref({ x: 0, y: 0, zoom: 1.0 });
+			const { calculateEdgeLightness } = useZoomAdjustedValues(viewport);
+
+			const lightness = calculateEdgeLightness();
+			expect(lightness.value.light).toBe('0.840');
+
+			viewport.value = { x: 0, y: 0, zoom: 0.2 };
+			expect(lightness.value.light).toBe('0.600');
+		});
+	});
+
+	describe('calculateHandleLightness', () => {
+		it('should return base lightness values at zoom 1.0', () => {
+			const viewport = createViewport(1.0);
+			const { calculateHandleLightness } = useZoomAdjustedValues(viewport);
+
+			const lightness = calculateHandleLightness();
+			expect(lightness.value.light).toBe('0.680');
+			expect(lightness.value.dark).toBe('0.500');
+		});
+
+		it('should return max lightness values at minimum zoom', () => {
+			const viewport = createViewport(0.2);
+			const { calculateHandleLightness } = useZoomAdjustedValues(viewport);
+
+			const lightness = calculateHandleLightness();
+			expect(lightness.value.light).toBe('0.300');
+			expect(lightness.value.dark).toBe('0.700');
+		});
+	});
+
+	describe('calculateNodeBorderOpacity', () => {
+		it('should return base opacity values at zoom 1.0', () => {
+			const viewport = createViewport(1.0);
+			const { calculateNodeBorderOpacity } = useZoomAdjustedValues(viewport);
+
+			const opacity = calculateNodeBorderOpacity();
+			expect(opacity.value.light).toBe('0.100');
+			expect(opacity.value.dark).toBe('0.200');
+		});
+
+		it('should return max opacity values at minimum zoom', () => {
+			const viewport = createViewport(0.2);
+			const { calculateNodeBorderOpacity } = useZoomAdjustedValues(viewport);
+
+			const opacity = calculateNodeBorderOpacity();
+			expect(opacity.value.light).toBe('0.700');
+			expect(opacity.value.dark).toBe('0.700');
+		});
+	});
+});
diff --git a/packages/frontend/editor-ui/src/features/workflows/canvas/composables/useZoomAdjustedValues.ts b/packages/frontend/editor-ui/src/features/workflows/canvas/composables/useZoomAdjustedValues.ts
new file mode 100644
index 00000000000..3754bf85501
--- /dev/null
+++ b/packages/frontend/editor-ui/src/features/workflows/canvas/composables/useZoomAdjustedValues.ts
@@ -0,0 +1,95 @@
+import { computed, ref, type Ref } from 'vue';
+import type { ViewportTransform } from '@vue-flow/core';
+
+/**
+ * Composable for calculating zoom-adjusted visual values (lightness, opacity, etc.)
+ * Uses gamma correction for perceptually smooth transitions
+ */
+export function useZoomAdjustedValues(viewport: Ref<ViewportTransform>) {
+	/**
+	 * Core calculation function with gamma correction
+	 * @param zoom - Current zoom level
+	 * @param baseValue - Value at 100% zoom
+	 * @param maxValue - Value at minimum zoom
+	 * @param minZoom - Minimum zoom threshold (default: 0.2)
+	 * @param gamma - Gamma correction for perceptual smoothness (default: 2.2)
+	 */
+	function calculateZoomAdjustedValue(
+		zoom: number,
+		baseValue: number,
+		maxValue: number,
+		minZoom = 0.2,
+		gamma = 2.2,
+	): number {
+		if (zoom >= 1.0) {
+			return baseValue;
+		} else if (zoom <= minZoom) {
+			return maxValue;
+		} else {
+			const t = (1.0 - zoom) / (1.0 - minZoom);
+			const tGamma = Math.pow(t, gamma);
+			return baseValue + tGamma * (maxValue - baseValue);
+		}
+	}
+
+	/**
+	 * Calculate edge lightness values for light and dark modes
+	 * @param hovered - Whether the edge is hovered (optional, defaults to false)
+	 */
+	function calculateEdgeLightness(hovered: Ref<boolean> = ref(false)) {
+		return computed(() => {
+			const zoom = viewport.value.zoom;
+			let lightnessLight = calculateZoomAdjustedValue(zoom, 0.84, 0.6);
+			let lightnessDark = calculateZoomAdjustedValue(zoom, 0.42, 0.66);
+
+			if (hovered.value) {
+				lightnessLight = Math.max(0, lightnessLight - 0.3); // Darken by 30%
+				lightnessDark = Math.min(1, lightnessDark + 0.2); // Lighten by 20%
+			}
+
+			return {
+				light: lightnessLight.toFixed(3),
+				dark: lightnessDark.toFixed(3),
+			};
+		});
+	}
+
+	/**
+	 * Calculate handle border lightness values for light and dark modes
+	 */
+	function calculateHandleLightness() {
+		return computed(() => {
+			const zoom = viewport.value.zoom;
+			const lightnessLight = calculateZoomAdjustedValue(zoom, 0.68, 0.3);
+			const lightnessDark = calculateZoomAdjustedValue(zoom, 0.5, 0.7);
+
+			return {
+				light: lightnessLight.toFixed(3),
+				dark: lightnessDark.toFixed(3),
+			};
+		});
+	}
+
+	/**
+	 * Calculate node border opacity values for light and dark modes
+	 */
+	function calculateNodeBorderOpacity() {
+		return computed(() => {
+			const zoom = viewport.value.zoom;
+			const opacityLight = calculateZoomAdjustedValue(zoom, 0.1, 0.7);
+			const opacityDark = calculateZoomAdjustedValue(zoom, 0.2, 0.7);
+
+			return {
+				light: opacityLight.toFixed(3),
+				dark: opacityDark.toFixed(3),
+			};
+		});
+	}
+
+	return {
+		calculateZoomAdjustedValue,
+		calculateEdgeLightness,
+		calculateHandleLightness,
+		calculateNodeBorderOpacity,
+	};
+}
diff --git a/packages/frontend/editor-ui/src/features/workflows/workflowDiff/WorkflowDiffModal.vue b/packages/frontend/editor-ui/src/features/workflows/workflowDiff/WorkflowDiffModal.vue
index 889729619a4..124185cea59 100644
--- a/packages/frontend/editor-ui/src/features/workflows/workflowDiff/WorkflowDiffModal.vue
+++ b/packages/frontend/editor-ui/src/features/workflows/workflowDiff/WorkflowDiffModal.vue
@@ -861,15 +861,19 @@ const modifiers = [
 	--canvas-node--border-color: var(--diff--color--deleted);
 	--sticky--color--background: var(--diff--color--deleted--faint);
 	--sticky--border-color: var(--diff--color--deleted);
+
+	:global(> div) {
+		--canvas-node--border-width: 2px;
+	}
+
 	&::before {
 		content: 'D';
 		background-color: var(--diff--color--deleted);
 	}
-	:global(.canvas-node-handle-main-output > div:empty) {
-		background-color: var(--diff--color--deleted);
-	}
+	:global(.canvas-node-handle-main-output .source),
 	:global(.canvas-node-handle-main-input .target) {
 		background-color: var(--diff--color--deleted);
+		border: none;
 	}
 
 	/* Ensure disabled nodes still show diff border color */
@@ -883,15 +887,20 @@ const modifiers = [
 	--sticky--color--background: var(--diff--color--new--faint);
 	--sticky--border-color: var(--diff--color--new);
 	position: relative;
+
+	:global(> div) {
+		--canvas-node--border-width: 2px;
+	}
+
 	&::before {
 		content: 'N';
 		background-color: var(--diff--color--new);
 	}
-	:global(.canvas-node-handle-main-output > div:empty) {
-		background-color: var(--diff--color--new);
-	}
+
+	:global(.canvas-node-handle-main-output .source),
 	:global(.canvas-node-handle-main-input .target) {
 		background-color: var(--diff--color--new);
+		border: none;
 	}
 
 	/* Ensure disabled nodes still show diff border color */
@@ -912,20 +921,25 @@ const modifiers = [
 	}
 }
 .modified {
+	--canvas-node--border-width: 2px;
 	--canvas-node--border-color: var(--diff--color--modified);
 	--canvas-node--color--background: var(--diff--color--modified--faint);
 	--sticky--color--background: var(--diff--color--modified--faint);
 	--sticky--border-color: var(--diff--color--modified);
 	position: relative;
+
+	:global(> div) {
+		--canvas-node--border-width: 2px;
+	}
+
 	&::before {
 		content: 'M';
 		background-color: var(--diff--color--modified);
 	}
-	:global(.canvas-node-handle-main-output > div:empty) {
-		background-color: var(--diff--color--modified);
-	}
+	:global(.canvas-node-handle-main-output .source),
 	:global(.canvas-node-handle-main-input .target) {
 		background-color: var(--diff--color--modified);
+		border: none;
 	}
 
 	/* Ensure disabled nodes still show diff border color */
@@ -999,6 +1013,7 @@ const modifiers = [
 	flex: 1;
 	position: relative;
 	border-top: 1px solid var(--color--foreground);
+	background: var(--canvas--color--background);
 }
 
 .emptyWorkflow {
diff --git a/packages/testing/playwright/pages/CanvasPage.ts b/packages/testing/playwright/pages/CanvasPage.ts
index 992389e1989..ddc44efac28 100644
--- a/packages/testing/playwright/pages/CanvasPage.ts
+++ b/packages/testing/playwright/pages/CanvasPage.ts
@@ -800,15 +800,13 @@ export class CanvasPage extends BasePage {
 	}
 
 	getNodesWithSpinner(): Locator {
-		return this.page.getByTestId('canvas-node').filter({
-			has: this.page.locator('[data-icon=refresh-cw]'),
-		});
+		return this.page.locator(
+			'[data-test-id="canvas-node"].running, [data-test-id="canvas-node"].waiting',
+		);
 	}
 
 	getWaitingNodes(): Locator {
-		return this.page.getByTestId('canvas-node').filter({
-			has: this.page.locator('[data-icon=clock]'),
-		});
+		return this.page.locator('[data-test-id="canvas-node"].waiting');
 	}
 
 	/**
@@ -946,7 +944,9 @@ export class CanvasPage extends BasePage {
 	}
 
 	getNodeRunningStatusIndicator(nodeName: string): Locator {
-		return this.nodeByName(nodeName).locator('[data-icon="refresh-cw"]');
+		return this.page.locator(
+			`[data-test-id="canvas-node"][data-node-name="${nodeName}"].running, [data-test-id="canvas-node"][data-node-name="${nodeName}"].waiting`,
+		);
 	}
 
 	getSuccessEdges(): Locator {

From a02d7ba9d4f06193afae02d83a017ba9a9c2d1ec Mon Sep 17 00:00:00 2001
From: Guillaume Jacquart <jacquart.guillaume@gmail.com>
Date: Thu, 4 Dec 2025 09:41:47 +0100
Subject: [PATCH 048/167] feat(core): Add credential resolver entity for
 dynamic credential module (#22609)

---
 ...682447000-CreateCredentialResolverTable.ts | 22 +++++++++++++++++++
 .../@n8n/db/src/migrations/mysqldb/index.ts   |  2 ++
 .../db/src/migrations/postgresdb/index.ts     |  2 ++
 .../@n8n/db/src/migrations/sqlite/index.ts    |  2 ++
 .../database/entities/credential-resolver.ts  | 14 ++++++++++++
 .../credential-resolver.repository.ts         | 11 ++++++++++
 .../dynamic-credentials.module.ts             | 10 +++++++--
 ...edential-resolver-registry.service.test.ts |  8 +++----
 .../credential-resolver-registry.service.ts   |  2 +-
 9 files changed, 66 insertions(+), 7 deletions(-)
 create mode 100644 packages/@n8n/db/src/migrations/common/1764682447000-CreateCredentialResolverTable.ts
 create mode 100644 packages/cli/src/modules/dynamic-credentials.ee/database/entities/credential-resolver.ts
 create mode 100644 packages/cli/src/modules/dynamic-credentials.ee/database/repositories/credential-resolver.repository.ts

diff --git a/packages/@n8n/db/src/migrations/common/1764682447000-CreateCredentialResolverTable.ts b/packages/@n8n/db/src/migrations/common/1764682447000-CreateCredentialResolverTable.ts
new file mode 100644
index 00000000000..52e6120d8fd
--- /dev/null
+++ b/packages/@n8n/db/src/migrations/common/1764682447000-CreateCredentialResolverTable.ts
@@ -0,0 +1,22 @@
+import type { MigrationContext, ReversibleMigration } from '../migration-types';
+
+const tableName = 'dynamic_credential_resolver';
+
+export class CreateDynamicCredentialResolverTable1764682447000 implements ReversibleMigration {
+	async up({ schemaBuilder: { createTable, column } }: MigrationContext) {
+		await createTable(tableName)
+			.withColumns(
+				column('id').varchar(16).primary,
+				column('name').varchar(128).notNull,
+				column('type').varchar(128).notNull,
+				column('config').text.notNull.comment(
+					'Encrypted resolver configuration (JSON encrypted as string)',
+				),
+			)
+			.withTimestamps.withIndexOn('type');
+	}
+
+	async down({ schemaBuilder: { dropTable } }: MigrationContext) {
+		await dropTable(tableName);
+	}
+}
diff --git a/packages/@n8n/db/src/migrations/mysqldb/index.ts b/packages/@n8n/db/src/migrations/mysqldb/index.ts
index 6c2ccf8aee9..a97373931ea 100644
--- a/packages/@n8n/db/src/migrations/mysqldb/index.ts
+++ b/packages/@n8n/db/src/migrations/mysqldb/index.ts
@@ -120,6 +120,7 @@ import { ChangeOAuthStateColumnToUnboundedVarchar1763572724000 } from '../common
 import { CreateBinaryDataTable1763716655000 } from '../common/1763716655000-CreateBinaryDataTable';
 import { CreateWorkflowPublishHistoryTable1764167920585 } from '../common/1764167920585-CreateWorkflowPublishHistoryTable';
 import { AddCreatorIdToProjectTable1764276827837 } from '../common/1764276827837-AddCreatorIdToProjectTable';
+import { CreateDynamicCredentialResolverTable1764682447000 } from '../common/1764682447000-CreateCredentialResolverTable';
 import type { Migration } from '../migration-types';
 
 export const mysqlMigrations: Migration[] = [
@@ -245,4 +246,5 @@ export const mysqlMigrations: Migration[] = [
 	CreateBinaryDataTable1763716655000,
 	CreateWorkflowPublishHistoryTable1764167920585,
 	AddCreatorIdToProjectTable1764276827837,
+	CreateDynamicCredentialResolverTable1764682447000,
 ];
diff --git a/packages/@n8n/db/src/migrations/postgresdb/index.ts b/packages/@n8n/db/src/migrations/postgresdb/index.ts
index b33ea3f9fcf..f4d5e354982 100644
--- a/packages/@n8n/db/src/migrations/postgresdb/index.ts
+++ b/packages/@n8n/db/src/migrations/postgresdb/index.ts
@@ -120,6 +120,7 @@ import { ChangeOAuthStateColumnToUnboundedVarchar1763572724000 } from '../common
 import { CreateBinaryDataTable1763716655000 } from '../common/1763716655000-CreateBinaryDataTable';
 import { CreateWorkflowPublishHistoryTable1764167920585 } from '../common/1764167920585-CreateWorkflowPublishHistoryTable';
 import { AddCreatorIdToProjectTable1764276827837 } from '../common/1764276827837-AddCreatorIdToProjectTable';
+import { CreateDynamicCredentialResolverTable1764682447000 } from '../common/1764682447000-CreateCredentialResolverTable';
 import type { Migration } from '../migration-types';
 
 export const postgresMigrations: Migration[] = [
@@ -245,4 +246,5 @@ export const postgresMigrations: Migration[] = [
 	CreateBinaryDataTable1763716655000,
 	CreateWorkflowPublishHistoryTable1764167920585,
 	AddCreatorIdToProjectTable1764276827837,
+	CreateDynamicCredentialResolverTable1764682447000,
 ];
diff --git a/packages/@n8n/db/src/migrations/sqlite/index.ts b/packages/@n8n/db/src/migrations/sqlite/index.ts
index 53e364c62cb..369a9e54ca8 100644
--- a/packages/@n8n/db/src/migrations/sqlite/index.ts
+++ b/packages/@n8n/db/src/migrations/sqlite/index.ts
@@ -116,6 +116,7 @@ import { AddActiveVersionIdColumn1763047800000 } from '../common/1763047800000-A
 import { ChangeOAuthStateColumnToUnboundedVarchar1763572724000 } from '../common/1763572724000-ChangeOAuthStateColumnToUnboundedVarchar';
 import { CreateBinaryDataTable1763716655000 } from '../common/1763716655000-CreateBinaryDataTable';
 import { CreateWorkflowPublishHistoryTable1764167920585 } from '../common/1764167920585-CreateWorkflowPublishHistoryTable';
+import { CreateDynamicCredentialResolverTable1764682447000 } from '../common/1764682447000-CreateCredentialResolverTable';
 import type { Migration } from '../migration-types';
 
 const sqliteMigrations: Migration[] = [
@@ -237,6 +238,7 @@ const sqliteMigrations: Migration[] = [
 	CreateBinaryDataTable1763716655000,
 	CreateWorkflowPublishHistoryTable1764167920585,
 	AddCreatorIdToProjectTable1764276827837,
+	CreateDynamicCredentialResolverTable1764682447000,
 ];
 
 export { sqliteMigrations };
diff --git a/packages/cli/src/modules/dynamic-credentials.ee/database/entities/credential-resolver.ts b/packages/cli/src/modules/dynamic-credentials.ee/database/entities/credential-resolver.ts
new file mode 100644
index 00000000000..7c011a6bd08
--- /dev/null
+++ b/packages/cli/src/modules/dynamic-credentials.ee/database/entities/credential-resolver.ts
@@ -0,0 +1,14 @@
+import { Column, Entity } from '@n8n/typeorm';
+import { WithTimestampsAndStringId } from '@n8n/db';
+
+@Entity()
+export class DynamicCredentialResolver extends WithTimestampsAndStringId {
+	@Column({ type: 'varchar', length: 128 })
+	name: string;
+
+	@Column({ type: 'varchar', length: 128 })
+	type: string;
+
+	@Column({ type: 'text' })
+	config: string;
+}
diff --git a/packages/cli/src/modules/dynamic-credentials.ee/database/repositories/credential-resolver.repository.ts b/packages/cli/src/modules/dynamic-credentials.ee/database/repositories/credential-resolver.repository.ts
new file mode 100644
index 00000000000..9b3d6b777d5
--- /dev/null
+++ b/packages/cli/src/modules/dynamic-credentials.ee/database/repositories/credential-resolver.repository.ts
@@ -0,0 +1,11 @@
+import { Service } from '@n8n/di';
+import { DataSource, Repository } from '@n8n/typeorm';
+
+import { DynamicCredentialResolver } from '../entities/credential-resolver';
+
+@Service()
+export class DynamicCredentialResolverRepository extends Repository<DynamicCredentialResolver> {
+	constructor(dataSource: DataSource) {
+		super(DynamicCredentialResolver, dataSource.manager);
+	}
+}
diff --git a/packages/cli/src/modules/dynamic-credentials.ee/dynamic-credentials.module.ts b/packages/cli/src/modules/dynamic-credentials.ee/dynamic-credentials.module.ts
index 2c4171de959..63da47c25a1 100644
--- a/packages/cli/src/modules/dynamic-credentials.ee/dynamic-credentials.module.ts
+++ b/packages/cli/src/modules/dynamic-credentials.ee/dynamic-credentials.module.ts
@@ -7,9 +7,15 @@ export class DynamicCredentialsModule implements ModuleInterface {
 	async init() {
 		await import('./context-establishment-hooks');
 		await import('./credential-resolvers');
-		const { CredentialResolverRegistry } = await import('./services');
+		const { DynamicCredentialResolverRegistry } = await import('./services');
 
-		await Container.get(CredentialResolverRegistry).init();
+		await Container.get(DynamicCredentialResolverRegistry).init();
+	}
+
+	async entities() {
+		const { DynamicCredentialResolver } = await import('./database/entities/credential-resolver');
+
+		return [DynamicCredentialResolver];
 	}
 
 	@OnShutdown()
diff --git a/packages/cli/src/modules/dynamic-credentials.ee/services/__tests__/credential-resolver-registry.service.test.ts b/packages/cli/src/modules/dynamic-credentials.ee/services/__tests__/credential-resolver-registry.service.test.ts
index 3180ec4337a..ec22d69d0fb 100644
--- a/packages/cli/src/modules/dynamic-credentials.ee/services/__tests__/credential-resolver-registry.service.test.ts
+++ b/packages/cli/src/modules/dynamic-credentials.ee/services/__tests__/credential-resolver-registry.service.test.ts
@@ -8,10 +8,10 @@ import type {
 import { Container } from '@n8n/di';
 import type { ICredentialContext, ICredentialDataDecryptedObject } from 'n8n-workflow';
 
-import { CredentialResolverRegistry } from '../credential-resolver-registry.service';
+import { DynamicCredentialResolverRegistry } from '../credential-resolver-registry.service';
 
-describe('CredentialResolverRegistry', () => {
-	let registry: CredentialResolverRegistry;
+describe('DynamicCredentialResolverRegistry', () => {
+	let registry: DynamicCredentialResolverRegistry;
 	let mockLogger: jest.Mocked<Logger>;
 	let mockMetadata: jest.Mocked<CredentialResolverEntryMetadata>;
 
@@ -62,7 +62,7 @@ describe('CredentialResolverRegistry', () => {
 			getClasses: jest.fn(),
 		} as unknown as jest.Mocked<CredentialResolverEntryMetadata>;
 
-		registry = new CredentialResolverRegistry(mockMetadata, mockLogger);
+		registry = new DynamicCredentialResolverRegistry(mockMetadata, mockLogger);
 	});
 
 	describe('init', () => {
diff --git a/packages/cli/src/modules/dynamic-credentials.ee/services/credential-resolver-registry.service.ts b/packages/cli/src/modules/dynamic-credentials.ee/services/credential-resolver-registry.service.ts
index 03012cb3966..a12210e7c0a 100644
--- a/packages/cli/src/modules/dynamic-credentials.ee/services/credential-resolver-registry.service.ts
+++ b/packages/cli/src/modules/dynamic-credentials.ee/services/credential-resolver-registry.service.ts
@@ -7,7 +7,7 @@ import { Container, Service } from '@n8n/di';
  * Automatically discovers all classes decorated with @CredentialResolver() and makes them available by name.
  */
 @Service()
-export class CredentialResolverRegistry {
+export class DynamicCredentialResolverRegistry {
 	/** Map of resolver names to resolver instances */
 	private resolverMap: Map<string, ICredentialResolver> = new Map();
 

From 553b24458ea780dc4e5d63b2db51fb5466ea13ea Mon Sep 17 00:00:00 2001
From: Tomi Turtiainen <10324676+tomi@users.noreply.github.com>
Date: Thu, 4 Dec 2025 11:22:42 +0200
Subject: [PATCH 049/167] fix(core): Fix html header check (#22713)

---
 packages/core/src/__tests__/html-sandbox.test.ts | 8 ++++++--
 packages/core/src/html-sandbox.ts                | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/core/src/__tests__/html-sandbox.test.ts b/packages/core/src/__tests__/html-sandbox.test.ts
index def14bb261c..c65b15b6d8c 100644
--- a/packages/core/src/__tests__/html-sandbox.test.ts
+++ b/packages/core/src/__tests__/html-sandbox.test.ts
@@ -75,11 +75,15 @@ describe('isHtmlRenderedContentType', () => {
 		});
 	});
 
+	it('should handle content type with extra spaces', () => {
+		expect(isHtmlRenderedContentType('  text/html')).toBe(true);
+		expect(isHtmlRenderedContentType('text/html  ')).toBe(true);
+		expect(isHtmlRenderedContentType('  text/html  ')).toBe(true);
+	});
+
 	it('should handle edge cases', () => {
 		expect(isHtmlRenderedContentType('text/htmlsomething')).toBe(true);
 		expect(isHtmlRenderedContentType('application/xhtml+xmlsomething')).toBe(true);
-		expect(isHtmlRenderedContentType(' text/html')).toBe(false);
-		expect(isHtmlRenderedContentType('text/html ')).toBe(true);
 	});
 });
 
diff --git a/packages/core/src/html-sandbox.ts b/packages/core/src/html-sandbox.ts
index 8c52e8692d1..dcaa0d95c51 100644
--- a/packages/core/src/html-sandbox.ts
+++ b/packages/core/src/html-sandbox.ts
@@ -17,7 +17,7 @@ export const getWebhookSandboxCSP = (): string => {
  * as HTML.
  */
 export const isHtmlRenderedContentType = (contentType: string) => {
-	const contentTypeLower = contentType.toLowerCase();
+	const contentTypeLower = contentType.trim().toLowerCase();
 
 	return (
 		// The content-type can also contain a charset, e.g. "text/html; charset=utf-8"

From 5f3ef83d9e10ee93a911f751e3a0838681f8ee45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BAl=20G=C3=B3mez=20Morales?= <raul00gm@gmail.com>
Date: Thu, 4 Dec 2025 10:34:46 +0100
Subject: [PATCH 050/167] test(editor): Increase timeout for loader not to be
 present (#22717)

---
 .../playwright/tests/ui/56-workflow-viewer-permissions.spec.ts   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/testing/playwright/tests/ui/56-workflow-viewer-permissions.spec.ts b/packages/testing/playwright/tests/ui/56-workflow-viewer-permissions.spec.ts
index 84badccb509..e0f11897a10 100644
--- a/packages/testing/playwright/tests/ui/56-workflow-viewer-permissions.spec.ts
+++ b/packages/testing/playwright/tests/ui/56-workflow-viewer-permissions.spec.ts
@@ -31,6 +31,7 @@ async function setupProjectWithWorkflowAndSignInAsMember({
 	await n8n.navigate.toHome();
 	await n8n.sideBar.clickProjectMenuItem(createdProjectName);
 	await n8n.workflows.cards.getWorkflows().first().click();
+	await expect(n8n.canvas.getLoadingMask()).toBeHidden({ timeout: 30000 });
 	await expect(n8n.canvas.getLoadingMask()).not.toBeAttached();
 }
 

From 9913991d208ac0c2a666927790f8fa96e9fd6f69 Mon Sep 17 00:00:00 2001
From: Guillaume Jacquart <jacquart.guillaume@gmail.com>
Date: Thu, 4 Dec 2025 11:09:50 +0100
Subject: [PATCH 051/167] fix(core): Do not prevent credential save if property
 has default value (#22720)

---
 .../__tests__/credentials.service.test.ts     | 69 +++++++++++++++++++
 .../src/credentials/credentials.service.ts    |  5 +-
 2 files changed, 73 insertions(+), 1 deletion(-)

diff --git a/packages/cli/src/credentials/__tests__/credentials.service.test.ts b/packages/cli/src/credentials/__tests__/credentials.service.test.ts
index f2f657cd764..d92b161683f 100644
--- a/packages/cli/src/credentials/__tests__/credentials.service.test.ts
+++ b/packages/cli/src/credentials/__tests__/credentials.service.test.ts
@@ -1479,6 +1479,75 @@ describe('CredentialsService', () => {
 			// ASSERT
 			expect(savedCredential.isGlobal).toBeUndefined();
 		});
+
+		it('should allow creating credential when required field has default value and is not provided', async () => {
+			// ARRANGE
+			// Mock credential properties with a required field that has a default value
+			credentialsHelper.getCredentialsProperties.mockReturnValue([
+				{
+					displayName: 'Host',
+					name: 'host',
+					type: 'string',
+					required: true,
+					default: 'https://generativelanguage.googleapis.com',
+				},
+				{
+					displayName: 'API Key',
+					name: 'apiKey',
+					type: 'string',
+					required: true,
+					default: '',
+				},
+			] as any);
+
+			// Payload without 'host' field - should use default value
+			const payload = {
+				name: 'Google Gemini Credential',
+				type: 'googlePalmApi',
+				data: { apiKey: 'test-api-key' }, // host is not provided
+				projectId: 'project-1',
+			};
+
+			// @ts-expect-error - Mocking manager for testing
+			credentialsRepository.manager = {
+				transaction: jest.fn().mockImplementation(async (callback) => {
+					const mockManager = {
+						save: jest.fn().mockImplementation(async (entity) => {
+							return { ...entity, id: 'new-cred-id' };
+						}),
+					};
+					return await callback(mockManager);
+				}),
+			};
+
+			// ACT & ASSERT
+			await expect(service.createUnmanagedCredential(payload, ownerUser)).resolves.toBeDefined();
+		});
+
+		it('should throw error when required field without default value is not provided', async () => {
+			// ARRANGE
+			credentialsHelper.getCredentialsProperties.mockReturnValue([
+				{
+					displayName: 'API Key',
+					name: 'apiKey',
+					type: 'string',
+					required: true,
+					default: '', // Empty default means no valid default
+				},
+			] as any);
+
+			const payload = {
+				name: 'Test Credential',
+				type: 'apiKey',
+				data: {}, // apiKey is missing
+				projectId: 'project-1',
+			};
+
+			// ACT & ASSERT
+			await expect(service.createUnmanagedCredential(payload, ownerUser)).rejects.toThrow(
+				'The field "apiKey" is mandatory for credentials of type "apiKey"',
+			);
+		});
 	});
 
 	describe('createManagedCredential', () => {
diff --git a/packages/cli/src/credentials/credentials.service.ts b/packages/cli/src/credentials/credentials.service.ts
index 299f5fdef79..06faf9ae93e 100644
--- a/packages/cli/src/credentials/credentials.service.ts
+++ b/packages/cli/src/credentials/credentials.service.ts
@@ -874,8 +874,11 @@ export class CredentialsService {
 		const credentialProperties = this.credentialsHelper.getCredentialsProperties(type);
 		for (const property of credentialProperties) {
 			if (property.required && displayParameter(data, property, null, null)) {
+				// Check if value is present in data, if not, check if default value exists
 				const value = data[property.name];
-				if (value === undefined || value === null || value === '') {
+				const hasDefault =
+					property.default !== undefined && property.default !== null && property.default !== '';
+				if ((value === undefined || value === null || value === '') && !hasDefault) {
 					throw new BadRequestError(
 						`The field "${property.name}" is mandatory for credentials of type "${type}"`,
 					);

From 5fba6c9f2ef0e782d9f845369a49f4511da49be3 Mon Sep 17 00:00:00 2001
From: Suguru Inoue <suguru@n8n.io>
Date: Thu, 4 Dec 2025 11:51:32 +0100
Subject: [PATCH 052/167] fix(editor): Syntax highlighting in chat message not
 working (no-changelog) (#22721)

---
 .../frontend/editor-ui/src/__tests__/setup.ts | 48 +++++++++++++++++++
 .../src/features/ai/chatHub/__test__/data.ts  | 27 +++++++++++
 .../ai/chatHub/components/ChatMessage.test.ts | 41 ++++++++++++++++
 .../ai/chatHub/components/ChatMessage.vue     |  2 +-
 4 files changed, 117 insertions(+), 1 deletion(-)
 create mode 100644 packages/frontend/editor-ui/src/features/ai/chatHub/__test__/data.ts
 create mode 100644 packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatMessage.test.ts

diff --git a/packages/frontend/editor-ui/src/__tests__/setup.ts b/packages/frontend/editor-ui/src/__tests__/setup.ts
index 0378c18507b..f811a18a436 100644
--- a/packages/frontend/editor-ui/src/__tests__/setup.ts
+++ b/packages/frontend/editor-ui/src/__tests__/setup.ts
@@ -147,4 +147,52 @@ Object.defineProperty(HTMLElement.prototype, 'scrollTo', {
 	value: vi.fn(),
 });
 
+class SpeechSynthesisUtterance {
+	text = '';
+	lang = '';
+	voice = null;
+	volume = 1;
+	rate = 1;
+	pitch = 1;
+	onstart = null;
+	onend = null;
+	onerror = null;
+	onpause = null;
+	onresume = null;
+	onmark = null;
+	onboundary = null;
+
+	constructor(text?: string) {
+		if (text) {
+			this.text = text;
+		}
+	}
+
+	addEventListener = vi.fn();
+	removeEventListener = vi.fn();
+	dispatchEvent = vi.fn(() => true);
+}
+
+Object.defineProperty(window, 'SpeechSynthesisUtterance', {
+	writable: true,
+	value: SpeechSynthesisUtterance,
+});
+
+Object.defineProperty(window, 'speechSynthesis', {
+	writable: true,
+	value: {
+		cancel: vi.fn(),
+		speak: vi.fn(),
+		pause: vi.fn(),
+		resume: vi.fn(),
+		getVoices: vi.fn(() => []),
+		pending: false,
+		speaking: false,
+		paused: false,
+		addEventListener: vi.fn(),
+		removeEventListener: vi.fn(),
+		dispatchEvent: vi.fn(() => true),
+	},
+});
+
 loadLanguage('en', englishBaseText as LocaleMessages);
diff --git a/packages/frontend/editor-ui/src/features/ai/chatHub/__test__/data.ts b/packages/frontend/editor-ui/src/features/ai/chatHub/__test__/data.ts
new file mode 100644
index 00000000000..1448f228d70
--- /dev/null
+++ b/packages/frontend/editor-ui/src/features/ai/chatHub/__test__/data.ts
@@ -0,0 +1,27 @@
+import type {} from '@n8n/api-types';
+import type { ChatMessage } from '../chat.types';
+
+export function createTestChatMessage(overrides: Partial<ChatMessage> = {}): ChatMessage {
+	return {
+		id: 'm0',
+		type: 'ai',
+		content: 'test message',
+		status: 'success',
+		sessionId: 's0',
+		createdAt: new Date().toISOString(),
+		model: 'm0',
+		provider: 'anthropic',
+		alternatives: [],
+		attachments: [],
+		responses: [],
+		name: '',
+		workflowId: null,
+		agentId: null,
+		executionId: null,
+		updatedAt: new Date().toISOString(),
+		previousMessageId: null,
+		retryOfMessageId: null,
+		revisionOfMessageId: null,
+		...overrides,
+	};
+}
diff --git a/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatMessage.test.ts b/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatMessage.test.ts
new file mode 100644
index 00000000000..69f1ff38e47
--- /dev/null
+++ b/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatMessage.test.ts
@@ -0,0 +1,41 @@
+import { describe, it, expect, beforeEach } from 'vitest';
+import { createComponentRenderer } from '@/__tests__/render';
+import { createTestingPinia } from '@pinia/testing';
+import ChatMessage from './ChatMessage.vue';
+import type { ChatMessage as ChatMessageType } from '../chat.types';
+import { waitFor } from '@testing-library/vue';
+import { createTestChatMessage } from '../__test__/data';
+
+const renderComponent = createComponentRenderer(ChatMessage);
+
+describe('ChatMessage', () => {
+	let pinia: ReturnType<typeof createTestingPinia>;
+
+	beforeEach(() => {
+		pinia = createTestingPinia();
+	});
+
+	it('should render syntax highlighting for code blocks', async () => {
+		const message: ChatMessageType = createTestChatMessage({
+			content: '```javascript\nconst foo = "bar";\nfunction test() {\n  return true;\n}\n```',
+		});
+
+		const { container } = renderComponent({
+			props: {
+				message,
+				compact: false,
+				isEditing: false,
+				isStreaming: false,
+				cachedAgentDisplayName: null,
+			},
+			pinia,
+		});
+
+		// Wait for highlight.js to load and apply syntax highlighting
+		await waitFor(() => {
+			const highlightedElements = container.querySelectorAll('.hljs-keyword');
+
+			expect(highlightedElements.length).toBeGreaterThan(0);
+		});
+	});
+});
diff --git a/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatMessage.vue b/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatMessage.vue
index 995eae465a8..56908416d9c 100644
--- a/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatMessage.vue
+++ b/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatMessage.vue
@@ -240,7 +240,7 @@ onBeforeMount(() => {
 					<div v-if="message.type === 'human'">{{ message.content }}</div>
 					<VueMarkdown
 						v-else
-						:key="markdown.forceReRenderKey"
+						:key="markdown.forceReRenderKey.value"
 						:class="[$style.chatMessageMarkdown, 'chat-message-markdown']"
 						:source="
 							message.status === 'error' && !message.content

From f2eb85dc081934cad857108c2359aeac2b461b52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BAl=20G=C3=B3mez=20Morales?= <raul00gm@gmail.com>
Date: Thu, 4 Dec 2025 11:52:45 +0100
Subject: [PATCH 053/167] fix(editor): Fix correct $fromAi expression showing
 as error (#22711)

---
 packages/workflow/src/workflow-data-proxy.ts  |  2 +-
 .../workflow/test/workflow-data-proxy.test.ts | 48 +++++++++++++++++++
 2 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/packages/workflow/src/workflow-data-proxy.ts b/packages/workflow/src/workflow-data-proxy.ts
index 9794f66b47d..733076cb133 100644
--- a/packages/workflow/src/workflow-data-proxy.ts
+++ b/packages/workflow/src/workflow-data-proxy.ts
@@ -1034,7 +1034,7 @@ export class WorkflowDataProxy {
 
 			if (!resultData) {
 				inputData = this.connectionInputData?.[runIndex];
-				placeholdersDataInputData = inputData.json;
+				placeholdersDataInputData = inputData?.json;
 			} else {
 				inputData =
 					that.runExecutionData?.resultData.runData[that.activeNodeName]?.[runIndex].inputOverride;
diff --git a/packages/workflow/test/workflow-data-proxy.test.ts b/packages/workflow/test/workflow-data-proxy.test.ts
index f9aadb0d849..6007c96fbf2 100644
--- a/packages/workflow/test/workflow-data-proxy.test.ts
+++ b/packages/workflow/test/workflow-data-proxy.test.ts
@@ -676,6 +676,54 @@ describe('WorkflowDataProxy', () => {
 			// Should return existing values for keys that are present
 			expect(proxy.$fromAI('regular_field')).toEqual('regular_value');
 		});
+
+		test('Throws ExpressionError when there is no execution data', () => {
+			// Create a workflow with no data at all
+			const workflowWithNoData: IWorkflowBase = {
+				id: '123',
+				name: 'test workflow',
+				nodes: [
+					{
+						id: 'aiNode',
+						name: 'AI Node',
+						type: 'n8n-nodes-base.aiAgent',
+						typeVersion: 1,
+						position: [0, 0],
+						parameters: {},
+					},
+				],
+				connections: {},
+				active: false,
+				activeVersionId: null,
+				isArchived: false,
+				createdAt: new Date(),
+				updatedAt: new Date(),
+			};
+
+			const dataProxy = new WorkflowDataProxy(
+				new Workflow({
+					id: '123',
+					name: 'test workflow',
+					nodes: workflowWithNoData.nodes,
+					connections: workflowWithNoData.connections,
+					active: false,
+					nodeTypes: Helpers.NodeTypes(),
+				}),
+				null, // No run execution data
+				0,
+				0,
+				'AI Node',
+				[], // Empty connectionInputData - this triggers the bug
+				{},
+				'manual',
+				{},
+				undefined,
+			);
+
+			const proxy = dataProxy.getDataProxy();
+
+			expect(() => proxy.$fromAI('some_key')).toThrow(ExpressionError);
+		});
 	});
 
 	describe('$rawParameter', () => {

From 599c6ebe98c39b4ad35405d56d5722960318a676 Mon Sep 17 00:00:00 2001
From: Benjamin Schroth <68321970+schrothbn@users.noreply.github.com>
Date: Thu, 4 Dec 2025 12:32:05 +0100
Subject: [PATCH 054/167] fix(editor): Don't create duplicate placeholder nodes
 on agent failure (#22715)

---
 .../execution/logs/logs.utils.test.ts         |  48 +++++++
 .../src/features/execution/logs/logs.utils.ts | 119 +++++++++++-------
 2 files changed, 123 insertions(+), 44 deletions(-)

diff --git a/packages/frontend/editor-ui/src/features/execution/logs/logs.utils.test.ts b/packages/frontend/editor-ui/src/features/execution/logs/logs.utils.test.ts
index e611655bc3c..38457c9e35a 100644
--- a/packages/frontend/editor-ui/src/features/execution/logs/logs.utils.test.ts
+++ b/packages/frontend/editor-ui/src/features/execution/logs/logs.utils.test.ts
@@ -1179,6 +1179,54 @@ describe(createLogTree, () => {
 		expect(logs[0].children).toHaveLength(1);
 		expect(logs[0].children[0].node.name).toBe(aiModelNode.name);
 	});
+
+	it('should not duplicate parent node placeholder when multiple child nodes have the same parent without run data', () => {
+		// This test covers the AI-1726 bug scenario:
+		// When AI Agent execution finishes with error, the agent is NOT in runData
+		// But its child nodes (LLM and tools) ARE in runData
+		// Each child tries to insert the AI Agent as a placeholder
+		// Before the fix: AI Agent appeared twice (once per child)
+		// After the fix: AI Agent appears only once
+		const llmNode = createTestNode({ name: 'Anthropic Chat Model' });
+		const toolNode = createTestNode({ name: 'HTTP Request' });
+		const logs = createLogTree(
+			createTestWorkflowObject({
+				nodes: [aiAgentNode, llmNode, toolNode],
+				connections: {
+					[llmNode.name]: {
+						[NodeConnectionTypes.AiLanguageModel]: [
+							[{ node: aiAgentNode.name, index: 0, type: NodeConnectionTypes.AiLanguageModel }],
+						],
+					},
+					[toolNode.name]: {
+						[NodeConnectionTypes.AiTool]: [
+							[{ node: aiAgentNode.name, index: 0, type: NodeConnectionTypes.AiTool }],
+						],
+					},
+				},
+			}),
+			createTestWorkflowExecutionResponse({
+				data: createRunExecutionData({
+					resultData: {
+						runData: {
+							// AI Agent is NOT in runData (error case)
+							[llmNode.name]: [createTestTaskData()],
+							[toolNode.name]: [createTestTaskData()],
+						},
+					},
+				}),
+			}),
+		);
+
+		// Should have only ONE AI Agent entry (not duplicated)
+		expect(logs).toHaveLength(1);
+		expect(logs[0].node.name).toBe(aiAgentNode.name);
+		expect(logs[0].runData).toBe(undefined); // Placeholder has no runData
+		expect(logs[0].children).toHaveLength(2); // Both child nodes
+		expect(logs[0].children.map((c) => c.node.name)).toEqual(
+			expect.arrayContaining([llmNode.name, toolNode.name]),
+		);
+	});
 });
 
 describe(processFiles, () => {
diff --git a/packages/frontend/editor-ui/src/features/execution/logs/logs.utils.ts b/packages/frontend/editor-ui/src/features/execution/logs/logs.utils.ts
index 6aead582156..09a51711dfc 100644
--- a/packages/frontend/editor-ui/src/features/execution/logs/logs.utils.ts
+++ b/packages/frontend/editor-ui/src/features/execution/logs/logs.utils.ts
@@ -210,54 +210,75 @@ function createLogTreeRec(
 ): LogEntry[] {
 	const runData = context.data.resultData.runData;
 
-	return Object.entries(runData)
-		.flatMap<{
-			node: INode;
-			task?: ITaskData;
-			runIndex?: number;
-			nodeHasMultipleRuns: boolean;
-		}>(([nodeName, taskData]) => {
-			const node = context.workflow.getNode(nodeName);
+	const intermediateResult = Object.entries(runData).flatMap<{
+		node: INode;
+		task?: ITaskData;
+		runIndex?: number;
+		nodeHasMultipleRuns: boolean;
+	}>(([nodeName, taskData]) => {
+		const node = context.workflow.getNode(nodeName);
 
-			if (node === null || (filter && filter.rootNodeId !== node.id)) {
-				return [];
-			}
+		if (node === null || (filter && filter.rootNodeId !== node.id)) {
+			return [];
+		}
 
-			const childNodes = context.workflow.getChildNodes(nodeName, 'ALL_NON_MAIN');
+		const childNodes = context.workflow.getChildNodes(nodeName, 'ALL_NON_MAIN');
 
-			if (childNodes.length === 0) {
-				// The node is root node
-				const taskDataList = taskData.map((task, runIndex) => ({
-					node,
-					task,
-					runIndex,
-					nodeHasMultipleRuns: taskData.length > 1,
-				}));
+		if (childNodes.length === 0) {
+			// The node is root node
+			const taskDataList = taskData.map((task, runIndex) => ({
+				node,
+				task,
+				runIndex,
+				nodeHasMultipleRuns: taskData.length > 1,
+			}));
 
-				return filter
-					? taskDataList.filter((item) => item.runIndex === filter.rootNodeRunIndex)
-					: taskDataList;
-			}
+			return filter
+				? taskDataList.filter((item) => item.runIndex === filter.rootNodeRunIndex)
+				: taskDataList;
+		}
 
-			// The node is sub node
-			if (childNodes.some((child) => (runData[child] ?? []).length > 0)) {
-				return [];
-			}
+		// The node is sub node
+		if (childNodes.some((child) => (runData[child] ?? []).length > 0)) {
+			return [];
+		}
 
-			// The sub node has data but its children don't: this can happen for partial execution of tools.
-			// In this case, we insert first child as placeholder so that the node is included in the tree.
-			const firstChild = context.workflow.getNode(childNodes[0]);
+		// The sub node has data but its children don't: this can happen for partial execution of tools.
+		// In this case, we insert first child as placeholder so that the node is included in the tree.
+		const firstChild = context.workflow.getNode(childNodes[0]);
 
-			if (firstChild === null) {
-				return [];
-			}
+		if (firstChild === null) {
+			return [];
+		}
 
-			return [{ node: firstChild, nodeHasMultipleRuns: false }];
-		})
+		return [{ node: firstChild, nodeHasMultipleRuns: false }];
+	});
+
+	// Deduplicate placeholder entries (entries without task data)
+	// This prevents duplicate parent nodes when multiple child nodes try to insert the same placeholder
+	const seenPlaceholders = new Set<string>();
+	const deduplicated = intermediateResult.filter((entry) => {
+		// Keep all entries with actual task data
+		if (entry.task !== undefined) {
+			return true;
+		}
+
+		// For placeholders, keep only the first occurrence of each node
+		if (seenPlaceholders.has(entry.node.id)) {
+			return false;
+		}
+
+		seenPlaceholders.add(entry.node.id);
+		return true;
+	});
+
+	const result = deduplicated
 		.flatMap(({ node, runIndex, task, nodeHasMultipleRuns }) =>
 			getTreeNodeData(node, task, nodeHasMultipleRuns ? runIndex : undefined, context),
 		)
 		.sort(sortLogEntries);
+
+	return result;
 }
 
 export function createLogTree(
@@ -396,16 +417,26 @@ export function mergeStartData(
 	const runData = Object.fromEntries(
 		nodeNames.map<[string, ITaskData[]]>((nodeName) => {
 			const tasks = response.data?.resultData.runData[nodeName] ?? [];
+
 			const mergedTasks = tasks.concat(
 				(startData[nodeName] ?? [])
-					.filter((task) =>
-						// To remove duplicate runs, we check start time in addition to execution index
-						// because nodes such as Wait and Form emits multiple websocket events with
-						// different execution index for a single run
-						tasks.every(
-							(t) => t.startTime < task.startTime && t.executionIndex !== task.executionIndex,
-						),
-					)
+					.filter((task) => {
+						// To remove duplicate runs, we check if there's an exact match in the final tasks
+						// An exact match means the task has the same executionIndex AND startTime
+						// This handles AI agent cases where the same execution appears in both
+						// startData (from nodeExecuteBefore events) and final results
+						const hasExactMatch = tasks.some(
+							(t) => t.executionIndex === task.executionIndex && t.startTime === task.startTime,
+						);
+
+						if (hasExactMatch) {
+							return false; // Filter out duplicates
+						}
+
+						// Keep tasks from startData that started after all existing tasks
+						// This handles cases like Wait and Form nodes that emit multiple websocket events
+						return tasks.every((t) => t.startTime < task.startTime);
+					})
 					.map<ITaskData>((task) => ({
 						...task,
 						executionTime: 0,

From 31e5b4590b55a893b3607fd03da94223e073972a Mon Sep 17 00:00:00 2001
From: Declan Carroll <declan@n8n.io>
Date: Thu, 4 Dec 2025 12:01:52 +0000
Subject: [PATCH 055/167] ci: Add consolidated check job so we can change
 branch protection rules (#22732)

---
 .github/actionlint.yaml                |  1 +
 .github/workflows/ci-pull-requests.yml | 19 +++++++++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/.github/actionlint.yaml b/.github/actionlint.yaml
index 4fd255842e4..6c682e673e4 100644
--- a/.github/actionlint.yaml
+++ b/.github/actionlint.yaml
@@ -5,3 +5,4 @@ self-hosted-runner:
     - blacksmith-2vcpu-ubuntu-2204-arm
     - blacksmith-4vcpu-ubuntu-2204-arm
     - blacksmith-8vcpu-ubuntu-2204
+    - ubuntu-slim
diff --git a/.github/workflows/ci-pull-requests.yml b/.github/workflows/ci-pull-requests.yml
index 269bdce4ba5..ef4d0034edd 100644
--- a/.github/workflows/ci-pull-requests.yml
+++ b/.github/workflows/ci-pull-requests.yml
@@ -135,12 +135,19 @@ jobs:
     uses: ./.github/workflows/playwright-test-reusable.yml
     secrets: inherit
 
-  e2e-checks:
-    name: E2E - Checks
-    runs-on: ubuntu-latest
-    needs: [e2e-test]
+  # This job is required by GitHub branch protection rules.
+  # PRs cannot be merged unless this job passes.
+  # If you add/remove jobs that should block merging, update the 'needs' array below.
+  required-checks:
+    name: Required Checks
+    needs: [install-and-build, unit-test, typecheck, lint, e2e-test]
     if: always()
+    runs-on: ubuntu-slim
     steps:
-      - name: Fail if E2E tests failed
-        if: needs.e2e-test.result == 'failure'
+      - name: Fail if any required job failed or was skipped unexpectedly
+        # The non_python_changed check allows jobs to be skipped for python-only changes,
+        # since those jobs don't run when only python files are modified.
+        if: |
+          contains(needs.*.result, 'failure') ||
+          (needs.install-and-build.outputs.non_python_changed == 'true' && contains(needs.*.result, 'skipped'))
         run: exit 1

From 70aad196d60a79536899f8c85334c21f0cf090fc Mon Sep 17 00:00:00 2001
From: Declan Carroll <declan@n8n.io>
Date: Thu, 4 Dec 2025 12:23:11 +0000
Subject: [PATCH 056/167] ci: Use multimain as default for e2e (#22255)

---
 .github/workflows/ci-pull-requests.yml        |  15 +--
 .github/workflows/docker-build-push.yml       |  12 --
 .github/workflows/playwright-nightly.yml      |  29 -----
 .github/workflows/playwright-test-ci.yml      |  52 +++++++++
 .../playwright-test-docker-build.yml          |  14 ---
 .../workflows/playwright-test-reusable.yml    |  15 ++-
 .../cli/src/controllers/e2e.controller.ts     |   9 ++
 .../containers/n8n-test-container-creation.ts |  28 ++++-
 .../n8n-test-container-dependencies.ts        |   5 +-
 .../containers/n8n-test-container-utils.ts    |  14 +++
 .../testing/containers/pull-test-images.ts    |   4 +-
 .../testing/containers/test-containers.ts     |  16 ++-
 packages/testing/playwright/fixtures/base.ts  |  20 +++-
 packages/testing/playwright/package.json      |   8 ++
 .../playwright/tests/ui/13-pinning.spec.ts    |   3 +-
 .../tests/ui/16-webhook-node.spec.ts          |   3 +-
 .../playwright/tests/ui/19-execution.spec.ts  |   6 +-
 .../playwright/tests/ui/50-logs.spec.ts       |  10 +-
 .../53-workflow-production-checklist.spec.ts  |   3 +-
 .../tests/ui/7-workflow-actions.spec.ts       |   9 +-
 .../tests/ui/execute-previous-nodes.spec.ts   |   3 +-
 .../tests/ui/task-runner-demo.spec.ts         |   5 +-
 scripts/dockerize-n8n.mjs                     | 106 +++++++++++++-----
 23 files changed, 269 insertions(+), 120 deletions(-)
 delete mode 100644 .github/workflows/playwright-nightly.yml
 create mode 100644 .github/workflows/playwright-test-ci.yml
 delete mode 100644 .github/workflows/playwright-test-docker-build.yml

diff --git a/.github/workflows/ci-pull-requests.yml b/.github/workflows/ci-pull-requests.yml
index ef4d0034edd..ee6594aecb2 100644
--- a/.github/workflows/ci-pull-requests.yml
+++ b/.github/workflows/ci-pull-requests.yml
@@ -123,16 +123,11 @@ jobs:
     with:
       ref: refs/pull/${{ github.event.pull_request.number }}/merge
 
-  e2e-test:
+  e2e-tests:
     name: E2E Tests
-    needs: [install-and-build, unit-test, typecheck, lint]
-    if: |
-      always() &&
-      needs.install-and-build.result == 'success' &&
-      needs.unit-test.result != 'failure' &&
-      needs.typecheck.result != 'failure' &&
-      needs.lint.result != 'failure'
-    uses: ./.github/workflows/playwright-test-reusable.yml
+    needs: [install-and-build]
+    if: needs.install-and-build.outputs.non_python_changed == 'true'
+    uses: ./.github/workflows/playwright-test-ci.yml
     secrets: inherit
 
   # This job is required by GitHub branch protection rules.
@@ -140,7 +135,7 @@ jobs:
   # If you add/remove jobs that should block merging, update the 'needs' array below.
   required-checks:
     name: Required Checks
-    needs: [install-and-build, unit-test, typecheck, lint, e2e-test]
+    needs: [install-and-build, unit-test, typecheck, lint, e2e-tests]
     if: always()
     runs-on: ubuntu-slim
     steps:
diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml
index 16caecc15ca..d03bd901c16 100644
--- a/.github/workflows/docker-build-push.yml
+++ b/.github/workflows/docker-build-push.yml
@@ -42,18 +42,6 @@ on:
         required: false
         type: string
 
-  pull_request:
-    types:
-      - opened
-      - ready_for_review
-    paths:
-      - '.github/workflows/docker-build-push.yml'
-      - '.github/scripts/docker/docker-config.mjs'
-      - '.github/scripts/docker/docker-tags.mjs'
-      - 'docker/images/n8n/Dockerfile'
-      - 'docker/images/runners/Dockerfile'
-      - 'docker/images/runners/Dockerfile.distroless'
-
 jobs:
   determine-build-context:
     name: Determine Build Context
diff --git a/.github/workflows/playwright-nightly.yml b/.github/workflows/playwright-nightly.yml
deleted file mode 100644
index f458f3d118c..00000000000
--- a/.github/workflows/playwright-nightly.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-name: Playwright Tests - Nightly
-
-on:
-  schedule:
-    - cron: '0 4 * * *'
-  workflow_dispatch:
-    inputs:
-      image:
-        description: 'Docker image to test against'
-        required: false
-        default: 'n8nio/n8n:nightly'
-        type: string
-  push:
-    branches:
-      - ci-containers-nightly
-
-jobs:
-  test-configurations:
-    strategy:
-      fail-fast: false
-      matrix:
-        config: [standard, postgres]
-    name: Test ${{ matrix.config }}
-    uses: ./.github/workflows/playwright-test-reusable.yml
-    with:
-      test-mode: docker-pull
-      docker-image: ${{ github.event.inputs.image || 'n8nio/n8n:nightly' }}
-      test-command: pnpm --filter=n8n-playwright test:container:${{ matrix.config }}
-    secrets: inherit
diff --git a/.github/workflows/playwright-test-ci.yml b/.github/workflows/playwright-test-ci.yml
new file mode 100644
index 00000000000..c5ccbe1c9d0
--- /dev/null
+++ b/.github/workflows/playwright-test-ci.yml
@@ -0,0 +1,52 @@
+name: E2E Tests for CI
+
+on:
+  workflow_call:
+
+jobs:
+  # Multi-main: postgres + redis + caddy + 2 mains + 1 worker
+  multi-main-ui:
+    name: 'Multi-Main: UI'
+    uses: ./.github/workflows/playwright-test-reusable.yml
+    with:
+      test-mode: docker-build
+      test-command: pnpm --filter=n8n-playwright test:container:multi-main:ui
+      shards: '[1, 2, 3, 4, 5, 6, 7, 8]'
+      runner: blacksmith-4vcpu-ubuntu-2204
+      workers: '1'
+    secrets: inherit
+
+  multi-main-isolated:
+    name: 'Multi-Main: Isolated'
+    uses: ./.github/workflows/playwright-test-reusable.yml
+    with:
+      test-mode: docker-build
+      test-command: pnpm --filter=n8n-playwright test:container:multi-main:isolated
+      shards: '[1]'
+      runner: blacksmith-4vcpu-ubuntu-2204
+      workers: '1'
+    secrets: inherit
+
+  # Standard: Single n8n instance with SQLite
+  # TODO: Enable after confirmed costs with currents/blacksmith
+  # standard-ui:
+  #   name: 'Standard: UI'
+  #   uses: ./.github/workflows/playwright-test-reusable.yml
+  #   with:
+  #     test-mode: docker-build
+  #     test-command: pnpm --filter=n8n-playwright test:container:standard:ui
+  #     shards: '[1, 2, 3, 4, 5]'
+  #     runner: blacksmith-2vcpu-ubuntu-2204
+  #     workers: '2'
+  #   secrets: inherit
+
+  # standard-isolated:
+  #   name: 'Standard: Isolated'
+  #   uses: ./.github/workflows/playwright-test-reusable.yml
+  #   with:
+  #     test-mode: docker-build
+  #     test-command: pnpm --filter=n8n-playwright test:container:standard:isolated
+  #     shards: '[1]'
+  #     runner: blacksmith-2vcpu-ubuntu-2204
+  #     workers: '1'
+  #   secrets: inherit
diff --git a/.github/workflows/playwright-test-docker-build.yml b/.github/workflows/playwright-test-docker-build.yml
deleted file mode 100644
index 4661f05330f..00000000000
--- a/.github/workflows/playwright-test-docker-build.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-name: Run Playwright Tests (Docker Build)
-# This workflow is used to run Playwright tests in a Docker container built from the current branch
-
-on:
-  workflow_call:
-  workflow_dispatch:
-
-jobs:
-  build-and-test:
-    uses: ./.github/workflows/playwright-test-reusable.yml
-    with:
-      test-mode: docker-build
-      test-command: pnpm --filter=n8n-playwright test:container:standard
-    secrets: inherit
diff --git a/.github/workflows/playwright-test-reusable.yml b/.github/workflows/playwright-test-reusable.yml
index 5759de3862a..4f85fcafb14 100644
--- a/.github/workflows/playwright-test-reusable.yml
+++ b/.github/workflows/playwright-test-reusable.yml
@@ -32,6 +32,11 @@ on:
         required: false
         default: ''
         type: string
+      runner:
+        description: 'GitHub runner to use'
+        required: false
+        default: 'blacksmith-2vcpu-ubuntu-2204'
+        type: string
 
     secrets:
       CURRENTS_RECORD_KEY:
@@ -42,6 +47,10 @@ on:
         required: false
       QA_PERFORMANCE_METRICS_WEBHOOK_PASSWORD:
         required: false
+      N8N_LICENSE_ACTIVATION_KEY:
+        required: false
+      N8N_ENCRYPTION_KEY:
+        required: false
 
 env:
   PLAYWRIGHT_BROWSERS_PATH: packages/testing/playwright/ms-playwright-cache
@@ -49,10 +58,13 @@ env:
   # Disable Ryuk to avoid issues with Docker since it needs privileged access, containers are cleaned on teardown anyway
   TESTCONTAINERS_RYUK_DISABLED: true
   PLAYWRIGHT_WORKERS: ${{ inputs.workers || '2' }} # Configurable workers, defaults to 2 to reduce resource contention
+  # Must match CI's COVERAGE_ENABLED to ensure Turbo cache hits (it's a globalEnv in turbo.json)
+  COVERAGE_ENABLED: 'true'
 
 jobs:
   test:
-    runs-on: blacksmith-2vcpu-ubuntu-2204
+    runs-on: ${{ inputs.runner }}
+    timeout-minutes: 20
     strategy:
       fail-fast: false
       matrix:
@@ -101,3 +113,4 @@ jobs:
           QA_PERFORMANCE_METRICS_WEBHOOK_URL: ${{ secrets.QA_PERFORMANCE_METRICS_WEBHOOK_URL }}
           QA_PERFORMANCE_METRICS_WEBHOOK_USER: ${{ secrets.QA_PERFORMANCE_METRICS_WEBHOOK_USER }}
           QA_PERFORMANCE_METRICS_WEBHOOK_PASSWORD: ${{ secrets.QA_PERFORMANCE_METRICS_WEBHOOK_PASSWORD }}
+          N8N_LICENSE_ACTIVATION_KEY: ${{ secrets.N8N_LICENSE_ACTIVATION_KEY }}
diff --git a/packages/cli/src/controllers/e2e.controller.ts b/packages/cli/src/controllers/e2e.controller.ts
index 11d6be146f2..3548867b510 100644
--- a/packages/cli/src/controllers/e2e.controller.ts
+++ b/packages/cli/src/controllers/e2e.controller.ts
@@ -3,6 +3,7 @@ import { Logger } from '@n8n/backend-common';
 import type { BooleanLicenseFeature, NumericLicenseFeature } from '@n8n/constants';
 import { LICENSE_FEATURES, LICENSE_QUOTAS, UNLIMITED_LICENSE_QUOTA } from '@n8n/constants';
 import {
+	AuthRolesService,
 	GLOBAL_ADMIN_ROLE,
 	GLOBAL_MEMBER_ROLE,
 	GLOBAL_OWNER_ROLE,
@@ -191,6 +192,7 @@ export class E2EController {
 		await this.resetLogStreaming();
 		await this.removeActiveWorkflows();
 		await this.truncateAll();
+		await this.reseedRolesAndScopes();
 		await this.resetCache();
 		await this.setupUserManagement(req.body.owner, req.body.members, req.body.admin);
 	}
@@ -304,6 +306,13 @@ export class E2EController {
 		}
 	}
 
+	private async reseedRolesAndScopes() {
+		// Re-initialize scopes and roles after truncation so that foreign keys
+		// from users and project relations can be created safely, especially
+		// on databases that strictly enforce foreign keys like Postgres.
+		await Container.get(AuthRolesService).init();
+	}
+
 	private async setupUserManagement(
 		owner: UserSetupPayload,
 		members: UserSetupPayload[],
diff --git a/packages/testing/containers/n8n-test-container-creation.ts b/packages/testing/containers/n8n-test-container-creation.ts
index 3995547e733..0516c2f0578 100644
--- a/packages/testing/containers/n8n-test-container-creation.ts
+++ b/packages/testing/containers/n8n-test-container-creation.ts
@@ -29,7 +29,7 @@ import {
 } from './n8n-test-container-dependencies';
 import { setupGitea } from './n8n-test-container-gitea';
 import { setupMailpit, getMailpitEnvironment } from './n8n-test-container-mailpit';
-import { createSilentLogConsumer } from './n8n-test-container-utils';
+import { createElapsedLogger, createSilentLogConsumer } from './n8n-test-container-utils';
 import { TEST_CONTAINER_IMAGES } from './test-containers';
 
 // --- Constants ---
@@ -47,7 +47,7 @@ const N8N_IMAGE = getDockerImageFromEnv(N8N_E2E_IMAGE);
 // Base environment for all n8n instances
 const BASE_ENV: Record<string, string> = {
 	N8N_LOG_LEVEL: 'debug',
-	N8N_ENCRYPTION_KEY: 'test-encryption-key',
+	N8N_ENCRYPTION_KEY: process.env.N8N_ENCRYPTION_KEY ?? 'test-encryption-key',
 	E2E_TESTS: 'false',
 	QUEUE_HEALTH_CHECK_ACTIVE: 'true',
 	N8N_DIAGNOSTICS_ENABLED: 'false',
@@ -55,6 +55,8 @@ const BASE_ENV: Record<string, string> = {
 	NODE_ENV: 'development', // If this is set to test, the n8n container will not start, insights module is not found??
 	N8N_LICENSE_TENANT_ID: process.env.N8N_LICENSE_TENANT_ID ?? '1001',
 	N8N_LICENSE_ACTIVATION_KEY: process.env.N8N_LICENSE_ACTIVATION_KEY ?? '',
+	N8N_LICENSE_CERT: process.env.N8N_LICENSE_CERT ?? '',
+	N8N_DYNAMIC_BANNERS_ENABLED: 'false',
 };
 
 // Wait strategy for n8n main containers
@@ -121,6 +123,8 @@ export interface N8NStack {
  * });
  */
 export async function createN8NStack(config: N8NConfig = {}): Promise<N8NStack> {
+	const log = createElapsedLogger('n8n-stack');
+
 	const {
 		postgres = false,
 		queueMode = false,
@@ -140,6 +144,8 @@ export async function createN8NStack(config: N8NConfig = {}): Promise<N8NStack>
 	const uniqueProjectName = projectName ?? `n8n-stack-${Math.random().toString(36).substring(7)}`;
 	const containers: StartedTestContainer[] = [];
 
+	log(`Starting stack creation: ${uniqueProjectName} (queueMode: ${JSON.stringify(queueConfig)})`);
+
 	const mainCount = queueConfig?.mains ?? 1;
 	const needsLoadBalancer = mainCount > 1;
 	const needsNetwork =
@@ -153,7 +159,9 @@ export async function createN8NStack(config: N8NConfig = {}): Promise<N8NStack>
 
 	let network: StartedNetwork | undefined;
 	if (needsNetwork) {
+		log('Creating network...');
 		network = await new Network().start();
+		log('Network created');
 	}
 
 	let environment: Record<string, string> = {
@@ -168,12 +176,14 @@ export async function createN8NStack(config: N8NConfig = {}): Promise<N8NStack>
 
 	if (usePostgres) {
 		assert(network, 'Network should be created for postgres');
+		log('Starting PostgreSQL...');
 		const postgresContainer = await setupPostgres({
 			postgresImage: POSTGRES_IMAGE,
 			projectName: uniqueProjectName,
 			network,
 		});
 		containers.push(postgresContainer.container);
+		log('PostgreSQL ready');
 		environment = {
 			...environment,
 			DB_TYPE: 'postgresdb',
@@ -189,12 +199,14 @@ export async function createN8NStack(config: N8NConfig = {}): Promise<N8NStack>
 
 	if (queueConfig) {
 		assert(network, 'Network should be created for queue mode');
+		log('Starting Redis...');
 		const redis = await setupRedis({
 			redisImage: REDIS_IMAGE,
 			projectName: uniqueProjectName,
 			network,
 		});
 		containers.push(redis);
+		log('Redis ready');
 		environment = {
 			...environment,
 			EXECUTIONS_MODE: 'queue',
@@ -274,6 +286,7 @@ export async function createN8NStack(config: N8NConfig = {}): Promise<N8NStack>
 
 	if (needsLoadBalancer) {
 		assert(network, 'Network should be created for load balancer');
+		log('Starting Caddy load balancer...');
 		const loadBalancerContainer = await setupCaddyLoadBalancer({
 			caddyImage: CADDY_IMAGE,
 			projectName: uniqueProjectName,
@@ -281,6 +294,7 @@ export async function createN8NStack(config: N8NConfig = {}): Promise<N8NStack>
 			network,
 		});
 		containers.push(loadBalancerContainer);
+		log('Caddy load balancer ready');
 
 		const loadBalancerPort = loadBalancerContainer.getMappedPort(80);
 		baseUrl = `http://localhost:${loadBalancerPort}`;
@@ -289,6 +303,7 @@ export async function createN8NStack(config: N8NConfig = {}): Promise<N8NStack>
 			WEBHOOK_URL: baseUrl,
 		};
 
+		log(`Starting n8n instances (${mainCount} mains, ${queueConfig?.workers ?? 0} workers)...`);
 		const instances = await createN8NInstances({
 			mainCount,
 			workerCount: queueConfig?.workers ?? 0,
@@ -298,9 +313,12 @@ export async function createN8NStack(config: N8NConfig = {}): Promise<N8NStack>
 			resourceQuota,
 		});
 		containers.push(...instances);
+		log('All n8n instances started');
 
 		// Wait for all containers to be ready behind the load balancer
+		log('Polling load balancer for readiness...');
 		await pollContainerHttpEndpoint(loadBalancerContainer, '/healthz/readiness');
+		log('Load balancer is ready');
 	} else {
 		const assignedPort = await getPort();
 		baseUrl = `http://localhost:${assignedPort}`;
@@ -346,6 +364,7 @@ export async function createN8NStack(config: N8NConfig = {}): Promise<N8NStack>
 		containers.push(giteaContainer);
 	}
 
+	log(`Stack ready! baseUrl: ${baseUrl}`);
 	return {
 		baseUrl,
 		stop: async () => {
@@ -428,11 +447,13 @@ async function createN8NInstances({
 	resourceQuota,
 }: CreateInstancesOptions): Promise<StartedTestContainer[]> {
 	const instances: StartedTestContainer[] = [];
+	const log = createElapsedLogger('n8n-instances');
 
 	// Create main instances sequentially to avoid database migration conflicts
 	for (let i = 1; i <= mainCount; i++) {
 		const name = mainCount > 1 ? `${uniqueProjectName}-n8n-main-${i}` : `${uniqueProjectName}-n8n`;
 		const networkAlias = mainCount > 1 ? name : `${uniqueProjectName}-n8n-main-1`;
+		log(`Starting main ${i}/${mainCount}: ${name}`);
 		const container = await createN8NContainer({
 			name,
 			uniqueProjectName,
@@ -445,11 +466,13 @@ async function createN8NInstances({
 			resourceQuota,
 		});
 		instances.push(container);
+		log(`Main ${i}/${mainCount} ready`);
 	}
 
 	// Create worker instances
 	for (let i = 1; i <= workerCount; i++) {
 		const name = `${uniqueProjectName}-n8n-worker-${i}`;
+		log(`Starting worker ${i}/${workerCount}: ${name}`);
 		const container = await createN8NContainer({
 			name,
 			uniqueProjectName,
@@ -460,6 +483,7 @@ async function createN8NInstances({
 			resourceQuota,
 		});
 		instances.push(container);
+		log(`Worker ${i}/${workerCount} ready`);
 	}
 
 	return instances;
diff --git a/packages/testing/containers/n8n-test-container-dependencies.ts b/packages/testing/containers/n8n-test-container-dependencies.ts
index 571a3932371..aa531492d04 100644
--- a/packages/testing/containers/n8n-test-container-dependencies.ts
+++ b/packages/testing/containers/n8n-test-container-dependencies.ts
@@ -210,8 +210,9 @@ function buildCaddyConfig(upstreamServers: string[]): string {
 :80 {
   # Reverse proxy with load balancing
   reverse_proxy ${backends} {
-    # Enable sticky sessions using cookie
-    lb_policy cookie
+    # Use first available backend for simpler debugging
+    # (cookie-based sticky sessions can cause issues with separate API/browser contexts)
+    lb_policy first
 
     # Health check (optional)
     health_uri /healthz
diff --git a/packages/testing/containers/n8n-test-container-utils.ts b/packages/testing/containers/n8n-test-container-utils.ts
index 7eef6e5f46a..1622373df77 100644
--- a/packages/testing/containers/n8n-test-container-utils.ts
+++ b/packages/testing/containers/n8n-test-container-utils.ts
@@ -1,5 +1,19 @@
 import type { Readable } from 'stream';
 
+/**
+ * Create a logger that prefixes messages with elapsed time since creation
+ * @param prefix - Prefix string for log messages (e.g., 'n8n-stack', 'n8n-instances')
+ * @returns A log function that outputs messages with elapsed time
+ */
+export function createElapsedLogger(prefix: string) {
+	const startTime = Date.now();
+
+	return (message: string) => {
+		const elapsed = ((Date.now() - startTime) / 1000).toFixed(2);
+		console.log(`[${prefix} +${elapsed}s] ${message}`);
+	};
+}
+
 /**
  * Create a log consumer that does not log to the console
  * @returns A tuple containing the log consumer and a function to throw an error with logs
diff --git a/packages/testing/containers/pull-test-images.ts b/packages/testing/containers/pull-test-images.ts
index fe0b8a1f3c0..249778dba06 100755
--- a/packages/testing/containers/pull-test-images.ts
+++ b/packages/testing/containers/pull-test-images.ts
@@ -13,8 +13,8 @@ const timings = [];
 const images = Object.values(TEST_CONTAINER_IMAGES);
 
 for (const image of images) {
-	// Skip local builds that won't exist in registry
-	if (image.includes(':local') && !process.env.N8N_DOCKER_IMAGE) {
+	// Skip :local tagged images - these are locally built and won't exist in any registry
+	if (image.endsWith(':local')) {
 		console.log(`\n⏭️  Skipping ${image} (local build)`);
 		continue;
 	}
diff --git a/packages/testing/containers/test-containers.ts b/packages/testing/containers/test-containers.ts
index 68a4b1c346b..1a33819812f 100644
--- a/packages/testing/containers/test-containers.ts
+++ b/packages/testing/containers/test-containers.ts
@@ -5,12 +5,26 @@
 // Use N8N_DOCKER_IMAGE env var if set, otherwise default to 'n8nio/n8n:local'
 const n8nImage = process.env.N8N_DOCKER_IMAGE ?? 'n8nio/n8n:local';
 
+// Derive the task runner image from the n8n image tag for consistency
+// e.g., 'n8nio/n8n:local' -> 'n8nio/runners:local'
+// e.g., 'n8nio/n8n:1.50.0' -> 'n8nio/runners:1.50.0'
+function getTaskRunnerImage(): string {
+	// Allow explicit override via env var
+	if (process.env.N8N_RUNNERS_IMAGE) {
+		return process.env.N8N_RUNNERS_IMAGE;
+	}
+
+	// Extract the tag from the n8n image and apply it to runners
+	const tag = n8nImage.split(':').at(-1) ?? 'local';
+	return `n8nio/runners:${tag}`;
+}
+
 export const TEST_CONTAINER_IMAGES = {
 	postgres: 'postgres:18-alpine',
 	redis: 'redis:alpine',
 	caddy: 'caddy:alpine',
 	n8n: n8nImage,
-	taskRunner: 'n8nio/runners:nightly',
+	taskRunner: getTaskRunnerImage(),
 	mailpit: 'axllent/mailpit:latest',
 	mockserver: 'mockserver/mockserver:5.15.0',
 	gitea: 'gitea/gitea:1.25.1',
diff --git a/packages/testing/playwright/fixtures/base.ts b/packages/testing/playwright/fixtures/base.ts
index a156c57f610..3cbe1866d19 100644
--- a/packages/testing/playwright/fixtures/base.ts
+++ b/packages/testing/playwright/fixtures/base.ts
@@ -92,7 +92,7 @@ export const test = base.extend<
 
 	// Create a new n8n container if N8N_BASE_URL is not set, otherwise use the existing n8n instance
 	n8nContainer: [
-		async ({ containerConfig }, use) => {
+		async ({ containerConfig }, use, workerInfo) => {
 			const envBaseURL = process.env.N8N_BASE_URL;
 
 			if (envBaseURL) {
@@ -100,10 +100,22 @@ export const test = base.extend<
 				return;
 			}
 
-			console.log('Creating container with config:', containerConfig);
-			const container = await createN8NStack(containerConfig);
+			const startTime = Date.now();
+			console.log(
+				`[${new Date().toISOString()}] Creating container for project: ${workerInfo.project.name}, worker: ${workerInfo.workerIndex}`,
+			);
+			console.log('Container config:', JSON.stringify(containerConfig));
 
-			console.log(`Container URL: ${container.baseUrl}`);
+			const container = await createN8NStack(containerConfig);
+			const duration = ((Date.now() - startTime) / 1000).toFixed(1);
+
+			console.log(
+				`[${new Date().toISOString()}] Container created in ${duration}s - URL: ${container.baseUrl}`,
+			);
+
+			console.log(
+				`[${new Date().toISOString()}] Container created in ${duration}s - URL: ${container.baseUrl}`,
+			);
 
 			await use(container);
 			await container.stop();
diff --git a/packages/testing/playwright/package.json b/packages/testing/playwright/package.json
index 9c4c871f709..3bd5d1d6209 100644
--- a/packages/testing/playwright/package.json
+++ b/packages/testing/playwright/package.json
@@ -4,13 +4,21 @@
   "scripts": {
     "test:all": "playwright test",
     "test:local": "N8N_BASE_URL=http://localhost:5680 RESET_E2E_DB=true playwright test --project=ui --project=ui:isolated",
+    "test:local:ui-only": "N8N_BASE_URL=http://localhost:5680 RESET_E2E_DB=true playwright test --project=ui",
+    "test:local:isolated": "N8N_BASE_URL=http://localhost:5680 RESET_E2E_DB=true playwright test --project=ui:isolated",
     "test:ui": "playwright test --project=*ui*",
     "test:performance": "playwright test --project=performance",
     "test:chaos": "playwright test --project='*:chaos'",
     "test:container:standard": "playwright test --project='standard:*'",
+    "test:container:standard:ui": "playwright test --project='standard:ui'",
+    "test:container:standard:isolated": "playwright test --project='standard:ui:isolated'",
     "test:container:postgres": "playwright test --project='postgres:*'",
     "test:container:queue": "playwright test --project='queue:*'",
+    "test:container:queue:ui-only": "playwright test --project='queue:ui'",
+    "test:container:queue:isolated": "playwright test --project='queue:ui:isolated'",
     "test:container:multi-main": "playwright test --project='multi-main:*'",
+    "test:container:multi-main:ui": "playwright test --project='multi-main:ui'",
+    "test:container:multi-main:isolated": "playwright test --project='multi-main:ui:isolated'",
     "test:container:trial": "playwright test --project='trial:*'",
     "test:workflows:setup": "tsx ./tests/cli-workflows/setup-workflow-tests.ts",
     "test:workflows": "playwright test --project=cli-workflows",
diff --git a/packages/testing/playwright/tests/ui/13-pinning.spec.ts b/packages/testing/playwright/tests/ui/13-pinning.spec.ts
index b54570bdde2..6fef1f859d9 100644
--- a/packages/testing/playwright/tests/ui/13-pinning.spec.ts
+++ b/packages/testing/playwright/tests/ui/13-pinning.spec.ts
@@ -199,7 +199,8 @@ test.describe('Data pinning', () => {
 			await expect(n8n.ndv.outputPanel.getTableRow(1)).toContainText('pin-overwritten');
 		});
 
-		test('should not use pin data in production webhook executions', async ({
+		// eslint-disable-next-line n8n-local-rules/no-skipped-tests -- Flaky in multi-main mode due to webhook registration timing issues
+		test.skip('should not use pin data in production webhook executions', async ({
 			n8n,
 			setupRequirements,
 		}) => {
diff --git a/packages/testing/playwright/tests/ui/16-webhook-node.spec.ts b/packages/testing/playwright/tests/ui/16-webhook-node.spec.ts
index d2285124a98..482cd77321a 100644
--- a/packages/testing/playwright/tests/ui/16-webhook-node.spec.ts
+++ b/packages/testing/playwright/tests/ui/16-webhook-node.spec.ts
@@ -7,7 +7,8 @@ import { EditFieldsNode } from '../../pages/nodes/EditFieldsNode';
 const cowBase64 =
 	'data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEAYABgAAD/2wBDAAYEBQYFBAYGBQYHBwYIChAKCgkJChQODwwQFxQYGBcUFhYaHSUfGhsjHBYWICwgIyYnKSopGR8tMC0oMCUoKSj/2wBDAQcHBwoIChMKChMoGhYaKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCj/wAARCAABAAEDASIAAhEBAxEB/8QAFQABAQAAAAAAAAAAAAAAAAAAAAv/xAAUEAEAAAAAAAAAAAAAAAAAAAAA/8QAFQEBAQAAAAAAAAAAAAAAAAAAAAX/xAAUEQEAAAAAAAAAAAAAAAAAAAAA/9oADAMBAAIRAxEAPwCdABmX/9k=';
 
-test.describe('Webhook Trigger node', () => {
+// eslint-disable-next-line n8n-local-rules/no-skipped-tests -- Flaky in multi-main mode due to webhook registration timing issues
+test.describe.skip('Webhook Trigger node', () => {
 	test.describe.configure({ mode: 'serial' });
 	test.beforeEach(async ({ n8n }) => {
 		await n8n.start.fromBlankCanvas();
diff --git a/packages/testing/playwright/tests/ui/19-execution.spec.ts b/packages/testing/playwright/tests/ui/19-execution.spec.ts
index 7674a1e4f63..d0181e0f9c2 100644
--- a/packages/testing/playwright/tests/ui/19-execution.spec.ts
+++ b/packages/testing/playwright/tests/ui/19-execution.spec.ts
@@ -86,7 +86,8 @@ test.describe('Execution', () => {
 		await expect(n8n.canvas.clearExecutionDataButton()).toBeHidden();
 	});
 
-	test('should test manual workflow stop', async ({ n8n }) => {
+	// eslint-disable-next-line playwright/no-skipped-test -- Failing/flaky in multi-main
+	test.skip('should test manual workflow stop', async ({ n8n }) => {
 		await n8n.start.fromImportedWorkflow('Manual_wait_set.json');
 
 		await expect(n8n.canvas.getExecuteWorkflowButton()).toBeVisible();
@@ -122,7 +123,8 @@ test.describe('Execution', () => {
 		await expect(n8n.canvas.clearExecutionDataButton()).toBeHidden();
 	});
 
-	test('should test webhook workflow', async ({ n8n }) => {
+	// eslint-disable-next-line n8n-local-rules/no-skipped-tests -- Flaky in multi-main mode due to webhook registration timing issues
+	test.skip('should test webhook workflow', async ({ n8n }) => {
 		await n8n.start.fromImportedWorkflow('Webhook_wait_set.json');
 
 		await expect(n8n.canvas.getExecuteWorkflowButton()).toBeVisible();
diff --git a/packages/testing/playwright/tests/ui/50-logs.spec.ts b/packages/testing/playwright/tests/ui/50-logs.spec.ts
index 4fcc2d65f69..9b1a9b406ba 100644
--- a/packages/testing/playwright/tests/ui/50-logs.spec.ts
+++ b/packages/testing/playwright/tests/ui/50-logs.spec.ts
@@ -231,7 +231,10 @@ test.describe('Logs', () => {
 		await expect(n8n.executions.logsPanel.getLogEntries().nth(2)).toContainText('E2E Chat Model');
 	});
 
-	test('should show logs for a workflow with a node that waits for webhook', async ({ n8n }) => {
+	// eslint-disable-next-line n8n-local-rules/no-skipped-tests -- Flaky in multi-main mode due to webhook registration timing issues
+	test.skip('should show logs for a workflow with a node that waits for webhook', async ({
+		n8n,
+	}) => {
 		await n8n.start.fromImportedWorkflow('Workflow_wait_for_webhook.json');
 		await n8n.canvas.deselectAll();
 		await n8n.canvas.logsPanel.open();
@@ -267,7 +270,10 @@ test.describe('Logs', () => {
 		await expect(n8n.canvas.logsPanel.getLogEntries().nth(1)).toContainText('Success');
 	});
 
-	test('should allow to cancel a workflow with a node that waits for webhook', async ({ n8n }) => {
+	// eslint-disable-next-line n8n-local-rules/no-skipped-tests -- Flaky in multi-main mode due to webhook registration timing issues
+	test.skip('should allow to cancel a workflow with a node that waits for webhook', async ({
+		n8n,
+	}) => {
 		await n8n.start.fromImportedWorkflow('Workflow_wait_for_webhook.json');
 		await n8n.canvas.deselectAll();
 		await n8n.canvas.logsPanel.open();
diff --git a/packages/testing/playwright/tests/ui/53-workflow-production-checklist.spec.ts b/packages/testing/playwright/tests/ui/53-workflow-production-checklist.spec.ts
index dc69d11b983..4379b4b7be6 100644
--- a/packages/testing/playwright/tests/ui/53-workflow-production-checklist.spec.ts
+++ b/packages/testing/playwright/tests/ui/53-workflow-production-checklist.spec.ts
@@ -103,7 +103,8 @@ test.describe('Workflow Production Checklist', () => {
 		await expect(n8n.canvas.getTimeSavedActionItem()).toBeVisible();
 	});
 
-	test('should show completed state for configured actions', async ({ n8n }) => {
+	// eslint-disable-next-line n8n-local-rules/no-skipped-tests -- Flaky in multi-main mode
+	test.skip('should show completed state for configured actions', async ({ n8n }) => {
 		await n8n.canvas.addNode(SCHEDULE_TRIGGER_NODE_NAME, { closeNDV: true });
 		await n8n.canvas.saveWorkflow();
 		await n8n.canvas.publishWorkflow();
diff --git a/packages/testing/playwright/tests/ui/7-workflow-actions.spec.ts b/packages/testing/playwright/tests/ui/7-workflow-actions.spec.ts
index 4f05ef1785d..b27bbd74a0b 100644
--- a/packages/testing/playwright/tests/ui/7-workflow-actions.spec.ts
+++ b/packages/testing/playwright/tests/ui/7-workflow-actions.spec.ts
@@ -369,7 +369,8 @@ test.describe('Workflow Actions', () => {
 		await expect(n8n.page).toHaveURL(/\/workflows$/);
 	});
 
-	test('should archive published workflow and then delete it', async ({ n8n }) => {
+	// eslint-disable-next-line n8n-local-rules/no-skipped-tests -- Flaky in multi-main mode
+	test.skip('should archive published workflow and then delete it', async ({ n8n }) => {
 		await n8n.canvas.addNode(SCHEDULE_TRIGGER_NODE_NAME, { closeNDV: true });
 		const workflowId = await saveWorkflowAndGetId(n8n);
 		await n8n.canvas.publishWorkflow();
@@ -437,7 +438,8 @@ test.describe('Workflow Actions', () => {
 		await expect(n8n.workflowSettingsModal.getUnpublishMenuItem()).not.toBeAttached();
 	});
 
-	test('should unpublish a published workflow', async ({ n8n }) => {
+	// TODO: flaky test - 18 similar failures across 10 branches in last 14 days
+	test.skip('should unpublish a published workflow', async ({ n8n }) => {
 		await n8n.canvas.addNode(SCHEDULE_TRIGGER_NODE_NAME, { closeNDV: true });
 		await n8n.canvas.publishWorkflow();
 		await n8n.page.keyboard.press('Escape');
@@ -454,7 +456,8 @@ test.describe('Workflow Actions', () => {
 		await expect(n8n.canvas.getPublishedIndicator()).not.toBeVisible();
 	});
 
-	test('should unpublish published workflow on archive', async ({ n8n }) => {
+	// eslint-disable-next-line n8n-local-rules/no-skipped-tests -- Flaky in multi-main mode
+	test.skip('should unpublish published workflow on archive', async ({ n8n }) => {
 		await n8n.canvas.addNode(SCHEDULE_TRIGGER_NODE_NAME, { closeNDV: true });
 		const workflowId = await saveWorkflowAndGetId(n8n);
 		await n8n.canvas.publishWorkflow();
diff --git a/packages/testing/playwright/tests/ui/execute-previous-nodes.spec.ts b/packages/testing/playwright/tests/ui/execute-previous-nodes.spec.ts
index bc4230a1d0c..a0c9512f96a 100644
--- a/packages/testing/playwright/tests/ui/execute-previous-nodes.spec.ts
+++ b/packages/testing/playwright/tests/ui/execute-previous-nodes.spec.ts
@@ -1,6 +1,7 @@
 import { test, expect } from '../../fixtures/base';
 
-test.describe('Execute previous nodes', () => {
+// eslint-disable-next-line n8n-local-rules/no-skipped-tests -- Flaky in multi-main mode: "execute previous nodes" also executes the current node
+test.describe.skip('Execute previous nodes', () => {
 	test('should execute only previous nodes and not the current node', async ({ n8n }) => {
 		// Import workflow with Manual Trigger -> Code1 -> Code2
 		await n8n.start.fromImportedWorkflow('execute-previous-nodes.json');
diff --git a/packages/testing/playwright/tests/ui/task-runner-demo.spec.ts b/packages/testing/playwright/tests/ui/task-runner-demo.spec.ts
index 670851c2242..7df31fc0f8a 100644
--- a/packages/testing/playwright/tests/ui/task-runner-demo.spec.ts
+++ b/packages/testing/playwright/tests/ui/task-runner-demo.spec.ts
@@ -28,7 +28,10 @@ test.describe('Task Runner Capability @capability:task-runner', () => {
 	test('should execute Python with task runner enabled', async ({ n8n }) => {
 		await n8n.start.fromBlankCanvas();
 		await n8n.canvas.addNode(MANUAL_TRIGGER_NODE_NAME);
-		await n8n.canvas.addNode(CODE_NODE_NAME, { action: 'Code in Python (Beta)', closeNDV: true });
+		await n8n.canvas.addNode(CODE_NODE_NAME, {
+			action: 'Code in Python (Native) (Beta)',
+			closeNDV: true,
+		});
 		await n8n.workflowComposer.executeWorkflowAndWaitForNotification(
 			'Workflow executed successfully',
 		);
diff --git a/scripts/dockerize-n8n.mjs b/scripts/dockerize-n8n.mjs
index b3103ed03fc..bad0fb80760 100755
--- a/scripts/dockerize-n8n.mjs
+++ b/scripts/dockerize-n8n.mjs
@@ -1,9 +1,9 @@
 #!/usr/bin/env node
 /**
- * Build n8n Docker image locally
+ * Build n8n and runners Docker images locally
  *
  * This script simulates the CI build process for local testing.
- * Default output: 'n8nio/n8n:local'
+ * Default output: 'n8nio/n8n:local' and 'n8nio/runners:local'
  * Override with IMAGE_BASE_NAME and IMAGE_TAG environment variables.
  */
 
@@ -120,14 +120,28 @@ const isInScriptsDir = path.basename(__dirname) === 'scripts';
 const rootDir = isInScriptsDir ? path.join(__dirname, '..') : __dirname;
 
 const config = {
-	dockerfilePath: path.join(rootDir, 'docker/images/n8n/Dockerfile'),
-	imageBaseName: process.env.IMAGE_BASE_NAME || 'n8nio/n8n',
-	imageTag: process.env.IMAGE_TAG || 'local',
+	n8n: {
+		dockerfilePath: path.join(rootDir, 'docker/images/n8n/Dockerfile'),
+		imageBaseName: process.env.IMAGE_BASE_NAME || 'n8nio/n8n',
+		imageTag: process.env.IMAGE_TAG || 'local',
+		get fullImageName() {
+			return `${this.imageBaseName}:${this.imageTag}`;
+		},
+	},
+	runners: {
+		dockerfilePath: path.join(rootDir, 'docker/images/runners/Dockerfile'),
+		imageBaseName: process.env.RUNNERS_IMAGE_BASE_NAME || 'n8nio/runners',
+		get imageTag() {
+			// Runners use the same tag as n8n for consistency
+			return config.n8n.imageTag;
+		},
+		get fullImageName() {
+			return `${this.imageBaseName}:${this.imageTag}`;
+		},
+	},
 	buildContext: rootDir,
 	compiledAppDir: path.join(rootDir, 'compiled'),
-	get fullImageName() {
-		return `${this.imageBaseName}:${this.imageTag}`;
-	},
+	compiledTaskRunnerDir: path.join(rootDir, 'dist', 'task-runner-javascript'),
 };
 
 // #region ===== Main Build Process =====
@@ -135,26 +149,47 @@ const config = {
 const platform = getDockerPlatform();
 
 async function main() {
-	echo(chalk.blue.bold('===== Docker Build for n8n ====='));
-	echo(`INFO: Image: ${config.fullImageName}`);
+	echo(chalk.blue.bold('===== Docker Build for n8n & Runners ====='));
+	echo(`INFO: n8n Image: ${config.n8n.fullImageName}`);
+	echo(`INFO: Runners Image: ${config.runners.fullImageName}`);
 	echo(`INFO: Platform: ${platform}`);
 	echo(chalk.gray('-'.repeat(47)));
 
 	await checkPrerequisites();
 
-	// Build Docker image
-	const buildTime = await buildDockerImage();
+	// Build n8n Docker image
+	const n8nBuildTime = await buildDockerImage({
+		name: 'n8n',
+		dockerfilePath: config.n8n.dockerfilePath,
+		fullImageName: config.n8n.fullImageName,
+	});
+
+	// Build runners Docker image
+	const runnersBuildTime = await buildDockerImage({
+		name: 'runners',
+		dockerfilePath: config.runners.dockerfilePath,
+		fullImageName: config.runners.fullImageName,
+	});
 
 	// Get image details
-	const imageSize = await getImageSize(config.fullImageName);
+	const n8nImageSize = await getImageSize(config.n8n.fullImageName);
+	const runnersImageSize = await getImageSize(config.runners.fullImageName);
 
 	// Display summary
-	displaySummary({
-		imageName: config.fullImageName,
-		platform,
-		size: imageSize,
-		buildTime,
-	});
+	displaySummary([
+		{
+			imageName: config.n8n.fullImageName,
+			platform,
+			size: n8nImageSize,
+			buildTime: n8nBuildTime,
+		},
+		{
+			imageName: config.runners.fullImageName,
+			platform,
+			size: runnersImageSize,
+			buildTime: runnersBuildTime,
+		},
+	]);
 }
 
 async function checkPrerequisites() {
@@ -164,6 +199,12 @@ async function checkPrerequisites() {
 		process.exit(1);
 	}
 
+	if (!(await fs.pathExists(config.compiledTaskRunnerDir))) {
+		echo(chalk.red(`Error: Task runner directory not found at ${config.compiledTaskRunnerDir}`));
+		echo(chalk.yellow('Please run build-n8n.mjs first!'));
+		process.exit(1);
+	}
+
 	// Ensure at least one supported container engine is available
 	if (!(await commandExists('docker')) && !(await commandExists('podman'))) {
 		echo(chalk.red('Error: Neither Docker nor Podman is installed or in PATH'));
@@ -171,18 +212,18 @@ async function checkPrerequisites() {
 	}
 }
 
-async function buildDockerImage() {
+async function buildDockerImage({ name, dockerfilePath, fullImageName }) {
 	const startTime = Date.now();
 	const containerEngine = await getContainerEngine();
-	echo(chalk.yellow(`INFO: Building Docker image using ${containerEngine}...`));
+	echo(chalk.yellow(`INFO: Building ${name} Docker image using ${containerEngine}...`));
 
 	try {
 		if (containerEngine === 'podman') {
 			const { stdout } = await $`podman build \
 				--platform ${platform} \
 				--build-arg TARGETPLATFORM=${platform} \
-				-t ${config.fullImageName} \
-				-f ${config.dockerfilePath} \
+				-t ${fullImageName} \
+				-f ${dockerfilePath} \
 				${config.buildContext}`;
 			echo(stdout);
 		} else {
@@ -190,8 +231,8 @@ async function buildDockerImage() {
 			const { stdout } = await $`docker build \
 				--platform ${platform} \
 				--build-arg TARGETPLATFORM=${platform} \
-				-t ${config.fullImageName} \
-				-f ${config.dockerfilePath} \
+				-t ${fullImageName} \
+				-f ${dockerfilePath} \
 				--load \
 				${config.buildContext}`;
 			echo(stdout);
@@ -199,20 +240,23 @@ async function buildDockerImage() {
 
 		return formatDuration(Date.now() - startTime);
 	} catch (error) {
-		echo(chalk.red(`ERROR: Docker build failed: ${error.stderr || error.message}`));
+		echo(chalk.red(`ERROR: ${name} Docker build failed: ${error.stderr || error.message}`));
 		process.exit(1);
 	}
 }
 
-function displaySummary({ imageName, platform, size, buildTime }) {
+function displaySummary(images) {
 	echo('');
 	echo(chalk.green.bold('═'.repeat(54)));
 	echo(chalk.green.bold('           DOCKER BUILD COMPLETE'));
 	echo(chalk.green.bold('═'.repeat(54)));
-	echo(chalk.green(`✅ Image built: ${imageName}`));
-	echo(`   Platform: ${platform}`);
-	echo(`   Size: ${size}`);
-	echo(`   Build time: ${buildTime}`);
+	for (const { imageName, platform, size, buildTime } of images) {
+		echo(chalk.green(`✅ Image built: ${imageName}`));
+		echo(`   Platform: ${platform}`);
+		echo(`   Size: ${size}`);
+		echo(`   Build time: ${buildTime}`);
+		echo('');
+	}
 	echo(chalk.green.bold('═'.repeat(54)));
 }
 

From 727a12da563e53ff2e10004344decd9781264b08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Thu, 4 Dec 2025 13:34:48 +0100
Subject: [PATCH 057/167] refactor(core): Mark native Python as stable (#22737)

---
 packages/nodes-base/nodes/Code/Code.node.ts | 4 ++--
 packages/workflow/test/node-helpers.test.ts | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/nodes-base/nodes/Code/Code.node.ts b/packages/nodes-base/nodes/Code/Code.node.ts
index 0e6ada2612e..ff1c026c010 100644
--- a/packages/nodes-base/nodes/Code/Code.node.ts
+++ b/packages/nodes-base/nodes/Code/Code.node.ts
@@ -93,9 +93,9 @@ export class Code implements INodeType {
 						action: 'Code in Python (Beta)',
 					},
 					{
-						name: 'Python (Native) (Beta)',
+						name: 'Python (Native)',
 						value: 'pythonNative',
-						action: 'Code in Python (Native) (Beta)',
+						action: 'Code in Python (Native)',
 					},
 				],
 				default: 'javaScript',
diff --git a/packages/workflow/test/node-helpers.test.ts b/packages/workflow/test/node-helpers.test.ts
index e5c3e9a622b..b422f649cd0 100644
--- a/packages/workflow/test/node-helpers.test.ts
+++ b/packages/workflow/test/node-helpers.test.ts
@@ -5634,7 +5634,7 @@ describe('NodeHelpers', () => {
 		test.each([
 			['javaScript', 'Code in JavaScript'],
 			['python', 'Code in Python (Beta)'],
-			['pythonNative', 'Code in Python (Native) (Beta)'],
+			['pythonNative', 'Code in Python (Native)'],
 		])(
 			'should return action-based name for Code node with %s language',
 			(language, expectedAction) => {
@@ -5656,9 +5656,9 @@ describe('NodeHelpers', () => {
 								action: 'Code in Python (Beta)',
 							},
 							{
-								name: 'Python (Native) (Beta)',
+								name: 'Python (Native)',
 								value: 'pythonNative',
-								action: 'Code in Python (Native) (Beta)',
+								action: 'Code in Python (Native)',
 							},
 						],
 						default: 'javaScript',

From 0866f644b1d8f34d9d5c1ae19b79b6c9ca8da41c Mon Sep 17 00:00:00 2001
From: Michael Drury <me@michaeldrury.co.uk>
Date: Thu, 4 Dec 2025 12:54:36 +0000
Subject: [PATCH 058/167] chore(ai-builder): Telemetry updates for pinned data
 (#22625)

---
 .../src/telemetry/__tests__/telemetry.test.ts | 58 +++++++++++++++++++
 packages/cli/src/telemetry/index.ts           |  1 +
 .../src/app/composables/usePinnedData.test.ts | 27 +++++++--
 .../src/app/composables/usePinnedData.ts      |  2 +
 .../ndv/runData/components/RunData.vue        | 12 +++-
 5 files changed, 93 insertions(+), 7 deletions(-)

diff --git a/packages/cli/src/telemetry/__tests__/telemetry.test.ts b/packages/cli/src/telemetry/__tests__/telemetry.test.ts
index 6252a0c237d..1523d3a569b 100644
--- a/packages/cli/src/telemetry/__tests__/telemetry.test.ts
+++ b/packages/cli/src/telemetry/__tests__/telemetry.test.ts
@@ -384,6 +384,64 @@ describe('Telemetry', () => {
 				}),
 			);
 		});
+
+		test('should include instance_id, version_cli, and user_id in track properties', () => {
+			const eventName = 'Test Event';
+			const properties = { user_id: '1234', custom_prop: 'value' };
+
+			telemetry.track(eventName, properties);
+
+			expect(mockRudderStack.track).toHaveBeenCalledWith(
+				expect.objectContaining({
+					event: eventName,
+					properties: expect.objectContaining({
+						instance_id: instanceId,
+						user_id: '1234',
+						version_cli: expect.any(String),
+						custom_prop: 'value',
+					}),
+				}),
+			);
+		});
+
+		test('should format userId with user_id when provided', () => {
+			const eventName = 'Test Event';
+			const properties = { user_id: '5678' };
+
+			telemetry.track(eventName, properties);
+
+			expect(mockRudderStack.track).toHaveBeenCalledWith(
+				expect.objectContaining({
+					userId: `${instanceId}#5678`,
+				}),
+			);
+		});
+
+		test('should format userId without user_id when not provided', () => {
+			const eventName = 'Test Event';
+
+			telemetry.track(eventName, {});
+
+			expect(mockRudderStack.track).toHaveBeenCalledWith(
+				expect.objectContaining({
+					userId: instanceId,
+				}),
+			);
+		});
+
+		test('should set user_id to undefined when not provided in properties', () => {
+			const eventName = 'Test Event';
+
+			telemetry.track(eventName, {});
+
+			expect(mockRudderStack.track).toHaveBeenCalledWith(
+				expect.objectContaining({
+					properties: expect.objectContaining({
+						user_id: undefined,
+					}),
+				}),
+			);
+		});
 	});
 });
 
diff --git a/packages/cli/src/telemetry/index.ts b/packages/cli/src/telemetry/index.ts
index 35899bea707..f4a1f929d78 100644
--- a/packages/cli/src/telemetry/index.ts
+++ b/packages/cli/src/telemetry/index.ts
@@ -225,6 +225,7 @@ export class Telemetry {
 		const updatedProperties = {
 			...properties,
 			instance_id: instanceId,
+			user_id: user_id ?? undefined,
 			version_cli: N8N_VERSION,
 		};
 
diff --git a/packages/frontend/editor-ui/src/app/composables/usePinnedData.test.ts b/packages/frontend/editor-ui/src/app/composables/usePinnedData.test.ts
index f5860c6488d..d284d118430 100644
--- a/packages/frontend/editor-ui/src/app/composables/usePinnedData.test.ts
+++ b/packages/frontend/editor-ui/src/app/composables/usePinnedData.test.ts
@@ -102,16 +102,35 @@ describe('usePinnedData', () => {
 	});
 
 	describe('onSetDataSuccess()', () => {
-		it('should trigger telemetry on successful data setting', async () => {
+		it('should trigger telemetry on successful data setting with correct payload values', async () => {
+			const workflowsStore = useWorkflowsStore();
+			workflowsStore.workflow.id = 'test-workflow-id';
+
 			const telemetry = useTelemetry();
 			const spy = vi.spyOn(telemetry, 'track');
-			const pinnedData = usePinnedData(ref({ name: 'testNode', type: 'someType' } as INodeUi), {
+			const node = ref({
+				name: 'testNode',
+				type: 'n8n-nodes-base.httpRequest',
+				id: 'test-node-id',
+			} as INodeUi);
+			const pinnedData = usePinnedData(node, {
 				displayMode: ref('json'),
-				runIndex: ref(0),
+				runIndex: ref(2),
 			});
 
 			pinnedData.onSetDataSuccess({ source: 'pin-icon-click' });
-			expect(spy).toHaveBeenCalled();
+
+			expect(spy).toHaveBeenCalledWith(
+				'Ndv data pinning success',
+				expect.objectContaining({
+					pinning_source: 'pin-icon-click',
+					node_type: 'n8n-nodes-base.httpRequest',
+					view: 'json',
+					run_index: 2,
+					workflow_id: 'test-workflow-id',
+					node_id: 'test-node-id',
+				}),
+			);
 		});
 	});
 
diff --git a/packages/frontend/editor-ui/src/app/composables/usePinnedData.ts b/packages/frontend/editor-ui/src/app/composables/usePinnedData.ts
index a99e733bbd8..34b27e4b7fb 100644
--- a/packages/frontend/editor-ui/src/app/composables/usePinnedData.ts
+++ b/packages/frontend/editor-ui/src/app/composables/usePinnedData.ts
@@ -215,6 +215,8 @@ export function usePinnedData(
 			data_size: stringSizeInBytes(data.value),
 			view: displayMode,
 			run_index: runIndex,
+			workflow_id: workflowsStore.workflowId,
+			node_id: targetNode?.id,
 		};
 
 		void externalHooks.run('runData.onDataPinningSuccess', telemetryPayload);
diff --git a/packages/frontend/editor-ui/src/features/ndv/runData/components/RunData.vue b/packages/frontend/editor-ui/src/features/ndv/runData/components/RunData.vue
index bba43572c89..2dc97144287 100644
--- a/packages/frontend/editor-ui/src/features/ndv/runData/components/RunData.vue
+++ b/packages/frontend/editor-ui/src/features/ndv/runData/components/RunData.vue
@@ -95,6 +95,7 @@ import {
 	N8nTooltip,
 } from '@n8n/design-system';
 import { injectWorkflowState } from '@/app/composables/useWorkflowState';
+
 const LazyRunDataTable = defineAsyncComponent(async () => await import('./RunDataTable.vue'));
 const LazyRunDataJson = defineAsyncComponent(async () => await import('./RunDataJson.vue'));
 
@@ -807,6 +808,7 @@ function getResolvedNodeOutputs() {
 	}
 	return [];
 }
+
 function shouldHintBeDisplayed(hint: NodeHint): boolean {
 	const { location, whenToDisplay } = hint;
 
@@ -963,6 +965,8 @@ function enterEditMode({ origin }: EnterEditModeArgs) {
 		is_output_present: hasNodeRun.value || pinnedData.hasData.value,
 		view: !hasNodeRun.value && !pinnedData.hasData.value ? 'undefined' : props.displayMode,
 		is_data_pinned: pinnedData.hasData.value,
+		workflow_id: workflowsStore.workflowId,
+		node_id: activeNode.value?.id,
 	});
 }
 
@@ -1038,6 +1042,8 @@ async function onTogglePinData({ source }: { source: PinDataSource | UnpinDataSo
 			push_ref: props.pushRef,
 			run_index: props.runIndex,
 			view: !hasNodeRun.value && !pinnedData.hasData.value ? 'none' : props.displayMode,
+			workflow_id: workflowsStore.workflowId,
+			node_id: activeNode.value?.id,
 		};
 
 		void externalHooks.run('runData.onTogglePinData', telemetryPayload);
@@ -1725,9 +1731,9 @@ defineExpose({ enterEditMode });
 			</div>
 
 			<div v-else-if="editMode.enabled" :class="$style.editMode">
-				<N8nText v-if="previousExecutionDataUsedInEditMode" class="mb-2xs" size="small">{{
-					i18n.baseText('runData.pinData.insertedExecutionData')
-				}}</N8nText>
+				<N8nText v-if="previousExecutionDataUsedInEditMode" class="mb-2xs" size="small"
+					>{{ i18n.baseText('runData.pinData.insertedExecutionData') }}
+				</N8nText>
 				<div :class="[$style.editModeBody, 'ignore-key-press-canvas']">
 					<JsonEditor
 						:model-value="editMode.value"

From f3fa3f9c30ea3493f013f353c53fbbf49a77d512 Mon Sep 17 00:00:00 2001
From: Jaakko Husso <jaakko@n8n.io>
Date: Thu, 4 Dec 2025 15:17:59 +0200
Subject: [PATCH 059/167] fix(core): Address chat feedback items (no-changelog)
 (#22725)

---
 packages/@n8n/api-types/src/chat-hub.ts       | 26 ++++++++++++++++-
 .../trigger/ChatTrigger/ChatTrigger.node.ts   | 16 +++++++++--
 .../chat-hub/chat-hub-workflow.service.ts     | 28 +++++++++++++++++--
 .../src/modules/chat-hub/chat-hub.service.ts  | 25 ++++++++++++++---
 .../src/modules/chat-hub/chat-hub.types.ts    |  3 +-
 .../src/features/ai/chatHub/ChatView.vue      |  1 +
 .../src/features/ai/chatHub/chat.store.ts     |  3 ++
 .../components/ChatConversationHeader.vue     |  4 ++-
 .../ai/chatHub/components/ModelSelector.vue   | 10 +++++--
 9 files changed, 101 insertions(+), 15 deletions(-)

diff --git a/packages/@n8n/api-types/src/chat-hub.ts b/packages/@n8n/api-types/src/chat-hub.ts
index 1bd6bd557b8..dcfbc15dd85 100644
--- a/packages/@n8n/api-types/src/chat-hub.ts
+++ b/packages/@n8n/api-types/src/chat-hub.ts
@@ -267,6 +267,27 @@ export const chatAttachmentSchema = z.object({
 	fileName: z.string(),
 });
 
+export const isValidTimeZone = (tz: string): boolean => {
+	try {
+		// Throws if invalid timezone
+		new Intl.DateTimeFormat('en-US', { timeZone: tz });
+		return true;
+	} catch {
+		return false;
+	}
+};
+
+export const StrictTimeZoneSchema = z
+	.string()
+	.min(1)
+	.max(50)
+	.regex(/^[A-Za-z0-9_/+-]+$/)
+	.refine(isValidTimeZone, {
+		message: 'Unknown or invalid time zone',
+	});
+
+export const TimeZoneSchema = StrictTimeZoneSchema.optional().catch(undefined);
+
 export type ChatAttachment = z.infer<typeof chatAttachmentSchema>;
 
 export class ChatHubSendMessageRequest extends Z.class({
@@ -283,7 +304,8 @@ export class ChatHubSendMessageRequest extends Z.class({
 	),
 	tools: z.array(INodeSchema),
 	attachments: z.array(chatAttachmentSchema),
-	agentName: z.string(),
+	agentName: z.string().optional(),
+	timeZone: TimeZoneSchema,
 }) {}
 
 export class ChatHubRegenerateMessageRequest extends Z.class({
@@ -294,6 +316,7 @@ export class ChatHubRegenerateMessageRequest extends Z.class({
 			name: z.string(),
 		}),
 	),
+	timeZone: TimeZoneSchema,
 }) {}
 
 export class ChatHubEditMessageRequest extends Z.class({
@@ -306,6 +329,7 @@ export class ChatHubEditMessageRequest extends Z.class({
 			name: z.string(),
 		}),
 	),
+	timeZone: TimeZoneSchema,
 }) {}
 
 export class ChatHubUpdateConversationRequest extends Z.class({
diff --git a/packages/@n8n/nodes-langchain/nodes/trigger/ChatTrigger/ChatTrigger.node.ts b/packages/@n8n/nodes-langchain/nodes/trigger/ChatTrigger/ChatTrigger.node.ts
index 65ae8ed16b5..de087b51a4e 100644
--- a/packages/@n8n/nodes-langchain/nodes/trigger/ChatTrigger/ChatTrigger.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/trigger/ChatTrigger/ChatTrigger.node.ts
@@ -323,7 +323,7 @@ export class ChatTrigger extends Node {
 			},
 			{
 				displayName:
-					'Chat will be live at the URL above once you activate this workflow. Live executions will show up in the ‘executions’ tab',
+					'Chat will be live at the URL above once this workflow is published. Live executions will show up in the ‘executions’ tab',
 				name: 'hostedChatNotice',
 				type: 'notice',
 				displayOptions: {
@@ -336,7 +336,7 @@ export class ChatTrigger extends Node {
 			},
 			{
 				displayName:
-					'Follow the instructions <a href="https://www.npmjs.com/package/@n8n/chat" target="_blank">here</a> to embed chat in a webpage (or just call the webhook URL at the top of this section). Chat will be live once you activate this workflow',
+					'Follow the instructions <a href="https://www.npmjs.com/package/@n8n/chat" target="_blank">here</a> to embed chat in a webpage (or just call the webhook URL at the top of this section). Chat will be live once you publish this workflow',
 				name: 'embeddedChatNotice',
 				type: 'notice',
 				displayOptions: {
@@ -406,6 +406,18 @@ export class ChatTrigger extends Node {
 					},
 				},
 			},
+			{
+				displayName:
+					'Your n8n users will be able to use this agent in <a href="/home/chat/" target="_blank">Chat</a> once this workflow is published. Make sure to share this workflow with at least viewer access to all users who should use it. Currently, only streaming response mode is supported.',
+				name: 'availableInChatNotice',
+				type: 'notice',
+				displayOptions: {
+					show: {
+						availableInChat: [true],
+					},
+				},
+				default: '',
+			},
 			{
 				displayName: 'Agent Name',
 				name: 'agentName',
diff --git a/packages/cli/src/modules/chat-hub/chat-hub-workflow.service.ts b/packages/cli/src/modules/chat-hub/chat-hub-workflow.service.ts
index ec64ffe6c33..dc05fae2804 100644
--- a/packages/cli/src/modules/chat-hub/chat-hub-workflow.service.ts
+++ b/packages/cli/src/modules/chat-hub/chat-hub-workflow.service.ts
@@ -9,6 +9,7 @@ import {
 } from '@n8n/db';
 import { Service } from '@n8n/di';
 import { EntityManager } from '@n8n/typeorm';
+import { DateTime } from 'luxon';
 import {
 	AGENT_LANGCHAIN_NODE_TYPE,
 	CHAT_TRIGGER_NODE_TYPE,
@@ -52,6 +53,7 @@ export class ChatHubWorkflowService {
 		model: ChatHubConversationModel,
 		systemMessage: string | undefined,
 		tools: INode[],
+		timeZone: string,
 		trx?: EntityManager,
 	): Promise<{ workflowData: IWorkflowBase; executionData: IRunExecutionData }> {
 		return await withTransaction(this.workflowRepository.manager, trx, async (em) => {
@@ -69,6 +71,7 @@ export class ChatHubWorkflowService {
 				model,
 				systemMessage,
 				tools,
+				timeZone,
 			});
 
 			const newWorkflow = new WorkflowEntity();
@@ -258,6 +261,7 @@ export class ChatHubWorkflowService {
 		model,
 		systemMessage,
 		tools,
+		timeZone,
 	}: {
 		userId: string;
 		sessionId: ChatSessionId;
@@ -268,9 +272,10 @@ export class ChatHubWorkflowService {
 		model: ChatHubConversationModel;
 		systemMessage?: string;
 		tools: INode[];
+		timeZone: string;
 	}) {
 		const chatTriggerNode = this.buildChatTriggerNode();
-		const toolsAgentNode = this.buildToolsAgentNode(model, systemMessage);
+		const toolsAgentNode = this.buildToolsAgentNode(model, timeZone, systemMessage);
 		const modelNode = this.buildModelNode(credentials, model);
 		const memoryNode = this.buildMemoryNode(20);
 		const restoreMemoryNode = this.buildRestoreMemoryNode(history);
@@ -463,7 +468,24 @@ export class ChatHubWorkflowService {
 		};
 	}
 
-	private buildToolsAgentNode(model: ChatHubConversationModel, systemMessage?: string): INode {
+	getSystemMessageMetadata(timeZone: string) {
+		const now = DateTime.now().setZone(timeZone).toISO({
+			includeOffset: true,
+		});
+
+		return `The user's current local date and time is: ${now} (timezone: ${timeZone}).
+When you need to reference “now”, use this date and time.`;
+	}
+
+	private getBaseSystemMessage(timeZone: string) {
+		return 'You are a helpful assistant.\n' + this.getSystemMessageMetadata(timeZone);
+	}
+
+	private buildToolsAgentNode(
+		model: ChatHubConversationModel,
+		timeZone: string,
+		systemMessage?: string,
+	): INode {
 		return {
 			parameters: {
 				promptType: 'define',
@@ -474,7 +496,7 @@ export class ChatHubWorkflowService {
 						model.provider !== 'n8n' && model.provider !== 'custom-agent'
 							? getMaxContextWindowTokens(model.provider, model.model)
 							: undefined,
-					systemMessage,
+					systemMessage: systemMessage ?? this.getBaseSystemMessage(timeZone),
 				},
 			},
 			type: AGENT_LANGCHAIN_NODE_TYPE,
diff --git a/packages/cli/src/modules/chat-hub/chat-hub.service.ts b/packages/cli/src/modules/chat-hub/chat-hub.service.ts
index 7f89db12bf8..03383da4a99 100644
--- a/packages/cli/src/modules/chat-hub/chat-hub.service.ts
+++ b/packages/cli/src/modules/chat-hub/chat-hub.service.ts
@@ -23,6 +23,7 @@ import { Logger } from '@n8n/backend-common';
 import { ExecutionRepository, IExecutionResponse, User, WorkflowRepository, In } from '@n8n/db';
 import { Service } from '@n8n/di';
 import type { EntityManager } from '@n8n/typeorm';
+import { GlobalConfig } from '@n8n/config';
 import type { Response } from 'express';
 import { ErrorReporter, InstanceSettings } from 'n8n-core';
 import {
@@ -104,6 +105,7 @@ export class ChatHubService {
 		private readonly chatHubSettingsService: ChatHubSettingsService,
 		private readonly chatHubAttachmentService: ChatHubAttachmentService,
 		private readonly instanceSettings: InstanceSettings,
+		private readonly globalConfig: GlobalConfig,
 	) {}
 
 	async getModels(
@@ -1029,7 +1031,9 @@ export class ChatHubService {
 			previousMessageId,
 			tools,
 			attachments,
+			timeZone,
 		} = payload;
+		const tz = timeZone ?? this.globalConfig.generic.timezone;
 
 		const credentialId = this.getModelCredential(model, credentials);
 
@@ -1079,6 +1083,7 @@ export class ChatHubService {
 					message,
 					tools,
 					processedAttachments,
+					tz,
 					trx,
 				);
 			});
@@ -1125,7 +1130,8 @@ export class ChatHubService {
 	}
 
 	async editMessage(res: Response, user: User, payload: EditMessagePayload) {
-		const { sessionId, editId, messageId, message, model, credentials } = payload;
+		const { sessionId, editId, messageId, message, model, credentials, timeZone } = payload;
+		const tz = timeZone ?? this.globalConfig.generic.timezone;
 
 		const workflow = await this.messageRepository.manager.transaction(async (trx) => {
 			const session = await this.getChatSession(user, sessionId, trx);
@@ -1170,6 +1176,7 @@ export class ChatHubService {
 					message,
 					session.tools,
 					attachments,
+					tz,
 					trx,
 				);
 			}
@@ -1195,7 +1202,8 @@ export class ChatHubService {
 	}
 
 	async regenerateAIMessage(res: Response, user: User, payload: RegenerateMessagePayload) {
-		const { sessionId, retryId, model, credentials } = payload;
+		const { sessionId, retryId, model, credentials, timeZone } = payload;
+		const tz = timeZone ?? this.globalConfig.generic.timezone;
 
 		const {
 			workflow: { workflowData, executionData },
@@ -1242,6 +1250,7 @@ export class ChatHubService {
 				message,
 				session.tools,
 				attachments,
+				tz,
 				trx,
 			);
 
@@ -1273,6 +1282,7 @@ export class ChatHubService {
 		message: string,
 		tools: INode[],
 		attachments: IBinaryData[],
+		timeZone: string,
 		trx: EntityManager,
 	) {
 		if (model.provider === 'n8n') {
@@ -1293,6 +1303,7 @@ export class ChatHubService {
 				history,
 				message,
 				attachments,
+				timeZone,
 				trx,
 			);
 		}
@@ -1307,6 +1318,7 @@ export class ChatHubService {
 			undefined,
 			tools,
 			attachments,
+			timeZone,
 			trx,
 		);
 	}
@@ -1321,6 +1333,7 @@ export class ChatHubService {
 		systemMessage: string | undefined,
 		tools: INode[],
 		attachments: IBinaryData[],
+		timeZone: string,
 		trx: EntityManager,
 	) {
 		await this.chatHubSettingsService.ensureModelIsAllowed(model);
@@ -1342,6 +1355,7 @@ export class ChatHubService {
 			model,
 			systemMessage,
 			tools,
+			timeZone,
 			trx,
 		);
 	}
@@ -1353,6 +1367,7 @@ export class ChatHubService {
 		history: ChatHubMessage[],
 		message: string,
 		attachments: IBinaryData[],
+		timeZone: string,
 		trx: EntityManager,
 	) {
 		const agent = await this.chatHubAgentService.getAgentById(agentId, user.id);
@@ -1370,7 +1385,8 @@ export class ChatHubService {
 			throw new BadRequestError('Credentials not set for agent');
 		}
 
-		const systemMessage = agent.systemPrompt;
+		const systemMessage =
+			agent.systemPrompt + '\n' + this.chatHubWorkflowService.getSystemMessageMetadata(timeZone);
 
 		const model: ChatHubBaseLLMModel = {
 			provider: agent.provider,
@@ -1396,6 +1412,7 @@ export class ChatHubService {
 			systemMessage,
 			tools,
 			attachments,
+			timeZone,
 			trx,
 		);
 	}
@@ -2074,7 +2091,7 @@ export class ChatHubService {
 		model: ChatHubConversationModel,
 		credentialId: string | null,
 		tools: INode[],
-		agentName: string,
+		agentName?: string,
 		trx?: EntityManager,
 	) {
 		await this.ensureValidModel(user, model);
diff --git a/packages/cli/src/modules/chat-hub/chat-hub.types.ts b/packages/cli/src/modules/chat-hub/chat-hub.types.ts
index ad7248e7c11..afaee379b29 100644
--- a/packages/cli/src/modules/chat-hub/chat-hub.types.ts
+++ b/packages/cli/src/modules/chat-hub/chat-hub.types.ts
@@ -22,6 +22,7 @@ export interface BaseMessagePayload {
 	sessionId: ChatSessionId;
 	model: ChatHubConversationModel;
 	credentials: INodeCredentials;
+	timeZone?: string;
 }
 
 export interface HumanMessagePayload extends BaseMessagePayload {
@@ -30,7 +31,7 @@ export interface HumanMessagePayload extends BaseMessagePayload {
 	previousMessageId: ChatMessageId | null;
 	attachments: ChatAttachment[];
 	tools: INode[];
-	agentName: string;
+	agentName?: string;
 }
 export interface RegenerateMessagePayload extends BaseMessagePayload {
 	retryId: ChatMessageId;
diff --git a/packages/frontend/editor-ui/src/features/ai/chatHub/ChatView.vue b/packages/frontend/editor-ui/src/features/ai/chatHub/ChatView.vue
index 2718f2cd9d2..99a38d27d64 100644
--- a/packages/frontend/editor-ui/src/features/ai/chatHub/ChatView.vue
+++ b/packages/frontend/editor-ui/src/features/ai/chatHub/ChatView.vue
@@ -566,6 +566,7 @@ function onFilesDropped(files: File[]) {
 			:selected-model="selectedModel"
 			:credentials="credentialsByProvider"
 			:ready-to-show-model-selector="isNewSession || !!currentConversation"
+			:is-new-session="isNewSession"
 			@select-model="handleSelectModel"
 			@edit-custom-agent="handleEditAgent"
 			@create-custom-agent="openNewAgentCreator"
diff --git a/packages/frontend/editor-ui/src/features/ai/chatHub/chat.store.ts b/packages/frontend/editor-ui/src/features/ai/chatHub/chat.store.ts
index cafdd824848..ebcf3e98900 100644
--- a/packages/frontend/editor-ui/src/features/ai/chatHub/chat.store.ts
+++ b/packages/frontend/editor-ui/src/features/ai/chatHub/chat.store.ts
@@ -548,6 +548,7 @@ export const useChatStore = defineStore(CHAT_STORE, () => {
 				tools,
 				attachments,
 				agentName,
+				timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone,
 			},
 			onStreamMessage,
 			onStreamDone,
@@ -618,6 +619,7 @@ export const useChatStore = defineStore(CHAT_STORE, () => {
 				messageId: promptId,
 				message: content,
 				credentials,
+				timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone,
 			},
 			onStreamMessage,
 			onStreamDone,
@@ -654,6 +656,7 @@ export const useChatStore = defineStore(CHAT_STORE, () => {
 			{
 				model,
 				credentials,
+				timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone,
 			},
 			onStreamMessage,
 			onStreamDone,
diff --git a/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatConversationHeader.vue b/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatConversationHeader.vue
index 44e303b7620..f176cce9103 100644
--- a/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatConversationHeader.vue
+++ b/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatConversationHeader.vue
@@ -17,7 +17,8 @@ import { useI18n } from '@n8n/i18n';
 import { computed, useTemplateRef } from 'vue';
 import { useRouter } from 'vue-router';
 
-const { selectedModel, credentials, readyToShowModelSelector } = defineProps<{
+const { isNewSession, selectedModel, credentials, readyToShowModelSelector } = defineProps<{
+	isNewSession: boolean;
 	selectedModel: ChatModelDto | null;
 	credentials: CredentialsMap | null;
 	readyToShowModelSelector: boolean;
@@ -79,6 +80,7 @@ defineExpose({
 				text
 				icon-size="large"
 				:aria-label="i18n.baseText('chatHub.chat.header.button.newChat')"
+				:disabled="isNewSession"
 				@click="onNewChat"
 			/>
 			<ModelSelector
diff --git a/packages/frontend/editor-ui/src/features/ai/chatHub/components/ModelSelector.vue b/packages/frontend/editor-ui/src/features/ai/chatHub/components/ModelSelector.vue
index df64e8f21f5..c9d7de11317 100644
--- a/packages/frontend/editor-ui/src/features/ai/chatHub/components/ModelSelector.vue
+++ b/packages/frontend/editor-ui/src/features/ai/chatHub/components/ModelSelector.vue
@@ -156,13 +156,13 @@ const menu = computed(() => {
 				id: provider,
 				title: providerDisplayNames[provider],
 				submenu: [
+					configureMenu,
+					{ isDivider: true as const, id: 'divider' },
 					{
 						id: `${provider}::loading`,
 						title: i18n.baseText('generic.loadingEllipsis'),
 						disabled: true,
 					},
-					{ isDivider: true as const, id: 'divider' },
-					configureMenu,
 				],
 			});
 			continue;
@@ -234,9 +234,13 @@ const menu = computed(() => {
 						} as const,
 					]
 				: []),
-			configureMenu,
 		]);
 
+		submenu.unshift(
+			configureMenu,
+			...(submenu.length > 1 ? [{ isDivider: true as const, id: 'divider' }] : []),
+		);
+
 		menuItems.push({
 			id: provider,
 			title: providerDisplayNames[provider],

From 5851265ded1e35d0e76a8934da856d8af3b611d8 Mon Sep 17 00:00:00 2001
From: Declan Carroll <declan@n8n.io>
Date: Thu, 4 Dec 2025 15:07:20 +0000
Subject: [PATCH 060/167] test: Fixing task runner test (#22756)

---
 .../testing/playwright/tests/ui/task-runner-demo.spec.ts    | 2 +-
 packages/workflow/test/node-helpers.test.ts                 | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/testing/playwright/tests/ui/task-runner-demo.spec.ts b/packages/testing/playwright/tests/ui/task-runner-demo.spec.ts
index 7df31fc0f8a..4343e618568 100644
--- a/packages/testing/playwright/tests/ui/task-runner-demo.spec.ts
+++ b/packages/testing/playwright/tests/ui/task-runner-demo.spec.ts
@@ -29,7 +29,7 @@ test.describe('Task Runner Capability @capability:task-runner', () => {
 		await n8n.start.fromBlankCanvas();
 		await n8n.canvas.addNode(MANUAL_TRIGGER_NODE_NAME);
 		await n8n.canvas.addNode(CODE_NODE_NAME, {
-			action: 'Code in Python (Native) (Beta)',
+			action: 'Code in Python (Native)',
 			closeNDV: true,
 		});
 		await n8n.workflowComposer.executeWorkflowAndWaitForNotification(
diff --git a/packages/workflow/test/node-helpers.test.ts b/packages/workflow/test/node-helpers.test.ts
index b422f649cd0..b24e5e3b730 100644
--- a/packages/workflow/test/node-helpers.test.ts
+++ b/packages/workflow/test/node-helpers.test.ts
@@ -5633,7 +5633,7 @@ describe('NodeHelpers', () => {
 
 		test.each([
 			['javaScript', 'Code in JavaScript'],
-			['python', 'Code in Python (Beta)'],
+			['python', 'Code in Python'],
 			['pythonNative', 'Code in Python (Native)'],
 		])(
 			'should return action-based name for Code node with %s language',
@@ -5651,9 +5651,9 @@ describe('NodeHelpers', () => {
 								action: 'Code in JavaScript',
 							},
 							{
-								name: 'Python (Beta)',
+								name: 'Python',
 								value: 'python',
-								action: 'Code in Python (Beta)',
+								action: 'Code in Python',
 							},
 							{
 								name: 'Python (Native)',

From 3026a813b0ca1872a9ccc14ab85cefd5dfcfa080 Mon Sep 17 00:00:00 2001
From: mfsiega <93014743+mfsiega@users.noreply.github.com>
Date: Thu, 4 Dec 2025 18:20:13 +0100
Subject: [PATCH 061/167] fix(core, editor): Move single webhook trigger check
 to the backend (#22450)

Co-authored-by: Danny Martini <danny@n8n.io>
---
 .../src/repositories/workflow.repository.ts   |  12 ++
 packages/cli/src/active-workflow-manager.ts   |  15 --
 .../errors/single-webhook-trigger.error.ts    |  10 +
 .../webhooks/__tests__/test-webhooks.test.ts  |  66 +++++++
 packages/cli/src/webhooks/test-webhooks.ts    |  21 +++
 .../workflow-execution.service.test.ts        |  61 ++++++
 .../workflows/workflow-execution.service.ts   |   5 +
 .../active-workflow-manager.test.ts           |  18 --
 .../repositories/workflow.repository.test.ts  |  20 ++
 .../integration/public-api/workflows.test.ts  |  17 +-
 .../frontend/@n8n/i18n/src/locales/en.json    |   1 -
 .../app/composables/useRunWorkflow.test.ts    | 174 ------------------
 .../src/app/composables/useRunWorkflow.ts     |  31 +---
 .../editor-ui/src/app/constants/nodeTypes.ts  |   6 -
 14 files changed, 208 insertions(+), 249 deletions(-)
 create mode 100644 packages/cli/src/errors/single-webhook-trigger.error.ts

diff --git a/packages/@n8n/db/src/repositories/workflow.repository.ts b/packages/@n8n/db/src/repositories/workflow.repository.ts
index e428823ef53..6f5c4d0b361 100644
--- a/packages/@n8n/db/src/repositories/workflow.repository.ts
+++ b/packages/@n8n/db/src/repositories/workflow.repository.ts
@@ -981,4 +981,16 @@ export class WorkflowRepository extends Repository<WorkflowEntity> {
 
 		return await qb.getMany();
 	}
+
+	/**
+	 * Returns if the workflow is stored as `active`.
+	 *
+	 * @important Do not confuse with `ActiveWorkflows.isActive()`,
+	 * which checks if the workflow is active in memory.
+	 */
+	async isActive(workflowId: string) {
+		const workflow = await this.findOne({ select: ['activeVersionId'], where: { id: workflowId } });
+
+		return !!workflow?.activeVersionId;
+	}
 }
diff --git a/packages/cli/src/active-workflow-manager.ts b/packages/cli/src/active-workflow-manager.ts
index 6c8372baa67..ff02ae145bf 100644
--- a/packages/cli/src/active-workflow-manager.ts
+++ b/packages/cli/src/active-workflow-manager.ts
@@ -138,21 +138,6 @@ export class ActiveWorkflowManager {
 		return this.activeWorkflows.allActiveWorkflows();
 	}
 
-	/**
-	 * Returns if the workflow is stored as `active`.
-	 *
-	 * @important Do not confuse with `ActiveWorkflows.isActive()`,
-	 * which checks if the workflow is active in memory.
-	 */
-	async isActive(workflowId: WorkflowId) {
-		const workflow = await this.workflowRepository.findOne({
-			select: ['activeVersionId'],
-			where: { id: workflowId },
-		});
-
-		return !!workflow?.activeVersionId;
-	}
-
 	/**
 	 * Register workflow-defined webhooks in the `workflow_entity` table.
 	 */
diff --git a/packages/cli/src/errors/single-webhook-trigger.error.ts b/packages/cli/src/errors/single-webhook-trigger.error.ts
new file mode 100644
index 00000000000..2627960863b
--- /dev/null
+++ b/packages/cli/src/errors/single-webhook-trigger.error.ts
@@ -0,0 +1,10 @@
+import { UserError } from 'n8n-workflow';
+
+export class SingleWebhookTriggerError extends UserError {
+	constructor(triggerName: string) {
+		super(
+			`Because of limitations in ${triggerName}, n8n can't listen for test executions at the same time as listening for production ones. Unpublish the workflow to execute.`,
+			{ extra: { triggerName } },
+		);
+	}
+}
diff --git a/packages/cli/src/webhooks/__tests__/test-webhooks.test.ts b/packages/cli/src/webhooks/__tests__/test-webhooks.test.ts
index aa4a7e8bea3..d2b00b2cb14 100644
--- a/packages/cli/src/webhooks/__tests__/test-webhooks.test.ts
+++ b/packages/cli/src/webhooks/__tests__/test-webhooks.test.ts
@@ -149,6 +149,72 @@ describe('TestWebhooks', () => {
 			expect(webhookService.createWebhookIfNotExists.mock.calls[0][1].node).toBe(webhook2.node);
 			expect(needsWebhook).toBe(true);
 		});
+
+		test.each([
+			{ published: true, withSingleWebhookTrigger: true, shouldThrow: true },
+			{ published: true, withSingleWebhookTrigger: false, shouldThrow: false },
+			{ published: false, withSingleWebhookTrigger: true, shouldThrow: false },
+			{ published: false, withSingleWebhookTrigger: false, shouldThrow: false },
+		] satisfies Array<{
+			published: boolean;
+			withSingleWebhookTrigger: boolean;
+			shouldThrow: boolean;
+		}>)(
+			'handles single webhook trigger when workflowIsActive=%s',
+			async ({ published: workflowIsActive, withSingleWebhookTrigger, shouldThrow }) => {
+				const workflow = mock<Workflow>();
+				const regularWebhook = mock<IWebhookData>({
+					node: 'Webhook',
+					httpMethod,
+					path: 'regular-path',
+					workflowId: workflowEntity.id,
+					userId,
+				});
+				const telegramWebhook = mock<IWebhookData>({
+					node: 'Telegram Trigger',
+					httpMethod,
+					path: 'telegram-path',
+					workflowId: workflowEntity.id,
+					userId,
+				});
+				const webhookNode = mock<IWorkflowBase['nodes'][number]>({
+					name: 'Webhook',
+					type: 'n8n-nodes-base.webhook',
+				});
+				const telegramNode = mock<IWorkflowBase['nodes'][number]>({
+					name: 'Telegram Trigger',
+					type: 'n8n-nodes-base.telegramTrigger',
+				});
+
+				jest.spyOn(testWebhooks, 'toWorkflow').mockReturnValueOnce(workflow);
+				jest
+					.spyOn(WebhookHelpers, 'getWorkflowWebhooks')
+					.mockReturnValue([regularWebhook, telegramWebhook]);
+				jest.spyOn(workflow, 'getNode').mockImplementation((name: string) => {
+					if (name === 'Webhook') return webhookNode;
+					if (name === 'Telegram Trigger' && withSingleWebhookTrigger) return telegramNode;
+					return null;
+				});
+
+				if (shouldThrow) {
+					const promise = testWebhooks.needsWebhook({
+						...args,
+						workflowIsActive,
+					});
+
+					await expect(promise).rejects.toThrow(
+						"Because of limitations in Telegram Trigger, n8n can't listen for test executions at the same time as listening for production ones. Unpublish the workflow to execute.",
+					);
+				} else {
+					const needsWebhook = await testWebhooks.needsWebhook({
+						...args,
+						workflowIsActive,
+					});
+
+					expect(needsWebhook).toBe(true);
+				}
+			},
+		);
 	});
 
 	describe('executeWebhook()', () => {
diff --git a/packages/cli/src/webhooks/test-webhooks.ts b/packages/cli/src/webhooks/test-webhooks.ts
index 466c2465152..d58808dfe1d 100644
--- a/packages/cli/src/webhooks/test-webhooks.ts
+++ b/packages/cli/src/webhooks/test-webhooks.ts
@@ -25,6 +25,7 @@ import type {
 
 import { NotFoundError } from '@/errors/response-errors/not-found.error';
 import { WebhookNotFoundError } from '@/errors/response-errors/webhook-not-found.error';
+import { SingleWebhookTriggerError } from '@/errors/single-webhook-trigger.error';
 import { WorkflowMissingIdError } from '@/errors/workflow-missing-id.error';
 import { NodeTypes } from '@/node-types';
 import { Push } from '@/push';
@@ -36,6 +37,12 @@ import * as WebhookHelpers from '@/webhooks/webhook-helpers';
 import * as WorkflowExecuteAdditionalData from '@/workflow-execute-additional-data';
 import type { WorkflowRequest } from '@/workflows/workflow.request';
 
+const SINGLE_WEBHOOK_TRIGGERS = [
+	'n8n-nodes-base.telegramTrigger',
+	'n8n-nodes-base.slackTrigger',
+	'n8n-nodes-base.facebookLeadAdsTrigger',
+];
+
 /**
  * Service for handling the execution of webhooks of manual executions
  * that use the [Test URL](https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.webhook/#webhook-urls).
@@ -272,6 +279,7 @@ export class TestWebhooks implements IWebhookManager {
 		pushRef?: string;
 		destinationNode?: IDestinationNode;
 		triggerToStartFrom?: WorkflowRequest.FullManualExecutionFromKnownTriggerPayload['triggerToStartFrom'];
+		workflowIsActive?: boolean;
 	}) {
 		const {
 			userId,
@@ -281,6 +289,7 @@ export class TestWebhooks implements IWebhookManager {
 			pushRef,
 			destinationNode,
 			triggerToStartFrom,
+			workflowIsActive,
 		} = options;
 
 		if (!workflowEntity.id) throw new WorkflowMissingIdError(workflowEntity);
@@ -310,6 +319,18 @@ export class TestWebhooks implements IWebhookManager {
 			return false; // no webhooks found to start a workflow
 		}
 
+		// Check if any webhook is a single webhook trigger and workflow is active
+		if (workflowIsActive) {
+			const singleWebhookTrigger = webhooks.find((w) =>
+				SINGLE_WEBHOOK_TRIGGERS.includes(workflow.getNode(w.node)?.type ?? ''),
+			);
+			if (singleWebhookTrigger) {
+				throw new SingleWebhookTriggerError(
+					workflow.getNode(singleWebhookTrigger.node)?.name ?? '',
+				);
+			}
+		}
+
 		const timeout = setTimeout(
 			async () => await this.cancelWebhook(workflow.id),
 			TEST_WEBHOOK_TIMEOUT,
diff --git a/packages/cli/src/workflows/__tests__/workflow-execution.service.test.ts b/packages/cli/src/workflows/__tests__/workflow-execution.service.test.ts
index 06ce635bb31..92c4b83c061 100644
--- a/packages/cli/src/workflows/__tests__/workflow-execution.service.test.ts
+++ b/packages/cli/src/workflows/__tests__/workflow-execution.service.test.ts
@@ -15,6 +15,7 @@ import {
 
 import type { IWorkflowErrorData } from '@/interfaces';
 import type { NodeTypes } from '@/node-types';
+import type { TestWebhooks } from '@/webhooks/test-webhooks';
 import * as WorkflowExecuteAdditionalData from '@/workflow-execute-additional-data';
 import type { WorkflowRunner } from '@/workflow-runner';
 import { WorkflowExecutionService } from '@/workflows/workflow-execution.service';
@@ -336,6 +337,66 @@ describe('WorkflowExecutionService', () => {
 			expect(callArgs.executionMode).toBe('manual');
 			expect(result).toEqual({ executionId });
 		});
+
+		test('should pass workflowIsActive to testWebhooks.needsWebhook', async () => {
+			const userId = 'user-id';
+			const user = mock<User>({ id: userId });
+			const testWebhooks = mock<TestWebhooks>();
+			const workflowRepositoryMock = mock<WorkflowRepository>();
+			const telegramTrigger: INode = {
+				id: '1',
+				typeVersion: 1,
+				position: [1, 2],
+				parameters: {},
+				name: 'Telegram Trigger',
+				type: 'n8n-nodes-base.telegramTrigger',
+			};
+			const activeWorkflowData = {
+				id: 'workflow-id',
+				name: 'Test Workflow',
+				active: true,
+				activeVersionId: 'version-123',
+				isArchived: false,
+				nodes: [telegramTrigger],
+				connections: {},
+				createdAt: new Date(),
+				updatedAt: new Date(),
+			};
+			workflowRepositoryMock.isActive.mockResolvedValue(true);
+			const service = new WorkflowExecutionService(
+				mock(),
+				mock(),
+				mock(),
+				workflowRepositoryMock,
+				nodeTypes,
+				testWebhooks,
+				workflowRunner,
+				mock(),
+				mock(),
+				mock(),
+			);
+
+			const runPayload: WorkflowRequest.FullManualExecutionFromKnownTriggerPayload = {
+				workflowData: activeWorkflowData,
+				triggerToStartFrom: { name: telegramTrigger.name },
+			};
+
+			testWebhooks.needsWebhook.mockRejectedValue(
+				new Error(
+					'Cannot test webhook for node "Telegram Trigger" while workflow is active. Please deactivate the workflow first.',
+				),
+			);
+
+			await expect(service.executeManually(runPayload, user)).rejects.toThrow(
+				'Cannot test webhook for node "Telegram Trigger" while workflow is active. Please deactivate the workflow first.',
+			);
+
+			expect(testWebhooks.needsWebhook).toHaveBeenCalledWith(
+				expect.objectContaining({
+					workflowIsActive: true,
+				}),
+			);
+		});
 	});
 
 	describe('selectPinnedTrigger()', () => {
diff --git a/packages/cli/src/workflows/workflow-execution.service.ts b/packages/cli/src/workflows/workflow-execution.service.ts
index 25ae95dfd37..d58e89a9e3b 100644
--- a/packages/cli/src/workflows/workflow-execution.service.ts
+++ b/packages/cli/src/workflows/workflow-execution.service.ts
@@ -101,6 +101,9 @@ export class WorkflowExecutionService {
 		user: User,
 		pushRef?: string,
 	): Promise<{ executionId: string } | { waitingForWebhook: boolean }> {
+		// Check whether this workflow is active.
+		const workflowIsActive = await this.workflowRepository.isActive(payload.workflowData.id);
+
 		// For manual testing always set to not active
 		payload.workflowData.active = false;
 		payload.workflowData.activeVersionId = null;
@@ -146,6 +149,7 @@ export class WorkflowExecutionService {
 					pushRef,
 					triggerToStartFrom: payload.triggerToStartFrom,
 					destinationNode: payload.destinationNode,
+					workflowIsActive,
 				}))
 			) {
 				return { waitingForWebhook: true };
@@ -182,6 +186,7 @@ export class WorkflowExecutionService {
 					}),
 					pushRef,
 					destinationNode: payload.destinationNode,
+					workflowIsActive,
 				}))
 			) {
 				return { waitingForWebhook: true };
diff --git a/packages/cli/test/integration/active-workflow-manager.test.ts b/packages/cli/test/integration/active-workflow-manager.test.ts
index f65b7c73639..0e0c94a4754 100644
--- a/packages/cli/test/integration/active-workflow-manager.test.ts
+++ b/packages/cli/test/integration/active-workflow-manager.test.ts
@@ -123,24 +123,6 @@ describe('init()', () => {
 	});
 });
 
-describe('isActive()', () => {
-	it('should return `true` for active workflow in storage', async () => {
-		const dbWorkflow = await createActiveWorkflow();
-
-		await activeWorkflowManager.init();
-
-		await expect(activeWorkflowManager.isActive(dbWorkflow.id)).resolves.toBe(true);
-	});
-
-	it('should return `false` for inactive workflow in storage', async () => {
-		const dbWorkflow = await createInactiveWorkflow();
-
-		await activeWorkflowManager.init();
-
-		await expect(activeWorkflowManager.isActive(dbWorkflow.id)).resolves.toBe(false);
-	});
-});
-
 describe('add()', () => {
 	describe('in single-main mode', () => {
 		test.each(['activate', 'update'])(
diff --git a/packages/cli/test/integration/database/repositories/workflow.repository.test.ts b/packages/cli/test/integration/database/repositories/workflow.repository.test.ts
index 9f6f4594afd..df52156cfe2 100644
--- a/packages/cli/test/integration/database/repositories/workflow.repository.test.ts
+++ b/packages/cli/test/integration/database/repositories/workflow.repository.test.ts
@@ -6,6 +6,7 @@ import {
 	createWorkflow,
 	testDb,
 	getWorkflowById,
+	setActiveVersion,
 } from '@n8n/backend-test-utils';
 import { GlobalConfig } from '@n8n/config';
 import { WorkflowRepository, WorkflowDependencyRepository, WorkflowDependencies } from '@n8n/db';
@@ -262,6 +263,25 @@ describe('WorkflowRepository', () => {
 		});
 	});
 
+	describe('isActive()', () => {
+		it('should return `true` for active workflow in storage', async () => {
+			const workflowRepository = Container.get(WorkflowRepository);
+
+			const workflow = await createWorkflowWithHistory();
+			await setActiveVersion(workflow.id, workflow.versionId);
+
+			await expect(workflowRepository.isActive(workflow.id)).resolves.toBe(true);
+		});
+
+		it('should return `false` for inactive workflow in storage', async () => {
+			const workflowRepository = Container.get(WorkflowRepository);
+
+			const workflow = await createWorkflowWithHistory();
+
+			await expect(workflowRepository.isActive(workflow.id)).resolves.toBe(false);
+		});
+	});
+
 	// NOTE: these tests use the workflow dependency repository, which is not enabled
 	// on legacy Sqlite.
 	const globalConfig = Container.get(GlobalConfig);
diff --git a/packages/cli/test/integration/public-api/workflows.test.ts b/packages/cli/test/integration/public-api/workflows.test.ts
index 97b24da0762..67bad030ddc 100644
--- a/packages/cli/test/integration/public-api/workflows.test.ts
+++ b/packages/cli/test/integration/public-api/workflows.test.ts
@@ -9,7 +9,12 @@ import {
 } from '@n8n/backend-test-utils';
 import { GlobalConfig } from '@n8n/config';
 import type { Project, TagEntity, User, WorkflowHistory } from '@n8n/db';
-import { ProjectRepository, WorkflowHistoryRepository, SharedWorkflowRepository } from '@n8n/db';
+import {
+	WorkflowRepository,
+	ProjectRepository,
+	WorkflowHistoryRepository,
+	SharedWorkflowRepository,
+} from '@n8n/db';
 import { Container } from '@n8n/di';
 import { Not } from '@n8n/typeorm';
 import { InstanceSettings } from 'n8n-core';
@@ -37,6 +42,7 @@ let memberPersonalProject: Project;
 let authOwnerAgent: SuperAgentTest;
 let authMemberAgent: SuperAgentTest;
 let activeWorkflowManager: ActiveWorkflowManager;
+let workflowRepository: WorkflowRepository;
 
 const testServer = utils.setupTestServer({ endpointGroups: ['publicApi'] });
 const license = testServer.license;
@@ -61,6 +67,7 @@ beforeAll(async () => {
 	await utils.initNodeTypes();
 
 	activeWorkflowManager = Container.get(ActiveWorkflowManager);
+	workflowRepository = Container.get(WorkflowRepository);
 
 	await activeWorkflowManager.init();
 });
@@ -898,7 +905,7 @@ describe('POST /workflows/:id/activate', () => {
 		expect(sharedWorkflow?.workflow.activeVersionId).toBe(workflow.versionId);
 
 		// check whether the workflow is on the active workflow runner
-		expect(await activeWorkflowManager.isActive(workflow.id)).toBe(true);
+		expect(await workflowRepository.isActive(workflow.id)).toBe(true);
 	});
 
 	test('should set activeVersionId when activating workflow', async () => {
@@ -974,7 +981,7 @@ describe('POST /workflows/:id/activate', () => {
 		expect(sharedWorkflow?.workflow.activeVersionId).toBe(workflow.versionId);
 
 		// check whether the workflow is on the active workflow runner
-		expect(await activeWorkflowManager.isActive(workflow.id)).toBe(true);
+		expect(await workflowRepository.isActive(workflow.id)).toBe(true);
 	});
 });
 
@@ -1039,7 +1046,7 @@ describe('POST /workflows/:id/deactivate', () => {
 		// check whether the workflow is deactivated in the database
 		expect(sharedWorkflow?.workflow.activeVersionId).toBeNull();
 
-		expect(await activeWorkflowManager.isActive(workflow.id)).toBe(false);
+		expect(await workflowRepository.isActive(workflow.id)).toBe(false);
 	});
 
 	test('should clear activeVersionId when deactivating workflow', async () => {
@@ -1126,7 +1133,7 @@ describe('POST /workflows/:id/deactivate', () => {
 
 		expect(sharedWorkflow?.workflow.activeVersionId).toBeNull();
 
-		expect(await activeWorkflowManager.isActive(workflow.id)).toBe(false);
+		expect(await workflowRepository.isActive(workflow.id)).toBe(false);
 	});
 });
 
diff --git a/packages/frontend/@n8n/i18n/src/locales/en.json b/packages/frontend/@n8n/i18n/src/locales/en.json
index a30c8627ed5..d859015d0a6 100644
--- a/packages/frontend/@n8n/i18n/src/locales/en.json
+++ b/packages/frontend/@n8n/i18n/src/locales/en.json
@@ -3083,7 +3083,6 @@
 	"workflowPreview.showError.previewError.title": "Preview error",
 	"workflowRun.noActiveConnectionToTheServer": "Lost connection to the server",
 	"workflowRun.showError.deactivate": "Deactivate workflow to execute",
-	"workflowRun.showError.productionActive": "Because of limitations in {nodeName}, n8n can't listen for test executions at the same time as listening for production ones",
 	"workflowRun.showError.title": "Problem running workflow",
 	"workflowRun.showError.payloadTooLarge": "Please execute the whole workflow, rather than just the node. (Existing execution data is too large.)",
 	"workflowRun.showError.resolveOutstandingIssues": "Please resolve outstanding issues before you activate it",
diff --git a/packages/frontend/editor-ui/src/app/composables/useRunWorkflow.test.ts b/packages/frontend/editor-ui/src/app/composables/useRunWorkflow.test.ts
index 2f506a6a080..a7d06f45527 100644
--- a/packages/frontend/editor-ui/src/app/composables/useRunWorkflow.test.ts
+++ b/packages/frontend/editor-ui/src/app/composables/useRunWorkflow.test.ts
@@ -25,14 +25,11 @@ import type { WorkflowData } from '@n8n/rest-api-client/api/workflows';
 import { useWorkflowsStore } from '@/app/stores/workflows.store';
 import { useUIStore } from '@/app/stores/ui.store';
 import { useWorkflowHelpers } from '@/app/composables/useWorkflowHelpers';
-import { useToast } from './useToast';
-import { useI18n } from '@n8n/i18n';
 import { captor, mock } from 'vitest-mock-extended';
 import { usePushConnectionStore } from '@/app/stores/pushConnection.store';
 import { createTestNode, createTestWorkflow } from '@/__tests__/mocks';
 import { waitFor } from '@testing-library/vue';
 import { useAgentRequestStore } from '@n8n/stores/useAgentRequestStore';
-import { SLACK_TRIGGER_NODE_TYPE, MANUAL_TRIGGER_NODE_TYPE } from '@/app/constants';
 
 vi.mock('@/app/stores/workflows.store', () => {
 	const storeState: Partial<ReturnType<typeof useWorkflowsStore>> & {
@@ -250,177 +247,6 @@ describe('useRunWorkflow({ router })', () => {
 	});
 
 	describe('runWorkflow()', () => {
-		it('should prevent execution and show error message when workflow is active with single webhook trigger', async () => {
-			const pinia = createTestingPinia({ stubActions: false });
-			setActivePinia(pinia);
-			const toast = useToast();
-			const i18n = useI18n();
-			const { runWorkflow } = useRunWorkflow({ router });
-
-			vi.mocked(workflowsStore).isWorkflowActive = true;
-
-			vi.mocked(useWorkflowHelpers()).getWorkflowDataToSave.mockResolvedValue({
-				nodes: [
-					{
-						name: 'Slack',
-						type: SLACK_TRIGGER_NODE_TYPE,
-						disabled: false,
-					},
-				],
-			} as unknown as WorkflowData);
-
-			const result = await runWorkflow({});
-
-			expect(result).toBeUndefined();
-			expect(toast.showMessage).toHaveBeenCalledWith({
-				title: i18n.baseText('workflowRun.showError.deactivate'),
-				message: i18n.baseText('workflowRun.showError.productionActive', {
-					interpolate: { nodeName: 'Webhook' },
-				}),
-				type: 'error',
-			});
-		});
-
-		it('should execute the workflow if the single webhook trigger has pin data', async () => {
-			const pinia = createTestingPinia({ stubActions: false });
-			setActivePinia(pinia);
-			const toast = useToast();
-			const i18n = useI18n();
-			const { runWorkflow } = useRunWorkflow({ router });
-
-			vi.mocked(workflowsStore).isWorkflowActive = true;
-
-			vi.mocked(useWorkflowHelpers()).getWorkflowDataToSave.mockResolvedValue({
-				nodes: [
-					{
-						name: 'Slack',
-						type: SLACK_TRIGGER_NODE_TYPE,
-						disabled: false,
-					},
-				],
-				pinData: {
-					Slack: [{ json: { value: 'data2' } }],
-				},
-			} as unknown as WorkflowData);
-
-			const mockExecutionResponse = { executionId: '123' };
-
-			vi.mocked(uiStore).activeActions = [''];
-			vi.mocked(workflowsStore).workflowObject = {
-				name: 'Test Workflow',
-			} as unknown as Workflow;
-			vi.mocked(workflowsStore).runWorkflow.mockResolvedValue(mockExecutionResponse);
-			vi.mocked(workflowsStore).nodesIssuesExist = true;
-			vi.mocked(workflowsStore).getWorkflowRunData = {
-				NodeName: [],
-			};
-
-			const result = await runWorkflow({});
-			expect(result).toEqual(mockExecutionResponse);
-
-			expect(toast.showMessage).not.toHaveBeenCalledWith({
-				title: i18n.baseText('workflowRun.showError.deactivate'),
-				message: i18n.baseText('workflowRun.showError.productionActive', {
-					interpolate: { nodeName: 'Webhook' },
-				}),
-				type: 'error',
-			});
-		});
-
-		it('should execute the workflow if there is a single webhook trigger, but another trigger is chosen', async () => {
-			// ARRANGE
-			const pinia = createTestingPinia({ stubActions: false });
-			setActivePinia(pinia);
-			const toast = useToast();
-			const i18n = useI18n();
-			const { runWorkflow } = useRunWorkflow({ router });
-			const mockExecutionResponse = { executionId: '123' };
-			const triggerNode = 'Manual';
-
-			vi.mocked(workflowsStore).isWorkflowActive = true;
-			vi.mocked(useWorkflowHelpers()).getWorkflowDataToSave.mockResolvedValue({
-				nodes: [
-					{
-						name: 'Slack',
-						type: SLACK_TRIGGER_NODE_TYPE,
-						disabled: false,
-					},
-					{
-						name: triggerNode,
-						type: MANUAL_TRIGGER_NODE_TYPE,
-						disabled: false,
-					},
-				],
-			} as unknown as WorkflowData);
-			vi.mocked(uiStore).activeActions = [''];
-			vi.mocked(workflowsStore).workflowObject = {
-				name: 'Test Workflow',
-			} as unknown as Workflow;
-			vi.mocked(workflowsStore).runWorkflow.mockResolvedValue(mockExecutionResponse);
-			vi.mocked(workflowsStore).nodesIssuesExist = true;
-			vi.mocked(workflowsStore).getWorkflowRunData = { NodeName: [] };
-
-			// ACT
-			const result = await runWorkflow({ triggerNode });
-
-			// ASSERT
-			expect(result).toEqual(mockExecutionResponse);
-			expect(toast.showMessage).not.toHaveBeenCalledWith({
-				title: i18n.baseText('workflowRun.showError.deactivate'),
-				message: i18n.baseText('workflowRun.showError.productionActive', {
-					interpolate: { nodeName: 'Webhook' },
-				}),
-				type: 'error',
-			});
-		});
-
-		it('should prevent execution and show error message when workflow is active with multiple triggers and a single webhook trigger is chosen', async () => {
-			// ARRANGE
-			const pinia = createTestingPinia({ stubActions: false });
-			setActivePinia(pinia);
-			const toast = useToast();
-			const i18n = useI18n();
-			const { runWorkflow } = useRunWorkflow({ router });
-			const mockExecutionResponse = { executionId: '123' };
-			const triggerNode = 'Slack';
-
-			vi.mocked(workflowsStore).isWorkflowActive = true;
-			vi.mocked(useWorkflowHelpers()).getWorkflowDataToSave.mockResolvedValue({
-				nodes: [
-					{
-						name: triggerNode,
-						type: SLACK_TRIGGER_NODE_TYPE,
-						disabled: false,
-					},
-					{
-						name: 'Manual',
-						type: MANUAL_TRIGGER_NODE_TYPE,
-						disabled: false,
-					},
-				],
-			} as unknown as WorkflowData);
-			vi.mocked(uiStore).activeActions = [''];
-			vi.mocked(workflowsStore).workflowObject = {
-				name: 'Test Workflow',
-			} as unknown as Workflow;
-			vi.mocked(workflowsStore).runWorkflow.mockResolvedValue(mockExecutionResponse);
-			vi.mocked(workflowsStore).nodesIssuesExist = true;
-			vi.mocked(workflowsStore).getWorkflowRunData = { NodeName: [] };
-
-			// ACT
-			const result = await runWorkflow({ triggerNode });
-
-			// ASSERT
-			expect(result).toBeUndefined();
-			expect(toast.showMessage).toHaveBeenCalledWith({
-				title: i18n.baseText('workflowRun.showError.deactivate'),
-				message: i18n.baseText('workflowRun.showError.productionActive', {
-					interpolate: { nodeName: 'Webhook' },
-				}),
-				type: 'error',
-			});
-		});
-
 		it('should return undefined if UI action "workflowRunning" is active', async () => {
 			const { runWorkflow } = useRunWorkflow({ router });
 			workflowState.setActiveExecutionId('123');
diff --git a/packages/frontend/editor-ui/src/app/composables/useRunWorkflow.ts b/packages/frontend/editor-ui/src/app/composables/useRunWorkflow.ts
index 4bb64c7d08d..1fb80d8e1b5 100644
--- a/packages/frontend/editor-ui/src/app/composables/useRunWorkflow.ts
+++ b/packages/frontend/editor-ui/src/app/composables/useRunWorkflow.ts
@@ -22,11 +22,7 @@ import { retry } from '@n8n/utils/retry';
 import { useToast } from '@/app/composables/useToast';
 import { useNodeHelpers } from '@/app/composables/useNodeHelpers';
 
-import {
-	CHAT_TRIGGER_NODE_TYPE,
-	IN_PROGRESS_EXECUTION_ID,
-	SINGLE_WEBHOOK_TRIGGERS,
-} from '@/app/constants';
+import { CHAT_TRIGGER_NODE_TYPE, IN_PROGRESS_EXECUTION_ID } from '@/app/constants';
 
 import { useRootStore } from '@n8n/stores/useRootStore';
 import { useWorkflowsStore } from '@/app/stores/workflows.store';
@@ -287,31 +283,6 @@ export function useRunWorkflow(useRunWorkflowOpts: {
 					return true;
 				});
 
-			const singleWebhookTrigger =
-				options.triggerNode === undefined
-					? // if there is no chosen trigger we check all triggers
-						triggers.find((node) => SINGLE_WEBHOOK_TRIGGERS.includes(node.type))
-					: // if there is a chosen trigger we check this one only
-						workflowData.nodes.find(
-							(node) =>
-								node.name === options.triggerNode && SINGLE_WEBHOOK_TRIGGERS.includes(node.type),
-						);
-
-			if (
-				singleWebhookTrigger &&
-				workflowsStore.isWorkflowActive &&
-				!workflowData.pinData?.[singleWebhookTrigger.name]
-			) {
-				toast.showMessage({
-					title: i18n.baseText('workflowRun.showError.deactivate'),
-					message: i18n.baseText('workflowRun.showError.productionActive', {
-						interpolate: { nodeName: singleWebhookTrigger.name },
-					}),
-					type: 'error',
-				});
-				return undefined;
-			}
-
 			const startRunData: IStartRunData = {
 				workflowData,
 				runData: isPartialExecution
diff --git a/packages/frontend/editor-ui/src/app/constants/nodeTypes.ts b/packages/frontend/editor-ui/src/app/constants/nodeTypes.ts
index ae42317610f..2d1ee2118ee 100644
--- a/packages/frontend/editor-ui/src/app/constants/nodeTypes.ts
+++ b/packages/frontend/editor-ui/src/app/constants/nodeTypes.ts
@@ -143,12 +143,6 @@ export const OPEN_URL_PANEL_TRIGGER_NODE_TYPES = [
 	MCP_TRIGGER_NODE_TYPE,
 ];
 
-export const SINGLE_WEBHOOK_TRIGGERS = [
-	TELEGRAM_TRIGGER_NODE_TYPE,
-	SLACK_TRIGGER_NODE_TYPE,
-	FACEBOOK_LEAD_ADS_TRIGGER_NODE_TYPE,
-];
-
 export const LIST_LIKE_NODE_OPERATIONS = ['getAll', 'getMany', 'read', 'search'];
 
 export const PRODUCTION_ONLY_TRIGGER_NODE_TYPES = [CHAT_TRIGGER_NODE_TYPE];

From 803ab421648171d8b7909694597e560244e1cefa Mon Sep 17 00:00:00 2001
From: mfsiega <93014743+mfsiega@users.noreply.github.com>
Date: Thu, 4 Dec 2025 18:20:33 +0100
Subject: [PATCH 062/167] fix(core): During partial execution don't include
 loop as start node if the loop isn't closed (#22555)

Co-authored-by: Danny Martini <danny@n8n.io>
---
 .../__tests__/find-start-nodes.test.ts        | 41 +++++++++++++++++++
 .../find-start-nodes.ts                       | 10 ++++-
 2 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/packages/core/src/execution-engine/partial-execution-utils/__tests__/find-start-nodes.test.ts b/packages/core/src/execution-engine/partial-execution-utils/__tests__/find-start-nodes.test.ts
index 30da6e563be..788cc7e6c8e 100644
--- a/packages/core/src/execution-engine/partial-execution-utils/__tests__/find-start-nodes.test.ts
+++ b/packages/core/src/execution-engine/partial-execution-utils/__tests__/find-start-nodes.test.ts
@@ -624,5 +624,46 @@ describe('findStartNodes', () => {
 			expect(startNodes.size).toBe(1);
 			expect(startNodes).toContainEqual(afterLoop);
 		});
+
+		// 	                      done (empty)
+		//                      ┌────►
+		// ┌─────────┐1 ┌────┐1 │
+		// │ trigger ┼──►loop┼─┬┘  ►►
+		// └─────────┘  └────┘ │  ┌────────┐
+		//                     └─►│in loop │
+		//                        └────────┘
+		test('if a loop node does not actually form a loop in the graph, it uses loop output instead of done output', () => {
+			// ARRANGE
+			const trigger = createNodeData({ name: 'trigger' });
+			const loop = createNodeData({ name: 'loop', type: 'n8n-nodes-base.splitInBatches' });
+			const inLoop = createNodeData({ name: 'inLoop' });
+			const graph = new DirectedGraph().addNodes(trigger, loop, inLoop).addConnections(
+				{ from: trigger, to: loop },
+				// Note: loop connects to inLoop via output 1, but there's no connection
+				// back to loop, so it's not actually a loop
+				{ from: loop, outputIndex: 1, to: inLoop },
+			);
+			const runData: IRunData = {
+				[trigger.name]: [toITaskData([{ data: { name: 'trigger' } }])],
+				// The loop node has data on output 1 (the first output), but not on output 0 (done)
+				[loop.name]: [toITaskData([{ outputIndex: 1, data: { name: 'loop' } }])],
+			};
+
+			// ACT
+			const startNodes = findStartNodes({
+				graph,
+				trigger,
+				destination: inLoop,
+				runData,
+				pinData: {},
+			});
+
+			// ASSERT
+			// Because the loop node doesn't form an actual loop, it should check output 1
+			// for run data (not output 0). Since output 1 has data, the loop node should
+			// not be a start node, and we should continue to inLoop.
+			expect(startNodes.size).toBe(1);
+			expect(startNodes).toContainEqual(inLoop);
+		});
 	});
 });
diff --git a/packages/core/src/execution-engine/partial-execution-utils/find-start-nodes.ts b/packages/core/src/execution-engine/partial-execution-utils/find-start-nodes.ts
index 7b9a5f424ff..cb4e1b11083 100644
--- a/packages/core/src/execution-engine/partial-execution-utils/find-start-nodes.ts
+++ b/packages/core/src/execution-engine/partial-execution-utils/find-start-nodes.ts
@@ -83,7 +83,11 @@ function findStartNodesRecursive(
 			// last run
 			-1,
 			NodeConnectionTypes.Main,
-			0,
+			// Although this is a Loop node, the graph may not actually have a loop here e.g.,
+			// while the workflow is under development. If there's not a loop, we treat the loop
+			// node as a normal node and take the data from the first output at index 1.
+			// If there *is* a loop, we take the data from the `done` output at index 0.
+			isALoop(graph, current) ? 0 : 1,
 		);
 
 		if (nodeRunData === null || nodeRunData.length === 0) {
@@ -130,6 +134,10 @@ function findStartNodesRecursive(
 	return startNodes;
 }
 
+function isALoop(graph: DirectedGraph, node: INode): boolean {
+	return graph.getChildren(node).has(node);
+}
+
 /**
  * The start node is the node from which a partial execution starts. The start
  * node will be executed or re-executed.

From b8d045b05084b401cf20d094b9d426cb41bcc8c6 Mon Sep 17 00:00:00 2001
From: Guillaume Jacquart <jacquart.guillaume@gmail.com>
Date: Thu, 4 Dec 2025 20:20:24 +0100
Subject: [PATCH 063/167] feat(core): Add credential resolver service for CRUD
 operations (#22653)

---
 .../@n8n/config/src/configs/logging.config.ts |   1 +
 .../database/entities/credential-resolver.ts  |   6 +-
 .../credential-resolver-not-found.error.ts    |   7 +
 .../credential-resolver.service.test.ts       | 308 ++++++++++++++++++
 .../services/credential-resolver.service.ts   | 170 ++++++++++
 .../dynamic-credentials.ee/services/index.ts  |   1 +
 6 files changed, 492 insertions(+), 1 deletion(-)
 create mode 100644 packages/cli/src/modules/dynamic-credentials.ee/errors/credential-resolver-not-found.error.ts
 create mode 100644 packages/cli/src/modules/dynamic-credentials.ee/services/__tests__/credential-resolver.service.test.ts
 create mode 100644 packages/cli/src/modules/dynamic-credentials.ee/services/credential-resolver.service.ts

diff --git a/packages/@n8n/config/src/configs/logging.config.ts b/packages/@n8n/config/src/configs/logging.config.ts
index 8a899329d32..fbeaddfb0d0 100644
--- a/packages/@n8n/config/src/configs/logging.config.ts
+++ b/packages/@n8n/config/src/configs/logging.config.ts
@@ -28,6 +28,7 @@ export const LOG_SCOPES = [
 	'chat-hub',
 	'breaking-changes',
 	'circuit-breaker',
+	'dynamic-credentials',
 ] as const;
 
 export type LogScope = (typeof LOG_SCOPES)[number];
diff --git a/packages/cli/src/modules/dynamic-credentials.ee/database/entities/credential-resolver.ts b/packages/cli/src/modules/dynamic-credentials.ee/database/entities/credential-resolver.ts
index 7c011a6bd08..a4c31322d91 100644
--- a/packages/cli/src/modules/dynamic-credentials.ee/database/entities/credential-resolver.ts
+++ b/packages/cli/src/modules/dynamic-credentials.ee/database/entities/credential-resolver.ts
@@ -1,5 +1,6 @@
-import { Column, Entity } from '@n8n/typeorm';
 import { WithTimestampsAndStringId } from '@n8n/db';
+import type { CredentialResolverConfiguration } from '@n8n/decorators';
+import { Column, Entity } from '@n8n/typeorm';
 
 @Entity()
 export class DynamicCredentialResolver extends WithTimestampsAndStringId {
@@ -11,4 +12,7 @@ export class DynamicCredentialResolver extends WithTimestampsAndStringId {
 
 	@Column({ type: 'text' })
 	config: string;
+
+	/** Decrypted config, not persisted to the database */
+	decryptedConfig?: CredentialResolverConfiguration;
 }
diff --git a/packages/cli/src/modules/dynamic-credentials.ee/errors/credential-resolver-not-found.error.ts b/packages/cli/src/modules/dynamic-credentials.ee/errors/credential-resolver-not-found.error.ts
new file mode 100644
index 00000000000..59c78ee3b66
--- /dev/null
+++ b/packages/cli/src/modules/dynamic-credentials.ee/errors/credential-resolver-not-found.error.ts
@@ -0,0 +1,7 @@
+import { UserError } from 'n8n-workflow';
+
+export class DynamicCredentialResolverNotFoundError extends UserError {
+	constructor(resolverId: string) {
+		super(`Credential resolver with ID "${resolverId}" does not exist.`);
+	}
+}
diff --git a/packages/cli/src/modules/dynamic-credentials.ee/services/__tests__/credential-resolver.service.test.ts b/packages/cli/src/modules/dynamic-credentials.ee/services/__tests__/credential-resolver.service.test.ts
new file mode 100644
index 00000000000..2879d02b6e2
--- /dev/null
+++ b/packages/cli/src/modules/dynamic-credentials.ee/services/__tests__/credential-resolver.service.test.ts
@@ -0,0 +1,308 @@
+import type { Logger } from '@n8n/backend-common';
+import {
+	CredentialResolverValidationError,
+	type CredentialResolverConfiguration,
+	type ICredentialResolver,
+} from '@n8n/decorators';
+import type { Cipher } from 'n8n-core';
+import { UnexpectedError } from 'n8n-workflow';
+
+import { DynamicCredentialResolver } from '../../database/entities/credential-resolver';
+import type { DynamicCredentialResolverRepository } from '../../database/repositories/credential-resolver.repository';
+import { DynamicCredentialResolverNotFoundError } from '../../errors/credential-resolver-not-found.error';
+import type { DynamicCredentialResolverRegistry } from '../credential-resolver-registry.service';
+import { DynamicCredentialResolverService } from '../credential-resolver.service';
+
+describe('DynamicCredentialResolverService', () => {
+	let service: DynamicCredentialResolverService;
+	let mockLogger: jest.Mocked<Logger>;
+	let mockRepository: jest.Mocked<DynamicCredentialResolverRepository>;
+	let mockRegistry: jest.Mocked<DynamicCredentialResolverRegistry>;
+	let mockCipher: jest.Mocked<Cipher>;
+
+	const mockResolverImplementation: jest.Mocked<ICredentialResolver> = {
+		metadata: {
+			name: 'test.resolver',
+			description: 'A test resolver',
+		},
+		getSecret: jest.fn(),
+		setSecret: jest.fn(),
+		validateOptions: jest.fn(),
+	};
+
+	const createMockEntity = (
+		overrides: Partial<DynamicCredentialResolver> = {},
+	): DynamicCredentialResolver => {
+		const entity = new DynamicCredentialResolver();
+		entity.id = 'resolver-id-123';
+		entity.name = 'Test Resolver';
+		entity.type = 'test.resolver';
+		entity.config = 'encrypted-config-data';
+		entity.createdAt = new Date('2024-01-01');
+		entity.updatedAt = new Date('2024-01-01');
+		Object.assign(entity, overrides);
+		return entity;
+	};
+
+	beforeEach(() => {
+		jest.clearAllMocks();
+
+		mockLogger = {
+			debug: jest.fn(),
+			info: jest.fn(),
+			warn: jest.fn(),
+			error: jest.fn(),
+			scoped: jest.fn().mockReturnThis(),
+		} as unknown as jest.Mocked<Logger>;
+
+		mockRepository = {
+			create: jest.fn(),
+			save: jest.fn(),
+			find: jest.fn(),
+			findOneBy: jest.fn(),
+			remove: jest.fn(),
+		} as unknown as jest.Mocked<DynamicCredentialResolverRepository>;
+
+		mockRegistry = {
+			getResolverByName: jest.fn(),
+		} as unknown as jest.Mocked<DynamicCredentialResolverRegistry>;
+
+		mockCipher = {
+			encrypt: jest.fn(),
+			decrypt: jest.fn(),
+		} as unknown as jest.Mocked<Cipher>;
+
+		service = new DynamicCredentialResolverService(
+			mockLogger,
+			mockRepository,
+			mockRegistry,
+			mockCipher,
+		);
+	});
+
+	describe('create', () => {
+		it('should create a resolver with encrypted config', async () => {
+			const config: CredentialResolverConfiguration = { prefix: 'test-prefix' };
+			const savedEntity = createMockEntity();
+
+			mockRegistry.getResolverByName.mockReturnValue(mockResolverImplementation);
+			mockResolverImplementation.validateOptions.mockResolvedValue(undefined);
+			mockCipher.encrypt.mockReturnValue('encrypted-config-data');
+			mockRepository.create.mockReturnValue(savedEntity);
+			mockRepository.save.mockResolvedValue(savedEntity);
+			mockCipher.decrypt.mockReturnValue(JSON.stringify(config));
+
+			const result = await service.create({
+				name: 'Test Resolver',
+				type: 'test.resolver',
+				config,
+			});
+
+			expect(mockRegistry.getResolverByName).toHaveBeenCalledWith('test.resolver');
+			expect(mockResolverImplementation.validateOptions).toHaveBeenCalledWith(config);
+			expect(mockCipher.encrypt).toHaveBeenCalledWith(config);
+			expect(mockRepository.create).toHaveBeenCalledWith({
+				name: 'Test Resolver',
+				type: 'test.resolver',
+				config: 'encrypted-config-data',
+			});
+			expect(mockRepository.save).toHaveBeenCalledWith(savedEntity);
+			expect(mockLogger.debug).toHaveBeenCalledWith(
+				expect.stringContaining('Created credential resolver'),
+			);
+			expect(result).toBeDefined();
+		});
+
+		it('should throw CredentialResolverValidationError for unknown resolver type', async () => {
+			mockRegistry.getResolverByName.mockReturnValue(undefined);
+
+			await expect(
+				service.create({
+					name: 'Test Resolver',
+					type: 'unknown.resolver',
+					config: {},
+				}),
+			).rejects.toThrow(CredentialResolverValidationError);
+
+			expect(mockRepository.create).not.toHaveBeenCalled();
+			expect(mockRepository.save).not.toHaveBeenCalled();
+		});
+
+		it('should throw CredentialResolverValidationError when config validation fails', async () => {
+			const config: CredentialResolverConfiguration = { invalidOption: 'value' };
+
+			mockRegistry.getResolverByName.mockReturnValue(mockResolverImplementation);
+			mockResolverImplementation.validateOptions.mockRejectedValue(
+				new CredentialResolverValidationError('Invalid option'),
+			);
+
+			await expect(
+				service.create({
+					name: 'Test Resolver',
+					type: 'test.resolver',
+					config,
+				}),
+			).rejects.toThrow(CredentialResolverValidationError);
+
+			expect(mockRepository.create).not.toHaveBeenCalled();
+			expect(mockRepository.save).not.toHaveBeenCalled();
+		});
+	});
+
+	describe('findAll', () => {
+		it('should return all resolvers with decryptedConfig populated', async () => {
+			const entities = [
+				createMockEntity({ id: 'id-1', name: 'Resolver 1' }),
+				createMockEntity({ id: 'id-2', name: 'Resolver 2' }),
+			];
+			const decryptedConfig = { prefix: 'test' };
+
+			mockRepository.find.mockResolvedValue(entities);
+			mockCipher.decrypt.mockReturnValue(JSON.stringify(decryptedConfig));
+
+			const result = await service.findAll();
+
+			expect(mockRepository.find).toHaveBeenCalled();
+			expect(mockCipher.decrypt).toHaveBeenCalledTimes(2);
+			expect(result).toHaveLength(2);
+			expect(result[0].decryptedConfig).toEqual(decryptedConfig);
+			expect(result[1].decryptedConfig).toEqual(decryptedConfig);
+		});
+
+		it('should return empty array when no resolvers exist', async () => {
+			mockRepository.find.mockResolvedValue([]);
+
+			const result = await service.findAll();
+
+			expect(result).toEqual([]);
+		});
+	});
+
+	describe('findById', () => {
+		it('should return resolver with decryptedConfig populated', async () => {
+			const entity = createMockEntity();
+			const decryptedConfig = { prefix: 'test' };
+
+			mockRepository.findOneBy.mockResolvedValue(entity);
+			mockCipher.decrypt.mockReturnValue(JSON.stringify(decryptedConfig));
+
+			const result = await service.findById('resolver-id-123');
+
+			expect(mockRepository.findOneBy).toHaveBeenCalledWith({ id: 'resolver-id-123' });
+			expect(mockCipher.decrypt).toHaveBeenCalledWith('encrypted-config-data');
+			expect(result.decryptedConfig).toEqual(decryptedConfig);
+		});
+
+		it('should throw DynamicCredentialResolverNotFoundError when resolver not found', async () => {
+			mockRepository.findOneBy.mockResolvedValue(null);
+
+			await expect(service.findById('non-existent-id')).rejects.toThrow(
+				DynamicCredentialResolverNotFoundError,
+			);
+		});
+
+		it('should throw UnexpectedError when decryption fails', async () => {
+			const entity = createMockEntity();
+
+			mockRepository.findOneBy.mockResolvedValue(entity);
+			mockCipher.decrypt.mockReturnValue('invalid-json{');
+
+			await expect(service.findById('resolver-id-123')).rejects.toThrow(UnexpectedError);
+		});
+	});
+
+	describe('update', () => {
+		it('should update resolver name', async () => {
+			const entity = createMockEntity();
+			const updatedEntity = createMockEntity({ name: 'Updated Name' });
+			const decryptedConfig = { prefix: 'test' };
+
+			mockRepository.findOneBy.mockResolvedValue(entity);
+			mockRepository.save.mockResolvedValue(updatedEntity);
+			mockCipher.decrypt.mockReturnValue(JSON.stringify(decryptedConfig));
+
+			const result = await service.update('resolver-id-123', { name: 'Updated Name' });
+
+			expect(mockRepository.findOneBy).toHaveBeenCalledWith({ id: 'resolver-id-123' });
+			expect(mockRepository.save).toHaveBeenCalled();
+			expect(mockLogger.debug).toHaveBeenCalledWith(
+				expect.stringContaining('Updated credential resolver'),
+			);
+			expect(result.name).toBe('Updated Name');
+		});
+
+		it('should update resolver config with encryption and validation', async () => {
+			const entity = createMockEntity();
+			const newConfig: CredentialResolverConfiguration = { prefix: 'new-prefix' };
+			const updatedEntity = createMockEntity({ config: 'new-encrypted-config' });
+
+			mockRepository.findOneBy.mockResolvedValue(entity);
+			mockRegistry.getResolverByName.mockReturnValue(mockResolverImplementation);
+			mockResolverImplementation.validateOptions.mockResolvedValue(undefined);
+			mockCipher.encrypt.mockReturnValue('new-encrypted-config');
+			mockRepository.save.mockResolvedValue(updatedEntity);
+			mockCipher.decrypt.mockReturnValue(JSON.stringify(newConfig));
+
+			await service.update('resolver-id-123', { config: newConfig });
+
+			expect(mockRegistry.getResolverByName).toHaveBeenCalledWith('test.resolver');
+			expect(mockResolverImplementation.validateOptions).toHaveBeenCalledWith(newConfig);
+			expect(mockCipher.encrypt).toHaveBeenCalledWith(newConfig);
+			expect(mockRepository.save).toHaveBeenCalled();
+		});
+
+		it('should throw DynamicCredentialResolverNotFoundError when resolver not found', async () => {
+			mockRepository.findOneBy.mockResolvedValue(null);
+
+			await expect(service.update('non-existent-id', { name: 'New Name' })).rejects.toThrow(
+				DynamicCredentialResolverNotFoundError,
+			);
+
+			expect(mockRepository.save).not.toHaveBeenCalled();
+		});
+
+		it('should throw CredentialResolverValidationError when config validation fails on update', async () => {
+			const entity = createMockEntity();
+			const invalidConfig: CredentialResolverConfiguration = { badOption: 'value' };
+
+			mockRepository.findOneBy.mockResolvedValue(entity);
+			mockRegistry.getResolverByName.mockReturnValue(mockResolverImplementation);
+			mockResolverImplementation.validateOptions.mockRejectedValue(
+				new CredentialResolverValidationError('Invalid config'),
+			);
+
+			await expect(service.update('resolver-id-123', { config: invalidConfig })).rejects.toThrow(
+				CredentialResolverValidationError,
+			);
+
+			expect(mockRepository.save).not.toHaveBeenCalled();
+		});
+	});
+
+	describe('delete', () => {
+		it('should delete an existing resolver', async () => {
+			const entity = createMockEntity();
+
+			mockRepository.findOneBy.mockResolvedValue(entity);
+			mockRepository.remove.mockResolvedValue(entity);
+
+			await service.delete('resolver-id-123');
+
+			expect(mockRepository.findOneBy).toHaveBeenCalledWith({ id: 'resolver-id-123' });
+			expect(mockRepository.remove).toHaveBeenCalledWith(entity);
+			expect(mockLogger.debug).toHaveBeenCalledWith(
+				expect.stringContaining('Deleted credential resolver'),
+			);
+		});
+
+		it('should throw DynamicCredentialResolverNotFoundError when resolver not found', async () => {
+			mockRepository.findOneBy.mockResolvedValue(null);
+
+			await expect(service.delete('non-existent-id')).rejects.toThrow(
+				DynamicCredentialResolverNotFoundError,
+			);
+
+			expect(mockRepository.remove).not.toHaveBeenCalled();
+		});
+	});
+});
diff --git a/packages/cli/src/modules/dynamic-credentials.ee/services/credential-resolver.service.ts b/packages/cli/src/modules/dynamic-credentials.ee/services/credential-resolver.service.ts
new file mode 100644
index 00000000000..a72305b7965
--- /dev/null
+++ b/packages/cli/src/modules/dynamic-credentials.ee/services/credential-resolver.service.ts
@@ -0,0 +1,170 @@
+import { Logger } from '@n8n/backend-common';
+import {
+	CredentialResolverConfiguration,
+	CredentialResolverValidationError,
+} from '@n8n/decorators';
+import { Service } from '@n8n/di';
+import { Cipher } from 'n8n-core';
+import { jsonParse, UnexpectedError } from 'n8n-workflow';
+
+import { DynamicCredentialResolverRegistry } from './credential-resolver-registry.service';
+import { DynamicCredentialResolver } from '../database/entities/credential-resolver';
+import { DynamicCredentialResolverRepository } from '../database/repositories/credential-resolver.repository';
+import { DynamicCredentialResolverNotFoundError } from '../errors/credential-resolver-not-found.error';
+
+export interface CreateResolverParams {
+	name: string;
+	type: string;
+	config: CredentialResolverConfiguration;
+}
+
+export interface UpdateResolverParams {
+	name?: string;
+	config?: CredentialResolverConfiguration;
+}
+
+/**
+ * Service layer for managing DynamicCredentialResolver entities.
+ * Provides CRUD operations with:
+ * - Config encryption at rest
+ * - Validation against resolver type's config schema
+ */
+@Service()
+export class DynamicCredentialResolverService {
+	constructor(
+		private readonly logger: Logger,
+		private readonly repository: DynamicCredentialResolverRepository,
+		private readonly registry: DynamicCredentialResolverRegistry,
+		private readonly cipher: Cipher,
+	) {
+		this.logger = this.logger.scoped('dynamic-credentials');
+	}
+
+	/**
+	 * Creates a new credential resolver.
+	 * @throws {CredentialResolverValidationError} When the resolver type is unknown or config is invalid
+	 */
+	async create(params: CreateResolverParams): Promise<DynamicCredentialResolver> {
+		await this.validateConfig(params.type, params.config);
+
+		const encryptedConfig = this.encryptConfig(params.config);
+
+		const resolver = this.repository.create({
+			name: params.name,
+			type: params.type,
+			config: encryptedConfig,
+		});
+
+		const saved = await this.repository.save(resolver);
+		this.logger.debug(`Created credential resolver "${saved.name}" (${saved.id})`);
+
+		return saved;
+	}
+
+	/**
+	 * Retrieves all credential resolvers.
+	 * Config is returned decrypted.
+	 */
+	async findAll(): Promise<DynamicCredentialResolver[]> {
+		const resolvers = await this.repository.find();
+		return resolvers.map((resolver) => this.withDecryptedConfig(resolver));
+	}
+
+	/**
+	 * Retrieves a credential resolver by ID.
+	 * Config is returned decrypted.
+	 * @throws {DynamicCredentialResolverNotFoundError} When resolver is not found
+	 */
+	async findById(id: string): Promise<DynamicCredentialResolver> {
+		const resolver = await this.repository.findOneBy({ id });
+		if (!resolver) {
+			throw new DynamicCredentialResolverNotFoundError(id);
+		}
+		return this.withDecryptedConfig(resolver);
+	}
+
+	/**
+	 * Updates an existing credential resolver.
+	 * @throws {DynamicCredentialResolverNotFoundError} When resolver is not found
+	 * @throws {CredentialResolverValidationError} When the config is invalid for the resolver type
+	 */
+	async update(id: string, params: UpdateResolverParams): Promise<DynamicCredentialResolver> {
+		const existing = await this.repository.findOneBy({ id });
+		if (!existing) {
+			throw new DynamicCredentialResolverNotFoundError(id);
+		}
+
+		if (params.config !== undefined) {
+			await this.validateConfig(existing.type, params.config);
+			existing.config = this.encryptConfig(params.config);
+		}
+
+		if (params.name !== undefined) {
+			existing.name = params.name;
+		}
+
+		const saved = await this.repository.save(existing);
+		this.logger.debug(`Updated credential resolver "${saved.name}" (${saved.id})`);
+
+		return this.withDecryptedConfig(saved);
+	}
+
+	/**
+	 * Deletes a credential resolver by ID.
+	 * @throws {DynamicCredentialResolverNotFoundError} When resolver is not found
+	 */
+	async delete(id: string): Promise<void> {
+		const existing = await this.repository.findOneBy({ id });
+		if (!existing) {
+			throw new DynamicCredentialResolverNotFoundError(id);
+		}
+
+		await this.repository.remove(existing);
+		this.logger.debug(`Deleted credential resolver "${existing.name}" (${id})`);
+	}
+
+	/**
+	 * Validates the config against the resolver type's schema.
+	 * @throws {CredentialResolverValidationError} When the resolver type is unknown or config is invalid
+	 */
+	private async validateConfig(
+		type: string,
+		config: CredentialResolverConfiguration,
+	): Promise<void> {
+		const resolverImplementation = this.registry.getResolverByName(type);
+		if (!resolverImplementation) {
+			throw new CredentialResolverValidationError(`Unknown resolver type: ${type}`);
+		}
+
+		await resolverImplementation.validateOptions(config);
+	}
+
+	/**
+	 * Encrypts the config for storage.
+	 */
+	private encryptConfig(config: CredentialResolverConfiguration): string {
+		return this.cipher.encrypt(config);
+	}
+
+	/**
+	 * Decrypts the config from storage.
+	 */
+	private decryptConfig(encryptedConfig: string): CredentialResolverConfiguration {
+		const decryptedData = this.cipher.decrypt(encryptedConfig);
+		try {
+			return jsonParse<CredentialResolverConfiguration>(decryptedData);
+		} catch {
+			throw new UnexpectedError(
+				'Credential resolver config could not be decrypted. The likely reason is that a different "encryptionKey" was used to encrypt the data.',
+			);
+		}
+	}
+
+	/**
+	 * Populates the decryptedConfig field on the resolver.
+	 */
+	private withDecryptedConfig(resolver: DynamicCredentialResolver): DynamicCredentialResolver {
+		resolver.decryptedConfig = this.decryptConfig(resolver.config);
+		return resolver;
+	}
+}
diff --git a/packages/cli/src/modules/dynamic-credentials.ee/services/index.ts b/packages/cli/src/modules/dynamic-credentials.ee/services/index.ts
index 342ab6b6b4f..7405c3ed8eb 100644
--- a/packages/cli/src/modules/dynamic-credentials.ee/services/index.ts
+++ b/packages/cli/src/modules/dynamic-credentials.ee/services/index.ts
@@ -1 +1,2 @@
 export * from './credential-resolver-registry.service';
+export * from './credential-resolver.service';

From ad56240013187e31baf4fd19df5f154c7b3d1673 Mon Sep 17 00:00:00 2001
From: Guillaume Jacquart <jacquart.guillaume@gmail.com>
Date: Thu, 4 Dec 2025 20:20:35 +0100
Subject: [PATCH 064/167] fix(core): Hide migration rule issues not relevant to
 cloud (#22749)

---
 .../settings-file-permissions.rule.test.ts    | 41 +++++++++++++++----
 .../task-runner-docker-image.rule.test.ts     | 21 +++++++++-
 .../v2/__tests__/task-runners.rule.test.ts    | 32 +++++++++++++--
 .../v2/settings-file-permissions.rule.ts      | 19 ++++++---
 .../rules/v2/task-runner-docker-image.rule.ts | 12 ++++++
 .../rules/v2/task-runners.rule.ts             | 16 +++++++-
 6 files changed, 122 insertions(+), 19 deletions(-)

diff --git a/packages/cli/src/modules/breaking-changes/rules/v2/__tests__/settings-file-permissions.rule.test.ts b/packages/cli/src/modules/breaking-changes/rules/v2/__tests__/settings-file-permissions.rule.test.ts
index 446cd40c609..2fd7679abc5 100644
--- a/packages/cli/src/modules/breaking-changes/rules/v2/__tests__/settings-file-permissions.rule.test.ts
+++ b/packages/cli/src/modules/breaking-changes/rules/v2/__tests__/settings-file-permissions.rule.test.ts
@@ -1,16 +1,20 @@
-import type { InstanceSettingsConfig } from '@n8n/config';
+import type { GlobalConfig } from '@n8n/config';
 import { mock } from 'jest-mock-extended';
 
 import { SettingsFilePermissionsRule } from '../settings-file-permissions.rule';
 
 describe('SettingsFilePermissionsRule', () => {
 	let rule: SettingsFilePermissionsRule;
-	const instanceSettingsConfig = mock<InstanceSettingsConfig>({});
+	const mockGlobalConfig = mock<GlobalConfig>({
+		deployment: { type: 'default' },
+	});
 	let originalEnvValue: string | undefined;
 
 	beforeEach(() => {
-		rule = new SettingsFilePermissionsRule(instanceSettingsConfig);
+		rule = new SettingsFilePermissionsRule(mockGlobalConfig);
 		originalEnvValue = process.env.N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS;
+		// Clear env var before each test
+		delete process.env.N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS;
 	});
 
 	afterEach(() => {
@@ -22,8 +26,21 @@ describe('SettingsFilePermissionsRule', () => {
 	});
 
 	describe('detect()', () => {
-		it('should not be affected when enforceSettingsFilePermissions is set to false', async () => {
-			instanceSettingsConfig.enforceSettingsFilePermissions = false;
+		it('should not be affected on cloud deployments', async () => {
+			const cloudGlobalConfig = mock<GlobalConfig>({
+				deployment: { type: 'cloud' },
+			});
+			const cloudRule = new SettingsFilePermissionsRule(cloudGlobalConfig);
+
+			const result = await cloudRule.detect();
+
+			expect(result.isAffected).toBe(false);
+			expect(result.instanceIssues).toHaveLength(0);
+			expect(result.recommendations).toHaveLength(0);
+		});
+
+		it('should not be affected when N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS is explicitly set to false', async () => {
+			process.env.N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS = 'false';
 
 			const result = await rule.detect();
 
@@ -32,8 +49,18 @@ describe('SettingsFilePermissionsRule', () => {
 			expect(result.recommendations).toHaveLength(0);
 		});
 
-		it('should be affected when enforceSettingsFilePermissions is not set to false', async () => {
-			instanceSettingsConfig.enforceSettingsFilePermissions = true;
+		it('should not be affected when N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS is explicitly set to true', async () => {
+			process.env.N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS = 'true';
+
+			const result = await rule.detect();
+
+			expect(result.isAffected).toBe(false);
+			expect(result.instanceIssues).toHaveLength(0);
+			expect(result.recommendations).toHaveLength(0);
+		});
+
+		it('should be affected when N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS is not set (default behavior change)', async () => {
+			// Env var is not set (cleared in beforeEach)
 			const result = await rule.detect();
 
 			expect(result.isAffected).toBe(true);
diff --git a/packages/cli/src/modules/breaking-changes/rules/v2/__tests__/task-runner-docker-image.rule.test.ts b/packages/cli/src/modules/breaking-changes/rules/v2/__tests__/task-runner-docker-image.rule.test.ts
index 240553931ae..c96a75e0fa6 100644
--- a/packages/cli/src/modules/breaking-changes/rules/v2/__tests__/task-runner-docker-image.rule.test.ts
+++ b/packages/cli/src/modules/breaking-changes/rules/v2/__tests__/task-runner-docker-image.rule.test.ts
@@ -1,10 +1,16 @@
+import type { GlobalConfig } from '@n8n/config';
+import { mock } from 'jest-mock-extended';
+
 import { TaskRunnerDockerImageRule } from '../task-runner-docker-image.rule';
 
 describe('TaskRunnerDockerImageRule', () => {
 	let rule: TaskRunnerDockerImageRule;
 
 	beforeEach(() => {
-		rule = new TaskRunnerDockerImageRule();
+		const mockGlobalConfig = mock<GlobalConfig>({
+			deployment: { type: 'default' },
+		});
+		rule = new TaskRunnerDockerImageRule(mockGlobalConfig);
 	});
 
 	describe('getMetadata()', () => {
@@ -18,6 +24,19 @@ describe('TaskRunnerDockerImageRule', () => {
 	});
 
 	describe('detect()', () => {
+		it('should not be affected on cloud deployments', async () => {
+			const mockGlobalConfig = mock<GlobalConfig>({
+				deployment: { type: 'cloud' },
+			});
+			const cloudRule = new TaskRunnerDockerImageRule(mockGlobalConfig);
+
+			const result = await cloudRule.detect();
+
+			expect(result.isAffected).toBe(false);
+			expect(result.instanceIssues).toHaveLength(0);
+			expect(result.recommendations).toHaveLength(0);
+		});
+
 		it('should always be affected (informational)', async () => {
 			const result = await rule.detect();
 
diff --git a/packages/cli/src/modules/breaking-changes/rules/v2/__tests__/task-runners.rule.test.ts b/packages/cli/src/modules/breaking-changes/rules/v2/__tests__/task-runners.rule.test.ts
index 5878b436ec0..c807cf6bea8 100644
--- a/packages/cli/src/modules/breaking-changes/rules/v2/__tests__/task-runners.rule.test.ts
+++ b/packages/cli/src/modules/breaking-changes/rules/v2/__tests__/task-runners.rule.test.ts
@@ -1,12 +1,35 @@
-import type { TaskRunnersConfig } from '@n8n/config';
+import type { GlobalConfig, TaskRunnersConfig } from '@n8n/config';
+import { mock } from 'jest-mock-extended';
 
 import { TaskRunnersRule } from '../task-runners.rule';
 
 describe('TaskRunnersRule', () => {
+	let mockGlobalConfig: GlobalConfig;
+
+	beforeEach(() => {
+		mockGlobalConfig = mock<GlobalConfig>({
+			deployment: { type: 'default' },
+		});
+	});
+
 	describe('detect()', () => {
+		it('should not be affected on cloud deployments', async () => {
+			const mockConfig = { enabled: false } as TaskRunnersConfig;
+			const cloudGlobalConfig = mock<GlobalConfig>({
+				deployment: { type: 'cloud' },
+			});
+			const rule = new TaskRunnersRule(mockConfig, cloudGlobalConfig);
+
+			const result = await rule.detect();
+
+			expect(result.isAffected).toBe(false);
+			expect(result.instanceIssues).toHaveLength(0);
+			expect(result.recommendations).toHaveLength(0);
+		});
+
 		it('should not be affected when runners are already enabled', async () => {
 			const mockConfig = { enabled: true } as TaskRunnersConfig;
-			const rule = new TaskRunnersRule(mockConfig);
+			const rule = new TaskRunnersRule(mockConfig, mockGlobalConfig);
 
 			const result = await rule.detect();
 
@@ -16,18 +39,19 @@ describe('TaskRunnersRule', () => {
 
 		it('should be affected when runners are not enabled', async () => {
 			const mockConfig = { enabled: false } as TaskRunnersConfig;
-			const rule = new TaskRunnersRule(mockConfig);
+			const rule = new TaskRunnersRule(mockConfig, mockGlobalConfig);
 
 			const result = await rule.detect();
 
 			expect(result.isAffected).toBe(true);
 			expect(result.instanceIssues).toHaveLength(1);
 			expect(result.instanceIssues[0].title).toBe('Task Runners will be enabled by default');
+			expect(result.recommendations).toHaveLength(3);
 		});
 
 		it('should be affected when runners are explicitly disabled', async () => {
 			const mockConfig = { enabled: false } as TaskRunnersConfig;
-			const rule = new TaskRunnersRule(mockConfig);
+			const rule = new TaskRunnersRule(mockConfig, mockGlobalConfig);
 
 			const result = await rule.detect();
 
diff --git a/packages/cli/src/modules/breaking-changes/rules/v2/settings-file-permissions.rule.ts b/packages/cli/src/modules/breaking-changes/rules/v2/settings-file-permissions.rule.ts
index 0a594f37465..eb1390d6575 100644
--- a/packages/cli/src/modules/breaking-changes/rules/v2/settings-file-permissions.rule.ts
+++ b/packages/cli/src/modules/breaking-changes/rules/v2/settings-file-permissions.rule.ts
@@ -1,4 +1,4 @@
-import { InstanceSettingsConfig } from '@n8n/config';
+import { GlobalConfig } from '@n8n/config';
 import { Service } from '@n8n/di';
 
 import type {
@@ -10,7 +10,7 @@ import { BreakingChangeCategory } from '../../types';
 
 @Service()
 export class SettingsFilePermissionsRule implements IBreakingChangeInstanceRule {
-	constructor(private readonly instanceSettingsConfig: InstanceSettingsConfig) {}
+	constructor(private readonly globalConfig: GlobalConfig) {}
 
 	id: string = 'settings-file-permissions-v2';
 
@@ -28,9 +28,18 @@ export class SettingsFilePermissionsRule implements IBreakingChangeInstanceRule
 	}
 
 	async detect(): Promise<InstanceDetectionReport> {
-		// If enforceSettingsFilePermissions is explicitly set to 'false', users are not affected
-		// because they've configured the system to not enforce file permissions
-		if (!this.instanceSettingsConfig.enforceSettingsFilePermissions) {
+		// Not relevant for cloud deployments - cloud manages infrastructure and file permissions
+		if (this.globalConfig.deployment.type === 'cloud') {
+			return {
+				isAffected: false,
+				instanceIssues: [],
+				recommendations: [],
+			};
+		}
+
+		// If N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS is explicitly set to any value, users are not affected
+		// because they've already handled the configuration and are aware of this setting.
+		if (process.env.N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS) {
 			return {
 				isAffected: false,
 				instanceIssues: [],
diff --git a/packages/cli/src/modules/breaking-changes/rules/v2/task-runner-docker-image.rule.ts b/packages/cli/src/modules/breaking-changes/rules/v2/task-runner-docker-image.rule.ts
index 4bd1c2e5b3f..8e939a69ad3 100644
--- a/packages/cli/src/modules/breaking-changes/rules/v2/task-runner-docker-image.rule.ts
+++ b/packages/cli/src/modules/breaking-changes/rules/v2/task-runner-docker-image.rule.ts
@@ -1,3 +1,4 @@
+import { GlobalConfig } from '@n8n/config';
 import { Service } from '@n8n/di';
 
 import type {
@@ -9,6 +10,8 @@ import { BreakingChangeCategory } from '../../types';
 
 @Service()
 export class TaskRunnerDockerImageRule implements IBreakingChangeInstanceRule {
+	constructor(private readonly globalConfig: GlobalConfig) {}
+
 	id: string = 'task-runner-docker-image-v2';
 
 	getMetadata(): BreakingChangeRuleMetadata {
@@ -25,6 +28,15 @@ export class TaskRunnerDockerImageRule implements IBreakingChangeInstanceRule {
 	}
 
 	async detect(): Promise<InstanceDetectionReport> {
+		// Not relevant for cloud deployments - cloud manages Docker images
+		if (this.globalConfig.deployment.type === 'cloud') {
+			return {
+				isAffected: false,
+				instanceIssues: [],
+				recommendations: [],
+			};
+		}
+
 		const result: InstanceDetectionReport = {
 			isAffected: true,
 			instanceIssues: [
diff --git a/packages/cli/src/modules/breaking-changes/rules/v2/task-runners.rule.ts b/packages/cli/src/modules/breaking-changes/rules/v2/task-runners.rule.ts
index ab05e0dde8e..2388718a36e 100644
--- a/packages/cli/src/modules/breaking-changes/rules/v2/task-runners.rule.ts
+++ b/packages/cli/src/modules/breaking-changes/rules/v2/task-runners.rule.ts
@@ -1,4 +1,4 @@
-import { TaskRunnersConfig } from '@n8n/config';
+import { GlobalConfig, TaskRunnersConfig } from '@n8n/config';
 import { Service } from '@n8n/di';
 
 import type {
@@ -10,7 +10,10 @@ import { BreakingChangeCategory } from '../../types';
 
 @Service()
 export class TaskRunnersRule implements IBreakingChangeInstanceRule {
-	constructor(private readonly taskRunnersConfig: TaskRunnersConfig) {}
+	constructor(
+		private readonly taskRunnersConfig: TaskRunnersConfig,
+		private readonly globalConfig: GlobalConfig,
+	) {}
 
 	id: string = 'task-runners-v2';
 
@@ -27,6 +30,15 @@ export class TaskRunnersRule implements IBreakingChangeInstanceRule {
 	}
 
 	async detect(): Promise<InstanceDetectionReport> {
+		// Not relevant for cloud deployments - cloud manages task runner infrastructure
+		if (this.globalConfig.deployment.type === 'cloud') {
+			return {
+				isAffected: false,
+				instanceIssues: [],
+				recommendations: [],
+			};
+		}
+
 		const result: InstanceDetectionReport = {
 			isAffected: false,
 			instanceIssues: [],

From 8928522991c3ebb65b7c52af5ebce8b0257fe93a Mon Sep 17 00:00:00 2001
From: Artem Sorokin <38620398+seemewalkin@users.noreply.github.com>
Date: Thu, 4 Dec 2025 21:00:52 +0100
Subject: [PATCH 065/167] test: Reorganize Playwright settings tests to match
 UI structure (#22618)

---
 .../tests/ui/21-community-nodes.spec.ts       |  68 ------------
 .../tests/ui/33-settings-personal.spec.ts     |  55 ---------
 .../playwright/tests/ui/auth/signin.spec.ts   |  14 +++
 .../community-nodes/community-nodes.spec.ts   |  70 ++++++++++++
 .../environments/source-control.spec.ts}      |   4 +-
 .../environments/variables.spec.ts}           |   2 +-
 .../log-streaming/log-streaming.spec.ts}      |   2 +-
 .../personal/personal.spec.ts}                | 104 ++++++++----------
 .../two-factor-authentication.spec.ts}        |   4 +-
 .../tests/ui/settings/users/users.spec.ts     |  53 +++++++++
 .../workers/workers.spec.ts}                  |   2 +-
 11 files changed, 192 insertions(+), 186 deletions(-)
 delete mode 100644 packages/testing/playwright/tests/ui/33-settings-personal.spec.ts
 create mode 100644 packages/testing/playwright/tests/ui/auth/signin.spec.ts
 create mode 100644 packages/testing/playwright/tests/ui/settings/community-nodes/community-nodes.spec.ts
 rename packages/testing/playwright/tests/ui/{30-source-control.spec.ts => settings/environments/source-control.spec.ts} (94%)
 rename packages/testing/playwright/tests/ui/{23-variables.spec.ts => settings/environments/variables.spec.ts} (99%)
 rename packages/testing/playwright/tests/ui/{10-settings-log-streaming.spec.ts => settings/log-streaming/log-streaming.spec.ts} (98%)
 rename packages/testing/playwright/tests/ui/{18-user-management.spec.ts => settings/personal/personal.spec.ts} (61%)
 rename packages/testing/playwright/tests/ui/{27-two-factor-authentication.spec.ts => settings/personal/two-factor-authentication.spec.ts} (96%)
 create mode 100644 packages/testing/playwright/tests/ui/settings/users/users.spec.ts
 rename packages/testing/playwright/tests/ui/{32-worker-view.spec.ts => settings/workers/workers.spec.ts} (95%)

diff --git a/packages/testing/playwright/tests/ui/21-community-nodes.spec.ts b/packages/testing/playwright/tests/ui/21-community-nodes.spec.ts
index 80779de29fc..da1f67432c8 100644
--- a/packages/testing/playwright/tests/ui/21-community-nodes.spec.ts
+++ b/packages/testing/playwright/tests/ui/21-community-nodes.spec.ts
@@ -8,22 +8,6 @@ import customNodeWithN8nCredentialFixture from '../../workflows/Custom_node_n8n_
 const CUSTOM_NODE_NAME = 'E2E Node';
 const CUSTOM_NODE_WITH_N8N_CREDENTIAL = 'E2E Node with native n8n credential';
 const CUSTOM_NODE_WITH_CUSTOM_CREDENTIAL = 'E2E Node with custom credential';
-const MOCK_PACKAGE = {
-	createdAt: '2024-07-22T19:08:06.505Z',
-	updatedAt: '2024-07-22T19:08:06.505Z',
-	packageName: 'n8n-nodes-chatwork',
-	installedVersion: '1.0.0',
-	authorName: null,
-	authorEmail: null,
-	installedNodes: [
-		{
-			name: 'Chatwork',
-			type: 'n8n-nodes-chatwork.chatwork',
-			latestVersion: 1,
-		},
-	],
-	updateAvailable: '1.1.2',
-};
 
 test.describe('Community and custom nodes in canvas', () => {
 	test.beforeEach(async ({ n8n }) => {
@@ -115,55 +99,3 @@ test.describe('Community and custom nodes in canvas', () => {
 		);
 	});
 });
-
-test.describe('Community nodes management', () => {
-	test('can install, update and uninstall community nodes', async ({ n8n }) => {
-		await n8n.page.route('**/api.npms.io/v2/search*', async (route) => {
-			await route.fulfill({ status: 200, json: {} });
-		});
-
-		await n8n.page.route('/rest/community-packages', async (route) => {
-			if (route.request().method() === 'GET') {
-				await route.fulfill({ status: 200, json: { data: [] } });
-			}
-		});
-
-		await n8n.navigate.toCommunityNodes();
-
-		await n8n.page.route('/rest/community-packages', async (route) => {
-			if (route.request().method() === 'POST') {
-				await route.fulfill({ status: 200, json: { data: MOCK_PACKAGE } });
-			} else if (route.request().method() === 'GET') {
-				await route.fulfill({ status: 200, json: { data: [MOCK_PACKAGE] } });
-			}
-		});
-
-		await n8n.communityNodes.installPackage('n8n-nodes-chatwork@1.0.0');
-		await expect(n8n.communityNodes.getCommunityCards()).toHaveCount(1);
-		await expect(n8n.communityNodes.getCommunityCards().first()).toContainText('v1.0.0');
-
-		const updatedPackage = {
-			...MOCK_PACKAGE,
-			installedVersion: '1.2.0',
-			updateAvailable: undefined,
-		};
-		await n8n.page.route('/rest/community-packages', async (route) => {
-			if (route.request().method() === 'PATCH') {
-				await route.fulfill({ status: 200, json: { data: updatedPackage } });
-			}
-		});
-
-		await n8n.communityNodes.updatePackage();
-		await expect(n8n.communityNodes.getCommunityCards()).toHaveCount(1);
-		await expect(n8n.communityNodes.getCommunityCards().first()).not.toContainText('v1.0.0');
-
-		await n8n.page.route('/rest/community-packages*', async (route) => {
-			if (route.request().method() === 'DELETE') {
-				await route.fulfill({ status: 204 });
-			}
-		});
-
-		await n8n.communityNodes.uninstallPackage();
-		await expect(n8n.communityNodes.getActionBox()).toBeVisible();
-	});
-});
diff --git a/packages/testing/playwright/tests/ui/33-settings-personal.spec.ts b/packages/testing/playwright/tests/ui/33-settings-personal.spec.ts
deleted file mode 100644
index e51ab7b643c..00000000000
--- a/packages/testing/playwright/tests/ui/33-settings-personal.spec.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import { test, expect } from '../../fixtures/base';
-
-const INVALID_NAMES = [
-	'https://n8n.io',
-	'http://n8n.io',
-	'www.n8n.io',
-	'n8n.io',
-	'n8n.бг',
-	'n8n.io/home',
-	'n8n.io/home?send=true',
-	'<a href="#">Jack</a>',
-	'<script>alert("Hello")</script>',
-];
-
-const VALID_NAMES = [
-	['a', 'a'],
-	['alice', 'alice'],
-	['Robert', 'Downey Jr.'],
-	['Mia', 'Mia-Downey'],
-	['Mark', "O'neil"],
-	['Thomas', 'Müler'],
-	['ßáçøñ', 'ßáçøñ'],
-	['أحمد', 'فلسطين'],
-	['Милорад', 'Филиповић'],
-];
-
-test.describe('Personal Settings', () => {
-	test('should allow to change first and last name', async ({ n8n }) => {
-		await n8n.settingsPersonal.goToPersonalSettings();
-
-		for (const name of VALID_NAMES) {
-			await n8n.settingsPersonal.fillPersonalData(name[0], name[1]);
-			await n8n.settingsPersonal.saveSettings();
-
-			await expect(
-				n8n.notifications.getNotificationByTitleOrContent('Personal details updated'),
-			).toBeVisible();
-			await n8n.notifications.closeNotificationByText('Personal details updated');
-		}
-	});
-
-	test('should not allow malicious values for personal data', async ({ n8n }) => {
-		await n8n.settingsPersonal.goToPersonalSettings();
-
-		for (const name of INVALID_NAMES) {
-			await n8n.settingsPersonal.fillPersonalData(name, name);
-			await n8n.settingsPersonal.saveSettings();
-
-			await expect(
-				n8n.notifications.getNotificationByTitleOrContent('Problem updating your details'),
-			).toBeVisible();
-			await n8n.notifications.closeNotificationByText('Problem updating your details');
-		}
-	});
-});
diff --git a/packages/testing/playwright/tests/ui/auth/signin.spec.ts b/packages/testing/playwright/tests/ui/auth/signin.spec.ts
new file mode 100644
index 00000000000..fa59e012597
--- /dev/null
+++ b/packages/testing/playwright/tests/ui/auth/signin.spec.ts
@@ -0,0 +1,14 @@
+import { INSTANCE_OWNER_CREDENTIALS } from '../../../config/test-users';
+import { test, expect } from '../../../fixtures/base';
+
+test.describe('Sign In', () => {
+	test('should login and logout @auth:none', async ({ n8n }) => {
+		await n8n.goHome();
+		await n8n.signIn.goToSignIn();
+		await n8n.signIn.loginWithEmailAndPassword(
+			INSTANCE_OWNER_CREDENTIALS.email,
+			INSTANCE_OWNER_CREDENTIALS.password,
+		);
+		await expect(n8n.sideBar.getUserMenu()).toBeVisible();
+	});
+});
diff --git a/packages/testing/playwright/tests/ui/settings/community-nodes/community-nodes.spec.ts b/packages/testing/playwright/tests/ui/settings/community-nodes/community-nodes.spec.ts
new file mode 100644
index 00000000000..07e54037af5
--- /dev/null
+++ b/packages/testing/playwright/tests/ui/settings/community-nodes/community-nodes.spec.ts
@@ -0,0 +1,70 @@
+import { test, expect } from '../../../../fixtures/base';
+
+const MOCK_PACKAGE = {
+	createdAt: '2024-07-22T19:08:06.505Z',
+	updatedAt: '2024-07-22T19:08:06.505Z',
+	packageName: 'n8n-nodes-chatwork',
+	installedVersion: '1.0.0',
+	authorName: null,
+	authorEmail: null,
+	installedNodes: [
+		{
+			name: 'Chatwork',
+			type: 'n8n-nodes-chatwork.chatwork',
+			latestVersion: 1,
+		},
+	],
+	updateAvailable: '1.1.2',
+};
+
+test.describe('Community nodes management', () => {
+	test('can install, update and uninstall community nodes', async ({ n8n }) => {
+		await n8n.page.route('**/api.npms.io/v2/search*', async (route) => {
+			await route.fulfill({ status: 200, json: {} });
+		});
+
+		await n8n.page.route('/rest/community-packages', async (route) => {
+			if (route.request().method() === 'GET') {
+				await route.fulfill({ status: 200, json: { data: [] } });
+			}
+		});
+
+		await n8n.navigate.toCommunityNodes();
+
+		await n8n.page.route('/rest/community-packages', async (route) => {
+			if (route.request().method() === 'POST') {
+				await route.fulfill({ status: 200, json: { data: MOCK_PACKAGE } });
+			} else if (route.request().method() === 'GET') {
+				await route.fulfill({ status: 200, json: { data: [MOCK_PACKAGE] } });
+			}
+		});
+
+		await n8n.communityNodes.installPackage('n8n-nodes-chatwork@1.0.0');
+		await expect(n8n.communityNodes.getCommunityCards()).toHaveCount(1);
+		await expect(n8n.communityNodes.getCommunityCards().first()).toContainText('v1.0.0');
+
+		const updatedPackage = {
+			...MOCK_PACKAGE,
+			installedVersion: '1.2.0',
+			updateAvailable: undefined,
+		};
+		await n8n.page.route('/rest/community-packages', async (route) => {
+			if (route.request().method() === 'PATCH') {
+				await route.fulfill({ status: 200, json: { data: updatedPackage } });
+			}
+		});
+
+		await n8n.communityNodes.updatePackage();
+		await expect(n8n.communityNodes.getCommunityCards()).toHaveCount(1);
+		await expect(n8n.communityNodes.getCommunityCards().first()).not.toContainText('v1.0.0');
+
+		await n8n.page.route('/rest/community-packages*', async (route) => {
+			if (route.request().method() === 'DELETE') {
+				await route.fulfill({ status: 204 });
+			}
+		});
+
+		await n8n.communityNodes.uninstallPackage();
+		await expect(n8n.communityNodes.getActionBox()).toBeVisible();
+	});
+});
diff --git a/packages/testing/playwright/tests/ui/30-source-control.spec.ts b/packages/testing/playwright/tests/ui/settings/environments/source-control.spec.ts
similarity index 94%
rename from packages/testing/playwright/tests/ui/30-source-control.spec.ts
rename to packages/testing/playwright/tests/ui/settings/environments/source-control.spec.ts
index ef41342f100..a4d5232ff7b 100644
--- a/packages/testing/playwright/tests/ui/30-source-control.spec.ts
+++ b/packages/testing/playwright/tests/ui/settings/environments/source-control.spec.ts
@@ -1,7 +1,7 @@
 import { addGiteaSSHKey } from 'n8n-containers/n8n-test-container-gitea';
 
-import { test, expect } from '../../fixtures/base';
-import type { n8nPage } from '../../pages/n8nPage';
+import { test, expect } from '../../../../fixtures/base';
+import type { n8nPage } from '../../../../pages/n8nPage';
 
 test.use({
 	addContainerCapability: {
diff --git a/packages/testing/playwright/tests/ui/23-variables.spec.ts b/packages/testing/playwright/tests/ui/settings/environments/variables.spec.ts
similarity index 99%
rename from packages/testing/playwright/tests/ui/23-variables.spec.ts
rename to packages/testing/playwright/tests/ui/settings/environments/variables.spec.ts
index 4e4473fdf60..4244253e1c5 100644
--- a/packages/testing/playwright/tests/ui/23-variables.spec.ts
+++ b/packages/testing/playwright/tests/ui/settings/environments/variables.spec.ts
@@ -1,6 +1,6 @@
 import { customAlphabet } from 'nanoid';
 
-import { test, expect } from '../../fixtures/base';
+import { test, expect } from '../../../../fixtures/base';
 
 const generateValidId = customAlphabet(
 	'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_',
diff --git a/packages/testing/playwright/tests/ui/10-settings-log-streaming.spec.ts b/packages/testing/playwright/tests/ui/settings/log-streaming/log-streaming.spec.ts
similarity index 98%
rename from packages/testing/playwright/tests/ui/10-settings-log-streaming.spec.ts
rename to packages/testing/playwright/tests/ui/settings/log-streaming/log-streaming.spec.ts
index c7c0d05db95..7575f9b6159 100644
--- a/packages/testing/playwright/tests/ui/10-settings-log-streaming.spec.ts
+++ b/packages/testing/playwright/tests/ui/settings/log-streaming/log-streaming.spec.ts
@@ -1,4 +1,4 @@
-import { test, expect } from '../../fixtures/base';
+import { test, expect } from '../../../../fixtures/base';
 
 const DESTINATION_NAMES = {
 	FIRST: 'Destination 0',
diff --git a/packages/testing/playwright/tests/ui/18-user-management.spec.ts b/packages/testing/playwright/tests/ui/settings/personal/personal.spec.ts
similarity index 61%
rename from packages/testing/playwright/tests/ui/18-user-management.spec.ts
rename to packages/testing/playwright/tests/ui/settings/personal/personal.spec.ts
index c0fa132b622..c2fdd3c73a6 100644
--- a/packages/testing/playwright/tests/ui/18-user-management.spec.ts
+++ b/packages/testing/playwright/tests/ui/settings/personal/personal.spec.ts
@@ -1,39 +1,58 @@
 import { customAlphabet } from 'nanoid';
 
-import { INSTANCE_OWNER_CREDENTIALS } from '../../config/test-users';
-import { test, expect } from '../../fixtures/base';
+import { test, expect } from '../../../../fixtures/base';
 
-test.describe('User Management', () => {
-	test('should login and logout @auth:none', async ({ n8n }) => {
-		await n8n.goHome();
-		await n8n.signIn.goToSignIn();
-		await n8n.signIn.loginWithEmailAndPassword(
-			INSTANCE_OWNER_CREDENTIALS.email,
-			INSTANCE_OWNER_CREDENTIALS.password,
-		);
-		await expect(n8n.sideBar.getUserMenu()).toBeVisible();
+const INVALID_NAMES = [
+	'https://n8n.io',
+	'http://n8n.io',
+	'www.n8n.io',
+	'n8n.io',
+	'n8n.бг',
+	'n8n.io/home',
+	'n8n.io/home?send=true',
+	'<a href="#">Jack</a>',
+	'<script>alert("Hello")</script>',
+];
+
+const VALID_NAMES = [
+	['a', 'a'],
+	['alice', 'alice'],
+	['Robert', 'Downey Jr.'],
+	['Mia', 'Mia-Downey'],
+	['Mark', "O'neil"],
+	['Thomas', 'Müler'],
+	['ßáçøñ', 'ßáçøñ'],
+	['أحمد', 'فلسطين'],
+	['Милорад', 'Филиповић'],
+];
+
+test.describe('Personal Settings', () => {
+	test('should allow to change first and last name', async ({ n8n }) => {
+		await n8n.settingsPersonal.goToPersonalSettings();
+
+		for (const name of VALID_NAMES) {
+			await n8n.settingsPersonal.fillPersonalData(name[0], name[1]);
+			await n8n.settingsPersonal.saveSettings();
+
+			await expect(
+				n8n.notifications.getNotificationByTitleOrContent('Personal details updated'),
+			).toBeVisible();
+			await n8n.notifications.closeNotificationByText('Personal details updated');
+		}
 	});
 
-	test('should prevent non-owners to access UM settings', async ({ n8n }) => {
-		// This creates a new user in the same context, so the cookies are refreshed and owner is no longer logged in
-		await n8n.api.users.create();
-		await n8n.navigate.toUsers();
-		await expect(n8n.workflows.getNewWorkflowCard()).toBeVisible();
-	});
+	test('should not allow malicious values for personal data', async ({ n8n }) => {
+		await n8n.settingsPersonal.goToPersonalSettings();
 
-	test('should allow instance owner to access UM settings', async ({ n8n }) => {
-		await n8n.navigate.toUsers();
-		expect(n8n.page.url()).toContain('/settings/users');
-	});
+		for (const name of INVALID_NAMES) {
+			await n8n.settingsPersonal.fillPersonalData(name, name);
+			await n8n.settingsPersonal.saveSettings();
 
-	test('should be able to change user role to Admin and back', async ({ n8n, api }) => {
-		const user = await api.users.create();
-		await n8n.navigate.toUsers();
-		await n8n.settingsUsers.search(user.email);
-		await n8n.settingsUsers.selectAccountType(user.email, 'Admin');
-		await expect(n8n.settingsUsers.getAccountType(user.email)).toHaveText('Admin');
-		await n8n.settingsUsers.selectAccountType(user.email, 'Member');
-		await expect(n8n.settingsUsers.getAccountType(user.email)).toHaveText('Member');
+			await expect(
+				n8n.notifications.getNotificationByTitleOrContent('Problem updating your details'),
+			).toBeVisible();
+			await n8n.notifications.closeNotificationByText('Problem updating your details');
+		}
 	});
 
 	test('should be able to change theme', async ({ n8n }) => {
@@ -45,33 +64,6 @@ test.describe('User Management', () => {
 		await expect(n8n.page.locator('body')).toHaveAttribute('data-theme', 'dark');
 	});
 
-	test('should delete user and their data', async ({ n8n, api }) => {
-		const user = await api.users.create();
-		await n8n.navigate.toUsers();
-		await n8n.page.reload();
-
-		await n8n.settingsUsers.search(user.email);
-		await expect(n8n.settingsUsers.getRow(user.email)).toBeVisible();
-
-		await n8n.settingsUsers.clickDeleteUser(user.email);
-		await n8n.settingsUsers.deleteData();
-		await expect(n8n.notifications.getNotificationByTitleOrContent('User deleted')).toBeVisible();
-	});
-
-	test('should delete user and transfer their data', async ({ n8n, api }) => {
-		const ownerEmail = INSTANCE_OWNER_CREDENTIALS.email;
-		const user = await api.users.create();
-		await n8n.navigate.toUsers();
-		await n8n.page.reload();
-
-		await n8n.settingsUsers.search(user.email);
-		await n8n.settingsUsers.getRow(user.email).isVisible();
-
-		await n8n.settingsUsers.clickDeleteUser(user.email);
-		await n8n.settingsUsers.transferData(ownerEmail);
-		await expect(n8n.notifications.getNotificationByTitleOrContent('User deleted')).toBeVisible();
-	});
-
 	test('should allow user to change their personal data', async ({ n8n }) => {
 		await n8n.api.users.create();
 		await n8n.navigate.toPersonalSettings();
diff --git a/packages/testing/playwright/tests/ui/27-two-factor-authentication.spec.ts b/packages/testing/playwright/tests/ui/settings/personal/two-factor-authentication.spec.ts
similarity index 96%
rename from packages/testing/playwright/tests/ui/27-two-factor-authentication.spec.ts
rename to packages/testing/playwright/tests/ui/settings/personal/two-factor-authentication.spec.ts
index e5aecf3199c..2f25352bf5d 100644
--- a/packages/testing/playwright/tests/ui/27-two-factor-authentication.spec.ts
+++ b/packages/testing/playwright/tests/ui/settings/personal/two-factor-authentication.spec.ts
@@ -1,7 +1,7 @@
 import { authenticator } from 'otplib';
 
-import { INSTANCE_OWNER_CREDENTIALS } from '../../config/test-users';
-import { test, expect } from '../../fixtures/base';
+import { INSTANCE_OWNER_CREDENTIALS } from '../../../../config/test-users';
+import { test, expect } from '../../../../fixtures/base';
 
 const TEST_DATA = {
 	NEW_EMAIL: 'newemail@test.com',
diff --git a/packages/testing/playwright/tests/ui/settings/users/users.spec.ts b/packages/testing/playwright/tests/ui/settings/users/users.spec.ts
new file mode 100644
index 00000000000..a9e672a2f8f
--- /dev/null
+++ b/packages/testing/playwright/tests/ui/settings/users/users.spec.ts
@@ -0,0 +1,53 @@
+import { INSTANCE_OWNER_CREDENTIALS } from '../../../../config/test-users';
+import { test, expect } from '../../../../fixtures/base';
+
+test.describe('Users Settings', () => {
+	test('should prevent non-owners to access UM settings', async ({ n8n }) => {
+		// This creates a new user in the same context, so the cookies are refreshed and owner is no longer logged in
+		await n8n.api.users.create();
+		await n8n.navigate.toUsers();
+		await expect(n8n.workflows.getNewWorkflowCard()).toBeVisible();
+	});
+
+	test('should allow instance owner to access UM settings', async ({ n8n }) => {
+		await n8n.navigate.toUsers();
+		expect(n8n.page.url()).toContain('/settings/users');
+	});
+
+	test('should be able to change user role to Admin and back', async ({ n8n, api }) => {
+		const user = await api.users.create();
+		await n8n.navigate.toUsers();
+		await n8n.settingsUsers.search(user.email);
+		await n8n.settingsUsers.selectAccountType(user.email, 'Admin');
+		await expect(n8n.settingsUsers.getAccountType(user.email)).toHaveText('Admin');
+		await n8n.settingsUsers.selectAccountType(user.email, 'Member');
+		await expect(n8n.settingsUsers.getAccountType(user.email)).toHaveText('Member');
+	});
+
+	test('should delete user and their data', async ({ n8n, api }) => {
+		const user = await api.users.create();
+		await n8n.navigate.toUsers();
+		await n8n.page.reload();
+
+		await n8n.settingsUsers.search(user.email);
+		await expect(n8n.settingsUsers.getRow(user.email)).toBeVisible();
+
+		await n8n.settingsUsers.clickDeleteUser(user.email);
+		await n8n.settingsUsers.deleteData();
+		await expect(n8n.notifications.getNotificationByTitleOrContent('User deleted')).toBeVisible();
+	});
+
+	test('should delete user and transfer their data', async ({ n8n, api }) => {
+		const ownerEmail = INSTANCE_OWNER_CREDENTIALS.email;
+		const user = await api.users.create();
+		await n8n.navigate.toUsers();
+		await n8n.page.reload();
+
+		await n8n.settingsUsers.search(user.email);
+		await n8n.settingsUsers.getRow(user.email).isVisible();
+
+		await n8n.settingsUsers.clickDeleteUser(user.email);
+		await n8n.settingsUsers.transferData(ownerEmail);
+		await expect(n8n.notifications.getNotificationByTitleOrContent('User deleted')).toBeVisible();
+	});
+});
diff --git a/packages/testing/playwright/tests/ui/32-worker-view.spec.ts b/packages/testing/playwright/tests/ui/settings/workers/workers.spec.ts
similarity index 95%
rename from packages/testing/playwright/tests/ui/32-worker-view.spec.ts
rename to packages/testing/playwright/tests/ui/settings/workers/workers.spec.ts
index 8eeb1b1c659..478d0d0b430 100644
--- a/packages/testing/playwright/tests/ui/32-worker-view.spec.ts
+++ b/packages/testing/playwright/tests/ui/settings/workers/workers.spec.ts
@@ -1,4 +1,4 @@
-import { test, expect } from '../../fixtures/base';
+import { test, expect } from '../../../../fixtures/base';
 
 test.describe
 	.serial('Worker View', () => {

From ba1ac9e1a8133417ebac5cf9dbb47dfe907940a3 Mon Sep 17 00:00:00 2001
From: Artem Sorokin <38620398+seemewalkin@users.noreply.github.com>
Date: Thu, 4 Dec 2025 21:01:09 +0100
Subject: [PATCH 066/167] test: Move credentials tests to separate folder
 (#22724)

---
 .../api-operations.spec.ts}                                     | 2 +-
 .../ui/{2-credentials.spec.ts => credentials/crud.spec.ts}      | 2 +-
 .../{global-credentials.spec.ts => credentials/global.spec.ts}  | 2 +-
 .../ui/{43-oauth-flow.spec.ts => credentials/oauth.spec.ts}     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename packages/testing/playwright/tests/ui/{credential-api-operations.spec.ts => credentials/api-operations.spec.ts} (99%)
 rename packages/testing/playwright/tests/ui/{2-credentials.spec.ts => credentials/crud.spec.ts} (99%)
 rename packages/testing/playwright/tests/ui/{global-credentials.spec.ts => credentials/global.spec.ts} (98%)
 rename packages/testing/playwright/tests/ui/{43-oauth-flow.spec.ts => credentials/oauth.spec.ts} (95%)

diff --git a/packages/testing/playwright/tests/ui/credential-api-operations.spec.ts b/packages/testing/playwright/tests/ui/credentials/api-operations.spec.ts
similarity index 99%
rename from packages/testing/playwright/tests/ui/credential-api-operations.spec.ts
rename to packages/testing/playwright/tests/ui/credentials/api-operations.spec.ts
index 6893e93932c..cc94c892d5d 100644
--- a/packages/testing/playwright/tests/ui/credential-api-operations.spec.ts
+++ b/packages/testing/playwright/tests/ui/credentials/api-operations.spec.ts
@@ -1,6 +1,6 @@
 import type { CreateCredentialDto } from '@n8n/api-types';
 
-import { test, expect } from '../../fixtures/base';
+import { test, expect } from '../../../fixtures/base';
 
 test.describe('Credential API Operations', () => {
 	test.describe('Basic CRUD Operations', () => {
diff --git a/packages/testing/playwright/tests/ui/2-credentials.spec.ts b/packages/testing/playwright/tests/ui/credentials/crud.spec.ts
similarity index 99%
rename from packages/testing/playwright/tests/ui/2-credentials.spec.ts
rename to packages/testing/playwright/tests/ui/credentials/crud.spec.ts
index b92eb69fba9..22ccee29727 100644
--- a/packages/testing/playwright/tests/ui/2-credentials.spec.ts
+++ b/packages/testing/playwright/tests/ui/credentials/crud.spec.ts
@@ -1,6 +1,6 @@
 import { nanoid } from 'nanoid';
 
-import { test, expect } from '../../fixtures/base';
+import { test, expect } from '../../../fixtures/base';
 
 test.describe('Credentials', () => {
 	test.beforeEach(async ({ n8n }) => {
diff --git a/packages/testing/playwright/tests/ui/global-credentials.spec.ts b/packages/testing/playwright/tests/ui/credentials/global.spec.ts
similarity index 98%
rename from packages/testing/playwright/tests/ui/global-credentials.spec.ts
rename to packages/testing/playwright/tests/ui/credentials/global.spec.ts
index b216266a183..b693b760700 100644
--- a/packages/testing/playwright/tests/ui/global-credentials.spec.ts
+++ b/packages/testing/playwright/tests/ui/credentials/global.spec.ts
@@ -1,4 +1,4 @@
-import { test, expect } from '../../fixtures/base';
+import { test, expect } from '../../../fixtures/base';
 
 test.describe('Global credentials @isolated', () => {
 	test.describe.configure({ mode: 'serial' });
diff --git a/packages/testing/playwright/tests/ui/43-oauth-flow.spec.ts b/packages/testing/playwright/tests/ui/credentials/oauth.spec.ts
similarity index 95%
rename from packages/testing/playwright/tests/ui/43-oauth-flow.spec.ts
rename to packages/testing/playwright/tests/ui/credentials/oauth.spec.ts
index 896d00f57dc..72ff787d5b9 100644
--- a/packages/testing/playwright/tests/ui/43-oauth-flow.spec.ts
+++ b/packages/testing/playwright/tests/ui/credentials/oauth.spec.ts
@@ -1,4 +1,4 @@
-import { test, expect } from '../../fixtures/base';
+import { test, expect } from '../../../fixtures/base';
 
 test.describe('OAuth Credentials', () => {
 	test('should create and connect with Google OAuth2', async ({ n8n }) => {

From bcfc95b08f797d4678dcd0402c147d66d49bed86 Mon Sep 17 00:00:00 2001
From: Artem Sorokin <38620398+seemewalkin@users.noreply.github.com>
Date: Thu, 4 Dec 2025 21:01:23 +0100
Subject: [PATCH 067/167] test: Move workflow executions to separate folder
 (#22723)

---
 .../executions/list.spec.ts}                                  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename packages/testing/playwright/tests/ui/{20-workflow-executions.spec.ts => workflows/executions/list.spec.ts} (97%)

diff --git a/packages/testing/playwright/tests/ui/20-workflow-executions.spec.ts b/packages/testing/playwright/tests/ui/workflows/executions/list.spec.ts
similarity index 97%
rename from packages/testing/playwright/tests/ui/20-workflow-executions.spec.ts
rename to packages/testing/playwright/tests/ui/workflows/executions/list.spec.ts
index 92fc3c8e4d9..02c162c99e3 100644
--- a/packages/testing/playwright/tests/ui/20-workflow-executions.spec.ts
+++ b/packages/testing/playwright/tests/ui/workflows/executions/list.spec.ts
@@ -1,5 +1,5 @@
-import { test, expect } from '../../fixtures/base';
-import executionOutOfMemoryResponse from '../../fixtures/execution-out-of-memory-server-response.json';
+import { test, expect } from '../../../../fixtures/base';
+import executionOutOfMemoryResponse from '../../../../fixtures/execution-out-of-memory-server-response.json';
 
 const ERROR_MESSAGES = {
 	OUT_OF_MEMORY: 'Workflow did not finish, possible out-of-memory issue',

From 813d33372c47983798cd6ed1ea9cce8b7b45add7 Mon Sep 17 00:00:00 2001
From: Artem Sorokin <38620398+seemewalkin@users.noreply.github.com>
Date: Thu, 4 Dec 2025 21:43:07 +0100
Subject: [PATCH 068/167] test: Move AI features tests to separate folder
 (#22727)

---
 .../playwright/tests/ui/30-langchain.spec.ts  | 561 ----------------
 .../tests/ui/45-ai-assistant.spec.ts          | 618 ------------------
 .../tests/ui/ai/assistant-basic.spec.ts       | 288 ++++++++
 .../tests/ui/ai/assistant-code-help.spec.ts   |  97 +++
 .../ui/ai/assistant-credential-help.spec.ts   | 147 +++++
 .../ui/ai/assistant-support-chat.spec.ts      | 114 ++++
 .../chat-session.spec.ts}                     |   2 +-
 .../tests/ui/{ => ai}/evaluations.spec.ts     |   2 +-
 .../tests/ui/ai/langchain-agents.spec.ts      | 244 +++++++
 .../tests/ui/ai/langchain-chains.spec.ts      | 119 ++++
 .../tests/ui/ai/langchain-memory.spec.ts      | 178 +++++
 .../tests/ui/ai/langchain-tools.spec.ts       | 111 ++++
 .../ui/ai/langchain-vectorstores.spec.ts      | 109 +++
 .../rag-callout.spec.ts}                      |   2 +-
 .../workflow-builder.spec.ts}                 |   6 +-
 15 files changed, 1413 insertions(+), 1185 deletions(-)
 delete mode 100644 packages/testing/playwright/tests/ui/30-langchain.spec.ts
 delete mode 100644 packages/testing/playwright/tests/ui/45-ai-assistant.spec.ts
 create mode 100644 packages/testing/playwright/tests/ui/ai/assistant-basic.spec.ts
 create mode 100644 packages/testing/playwright/tests/ui/ai/assistant-code-help.spec.ts
 create mode 100644 packages/testing/playwright/tests/ui/ai/assistant-credential-help.spec.ts
 create mode 100644 packages/testing/playwright/tests/ui/ai/assistant-support-chat.spec.ts
 rename packages/testing/playwright/tests/ui/{chat-session-id-reset.spec.ts => ai/chat-session.spec.ts} (97%)
 rename packages/testing/playwright/tests/ui/{ => ai}/evaluations.spec.ts (98%)
 create mode 100644 packages/testing/playwright/tests/ui/ai/langchain-agents.spec.ts
 create mode 100644 packages/testing/playwright/tests/ui/ai/langchain-chains.spec.ts
 create mode 100644 packages/testing/playwright/tests/ui/ai/langchain-memory.spec.ts
 create mode 100644 packages/testing/playwright/tests/ui/ai/langchain-tools.spec.ts
 create mode 100644 packages/testing/playwright/tests/ui/ai/langchain-vectorstores.spec.ts
 rename packages/testing/playwright/tests/ui/{52-rag-callout-experiment.spec.ts => ai/rag-callout.spec.ts} (95%)
 rename packages/testing/playwright/tests/ui/{55-workflow-builder.spec.ts => ai/workflow-builder.spec.ts} (95%)

diff --git a/packages/testing/playwright/tests/ui/30-langchain.spec.ts b/packages/testing/playwright/tests/ui/30-langchain.spec.ts
deleted file mode 100644
index 0629ffc1769..00000000000
--- a/packages/testing/playwright/tests/ui/30-langchain.spec.ts
+++ /dev/null
@@ -1,561 +0,0 @@
-import {
-	AGENT_NODE_NAME,
-	EDIT_FIELDS_SET_NODE_NAME,
-	MANUAL_CHAT_TRIGGER_NODE_NAME,
-	AI_LANGUAGE_MODEL_OPENAI_CHAT_MODEL_NODE_NAME,
-	AI_MEMORY_WINDOW_BUFFER_MEMORY_NODE_NAME,
-	AI_MEMORY_POSTGRES_NODE_NAME,
-	AI_TOOL_CALCULATOR_NODE_NAME,
-	AI_OUTPUT_PARSER_AUTO_FIXING_NODE_NAME,
-	AI_TOOL_CODE_NODE_NAME,
-	AI_TOOL_WIKIPEDIA_NODE_NAME,
-	BASIC_LLM_CHAIN_NODE_NAME,
-	CHAT_TRIGGER_NODE_DISPLAY_NAME,
-	SCHEDULE_TRIGGER_NODE_NAME,
-} from '../../config/constants';
-import { test, expect } from '../../fixtures/base';
-import type { n8nPage } from '../../pages/n8nPage';
-
-// Helper functions for common operations
-async function addOpenAILanguageModelWithCredentials(
-	n8n: n8nPage,
-	parentNode: string,
-	options: { exactMatch?: boolean; closeNDV?: boolean } = { exactMatch: true, closeNDV: false },
-) {
-	await n8n.canvas.addSupplementalNodeToParent(
-		AI_LANGUAGE_MODEL_OPENAI_CHAT_MODEL_NODE_NAME,
-		'ai_languageModel',
-		parentNode,
-		options,
-	);
-
-	await n8n.credentialsComposer.createFromNdv({
-		apiKey: 'abcd',
-	});
-	await n8n.ndv.clickBackToCanvasButton();
-}
-
-async function waitForWorkflowSuccess(n8n: n8nPage, timeout = 3000) {
-	await n8n.notifications.waitForNotificationAndClose('Workflow executed successfully', {
-		timeout,
-	});
-}
-
-async function executeChatAndWaitForResponse(n8n: n8nPage, message: string) {
-	await n8n.canvas.logsPanel.sendManualChatMessage(message);
-	await waitForWorkflowSuccess(n8n);
-}
-
-async function verifyChatMessages(n8n: n8nPage, expectedCount: number, inputMessage?: string) {
-	const messages = n8n.canvas.getManualChatMessages();
-	await expect(messages).toHaveCount(expectedCount);
-	if (inputMessage) {
-		await expect(messages.first()).toContainText(inputMessage);
-	}
-	await expect(messages.last()).toBeVisible();
-	return messages;
-}
-
-async function verifyLogsPanelEntries(n8n: n8nPage, expectedEntries: string[]) {
-	await expect(n8n.canvas.logsPanel.getLogEntries().first()).toBeVisible();
-	await expect(n8n.canvas.logsPanel.getLogEntries()).toHaveCount(expectedEntries.length);
-	for (let i = 0; i < expectedEntries.length; i++) {
-		await expect(n8n.canvas.logsPanel.getLogEntries().nth(i)).toHaveText(expectedEntries[i]);
-	}
-}
-
-async function setupBasicAgentWorkflow(n8n: n8nPage, additionalNodes: string[] = []) {
-	await n8n.canvas.addNode(AGENT_NODE_NAME, { closeNDV: true });
-
-	// Add additional nodes if specified
-	for (const nodeName of additionalNodes) {
-		await n8n.canvas.addSupplementalNodeToParent(nodeName, 'ai_tool', AGENT_NODE_NAME, {
-			closeNDV: true,
-		});
-	}
-
-	// Always add OpenAI Language Model
-	await addOpenAILanguageModelWithCredentials(n8n, AGENT_NODE_NAME);
-}
-
-test.use({
-	addContainerCapability: {
-		proxyServerEnabled: true,
-	},
-});
-test.describe('Langchain Integration @capability:proxy', () => {
-	test.beforeEach(async ({ n8n, proxyServer }) => {
-		await proxyServer.clearAllExpectations();
-		await proxyServer.loadExpectations('langchain');
-		await n8n.canvas.openNewWorkflow();
-	});
-
-	test.describe('Workflow Execution Behavior', () => {
-		test('should not open chat modal', async ({ n8n }) => {
-			await n8n.canvas.addNode(EDIT_FIELDS_SET_NODE_NAME, { closeNDV: true });
-
-			await n8n.canvas.addNode(AGENT_NODE_NAME, { closeNDV: true });
-
-			await n8n.canvas.addSupplementalNodeToParent(
-				AI_LANGUAGE_MODEL_OPENAI_CHAT_MODEL_NODE_NAME,
-				'ai_languageModel',
-				AGENT_NODE_NAME,
-				{ exactMatch: true, closeNDV: true },
-			);
-
-			await n8n.canvas.clickExecuteWorkflowButton();
-			await expect(n8n.canvas.getManualChatModal()).toBeHidden();
-		});
-
-		test('should remove test workflow button', async ({ n8n }) => {
-			await n8n.canvas.addNode(SCHEDULE_TRIGGER_NODE_NAME, { closeNDV: true });
-
-			await n8n.canvas.addNode(EDIT_FIELDS_SET_NODE_NAME, { closeNDV: true });
-
-			await n8n.canvas.addNode(AGENT_NODE_NAME, { closeNDV: true });
-
-			await n8n.canvas.addSupplementalNodeToParent(
-				AI_LANGUAGE_MODEL_OPENAI_CHAT_MODEL_NODE_NAME,
-				'ai_languageModel',
-				AGENT_NODE_NAME,
-				{ exactMatch: true, closeNDV: true },
-			);
-
-			await n8n.canvas.disableNodeFromContextMenu(SCHEDULE_TRIGGER_NODE_NAME);
-			await expect(n8n.canvas.getExecuteWorkflowButton()).toBeHidden();
-		});
-	});
-
-	test.describe('Node Connection and Configuration', () => {
-		test('should add nodes to all Agent node input types', async ({ n8n }) => {
-			const agentSubNodes = [
-				AI_LANGUAGE_MODEL_OPENAI_CHAT_MODEL_NODE_NAME,
-				AI_MEMORY_WINDOW_BUFFER_MEMORY_NODE_NAME,
-				AI_TOOL_CALCULATOR_NODE_NAME,
-				AI_OUTPUT_PARSER_AUTO_FIXING_NODE_NAME,
-			];
-			await n8n.canvas.addNode(AGENT_NODE_NAME, { closeNDV: false });
-
-			await n8n.ndv.checkParameterCheckboxInputByName('hasOutputParser');
-			await n8n.ndv.clickBackToCanvasButton();
-			await n8n.canvas.addSupplementalNodeToParent(
-				AI_LANGUAGE_MODEL_OPENAI_CHAT_MODEL_NODE_NAME,
-				'ai_languageModel',
-				AGENT_NODE_NAME,
-				{ exactMatch: true, closeNDV: true },
-			);
-
-			await n8n.canvas.addSupplementalNodeToParent(
-				AI_MEMORY_WINDOW_BUFFER_MEMORY_NODE_NAME,
-				'ai_memory',
-				AGENT_NODE_NAME,
-				{ closeNDV: true },
-			);
-
-			await n8n.canvas.addSupplementalNodeToParent(
-				AI_TOOL_CALCULATOR_NODE_NAME,
-				'ai_tool',
-				AGENT_NODE_NAME,
-				{ closeNDV: true },
-			);
-
-			await n8n.canvas.addSupplementalNodeToParent(
-				AI_OUTPUT_PARSER_AUTO_FIXING_NODE_NAME,
-				'ai_outputParser',
-				AGENT_NODE_NAME,
-				{ closeNDV: true },
-			);
-			for (const nodeName of agentSubNodes) {
-				await expect(n8n.canvas.connectionBetweenNodes(nodeName, AGENT_NODE_NAME)).toBeAttached();
-			}
-			await expect(n8n.canvas.getCanvasNodes()).toHaveCount(2 + agentSubNodes.length); // Chat Trigger + Agent + 4 inputs
-		});
-
-		test('should add multiple tool nodes to Agent node tool input type', async ({ n8n }) => {
-			await n8n.canvas.addNode(AGENT_NODE_NAME, { closeNDV: true });
-
-			const tools = [
-				AI_TOOL_CALCULATOR_NODE_NAME,
-				AI_TOOL_CODE_NODE_NAME,
-				AI_TOOL_CODE_NODE_NAME,
-				AI_TOOL_WIKIPEDIA_NODE_NAME,
-			];
-
-			for (const tool of tools) {
-				await n8n.canvas.addSupplementalNodeToParent(tool, 'ai_tool', AGENT_NODE_NAME, {
-					closeNDV: true,
-				});
-				await expect(n8n.canvas.connectionBetweenNodes(tool, AGENT_NODE_NAME)).toBeAttached();
-			}
-
-			// Chat Trigger + Agent + Tools
-			await expect(n8n.canvas.getCanvasNodes()).toHaveCount(2 + tools.length);
-		});
-	});
-
-	test.describe('Auto-add Behavior', () => {
-		test('should auto-add chat trigger and basic LLM chain when adding LLM node', async ({
-			n8n,
-		}) => {
-			await n8n.canvas.addNode(AI_LANGUAGE_MODEL_OPENAI_CHAT_MODEL_NODE_NAME, { closeNDV: true });
-
-			await expect(
-				n8n.canvas.connectionBetweenNodes(
-					CHAT_TRIGGER_NODE_DISPLAY_NAME,
-					BASIC_LLM_CHAIN_NODE_NAME,
-				),
-			).toBeAttached();
-
-			await expect(
-				n8n.canvas.connectionBetweenNodes(
-					AI_LANGUAGE_MODEL_OPENAI_CHAT_MODEL_NODE_NAME,
-					BASIC_LLM_CHAIN_NODE_NAME,
-				),
-			).toBeAttached();
-
-			await expect(n8n.canvas.getCanvasNodes()).toHaveCount(3);
-		});
-
-		test('should not auto-add nodes if AI nodes are already present', async ({ n8n }) => {
-			await n8n.canvas.addNode(AGENT_NODE_NAME, { closeNDV: true });
-
-			await n8n.canvas.addNode(AI_LANGUAGE_MODEL_OPENAI_CHAT_MODEL_NODE_NAME, { closeNDV: true });
-
-			await expect(
-				n8n.canvas.connectionBetweenNodes(CHAT_TRIGGER_NODE_DISPLAY_NAME, AGENT_NODE_NAME),
-			).toBeAttached();
-
-			await expect(n8n.canvas.getCanvasNodes()).toHaveCount(3);
-		});
-
-		test('should not auto-add nodes if ChatTrigger is already present', async ({ n8n }) => {
-			await n8n.canvas.addNode(MANUAL_CHAT_TRIGGER_NODE_NAME, { closeNDV: true });
-
-			await n8n.canvas.addNode(AGENT_NODE_NAME, { closeNDV: true });
-
-			await n8n.canvas.addNode(AI_LANGUAGE_MODEL_OPENAI_CHAT_MODEL_NODE_NAME, { closeNDV: true });
-
-			await expect(
-				n8n.canvas.connectionBetweenNodes(CHAT_TRIGGER_NODE_DISPLAY_NAME, AGENT_NODE_NAME),
-			).toBeAttached();
-
-			await expect(n8n.canvas.getCanvasNodes()).toHaveCount(3);
-		});
-	});
-
-	test.describe('Chat Execution and Interaction', () => {
-		test('should be able to open and execute Basic LLM Chain node', async ({ n8n }) => {
-			await n8n.canvas.addNode(BASIC_LLM_CHAIN_NODE_NAME, { closeNDV: true });
-
-			await addOpenAILanguageModelWithCredentials(n8n, BASIC_LLM_CHAIN_NODE_NAME);
-
-			await n8n.canvas.openNode(BASIC_LLM_CHAIN_NODE_NAME);
-			const inputMessage = 'Hello!';
-
-			await n8n.ndv.execute();
-			await executeChatAndWaitForResponse(n8n, inputMessage);
-
-			// Verify chat message appears
-			await expect(n8n.canvas.getManualChatLatestBotMessage()).toBeVisible();
-		});
-		test('should be able to open and execute Agent node', async ({ n8n }) => {
-			await setupBasicAgentWorkflow(n8n);
-
-			const inputMessage = 'Hello!';
-			await n8n.canvas.clickManualChatButton();
-			await executeChatAndWaitForResponse(n8n, inputMessage);
-
-			// Verify chat message appears
-			await expect(n8n.canvas.getManualChatLatestBotMessage()).toBeVisible();
-		});
-		test('should add and use Manual Chat Trigger node together with Agent node', async ({
-			n8n,
-		}) => {
-			await setupBasicAgentWorkflow(n8n);
-
-			const inputMessage = 'Hello!';
-			await n8n.canvas.clickManualChatButton();
-			await executeChatAndWaitForResponse(n8n, inputMessage);
-
-			await verifyChatMessages(n8n, 2, inputMessage);
-			await verifyLogsPanelEntries(n8n, [
-				'When chat message received',
-				'AI Agent',
-				'OpenAI Chat Model',
-			]);
-
-			await n8n.canvas.closeManualChatModal();
-			await expect(n8n.canvas.logsPanel.getLogEntries()).toBeHidden();
-			await expect(n8n.canvas.getManualChatInput()).toBeHidden();
-		});
-	});
-
-	// @AI team to look at this
-	// eslint-disable-next-line playwright/no-skipped-test
-	test.skip('Tool Usage Notifications', () => {
-		test('should show tool info notice if no existing tools were used during execution', async ({
-			n8n,
-		}) => {
-			await setupBasicAgentWorkflow(n8n, [AI_TOOL_CALCULATOR_NODE_NAME]);
-			await n8n.canvas.openNode(AGENT_NODE_NAME);
-
-			const inputMessage = 'Hello!';
-			await n8n.ndv.execute();
-			await executeChatAndWaitForResponse(n8n, inputMessage);
-
-			await n8n.canvas.closeManualChatModal();
-			await n8n.canvas.openNode(AGENT_NODE_NAME);
-
-			await expect(n8n.ndv.getRunDataInfoCallout()).toBeVisible();
-		});
-		test('should not show tool info notice if tools were used during execution', async ({
-			n8n,
-		}) => {
-			await n8n.canvas.addNode(MANUAL_CHAT_TRIGGER_NODE_NAME, { closeNDV: true });
-			await n8n.canvas.addNode(AGENT_NODE_NAME, { closeNDV: false });
-			await expect(n8n.ndv.getRunDataInfoCallout()).toBeHidden();
-			await n8n.ndv.clickBackToCanvasButton();
-
-			await addOpenAILanguageModelWithCredentials(n8n, AGENT_NODE_NAME);
-
-			await n8n.canvas.addSupplementalNodeToParent(
-				AI_TOOL_CALCULATOR_NODE_NAME,
-				'ai_tool',
-				AGENT_NODE_NAME,
-				{ closeNDV: true },
-			);
-
-			const inputMessage = 'What is 1000 * 10?';
-			await n8n.canvas.clickManualChatButton();
-			await executeChatAndWaitForResponse(n8n, inputMessage);
-
-			await n8n.canvas.closeManualChatModal();
-			await n8n.canvas.openNode(AGENT_NODE_NAME);
-
-			await expect(n8n.ndv.getRunDataInfoCallout()).toBeHidden();
-		});
-	});
-
-	// Create a ticket for this for AI team to fix
-	// eslint-disable-next-line playwright/no-skipped-test
-	test.skip('Error Handling and Logs Display', () => {
-		// Helper function to set up the agent workflow with Postgres error configuration
-		async function setupAgentWorkflowWithPostgresError(n8n: n8nPage) {
-			await n8n.canvas.addNode(AGENT_NODE_NAME, { closeNDV: true });
-
-			// Add Calculator Tool (required for OpenAI model)
-			await n8n.canvas.addSupplementalNodeToParent(
-				AI_TOOL_CALCULATOR_NODE_NAME,
-				'ai_tool',
-				AGENT_NODE_NAME,
-				{ closeNDV: true },
-			);
-
-			// Add and configure Postgres Memory
-			await n8n.canvas.addSupplementalNodeToParent(
-				AI_MEMORY_POSTGRES_NODE_NAME,
-				'ai_memory',
-				AGENT_NODE_NAME,
-				{ closeNDV: false },
-			);
-
-			await n8n.credentialsComposer.createFromNdv({
-				password: 'testtesttest',
-			});
-
-			await n8n.ndv.getParameterInput('sessionIdType').click();
-			await n8n.page.getByRole('option', { name: 'Define below' }).click();
-			await n8n.ndv.getParameterInput('sessionKey').locator('input').fill('asdasd');
-			await n8n.ndv.clickBackToCanvasButton();
-
-			// Add and configure OpenAI Language Model
-			await addOpenAILanguageModelWithCredentials(n8n, AGENT_NODE_NAME);
-
-			await n8n.canvas.clickZoomToFitButton();
-		}
-
-		// Helper function to assert logs tab is active
-		async function assertLogsTabIsActive(n8n: n8nPage) {
-			await expect(n8n.ndv.getOutputDataContainer()).toBeVisible();
-			await expect(n8n.ndv.getAiOutputModeToggle()).toBeVisible();
-
-			const radioButtons = n8n.ndv.getAiOutputModeToggle().locator('[role="radio"]');
-			await expect(radioButtons).toHaveCount(2);
-			await expect(radioButtons.nth(1)).toHaveAttribute('aria-checked', 'true');
-		}
-
-		// Helper function to assert error message is visible
-		async function assertErrorMessageVisible(n8n: n8nPage) {
-			await expect(
-				n8n.ndv.getOutputPanel().getByTestId('node-error-message').first(),
-			).toBeVisible();
-			await expect(
-				n8n.ndv.getOutputPanel().getByTestId('node-error-message').first(),
-			).toContainText('Error in sub-node');
-		}
-
-		test('should open logs tab by default when there was an error', async ({ n8n }) => {
-			await setupAgentWorkflowWithPostgresError(n8n);
-
-			const inputMessage = 'Test the code tool';
-
-			// Execute workflow with chat trigger
-			await n8n.canvas.clickManualChatButton();
-			await executeChatAndWaitForResponse(n8n, inputMessage);
-
-			// Check that messages and logs are displayed
-			const messages = await verifyChatMessages(n8n, 2, inputMessage);
-			await expect(messages.last()).toContainText(
-				'[ERROR: The service refused the connection - perhaps it is offline]',
-			);
-
-			await expect(n8n.canvas.logsPanel.getLogEntries().first()).toBeVisible();
-			await expect(n8n.canvas.logsPanel.getLogEntries()).toHaveCount(3);
-			await expect(n8n.canvas.logsPanel.getSelectedLogEntry()).toHaveText('AI Agent');
-			await expect(n8n.canvas.logsPanel.outputPanel.get()).toContainText(
-				AI_MEMORY_POSTGRES_NODE_NAME,
-			);
-
-			await n8n.canvas.closeManualChatModal();
-
-			// Open the AI Agent node to see the logs
-			await n8n.canvas.openNode(AGENT_NODE_NAME);
-
-			// Assert that logs tab is active and error is displayed
-			await assertLogsTabIsActive(n8n);
-			await assertErrorMessageVisible(n8n);
-		});
-
-		test('should switch to logs tab on error, when NDV is already opened', async ({ n8n }) => {
-			// Remove the auto-added chat trigger
-			await n8n.canvas.addNode(MANUAL_CHAT_TRIGGER_NODE_NAME, { closeNDV: false });
-
-			// Set manual trigger to output standard pinned data
-			await n8n.ndv.getEditPinnedDataButton().click();
-			await n8n.ndv.savePinnedData();
-			await n8n.ndv.close();
-
-			// Set up the same workflow components but with manual trigger
-			await setupAgentWorkflowWithPostgresError(n8n);
-
-			// Open the AI Agent node
-			await n8n.canvas.openNode(AGENT_NODE_NAME);
-			await n8n.ndv.getParameterInput('promptType').click();
-			await n8n.page.getByRole('option', { name: 'Define below' }).click();
-			await n8n.ndv.getParameterInput('text').locator('textarea').fill('Some text');
-			await n8n.ndv.execute();
-			await waitForWorkflowSuccess(n8n);
-
-			// Assert that logs tab is active and error is displayed
-			await assertLogsTabIsActive(n8n);
-			await assertErrorMessageVisible(n8n);
-		});
-	});
-
-	test.describe('Advanced Workflow Features', () => {
-		test('should render runItems for sub-nodes and allow switching between them', async ({
-			n8n,
-		}) => {
-			await n8n.start.fromImportedWorkflow('In_memory_vector_store_fake_embeddings.json');
-			await n8n.canvas.clickZoomToFitButton();
-			await n8n.canvas.deselectAll();
-
-			await n8n.canvas.executeNode('Populate VS');
-			await waitForWorkflowSuccess(n8n);
-
-			const assertInputOutputTextExists = async (text: string) => {
-				await expect(n8n.ndv.getOutputPanel()).toContainText(text);
-				await expect(n8n.ndv.getInputPanel()).toContainText(text);
-			};
-
-			const assertInputOutputTextNotExists = async (text: string) => {
-				await expect(n8n.ndv.getOutputPanel()).not.toContainText(text);
-				await expect(n8n.ndv.getInputPanel()).not.toContainText(text);
-			};
-
-			await n8n.canvas.openNode('Character Text Splitter');
-
-			await expect(n8n.ndv.getOutputRunSelector()).toBeVisible();
-			await expect(n8n.ndv.getInputRunSelector()).toBeVisible();
-			await expect(n8n.ndv.getInputRunSelectorInput()).toHaveValue('3 of 3');
-			await expect(n8n.ndv.getOutputRunSelectorInput()).toHaveValue('3 of 3');
-			await assertInputOutputTextExists('Kyiv');
-			await assertInputOutputTextNotExists('Berlin');
-			await assertInputOutputTextNotExists('Prague');
-
-			await n8n.ndv.changeOutputRunSelector('2 of 3');
-			await assertInputOutputTextExists('Berlin');
-			await assertInputOutputTextNotExists('Kyiv');
-			await assertInputOutputTextNotExists('Prague');
-
-			await n8n.ndv.changeOutputRunSelector('1 of 3');
-			await assertInputOutputTextExists('Prague');
-			await assertInputOutputTextNotExists('Berlin');
-			await assertInputOutputTextNotExists('Kyiv');
-
-			await n8n.ndv.toggleInputRunLinking();
-			await n8n.ndv.changeOutputRunSelector('2 of 3');
-			await expect(n8n.ndv.getInputRunSelectorInput()).toHaveValue('1 of 3');
-			await expect(n8n.ndv.getOutputRunSelectorInput()).toHaveValue('2 of 3');
-			await expect(n8n.ndv.getInputPanel()).toContainText('Prague');
-			await expect(n8n.ndv.getInputPanel()).not.toContainText('Berlin');
-
-			await expect(n8n.ndv.getOutputPanel()).toContainText('Berlin');
-			await expect(n8n.ndv.getOutputPanel()).not.toContainText('Prague');
-
-			await n8n.ndv.toggleInputRunLinking();
-			await expect(n8n.ndv.getInputRunSelectorInput()).toHaveValue('1 of 3');
-			await expect(n8n.ndv.getOutputRunSelectorInput()).toHaveValue('1 of 3');
-			await assertInputOutputTextExists('Prague');
-			await assertInputOutputTextNotExists('Berlin');
-			await assertInputOutputTextNotExists('Kyiv');
-		});
-
-		test('should execute up to Node 1 when using partial execution', async ({ n8n }) => {
-			await n8n.start.fromImportedWorkflow('Test_workflow_chat_partial_execution.json');
-			await n8n.canvas.clickZoomToFitButton();
-
-			// Check that chat modal is not initially visible
-			await expect(n8n.canvas.getManualChatModal().locator('main')).toBeHidden();
-
-			// Open Node 1 and execute it
-			await n8n.canvas.openNode('Node 1');
-			await n8n.ndv.execute();
-			// Chat modal should now be visible
-			await expect(n8n.canvas.getManualChatModal().locator('main')).toBeVisible();
-
-			// Send first message
-			await n8n.canvas.logsPanel.sendManualChatMessage('Test');
-			await expect(n8n.canvas.getManualChatLatestBotMessage()).toContainText('this_my_field_1');
-
-			// Refresh session
-			await n8n.page.getByTestId('refresh-session-button').click();
-			await expect(n8n.canvas.getManualChatMessages()).not.toBeAttached();
-
-			// Send another message
-			await n8n.canvas.logsPanel.sendManualChatMessage('Another test');
-			await expect(n8n.canvas.getManualChatLatestBotMessage()).toContainText('this_my_field_3');
-			await expect(n8n.canvas.getManualChatLatestBotMessage()).toContainText('this_my_field_4');
-		});
-	});
-
-	test('should keep the same session when switching tabs', async ({ n8n }) => {
-		await n8n.start.fromImportedWorkflow('Test_workflow_chat_partial_execution.json');
-		await n8n.canvas.clickZoomToFitButton();
-
-		await n8n.canvas.logsPanel.open();
-
-		// Send a message
-		await n8n.canvas.logsPanel.sendManualChatMessage('Test');
-		await expect(n8n.canvas.getManualChatLatestBotMessage()).toContainText('this_my_field');
-
-		await n8n.canvas.clickExecutionsTab();
-
-		await n8n.canvas.clickEditorTab();
-		await expect(n8n.canvas.getManualChatLatestBotMessage()).toContainText('this_my_field');
-
-		// Refresh session
-		await n8n.page.getByTestId('refresh-session-button').click();
-		await expect(n8n.canvas.getManualChatMessages()).not.toBeAttached();
-	});
-});
diff --git a/packages/testing/playwright/tests/ui/45-ai-assistant.spec.ts b/packages/testing/playwright/tests/ui/45-ai-assistant.spec.ts
deleted file mode 100644
index bffdee651d9..00000000000
--- a/packages/testing/playwright/tests/ui/45-ai-assistant.spec.ts
+++ /dev/null
@@ -1,618 +0,0 @@
-import {
-	simpleAssistantResponse,
-	codeDiffSuggestionResponse,
-	applyCodeDiffResponse,
-	nodeExecutionSucceededResponse,
-	aiDisabledRequirements,
-	aiEnabledRequirements,
-	aiEnabledWorkflowBaseRequirements,
-	aiEnabledWithWorkflowRequirements,
-	aiEnabledWithQuickRepliesRequirements,
-	aiEnabledWithEndSessionRequirements,
-	aiEnabledWithCodeDiffRequirements,
-	aiEnabledWithSimpleChatRequirements,
-	aiEnabledWithCodeSnippetRequirements,
-	aiEnabledWithHttpWorkflowRequirements,
-} from '../../config/ai-assistant-fixtures';
-import {
-	GMAIL_NODE_NAME,
-	HTTP_REQUEST_NODE_NAME,
-	MANUAL_TRIGGER_NODE_NAME,
-	SCHEDULE_TRIGGER_NODE_NAME,
-} from '../../config/constants';
-import { test, expect } from '../../fixtures/base';
-
-type ChatRequestBody = {
-	payload?: {
-		type?: string;
-		text?: string;
-		question?: string;
-		context?: Record<string, unknown>;
-	};
-};
-
-test.describe('AI Assistant::disabled', () => {
-	test('does not show assistant button if feature is disabled', async ({
-		n8n,
-		setupRequirements,
-	}) => {
-		await setupRequirements(aiDisabledRequirements);
-		await n8n.page.goto('/workflow/new');
-		await expect(n8n.canvas.canvasPane()).toBeVisible();
-		await expect(n8n.aiAssistant.getAskAssistantFloatingButton()).toHaveCount(0);
-	});
-});
-
-test.describe('AI Assistant::enabled', () => {
-	test('renders placeholder UI', async ({ n8n, setupRequirements }) => {
-		await setupRequirements(aiEnabledRequirements);
-		await n8n.page.goto('/workflow/new');
-
-		await expect(n8n.aiAssistant.getAskAssistantCanvasActionButton()).toBeVisible();
-
-		await n8n.aiAssistant.getAskAssistantCanvasActionButton().click();
-
-		await expect(n8n.aiAssistant.getAskAssistantChat()).toBeVisible();
-
-		await expect(n8n.aiAssistant.getPlaceholderMessage()).toBeVisible();
-
-		await expect(n8n.aiAssistant.getChatInput()).toBeVisible();
-
-		await expect(n8n.aiAssistant.getSendMessageButton()).toBeDisabled();
-
-		await expect(n8n.aiAssistant.getCloseChatButton()).toBeVisible();
-
-		await n8n.aiAssistant.getCloseChatButton().click();
-
-		await expect(n8n.aiAssistant.getAskAssistantChat()).toBeHidden();
-	});
-
-	test('should show resizer when chat is open', async ({ n8n, setupRequirements }) => {
-		await setupRequirements(aiEnabledRequirements);
-		await n8n.page.goto('/workflow/new');
-
-		await n8n.aiAssistant.getAskAssistantCanvasActionButton().click();
-
-		await expect(n8n.aiAssistant.getAskAssistantSidebarResizer()).toBeVisible();
-
-		await expect(n8n.aiAssistant.getAskAssistantChat()).toBeVisible();
-
-		await n8n.aiAssistant.getAskAssistantSidebarResizer().hover();
-
-		await n8n.aiAssistant.getCloseChatButton().click();
-	});
-
-	test('should start chat session from node error view', async ({ n8n, setupRequirements }) => {
-		await setupRequirements(aiEnabledWithWorkflowRequirements);
-
-		await n8n.canvas.openNode('Stop and Error');
-
-		await n8n.ndv.execute();
-
-		await expect(n8n.aiAssistant.getNodeErrorViewAssistantButton()).toBeVisible();
-		await expect(n8n.aiAssistant.getNodeErrorViewAssistantButton()).toBeEnabled();
-
-		await n8n.aiAssistant.getNodeErrorViewAssistantButton().click();
-
-		await expect(n8n.aiAssistant.getChatMessagesAll()).toHaveCount(1);
-
-		await expect(n8n.aiAssistant.getChatMessagesAll().first()).toContainText(
-			'Hey, this is an assistant message',
-		);
-	});
-
-	test('should render chat input correctly', async ({ n8n, setupRequirements }) => {
-		await setupRequirements(aiEnabledWithWorkflowRequirements);
-
-		await n8n.aiAssistant.getAskAssistantCanvasActionButton().click();
-
-		await expect(n8n.aiAssistant.getAskAssistantChat()).toBeVisible();
-		await expect(n8n.aiAssistant.getChatInput()).toBeVisible();
-
-		await expect(n8n.aiAssistant.getSendMessageButton()).toBeDisabled();
-
-		await n8n.aiAssistant.getChatInput().fill('Test message');
-
-		await expect(n8n.aiAssistant.getChatInput()).toHaveValue('Test message');
-
-		await expect(n8n.aiAssistant.getSendMessageButton()).toBeEnabled();
-
-		await n8n.aiAssistant.getSendMessageButton().click();
-
-		await expect(n8n.aiAssistant.getChatMessagesUser()).toHaveCount(1);
-
-		await expect(n8n.aiAssistant.getChatMessagesUser()).toHaveCount(1);
-
-		await expect(n8n.aiAssistant.getChatInput()).toHaveValue('');
-	});
-
-	test('should render and handle quick replies', async ({ n8n, setupRequirements }) => {
-		await setupRequirements(aiEnabledWithQuickRepliesRequirements);
-
-		await n8n.canvas.openNode('Stop and Error');
-
-		await n8n.ndv.execute();
-
-		await n8n.aiAssistant.getNodeErrorViewAssistantButton().click();
-
-		await expect(n8n.aiAssistant.getQuickReplyButtons()).toHaveCount(2);
-
-		await expect(n8n.aiAssistant.getQuickReplyButtons()).toHaveCount(2);
-
-		await n8n.aiAssistant.getQuickReplyButtons().first().click();
-
-		await expect(n8n.aiAssistant.getChatMessagesUser()).toHaveCount(1);
-
-		await expect(n8n.aiAssistant.getChatMessagesUser()).toHaveCount(1);
-
-		await expect(n8n.aiAssistant.getChatMessagesUser().first()).toContainText("Sure, let's do it");
-	});
-
-	test('should warn before starting a new session', async ({ n8n, setupRequirements }) => {
-		await setupRequirements(aiEnabledWithWorkflowRequirements);
-
-		await n8n.canvas.openNode('Edit Fields');
-
-		await n8n.ndv.execute();
-
-		await n8n.aiAssistant.getNodeErrorViewAssistantButton().click();
-
-		await expect(n8n.aiAssistant.getChatMessagesAll()).toHaveCount(1);
-
-		await n8n.aiAssistant.getCloseChatButton().click();
-
-		await n8n.ndv.clickBackToCanvasButton();
-
-		await n8n.canvas.openNode('Stop and Error');
-
-		await n8n.ndv.execute();
-
-		await n8n.aiAssistant.getNodeErrorViewAssistantButton().click();
-
-		await expect(n8n.aiAssistant.getNewAssistantSessionModal()).toBeVisible();
-
-		await n8n.aiAssistant
-			.getNewAssistantSessionModal()
-			.getByRole('button', { name: 'Start new session' })
-			.click();
-
-		await expect(n8n.aiAssistant.getChatMessagesAll()).toHaveCount(1);
-	});
-
-	test('should end chat session when `end_session` event is received', async ({
-		n8n,
-		setupRequirements,
-	}) => {
-		await setupRequirements(aiEnabledWithEndSessionRequirements);
-
-		await n8n.canvas.openNode('Stop and Error');
-
-		await n8n.ndv.execute();
-
-		await n8n.aiAssistant.getNodeErrorViewAssistantButton().click();
-
-		await expect(n8n.aiAssistant.getChatMessagesSystem()).toHaveCount(1);
-
-		await expect(n8n.aiAssistant.getChatMessagesSystem()).toHaveCount(1);
-
-		await expect(n8n.aiAssistant.getChatMessagesSystem().first()).toContainText(
-			'session has ended',
-		);
-	});
-
-	test('should reset session after it ended and sidebar is closed', async ({
-		n8n,
-		setupRequirements,
-	}) => {
-		await setupRequirements(aiEnabledRequirements);
-		await n8n.page.goto('/workflow/new');
-
-		await n8n.page.route('**/rest/ai/chat', async (route) => {
-			const requestBody = route.request().postDataJSON() as ChatRequestBody;
-			const isInit = requestBody.payload?.type === 'init-support-chat';
-			const response = isInit
-				? simpleAssistantResponse
-				: {
-						sessionId: '1',
-						messages: [
-							{
-								role: 'assistant',
-								type: 'message',
-								title: 'Glad to Help',
-								text: "I'm glad I could help. If you have any more questions or need further assistance with your n8n workflows, feel free to ask!",
-							},
-							{
-								role: 'assistant',
-								type: 'event',
-								eventName: 'end-session',
-							},
-						],
-					};
-			await route.fulfill({
-				status: 200,
-				contentType: 'application/json',
-				body: JSON.stringify(response),
-			});
-		});
-
-		await n8n.aiAssistant.getAskAssistantCanvasActionButton().click();
-		await n8n.aiAssistant.sendMessage('Hello', 'enter-key');
-
-		await expect(n8n.aiAssistant.getChatMessagesAll()).toHaveCount(2);
-
-		await n8n.aiAssistant.getCloseChatButton().click();
-		// Wait for sidebar to close
-		await expect(n8n.aiAssistant.getAskAssistantChat()).toBeHidden();
-		await n8n.aiAssistant.getAskAssistantCanvasActionButton().click();
-		await expect(n8n.aiAssistant.getChatMessagesAll()).toHaveCount(2);
-
-		await n8n.aiAssistant.sendMessage('Thanks, bye', 'enter-key');
-
-		await expect(n8n.aiAssistant.getChatMessagesSystem()).toHaveCount(1);
-		await expect(n8n.aiAssistant.getChatMessagesSystem().first()).toContainText(
-			'session has ended',
-		);
-
-		await n8n.aiAssistant.getCloseChatButton().click();
-		await n8n.aiAssistant.getAskAssistantCanvasActionButton().click();
-		await expect(n8n.aiAssistant.getPlaceholderMessage()).toBeVisible();
-	});
-
-	test('should not reset assistant session when workflow is saved', async ({
-		n8n,
-		setupRequirements,
-	}) => {
-		await setupRequirements(aiEnabledWithSimpleChatRequirements);
-		await n8n.page.goto('/workflow/new');
-
-		await n8n.canvas.addInitialNodeToCanvas(SCHEDULE_TRIGGER_NODE_NAME);
-		await n8n.ndv.clickBackToCanvasButton();
-
-		await n8n.aiAssistant.getAskAssistantCanvasActionButton().click();
-		await n8n.aiAssistant.sendMessage('Hello', 'enter-key');
-
-		await expect(n8n.aiAssistant.getChatMessagesUser()).toHaveCount(1);
-
-		await n8n.canvas.openNode(SCHEDULE_TRIGGER_NODE_NAME);
-		await n8n.ndv.execute();
-
-		await expect(n8n.aiAssistant.getPlaceholderMessage()).toHaveCount(0);
-	});
-
-	test('should send message via shift + enter even with global NodeCreator panel opened', async ({
-		n8n,
-		setupRequirements,
-	}) => {
-		await setupRequirements(aiEnabledWithSimpleChatRequirements);
-		await n8n.page.goto('/workflow/new');
-
-		await n8n.canvas.addInitialNodeToCanvas(SCHEDULE_TRIGGER_NODE_NAME);
-		await n8n.ndv.clickBackToCanvasButton();
-
-		await n8n.aiAssistant.getAskAssistantCanvasActionButton().click();
-		await n8n.canvas.nodeCreator.open();
-
-		await n8n.aiAssistant.sendMessage('Hello', 'enter-key');
-
-		await expect(n8n.aiAssistant.getPlaceholderMessage()).toHaveCount(0);
-		await expect(n8n.aiAssistant.getChatMessagesUser()).toHaveCount(1);
-	});
-
-	test.describe('Support Chat', () => {
-		test('assistant returns code snippet', async ({ n8n, setupRequirements }) => {
-			await setupRequirements(aiEnabledWithCodeSnippetRequirements);
-			await n8n.page.goto('/workflow/new');
-
-			await expect(n8n.aiAssistant.getAskAssistantCanvasActionButton()).toBeVisible();
-			await n8n.aiAssistant.getAskAssistantCanvasActionButton().click();
-
-			await expect(n8n.aiAssistant.getAskAssistantChat()).toBeVisible();
-
-			await n8n.aiAssistant.sendMessage('Show me an expression');
-
-			await expect(n8n.aiAssistant.getChatMessagesAll()).toHaveCount(3);
-			await expect(n8n.aiAssistant.getChatMessagesUser().first()).toContainText(
-				'Show me an expression',
-			);
-			await expect(n8n.aiAssistant.getChatMessagesAssistant().first()).toContainText(
-				'To use expressions in n8n, follow these steps:',
-			);
-			await expect(n8n.aiAssistant.getChatMessagesAssistant().first()).toContainText('New York');
-			await expect(n8n.aiAssistant.getCodeSnippet()).toHaveText('{{$json.body.city}}');
-		});
-
-		test('should send current context to support chat', async ({ n8n, setupRequirements }) => {
-			await setupRequirements(aiEnabledWithHttpWorkflowRequirements);
-
-			const chatRequests: ChatRequestBody[] = [];
-			await n8n.page.route('**/rest/ai/chat', async (route) => {
-				const body = route.request().postDataJSON() as ChatRequestBody;
-				chatRequests.push(body);
-				await route.fulfill({
-					status: 200,
-					contentType: 'application/json',
-					body: JSON.stringify(simpleAssistantResponse),
-				});
-			});
-
-			await n8n.aiAssistant.getAskAssistantCanvasActionButton().click();
-			await n8n.aiAssistant.sendMessage('What is wrong with this workflow?');
-
-			const supportRequest = chatRequests.find(
-				(request) => request.payload?.question === 'What is wrong with this workflow?',
-			);
-			expect(supportRequest).toBeDefined();
-			const supportContext = supportRequest?.payload?.context;
-			expect(supportContext).toBeDefined();
-			expect(supportContext?.currentView).toBeDefined();
-			expect(supportContext?.currentWorkflow).toBeDefined();
-		});
-
-		test('should not send workflow context if nothing changed', async ({
-			n8n,
-			setupRequirements,
-		}) => {
-			await setupRequirements(aiEnabledWithHttpWorkflowRequirements);
-
-			const chatRequests: ChatRequestBody[] = [];
-			await n8n.page.route('**/rest/ai/chat', async (route) => {
-				const body = route.request().postDataJSON() as ChatRequestBody;
-				chatRequests.push(body);
-				await route.fulfill({
-					status: 200,
-					contentType: 'application/json',
-					body: JSON.stringify(simpleAssistantResponse),
-				});
-			});
-
-			await n8n.aiAssistant.getAskAssistantCanvasActionButton().click();
-
-			await n8n.aiAssistant.sendMessage('What is wrong with this workflow?', 'enter-key');
-			// Wait for message to be processed
-			await expect(n8n.aiAssistant.getChatMessagesAssistant()).toHaveCount(1);
-
-			await n8n.aiAssistant.sendMessage('And now?', 'enter-key');
-			await expect(n8n.aiAssistant.getChatMessagesAssistant()).toHaveCount(2);
-			const secondRequest = chatRequests.find((request) => request.payload?.text === 'And now?');
-			const secondContext = secondRequest?.payload?.context;
-			expect(secondContext?.currentWorkflow).toBeUndefined();
-
-			await n8n.canvas.openNode(HTTP_REQUEST_NODE_NAME);
-			await n8n.ndv.setParameterInputValue('url', 'https://example.com');
-			await n8n.ndv.close();
-			await n8n.canvas.clickExecuteWorkflowButton();
-
-			await n8n.aiAssistant.sendMessage('What about now?', 'enter-key');
-			await expect(n8n.aiAssistant.getChatMessagesAssistant()).toHaveCount(3);
-
-			const thirdRequest = chatRequests.find(
-				(request) => request.payload?.text === 'What about now?',
-			);
-			const thirdContext = thirdRequest?.payload?.context;
-			expect(thirdContext?.currentWorkflow).toBeTruthy();
-			expect(thirdContext?.executionData).toBeTruthy();
-		});
-	});
-
-	test.describe('Code Node Error Help', () => {
-		test('should apply code diff to code node', async ({ n8n, setupRequirements }) => {
-			await setupRequirements(aiEnabledWithCodeDiffRequirements);
-
-			let applySuggestionCalls = 0;
-			await n8n.page.route('**/rest/ai/chat/apply-suggestion', async (route) => {
-				applySuggestionCalls += 1;
-				await route.fulfill({
-					status: 200,
-					contentType: 'application/json',
-					body: JSON.stringify(applyCodeDiffResponse),
-				});
-			});
-
-			await n8n.canvas.openNode('Code');
-
-			await n8n.ndv.execute();
-
-			await n8n.aiAssistant.getNodeErrorViewAssistantButton().click();
-
-			await expect(n8n.aiAssistant.getChatMessagesAll()).toHaveCount(2);
-			await expect(n8n.aiAssistant.getCodeDiffs()).toHaveCount(1);
-			await expect(n8n.aiAssistant.getApplyCodeDiffButtons()).toHaveCount(1);
-
-			await n8n.aiAssistant.getApplyCodeDiffButtons().first().click();
-
-			await expect(n8n.aiAssistant.getApplyCodeDiffButtons()).toHaveCount(0);
-			await expect(n8n.aiAssistant.getUndoReplaceCodeButtons()).toHaveCount(1);
-			await expect(n8n.aiAssistant.getCodeReplacedMessage()).toBeVisible();
-			await expect(n8n.ndv.getCodeEditor()).toContainText('item.json.myNewField = 1');
-
-			await n8n.aiAssistant.getUndoReplaceCodeButtons().first().click();
-
-			await expect(n8n.aiAssistant.getApplyCodeDiffButtons()).toHaveCount(1);
-			await expect(n8n.aiAssistant.getCodeReplacedMessage()).toHaveCount(0);
-			expect(applySuggestionCalls).toBe(1);
-			await expect(n8n.ndv.getCodeEditor()).toContainText('item.json.myNewField = 1aaa');
-
-			await n8n.aiAssistant.getApplyCodeDiffButtons().first().click();
-
-			await expect(n8n.ndv.getCodeEditor()).toContainText('item.json.myNewField = 1');
-		});
-
-		test('should ignore node execution success and error messages after the node run successfully once', async ({
-			n8n,
-			setupRequirements,
-		}) => {
-			await setupRequirements(aiEnabledWorkflowBaseRequirements);
-
-			let chatRequestCount = 0;
-			await n8n.page.route('**/rest/ai/chat', async (route) => {
-				chatRequestCount += 1;
-				const response =
-					chatRequestCount === 1 ? codeDiffSuggestionResponse : nodeExecutionSucceededResponse;
-				await route.fulfill({
-					status: 200,
-					contentType: 'application/json',
-					body: JSON.stringify(response),
-				});
-			});
-
-			await n8n.canvas.openNode('Code');
-			await n8n.ndv.execute();
-			await n8n.aiAssistant.getNodeErrorViewAssistantButton().click();
-
-			await n8n.ndv
-				.getCodeEditor()
-				.fill(
-					"// Loop over input items and add a new field called 'myNewField' to the JSON of each one\nfor (const item of $input.all()) {\n  item.json.myNewField = 1;\n}\n\nreturn $input.all();",
-				);
-
-			await n8n.ndv.execute();
-
-			await n8n.ndv
-				.getCodeEditor()
-				.fill(
-					"// Loop over input items and add a new field called 'myNewField' to the JSON of each one\nfor (const item of $input.all()) {\n  item.json.myNewField = 1aaaa!;\n}\n\nreturn $input.all();",
-				);
-
-			await n8n.ndv.execute();
-
-			await expect(n8n.aiAssistant.getChatMessagesAssistant().nth(2)).toContainText(
-				'Code node ran successfully, did my solution help resolve your issue?',
-			);
-		});
-	});
-
-	test.describe('Credential Help', () => {
-		test('should start credential help from node credential', async ({
-			n8n,
-			setupRequirements,
-		}) => {
-			await setupRequirements(aiEnabledWithSimpleChatRequirements);
-			await n8n.page.goto('/workflow/new');
-
-			await n8n.canvas.addInitialNodeToCanvas(SCHEDULE_TRIGGER_NODE_NAME);
-			await n8n.ndv.clickBackToCanvasButton();
-			await n8n.canvas.addNode(GMAIL_NODE_NAME, { action: 'Get many messages', closeNDV: false });
-
-			await n8n.ndv.clickCreateNewCredential();
-
-			await expect(n8n.canvas.credentialModal.getModal()).toBeVisible();
-
-			const assistantButton = n8n.aiAssistant.getCredentialEditAssistantButton().locator('button');
-			await expect(assistantButton).toBeVisible();
-			await assistantButton.click();
-
-			await expect(n8n.aiAssistant.getChatMessagesUser()).toHaveCount(1);
-			await expect(n8n.aiAssistant.getChatMessagesUser().first()).toContainText(
-				'How do I set up the credentials for Gmail OAuth2 API?',
-			);
-			await expect(n8n.aiAssistant.getChatMessagesAssistant().first()).toContainText(
-				'Hey, this is an assistant message',
-			);
-			await expect(assistantButton).toBeDisabled();
-		});
-
-		test('should start credential help from credential list', async ({
-			n8n,
-			setupRequirements,
-		}) => {
-			await setupRequirements(aiEnabledWithSimpleChatRequirements);
-
-			await n8n.navigate.toCredentials();
-
-			await n8n.workflows.addResource.credential();
-			await n8n.credentials.selectCredentialType('Notion API');
-
-			const assistantButton = n8n.aiAssistant.getCredentialEditAssistantButton().locator('button');
-			await expect(assistantButton).toBeVisible();
-			await assistantButton.click();
-
-			await expect(n8n.aiAssistant.getChatMessagesUser()).toHaveCount(1);
-			await expect(n8n.aiAssistant.getChatMessagesUser().first()).toContainText(
-				'How do I set up the credentials for Notion API?',
-			);
-			await expect(n8n.aiAssistant.getChatMessagesAssistant().first()).toContainText(
-				'Hey, this is an assistant message',
-			);
-			await expect(assistantButton).toBeDisabled();
-		});
-
-		test('should not show assistant button if click to connect', async ({
-			n8n,
-			setupRequirements,
-		}) => {
-			await setupRequirements(aiEnabledRequirements);
-
-			await n8n.page.route('**/types/credentials.json', async (route) => {
-				const response = await route.fetch();
-				const credentials = (await response.json()) as Array<
-					{ name?: string } & Record<string, unknown>
-				>;
-				const index = credentials.findIndex((c) => c.name === 'slackOAuth2Api');
-				if (index >= 0) {
-					credentials[index] = {
-						...credentials[index],
-						__overwrittenProperties: ['clientId', 'clientSecret'],
-					};
-				}
-				await route.fulfill({
-					status: 200,
-					contentType: 'application/json',
-					body: JSON.stringify(credentials),
-				});
-			});
-
-			await n8n.page.goto('/workflow/new');
-			await n8n.canvas.addInitialNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
-			await n8n.canvas.addNode('Slack', { action: 'Get a channel' });
-
-			await n8n.ndv.clickCreateNewCredential();
-
-			const authOptions = n8n.canvas.credentialModal.getAuthTypeRadioButtons();
-			await authOptions.first().click();
-
-			await expect(n8n.canvas.credentialModal.oauthConnectButton).toHaveCount(1);
-			await expect(n8n.canvas.credentialModal.getCredentialInputs()).toHaveCount(2);
-			await expect(n8n.aiAssistant.getCredentialEditAssistantButton()).toHaveCount(0);
-
-			await authOptions.nth(1).click();
-			await expect(n8n.canvas.credentialModal.getCredentialInputs()).toHaveCount(4);
-			await expect(n8n.aiAssistant.getCredentialEditAssistantButton()).toHaveCount(1);
-		});
-
-		test('should not show assistant button when click to connect with some fields', async ({
-			n8n,
-			setupRequirements,
-		}) => {
-			await setupRequirements(aiEnabledRequirements);
-
-			await n8n.page.route('**/types/credentials.json', async (route) => {
-				const response = await route.fetch();
-				const credentials = (await response.json()) as Array<
-					{ name?: string } & Record<string, unknown>
-				>;
-				const index = credentials.findIndex((c) => c.name === 'microsoftOutlookOAuth2Api');
-				if (index >= 0) {
-					credentials[index] = {
-						...credentials[index],
-						__overwrittenProperties: ['authUrl', 'accessTokenUrl', 'clientId', 'clientSecret'],
-					};
-				}
-				await route.fulfill({
-					status: 200,
-					contentType: 'application/json',
-					body: JSON.stringify(credentials),
-				});
-			});
-
-			await n8n.page.goto('/workflow/new');
-			await n8n.canvas.addInitialNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
-			await n8n.canvas.addNode('Microsoft Outlook', { action: 'Get a calendar' });
-
-			await n8n.ndv.clickCreateNewCredential();
-
-			await expect(n8n.canvas.credentialModal.oauthConnectButton).toHaveCount(1);
-			await expect(n8n.canvas.credentialModal.getCredentialInputs()).toHaveCount(2);
-			await expect(n8n.aiAssistant.getCredentialEditAssistantButton()).toHaveCount(0);
-		});
-	});
-});
diff --git a/packages/testing/playwright/tests/ui/ai/assistant-basic.spec.ts b/packages/testing/playwright/tests/ui/ai/assistant-basic.spec.ts
new file mode 100644
index 00000000000..e7c6d6c7338
--- /dev/null
+++ b/packages/testing/playwright/tests/ui/ai/assistant-basic.spec.ts
@@ -0,0 +1,288 @@
+import {
+	simpleAssistantResponse,
+	aiDisabledRequirements,
+	aiEnabledRequirements,
+	aiEnabledWithWorkflowRequirements,
+	aiEnabledWithQuickRepliesRequirements,
+	aiEnabledWithEndSessionRequirements,
+	aiEnabledWithSimpleChatRequirements,
+} from '../../../config/ai-assistant-fixtures';
+import { SCHEDULE_TRIGGER_NODE_NAME } from '../../../config/constants';
+import { test, expect } from '../../../fixtures/base';
+
+type ChatRequestBody = {
+	payload?: {
+		type?: string;
+		text?: string;
+		question?: string;
+		context?: Record<string, unknown>;
+	};
+};
+
+test.describe('AI Assistant::disabled', () => {
+	test('does not show assistant button if feature is disabled', async ({
+		n8n,
+		setupRequirements,
+	}) => {
+		await setupRequirements(aiDisabledRequirements);
+		await n8n.page.goto('/workflow/new');
+		await expect(n8n.canvas.canvasPane()).toBeVisible();
+		await expect(n8n.aiAssistant.getAskAssistantFloatingButton()).toHaveCount(0);
+	});
+});
+
+test.describe('AI Assistant::enabled', () => {
+	test('renders placeholder UI', async ({ n8n, setupRequirements }) => {
+		await setupRequirements(aiEnabledRequirements);
+		await n8n.page.goto('/workflow/new');
+
+		await expect(n8n.aiAssistant.getAskAssistantCanvasActionButton()).toBeVisible();
+
+		await n8n.aiAssistant.getAskAssistantCanvasActionButton().click();
+
+		await expect(n8n.aiAssistant.getAskAssistantChat()).toBeVisible();
+
+		await expect(n8n.aiAssistant.getPlaceholderMessage()).toBeVisible();
+
+		await expect(n8n.aiAssistant.getChatInput()).toBeVisible();
+
+		await expect(n8n.aiAssistant.getSendMessageButton()).toBeDisabled();
+
+		await expect(n8n.aiAssistant.getCloseChatButton()).toBeVisible();
+
+		await n8n.aiAssistant.getCloseChatButton().click();
+
+		await expect(n8n.aiAssistant.getAskAssistantChat()).toBeHidden();
+	});
+
+	test('should show resizer when chat is open', async ({ n8n, setupRequirements }) => {
+		await setupRequirements(aiEnabledRequirements);
+		await n8n.page.goto('/workflow/new');
+
+		await n8n.aiAssistant.getAskAssistantCanvasActionButton().click();
+
+		await expect(n8n.aiAssistant.getAskAssistantSidebarResizer()).toBeVisible();
+
+		await expect(n8n.aiAssistant.getAskAssistantChat()).toBeVisible();
+
+		await n8n.aiAssistant.getAskAssistantSidebarResizer().hover();
+
+		await n8n.aiAssistant.getCloseChatButton().click();
+	});
+
+	test('should start chat session from node error view', async ({ n8n, setupRequirements }) => {
+		await setupRequirements(aiEnabledWithWorkflowRequirements);
+
+		await n8n.canvas.openNode('Stop and Error');
+
+		await n8n.ndv.execute();
+
+		await expect(n8n.aiAssistant.getNodeErrorViewAssistantButton()).toBeVisible();
+		await expect(n8n.aiAssistant.getNodeErrorViewAssistantButton()).toBeEnabled();
+
+		await n8n.aiAssistant.getNodeErrorViewAssistantButton().click();
+
+		await expect(n8n.aiAssistant.getChatMessagesAll()).toHaveCount(1);
+
+		await expect(n8n.aiAssistant.getChatMessagesAll().first()).toContainText(
+			'Hey, this is an assistant message',
+		);
+	});
+
+	test('should render chat input correctly', async ({ n8n, setupRequirements }) => {
+		await setupRequirements(aiEnabledWithWorkflowRequirements);
+
+		await n8n.aiAssistant.getAskAssistantCanvasActionButton().click();
+
+		await expect(n8n.aiAssistant.getAskAssistantChat()).toBeVisible();
+		await expect(n8n.aiAssistant.getChatInput()).toBeVisible();
+
+		await expect(n8n.aiAssistant.getSendMessageButton()).toBeDisabled();
+
+		await n8n.aiAssistant.getChatInput().fill('Test message');
+
+		await expect(n8n.aiAssistant.getChatInput()).toHaveValue('Test message');
+
+		await expect(n8n.aiAssistant.getSendMessageButton()).toBeEnabled();
+
+		await n8n.aiAssistant.getSendMessageButton().click();
+
+		await expect(n8n.aiAssistant.getChatMessagesUser()).toHaveCount(1);
+
+		await expect(n8n.aiAssistant.getChatMessagesUser()).toHaveCount(1);
+
+		await expect(n8n.aiAssistant.getChatInput()).toHaveValue('');
+	});
+
+	test('should render and handle quick replies', async ({ n8n, setupRequirements }) => {
+		await setupRequirements(aiEnabledWithQuickRepliesRequirements);
+
+		await n8n.canvas.openNode('Stop and Error');
+
+		await n8n.ndv.execute();
+
+		await n8n.aiAssistant.getNodeErrorViewAssistantButton().click();
+
+		await expect(n8n.aiAssistant.getQuickReplyButtons()).toHaveCount(2);
+
+		await expect(n8n.aiAssistant.getQuickReplyButtons()).toHaveCount(2);
+
+		await n8n.aiAssistant.getQuickReplyButtons().first().click();
+
+		await expect(n8n.aiAssistant.getChatMessagesUser()).toHaveCount(1);
+
+		await expect(n8n.aiAssistant.getChatMessagesUser()).toHaveCount(1);
+
+		await expect(n8n.aiAssistant.getChatMessagesUser().first()).toContainText("Sure, let's do it");
+	});
+
+	test('should warn before starting a new session', async ({ n8n, setupRequirements }) => {
+		await setupRequirements(aiEnabledWithWorkflowRequirements);
+
+		await n8n.canvas.openNode('Edit Fields');
+
+		await n8n.ndv.execute();
+
+		await n8n.aiAssistant.getNodeErrorViewAssistantButton().click();
+
+		await expect(n8n.aiAssistant.getChatMessagesAll()).toHaveCount(1);
+
+		await n8n.aiAssistant.getCloseChatButton().click();
+
+		await n8n.ndv.clickBackToCanvasButton();
+
+		await n8n.canvas.openNode('Stop and Error');
+
+		await n8n.ndv.execute();
+
+		await n8n.aiAssistant.getNodeErrorViewAssistantButton().click();
+
+		await expect(n8n.aiAssistant.getNewAssistantSessionModal()).toBeVisible();
+
+		await n8n.aiAssistant
+			.getNewAssistantSessionModal()
+			.getByRole('button', { name: 'Start new session' })
+			.click();
+
+		await expect(n8n.aiAssistant.getChatMessagesAll()).toHaveCount(1);
+	});
+
+	test('should end chat session when `end_session` event is received', async ({
+		n8n,
+		setupRequirements,
+	}) => {
+		await setupRequirements(aiEnabledWithEndSessionRequirements);
+
+		await n8n.canvas.openNode('Stop and Error');
+
+		await n8n.ndv.execute();
+
+		await n8n.aiAssistant.getNodeErrorViewAssistantButton().click();
+
+		await expect(n8n.aiAssistant.getChatMessagesSystem()).toHaveCount(1);
+
+		await expect(n8n.aiAssistant.getChatMessagesSystem()).toHaveCount(1);
+
+		await expect(n8n.aiAssistant.getChatMessagesSystem().first()).toContainText(
+			'session has ended',
+		);
+	});
+
+	test('should reset session after it ended and sidebar is closed', async ({
+		n8n,
+		setupRequirements,
+	}) => {
+		await setupRequirements(aiEnabledRequirements);
+		await n8n.page.goto('/workflow/new');
+
+		await n8n.page.route('**/rest/ai/chat', async (route) => {
+			const requestBody = route.request().postDataJSON() as ChatRequestBody;
+			const isInit = requestBody.payload?.type === 'init-support-chat';
+			const response = isInit
+				? simpleAssistantResponse
+				: {
+						sessionId: '1',
+						messages: [
+							{
+								role: 'assistant',
+								type: 'message',
+								title: 'Glad to Help',
+								text: "I'm glad I could help. If you have any more questions or need further assistance with your n8n workflows, feel free to ask!",
+							},
+							{
+								role: 'assistant',
+								type: 'event',
+								eventName: 'end-session',
+							},
+						],
+					};
+			await route.fulfill({
+				status: 200,
+				contentType: 'application/json',
+				body: JSON.stringify(response),
+			});
+		});
+
+		await n8n.aiAssistant.getAskAssistantCanvasActionButton().click();
+		await n8n.aiAssistant.sendMessage('Hello', 'enter-key');
+
+		await expect(n8n.aiAssistant.getChatMessagesAll()).toHaveCount(2);
+
+		await n8n.aiAssistant.getCloseChatButton().click();
+		// Wait for sidebar to close
+		await expect(n8n.aiAssistant.getAskAssistantChat()).toBeHidden();
+		await n8n.aiAssistant.getAskAssistantCanvasActionButton().click();
+		await expect(n8n.aiAssistant.getChatMessagesAll()).toHaveCount(2);
+
+		await n8n.aiAssistant.sendMessage('Thanks, bye', 'enter-key');
+
+		await expect(n8n.aiAssistant.getChatMessagesSystem()).toHaveCount(1);
+		await expect(n8n.aiAssistant.getChatMessagesSystem().first()).toContainText(
+			'session has ended',
+		);
+
+		await n8n.aiAssistant.getCloseChatButton().click();
+		await n8n.aiAssistant.getAskAssistantCanvasActionButton().click();
+		await expect(n8n.aiAssistant.getPlaceholderMessage()).toBeVisible();
+	});
+
+	test('should not reset assistant session when workflow is saved', async ({
+		n8n,
+		setupRequirements,
+	}) => {
+		await setupRequirements(aiEnabledWithSimpleChatRequirements);
+		await n8n.page.goto('/workflow/new');
+
+		await n8n.canvas.addInitialNodeToCanvas(SCHEDULE_TRIGGER_NODE_NAME);
+		await n8n.ndv.clickBackToCanvasButton();
+
+		await n8n.aiAssistant.getAskAssistantCanvasActionButton().click();
+		await n8n.aiAssistant.sendMessage('Hello', 'enter-key');
+
+		await expect(n8n.aiAssistant.getChatMessagesUser()).toHaveCount(1);
+
+		await n8n.canvas.openNode(SCHEDULE_TRIGGER_NODE_NAME);
+		await n8n.ndv.execute();
+
+		await expect(n8n.aiAssistant.getPlaceholderMessage()).toHaveCount(0);
+	});
+
+	test('should send message via shift + enter even with global NodeCreator panel opened', async ({
+		n8n,
+		setupRequirements,
+	}) => {
+		await setupRequirements(aiEnabledWithSimpleChatRequirements);
+		await n8n.page.goto('/workflow/new');
+
+		await n8n.canvas.addInitialNodeToCanvas(SCHEDULE_TRIGGER_NODE_NAME);
+		await n8n.ndv.clickBackToCanvasButton();
+
+		await n8n.aiAssistant.getAskAssistantCanvasActionButton().click();
+		await n8n.canvas.nodeCreator.open();
+
+		await n8n.aiAssistant.sendMessage('Hello', 'enter-key');
+
+		await expect(n8n.aiAssistant.getPlaceholderMessage()).toHaveCount(0);
+		await expect(n8n.aiAssistant.getChatMessagesUser()).toHaveCount(1);
+	});
+});
diff --git a/packages/testing/playwright/tests/ui/ai/assistant-code-help.spec.ts b/packages/testing/playwright/tests/ui/ai/assistant-code-help.spec.ts
new file mode 100644
index 00000000000..18710a0a93a
--- /dev/null
+++ b/packages/testing/playwright/tests/ui/ai/assistant-code-help.spec.ts
@@ -0,0 +1,97 @@
+import {
+	codeDiffSuggestionResponse,
+	applyCodeDiffResponse,
+	nodeExecutionSucceededResponse,
+	aiEnabledWorkflowBaseRequirements,
+	aiEnabledWithCodeDiffRequirements,
+} from '../../../config/ai-assistant-fixtures';
+import { test, expect } from '../../../fixtures/base';
+
+test.describe('AI Assistant::enabled', () => {
+	test.describe('Code Node Error Help', () => {
+		test('should apply code diff to code node', async ({ n8n, setupRequirements }) => {
+			await setupRequirements(aiEnabledWithCodeDiffRequirements);
+
+			let applySuggestionCalls = 0;
+			await n8n.page.route('**/rest/ai/chat/apply-suggestion', async (route) => {
+				applySuggestionCalls += 1;
+				await route.fulfill({
+					status: 200,
+					contentType: 'application/json',
+					body: JSON.stringify(applyCodeDiffResponse),
+				});
+			});
+
+			await n8n.canvas.openNode('Code');
+
+			await n8n.ndv.execute();
+
+			await n8n.aiAssistant.getNodeErrorViewAssistantButton().click();
+
+			await expect(n8n.aiAssistant.getChatMessagesAll()).toHaveCount(2);
+			await expect(n8n.aiAssistant.getCodeDiffs()).toHaveCount(1);
+			await expect(n8n.aiAssistant.getApplyCodeDiffButtons()).toHaveCount(1);
+
+			await n8n.aiAssistant.getApplyCodeDiffButtons().first().click();
+
+			await expect(n8n.aiAssistant.getApplyCodeDiffButtons()).toHaveCount(0);
+			await expect(n8n.aiAssistant.getUndoReplaceCodeButtons()).toHaveCount(1);
+			await expect(n8n.aiAssistant.getCodeReplacedMessage()).toBeVisible();
+			await expect(n8n.ndv.getCodeEditor()).toContainText('item.json.myNewField = 1');
+
+			await n8n.aiAssistant.getUndoReplaceCodeButtons().first().click();
+
+			await expect(n8n.aiAssistant.getApplyCodeDiffButtons()).toHaveCount(1);
+			await expect(n8n.aiAssistant.getCodeReplacedMessage()).toHaveCount(0);
+			expect(applySuggestionCalls).toBe(1);
+			await expect(n8n.ndv.getCodeEditor()).toContainText('item.json.myNewField = 1aaa');
+
+			await n8n.aiAssistant.getApplyCodeDiffButtons().first().click();
+
+			await expect(n8n.ndv.getCodeEditor()).toContainText('item.json.myNewField = 1');
+		});
+
+		test('should ignore node execution success and error messages after the node run successfully once', async ({
+			n8n,
+			setupRequirements,
+		}) => {
+			await setupRequirements(aiEnabledWorkflowBaseRequirements);
+
+			let chatRequestCount = 0;
+			await n8n.page.route('**/rest/ai/chat', async (route) => {
+				chatRequestCount += 1;
+				const response =
+					chatRequestCount === 1 ? codeDiffSuggestionResponse : nodeExecutionSucceededResponse;
+				await route.fulfill({
+					status: 200,
+					contentType: 'application/json',
+					body: JSON.stringify(response),
+				});
+			});
+
+			await n8n.canvas.openNode('Code');
+			await n8n.ndv.execute();
+			await n8n.aiAssistant.getNodeErrorViewAssistantButton().click();
+
+			await n8n.ndv
+				.getCodeEditor()
+				.fill(
+					"// Loop over input items and add a new field called 'myNewField' to the JSON of each one\nfor (const item of $input.all()) {\n  item.json.myNewField = 1;\n}\n\nreturn $input.all();",
+				);
+
+			await n8n.ndv.execute();
+
+			await n8n.ndv
+				.getCodeEditor()
+				.fill(
+					"// Loop over input items and add a new field called 'myNewField' to the JSON of each one\nfor (const item of $input.all()) {\n  item.json.myNewField = 1aaaa!;\n}\n\nreturn $input.all();",
+				);
+
+			await n8n.ndv.execute();
+
+			await expect(n8n.aiAssistant.getChatMessagesAssistant().nth(2)).toContainText(
+				'Code node ran successfully, did my solution help resolve your issue?',
+			);
+		});
+	});
+});
diff --git a/packages/testing/playwright/tests/ui/ai/assistant-credential-help.spec.ts b/packages/testing/playwright/tests/ui/ai/assistant-credential-help.spec.ts
new file mode 100644
index 00000000000..c3d830c5fc2
--- /dev/null
+++ b/packages/testing/playwright/tests/ui/ai/assistant-credential-help.spec.ts
@@ -0,0 +1,147 @@
+import {
+	aiEnabledRequirements,
+	aiEnabledWithSimpleChatRequirements,
+} from '../../../config/ai-assistant-fixtures';
+import {
+	GMAIL_NODE_NAME,
+	MANUAL_TRIGGER_NODE_NAME,
+	SCHEDULE_TRIGGER_NODE_NAME,
+} from '../../../config/constants';
+import { test, expect } from '../../../fixtures/base';
+
+test.describe('AI Assistant::enabled', () => {
+	test.describe('Credential Help', () => {
+		test('should start credential help from node credential', async ({
+			n8n,
+			setupRequirements,
+		}) => {
+			await setupRequirements(aiEnabledWithSimpleChatRequirements);
+			await n8n.page.goto('/workflow/new');
+
+			await n8n.canvas.addInitialNodeToCanvas(SCHEDULE_TRIGGER_NODE_NAME);
+			await n8n.ndv.clickBackToCanvasButton();
+			await n8n.canvas.addNode(GMAIL_NODE_NAME, { action: 'Get many messages', closeNDV: false });
+
+			await n8n.ndv.clickCreateNewCredential();
+
+			await expect(n8n.canvas.credentialModal.getModal()).toBeVisible();
+
+			const assistantButton = n8n.aiAssistant.getCredentialEditAssistantButton().locator('button');
+			await expect(assistantButton).toBeVisible();
+			await assistantButton.click();
+
+			await expect(n8n.aiAssistant.getChatMessagesUser()).toHaveCount(1);
+			await expect(n8n.aiAssistant.getChatMessagesUser().first()).toContainText(
+				'How do I set up the credentials for Gmail OAuth2 API?',
+			);
+			await expect(n8n.aiAssistant.getChatMessagesAssistant().first()).toContainText(
+				'Hey, this is an assistant message',
+			);
+			await expect(assistantButton).toBeDisabled();
+		});
+
+		test('should start credential help from credential list', async ({
+			n8n,
+			setupRequirements,
+		}) => {
+			await setupRequirements(aiEnabledWithSimpleChatRequirements);
+
+			await n8n.navigate.toCredentials();
+
+			await n8n.workflows.addResource.credential();
+			await n8n.credentials.selectCredentialType('Notion API');
+
+			const assistantButton = n8n.aiAssistant.getCredentialEditAssistantButton().locator('button');
+			await expect(assistantButton).toBeVisible();
+			await assistantButton.click();
+
+			await expect(n8n.aiAssistant.getChatMessagesUser()).toHaveCount(1);
+			await expect(n8n.aiAssistant.getChatMessagesUser().first()).toContainText(
+				'How do I set up the credentials for Notion API?',
+			);
+			await expect(n8n.aiAssistant.getChatMessagesAssistant().first()).toContainText(
+				'Hey, this is an assistant message',
+			);
+			await expect(assistantButton).toBeDisabled();
+		});
+
+		test('should not show assistant button if click to connect', async ({
+			n8n,
+			setupRequirements,
+		}) => {
+			await setupRequirements(aiEnabledRequirements);
+
+			await n8n.page.route('**/types/credentials.json', async (route) => {
+				const response = await route.fetch();
+				const credentials = (await response.json()) as Array<
+					{ name?: string } & Record<string, unknown>
+				>;
+				const index = credentials.findIndex((c) => c.name === 'slackOAuth2Api');
+				if (index >= 0) {
+					credentials[index] = {
+						...credentials[index],
+						__overwrittenProperties: ['clientId', 'clientSecret'],
+					};
+				}
+				await route.fulfill({
+					status: 200,
+					contentType: 'application/json',
+					body: JSON.stringify(credentials),
+				});
+			});
+
+			await n8n.page.goto('/workflow/new');
+			await n8n.canvas.addInitialNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
+			await n8n.canvas.addNode('Slack', { action: 'Get a channel' });
+
+			await n8n.ndv.clickCreateNewCredential();
+
+			const authOptions = n8n.canvas.credentialModal.getAuthTypeRadioButtons();
+			await authOptions.first().click();
+
+			await expect(n8n.canvas.credentialModal.oauthConnectButton).toHaveCount(1);
+			await expect(n8n.canvas.credentialModal.getCredentialInputs()).toHaveCount(2);
+			await expect(n8n.aiAssistant.getCredentialEditAssistantButton()).toHaveCount(0);
+
+			await authOptions.nth(1).click();
+			await expect(n8n.canvas.credentialModal.getCredentialInputs()).toHaveCount(4);
+			await expect(n8n.aiAssistant.getCredentialEditAssistantButton()).toHaveCount(1);
+		});
+
+		test('should not show assistant button when click to connect with some fields', async ({
+			n8n,
+			setupRequirements,
+		}) => {
+			await setupRequirements(aiEnabledRequirements);
+
+			await n8n.page.route('**/types/credentials.json', async (route) => {
+				const response = await route.fetch();
+				const credentials = (await response.json()) as Array<
+					{ name?: string } & Record<string, unknown>
+				>;
+				const index = credentials.findIndex((c) => c.name === 'microsoftOutlookOAuth2Api');
+				if (index >= 0) {
+					credentials[index] = {
+						...credentials[index],
+						__overwrittenProperties: ['authUrl', 'accessTokenUrl', 'clientId', 'clientSecret'],
+					};
+				}
+				await route.fulfill({
+					status: 200,
+					contentType: 'application/json',
+					body: JSON.stringify(credentials),
+				});
+			});
+
+			await n8n.page.goto('/workflow/new');
+			await n8n.canvas.addInitialNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
+			await n8n.canvas.addNode('Microsoft Outlook', { action: 'Get a calendar' });
+
+			await n8n.ndv.clickCreateNewCredential();
+
+			await expect(n8n.canvas.credentialModal.oauthConnectButton).toHaveCount(1);
+			await expect(n8n.canvas.credentialModal.getCredentialInputs()).toHaveCount(2);
+			await expect(n8n.aiAssistant.getCredentialEditAssistantButton()).toHaveCount(0);
+		});
+	});
+});
diff --git a/packages/testing/playwright/tests/ui/ai/assistant-support-chat.spec.ts b/packages/testing/playwright/tests/ui/ai/assistant-support-chat.spec.ts
new file mode 100644
index 00000000000..ff9d50f7890
--- /dev/null
+++ b/packages/testing/playwright/tests/ui/ai/assistant-support-chat.spec.ts
@@ -0,0 +1,114 @@
+import {
+	simpleAssistantResponse,
+	aiEnabledWithCodeSnippetRequirements,
+	aiEnabledWithHttpWorkflowRequirements,
+} from '../../../config/ai-assistant-fixtures';
+import { HTTP_REQUEST_NODE_NAME } from '../../../config/constants';
+import { test, expect } from '../../../fixtures/base';
+
+type ChatRequestBody = {
+	payload?: {
+		type?: string;
+		text?: string;
+		question?: string;
+		context?: Record<string, unknown>;
+	};
+};
+
+test.describe('AI Assistant::enabled', () => {
+	test.describe('Support Chat', () => {
+		test('assistant returns code snippet', async ({ n8n, setupRequirements }) => {
+			await setupRequirements(aiEnabledWithCodeSnippetRequirements);
+			await n8n.page.goto('/workflow/new');
+
+			await expect(n8n.aiAssistant.getAskAssistantCanvasActionButton()).toBeVisible();
+			await n8n.aiAssistant.getAskAssistantCanvasActionButton().click();
+
+			await expect(n8n.aiAssistant.getAskAssistantChat()).toBeVisible();
+
+			await n8n.aiAssistant.sendMessage('Show me an expression');
+
+			await expect(n8n.aiAssistant.getChatMessagesAll()).toHaveCount(3);
+			await expect(n8n.aiAssistant.getChatMessagesUser().first()).toContainText(
+				'Show me an expression',
+			);
+			await expect(n8n.aiAssistant.getChatMessagesAssistant().first()).toContainText(
+				'To use expressions in n8n, follow these steps:',
+			);
+			await expect(n8n.aiAssistant.getChatMessagesAssistant().first()).toContainText('New York');
+			await expect(n8n.aiAssistant.getCodeSnippet()).toHaveText('{{$json.body.city}}');
+		});
+
+		test('should send current context to support chat', async ({ n8n, setupRequirements }) => {
+			await setupRequirements(aiEnabledWithHttpWorkflowRequirements);
+
+			const chatRequests: ChatRequestBody[] = [];
+			await n8n.page.route('**/rest/ai/chat', async (route) => {
+				const body = route.request().postDataJSON() as ChatRequestBody;
+				chatRequests.push(body);
+				await route.fulfill({
+					status: 200,
+					contentType: 'application/json',
+					body: JSON.stringify(simpleAssistantResponse),
+				});
+			});
+
+			await n8n.aiAssistant.getAskAssistantCanvasActionButton().click();
+			await n8n.aiAssistant.sendMessage('What is wrong with this workflow?');
+
+			const supportRequest = chatRequests.find(
+				(request) => request.payload?.question === 'What is wrong with this workflow?',
+			);
+			expect(supportRequest).toBeDefined();
+			const supportContext = supportRequest?.payload?.context;
+			expect(supportContext).toBeDefined();
+			expect(supportContext?.currentView).toBeDefined();
+			expect(supportContext?.currentWorkflow).toBeDefined();
+		});
+
+		test('should not send workflow context if nothing changed', async ({
+			n8n,
+			setupRequirements,
+		}) => {
+			await setupRequirements(aiEnabledWithHttpWorkflowRequirements);
+
+			const chatRequests: ChatRequestBody[] = [];
+			await n8n.page.route('**/rest/ai/chat', async (route) => {
+				const body = route.request().postDataJSON() as ChatRequestBody;
+				chatRequests.push(body);
+				await route.fulfill({
+					status: 200,
+					contentType: 'application/json',
+					body: JSON.stringify(simpleAssistantResponse),
+				});
+			});
+
+			await n8n.aiAssistant.getAskAssistantCanvasActionButton().click();
+
+			await n8n.aiAssistant.sendMessage('What is wrong with this workflow?', 'enter-key');
+			// Wait for message to be processed
+			await expect(n8n.aiAssistant.getChatMessagesAssistant()).toHaveCount(1);
+
+			await n8n.aiAssistant.sendMessage('And now?', 'enter-key');
+			await expect(n8n.aiAssistant.getChatMessagesAssistant()).toHaveCount(2);
+			const secondRequest = chatRequests.find((request) => request.payload?.text === 'And now?');
+			const secondContext = secondRequest?.payload?.context;
+			expect(secondContext?.currentWorkflow).toBeUndefined();
+
+			await n8n.canvas.openNode(HTTP_REQUEST_NODE_NAME);
+			await n8n.ndv.setParameterInputValue('url', 'https://example.com');
+			await n8n.ndv.close();
+			await n8n.canvas.clickExecuteWorkflowButton();
+
+			await n8n.aiAssistant.sendMessage('What about now?', 'enter-key');
+			await expect(n8n.aiAssistant.getChatMessagesAssistant()).toHaveCount(3);
+
+			const thirdRequest = chatRequests.find(
+				(request) => request.payload?.text === 'What about now?',
+			);
+			const thirdContext = thirdRequest?.payload?.context;
+			expect(thirdContext?.currentWorkflow).toBeTruthy();
+			expect(thirdContext?.executionData).toBeTruthy();
+		});
+	});
+});
diff --git a/packages/testing/playwright/tests/ui/chat-session-id-reset.spec.ts b/packages/testing/playwright/tests/ui/ai/chat-session.spec.ts
similarity index 97%
rename from packages/testing/playwright/tests/ui/chat-session-id-reset.spec.ts
rename to packages/testing/playwright/tests/ui/ai/chat-session.spec.ts
index abadbe848c0..aa77ff5d367 100644
--- a/packages/testing/playwright/tests/ui/chat-session-id-reset.spec.ts
+++ b/packages/testing/playwright/tests/ui/ai/chat-session.spec.ts
@@ -1,4 +1,4 @@
-import { test, expect } from '../../fixtures/base';
+import { test, expect } from '../../../fixtures/base';
 
 test.describe('Chat session ID reset', () => {
 	test.beforeEach(async ({ n8n }) => {
diff --git a/packages/testing/playwright/tests/ui/evaluations.spec.ts b/packages/testing/playwright/tests/ui/ai/evaluations.spec.ts
similarity index 98%
rename from packages/testing/playwright/tests/ui/evaluations.spec.ts
rename to packages/testing/playwright/tests/ui/ai/evaluations.spec.ts
index 83456021ba5..f0c0074e984 100644
--- a/packages/testing/playwright/tests/ui/evaluations.spec.ts
+++ b/packages/testing/playwright/tests/ui/ai/evaluations.spec.ts
@@ -1,4 +1,4 @@
-import { expect, test } from '../../fixtures/base';
+import { expect, test } from '../../../fixtures/base';
 
 test.use({
 	addContainerCapability: {
diff --git a/packages/testing/playwright/tests/ui/ai/langchain-agents.spec.ts b/packages/testing/playwright/tests/ui/ai/langchain-agents.spec.ts
new file mode 100644
index 00000000000..4c1533e8fd8
--- /dev/null
+++ b/packages/testing/playwright/tests/ui/ai/langchain-agents.spec.ts
@@ -0,0 +1,244 @@
+import {
+	AGENT_NODE_NAME,
+	EDIT_FIELDS_SET_NODE_NAME,
+	AI_LANGUAGE_MODEL_OPENAI_CHAT_MODEL_NODE_NAME,
+	AI_MEMORY_WINDOW_BUFFER_MEMORY_NODE_NAME,
+	AI_TOOL_CALCULATOR_NODE_NAME,
+	AI_OUTPUT_PARSER_AUTO_FIXING_NODE_NAME,
+	AI_TOOL_CODE_NODE_NAME,
+	AI_TOOL_WIKIPEDIA_NODE_NAME,
+	SCHEDULE_TRIGGER_NODE_NAME,
+} from '../../../config/constants';
+import { test, expect } from '../../../fixtures/base';
+import type { n8nPage } from '../../../pages/n8nPage';
+
+// Helper functions for common operations
+async function addOpenAILanguageModelWithCredentials(
+	n8n: n8nPage,
+	parentNode: string,
+	options: { exactMatch?: boolean; closeNDV?: boolean } = { exactMatch: true, closeNDV: false },
+) {
+	await n8n.canvas.addSupplementalNodeToParent(
+		AI_LANGUAGE_MODEL_OPENAI_CHAT_MODEL_NODE_NAME,
+		'ai_languageModel',
+		parentNode,
+		options,
+	);
+
+	await n8n.credentialsComposer.createFromNdv({
+		apiKey: 'abcd',
+	});
+	await n8n.ndv.clickBackToCanvasButton();
+}
+
+async function waitForWorkflowSuccess(n8n: n8nPage, timeout = 3000) {
+	await n8n.notifications.waitForNotificationAndClose('Workflow executed successfully', {
+		timeout,
+	});
+}
+
+async function executeChatAndWaitForResponse(n8n: n8nPage, message: string) {
+	await n8n.canvas.logsPanel.sendManualChatMessage(message);
+	await waitForWorkflowSuccess(n8n);
+}
+
+async function verifyChatMessages(n8n: n8nPage, expectedCount: number, inputMessage?: string) {
+	const messages = n8n.canvas.getManualChatMessages();
+	await expect(messages).toHaveCount(expectedCount);
+	if (inputMessage) {
+		await expect(messages.first()).toContainText(inputMessage);
+	}
+	await expect(messages.last()).toBeVisible();
+	return messages;
+}
+
+async function verifyLogsPanelEntries(n8n: n8nPage, expectedEntries: string[]) {
+	await expect(n8n.canvas.logsPanel.getLogEntries().first()).toBeVisible();
+	await expect(n8n.canvas.logsPanel.getLogEntries()).toHaveCount(expectedEntries.length);
+	for (let i = 0; i < expectedEntries.length; i++) {
+		await expect(n8n.canvas.logsPanel.getLogEntries().nth(i)).toHaveText(expectedEntries[i]);
+	}
+}
+
+async function setupBasicAgentWorkflow(n8n: n8nPage, additionalNodes: string[] = []) {
+	await n8n.canvas.addNode(AGENT_NODE_NAME, { closeNDV: true });
+
+	// Add additional nodes if specified
+	for (const nodeName of additionalNodes) {
+		await n8n.canvas.addSupplementalNodeToParent(nodeName, 'ai_tool', AGENT_NODE_NAME, {
+			closeNDV: true,
+		});
+	}
+
+	// Always add OpenAI Language Model
+	await addOpenAILanguageModelWithCredentials(n8n, AGENT_NODE_NAME);
+}
+
+test.use({
+	addContainerCapability: {
+		proxyServerEnabled: true,
+	},
+});
+test.describe('Langchain Integration @capability:proxy', () => {
+	test.beforeEach(async ({ n8n, proxyServer }) => {
+		await proxyServer.clearAllExpectations();
+		await proxyServer.loadExpectations('langchain');
+		await n8n.canvas.openNewWorkflow();
+	});
+
+	test.describe('Workflow Execution Behavior', () => {
+		test('should not open chat modal', async ({ n8n }) => {
+			await n8n.canvas.addNode(EDIT_FIELDS_SET_NODE_NAME, { closeNDV: true });
+
+			await n8n.canvas.addNode(AGENT_NODE_NAME, { closeNDV: true });
+
+			await n8n.canvas.addSupplementalNodeToParent(
+				AI_LANGUAGE_MODEL_OPENAI_CHAT_MODEL_NODE_NAME,
+				'ai_languageModel',
+				AGENT_NODE_NAME,
+				{ exactMatch: true, closeNDV: true },
+			);
+
+			await n8n.canvas.clickExecuteWorkflowButton();
+			await expect(n8n.canvas.getManualChatModal()).toBeHidden();
+		});
+
+		test('should remove test workflow button', async ({ n8n }) => {
+			await n8n.canvas.addNode(SCHEDULE_TRIGGER_NODE_NAME, { closeNDV: true });
+
+			await n8n.canvas.addNode(EDIT_FIELDS_SET_NODE_NAME, { closeNDV: true });
+
+			await n8n.canvas.addNode(AGENT_NODE_NAME, { closeNDV: true });
+
+			await n8n.canvas.addSupplementalNodeToParent(
+				AI_LANGUAGE_MODEL_OPENAI_CHAT_MODEL_NODE_NAME,
+				'ai_languageModel',
+				AGENT_NODE_NAME,
+				{ exactMatch: true, closeNDV: true },
+			);
+
+			await n8n.canvas.disableNodeFromContextMenu(SCHEDULE_TRIGGER_NODE_NAME);
+			await expect(n8n.canvas.getExecuteWorkflowButton()).toBeHidden();
+		});
+	});
+
+	test.describe('Node Connection and Configuration', () => {
+		test('should add nodes to all Agent node input types', async ({ n8n }) => {
+			const agentSubNodes = [
+				AI_LANGUAGE_MODEL_OPENAI_CHAT_MODEL_NODE_NAME,
+				AI_MEMORY_WINDOW_BUFFER_MEMORY_NODE_NAME,
+				AI_TOOL_CALCULATOR_NODE_NAME,
+				AI_OUTPUT_PARSER_AUTO_FIXING_NODE_NAME,
+			];
+			await n8n.canvas.addNode(AGENT_NODE_NAME, { closeNDV: false });
+
+			await n8n.ndv.checkParameterCheckboxInputByName('hasOutputParser');
+			await n8n.ndv.clickBackToCanvasButton();
+			await n8n.canvas.addSupplementalNodeToParent(
+				AI_LANGUAGE_MODEL_OPENAI_CHAT_MODEL_NODE_NAME,
+				'ai_languageModel',
+				AGENT_NODE_NAME,
+				{ exactMatch: true, closeNDV: true },
+			);
+
+			await n8n.canvas.addSupplementalNodeToParent(
+				AI_MEMORY_WINDOW_BUFFER_MEMORY_NODE_NAME,
+				'ai_memory',
+				AGENT_NODE_NAME,
+				{ closeNDV: true },
+			);
+
+			await n8n.canvas.addSupplementalNodeToParent(
+				AI_TOOL_CALCULATOR_NODE_NAME,
+				'ai_tool',
+				AGENT_NODE_NAME,
+				{ closeNDV: true },
+			);
+
+			await n8n.canvas.addSupplementalNodeToParent(
+				AI_OUTPUT_PARSER_AUTO_FIXING_NODE_NAME,
+				'ai_outputParser',
+				AGENT_NODE_NAME,
+				{ closeNDV: true },
+			);
+			for (const nodeName of agentSubNodes) {
+				await expect(n8n.canvas.connectionBetweenNodes(nodeName, AGENT_NODE_NAME)).toBeAttached();
+			}
+			await expect(n8n.canvas.getCanvasNodes()).toHaveCount(2 + agentSubNodes.length); // Chat Trigger + Agent + 4 inputs
+		});
+
+		test('should add multiple tool nodes to Agent node tool input type', async ({ n8n }) => {
+			await n8n.canvas.addNode(AGENT_NODE_NAME, { closeNDV: true });
+
+			const tools = [
+				AI_TOOL_CALCULATOR_NODE_NAME,
+				AI_TOOL_CODE_NODE_NAME,
+				AI_TOOL_CODE_NODE_NAME,
+				AI_TOOL_WIKIPEDIA_NODE_NAME,
+			];
+
+			for (const tool of tools) {
+				await n8n.canvas.addSupplementalNodeToParent(tool, 'ai_tool', AGENT_NODE_NAME, {
+					closeNDV: true,
+				});
+				await expect(n8n.canvas.connectionBetweenNodes(tool, AGENT_NODE_NAME)).toBeAttached();
+			}
+
+			// Chat Trigger + Agent + Tools
+			await expect(n8n.canvas.getCanvasNodes()).toHaveCount(2 + tools.length);
+		});
+	});
+
+	test.describe('Chat Execution and Interaction', () => {
+		test('should be able to open and execute Agent node', async ({ n8n }) => {
+			await setupBasicAgentWorkflow(n8n);
+
+			const inputMessage = 'Hello!';
+			await n8n.canvas.clickManualChatButton();
+			await executeChatAndWaitForResponse(n8n, inputMessage);
+
+			// Verify chat message appears
+			await expect(n8n.canvas.getManualChatLatestBotMessage()).toBeVisible();
+		});
+		test('should add and use Manual Chat Trigger node together with Agent node', async ({
+			n8n,
+		}) => {
+			await setupBasicAgentWorkflow(n8n);
+
+			const inputMessage = 'Hello!';
+			await n8n.canvas.clickManualChatButton();
+			await executeChatAndWaitForResponse(n8n, inputMessage);
+
+			await verifyChatMessages(n8n, 2, inputMessage);
+			await verifyLogsPanelEntries(n8n, [
+				'When chat message received',
+				'AI Agent',
+				'OpenAI Chat Model',
+			]);
+
+			await n8n.canvas.closeManualChatModal();
+			await expect(n8n.canvas.logsPanel.getLogEntries()).toBeHidden();
+			await expect(n8n.canvas.getManualChatInput()).toBeHidden();
+		});
+	});
+
+	test('should keep the same session when switching tabs', async ({ n8n }) => {
+		await n8n.start.fromImportedWorkflow('Test_workflow_chat_partial_execution.json');
+		await n8n.canvas.clickZoomToFitButton();
+
+		await n8n.canvas.logsPanel.open();
+
+		// Send a message
+		await n8n.canvas.logsPanel.sendManualChatMessage('Test');
+		await expect(n8n.canvas.getManualChatLatestBotMessage()).toContainText('this_my_field');
+
+		await n8n.canvas.clickExecutionsTab();
+
+		await n8n.canvas.clickEditorTab();
+		await expect(n8n.canvas.getManualChatLatestBotMessage()).toContainText('this_my_field');
+
+		// Refresh session
+		await n8n.page.getByTestId('refresh-session-button').click();
+		await expect(n8n.canvas.getManualChatMessages()).not.toBeAttached();
+	});
+});
diff --git a/packages/testing/playwright/tests/ui/ai/langchain-chains.spec.ts b/packages/testing/playwright/tests/ui/ai/langchain-chains.spec.ts
new file mode 100644
index 00000000000..71d7899ca9d
--- /dev/null
+++ b/packages/testing/playwright/tests/ui/ai/langchain-chains.spec.ts
@@ -0,0 +1,119 @@
+import {
+	AGENT_NODE_NAME,
+	AI_LANGUAGE_MODEL_OPENAI_CHAT_MODEL_NODE_NAME,
+	BASIC_LLM_CHAIN_NODE_NAME,
+	CHAT_TRIGGER_NODE_DISPLAY_NAME,
+	MANUAL_CHAT_TRIGGER_NODE_NAME,
+} from '../../../config/constants';
+import { test, expect } from '../../../fixtures/base';
+import type { n8nPage } from '../../../pages/n8nPage';
+
+// Helper functions for common operations
+async function addOpenAILanguageModelWithCredentials(
+	n8n: n8nPage,
+	parentNode: string,
+	options: { exactMatch?: boolean; closeNDV?: boolean } = { exactMatch: true, closeNDV: false },
+) {
+	await n8n.canvas.addSupplementalNodeToParent(
+		AI_LANGUAGE_MODEL_OPENAI_CHAT_MODEL_NODE_NAME,
+		'ai_languageModel',
+		parentNode,
+		options,
+	);
+
+	await n8n.credentialsComposer.createFromNdv({
+		apiKey: 'abcd',
+	});
+	await n8n.ndv.clickBackToCanvasButton();
+}
+
+async function waitForWorkflowSuccess(n8n: n8nPage, timeout = 3000) {
+	await n8n.notifications.waitForNotificationAndClose('Workflow executed successfully', {
+		timeout,
+	});
+}
+
+async function executeChatAndWaitForResponse(n8n: n8nPage, message: string) {
+	await n8n.canvas.logsPanel.sendManualChatMessage(message);
+	await waitForWorkflowSuccess(n8n);
+}
+
+test.use({
+	addContainerCapability: {
+		proxyServerEnabled: true,
+	},
+});
+test.describe('Langchain Integration @capability:proxy', () => {
+	test.beforeEach(async ({ n8n, proxyServer }) => {
+		await proxyServer.clearAllExpectations();
+		await proxyServer.loadExpectations('langchain');
+		await n8n.canvas.openNewWorkflow();
+	});
+
+	test.describe('Auto-add Behavior', () => {
+		test('should auto-add chat trigger and basic LLM chain when adding LLM node', async ({
+			n8n,
+		}) => {
+			await n8n.canvas.addNode(AI_LANGUAGE_MODEL_OPENAI_CHAT_MODEL_NODE_NAME, { closeNDV: true });
+
+			await expect(
+				n8n.canvas.connectionBetweenNodes(
+					CHAT_TRIGGER_NODE_DISPLAY_NAME,
+					BASIC_LLM_CHAIN_NODE_NAME,
+				),
+			).toBeAttached();
+
+			await expect(
+				n8n.canvas.connectionBetweenNodes(
+					AI_LANGUAGE_MODEL_OPENAI_CHAT_MODEL_NODE_NAME,
+					BASIC_LLM_CHAIN_NODE_NAME,
+				),
+			).toBeAttached();
+
+			await expect(n8n.canvas.getCanvasNodes()).toHaveCount(3);
+		});
+
+		test('should not auto-add nodes if AI nodes are already present', async ({ n8n }) => {
+			await n8n.canvas.addNode(AGENT_NODE_NAME, { closeNDV: true });
+
+			await n8n.canvas.addNode(AI_LANGUAGE_MODEL_OPENAI_CHAT_MODEL_NODE_NAME, { closeNDV: true });
+
+			await expect(
+				n8n.canvas.connectionBetweenNodes(CHAT_TRIGGER_NODE_DISPLAY_NAME, AGENT_NODE_NAME),
+			).toBeAttached();
+
+			await expect(n8n.canvas.getCanvasNodes()).toHaveCount(3);
+		});
+
+		test('should not auto-add nodes if ChatTrigger is already present', async ({ n8n }) => {
+			await n8n.canvas.addNode(MANUAL_CHAT_TRIGGER_NODE_NAME, { closeNDV: true });
+
+			await n8n.canvas.addNode(AGENT_NODE_NAME, { closeNDV: true });
+
+			await n8n.canvas.addNode(AI_LANGUAGE_MODEL_OPENAI_CHAT_MODEL_NODE_NAME, { closeNDV: true });
+
+			await expect(
+				n8n.canvas.connectionBetweenNodes(CHAT_TRIGGER_NODE_DISPLAY_NAME, AGENT_NODE_NAME),
+			).toBeAttached();
+
+			await expect(n8n.canvas.getCanvasNodes()).toHaveCount(3);
+		});
+	});
+
+	test.describe('Chat Execution and Interaction', () => {
+		test('should be able to open and execute Basic LLM Chain node', async ({ n8n }) => {
+			await n8n.canvas.addNode(BASIC_LLM_CHAIN_NODE_NAME, { closeNDV: true });
+
+			await addOpenAILanguageModelWithCredentials(n8n, BASIC_LLM_CHAIN_NODE_NAME);
+
+			await n8n.canvas.openNode(BASIC_LLM_CHAIN_NODE_NAME);
+			const inputMessage = 'Hello!';
+
+			await n8n.ndv.execute();
+			await executeChatAndWaitForResponse(n8n, inputMessage);
+
+			// Verify chat message appears
+			await expect(n8n.canvas.getManualChatLatestBotMessage()).toBeVisible();
+		});
+	});
+});
diff --git a/packages/testing/playwright/tests/ui/ai/langchain-memory.spec.ts b/packages/testing/playwright/tests/ui/ai/langchain-memory.spec.ts
new file mode 100644
index 00000000000..49e4bde048a
--- /dev/null
+++ b/packages/testing/playwright/tests/ui/ai/langchain-memory.spec.ts
@@ -0,0 +1,178 @@
+import {
+	AGENT_NODE_NAME,
+	AI_TOOL_CALCULATOR_NODE_NAME,
+	AI_MEMORY_POSTGRES_NODE_NAME,
+	AI_LANGUAGE_MODEL_OPENAI_CHAT_MODEL_NODE_NAME,
+	MANUAL_CHAT_TRIGGER_NODE_NAME,
+} from '../../../config/constants';
+import { test, expect } from '../../../fixtures/base';
+import type { n8nPage } from '../../../pages/n8nPage';
+
+// Helper functions for common operations
+async function addOpenAILanguageModelWithCredentials(
+	n8n: n8nPage,
+	parentNode: string,
+	options: { exactMatch?: boolean; closeNDV?: boolean } = { exactMatch: true, closeNDV: false },
+) {
+	await n8n.canvas.addSupplementalNodeToParent(
+		AI_LANGUAGE_MODEL_OPENAI_CHAT_MODEL_NODE_NAME,
+		'ai_languageModel',
+		parentNode,
+		options,
+	);
+
+	await n8n.credentialsComposer.createFromNdv({
+		apiKey: 'abcd',
+	});
+	await n8n.ndv.clickBackToCanvasButton();
+}
+
+async function waitForWorkflowSuccess(n8n: n8nPage, timeout = 3000) {
+	await n8n.notifications.waitForNotificationAndClose('Workflow executed successfully', {
+		timeout,
+	});
+}
+
+async function executeChatAndWaitForResponse(n8n: n8nPage, message: string) {
+	await n8n.canvas.logsPanel.sendManualChatMessage(message);
+	await waitForWorkflowSuccess(n8n);
+}
+
+async function verifyChatMessages(n8n: n8nPage, expectedCount: number, inputMessage?: string) {
+	const messages = n8n.canvas.getManualChatMessages();
+	await expect(messages).toHaveCount(expectedCount);
+	if (inputMessage) {
+		await expect(messages.first()).toContainText(inputMessage);
+	}
+	await expect(messages.last()).toBeVisible();
+	return messages;
+}
+
+test.use({
+	addContainerCapability: {
+		proxyServerEnabled: true,
+	},
+});
+test.describe('Langchain Integration @capability:proxy', () => {
+	test.beforeEach(async ({ n8n, proxyServer }) => {
+		await proxyServer.clearAllExpectations();
+		await proxyServer.loadExpectations('langchain');
+		await n8n.canvas.openNewWorkflow();
+	});
+
+	// Create a ticket for this for AI team to fix
+	// eslint-disable-next-line playwright/no-skipped-test
+	test.skip('Error Handling and Logs Display', () => {
+		// Helper function to set up the agent workflow with Postgres error configuration
+		async function setupAgentWorkflowWithPostgresError(n8n: n8nPage) {
+			await n8n.canvas.addNode(AGENT_NODE_NAME, { closeNDV: true });
+
+			// Add Calculator Tool (required for OpenAI model)
+			await n8n.canvas.addSupplementalNodeToParent(
+				AI_TOOL_CALCULATOR_NODE_NAME,
+				'ai_tool',
+				AGENT_NODE_NAME,
+				{ closeNDV: true },
+			);
+
+			// Add and configure Postgres Memory
+			await n8n.canvas.addSupplementalNodeToParent(
+				AI_MEMORY_POSTGRES_NODE_NAME,
+				'ai_memory',
+				AGENT_NODE_NAME,
+				{ closeNDV: false },
+			);
+
+			await n8n.credentialsComposer.createFromNdv({
+				password: 'testtesttest',
+			});
+
+			await n8n.ndv.getParameterInput('sessionIdType').click();
+			await n8n.page.getByRole('option', { name: 'Define below' }).click();
+			await n8n.ndv.getParameterInput('sessionKey').locator('input').fill('asdasd');
+			await n8n.ndv.clickBackToCanvasButton();
+
+			// Add and configure OpenAI Language Model
+			await addOpenAILanguageModelWithCredentials(n8n, AGENT_NODE_NAME);
+
+			await n8n.canvas.clickZoomToFitButton();
+		}
+
+		// Helper function to assert logs tab is active
+		async function assertLogsTabIsActive(n8n: n8nPage) {
+			await expect(n8n.ndv.getOutputDataContainer()).toBeVisible();
+			await expect(n8n.ndv.getAiOutputModeToggle()).toBeVisible();
+
+			const radioButtons = n8n.ndv.getAiOutputModeToggle().locator('[role="radio"]');
+			await expect(radioButtons).toHaveCount(2);
+			await expect(radioButtons.nth(1)).toHaveAttribute('aria-checked', 'true');
+		}
+
+		// Helper function to assert error message is visible
+		async function assertErrorMessageVisible(n8n: n8nPage) {
+			await expect(
+				n8n.ndv.getOutputPanel().getByTestId('node-error-message').first(),
+			).toBeVisible();
+			await expect(
+				n8n.ndv.getOutputPanel().getByTestId('node-error-message').first(),
+			).toContainText('Error in sub-node');
+		}
+
+		test('should open logs tab by default when there was an error', async ({ n8n }) => {
+			await setupAgentWorkflowWithPostgresError(n8n);
+
+			const inputMessage = 'Test the code tool';
+
+			// Execute workflow with chat trigger
+			await n8n.canvas.clickManualChatButton();
+			await executeChatAndWaitForResponse(n8n, inputMessage);
+
+			// Check that messages and logs are displayed
+			const messages = await verifyChatMessages(n8n, 2, inputMessage);
+			await expect(messages.last()).toContainText(
+				'[ERROR: The service refused the connection - perhaps it is offline]',
+			);
+
+			await expect(n8n.canvas.logsPanel.getLogEntries().first()).toBeVisible();
+			await expect(n8n.canvas.logsPanel.getLogEntries()).toHaveCount(3);
+			await expect(n8n.canvas.logsPanel.getSelectedLogEntry()).toHaveText('AI Agent');
+			await expect(n8n.canvas.logsPanel.outputPanel.get()).toContainText(
+				AI_MEMORY_POSTGRES_NODE_NAME,
+			);
+
+			await n8n.canvas.closeManualChatModal();
+
+			// Open the AI Agent node to see the logs
+			await n8n.canvas.openNode(AGENT_NODE_NAME);
+
+			// Assert that logs tab is active and error is displayed
+			await assertLogsTabIsActive(n8n);
+			await assertErrorMessageVisible(n8n);
+		});
+
+		test('should switch to logs tab on error, when NDV is already opened', async ({ n8n }) => {
+			// Remove the auto-added chat trigger
+			await n8n.canvas.addNode(MANUAL_CHAT_TRIGGER_NODE_NAME, { closeNDV: false });
+
+			// Set manual trigger to output standard pinned data
+			await n8n.ndv.getEditPinnedDataButton().click();
+			await n8n.ndv.savePinnedData();
+			await n8n.ndv.close();
+
+			// Set up the same workflow components but with manual trigger
+			await setupAgentWorkflowWithPostgresError(n8n);
+
+			// Open the AI Agent node
+			await n8n.canvas.openNode(AGENT_NODE_NAME);
+			await n8n.ndv.getParameterInput('promptType').click();
+			await n8n.page.getByRole('option', { name: 'Define below' }).click();
+			await n8n.ndv.getParameterInput('text').locator('textarea').fill('Some text');
+			await n8n.ndv.execute();
+			await waitForWorkflowSuccess(n8n);
+
+			// Assert that logs tab is active and error is displayed
+			await assertLogsTabIsActive(n8n);
+			await assertErrorMessageVisible(n8n);
+		});
+	});
+});
diff --git a/packages/testing/playwright/tests/ui/ai/langchain-tools.spec.ts b/packages/testing/playwright/tests/ui/ai/langchain-tools.spec.ts
new file mode 100644
index 00000000000..86ba1860b4b
--- /dev/null
+++ b/packages/testing/playwright/tests/ui/ai/langchain-tools.spec.ts
@@ -0,0 +1,111 @@
+import {
+	AGENT_NODE_NAME,
+	AI_TOOL_CALCULATOR_NODE_NAME,
+	AI_LANGUAGE_MODEL_OPENAI_CHAT_MODEL_NODE_NAME,
+	MANUAL_CHAT_TRIGGER_NODE_NAME,
+} from '../../../config/constants';
+import { test, expect } from '../../../fixtures/base';
+import type { n8nPage } from '../../../pages/n8nPage';
+
+// Helper functions for common operations
+async function addOpenAILanguageModelWithCredentials(
+	n8n: n8nPage,
+	parentNode: string,
+	options: { exactMatch?: boolean; closeNDV?: boolean } = { exactMatch: true, closeNDV: false },
+) {
+	await n8n.canvas.addSupplementalNodeToParent(
+		AI_LANGUAGE_MODEL_OPENAI_CHAT_MODEL_NODE_NAME,
+		'ai_languageModel',
+		parentNode,
+		options,
+	);
+
+	await n8n.credentialsComposer.createFromNdv({
+		apiKey: 'abcd',
+	});
+	await n8n.ndv.clickBackToCanvasButton();
+}
+
+async function waitForWorkflowSuccess(n8n: n8nPage, timeout = 3000) {
+	await n8n.notifications.waitForNotificationAndClose('Workflow executed successfully', {
+		timeout,
+	});
+}
+
+async function executeChatAndWaitForResponse(n8n: n8nPage, message: string) {
+	await n8n.canvas.logsPanel.sendManualChatMessage(message);
+	await waitForWorkflowSuccess(n8n);
+}
+
+async function setupBasicAgentWorkflow(n8n: n8nPage, additionalNodes: string[] = []) {
+	await n8n.canvas.addNode(AGENT_NODE_NAME, { closeNDV: true });
+
+	// Add additional nodes if specified
+	for (const nodeName of additionalNodes) {
+		await n8n.canvas.addSupplementalNodeToParent(nodeName, 'ai_tool', AGENT_NODE_NAME, {
+			closeNDV: true,
+		});
+	}
+
+	// Always add OpenAI Language Model
+	await addOpenAILanguageModelWithCredentials(n8n, AGENT_NODE_NAME);
+}
+
+test.use({
+	addContainerCapability: {
+		proxyServerEnabled: true,
+	},
+});
+test.describe('Langchain Integration @capability:proxy', () => {
+	test.beforeEach(async ({ n8n, proxyServer }) => {
+		await proxyServer.clearAllExpectations();
+		await proxyServer.loadExpectations('langchain');
+		await n8n.canvas.openNewWorkflow();
+	});
+
+	// @AI team to look at this
+	// eslint-disable-next-line playwright/no-skipped-test
+	test.skip('Tool Usage Notifications', () => {
+		test('should show tool info notice if no existing tools were used during execution', async ({
+			n8n,
+		}) => {
+			await setupBasicAgentWorkflow(n8n, [AI_TOOL_CALCULATOR_NODE_NAME]);
+			await n8n.canvas.openNode(AGENT_NODE_NAME);
+
+			const inputMessage = 'Hello!';
+			await n8n.ndv.execute();
+			await executeChatAndWaitForResponse(n8n, inputMessage);
+
+			await n8n.canvas.closeManualChatModal();
+			await n8n.canvas.openNode(AGENT_NODE_NAME);
+
+			await expect(n8n.ndv.getRunDataInfoCallout()).toBeVisible();
+		});
+		test('should not show tool info notice if tools were used during execution', async ({
+			n8n,
+		}) => {
+			await n8n.canvas.addNode(MANUAL_CHAT_TRIGGER_NODE_NAME, { closeNDV: true });
+			await n8n.canvas.addNode(AGENT_NODE_NAME, { closeNDV: false });
+			await expect(n8n.ndv.getRunDataInfoCallout()).toBeHidden();
+			await n8n.ndv.clickBackToCanvasButton();
+
+			await addOpenAILanguageModelWithCredentials(n8n, AGENT_NODE_NAME);
+
+			await n8n.canvas.addSupplementalNodeToParent(
+				AI_TOOL_CALCULATOR_NODE_NAME,
+				'ai_tool',
+				AGENT_NODE_NAME,
+				{ closeNDV: true },
+			);
+
+			const inputMessage = 'What is 1000 * 10?';
+			await n8n.canvas.clickManualChatButton();
+			await executeChatAndWaitForResponse(n8n, inputMessage);
+
+			await n8n.canvas.closeManualChatModal();
+			await n8n.canvas.openNode(AGENT_NODE_NAME);
+
+			await expect(n8n.ndv.getRunDataInfoCallout()).toBeHidden();
+		});
+	});
+});
diff --git a/packages/testing/playwright/tests/ui/ai/langchain-vectorstores.spec.ts b/packages/testing/playwright/tests/ui/ai/langchain-vectorstores.spec.ts
new file mode 100644
index 00000000000..e1ef48947dd
--- /dev/null
+++ b/packages/testing/playwright/tests/ui/ai/langchain-vectorstores.spec.ts
@@ -0,0 +1,109 @@
+import { test, expect } from '../../../fixtures/base';
+import type { n8nPage } from '../../../pages/n8nPage';
+
+// Helper functions for common operations
+async function waitForWorkflowSuccess(n8n: n8nPage, timeout = 3000) {
+	await n8n.notifications.waitForNotificationAndClose('Workflow executed successfully', {
+		timeout,
+	});
+}
+
+test.use({
+	addContainerCapability: {
+		proxyServerEnabled: true,
+	},
+});
+test.describe('Langchain Integration @capability:proxy', () => {
+	test.beforeEach(async ({ n8n, proxyServer }) => {
+		await proxyServer.clearAllExpectations();
+		await proxyServer.loadExpectations('langchain');
+		await n8n.canvas.openNewWorkflow();
+	});
+
+	test.describe('Advanced Workflow Features', () => {
+		test('should render runItems for sub-nodes and allow switching between them', async ({
+			n8n,
+		}) => {
+			await n8n.start.fromImportedWorkflow('In_memory_vector_store_fake_embeddings.json');
+			await n8n.canvas.clickZoomToFitButton();
+			await n8n.canvas.deselectAll();
+
+			await n8n.canvas.executeNode('Populate VS');
+			await waitForWorkflowSuccess(n8n);
+
+			const assertInputOutputTextExists = async (text: string) => {
+				await expect(n8n.ndv.getOutputPanel()).toContainText(text);
+				await expect(n8n.ndv.getInputPanel()).toContainText(text);
+			};
+
+			const assertInputOutputTextNotExists = async (text: string) => {
+				await expect(n8n.ndv.getOutputPanel()).not.toContainText(text);
+				await expect(n8n.ndv.getInputPanel()).not.toContainText(text);
+			};
+
+			await n8n.canvas.openNode('Character Text Splitter');
+
+			await expect(n8n.ndv.getOutputRunSelector()).toBeVisible();
+			await expect(n8n.ndv.getInputRunSelector()).toBeVisible();
+			await expect(n8n.ndv.getInputRunSelectorInput()).toHaveValue('3 of 3');
+			await expect(n8n.ndv.getOutputRunSelectorInput()).toHaveValue('3 of 3');
+			await assertInputOutputTextExists('Kyiv');
+			await assertInputOutputTextNotExists('Berlin');
+			await assertInputOutputTextNotExists('Prague');
+
+			await n8n.ndv.changeOutputRunSelector('2 of 3');
+			await assertInputOutputTextExists('Berlin');
+			await assertInputOutputTextNotExists('Kyiv');
+			await assertInputOutputTextNotExists('Prague');
+
+			await n8n.ndv.changeOutputRunSelector('1 of 3');
+			await assertInputOutputTextExists('Prague');
+			await assertInputOutputTextNotExists('Berlin');
+			await assertInputOutputTextNotExists('Kyiv');
+
+			await n8n.ndv.toggleInputRunLinking();
+			await n8n.ndv.changeOutputRunSelector('2 of 3');
+			await expect(n8n.ndv.getInputRunSelectorInput()).toHaveValue('1 of 3');
+			await expect(n8n.ndv.getOutputRunSelectorInput()).toHaveValue('2 of 3');
+			await expect(n8n.ndv.getInputPanel()).toContainText('Prague');
+			await expect(n8n.ndv.getInputPanel()).not.toContainText('Berlin');
+
+			await expect(n8n.ndv.getOutputPanel()).toContainText('Berlin');
+			await expect(n8n.ndv.getOutputPanel()).not.toContainText('Prague');
+
+			await n8n.ndv.toggleInputRunLinking();
+			await expect(n8n.ndv.getInputRunSelectorInput()).toHaveValue('1 of 3');
+			await expect(n8n.ndv.getOutputRunSelectorInput()).toHaveValue('1 of 3');
+			await assertInputOutputTextExists('Prague');
+			await assertInputOutputTextNotExists('Berlin');
+			await assertInputOutputTextNotExists('Kyiv');
+		});
+
+		test('should execute up to Node 1 when using partial execution', async ({ n8n }) => {
+			await n8n.start.fromImportedWorkflow('Test_workflow_chat_partial_execution.json');
+			await n8n.canvas.clickZoomToFitButton();
+
+			// Check that chat modal is not initially visible
+			await expect(n8n.canvas.getManualChatModal().locator('main')).toBeHidden();
+
+			// Open Node 1 and execute it
+			await n8n.canvas.openNode('Node 1');
+			await n8n.ndv.execute();
+			// Chat modal should now be visible
+			await expect(n8n.canvas.getManualChatModal().locator('main')).toBeVisible();
+
+			// Send first message
+			await n8n.canvas.logsPanel.sendManualChatMessage('Test');
+			await expect(n8n.canvas.getManualChatLatestBotMessage()).toContainText('this_my_field_1');
+
+			// Refresh session
+			await n8n.page.getByTestId('refresh-session-button').click();
+			await expect(n8n.canvas.getManualChatMessages()).not.toBeAttached();
+
+			// Send another message
+			await n8n.canvas.logsPanel.sendManualChatMessage('Another test');
+			await expect(n8n.canvas.getManualChatLatestBotMessage()).toContainText('this_my_field_3');
+			await expect(n8n.canvas.getManualChatLatestBotMessage()).toContainText('this_my_field_4');
+		});
+	});
+});
diff --git a/packages/testing/playwright/tests/ui/52-rag-callout-experiment.spec.ts b/packages/testing/playwright/tests/ui/ai/rag-callout.spec.ts
similarity index 95%
rename from packages/testing/playwright/tests/ui/52-rag-callout-experiment.spec.ts
rename to packages/testing/playwright/tests/ui/ai/rag-callout.spec.ts
index afe115d40db..fa11ec195b9 100644
--- a/packages/testing/playwright/tests/ui/52-rag-callout-experiment.spec.ts
+++ b/packages/testing/playwright/tests/ui/ai/rag-callout.spec.ts
@@ -1,4 +1,4 @@
-import { test, expect } from '../../fixtures/base';
+import { test, expect } from '../../../fixtures/base';
 
 test.describe('RAG callout experiment', () => {
 	test.describe('NDV callout', () => {
diff --git a/packages/testing/playwright/tests/ui/55-workflow-builder.spec.ts b/packages/testing/playwright/tests/ui/ai/workflow-builder.spec.ts
similarity index 95%
rename from packages/testing/playwright/tests/ui/55-workflow-builder.spec.ts
rename to packages/testing/playwright/tests/ui/ai/workflow-builder.spec.ts
index 18a051255a2..1d3772a0eba 100644
--- a/packages/testing/playwright/tests/ui/55-workflow-builder.spec.ts
+++ b/packages/testing/playwright/tests/ui/ai/workflow-builder.spec.ts
@@ -1,6 +1,6 @@
-import { workflowBuilderEnabledRequirements } from '../../config/ai-builder-fixtures';
-import { test, expect } from '../../fixtures/base';
-import type { n8nPage } from '../../pages/n8nPage';
+import { workflowBuilderEnabledRequirements } from '../../../config/ai-builder-fixtures';
+import { test, expect } from '../../../fixtures/base';
+import type { n8nPage } from '../../../pages/n8nPage';
 
 // Helper to open workflow builder and click a specific suggestion pill
 async function openBuilderAndClickSuggestion(n8n: n8nPage, suggestionText: string) {

From 6e77f0eb8148f799d9b9c3af60bc62f565a97d33 Mon Sep 17 00:00:00 2001
From: Declan Carroll <declan@n8n.io>
Date: Thu, 4 Dec 2025 21:23:59 +0000
Subject: [PATCH 069/167] ci: GH bot has a bypass for our CLA (#22773)

---
 .github/workflows/update-node-popularity.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/update-node-popularity.yml b/.github/workflows/update-node-popularity.yml
index d8a46bcf652..9f42729310b 100644
--- a/.github/workflows/update-node-popularity.yml
+++ b/.github/workflows/update-node-popularity.yml
@@ -56,5 +56,5 @@ jobs:
           branch: update-node-popularity
           base: master
           delete-branch: true
-          author: n8n Bot <191478365+n8n-bot@users.noreply.github.com>
-          committer: n8n Bot <191478365+n8n-bot@users.noreply.github.com>
+          author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
+          committer: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

From e219e7e9151aaf62c479d22fb6d0642ed914ff9f Mon Sep 17 00:00:00 2001
From: Artem Sorokin <38620398+seemewalkin@users.noreply.github.com>
Date: Thu, 4 Dec 2025 23:01:55 +0100
Subject: [PATCH 070/167] test: Move auth tests to separate folder (#22726)

---
 .../admin-smoke.spec.ts}                                       | 2 +-
 .../playwright/tests/ui/{ => auth}/authenticated.spec.ts       | 2 +-
 .../password-reset.spec.ts}                                    | 2 +-
 packages/testing/playwright/tests/ui/auth/signin.spec.ts       | 3 +++
 4 files changed, 6 insertions(+), 3 deletions(-)
 rename packages/testing/playwright/tests/ui/{35-admin-user-smoke-test.spec.ts => auth/admin-smoke.spec.ts} (89%)
 rename packages/testing/playwright/tests/ui/{ => auth}/authenticated.spec.ts (91%)
 rename packages/testing/playwright/tests/ui/{31-mail-cli-transactional.spec.ts => auth/password-reset.spec.ts} (88%)

diff --git a/packages/testing/playwright/tests/ui/35-admin-user-smoke-test.spec.ts b/packages/testing/playwright/tests/ui/auth/admin-smoke.spec.ts
similarity index 89%
rename from packages/testing/playwright/tests/ui/35-admin-user-smoke-test.spec.ts
rename to packages/testing/playwright/tests/ui/auth/admin-smoke.spec.ts
index f01dea18b74..0bb56d79974 100644
--- a/packages/testing/playwright/tests/ui/35-admin-user-smoke-test.spec.ts
+++ b/packages/testing/playwright/tests/ui/auth/admin-smoke.spec.ts
@@ -1,4 +1,4 @@
-import { test, expect } from '../../fixtures/base';
+import { test, expect } from '../../../fixtures/base';
 
 test.describe('Admin user', () => {
 	test('should see same Settings sub menu items as instance owner', async ({ n8n }) => {
diff --git a/packages/testing/playwright/tests/ui/authenticated.spec.ts b/packages/testing/playwright/tests/ui/auth/authenticated.spec.ts
similarity index 91%
rename from packages/testing/playwright/tests/ui/authenticated.spec.ts
rename to packages/testing/playwright/tests/ui/auth/authenticated.spec.ts
index 611a7b77f14..1e2b14cf4db 100644
--- a/packages/testing/playwright/tests/ui/authenticated.spec.ts
+++ b/packages/testing/playwright/tests/ui/auth/authenticated.spec.ts
@@ -1,4 +1,4 @@
-import { test, expect } from '../../fixtures/base';
+import { test, expect } from '../../../fixtures/base';
 
 test.describe('Authentication', () => {
 	const testCases = [
diff --git a/packages/testing/playwright/tests/ui/31-mail-cli-transactional.spec.ts b/packages/testing/playwright/tests/ui/auth/password-reset.spec.ts
similarity index 88%
rename from packages/testing/playwright/tests/ui/31-mail-cli-transactional.spec.ts
rename to packages/testing/playwright/tests/ui/auth/password-reset.spec.ts
index c7f37e26684..87c669a8c07 100644
--- a/packages/testing/playwright/tests/ui/31-mail-cli-transactional.spec.ts
+++ b/packages/testing/playwright/tests/ui/auth/password-reset.spec.ts
@@ -1,4 +1,4 @@
-import { test, expect } from '../../fixtures/base';
+import { test, expect } from '../../../fixtures/base';
 
 test.use({ addContainerCapability: { email: true } });
 
diff --git a/packages/testing/playwright/tests/ui/auth/signin.spec.ts b/packages/testing/playwright/tests/ui/auth/signin.spec.ts
index fa59e012597..2cf33623c02 100644
--- a/packages/testing/playwright/tests/ui/auth/signin.spec.ts
+++ b/packages/testing/playwright/tests/ui/auth/signin.spec.ts
@@ -4,11 +4,14 @@ import { test, expect } from '../../../fixtures/base';
 test.describe('Sign In', () => {
 	test('should login and logout @auth:none', async ({ n8n }) => {
 		await n8n.goHome();
+
 		await n8n.signIn.goToSignIn();
+
 		await n8n.signIn.loginWithEmailAndPassword(
 			INSTANCE_OWNER_CREDENTIALS.email,
 			INSTANCE_OWNER_CREDENTIALS.password,
 		);
+
 		await expect(n8n.sideBar.getUserMenu()).toBeVisible();
 	});
 });

From 54ca0c1abc0f8f0310a8e5b21a318e1cbb266fd0 Mon Sep 17 00:00:00 2001
From: Jaakko Husso <jaakko@n8n.io>
Date: Fri, 5 Dec 2025 00:53:02 +0200
Subject: [PATCH 071/167] fix(core): Filter out workflows from custom agents
 that use too old agents (no-changelog) (#22752)

---
 packages/cli/src/modules/chat-hub/chat-hub.service.ts | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/packages/cli/src/modules/chat-hub/chat-hub.service.ts b/packages/cli/src/modules/chat-hub/chat-hub.service.ts
index 03383da4a99..0d31e7621f2 100644
--- a/packages/cli/src/modules/chat-hub/chat-hub.service.ts
+++ b/packages/cli/src/modules/chat-hub/chat-hub.service.ts
@@ -28,6 +28,7 @@ import type { Response } from 'express';
 import { ErrorReporter, InstanceSettings } from 'n8n-core';
 import {
 	CHAT_TRIGGER_NODE_TYPE,
+	AGENT_LANGCHAIN_NODE_TYPE,
 	OperationalError,
 	ManualExecutionCancelledError,
 	type INodeCredentials,
@@ -940,7 +941,6 @@ export class ChatHubService {
 			}
 
 			const chatTrigger = activeVersion.nodes?.find((node) => node.type === CHAT_TRIGGER_NODE_TYPE);
-
 			if (!chatTrigger) {
 				continue;
 			}
@@ -950,6 +950,15 @@ export class ChatHubService {
 				continue;
 			}
 
+			const agentNodes = activeVersion.nodes?.filter(
+				(node) => node.type === AGENT_LANGCHAIN_NODE_TYPE,
+			);
+
+			// Agents older than this can't do streaming
+			if (agentNodes.some((node) => node.typeVersion < 2.1)) {
+				continue;
+			}
+
 			const inputModalities = this.chatHubWorkflowService.parseInputModalities(
 				chatTriggerParams.options,
 			);

From 3f382a0369db73f988009e89c0a8aa8f3890432a Mon Sep 17 00:00:00 2001
From: Declan Carroll <declan@n8n.io>
Date: Fri, 5 Dec 2025 08:37:55 +0000
Subject: [PATCH 072/167] test: Fixing flaky/failing workflow action test
 (#22792)

---
 .../testing/playwright/tests/ui/7-workflow-actions.spec.ts     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/testing/playwright/tests/ui/7-workflow-actions.spec.ts b/packages/testing/playwright/tests/ui/7-workflow-actions.spec.ts
index b27bbd74a0b..3ff30e40e04 100644
--- a/packages/testing/playwright/tests/ui/7-workflow-actions.spec.ts
+++ b/packages/testing/playwright/tests/ui/7-workflow-actions.spec.ts
@@ -37,7 +37,8 @@ async function goToWorkflow(n8n: n8nPage, workflowId: string): Promise<void> {
 	await loadResponsePromise;
 }
 
-test.describe('Workflow Actions', () => {
+// eslint-disable-next-line playwright/no-skipped-test
+test.skip('Workflow Actions', () => {
 	test.beforeEach(async ({ n8n }) => {
 		await n8n.start.fromBlankCanvas();
 	});

From 829135ceeee984daa415053b2f085617638e6e6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milorad=20FIlipovi=C4=87?= <milorad@n8n.io>
Date: Fri, 5 Dec 2025 09:54:05 +0100
Subject: [PATCH 073/167] feat(editor): Open template setup modal automatically
 (no-changelog) (#22596)

---
 .../SetupWorkflowCredentialsButton.vue        | 22 +++++++++++++++----
 .../pages/TemplateCredentialSetupPage.ts      | 11 ++++++++++
 ...ADO-4462-template-setup-experiment.spec.ts |  5 +++++
 3 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/packages/frontend/editor-ui/src/features/workflows/templates/components/SetupWorkflowCredentialsButton.vue b/packages/frontend/editor-ui/src/features/workflows/templates/components/SetupWorkflowCredentialsButton.vue
index 3029b281c19..043f33e4b3b 100644
--- a/packages/frontend/editor-ui/src/features/workflows/templates/components/SetupWorkflowCredentialsButton.vue
+++ b/packages/frontend/editor-ui/src/features/workflows/templates/components/SetupWorkflowCredentialsButton.vue
@@ -1,15 +1,17 @@
 <script lang="ts" setup>
-import { computed, onBeforeUnmount, watch } from 'vue';
+import { computed, onBeforeUnmount, onMounted, watch } from 'vue';
 import { useI18n } from '@n8n/i18n';
-import { SETUP_CREDENTIALS_MODAL_KEY } from '@/app/constants';
+import { SETUP_CREDENTIALS_MODAL_KEY, TEMPLATE_SETUP_EXPERIENCE } from '@/app/constants';
 import { useNodeTypesStore } from '@/app/stores/nodeTypes.store';
 import { useUIStore } from '@/app/stores/ui.store';
 import { useWorkflowsStore } from '@/app/stores/workflows.store';
 import { doesNodeHaveAllCredentialsFilled } from '@/app/utils/nodes/nodeTransforms';
 
 import { N8nButton } from '@n8n/design-system';
+import { usePostHog } from '@/app/stores/posthog.store';
 const workflowsStore = useWorkflowsStore();
 const nodeTypesStore = useNodeTypesStore();
+const posthogStore = usePostHog();
 const uiStore = useUIStore();
 const i18n = useI18n();
 
@@ -39,6 +41,12 @@ const showButton = computed(() => {
 	return !allCredentialsFilled.value;
 });
 
+const isNewTemplatesSetupEnabled = computed(() => {
+	return (
+		posthogStore.getVariant(TEMPLATE_SETUP_EXPERIENCE.name) === TEMPLATE_SETUP_EXPERIENCE.variant
+	);
+});
+
 const unsubscribe = watch(allCredentialsFilled, (newValue) => {
 	if (newValue) {
 		workflowsStore.addToWorkflowMetadata({
@@ -49,13 +57,19 @@ const unsubscribe = watch(allCredentialsFilled, (newValue) => {
 	}
 });
 
-const handleClick = () => {
+const openSetupModal = () => {
 	uiStore.openModal(SETUP_CREDENTIALS_MODAL_KEY);
 };
 
 onBeforeUnmount(() => {
 	uiStore.closeModal(SETUP_CREDENTIALS_MODAL_KEY);
 });
+
+onMounted(() => {
+	if (isNewTemplatesSetupEnabled.value && showButton.value) {
+		openSetupModal();
+	}
+});
 </script>
 
 <template>
@@ -66,6 +80,6 @@ onBeforeUnmount(() => {
 		size="large"
 		icon="package-open"
 		type="secondary"
-		@click="handleClick()"
+		@click="openSetupModal()"
 	/>
 </template>
diff --git a/packages/testing/playwright/pages/TemplateCredentialSetupPage.ts b/packages/testing/playwright/pages/TemplateCredentialSetupPage.ts
index f0209300711..2e89151d152 100644
--- a/packages/testing/playwright/pages/TemplateCredentialSetupPage.ts
+++ b/packages/testing/playwright/pages/TemplateCredentialSetupPage.ts
@@ -41,6 +41,12 @@ export class TemplateCredentialSetupPage extends BasePage {
 		return this.page.getByTestId('setup-workflow-credentials-modal');
 	}
 
+	getSetupCredentialModalCloseButton(): Locator {
+		return this.page
+			.getByTestId('setup-workflow-credentials-modal')
+			.getByRole('button', { name: 'Close this dialog' });
+	}
+
 	getSetupCredentialModalSteps(): Locator {
 		return this.page
 			.getByTestId('setup-workflow-credentials-modal')
@@ -68,4 +74,9 @@ export class TemplateCredentialSetupPage extends BasePage {
 		await messageBox.waitFor({ state: 'visible' });
 		await messageBox.locator('.btn--cancel').click();
 	}
+
+	async closeSetupCredentialModal(): Promise<void> {
+		await this.getSetupCredentialModalCloseButton().click();
+		await this.getCanvasCredentialModal().waitFor({ state: 'hidden' });
+	}
 }
diff --git a/packages/testing/playwright/tests/ui/regression/ADO-4462-template-setup-experiment.spec.ts b/packages/testing/playwright/tests/ui/regression/ADO-4462-template-setup-experiment.spec.ts
index b2be88f1177..a27fd9956f7 100644
--- a/packages/testing/playwright/tests/ui/regression/ADO-4462-template-setup-experiment.spec.ts
+++ b/packages/testing/playwright/tests/ui/regression/ADO-4462-template-setup-experiment.spec.ts
@@ -73,6 +73,11 @@ test.describe('Template credentials setup @db:reset', () => {
 		await expect(n8n.canvas.getCanvasNodes()).toHaveCount(3);
 
 		await expect(n8n.templateCredentialSetup.getCanvasSetupButton()).toBeVisible();
+		// Modal should open automatically
+		await expect(n8n.templateCredentialSetup.getCanvasCredentialModal()).toBeVisible();
+
+		// Close the modal and re-open it
+		await n8n.templateCredentialSetup.closeSetupCredentialModal();
 		await n8n.templateCredentialSetup.getCanvasSetupButton().click();
 		await expect(n8n.templateCredentialSetup.getCanvasCredentialModal()).toBeVisible();
 

From 8d7f438e1f479c54eb0d73d3b1c956755502929c Mon Sep 17 00:00:00 2001
From: Suguru Inoue <suguru@n8n.io>
Date: Fri, 5 Dec 2025 10:04:20 +0100
Subject: [PATCH 074/167] fix(editor): Fix chat telemetry (no-changelog)
 (#22793)

---
 .../src/features/ai/chatHub/chat.store.ts          | 14 ++++++++++++++
 .../chatHub/components/CredentialSelectorModal.vue | 14 +++++++++++++-
 .../ai/chatHub/components/ModelSelector.vue        | 14 --------------
 .../ai/chatHub/components/ToolsSelectorModal.vue   |  9 +++++++++
 .../src/features/ai/chatHub/module.descriptor.ts   |  1 -
 .../CredentialPicker/CredentialPicker.vue          |  6 +++---
 6 files changed, 39 insertions(+), 19 deletions(-)

diff --git a/packages/frontend/editor-ui/src/features/ai/chatHub/chat.store.ts b/packages/frontend/editor-ui/src/features/ai/chatHub/chat.store.ts
index ebcf3e98900..f090961939c 100644
--- a/packages/frontend/editor-ui/src/features/ai/chatHub/chat.store.ts
+++ b/packages/frontend/editor-ui/src/features/ai/chatHub/chat.store.ts
@@ -625,6 +625,13 @@ export const useChatStore = defineStore(CHAT_STORE, () => {
 			onStreamDone,
 			onStreamError,
 		);
+
+		telemetry.track('User edited chat hub message', {
+			...flattenModel(model),
+			is_custom: model.provider === 'custom-agent',
+			chat_session_id: sessionId,
+			chat_message_id: editId,
+		});
 	}
 
 	function regenerateMessage(
@@ -662,6 +669,13 @@ export const useChatStore = defineStore(CHAT_STORE, () => {
 			onStreamDone,
 			onStreamError,
 		);
+
+		telemetry.track('User regenerated chat hub message', {
+			...flattenModel(model),
+			is_custom: model.provider === 'custom-agent',
+			chat_session_id: sessionId,
+			chat_message_id: retryId,
+		});
 	}
 
 	async function stopStreamingMessage(sessionId: ChatSessionId) {
diff --git a/packages/frontend/editor-ui/src/features/ai/chatHub/components/CredentialSelectorModal.vue b/packages/frontend/editor-ui/src/features/ai/chatHub/components/CredentialSelectorModal.vue
index 58e7ffaf963..c1517b1be4d 100644
--- a/packages/frontend/editor-ui/src/features/ai/chatHub/components/CredentialSelectorModal.vue
+++ b/packages/frontend/editor-ui/src/features/ai/chatHub/components/CredentialSelectorModal.vue
@@ -8,6 +8,7 @@ import { providerDisplayNames } from '@/features/ai/chatHub/constants';
 import CredentialIcon from '@/features/credentials/components/CredentialIcon.vue';
 import CredentialPicker from '@/features/credentials/components/CredentialPicker/CredentialPicker.vue';
 import { useI18n } from '@n8n/i18n';
+import { useTelemetry } from '@/app/composables/useTelemetry';
 
 const props = defineProps<{
 	modalName: string;
@@ -15,11 +16,12 @@ const props = defineProps<{
 		provider: ChatHubLLMProvider;
 		initialValue: string | null;
 		onSelect: (provider: ChatHubLLMProvider, credentialId: string | null) => void;
-		onCreateNew: (provider: ChatHubLLMProvider) => void;
 	};
 }>();
 
 const i18n = useI18n();
+const telemetry = useTelemetry();
+
 const modalBus = ref(createEventBus());
 const selectedCredentialId = ref<string | null>(props.data.initialValue);
 
@@ -45,6 +47,15 @@ function onDeleteCredential(credentialId: string) {
 	}
 }
 
+function onCredentialModalOpened(credentialId?: string) {
+	telemetry.track('User opened Credential modal', {
+		credential_type: credentialType.value,
+		source: 'chat',
+		new_credential: !credentialId,
+		workflow_id: null,
+	});
+}
+
 function onConfirm() {
 	if (selectedCredentialId.value) {
 		props.data.onSelect(props.data.provider, selectedCredentialId.value);
@@ -106,6 +117,7 @@ function onCancel() {
 						@credential-selected="onCredentialSelect"
 						@credential-deselected="onCredentialDeselect"
 						@credential-deleted="onDeleteCredential"
+						@credential-modal-opened="onCredentialModalOpened"
 					/>
 				</div>
 			</div>
diff --git a/packages/frontend/editor-ui/src/features/ai/chatHub/components/ModelSelector.vue b/packages/frontend/editor-ui/src/features/ai/chatHub/components/ModelSelector.vue
index c9d7de11317..424d8800406 100644
--- a/packages/frontend/editor-ui/src/features/ai/chatHub/components/ModelSelector.vue
+++ b/packages/frontend/editor-ui/src/features/ai/chatHub/components/ModelSelector.vue
@@ -274,7 +274,6 @@ function openCredentialsSelectorOrCreate(provider: ChatHubLLMProvider) {
 			provider,
 			initialValue: credentials?.[provider] ?? null,
 			onSelect: handleSelectCredentials,
-			onCreateNew: handleCreateNewCredential,
 		},
 	});
 }
@@ -321,19 +320,6 @@ function onSelect(id: string) {
 	emit('change', parsedModel);
 }
 
-function handleCreateNewCredential(provider: ChatHubLLMProvider) {
-	const credentialType = PROVIDER_CREDENTIAL_TYPE_MAP[provider];
-
-	telemetry.track('User opened Credential modal', {
-		credential_type: credentialType,
-		source: 'chat',
-		new_credential: true,
-		workflow_id: null,
-	});
-
-	uiStore.openNewCredential(credentialType);
-}
-
 onClickOutside(
 	computed(() => dropdownRef.value?.$el),
 	() => dropdownRef.value?.close(),
diff --git a/packages/frontend/editor-ui/src/features/ai/chatHub/components/ToolsSelectorModal.vue b/packages/frontend/editor-ui/src/features/ai/chatHub/components/ToolsSelectorModal.vue
index b87067e1a2d..6ecee5b3506 100644
--- a/packages/frontend/editor-ui/src/features/ai/chatHub/components/ToolsSelectorModal.vue
+++ b/packages/frontend/editor-ui/src/features/ai/chatHub/components/ToolsSelectorModal.vue
@@ -23,6 +23,7 @@ import { useNodeTypesStore } from '@/app/stores/nodeTypes.store';
 import { useI18n } from '@n8n/i18n';
 import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
 import { getResourcePermissions } from '@n8n/permissions';
+import { useTelemetry } from '@/app/composables/useTelemetry';
 
 const props = defineProps<{
 	modalName: string;
@@ -38,6 +39,7 @@ const credentialsStore = useCredentialsStore();
 const nodeTypesStore = useNodeTypesStore();
 const projectStore = useProjectsStore();
 const uiStore = useUIStore();
+const telemetry = useTelemetry();
 
 const canCreateCredentials = computed(() => {
 	return getResourcePermissions(projectStore.personalProject?.scopes).credential.create;
@@ -141,6 +143,13 @@ function onCreateNewCredential(providerKey: ChatHubAgentTool) {
 	const provider = AVAILABLE_TOOLS[providerKey];
 	if (!provider.credentialType) return;
 
+	telemetry.track('User opened Credential modal', {
+		credential_type: provider.credentialType,
+		source: 'chat',
+		new_credential: true,
+		workflow_id: null,
+	});
+
 	uiStore.openNewCredential(provider.credentialType);
 }
 
diff --git a/packages/frontend/editor-ui/src/features/ai/chatHub/module.descriptor.ts b/packages/frontend/editor-ui/src/features/ai/chatHub/module.descriptor.ts
index fe5cc5b2292..a5bf0623c7e 100644
--- a/packages/frontend/editor-ui/src/features/ai/chatHub/module.descriptor.ts
+++ b/packages/frontend/editor-ui/src/features/ai/chatHub/module.descriptor.ts
@@ -57,7 +57,6 @@ export const ChatModule: FrontendModuleDescription = {
 					provider: null,
 					initialValue: null,
 					onSelect: () => {},
-					onCreateNew: () => {},
 				},
 			},
 		},
diff --git a/packages/frontend/editor-ui/src/features/credentials/components/CredentialPicker/CredentialPicker.vue b/packages/frontend/editor-ui/src/features/credentials/components/CredentialPicker/CredentialPicker.vue
index 7c997858140..e3c2301bcf5 100644
--- a/packages/frontend/editor-ui/src/features/credentials/components/CredentialPicker/CredentialPicker.vue
+++ b/packages/frontend/editor-ui/src/features/credentials/components/CredentialPicker/CredentialPicker.vue
@@ -25,7 +25,7 @@ const props = defineProps<{
 const emit = defineEmits<{
 	credentialSelected: [credentialId: string];
 	credentialDeselected: [];
-	credentialModalOpened: [];
+	credentialModalOpened: [credentialId?: string];
 	credentialDeleted: [credentialId: string];
 }>();
 
@@ -102,13 +102,13 @@ const onCredentialSelected = (credentialId: string) => {
 const createNewCredential = () => {
 	uiStore.openNewCredential(props.credentialType, true);
 	wasModalOpenedFromHere.value = true;
-	emit('credentialModalOpened');
+	emit('credentialModalOpened', undefined);
 };
 const editCredential = () => {
 	assert(props.selectedCredentialId);
 	uiStore.openExistingCredential(props.selectedCredentialId);
 	wasModalOpenedFromHere.value = true;
-	emit('credentialModalOpened');
+	emit('credentialModalOpened', props.selectedCredentialId);
 };
 const deleteCredential = async () => {
 	assert(props.selectedCredentialId);

From b22654709acb3d81e84e6cac1145e359941db991 Mon Sep 17 00:00:00 2001
From: Nikhil Kuriakose <nikhilkuria@gmail.com>
Date: Fri, 5 Dec 2025 10:06:54 +0100
Subject: [PATCH 075/167] feat(editor): Rename columns in data tables (#21747)

---
 .../rename-data-table-column.dto.ts           |   7 +
 packages/@n8n/api-types/src/dto/index.ts      |   1 +
 ...lumn-rename.controller.integration.test.ts | 352 ++++++++++++++++
 .../data-table-column.repository.test.ts      | 250 ++++++++++++
 .../__tests__/data-table-ddl.service.test.ts  | 384 ++++++++++++++++++
 .../__tests__/data-table.service.test.ts      | 365 +++++++++++++++++
 .../data-table-column.repository.ts           |  81 +++-
 .../data-table/data-table-ddl.service.ts      |  22 +-
 .../data-table/data-table.controller.ts       |  75 ++--
 .../modules/data-table/data-table.service.ts  |  13 +
 .../data-table-column-not-found.error.ts      |   8 +-
 .../errors/data-table-not-found.error.ts      |   8 +-
 .../src/modules/data-table/utils/sql-utils.ts |  17 +
 .../frontend/@n8n/i18n/src/locales/en.json    |   4 +-
 .../dataGrid/AddColumnButton.test.ts          |   2 +-
 .../components/dataGrid/AddColumnButton.vue   |   2 +-
 .../components/dataGrid/ColumnHeader.test.ts  | 196 +++++++++
 .../components/dataGrid/ColumnHeader.vue      |  96 ++++-
 .../components/dataGrid/DataTableTable.vue    |   5 +
 .../composables/useDataTableColumns.test.ts   |   2 +
 .../composables/useDataTableColumns.ts        |   3 +
 .../useDataTableOperations.test.ts            | 213 ++++++++++
 .../composables/useDataTableOperations.ts     |  54 ++-
 .../features/core/dataTable/dataTable.api.ts  |  17 +
 .../core/dataTable/dataTable.store.test.ts    | 250 ++++++++++++
 .../core/dataTable/dataTable.store.ts         |  26 ++
 .../playwright/pages/DataTableDetails.ts      |   3 +-
 27 files changed, 2382 insertions(+), 74 deletions(-)
 create mode 100644 packages/@n8n/api-types/src/dto/data-table/rename-data-table-column.dto.ts
 create mode 100644 packages/cli/src/modules/data-table/__tests__/data-table-column-rename.controller.integration.test.ts
 create mode 100644 packages/cli/src/modules/data-table/__tests__/data-table-column.repository.test.ts
 create mode 100644 packages/cli/src/modules/data-table/__tests__/data-table-ddl.service.test.ts
 create mode 100644 packages/cli/src/modules/data-table/__tests__/data-table.service.test.ts

diff --git a/packages/@n8n/api-types/src/dto/data-table/rename-data-table-column.dto.ts b/packages/@n8n/api-types/src/dto/data-table/rename-data-table-column.dto.ts
new file mode 100644
index 00000000000..f2565280bd5
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/data-table/rename-data-table-column.dto.ts
@@ -0,0 +1,7 @@
+import { Z } from 'zod-class';
+
+import { dataTableColumnNameSchema } from '../../schemas/data-table.schema';
+
+export class RenameDataTableColumnDto extends Z.class({
+	name: dataTableColumnNameSchema,
+}) {}
diff --git a/packages/@n8n/api-types/src/dto/index.ts b/packages/@n8n/api-types/src/dto/index.ts
index f54a4341ab3..5b0cfec8718 100644
--- a/packages/@n8n/api-types/src/dto/index.ts
+++ b/packages/@n8n/api-types/src/dto/index.ts
@@ -99,6 +99,7 @@ export { CreateDataTableColumnDto } from './data-table/create-data-table-column.
 export { AddDataTableRowsDto } from './data-table/add-data-table-rows.dto';
 export { AddDataTableColumnDto } from './data-table/add-data-table-column.dto';
 export { MoveDataTableColumnDto } from './data-table/move-data-table-column.dto';
+export { RenameDataTableColumnDto } from './data-table/rename-data-table-column.dto';
 
 export {
 	OAuthClientResponseDto,
diff --git a/packages/cli/src/modules/data-table/__tests__/data-table-column-rename.controller.integration.test.ts b/packages/cli/src/modules/data-table/__tests__/data-table-column-rename.controller.integration.test.ts
new file mode 100644
index 00000000000..2dff393de38
--- /dev/null
+++ b/packages/cli/src/modules/data-table/__tests__/data-table-column-rename.controller.integration.test.ts
@@ -0,0 +1,352 @@
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
+import {
+	createTeamProject,
+	getPersonalProject,
+	linkUserToProject,
+	testDb,
+} from '@n8n/backend-test-utils';
+import type { Project, User } from '@n8n/db';
+import { Container } from '@n8n/di';
+
+import { createDataTable } from '@test-integration/db/data-tables';
+import { createOwner, createMember, createAdmin } from '@test-integration/db/users';
+import type { SuperAgentTest } from '@test-integration/types';
+import * as utils from '@test-integration/utils';
+
+import { DataTableColumnRepository } from '../data-table-column.repository';
+import { mockDataTableSizeValidator } from './test-helpers';
+
+let owner: User;
+let member: User;
+let admin: User;
+let authOwnerAgent: SuperAgentTest;
+let authMemberAgent: SuperAgentTest;
+let authAdminAgent: SuperAgentTest;
+let ownerProject: Project;
+let memberProject: Project;
+
+const testServer = utils.setupTestServer({
+	endpointGroups: ['data-table'],
+	modules: ['data-table'],
+});
+let dataTableColumnRepository: DataTableColumnRepository;
+
+beforeAll(async () => {
+	mockDataTableSizeValidator();
+
+	dataTableColumnRepository = Container.get(DataTableColumnRepository);
+
+	owner = await createOwner();
+	member = await createMember();
+	admin = await createAdmin();
+
+	authOwnerAgent = testServer.authAgentFor(owner);
+	authMemberAgent = testServer.authAgentFor(member);
+	authAdminAgent = testServer.authAgentFor(admin);
+
+	ownerProject = await getPersonalProject(owner);
+	memberProject = await getPersonalProject(member);
+});
+
+beforeEach(async () => {
+	await testDb.truncate(['DataTable', 'DataTableColumn']);
+});
+
+describe('PATCH /projects/:projectId/data-tables/:dataTableId/columns/:columnId/rename', () => {
+	test('should not rename column when project does not exist', async () => {
+		const payload = {
+			name: 'new_column_name',
+		};
+
+		await authOwnerAgent
+			.patch(
+				'/projects/non-existing-id/data-tables/some-data-table-id/columns/some-column-id/rename',
+			)
+			.send(payload)
+			.expect(404);
+	});
+
+	test('should not rename column when data table does not exist', async () => {
+		const project = await createTeamProject('test project', owner);
+		const payload = {
+			name: 'new_column_name',
+		};
+
+		await authOwnerAgent
+			.patch(
+				`/projects/${project.id}/data-tables/non-existing-data-table/columns/some-column-id/rename`,
+			)
+			.send(payload)
+			.expect(404);
+	});
+
+	test('should not rename column when column does not exist', async () => {
+		const project = await createTeamProject('test project', owner);
+		const dataTable = await createDataTable(project, {
+			columns: [
+				{
+					name: 'test_column',
+					type: 'string',
+				},
+			],
+		});
+		const payload = {
+			name: 'new_column_name',
+		};
+
+		await authOwnerAgent
+			.patch(
+				`/projects/${project.id}/data-tables/${dataTable.id}/columns/non-existing-column-id/rename`,
+			)
+			.send(payload)
+			.expect(404);
+	});
+
+	test("should not rename column in another user's personal project data table", async () => {
+		const dataTable = await createDataTable(ownerProject, {
+			columns: [
+				{
+					name: 'test_column',
+					type: 'string',
+				},
+			],
+		});
+
+		await authMemberAgent
+			.patch(
+				`/projects/${ownerProject.id}/data-tables/${dataTable.id}/columns/${dataTable.columns[0].id}/rename`,
+			)
+			.send({ name: 'new_name' })
+			.expect(403);
+
+		const columnInDb = await dataTableColumnRepository.findOneBy({
+			id: dataTable.columns[0].id,
+		});
+		expect(columnInDb?.name).toBe('test_column');
+	});
+
+	test('should not rename column if user has project:viewer role in team project', async () => {
+		const project = await createTeamProject('test project', owner);
+		await linkUserToProject(member, project, 'project:viewer');
+		const dataTable = await createDataTable(project, {
+			columns: [
+				{
+					name: 'test_column',
+					type: 'string',
+				},
+			],
+		});
+
+		await authMemberAgent
+			.patch(
+				`/projects/${project.id}/data-tables/${dataTable.id}/columns/${dataTable.columns[0].id}/rename`,
+			)
+			.send({ name: 'new_name' })
+			.expect(403);
+
+		const columnInDb = await dataTableColumnRepository.findOneBy({
+			id: dataTable.columns[0].id,
+		});
+		expect(columnInDb?.name).toBe('test_column');
+	});
+
+	test('should rename column if user has project:editor role in team project', async () => {
+		const project = await createTeamProject('test project', owner);
+		await linkUserToProject(member, project, 'project:editor');
+		const dataTable = await createDataTable(project, {
+			columns: [
+				{
+					name: 'test_column',
+					type: 'string',
+				},
+			],
+		});
+
+		await authMemberAgent
+			.patch(
+				`/projects/${project.id}/data-tables/${dataTable.id}/columns/${dataTable.columns[0].id}/rename`,
+			)
+			.send({ name: 'renamed_column' })
+			.expect(200);
+
+		const columnInDb = await dataTableColumnRepository.findOneBy({
+			id: dataTable.columns[0].id,
+		});
+		expect(columnInDb?.name).toBe('renamed_column');
+	});
+
+	test('should rename column if user has project:admin role in team project', async () => {
+		const project = await createTeamProject('test project', owner);
+		await linkUserToProject(admin, project, 'project:admin');
+		const dataTable = await createDataTable(project, {
+			columns: [
+				{
+					name: 'test_column',
+					type: 'string',
+				},
+			],
+		});
+
+		await authAdminAgent
+			.patch(
+				`/projects/${project.id}/data-tables/${dataTable.id}/columns/${dataTable.columns[0].id}/rename`,
+			)
+			.send({ name: 'renamed_column' })
+			.expect(200);
+
+		const columnInDb = await dataTableColumnRepository.findOneBy({
+			id: dataTable.columns[0].id,
+		});
+		expect(columnInDb?.name).toBe('renamed_column');
+	});
+
+	test('should rename column if user is owner in team project', async () => {
+		const project = await createTeamProject('test project', owner);
+
+		const dataTable = await createDataTable(project, {
+			columns: [
+				{
+					name: 'test_column',
+					type: 'string',
+				},
+			],
+		});
+
+		await authOwnerAgent
+			.patch(
+				`/projects/${project.id}/data-tables/${dataTable.id}/columns/${dataTable.columns[0].id}/rename`,
+			)
+			.send({ name: 'renamed_column' })
+			.expect(200);
+
+		const columnInDb = await dataTableColumnRepository.findOneBy({
+			id: dataTable.columns[0].id,
+		});
+		expect(columnInDb?.name).toBe('renamed_column');
+	});
+
+	test('should rename column in personal project', async () => {
+		const dataTable = await createDataTable(memberProject, {
+			columns: [
+				{
+					name: 'test_column',
+					type: 'string',
+				},
+			],
+		});
+
+		await authMemberAgent
+			.patch(
+				`/projects/${memberProject.id}/data-tables/${dataTable.id}/columns/${dataTable.columns[0].id}/rename`,
+			)
+			.send({ name: 'renamed_column' })
+			.expect(200);
+
+		const columnInDb = await dataTableColumnRepository.findOneBy({
+			id: dataTable.columns[0].id,
+		});
+		expect(columnInDb?.name).toBe('renamed_column');
+	});
+
+	test('should not rename column to an existing column name', async () => {
+		const project = await createTeamProject('test project', owner);
+		const dataTable = await createDataTable(project, {
+			columns: [
+				{
+					name: 'first_column',
+					type: 'string',
+				},
+				{
+					name: 'second_column',
+					type: 'string',
+				},
+			],
+		});
+
+		await authOwnerAgent
+			.patch(
+				`/projects/${project.id}/data-tables/${dataTable.id}/columns/${dataTable.columns[0].id}/rename`,
+			)
+			.send({ name: 'second_column' })
+			.expect(409);
+
+		const firstColumnInDb = await dataTableColumnRepository.findOneBy({
+			id: dataTable.columns[0].id,
+		});
+		expect(firstColumnInDb?.name).toBe('first_column');
+	});
+
+	test('should not rename column with invalid column name', async () => {
+		const project = await createTeamProject('test project', owner);
+		const dataTable = await createDataTable(project, {
+			columns: [
+				{
+					name: 'test_column',
+					type: 'string',
+				},
+			],
+		});
+
+		await authOwnerAgent
+			.patch(
+				`/projects/${project.id}/data-tables/${dataTable.id}/columns/${dataTable.columns[0].id}/rename`,
+			)
+			.send({ name: 'invalid name with spaces' })
+			.expect(400);
+
+		const columnInDb = await dataTableColumnRepository.findOneBy({
+			id: dataTable.columns[0].id,
+		});
+		expect(columnInDb?.name).toBe('test_column');
+	});
+
+	test('should not rename column with empty name', async () => {
+		const project = await createTeamProject('test project', owner);
+		const dataTable = await createDataTable(project, {
+			columns: [
+				{
+					name: 'test_column',
+					type: 'string',
+				},
+			],
+		});
+
+		await authOwnerAgent
+			.patch(
+				`/projects/${project.id}/data-tables/${dataTable.id}/columns/${dataTable.columns[0].id}/rename`,
+			)
+			.send({ name: '' })
+			.expect(400);
+
+		const columnInDb = await dataTableColumnRepository.findOneBy({
+			id: dataTable.columns[0].id,
+		});
+		expect(columnInDb?.name).toBe('test_column');
+	});
+
+	test('should rename column successfully', async () => {
+		const project = await createTeamProject('test project', owner);
+		const dataTable = await createDataTable(project, {
+			columns: [
+				{
+					name: 'original_name',
+					type: 'string',
+				},
+			],
+		});
+
+		await authOwnerAgent
+			.patch(
+				`/projects/${project.id}/data-tables/${dataTable.id}/columns/${dataTable.columns[0].id}/rename`,
+			)
+			.send({ name: 'updated_name' })
+			.expect(200);
+
+		// Verify column name changed
+		const columnInDb = await dataTableColumnRepository.findOneBy({
+			id: dataTable.columns[0].id,
+		});
+		expect(columnInDb?.name).toBe('updated_name');
+	});
+});
diff --git a/packages/cli/src/modules/data-table/__tests__/data-table-column.repository.test.ts b/packages/cli/src/modules/data-table/__tests__/data-table-column.repository.test.ts
new file mode 100644
index 00000000000..bc9dd93914f
--- /dev/null
+++ b/packages/cli/src/modules/data-table/__tests__/data-table-column.repository.test.ts
@@ -0,0 +1,250 @@
+import { testModules } from '@n8n/backend-test-utils';
+import type { DataSource, EntityManager } from '@n8n/typeorm';
+import { mock } from 'jest-mock-extended';
+
+import { DataTableColumn } from '../data-table-column.entity';
+import { DataTableColumnRepository } from '../data-table-column.repository';
+import type { DataTableDDLService } from '../data-table-ddl.service';
+import { DataTable } from '../data-table.entity';
+import { DataTableColumnNameConflictError } from '../errors/data-table-column-name-conflict.error';
+import { DataTableSystemColumnNameConflictError } from '../errors/data-table-system-column-name-conflict.error';
+
+describe('DataTableColumnRepository', () => {
+	let repository: DataTableColumnRepository;
+	let mockDataSource: DataSource;
+	let mockDDLService: jest.Mocked<DataTableDDLService>;
+	let mockEntityManager: jest.Mocked<EntityManager>;
+
+	beforeAll(async () => {
+		await testModules.loadModules(['data-table']);
+	});
+
+	beforeEach(() => {
+		mockDDLService = mock<DataTableDDLService>();
+		mockEntityManager = mock<EntityManager>({
+			connection: {
+				options: { type: 'postgres' },
+			} as any,
+		});
+
+		// Mock the transaction method to execute the callback immediately
+		(mockEntityManager.transaction as jest.Mock) = jest.fn(
+			async (callback: (em: EntityManager) => Promise<any>) => {
+				return await callback(mockEntityManager);
+			},
+		);
+
+		mockDataSource = mock<DataSource>({
+			manager: mockEntityManager,
+		});
+
+		repository = new DataTableColumnRepository(mockDataSource, mockDDLService);
+	});
+
+	describe('renameColumn', () => {
+		const dataTableId = 'test-table-id';
+		const mockColumn: DataTableColumn = {
+			id: 'column-id',
+			name: 'old_name',
+			type: 'string',
+			index: 0,
+			dataTableId,
+		} as DataTableColumn;
+
+		describe('validateUniqueColumnName', () => {
+			it('should throw DataTableColumnNameConflictError when column name already exists', async () => {
+				// Arrange
+				const newName = 'duplicate_name';
+				const dataTable = { id: dataTableId, name: 'Test Table' } as DataTable;
+
+				mockEntityManager.existsBy.mockResolvedValue(true);
+				mockEntityManager.findOneBy.mockResolvedValue(dataTable);
+
+				// Act & Assert
+				await expect(repository.renameColumn(dataTableId, mockColumn, newName)).rejects.toThrow(
+					DataTableColumnNameConflictError,
+				);
+
+				await expect(repository.renameColumn(dataTableId, mockColumn, newName)).rejects.toThrow(
+					`Data table column with name '${newName}' already exists in data table '${dataTable.name}'`,
+				);
+
+				expect(mockEntityManager.existsBy).toHaveBeenCalledWith(DataTableColumn, {
+					name: newName,
+					dataTableId,
+				});
+				expect(mockEntityManager.findOneBy).toHaveBeenCalledWith(DataTable, { id: dataTableId });
+			});
+
+			it('should not throw when column name is unique', async () => {
+				// Arrange
+				const newName = 'unique_name';
+
+				mockEntityManager.existsBy.mockResolvedValue(false);
+				mockEntityManager.update.mockResolvedValue({ affected: 1 } as any);
+				Object.defineProperty(mockEntityManager, 'connection', {
+					value: {
+						options: { type: 'postgres' },
+					},
+					configurable: true,
+				});
+				mockDDLService.renameColumn.mockResolvedValue(undefined);
+
+				// Act
+				const result = await repository.renameColumn(dataTableId, mockColumn, newName);
+
+				// Assert
+				expect(mockEntityManager.existsBy).toHaveBeenCalledWith(DataTableColumn, {
+					name: newName,
+					dataTableId,
+				});
+				expect(result.name).toBe(newName);
+			});
+		});
+
+		describe('validateNotSystemColumn', () => {
+			it('should throw DataTableSystemColumnNameConflictError for system column names', async () => {
+				// Arrange - system columns: id, createdAt, updatedAt
+				const systemColumnNames = ['id', 'createdAt', 'updatedAt'];
+
+				for (const systemColumnName of systemColumnNames) {
+					mockEntityManager.existsBy.mockResolvedValue(false);
+
+					// Act & Assert
+					await expect(
+						repository.renameColumn(dataTableId, mockColumn, systemColumnName),
+					).rejects.toThrow(DataTableSystemColumnNameConflictError);
+
+					await expect(
+						repository.renameColumn(dataTableId, mockColumn, systemColumnName),
+					).rejects.toThrow(
+						`Column name "${systemColumnName}" is reserved as a system column name.`,
+					);
+				}
+			});
+
+			it('should throw DataTableSystemColumnNameConflictError for testing column name', async () => {
+				// Arrange
+				const testingColumnName = 'dryRunState';
+
+				mockEntityManager.existsBy.mockResolvedValue(false);
+
+				// Act & Assert
+				await expect(
+					repository.renameColumn(dataTableId, mockColumn, testingColumnName),
+				).rejects.toThrow(DataTableSystemColumnNameConflictError);
+
+				await expect(
+					repository.renameColumn(dataTableId, mockColumn, testingColumnName),
+				).rejects.toThrow(
+					`Column name "${testingColumnName}" is reserved as a testing column name.`,
+				);
+			});
+		});
+
+		describe('successful rename', () => {
+			it('should successfully rename column when all validations pass', async () => {
+				// Arrange
+				const newName = 'new_valid_name';
+
+				mockEntityManager.existsBy.mockResolvedValue(false);
+				mockEntityManager.update.mockResolvedValue({ affected: 1 } as any);
+				Object.defineProperty(mockEntityManager, 'connection', {
+					value: {
+						options: { type: 'postgres' },
+					},
+					configurable: true,
+				});
+				mockDDLService.renameColumn.mockResolvedValue(undefined);
+
+				// Act
+				const result = await repository.renameColumn(dataTableId, mockColumn, newName);
+
+				// Assert
+				expect(result).toEqual({
+					...mockColumn,
+					name: newName,
+				});
+				expect(mockEntityManager.update).toHaveBeenCalledWith(
+					DataTableColumn,
+					{ id: mockColumn.id },
+					{ name: newName },
+				);
+				expect(mockDDLService.renameColumn).toHaveBeenCalledWith(
+					dataTableId,
+					mockColumn.name,
+					newName,
+					'postgres',
+					mockEntityManager,
+				);
+			});
+
+			it('should call DDL service with correct database type', async () => {
+				// Arrange
+				const newName = 'new_valid_name';
+				const dbTypes = ['postgres', 'mysql', 'sqlite'] as const;
+
+				for (const dbType of dbTypes) {
+					mockEntityManager.existsBy.mockResolvedValue(false);
+					mockEntityManager.update.mockResolvedValue({ affected: 1 } as any);
+					Object.defineProperty(mockEntityManager, 'connection', {
+						value: {
+							options: { type: dbType },
+						},
+						configurable: true,
+					});
+					mockDDLService.renameColumn.mockResolvedValue(undefined);
+
+					// Act
+					await repository.renameColumn(dataTableId, mockColumn, newName);
+
+					// Assert
+					expect(mockDDLService.renameColumn).toHaveBeenCalledWith(
+						dataTableId,
+						mockColumn.name,
+						newName,
+						dbType,
+						mockEntityManager,
+					);
+				}
+			});
+		});
+
+		describe('validation order', () => {
+			it('should validate system column name before checking uniqueness', async () => {
+				// Arrange
+				const systemColumnName = 'id';
+
+				mockEntityManager.existsBy.mockResolvedValue(false);
+
+				// Act & Assert
+				await expect(
+					repository.renameColumn(dataTableId, mockColumn, systemColumnName),
+				).rejects.toThrow(DataTableSystemColumnNameConflictError);
+
+				// existsBy should not be called because system column validation happens first
+				expect(mockEntityManager.existsBy).not.toHaveBeenCalled();
+			});
+
+			it('should check uniqueness after system column validation passes', async () => {
+				// Arrange
+				const newName = 'valid_name';
+				const dataTable = { id: dataTableId, name: 'Test Table' } as DataTable;
+
+				mockEntityManager.existsBy.mockResolvedValue(true);
+				mockEntityManager.findOneBy.mockResolvedValue(dataTable);
+
+				// Act & Assert
+				await expect(repository.renameColumn(dataTableId, mockColumn, newName)).rejects.toThrow(
+					DataTableColumnNameConflictError,
+				);
+
+				// Both validations should have been called in order
+				expect(mockEntityManager.existsBy).toHaveBeenCalledWith(DataTableColumn, {
+					name: newName,
+					dataTableId,
+				});
+			});
+		});
+	});
+});
diff --git a/packages/cli/src/modules/data-table/__tests__/data-table-ddl.service.test.ts b/packages/cli/src/modules/data-table/__tests__/data-table-ddl.service.test.ts
new file mode 100644
index 00000000000..29eff14c3ee
--- /dev/null
+++ b/packages/cli/src/modules/data-table/__tests__/data-table-ddl.service.test.ts
@@ -0,0 +1,384 @@
+import { testModules } from '@n8n/backend-test-utils';
+import type { DataSource, DataSourceOptions, EntityManager } from '@n8n/typeorm';
+import { mock } from 'jest-mock-extended';
+
+import { DataTableDDLService } from '../data-table-ddl.service';
+import * as sqlUtils from '../utils/sql-utils';
+
+// Mock the sql-utils module
+jest.mock('../utils/sql-utils', () => ({
+	...jest.requireActual('../utils/sql-utils'),
+	renameColumnQuery: jest.fn(),
+	toTableName: jest.fn(),
+}));
+
+describe('DataTableDDLService', () => {
+	let ddlService: DataTableDDLService;
+	let mockDataSource: DataSource;
+	let mockEntityManager: jest.Mocked<EntityManager>;
+
+	beforeAll(async () => {
+		await testModules.loadModules(['data-table']);
+	});
+
+	beforeEach(() => {
+		mockEntityManager = mock<EntityManager>({
+			connection: {
+				options: { type: 'postgres' },
+			} as any,
+		});
+
+		// Mock the transaction method to execute the callback immediately
+		(mockEntityManager.transaction as jest.Mock) = jest.fn(
+			async (callback: (em: EntityManager) => Promise<any>) => {
+				return await callback(mockEntityManager);
+			},
+		);
+
+		// Mock the query method
+		mockEntityManager.query = jest.fn().mockResolvedValue(undefined);
+
+		mockDataSource = mock<DataSource>({
+			manager: mockEntityManager,
+		});
+
+		ddlService = new DataTableDDLService(mockDataSource);
+
+		// Reset all mocks
+		jest.clearAllMocks();
+	});
+
+	describe('renameColumn', () => {
+		const dataTableId = 'test-table-id';
+		const oldColumnName = 'old_column';
+		const newColumnName = 'new_column';
+		const tableName = 'n8n_data_table_user_test-table-id';
+
+		beforeEach(() => {
+			(sqlUtils.toTableName as jest.Mock).mockReturnValue(tableName);
+		});
+
+		describe('successful rename', () => {
+			it('should execute rename column query for PostgreSQL', async () => {
+				// Arrange
+				const dbType: DataSourceOptions['type'] = 'postgres';
+				const expectedQuery =
+					'ALTER TABLE "n8n_data_table_user_test-table-id" RENAME COLUMN "old_column" TO "new_column"';
+
+				(sqlUtils.renameColumnQuery as jest.Mock).mockReturnValue(expectedQuery);
+
+				// Act
+				await ddlService.renameColumn(dataTableId, oldColumnName, newColumnName, dbType);
+
+				// Assert
+				expect(sqlUtils.toTableName).toHaveBeenCalledWith(dataTableId);
+				expect(sqlUtils.renameColumnQuery).toHaveBeenCalledWith(
+					tableName,
+					oldColumnName,
+					newColumnName,
+					dbType,
+				);
+				expect(mockEntityManager.query).toHaveBeenCalledWith(expectedQuery);
+			});
+
+			it('should execute rename column query for MySQL', async () => {
+				// Arrange
+				const dbType: DataSourceOptions['type'] = 'mysql';
+				const expectedQuery =
+					'ALTER TABLE `n8n_data_table_user_test-table-id` RENAME COLUMN `old_column` TO `new_column`';
+
+				(sqlUtils.renameColumnQuery as jest.Mock).mockReturnValue(expectedQuery);
+
+				// Act
+				await ddlService.renameColumn(dataTableId, oldColumnName, newColumnName, dbType);
+
+				// Assert
+				expect(sqlUtils.renameColumnQuery).toHaveBeenCalledWith(
+					tableName,
+					oldColumnName,
+					newColumnName,
+					dbType,
+				);
+				expect(mockEntityManager.query).toHaveBeenCalledWith(expectedQuery);
+			});
+
+			it('should execute rename column query for SQLite', async () => {
+				// Arrange
+				const dbType: DataSourceOptions['type'] = 'sqlite';
+				const expectedQuery =
+					'ALTER TABLE "n8n_data_table_user_test-table-id" RENAME COLUMN "old_column" TO "new_column"';
+
+				(sqlUtils.renameColumnQuery as jest.Mock).mockReturnValue(expectedQuery);
+
+				// Act
+				await ddlService.renameColumn(dataTableId, oldColumnName, newColumnName, dbType);
+
+				// Assert
+				expect(sqlUtils.renameColumnQuery).toHaveBeenCalledWith(
+					tableName,
+					oldColumnName,
+					newColumnName,
+					dbType,
+				);
+				expect(mockEntityManager.query).toHaveBeenCalledWith(expectedQuery);
+			});
+
+			it('should call methods in correct order', async () => {
+				// Arrange
+				const dbType: DataSourceOptions['type'] = 'postgres';
+				const expectedQuery =
+					'ALTER TABLE "n8n_data_table_user_test-table-id" RENAME COLUMN "old_column" TO "new_column"';
+				const callOrder: string[] = [];
+
+				(sqlUtils.toTableName as jest.Mock).mockImplementation(() => {
+					callOrder.push('toTableName');
+					return tableName;
+				});
+
+				(sqlUtils.renameColumnQuery as jest.Mock).mockImplementation(() => {
+					callOrder.push('renameColumnQuery');
+					return expectedQuery;
+				});
+
+				mockEntityManager.query = jest.fn().mockImplementation(async () => {
+					callOrder.push('query');
+					return undefined;
+				});
+
+				// Act
+				await ddlService.renameColumn(dataTableId, oldColumnName, newColumnName, dbType);
+
+				// Assert
+				expect(callOrder).toEqual(['toTableName', 'renameColumnQuery', 'query']);
+			});
+		});
+
+		describe('with transaction parameter', () => {
+			it('should use provided transaction manager', async () => {
+				// Arrange
+				const dbType: DataSourceOptions['type'] = 'postgres';
+				const expectedQuery =
+					'ALTER TABLE "n8n_data_table_user_test-table-id" RENAME COLUMN "old_column" TO "new_column"';
+				const customTrx = mock<EntityManager>();
+
+				customTrx.query = jest.fn().mockResolvedValue(undefined) as any;
+
+				(sqlUtils.renameColumnQuery as jest.Mock).mockReturnValue(expectedQuery);
+
+				// Act
+				await ddlService.renameColumn(dataTableId, oldColumnName, newColumnName, dbType, customTrx);
+
+				// Assert
+				expect(sqlUtils.renameColumnQuery).toHaveBeenCalledWith(
+					tableName,
+					oldColumnName,
+					newColumnName,
+					dbType,
+				);
+				expect(customTrx.query).toHaveBeenCalledWith(expectedQuery);
+			});
+
+			it('should execute within transaction when no transaction manager is provided', async () => {
+				// Arrange
+				const dbType: DataSourceOptions['type'] = 'postgres';
+				const expectedQuery =
+					'ALTER TABLE "n8n_data_table_user_test-table-id" RENAME COLUMN "old_column" TO "new_column"';
+
+				(sqlUtils.renameColumnQuery as jest.Mock).mockReturnValue(expectedQuery);
+
+				// Act
+				await ddlService.renameColumn(dataTableId, oldColumnName, newColumnName, dbType);
+
+				// Assert
+				expect(mockEntityManager.transaction).toHaveBeenCalled();
+				expect(mockEntityManager.query).toHaveBeenCalledWith(expectedQuery);
+			});
+		});
+
+		describe('error handling', () => {
+			it('should propagate errors from query execution', async () => {
+				// Arrange
+				const dbType: DataSourceOptions['type'] = 'postgres';
+				const expectedQuery =
+					'ALTER TABLE "n8n_data_table_user_test-table-id" RENAME COLUMN "old_column" TO "new_column"';
+				const queryError = new Error('Database query failed');
+
+				(sqlUtils.renameColumnQuery as jest.Mock).mockReturnValue(expectedQuery);
+				mockEntityManager.query = jest.fn().mockRejectedValue(queryError);
+
+				// Act & Assert
+				await expect(
+					ddlService.renameColumn(dataTableId, oldColumnName, newColumnName, dbType),
+				).rejects.toThrow(queryError);
+
+				expect(mockEntityManager.query).toHaveBeenCalledWith(expectedQuery);
+			});
+
+			it('should propagate errors from renameColumnQuery', async () => {
+				// Arrange
+				const dbType: DataSourceOptions['type'] = 'postgres';
+				const queryError = new Error('Invalid column name');
+
+				(sqlUtils.renameColumnQuery as jest.Mock).mockImplementation(() => {
+					throw queryError;
+				});
+
+				// Act & Assert
+				await expect(
+					ddlService.renameColumn(dataTableId, oldColumnName, newColumnName, dbType),
+				).rejects.toThrow(queryError);
+
+				expect(sqlUtils.renameColumnQuery).toHaveBeenCalled();
+				expect(mockEntityManager.query).not.toHaveBeenCalled();
+			});
+		});
+
+		describe('parameter handling', () => {
+			it('should handle special characters in column names', async () => {
+				// Arrange
+				const dbType: DataSourceOptions['type'] = 'postgres';
+				const oldNameWithSpecialChars = 'old_column_2024';
+				const newNameWithSpecialChars = 'new_column_v2';
+				const expectedQuery =
+					'ALTER TABLE "n8n_data_table_user_test-table-id" RENAME COLUMN "old_column_2024" TO "new_column_v2"';
+
+				(sqlUtils.renameColumnQuery as jest.Mock).mockReturnValue(expectedQuery);
+
+				// Act
+				await ddlService.renameColumn(
+					dataTableId,
+					oldNameWithSpecialChars,
+					newNameWithSpecialChars,
+					dbType,
+				);
+
+				// Assert
+				expect(sqlUtils.renameColumnQuery).toHaveBeenCalledWith(
+					tableName,
+					oldNameWithSpecialChars,
+					newNameWithSpecialChars,
+					dbType,
+				);
+				expect(mockEntityManager.query).toHaveBeenCalledWith(expectedQuery);
+			});
+
+			it('should handle different data table IDs', async () => {
+				// Arrange
+				const dbType: DataSourceOptions['type'] = 'postgres';
+				const differentTableId = 'different-table-id';
+				const differentTableName = 'n8n_data_table_user_different-table-id';
+				const expectedQuery =
+					'ALTER TABLE "n8n_data_table_user_different-table-id" RENAME COLUMN "old_column" TO "new_column"';
+
+				(sqlUtils.toTableName as jest.Mock).mockReturnValue(differentTableName);
+				(sqlUtils.renameColumnQuery as jest.Mock).mockReturnValue(expectedQuery);
+
+				// Act
+				await ddlService.renameColumn(differentTableId, oldColumnName, newColumnName, dbType);
+
+				// Assert
+				expect(sqlUtils.toTableName).toHaveBeenCalledWith(differentTableId);
+				expect(sqlUtils.renameColumnQuery).toHaveBeenCalledWith(
+					differentTableName,
+					oldColumnName,
+					newColumnName,
+					dbType,
+				);
+			});
+		});
+
+		describe('database type specific behavior', () => {
+			const testCases: Array<{
+				dbType: DataSourceOptions['type'];
+				expectedQuery: string;
+			}> = [
+				{
+					dbType: 'postgres',
+					expectedQuery:
+						'ALTER TABLE "n8n_data_table_user_test-table-id" RENAME COLUMN "old_column" TO "new_column"',
+				},
+				{
+					dbType: 'mysql',
+					expectedQuery:
+						'ALTER TABLE `n8n_data_table_user_test-table-id` RENAME COLUMN `old_column` TO `new_column`',
+				},
+				{
+					dbType: 'mariadb',
+					expectedQuery:
+						'ALTER TABLE `n8n_data_table_user_test-table-id` RENAME COLUMN `old_column` TO `new_column`',
+				},
+				{
+					dbType: 'sqlite',
+					expectedQuery:
+						'ALTER TABLE "n8n_data_table_user_test-table-id" RENAME COLUMN "old_column" TO "new_column"',
+				},
+			];
+
+			testCases.forEach(({ dbType, expectedQuery }) => {
+				it(`should generate correct query for ${dbType}`, async () => {
+					// Arrange
+					(sqlUtils.renameColumnQuery as jest.Mock).mockReturnValue(expectedQuery);
+
+					// Act
+					await ddlService.renameColumn(dataTableId, oldColumnName, newColumnName, dbType);
+
+					// Assert
+					expect(sqlUtils.renameColumnQuery).toHaveBeenCalledWith(
+						tableName,
+						oldColumnName,
+						newColumnName,
+						dbType,
+					);
+					expect(mockEntityManager.query).toHaveBeenCalledWith(expectedQuery);
+				});
+			});
+		});
+
+		describe('integration with utilities', () => {
+			it('should properly convert dataTableId to table name', async () => {
+				// Arrange
+				const dbType: DataSourceOptions['type'] = 'postgres';
+				const customTableId = 'custom-uuid-1234';
+				const expectedTableName = 'n8n_data_table_user_custom-uuid-1234';
+				const expectedQuery =
+					'ALTER TABLE "n8n_data_table_user_custom-uuid-1234" RENAME COLUMN "old_column" TO "new_column"';
+
+				(sqlUtils.toTableName as jest.Mock).mockReturnValue(expectedTableName);
+				(sqlUtils.renameColumnQuery as jest.Mock).mockReturnValue(expectedQuery);
+
+				// Act
+				await ddlService.renameColumn(customTableId, oldColumnName, newColumnName, dbType);
+
+				// Assert
+				expect(sqlUtils.toTableName).toHaveBeenCalledTimes(1);
+				expect(sqlUtils.toTableName).toHaveBeenCalledWith(customTableId);
+				expect(sqlUtils.renameColumnQuery).toHaveBeenCalledWith(
+					expectedTableName,
+					oldColumnName,
+					newColumnName,
+					dbType,
+				);
+			});
+
+			it('should pass all parameters to renameColumnQuery utility', async () => {
+				// Arrange
+				const dbType: DataSourceOptions['type'] = 'mysql';
+				const expectedQuery = 'ALTER TABLE query';
+
+				(sqlUtils.renameColumnQuery as jest.Mock).mockReturnValue(expectedQuery);
+
+				// Act
+				await ddlService.renameColumn(dataTableId, oldColumnName, newColumnName, dbType);
+
+				// Assert
+				expect(sqlUtils.renameColumnQuery).toHaveBeenCalledWith(
+					tableName,
+					oldColumnName,
+					newColumnName,
+					dbType,
+				);
+				expect(sqlUtils.renameColumnQuery).toHaveBeenCalledTimes(1);
+			});
+		});
+	});
+});
diff --git a/packages/cli/src/modules/data-table/__tests__/data-table.service.test.ts b/packages/cli/src/modules/data-table/__tests__/data-table.service.test.ts
new file mode 100644
index 00000000000..da5eb7c9738
--- /dev/null
+++ b/packages/cli/src/modules/data-table/__tests__/data-table.service.test.ts
@@ -0,0 +1,365 @@
+import { mockInstance, testModules } from '@n8n/backend-test-utils';
+import type { RenameDataTableColumnDto } from '@n8n/api-types';
+import { Logger } from '@n8n/backend-common';
+import { ProjectRelationRepository } from '@n8n/db';
+
+import { CsvParserService } from '../csv-parser.service';
+import type { DataTableColumn } from '../data-table-column.entity';
+import { DataTableColumnRepository } from '../data-table-column.repository';
+import { DataTableFileCleanupService } from '../data-table-file-cleanup.service';
+import { DataTableRowsRepository } from '../data-table-rows.repository';
+import { DataTableSizeValidator } from '../data-table-size-validator.service';
+import type { DataTable } from '../data-table.entity';
+import { DataTableRepository } from '../data-table.repository';
+import { DataTableService } from '../data-table.service';
+import { DataTableColumnNotFoundError } from '../errors/data-table-column-not-found.error';
+import { DataTableNotFoundError } from '../errors/data-table-not-found.error';
+import { RoleService } from '@/services/role.service';
+
+describe('DataTableService', () => {
+	let dataTableService: DataTableService;
+	let mockDataTableRepository: jest.Mocked<DataTableRepository>;
+	let mockDataTableColumnRepository: jest.Mocked<DataTableColumnRepository>;
+	let mockDataTableRowsRepository: jest.Mocked<DataTableRowsRepository>;
+	let mockLogger: jest.Mocked<Logger>;
+	let mockDataTableSizeValidator: jest.Mocked<DataTableSizeValidator>;
+	let mockProjectRelationRepository: jest.Mocked<ProjectRelationRepository>;
+	let mockRoleService: jest.Mocked<RoleService>;
+	let mockCsvParserService: jest.Mocked<CsvParserService>;
+	let mockFileCleanupService: jest.Mocked<DataTableFileCleanupService>;
+
+	beforeAll(async () => {
+		await testModules.loadModules(['data-table']);
+	});
+
+	beforeEach(() => {
+		mockDataTableRepository = mockInstance(DataTableRepository);
+		mockDataTableColumnRepository = mockInstance(DataTableColumnRepository);
+		mockDataTableRowsRepository = mockInstance(DataTableRowsRepository);
+		mockLogger = mockInstance(Logger);
+		mockDataTableSizeValidator = mockInstance(DataTableSizeValidator);
+		mockProjectRelationRepository = mockInstance(ProjectRelationRepository);
+		mockRoleService = mockInstance(RoleService);
+		mockCsvParserService = mockInstance(CsvParserService);
+		mockFileCleanupService = mockInstance(DataTableFileCleanupService);
+
+		// Mock the logger.scoped method to return the logger itself
+		mockLogger.scoped = jest.fn().mockReturnValue(mockLogger);
+
+		dataTableService = new DataTableService(
+			mockDataTableRepository,
+			mockDataTableColumnRepository,
+			mockDataTableRowsRepository,
+			mockLogger,
+			mockDataTableSizeValidator,
+			mockProjectRelationRepository,
+			mockRoleService,
+			mockCsvParserService,
+			mockFileCleanupService,
+		);
+
+		jest.clearAllMocks();
+	});
+
+	describe('renameColumn', () => {
+		const projectId = 'test-project-id';
+		const dataTableId = 'test-data-table-id';
+		const columnId = 'test-column-id';
+
+		const mockDataTable: DataTable = {
+			id: dataTableId,
+			name: 'Test Table',
+			projectId,
+		} as DataTable;
+
+		const mockColumn: DataTableColumn = {
+			id: columnId,
+			name: 'old_column_name',
+			type: 'string',
+			index: 0,
+			dataTableId,
+		} as DataTableColumn;
+
+		const renameDto: RenameDataTableColumnDto = {
+			name: 'new_column_name',
+		};
+
+		describe('successful rename', () => {
+			it('should rename column when data table and column exist', async () => {
+				// Arrange
+				const renamedColumn = { ...mockColumn, name: renameDto.name };
+
+				mockDataTableRepository.findOneBy.mockResolvedValue(mockDataTable);
+				mockDataTableColumnRepository.findOneBy.mockResolvedValue(mockColumn);
+				mockDataTableColumnRepository.renameColumn.mockResolvedValue(renamedColumn);
+
+				// Act
+				const result = await dataTableService.renameColumn(
+					dataTableId,
+					projectId,
+					columnId,
+					renameDto,
+				);
+
+				// Assert
+				expect(result).toEqual(renamedColumn);
+				expect(mockDataTableRepository.findOneBy).toHaveBeenCalledWith({
+					id: dataTableId,
+					project: {
+						id: projectId,
+					},
+				});
+				expect(mockDataTableColumnRepository.findOneBy).toHaveBeenCalledWith({
+					id: columnId,
+					dataTableId,
+				});
+				expect(mockDataTableColumnRepository.renameColumn).toHaveBeenCalledWith(
+					dataTableId,
+					mockColumn,
+					renameDto.name,
+				);
+			});
+
+			it('should call repository methods in correct order', async () => {
+				// Arrange
+				const renamedColumn = { ...mockColumn, name: renameDto.name };
+				const callOrder: string[] = [];
+
+				mockDataTableRepository.findOneBy.mockImplementation(async () => {
+					callOrder.push('validateDataTableExists');
+					return mockDataTable;
+				});
+
+				mockDataTableColumnRepository.findOneBy.mockImplementation(async () => {
+					callOrder.push('validateColumnExists');
+					return mockColumn;
+				});
+
+				mockDataTableColumnRepository.renameColumn.mockImplementation(async () => {
+					callOrder.push('renameColumn');
+					return renamedColumn;
+				});
+
+				// Act
+				await dataTableService.renameColumn(dataTableId, projectId, columnId, renameDto);
+
+				// Assert
+				expect(callOrder).toEqual([
+					'validateDataTableExists',
+					'validateColumnExists',
+					'renameColumn',
+				]);
+			});
+		});
+
+		describe('validation errors', () => {
+			it('should throw DataTableNotFoundError when data table does not exist', async () => {
+				// Arrange
+				mockDataTableRepository.findOneBy.mockResolvedValue(null);
+
+				// Act & Assert
+				await expect(
+					dataTableService.renameColumn(dataTableId, projectId, columnId, renameDto),
+				).rejects.toThrow(DataTableNotFoundError);
+
+				await expect(
+					dataTableService.renameColumn(dataTableId, projectId, columnId, renameDto),
+				).rejects.toThrow(`Could not find the data table: '${dataTableId}'`);
+
+				// Verify that column validation and rename were not called
+				expect(mockDataTableColumnRepository.findOneBy).not.toHaveBeenCalled();
+				expect(mockDataTableColumnRepository.renameColumn).not.toHaveBeenCalled();
+			});
+
+			it('should throw DataTableNotFoundError when data table exists but belongs to different project', async () => {
+				// Arrange
+				const differentProjectId = 'different-project-id';
+				mockDataTableRepository.findOneBy.mockResolvedValue(null);
+
+				// Act & Assert
+				await expect(
+					dataTableService.renameColumn(dataTableId, differentProjectId, columnId, renameDto),
+				).rejects.toThrow(DataTableNotFoundError);
+
+				// Verify that the repository was called with the correct project filter
+				expect(mockDataTableRepository.findOneBy).toHaveBeenCalledWith({
+					id: dataTableId,
+					project: {
+						id: differentProjectId,
+					},
+				});
+			});
+
+			it('should throw DataTableColumnNotFoundError when column does not exist', async () => {
+				// Arrange
+				mockDataTableRepository.findOneBy.mockResolvedValue(mockDataTable);
+				mockDataTableColumnRepository.findOneBy.mockResolvedValue(null);
+
+				// Act & Assert
+				await expect(
+					dataTableService.renameColumn(dataTableId, projectId, columnId, renameDto),
+				).rejects.toThrow(DataTableColumnNotFoundError);
+
+				await expect(
+					dataTableService.renameColumn(dataTableId, projectId, columnId, renameDto),
+				).rejects.toThrow(
+					`Could not find the column '${columnId}' in the data table: ${dataTableId}`,
+				);
+
+				// Verify that data table validation was called but rename was not
+				expect(mockDataTableRepository.findOneBy).toHaveBeenCalled();
+				expect(mockDataTableColumnRepository.renameColumn).not.toHaveBeenCalled();
+			});
+
+			it('should throw DataTableColumnNotFoundError when column exists but belongs to different data table', async () => {
+				// Arrange
+				const differentDataTableId = 'different-table-id';
+				mockDataTableRepository.findOneBy.mockResolvedValue(mockDataTable);
+				mockDataTableColumnRepository.findOneBy.mockResolvedValue(null);
+
+				// Act & Assert
+				await expect(
+					dataTableService.renameColumn(differentDataTableId, projectId, columnId, renameDto),
+				).rejects.toThrow(DataTableColumnNotFoundError);
+
+				// Verify that the repository was called with the correct table filter
+				expect(mockDataTableColumnRepository.findOneBy).toHaveBeenCalledWith({
+					id: columnId,
+					dataTableId: differentDataTableId,
+				});
+			});
+		});
+
+		describe('validation order', () => {
+			it('should validate data table existence before validating column existence', async () => {
+				// Arrange
+				mockDataTableRepository.findOneBy.mockResolvedValue(null);
+				mockDataTableColumnRepository.findOneBy.mockResolvedValue(mockColumn);
+
+				// Act & Assert
+				await expect(
+					dataTableService.renameColumn(dataTableId, projectId, columnId, renameDto),
+				).rejects.toThrow(DataTableNotFoundError);
+
+				// Column validation should not be called if table validation fails
+				expect(mockDataTableRepository.findOneBy).toHaveBeenCalled();
+				expect(mockDataTableColumnRepository.findOneBy).not.toHaveBeenCalled();
+			});
+
+			it('should validate column existence before calling rename', async () => {
+				// Arrange
+				mockDataTableRepository.findOneBy.mockResolvedValue(mockDataTable);
+				mockDataTableColumnRepository.findOneBy.mockResolvedValue(null);
+
+				// Act & Assert
+				await expect(
+					dataTableService.renameColumn(dataTableId, projectId, columnId, renameDto),
+				).rejects.toThrow(DataTableColumnNotFoundError);
+
+				// Rename should not be called if column validation fails
+				expect(mockDataTableColumnRepository.renameColumn).not.toHaveBeenCalled();
+			});
+		});
+
+		describe('error propagation from repository', () => {
+			it('should propagate errors from dataTableColumnRepository.renameColumn', async () => {
+				// Arrange
+				const repositoryError = new Error('Database constraint violation');
+
+				mockDataTableRepository.findOneBy.mockResolvedValue(mockDataTable);
+				mockDataTableColumnRepository.findOneBy.mockResolvedValue(mockColumn);
+				mockDataTableColumnRepository.renameColumn.mockRejectedValue(repositoryError);
+
+				// Act & Assert
+				await expect(
+					dataTableService.renameColumn(dataTableId, projectId, columnId, renameDto),
+				).rejects.toThrow(repositoryError);
+
+				// Verify that all validations were performed before the error
+				expect(mockDataTableRepository.findOneBy).toHaveBeenCalled();
+				expect(mockDataTableColumnRepository.findOneBy).toHaveBeenCalled();
+				expect(mockDataTableColumnRepository.renameColumn).toHaveBeenCalled();
+			});
+		});
+
+		describe('edge cases', () => {
+			it('should handle empty column name in DTO', async () => {
+				// Arrange
+				const emptyNameDto: RenameDataTableColumnDto = { name: '' };
+				const renamedColumn = { ...mockColumn, name: '' };
+
+				mockDataTableRepository.findOneBy.mockResolvedValue(mockDataTable);
+				mockDataTableColumnRepository.findOneBy.mockResolvedValue(mockColumn);
+				mockDataTableColumnRepository.renameColumn.mockResolvedValue(renamedColumn);
+
+				// Act
+				const result = await dataTableService.renameColumn(
+					dataTableId,
+					projectId,
+					columnId,
+					emptyNameDto,
+				);
+
+				// Assert
+				expect(mockDataTableColumnRepository.renameColumn).toHaveBeenCalledWith(
+					dataTableId,
+					mockColumn,
+					'',
+				);
+				expect(result.name).toBe('');
+			});
+
+			it('should handle renaming to same name', async () => {
+				// Arrange
+				const sameNameDto: RenameDataTableColumnDto = { name: mockColumn.name };
+				const renamedColumn = { ...mockColumn, name: mockColumn.name };
+
+				mockDataTableRepository.findOneBy.mockResolvedValue(mockDataTable);
+				mockDataTableColumnRepository.findOneBy.mockResolvedValue(mockColumn);
+				mockDataTableColumnRepository.renameColumn.mockResolvedValue(renamedColumn);
+
+				// Act
+				const result = await dataTableService.renameColumn(
+					dataTableId,
+					projectId,
+					columnId,
+					sameNameDto,
+				);
+
+				// Assert
+				expect(mockDataTableColumnRepository.renameColumn).toHaveBeenCalledWith(
+					dataTableId,
+					mockColumn,
+					mockColumn.name,
+				);
+				expect(result.name).toBe(mockColumn.name);
+			});
+
+			it('should handle special characters in new column name', async () => {
+				// Arrange
+				const specialCharDto: RenameDataTableColumnDto = { name: 'column_with_special@chars!' };
+				const renamedColumn = { ...mockColumn, name: specialCharDto.name };
+
+				mockDataTableRepository.findOneBy.mockResolvedValue(mockDataTable);
+				mockDataTableColumnRepository.findOneBy.mockResolvedValue(mockColumn);
+				mockDataTableColumnRepository.renameColumn.mockResolvedValue(renamedColumn);
+
+				// Act
+				const result = await dataTableService.renameColumn(
+					dataTableId,
+					projectId,
+					columnId,
+					specialCharDto,
+				);
+
+				// Assert
+				expect(mockDataTableColumnRepository.renameColumn).toHaveBeenCalledWith(
+					dataTableId,
+					mockColumn,
+					specialCharDto.name,
+				);
+				expect(result.name).toBe(specialCharDto.name);
+			});
+		});
+	});
+});
diff --git a/packages/cli/src/modules/data-table/data-table-column.repository.ts b/packages/cli/src/modules/data-table/data-table-column.repository.ts
index 22bcde279a9..a6e830ef8a4 100644
--- a/packages/cli/src/modules/data-table/data-table-column.repository.ts
+++ b/packages/cli/src/modules/data-table/data-table-column.repository.ts
@@ -24,6 +24,40 @@ export class DataTableColumnRepository extends Repository<DataTableColumn> {
 		super(DataTableColumn, dataSource.manager);
 	}
 
+	/**
+	 * Validates that a column name is not reserved as a system column
+	 */
+	private validateNotSystemColumn(columnName: string): void {
+		if (DATA_TABLE_SYSTEM_COLUMNS.includes(columnName)) {
+			throw new DataTableSystemColumnNameConflictError(columnName);
+		}
+		if (columnName === DATA_TABLE_SYSTEM_TESTING_COLUMN) {
+			throw new DataTableSystemColumnNameConflictError(columnName, 'testing');
+		}
+	}
+
+	/**
+	 * Validates that a column name is unique within a data table
+	 */
+	private async validateUniqueColumnName(
+		columnName: string,
+		dataTableId: string,
+		em: EntityManager,
+	): Promise<void> {
+		const existingColumnMatch = await em.existsBy(DataTableColumn, {
+			name: columnName,
+			dataTableId,
+		});
+
+		if (existingColumnMatch) {
+			const dataTable = await em.findOneBy(DataTable, { id: dataTableId });
+			if (!dataTable) {
+				throw new UnexpectedError('Data table not found');
+			}
+			throw new DataTableColumnNameConflictError(columnName, dataTable.name);
+		}
+	}
+
 	async getColumns(dataTableId: string, trx?: EntityManager) {
 		return await withTransaction(
 			this.manager,
@@ -46,25 +80,8 @@ export class DataTableColumnRepository extends Repository<DataTableColumn> {
 
 	async addColumn(dataTableId: string, schema: DataTableCreateColumnSchema, trx?: EntityManager) {
 		return await withTransaction(this.manager, trx, async (em) => {
-			if (DATA_TABLE_SYSTEM_COLUMNS.includes(schema.name)) {
-				throw new DataTableSystemColumnNameConflictError(schema.name);
-			}
-			if (schema.name === DATA_TABLE_SYSTEM_TESTING_COLUMN) {
-				throw new DataTableSystemColumnNameConflictError(schema.name, 'testing');
-			}
-
-			const existingColumnMatch = await em.existsBy(DataTableColumn, {
-				name: schema.name,
-				dataTableId,
-			});
-
-			if (existingColumnMatch) {
-				const dataTable = await em.findOneBy(DataTable, { id: dataTableId });
-				if (!dataTable) {
-					throw new UnexpectedError('Data table not found');
-				}
-				throw new DataTableColumnNameConflictError(schema.name, dataTable.name);
-			}
+			this.validateNotSystemColumn(schema.name);
+			await this.validateUniqueColumnName(schema.name, dataTableId, em);
 
 			if (schema.index === undefined) {
 				const columns = await this.getColumns(dataTableId, em);
@@ -125,6 +142,32 @@ export class DataTableColumnRepository extends Repository<DataTableColumn> {
 		});
 	}
 
+	async renameColumn(
+		dataTableId: string,
+		column: DataTableColumn,
+		newName: string,
+		trx?: EntityManager,
+	) {
+		return await withTransaction(this.manager, trx, async (em) => {
+			this.validateNotSystemColumn(newName);
+			await this.validateUniqueColumnName(newName, dataTableId, em);
+
+			const oldName = column.name;
+
+			await em.update(DataTableColumn, { id: column.id }, { name: newName });
+
+			await this.ddlService.renameColumn(
+				dataTableId,
+				oldName,
+				newName,
+				em.connection.options.type,
+				em,
+			);
+
+			return { ...column, name: newName };
+		});
+	}
+
 	async shiftColumns(dataTableId: string, lowestIndex: number, delta: -1 | 1, trx?: EntityManager) {
 		await withTransaction(this.manager, trx, async (em) => {
 			await em
diff --git a/packages/cli/src/modules/data-table/data-table-ddl.service.ts b/packages/cli/src/modules/data-table/data-table-ddl.service.ts
index 0d46ea1d179..5c7016145ee 100644
--- a/packages/cli/src/modules/data-table/data-table-ddl.service.ts
+++ b/packages/cli/src/modules/data-table/data-table-ddl.service.ts
@@ -4,7 +4,13 @@ import { DataSource, DataSourceOptions, EntityManager } from '@n8n/typeorm';
 import { UnexpectedError } from 'n8n-workflow';
 
 import { DataTableColumn } from './data-table-column.entity';
-import { addColumnQuery, deleteColumnQuery, toDslColumns, toTableName } from './utils/sql-utils';
+import {
+	addColumnQuery,
+	deleteColumnQuery,
+	renameColumnQuery,
+	toDslColumns,
+	toTableName,
+} from './utils/sql-utils';
 
 /**
  * Manages database schema operations for data tables (DDL).
@@ -63,4 +69,18 @@ export class DataTableDDLService {
 			await em.query(deleteColumnQuery(toTableName(dataTableId), columnName, dbType));
 		});
 	}
+
+	async renameColumn(
+		dataTableId: string,
+		oldColumnName: string,
+		newColumnName: string,
+		dbType: DataSourceOptions['type'],
+		trx?: EntityManager,
+	) {
+		await withTransaction(this.dataSource.manager, trx, async (em) => {
+			await em.query(
+				renameColumnQuery(toTableName(dataTableId), oldColumnName, newColumnName, dbType),
+			);
+		});
+	}
 }
diff --git a/packages/cli/src/modules/data-table/data-table.controller.ts b/packages/cli/src/modules/data-table/data-table.controller.ts
index b315c7666f8..0b67082e2e3 100644
--- a/packages/cli/src/modules/data-table/data-table.controller.ts
+++ b/packages/cli/src/modules/data-table/data-table.controller.ts
@@ -6,6 +6,7 @@ import {
 	ListDataTableContentQueryDto,
 	ListDataTableQueryDto,
 	MoveDataTableColumnDto,
+	RenameDataTableColumnDto,
 	UpdateDataTableDto,
 	UpdateDataTableRowDto,
 	UpsertDataTableRowDto,
@@ -26,6 +27,7 @@ import {
 import { NextFunction, Response } from 'express';
 import { DataTableRowReturn } from 'n8n-workflow';
 
+import { ResponseError } from '@/errors/response-errors/abstract/response.error';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 import { ConflictError } from '@/errors/response-errors/conflict.error';
 import { InternalServerError } from '@/errors/response-errors/internal-server.error';
@@ -33,7 +35,6 @@ import { NotFoundError } from '@/errors/response-errors/not-found.error';
 
 import { DataTableService } from './data-table.service';
 import { DataTableColumnNameConflictError } from './errors/data-table-column-name-conflict.error';
-import { DataTableColumnNotFoundError } from './errors/data-table-column-not-found.error';
 import { DataTableNameConflictError } from './errors/data-table-name-conflict.error';
 import { DataTableNotFoundError } from './errors/data-table-not-found.error';
 import { DataTableSystemColumnNameConflictError } from './errors/data-table-system-column-name-conflict.error';
@@ -47,6 +48,26 @@ export class DataTableController {
 		private readonly projectService: ProjectService,
 	) {}
 
+	private handleDataTableColumnOperationError(e: unknown): never {
+		if (
+			e instanceof DataTableColumnNameConflictError ||
+			e instanceof DataTableSystemColumnNameConflictError ||
+			e instanceof DataTableNameConflictError
+		) {
+			throw new ConflictError(e.message);
+		}
+		if (e instanceof DataTableValidationError) {
+			throw new BadRequestError(e.message);
+		}
+		if (e instanceof ResponseError) {
+			throw e;
+		}
+		if (e instanceof Error) {
+			throw new InternalServerError(e.message, e);
+		}
+		throw e;
+	}
+
 	@Middleware()
 	async validateProjectExists(
 		req: AuthenticatedRequest<{ projectId: string }>,
@@ -171,18 +192,7 @@ export class DataTableController {
 		try {
 			return await this.dataTableService.addColumn(dataTableId, req.params.projectId, dto);
 		} catch (e: unknown) {
-			if (e instanceof DataTableNotFoundError) {
-				throw new NotFoundError(e.message);
-			} else if (
-				e instanceof DataTableColumnNameConflictError ||
-				e instanceof DataTableSystemColumnNameConflictError
-			) {
-				throw new ConflictError(e.message);
-			} else if (e instanceof Error) {
-				throw new InternalServerError(e.message, e);
-			} else {
-				throw e;
-			}
+			this.handleDataTableColumnOperationError(e);
 		}
 	}
 
@@ -197,13 +207,7 @@ export class DataTableController {
 		try {
 			return await this.dataTableService.deleteColumn(dataTableId, req.params.projectId, columnId);
 		} catch (e: unknown) {
-			if (e instanceof DataTableNotFoundError || e instanceof DataTableColumnNotFoundError) {
-				throw new NotFoundError(e.message);
-			} else if (e instanceof Error) {
-				throw new InternalServerError(e.message, e);
-			} else {
-				throw e;
-			}
+			this.handleDataTableColumnOperationError(e);
 		}
 	}
 
@@ -224,15 +228,28 @@ export class DataTableController {
 				dto,
 			);
 		} catch (e: unknown) {
-			if (e instanceof DataTableNotFoundError || e instanceof DataTableColumnNotFoundError) {
-				throw new NotFoundError(e.message);
-			} else if (e instanceof DataTableValidationError) {
-				throw new BadRequestError(e.message);
-			} else if (e instanceof Error) {
-				throw new InternalServerError(e.message, e);
-			} else {
-				throw e;
-			}
+			this.handleDataTableColumnOperationError(e);
+		}
+	}
+
+	@Patch('/:dataTableId/columns/:columnId/rename')
+	@ProjectScope('dataTable:update')
+	async renameColumn(
+		req: AuthenticatedRequest<{ projectId: string }>,
+		_res: Response,
+		@Param('dataTableId') dataTableId: string,
+		@Param('columnId') columnId: string,
+		@Body dto: RenameDataTableColumnDto,
+	) {
+		try {
+			return await this.dataTableService.renameColumn(
+				dataTableId,
+				req.params.projectId,
+				columnId,
+				dto,
+			);
+		} catch (e: unknown) {
+			this.handleDataTableColumnOperationError(e);
 		}
 	}
 
diff --git a/packages/cli/src/modules/data-table/data-table.service.ts b/packages/cli/src/modules/data-table/data-table.service.ts
index 5ce91ef8226..7f4b955e40a 100644
--- a/packages/cli/src/modules/data-table/data-table.service.ts
+++ b/packages/cli/src/modules/data-table/data-table.service.ts
@@ -4,6 +4,7 @@ import type {
 	DeleteDataTableRowsDto,
 	ListDataTableContentQueryDto,
 	MoveDataTableColumnDto,
+	RenameDataTableColumnDto,
 	DataTableListOptions,
 	UpsertDataTableRowDto,
 	UpdateDataTableDto,
@@ -203,6 +204,18 @@ export class DataTableService {
 		return true;
 	}
 
+	async renameColumn(
+		dataTableId: string,
+		projectId: string,
+		columnId: string,
+		dto: RenameDataTableColumnDto,
+	) {
+		await this.validateDataTableExists(dataTableId, projectId);
+		const existingColumn = await this.validateColumnExists(dataTableId, columnId);
+
+		return await this.dataTableColumnRepository.renameColumn(dataTableId, existingColumn, dto.name);
+	}
+
 	async getManyAndCount(options: DataTableListOptions) {
 		return await this.dataTableRepository.getManyAndCount(options);
 	}
diff --git a/packages/cli/src/modules/data-table/errors/data-table-column-not-found.error.ts b/packages/cli/src/modules/data-table/errors/data-table-column-not-found.error.ts
index e874731534c..8c59716dfc6 100644
--- a/packages/cli/src/modules/data-table/errors/data-table-column-not-found.error.ts
+++ b/packages/cli/src/modules/data-table/errors/data-table-column-not-found.error.ts
@@ -1,9 +1,7 @@
-import { UserError } from 'n8n-workflow';
+import { NotFoundError } from '@/errors/response-errors/not-found.error';
 
-export class DataTableColumnNotFoundError extends UserError {
+export class DataTableColumnNotFoundError extends NotFoundError {
 	constructor(dataTableId: string, columnId: string) {
-		super(`Could not find the column '${columnId}' in the data table: ${dataTableId}`, {
-			level: 'warning',
-		});
+		super(`Could not find the column '${columnId}' in the data table: ${dataTableId}`);
 	}
 }
diff --git a/packages/cli/src/modules/data-table/errors/data-table-not-found.error.ts b/packages/cli/src/modules/data-table/errors/data-table-not-found.error.ts
index 3640bc20aeb..83589c09573 100644
--- a/packages/cli/src/modules/data-table/errors/data-table-not-found.error.ts
+++ b/packages/cli/src/modules/data-table/errors/data-table-not-found.error.ts
@@ -1,9 +1,7 @@
-import { UserError } from 'n8n-workflow';
+import { NotFoundError } from '@/errors/response-errors/not-found.error';
 
-export class DataTableNotFoundError extends UserError {
+export class DataTableNotFoundError extends NotFoundError {
 	constructor(dataTableId: string) {
-		super(`Could not find the data table: '${dataTableId}'`, {
-			level: 'warning',
-		});
+		super(`Could not find the data table: '${dataTableId}'`);
 	}
 }
diff --git a/packages/cli/src/modules/data-table/utils/sql-utils.ts b/packages/cli/src/modules/data-table/utils/sql-utils.ts
index 35e58df82ee..a478823fc96 100644
--- a/packages/cli/src/modules/data-table/utils/sql-utils.ts
+++ b/packages/cli/src/modules/data-table/utils/sql-utils.ts
@@ -106,6 +106,23 @@ export function deleteColumnQuery(
 	return `ALTER TABLE ${quotedTableName} DROP COLUMN ${quoteIdentifier(column, dbType)}`;
 }
 
+export function renameColumnQuery(
+	tableName: DataTableUserTableName,
+	oldColumnName: string,
+	newColumnName: string,
+	dbType: DataSourceOptions['type'],
+): string {
+	if (!isValidColumnName(oldColumnName) || !isValidColumnName(newColumnName)) {
+		throw new UnexpectedError(DATA_TABLE_COLUMN_ERROR_MESSAGE);
+	}
+
+	const quotedTableName = quoteIdentifier(tableName, dbType);
+	const quotedOldName = quoteIdentifier(oldColumnName, dbType);
+	const quotedNewName = quoteIdentifier(newColumnName, dbType);
+
+	return `ALTER TABLE ${quotedTableName} RENAME COLUMN ${quotedOldName} TO ${quotedNewName}`;
+}
+
 export function quoteIdentifier(name: string, dbType: DataSourceOptions['type']): string {
 	switch (dbType) {
 		case 'mysql':
diff --git a/packages/frontend/@n8n/i18n/src/locales/en.json b/packages/frontend/@n8n/i18n/src/locales/en.json
index d859015d0a6..cbffe12e6e1 100644
--- a/packages/frontend/@n8n/i18n/src/locales/en.json
+++ b/packages/frontend/@n8n/i18n/src/locales/en.json
@@ -3470,13 +3470,15 @@
 	"dataTable.addColumn.nameInput.placeholder": "Enter column name",
 	"dataTable.addColumn.typeInput.label": "@:_reusableBaseText.type",
 	"dataTable.addColumn.error": "Error adding column",
-	"dataTable.addColumn.alreadyExistsError": "This column already exists",
+	"dataTable.column.alreadyExistsError": "This column already exists",
 	"dataTable.moveColumn.error": "Error moving column",
 	"dataTable.deleteColumn.error": "Error deleting column",
 	"dataTable.deleteColumn.confirm.title": "Delete column",
 	"dataTable.deleteColumn.confirm.message": "Are you sure you want to delete the column '{name}'? This action cannot be undone.",
 	"dataTable.addColumn.invalidName.error": "Invalid column name",
 	"dataTable.addColumn.invalidName.description": "Column names must begin with a letter and can only include letters, numbers, or underscores",
+	"dataTable.renameColumn.label": "Rename column",
+	"dataTable.renameColumn.error": "Error renaming column",
 	"dataTable.fetchContent.error": "Error fetching data table content",
 	"dataTable.addRow.label": "Add Row",
 	"dataTable.addRow.error": "Error adding row",
diff --git a/packages/frontend/editor-ui/src/features/core/dataTable/components/dataGrid/AddColumnButton.test.ts b/packages/frontend/editor-ui/src/features/core/dataTable/components/dataGrid/AddColumnButton.test.ts
index 18e83838671..ff0c5093121 100644
--- a/packages/frontend/editor-ui/src/features/core/dataTable/components/dataGrid/AddColumnButton.test.ts
+++ b/packages/frontend/editor-ui/src/features/core/dataTable/components/dataGrid/AddColumnButton.test.ts
@@ -45,7 +45,7 @@ vi.mock('@n8n/i18n', async (importOriginal) => ({
 				'dataTable.addColumn.invalidName.description':
 					'Column names must start with a letter and contain only letters, numbers, and hyphens',
 				'dataTable.addColumn.error': 'Error adding column',
-				'dataTable.addColumn.alreadyExistsError': `Column "${options?.interpolate?.name}" already exists`,
+				'dataTable.column.alreadyExistsError': `Column "${options?.interpolate?.name}" already exists`,
 				'dataTable.addColumn.systemColumnDescription': 'This is a system column',
 				'dataTable.addColumn.testingColumnDescription': 'This is a testing column',
 				'dataTable.addColumn.alreadyExistsDescription': 'Column already exists',
diff --git a/packages/frontend/editor-ui/src/features/core/dataTable/components/dataGrid/AddColumnButton.vue b/packages/frontend/editor-ui/src/features/core/dataTable/components/dataGrid/AddColumnButton.vue
index 8ba00781845..0a8cfa607e2 100644
--- a/packages/frontend/editor-ui/src/features/core/dataTable/components/dataGrid/AddColumnButton.vue
+++ b/packages/frontend/editor-ui/src/features/core/dataTable/components/dataGrid/AddColumnButton.vue
@@ -80,7 +80,7 @@ const onAddButtonClicked = async () => {
 		let errorDescription = response.errorMessage;
 		// Provide custom error message for conflict (column already exists)
 		if (response.httpStatus === 409) {
-			errorMessage = i18n.baseText('dataTable.addColumn.alreadyExistsError', {
+			errorMessage = i18n.baseText('dataTable.column.alreadyExistsError', {
 				interpolate: { name: columnName.value },
 			});
 			errorDescription = response.errorMessage?.includes('system')
diff --git a/packages/frontend/editor-ui/src/features/core/dataTable/components/dataGrid/ColumnHeader.test.ts b/packages/frontend/editor-ui/src/features/core/dataTable/components/dataGrid/ColumnHeader.test.ts
index 466e0bb8833..9f6acf40ec4 100644
--- a/packages/frontend/editor-ui/src/features/core/dataTable/components/dataGrid/ColumnHeader.test.ts
+++ b/packages/frontend/editor-ui/src/features/core/dataTable/components/dataGrid/ColumnHeader.test.ts
@@ -80,4 +80,200 @@ describe('ColumnHeader', () => {
 		await userEvent.click(getByTestId('action-delete'));
 		expect(onDeleteMock).toHaveBeenCalledWith('col-1');
 	});
+
+	describe('onNameSubmit', () => {
+		it('should call onRename when valid new name is provided', async () => {
+			const onRenameMock = vi.fn();
+			const { container } = renderComponent({
+				props: {
+					params: {
+						displayName: 'Original Name',
+						column: {
+							getColId: () => 'col-1',
+							getColDef: () => ({ cellDataType: 'string' }),
+							getSort: () => null,
+						},
+						onRename: onRenameMock,
+						onDelete: onDeleteMock,
+						allowMenuActions: true,
+						api: {
+							getFilterModel: vi.fn().mockReturnValue({}),
+							addEventListener: vi.fn(),
+							removeEventListener: vi.fn(),
+						},
+					} as unknown as HeaderParamsWithDelete,
+				},
+			});
+
+			// Find the actual input element within N8nInlineTextEdit
+			const input = container.querySelector('input') as HTMLInputElement;
+			expect(input).toBeTruthy();
+
+			await userEvent.clear(input);
+			await userEvent.type(input, 'New Name{Enter}');
+
+			expect(onRenameMock).toHaveBeenCalledWith('col-1', 'New Name');
+		});
+
+		it('should trim whitespace before calling onRename', async () => {
+			const onRenameMock = vi.fn();
+			const { container } = renderComponent({
+				props: {
+					params: {
+						displayName: 'Original Name',
+						column: {
+							getColId: () => 'col-1',
+							getColDef: () => ({ cellDataType: 'string' }),
+							getSort: () => null,
+						},
+						onRename: onRenameMock,
+						onDelete: onDeleteMock,
+						allowMenuActions: true,
+						api: {
+							getFilterModel: vi.fn().mockReturnValue({}),
+							addEventListener: vi.fn(),
+							removeEventListener: vi.fn(),
+						},
+					} as unknown as HeaderParamsWithDelete,
+				},
+			});
+
+			const input = container.querySelector('input') as HTMLInputElement;
+			expect(input).toBeTruthy();
+
+			await userEvent.clear(input);
+			await userEvent.type(input, '  Trimmed Name  {Enter}');
+
+			expect(onRenameMock).toHaveBeenCalledWith('col-1', 'Trimmed Name');
+		});
+
+		it('should not call onRename when name is empty', async () => {
+			const onRenameMock = vi.fn();
+			const { container } = renderComponent({
+				props: {
+					params: {
+						displayName: 'Original Name',
+						column: {
+							getColId: () => 'col-1',
+							getColDef: () => ({ cellDataType: 'string' }),
+							getSort: () => null,
+						},
+						onRename: onRenameMock,
+						onDelete: onDeleteMock,
+						allowMenuActions: true,
+						api: {
+							getFilterModel: vi.fn().mockReturnValue({}),
+							addEventListener: vi.fn(),
+							removeEventListener: vi.fn(),
+						},
+					} as unknown as HeaderParamsWithDelete,
+				},
+			});
+
+			const input = container.querySelector('input') as HTMLInputElement;
+			expect(input).toBeTruthy();
+
+			await userEvent.clear(input);
+			await fireEvent.blur(input);
+
+			expect(onRenameMock).not.toHaveBeenCalled();
+		});
+
+		it('should not call onRename when name is only whitespace', async () => {
+			const onRenameMock = vi.fn();
+			const { container } = renderComponent({
+				props: {
+					params: {
+						displayName: 'Original Name',
+						column: {
+							getColId: () => 'col-1',
+							getColDef: () => ({ cellDataType: 'string' }),
+							getSort: () => null,
+						},
+						onRename: onRenameMock,
+						onDelete: onDeleteMock,
+						allowMenuActions: true,
+						api: {
+							getFilterModel: vi.fn().mockReturnValue({}),
+							addEventListener: vi.fn(),
+							removeEventListener: vi.fn(),
+						},
+					} as unknown as HeaderParamsWithDelete,
+				},
+			});
+
+			const input = container.querySelector('input') as HTMLInputElement;
+			expect(input).toBeTruthy();
+
+			await userEvent.clear(input);
+			await userEvent.type(input, '   ');
+			await fireEvent.blur(input);
+
+			expect(onRenameMock).not.toHaveBeenCalled();
+		});
+
+		it('should not call onRename when name is unchanged', async () => {
+			const onRenameMock = vi.fn();
+			const { container } = renderComponent({
+				props: {
+					params: {
+						displayName: 'Original Name',
+						column: {
+							getColId: () => 'col-1',
+							getColDef: () => ({ cellDataType: 'string' }),
+							getSort: () => null,
+						},
+						onRename: onRenameMock,
+						onDelete: onDeleteMock,
+						allowMenuActions: true,
+						api: {
+							getFilterModel: vi.fn().mockReturnValue({}),
+							addEventListener: vi.fn(),
+							removeEventListener: vi.fn(),
+						},
+					} as unknown as HeaderParamsWithDelete,
+				},
+			});
+
+			const input = container.querySelector('input') as HTMLInputElement;
+			expect(input).toBeTruthy();
+
+			await userEvent.clear(input);
+			await userEvent.type(input, 'Original Name');
+			await fireEvent.blur(input);
+
+			expect(onRenameMock).not.toHaveBeenCalled();
+		});
+
+		it('should not call onRename when onRename callback is not provided', async () => {
+			const { container } = renderComponent({
+				props: {
+					params: {
+						displayName: 'Original Name',
+						column: {
+							getColId: () => 'col-1',
+							getColDef: () => ({ cellDataType: 'string' }),
+							getSort: () => null,
+						},
+						onDelete: onDeleteMock,
+						allowMenuActions: true,
+						api: {
+							getFilterModel: vi.fn().mockReturnValue({}),
+							addEventListener: vi.fn(),
+							removeEventListener: vi.fn(),
+						},
+					} as unknown as HeaderParamsWithDelete,
+				},
+			});
+
+			const input = container.querySelector('input') as HTMLInputElement;
+			expect(input).toBeTruthy();
+
+			await userEvent.clear(input);
+			await userEvent.type(input, 'New Name');
+
+			// Should not throw an error
+			await expect(fireEvent.blur(input)).resolves.not.toThrow();
+		});
+	});
 });
diff --git a/packages/frontend/editor-ui/src/features/core/dataTable/components/dataGrid/ColumnHeader.vue b/packages/frontend/editor-ui/src/features/core/dataTable/components/dataGrid/ColumnHeader.vue
index 42e43c36569..88d5d91c496 100644
--- a/packages/frontend/editor-ui/src/features/core/dataTable/components/dataGrid/ColumnHeader.vue
+++ b/packages/frontend/editor-ui/src/features/core/dataTable/components/dataGrid/ColumnHeader.vue
@@ -1,13 +1,15 @@
 <script setup lang="ts">
 import type { IHeaderParams, SortDirection } from 'ag-grid-community';
 import { useDataTableTypes } from '@/features/core/dataTable/composables/useDataTableTypes';
-import { ref, computed, onMounted, onUnmounted } from 'vue';
+import { ref, computed, onMounted, onUnmounted, useTemplateRef } from 'vue';
 import { useI18n } from '@n8n/i18n';
 import { isAGGridCellType } from '@/features/core/dataTable/typeGuards';
-import { N8nActionDropdown, N8nIcon, N8nIconButton } from '@n8n/design-system';
+import { N8nActionDropdown, N8nIcon, N8nIconButton, N8nInlineTextEdit } from '@n8n/design-system';
+import { DATA_TABLE_SYSTEM_COLUMNS } from 'n8n-workflow';
 
 export type HeaderParamsWithDelete = IHeaderParams & {
 	onDelete?: (columnId: string) => void;
+	onRename?: (columnId: string, newName: string) => void;
 	allowMenuActions: boolean;
 	showTypeIcon?: boolean;
 };
@@ -19,6 +21,7 @@ const props = defineProps<{
 const { getIconForType, mapToDataTableColumnType } = useDataTableTypes();
 const i18n = useI18n();
 
+const renameInput = useTemplateRef<InstanceType<typeof N8nInlineTextEdit>>('renameInput');
 const isHovered = ref(false);
 const isDropdownOpen = ref(false);
 const isFilterOpen = ref(false);
@@ -28,13 +31,32 @@ const shouldShowTypeIcon = computed(() => props.params.showTypeIcon !== false);
 const isFilterable = computed(() => props.params.column.getColDef().filter !== false);
 
 const enum ItemAction {
+	Rename = 'rename',
 	Delete = 'delete',
 }
 
+const onNameSubmit = (newName: string) => {
+	const trimmed = newName.trim();
+	if (!trimmed || trimmed === props.params.displayName) {
+		renameInput.value?.forceCancel();
+		return;
+	}
+	props.params.onRename?.(props.params.column.getColId(), trimmed);
+};
+
+const onNameToggle = (e?: Event) => {
+	e?.stopPropagation();
+	if (renameInput.value?.forceFocus && !isSystemColumn.value) {
+		renameInput.value.forceFocus();
+	}
+};
+
 const onItemClick = (action: string) => {
 	const actionEnum = action as ItemAction;
 	if (actionEnum === ItemAction.Delete) {
 		props.params.onDelete?.(props.params.column.getColId());
+	} else if (actionEnum === ItemAction.Rename) {
+		onNameToggle();
 	}
 };
 
@@ -87,14 +109,42 @@ const typeIcon = computed(() => {
 	return getIconForType(mapToDataTableColumnType(cellDataType));
 });
 
-const columnActionItems = [
-	{
+const isSystemColumn = computed(() => {
+	const columnId = props.params.column.getColId();
+	return DATA_TABLE_SYSTEM_COLUMNS.includes(columnId);
+});
+
+// Constants for width calculation
+const CHAR_WIDTH_PX = 7; // Average character width
+const PADDING_PX = 16; // Padding and cursor space
+const MIN_WIDTH_PX = 50; // Minimum width for short names
+const MAX_WIDTH_PX = 250; // Maximum width to prevent overflow
+
+const columnWidth = computed(() => {
+	const textLength = (props.params.displayName || '').length;
+	const calculatedWidth = textLength * CHAR_WIDTH_PX + PADDING_PX;
+	return Math.min(Math.max(calculatedWidth, MIN_WIDTH_PX), MAX_WIDTH_PX);
+});
+
+const columnActionItems = computed(() => {
+	const items = [];
+
+	items.push({
+		id: ItemAction.Rename,
+		label: i18n.baseText('dataTable.renameColumn.label'),
+		icon: 'pen',
+		customClass: 'data-table-column-header-action-item',
+	} as const);
+
+	items.push({
 		id: ItemAction.Delete,
 		label: i18n.baseText('dataTable.deleteColumn.confirm.title'),
 		icon: 'trash-2',
 		customClass: 'data-table-column-header-action-item',
-	} as const,
-];
+	} as const);
+
+	return items;
+});
 
 const isSortable = computed(() => {
 	return props.params.column.getColDef().sortable;
@@ -158,9 +208,22 @@ onUnmounted(() => {
 	>
 		<div class="data-table-column-header-icon-wrapper">
 			<N8nIcon v-if="typeIcon" :icon="typeIcon" />
-			<span class="ag-header-cell-text" data-test-id="data-table-column-header-text">{{
-				props.params.displayName
-			}}</span>
+			<N8nInlineTextEdit
+				v-if="!isSystemColumn"
+				ref="renameInput"
+				:model-value="props.params.displayName"
+				:max-width="columnWidth"
+				:read-only="false"
+				:disabled="false"
+				class="ag-header-cell-text"
+				data-test-id="data-table-column-header-text"
+				@update:model-value="onNameSubmit"
+				@click="onNameToggle"
+				@keydown.stop
+			/>
+			<span v-else class="ag-header-cell-text" data-test-id="data-table-column-header-text">
+				{{ props.params.displayName }}
+			</span>
 
 			<div v-if="showSortIndicator" class="sort-indicator">
 				<N8nIcon v-if="currentSort === 'asc'" icon="arrow-up" class="sort-icon-active" />
@@ -216,6 +279,15 @@ onUnmounted(() => {
 	align-items: center;
 	gap: var(--spacing--2xs);
 	min-width: 0;
+
+	.n8n-icon,
+	.n8n-inline-text-edit,
+	.ag-header-cell-text {
+		display: inline-flex;
+		align-items: center;
+		vertical-align: middle;
+		line-height: 1;
+	}
 }
 
 .data-table-column-header-icon-wrapper .n8n-icon {
@@ -225,6 +297,12 @@ onUnmounted(() => {
 .ag-header-cell-text {
 	@include mixins.utils-ellipsis;
 	min-width: 0;
+
+	// Remove overflow hidden when inline edit is active to show border
+	&.n8n-inline-text-edit--active,
+	&:focus-within {
+		overflow: visible;
+	}
 }
 
 .sort-indicator {
diff --git a/packages/frontend/editor-ui/src/features/core/dataTable/components/dataGrid/DataTableTable.vue b/packages/frontend/editor-ui/src/features/core/dataTable/components/dataGrid/DataTableTable.vue
index 286696137ba..04794f181c6 100644
--- a/packages/frontend/editor-ui/src/features/core/dataTable/components/dataGrid/DataTableTable.vue
+++ b/packages/frontend/editor-ui/src/features/core/dataTable/components/dataGrid/DataTableTable.vue
@@ -56,6 +56,7 @@ const agGrid = useAgGrid<DataTableRow>({
 
 const dataTableColumns = useDataTableColumns({
 	onDeleteColumn: onDeleteColumnFunction,
+	onRenameColumn: onRenameColumnFunction,
 	onAddRowClick: onAddRowClickFunction,
 	onAddColumn: onAddColumnFunction,
 	isTextEditorOpen: agGrid.isTextEditorOpen,
@@ -112,6 +113,10 @@ async function onDeleteColumnFunction(columnId: string) {
 	await dataTableOperations.onDeleteColumn(columnId);
 }
 
+async function onRenameColumnFunction(columnId: string, columnName: string) {
+	await dataTableOperations.onRenameColumn(columnId, columnName);
+}
+
 async function onAddColumnFunction(column: DataTableColumnCreatePayload) {
 	return await dataTableOperations.onAddColumn(column);
 }
diff --git a/packages/frontend/editor-ui/src/features/core/dataTable/composables/useDataTableColumns.test.ts b/packages/frontend/editor-ui/src/features/core/dataTable/composables/useDataTableColumns.test.ts
index 97ceb36734b..aee2f462f73 100644
--- a/packages/frontend/editor-ui/src/features/core/dataTable/composables/useDataTableColumns.test.ts
+++ b/packages/frontend/editor-ui/src/features/core/dataTable/composables/useDataTableColumns.test.ts
@@ -51,6 +51,7 @@ vi.mock('@/features/core/dataTable/utils/columnUtils', () => ({
 
 describe('useDataTableColumns', () => {
 	const mockOnDeleteColumn = vi.fn();
+	const mockOnRenameColumn = vi.fn();
 	const mockOnAddRowClick = vi.fn();
 	const mockOnAddColumn = vi.fn();
 	const isTextEditorOpen = ref(false);
@@ -62,6 +63,7 @@ describe('useDataTableColumns', () => {
 	const createComposable = () => {
 		return useDataTableColumns({
 			onDeleteColumn: mockOnDeleteColumn,
+			onRenameColumn: mockOnRenameColumn,
 			onAddRowClick: mockOnAddRowClick,
 			onAddColumn: mockOnAddColumn,
 			isTextEditorOpen,
diff --git a/packages/frontend/editor-ui/src/features/core/dataTable/composables/useDataTableColumns.ts b/packages/frontend/editor-ui/src/features/core/dataTable/composables/useDataTableColumns.ts
index 8ca114e50d5..e51e84d5d3e 100644
--- a/packages/frontend/editor-ui/src/features/core/dataTable/composables/useDataTableColumns.ts
+++ b/packages/frontend/editor-ui/src/features/core/dataTable/composables/useDataTableColumns.ts
@@ -37,11 +37,13 @@ import { GRID_FILTER_CONFIG } from '@/features/core/dataTable/utils/filterMappin
 
 export const useDataTableColumns = ({
 	onDeleteColumn,
+	onRenameColumn,
 	onAddRowClick,
 	onAddColumn,
 	isTextEditorOpen,
 }: {
 	onDeleteColumn: (columnId: string) => void;
+	onRenameColumn: (columnId: string, columnName: string) => void;
 	onAddRowClick: () => void;
 	onAddColumn: (column: DataTableColumnCreatePayload) => Promise<AddColumnResponse>;
 	isTextEditorOpen: Ref<boolean>;
@@ -63,6 +65,7 @@ export const useDataTableColumns = ({
 			headerComponent: ColumnHeader,
 			headerComponentParams: {
 				onDelete: onDeleteColumn,
+				onRename: onRenameColumn,
 				allowMenuActions: true,
 			},
 			cellEditorPopup: false,
diff --git a/packages/frontend/editor-ui/src/features/core/dataTable/composables/useDataTableOperations.test.ts b/packages/frontend/editor-ui/src/features/core/dataTable/composables/useDataTableOperations.test.ts
index 42edaec9bb6..1616a6ab70a 100644
--- a/packages/frontend/editor-ui/src/features/core/dataTable/composables/useDataTableOperations.test.ts
+++ b/packages/frontend/editor-ui/src/features/core/dataTable/composables/useDataTableOperations.test.ts
@@ -73,6 +73,7 @@ describe('useDataTableOperations', () => {
 			addDataTableColumn: vi.fn(),
 			deleteDataTableColumn: vi.fn(),
 			moveDataTableColumn: vi.fn(),
+			renameDataTableColumn: vi.fn(),
 			deleteRows: vi.fn(),
 			insertEmptyRow: vi.fn(),
 		} as unknown as ReturnType<typeof useDataTableStore>;
@@ -840,6 +841,218 @@ describe('useDataTableOperations', () => {
 		});
 	});
 
+	describe('onRenameColumn', () => {
+		it('should return early when column is not found', async () => {
+			const colDefs = ref([]);
+			const { onRenameColumn } = useDataTableOperations({ ...params, colDefs });
+
+			await onRenameColumn('non-existent-column', 'newName');
+
+			expect(dataTableStore.renameDataTableColumn).not.toHaveBeenCalled();
+		});
+
+		it('should return early when column has no field', async () => {
+			const colDefs = ref([{ colId: 'col1', headerName: 'Name', cellDataType: 'text' }]);
+			const { onRenameColumn } = useDataTableOperations({ ...params, colDefs });
+
+			await onRenameColumn('col1', 'newName');
+
+			expect(dataTableStore.renameDataTableColumn).not.toHaveBeenCalled();
+		});
+
+		it('should rename column successfully', async () => {
+			const renameDataTableColumnMock = vi.fn().mockResolvedValue(undefined);
+			vi.mocked(useDataTableStore).mockReturnValue({
+				...dataTableStore,
+				renameDataTableColumn: renameDataTableColumnMock,
+			});
+
+			const colDefs = ref([
+				{ colId: 'col1', field: 'oldName', headerName: 'Old Name', cellDataType: 'text' },
+			]);
+			const rowData = ref([
+				{ id: 1, oldName: 'value1' },
+				{ id: 2, oldName: 'value2' },
+			]);
+
+			const { onRenameColumn } = useDataTableOperations({ ...params, colDefs, rowData });
+
+			await onRenameColumn('col1', 'newName');
+
+			expect(colDefs.value[0].headerName).toBe('newName');
+			expect(colDefs.value[0].field).toBe('newName');
+			expect(rowData.value).toEqual([
+				{ id: 1, newName: 'value1' },
+				{ id: 2, newName: 'value2' },
+			]);
+			expect(params.setGridData).toHaveBeenCalledWith({
+				colDefs: colDefs.value,
+				rowData: rowData.value,
+			});
+			expect(renameDataTableColumnMock).toHaveBeenCalledWith('test', 'test', 'col1', 'newName');
+			expect(telemetryTrackMock).toHaveBeenCalledWith('User renamed data table column', {
+				column_id: 'col1',
+				column_type: 'text',
+				data_table_id: 'test',
+			});
+		});
+
+		it('should handle when new name equals old field name', async () => {
+			const renameDataTableColumnMock = vi.fn().mockResolvedValue(undefined);
+			vi.mocked(useDataTableStore).mockReturnValue({
+				...dataTableStore,
+				renameDataTableColumn: renameDataTableColumnMock,
+			});
+
+			const colDefs = ref([
+				{ colId: 'col1', field: 'sameName', headerName: 'Old Header', cellDataType: 'text' },
+			]);
+			const rowData = ref([{ id: 1, sameName: 'value1' }]);
+
+			const { onRenameColumn } = useDataTableOperations({ ...params, colDefs, rowData });
+
+			await onRenameColumn('col1', 'sameName');
+
+			expect(colDefs.value[0].headerName).toBe('sameName');
+			expect(colDefs.value[0].field).toBe('sameName');
+			expect(rowData.value).toEqual([{ id: 1, sameName: 'value1' }]);
+			expect(renameDataTableColumnMock).toHaveBeenCalledWith('test', 'test', 'col1', 'sameName');
+		});
+
+		it('should rollback header name when API call fails', async () => {
+			const renameError = new Error('Rename failed');
+			vi.mocked(useDataTableStore).mockReturnValue({
+				...dataTableStore,
+				renameDataTableColumn: vi.fn().mockRejectedValue(renameError),
+			});
+
+			const colDefs = ref([
+				{ colId: 'col1', field: 'oldName', headerName: 'Old Name', cellDataType: 'text' },
+			]);
+			const rowData = ref([{ id: 1, oldName: 'value1' }]);
+
+			const { onRenameColumn } = useDataTableOperations({ ...params, colDefs, rowData });
+
+			await onRenameColumn('col1', 'newName');
+
+			expect(colDefs.value[0].headerName).toBe('Old Name');
+			expect(colDefs.value[0].field).toBe('oldName');
+			expect(rowData.value).toEqual([{ id: 1, oldName: 'value1' }]);
+			expect(showErrorMock).toHaveBeenCalledWith(renameError, 'dataTable.renameColumn.error');
+			expect(params.setGridData).toHaveBeenCalledTimes(2);
+		});
+
+		it('should show specific error message for 409 conflict', async () => {
+			const responseError = new ResponseError('Column name already exists', {
+				httpStatusCode: 409,
+			});
+			vi.mocked(useDataTableStore).mockReturnValue({
+				...dataTableStore,
+				renameDataTableColumn: vi.fn().mockRejectedValue(responseError),
+			});
+
+			const colDefs = ref([
+				{ colId: 'col1', field: 'oldName', headerName: 'Old Name', cellDataType: 'text' },
+			]);
+
+			const { onRenameColumn } = useDataTableOperations({ ...params, colDefs });
+
+			await onRenameColumn('col1', 'existingName');
+
+			expect(colDefs.value[0].headerName).toBe('Old Name');
+			expect(showErrorMock).toHaveBeenCalledWith(
+				new Error('Column name already exists'),
+				'dataTable.column.alreadyExistsError',
+			);
+		});
+
+		it('should handle ResponseError without httpStatusCode', async () => {
+			const responseError = new ResponseError('Unknown response error');
+			vi.mocked(useDataTableStore).mockReturnValue({
+				...dataTableStore,
+				renameDataTableColumn: vi.fn().mockRejectedValue(responseError),
+			});
+
+			const colDefs = ref([
+				{ colId: 'col1', field: 'oldName', headerName: 'Old Name', cellDataType: 'text' },
+			]);
+
+			const { onRenameColumn } = useDataTableOperations({ ...params, colDefs });
+
+			await onRenameColumn('col1', 'newName');
+
+			expect(colDefs.value[0].headerName).toBe('Old Name');
+			expect(showErrorMock).toHaveBeenCalledWith(responseError, 'dataTable.renameColumn.error');
+		});
+
+		it('should handle regular Error', async () => {
+			const error = new Error('Regular error message');
+			vi.mocked(useDataTableStore).mockReturnValue({
+				...dataTableStore,
+				renameDataTableColumn: vi.fn().mockRejectedValue(error),
+			});
+
+			const colDefs = ref([
+				{ colId: 'col1', field: 'oldName', headerName: 'Old Name', cellDataType: 'text' },
+			]);
+
+			const { onRenameColumn } = useDataTableOperations({ ...params, colDefs });
+
+			await onRenameColumn('col1', 'newName');
+
+			expect(colDefs.value[0].headerName).toBe('Old Name');
+			expect(showErrorMock).toHaveBeenCalledWith(error, 'dataTable.renameColumn.error');
+		});
+
+		it('should update row data correctly with multiple columns', async () => {
+			const renameDataTableColumnMock = vi.fn().mockResolvedValue(undefined);
+			vi.mocked(useDataTableStore).mockReturnValue({
+				...dataTableStore,
+				renameDataTableColumn: renameDataTableColumnMock,
+			});
+
+			const colDefs = ref([
+				{ colId: 'col1', field: 'name', headerName: 'Name', cellDataType: 'text' },
+				{ colId: 'col2', field: 'age', headerName: 'Age', cellDataType: 'number' },
+			]);
+			const rowData = ref([
+				{ id: 1, name: 'John', age: 30 },
+				{ id: 2, name: 'Jane', age: 25 },
+			]);
+
+			const { onRenameColumn } = useDataTableOperations({ ...params, colDefs, rowData });
+
+			await onRenameColumn('col1', 'fullName');
+
+			expect(colDefs.value[0].field).toBe('fullName');
+			expect(rowData.value).toEqual([
+				{ id: 1, fullName: 'John', age: 30 },
+				{ id: 2, fullName: 'Jane', age: 25 },
+			]);
+		});
+
+		it('should handle empty row data', async () => {
+			const renameDataTableColumnMock = vi.fn().mockResolvedValue(undefined);
+			vi.mocked(useDataTableStore).mockReturnValue({
+				...dataTableStore,
+				renameDataTableColumn: renameDataTableColumnMock,
+			});
+
+			const colDefs = ref([
+				{ colId: 'col1', field: 'oldName', headerName: 'Old Name', cellDataType: 'text' },
+			]);
+			const rowData = ref([]);
+
+			const { onRenameColumn } = useDataTableOperations({ ...params, colDefs, rowData });
+
+			await onRenameColumn('col1', 'newName');
+
+			expect(colDefs.value[0].field).toBe('newName');
+			expect(rowData.value).toEqual([]);
+			expect(renameDataTableColumnMock).toHaveBeenCalledWith('test', 'test', 'col1', 'newName');
+		});
+	});
+
 	describe('onCellKeyDown', () => {
 		const createKeyDownEvent = (
 			key: string,
diff --git a/packages/frontend/editor-ui/src/features/core/dataTable/composables/useDataTableOperations.ts b/packages/frontend/editor-ui/src/features/core/dataTable/composables/useDataTableOperations.ts
index 544a024cfd0..f06e999f6ad 100644
--- a/packages/frontend/editor-ui/src/features/core/dataTable/composables/useDataTableOperations.ts
+++ b/packages/frontend/editor-ui/src/features/core/dataTable/composables/useDataTableOperations.ts
@@ -87,7 +87,7 @@ export const useDataTableOperations = ({
 	const telemetry = useTelemetry();
 	const dataTableTypes = useDataTableTypes();
 
-	const getAddColumnError = (error: unknown): { httpStatus: number; message: string } => {
+	const parseColumnOperationError = (error: unknown): { httpStatus: number; message: string } => {
 		const DEFAULT_HTTP_STATUS = 500;
 		const DEFAULT_MESSAGE = i18n.baseText('generic.unknownError');
 
@@ -151,6 +151,55 @@ export const useDataTableOperations = ({
 		}
 	}
 
+	async function onRenameColumn(columnId: string, newName: string): Promise<void> {
+		const columnToRename = colDefs.value.find((col) => col.colId === columnId);
+		if (!columnToRename) return;
+
+		const oldName = columnToRename.headerName;
+		const oldField = columnToRename.field;
+		if (!oldField) return;
+
+		columnToRename.headerName = newName;
+		setGridData({ colDefs: colDefs.value });
+
+		try {
+			toggleSave(true);
+			await dataTableStore.renameDataTableColumn(dataTableId, projectId, columnId, newName);
+
+			columnToRename.field = newName;
+			if (oldField !== newName) {
+				rowData.value = rowData.value.map((row) => {
+					const newRow: DataTableRow = { ...row };
+					newRow[newName] = newRow[oldField];
+					delete newRow[oldField];
+					return newRow;
+				});
+			}
+			setGridData({ colDefs: colDefs.value, rowData: rowData.value });
+
+			telemetry.track('User renamed data table column', {
+				column_id: columnId,
+				column_type: columnToRename.cellDataType,
+				data_table_id: dataTableId,
+			});
+		} catch (error) {
+			columnToRename.headerName = oldName;
+			setGridData({ colDefs: colDefs.value });
+
+			const errorDetails = parseColumnOperationError(error);
+			if (errorDetails.httpStatus === 409) {
+				toast.showError(
+					new Error(errorDetails.message),
+					i18n.baseText('dataTable.column.alreadyExistsError'),
+				);
+			} else {
+				toast.showError(error, i18n.baseText('dataTable.renameColumn.error'));
+			}
+		} finally {
+			toggleSave(false);
+		}
+	}
+
 	async function onAddColumn(column: DataTableColumnCreatePayload): Promise<AddColumnResponse> {
 		try {
 			const newColumn = await dataTableStore.addDataTableColumn(dataTableId, projectId, column);
@@ -166,7 +215,7 @@ export const useDataTableOperations = ({
 			});
 			return { success: true, httpStatus: 200 };
 		} catch (error) {
-			const addColumnError = getAddColumnError(error);
+			const addColumnError = parseColumnOperationError(error);
 			return {
 				success: false,
 				httpStatus: addColumnError.httpStatus,
@@ -362,6 +411,7 @@ export const useDataTableOperations = ({
 
 	return {
 		onDeleteColumn,
+		onRenameColumn,
 		onAddColumn,
 		onColumnMoved,
 		onAddRowClick,
diff --git a/packages/frontend/editor-ui/src/features/core/dataTable/dataTable.api.ts b/packages/frontend/editor-ui/src/features/core/dataTable/dataTable.api.ts
index dca73ba0d57..1f34bcba686 100644
--- a/packages/frontend/editor-ui/src/features/core/dataTable/dataTable.api.ts
+++ b/packages/frontend/editor-ui/src/features/core/dataTable/dataTable.api.ts
@@ -133,6 +133,23 @@ export const moveDataTableColumnApi = async (
 	);
 };
 
+export const renameDataTableColumnApi = async (
+	context: IRestApiContext,
+	dataTableId: string,
+	projectId: string,
+	columnId: string,
+	name: string,
+) => {
+	return await makeRestApiRequest<DataTableColumn>(
+		context,
+		'PATCH',
+		`/projects/${projectId}/data-tables/${dataTableId}/columns/${columnId}/rename`,
+		{
+			name,
+		},
+	);
+};
+
 export const getDataTableRowsApi = async (
 	context: IRestApiContext,
 	dataTableId: string,
diff --git a/packages/frontend/editor-ui/src/features/core/dataTable/dataTable.store.test.ts b/packages/frontend/editor-ui/src/features/core/dataTable/dataTable.store.test.ts
index f34af73e265..4ad9ec2ec33 100644
--- a/packages/frontend/editor-ui/src/features/core/dataTable/dataTable.store.test.ts
+++ b/packages/frontend/editor-ui/src/features/core/dataTable/dataTable.store.test.ts
@@ -340,6 +340,256 @@ describe('dataTable.store', () => {
 		});
 	});
 
+	describe('renameDataTableColumn', () => {
+		it('should rename column in data table', async () => {
+			const dataTableId = faker.string.alphanumeric(10);
+			const columnId = 'col-1';
+			const projectId = 'p1';
+			const newName = 'renamedColumn';
+
+			dataTableStore.$patch({
+				dataTables: [
+					{
+						id: dataTableId,
+						name: 'Test Table',
+						sizeBytes: 0,
+						createdAt: '2024-01-01T00:00:00.000Z',
+						updatedAt: '2024-01-01T00:00:00.000Z',
+						projectId,
+						columns: [
+							{ id: columnId, index: 0, name: 'oldName', type: 'string' },
+							{ id: 'col-2', index: 1, name: 'otherColumn', type: 'number' },
+						],
+					},
+				],
+			});
+
+			vi.spyOn(dataTableApi, 'renameDataTableColumnApi').mockResolvedValue({
+				id: columnId,
+				index: 0,
+				name: newName,
+				type: 'string',
+			});
+
+			await dataTableStore.renameDataTableColumn(dataTableId, projectId, columnId, newName);
+
+			expect(dataTableApi.renameDataTableColumnApi).toHaveBeenCalledWith(
+				rootStore.restApiContext,
+				dataTableId,
+				projectId,
+				columnId,
+				newName,
+			);
+
+			const updatedColumn = dataTableStore.dataTables[0].columns.find((c) => c.id === columnId);
+			expect(updatedColumn?.name).toBe(newName);
+		});
+
+		it('should not update state when data table is not found', async () => {
+			const dataTableId = 'non-existent-table';
+			const columnId = 'col-1';
+			const projectId = 'p1';
+			const newName = 'newName';
+
+			dataTableStore.$patch({
+				dataTables: [
+					{
+						id: 'other-table',
+						name: 'Other Table',
+						sizeBytes: 0,
+						createdAt: '2024-01-01T00:00:00.000Z',
+						updatedAt: '2024-01-01T00:00:00.000Z',
+						projectId,
+						columns: [{ id: 'col-x', index: 0, name: 'column', type: 'string' }],
+					},
+				],
+			});
+
+			vi.spyOn(dataTableApi, 'renameDataTableColumnApi').mockResolvedValue({
+				id: columnId,
+				index: 0,
+				name: newName,
+				type: 'string',
+			});
+
+			await dataTableStore.renameDataTableColumn(dataTableId, projectId, columnId, newName);
+
+			expect(dataTableApi.renameDataTableColumnApi).toHaveBeenCalledWith(
+				rootStore.restApiContext,
+				dataTableId,
+				projectId,
+				columnId,
+				newName,
+			);
+
+			// Verify other table's columns remain unchanged
+			expect(dataTableStore.dataTables[0].columns[0].name).toBe('column');
+		});
+
+		it('should not update state when column is not found in table', async () => {
+			const dataTableId = faker.string.alphanumeric(10);
+			const columnId = 'non-existent-column';
+			const projectId = 'p1';
+			const newName = 'newName';
+
+			dataTableStore.$patch({
+				dataTables: [
+					{
+						id: dataTableId,
+						name: 'Test Table',
+						sizeBytes: 0,
+						createdAt: '2024-01-01T00:00:00.000Z',
+						updatedAt: '2024-01-01T00:00:00.000Z',
+						projectId,
+						columns: [
+							{ id: 'col-1', index: 0, name: 'column1', type: 'string' },
+							{ id: 'col-2', index: 1, name: 'column2', type: 'number' },
+						],
+					},
+				],
+			});
+
+			vi.spyOn(dataTableApi, 'renameDataTableColumnApi').mockResolvedValue({
+				id: columnId,
+				index: 0,
+				name: newName,
+				type: 'string',
+			});
+
+			await dataTableStore.renameDataTableColumn(dataTableId, projectId, columnId, newName);
+
+			expect(dataTableApi.renameDataTableColumnApi).toHaveBeenCalledWith(
+				rootStore.restApiContext,
+				dataTableId,
+				projectId,
+				columnId,
+				newName,
+			);
+
+			// Verify all columns remain unchanged
+			expect(dataTableStore.dataTables[0].columns[0].name).toBe('column1');
+			expect(dataTableStore.dataTables[0].columns[1].name).toBe('column2');
+		});
+
+		it('should handle API errors', async () => {
+			const dataTableId = faker.string.alphanumeric(10);
+			const columnId = 'col-1';
+			const projectId = 'p1';
+			const newName = 'newName';
+
+			dataTableStore.$patch({
+				dataTables: [
+					{
+						id: dataTableId,
+						name: 'Test Table',
+						sizeBytes: 0,
+						createdAt: '2024-01-01T00:00:00.000Z',
+						updatedAt: '2024-01-01T00:00:00.000Z',
+						projectId,
+						columns: [{ id: columnId, index: 0, name: 'oldName', type: 'string' }],
+					},
+				],
+			});
+
+			const error = new Error('API Error');
+			vi.spyOn(dataTableApi, 'renameDataTableColumnApi').mockRejectedValue(error);
+
+			await expect(
+				dataTableStore.renameDataTableColumn(dataTableId, projectId, columnId, newName),
+			).rejects.toThrow('API Error');
+
+			// Verify column name remains unchanged after error
+			expect(dataTableStore.dataTables[0].columns[0].name).toBe('oldName');
+		});
+
+		it('should rename correct column when multiple columns exist', async () => {
+			const dataTableId = faker.string.alphanumeric(10);
+			const columnId = 'col-2';
+			const projectId = 'p1';
+			const newName = 'renamedMiddleColumn';
+
+			dataTableStore.$patch({
+				dataTables: [
+					{
+						id: dataTableId,
+						name: 'Test Table',
+						sizeBytes: 0,
+						createdAt: '2024-01-01T00:00:00.000Z',
+						updatedAt: '2024-01-01T00:00:00.000Z',
+						projectId,
+						columns: [
+							{ id: 'col-1', index: 0, name: 'firstColumn', type: 'string' },
+							{ id: 'col-2', index: 1, name: 'secondColumn', type: 'number' },
+							{ id: 'col-3', index: 2, name: 'thirdColumn', type: 'boolean' },
+						],
+					},
+				],
+			});
+
+			vi.spyOn(dataTableApi, 'renameDataTableColumnApi').mockResolvedValue({
+				id: columnId,
+				index: 0,
+				name: newName,
+				type: 'string',
+			});
+
+			await dataTableStore.renameDataTableColumn(dataTableId, projectId, columnId, newName);
+
+			expect(dataTableApi.renameDataTableColumnApi).toHaveBeenCalledWith(
+				rootStore.restApiContext,
+				dataTableId,
+				projectId,
+				columnId,
+				newName,
+			);
+
+			const columns = dataTableStore.dataTables[0].columns;
+			expect(columns[0].name).toBe('firstColumn');
+			expect(columns[1].name).toBe(newName);
+			expect(columns[2].name).toBe('thirdColumn');
+		});
+
+		it('should handle empty columns array', async () => {
+			const dataTableId = faker.string.alphanumeric(10);
+			const columnId = 'col-1';
+			const projectId = 'p1';
+			const newName = 'newName';
+
+			dataTableStore.$patch({
+				dataTables: [
+					{
+						id: dataTableId,
+						name: 'Test Table',
+						sizeBytes: 0,
+						createdAt: '2024-01-01T00:00:00.000Z',
+						updatedAt: '2024-01-01T00:00:00.000Z',
+						projectId,
+						columns: [],
+					},
+				],
+			});
+
+			vi.spyOn(dataTableApi, 'renameDataTableColumnApi').mockResolvedValue({
+				id: columnId,
+				index: 0,
+				name: newName,
+				type: 'string',
+			});
+
+			await dataTableStore.renameDataTableColumn(dataTableId, projectId, columnId, newName);
+
+			expect(dataTableApi.renameDataTableColumnApi).toHaveBeenCalledWith(
+				rootStore.restApiContext,
+				dataTableId,
+				projectId,
+				columnId,
+				newName,
+			);
+
+			expect(dataTableStore.dataTables[0].columns).toHaveLength(0);
+		});
+	});
+
 	describe('fetchDataTableContent', () => {
 		it('should fetch rows with pagination and filters', async () => {
 			const mockResponse = { count: 100, data: [{ id: 1, name: 'Row 1' }] };
diff --git a/packages/frontend/editor-ui/src/features/core/dataTable/dataTable.store.ts b/packages/frontend/editor-ui/src/features/core/dataTable/dataTable.store.ts
index 188c72e1500..7e469abaaa1 100644
--- a/packages/frontend/editor-ui/src/features/core/dataTable/dataTable.store.ts
+++ b/packages/frontend/editor-ui/src/features/core/dataTable/dataTable.store.ts
@@ -10,6 +10,7 @@ import {
 	addDataTableColumnApi,
 	deleteDataTableColumnApi,
 	moveDataTableColumnApi,
+	renameDataTableColumnApi,
 	getDataTableRowsApi,
 	insertDataTableRowApi,
 	updateDataTableRowsApi,
@@ -215,6 +216,30 @@ export const useDataTableStore = defineStore(DATA_TABLE_STORE, () => {
 		return moved;
 	};
 
+	const renameDataTableColumn = async (
+		dataTableId: string,
+		projectId: string,
+		columnId: string,
+		newName: string,
+	): Promise<void> => {
+		await renameDataTableColumnApi(
+			rootStore.restApiContext,
+			dataTableId,
+			projectId,
+			columnId,
+			newName,
+		);
+
+		const index = dataTables.value.findIndex((table) => table.id === dataTableId);
+		if (index === -1) return;
+
+		const table = dataTables.value[index];
+		const column = table.columns.find((col) => col.id === columnId);
+		if (column) {
+			column.name = newName;
+		}
+	};
+
 	const fetchDataTableContent = async (
 		dataTableId: string,
 		projectId: string,
@@ -333,6 +358,7 @@ export const useDataTableStore = defineStore(DATA_TABLE_STORE, () => {
 		addDataTableColumn,
 		deleteDataTableColumn,
 		moveDataTableColumn,
+		renameDataTableColumn,
 		fetchDataTableContent,
 		insertEmptyRow,
 		updateRow,
diff --git a/packages/testing/playwright/pages/DataTableDetails.ts b/packages/testing/playwright/pages/DataTableDetails.ts
index 30d504e363e..b52e08ee011 100644
--- a/packages/testing/playwright/pages/DataTableDetails.ts
+++ b/packages/testing/playwright/pages/DataTableDetails.ts
@@ -363,7 +363,8 @@ export class DataTableDetails extends BasePage {
 			const textCount = await textElement.count();
 
 			if (textCount > 0 && ariaColIndex) {
-				const text = await textElement.textContent();
+				// Use innerText instead of textContent to avoid getting hidden input values
+				const text = await textElement.innerText();
 				if (text) {
 					columnData.push({
 						index: parseInt(ariaColIndex, 10),

From 480d1e609b0a435fce701e34edd30507fc9eba36 Mon Sep 17 00:00:00 2001
From: Jaakko Husso <jaakko@n8n.io>
Date: Fri, 5 Dec 2025 11:38:12 +0200
Subject: [PATCH 076/167] feat(core): Put Chat users behind license checks
 (no-changelog) (#22781)

---
 .../__tests__/credentials.controller.test.ts  | 52 ++++++++++++++++---
 .../src/credentials/credentials.controller.ts | 11 ++--
 .../credentials/credentials.api.test.ts       |  1 +
 .../users/components/InviteUsersModal.vue     |  8 +++
 .../users/views/SettingsUsersView.vue         |  5 ++
 5 files changed, 65 insertions(+), 12 deletions(-)

diff --git a/packages/cli/src/credentials/__tests__/credentials.controller.test.ts b/packages/cli/src/credentials/__tests__/credentials.controller.test.ts
index c327d23affc..ad18d998f5d 100644
--- a/packages/cli/src/credentials/__tests__/credentials.controller.test.ts
+++ b/packages/cli/src/credentials/__tests__/credentials.controller.test.ts
@@ -1,14 +1,15 @@
+import type { LicenseState } from '@n8n/backend-common';
 import type { AuthenticatedRequest, SharedCredentialsRepository, CredentialsEntity } from '@n8n/db';
 import { GLOBAL_OWNER_ROLE, GLOBAL_MEMBER_ROLE } from '@n8n/db';
 import { mock } from 'jest-mock-extended';
 
-import { createRawProjectData } from '@/__tests__/project.test-data';
-import type { EventService } from '@/events/event.service';
-
 import { createdCredentialsWithScopes, createNewCredentialsPayload } from './credentials.test-data';
+import type { CredentialsFinderService } from '../credentials-finder.service';
 import { CredentialsController } from '../credentials.controller';
 import type { CredentialsService } from '../credentials.service';
-import type { CredentialsFinderService } from '../credentials-finder.service';
+
+import { createRawProjectData } from '@/__tests__/project.test-data';
+import type { EventService } from '@/events/event.service';
 import type { CredentialRequest } from '@/requests';
 
 describe('CredentialsController', () => {
@@ -16,13 +17,14 @@ describe('CredentialsController', () => {
 	const credentialsService = mock<CredentialsService>();
 	const sharedCredentialsRepository = mock<SharedCredentialsRepository>();
 	const credentialsFinderService = mock<CredentialsFinderService>();
+	const licenseState = mock<LicenseState>();
 
 	const credentialsController = new CredentialsController(
 		mock(),
 		credentialsService,
 		mock(),
 		mock(),
-		mock(),
+		licenseState,
 		mock(),
 		mock(),
 		sharedCredentialsRepository,
@@ -126,7 +128,7 @@ describe('CredentialsController', () => {
 			] as any);
 		});
 
-		it('should allow owner to set isGlobal to true', async () => {
+		it('should not allow owner to set isGlobal to true if not licensed', async () => {
 			// ARRANGE
 			const ownerReq = {
 				user: { id: 'owner-id', role: GLOBAL_OWNER_ROLE },
@@ -139,6 +141,34 @@ describe('CredentialsController', () => {
 				},
 			} as unknown as CredentialRequest.Update;
 
+			licenseState.isSharingLicensed.mockReturnValue(false);
+
+			credentialsFinderService.findCredentialForUser.mockResolvedValue(existingCredential);
+
+			// ACT
+			await expect(credentialsController.updateCredentials(ownerReq)).rejects.toThrowError(
+				'You are not licensed for sharing credentials',
+			);
+
+			// ASSERT
+			expect(credentialsService.update).not.toHaveBeenCalled();
+		});
+
+		it('should allow owner to set isGlobal to true if licensed', async () => {
+			// ARRANGE
+			const ownerReq = {
+				user: { id: 'owner-id', role: GLOBAL_OWNER_ROLE },
+				params: { credentialId },
+				body: {
+					name: 'Updated Credential',
+					type: 'apiKey',
+					data: { apiKey: 'updated-key' },
+					isGlobal: true,
+				},
+			} as unknown as CredentialRequest.Update;
+
+			licenseState.isSharingLicensed.mockReturnValue(true);
+
 			credentialsFinderService.findCredentialForUser.mockResolvedValue(existingCredential);
 			credentialsService.update.mockResolvedValue({
 				...existingCredential,
@@ -163,7 +193,7 @@ describe('CredentialsController', () => {
 			});
 		});
 
-		it('should allow owner to set isGlobal to false', async () => {
+		it('should allow owner to set isGlobal to false if licensed', async () => {
 			// ARRANGE
 			const globalCredential = mock<CredentialsEntity>({
 				...existingCredential,
@@ -180,6 +210,8 @@ describe('CredentialsController', () => {
 				},
 			} as unknown as CredentialRequest.Update;
 
+			licenseState.isSharingLicensed.mockReturnValue(true);
+
 			credentialsFinderService.findCredentialForUser.mockResolvedValue(globalCredential);
 			credentialsService.update.mockResolvedValue({
 				...globalCredential,
@@ -198,7 +230,7 @@ describe('CredentialsController', () => {
 			);
 		});
 
-		it('should prevent non-owner from changing isGlobal', async () => {
+		it('should prevent non-owner from changing isGlobal if licensed', async () => {
 			// ARRANGE
 			const memberReq = {
 				user: { id: 'member-id', role: GLOBAL_MEMBER_ROLE },
@@ -211,6 +243,8 @@ describe('CredentialsController', () => {
 				},
 			} as unknown as CredentialRequest.Update;
 
+			licenseState.isSharingLicensed.mockReturnValue(true);
+
 			credentialsFinderService.findCredentialForUser.mockResolvedValue(existingCredential);
 
 			// ACT
@@ -235,6 +269,8 @@ describe('CredentialsController', () => {
 				},
 			} as unknown as CredentialRequest.Update;
 
+			licenseState.isSharingLicensed.mockReturnValue(true);
+
 			credentialsFinderService.findCredentialForUser.mockResolvedValue({
 				...existingCredential,
 				isGlobal: true,
diff --git a/packages/cli/src/credentials/credentials.controller.ts b/packages/cli/src/credentials/credentials.controller.ts
index 965966262d9..4b73f2da464 100644
--- a/packages/cli/src/credentials/credentials.controller.ts
+++ b/packages/cli/src/credentials/credentials.controller.ts
@@ -4,7 +4,7 @@ import {
 	CredentialsGetOneRequestQuery,
 	GenerateCredentialNameRequestQuery,
 } from '@n8n/api-types';
-import { Logger } from '@n8n/backend-common';
+import { LicenseState, Logger } from '@n8n/backend-common';
 import { GlobalConfig } from '@n8n/config';
 import {
 	SharedCredentials,
@@ -40,7 +40,6 @@ import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 import { ForbiddenError } from '@/errors/response-errors/forbidden.error';
 import { NotFoundError } from '@/errors/response-errors/not-found.error';
 import { EventService } from '@/events/event.service';
-import { License } from '@/license';
 import { listQueryMiddleware } from '@/middlewares';
 import { CredentialRequest } from '@/requests';
 import { NamingService } from '@/services/naming.service';
@@ -54,7 +53,7 @@ export class CredentialsController {
 		private readonly credentialsService: CredentialsService,
 		private readonly enterpriseCredentialsService: EnterpriseCredentialsService,
 		private readonly namingService: NamingService,
-		private readonly license: License,
+		private readonly licenseState: LicenseState,
 		private readonly logger: Logger,
 		private readonly userManagementMailer: UserManagementMailer,
 		private readonly sharedCredentialsRepository: SharedCredentialsRepository,
@@ -114,7 +113,7 @@ export class CredentialsController {
 		@Param('credentialId') credentialId: string,
 		@Query query: CredentialsGetOneRequestQuery,
 	) {
-		const { shared, ...credential } = this.license.isSharingEnabled()
+		const { shared, ...credential } = this.licenseState.isSharingLicensed()
 			? await this.enterpriseCredentialsService.getOne(
 					req.user,
 					credentialId,
@@ -246,6 +245,10 @@ export class CredentialsController {
 		// Update isGlobal if provided in the payload and user has permission
 		const isGlobal = body.isGlobal;
 		if (isGlobal !== undefined && isGlobal !== credential.isGlobal) {
+			if (!this.licenseState.isSharingLicensed()) {
+				throw new ForbiddenError('You are not licensed for sharing credentials');
+			}
+
 			const canShareGlobally = hasGlobalScope(req.user, 'credential:shareGlobally');
 			if (!canShareGlobally) {
 				throw new ForbiddenError(
diff --git a/packages/cli/test/integration/credentials/credentials.api.test.ts b/packages/cli/test/integration/credentials/credentials.api.test.ts
index 8cfc17b4a1d..5f62bcd0e7f 100644
--- a/packages/cli/test/integration/credentials/credentials.api.test.ts
+++ b/packages/cli/test/integration/credentials/credentials.api.test.ts
@@ -44,6 +44,7 @@ const { any } = expect;
 
 const testServer = setupTestServer({
 	endpointGroups: ['credentials'],
+	enabledFeatures: ['feat:sharing'],
 });
 
 let owner: User;
diff --git a/packages/frontend/editor-ui/src/features/settings/users/components/InviteUsersModal.vue b/packages/frontend/editor-ui/src/features/settings/users/components/InviteUsersModal.vue
index a02b5bc0239..1b5b9b18957 100644
--- a/packages/frontend/editor-ui/src/features/settings/users/components/InviteUsersModal.vue
+++ b/packages/frontend/editor-ui/src/features/settings/users/components/InviteUsersModal.vue
@@ -88,6 +88,13 @@ const isChatHubEnabled = computed((): boolean => {
 	return settingsStore.isChatFeatureEnabled;
 });
 
+const isChatUsersEnabled = computed((): boolean => {
+	return (
+		isChatHubEnabled.value &&
+		settingsStore.isEnterpriseFeatureEnabled[EnterpriseEditionFeature.AdvancedPermissions]
+	);
+});
+
 const validateEmails = (value: string | number | boolean | null | undefined) => {
 	if (typeof value !== 'string') {
 		return false;
@@ -295,6 +302,7 @@ onMounted(() => {
 								{
 									value: ROLE.ChatUser,
 									label: i18n.baseText('auth.roles.chatUser'),
+									disabled: !isChatUsersEnabled.value,
 								},
 							]
 						: []),
diff --git a/packages/frontend/editor-ui/src/features/settings/users/views/SettingsUsersView.vue b/packages/frontend/editor-ui/src/features/settings/users/views/SettingsUsersView.vue
index b8fc06d4b10..29732e64608 100644
--- a/packages/frontend/editor-ui/src/features/settings/users/views/SettingsUsersView.vue
+++ b/packages/frontend/editor-ui/src/features/settings/users/views/SettingsUsersView.vue
@@ -140,6 +140,11 @@ const userRoles = computed((): Array<{ value: Role; label: string; disabled?: bo
 			value: ROLE.Member,
 			label: i18n.baseText('auth.roles.member'),
 		},
+		{
+			value: ROLE.ChatUser,
+			label: i18n.baseText('auth.roles.chatUser'),
+			disabled: !isAdvancedPermissionsEnabled.value,
+		},
 		{
 			value: ROLE.Admin,
 			label: i18n.baseText('auth.roles.admin'),

From fcc6d863262df8cd10370a895ba8aa50de94f7e9 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 5 Dec 2025 10:03:18 +0000
Subject: [PATCH 077/167] chore: Update peter-evans/create-pull-request digest
 to 84ae59a (#22376)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Declan Carroll <declan@n8n.io>
---
 .github/workflows/sync-public-api-docs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/sync-public-api-docs.yml b/.github/workflows/sync-public-api-docs.yml
index 6e505c7847d..4ba97452a63 100644
--- a/.github/workflows/sync-public-api-docs.yml
+++ b/.github/workflows/sync-public-api-docs.yml
@@ -137,7 +137,7 @@ jobs:
         if: steps.verify_file.outputs.file_exists == 'true'
 
         # Pin v7.0.8
-        uses: peter-evans/create-pull-request@18e469570b1cf0dfc11d60ec121099f8ff3e617a
+        uses: peter-evans/create-pull-request@84ae59a2cdc2258d6fa0732dd66352dddae2a412
         with:
           token: ${{ steps.generate_token.outputs.token }}
 

From e78250f94c37e9038cf728e7cec0389a68143690 Mon Sep 17 00:00:00 2001
From: Andreas Fitzek <andreas.fitzek@n8n.io>
Date: Fri, 5 Dec 2025 11:04:26 +0100
Subject: [PATCH 078/167] chore(core): Implement generic credential storage
 provider (#22662)

---
 .../@n8n/backend-test-utils/src/test-db.ts    |   4 +-
 ...89388394-AddDynamicCredentialEntryTable.ts |  31 ++
 .../@n8n/db/src/migrations/mysqldb/index.ts   |   2 +
 .../db/src/migrations/postgresdb/index.ts     |   2 +
 .../@n8n/db/src/migrations/sqlite/index.ts    |   2 +
 packages/@n8n/decorators/src/module/module.ts |   9 +-
 .../dynamic-credential-entry-storage.ts       |  64 +++
 .../storage/storage-interface.ts              |  38 ++
 .../entities/dynamic-credential-entry.ts      |  39 ++
 .../dynamic-credential-entry.repository.ts    |  11 +
 .../dynamic-credentials.module.ts             |   3 +-
 .../dynamic-credential-entry-storage.test.ts  | 263 ++++++++++
 ...ynamic-credential-entry.repository.test.ts | 459 ++++++++++++++++++
 .../dynamic-credentials/shared/db-helpers.ts  |  22 +
 14 files changed, 945 insertions(+), 4 deletions(-)
 create mode 100644 packages/@n8n/db/src/migrations/common/1764689388394-AddDynamicCredentialEntryTable.ts
 create mode 100644 packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/storage/dynamic-credential-entry-storage.ts
 create mode 100644 packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/storage/storage-interface.ts
 create mode 100644 packages/cli/src/modules/dynamic-credentials.ee/database/entities/dynamic-credential-entry.ts
 create mode 100644 packages/cli/src/modules/dynamic-credentials.ee/database/repositories/dynamic-credential-entry.repository.ts
 create mode 100644 packages/cli/test/integration/dynamic-credentials/dynamic-credential-entry-storage.test.ts
 create mode 100644 packages/cli/test/integration/dynamic-credentials/dynamic-credential-entry.repository.test.ts
 create mode 100644 packages/cli/test/integration/dynamic-credentials/shared/db-helpers.ts

diff --git a/packages/@n8n/backend-test-utils/src/test-db.ts b/packages/@n8n/backend-test-utils/src/test-db.ts
index c6fee2a8daa..afe8b6297e8 100644
--- a/packages/@n8n/backend-test-utils/src/test-db.ts
+++ b/packages/@n8n/backend-test-utils/src/test-db.ts
@@ -87,7 +87,9 @@ type EntityName =
 	| 'AuthorizationCode'
 	| 'AccessToken'
 	| 'RefreshToken'
-	| 'UserConsent';
+	| 'UserConsent'
+	| 'DynamicCredentialEntry'
+	| 'DynamicCredentialResolver';
 
 /**
  * Truncate specific DB tables in a test DB.
diff --git a/packages/@n8n/db/src/migrations/common/1764689388394-AddDynamicCredentialEntryTable.ts b/packages/@n8n/db/src/migrations/common/1764689388394-AddDynamicCredentialEntryTable.ts
new file mode 100644
index 00000000000..6be0b636c30
--- /dev/null
+++ b/packages/@n8n/db/src/migrations/common/1764689388394-AddDynamicCredentialEntryTable.ts
@@ -0,0 +1,31 @@
+import type { MigrationContext, ReversibleMigration } from '../migration-types';
+
+const tableName = 'dynamic_credential_entry';
+
+export class AddDynamicCredentialEntryTable1764689388394 implements ReversibleMigration {
+	async up({ schemaBuilder: { createTable, column } }: MigrationContext) {
+		await createTable(tableName)
+			.withColumns(
+				column('credential_id').varchar(16).primary.notNull,
+				column('subject_id').varchar(16).primary.notNull,
+				column('resolver_id').varchar(16).primary.notNull,
+				column('data').text.notNull,
+			)
+			.withTimestamps.withForeignKey('credential_id', {
+				tableName: 'credentials_entity',
+				columnName: 'id',
+				onDelete: 'CASCADE',
+			})
+			.withForeignKey('resolver_id', {
+				tableName: 'dynamic_credential_resolver',
+				columnName: 'id',
+				onDelete: 'CASCADE',
+			})
+			.withIndexOn(['subject_id'])
+			.withIndexOn(['resolver_id']);
+	}
+
+	async down({ schemaBuilder: { dropTable } }: MigrationContext) {
+		await dropTable(tableName);
+	}
+}
diff --git a/packages/@n8n/db/src/migrations/mysqldb/index.ts b/packages/@n8n/db/src/migrations/mysqldb/index.ts
index a97373931ea..d5b2297d1d8 100644
--- a/packages/@n8n/db/src/migrations/mysqldb/index.ts
+++ b/packages/@n8n/db/src/migrations/mysqldb/index.ts
@@ -121,6 +121,7 @@ import { CreateBinaryDataTable1763716655000 } from '../common/1763716655000-Crea
 import { CreateWorkflowPublishHistoryTable1764167920585 } from '../common/1764167920585-CreateWorkflowPublishHistoryTable';
 import { AddCreatorIdToProjectTable1764276827837 } from '../common/1764276827837-AddCreatorIdToProjectTable';
 import { CreateDynamicCredentialResolverTable1764682447000 } from '../common/1764682447000-CreateCredentialResolverTable';
+import { AddDynamicCredentialEntryTable1764689388394 } from '../common/1764689388394-AddDynamicCredentialEntryTable';
 import type { Migration } from '../migration-types';
 
 export const mysqlMigrations: Migration[] = [
@@ -247,4 +248,5 @@ export const mysqlMigrations: Migration[] = [
 	CreateWorkflowPublishHistoryTable1764167920585,
 	AddCreatorIdToProjectTable1764276827837,
 	CreateDynamicCredentialResolverTable1764682447000,
+	AddDynamicCredentialEntryTable1764689388394,
 ];
diff --git a/packages/@n8n/db/src/migrations/postgresdb/index.ts b/packages/@n8n/db/src/migrations/postgresdb/index.ts
index f4d5e354982..d108c6797da 100644
--- a/packages/@n8n/db/src/migrations/postgresdb/index.ts
+++ b/packages/@n8n/db/src/migrations/postgresdb/index.ts
@@ -121,6 +121,7 @@ import { CreateBinaryDataTable1763716655000 } from '../common/1763716655000-Crea
 import { CreateWorkflowPublishHistoryTable1764167920585 } from '../common/1764167920585-CreateWorkflowPublishHistoryTable';
 import { AddCreatorIdToProjectTable1764276827837 } from '../common/1764276827837-AddCreatorIdToProjectTable';
 import { CreateDynamicCredentialResolverTable1764682447000 } from '../common/1764682447000-CreateCredentialResolverTable';
+import { AddDynamicCredentialEntryTable1764689388394 } from '../common/1764689388394-AddDynamicCredentialEntryTable';
 import type { Migration } from '../migration-types';
 
 export const postgresMigrations: Migration[] = [
@@ -247,4 +248,5 @@ export const postgresMigrations: Migration[] = [
 	CreateWorkflowPublishHistoryTable1764167920585,
 	AddCreatorIdToProjectTable1764276827837,
 	CreateDynamicCredentialResolverTable1764682447000,
+	AddDynamicCredentialEntryTable1764689388394,
 ];
diff --git a/packages/@n8n/db/src/migrations/sqlite/index.ts b/packages/@n8n/db/src/migrations/sqlite/index.ts
index 369a9e54ca8..6502dd831a0 100644
--- a/packages/@n8n/db/src/migrations/sqlite/index.ts
+++ b/packages/@n8n/db/src/migrations/sqlite/index.ts
@@ -117,6 +117,7 @@ import { ChangeOAuthStateColumnToUnboundedVarchar1763572724000 } from '../common
 import { CreateBinaryDataTable1763716655000 } from '../common/1763716655000-CreateBinaryDataTable';
 import { CreateWorkflowPublishHistoryTable1764167920585 } from '../common/1764167920585-CreateWorkflowPublishHistoryTable';
 import { CreateDynamicCredentialResolverTable1764682447000 } from '../common/1764682447000-CreateCredentialResolverTable';
+import { AddDynamicCredentialEntryTable1764689388394 } from '../common/1764689388394-AddDynamicCredentialEntryTable';
 import type { Migration } from '../migration-types';
 
 const sqliteMigrations: Migration[] = [
@@ -239,6 +240,7 @@ const sqliteMigrations: Migration[] = [
 	CreateWorkflowPublishHistoryTable1764167920585,
 	AddCreatorIdToProjectTable1764276827837,
 	CreateDynamicCredentialResolverTable1764682447000,
+	AddDynamicCredentialEntryTable1764689388394,
 ];
 
 export { sqliteMigrations };
diff --git a/packages/@n8n/decorators/src/module/module.ts b/packages/@n8n/decorators/src/module/module.ts
index 96df70a5657..50810c45585 100644
--- a/packages/@n8n/decorators/src/module/module.ts
+++ b/packages/@n8n/decorators/src/module/module.ts
@@ -16,13 +16,18 @@ export interface BaseEntity {
 	reload(): Promise<void>;
 }
 
-export interface TimestampedEntity {
+export interface TimestampedIdEntity {
 	id: string;
 	createdAt: Date;
 	updatedAt: Date;
 }
 
-export type EntityClass = new () => BaseEntity | TimestampedEntity;
+export interface TimestampedEntity {
+	createdAt: Date;
+	updatedAt: Date;
+}
+
+export type EntityClass = new () => BaseEntity | TimestampedIdEntity | TimestampedEntity;
 
 export type ModuleSettings = Record<string, unknown>;
 export type ModuleContext = Record<string, unknown>;
diff --git a/packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/storage/dynamic-credential-entry-storage.ts b/packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/storage/dynamic-credential-entry-storage.ts
new file mode 100644
index 00000000000..45bcfc82964
--- /dev/null
+++ b/packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/storage/dynamic-credential-entry-storage.ts
@@ -0,0 +1,64 @@
+import { Service } from '@n8n/di';
+
+import { ICredentialEntriesStorage } from './storage-interface';
+import { DynamicCredentialEntry } from '../../database/entities/dynamic-credential-entry';
+import { DynamicCredentialEntryRepository } from '../../database/repositories/dynamic-credential-entry.repository';
+
+@Service()
+export class DynamicCredentialEntryStorage implements ICredentialEntriesStorage {
+	constructor(
+		private readonly dynamicCredentialEntryRepository: DynamicCredentialEntryRepository,
+	) {}
+
+	async getCredentialData(
+		credentialId: string,
+		subjectId: string,
+		resolverId: string,
+		_: Record<string, unknown>,
+	): Promise<string | null> {
+		const entry = await this.dynamicCredentialEntryRepository.findOne({
+			where: {
+				credentialId,
+				subjectId,
+				resolverId,
+			},
+		});
+
+		return entry?.data ?? null;
+	}
+
+	async setCredentialData(
+		credentialId: string,
+		subjectId: string,
+		resolverId: string,
+		data: string,
+		_: Record<string, unknown>,
+	): Promise<void> {
+		let entry = await this.dynamicCredentialEntryRepository.findOne({
+			where: { credentialId, subjectId, resolverId },
+		});
+
+		if (!entry) {
+			entry = new DynamicCredentialEntry();
+			entry.credentialId = credentialId;
+			entry.subjectId = subjectId;
+			entry.resolverId = resolverId;
+		}
+
+		entry.data = data;
+		await this.dynamicCredentialEntryRepository.save(entry);
+	}
+
+	async deleteCredentialData(
+		credentialId: string,
+		subjectId: string,
+		resolverId: string,
+		_: Record<string, unknown>,
+	): Promise<void> {
+		await this.dynamicCredentialEntryRepository.delete({
+			credentialId,
+			subjectId,
+			resolverId,
+		});
+	}
+}
diff --git a/packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/storage/storage-interface.ts b/packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/storage/storage-interface.ts
new file mode 100644
index 00000000000..c57d5e6ae93
--- /dev/null
+++ b/packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/storage/storage-interface.ts
@@ -0,0 +1,38 @@
+export interface ICredentialEntriesStorage {
+	/**
+	 * Retrieves credential data for a specific entity from storage.
+	 *
+	 * @returns The credential data object, or null if not found
+	 * @throws {Error} When storage operation fails
+	 */
+	getCredentialData(
+		credentialId: string,
+		subjectId: string,
+		resolverId: string,
+		storageOptions: Record<string, unknown>,
+	): Promise<string | null>;
+
+	/**
+	 * Stores credential data for a specific entity in storage.
+	 * @throws {Error} When storage operation fails
+	 */
+	setCredentialData(
+		credentialId: string,
+		subjectId: string,
+		resolverId: string,
+		data: string,
+		storageOptions: Record<string, unknown>,
+	): Promise<void>;
+
+	/**
+	 * Deletes credential data for a specific entity from storage.
+	 * Optional - not all storage implementations support deletion.
+	 * @throws {Error} When deletion operation fails
+	 */
+	deleteCredentialData?(
+		credentialId: string,
+		subjectId: string,
+		resolverId: string,
+		storageOptions: Record<string, unknown>,
+	): Promise<void>;
+}
diff --git a/packages/cli/src/modules/dynamic-credentials.ee/database/entities/dynamic-credential-entry.ts b/packages/cli/src/modules/dynamic-credentials.ee/database/entities/dynamic-credential-entry.ts
new file mode 100644
index 00000000000..911517ad5d6
--- /dev/null
+++ b/packages/cli/src/modules/dynamic-credentials.ee/database/entities/dynamic-credential-entry.ts
@@ -0,0 +1,39 @@
+import { CredentialsEntity, WithTimestamps } from '@n8n/db';
+import { Column, Entity, JoinColumn, ManyToOne, PrimaryColumn } from '@n8n/typeorm';
+
+import { DynamicCredentialResolver } from './credential-resolver';
+
+@Entity({
+	name: 'dynamic_credential_entry',
+})
+export class DynamicCredentialEntry extends WithTimestamps {
+	constructor() {
+		super();
+	}
+
+	@PrimaryColumn({
+		name: 'credential_id',
+	})
+	credentialId: string;
+
+	@PrimaryColumn({
+		name: 'subject_id',
+	})
+	subjectId: string;
+
+	@PrimaryColumn({
+		name: 'resolver_id',
+	})
+	resolverId: string;
+
+	@Column('text')
+	data: string;
+
+	@ManyToOne(() => CredentialsEntity, { onDelete: 'CASCADE' })
+	@JoinColumn({ name: 'credential_id' })
+	credential: CredentialsEntity;
+
+	@ManyToOne(() => DynamicCredentialResolver, { onDelete: 'CASCADE' })
+	@JoinColumn({ name: 'resolver_id' })
+	resolver: DynamicCredentialResolver;
+}
diff --git a/packages/cli/src/modules/dynamic-credentials.ee/database/repositories/dynamic-credential-entry.repository.ts b/packages/cli/src/modules/dynamic-credentials.ee/database/repositories/dynamic-credential-entry.repository.ts
new file mode 100644
index 00000000000..c8b0d9b3b0c
--- /dev/null
+++ b/packages/cli/src/modules/dynamic-credentials.ee/database/repositories/dynamic-credential-entry.repository.ts
@@ -0,0 +1,11 @@
+import { Service } from '@n8n/di';
+import { DataSource, Repository } from '@n8n/typeorm';
+
+import { DynamicCredentialEntry } from '../entities/dynamic-credential-entry';
+
+@Service()
+export class DynamicCredentialEntryRepository extends Repository<DynamicCredentialEntry> {
+	constructor(dataSource: DataSource) {
+		super(DynamicCredentialEntry, dataSource.manager);
+	}
+}
diff --git a/packages/cli/src/modules/dynamic-credentials.ee/dynamic-credentials.module.ts b/packages/cli/src/modules/dynamic-credentials.ee/dynamic-credentials.module.ts
index 63da47c25a1..613d469ebaa 100644
--- a/packages/cli/src/modules/dynamic-credentials.ee/dynamic-credentials.module.ts
+++ b/packages/cli/src/modules/dynamic-credentials.ee/dynamic-credentials.module.ts
@@ -14,8 +14,9 @@ export class DynamicCredentialsModule implements ModuleInterface {
 
 	async entities() {
 		const { DynamicCredentialResolver } = await import('./database/entities/credential-resolver');
+		const { DynamicCredentialEntry } = await import('./database/entities/dynamic-credential-entry');
 
-		return [DynamicCredentialResolver];
+		return [DynamicCredentialResolver, DynamicCredentialEntry];
 	}
 
 	@OnShutdown()
diff --git a/packages/cli/test/integration/dynamic-credentials/dynamic-credential-entry-storage.test.ts b/packages/cli/test/integration/dynamic-credentials/dynamic-credential-entry-storage.test.ts
new file mode 100644
index 00000000000..3c44ceae1a8
--- /dev/null
+++ b/packages/cli/test/integration/dynamic-credentials/dynamic-credential-entry-storage.test.ts
@@ -0,0 +1,263 @@
+import { testDb, testModules } from '@n8n/backend-test-utils';
+import { Container } from '@n8n/di';
+
+import { DynamicCredentialEntryStorage } from '@/modules/dynamic-credentials.ee/credential-resolvers/storage/dynamic-credential-entry-storage';
+
+import { createCredentials } from '../shared/db/credentials';
+import { createDynamicCredentialResolver } from './shared/db-helpers';
+
+describe('DynamicCredentialEntryStorage', () => {
+	let storage: DynamicCredentialEntryStorage;
+
+	beforeAll(async () => {
+		await testModules.loadModules(['dynamic-credentials']);
+		await testDb.init();
+		storage = Container.get(DynamicCredentialEntryStorage);
+	});
+
+	afterAll(async () => {
+		await testDb.terminate();
+	});
+
+	beforeEach(async () => {
+		await testDb.truncate([
+			'DynamicCredentialEntry',
+			'DynamicCredentialResolver',
+			'CredentialsEntity',
+		]);
+	});
+
+	it('should store and retrieve credential data', async () => {
+		// ARRANGE
+		const credential = await createCredentials({
+			name: 'Test Credential',
+			type: 'testType',
+			data: 'test-data',
+		});
+		const resolver = await createDynamicCredentialResolver({
+			name: 'test-resolver',
+			type: 'test',
+			config: 'test-data',
+		});
+
+		const testData = 'encrypted-credential-data';
+
+		// ACT - Store
+		await storage.setCredentialData(credential.id, 'test-subject', resolver.id, testData, {});
+
+		// ACT - Retrieve
+		const retrievedData = await storage.getCredentialData(
+			credential.id,
+			'test-subject',
+			resolver.id,
+			{},
+		);
+
+		// ASSERT
+		expect(retrievedData).toBe(testData);
+	});
+
+	it('should update existing credential data (upsert)', async () => {
+		// ARRANGE
+		const credential = await createCredentials({
+			name: 'Test Credential',
+			type: 'testType',
+			data: 'test-data',
+		});
+		const resolver = await createDynamicCredentialResolver({
+			name: 'test-resolver',
+			type: 'test',
+			config: 'test-data',
+		});
+
+		// ACT - Insert
+		await storage.setCredentialData(
+			credential.id,
+			'upsert-subject',
+			resolver.id,
+			'original-data',
+			{},
+		);
+
+		// ACT - Update
+		await storage.setCredentialData(
+			credential.id,
+			'upsert-subject',
+			resolver.id,
+			'updated-data',
+			{},
+		);
+
+		// ACT - Retrieve
+		const data = await storage.getCredentialData(credential.id, 'upsert-subject', resolver.id, {});
+
+		// ASSERT
+		expect(data).toBe('updated-data');
+	});
+
+	it('should delete credential data', async () => {
+		// ARRANGE
+		const credential = await createCredentials({
+			name: 'Test Credential',
+			type: 'testType',
+			data: 'test-data',
+		});
+		const resolver = await createDynamicCredentialResolver({
+			name: 'test-resolver',
+			type: 'test',
+			config: 'test-data',
+		});
+
+		const testData = 'data-to-delete';
+
+		// Store data first
+		await storage.setCredentialData(credential.id, 'delete-subject', resolver.id, testData, {});
+
+		// Verify it exists
+		const beforeDelete = await storage.getCredentialData(
+			credential.id,
+			'delete-subject',
+			resolver.id,
+			{},
+		);
+		expect(beforeDelete).toBe(testData);
+
+		// ACT - Delete
+		await storage.deleteCredentialData(credential.id, 'delete-subject', resolver.id, {});
+
+		// ASSERT - Verify it's gone
+		const afterDelete = await storage.getCredentialData(
+			credential.id,
+			'delete-subject',
+			resolver.id,
+			{},
+		);
+		expect(afterDelete).toBeNull();
+	});
+
+	it('should isolate entries by composite key (multiple entries do not affect each other)', async () => {
+		// ARRANGE
+		const credential1 = await createCredentials({
+			name: 'Credential 1',
+			type: 'testType',
+			data: 'test-data-1',
+		});
+		const credential2 = await createCredentials({
+			name: 'Credential 2',
+			type: 'testType',
+			data: 'test-data-2',
+		});
+		const resolver1 = await createDynamicCredentialResolver({
+			name: 'resolver-1',
+			type: 'test',
+			config: 'test-config-1',
+		});
+		const resolver2 = await createDynamicCredentialResolver({
+			name: 'resolver-2',
+			type: 'test',
+			config: 'test-config-2',
+		});
+
+		// ACT - Create multiple entries with different combinations
+		// Same credential, different subjects
+		await storage.setCredentialData(
+			credential1.id,
+			'subject-A',
+			resolver1.id,
+			'data-cred1-subjA-res1',
+			{},
+		);
+		await storage.setCredentialData(
+			credential1.id,
+			'subject-B',
+			resolver1.id,
+			'data-cred1-subjB-res1',
+			{},
+		);
+
+		// Same credential and subject, different resolver
+		await storage.setCredentialData(
+			credential1.id,
+			'subject-A',
+			resolver2.id,
+			'data-cred1-subjA-res2',
+			{},
+		);
+
+		// Different credential, same subject and resolver
+		await storage.setCredentialData(
+			credential2.id,
+			'subject-A',
+			resolver1.id,
+			'data-cred2-subjA-res1',
+			{},
+		);
+
+		// ASSERT - Each entry should be isolated and return correct data
+		const data1 = await storage.getCredentialData(credential1.id, 'subject-A', resolver1.id, {});
+		expect(data1).toBe('data-cred1-subjA-res1');
+
+		const data2 = await storage.getCredentialData(credential1.id, 'subject-B', resolver1.id, {});
+		expect(data2).toBe('data-cred1-subjB-res1');
+
+		const data3 = await storage.getCredentialData(credential1.id, 'subject-A', resolver2.id, {});
+		expect(data3).toBe('data-cred1-subjA-res2');
+
+		const data4 = await storage.getCredentialData(credential2.id, 'subject-A', resolver1.id, {});
+		expect(data4).toBe('data-cred2-subjA-res1');
+
+		// ACT - Update one entry
+		await storage.setCredentialData(
+			credential1.id,
+			'subject-A',
+			resolver1.id,
+			'updated-data-cred1-subjA-res1',
+			{},
+		);
+
+		// ASSERT - Only the updated entry should change, others remain unchanged
+		const updatedData1 = await storage.getCredentialData(
+			credential1.id,
+			'subject-A',
+			resolver1.id,
+			{},
+		);
+		expect(updatedData1).toBe('updated-data-cred1-subjA-res1');
+
+		const unchangedData2 = await storage.getCredentialData(
+			credential1.id,
+			'subject-B',
+			resolver1.id,
+			{},
+		);
+		expect(unchangedData2).toBe('data-cred1-subjB-res1');
+
+		const unchangedData3 = await storage.getCredentialData(
+			credential1.id,
+			'subject-A',
+			resolver2.id,
+			{},
+		);
+		expect(unchangedData3).toBe('data-cred1-subjA-res2');
+
+		// ACT - Delete one entry
+		await storage.deleteCredentialData(credential1.id, 'subject-A', resolver1.id, {});
+
+		// ASSERT - Deleted entry should be gone, others remain
+		const deletedData = await storage.getCredentialData(
+			credential1.id,
+			'subject-A',
+			resolver1.id,
+			{},
+		);
+		expect(deletedData).toBeNull();
+
+		const stillExistingData = await storage.getCredentialData(
+			credential1.id,
+			'subject-B',
+			resolver1.id,
+			{},
+		);
+		expect(stillExistingData).toBe('data-cred1-subjB-res1');
+	});
+});
diff --git a/packages/cli/test/integration/dynamic-credentials/dynamic-credential-entry.repository.test.ts b/packages/cli/test/integration/dynamic-credentials/dynamic-credential-entry.repository.test.ts
new file mode 100644
index 00000000000..50384dd2990
--- /dev/null
+++ b/packages/cli/test/integration/dynamic-credentials/dynamic-credential-entry.repository.test.ts
@@ -0,0 +1,459 @@
+import { testDb, testModules } from '@n8n/backend-test-utils';
+import { CredentialsRepository } from '@n8n/db';
+import { Container } from '@n8n/di';
+
+import { DynamicCredentialEntryRepository } from '@/modules/dynamic-credentials.ee/database/repositories/dynamic-credential-entry.repository';
+import { DynamicCredentialEntry } from '@/modules/dynamic-credentials.ee/database/entities/dynamic-credential-entry';
+import { DynamicCredentialResolverRepository } from '@/modules/dynamic-credentials.ee/database/repositories/credential-resolver.repository';
+
+import { createCredentials } from '../shared/db/credentials';
+import { createDynamicCredentialResolver } from './shared/db-helpers';
+
+describe('DynamicCredentialEntryRepository', () => {
+	let repository: DynamicCredentialEntryRepository;
+
+	beforeAll(async () => {
+		await testModules.loadModules(['dynamic-credentials']);
+		await testDb.init();
+		repository = Container.get(DynamicCredentialEntryRepository);
+	});
+
+	afterAll(async () => {
+		await testDb.terminate();
+	});
+
+	beforeEach(async () => {
+		await testDb.truncate([
+			'DynamicCredentialEntry',
+			'DynamicCredentialResolver',
+			'CredentialsEntity',
+		]);
+	});
+
+	it('should save and retrieve a dynamic credential entry', async () => {
+		// ARRANGE
+		const credential = await createCredentials({
+			name: 'Test Credential',
+			type: 'testType',
+			data: 'test-data',
+		});
+		const resolver = await createDynamicCredentialResolver({
+			name: 'test-resolver',
+			type: 'test',
+			config: 'test-data',
+		});
+
+		const entry = new DynamicCredentialEntry();
+		entry.credentialId = credential.id;
+		entry.subjectId = 'subject-123';
+		entry.resolverId = resolver.id;
+		entry.data = 'encrypted-test-data';
+
+		// ACT
+		const savedEntry = await repository.save(entry);
+
+		// Retrieve it back
+		const foundEntry = await repository.findOne({
+			where: {
+				credentialId: credential.id,
+				subjectId: 'subject-123',
+				resolverId: resolver.id,
+			},
+		});
+
+		// ASSERT
+		expect(savedEntry).toBeDefined();
+		expect(savedEntry.credentialId).toBe(credential.id);
+		expect(savedEntry.subjectId).toBe('subject-123');
+		expect(savedEntry.resolverId).toBe(resolver.id);
+		expect(savedEntry.data).toBe('encrypted-test-data');
+		expect(savedEntry.createdAt).toBeInstanceOf(Date);
+		expect(savedEntry.updatedAt).toBeInstanceOf(Date);
+
+		expect(foundEntry).toBeDefined();
+		expect(foundEntry?.data).toBe('encrypted-test-data');
+	});
+
+	it('should cascade delete entries when credential is deleted', async () => {
+		// ARRANGE
+		const credential = await createCredentials({
+			name: 'Test Credential',
+			type: 'testType',
+			data: 'test-data',
+		});
+		const resolver = await createDynamicCredentialResolver({
+			name: 'test-resolver',
+			type: 'test',
+			config: 'test-data',
+		});
+
+		// Create multiple entries for the same credential
+		const entry1 = new DynamicCredentialEntry();
+		entry1.credentialId = credential.id;
+		entry1.subjectId = 'subject-1';
+		entry1.resolverId = resolver.id;
+		entry1.data = 'data-1';
+
+		const entry2 = new DynamicCredentialEntry();
+		entry2.credentialId = credential.id;
+		entry2.subjectId = 'subject-2';
+		entry2.resolverId = resolver.id;
+		entry2.data = 'data-2';
+
+		await repository.save(entry1);
+		await repository.save(entry2);
+
+		// Verify entries exist
+		const entriesBeforeDelete = await repository.find({
+			where: {
+				credentialId: credential.id,
+			},
+		});
+		expect(entriesBeforeDelete).toHaveLength(2);
+
+		// ACT - Delete the credential
+		const credentialsRepository = Container.get(CredentialsRepository);
+		await credentialsRepository.delete({ id: credential.id });
+
+		// ASSERT - All entries for this credential should be cascade deleted
+		const entriesAfterDelete = await repository.find({
+			where: {
+				credentialId: credential.id,
+			},
+		});
+		expect(entriesAfterDelete).toHaveLength(0);
+	});
+
+	it('should cascade delete entries when resolver is deleted', async () => {
+		// ARRANGE
+		const credential1 = await createCredentials({
+			name: 'Credential 1',
+			type: 'testType',
+			data: 'test-data-1',
+		});
+		const credential2 = await createCredentials({
+			name: 'Credential 2',
+			type: 'testType',
+			data: 'test-data-2',
+		});
+		const resolver = await createDynamicCredentialResolver({
+			name: 'test-resolver',
+			type: 'test',
+			config: 'test-data',
+		});
+
+		// Create entries for multiple credentials using the same resolver
+		const entry1 = new DynamicCredentialEntry();
+		entry1.credentialId = credential1.id;
+		entry1.subjectId = 'subject-1';
+		entry1.resolverId = resolver.id;
+		entry1.data = 'data-1';
+
+		const entry2 = new DynamicCredentialEntry();
+		entry2.credentialId = credential2.id;
+		entry2.subjectId = 'subject-2';
+		entry2.resolverId = resolver.id;
+		entry2.data = 'data-2';
+
+		await repository.save(entry1);
+		await repository.save(entry2);
+
+		// Verify entries exist
+		const entriesBeforeDelete = await repository.find({
+			where: {
+				resolverId: resolver.id,
+			},
+		});
+		expect(entriesBeforeDelete).toHaveLength(2);
+
+		// ACT - Delete the resolver
+		const resolverRepository = Container.get(DynamicCredentialResolverRepository);
+		await resolverRepository.delete({ id: resolver.id });
+
+		// ASSERT - All entries for this resolver should be cascade deleted
+		const entriesAfterDelete = await repository.find({
+			where: {
+				resolverId: resolver.id,
+			},
+		});
+		expect(entriesAfterDelete).toHaveLength(0);
+	});
+
+	it('should fetch CredentialsEntity through ManyToOne relationship', async () => {
+		// ARRANGE
+		const credential = await createCredentials({
+			name: 'Test Credential for Relationship',
+			type: 'testType',
+			data: 'test-data',
+		});
+		const resolver = await createDynamicCredentialResolver({
+			name: 'test-resolver',
+			type: 'test',
+			config: 'test-data',
+		});
+
+		const entry = new DynamicCredentialEntry();
+		entry.credentialId = credential.id;
+		entry.subjectId = 'subject-123';
+		entry.resolverId = resolver.id;
+		entry.data = 'encrypted-test-data';
+
+		await repository.save(entry);
+
+		// ACT - Fetch entry with credential relationship loaded
+		const foundEntry = await repository.findOne({
+			where: {
+				credentialId: credential.id,
+				subjectId: 'subject-123',
+				resolverId: resolver.id,
+			},
+			relations: ['credential'],
+		});
+
+		// ASSERT
+		expect(foundEntry).toBeDefined();
+		expect(foundEntry?.credential).toBeDefined();
+		expect(foundEntry?.credential.id).toBe(credential.id);
+		expect(foundEntry?.credential.name).toBe('Test Credential for Relationship');
+		expect(foundEntry?.credential.type).toBe('testType');
+	});
+
+	it('should fetch DynamicCredentialResolver through ManyToOne relationship', async () => {
+		// ARRANGE
+		const credential = await createCredentials({
+			name: 'Test Credential',
+			type: 'testType',
+			data: 'test-data',
+		});
+		const resolver = await createDynamicCredentialResolver({
+			name: 'test-resolver-for-relationship',
+			type: 'test-type',
+			config: 'test-config-data',
+		});
+
+		const entry = new DynamicCredentialEntry();
+		entry.credentialId = credential.id;
+		entry.subjectId = 'subject-456';
+		entry.resolverId = resolver.id;
+		entry.data = 'encrypted-test-data';
+
+		await repository.save(entry);
+
+		// ACT - Fetch entry with resolver relationship loaded
+		const foundEntry = await repository.findOne({
+			where: {
+				credentialId: credential.id,
+				subjectId: 'subject-456',
+				resolverId: resolver.id,
+			},
+			relations: ['resolver'],
+		});
+
+		// ASSERT
+		expect(foundEntry).toBeDefined();
+		expect(foundEntry?.resolver).toBeDefined();
+		expect(foundEntry?.resolver.id).toBe(resolver.id);
+		expect(foundEntry?.resolver.name).toBe('test-resolver-for-relationship');
+		expect(foundEntry?.resolver.type).toBe('test-type');
+	});
+
+	it('should filter entries by credential type using find method', async () => {
+		// ARRANGE
+		const credential1 = await createCredentials({
+			name: 'OAuth Credential',
+			type: 'oAuth2Api',
+			data: 'oauth-data',
+		});
+		const credential2 = await createCredentials({
+			name: 'API Key Credential',
+			type: 'apiKeyAuth',
+			data: 'api-key-data',
+		});
+		const credential3 = await createCredentials({
+			name: 'Another OAuth Credential',
+			type: 'oAuth2Api',
+			data: 'oauth-data-2',
+		});
+		const resolver = await createDynamicCredentialResolver({
+			name: 'test-resolver',
+			type: 'test',
+			config: 'test-data',
+		});
+
+		// Create entries for different credential types
+		const entry1 = new DynamicCredentialEntry();
+		entry1.credentialId = credential1.id;
+		entry1.subjectId = 'subject-1';
+		entry1.resolverId = resolver.id;
+		entry1.data = 'data-1';
+
+		const entry2 = new DynamicCredentialEntry();
+		entry2.credentialId = credential2.id;
+		entry2.subjectId = 'subject-2';
+		entry2.resolverId = resolver.id;
+		entry2.data = 'data-2';
+
+		const entry3 = new DynamicCredentialEntry();
+		entry3.credentialId = credential3.id;
+		entry3.subjectId = 'subject-3';
+		entry3.resolverId = resolver.id;
+		entry3.data = 'data-3';
+
+		await repository.save([entry1, entry2, entry3]);
+
+		// ACT - Query entries where credential type is 'oAuth2Api'
+		const oauthEntries = await repository.find({
+			where: {
+				credential: {
+					type: 'oAuth2Api',
+				},
+			},
+			relations: ['credential'],
+		});
+
+		// ASSERT
+		expect(oauthEntries).toHaveLength(2);
+		expect(oauthEntries.every((entry) => entry.credential.type === 'oAuth2Api')).toBe(true);
+		expect(oauthEntries.map((e) => e.subjectId).sort()).toEqual(['subject-1', 'subject-3']);
+	});
+
+	it('should filter entries by resolver type using find method', async () => {
+		// ARRANGE
+		const credential = await createCredentials({
+			name: 'Test Credential',
+			type: 'testType',
+			data: 'test-data',
+		});
+		const resolver1 = await createDynamicCredentialResolver({
+			name: 'AWS Resolver',
+			type: 'aws-secrets-manager',
+			config: 'aws-config',
+		});
+		const resolver2 = await createDynamicCredentialResolver({
+			name: 'Azure Resolver',
+			type: 'azure-key-vault',
+			config: 'azure-config',
+		});
+		const resolver3 = await createDynamicCredentialResolver({
+			name: 'Another AWS Resolver',
+			type: 'aws-secrets-manager',
+			config: 'aws-config-2',
+		});
+
+		// Create entries for different resolver types
+		const entry1 = new DynamicCredentialEntry();
+		entry1.credentialId = credential.id;
+		entry1.subjectId = 'subject-1';
+		entry1.resolverId = resolver1.id;
+		entry1.data = 'data-1';
+
+		const entry2 = new DynamicCredentialEntry();
+		entry2.credentialId = credential.id;
+		entry2.subjectId = 'subject-2';
+		entry2.resolverId = resolver2.id;
+		entry2.data = 'data-2';
+
+		const entry3 = new DynamicCredentialEntry();
+		entry3.credentialId = credential.id;
+		entry3.subjectId = 'subject-3';
+		entry3.resolverId = resolver3.id;
+		entry3.data = 'data-3';
+
+		await repository.save([entry1, entry2, entry3]);
+
+		// ACT - Query entries where resolver type is 'aws-secrets-manager'
+		const awsEntries = await repository.find({
+			where: {
+				resolver: {
+					type: 'aws-secrets-manager',
+				},
+			},
+			relations: ['resolver'],
+		});
+
+		// ASSERT
+		expect(awsEntries).toHaveLength(2);
+		expect(awsEntries.every((entry) => entry.resolver.type === 'aws-secrets-manager')).toBe(true);
+		expect(awsEntries.map((e) => e.subjectId).sort()).toEqual(['subject-1', 'subject-3']);
+	});
+
+	it('should filter entries by both credential type and resolver type using find method', async () => {
+		// ARRANGE
+		const credential1 = await createCredentials({
+			name: 'OAuth Credential 1',
+			type: 'oAuth2Api',
+			data: 'oauth-data-1',
+		});
+		const credential2 = await createCredentials({
+			name: 'OAuth Credential 2',
+			type: 'oAuth2Api',
+			data: 'oauth-data-2',
+		});
+		const credential3 = await createCredentials({
+			name: 'API Key Credential',
+			type: 'apiKeyAuth',
+			data: 'api-key-data',
+		});
+
+		const resolver1 = await createDynamicCredentialResolver({
+			name: 'AWS Resolver',
+			type: 'aws-secrets-manager',
+			config: 'aws-config',
+		});
+		const resolver2 = await createDynamicCredentialResolver({
+			name: 'Azure Resolver',
+			type: 'azure-key-vault',
+			config: 'azure-config',
+		});
+
+		// Create entries with various combinations
+		const entry1 = new DynamicCredentialEntry();
+		entry1.credentialId = credential1.id;
+		entry1.subjectId = 'subject-1';
+		entry1.resolverId = resolver1.id;
+		entry1.data = 'data-1';
+
+		const entry2 = new DynamicCredentialEntry();
+		entry2.credentialId = credential1.id;
+		entry2.subjectId = 'subject-2';
+		entry2.resolverId = resolver2.id;
+		entry2.data = 'data-2';
+
+		const entry3 = new DynamicCredentialEntry();
+		entry3.credentialId = credential2.id;
+		entry3.subjectId = 'subject-3';
+		entry3.resolverId = resolver1.id;
+		entry3.data = 'data-3';
+
+		const entry4 = new DynamicCredentialEntry();
+		entry4.credentialId = credential3.id;
+		entry4.subjectId = 'subject-4';
+		entry4.resolverId = resolver1.id;
+		entry4.data = 'data-4';
+
+		await repository.save([entry1, entry2, entry3, entry4]);
+
+		// ACT - Query entries where credential type is 'oAuth2Api' AND resolver type is 'aws-secrets-manager'
+		const filteredEntries = await repository.find({
+			where: {
+				credential: {
+					type: 'oAuth2Api',
+				},
+				resolver: {
+					type: 'aws-secrets-manager',
+				},
+			},
+			relations: ['credential', 'resolver'],
+		});
+
+		// ASSERT - Should only return entries with both OAuth credentials and AWS resolver
+		expect(filteredEntries).toHaveLength(2);
+		expect(
+			filteredEntries.every(
+				(entry) =>
+					entry.credential.type === 'oAuth2Api' && entry.resolver.type === 'aws-secrets-manager',
+			),
+		).toBe(true);
+		expect(filteredEntries.map((e) => e.subjectId).sort()).toEqual(['subject-1', 'subject-3']);
+	});
+});
diff --git a/packages/cli/test/integration/dynamic-credentials/shared/db-helpers.ts b/packages/cli/test/integration/dynamic-credentials/shared/db-helpers.ts
new file mode 100644
index 00000000000..a03f70906f7
--- /dev/null
+++ b/packages/cli/test/integration/dynamic-credentials/shared/db-helpers.ts
@@ -0,0 +1,22 @@
+import { Container } from '@n8n/di';
+
+import type { DynamicCredentialResolver } from '@/modules/dynamic-credentials.ee/database/entities/credential-resolver';
+import { DynamicCredentialResolverRepository } from '@/modules/dynamic-credentials.ee/database/repositories/credential-resolver.repository';
+
+/**
+ * Creates a dynamic credential resolver for testing
+ */
+export async function createDynamicCredentialResolver(
+	attributes: Partial<DynamicCredentialResolver>,
+): Promise<DynamicCredentialResolver> {
+	const repository = Container.get(DynamicCredentialResolverRepository);
+
+	const resolver = repository.create({
+		name: attributes.name ?? 'test-resolver',
+		type: attributes.type ?? 'test-type',
+		config: attributes.config ?? '{}',
+		...attributes,
+	});
+
+	return await repository.save(resolver);
+}

From 064f90ce1e25c75eca30f3bd4ac932560e50e67d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Fri, 5 Dec 2025 11:15:29 +0100
Subject: [PATCH 079/167] fix: Add `HOME` env var to distroless runners image
 (#22796)

---
 docker/images/runners/Dockerfile.distroless | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docker/images/runners/Dockerfile.distroless b/docker/images/runners/Dockerfile.distroless
index 39fbfcf3ed1..a934c125207 100644
--- a/docker/images/runners/Dockerfile.distroless
+++ b/docker/images/runners/Dockerfile.distroless
@@ -172,7 +172,8 @@ ARG N8N_VERSION=snapshot
 ARG N8N_RELEASE_TYPE=dev
 
 ENV NODE_ENV=production \
-    N8N_RELEASE_TYPE=${N8N_RELEASE_TYPE}
+    N8N_RELEASE_TYPE=${N8N_RELEASE_TYPE} \
+    HOME=/home/runner
 
 # Copy everything from the prepared runtime filesystem
 COPY --from=runtime-prep --chown=root:root /runtime/ /

From 132f9c6f707176f1fbd5b5d7d8177ea4b0f8df3c Mon Sep 17 00:00:00 2001
From: Suguru Inoue <suguru@n8n.io>
Date: Fri, 5 Dec 2025 11:19:41 +0100
Subject: [PATCH 080/167] fix(editor): Improve table rendering in chat history
 (no-changelog) (#22738)

---
 .../src/features/ai/chatHub/ChatView.vue      |  8 ++-
 .../ai/chatHub/components/ChatMessage.vue     | 53 +++++++++++++------
 .../composables/useChatHubMarkdownOptions.ts  | 28 +++++++++-
 3 files changed, 69 insertions(+), 20 deletions(-)

diff --git a/packages/frontend/editor-ui/src/features/ai/chatHub/ChatView.vue b/packages/frontend/editor-ui/src/features/ai/chatHub/ChatView.vue
index 99a38d27d64..fcc7d08b57e 100644
--- a/packages/frontend/editor-ui/src/features/ai/chatHub/ChatView.vue
+++ b/packages/frontend/editor-ui/src/features/ai/chatHub/ChatView.vue
@@ -32,7 +32,7 @@ import {
 	type ChatModelDto,
 } from '@n8n/api-types';
 import { N8nIconButton, N8nScrollArea, N8nText } from '@n8n/design-system';
-import { useLocalStorage, useMediaQuery, useScroll } from '@vueuse/core';
+import { useElementSize, useLocalStorage, useMediaQuery, useScroll } from '@vueuse/core';
 import { v4 as uuidv4 } from 'uuid';
 import { computed, nextTick, ref, useTemplateRef, watch } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
@@ -62,12 +62,15 @@ const i18n = useI18n();
 
 const headerRef = useTemplateRef('headerRef');
 const inputRef = useTemplateRef('inputRef');
+const scrollableRef = useTemplateRef('scrollable');
+
+const scrollableSize = useElementSize(scrollableRef);
+
 const sessionId = computed<string>(() =>
 	typeof route.params.id === 'string' ? route.params.id : uuidv4(),
 );
 const isResponding = computed(() => chatStore.isResponding(sessionId.value));
 const isNewSession = computed(() => sessionId.value !== route.params.id);
-const scrollableRef = useTemplateRef('scrollable');
 const scrollContainerRef = computed(() => scrollableRef.value?.parentElement ?? null);
 const currentConversation = computed(() =>
 	sessionId.value ? chatStore.sessions.byId[sessionId.value] : undefined,
@@ -605,6 +608,7 @@ function onFilesDropped(files: File[]) {
 								? scrollContainerRef.offsetHeight - 30 /* padding-top */ - 200 /* padding-bottom */
 								: undefined
 						"
+						:container-width="scrollableSize.width.value ?? 0"
 						@start-edit="handleStartEditMessage(message.id)"
 						@cancel-edit="handleCancelEditMessage"
 						@regenerate="handleRegenerateMessage"
diff --git a/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatMessage.vue b/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatMessage.vue
index 56908416d9c..f720dc6d3fa 100644
--- a/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatMessage.vue
+++ b/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatMessage.vue
@@ -18,18 +18,26 @@ import { useDeviceSupport } from '@n8n/composables/useDeviceSupport';
 import { useI18n } from '@n8n/i18n';
 import CopyButton from '@/features/ai/chatHub/components/CopyButton.vue';
 
-const { message, compact, isEditing, isStreaming, minHeight, cachedAgentDisplayName } =
-	defineProps<{
-		message: ChatMessage;
-		compact: boolean;
-		isEditing: boolean;
-		isStreaming: boolean;
-		cachedAgentDisplayName: string | null;
-		/**
-		 * minHeight allows scrolling agent's response to the top while it is being generated
-		 */
-		minHeight?: number;
-	}>();
+const {
+	message,
+	compact,
+	isEditing,
+	isStreaming,
+	minHeight,
+	cachedAgentDisplayName,
+	containerWidth,
+} = defineProps<{
+	message: ChatMessage;
+	compact: boolean;
+	isEditing: boolean;
+	isStreaming: boolean;
+	cachedAgentDisplayName: string | null;
+	/**
+	 * minHeight allows scrolling agent's response to the top while it is being generated
+	 */
+	minHeight?: number;
+	containerWidth: number;
+}>();
 
 const emit = defineEmits<{
 	startEdit: [];
@@ -48,7 +56,7 @@ const styles = useCssModule();
 const editedText = ref('');
 const hoveredCodeBlockActions = ref<HTMLElement | null>(null);
 const textareaRef = useTemplateRef('textarea');
-const markdown = useChatHubMarkdownOptions(styles.codeBlockActions);
+const markdown = useChatHubMarkdownOptions(styles.codeBlockActions, styles.tableContainer);
 const messageContent = computed(() => message.content);
 
 const speech = useSpeechSynthesis(messageContent, {
@@ -181,7 +189,10 @@ onBeforeMount(() => {
 				[$style.compact]: compact,
 			},
 		]"
-		:style="minHeight ? { minHeight: `${minHeight}px` } : undefined"
+		:style="{
+			minHeight: minHeight ? `${minHeight}px` : undefined,
+			'--container--width': `${containerWidth}px`,
+		}"
 		:data-message-id="message.id"
 	>
 		<div :class="$style.avatar">
@@ -404,6 +415,7 @@ onBeforeMount(() => {
 	}
 
 	pre {
+		width: 100%;
 		font-family: inherit;
 		font-size: inherit;
 		margin: 0;
@@ -430,18 +442,27 @@ onBeforeMount(() => {
 		}
 	}
 
+	.tableContainer {
+		width: var(--container--width);
+		padding-bottom: 1em;
+		padding-left: calc((var(--container--width) - 100%) / 2);
+		padding-right: var(--spacing--lg);
+		margin-left: calc(-1 * (var(--container--width) - 100%) / 2);
+		overflow-x: auto;
+	}
+
 	table {
-		width: 100%;
+		width: fit-content;
 		border-bottom: var(--border);
 		border-top: var(--border);
 		border-width: 2px;
-		margin-bottom: 1em;
 		border-color: var(--color--text--shade-1);
 	}
 
 	th,
 	td {
 		padding: 0.25em 1em 0.25em 0;
+		min-width: 12em;
 	}
 
 	th {
diff --git a/packages/frontend/editor-ui/src/features/ai/chatHub/composables/useChatHubMarkdownOptions.ts b/packages/frontend/editor-ui/src/features/ai/chatHub/composables/useChatHubMarkdownOptions.ts
index ab39b519681..020ef026730 100644
--- a/packages/frontend/editor-ui/src/features/ai/chatHub/composables/useChatHubMarkdownOptions.ts
+++ b/packages/frontend/editor-ui/src/features/ai/chatHub/composables/useChatHubMarkdownOptions.ts
@@ -13,7 +13,10 @@ let asyncImport:
 	| { status: 'uninitialized' }
 	| { status: 'done' } = { status: 'uninitialized' };
 
-export function useChatHubMarkdownOptions(codeBlockActionsClassName: string) {
+export function useChatHubMarkdownOptions(
+	codeBlockActionsClassName: string,
+	tableContainerClassName: string,
+) {
 	const forceReRenderKey = ref(0);
 	const codeBlockContents = ref<Map<string, string>>();
 
@@ -100,7 +103,28 @@ export function useChatHubMarkdownOptions(codeBlockActionsClassName: string) {
 				);
 			};
 		};
-		return [linksNewTabPlugin, codeBlockPlugin];
+
+		const tablePlugin = (vueMarkdownItInstance: MarkdownIt) => {
+			const defaultTableOpenRenderer = vueMarkdownItInstance.renderer.rules.table_open;
+			const defaultTableCloseRenderer = vueMarkdownItInstance.renderer.rules.table_close;
+
+			vueMarkdownItInstance.renderer.rules.table_open = (tokens, idx, options, env, self) => {
+				const defaultRendered =
+					defaultTableOpenRenderer?.(tokens, idx, options, env, self) ??
+					self.renderToken(tokens, idx, options);
+
+				return defaultRendered.replace('<table', `<div class="${tableContainerClassName}"><table`);
+			};
+			vueMarkdownItInstance.renderer.rules.table_close = (tokens, idx, options, env, self) => {
+				const defaultRendered =
+					defaultTableCloseRenderer?.(tokens, idx, options, env, self) ??
+					self.renderToken(tokens, idx, options);
+
+				return defaultRendered.replace('</table>', '</table></div>');
+			};
+		};
+
+		return [linksNewTabPlugin, codeBlockPlugin, tablePlugin];
 	});
 
 	return { options, forceReRenderKey, plugins, codeBlockContents };

From c43543fb8431aa678a54183954af6269976b924b Mon Sep 17 00:00:00 2001
From: yehorkardash <yehor.kardash@n8n.io>
Date: Fri, 5 Dec 2025 11:45:18 +0100
Subject: [PATCH 081/167] fix(editor): Disable noImplicitAny in typescript
 plugin (#22104)

---
 .../editors/plugins/codemirror/typescript/worker/constants.ts    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/typescript/worker/constants.ts b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/typescript/worker/constants.ts
index 215d7a25442..7d417c1cfc8 100644
--- a/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/typescript/worker/constants.ts
+++ b/packages/frontend/editor-ui/src/features/shared/editors/plugins/codemirror/typescript/worker/constants.ts
@@ -13,6 +13,7 @@ export const COMPILER_OPTIONS: ts.CompilerOptions = {
 	importHelpers: false,
 	skipDefaultLibCheck: true,
 	noEmit: true,
+	noImplicitAny: false,
 };
 export const TYPESCRIPT_AUTOCOMPLETE_THRESHOLD = '15';
 export const TYPESCRIPT_FILES = {

From 492aca09ff399dc1648797a358c8f15665cb2977 Mon Sep 17 00:00:00 2001
From: Charlie Kolb <charlie@n8n.io>
Date: Fri, 5 Dec 2025 12:20:27 +0100
Subject: [PATCH 082/167] feat(editor): Move workflow description edit button
 to settings (#22301)

---
 .../frontend/@n8n/i18n/src/locales/en.json    |  10 +-
 .../MainHeader/ActionsDropdownMenu.vue        |  20 +
 .../WorkflowDescriptionPopover.test.ts        | 638 ------------------
 .../MainHeader/WorkflowDescriptionPopover.vue | 239 -------
 .../components/MainHeader/WorkflowDetails.vue |   7 -
 .../editor-ui/src/app/components/Modals.vue   |   8 +
 .../WorkflowDescriptionModal.test.ts          | 490 ++++++++++++++
 .../components/WorkflowDescriptionModal.vue   | 168 +++++
 .../editor-ui/src/app/constants/actions.ts    |   1 +
 .../editor-ui/src/app/constants/modals.ts     |   1 +
 .../editor-ui/src/app/stores/ui.store.ts      |   2 +
 .../src/app/stores/workflows.store.ts         |  14 +-
 12 files changed, 703 insertions(+), 895 deletions(-)
 delete mode 100644 packages/frontend/editor-ui/src/app/components/MainHeader/WorkflowDescriptionPopover.test.ts
 delete mode 100644 packages/frontend/editor-ui/src/app/components/MainHeader/WorkflowDescriptionPopover.vue
 create mode 100644 packages/frontend/editor-ui/src/app/components/WorkflowDescriptionModal.test.ts
 create mode 100644 packages/frontend/editor-ui/src/app/components/WorkflowDescriptionModal.vue

diff --git a/packages/frontend/@n8n/i18n/src/locales/en.json b/packages/frontend/@n8n/i18n/src/locales/en.json
index cbffe12e6e1..c8762b583eb 100644
--- a/packages/frontend/@n8n/i18n/src/locales/en.json
+++ b/packages/frontend/@n8n/i18n/src/locales/en.json
@@ -1176,9 +1176,8 @@
 	"folder.delete.modal.confirmation": "What should we do with {folders} {workflows} in this folder?",
 	"folder.count": "the {count} folder | the {count} folders",
 	"workflow.count": "the {count} workflow | the {count} workflows",
-	"workflow.description.tooltip": "Edit workflow description",
-	"workflow.description.placeholder": "Describe the purpose and functionality of this workflow",
-	"workflow.description.placeholder.mcp": "To help MCP clients understand when to use this workflow, add a short workflow description that describes what it does.",
+	"workflow.description.mcp": "Clear descriptions help other users and MCP clients understand the purpose of your workflow",
+	"workflow.description.nomcp": "Clear descriptions help other users understand the purpose of your workflow",
 	"workflow.description.error.title": "Problem updating workflow description",
 	"folder.and.workflow.separator": "and",
 	"folders.delete.action": "Archive all workflows and delete subfolders",
@@ -1312,9 +1311,10 @@
 	"mcp.workflowDeactivated.message": "MCP Access has been disabled for this workflow because it is deactivated",
 	"menuActions.duplicate": "Duplicate",
 	"menuActions.download": "Download",
-	"menuActions.push": "Push to Git",
+	"menuActions.push": "Push to git",
+	"menuActions.editDescription": "Edit description",
 	"menuActions.importFromUrl": "Import from URL...",
-	"menuActions.importFromFile": "Import from File...",
+	"menuActions.importFromFile": "Import from file...",
 	"menuActions.delete": "Delete",
 	"menuActions.archive": "Archive",
 	"menuActions.unarchive": "Unarchive",
diff --git a/packages/frontend/editor-ui/src/app/components/MainHeader/ActionsDropdownMenu.vue b/packages/frontend/editor-ui/src/app/components/MainHeader/ActionsDropdownMenu.vue
index 327f2f46cbe..1bfe41a8690 100644
--- a/packages/frontend/editor-ui/src/app/components/MainHeader/ActionsDropdownMenu.vue
+++ b/packages/frontend/editor-ui/src/app/components/MainHeader/ActionsDropdownMenu.vue
@@ -15,6 +15,7 @@ import {
 	IS_DRAFT_PUBLISH_ENABLED,
 	WORKFLOW_SHARE_MODAL_KEY,
 	EnterpriseEditionFeature,
+	WORKFLOW_DESCRIPTION_MODAL_KEY,
 } from '@/app/constants';
 import { hasPermission } from '@/app/utils/rbac/permissions';
 import { useRoute } from 'vue-router';
@@ -163,6 +164,11 @@ const workflowMenuItems = computed<Array<ActionDropdownItem<WORKFLOW_MENU_ACTION
 			label: locale.baseText('menuActions.duplicate'),
 			disabled: !onWorkflowPage.value || !props.id,
 		});
+		actions.unshift({
+			id: WORKFLOW_MENU_ACTIONS.EDIT_DESCRIPTION,
+			label: locale.baseText('menuActions.editDescription'),
+			disabled: !onWorkflowPage.value || !props.id,
+		});
 
 		actions.push(
 			{
@@ -239,6 +245,20 @@ const workflowMenuItems = computed<Array<ActionDropdownItem<WORKFLOW_MENU_ACTION
 
 async function onWorkflowMenuSelect(action: WORKFLOW_MENU_ACTIONS): Promise<void> {
 	switch (action) {
+		case WORKFLOW_MENU_ACTIONS.EDIT_DESCRIPTION: {
+			const workflowId = getWorkflowId(props.id, route.params.name);
+			if (!workflowId) return;
+
+			const workflowDescription = workflowsStore.getWorkflowById(workflowId).description;
+			uiStore.openModalWithData({
+				name: WORKFLOW_DESCRIPTION_MODAL_KEY,
+				data: {
+					workflowId,
+					workflowDescription,
+				},
+			});
+			break;
+		}
 		case WORKFLOW_MENU_ACTIONS.DUPLICATE: {
 			uiStore.openModalWithData({
 				name: DUPLICATE_MODAL_KEY,
diff --git a/packages/frontend/editor-ui/src/app/components/MainHeader/WorkflowDescriptionPopover.test.ts b/packages/frontend/editor-ui/src/app/components/MainHeader/WorkflowDescriptionPopover.test.ts
deleted file mode 100644
index 8a690211772..00000000000
--- a/packages/frontend/editor-ui/src/app/components/MainHeader/WorkflowDescriptionPopover.test.ts
+++ /dev/null
@@ -1,638 +0,0 @@
-import { createComponentRenderer } from '@/__tests__/render';
-import { type MockedStore, mockedStore } from '@/__tests__/utils';
-import { createTestingPinia } from '@pinia/testing';
-import userEvent from '@testing-library/user-event';
-import { nextTick } from 'vue';
-import WorkflowDescriptionPopover from '@/app/components/MainHeader/WorkflowDescriptionPopover.vue';
-import { useWorkflowsStore } from '@/app/stores/workflows.store';
-import { useUIStore } from '@/app/stores/ui.store';
-import { useSettingsStore } from '@/app/stores/settings.store';
-import { useToast } from '@/app/composables/useToast';
-import { useTelemetry } from '@/app/composables/useTelemetry';
-import { STORES } from '@n8n/stores';
-
-vi.mock('@/app/composables/useToast', () => {
-	const showError = vi.fn();
-	return {
-		useToast: () => ({
-			showError,
-		}),
-	};
-});
-
-vi.mock('@/app/composables/useTelemetry', () => {
-	const track = vi.fn();
-	return {
-		useTelemetry: () => ({
-			track,
-		}),
-	};
-});
-
-const initialState = {
-	[STORES.SETTINGS]: {
-		settings: {
-			modules: {
-				mcp: {
-					enabled: false,
-				},
-			},
-		},
-	},
-};
-
-const renderComponent = createComponentRenderer(WorkflowDescriptionPopover, {
-	pinia: createTestingPinia({ initialState }),
-});
-
-describe('WorkflowDescriptionPopover', () => {
-	let workflowsStore: MockedStore<typeof useWorkflowsStore>;
-	let uiStore: MockedStore<typeof useUIStore>;
-	let settingsStore: MockedStore<typeof useSettingsStore>;
-	let telemetry: ReturnType<typeof useTelemetry>;
-	let toast: ReturnType<typeof useToast>;
-
-	beforeEach(() => {
-		workflowsStore = mockedStore(useWorkflowsStore);
-		uiStore = mockedStore(useUIStore);
-		settingsStore = mockedStore(useSettingsStore);
-		telemetry = useTelemetry();
-		toast = useToast();
-
-		// Reset mocks
-		workflowsStore.saveWorkflowDescription = vi.fn().mockResolvedValue(undefined);
-		workflowsStore.workflow = {
-			id: 'test-workflow-id',
-			name: 'Test Workflow',
-			active: false,
-			activeVersionId: null,
-			isArchived: false,
-			createdAt: Date.now(),
-			updatedAt: Date.now(),
-			versionId: '1',
-			nodes: [],
-			connections: {},
-		};
-		uiStore.stateIsDirty = false;
-	});
-
-	afterEach(() => {
-		vi.clearAllMocks();
-	});
-
-	describe('Component rendering', () => {
-		it('should render the description button and default description', async () => {
-			const { getByTestId } = renderComponent({
-				props: {
-					workflowId: 'test-workflow-id',
-					workflowDescription: 'Initial description',
-				},
-			});
-
-			const button = getByTestId('workflow-description-button');
-			await userEvent.click(button);
-
-			const textarea = getByTestId('workflow-description-input');
-			expect(textarea).toHaveValue('Initial description');
-		});
-
-		it('should render empty string if there is no description', async () => {
-			const { getByTestId } = renderComponent({
-				props: {
-					workflowId: 'test-workflow-id',
-				},
-			});
-
-			const button = getByTestId('workflow-description-button');
-			await userEvent.click(button);
-
-			const textarea = getByTestId('workflow-description-input');
-			expect(textarea).toHaveValue('');
-		});
-	});
-
-	describe('Popover interaction', () => {
-		it('should open popover when button is clicked', async () => {
-			const { getByTestId, queryByTestId } = renderComponent({
-				props: {
-					workflowId: 'test-workflow-id',
-					workflowDescription: 'Test description',
-				},
-			});
-
-			const button = getByTestId('workflow-description-button');
-			expect(queryByTestId('workflow-description-edit-content')).not.toBeInTheDocument();
-
-			await userEvent.click(button);
-			expect(getByTestId('workflow-description-edit-content')).toBeInTheDocument();
-		});
-
-		it('should focus textarea when popover opens', async () => {
-			const { getByTestId } = renderComponent({
-				props: {
-					workflowId: 'test-workflow-id',
-				},
-			});
-
-			const button = getByTestId('workflow-description-button');
-			await userEvent.click(button);
-			await nextTick();
-
-			const textarea = getByTestId('workflow-description-input');
-			expect(textarea).toHaveFocus();
-		});
-
-		it('should save description when popover closes', async () => {
-			const { getByTestId } = renderComponent({
-				props: {
-					workflowId: 'test-workflow-id',
-					workflowDescription: 'Initial description',
-				},
-			});
-
-			const button = getByTestId('workflow-description-button');
-			await userEvent.click(button);
-
-			const textarea = getByTestId('workflow-description-input');
-			await userEvent.clear(textarea);
-			await userEvent.type(textarea, 'Updated description');
-
-			// Click outside to close popover
-			await userEvent.click(document.body);
-
-			expect(workflowsStore.saveWorkflowDescription).toHaveBeenCalledWith(
-				'test-workflow-id',
-				'Updated description',
-			);
-		});
-	});
-
-	describe('Save and Cancel functionality', () => {
-		it('should save description when save button is clicked', async () => {
-			const { getByTestId } = renderComponent({
-				props: {
-					workflowId: 'test-workflow-id',
-					workflowDescription: 'Initial description',
-				},
-			});
-
-			await userEvent.click(getByTestId('workflow-description-button'));
-
-			const textarea = getByTestId('workflow-description-input');
-			await userEvent.clear(textarea);
-			await userEvent.type(textarea, 'New description');
-
-			const saveButton = getByTestId('workflow-description-save-button');
-			await userEvent.click(saveButton);
-
-			expect(workflowsStore.saveWorkflowDescription).toHaveBeenCalledWith(
-				'test-workflow-id',
-				'New description',
-			);
-			expect(telemetry.track).toHaveBeenCalledWith('User set workflow description', {
-				workflow_id: 'test-workflow-id',
-				description: 'New description',
-			});
-		});
-
-		it('should save empty string when description is cleared', async () => {
-			const { getByTestId } = renderComponent({
-				props: {
-					workflowId: 'test-workflow-id',
-					workflowDescription: 'Initial description',
-				},
-			});
-
-			await userEvent.click(getByTestId('workflow-description-button'));
-
-			const textarea = getByTestId('workflow-description-input');
-			await userEvent.clear(textarea);
-
-			const saveButton = getByTestId('workflow-description-save-button');
-			await userEvent.click(saveButton);
-
-			expect(workflowsStore.saveWorkflowDescription).toHaveBeenCalledWith('test-workflow-id', '');
-			expect(telemetry.track).toHaveBeenCalledWith('User set workflow description', {
-				workflow_id: 'test-workflow-id',
-				description: '',
-			});
-		});
-
-		it('should disable save button when description has not changed', async () => {
-			const { getByTestId } = renderComponent({
-				props: {
-					workflowId: 'test-workflow-id',
-					workflowDescription: 'Initial description',
-				},
-			});
-
-			await userEvent.click(getByTestId('workflow-description-button'));
-
-			const saveButton = getByTestId('workflow-description-save-button');
-			expect(saveButton).toBeDisabled();
-		});
-
-		it('should disable save button when whitespace-only changes result in same trimmed value', async () => {
-			const { getByTestId } = renderComponent({
-				props: {
-					workflowId: 'test-workflow-id',
-					workflowDescription: '',
-				},
-			});
-
-			await userEvent.click(getByTestId('workflow-description-button'));
-
-			const textarea = getByTestId('workflow-description-input');
-			// Type only whitespace
-			await userEvent.type(textarea, '   ');
-
-			const saveButton = getByTestId('workflow-description-save-button');
-			// Should be disabled since trimmed value is still empty
-			expect(saveButton).toBeDisabled();
-		});
-
-		it('should not save on Enter key when only whitespace is entered', async () => {
-			const { getByTestId } = renderComponent({
-				props: {
-					workflowId: 'test-workflow-id',
-					workflowDescription: '',
-				},
-			});
-
-			await userEvent.click(getByTestId('workflow-description-button'));
-
-			const textarea = getByTestId('workflow-description-input');
-			// Type only whitespace
-			await userEvent.type(textarea, '   ');
-			await userEvent.keyboard('{Enter}');
-
-			// Should not save since canSave is false
-			expect(workflowsStore.saveWorkflowDescription).not.toHaveBeenCalled();
-		});
-
-		it('should enable save button when description changes', async () => {
-			const { getByTestId } = renderComponent({
-				props: {
-					workflowId: 'test-workflow-id',
-					workflowDescription: 'Initial description',
-				},
-			});
-
-			await userEvent.click(getByTestId('workflow-description-button'));
-
-			const textarea = getByTestId('workflow-description-input');
-			await userEvent.type(textarea, ' updated');
-
-			const saveButton = getByTestId('workflow-description-save-button');
-			expect(saveButton).not.toBeDisabled();
-		});
-
-		it('should revert changes when cancel button is clicked', async () => {
-			const { getByTestId } = renderComponent({
-				props: {
-					workflowId: 'test-workflow-id',
-					workflowDescription: 'Initial description',
-				},
-			});
-
-			await userEvent.click(getByTestId('workflow-description-button'));
-
-			const textarea = getByTestId('workflow-description-input');
-			await userEvent.clear(textarea);
-			await userEvent.type(textarea, 'Changed description');
-
-			const cancelButton = getByTestId('workflow-description-cancel-button');
-			await userEvent.click(cancelButton);
-
-			// Re-open popover to check value
-			await userEvent.click(getByTestId('workflow-description-button'));
-			const textareaAfterCancel = getByTestId('workflow-description-input');
-			expect(textareaAfterCancel).toHaveValue('Initial description');
-		});
-
-		it('should disable cancel button during save', async () => {
-			workflowsStore.saveWorkflowDescription = vi.fn(
-				async () => await new Promise((resolve) => setTimeout(resolve, 100)),
-			);
-
-			const { getByTestId } = renderComponent({
-				props: {
-					workflowId: 'test-workflow-id',
-					workflowDescription: 'Initial description',
-				},
-			});
-
-			await userEvent.click(getByTestId('workflow-description-button'));
-
-			const textarea = getByTestId('workflow-description-input');
-			await userEvent.type(textarea, ' updated');
-
-			const saveButton = getByTestId('workflow-description-save-button');
-			const cancelButton = getByTestId('workflow-description-cancel-button');
-
-			await userEvent.click(saveButton);
-
-			// During save, cancel should be disabled
-			expect(cancelButton).toBeDisabled();
-		});
-	});
-
-	describe('Keyboard shortcuts', () => {
-		it('should save when Enter key is pressed', async () => {
-			const { getByTestId } = renderComponent({
-				props: {
-					workflowId: 'test-workflow-id',
-					workflowDescription: 'Initial description',
-				},
-			});
-
-			await userEvent.click(getByTestId('workflow-description-button'));
-
-			const textarea = getByTestId('workflow-description-input');
-			await userEvent.clear(textarea);
-			await userEvent.type(textarea, 'New description');
-			await userEvent.keyboard('{Enter}');
-
-			expect(workflowsStore.saveWorkflowDescription).toHaveBeenCalledWith(
-				'test-workflow-id',
-				'New description',
-			);
-		});
-
-		it('should allow new lines with Shift+Enter', async () => {
-			const { getByTestId } = renderComponent({
-				props: {
-					workflowId: 'test-workflow-id',
-					workflowDescription: '',
-				},
-			});
-
-			await userEvent.click(getByTestId('workflow-description-button'));
-
-			const textarea = getByTestId('workflow-description-input');
-			await userEvent.type(textarea, 'Line 1');
-			await userEvent.keyboard('{Shift>}{Enter}{/Shift}');
-			await userEvent.type(textarea, 'Line 2');
-
-			expect(textarea).toHaveValue('Line 1\nLine 2');
-			expect(workflowsStore.saveWorkflowDescription).not.toHaveBeenCalled();
-		});
-
-		it('should cancel when Escape key is pressed', async () => {
-			const { getByTestId, queryByTestId } = renderComponent({
-				props: {
-					workflowId: 'test-workflow-id',
-					workflowDescription: 'Initial description',
-				},
-			});
-
-			await userEvent.click(getByTestId('workflow-description-button'));
-
-			const textarea = getByTestId('workflow-description-input');
-			await userEvent.clear(textarea);
-			await userEvent.type(textarea, 'Changed description');
-			await userEvent.keyboard('{Escape}');
-
-			// Check that popover is closed
-			expect(queryByTestId('workflow-description-edit-content')).not.toBeInTheDocument();
-
-			// Re-open to verify changes were reverted
-			await userEvent.click(getByTestId('workflow-description-button'));
-			const textareaAfterEscape = getByTestId('workflow-description-input');
-			expect(textareaAfterEscape).toHaveValue('Initial description');
-		});
-	});
-
-	describe('Error handling', () => {
-		it('should show error toast when save fails', async () => {
-			const error = new Error('Save failed');
-			workflowsStore.saveWorkflowDescription = vi.fn().mockRejectedValue(error);
-
-			const { getByTestId } = renderComponent({
-				props: {
-					workflowId: 'test-workflow-id',
-					workflowDescription: 'Initial description',
-				},
-			});
-
-			await userEvent.click(getByTestId('workflow-description-button'));
-
-			const textarea = getByTestId('workflow-description-input');
-			await userEvent.type(textarea, ' updated');
-
-			const saveButton = getByTestId('workflow-description-save-button');
-			await userEvent.click(saveButton);
-
-			await vi.waitFor(() => {
-				expect(toast.showError).toHaveBeenCalledWith(
-					error,
-					'Problem updating workflow description',
-				);
-			});
-		});
-
-		it('should revert to last saved value on error', async () => {
-			const error = new Error('Save failed');
-			workflowsStore.saveWorkflowDescription = vi.fn().mockRejectedValue(error);
-
-			const { getByTestId } = renderComponent({
-				props: {
-					workflowId: 'test-workflow-id',
-					workflowDescription: 'Initial description',
-				},
-			});
-
-			await userEvent.click(getByTestId('workflow-description-button'));
-
-			const textarea = getByTestId('workflow-description-input');
-			await userEvent.clear(textarea);
-			await userEvent.type(textarea, 'Failed update');
-
-			const saveButton = getByTestId('workflow-description-save-button');
-			await userEvent.click(saveButton);
-
-			await vi.waitFor(() => {
-				expect(textarea).toHaveValue('Initial description');
-			});
-		});
-	});
-
-	describe('Dirty state management', () => {
-		it('should set dirty flag when description changes', async () => {
-			const { getByTestId } = renderComponent({
-				props: {
-					workflowId: 'test-workflow-id',
-					workflowDescription: 'Initial description',
-				},
-			});
-
-			expect(uiStore.stateIsDirty).toBe(false);
-
-			await userEvent.click(getByTestId('workflow-description-button'));
-
-			const textarea = getByTestId('workflow-description-input');
-			await userEvent.type(textarea, ' updated');
-
-			expect(uiStore.stateIsDirty).toBe(true);
-		});
-
-		it('should clear dirty flag when saving', async () => {
-			const { getByTestId } = renderComponent({
-				props: {
-					workflowId: 'test-workflow-id',
-					workflowDescription: 'Initial description',
-				},
-			});
-
-			await userEvent.click(getByTestId('workflow-description-button'));
-
-			const textarea = getByTestId('workflow-description-input');
-			await userEvent.type(textarea, ' updated');
-
-			expect(uiStore.stateIsDirty).toBe(true);
-
-			const saveButton = getByTestId('workflow-description-save-button');
-			await userEvent.click(saveButton);
-
-			await vi.waitFor(() => {
-				expect(uiStore.stateIsDirty).toBe(false);
-			});
-		});
-
-		it('should clear dirty flag when canceling', async () => {
-			const { getByTestId } = renderComponent({
-				props: {
-					workflowId: 'test-workflow-id',
-					workflowDescription: 'Initial description',
-				},
-			});
-
-			await userEvent.click(getByTestId('workflow-description-button'));
-
-			const textarea = getByTestId('workflow-description-input');
-			await userEvent.type(textarea, ' updated');
-
-			expect(uiStore.stateIsDirty).toBe(true);
-
-			const cancelButton = getByTestId('workflow-description-cancel-button');
-			await userEvent.click(cancelButton);
-
-			expect(uiStore.stateIsDirty).toBe(false);
-		});
-
-		it('should handle whitespace-only changes correctly', async () => {
-			const { getByTestId } = renderComponent({
-				props: {
-					workflowId: 'test-workflow-id',
-					workflowDescription: '  Initial  ',
-				},
-			});
-
-			await userEvent.click(getByTestId('workflow-description-button'));
-
-			const textarea = getByTestId('workflow-description-input');
-			await userEvent.clear(textarea);
-			await userEvent.type(textarea, 'Initial');
-
-			// Should not be dirty since trimmed values are the same
-			expect(uiStore.stateIsDirty).toBe(false);
-		});
-	});
-
-	describe('MCP tooltips', () => {
-		it('should show base tooltip when MCP is disabled', async () => {
-			// Ensure MCP is disabled
-			settingsStore.isModuleActive = vi.fn().mockReturnValue(false);
-			settingsStore.moduleSettings.mcp = { mcpAccessEnabled: false };
-
-			const { getByTestId } = renderComponent({
-				props: {
-					workflowId: 'test-workflow-id',
-					workflowDescription: '',
-				},
-			});
-
-			await userEvent.click(getByTestId('workflow-description-button'));
-
-			// The tooltip text appears as placeholder in the textarea
-			const textarea = getByTestId('workflow-description-input');
-			const placeholder = textarea.getAttribute('placeholder');
-
-			expect(placeholder).toContain('Edit workflow description');
-			expect(placeholder).not.toContain('MCP clients');
-		});
-
-		it('should show MCP tooltip when MCP is enabled', async () => {
-			// Enable MCP module
-			settingsStore.isModuleActive = vi.fn().mockReturnValue(true);
-			settingsStore.moduleSettings.mcp = { mcpAccessEnabled: true };
-
-			const { getByTestId } = renderComponent({
-				props: {
-					workflowId: 'test-workflow-id',
-					workflowDescription: '',
-				},
-			});
-
-			await userEvent.click(getByTestId('workflow-description-button'));
-
-			const textarea = getByTestId('workflow-description-input');
-			const placeholder = textarea.getAttribute('placeholder');
-
-			expect(placeholder).toContain('MCP clients');
-			expect(placeholder).not.toContain('Edit workflow description');
-		});
-	});
-
-	describe('UI state tracking', () => {
-		it('should track active actions during save', async () => {
-			const addActiveActionSpy = vi.spyOn(uiStore, 'addActiveAction');
-			const removeActiveActionSpy = vi.spyOn(uiStore, 'removeActiveAction');
-
-			const { getByTestId } = renderComponent({
-				props: {
-					workflowId: 'test-workflow-id',
-					workflowDescription: 'Initial description',
-				},
-			});
-
-			await userEvent.click(getByTestId('workflow-description-button'));
-
-			const textarea = getByTestId('workflow-description-input');
-			await userEvent.type(textarea, ' updated');
-
-			const saveButton = getByTestId('workflow-description-save-button');
-			await userEvent.click(saveButton);
-
-			expect(addActiveActionSpy).toHaveBeenCalledWith('workflowSaving');
-
-			await vi.waitFor(() => {
-				expect(removeActiveActionSpy).toHaveBeenCalledWith('workflowSaving');
-			});
-		});
-
-		it('should remove active action even on error', async () => {
-			const removeActiveActionSpy = vi.spyOn(uiStore, 'removeActiveAction');
-			workflowsStore.saveWorkflowDescription = vi.fn().mockRejectedValue(new Error('Failed'));
-
-			const { getByTestId } = renderComponent({
-				props: {
-					workflowId: 'test-workflow-id',
-					workflowDescription: 'Initial description',
-				},
-			});
-
-			await userEvent.click(getByTestId('workflow-description-button'));
-
-			const textarea = getByTestId('workflow-description-input');
-			await userEvent.type(textarea, ' updated');
-
-			const saveButton = getByTestId('workflow-description-save-button');
-			await userEvent.click(saveButton);
-
-			await vi.waitFor(() => {
-				expect(removeActiveActionSpy).toHaveBeenCalledWith('workflowSaving');
-			});
-		});
-	});
-});
diff --git a/packages/frontend/editor-ui/src/app/components/MainHeader/WorkflowDescriptionPopover.vue b/packages/frontend/editor-ui/src/app/components/MainHeader/WorkflowDescriptionPopover.vue
deleted file mode 100644
index 504f6098642..00000000000
--- a/packages/frontend/editor-ui/src/app/components/MainHeader/WorkflowDescriptionPopover.vue
+++ /dev/null
@@ -1,239 +0,0 @@
-<script setup lang="ts">
-import { computed, nextTick, ref, useTemplateRef, watch } from 'vue';
-import {
-	N8nButton,
-	N8nIconButton,
-	N8nInput,
-	N8nInputLabel,
-	N8nPopoverReka,
-	N8nTooltip,
-} from '@n8n/design-system';
-import { useI18n } from '@n8n/i18n';
-import { useSettingsStore } from '@/app/stores/settings.store';
-import { useWorkflowsStore } from '@/app/stores/workflows.store';
-import { useUIStore } from '@/app/stores/ui.store';
-import { useToast } from '@/app/composables/useToast';
-import { useTelemetry } from '@/app/composables/useTelemetry';
-
-type Props = {
-	workflowId: string;
-	workflowDescription?: string | null;
-};
-
-const props = withDefaults(defineProps<Props>(), {
-	workflowDescription: '',
-});
-
-const i18n = useI18n();
-const toast = useToast();
-const telemetry = useTelemetry();
-
-const settingsStore = useSettingsStore();
-const workflowStore = useWorkflowsStore();
-const uiStore = useUIStore();
-
-const descriptionValue = ref(props.workflowDescription);
-const popoverOpen = ref(false);
-const descriptionInput = useTemplateRef<HTMLInputElement>('descriptionInput');
-const isSaving = ref(false);
-const lastSavedDescription = ref(props.workflowDescription);
-
-const normalizedCurrentValue = computed(() => (descriptionValue.value ?? '').trim());
-const normalizedLastSaved = computed(() => (lastSavedDescription.value ?? '').trim());
-
-const canSave = computed(() => normalizedCurrentValue.value !== normalizedLastSaved.value);
-
-const isMcpEnabled = computed(
-	() => settingsStore.isModuleActive('mcp') && settingsStore.moduleSettings.mcp?.mcpAccessEnabled,
-);
-
-const textareaTip = computed(() => {
-	if (!isMcpEnabled.value) {
-		return i18n.baseText('workflow.description.tooltip');
-	}
-	return i18n.baseText('workflow.description.placeholder.mcp');
-});
-
-const saveDescription = async () => {
-	isSaving.value = true;
-	uiStore.addActiveAction('workflowSaving');
-
-	try {
-		await workflowStore.saveWorkflowDescription(
-			props.workflowId,
-			normalizedCurrentValue.value ?? null,
-		);
-		lastSavedDescription.value = descriptionValue.value;
-		uiStore.stateIsDirty = false;
-		telemetry.track('User set workflow description', {
-			workflow_id: props.workflowId,
-			description: normalizedCurrentValue.value ?? null,
-		});
-	} catch (error) {
-		toast.showError(error, i18n.baseText('workflow.description.error.title'));
-		descriptionValue.value = lastSavedDescription.value;
-	} finally {
-		isSaving.value = false;
-		uiStore.removeActiveAction('workflowSaving');
-	}
-};
-
-const handlePopoverOpenChange = async (open: boolean) => {
-	popoverOpen.value = open;
-	if (open) {
-		await nextTick();
-		descriptionInput.value?.focus();
-	} else {
-		await saveDescription();
-	}
-};
-
-const handleKeyDown = async (event: KeyboardEvent) => {
-	// Escape - cancel editing
-	if (event.key === 'Escape') {
-		event.preventDefault();
-		event.stopPropagation();
-		await cancel();
-	}
-
-	// Enter (without Shift) - save and close
-	if (event.key === 'Enter' && !event.shiftKey) {
-		if (!canSave.value) {
-			return;
-		}
-
-		event.preventDefault();
-		event.stopPropagation();
-		await save();
-	}
-};
-
-const cancel = async () => {
-	descriptionValue.value = lastSavedDescription.value;
-	uiStore.stateIsDirty = false;
-	popoverOpen.value = false;
-};
-
-const save = async () => {
-	await saveDescription();
-	popoverOpen.value = false;
-};
-
-// Sync with external prop changes
-watch(
-	() => props.workflowDescription,
-	(newValue) => {
-		descriptionValue.value = newValue;
-		lastSavedDescription.value = newValue;
-	},
-);
-
-// Set dirty flag when text changes
-watch(descriptionValue, (newValue) => {
-	const normalizedNewValue = (newValue ?? '').trim();
-
-	if (normalizedNewValue !== normalizedLastSaved.value) {
-		uiStore.stateIsDirty = true;
-	} else {
-		uiStore.stateIsDirty = false;
-	}
-});
-</script>
-<template>
-	<N8nTooltip :disabled="popoverOpen" :content="i18n.baseText('workflow.description.tooltip')">
-		<div :class="$style['description-popover-wrapper']" data-test-id="workflow-description-popover">
-			<N8nPopoverReka
-				id="workflow-description-popover"
-				:open="popoverOpen"
-				@update:open="handlePopoverOpenChange"
-			>
-				<template #trigger>
-					<N8nIconButton
-						:class="{ [$style['description-button']]: true, [$style.active]: popoverOpen }"
-						:square="true"
-						data-test-id="workflow-description-button"
-						icon="notebook-pen"
-						type="tertiary"
-						size="small"
-						:aria-label="i18n.baseText('workflow.description.tooltip')"
-					/>
-				</template>
-				<template #content>
-					<div
-						:class="$style['description-edit-content']"
-						data-test-id="workflow-description-edit-content"
-					>
-						<N8nInputLabel
-							:label="i18n.baseText('generic.description')"
-							:tooltip-text="textareaTip"
-						>
-							<N8nInput
-								ref="descriptionInput"
-								v-model="descriptionValue"
-								:placeholder="textareaTip"
-								:rows="6"
-								data-test-id="workflow-description-input"
-								type="textarea"
-								@keydown="handleKeyDown"
-							/>
-						</N8nInputLabel>
-					</div>
-					<footer :class="$style['popover-footer']">
-						<N8nButton
-							:label="i18n.baseText('generic.cancel')"
-							:size="'small'"
-							:disabled="isSaving"
-							type="tertiary"
-							data-test-id="workflow-description-cancel-button"
-							@click="cancel"
-						/>
-						<N8nButton
-							:label="i18n.baseText('generic.unsavedWork.confirmMessage.confirmButtonText')"
-							:size="'small'"
-							:loading="isSaving"
-							:disabled="!canSave || isSaving"
-							type="primary"
-							data-test-id="workflow-description-save-button"
-							@click="save"
-						/>
-					</footer>
-				</template>
-			</N8nPopoverReka>
-		</div>
-	</N8nTooltip>
-</template>
-
-<style module lang="scss">
-.description-button {
-	border: none;
-	position: relative;
-
-	&.active {
-		color: var(--color--background--shade-2);
-	}
-
-	&:hover,
-	&:focus,
-	&:focus-visible,
-	&:active {
-		background: none;
-		background-color: transparent !important;
-		outline: none !important;
-		color: var(--color--background--shade-2) !important;
-	}
-}
-
-.description-edit-content {
-	display: flex;
-	flex-direction: column;
-	padding: var(--spacing--xs);
-	width: 400px;
-}
-
-.popover-footer {
-	display: flex;
-	justify-content: flex-end;
-	gap: var(--spacing--2xs);
-	padding: 0 var(--spacing--xs) var(--spacing--xs);
-}
-</style>
diff --git a/packages/frontend/editor-ui/src/app/components/MainHeader/WorkflowDetails.vue b/packages/frontend/editor-ui/src/app/components/MainHeader/WorkflowDetails.vue
index c05d89052f1..dd16f09acf2 100644
--- a/packages/frontend/editor-ui/src/app/components/MainHeader/WorkflowDetails.vue
+++ b/packages/frontend/editor-ui/src/app/components/MainHeader/WorkflowDetails.vue
@@ -42,8 +42,6 @@ import {
 } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 
-import WorkflowDescriptionPopover from './WorkflowDescriptionPopover.vue';
-
 import { N8nBadge, N8nInlineTextEdit } from '@n8n/design-system';
 import { useSettingsStore } from '@/app/stores/settings.store';
 import { useUIStore } from '@/app/stores/ui.store';
@@ -549,11 +547,6 @@ onBeforeUnmount(() => {
 				>
 					{{ locale.baseText('workflows.item.archived') }}
 				</N8nBadge>
-				<WorkflowDescriptionPopover
-					v-else-if="!props.readOnly && workflowPermissions.update"
-					:workflow-id="props.id"
-					:workflow-description="props.description"
-				/>
 			</span>
 		</span>
 
diff --git a/packages/frontend/editor-ui/src/app/components/Modals.vue b/packages/frontend/editor-ui/src/app/components/Modals.vue
index 36b630c0b60..77ca22391c5 100644
--- a/packages/frontend/editor-ui/src/app/components/Modals.vue
+++ b/packages/frontend/editor-ui/src/app/components/Modals.vue
@@ -30,6 +30,7 @@ import {
 	EXPERIMENT_TEMPLATE_RECO_V3_KEY,
 	EXPERIMENT_TEMPLATES_DATA_QUALITY_KEY,
 	CONFIRM_PASSWORD_MODAL_KEY,
+	WORKFLOW_DESCRIPTION_MODAL_KEY,
 	WORKFLOW_PUBLISH_MODAL_KEY,
 	WORKFLOW_HISTORY_PUBLISH_MODAL_KEY,
 } from '@/app/constants';
@@ -114,6 +115,7 @@ import NodeRecommendationModalV2 from '@/experiments/templateRecoV2/components/N
 import NodeRecommendationModalV3 from '@/experiments/personalizedTemplatesV3/components/NodeRecommendationModal.vue';
 import NodeRecommendationModalTDQ from '@/experiments/templatesDataQuality/components/NodeRecommendationModal.vue';
 import VariableModal from '@/features/settings/environments.ee/components/VariableModal.vue';
+import WorkflowDescriptionModal from '@/app/components/WorkflowDescriptionModal.vue';
 import WorkflowPublishModal from '@/app/components/MainHeader/WorkflowPublishModal.vue';
 import WorkflowHistoryPublishModal from '@/features/workflows/workflowHistory/components/WorkflowHistoryPublishModal.vue';
 </script>
@@ -419,6 +421,12 @@ import WorkflowHistoryPublishModal from '@/features/workflows/workflowHistory/co
 			</template>
 		</ModalRoot>
 
+		<ModalRoot :name="WORKFLOW_DESCRIPTION_MODAL_KEY">
+			<template #default="{ modalName, data }">
+				<WorkflowDescriptionModal :modal-name="modalName" :data="data" />
+			</template>
+		</ModalRoot>
+
 		<ModalRoot :name="WORKFLOW_PUBLISH_MODAL_KEY">
 			<template #default="{ modalName, data }">
 				<WorkflowPublishModal :modal-name="modalName" :data="data" />
diff --git a/packages/frontend/editor-ui/src/app/components/WorkflowDescriptionModal.test.ts b/packages/frontend/editor-ui/src/app/components/WorkflowDescriptionModal.test.ts
new file mode 100644
index 00000000000..022f77aa463
--- /dev/null
+++ b/packages/frontend/editor-ui/src/app/components/WorkflowDescriptionModal.test.ts
@@ -0,0 +1,490 @@
+import { createComponentRenderer } from '@/__tests__/render';
+import { type MockedStore, mockedStore } from '@/__tests__/utils';
+import { createTestingPinia } from '@pinia/testing';
+import userEvent from '@testing-library/user-event';
+import WorkflowDescriptionModal from '@/app/components/WorkflowDescriptionModal.vue';
+import { useWorkflowsStore } from '@/app/stores/workflows.store';
+import { useUIStore } from '@/app/stores/ui.store';
+import { useSettingsStore } from '@/app/stores/settings.store';
+import { useToast } from '@/app/composables/useToast';
+import { useTelemetry } from '@/app/composables/useTelemetry';
+import { STORES } from '@n8n/stores';
+import { WORKFLOW_DESCRIPTION_MODAL_KEY } from '../constants';
+
+vi.mock('@/app/composables/useToast', () => {
+	const showError = vi.fn();
+	return {
+		useToast: () => ({
+			showError,
+		}),
+	};
+});
+
+vi.mock('@/app/composables/useTelemetry', () => {
+	const track = vi.fn();
+	return {
+		useTelemetry: () => ({
+			track,
+		}),
+	};
+});
+
+const initialState = {
+	[STORES.SETTINGS]: {
+		settings: {
+			modules: {
+				mcp: {
+					enabled: false,
+				},
+			},
+		},
+	},
+};
+
+const ModalStub = {
+	template: `
+		<div>
+			<slot name="header" />
+			<slot name="title" />
+			<slot name="content" />
+			<slot name="footer" />
+		</div>
+	`,
+};
+
+const global = {
+	stubs: {
+		Modal: ModalStub,
+	},
+};
+
+const renderModal = createComponentRenderer(WorkflowDescriptionModal);
+
+let pinia: ReturnType<typeof createTestingPinia>;
+
+describe('WorkflowDescriptionModal', () => {
+	let workflowsStore: MockedStore<typeof useWorkflowsStore>;
+	let uiStore: MockedStore<typeof useUIStore>;
+	let settingsStore: MockedStore<typeof useSettingsStore>;
+	let telemetry: ReturnType<typeof useTelemetry>;
+	let toast: ReturnType<typeof useToast>;
+
+	beforeEach(() => {
+		pinia = createTestingPinia({ initialState });
+
+		workflowsStore = mockedStore(useWorkflowsStore);
+		uiStore = mockedStore(useUIStore);
+		settingsStore = mockedStore(useSettingsStore);
+		telemetry = useTelemetry();
+		toast = useToast();
+
+		// Reset mocks
+		workflowsStore.saveWorkflowDescription = vi.fn().mockResolvedValue(undefined);
+		workflowsStore.workflow = {
+			id: 'test-workflow-id',
+			name: 'Test Workflow',
+			active: false,
+			activeVersionId: null,
+			isArchived: false,
+			createdAt: Date.now(),
+			updatedAt: Date.now(),
+			versionId: '1',
+			nodes: [],
+			connections: {},
+		};
+		uiStore.stateIsDirty = false;
+	});
+
+	afterEach(() => {
+		vi.clearAllMocks();
+	});
+
+	describe('Component rendering', () => {
+		it('should render empty string if there is no description', async () => {
+			const { getByTestId } = renderModal({
+				props: {
+					modalName: WORKFLOW_DESCRIPTION_MODAL_KEY,
+					data: {
+						workflowId: 'test-workflow-id',
+					},
+				},
+				pinia,
+				global,
+			});
+
+			const textarea = getByTestId('workflow-description-input');
+			expect(textarea).toHaveValue('');
+		});
+	});
+
+	describe('Popover interaction', () => {
+		it('should focus textarea when modal opens', async () => {
+			const { getByTestId } = renderModal({
+				props: {
+					modalName: WORKFLOW_DESCRIPTION_MODAL_KEY,
+					data: {
+						workflowId: 'test-workflow-id',
+					},
+				},
+				pinia,
+				global,
+			});
+
+			await new Promise((resolve) => setTimeout(resolve, 200));
+
+			const textarea = getByTestId('workflow-description-input');
+			expect(textarea).toHaveFocus();
+		});
+
+		it('should not save description when modal closes by esc', async () => {
+			const { getByTestId } = renderModal({
+				props: {
+					modalName: WORKFLOW_DESCRIPTION_MODAL_KEY,
+					data: {
+						workflowId: 'test-workflow-id',
+						workflowDescription: 'Initial description',
+					},
+				},
+				pinia,
+				global,
+			});
+
+			const textarea = getByTestId('workflow-description-input');
+			await userEvent.clear(textarea);
+			await userEvent.type(textarea, 'Updated description');
+
+			await userEvent.type(textarea, '{Esc}');
+
+			expect(workflowsStore.saveWorkflowDescription).not.toHaveBeenCalled();
+		});
+	});
+
+	describe('Save and Cancel functionality', () => {
+		it('should save description when save button is clicked', async () => {
+			const { getByTestId } = renderModal({
+				props: {
+					modalName: WORKFLOW_DESCRIPTION_MODAL_KEY,
+					data: {
+						workflowId: 'test-workflow-id',
+						workflowDescription: 'Initial description',
+					},
+				},
+				pinia,
+				global,
+			});
+
+			const textarea = getByTestId('workflow-description-input');
+			await userEvent.clear(textarea);
+			await userEvent.type(textarea, 'New description');
+
+			const saveButton = getByTestId('workflow-description-save-button');
+			await userEvent.click(saveButton);
+
+			expect(workflowsStore.saveWorkflowDescription).toHaveBeenCalledWith(
+				'test-workflow-id',
+				'New description',
+			);
+			expect(telemetry.track).toHaveBeenCalledWith('User set workflow description', {
+				workflow_id: 'test-workflow-id',
+				description: 'New description',
+			});
+		});
+
+		it('should save empty string when description is cleared', async () => {
+			const { getByTestId } = renderModal({
+				props: {
+					modalName: WORKFLOW_DESCRIPTION_MODAL_KEY,
+					data: {
+						workflowId: 'test-workflow-id',
+						workflowDescription: 'Initial description',
+					},
+				},
+				pinia,
+				global,
+			});
+
+			const textarea = getByTestId('workflow-description-input');
+			await userEvent.clear(textarea);
+
+			const saveButton = getByTestId('workflow-description-save-button');
+			await userEvent.click(saveButton);
+
+			expect(workflowsStore.saveWorkflowDescription).toHaveBeenCalledWith('test-workflow-id', '');
+			expect(telemetry.track).toHaveBeenCalledWith('User set workflow description', {
+				workflow_id: 'test-workflow-id',
+				description: '',
+			});
+		});
+
+		it('should disable save button when description has not changed', async () => {
+			const { getByTestId } = renderModal({
+				props: {
+					modalName: WORKFLOW_DESCRIPTION_MODAL_KEY,
+					data: {
+						workflowId: 'test-workflow-id',
+						workflowDescription: 'Initial description',
+					},
+				},
+				pinia,
+				global,
+			});
+
+			const saveButton = getByTestId('workflow-description-save-button');
+			expect(saveButton).toBeDisabled();
+		});
+
+		it('should disable save button when whitespace-only changes result in same trimmed value', async () => {
+			const { getByTestId } = renderModal({
+				props: {
+					modalName: WORKFLOW_DESCRIPTION_MODAL_KEY,
+					data: {
+						workflowId: 'test-workflow-id',
+						workflowDescription: '',
+					},
+				},
+				pinia,
+				global,
+			});
+
+			const textarea = getByTestId('workflow-description-input');
+			// Type only whitespace
+			await userEvent.type(textarea, '   ');
+
+			const saveButton = getByTestId('workflow-description-save-button');
+			// Should be disabled since trimmed value is still empty
+			expect(saveButton).toBeDisabled();
+		});
+
+		it('should not save on Enter key when only whitespace is entered', async () => {
+			const { getByTestId } = renderModal({
+				props: {
+					modalName: WORKFLOW_DESCRIPTION_MODAL_KEY,
+					data: {
+						workflowId: 'test-workflow-id',
+						workflowDescription: '',
+					},
+				},
+				pinia,
+				global,
+			});
+
+			const textarea = getByTestId('workflow-description-input');
+			// Type only whitespace
+			await userEvent.type(textarea, '   ');
+			await userEvent.keyboard('{Enter}');
+
+			// Should not save since canSave is false
+			expect(workflowsStore.saveWorkflowDescription).not.toHaveBeenCalled();
+		});
+
+		it('should enable save button when description changes', async () => {
+			const { getByTestId } = renderModal({
+				props: {
+					modalName: WORKFLOW_DESCRIPTION_MODAL_KEY,
+					data: {
+						workflowId: 'test-workflow-id',
+						workflowDescription: 'Initial description',
+					},
+				},
+				pinia,
+				global,
+			});
+
+			const textarea = getByTestId('workflow-description-input');
+			await userEvent.type(textarea, ' updated');
+
+			const saveButton = getByTestId('workflow-description-save-button');
+			expect(saveButton).not.toBeDisabled();
+		});
+
+		it('should disable cancel button during save', async () => {
+			workflowsStore.saveWorkflowDescription = vi.fn(
+				async () => await new Promise((resolve) => setTimeout(resolve, 100)),
+			);
+
+			const { getByTestId } = renderModal({
+				props: {
+					modalName: WORKFLOW_DESCRIPTION_MODAL_KEY,
+					data: {
+						workflowId: 'test-workflow-id',
+						workflowDescription: 'Initial description',
+					},
+				},
+				pinia,
+				global,
+			});
+
+			const textarea = getByTestId('workflow-description-input');
+			await userEvent.type(textarea, ' updated');
+
+			const saveButton = getByTestId('workflow-description-save-button');
+			const cancelButton = getByTestId('workflow-description-cancel-button');
+
+			await userEvent.click(saveButton);
+
+			// During save, cancel should be disabled
+			expect(cancelButton).toBeDisabled();
+		});
+	});
+
+	describe('Keyboard shortcuts', () => {
+		it('should save when Enter key is pressed', async () => {
+			const { getByTestId } = renderModal({
+				props: {
+					modalName: WORKFLOW_DESCRIPTION_MODAL_KEY,
+					data: {
+						workflowId: 'test-workflow-id',
+						workflowDescription: 'Initial description',
+					},
+				},
+				pinia,
+				global,
+			});
+
+			const textarea = getByTestId('workflow-description-input');
+			await userEvent.clear(textarea);
+			await userEvent.type(textarea, 'New description');
+			await userEvent.keyboard('{Enter}');
+
+			expect(workflowsStore.saveWorkflowDescription).toHaveBeenCalledWith(
+				'test-workflow-id',
+				'New description',
+			);
+		});
+
+		it('should allow new lines with Shift+Enter', async () => {
+			const { getByTestId } = renderModal({
+				props: {
+					modalName: WORKFLOW_DESCRIPTION_MODAL_KEY,
+					data: {
+						workflowId: 'test-workflow-id',
+						workflowDescription: '',
+					},
+				},
+				pinia,
+				global,
+			});
+
+			const textarea = getByTestId('workflow-description-input');
+			await userEvent.type(textarea, 'Line 1');
+			await userEvent.keyboard('{Shift>}{Enter}{/Shift}');
+			await userEvent.type(textarea, 'Line 2');
+
+			expect(textarea).toHaveValue('Line 1\nLine 2');
+			expect(workflowsStore.saveWorkflowDescription).not.toHaveBeenCalled();
+		});
+	});
+
+	describe('Error handling', () => {
+		it('should show error toast when save fails', async () => {
+			const error = new Error('Save failed');
+			workflowsStore.saveWorkflowDescription = vi.fn().mockRejectedValue(error);
+
+			const { getByTestId } = renderModal({
+				props: {
+					modalName: WORKFLOW_DESCRIPTION_MODAL_KEY,
+					data: {
+						workflowId: 'test-workflow-id',
+						workflowDescription: 'Initial description',
+					},
+				},
+				pinia,
+				global,
+			});
+
+			const textarea = getByTestId('workflow-description-input');
+			await userEvent.type(textarea, ' updated');
+
+			const saveButton = getByTestId('workflow-description-save-button');
+			await userEvent.click(saveButton);
+
+			await vi.waitFor(() => {
+				expect(toast.showError).toHaveBeenCalledWith(
+					error,
+					'Problem updating workflow description',
+				);
+			});
+		});
+
+		it('should keep text on error', async () => {
+			const error = new Error('Save failed');
+			workflowsStore.saveWorkflowDescription = vi.fn().mockRejectedValue(error);
+
+			const { getByTestId } = renderModal({
+				props: {
+					modalName: WORKFLOW_DESCRIPTION_MODAL_KEY,
+					data: {
+						workflowId: 'test-workflow-id',
+						workflowDescription: 'Initial description',
+					},
+				},
+				pinia,
+				global,
+			});
+
+			const textarea = getByTestId('workflow-description-input');
+			await userEvent.clear(textarea);
+			await userEvent.type(textarea, 'Failed update');
+
+			const saveButton = getByTestId('workflow-description-save-button');
+			await userEvent.click(saveButton);
+
+			await vi.waitFor(() => {
+				expect(textarea).toHaveValue('Failed update');
+			});
+		});
+	});
+
+	describe('MCP tooltips', () => {
+		it('should show base tooltip when MCP is disabled', async () => {
+			// Ensure MCP is disabled
+			settingsStore.isModuleActive = vi.fn().mockReturnValue(false);
+			settingsStore.moduleSettings.mcp = { mcpAccessEnabled: false };
+
+			const { getByTestId } = renderModal({
+				props: {
+					modalName: WORKFLOW_DESCRIPTION_MODAL_KEY,
+					data: {
+						workflowId: 'test-workflow-id',
+						workflowDescription: '',
+					},
+				},
+				pinia,
+				global,
+			});
+
+			// The tooltip text appears as placeholder in the textarea
+			const textarea = getByTestId('descriptionTooltip');
+			const placeholder = textarea.textContent;
+
+			expect(placeholder).toContain(
+				'Clear descriptions help other users understand the purpose of your workflow',
+			);
+			expect(placeholder).not.toContain('MCP clients');
+		});
+
+		it('should show MCP tooltip when MCP is enabled', async () => {
+			// Enable MCP module
+			settingsStore.isModuleActive = vi.fn().mockReturnValue(true);
+			settingsStore.moduleSettings.mcp = { mcpAccessEnabled: true };
+
+			const { getByTestId } = renderModal({
+				props: {
+					modalName: WORKFLOW_DESCRIPTION_MODAL_KEY,
+					data: {
+						workflowId: 'test-workflow-id',
+						workflowDescription: '',
+					},
+				},
+				pinia,
+				global,
+			});
+
+			const textarea = getByTestId('descriptionTooltip');
+			const placeholder = textarea.textContent;
+
+			// When MCP is enabled, the placeholder includes both base tooltip and MCP-specific text
+			expect(placeholder).toContain('MCP clients');
+		});
+	});
+});
diff --git a/packages/frontend/editor-ui/src/app/components/WorkflowDescriptionModal.vue b/packages/frontend/editor-ui/src/app/components/WorkflowDescriptionModal.vue
new file mode 100644
index 00000000000..8023463c5c3
--- /dev/null
+++ b/packages/frontend/editor-ui/src/app/components/WorkflowDescriptionModal.vue
@@ -0,0 +1,168 @@
+<script setup lang="ts">
+import { computed, ref, useTemplateRef } from 'vue';
+import { N8nButton, N8nInput, N8nText } from '@n8n/design-system';
+import { useI18n } from '@n8n/i18n';
+import { useSettingsStore } from '@/app/stores/settings.store';
+import { useWorkflowsStore } from '@/app/stores/workflows.store';
+import { useToast } from '@/app/composables/useToast';
+import { useTelemetry } from '@/app/composables/useTelemetry';
+import { WORKFLOW_DESCRIPTION_MODAL_KEY } from '../constants';
+import { createEventBus } from '@n8n/utils/event-bus';
+import Modal from './Modal.vue';
+import { onMounted } from 'vue';
+
+const props = defineProps<{
+	modalName: string;
+	data: {
+		workflowId: string;
+		workflowDescription?: string | null;
+	};
+}>();
+
+const modalBus = createEventBus();
+
+const i18n = useI18n();
+const toast = useToast();
+const telemetry = useTelemetry();
+
+const settingsStore = useSettingsStore();
+const workflowStore = useWorkflowsStore();
+
+const descriptionValue = ref(props.data.workflowDescription ?? '');
+const descriptionInput = useTemplateRef<HTMLInputElement>('descriptionInput');
+const isSaving = ref(false);
+
+const normalizedCurrentValue = computed(() => (descriptionValue.value ?? '').trim());
+const normalizedLastSaved = computed(() => (props.data.workflowDescription ?? '').trim());
+
+const canSave = computed(() => normalizedCurrentValue.value !== normalizedLastSaved.value);
+
+const isMcpEnabled = computed(
+	() => settingsStore.isModuleActive('mcp') && settingsStore.moduleSettings.mcp?.mcpAccessEnabled,
+);
+
+// Descriptive message that educates the user that the description is relevant for MCP
+// Updated based on MCP presence
+const textareaTip = computed(() =>
+	isMcpEnabled.value
+		? i18n.baseText('workflow.description.mcp')
+		: i18n.baseText('workflow.description.nomcp'),
+);
+
+const saveDescription = async () => {
+	isSaving.value = true;
+
+	try {
+		await workflowStore.saveWorkflowDescription(
+			props.data.workflowId,
+			normalizedCurrentValue.value ?? null,
+		);
+		telemetry.track('User set workflow description', {
+			workflow_id: props.data.workflowId,
+			description: normalizedCurrentValue.value ?? null,
+		});
+	} catch (error) {
+		toast.showError(error, i18n.baseText('workflow.description.error.title'));
+	} finally {
+		isSaving.value = false;
+	}
+};
+
+const cancel = () => {
+	modalBus.emit('close');
+};
+
+const save = async () => {
+	await saveDescription();
+	modalBus.emit('close');
+};
+
+const handleKeyDown = async (event: KeyboardEvent) => {
+	// Escape - cancel editing
+	if (event.key === 'Escape') {
+		event.preventDefault();
+		event.stopPropagation();
+		cancel();
+	}
+
+	// Enter (without Shift) - save and close
+	if (event.key === 'Enter' && !event.shiftKey) {
+		if (!canSave.value) {
+			return;
+		}
+
+		event.preventDefault();
+		event.stopPropagation();
+		await save();
+	}
+};
+
+onMounted(() => {
+	setTimeout(() => {
+		descriptionInput.value?.focus();
+	}, 150);
+});
+</script>
+
+<template>
+	<Modal
+		:name="WORKFLOW_DESCRIPTION_MODAL_KEY"
+		:title="i18n.baseText('generic.description')"
+		width="500"
+		:class="$style.container"
+		:event-bus="modalBus"
+		:close-on-click-modal="false"
+	>
+		<template #content>
+			<div
+				:class="$style['description-edit-content']"
+				data-test-id="workflow-description-edit-content"
+			>
+				<N8nText color="text-base" data-test-id="descriptionTooltip">{{ textareaTip }}</N8nText>
+				<N8nInput
+					ref="descriptionInput"
+					v-model="descriptionValue"
+					:rows="6"
+					data-test-id="workflow-description-input"
+					type="textarea"
+					@keydown="handleKeyDown"
+				/>
+			</div>
+		</template>
+		<template #footer>
+			<div :class="$style['popover-footer']">
+				<N8nButton
+					:label="i18n.baseText('generic.cancel')"
+					:size="'small'"
+					:disabled="isSaving"
+					type="tertiary"
+					data-test-id="workflow-description-cancel-button"
+					@click="cancel"
+				/>
+				<N8nButton
+					:label="i18n.baseText('generic.unsavedWork.confirmMessage.confirmButtonText')"
+					:loading="isSaving"
+					:disabled="!canSave || isSaving"
+					type="primary"
+					data-test-id="workflow-description-save-button"
+					@click="save"
+				/>
+			</div>
+		</template>
+	</Modal>
+</template>
+
+<style module lang="scss">
+.description-edit-content {
+	display: flex;
+	flex-direction: column;
+	gap: var(--spacing--xs);
+	padding: var(--spacing--s);
+}
+
+.popover-footer {
+	display: flex;
+	justify-content: flex-end;
+	gap: var(--spacing--2xs);
+}
+</style>
diff --git a/packages/frontend/editor-ui/src/app/constants/actions.ts b/packages/frontend/editor-ui/src/app/constants/actions.ts
index 91721e8679b..1870a37639f 100644
--- a/packages/frontend/editor-ui/src/app/constants/actions.ts
+++ b/packages/frontend/editor-ui/src/app/constants/actions.ts
@@ -4,6 +4,7 @@ export const enum WORKFLOW_MENU_ACTIONS {
 	IMPORT_FROM_URL = 'import-from-url',
 	IMPORT_FROM_FILE = 'import-from-file',
 	PUSH = 'push',
+	EDIT_DESCRIPTION = 'edit-description',
 	SETTINGS = 'settings',
 	DELETE = 'delete',
 	ARCHIVE = 'archive',
diff --git a/packages/frontend/editor-ui/src/app/constants/modals.ts b/packages/frontend/editor-ui/src/app/constants/modals.ts
index 0eb85d35be9..685092c7e10 100644
--- a/packages/frontend/editor-ui/src/app/constants/modals.ts
+++ b/packages/frontend/editor-ui/src/app/constants/modals.ts
@@ -35,5 +35,6 @@ export const CHAT_HUB_SIDE_MENU_DRAWER_MODAL_KEY = 'chatHubSideMenuDrawer';
 export const EXPERIMENT_TEMPLATE_RECO_V2_KEY = 'templateRecoV2';
 export const EXPERIMENT_TEMPLATE_RECO_V3_KEY = 'templateRecoV3';
 export const EXPERIMENT_TEMPLATES_DATA_QUALITY_KEY = 'templatesDataQuality';
+export const WORKFLOW_DESCRIPTION_MODAL_KEY = 'workflowDescription';
 export const WORKFLOW_PUBLISH_MODAL_KEY = 'workflowPublish';
 export const WORKFLOW_HISTORY_PUBLISH_MODAL_KEY = 'workflowHistoryPublish';
diff --git a/packages/frontend/editor-ui/src/app/stores/ui.store.ts b/packages/frontend/editor-ui/src/app/stores/ui.store.ts
index b50eb880060..603739cc94a 100644
--- a/packages/frontend/editor-ui/src/app/stores/ui.store.ts
+++ b/packages/frontend/editor-ui/src/app/stores/ui.store.ts
@@ -32,6 +32,7 @@ import {
 	EXPERIMENT_TEMPLATE_RECO_V3_KEY,
 	WORKFLOW_PUBLISH_MODAL_KEY,
 	EXPERIMENT_TEMPLATES_DATA_QUALITY_KEY,
+	WORKFLOW_DESCRIPTION_MODAL_KEY,
 	WORKFLOW_HISTORY_PUBLISH_MODAL_KEY,
 	WORKFLOW_HISTORY_VERSION_UNPUBLISH,
 } from '@/app/constants';
@@ -151,6 +152,7 @@ export const useUIStore = defineStore(STORES.UI, () => {
 				WORKFLOW_DIFF_MODAL_KEY,
 				EXPERIMENT_TEMPLATE_RECO_V3_KEY,
 				VARIABLE_MODAL_KEY,
+				WORKFLOW_DESCRIPTION_MODAL_KEY,
 				WORKFLOW_PUBLISH_MODAL_KEY,
 				WORKFLOW_HISTORY_PUBLISH_MODAL_KEY,
 				WORKFLOW_HISTORY_VERSION_UNPUBLISH,
diff --git a/packages/frontend/editor-ui/src/app/stores/workflows.store.ts b/packages/frontend/editor-ui/src/app/stores/workflows.store.ts
index 7f0635bb3df..045e600433a 100644
--- a/packages/frontend/editor-ui/src/app/stores/workflows.store.ts
+++ b/packages/frontend/editor-ui/src/app/stores/workflows.store.ts
@@ -1713,18 +1713,20 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 			description,
 		});
 
+		if (workflowsById.value[id]) {
+			workflowsById.value[id] = {
+				...workflowsById.value[id],
+				description: updated.description,
+				versionId: updated.versionId,
+			};
+		}
+
 		// Update local store state
 		if (isCurrentWorkflow) {
 			setDescription(updated.description ?? '');
 			if (updated.versionId !== currentVersionId) {
 				setWorkflowVersionId(updated.versionId);
 			}
-		} else if (workflowsById.value[id]) {
-			workflowsById.value[id] = {
-				...workflowsById.value[id],
-				description: updated.description,
-				versionId: updated.versionId,
-			};
 		}
 
 		return updated;

From feab6d3f3451684f39b5bb0bd84b3c84a61f58f7 Mon Sep 17 00:00:00 2001
From: Charlie Kolb <charlie@n8n.io>
Date: Fri, 5 Dec 2025 12:20:39 +0100
Subject: [PATCH 083/167] fix(editor): Restore workflow tool `view-execution`
 link for V3 Agents (#22730)

---
 .../tools/ToolWorkflow/v2/utils/WorkflowToolService.ts      | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/utils/WorkflowToolService.ts b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/utils/WorkflowToolService.ts
index d70025492e1..898f7c12acf 100644
--- a/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/utils/WorkflowToolService.ts
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/utils/WorkflowToolService.ts
@@ -173,9 +173,13 @@ export class WorkflowToolService {
 
 						return processedResponse;
 					}
-
 					// If manualLogging is false we've been called by the engine and need
 					// the structured response.
+
+					if (metadata && 'setMetadata' in context) {
+						void context.setMetadata(metadata);
+					}
+
 					return responseData;
 				} catch (error) {
 					// Check if error is due to cancellation

From 679cfc5572b4a9b645e5810493eec5bfc83696e3 Mon Sep 17 00:00:00 2001
From: Artem Sorokin <38620398+seemewalkin@users.noreply.github.com>
Date: Fri, 5 Dec 2025 12:35:04 +0100
Subject: [PATCH 084/167] test: Move project and folder tests to projects/
 directory (#22802)

---
 .../folders-advanced.spec.ts}                                 | 2 +-
 .../folders-basic.spec.ts}                                    | 2 +-
 .../folders-operations.spec.ts}                               | 2 +-
 .../project-settings.spec.ts}                                 | 2 +-
 .../ui/{39-projects.spec.ts => projects/projects.spec.ts}     | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)
 rename packages/testing/playwright/tests/ui/{49-folders-advanced.spec.ts => projects/folders-advanced.spec.ts} (99%)
 rename packages/testing/playwright/tests/ui/{49-folders-basic.spec.ts => projects/folders-basic.spec.ts} (99%)
 rename packages/testing/playwright/tests/ui/{49-folders-operations.spec.ts => projects/folders-operations.spec.ts} (99%)
 rename packages/testing/playwright/tests/ui/{39-project-settings.spec.ts => projects/project-settings.spec.ts} (99%)
 rename packages/testing/playwright/tests/ui/{39-projects.spec.ts => projects/projects.spec.ts} (99%)

diff --git a/packages/testing/playwright/tests/ui/49-folders-advanced.spec.ts b/packages/testing/playwright/tests/ui/projects/folders-advanced.spec.ts
similarity index 99%
rename from packages/testing/playwright/tests/ui/49-folders-advanced.spec.ts
rename to packages/testing/playwright/tests/ui/projects/folders-advanced.spec.ts
index fc69aa919c9..3ff901ec941 100644
--- a/packages/testing/playwright/tests/ui/49-folders-advanced.spec.ts
+++ b/packages/testing/playwright/tests/ui/projects/folders-advanced.spec.ts
@@ -1,4 +1,4 @@
-import { test, expect } from '../../fixtures/base';
+import { test, expect } from '../../../fixtures/base';
 
 test.describe('Folders - Advanced Operations', () => {
 	test.describe('Duplicate workflows', () => {
diff --git a/packages/testing/playwright/tests/ui/49-folders-basic.spec.ts b/packages/testing/playwright/tests/ui/projects/folders-basic.spec.ts
similarity index 99%
rename from packages/testing/playwright/tests/ui/49-folders-basic.spec.ts
rename to packages/testing/playwright/tests/ui/projects/folders-basic.spec.ts
index a1e8c3c35d5..de86afd1258 100644
--- a/packages/testing/playwright/tests/ui/49-folders-basic.spec.ts
+++ b/packages/testing/playwright/tests/ui/projects/folders-basic.spec.ts
@@ -1,4 +1,4 @@
-import { test, expect } from '../../fixtures/base';
+import { test, expect } from '../../../fixtures/base';
 
 test.describe('Folders - Basic Operations', () => {
 	const FOLDER_CREATED_NOTIFICATION = 'Folder created';
diff --git a/packages/testing/playwright/tests/ui/49-folders-operations.spec.ts b/packages/testing/playwright/tests/ui/projects/folders-operations.spec.ts
similarity index 99%
rename from packages/testing/playwright/tests/ui/49-folders-operations.spec.ts
rename to packages/testing/playwright/tests/ui/projects/folders-operations.spec.ts
index 84b2f4501c0..fa6b608064e 100644
--- a/packages/testing/playwright/tests/ui/49-folders-operations.spec.ts
+++ b/packages/testing/playwright/tests/ui/projects/folders-operations.spec.ts
@@ -1,4 +1,4 @@
-import { test, expect } from '../../fixtures/base';
+import { test, expect } from '../../../fixtures/base';
 
 test.describe('Folders - Operations', () => {
 	test.describe('Rename and delete folders', () => {
diff --git a/packages/testing/playwright/tests/ui/39-project-settings.spec.ts b/packages/testing/playwright/tests/ui/projects/project-settings.spec.ts
similarity index 99%
rename from packages/testing/playwright/tests/ui/39-project-settings.spec.ts
rename to packages/testing/playwright/tests/ui/projects/project-settings.spec.ts
index 41dd93fc40b..963bb351172 100644
--- a/packages/testing/playwright/tests/ui/39-project-settings.spec.ts
+++ b/packages/testing/playwright/tests/ui/projects/project-settings.spec.ts
@@ -1,6 +1,6 @@
 import { nanoid } from 'nanoid';
 
-import { test, expect } from '../../fixtures/base';
+import { test, expect } from '../../../fixtures/base';
 
 test.describe('Project Settings - Member Management', () => {
 	test.beforeEach(async ({ n8n }) => {
diff --git a/packages/testing/playwright/tests/ui/39-projects.spec.ts b/packages/testing/playwright/tests/ui/projects/projects.spec.ts
similarity index 99%
rename from packages/testing/playwright/tests/ui/39-projects.spec.ts
rename to packages/testing/playwright/tests/ui/projects/projects.spec.ts
index f1d607c97b1..5d8e397c513 100644
--- a/packages/testing/playwright/tests/ui/39-projects.spec.ts
+++ b/packages/testing/playwright/tests/ui/projects/projects.spec.ts
@@ -4,8 +4,8 @@ import {
 	INSTANCE_ADMIN_CREDENTIALS,
 	INSTANCE_MEMBER_CREDENTIALS,
 	INSTANCE_OWNER_CREDENTIALS,
-} from '../../config/test-users';
-import { test, expect } from '../../fixtures/base';
+} from '../../../config/test-users';
+import { test, expect } from '../../../fixtures/base';
 
 const MANUAL_TRIGGER_NODE_NAME = 'Manual Trigger';
 const EXECUTE_WORKFLOW_NODE_NAME = 'Execute Sub-workflow';

From 79fd0b5d40de6aece963e2cd9a318dab4a98d8fe Mon Sep 17 00:00:00 2001
From: Artem Sorokin <38620398+seemewalkin@users.noreply.github.com>
Date: Fri, 5 Dec 2025 12:39:00 +0100
Subject: [PATCH 085/167] test: Reorganize NDV tests into workflows/editor/ndv/
 directory (#22806)

---
 .../testing/playwright/tests/ui/5-ndv.spec.ts | 804 ------------------
 .../editor/ndv/io-filter.spec.ts}             |   2 +-
 .../ui/workflows/editor/ndv/ndv-core.spec.ts  | 266 ++++++
 .../editor/ndv/ndv-data-display.spec.ts       | 255 ++++++
 .../editor/ndv/ndv-floating-nodes.spec.ts     | 113 +++
 .../editor/ndv/ndv-parameters.spec.ts         | 193 +++++
 .../editor/ndv/paired-item.spec.ts}           |   2 +-
 .../editor/ndv/pinning.spec.ts}               |   4 +-
 .../editor/ndv/resource-locator.spec.ts}      |   4 +-
 .../editor/ndv/resource-mapper.spec.ts}       |   4 +-
 10 files changed, 835 insertions(+), 812 deletions(-)
 delete mode 100644 packages/testing/playwright/tests/ui/5-ndv.spec.ts
 rename packages/testing/playwright/tests/ui/{32-node-io-filter.spec.ts => workflows/editor/ndv/io-filter.spec.ts} (98%)
 create mode 100644 packages/testing/playwright/tests/ui/workflows/editor/ndv/ndv-core.spec.ts
 create mode 100644 packages/testing/playwright/tests/ui/workflows/editor/ndv/ndv-data-display.spec.ts
 create mode 100644 packages/testing/playwright/tests/ui/workflows/editor/ndv/ndv-floating-nodes.spec.ts
 create mode 100644 packages/testing/playwright/tests/ui/workflows/editor/ndv/ndv-parameters.spec.ts
 rename packages/testing/playwright/tests/ui/{24-ndv-paired-item.spec.ts => workflows/editor/ndv/paired-item.spec.ts} (99%)
 rename packages/testing/playwright/tests/ui/{13-pinning.spec.ts => workflows/editor/ndv/pinning.spec.ts} (98%)
 rename packages/testing/playwright/tests/ui/{26-resource-locator.spec.ts => workflows/editor/ndv/resource-locator.spec.ts} (97%)
 rename packages/testing/playwright/tests/ui/{28-resource-mapper.spec.ts => workflows/editor/ndv/resource-mapper.spec.ts} (96%)

diff --git a/packages/testing/playwright/tests/ui/5-ndv.spec.ts b/packages/testing/playwright/tests/ui/5-ndv.spec.ts
deleted file mode 100644
index f82587d6a41..00000000000
--- a/packages/testing/playwright/tests/ui/5-ndv.spec.ts
+++ /dev/null
@@ -1,804 +0,0 @@
-import {
-	CODE_NODE_NAME,
-	CODE_NODE_DISPLAY_NAME,
-	MANUAL_TRIGGER_NODE_DISPLAY_NAME,
-} from '../../config/constants';
-import { test, expect } from '../../fixtures/base';
-import type { n8nPage } from '../../pages/n8nPage';
-
-test.describe('NDV', () => {
-	test.beforeEach(async ({ n8n }) => {
-		await n8n.start.fromBlankCanvas();
-	});
-
-	test('should show up when double clicked on a node and close when Back to canvas clicked', async ({
-		n8n,
-	}) => {
-		await n8n.canvas.addNode('Manual Trigger');
-		const canvasNodes = n8n.canvas.getCanvasNodes();
-		await canvasNodes.first().dblclick();
-		await expect(n8n.ndv.getContainer()).toBeVisible();
-		await n8n.ndv.clickBackToCanvasButton();
-		await expect(n8n.ndv.getContainer()).toBeHidden();
-	});
-
-	test('should show input panel when node is not connected', async ({ n8n }) => {
-		await n8n.canvas.addNode('Manual Trigger');
-		await n8n.canvas.deselectAll();
-		await n8n.canvas.addNode('Edit Fields (Set)', { closeNDV: true });
-		const canvasNodes = n8n.canvas.getCanvasNodes();
-		await canvasNodes.last().dblclick();
-		await expect(n8n.ndv.getContainer()).toBeVisible();
-		await expect(n8n.ndv.inputPanel.get()).toContainText('Wire me up');
-	});
-
-	test('should test webhook node', async ({ n8n }) => {
-		await n8n.canvas.addNode('Webhook', { closeNDV: false });
-
-		await n8n.ndv.execute();
-
-		const webhookUrl = await n8n.ndv.getWebhookUrl();
-		await expect(n8n.ndv.getWebhookTriggerListening()).toBeVisible();
-		const response = await n8n.ndv.makeWebhookRequest(webhookUrl as string);
-		expect(response.status()).toBe(200);
-
-		await expect(n8n.ndv.outputPanel.get()).toBeVisible();
-		await expect(n8n.ndv.outputPanel.getDataContainer()).toBeVisible();
-	});
-
-	test('should change input and go back to canvas', async ({ n8n }) => {
-		await n8n.start.fromImportedWorkflow('NDV-test-select-input.json');
-		await n8n.canvas.clickZoomToFitButton();
-		await n8n.canvas.getCanvasNodes().last().dblclick();
-		await n8n.ndv.execute();
-
-		await n8n.ndv.inputPanel.switchDisplayMode('table');
-
-		await n8n.ndv.inputPanel.getNodeInputOptions().last().click();
-
-		await expect(n8n.ndv.inputPanel.get()).toContainText('start');
-
-		await n8n.ndv.clickBackToCanvasButton();
-		await expect(n8n.ndv.getContainer()).toBeHidden();
-	});
-
-	test('should show correct validation state for resource locator params', async ({ n8n }) => {
-		await n8n.canvas.addNode('Typeform Trigger', { closeNDV: false });
-		await expect(n8n.ndv.getContainer()).toBeVisible();
-
-		await n8n.ndv.clickBackToCanvasButton();
-
-		await n8n.canvas.openNode('Typeform Trigger');
-		await expect(n8n.canvas.getNodeIssuesByName('Typeform Trigger')).toBeVisible();
-	});
-
-	test('should show validation errors only after blur or re-opening of NDV', async ({ n8n }) => {
-		await n8n.canvas.addNode('Manual Trigger');
-		await n8n.canvas.addNode('Airtable', { closeNDV: false, action: 'Search records' });
-		await expect(n8n.ndv.getContainer()).toBeVisible();
-
-		await expect(n8n.canvas.getNodeIssuesByName('Airtable')).toBeHidden();
-
-		await n8n.ndv.getParameterInputField('table').nth(1).focus();
-		await n8n.ndv.getParameterInputField('table').nth(1).blur();
-		await n8n.ndv.getParameterInputField('base').nth(1).focus();
-		await n8n.ndv.getParameterInputField('base').nth(1).blur();
-
-		await expect(n8n.ndv.getParameterInput('base')).toHaveClass(/has-issues|error|invalid/);
-		await expect(n8n.ndv.getParameterInput('table')).toHaveClass(/has-issues|error|invalid/);
-
-		await n8n.ndv.clickBackToCanvasButton();
-
-		await n8n.canvas.openNode('Search records');
-		await expect(n8n.canvas.getNodeIssuesByName('Search records')).toBeVisible();
-	});
-
-	test('should show all validation errors when opening pasted node', async ({ n8n }) => {
-		await n8n.start.fromImportedWorkflow('Test_workflow_ndv_errors.json');
-		const canvasNodes = n8n.canvas.getCanvasNodes();
-		await expect(canvasNodes).toHaveCount(1);
-
-		await n8n.canvas.openNode('Airtable');
-		await expect(n8n.canvas.getNodeIssuesByName('Airtable')).toBeVisible();
-	});
-
-	test('should render run errors correctly', async ({ n8n }) => {
-		await n8n.start.fromImportedWorkflow('Test_workflow_ndv_run_error.json');
-		await n8n.canvas.openNode('Error');
-		await n8n.ndv.execute();
-
-		await expect(n8n.ndv.getNodeRunErrorMessage()).toHaveText(
-			"Paired item data for item from node 'Break pairedItem chain' is unavailable. Ensure 'Break pairedItem chain' is providing the required output.",
-		);
-
-		await expect(n8n.ndv.getNodeRunErrorDescription()).toContainText(
-			"An expression here won't work because it uses .item and n8n can't figure out the matching item.",
-		);
-
-		await expect(n8n.ndv.getNodeRunErrorMessage()).toBeVisible();
-		await expect(n8n.ndv.getNodeRunErrorDescription()).toBeVisible();
-	});
-
-	test('should save workflow using keyboard shortcut from NDV', async ({ n8n }) => {
-		await n8n.canvas.addNode('Manual Trigger');
-		await n8n.canvas.addNode('Edit Fields (Set)', { closeNDV: false });
-		await expect(n8n.ndv.getContainer()).toBeVisible();
-
-		await n8n.page.keyboard.press('ControlOrMeta+s');
-
-		await expect(n8n.canvas.getWorkflowSaveButton()).toBeHidden();
-	});
-
-	test('webhook should fallback to webhookId if path is empty', async ({ n8n }) => {
-		await n8n.canvas.addNode('Webhook', { closeNDV: false });
-
-		await expect(n8n.canvas.getNodeIssuesByName('Webhook')).toBeHidden();
-		await expect(n8n.ndv.getExecuteNodeButton()).toBeEnabled();
-		await expect(n8n.ndv.getTriggerPanelExecuteButton()).toBeVisible();
-
-		await n8n.ndv.getParameterInputField('path').clear();
-
-		const webhookUrlsContainer = n8n.ndv.getContainer().getByText('Webhook URLs').locator('..');
-		const urlText = await webhookUrlsContainer.textContent();
-		const uuidRegex = /[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/i;
-		expect(urlText).toMatch(uuidRegex);
-
-		await n8n.ndv.close();
-
-		await n8n.canvas.openNode('Webhook');
-		await n8n.ndv.fillParameterInput('path', 'test-path');
-
-		const updatedUrlText = await webhookUrlsContainer.textContent();
-		expect(updatedUrlText).toContain('test-path');
-		expect(updatedUrlText).not.toMatch(uuidRegex);
-	});
-
-	test.describe('test output schema view', () => {
-		const schemaKeys = [
-			'id',
-			'name',
-			'email',
-			'notes',
-			'country',
-			'created',
-			'objectValue',
-			'prop1',
-			'prop2',
-		];
-
-		const setupSchemaWorkflow = async (n8n: n8nPage) => {
-			await n8n.start.fromImportedWorkflow('Test_workflow_schema_test.json');
-			await n8n.canvas.clickZoomToFitButton();
-			await n8n.canvas.openNode('Set');
-			await n8n.ndv.execute();
-		};
-
-		test('should switch to output schema view and validate it', async ({ n8n }) => {
-			await setupSchemaWorkflow(n8n);
-			await n8n.ndv.outputPanel.switchDisplayMode('schema');
-
-			for (const key of schemaKeys) {
-				await expect(n8n.ndv.outputPanel.getSchemaItem(key)).toBeVisible();
-			}
-		});
-
-		test('should preserve schema view after execution', async ({ n8n }) => {
-			await setupSchemaWorkflow(n8n);
-			await n8n.ndv.outputPanel.switchDisplayMode('schema');
-			await n8n.ndv.execute();
-
-			for (const key of schemaKeys) {
-				await expect(n8n.ndv.outputPanel.getSchemaItem(key)).toBeVisible();
-			}
-		});
-
-		test('should collapse and expand nested schema object', async ({ n8n }) => {
-			await setupSchemaWorkflow(n8n);
-			const expandedObjectProps = ['prop1', 'prop2'];
-
-			await n8n.ndv.outputPanel.switchDisplayMode('schema');
-
-			for (const key of expandedObjectProps) {
-				await expect(n8n.ndv.outputPanel.getSchemaItem(key)).toBeVisible();
-			}
-
-			const objectValueItem = n8n.ndv.outputPanel.getSchemaItem('objectValue');
-			await objectValueItem.locator('.toggle').click();
-
-			for (const key of expandedObjectProps) {
-				await expect(n8n.ndv.outputPanel.getSchemaItem(key)).not.toBeInViewport();
-			}
-		});
-
-		test('should not display pagination for schema', async ({ n8n }) => {
-			await setupSchemaWorkflow(n8n);
-
-			await n8n.ndv.clickBackToCanvasButton();
-			await n8n.canvas.deselectAll();
-			await n8n.canvas.nodeByName('Set').click();
-			await n8n.canvas.addNode('Customer Datastore (n8n training)');
-
-			await n8n.canvas.openNode('Customer Datastore (n8n training)');
-
-			await n8n.ndv.execute();
-
-			await expect(n8n.ndv.outputPanel.get().getByText('5 items')).toBeVisible();
-
-			await n8n.ndv.outputPanel.switchDisplayMode('schema');
-
-			const schemaItemsCount = await n8n.ndv.outputPanel.getSchemaItems().count();
-			expect(schemaItemsCount).toBeGreaterThan(0);
-
-			await n8n.ndv.outputPanel.switchDisplayMode('json');
-		});
-
-		test('should display large schema', async ({ n8n }) => {
-			await n8n.start.fromImportedWorkflow('Test_workflow_schema_test_pinned_data.json');
-			await n8n.canvas.clickZoomToFitButton();
-			await n8n.canvas.openNode('Set');
-
-			await expect(n8n.ndv.outputPanel.get().getByText('20 items')).toBeVisible();
-			await expect(n8n.ndv.outputPanel.get().locator('[class*="_pagination"]')).toBeVisible();
-
-			await n8n.ndv.outputPanel.switchDisplayMode('schema');
-
-			await expect(n8n.ndv.outputPanel.get().locator('[class*="_pagination"]')).toBeHidden();
-		});
-	});
-
-	test('should display parameter hints correctly', async ({ n8n }) => {
-		await n8n.start.fromImportedWorkflow('Test_workflow_3.json');
-		await n8n.canvas.openNode('Set1');
-
-		await n8n.ndv.getParameterInputField('value').clear();
-		await n8n.ndv.getParameterInputField('value').fill('=');
-
-		await n8n.ndv.getInlineExpressionEditorContent().fill('hello');
-		await n8n.ndv.getParameterInputField('name').click();
-		await expect(n8n.ndv.getParameterExpressionPreviewValue()).toContainText('hello');
-
-		await n8n.ndv.getInlineExpressionEditorContent().fill('');
-		await n8n.ndv.getParameterInputField('name').click();
-		await expect(n8n.ndv.getParameterExpressionPreviewValue()).toContainText('[empty]');
-
-		await n8n.ndv.getInlineExpressionEditorContent().fill(' test');
-		await n8n.ndv.getParameterInputField('name').click();
-		await expect(n8n.ndv.getParameterExpressionPreviewValue()).toContainText(' test');
-
-		await n8n.ndv.getInlineExpressionEditorContent().fill(' ');
-		await n8n.ndv.getParameterInputField('name').click();
-		await expect(n8n.ndv.getParameterExpressionPreviewValue()).toContainText(' ');
-
-		await n8n.ndv.getInlineExpressionEditorContent().fill('<div></div>');
-		await n8n.ndv.getParameterInputField('name').click();
-		await expect(n8n.ndv.getParameterExpressionPreviewValue()).toContainText('<div></div>');
-	});
-
-	test('should properly show node execution indicator', async ({ n8n }) => {
-		await n8n.canvas.addNode('Manual Trigger');
-		await n8n.canvas.addNode('Code', { action: 'Code in JavaScript', closeNDV: false });
-
-		await expect(n8n.ndv.getNodeRunSuccessIndicator()).toBeHidden();
-		await expect(n8n.ndv.getNodeRunErrorIndicator()).toBeHidden();
-		await expect(n8n.ndv.getNodeRunTooltipIndicator()).toBeHidden();
-
-		await n8n.ndv.execute();
-
-		await expect(n8n.ndv.getNodeRunSuccessIndicator()).toBeVisible();
-		await expect(n8n.ndv.getNodeRunTooltipIndicator()).toBeVisible();
-	});
-
-	test('should show node name and version in settings', async ({ n8n }) => {
-		await n8n.start.fromImportedWorkflow('Test_workflow_ndv_version.json');
-
-		await n8n.canvas.openNode('Edit Fields (old)');
-		await n8n.ndv.openSettings();
-		await expect(n8n.ndv.getNodeVersion()).toContainText('Set node version 2');
-		await expect(n8n.ndv.getNodeVersion()).toContainText('Latest version: 3.4');
-		await n8n.ndv.close();
-
-		await n8n.canvas.openNode('Edit Fields (latest)');
-		await n8n.ndv.openSettings();
-		await expect(n8n.ndv.getNodeVersion()).toContainText('Edit Fields (Set) node version 3.4');
-		await expect(n8n.ndv.getNodeVersion()).toContainText('Latest');
-		await n8n.ndv.close();
-
-		await n8n.canvas.openNode('Function');
-		await n8n.ndv.openSettings();
-		await expect(n8n.ndv.getNodeVersion()).toContainText('Function node version 1');
-		await expect(n8n.ndv.getNodeVersion()).toContainText('Deprecated');
-		await n8n.ndv.close();
-	});
-
-	test('should not push NDV header out with a lot of code in Code node editor', async ({ n8n }) => {
-		await n8n.canvas.addNode('Manual Trigger');
-		await n8n.canvas.addNode('Code', { action: 'Code in JavaScript', closeNDV: false });
-
-		const codeEditor = n8n.ndv.getParameterInput('jsCode').locator('.cm-content');
-		await codeEditor.click();
-		await n8n.page.keyboard.press('ControlOrMeta+a');
-		await n8n.page.keyboard.press('Delete');
-
-		const dummyCode = Array(50)
-			.fill(
-				'console.log("This is a very long line of dummy JavaScript code that should not push the NDV header out of view");',
-			)
-			.join('\n');
-
-		await codeEditor.fill(dummyCode);
-
-		await expect(n8n.ndv.getExecuteNodeButton()).toBeVisible();
-	});
-
-	test('should allow editing code in fullscreen in the code editors', async ({ n8n }) => {
-		await n8n.canvas.addNode('Manual Trigger');
-		await n8n.canvas.addNode('Code', { action: 'Code in JavaScript', closeNDV: false });
-
-		await n8n.ndv.openCodeEditorFullscreen();
-
-		const fullscreenEditor = n8n.ndv.getCodeEditorFullscreen();
-		await fullscreenEditor.click();
-		await n8n.page.keyboard.press('ControlOrMeta+a');
-		await fullscreenEditor.fill('foo()');
-
-		await expect(fullscreenEditor).toContainText('foo()');
-
-		await n8n.ndv.closeCodeEditorDialog();
-
-		await expect(n8n.ndv.getParameterInput('jsCode').locator('.cm-content')).toContainText('foo()');
-	});
-
-	test('should keep search expanded after Execute step node run', async ({ n8n }) => {
-		await n8n.start.fromImportedWorkflow('Test_ndv_search.json');
-		await n8n.canvas.clickZoomToFitButton();
-		await n8n.workflowComposer.executeWorkflowAndWaitForNotification(
-			'Workflow executed successfully',
-		);
-
-		await n8n.canvas.openNode('Edit Fields');
-		await expect(n8n.ndv.outputPanel.get()).toBeVisible();
-
-		await n8n.ndv.searchOutputData('US');
-
-		await expect(n8n.ndv.outputPanel.getTableRow(1).locator('mark')).toContainText('US');
-
-		await n8n.ndv.execute();
-
-		await expect(n8n.ndv.outputPanel.getSearchInput()).toBeVisible();
-		await expect(n8n.ndv.outputPanel.getSearchInput()).toHaveValue('US');
-	});
-
-	test('Should render xml and html tags as strings and can search', async ({ n8n }) => {
-		await n8n.start.fromImportedWorkflow('Test_workflow_xml_output.json');
-		await n8n.workflowComposer.executeWorkflowAndWaitForNotification(
-			'Workflow executed successfully',
-		);
-		await n8n.canvas.openNode('Edit Fields');
-
-		await expect(n8n.ndv.outputPanel.get().locator('[class*="active"]')).toContainText('Table');
-
-		await expect(n8n.ndv.outputPanel.getTableRow(1)).toContainText(
-			'<?xml version="1.0" encoding="UTF-8"?> <library>',
-		);
-
-		await n8n.page.keyboard.press('/');
-
-		const searchInput = n8n.ndv.outputPanel.getSearchInput();
-		await expect(searchInput).toBeFocused();
-		await searchInput.fill('<lib');
-
-		await expect(n8n.ndv.outputPanel.getTableRow(1).locator('mark')).toContainText('<lib');
-
-		await n8n.ndv.outputPanel.switchDisplayMode('json');
-
-		await expect(n8n.ndv.outputPanel.getDataContainer().locator('.json-data')).toBeVisible();
-	});
-
-	test.describe('Run Data & Selectors - Advanced', () => {
-		test('can link and unlink run selectors between input and output', async ({ n8n }) => {
-			await n8n.start.fromImportedWorkflow('Test_workflow_5.json');
-			await n8n.canvas.clickZoomToFitButton();
-			await n8n.workflowComposer.executeWorkflowAndWaitForNotification(
-				'Workflow executed successfully',
-			);
-			await n8n.canvas.openNode('Set3');
-
-			await n8n.ndv.inputPanel.switchDisplayMode('table');
-			await n8n.ndv.outputPanel.switchDisplayMode('table');
-
-			await n8n.ndv.ensureOutputRunLinking(true);
-			await n8n.ndv.inputPanel.getTbodyCell(0, 0).click();
-			expect(await n8n.ndv.getInputRunSelectorValue()).toContain('2 of 2 (6 items)');
-			expect(await n8n.ndv.getOutputRunSelectorValue()).toContain('2 of 2 (6 items)');
-
-			await n8n.ndv.changeOutputRunSelector('1 of 2 (6 items)');
-			expect(await n8n.ndv.getInputRunSelectorValue()).toContain('1 of 2 (6 items)');
-			await expect(n8n.ndv.inputPanel.getTbodyCell(0, 0)).toHaveText('1111');
-			await expect(n8n.ndv.outputPanel.getTbodyCell(0, 0)).toHaveText('1111');
-
-			await n8n.ndv.inputPanel.getTbodyCell(0, 0).click();
-			await n8n.ndv.changeInputRunSelector('2 of 2 (6 items)');
-			expect(await n8n.ndv.getOutputRunSelectorValue()).toContain('2 of 2 (6 items)');
-
-			await n8n.ndv.outputPanel.getLinkRun().click();
-			await n8n.ndv.inputPanel.getTbodyCell(0, 0).click();
-			await n8n.ndv.changeOutputRunSelector('1 of 2 (6 items)');
-			expect(await n8n.ndv.getInputRunSelectorValue()).toContain('2 of 2 (6 items)');
-
-			await n8n.ndv.outputPanel.getLinkRun().click();
-			await n8n.ndv.inputPanel.getTbodyCell(0, 0).click();
-			expect(await n8n.ndv.getInputRunSelectorValue()).toContain('1 of 2 (6 items)');
-
-			await n8n.ndv.inputPanel.toggleInputRunLinking();
-			await n8n.ndv.inputPanel.getTbodyCell(0, 0).click();
-			await n8n.ndv.changeInputRunSelector('2 of 2 (6 items)');
-			expect(await n8n.ndv.getOutputRunSelectorValue()).toContain('1 of 2 (6 items)');
-
-			await n8n.ndv.inputPanel.toggleInputRunLinking();
-			await n8n.ndv.inputPanel.getTbodyCell(0, 0).click();
-			expect(await n8n.ndv.getOutputRunSelectorValue()).toContain('2 of 2 (6 items)');
-		});
-	});
-
-	test.describe('Remote Options & Network', () => {
-		test('should not retrieve remote options when a parameter value changes', async ({ n8n }) => {
-			let fetchParameterOptionsCallCount = 0;
-			await n8n.page.route('**/rest/dynamic-node-parameters/options', async (route) => {
-				fetchParameterOptionsCallCount++;
-				await route.fulfill({
-					status: 200,
-					contentType: 'application/json',
-					body: JSON.stringify({ data: [] }),
-				});
-			});
-
-			await n8n.canvas.addNode('E2E Test', { action: 'Remote Options' });
-			await expect(n8n.ndv.getContainer()).toBeVisible();
-
-			await n8n.ndv.fillFirstAvailableTextParameterMultipleTimes(['test1', 'test2', 'test3']);
-
-			expect(fetchParameterOptionsCallCount).toBe(1);
-		});
-
-		test('Should show a notice when remote options cannot be fetched because of missing credentials', async ({
-			n8n,
-		}) => {
-			await n8n.page.route('**/rest/dynamic-node-parameters/options', async (route) => {
-				await route.fulfill({ status: 403 });
-			});
-
-			await n8n.canvas.addNode('Manual Trigger');
-			await n8n.canvas.addNode('Notion', { action: 'Update a database page', closeNDV: false });
-			await expect(n8n.ndv.getContainer()).toBeVisible();
-
-			await n8n.ndv.addItemToFixedCollection('propertiesUi');
-			await expect(
-				n8n.ndv.getParameterInputWithIssues('propertiesUi.propertyValues[0].key'),
-			).toBeVisible();
-		});
-
-		test('Should show error state when remote options cannot be fetched', async ({ n8n }) => {
-			await n8n.page.route('**/rest/dynamic-node-parameters/options', async (route) => {
-				await route.fulfill({ status: 500 });
-			});
-
-			await n8n.canvas.addNode('Manual Trigger');
-			await n8n.canvas.addNode('Notion', { action: 'Update a database page', closeNDV: false });
-			await expect(n8n.ndv.getContainer()).toBeVisible();
-
-			await n8n.credentialsComposer.createFromNdv({
-				apiKey: 'sk_test_123',
-			});
-			await n8n.ndv.addItemToFixedCollection('propertiesUi');
-			await expect(
-				n8n.ndv.getParameterInputWithIssues('propertiesUi.propertyValues[0].key'),
-			).toBeVisible();
-		});
-	});
-
-	test.describe('Floating Nodes Navigation', () => {
-		test('should traverse floating nodes with mouse', async ({ n8n }) => {
-			await n8n.start.fromImportedWorkflow('Floating_Nodes.json');
-			await n8n.canvas.getCanvasNodes().first().dblclick();
-			await expect(n8n.ndv.getContainer()).toBeVisible();
-
-			await expect(n8n.ndv.getFloatingNodeByPosition('inputMain')).toBeHidden();
-			await expect(n8n.ndv.getFloatingNodeByPosition('outputMain')).toBeVisible();
-			for (let i = 0; i < 4; i++) {
-				await n8n.ndv.clickFloatingNodeByPosition('outputMain');
-				await expect(n8n.ndv.getFloatingNodeByPosition('inputMain')).toBeVisible();
-				await expect(n8n.ndv.getFloatingNodeByPosition('outputMain')).toBeVisible();
-
-				await n8n.ndv.close();
-				await expect(n8n.canvas.getSelectedNodes()).toHaveCount(1);
-
-				await n8n.canvas.getSelectedNodes().first().dblclick();
-				await expect(n8n.ndv.getContainer()).toBeVisible();
-			}
-
-			await n8n.ndv.clickFloatingNodeByPosition('outputMain');
-			await expect(n8n.ndv.getFloatingNodeByPosition('inputMain')).toBeVisible();
-
-			for (let i = 0; i < 4; i++) {
-				await n8n.ndv.clickFloatingNodeByPosition('inputMain');
-				await expect(n8n.ndv.getFloatingNodeByPosition('outputMain')).toBeVisible();
-				await expect(n8n.ndv.getFloatingNodeByPosition('inputMain')).toBeVisible();
-			}
-
-			await n8n.ndv.clickFloatingNodeByPosition('inputMain');
-			await expect(n8n.ndv.getFloatingNodeByPosition('inputMain')).toBeHidden();
-			await expect(n8n.ndv.getFloatingNodeByPosition('inputSub')).toBeHidden();
-			await expect(n8n.ndv.getFloatingNodeByPosition('outputSub')).toBeHidden();
-
-			await n8n.ndv.close();
-			await expect(n8n.canvas.getSelectedNodes()).toHaveCount(1);
-		});
-
-		test('should traverse floating nodes with keyboard', async ({ n8n }) => {
-			await n8n.start.fromImportedWorkflow('Floating_Nodes.json');
-
-			await n8n.canvas.getCanvasNodes().first().dblclick();
-			await expect(n8n.ndv.getContainer()).toBeVisible();
-
-			await expect(n8n.ndv.getFloatingNodeByPosition('inputMain')).toBeHidden();
-			await expect(n8n.ndv.getFloatingNodeByPosition('outputMain')).toBeVisible();
-			for (let i = 0; i < 4; i++) {
-				await n8n.ndv.navigateToNextFloatingNodeWithKeyboard();
-				await expect(n8n.ndv.getFloatingNodeByPosition('inputMain')).toBeVisible();
-				await expect(n8n.ndv.getFloatingNodeByPosition('outputMain')).toBeVisible();
-
-				await n8n.ndv.close();
-				await expect(n8n.canvas.getSelectedNodes()).toHaveCount(1);
-
-				await n8n.canvas.getSelectedNodes().first().dblclick();
-				await expect(n8n.ndv.getContainer()).toBeVisible();
-			}
-
-			await n8n.ndv.navigateToNextFloatingNodeWithKeyboard();
-			await expect(n8n.ndv.getFloatingNodeByPosition('inputMain')).toBeVisible();
-
-			for (let i = 0; i < 4; i++) {
-				await n8n.ndv.navigateToPreviousFloatingNodeWithKeyboard();
-				await expect(n8n.ndv.getFloatingNodeByPosition('outputMain')).toBeVisible();
-				await expect(n8n.ndv.getFloatingNodeByPosition('inputMain')).toBeVisible();
-			}
-
-			await n8n.ndv.navigateToPreviousFloatingNodeWithKeyboard();
-			await expect(n8n.ndv.getFloatingNodeByPosition('inputMain')).toBeHidden();
-			await expect(n8n.ndv.getFloatingNodeByPosition('inputSub')).toBeHidden();
-			await expect(n8n.ndv.getFloatingNodeByPosition('outputSub')).toBeHidden();
-
-			await n8n.ndv.close();
-			await expect(n8n.canvas.getSelectedNodes()).toHaveCount(1);
-		});
-
-		test('should connect floating sub-nodes', async ({ n8n }) => {
-			await n8n.canvas.addNode('AI Agent', { closeNDV: false });
-			await expect(n8n.ndv.getContainer()).toBeVisible();
-
-			await n8n.ndv.connectAISubNode('ai_languageModel', 'Anthropic Chat Model');
-			await n8n.ndv.connectAISubNode('ai_memory', 'Simple Memory');
-			await n8n.ndv.connectAISubNode('ai_tool', 'HTTP Request Tool');
-
-			expect(await n8n.ndv.getNodesWithIssuesCount()).toBeGreaterThanOrEqual(2);
-		});
-
-		test('should have the floating nodes in correct order', async ({ n8n }) => {
-			await n8n.start.fromImportedWorkflow('Floating_Nodes.json');
-
-			await n8n.canvas.openNode('Merge');
-			await expect(n8n.ndv.getContainer()).toBeVisible();
-
-			expect(await n8n.ndv.getFloatingNodeCount('inputMain')).toBe(2);
-			await n8n.ndv.verifyFloatingNodeName('inputMain', 'Edit Fields1', 0);
-			await n8n.ndv.verifyFloatingNodeName('inputMain', 'Edit Fields0', 1);
-
-			await n8n.ndv.close();
-
-			await n8n.canvas.openNode('Merge1');
-			await expect(n8n.ndv.getContainer()).toBeVisible();
-
-			expect(await n8n.ndv.getFloatingNodeCount('inputMain')).toBe(2);
-			await n8n.ndv.verifyFloatingNodeName('inputMain', 'Edit Fields0', 0);
-			await n8n.ndv.verifyFloatingNodeName('inputMain', 'Edit Fields1', 1);
-		});
-	});
-
-	test.describe('Parameter Management - Advanced', () => {
-		test('Should clear mismatched collection parameters', async ({ n8n }) => {
-			await n8n.canvas.addNode('Manual Trigger');
-			await n8n.canvas.addNode('Notion', { action: 'Create a database page', closeNDV: false });
-			await expect(n8n.ndv.getContainer()).toBeVisible();
-
-			await n8n.ndv.addItemToFixedCollection('propertiesUi');
-			await n8n.ndv.changeNodeOperation('Update');
-
-			await expect(n8n.ndv.getParameterItemWithText('Currently no items exist')).toBeVisible();
-		});
-
-		test('Should keep RLC values after operation change', async ({ n8n }) => {
-			const TEST_DOC_ID = '1111';
-
-			await n8n.canvas.addNode('Manual Trigger');
-			await n8n.canvas.addNode('Google Sheets', { closeNDV: false, action: 'Append row in sheet' });
-			await expect(n8n.ndv.getContainer()).toBeVisible();
-
-			await n8n.ndv.setRLCValue('documentId', TEST_DOC_ID);
-			await n8n.ndv.changeNodeOperation('Append or Update Row');
-			const input = n8n.ndv.getResourceLocatorInput('documentId').locator('input');
-			await expect(input).toHaveValue(TEST_DOC_ID);
-		});
-
-		test('Should not clear resource/operation after credential change', async ({ n8n }) => {
-			await n8n.canvas.addNode('Manual Trigger');
-			await n8n.canvas.addNode('Discord', { closeNDV: false, action: 'Delete a message' });
-			await expect(n8n.ndv.getContainer()).toBeVisible();
-			await n8n.credentialsComposer.createFromNdv({
-				botToken: 'sk_test_123',
-			});
-
-			const resourceInput = n8n.ndv.getParameterInputField('resource');
-			const operationInput = n8n.ndv.getParameterInputField('operation');
-
-			await expect(resourceInput).toHaveValue('Message');
-			await expect(operationInput).toHaveValue('Delete');
-		});
-	});
-
-	test.describe('Node Creator Integration', () => {
-		test('Should open appropriate node creator after clicking on connection hint link', async ({
-			n8n,
-		}) => {
-			const hintMapper = {
-				Memory: 'AI Nodes',
-				'Output Parser': 'AI Nodes',
-				'Token Splitter': 'Document Loaders',
-				Tool: 'AI Nodes',
-				Embeddings: 'Vector Stores',
-				'Vector Store': 'Retrievers',
-			};
-
-			await n8n.canvas.importWorkflow(
-				'open_node_creator_for_connection.json',
-				'open_node_creator_for_connection',
-			);
-
-			for (const [node, group] of Object.entries(hintMapper)) {
-				await n8n.canvas.openNode(node);
-
-				await n8n.ndv.clickNodeCreatorInsertOneButton();
-				await expect(n8n.canvas.getNodeCreatorHeader(group)).toBeVisible();
-				await n8n.page.keyboard.press('Escape');
-			}
-		});
-	});
-
-	test.describe('Expression Editor Features', () => {
-		test('should allow selecting item for expressions', async ({ n8n }) => {
-			await n8n.canvas.importWorkflow('Test_workflow_3.json', 'My test workflow 2');
-
-			await n8n.workflowComposer.executeWorkflowAndWaitForNotification(
-				'Workflow executed successfully',
-			);
-
-			await n8n.canvas.openNode('Set');
-
-			await n8n.ndv.getAssignmentValue('assignments').getByText('Expression').click();
-
-			const expressionInput = n8n.ndv.getInlineExpressionEditorInput();
-			await expressionInput.click();
-			await n8n.ndv.clearExpressionEditor();
-			await n8n.ndv.typeInExpressionEditor('{{ $json.input[0].count');
-
-			await expect(n8n.ndv.getInlineExpressionEditorOutput()).toHaveText('0');
-
-			await n8n.ndv.expressionSelectNextItem();
-			await expect(n8n.ndv.getInlineExpressionEditorOutput()).toHaveText('1');
-			await expect(n8n.ndv.getInlineExpressionEditorItemInput()).toHaveValue('1');
-
-			await expect(n8n.ndv.getInlineExpressionEditorItemNextButton()).toBeDisabled();
-
-			await n8n.ndv.expressionSelectPrevItem();
-			await expect(n8n.ndv.getInlineExpressionEditorOutput()).toHaveText('0');
-			await expect(n8n.ndv.getInlineExpressionEditorItemInput()).toHaveValue('0');
-		});
-	});
-
-	test.describe('Schema & Data Views', () => {
-		test('should show data from the correct output in schema view', async ({ n8n }) => {
-			await n8n.canvas.importWorkflow('Test_workflow_multiple_outputs.json', 'Multiple outputs');
-			await n8n.workflowComposer.executeWorkflowAndWaitForNotification(
-				'Workflow executed successfully',
-			);
-
-			await n8n.canvas.openNode('Only Item 1');
-			await expect(n8n.ndv.inputPanel.get()).toBeVisible();
-			await n8n.ndv.inputPanel.switchDisplayMode('schema');
-			await expect(n8n.ndv.inputPanel.getSchemaItem('onlyOnItem1')).toBeVisible();
-			await n8n.ndv.close();
-
-			await n8n.canvas.openNode('Only Item 2');
-			await expect(n8n.ndv.inputPanel.get()).toBeVisible();
-			await n8n.ndv.inputPanel.switchDisplayMode('schema');
-			await expect(n8n.ndv.inputPanel.getSchemaItem('onlyOnItem2')).toBeVisible();
-			await n8n.ndv.close();
-
-			await n8n.canvas.openNode('Only Item 3');
-			await expect(n8n.ndv.inputPanel.get()).toBeVisible();
-			await n8n.ndv.inputPanel.switchDisplayMode('schema');
-			await expect(n8n.ndv.inputPanel.getSchemaItem('onlyOnItem3')).toBeVisible();
-			await n8n.ndv.close();
-		});
-	});
-
-	test.describe('Search Functionality - Advanced', () => {
-		test('should not show items count when searching in schema view', async ({ n8n }) => {
-			await n8n.canvas.importWorkflow('Test_ndv_search.json', 'NDV Search Test');
-			await n8n.canvas.openNode('Edit Fields');
-			await expect(n8n.ndv.outputPanel.get()).toBeVisible();
-
-			await n8n.ndv.execute();
-			await n8n.ndv.outputPanel.switchDisplayMode('schema');
-			await n8n.ndv.searchOutputData('US');
-
-			await expect(n8n.ndv.outputPanel.getItemsCount()).toBeHidden();
-		});
-
-		test('should show additional tooltip when searching in schema view if no matches', async ({
-			n8n,
-		}) => {
-			await n8n.canvas.importWorkflow('Test_ndv_search.json', 'NDV Search Test');
-
-			await n8n.canvas.openNode('Edit Fields');
-			await expect(n8n.ndv.outputPanel.get()).toBeVisible();
-
-			await n8n.ndv.execute();
-			await n8n.ndv.outputPanel.switchDisplayMode('schema');
-			await n8n.ndv.searchOutputData('foo');
-
-			await expect(
-				n8n.ndv.outputPanel
-					.get()
-					.getByText('To search field values, switch to table or JSON view.'),
-			).toBeVisible();
-		});
-	});
-
-	test.describe('Complex Edge Cases', () => {
-		test('ADO-2931 - should handle multiple branches of the same input with the first branch empty correctly', async ({
-			n8n,
-		}) => {
-			await n8n.canvas.importWorkflow(
-				'Test_ndv_two_branches_of_same_parent_false_populated.json',
-				'Multiple Branches Test',
-			);
-
-			await n8n.canvas.openNode('DebugHelper');
-			await expect(n8n.ndv.inputPanel.get()).toBeVisible();
-			await expect(n8n.ndv.outputPanel.get()).toBeVisible();
-
-			await n8n.ndv.execute();
-
-			await expect(n8n.ndv.inputPanel.getSchemaItem('a1')).toBeVisible();
-		});
-	});
-
-	test.describe('Execution Indicators - Multi-Node', () => {
-		test('should properly show node execution indicator for multiple nodes', async ({ n8n }) => {
-			await n8n.canvas.addNode(CODE_NODE_NAME, { action: 'Code in JavaScript' });
-			await n8n.ndv.clickBackToCanvasButton();
-
-			await n8n.workflowComposer.executeWorkflowAndWaitForNotification(
-				'Workflow executed successfully',
-			);
-
-			await n8n.canvas.openNode(MANUAL_TRIGGER_NODE_DISPLAY_NAME);
-			await expect(n8n.ndv.getNodeRunSuccessIndicator()).toBeVisible();
-			await expect(n8n.ndv.getNodeRunTooltipIndicator()).toBeVisible();
-
-			await n8n.ndv.clickBackToCanvasButton();
-			await n8n.canvas.openNode(CODE_NODE_DISPLAY_NAME);
-			await expect(n8n.ndv.getNodeRunSuccessIndicator()).toBeVisible();
-		});
-	});
-});
diff --git a/packages/testing/playwright/tests/ui/32-node-io-filter.spec.ts b/packages/testing/playwright/tests/ui/workflows/editor/ndv/io-filter.spec.ts
similarity index 98%
rename from packages/testing/playwright/tests/ui/32-node-io-filter.spec.ts
rename to packages/testing/playwright/tests/ui/workflows/editor/ndv/io-filter.spec.ts
index c3be89d0dc3..ce0b9e0537a 100644
--- a/packages/testing/playwright/tests/ui/32-node-io-filter.spec.ts
+++ b/packages/testing/playwright/tests/ui/workflows/editor/ndv/io-filter.spec.ts
@@ -1,4 +1,4 @@
-import { test, expect } from '../../fixtures/base';
+import { test, expect } from '../../../../../fixtures/base';
 
 test.describe('Node IO Filter', () => {
 	test.beforeEach(async ({ n8n }) => {
diff --git a/packages/testing/playwright/tests/ui/workflows/editor/ndv/ndv-core.spec.ts b/packages/testing/playwright/tests/ui/workflows/editor/ndv/ndv-core.spec.ts
new file mode 100644
index 00000000000..b2189a24eae
--- /dev/null
+++ b/packages/testing/playwright/tests/ui/workflows/editor/ndv/ndv-core.spec.ts
@@ -0,0 +1,266 @@
+import {
+	CODE_NODE_NAME,
+	CODE_NODE_DISPLAY_NAME,
+	MANUAL_TRIGGER_NODE_DISPLAY_NAME,
+} from '../../../../../config/constants';
+import { test, expect } from '../../../../../fixtures/base';
+
+test.describe('NDV', () => {
+	test.beforeEach(async ({ n8n }) => {
+		await n8n.start.fromBlankCanvas();
+	});
+
+	test('should show up when double clicked on a node and close when Back to canvas clicked', async ({
+		n8n,
+	}) => {
+		await n8n.canvas.addNode('Manual Trigger');
+		const canvasNodes = n8n.canvas.getCanvasNodes();
+		await canvasNodes.first().dblclick();
+		await expect(n8n.ndv.getContainer()).toBeVisible();
+		await n8n.ndv.clickBackToCanvasButton();
+		await expect(n8n.ndv.getContainer()).toBeHidden();
+	});
+
+	test('should show input panel when node is not connected', async ({ n8n }) => {
+		await n8n.canvas.addNode('Manual Trigger');
+		await n8n.canvas.deselectAll();
+		await n8n.canvas.addNode('Edit Fields (Set)', { closeNDV: true });
+		const canvasNodes = n8n.canvas.getCanvasNodes();
+		await canvasNodes.last().dblclick();
+		await expect(n8n.ndv.getContainer()).toBeVisible();
+		await expect(n8n.ndv.inputPanel.get()).toContainText('Wire me up');
+	});
+
+	test('should test webhook node', async ({ n8n }) => {
+		await n8n.canvas.addNode('Webhook', { closeNDV: false });
+
+		await n8n.ndv.execute();
+
+		const webhookUrl = await n8n.ndv.getWebhookUrl();
+		await expect(n8n.ndv.getWebhookTriggerListening()).toBeVisible();
+		const response = await n8n.ndv.makeWebhookRequest(webhookUrl as string);
+		expect(response.status()).toBe(200);
+
+		await expect(n8n.ndv.outputPanel.get()).toBeVisible();
+		await expect(n8n.ndv.outputPanel.getDataContainer()).toBeVisible();
+	});
+
+	test('should change input and go back to canvas', async ({ n8n }) => {
+		await n8n.start.fromImportedWorkflow('NDV-test-select-input.json');
+		await n8n.canvas.clickZoomToFitButton();
+		await n8n.canvas.getCanvasNodes().last().dblclick();
+		await n8n.ndv.execute();
+
+		await n8n.ndv.inputPanel.switchDisplayMode('table');
+
+		await n8n.ndv.inputPanel.getNodeInputOptions().last().click();
+
+		await expect(n8n.ndv.inputPanel.get()).toContainText('start');
+
+		await n8n.ndv.clickBackToCanvasButton();
+		await expect(n8n.ndv.getContainer()).toBeHidden();
+	});
+
+	test('should show correct validation state for resource locator params', async ({ n8n }) => {
+		await n8n.canvas.addNode('Typeform Trigger', { closeNDV: false });
+		await expect(n8n.ndv.getContainer()).toBeVisible();
+
+		await n8n.ndv.clickBackToCanvasButton();
+
+		await n8n.canvas.openNode('Typeform Trigger');
+		await expect(n8n.canvas.getNodeIssuesByName('Typeform Trigger')).toBeVisible();
+	});
+
+	test('should show validation errors only after blur or re-opening of NDV', async ({ n8n }) => {
+		await n8n.canvas.addNode('Manual Trigger');
+		await n8n.canvas.addNode('Airtable', { closeNDV: false, action: 'Search records' });
+		await expect(n8n.ndv.getContainer()).toBeVisible();
+
+		await expect(n8n.canvas.getNodeIssuesByName('Airtable')).toBeHidden();
+
+		await n8n.ndv.getParameterInputField('table').nth(1).focus();
+		await n8n.ndv.getParameterInputField('table').nth(1).blur();
+		await n8n.ndv.getParameterInputField('base').nth(1).focus();
+		await n8n.ndv.getParameterInputField('base').nth(1).blur();
+
+		await expect(n8n.ndv.getParameterInput('base')).toHaveClass(/has-issues|error|invalid/);
+		await expect(n8n.ndv.getParameterInput('table')).toHaveClass(/has-issues|error|invalid/);
+
+		await n8n.ndv.clickBackToCanvasButton();
+
+		await n8n.canvas.openNode('Search records');
+		await expect(n8n.canvas.getNodeIssuesByName('Search records')).toBeVisible();
+	});
+
+	test('should show all validation errors when opening pasted node', async ({ n8n }) => {
+		await n8n.start.fromImportedWorkflow('Test_workflow_ndv_errors.json');
+		const canvasNodes = n8n.canvas.getCanvasNodes();
+		await expect(canvasNodes).toHaveCount(1);
+
+		await n8n.canvas.openNode('Airtable');
+		await expect(n8n.canvas.getNodeIssuesByName('Airtable')).toBeVisible();
+	});
+
+	test('should render run errors correctly', async ({ n8n }) => {
+		await n8n.start.fromImportedWorkflow('Test_workflow_ndv_run_error.json');
+		await n8n.canvas.openNode('Error');
+		await n8n.ndv.execute();
+
+		await expect(n8n.ndv.getNodeRunErrorMessage()).toHaveText(
+			"Paired item data for item from node 'Break pairedItem chain' is unavailable. Ensure 'Break pairedItem chain' is providing the required output.",
+		);
+
+		await expect(n8n.ndv.getNodeRunErrorDescription()).toContainText(
+			"An expression here won't work because it uses .item and n8n can't figure out the matching item.",
+		);
+
+		await expect(n8n.ndv.getNodeRunErrorMessage()).toBeVisible();
+		await expect(n8n.ndv.getNodeRunErrorDescription()).toBeVisible();
+	});
+
+	test('should save workflow using keyboard shortcut from NDV', async ({ n8n }) => {
+		await n8n.canvas.addNode('Manual Trigger');
+		await n8n.canvas.addNode('Edit Fields (Set)', { closeNDV: false });
+		await expect(n8n.ndv.getContainer()).toBeVisible();
+
+		await n8n.page.keyboard.press('ControlOrMeta+s');
+
+		await expect(n8n.canvas.getWorkflowSaveButton()).toBeHidden();
+	});
+
+	test('webhook should fallback to webhookId if path is empty', async ({ n8n }) => {
+		await n8n.canvas.addNode('Webhook', { closeNDV: false });
+
+		await expect(n8n.canvas.getNodeIssuesByName('Webhook')).toBeHidden();
+		await expect(n8n.ndv.getExecuteNodeButton()).toBeEnabled();
+		await expect(n8n.ndv.getTriggerPanelExecuteButton()).toBeVisible();
+
+		await n8n.ndv.getParameterInputField('path').clear();
+
+		const webhookUrlsContainer = n8n.ndv.getContainer().getByText('Webhook URLs').locator('..');
+		const urlText = await webhookUrlsContainer.textContent();
+		const uuidRegex = /[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/i;
+		expect(urlText).toMatch(uuidRegex);
+
+		await n8n.ndv.close();
+
+		await n8n.canvas.openNode('Webhook');
+		await n8n.ndv.fillParameterInput('path', 'test-path');
+
+		const updatedUrlText = await webhookUrlsContainer.textContent();
+		expect(updatedUrlText).toContain('test-path');
+		expect(updatedUrlText).not.toMatch(uuidRegex);
+	});
+
+	test('should properly show node execution indicator', async ({ n8n }) => {
+		await n8n.canvas.addNode('Manual Trigger');
+		await n8n.canvas.addNode('Code', { action: 'Code in JavaScript', closeNDV: false });
+
+		await expect(n8n.ndv.getNodeRunSuccessIndicator()).toBeHidden();
+		await expect(n8n.ndv.getNodeRunErrorIndicator()).toBeHidden();
+		await expect(n8n.ndv.getNodeRunTooltipIndicator()).toBeHidden();
+
+		await n8n.ndv.execute();
+
+		await expect(n8n.ndv.getNodeRunSuccessIndicator()).toBeVisible();
+		await expect(n8n.ndv.getNodeRunTooltipIndicator()).toBeVisible();
+	});
+
+	test('should show node name and version in settings', async ({ n8n }) => {
+		await n8n.start.fromImportedWorkflow('Test_workflow_ndv_version.json');
+
+		await n8n.canvas.openNode('Edit Fields (old)');
+		await n8n.ndv.openSettings();
+		await expect(n8n.ndv.getNodeVersion()).toContainText('Set node version 2');
+		await expect(n8n.ndv.getNodeVersion()).toContainText('Latest version: 3.4');
+		await n8n.ndv.close();
+
+		await n8n.canvas.openNode('Edit Fields (latest)');
+		await n8n.ndv.openSettings();
+		await expect(n8n.ndv.getNodeVersion()).toContainText('Edit Fields (Set) node version 3.4');
+		await expect(n8n.ndv.getNodeVersion()).toContainText('Latest');
+		await n8n.ndv.close();
+
+		await n8n.canvas.openNode('Function');
+		await n8n.ndv.openSettings();
+		await expect(n8n.ndv.getNodeVersion()).toContainText('Function node version 1');
+		await expect(n8n.ndv.getNodeVersion()).toContainText('Deprecated');
+		await n8n.ndv.close();
+	});
+
+	test('should not push NDV header out with a lot of code in Code node editor', async ({ n8n }) => {
+		await n8n.canvas.addNode('Manual Trigger');
+		await n8n.canvas.addNode('Code', { action: 'Code in JavaScript', closeNDV: false });
+
+		const codeEditor = n8n.ndv.getParameterInput('jsCode').locator('.cm-content');
+		await codeEditor.click();
+		await n8n.page.keyboard.press('ControlOrMeta+a');
+		await n8n.page.keyboard.press('Delete');
+
+		const dummyCode = Array(50)
+			.fill(
+				'console.log("This is a very long line of dummy JavaScript code that should not push the NDV header out of view");',
+			)
+			.join('\n');
+
+		await codeEditor.fill(dummyCode);
+
+		await expect(n8n.ndv.getExecuteNodeButton()).toBeVisible();
+	});
+
+	test('should allow editing code in fullscreen in the code editors', async ({ n8n }) => {
+		await n8n.canvas.addNode('Manual Trigger');
+		await n8n.canvas.addNode('Code', { action: 'Code in JavaScript', closeNDV: false });
+
+		await n8n.ndv.openCodeEditorFullscreen();
+
+		const fullscreenEditor = n8n.ndv.getCodeEditorFullscreen();
+		await fullscreenEditor.click();
+		await n8n.page.keyboard.press('ControlOrMeta+a');
+		await fullscreenEditor.fill('foo()');
+
+		await expect(fullscreenEditor).toContainText('foo()');
+
+		await n8n.ndv.closeCodeEditorDialog();
+
+		await expect(n8n.ndv.getParameterInput('jsCode').locator('.cm-content')).toContainText('foo()');
+	});
+
+	test.describe('Complex Edge Cases', () => {
+		test('ADO-2931 - should handle multiple branches of the same input with the first branch empty correctly', async ({
+			n8n,
+		}) => {
+			await n8n.canvas.importWorkflow(
+				'Test_ndv_two_branches_of_same_parent_false_populated.json',
+				'Multiple Branches Test',
+			);
+
+			await n8n.canvas.openNode('DebugHelper');
+			await expect(n8n.ndv.inputPanel.get()).toBeVisible();
+			await expect(n8n.ndv.outputPanel.get()).toBeVisible();
+
+			await n8n.ndv.execute();
+
+			await expect(n8n.ndv.inputPanel.getSchemaItem('a1')).toBeVisible();
+		});
+	});
+
+	test.describe('Execution Indicators - Multi-Node', () => {
+		test('should properly show node execution indicator for multiple nodes', async ({ n8n }) => {
+			await n8n.canvas.addNode(CODE_NODE_NAME, { action: 'Code in JavaScript' });
+			await n8n.ndv.clickBackToCanvasButton();
+
+			await n8n.workflowComposer.executeWorkflowAndWaitForNotification(
+				'Workflow executed successfully',
+			);
+
+			await n8n.canvas.openNode(MANUAL_TRIGGER_NODE_DISPLAY_NAME);
+			await expect(n8n.ndv.getNodeRunSuccessIndicator()).toBeVisible();
+			await expect(n8n.ndv.getNodeRunTooltipIndicator()).toBeVisible();
+
+			await n8n.ndv.clickBackToCanvasButton();
+			await n8n.canvas.openNode(CODE_NODE_DISPLAY_NAME);
+			await expect(n8n.ndv.getNodeRunSuccessIndicator()).toBeVisible();
+		});
+	});
+});
diff --git a/packages/testing/playwright/tests/ui/workflows/editor/ndv/ndv-data-display.spec.ts b/packages/testing/playwright/tests/ui/workflows/editor/ndv/ndv-data-display.spec.ts
new file mode 100644
index 00000000000..8cefc603a61
--- /dev/null
+++ b/packages/testing/playwright/tests/ui/workflows/editor/ndv/ndv-data-display.spec.ts
@@ -0,0 +1,255 @@
+import { test, expect } from '../../../../../fixtures/base';
+import type { n8nPage } from '../../../../../pages/n8nPage';
+
+test.describe('NDV Data Display', () => {
+	test.beforeEach(async ({ n8n }) => {
+		await n8n.start.fromBlankCanvas();
+	});
+
+	test.describe('Schema View', () => {
+		const schemaKeys = [
+			'id',
+			'name',
+			'email',
+			'notes',
+			'country',
+			'created',
+			'objectValue',
+			'prop1',
+			'prop2',
+		];
+
+		const setupSchemaWorkflow = async (n8n: n8nPage) => {
+			await n8n.start.fromImportedWorkflow('Test_workflow_schema_test.json');
+			await n8n.canvas.clickZoomToFitButton();
+			await n8n.canvas.openNode('Set');
+			await n8n.ndv.execute();
+		};
+
+		test('should switch to output schema view and validate it', async ({ n8n }) => {
+			await setupSchemaWorkflow(n8n);
+			await n8n.ndv.outputPanel.switchDisplayMode('schema');
+
+			for (const key of schemaKeys) {
+				await expect(n8n.ndv.outputPanel.getSchemaItem(key)).toBeVisible();
+			}
+		});
+
+		test('should preserve schema view after execution', async ({ n8n }) => {
+			await setupSchemaWorkflow(n8n);
+			await n8n.ndv.outputPanel.switchDisplayMode('schema');
+			await n8n.ndv.execute();
+
+			for (const key of schemaKeys) {
+				await expect(n8n.ndv.outputPanel.getSchemaItem(key)).toBeVisible();
+			}
+		});
+
+		test('should collapse and expand nested schema object', async ({ n8n }) => {
+			await setupSchemaWorkflow(n8n);
+			const expandedObjectProps = ['prop1', 'prop2'];
+
+			await n8n.ndv.outputPanel.switchDisplayMode('schema');
+
+			for (const key of expandedObjectProps) {
+				await expect(n8n.ndv.outputPanel.getSchemaItem(key)).toBeVisible();
+			}
+
+			const objectValueItem = n8n.ndv.outputPanel.getSchemaItem('objectValue');
+			await objectValueItem.locator('.toggle').click();
+
+			for (const key of expandedObjectProps) {
+				await expect(n8n.ndv.outputPanel.getSchemaItem(key)).not.toBeInViewport();
+			}
+		});
+
+		test('should not display pagination for schema', async ({ n8n }) => {
+			await setupSchemaWorkflow(n8n);
+
+			await n8n.ndv.clickBackToCanvasButton();
+			await n8n.canvas.deselectAll();
+			await n8n.canvas.nodeByName('Set').click();
+			await n8n.canvas.addNode('Customer Datastore (n8n training)');
+
+			await n8n.canvas.openNode('Customer Datastore (n8n training)');
+
+			await n8n.ndv.execute();
+
+			await expect(n8n.ndv.outputPanel.get().getByText('5 items')).toBeVisible();
+
+			await n8n.ndv.outputPanel.switchDisplayMode('schema');
+
+			const schemaItemsCount = await n8n.ndv.outputPanel.getSchemaItems().count();
+			expect(schemaItemsCount).toBeGreaterThan(0);
+
+			await n8n.ndv.outputPanel.switchDisplayMode('json');
+		});
+
+		test('should display large schema', async ({ n8n }) => {
+			await n8n.start.fromImportedWorkflow('Test_workflow_schema_test_pinned_data.json');
+			await n8n.canvas.clickZoomToFitButton();
+			await n8n.canvas.openNode('Set');
+
+			await expect(n8n.ndv.outputPanel.get().getByText('20 items')).toBeVisible();
+			await expect(n8n.ndv.outputPanel.get().locator('[class*="_pagination"]')).toBeVisible();
+
+			await n8n.ndv.outputPanel.switchDisplayMode('schema');
+
+			await expect(n8n.ndv.outputPanel.get().locator('[class*="_pagination"]')).toBeHidden();
+		});
+	});
+
+	test.describe('Search and Rendering', () => {
+		test('should keep search expanded after Execute step node run', async ({ n8n }) => {
+			await n8n.start.fromImportedWorkflow('Test_ndv_search.json');
+			await n8n.canvas.clickZoomToFitButton();
+			await n8n.workflowComposer.executeWorkflowAndWaitForNotification(
+				'Workflow executed successfully',
+			);
+
+			await n8n.canvas.openNode('Edit Fields');
+			await expect(n8n.ndv.outputPanel.get()).toBeVisible();
+
+			await n8n.ndv.searchOutputData('US');
+
+			await expect(n8n.ndv.outputPanel.getTableRow(1).locator('mark')).toContainText('US');
+
+			await n8n.ndv.execute();
+
+			await expect(n8n.ndv.outputPanel.getSearchInput()).toBeVisible();
+			await expect(n8n.ndv.outputPanel.getSearchInput()).toHaveValue('US');
+		});
+
+		test('Should render xml and html tags as strings and can search', async ({ n8n }) => {
+			await n8n.start.fromImportedWorkflow('Test_workflow_xml_output.json');
+			await n8n.workflowComposer.executeWorkflowAndWaitForNotification(
+				'Workflow executed successfully',
+			);
+			await n8n.canvas.openNode('Edit Fields');
+
+			await expect(n8n.ndv.outputPanel.get().locator('[class*="active"]')).toContainText('Table');
+
+			await expect(n8n.ndv.outputPanel.getTableRow(1)).toContainText(
+				'<?xml version="1.0" encoding="UTF-8"?> <library>',
+			);
+
+			await n8n.page.keyboard.press('/');
+
+			const searchInput = n8n.ndv.outputPanel.getSearchInput();
+			await expect(searchInput).toBeFocused();
+			await searchInput.fill('<lib');
+
+			await expect(n8n.ndv.outputPanel.getTableRow(1).locator('mark')).toContainText('<lib');
+
+			await n8n.ndv.outputPanel.switchDisplayMode('json');
+
+			await expect(n8n.ndv.outputPanel.getDataContainer().locator('.json-data')).toBeVisible();
+		});
+	});
+
+	test.describe('Run Data & Selectors', () => {
+		test('can link and unlink run selectors between input and output', async ({ n8n }) => {
+			await n8n.start.fromImportedWorkflow('Test_workflow_5.json');
+			await n8n.canvas.clickZoomToFitButton();
+			await n8n.workflowComposer.executeWorkflowAndWaitForNotification(
+				'Workflow executed successfully',
+			);
+			await n8n.canvas.openNode('Set3');
+
+			await n8n.ndv.inputPanel.switchDisplayMode('table');
+			await n8n.ndv.outputPanel.switchDisplayMode('table');
+
+			await n8n.ndv.ensureOutputRunLinking(true);
+			await n8n.ndv.inputPanel.getTbodyCell(0, 0).click();
+			expect(await n8n.ndv.getInputRunSelectorValue()).toContain('2 of 2 (6 items)');
+			expect(await n8n.ndv.getOutputRunSelectorValue()).toContain('2 of 2 (6 items)');
+
+			await n8n.ndv.changeOutputRunSelector('1 of 2 (6 items)');
+			expect(await n8n.ndv.getInputRunSelectorValue()).toContain('1 of 2 (6 items)');
+			await expect(n8n.ndv.inputPanel.getTbodyCell(0, 0)).toHaveText('1111');
+			await expect(n8n.ndv.outputPanel.getTbodyCell(0, 0)).toHaveText('1111');
+
+			await n8n.ndv.inputPanel.getTbodyCell(0, 0).click();
+			await n8n.ndv.changeInputRunSelector('2 of 2 (6 items)');
+			expect(await n8n.ndv.getOutputRunSelectorValue()).toContain('2 of 2 (6 items)');
+
+			await n8n.ndv.outputPanel.getLinkRun().click();
+			await n8n.ndv.inputPanel.getTbodyCell(0, 0).click();
+			await n8n.ndv.changeOutputRunSelector('1 of 2 (6 items)');
+			expect(await n8n.ndv.getInputRunSelectorValue()).toContain('2 of 2 (6 items)');
+
+			await n8n.ndv.outputPanel.getLinkRun().click();
+			await n8n.ndv.inputPanel.getTbodyCell(0, 0).click();
+			expect(await n8n.ndv.getInputRunSelectorValue()).toContain('1 of 2 (6 items)');
+
+			await n8n.ndv.inputPanel.toggleInputRunLinking();
+			await n8n.ndv.inputPanel.getTbodyCell(0, 0).click();
+			await n8n.ndv.changeInputRunSelector('2 of 2 (6 items)');
+			expect(await n8n.ndv.getOutputRunSelectorValue()).toContain('1 of 2 (6 items)');
+
+			await n8n.ndv.inputPanel.toggleInputRunLinking();
+			await n8n.ndv.inputPanel.getTbodyCell(0, 0).click();
+			expect(await n8n.ndv.getOutputRunSelectorValue()).toContain('2 of 2 (6 items)');
+		});
+	});
+
+	test.describe('Schema & Data Views', () => {
+		test('should show data from the correct output in schema view', async ({ n8n }) => {
+			await n8n.canvas.importWorkflow('Test_workflow_multiple_outputs.json', 'Multiple outputs');
+			await n8n.workflowComposer.executeWorkflowAndWaitForNotification(
+				'Workflow executed successfully',
+			);
+
+			await n8n.canvas.openNode('Only Item 1');
+			await expect(n8n.ndv.inputPanel.get()).toBeVisible();
+			await n8n.ndv.inputPanel.switchDisplayMode('schema');
+			await expect(n8n.ndv.inputPanel.getSchemaItem('onlyOnItem1')).toBeVisible();
+			await n8n.ndv.close();
+
+			await n8n.canvas.openNode('Only Item 2');
+			await expect(n8n.ndv.inputPanel.get()).toBeVisible();
+			await n8n.ndv.inputPanel.switchDisplayMode('schema');
+			await expect(n8n.ndv.inputPanel.getSchemaItem('onlyOnItem2')).toBeVisible();
+			await n8n.ndv.close();
+
+			await n8n.canvas.openNode('Only Item 3');
+			await expect(n8n.ndv.inputPanel.get()).toBeVisible();
+			await n8n.ndv.inputPanel.switchDisplayMode('schema');
+			await expect(n8n.ndv.inputPanel.getSchemaItem('onlyOnItem3')).toBeVisible();
+			await n8n.ndv.close();
+		});
+	});
+
+	test.describe('Search Functionality - Advanced', () => {
+		test('should not show items count when searching in schema view', async ({ n8n }) => {
+			await n8n.canvas.importWorkflow('Test_ndv_search.json', 'NDV Search Test');
+			await n8n.canvas.openNode('Edit Fields');
+			await expect(n8n.ndv.outputPanel.get()).toBeVisible();
+
+			await n8n.ndv.execute();
+			await n8n.ndv.outputPanel.switchDisplayMode('schema');
+			await n8n.ndv.searchOutputData('US');
+
+			await expect(n8n.ndv.outputPanel.getItemsCount()).toBeHidden();
+		});
+
+		test('should show additional tooltip when searching in schema view if no matches', async ({
+			n8n,
+		}) => {
+			await n8n.canvas.importWorkflow('Test_ndv_search.json', 'NDV Search Test');
+
+			await n8n.canvas.openNode('Edit Fields');
+			await expect(n8n.ndv.outputPanel.get()).toBeVisible();
+
+			await n8n.ndv.execute();
+			await n8n.ndv.outputPanel.switchDisplayMode('schema');
+			await n8n.ndv.searchOutputData('foo');
+
+			await expect(
+				n8n.ndv.outputPanel
+					.get()
+					.getByText('To search field values, switch to table or JSON view.'),
+			).toBeVisible();
+		});
+	});
+});
diff --git a/packages/testing/playwright/tests/ui/workflows/editor/ndv/ndv-floating-nodes.spec.ts b/packages/testing/playwright/tests/ui/workflows/editor/ndv/ndv-floating-nodes.spec.ts
new file mode 100644
index 00000000000..f63925eeff6
--- /dev/null
+++ b/packages/testing/playwright/tests/ui/workflows/editor/ndv/ndv-floating-nodes.spec.ts
@@ -0,0 +1,113 @@
+import { test, expect } from '../../../../../fixtures/base';
+
+test.describe('NDV Floating Nodes Navigation', () => {
+	test.beforeEach(async ({ n8n }) => {
+		await n8n.start.fromBlankCanvas();
+	});
+
+	test('should traverse floating nodes with mouse', async ({ n8n }) => {
+		await n8n.start.fromImportedWorkflow('Floating_Nodes.json');
+		await n8n.canvas.getCanvasNodes().first().dblclick();
+		await expect(n8n.ndv.getContainer()).toBeVisible();
+
+		await expect(n8n.ndv.getFloatingNodeByPosition('inputMain')).toBeHidden();
+		await expect(n8n.ndv.getFloatingNodeByPosition('outputMain')).toBeVisible();
+		for (let i = 0; i < 4; i++) {
+			await n8n.ndv.clickFloatingNodeByPosition('outputMain');
+			await expect(n8n.ndv.getFloatingNodeByPosition('inputMain')).toBeVisible();
+			await expect(n8n.ndv.getFloatingNodeByPosition('outputMain')).toBeVisible();
+
+			await n8n.ndv.close();
+			await expect(n8n.canvas.getSelectedNodes()).toHaveCount(1);
+
+			await n8n.canvas.getSelectedNodes().first().dblclick();
+			await expect(n8n.ndv.getContainer()).toBeVisible();
+		}
+
+		await n8n.ndv.clickFloatingNodeByPosition('outputMain');
+		await expect(n8n.ndv.getFloatingNodeByPosition('inputMain')).toBeVisible();
+
+		for (let i = 0; i < 4; i++) {
+			await n8n.ndv.clickFloatingNodeByPosition('inputMain');
+			await expect(n8n.ndv.getFloatingNodeByPosition('outputMain')).toBeVisible();
+			await expect(n8n.ndv.getFloatingNodeByPosition('inputMain')).toBeVisible();
+		}
+
+		await n8n.ndv.clickFloatingNodeByPosition('inputMain');
+		await expect(n8n.ndv.getFloatingNodeByPosition('inputMain')).toBeHidden();
+		await expect(n8n.ndv.getFloatingNodeByPosition('inputSub')).toBeHidden();
+		await expect(n8n.ndv.getFloatingNodeByPosition('outputSub')).toBeHidden();
+
+		await n8n.ndv.close();
+		await expect(n8n.canvas.getSelectedNodes()).toHaveCount(1);
+	});
+
+	test('should traverse floating nodes with keyboard', async ({ n8n }) => {
+		await n8n.start.fromImportedWorkflow('Floating_Nodes.json');
+
+		await n8n.canvas.getCanvasNodes().first().dblclick();
+		await expect(n8n.ndv.getContainer()).toBeVisible();
+
+		await expect(n8n.ndv.getFloatingNodeByPosition('inputMain')).toBeHidden();
+		await expect(n8n.ndv.getFloatingNodeByPosition('outputMain')).toBeVisible();
+		for (let i = 0; i < 4; i++) {
+			await n8n.ndv.navigateToNextFloatingNodeWithKeyboard();
+			await expect(n8n.ndv.getFloatingNodeByPosition('inputMain')).toBeVisible();
+			await expect(n8n.ndv.getFloatingNodeByPosition('outputMain')).toBeVisible();
+
+			await n8n.ndv.close();
+			await expect(n8n.canvas.getSelectedNodes()).toHaveCount(1);
+
+			await n8n.canvas.getSelectedNodes().first().dblclick();
+			await expect(n8n.ndv.getContainer()).toBeVisible();
+		}
+
+		await n8n.ndv.navigateToNextFloatingNodeWithKeyboard();
+		await expect(n8n.ndv.getFloatingNodeByPosition('inputMain')).toBeVisible();
+
+		for (let i = 0; i < 4; i++) {
+			await n8n.ndv.navigateToPreviousFloatingNodeWithKeyboard();
+			await expect(n8n.ndv.getFloatingNodeByPosition('outputMain')).toBeVisible();
+			await expect(n8n.ndv.getFloatingNodeByPosition('inputMain')).toBeVisible();
+		}
+
+		await n8n.ndv.navigateToPreviousFloatingNodeWithKeyboard();
+		await expect(n8n.ndv.getFloatingNodeByPosition('inputMain')).toBeHidden();
+		await expect(n8n.ndv.getFloatingNodeByPosition('inputSub')).toBeHidden();
+		await expect(n8n.ndv.getFloatingNodeByPosition('outputSub')).toBeHidden();
+
+		await n8n.ndv.close();
+		await expect(n8n.canvas.getSelectedNodes()).toHaveCount(1);
+	});
+
+	test('should connect floating sub-nodes', async ({ n8n }) => {
+		await n8n.canvas.addNode('AI Agent', { closeNDV: false });
+		await expect(n8n.ndv.getContainer()).toBeVisible();
+
+		await n8n.ndv.connectAISubNode('ai_languageModel', 'Anthropic Chat Model');
+		await n8n.ndv.connectAISubNode('ai_memory', 'Simple Memory');
+		await n8n.ndv.connectAISubNode('ai_tool', 'HTTP Request Tool');
+
+		expect(await n8n.ndv.getNodesWithIssuesCount()).toBeGreaterThanOrEqual(2);
+	});
+
+	test('should have the floating nodes in correct order', async ({ n8n }) => {
+		await n8n.start.fromImportedWorkflow('Floating_Nodes.json');
+
+		await n8n.canvas.openNode('Merge');
+		await expect(n8n.ndv.getContainer()).toBeVisible();
+
+		expect(await n8n.ndv.getFloatingNodeCount('inputMain')).toBe(2);
+		await n8n.ndv.verifyFloatingNodeName('inputMain', 'Edit Fields1', 0);
+		await n8n.ndv.verifyFloatingNodeName('inputMain', 'Edit Fields0', 1);
+
+		await n8n.ndv.close();
+
+		await n8n.canvas.openNode('Merge1');
+		await expect(n8n.ndv.getContainer()).toBeVisible();
+
+		expect(await n8n.ndv.getFloatingNodeCount('inputMain')).toBe(2);
+		await n8n.ndv.verifyFloatingNodeName('inputMain', 'Edit Fields0', 0);
+		await n8n.ndv.verifyFloatingNodeName('inputMain', 'Edit Fields1', 1);
+	});
+});
diff --git a/packages/testing/playwright/tests/ui/workflows/editor/ndv/ndv-parameters.spec.ts b/packages/testing/playwright/tests/ui/workflows/editor/ndv/ndv-parameters.spec.ts
new file mode 100644
index 00000000000..926447bd474
--- /dev/null
+++ b/packages/testing/playwright/tests/ui/workflows/editor/ndv/ndv-parameters.spec.ts
@@ -0,0 +1,193 @@
+import { test, expect } from '../../../../../fixtures/base';
+
+test.describe('NDV Parameters', () => {
+	test.beforeEach(async ({ n8n }) => {
+		await n8n.start.fromBlankCanvas();
+	});
+
+	test.describe('Parameter Hints', () => {
+		test('should display parameter hints correctly', async ({ n8n }) => {
+			await n8n.start.fromImportedWorkflow('Test_workflow_3.json');
+			await n8n.canvas.openNode('Set1');
+
+			await n8n.ndv.getParameterInputField('value').clear();
+			await n8n.ndv.getParameterInputField('value').fill('=');
+
+			await n8n.ndv.getInlineExpressionEditorContent().fill('hello');
+			await n8n.ndv.getParameterInputField('name').click();
+			await expect(n8n.ndv.getParameterExpressionPreviewValue()).toContainText('hello');
+
+			await n8n.ndv.getInlineExpressionEditorContent().fill('');
+			await n8n.ndv.getParameterInputField('name').click();
+			await expect(n8n.ndv.getParameterExpressionPreviewValue()).toContainText('[empty]');
+
+			await n8n.ndv.getInlineExpressionEditorContent().fill(' test');
+			await n8n.ndv.getParameterInputField('name').click();
+			await expect(n8n.ndv.getParameterExpressionPreviewValue()).toContainText(' test');
+
+			await n8n.ndv.getInlineExpressionEditorContent().fill(' ');
+			await n8n.ndv.getParameterInputField('name').click();
+			await expect(n8n.ndv.getParameterExpressionPreviewValue()).toContainText(' ');
+
+			await n8n.ndv.getInlineExpressionEditorContent().fill('<div></div>');
+			await n8n.ndv.getParameterInputField('name').click();
+			await expect(n8n.ndv.getParameterExpressionPreviewValue()).toContainText('<div></div>');
+		});
+	});
+
+	test.describe('Remote Options & Network', () => {
+		test('should not retrieve remote options when a parameter value changes', async ({ n8n }) => {
+			let fetchParameterOptionsCallCount = 0;
+			await n8n.page.route('**/rest/dynamic-node-parameters/options', async (route) => {
+				fetchParameterOptionsCallCount++;
+				await route.fulfill({
+					status: 200,
+					contentType: 'application/json',
+					body: JSON.stringify({ data: [] }),
+				});
+			});
+
+			await n8n.canvas.addNode('E2E Test', { action: 'Remote Options' });
+			await expect(n8n.ndv.getContainer()).toBeVisible();
+
+			await n8n.ndv.fillFirstAvailableTextParameterMultipleTimes(['test1', 'test2', 'test3']);
+
+			expect(fetchParameterOptionsCallCount).toBe(1);
+		});
+
+		test('Should show a notice when remote options cannot be fetched because of missing credentials', async ({
+			n8n,
+		}) => {
+			await n8n.page.route('**/rest/dynamic-node-parameters/options', async (route) => {
+				await route.fulfill({ status: 403 });
+			});
+
+			await n8n.canvas.addNode('Manual Trigger');
+			await n8n.canvas.addNode('Notion', { action: 'Update a database page', closeNDV: false });
+			await expect(n8n.ndv.getContainer()).toBeVisible();
+
+			await n8n.ndv.addItemToFixedCollection('propertiesUi');
+			await expect(
+				n8n.ndv.getParameterInputWithIssues('propertiesUi.propertyValues[0].key'),
+			).toBeVisible();
+		});
+
+		test('Should show error state when remote options cannot be fetched', async ({ n8n }) => {
+			await n8n.page.route('**/rest/dynamic-node-parameters/options', async (route) => {
+				await route.fulfill({ status: 500 });
+			});
+
+			await n8n.canvas.addNode('Manual Trigger');
+			await n8n.canvas.addNode('Notion', { action: 'Update a database page', closeNDV: false });
+			await expect(n8n.ndv.getContainer()).toBeVisible();
+
+			await n8n.credentialsComposer.createFromNdv({
+				apiKey: 'sk_test_123',
+			});
+			await n8n.ndv.addItemToFixedCollection('propertiesUi');
+			await expect(
+				n8n.ndv.getParameterInputWithIssues('propertiesUi.propertyValues[0].key'),
+			).toBeVisible();
+		});
+	});
+
+	test.describe('Parameter Management - Advanced', () => {
+		test('Should clear mismatched collection parameters', async ({ n8n }) => {
+			await n8n.canvas.addNode('Manual Trigger');
+			await n8n.canvas.addNode('Notion', { action: 'Create a database page', closeNDV: false });
+			await expect(n8n.ndv.getContainer()).toBeVisible();
+
+			await n8n.ndv.addItemToFixedCollection('propertiesUi');
+			await n8n.ndv.changeNodeOperation('Update');
+
+			await expect(n8n.ndv.getParameterItemWithText('Currently no items exist')).toBeVisible();
+		});
+
+		test('Should keep RLC values after operation change', async ({ n8n }) => {
+			const TEST_DOC_ID = '1111';
+
+			await n8n.canvas.addNode('Manual Trigger');
+			await n8n.canvas.addNode('Google Sheets', { closeNDV: false, action: 'Append row in sheet' });
+			await expect(n8n.ndv.getContainer()).toBeVisible();
+
+			await n8n.ndv.setRLCValue('documentId', TEST_DOC_ID);
+			await n8n.ndv.changeNodeOperation('Append or Update Row');
+			const input = n8n.ndv.getResourceLocatorInput('documentId').locator('input');
+			await expect(input).toHaveValue(TEST_DOC_ID);
+		});
+
+		test('Should not clear resource/operation after credential change', async ({ n8n }) => {
+			await n8n.canvas.addNode('Manual Trigger');
+			await n8n.canvas.addNode('Discord', { closeNDV: false, action: 'Delete a message' });
+			await expect(n8n.ndv.getContainer()).toBeVisible();
+			await n8n.credentialsComposer.createFromNdv({
+				botToken: 'sk_test_123',
+			});
+
+			const resourceInput = n8n.ndv.getParameterInputField('resource');
+			const operationInput = n8n.ndv.getParameterInputField('operation');
+
+			await expect(resourceInput).toHaveValue('Message');
+			await expect(operationInput).toHaveValue('Delete');
+		});
+	});
+
+	test.describe('Node Creator Integration', () => {
+		test('Should open appropriate node creator after clicking on connection hint link', async ({
+			n8n,
+		}) => {
+			const hintMapper = {
+				Memory: 'AI Nodes',
+				'Output Parser': 'AI Nodes',
+				'Token Splitter': 'Document Loaders',
+				Tool: 'AI Nodes',
+				Embeddings: 'Vector Stores',
+				'Vector Store': 'Retrievers',
+			};
+
+			await n8n.canvas.importWorkflow(
+				'open_node_creator_for_connection.json',
+				'open_node_creator_for_connection',
+			);
+
+			for (const [node, group] of Object.entries(hintMapper)) {
+				await n8n.canvas.openNode(node);
+
+				await n8n.ndv.clickNodeCreatorInsertOneButton();
+				await expect(n8n.canvas.getNodeCreatorHeader(group)).toBeVisible();
+				await n8n.page.keyboard.press('Escape');
+			}
+		});
+	});
+
+	test.describe('Expression Editor Features', () => {
+		test('should allow selecting item for expressions', async ({ n8n }) => {
+			await n8n.canvas.importWorkflow('Test_workflow_3.json', 'My test workflow 2');
+
+			await n8n.workflowComposer.executeWorkflowAndWaitForNotification(
+				'Workflow executed successfully',
+			);
+
+			await n8n.canvas.openNode('Set');
+
+			await n8n.ndv.getAssignmentValue('assignments').getByText('Expression').click();
+
+			const expressionInput = n8n.ndv.getInlineExpressionEditorInput();
+			await expressionInput.click();
+			await n8n.ndv.clearExpressionEditor();
+			await n8n.ndv.typeInExpressionEditor('{{ $json.input[0].count');
+
+			await expect(n8n.ndv.getInlineExpressionEditorOutput()).toHaveText('0');
+
+			await n8n.ndv.expressionSelectNextItem();
+			await expect(n8n.ndv.getInlineExpressionEditorOutput()).toHaveText('1');
+			await expect(n8n.ndv.getInlineExpressionEditorItemInput()).toHaveValue('1');
+
+			await expect(n8n.ndv.getInlineExpressionEditorItemNextButton()).toBeDisabled();
+
+			await n8n.ndv.expressionSelectPrevItem();
+			await expect(n8n.ndv.getInlineExpressionEditorOutput()).toHaveText('0');
+			await expect(n8n.ndv.getInlineExpressionEditorItemInput()).toHaveValue('0');
+		});
+	});
+});
diff --git a/packages/testing/playwright/tests/ui/24-ndv-paired-item.spec.ts b/packages/testing/playwright/tests/ui/workflows/editor/ndv/paired-item.spec.ts
similarity index 99%
rename from packages/testing/playwright/tests/ui/24-ndv-paired-item.spec.ts
rename to packages/testing/playwright/tests/ui/workflows/editor/ndv/paired-item.spec.ts
index b38cdf2de54..57025a346e5 100644
--- a/packages/testing/playwright/tests/ui/24-ndv-paired-item.spec.ts
+++ b/packages/testing/playwright/tests/ui/workflows/editor/ndv/paired-item.spec.ts
@@ -1,4 +1,4 @@
-import { test, expect } from '../../fixtures/base';
+import { test, expect } from '../../../../../fixtures/base';
 
 test.describe('NDV Paired Items', () => {
 	test('maps paired input and output items', async ({ n8n }) => {
diff --git a/packages/testing/playwright/tests/ui/13-pinning.spec.ts b/packages/testing/playwright/tests/ui/workflows/editor/ndv/pinning.spec.ts
similarity index 98%
rename from packages/testing/playwright/tests/ui/13-pinning.spec.ts
rename to packages/testing/playwright/tests/ui/workflows/editor/ndv/pinning.spec.ts
index 6fef1f859d9..acf7e0bdd92 100644
--- a/packages/testing/playwright/tests/ui/13-pinning.spec.ts
+++ b/packages/testing/playwright/tests/ui/workflows/editor/ndv/pinning.spec.ts
@@ -1,5 +1,5 @@
-import { test, expect } from '../../fixtures/base';
-import type { TestRequirements } from '../../Types';
+import { test, expect } from '../../../../../fixtures/base';
+import type { TestRequirements } from '../../../../../Types';
 
 const NODES = {
 	MANUAL_TRIGGER: 'Manual Trigger',
diff --git a/packages/testing/playwright/tests/ui/26-resource-locator.spec.ts b/packages/testing/playwright/tests/ui/workflows/editor/ndv/resource-locator.spec.ts
similarity index 97%
rename from packages/testing/playwright/tests/ui/26-resource-locator.spec.ts
rename to packages/testing/playwright/tests/ui/workflows/editor/ndv/resource-locator.spec.ts
index e8f044a32b6..ac07d0c2469 100644
--- a/packages/testing/playwright/tests/ui/26-resource-locator.spec.ts
+++ b/packages/testing/playwright/tests/ui/workflows/editor/ndv/resource-locator.spec.ts
@@ -1,5 +1,5 @@
-import { E2E_TEST_NODE_NAME } from '../../config/constants';
-import { test, expect } from '../../fixtures/base';
+import { E2E_TEST_NODE_NAME } from '../../../../../config/constants';
+import { test, expect } from '../../../../../fixtures/base';
 
 const NO_CREDENTIALS_MESSAGE = 'Add your credential';
 const INVALID_CREDENTIALS_MESSAGE = 'Check your credential';
diff --git a/packages/testing/playwright/tests/ui/28-resource-mapper.spec.ts b/packages/testing/playwright/tests/ui/workflows/editor/ndv/resource-mapper.spec.ts
similarity index 96%
rename from packages/testing/playwright/tests/ui/28-resource-mapper.spec.ts
rename to packages/testing/playwright/tests/ui/workflows/editor/ndv/resource-mapper.spec.ts
index bb1d5ad0d66..aaeae38385b 100644
--- a/packages/testing/playwright/tests/ui/28-resource-mapper.spec.ts
+++ b/packages/testing/playwright/tests/ui/workflows/editor/ndv/resource-mapper.spec.ts
@@ -1,5 +1,5 @@
-import { E2E_TEST_NODE_NAME } from '../../config/constants';
-import { test, expect } from '../../fixtures/base';
+import { E2E_TEST_NODE_NAME } from '../../../../../config/constants';
+import { test, expect } from '../../../../../fixtures/base';
 
 test.describe('Resource Mapper', () => {
 	test.beforeEach(async ({ n8n }) => {

From 08729ce6c6fa26b0ba34bbe8f2c4cf04fd9c5486 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Fri, 5 Dec 2025 12:50:47 +0100
Subject: [PATCH 086/167] refactor(core): Make Sentry init non-fatal for JS
 runner (#22800)

---
 packages/@n8n/task-runner/src/start.ts | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/@n8n/task-runner/src/start.ts b/packages/@n8n/task-runner/src/start.ts
index 0b88a8ac4c2..1903b4f2e21 100644
--- a/packages/@n8n/task-runner/src/start.ts
+++ b/packages/@n8n/task-runner/src/start.ts
@@ -54,7 +54,15 @@ void (async function start() {
 	});
 
 	sentry = Container.get(TaskRunnerSentry);
-	await sentry.initIfEnabled();
+	try {
+		await sentry.initIfEnabled();
+	} catch (error) {
+		console.error(
+			'FAILED TO INITIALIZE SENTRY. ERROR REPORTING WILL BE DISABLED. THIS IS LIKELY A CONFIGURATION OR ENVIRONMENT ISSUE.',
+			error,
+		);
+		sentry = undefined;
+	}
 
 	runner = new JsTaskRunner(config);
 	runner.on('runner:reached-idle-timeout', () => {

From 0fd0904103e10cb2f4438eebb3e8ebdd127cc96a Mon Sep 17 00:00:00 2001
From: Suguru Inoue <suguru@n8n.io>
Date: Fri, 5 Dec 2025 13:07:14 +0100
Subject: [PATCH 087/167] refactor(core): Extract model retrieval methods from
 ChatHubService (#22809)

---
 .../modules/chat-hub/chat-hub.controller.ts   |   4 +-
 .../chat-hub/chat-hub.models.service.ts       | 811 ++++++++++++++++
 .../src/modules/chat-hub/chat-hub.service.ts  | 900 +-----------------
 3 files changed, 816 insertions(+), 899 deletions(-)
 create mode 100644 packages/cli/src/modules/chat-hub/chat-hub.models.service.ts

diff --git a/packages/cli/src/modules/chat-hub/chat-hub.controller.ts b/packages/cli/src/modules/chat-hub/chat-hub.controller.ts
index 52864b93586..834b72a995f 100644
--- a/packages/cli/src/modules/chat-hub/chat-hub.controller.ts
+++ b/packages/cli/src/modules/chat-hub/chat-hub.controller.ts
@@ -38,11 +38,13 @@ import { ChatHubAgentService } from './chat-hub-agent.service';
 import { ChatHubAttachmentService } from './chat-hub.attachment.service';
 import { ChatHubService } from './chat-hub.service';
 import { ChatModelsRequestDto } from './dto/chat-models-request.dto';
+import { ChatHubModelsService } from './chat-hub.models.service';
 
 @RestController('/chat')
 export class ChatHubController {
 	constructor(
 		private readonly chatService: ChatHubService,
+		private readonly chatModelsService: ChatHubModelsService,
 		private readonly chatAgentService: ChatHubAgentService,
 		private readonly chatAttachmentService: ChatHubAttachmentService,
 		private readonly logger: Logger,
@@ -55,7 +57,7 @@ export class ChatHubController {
 		_res: Response,
 		@Body payload: ChatModelsRequestDto,
 	): Promise<ChatModelsResponse> {
-		return await this.chatService.getModels(req.user, payload.credentials);
+		return await this.chatModelsService.getModels(req.user, payload.credentials);
 	}
 
 	@Get('/conversations')
diff --git a/packages/cli/src/modules/chat-hub/chat-hub.models.service.ts b/packages/cli/src/modules/chat-hub/chat-hub.models.service.ts
new file mode 100644
index 00000000000..8dfa5915c3e
--- /dev/null
+++ b/packages/cli/src/modules/chat-hub/chat-hub.models.service.ts
@@ -0,0 +1,811 @@
+import { In, type WorkflowRepository, type User } from '@n8n/db';
+import { getBase } from '@/workflow-execute-additional-data';
+
+import { ChatHubAgentService } from './chat-hub-agent.service';
+import { ChatHubWorkflowService } from './chat-hub-workflow.service';
+
+import { CredentialsFinderService } from '@/credentials/credentials-finder.service';
+import { DynamicNodeParametersService } from '@/services/dynamic-node-parameters.service';
+import { WorkflowService } from '@/workflows/workflow.service';
+import { getModelMetadata, PROVIDER_NODE_TYPE_MAP } from './chat-hub.constants';
+import {
+	AGENT_LANGCHAIN_NODE_TYPE,
+	CHAT_TRIGGER_NODE_TYPE,
+	type INodeCredentials,
+	type INodePropertyOptions,
+	type IWorkflowExecuteAdditionalData,
+} from 'n8n-workflow';
+import {
+	chatHubProviderSchema,
+	emptyChatModelsResponse,
+	PROVIDER_CREDENTIAL_TYPE_MAP,
+	type ChatHubLLMProvider,
+	type ChatHubProvider,
+	type ChatModelDto,
+	type ChatModelsResponse,
+} from '@n8n/api-types';
+import { validChatTriggerParamsShape } from './chat-hub.types';
+import { Service } from '@n8n/di';
+
+@Service()
+export class ChatHubModelsService {
+	constructor(
+		private readonly nodeParametersService: DynamicNodeParametersService,
+		private readonly workflowService: WorkflowService,
+		private readonly workflowRepository: WorkflowRepository,
+		private readonly credentialsFinderService: CredentialsFinderService,
+		private readonly chatHubAgentService: ChatHubAgentService,
+		private readonly chatHubWorkflowService: ChatHubWorkflowService,
+	) {}
+
+	async getModels(
+		user: User,
+		credentialIds: Record<ChatHubLLMProvider, string | null>,
+	): Promise<ChatModelsResponse> {
+		const additionalData = await getBase({ userId: user.id });
+		const providers = chatHubProviderSchema.options;
+
+		const allCredentials = await this.credentialsFinderService.findCredentialsForUser(user, [
+			'credential:read',
+		]);
+
+		const responses = await Promise.all(
+			providers.map<Promise<[ChatHubProvider, ChatModelsResponse[ChatHubProvider]]>>(
+				async (provider: ChatHubProvider) => {
+					const credentials: INodeCredentials = {};
+
+					if (provider !== 'n8n' && provider !== 'custom-agent') {
+						const credentialId = credentialIds[provider];
+						if (!credentialId) {
+							return [provider, { models: [] }];
+						}
+
+						// Ensure the user has the permission to read the credential
+						if (!allCredentials.some((credential) => credential.id === credentialId)) {
+							return [
+								provider,
+								{ models: [], error: 'Could not retrieve models. Verify credentials.' },
+							];
+						}
+
+						credentials[PROVIDER_CREDENTIAL_TYPE_MAP[provider]] = { name: '', id: credentialId };
+					}
+
+					try {
+						return [
+							provider,
+							await this.fetchModelsForProvider(user, provider, credentials, additionalData),
+						];
+					} catch {
+						return [
+							provider,
+							{ models: [], error: 'Could not retrieve models. Verify credentials.' },
+						];
+					}
+				},
+			),
+		);
+
+		return responses.reduce<ChatModelsResponse>(
+			(acc, [provider, res]) => {
+				acc[provider] = res;
+				return acc;
+			},
+			{ ...emptyChatModelsResponse },
+		);
+	}
+
+	private async fetchModelsForProvider(
+		user: User,
+		provider: ChatHubProvider,
+		credentials: INodeCredentials,
+		additionalData: IWorkflowExecuteAdditionalData,
+	): Promise<ChatModelsResponse[ChatHubProvider]> {
+		switch (provider) {
+			case 'openai': {
+				const rawModels = await this.fetchOpenAiModels(credentials, additionalData);
+				return { models: this.transformAndFilterModels(rawModels, 'openai') };
+			}
+			case 'anthropic': {
+				const rawModels = await this.fetchAnthropicModels(credentials, additionalData);
+				return { models: this.transformAndFilterModels(rawModels, 'anthropic') };
+			}
+			case 'google': {
+				const rawModels = await this.fetchGoogleModels(credentials, additionalData);
+				return { models: this.transformAndFilterModels(rawModels, 'google') };
+			}
+			case 'ollama': {
+				const rawModels = await this.fetchOllamaModels(credentials, additionalData);
+				return { models: this.transformAndFilterModels(rawModels, 'ollama') };
+			}
+			case 'azureOpenAi': {
+				const rawModels = this.fetchAzureOpenAiModels(credentials, additionalData);
+				return { models: this.transformAndFilterModels(rawModels, 'azureOpenAi') };
+			}
+			case 'azureEntraId': {
+				const rawModels = this.fetchAzureEntraIdModels(credentials, additionalData);
+				return { models: this.transformAndFilterModels(rawModels, 'azureEntraId') };
+			}
+			case 'awsBedrock': {
+				const rawModels = await this.fetchAwsBedrockModels(credentials, additionalData);
+				return { models: this.transformAndFilterModels(rawModels, 'awsBedrock') };
+			}
+			case 'vercelAiGateway': {
+				const rawModels = await this.fetchVercelAiGatewayModels(credentials, additionalData);
+				return { models: this.transformAndFilterModels(rawModels, 'vercelAiGateway') };
+			}
+			case 'xAiGrok': {
+				const rawModels = await this.fetchXAiGrokModels(credentials, additionalData);
+				return { models: this.transformAndFilterModels(rawModels, 'xAiGrok') };
+			}
+			case 'groq': {
+				const rawModels = await this.fetchGroqModels(credentials, additionalData);
+				return { models: this.transformAndFilterModels(rawModels, 'groq') };
+			}
+			case 'openRouter': {
+				const rawModels = await this.fetchOpenRouterModels(credentials, additionalData);
+				return { models: this.transformAndFilterModels(rawModels, 'openRouter') };
+			}
+			case 'deepSeek': {
+				const rawModels = await this.fetchDeepSeekModels(credentials, additionalData);
+				return { models: this.transformAndFilterModels(rawModels, 'deepSeek') };
+			}
+			case 'cohere': {
+				const rawModels = await this.fetchCohereModels(credentials, additionalData);
+				return { models: this.transformAndFilterModels(rawModels, 'cohere') };
+			}
+			case 'mistralCloud': {
+				const rawModels = await this.fetchMistralCloudModels(credentials, additionalData);
+				return { models: this.transformAndFilterModels(rawModels, 'mistralCloud') };
+			}
+			case 'n8n':
+				return await this.fetchAgentWorkflowsAsModels(user);
+			case 'custom-agent':
+				return await this.chatHubAgentService.getAgentsByUserIdAsModels(user.id);
+		}
+	}
+
+	private async fetchOpenAiModels(
+		credentials: INodeCredentials,
+		additionalData: IWorkflowExecuteAdditionalData,
+	): Promise<INodePropertyOptions[]> {
+		const resourceLocatorResults = await this.nodeParametersService.getResourceLocatorResults(
+			'searchModels',
+			'parameters.model',
+			additionalData,
+			PROVIDER_NODE_TYPE_MAP.openai,
+			{},
+			credentials,
+		);
+
+		return resourceLocatorResults.results;
+	}
+
+	private async fetchAnthropicModels(
+		credentials: INodeCredentials,
+		additionalData: IWorkflowExecuteAdditionalData,
+	): Promise<INodePropertyOptions[]> {
+		const resourceLocatorResults = await this.nodeParametersService.getResourceLocatorResults(
+			'searchModels',
+			'parameters.model',
+			additionalData,
+			PROVIDER_NODE_TYPE_MAP.anthropic,
+			{},
+			credentials,
+		);
+
+		return resourceLocatorResults.results;
+	}
+
+	private async fetchGoogleModels(
+		credentials: INodeCredentials,
+		additionalData: IWorkflowExecuteAdditionalData,
+	): Promise<INodePropertyOptions[]> {
+		return await this.nodeParametersService.getOptionsViaLoadOptions(
+			{
+				// From Gemini node
+				// https://github.com/n8n-io/n8n/blob/master/packages/%40n8n/nodes-langchain/nodes/llms/LmChatGoogleGemini/LmChatGoogleGemini.node.ts#L75
+				routing: {
+					request: {
+						method: 'GET',
+						url: '/v1beta/models',
+					},
+					output: {
+						postReceive: [
+							{
+								type: 'rootProperty',
+								properties: {
+									property: 'models',
+								},
+							},
+							{
+								type: 'filter',
+								properties: {
+									pass: "={{ !$responseItem.name.includes('embedding') }}",
+								},
+							},
+							{
+								type: 'setKeyValue',
+								properties: {
+									name: '={{$responseItem.name}}',
+									value: '={{$responseItem.name}}',
+									description: '={{$responseItem.description}}',
+								},
+							},
+							{
+								type: 'sort',
+								properties: {
+									key: 'name',
+								},
+							},
+						],
+					},
+				},
+			},
+			additionalData,
+			PROVIDER_NODE_TYPE_MAP.google,
+			{},
+			credentials,
+		);
+	}
+
+	private async fetchOllamaModels(
+		credentials: INodeCredentials,
+		additionalData: IWorkflowExecuteAdditionalData,
+	): Promise<INodePropertyOptions[]> {
+		return await this.nodeParametersService.getOptionsViaLoadOptions(
+			{
+				// From Ollama Model node
+				// https://github.com/n8n-io/n8n/blob/master/packages/%40n8n/nodes-langchain/nodes/llms/LMOllama/description.ts#L24
+				routing: {
+					request: {
+						method: 'GET',
+						url: '/api/tags',
+					},
+					output: {
+						postReceive: [
+							{
+								type: 'rootProperty',
+								properties: {
+									property: 'models',
+								},
+							},
+							{
+								type: 'setKeyValue',
+								properties: {
+									name: '={{$responseItem.name}}',
+									value: '={{$responseItem.name}}',
+								},
+							},
+							{
+								type: 'sort',
+								properties: {
+									key: 'name',
+								},
+							},
+						],
+					},
+				},
+			},
+			additionalData,
+			PROVIDER_NODE_TYPE_MAP.ollama,
+			{},
+			credentials,
+		);
+	}
+
+	private fetchAzureOpenAiModels(
+		_credentials: INodeCredentials,
+		_additionalData: IWorkflowExecuteAdditionalData,
+	): INodePropertyOptions[] {
+		// Azure doesn't appear to offer a way to list available models via API.
+		// If we add support for this in the future on the Azure OpenAI node we should copy that
+		// implementation here too.
+		return [];
+	}
+
+	private fetchAzureEntraIdModels(
+		_credentials: INodeCredentials,
+		_additionalData: IWorkflowExecuteAdditionalData,
+	): INodePropertyOptions[] {
+		return [];
+	}
+
+	private async fetchAwsBedrockModels(
+		credentials: INodeCredentials,
+		additionalData: IWorkflowExecuteAdditionalData,
+	): Promise<INodePropertyOptions[]> {
+		// From AWS Bedrock node
+		// https://github.com/n8n-io/n8n/blob/master/packages/%40n8n/nodes-langchain/nodes/llms/LmChatAwsBedrock/LmChatAwsBedrock.node.ts#L100
+		// https://github.com/n8n-io/n8n/blob/master/packages/%40n8n/nodes-langchain/nodes/llms/LmChatAwsBedrock/LmChatAwsBedrock.node.ts#L155
+		const foundationModelsRequest = this.nodeParametersService.getOptionsViaLoadOptions(
+			{
+				routing: {
+					request: {
+						method: 'GET',
+						url: '/foundation-models?&byOutputModality=TEXT&byInferenceType=ON_DEMAND',
+					},
+					output: {
+						postReceive: [
+							{
+								type: 'rootProperty',
+								properties: {
+									property: 'modelSummaries',
+								},
+							},
+							{
+								type: 'setKeyValue',
+								properties: {
+									name: '={{$responseItem.modelName}}',
+									description: '={{$responseItem.modelArn}}',
+									value: '={{$responseItem.modelId}}',
+								},
+							},
+							{
+								type: 'sort',
+								properties: {
+									key: 'name',
+								},
+							},
+						],
+					},
+				},
+			},
+			additionalData,
+			PROVIDER_NODE_TYPE_MAP.awsBedrock,
+			{},
+			credentials,
+		);
+
+		const inferenceProfileModelsRequest = this.nodeParametersService.getOptionsViaLoadOptions(
+			{
+				routing: {
+					request: {
+						method: 'GET',
+						url: '/inference-profiles?maxResults=1000',
+					},
+					output: {
+						postReceive: [
+							{
+								type: 'rootProperty',
+								properties: {
+									property: 'inferenceProfileSummaries',
+								},
+							},
+							{
+								type: 'setKeyValue',
+								properties: {
+									name: '={{$responseItem.inferenceProfileName}}',
+									description:
+										'={{$responseItem.description || $responseItem.inferenceProfileArn}}',
+									value: '={{$responseItem.inferenceProfileId}}',
+								},
+							},
+							{
+								type: 'sort',
+								properties: {
+									key: 'name',
+								},
+							},
+						],
+					},
+				},
+			},
+			additionalData,
+			PROVIDER_NODE_TYPE_MAP.awsBedrock,
+			{},
+			credentials,
+		);
+
+		const [foundationModels, inferenceProfileModels] = await Promise.all([
+			foundationModelsRequest,
+			inferenceProfileModelsRequest,
+		]);
+
+		return foundationModels.concat(inferenceProfileModels);
+	}
+
+	private async fetchMistralCloudModels(
+		credentials: INodeCredentials,
+		additionalData: IWorkflowExecuteAdditionalData,
+	): Promise<INodePropertyOptions[]> {
+		return await this.nodeParametersService.getOptionsViaLoadOptions(
+			{
+				routing: {
+					request: {
+						method: 'GET',
+						url: '/models',
+					},
+					output: {
+						postReceive: [
+							{
+								type: 'rootProperty',
+								properties: {
+									property: 'data',
+								},
+							},
+							{
+								type: 'filter',
+								properties: {
+									pass: "={{ !$responseItem.id.includes('embed') }}",
+								},
+							},
+							{
+								type: 'setKeyValue',
+								properties: {
+									name: '={{ $responseItem.id }}',
+									value: '={{ $responseItem.id }}',
+								},
+							},
+							{
+								type: 'sort',
+								properties: {
+									key: 'name',
+								},
+							},
+						],
+					},
+				},
+			},
+			additionalData,
+			PROVIDER_NODE_TYPE_MAP.mistralCloud,
+			{},
+			credentials,
+		);
+	}
+
+	private async fetchCohereModels(
+		credentials: INodeCredentials,
+		additionalData: IWorkflowExecuteAdditionalData,
+	): Promise<INodePropertyOptions[]> {
+		return await this.nodeParametersService.getOptionsViaLoadOptions(
+			{
+				routing: {
+					request: {
+						method: 'GET',
+						url: '/v1/models?page_size=100&endpoint=chat',
+					},
+					output: {
+						postReceive: [
+							{
+								type: 'rootProperty',
+								properties: {
+									property: 'models',
+								},
+							},
+							{
+								type: 'setKeyValue',
+								properties: {
+									name: '={{$responseItem.name}}',
+									value: '={{$responseItem.name}}',
+									description: '={{$responseItem.description}}',
+								},
+							},
+							{
+								type: 'sort',
+								properties: {
+									key: 'name',
+								},
+							},
+						],
+					},
+				},
+			},
+			additionalData,
+			PROVIDER_NODE_TYPE_MAP.cohere,
+			{},
+			credentials,
+		);
+	}
+
+	private async fetchDeepSeekModels(
+		credentials: INodeCredentials,
+		additionalData: IWorkflowExecuteAdditionalData,
+	): Promise<INodePropertyOptions[]> {
+		return await this.nodeParametersService.getOptionsViaLoadOptions(
+			{
+				routing: {
+					request: {
+						method: 'GET',
+						url: '/models',
+					},
+					output: {
+						postReceive: [
+							{
+								type: 'rootProperty',
+								properties: {
+									property: 'data',
+								},
+							},
+							{
+								type: 'setKeyValue',
+								properties: {
+									name: '={{$responseItem.id}}',
+									value: '={{$responseItem.id}}',
+								},
+							},
+							{
+								type: 'sort',
+								properties: {
+									key: 'name',
+								},
+							},
+						],
+					},
+				},
+			},
+			additionalData,
+			PROVIDER_NODE_TYPE_MAP.deepSeek,
+			{},
+			credentials,
+		);
+	}
+
+	private async fetchOpenRouterModels(
+		credentials: INodeCredentials,
+		additionalData: IWorkflowExecuteAdditionalData,
+	): Promise<INodePropertyOptions[]> {
+		return await this.nodeParametersService.getOptionsViaLoadOptions(
+			{
+				routing: {
+					request: {
+						method: 'GET',
+						url: '/models',
+					},
+					output: {
+						postReceive: [
+							{
+								type: 'rootProperty',
+								properties: {
+									property: 'data',
+								},
+							},
+							{
+								type: 'setKeyValue',
+								properties: {
+									name: '={{$responseItem.id}}',
+									value: '={{$responseItem.id}}',
+								},
+							},
+							{
+								type: 'sort',
+								properties: {
+									key: 'name',
+								},
+							},
+						],
+					},
+				},
+			},
+			additionalData,
+			PROVIDER_NODE_TYPE_MAP.openRouter,
+			{},
+			credentials,
+		);
+	}
+
+	private async fetchGroqModels(
+		credentials: INodeCredentials,
+		additionalData: IWorkflowExecuteAdditionalData,
+	): Promise<INodePropertyOptions[]> {
+		return await this.nodeParametersService.getOptionsViaLoadOptions(
+			{
+				routing: {
+					request: {
+						method: 'GET',
+						url: '/models',
+					},
+					output: {
+						postReceive: [
+							{
+								type: 'rootProperty',
+								properties: {
+									property: 'data',
+								},
+							},
+							{
+								type: 'filter',
+								properties: {
+									pass: '={{ $responseItem.active === true && $responseItem.object === "model" }}',
+								},
+							},
+							{
+								type: 'setKeyValue',
+								properties: {
+									name: '={{$responseItem.id}}',
+									value: '={{$responseItem.id}}',
+								},
+							},
+						],
+					},
+				},
+			},
+			additionalData,
+			PROVIDER_NODE_TYPE_MAP.groq,
+			{},
+			credentials,
+		);
+	}
+
+	private async fetchXAiGrokModels(
+		credentials: INodeCredentials,
+		additionalData: IWorkflowExecuteAdditionalData,
+	): Promise<INodePropertyOptions[]> {
+		return await this.nodeParametersService.getOptionsViaLoadOptions(
+			{
+				routing: {
+					request: {
+						method: 'GET',
+						url: '/models',
+					},
+					output: {
+						postReceive: [
+							{
+								type: 'rootProperty',
+								properties: {
+									property: 'data',
+								},
+							},
+							{
+								type: 'setKeyValue',
+								properties: {
+									name: '={{$responseItem.id}}',
+									value: '={{$responseItem.id}}',
+								},
+							},
+							{
+								type: 'sort',
+								properties: {
+									key: 'name',
+								},
+							},
+						],
+					},
+				},
+			},
+			additionalData,
+			PROVIDER_NODE_TYPE_MAP.xAiGrok,
+			{},
+			credentials,
+		);
+	}
+
+	private async fetchVercelAiGatewayModels(
+		credentials: INodeCredentials,
+		additionalData: IWorkflowExecuteAdditionalData,
+	): Promise<INodePropertyOptions[]> {
+		return await this.nodeParametersService.getOptionsViaLoadOptions(
+			{
+				routing: {
+					request: {
+						method: 'GET',
+						url: '/models',
+					},
+					output: {
+						postReceive: [
+							{
+								type: 'rootProperty',
+								properties: {
+									property: 'data',
+								},
+							},
+							{
+								type: 'setKeyValue',
+								properties: {
+									name: '={{$responseItem.id}}',
+									value: '={{$responseItem.id}}',
+								},
+							},
+							{
+								type: 'sort',
+								properties: {
+									key: 'name',
+								},
+							},
+						],
+					},
+				},
+			},
+			additionalData,
+			PROVIDER_NODE_TYPE_MAP.vercelAiGateway,
+			{},
+			credentials,
+		);
+	}
+
+	private async fetchAgentWorkflowsAsModels(user: User): Promise<ChatModelsResponse['n8n']> {
+		// Workflows are scanned by their latest version for chat trigger nodes.
+		// This means that we might miss some active workflow versions that had chat triggers but
+		// the latest version does not, but this trade-off is done for performance.
+		const workflowsWithChatTrigger = await this.workflowService.getWorkflowsWithNodesIncluded(
+			user,
+			[CHAT_TRIGGER_NODE_TYPE],
+			true,
+		);
+
+		const activeWorkflows = workflowsWithChatTrigger
+			// Ensure the user has at least read access to the workflows
+			.filter((workflow) => workflow.scopes.includes('workflow:read'))
+			.filter((workflow) => !!workflow.activeVersionId);
+
+		const workflows = await this.workflowRepository.find({
+			select: { id: true },
+			where: { id: In(activeWorkflows.map((workflow) => workflow.id)) },
+			relations: { activeVersion: true },
+		});
+
+		const models: ChatModelDto[] = [];
+
+		for (const { id, activeVersion } of workflows) {
+			if (!activeVersion) {
+				continue;
+			}
+
+			const chatTrigger = activeVersion.nodes?.find((node) => node.type === CHAT_TRIGGER_NODE_TYPE);
+			if (!chatTrigger) {
+				continue;
+			}
+
+			const chatTriggerParams = validChatTriggerParamsShape.safeParse(chatTrigger.parameters).data;
+			if (!chatTriggerParams) {
+				continue;
+			}
+
+			const agentNodes = activeVersion.nodes?.filter(
+				(node) => node.type === AGENT_LANGCHAIN_NODE_TYPE,
+			);
+
+			// Agents older than this can't do streaming
+			if (agentNodes.some((node) => node.typeVersion < 2.1)) {
+				continue;
+			}
+
+			const inputModalities = this.chatHubWorkflowService.parseInputModalities(
+				chatTriggerParams.options,
+			);
+
+			models.push({
+				name: chatTriggerParams.agentName ?? activeVersion.name ?? 'Unknown Agent',
+				description: chatTriggerParams.agentDescription ?? null,
+				model: {
+					provider: 'n8n',
+					workflowId: id,
+				},
+				createdAt: activeVersion.createdAt ? activeVersion.createdAt.toISOString() : null,
+				updatedAt: activeVersion.updatedAt ? activeVersion.updatedAt.toISOString() : null,
+				metadata: {
+					inputModalities,
+					capabilities: {
+						functionCalling: false,
+					},
+				},
+			});
+		}
+
+		return {
+			models,
+		};
+	}
+
+	private transformAndFilterModels(
+		rawModels: INodePropertyOptions[],
+		provider: ChatHubLLMProvider,
+	): ChatModelDto[] {
+		return rawModels.map((model) => {
+			const id = String(model.value);
+
+			return {
+				id,
+				name: model.name,
+				description: model.description ?? null,
+				model: {
+					provider,
+					model: id,
+				},
+				createdAt: null,
+				updatedAt: null,
+				metadata: getModelMetadata(provider, id),
+			};
+		});
+	}
+}
diff --git a/packages/cli/src/modules/chat-hub/chat-hub.service.ts b/packages/cli/src/modules/chat-hub/chat-hub.service.ts
index 0d31e7621f2..f21c423045e 100644
--- a/packages/cli/src/modules/chat-hub/chat-hub.service.ts
+++ b/packages/cli/src/modules/chat-hub/chat-hub.service.ts
@@ -2,7 +2,6 @@ import {
 	PROVIDER_CREDENTIAL_TYPE_MAP,
 	type ChatHubProvider,
 	type ChatHubLLMProvider,
-	type ChatModelsResponse,
 	type ChatHubConversationsResponse,
 	type ChatHubConversationResponse,
 	ChatHubMessageDto,
@@ -10,17 +9,14 @@ import {
 	type ChatSessionId,
 	ChatHubConversationModel,
 	ChatHubMessageStatus,
-	chatHubProviderSchema,
 	type EnrichedStructuredChunk,
 	ChatHubBaseLLMModel,
 	ChatHubN8nModel,
 	ChatHubCustomAgentModel,
-	emptyChatModelsResponse,
 	type ChatHubUpdateConversationRequest,
-	ChatModelDto,
 } from '@n8n/api-types';
 import { Logger } from '@n8n/backend-common';
-import { ExecutionRepository, IExecutionResponse, User, WorkflowRepository, In } from '@n8n/db';
+import { ExecutionRepository, IExecutionResponse, User, WorkflowRepository } from '@n8n/db';
 import { Service } from '@n8n/di';
 import type { EntityManager } from '@n8n/typeorm';
 import { GlobalConfig } from '@n8n/config';
@@ -28,12 +24,10 @@ import type { Response } from 'express';
 import { ErrorReporter, InstanceSettings } from 'n8n-core';
 import {
 	CHAT_TRIGGER_NODE_TYPE,
-	AGENT_LANGCHAIN_NODE_TYPE,
 	OperationalError,
 	ManualExecutionCancelledError,
 	type INodeCredentials,
 	type IWorkflowBase,
-	type IWorkflowExecuteAdditionalData,
 	jsonParse,
 	jsonStringify,
 	StructuredChunk,
@@ -48,15 +42,11 @@ import {
 } from 'n8n-workflow';
 
 import { ActiveExecutions } from '@/active-executions';
-import { CredentialsFinderService } from '@/credentials/credentials-finder.service';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 import { NotFoundError } from '@/errors/response-errors/not-found.error';
 import { ExecutionService } from '@/executions/execution.service';
-import { DynamicNodeParametersService } from '@/services/dynamic-node-parameters.service';
-import { getBase } from '@/workflow-execute-additional-data';
 import { WorkflowExecutionService } from '@/workflows/workflow-execution.service';
 import { WorkflowFinderService } from '@/workflows/workflow-finder.service';
-import { WorkflowService } from '@/workflows/workflow.service';
 
 import { ChatHubAgentService } from './chat-hub-agent.service';
 import { ChatHubCredentialsService } from './chat-hub-credentials.service';
@@ -64,18 +54,12 @@ import type { ChatHubMessage } from './chat-hub-message.entity';
 import type { ChatHubSession } from './chat-hub-session.entity';
 import { ChatHubWorkflowService } from './chat-hub-workflow.service';
 import { ChatHubAttachmentService } from './chat-hub.attachment.service';
-import {
-	JSONL_STREAM_HEADERS,
-	NODE_NAMES,
-	PROVIDER_NODE_TYPE_MAP,
-	getModelMetadata,
-} from './chat-hub.constants';
+import { JSONL_STREAM_HEADERS, NODE_NAMES, PROVIDER_NODE_TYPE_MAP } from './chat-hub.constants';
 import { ChatHubSettingsService } from './chat-hub.settings.service';
 import {
 	HumanMessagePayload,
 	RegenerateMessagePayload,
 	EditMessagePayload,
-	validChatTriggerParamsShape,
 } from './chat-hub.types';
 import { ChatHubMessageRepository } from './chat-message.repository';
 import { ChatHubSessionRepository } from './chat-session.repository';
@@ -90,16 +74,13 @@ export class ChatHubService {
 		private readonly logger: Logger,
 		private readonly errorReporter: ErrorReporter,
 		private readonly executionService: ExecutionService,
-		private readonly nodeParametersService: DynamicNodeParametersService,
 		private readonly executionRepository: ExecutionRepository,
 		private readonly workflowExecutionService: WorkflowExecutionService,
-		private readonly workflowService: WorkflowService,
 		private readonly workflowFinderService: WorkflowFinderService,
 		private readonly workflowRepository: WorkflowRepository,
 		private readonly activeExecutions: ActiveExecutions,
 		private readonly sessionRepository: ChatHubSessionRepository,
 		private readonly messageRepository: ChatHubMessageRepository,
-		private readonly credentialsFinderService: CredentialsFinderService,
 		private readonly chatHubAgentService: ChatHubAgentService,
 		private readonly chatHubCredentialsService: ChatHubCredentialsService,
 		private readonly chatHubWorkflowService: ChatHubWorkflowService,
@@ -109,883 +90,6 @@ export class ChatHubService {
 		private readonly globalConfig: GlobalConfig,
 	) {}
 
-	async getModels(
-		user: User,
-		credentialIds: Record<ChatHubLLMProvider, string | null>,
-	): Promise<ChatModelsResponse> {
-		const additionalData = await getBase({ userId: user.id });
-		const providers = chatHubProviderSchema.options;
-
-		const allCredentials = await this.credentialsFinderService.findCredentialsForUser(user, [
-			'credential:read',
-		]);
-
-		const responses = await Promise.all(
-			providers.map<Promise<[ChatHubProvider, ChatModelsResponse[ChatHubProvider]]>>(
-				async (provider: ChatHubProvider) => {
-					const credentials: INodeCredentials = {};
-
-					if (provider !== 'n8n' && provider !== 'custom-agent') {
-						const credentialId = credentialIds[provider];
-						if (!credentialId) {
-							return [provider, { models: [] }];
-						}
-
-						// Ensure the user has the permission to read the credential
-						if (!allCredentials.some((credential) => credential.id === credentialId)) {
-							return [
-								provider,
-								{ models: [], error: 'Could not retrieve models. Verify credentials.' },
-							];
-						}
-
-						credentials[PROVIDER_CREDENTIAL_TYPE_MAP[provider]] = { name: '', id: credentialId };
-					}
-
-					try {
-						return [
-							provider,
-							await this.fetchModelsForProvider(user, provider, credentials, additionalData),
-						];
-					} catch {
-						return [
-							provider,
-							{ models: [], error: 'Could not retrieve models. Verify credentials.' },
-						];
-					}
-				},
-			),
-		);
-
-		return responses.reduce<ChatModelsResponse>(
-			(acc, [provider, res]) => {
-				acc[provider] = res;
-				return acc;
-			},
-			{ ...emptyChatModelsResponse },
-		);
-	}
-
-	private async fetchModelsForProvider(
-		user: User,
-		provider: ChatHubProvider,
-		credentials: INodeCredentials,
-		additionalData: IWorkflowExecuteAdditionalData,
-	): Promise<ChatModelsResponse[ChatHubProvider]> {
-		switch (provider) {
-			case 'openai':
-				return await this.fetchOpenAiModels(credentials, additionalData);
-			case 'anthropic':
-				return await this.fetchAnthropicModels(credentials, additionalData);
-			case 'google':
-				return await this.fetchGoogleModels(credentials, additionalData);
-			case 'ollama':
-				return await this.fetchOllamaModels(credentials, additionalData);
-			case 'azureOpenAi':
-			case 'azureEntraId':
-				return this.fetchAzureOpenAiModels(credentials, additionalData);
-			case 'awsBedrock':
-				return await this.fetchAwsBedrockModels(credentials, additionalData);
-			case 'vercelAiGateway':
-				return await this.fetchVercelAiGatewayModels(credentials, additionalData);
-			case 'xAiGrok':
-				return await this.fetchXAiGrokModels(credentials, additionalData);
-			case 'groq':
-				return await this.fetchGroqModels(credentials, additionalData);
-			case 'openRouter':
-				return await this.fetchOpenRouterModels(credentials, additionalData);
-			case 'deepSeek':
-				return await this.fetchDeepSeekModels(credentials, additionalData);
-			case 'cohere':
-				return await this.fetchCohereModels(credentials, additionalData);
-			case 'mistralCloud':
-				return await this.fetchMistralCloudModels(credentials, additionalData);
-			case 'n8n':
-				return await this.fetchAgentWorkflowsAsModels(user);
-			case 'custom-agent':
-				return await this.chatHubAgentService.getAgentsByUserIdAsModels(user.id);
-		}
-	}
-
-	private async fetchOpenAiModels(
-		credentials: INodeCredentials,
-		additionalData: IWorkflowExecuteAdditionalData,
-	): Promise<ChatModelsResponse['openai']> {
-		const resourceLocatorResults = await this.nodeParametersService.getResourceLocatorResults(
-			'searchModels',
-			'parameters.model',
-			additionalData,
-			PROVIDER_NODE_TYPE_MAP.openai,
-			{},
-			credentials,
-		);
-
-		return {
-			models: resourceLocatorResults.results.map((result) => ({
-				name: result.name,
-				description: result.description ?? null,
-				model: {
-					provider: 'openai',
-					model: String(result.value),
-				},
-				createdAt: null,
-				updatedAt: null,
-				metadata: getModelMetadata('openai', String(result.value)),
-			})),
-		};
-	}
-
-	private async fetchAnthropicModels(
-		credentials: INodeCredentials,
-		additionalData: IWorkflowExecuteAdditionalData,
-	): Promise<ChatModelsResponse['anthropic']> {
-		const resourceLocatorResults = await this.nodeParametersService.getResourceLocatorResults(
-			'searchModels',
-			'parameters.model',
-			additionalData,
-			PROVIDER_NODE_TYPE_MAP.anthropic,
-			{},
-			credentials,
-		);
-
-		return {
-			models: resourceLocatorResults.results.map((result) => ({
-				name: result.name,
-				description: result.description ?? null,
-				model: {
-					provider: 'anthropic',
-					model: String(result.value),
-				},
-				createdAt: null,
-				updatedAt: null,
-				metadata: getModelMetadata('anthropic', String(result.value)),
-			})),
-		};
-	}
-
-	private async fetchGoogleModels(
-		credentials: INodeCredentials,
-		additionalData: IWorkflowExecuteAdditionalData,
-	): Promise<ChatModelsResponse['google']> {
-		const results = await this.nodeParametersService.getOptionsViaLoadOptions(
-			{
-				// From Gemini node
-				// https://github.com/n8n-io/n8n/blob/master/packages/%40n8n/nodes-langchain/nodes/llms/LmChatGoogleGemini/LmChatGoogleGemini.node.ts#L75
-				routing: {
-					request: {
-						method: 'GET',
-						url: '/v1beta/models',
-					},
-					output: {
-						postReceive: [
-							{
-								type: 'rootProperty',
-								properties: {
-									property: 'models',
-								},
-							},
-							{
-								type: 'filter',
-								properties: {
-									pass: "={{ !$responseItem.name.includes('embedding') }}",
-								},
-							},
-							{
-								type: 'setKeyValue',
-								properties: {
-									name: '={{$responseItem.name}}',
-									value: '={{$responseItem.name}}',
-									description: '={{$responseItem.description}}',
-								},
-							},
-							{
-								type: 'sort',
-								properties: {
-									key: 'name',
-								},
-							},
-						],
-					},
-				},
-			},
-			additionalData,
-			PROVIDER_NODE_TYPE_MAP.google,
-			{},
-			credentials,
-		);
-
-		return {
-			models: results.map((result) => ({
-				name: result.name,
-				description: result.description ?? null,
-				model: {
-					provider: 'google',
-					model: String(result.value),
-				},
-				createdAt: null,
-				updatedAt: null,
-				metadata: getModelMetadata('google', String(result.value)),
-			})),
-		};
-	}
-
-	private async fetchOllamaModels(
-		credentials: INodeCredentials,
-		additionalData: IWorkflowExecuteAdditionalData,
-	): Promise<ChatModelsResponse['ollama']> {
-		const results = await this.nodeParametersService.getOptionsViaLoadOptions(
-			{
-				// From Ollama Model node
-				// https://github.com/n8n-io/n8n/blob/master/packages/%40n8n/nodes-langchain/nodes/llms/LMOllama/description.ts#L24
-				routing: {
-					request: {
-						method: 'GET',
-						url: '/api/tags',
-					},
-					output: {
-						postReceive: [
-							{
-								type: 'rootProperty',
-								properties: {
-									property: 'models',
-								},
-							},
-							{
-								type: 'setKeyValue',
-								properties: {
-									name: '={{$responseItem.name}}',
-									value: '={{$responseItem.name}}',
-								},
-							},
-							{
-								type: 'sort',
-								properties: {
-									key: 'name',
-								},
-							},
-						],
-					},
-				},
-			},
-			additionalData,
-			PROVIDER_NODE_TYPE_MAP.ollama,
-			{},
-			credentials,
-		);
-
-		return {
-			models: results.map((result) => ({
-				name: result.name,
-				description: result.description ?? null,
-				model: {
-					provider: 'ollama',
-					model: String(result.value),
-				},
-				createdAt: null,
-				updatedAt: null,
-				metadata: getModelMetadata('ollama', String(result.value)),
-			})),
-		};
-	}
-
-	private fetchAzureOpenAiModels(
-		_credentials: INodeCredentials,
-		_additionalData: IWorkflowExecuteAdditionalData,
-	): ChatModelsResponse['azureOpenAi'] {
-		// Azure doesn't appear to offer a way to list available models via API.
-		// If we add support for this in the future on the Azure OpenAI node we should copy that
-		// implementation here too.
-		return {
-			models: [],
-		};
-	}
-
-	private async fetchAwsBedrockModels(
-		credentials: INodeCredentials,
-		additionalData: IWorkflowExecuteAdditionalData,
-	): Promise<ChatModelsResponse['awsBedrock']> {
-		// From AWS Bedrock node
-		// https://github.com/n8n-io/n8n/blob/master/packages/%40n8n/nodes-langchain/nodes/llms/LmChatAwsBedrock/LmChatAwsBedrock.node.ts#L100
-		// https://github.com/n8n-io/n8n/blob/master/packages/%40n8n/nodes-langchain/nodes/llms/LmChatAwsBedrock/LmChatAwsBedrock.node.ts#L155
-		const foundationModelsRequest = this.nodeParametersService.getOptionsViaLoadOptions(
-			{
-				routing: {
-					request: {
-						method: 'GET',
-						url: '/foundation-models?&byOutputModality=TEXT&byInferenceType=ON_DEMAND',
-					},
-					output: {
-						postReceive: [
-							{
-								type: 'rootProperty',
-								properties: {
-									property: 'modelSummaries',
-								},
-							},
-							{
-								type: 'setKeyValue',
-								properties: {
-									name: '={{$responseItem.modelName}}',
-									description: '={{$responseItem.modelArn}}',
-									value: '={{$responseItem.modelId}}',
-								},
-							},
-							{
-								type: 'sort',
-								properties: {
-									key: 'name',
-								},
-							},
-						],
-					},
-				},
-			},
-			additionalData,
-			PROVIDER_NODE_TYPE_MAP.awsBedrock,
-			{},
-			credentials,
-		);
-
-		const inferenceProfileModelsRequest = this.nodeParametersService.getOptionsViaLoadOptions(
-			{
-				routing: {
-					request: {
-						method: 'GET',
-						url: '/inference-profiles?maxResults=1000',
-					},
-					output: {
-						postReceive: [
-							{
-								type: 'rootProperty',
-								properties: {
-									property: 'inferenceProfileSummaries',
-								},
-							},
-							{
-								type: 'setKeyValue',
-								properties: {
-									name: '={{$responseItem.inferenceProfileName}}',
-									description:
-										'={{$responseItem.description || $responseItem.inferenceProfileArn}}',
-									value: '={{$responseItem.inferenceProfileId}}',
-								},
-							},
-							{
-								type: 'sort',
-								properties: {
-									key: 'name',
-								},
-							},
-						],
-					},
-				},
-			},
-			additionalData,
-			PROVIDER_NODE_TYPE_MAP.awsBedrock,
-			{},
-			credentials,
-		);
-
-		const [foundationModels, inferenceProfileModels] = await Promise.all([
-			foundationModelsRequest,
-			inferenceProfileModelsRequest,
-		]);
-
-		return {
-			models: foundationModels.concat(inferenceProfileModels).map((result) => ({
-				name: result.name,
-				description: result.description ?? String(result.value),
-				model: {
-					provider: 'awsBedrock',
-					model: String(result.value),
-				},
-				createdAt: null,
-				updatedAt: null,
-				metadata: getModelMetadata('awsBedrock', String(result.value)),
-			})),
-		};
-	}
-
-	private async fetchMistralCloudModels(
-		credentials: INodeCredentials,
-		additionalData: IWorkflowExecuteAdditionalData,
-	): Promise<ChatModelsResponse['mistralCloud']> {
-		const results = await this.nodeParametersService.getOptionsViaLoadOptions(
-			{
-				routing: {
-					request: {
-						method: 'GET',
-						url: '/models',
-					},
-					output: {
-						postReceive: [
-							{
-								type: 'rootProperty',
-								properties: {
-									property: 'data',
-								},
-							},
-							{
-								type: 'filter',
-								properties: {
-									pass: "={{ !$responseItem.id.includes('embed') }}",
-								},
-							},
-							{
-								type: 'setKeyValue',
-								properties: {
-									name: '={{ $responseItem.id }}',
-									value: '={{ $responseItem.id }}',
-								},
-							},
-							{
-								type: 'sort',
-								properties: {
-									key: 'name',
-								},
-							},
-						],
-					},
-				},
-			},
-			additionalData,
-			PROVIDER_NODE_TYPE_MAP.mistralCloud,
-			{},
-			credentials,
-		);
-
-		return {
-			models: results.map((result) => ({
-				name: result.name,
-				description: result.description ?? String(result.value),
-				model: {
-					provider: 'mistralCloud',
-					model: String(result.value),
-				},
-				createdAt: null,
-				updatedAt: null,
-				metadata: getModelMetadata('mistralCloud', String(result.value)),
-			})),
-		};
-	}
-
-	private async fetchCohereModels(
-		credentials: INodeCredentials,
-		additionalData: IWorkflowExecuteAdditionalData,
-	): Promise<ChatModelsResponse['cohere']> {
-		const results = await this.nodeParametersService.getOptionsViaLoadOptions(
-			{
-				routing: {
-					request: {
-						method: 'GET',
-						url: '/v1/models?page_size=100&endpoint=chat',
-					},
-					output: {
-						postReceive: [
-							{
-								type: 'rootProperty',
-								properties: {
-									property: 'models',
-								},
-							},
-							{
-								type: 'setKeyValue',
-								properties: {
-									name: '={{$responseItem.name}}',
-									value: '={{$responseItem.name}}',
-									description: '={{$responseItem.description}}',
-								},
-							},
-							{
-								type: 'sort',
-								properties: {
-									key: 'name',
-								},
-							},
-						],
-					},
-				},
-			},
-			additionalData,
-			PROVIDER_NODE_TYPE_MAP.cohere,
-			{},
-			credentials,
-		);
-
-		return {
-			models: results.map((result) => ({
-				name: result.name,
-				description: result.description ?? null,
-				model: {
-					provider: 'cohere',
-					model: String(result.value),
-				},
-				createdAt: null,
-				updatedAt: null,
-				metadata: getModelMetadata('cohere', String(result.value)),
-			})),
-		};
-	}
-
-	private async fetchDeepSeekModels(
-		credentials: INodeCredentials,
-		additionalData: IWorkflowExecuteAdditionalData,
-	): Promise<ChatModelsResponse['deepSeek']> {
-		const results = await this.nodeParametersService.getOptionsViaLoadOptions(
-			{
-				routing: {
-					request: {
-						method: 'GET',
-						url: '/models',
-					},
-					output: {
-						postReceive: [
-							{
-								type: 'rootProperty',
-								properties: {
-									property: 'data',
-								},
-							},
-							{
-								type: 'setKeyValue',
-								properties: {
-									name: '={{$responseItem.id}}',
-									value: '={{$responseItem.id}}',
-								},
-							},
-							{
-								type: 'sort',
-								properties: {
-									key: 'name',
-								},
-							},
-						],
-					},
-				},
-			},
-			additionalData,
-			PROVIDER_NODE_TYPE_MAP.deepSeek,
-			{},
-			credentials,
-		);
-
-		return {
-			models: results.map((result) => ({
-				name: result.name,
-				description: result.description ?? String(result.value),
-				model: {
-					provider: 'deepSeek',
-					model: String(result.value),
-				},
-				createdAt: null,
-				updatedAt: null,
-				metadata: getModelMetadata('deepSeek', String(result.value)),
-			})),
-		};
-	}
-
-	private async fetchOpenRouterModels(
-		credentials: INodeCredentials,
-		additionalData: IWorkflowExecuteAdditionalData,
-	): Promise<ChatModelsResponse['openRouter']> {
-		const results = await this.nodeParametersService.getOptionsViaLoadOptions(
-			{
-				routing: {
-					request: {
-						method: 'GET',
-						url: '/models',
-					},
-					output: {
-						postReceive: [
-							{
-								type: 'rootProperty',
-								properties: {
-									property: 'data',
-								},
-							},
-							{
-								type: 'setKeyValue',
-								properties: {
-									name: '={{$responseItem.id}}',
-									value: '={{$responseItem.id}}',
-								},
-							},
-							{
-								type: 'sort',
-								properties: {
-									key: 'name',
-								},
-							},
-						],
-					},
-				},
-			},
-			additionalData,
-			PROVIDER_NODE_TYPE_MAP.openRouter,
-			{},
-			credentials,
-		);
-
-		return {
-			models: results.map((result) => ({
-				name: result.name,
-				description: result.description ?? null,
-				model: {
-					provider: 'openRouter',
-					model: String(result.value),
-				},
-				createdAt: null,
-				updatedAt: null,
-				metadata: getModelMetadata('openRouter', String(result.value)),
-			})),
-		};
-	}
-
-	private async fetchGroqModels(
-		credentials: INodeCredentials,
-		additionalData: IWorkflowExecuteAdditionalData,
-	): Promise<ChatModelsResponse['groq']> {
-		const results = await this.nodeParametersService.getOptionsViaLoadOptions(
-			{
-				routing: {
-					request: {
-						method: 'GET',
-						url: '/models',
-					},
-					output: {
-						postReceive: [
-							{
-								type: 'rootProperty',
-								properties: {
-									property: 'data',
-								},
-							},
-							{
-								type: 'filter',
-								properties: {
-									pass: '={{ $responseItem.active === true && $responseItem.object === "model" }}',
-								},
-							},
-							{
-								type: 'setKeyValue',
-								properties: {
-									name: '={{$responseItem.id}}',
-									value: '={{$responseItem.id}}',
-								},
-							},
-						],
-					},
-				},
-			},
-			additionalData,
-			PROVIDER_NODE_TYPE_MAP.groq,
-			{},
-			credentials,
-		);
-
-		return {
-			models: results.map((result) => ({
-				name: result.name,
-				description: result.description ?? null,
-				model: {
-					provider: 'groq',
-					model: String(result.value),
-				},
-				createdAt: null,
-				updatedAt: null,
-				metadata: getModelMetadata('groq', String(result.value)),
-			})),
-		};
-	}
-
-	private async fetchXAiGrokModels(
-		credentials: INodeCredentials,
-		additionalData: IWorkflowExecuteAdditionalData,
-	): Promise<ChatModelsResponse['xAiGrok']> {
-		const results = await this.nodeParametersService.getOptionsViaLoadOptions(
-			{
-				routing: {
-					request: {
-						method: 'GET',
-						url: '/models',
-					},
-					output: {
-						postReceive: [
-							{
-								type: 'rootProperty',
-								properties: {
-									property: 'data',
-								},
-							},
-							{
-								type: 'setKeyValue',
-								properties: {
-									name: '={{$responseItem.id}}',
-									value: '={{$responseItem.id}}',
-								},
-							},
-							{
-								type: 'sort',
-								properties: {
-									key: 'name',
-								},
-							},
-						],
-					},
-				},
-			},
-			additionalData,
-			PROVIDER_NODE_TYPE_MAP.xAiGrok,
-			{},
-			credentials,
-		);
-
-		return {
-			models: results.map((result) => ({
-				name: result.name,
-				description: result.description ?? null,
-				model: {
-					provider: 'xAiGrok',
-					model: String(result.value),
-				},
-				createdAt: null,
-				updatedAt: null,
-				metadata: getModelMetadata('xAiGrok', String(result.value)),
-			})),
-		};
-	}
-
-	private async fetchVercelAiGatewayModels(
-		credentials: INodeCredentials,
-		additionalData: IWorkflowExecuteAdditionalData,
-	): Promise<ChatModelsResponse['vercelAiGateway']> {
-		const results = await this.nodeParametersService.getOptionsViaLoadOptions(
-			{
-				routing: {
-					request: {
-						method: 'GET',
-						url: '/models',
-					},
-					output: {
-						postReceive: [
-							{
-								type: 'rootProperty',
-								properties: {
-									property: 'data',
-								},
-							},
-							{
-								type: 'setKeyValue',
-								properties: {
-									name: '={{$responseItem.id}}',
-									value: '={{$responseItem.id}}',
-								},
-							},
-							{
-								type: 'sort',
-								properties: {
-									key: 'name',
-								},
-							},
-						],
-					},
-				},
-			},
-			additionalData,
-			PROVIDER_NODE_TYPE_MAP.vercelAiGateway,
-			{},
-			credentials,
-		);
-
-		return {
-			models: results.map((result) => ({
-				name: result.name,
-				description: result.description ?? String(result.value),
-				model: {
-					provider: 'vercelAiGateway',
-					model: String(result.value),
-				},
-				createdAt: null,
-				updatedAt: null,
-				metadata: getModelMetadata('vercelAiGateway', String(result.value)),
-			})),
-		};
-	}
-
-	private async fetchAgentWorkflowsAsModels(user: User): Promise<ChatModelsResponse['n8n']> {
-		// Workflows are scanned by their latest version for chat trigger nodes.
-		// This means that we might miss some active workflow versions that had chat triggers but
-		// the latest version does not, but this trade-off is done for performance.
-		const workflowsWithChatTrigger = await this.workflowService.getWorkflowsWithNodesIncluded(
-			user,
-			[CHAT_TRIGGER_NODE_TYPE],
-			true,
-		);
-
-		const activeWorkflows = workflowsWithChatTrigger
-			// Ensure the user has at least read access to the workflows
-			.filter((workflow) => workflow.scopes.includes('workflow:read'))
-			.filter((workflow) => !!workflow.activeVersionId);
-
-		const workflows = await this.workflowRepository.find({
-			select: { id: true },
-			where: { id: In(activeWorkflows.map((workflow) => workflow.id)) },
-			relations: { activeVersion: true },
-		});
-
-		const models: ChatModelDto[] = [];
-
-		for (const { id, activeVersion } of workflows) {
-			if (!activeVersion) {
-				continue;
-			}
-
-			const chatTrigger = activeVersion.nodes?.find((node) => node.type === CHAT_TRIGGER_NODE_TYPE);
-			if (!chatTrigger) {
-				continue;
-			}
-
-			const chatTriggerParams = validChatTriggerParamsShape.safeParse(chatTrigger.parameters).data;
-			if (!chatTriggerParams) {
-				continue;
-			}
-
-			const agentNodes = activeVersion.nodes?.filter(
-				(node) => node.type === AGENT_LANGCHAIN_NODE_TYPE,
-			);
-
-			// Agents older than this can't do streaming
-			if (agentNodes.some((node) => node.typeVersion < 2.1)) {
-				continue;
-			}
-
-			const inputModalities = this.chatHubWorkflowService.parseInputModalities(
-				chatTriggerParams.options,
-			);
-
-			models.push({
-				name: chatTriggerParams.agentName ?? activeVersion.name ?? 'Unknown Agent',
-				description: chatTriggerParams.agentDescription ?? null,
-				model: {
-					provider: 'n8n',
-					workflowId: id,
-				},
-				createdAt: activeVersion.createdAt ? activeVersion.createdAt.toISOString() : null,
-				updatedAt: activeVersion.updatedAt ? activeVersion.updatedAt.toISOString() : null,
-				metadata: {
-					inputModalities,
-					capabilities: {
-						functionCalling: false,
-					},
-				},
-			});
-		}
-
-		return {
-			models,
-		};
-	}
-
 	private async deleteChatWorkflow(workflowId: string): Promise<void> {
 		await this.workflowRepository.delete(workflowId);
 	}

From 661dada57279ca0e808cf58664109304aa0dde7c Mon Sep 17 00:00:00 2001
From: oleg <me@olegivaniv.com>
Date: Fri, 5 Dec 2025 13:07:45 +0100
Subject: [PATCH 088/167] refactor(ai-builder): Centralize prompts into
 dedicated directory (no-changelog) (#22751)

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>
---
 .../src/agents/responder.agent.ts             |  43 +--
 .../src/agents/supervisor.agent.ts            |  52 +--
 .../src/chains/conversation-compact.ts        |  15 +-
 .../src/chains/parameter-updater.ts           |   7 +-
 .../src/chains/prompt-categorization.ts       |  93 +----
 .../src/chains/workflow-name.ts               |  12 +-
 .../src/prompts/README.md                     | 204 +++++++++++
 .../src/prompts/agents/builder.prompt.ts      | 253 ++++++++++++++
 .../src/prompts/agents/configurator.prompt.ts | 137 ++++++++
 .../src/prompts/agents/discovery.prompt.ts    | 315 +++++++++++++++++
 .../src/prompts/agents/responder.prompt.ts    |  45 +++
 .../src/prompts/agents/supervisor.prompt.ts   |  57 +++
 .../prompts/chains/categorization.prompt.ts   |  91 +++++
 .../src/prompts/chains/compact.prompt.ts      |  16 +
 .../base/common-patterns.ts                   |   0
 .../base/core-instructions.ts                 |   0
 .../base/expression-rules.ts                  |   0
 .../parameter-updater}/base/output-format.ts  |   0
 .../advanced/resource-locator-examples.ts     |   0
 .../examples/advanced/tool-node-examples.ts   |   0
 .../examples/basic/if-node-examples.ts        |   0
 .../examples/basic/set-node-examples.ts       |   0
 .../examples/basic/simple-updates.ts          |   0
 .../examples/basic/switch-node-examples.ts    |   0
 .../prompts/chains/parameter-updater/index.ts |  26 ++
 .../chains/parameter-updater}/instance-url.ts |   0
 .../node-types/http-request.ts                |   0
 .../parameter-updater}/node-types/if-node.ts  |   0
 .../parameter-updater}/node-types/set-node.ts |   0
 .../node-types/switch-node.ts                 |   0
 .../node-types/tool-nodes.ts                  |   0
 .../parameter-types/resource-locator.ts       |   0
 .../parameter-types/system-message.ts         |   0
 .../parameter-types/text-fields.ts            |   0
 .../parameter-updater}/prompt-builder.ts      |   3 +-
 .../parameter-updater}/prompt-config.ts       |   2 +-
 .../test/prompt-builder.test.ts               |   0
 .../prompts/chains/workflow-name.prompt.ts    |  13 +
 .../src/prompts/index.ts                      |  56 +++
 .../legacy-agent.prompt.ts}                   |   2 +-
 .../src/subgraphs/builder.subgraph.ts         | 231 +------------
 .../src/subgraphs/configurator.subgraph.ts    | 123 +------
 .../src/subgraphs/discovery.subgraph.ts       | 325 +-----------------
 .../src/test/workflow-builder-agent.test.ts   |   4 +-
 .../src/workflow-builder-agent.ts             |   2 +-
 45 files changed, 1249 insertions(+), 878 deletions(-)
 create mode 100644 packages/@n8n/ai-workflow-builder.ee/src/prompts/README.md
 create mode 100644 packages/@n8n/ai-workflow-builder.ee/src/prompts/agents/builder.prompt.ts
 create mode 100644 packages/@n8n/ai-workflow-builder.ee/src/prompts/agents/configurator.prompt.ts
 create mode 100644 packages/@n8n/ai-workflow-builder.ee/src/prompts/agents/discovery.prompt.ts
 create mode 100644 packages/@n8n/ai-workflow-builder.ee/src/prompts/agents/responder.prompt.ts
 create mode 100644 packages/@n8n/ai-workflow-builder.ee/src/prompts/agents/supervisor.prompt.ts
 create mode 100644 packages/@n8n/ai-workflow-builder.ee/src/prompts/chains/categorization.prompt.ts
 create mode 100644 packages/@n8n/ai-workflow-builder.ee/src/prompts/chains/compact.prompt.ts
 rename packages/@n8n/ai-workflow-builder.ee/src/{chains/prompts => prompts/chains/parameter-updater}/base/common-patterns.ts (100%)
 rename packages/@n8n/ai-workflow-builder.ee/src/{chains/prompts => prompts/chains/parameter-updater}/base/core-instructions.ts (100%)
 rename packages/@n8n/ai-workflow-builder.ee/src/{chains/prompts => prompts/chains/parameter-updater}/base/expression-rules.ts (100%)
 rename packages/@n8n/ai-workflow-builder.ee/src/{chains/prompts => prompts/chains/parameter-updater}/base/output-format.ts (100%)
 rename packages/@n8n/ai-workflow-builder.ee/src/{chains/prompts => prompts/chains/parameter-updater}/examples/advanced/resource-locator-examples.ts (100%)
 rename packages/@n8n/ai-workflow-builder.ee/src/{chains/prompts => prompts/chains/parameter-updater}/examples/advanced/tool-node-examples.ts (100%)
 rename packages/@n8n/ai-workflow-builder.ee/src/{chains/prompts => prompts/chains/parameter-updater}/examples/basic/if-node-examples.ts (100%)
 rename packages/@n8n/ai-workflow-builder.ee/src/{chains/prompts => prompts/chains/parameter-updater}/examples/basic/set-node-examples.ts (100%)
 rename packages/@n8n/ai-workflow-builder.ee/src/{chains/prompts => prompts/chains/parameter-updater}/examples/basic/simple-updates.ts (100%)
 rename packages/@n8n/ai-workflow-builder.ee/src/{chains/prompts => prompts/chains/parameter-updater}/examples/basic/switch-node-examples.ts (100%)
 create mode 100644 packages/@n8n/ai-workflow-builder.ee/src/prompts/chains/parameter-updater/index.ts
 rename packages/@n8n/ai-workflow-builder.ee/src/{chains/prompts => prompts/chains/parameter-updater}/instance-url.ts (100%)
 rename packages/@n8n/ai-workflow-builder.ee/src/{chains/prompts => prompts/chains/parameter-updater}/node-types/http-request.ts (100%)
 rename packages/@n8n/ai-workflow-builder.ee/src/{chains/prompts => prompts/chains/parameter-updater}/node-types/if-node.ts (100%)
 rename packages/@n8n/ai-workflow-builder.ee/src/{chains/prompts => prompts/chains/parameter-updater}/node-types/set-node.ts (100%)
 rename packages/@n8n/ai-workflow-builder.ee/src/{chains/prompts => prompts/chains/parameter-updater}/node-types/switch-node.ts (100%)
 rename packages/@n8n/ai-workflow-builder.ee/src/{chains/prompts => prompts/chains/parameter-updater}/node-types/tool-nodes.ts (100%)
 rename packages/@n8n/ai-workflow-builder.ee/src/{chains/prompts => prompts/chains/parameter-updater}/parameter-types/resource-locator.ts (100%)
 rename packages/@n8n/ai-workflow-builder.ee/src/{chains/prompts => prompts/chains/parameter-updater}/parameter-types/system-message.ts (100%)
 rename packages/@n8n/ai-workflow-builder.ee/src/{chains/prompts => prompts/chains/parameter-updater}/parameter-types/text-fields.ts (100%)
 rename packages/@n8n/ai-workflow-builder.ee/src/{chains/prompts => prompts/chains/parameter-updater}/prompt-builder.ts (99%)
 rename packages/@n8n/ai-workflow-builder.ee/src/{chains/prompts => prompts/chains/parameter-updater}/prompt-config.ts (96%)
 rename packages/@n8n/ai-workflow-builder.ee/src/{chains/prompts => prompts/chains/parameter-updater}/test/prompt-builder.test.ts (100%)
 create mode 100644 packages/@n8n/ai-workflow-builder.ee/src/prompts/chains/workflow-name.prompt.ts
 create mode 100644 packages/@n8n/ai-workflow-builder.ee/src/prompts/index.ts
 rename packages/@n8n/ai-workflow-builder.ee/src/{tools/prompts/main-agent.prompt.ts => prompts/legacy-agent.prompt.ts} (99%)

diff --git a/packages/@n8n/ai-workflow-builder.ee/src/agents/responder.agent.ts b/packages/@n8n/ai-workflow-builder.ee/src/agents/responder.agent.ts
index 6efd85d0aa1..a7fd6ae99e5 100644
--- a/packages/@n8n/ai-workflow-builder.ee/src/agents/responder.agent.ts
+++ b/packages/@n8n/ai-workflow-builder.ee/src/agents/responder.agent.ts
@@ -3,57 +3,20 @@ import type { AIMessage, BaseMessage } from '@langchain/core/messages';
 import { HumanMessage } from '@langchain/core/messages';
 import { ChatPromptTemplate } from '@langchain/core/prompts';
 
+import { buildResponderPrompt } from '@/prompts/agents/responder.prompt';
+
 import type { CoordinationLogEntry } from '../types/coordination';
 import type { DiscoveryContext } from '../types/discovery-types';
 import type { SimpleWorkflow } from '../types/workflow';
 import { getErrorEntry, getBuilderOutput, getConfiguratorOutput } from '../utils/coordination-log';
 
-/**
- * Responder Agent Prompt
- *
- * Synthesizes final user-facing responses from workflow building context.
- * Also handles conversational queries.
- */
-const RESPONDER_PROMPT = `You are a helpful AI assistant for n8n workflow automation.
-
-You have access to context about what has been built, including:
-- Discovery results (nodes found)
-- Builder output (workflow structure)
-- Configuration summary (setup instructions)
-
-FOR WORKFLOW COMPLETION RESPONSES:
-When you receive [Internal Context], synthesize a clean user-facing response:
-1. Summarize what was built in a friendly way
-2. Explain the workflow structure briefly
-3. Include setup instructions if provided
-4. Ask if user wants adjustments
-
-Example response structure:
-"I've created your [workflow type] workflow! Here's what it does:
-[Brief explanation of the flow]
-
-**Setup Required:**
-[List any configuration steps from the context]
-
-Let me know if you'd like to adjust anything."
-
-FOR QUESTIONS/CONVERSATIONS:
-- Be friendly and concise
-- Explain n8n capabilities when asked
-- Provide practical examples when helpful
-
-RESPONSE STYLE:
-- Keep responses focused and not overly long
-- Use markdown formatting for readability
-- Be conversational and helpful`;
-
 const systemPrompt = ChatPromptTemplate.fromMessages([
 	[
 		'system',
 		[
 			{
 				type: 'text',
-				text: RESPONDER_PROMPT,
+				text: buildResponderPrompt(),
 				cache_control: { type: 'ephemeral' },
 			},
 		],
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/agents/supervisor.agent.ts b/packages/@n8n/ai-workflow-builder.ee/src/agents/supervisor.agent.ts
index 448df76e89a..c3c72406cec 100644
--- a/packages/@n8n/ai-workflow-builder.ee/src/agents/supervisor.agent.ts
+++ b/packages/@n8n/ai-workflow-builder.ee/src/agents/supervisor.agent.ts
@@ -4,63 +4,23 @@ import { HumanMessage } from '@langchain/core/messages';
 import { ChatPromptTemplate } from '@langchain/core/prompts';
 import { z } from 'zod';
 
+import {
+	buildSupervisorPrompt,
+	SUPERVISOR_PROMPT_SUFFIX,
+} from '@/prompts/agents/supervisor.prompt';
+
 import type { CoordinationLogEntry } from '../types/coordination';
 import type { SimpleWorkflow } from '../types/workflow';
 import { buildWorkflowSummary } from '../utils/context-builders';
 import { summarizeCoordinationLog } from '../utils/coordination-log';
 
-/**
- * Supervisor Agent Prompt
- *
- * Handles INITIAL routing based on user intent.
- * After initial routing, deterministic routing takes over based on coordination log.
- */
-const SUPERVISOR_PROMPT = `You are a Supervisor that routes user requests to specialist agents.
-
-AVAILABLE AGENTS:
-- discovery: Find n8n nodes for building/modifying workflows
-- builder: Create nodes and connections (requires discovery first for new node types)
-- configurator: Set parameters on EXISTING nodes (no structural changes)
-- responder: Answer questions, confirm completion (TERMINAL)
-
-ROUTING DECISION TREE:
-
-1. Is user asking a question or chatting? → responder
-   Examples: "what does this do?", "explain the workflow", "thanks"
-
-2. Does the request involve NEW or DIFFERENT node types? → discovery
-   Examples:
-   - "Build a workflow that..." (new workflow)
-   - "Use [ServiceB] instead of [ServiceA]" (replacing node type)
-   - "Add [some integration]" (new integration)
-   - "Switch from [ServiceA] to [ServiceB]" (swapping services)
-
-3. Is the request about connecting/disconnecting existing nodes? → builder
-   Examples: "Connect node A to node B", "Remove the connection to X"
-
-4. Is the request about changing VALUES in existing nodes? → configurator
-   Examples:
-   - "Change the URL to https://..."
-   - "Set the timeout to 30 seconds"
-   - "Update the email subject to..."
-
-KEY DISTINCTION:
-- "Use [ServiceB] instead of [ServiceA]" = REPLACEMENT = discovery (new node type needed)
-- "Change the [ServiceA] API key" = CONFIGURATION = configurator (same node, different value)
-
-OUTPUT:
-- reasoning: One sentence explaining your routing decision
-- next: Agent name`;
-
 const systemPrompt = ChatPromptTemplate.fromMessages([
 	[
 		'system',
 		[
 			{
 				type: 'text',
-				text:
-					SUPERVISOR_PROMPT +
-					'\n\nGiven the conversation above, which agent should act next? Provide your reasoning and selection.',
+				text: buildSupervisorPrompt() + SUPERVISOR_PROMPT_SUFFIX,
 				cache_control: { type: 'ephemeral' },
 			},
 		],
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/chains/conversation-compact.ts b/packages/@n8n/ai-workflow-builder.ee/src/chains/conversation-compact.ts
index ace9551a3a5..52a21814cd2 100644
--- a/packages/@n8n/ai-workflow-builder.ee/src/chains/conversation-compact.ts
+++ b/packages/@n8n/ai-workflow-builder.ee/src/chains/conversation-compact.ts
@@ -1,22 +1,9 @@
 import type { BaseChatModel } from '@langchain/core/language_models/chat_models';
 import type { BaseMessage } from '@langchain/core/messages';
 import { AIMessage, HumanMessage } from '@langchain/core/messages';
-import { PromptTemplate } from '@langchain/core/prompts';
 import z from 'zod';
 
-const compactPromptTemplate = PromptTemplate.fromTemplate(
-	`Please summarize the following conversation between a user and an AI assistant building an n8n workflow:
-
-<previous_summary>
-{previousSummary}
-</previous_summary>
-
-<conversation>
-{conversationText}
-</conversation>
-
-Provide a structured summary that captures the key points, decisions made, current state of the workflow, and suggested next steps.`,
-);
+import { compactPromptTemplate } from '@/prompts/chains/compact.prompt';
 
 export async function conversationCompactChain(
 	llm: BaseChatModel,
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/chains/parameter-updater.ts b/packages/@n8n/ai-workflow-builder.ee/src/chains/parameter-updater.ts
index 82a4668a6b5..32efa025050 100644
--- a/packages/@n8n/ai-workflow-builder.ee/src/chains/parameter-updater.ts
+++ b/packages/@n8n/ai-workflow-builder.ee/src/chains/parameter-updater.ts
@@ -4,10 +4,13 @@ import { ChatPromptTemplate, HumanMessagePromptTemplate } from '@langchain/core/
 import type { Logger } from 'n8n-workflow';
 import { z } from 'zod';
 
+import {
+	instanceUrlPrompt,
+	ParameterUpdatePromptBuilder,
+} from '@/prompts/chains/parameter-updater';
+
 import { LLMServiceError } from '../errors';
 import type { ParameterUpdaterOptions } from '../types/config';
-import { instanceUrlPrompt } from './prompts/instance-url';
-import { ParameterUpdatePromptBuilder } from './prompts/prompt-builder';
 
 export const parametersSchema = z
 	.object({
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/chains/prompt-categorization.ts b/packages/@n8n/ai-workflow-builder.ee/src/chains/prompt-categorization.ts
index 776dd4f55ad..fc0a5d572f8 100644
--- a/packages/@n8n/ai-workflow-builder.ee/src/chains/prompt-categorization.ts
+++ b/packages/@n8n/ai-workflow-builder.ee/src/chains/prompt-categorization.ts
@@ -1,96 +1,11 @@
 import type { BaseChatModel } from '@langchain/core/language_models/chat_models';
-import { PromptTemplate } from '@langchain/core/prompts';
 import { z } from 'zod';
 
 import {
-	WorkflowTechnique,
-	TechniqueDescription,
-	type PromptCategorization,
-} from '@/types/categorization';
-
-const examplePrompts = [
-	{
-		prompt: 'Monitor social channels for product mentions and auto-respond with campaign messages',
-		techniques: [
-			WorkflowTechnique.MONITORING,
-			WorkflowTechnique.CHATBOT,
-			WorkflowTechnique.CONTENT_GENERATION,
-		],
-	},
-	{
-		prompt: 'Collect partner referral submissions and verify client instances via BigQuery',
-		techniques: [
-			WorkflowTechnique.FORM_INPUT,
-			WorkflowTechnique.HUMAN_IN_THE_LOOP,
-			WorkflowTechnique.NOTIFICATION,
-		],
-	},
-	{
-		prompt: 'Scrape competitor pricing pages weekly and generate a summary report of changes',
-		techniques: [
-			WorkflowTechnique.SCHEDULING,
-			WorkflowTechnique.SCRAPING_AND_RESEARCH,
-			WorkflowTechnique.DATA_EXTRACTION,
-			WorkflowTechnique.DATA_ANALYSIS,
-		],
-	},
-	{
-		prompt: 'Process uploaded PDF contracts to extract client details and update CRM records',
-		techniques: [
-			WorkflowTechnique.DOCUMENT_PROCESSING,
-			WorkflowTechnique.DATA_EXTRACTION,
-			WorkflowTechnique.DATA_TRANSFORMATION,
-			WorkflowTechnique.ENRICHMENT,
-		],
-	},
-	{
-		prompt: 'Build a searchable internal knowledge base from past support tickets',
-		techniques: [
-			WorkflowTechnique.DATA_TRANSFORMATION,
-			WorkflowTechnique.DATA_ANALYSIS,
-			WorkflowTechnique.KNOWLEDGE_BASE,
-		],
-	},
-];
-
-function formatExamplePrompts() {
-	return examplePrompts
-		.map((example) => `- ${example.prompt} → ${example.techniques.join(',')}`)
-		.join('\n');
-}
-
-const promptCategorizationTemplate = PromptTemplate.fromTemplate(
-	`Analyze the following user prompt and identify the workflow techniques required to fulfill the request.
-Be specific and identify all relevant techniques.
-
-<user_prompt>
-{userPrompt}
-</user_prompt>
-
-<workflow_techniques>
-{techniques}
-</workflow_techniques>
-
-The following prompt categorization examples show a prompt → techniques involved to provide a sense
-of how the categorization should be carried out.
-<example_categorization>
-${formatExamplePrompts()}
-</example_categorization>
-
-Select a maximum of 5 techniques that you believe are applicable, but only select them if you are
-confident that they are applicable. If the prompt is ambigious or does not provide an obvious workflow
-do not provide any techniques - if confidence is low avoid providing techniques.
-
-Select ALL techniques that apply to this workflow. Most workflows use multiple techniques.
-Rate your confidence in this categorization from 0.0 to 1.0.
-`,
-);
-
-function formatTechniqueList(): string {
-	return Object.entries(TechniqueDescription)
-		.map(([key, description]) => `- **${key}**: ${description}`)
-		.join('\n');
-}
+	formatTechniqueList,
+	promptCategorizationTemplate,
+} from '@/prompts/chains/categorization.prompt';
+import { WorkflowTechnique, type PromptCategorization } from '@/types/categorization';
 
 export async function promptCategorizationChain(
 	llm: BaseChatModel,
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/chains/workflow-name.ts b/packages/@n8n/ai-workflow-builder.ee/src/chains/workflow-name.ts
index 8bf6df3e214..48352cc9f06 100644
--- a/packages/@n8n/ai-workflow-builder.ee/src/chains/workflow-name.ts
+++ b/packages/@n8n/ai-workflow-builder.ee/src/chains/workflow-name.ts
@@ -1,17 +1,7 @@
 import type { BaseChatModel } from '@langchain/core/language_models/chat_models';
-import { PromptTemplate } from '@langchain/core/prompts';
 import z from 'zod';
 
-const workflowNamingPromptTemplate = PromptTemplate.fromTemplate(
-	`Based on the initial user prompt, please generate a name for the workflow that captures its essence and purpose.
-
-<initial_prompt>
-{initialPrompt}
-</initial_prompt>
-
-This name should be concise, descriptive, and suitable for a workflow that automates tasks related to the given prompt. The name should be in a format that is easy to read and understand. Do not include the word "workflow" in the name.
-`,
-);
+import { workflowNamingPromptTemplate } from '@/prompts/chains/workflow-name.prompt';
 
 export async function workflowNameChain(llm: BaseChatModel, initialPrompt: string) {
 	// Use structured output for the workflow name to ensure it meets the required format and length
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/prompts/README.md b/packages/@n8n/ai-workflow-builder.ee/src/prompts/README.md
new file mode 100644
index 00000000000..40cac43af24
--- /dev/null
+++ b/packages/@n8n/ai-workflow-builder.ee/src/prompts/README.md
@@ -0,0 +1,204 @@
+# AI Workflow Builder Prompts
+
+Centralized prompts for the n8n AI Workflow Builder. This directory contains all prompts used by agents and chains.
+## Directory Structure
+
+```
+src/prompts/
+├── index.ts                      # Central exports
+├── README.md                     # This file
+├── legacy-agent.prompt.ts        # Single-agent mode (~650 lines)
+│
+├── agents/                       # Multi-agent system prompts
+│   ├── supervisor.prompt.ts      # Routes requests to specialists
+│   ├── discovery.prompt.ts       # Finds nodes & categorizes techniques
+│   ├── builder.prompt.ts         # Creates workflow structure
+│   ├── configurator.prompt.ts    # Sets node parameters
+│   └── responder.prompt.ts       # Generates user responses
+│
+└── chains/                       # Chain-level prompts
+    ├── categorization.prompt.ts  # Workflow technique classification
+    ├── compact.prompt.ts         # Conversation summarization
+    ├── workflow-name.prompt.ts   # Workflow name generation
+    │
+    └── parameter-updater/        # Dynamic prompt building for node updates
+        ├── index.ts              # Exports
+        ├── prompt-builder.ts     # ParameterUpdatePromptBuilder class
+        ├── prompt-config.ts      # Node detection config
+        ├── instance-url.ts       # Instance URL template
+        ├── base/                 # Core instructions
+        ├── node-types/           # Node-specific guides
+        ├── parameter-types/      # Parameter-specific guides
+        └── examples/             # Few-shot examples
+```
+
+## Multi-Agent Prompts
+
+### Supervisor (`agents/supervisor.prompt.ts`)
+
+Routes user requests to the appropriate specialist agent.
+
+| Export | Description |
+|--------|-------------|
+| `buildSupervisorPrompt()` | Builds the supervisor system prompt |
+| `SUPERVISOR_PROMPT_SUFFIX` | Suffix asking "which agent should act next?" |
+
+**Routing targets:** discovery, builder, configurator, responder
+
+### Discovery (`agents/discovery.prompt.ts`)
+
+Identifies relevant n8n nodes and categorizes workflow techniques.
+
+| Export | Description |
+|--------|-------------|
+| `buildDiscoveryPrompt(options)` | Builds prompt with optional examples phase |
+| `formatTechniqueList()` | Formats available techniques as bullet list |
+| `formatExampleCategorizations()` | Formats few-shot examples |
+| `exampleCategorizations` | 14 few-shot classification examples |
+| `DiscoveryPromptOptions` | Type: `{ includeExamples: boolean }` |
+
+**Input variables:** `{techniques}`, `{exampleCategorizations}`
+
+### Builder (`agents/builder.prompt.ts`)
+
+Constructs workflow structure by creating nodes and connections.
+
+| Export | Description |
+|--------|-------------|
+| `buildBuilderPrompt()` | Builds the builder system prompt |
+
+**Key sections:** Node creation rules, connection parameters, AI connections, RAG patterns
+
+### Configurator (`agents/configurator.prompt.ts`)
+
+Sets up node parameters using natural language instructions.
+
+| Export | Description |
+|--------|-------------|
+| `buildConfiguratorPrompt()` | Builds the configurator system prompt |
+| `INSTANCE_URL_PROMPT` | Template with `{instanceUrl}` variable |
+
+**Input variables:** `{instanceUrl}`
+
+### Responder (`agents/responder.prompt.ts`)
+
+Generates user-facing responses and handles conversational queries.
+
+| Export | Description |
+|--------|-------------|
+| `buildResponderPrompt()` | Builds the responder system prompt |
+
+## Legacy Agent Prompt
+
+### `legacy-agent.prompt.ts`
+
+Comprehensive monolithic prompt for single-agent mode. Contains all workflow building logic.
+
+| Export | Description |
+|--------|-------------|
+| `createMainAgentPrompt(options?)` | Creates ChatPromptTemplate with options |
+| `mainAgentPrompt` | Default prompt instance |
+| `MainAgentPromptOptions` | Type: `{ includeExamplesPhase?: boolean }` |
+
+**Input variables:** `{instanceUrl}`, `{previousSummary}`, `{messages}`
+
+**Phases:**
+1. Categorization (mandatory)
+2. Examples (optional, feature-flagged)
+3. Discovery (parallel)
+4. Analysis (parallel)
+5. Creation (parallel)
+6. Connection (parallel)
+7. Configuration (mandatory)
+8. Validation (mandatory)
+
+## Chain Prompts
+
+### Categorization (`chains/categorization.prompt.ts`)
+
+Analyzes user prompts to identify workflow techniques.
+
+| Export | Description |
+|--------|-------------|
+| `promptCategorizationTemplate` | PromptTemplate for classification |
+| `examplePrompts` | 5 few-shot examples |
+| `formatExamplePrompts()` | Formats examples as "prompt → techniques" |
+| `formatTechniqueList()` | Formats technique descriptions |
+
+**Input variables:** `{userPrompt}`, `{techniques}`
+
+### Compact (`chains/compact.prompt.ts`)
+
+Summarizes multi-turn conversations for context management.
+
+| Export | Description |
+|--------|-------------|
+| `compactPromptTemplate` | PromptTemplate for summarization |
+
+**Input variables:** `{previousSummary}`, `{conversationText}`
+
+**Output:** Structured summary with key_decisions, current_state, next_steps
+
+### Workflow Name (`chains/workflow-name.prompt.ts`)
+
+Generates descriptive workflow names.
+
+| Export | Description |
+|--------|-------------|
+| `workflowNamingPromptTemplate` | PromptTemplate for naming |
+
+**Input variables:** `{initialPrompt}`
+
+## Parameter Updater System
+
+A modular system for building context-aware prompts for node parameter updates.
+
+### ParameterUpdatePromptBuilder (`chains/parameter-updater/prompt-builder.ts`)
+
+Dynamically assembles prompts based on node context.
+
+```typescript
+import { ParameterUpdatePromptBuilder } from '@/prompts';
+
+const prompt = ParameterUpdatePromptBuilder.buildSystemPrompt({
+  nodeType: 'n8n-nodes-base.set',
+  nodeDefinition: nodeTypeDescription,
+  requestedChanges: ['set name to John'],
+  hasResourceLocatorParams: false,
+});
+```
+
+**Build logic:**
+1. Always: CORE_INSTRUCTIONS + EXPRESSION_RULES
+2. Node-type guide (Set, IF, Switch, HTTP, Tool)
+3. Parameter-type guides if applicable
+4. COMMON_PATTERNS
+5. Relevant examples
+6. OUTPUT_FORMAT
+
+### Base Prompts (`chains/parameter-updater/base/`)
+
+| File | Export | Description |
+|------|--------|-------------|
+| `core-instructions.ts` | `CORE_INSTRUCTIONS` | Parameter update guidelines |
+| `expression-rules.ts` | `EXPRESSION_RULES` | n8n expression syntax rules |
+| `common-patterns.ts` | `COMMON_PATTERNS` | HTTP Request patterns |
+| `output-format.ts` | `OUTPUT_FORMAT` | Expected output structure |
+
+### Node Type Guides (`chains/parameter-updater/node-types/`)
+
+| File | Export | Description |
+|------|--------|-------------|
+| `set-node.ts` | `SET_NODE_GUIDE` | Assignment structure & types |
+| `if-node.ts` | `IF_NODE_GUIDE` | Filter conditions & operators |
+| `switch-node.ts` | `SWITCH_NODE_GUIDE` | Rules and routing patterns |
+| `http-request.ts` | `HTTP_REQUEST_GUIDE` | URL, headers, body, auth |
+| `tool-nodes.ts` | `TOOL_NODES_GUIDE` | $fromAI expressions |
+
+### Parameter Type Guides (`chains/parameter-updater/parameter-types/`)
+
+| File | Export | Description |
+|------|--------|-------------|
+| `resource-locator.ts` | `RESOURCE_LOCATOR_GUIDE` | __rl structure & modes |
+| `system-message.ts` | `SYSTEM_MESSAGE_GUIDE` | AI node message separation |
+| `text-fields.ts` | `TEXT_FIELDS_GUIDE` | Expression embedding |
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/prompts/agents/builder.prompt.ts b/packages/@n8n/ai-workflow-builder.ee/src/prompts/agents/builder.prompt.ts
new file mode 100644
index 00000000000..a5765c5292e
--- /dev/null
+++ b/packages/@n8n/ai-workflow-builder.ee/src/prompts/agents/builder.prompt.ts
@@ -0,0 +1,253 @@
+/**
+ * Builder Agent Prompt
+ *
+ * Constructs workflow structure by creating nodes and connections based on Discovery results.
+ * Does NOT configure node parameters - that's the Configurator Agent's job.
+ */
+
+const BUILDER_ROLE = 'You are a Builder Agent specialized in constructing n8n workflows.';
+
+const EXECUTION_SEQUENCE = `MANDATORY EXECUTION SEQUENCE:
+You MUST follow these steps IN ORDER. Do not skip any step.
+
+STEP 1: CREATE NODES
+- Call add_nodes for EVERY node needed based on discovery results
+- Create multiple nodes in PARALLEL for efficiency
+- Do NOT respond with text - START BUILDING immediately
+
+STEP 2: CONNECT NODES
+- Call connect_nodes for ALL required connections
+- Connect multiple node pairs in PARALLEL
+
+STEP 3: VALIDATE (REQUIRED)
+- After ALL nodes and connections are created, call validate_structure
+- This step is MANDATORY - you cannot finish without it
+- If validation finds issues (missing trigger, invalid connections), fix them and validate again
+- MAXIMUM 3 VALIDATION ATTEMPTS: After 3 calls to validate_structure, proceed to respond regardless of remaining issues
+
+STEP 4: RESPOND TO USER
+- Only after validation passes, provide your brief summary
+
+⚠️ NEVER respond to the user without calling validate_structure first ⚠️`;
+
+const NODE_CREATION = `NODE CREATION:
+Each add_nodes call creates ONE node. You must provide:
+- nodeType: The exact type from discovery (e.g., "n8n-nodes-base.httpRequest")
+- name: Descriptive name (e.g., "Fetch Weather Data")
+- connectionParametersReasoning: Explain your thinking about connection parameters
+- connectionParameters: Parameters that affect connections (or {{}} if none needed)`;
+
+const WORKFLOW_CONFIG_NODE = `<workflow_configuration_node>
+Always include a Workflow Configuration node at the start of every workflow.
+
+The Workflow Configuration node (n8n-nodes-base.set) should be placed immediately after the trigger node and before all other processing nodes.
+
+Placement rules:
+- Add between trigger and first processing node
+- Connect: Trigger → Workflow Configuration → First processing node
+- Name it "Workflow Configuration"
+</workflow_configuration_node>`;
+
+const DATA_PARSING = `<data_parsing_strategy>
+For AI-generated structured data, prefer Structured Output Parser nodes over Code nodes.
+For binary file data, use Extract From File node to extract content from files before processing.
+Use Code nodes only for custom business logic beyond parsing.
+
+STRUCTURED OUTPUT PARSER RULE:
+When Discovery results include Structured Output Parser:
+1. Create the Structured Output Parser node
+2. Set AI Agent's hasOutputParser: true in connectionParameters
+3. Connect: Structured Output Parser → AI Agent (ai_outputParser connection)
+</data_parsing_strategy>`;
+
+const PROACTIVE_DESIGN = `<proactive_design>
+Anticipate workflow needs:
+- IF nodes for conditional logic when multiple outcomes exist
+- Set nodes for data transformation between incompatible formats
+- Schedule Triggers for recurring tasks
+- Error handling for external service calls
+
+NEVER use Split In Batches nodes.
+</proactive_design>`;
+
+const NODE_DEFAULTS = `<node_defaults_warning>
+CRITICAL: NEVER RELY ON DEFAULT PARAMETER VALUES FOR CONNECTIONS
+
+Default values often hide connection inputs/outputs. You MUST explicitly configure parameters that affect connections:
+- Vector Store: Mode parameter affects available connections - always set explicitly (e.g., mode: "insert", "retrieve", "retrieve-as-tool")
+- AI Agent: hasOutputParser default may not match your workflow needs
+- Document Loader: textSplittingMode affects whether it accepts a text splitter input
+
+ALWAYS check node details and set connectionParameters explicitly.
+</node_defaults_warning>`;
+
+const CONNECTION_PARAMETERS = `CONNECTION PARAMETERS EXAMPLES:
+- Static nodes (HTTP Request, Set, Code): reasoning="Static inputs/outputs", parameters={{}}
+- AI Agent with structured output: reasoning="hasOutputParser enables ai_outputParser input for Structured Output Parser", parameters={{ hasOutputParser: true }}
+- Vector Store insert: reasoning="Insert mode requires document input", parameters={{ mode: "insert" }}
+- Document Loader custom: reasoning="Custom mode enables text splitter input", parameters={{ textSplittingMode: "custom" }}
+- Switch with routing rules: reasoning="Switch needs N outputs, creating N rules.values entries with outputKeys", parameters={{ mode: "rules", rules: {{ values: [...] }} }} - see <switch_node_pattern> for full structure`;
+
+const STRUCTURED_OUTPUT_PARSER = `<structured_output_parser_guidance>
+WHEN TO SET hasOutputParser: true on AI Agent:
+- Discovery found Structured Output Parser node → MUST set hasOutputParser: true
+- AI output will be used in conditions (IF/Switch nodes checking $json.field)
+- AI output will be formatted/displayed (HTML emails, reports with specific sections)
+- AI output will be stored in database/data tables with specific fields
+- AI is classifying, scoring, or extracting specific data fields
+</structured_output_parser_guidance>`;
+
+/** AI sub-nodes are SOURCES (they "provide" capabilities), so arrows point FROM sub-node TO parent */
+const AI_CONNECTIONS = `<node_connections_understanding>
+n8n connections flow from SOURCE (output) to TARGET (input).
+
+Regular data flow: Source node output → Target node input
+Example: HTTP Request → Set (HTTP Request is source, Set is target)
+
+AI sub-nodes PROVIDE capabilities, making them the SOURCE:
+- OpenAI Chat Model → AI Agent [ai_languageModel]
+- Calculator Tool → AI Agent [ai_tool]
+- Window Buffer Memory → AI Agent [ai_memory]
+- Token Splitter → Default Data Loader [ai_textSplitter]
+- Default Data Loader → Vector Store [ai_document]
+- Embeddings OpenAI → Vector Store [ai_embedding]
+</node_connections_understanding>`;
+
+const AGENT_NODE_DISTINCTION = `<agent_node_distinction>
+Distinguish between two different agent node types:
+
+1. **AI Agent** (@n8n/n8n-nodes-langchain.agent)
+   - Main workflow node that orchestrates AI tasks
+   - Use for: Primary AI logic, chatbots, autonomous workflows
+
+2. **AI Agent Tool** (@n8n/n8n-nodes-langchain.agentTool)
+   - Sub-node that acts as a tool for another AI Agent
+   - Use for: Multi-agent systems where one agent calls another
+
+Default assumption: When discovery results include "agent", use AI Agent
+unless explicitly specified as "agent tool" or "sub-agent".
+</agent_node_distinction>`;
+
+const RAG_PATTERN = `<rag_workflow_pattern>
+For RAG (Retrieval-Augmented Generation) workflows:
+
+Main data flow:
+- Data source (e.g., HTTP Request) → Vector Store [main connection]
+
+AI capability connections:
+- Document Loader → Vector Store [ai_document]
+- Embeddings → Vector Store [ai_embedding]
+- Text Splitter → Document Loader [ai_textSplitter]
+
+Common mistake to avoid:
+- NEVER connect Document Loader to main data outputs
+- Document Loader is an AI sub-node that gives Vector Store document processing capability
+</rag_workflow_pattern>`;
+
+const SWITCH_NODE_PATTERN = `<switch_node_pattern>
+For Switch nodes with multiple routing paths:
+- The number of outputs is determined by the number of entries in rules.values[]
+- You MUST create the rules.values[] array with placeholder entries for each output branch
+- Each entry needs: conditions structure (with empty leftValue/rightValue) + renameOutput: true + descriptive outputKey
+- Configurator will fill in the actual condition values later
+- Use descriptive node names like "Route by Amount" or "Route by Status"
+
+Example connectionParameters for 3-way routing:
+{{
+  "mode": "rules",
+  "rules": {{
+    "values": [
+      {{
+        "conditions": {{
+          "options": {{ "caseSensitive": true, "leftValue": "", "typeValidation": "strict" }},
+          "conditions": [{{ "leftValue": "", "rightValue": "", "operator": {{ "type": "string", "operation": "equals" }} }}],
+          "combinator": "and"
+        }},
+        "renameOutput": true,
+        "outputKey": "Output 1 Name"
+      }},
+      {{
+        "conditions": {{
+          "options": {{ "caseSensitive": true, "leftValue": "", "typeValidation": "strict" }},
+          "conditions": [{{ "leftValue": "", "rightValue": "", "operator": {{ "type": "string", "operation": "equals" }} }}],
+          "combinator": "and"
+        }},
+        "renameOutput": true,
+        "outputKey": "Output 2 Name"
+      }},
+      {{
+        "conditions": {{
+          "options": {{ "caseSensitive": true, "leftValue": "", "typeValidation": "strict" }},
+          "conditions": [{{ "leftValue": "", "rightValue": "", "operator": {{ "type": "string", "operation": "equals" }} }}],
+          "combinator": "and"
+        }},
+        "renameOutput": true,
+        "outputKey": "Output 3 Name"
+      }}
+    ]
+  }}
+}}
+</switch_node_pattern>`;
+
+const CONNECTION_TYPES = `<connection_type_examples>
+**Main Connections** (regular data flow):
+- Trigger → HTTP Request → Set → Email
+
+**AI Language Model Connections** (ai_languageModel):
+- OpenAI Chat Model → AI Agent
+
+**AI Tool Connections** (ai_tool):
+- Calculator Tool → AI Agent
+- AI Agent Tool → AI Agent (for multi-agent systems)
+
+**AI Document Connections** (ai_document):
+- Document Loader → Vector Store
+
+**AI Embedding Connections** (ai_embedding):
+- OpenAI Embeddings → Vector Store
+
+**AI Text Splitter Connections** (ai_textSplitter):
+- Token Text Splitter → Document Loader
+
+**AI Memory Connections** (ai_memory):
+- Window Buffer Memory → AI Agent
+
+**AI Vector Store in retrieve-as-tool mode** (ai_tool):
+- Vector Store → AI Agent
+</connection_type_examples>`;
+
+const RESTRICTIONS = `DO NOT:
+- Respond before calling validate_structure
+- Skip validation even if you think structure is correct
+- Add commentary between tool calls - execute tools silently
+- Configure node parameters (that's the Configurator Agent's job)
+- Search for nodes (that's the Discovery Agent's job)
+- Make assumptions about node types - use exactly what Discovery found`;
+
+const RESPONSE_FORMAT = `RESPONSE FORMAT (only after validation):
+Provide ONE brief text message summarizing:
+- What nodes were added
+- How they're connected
+
+Example: "Created 4 nodes: Trigger → Weather → Image Generation → Email"`;
+
+export function buildBuilderPrompt(): string {
+	return [
+		BUILDER_ROLE,
+		EXECUTION_SEQUENCE,
+		NODE_CREATION,
+		WORKFLOW_CONFIG_NODE,
+		DATA_PARSING,
+		PROACTIVE_DESIGN,
+		NODE_DEFAULTS,
+		CONNECTION_PARAMETERS,
+		STRUCTURED_OUTPUT_PARSER,
+		AI_CONNECTIONS,
+		AGENT_NODE_DISTINCTION,
+		RAG_PATTERN,
+		SWITCH_NODE_PATTERN,
+		CONNECTION_TYPES,
+		RESTRICTIONS,
+		RESPONSE_FORMAT,
+	].join('\n\n');
+}
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/prompts/agents/configurator.prompt.ts b/packages/@n8n/ai-workflow-builder.ee/src/prompts/agents/configurator.prompt.ts
new file mode 100644
index 00000000000..a865fa746a2
--- /dev/null
+++ b/packages/@n8n/ai-workflow-builder.ee/src/prompts/agents/configurator.prompt.ts
@@ -0,0 +1,137 @@
+/**
+ * Configurator Agent Prompt
+ *
+ * Sets up node parameters after the Builder Agent has created the workflow structure.
+ * Uses natural language instructions to configure each node's settings.
+ */
+
+const CONFIGURATOR_ROLE =
+	'You are a Configurator Agent specialized in setting up n8n node parameters.';
+
+const EXECUTION_SEQUENCE = `MANDATORY EXECUTION SEQUENCE:
+You MUST follow these steps IN ORDER. Do not skip any step.
+
+STEP 1: CONFIGURE ALL NODES
+- Call update_node_parameters for EVERY node in the workflow
+- Configure multiple nodes in PARALLEL for efficiency
+- Do NOT respond with text - START CONFIGURING immediately
+
+STEP 2: VALIDATE (REQUIRED)
+- After ALL configurations complete, call validate_configuration
+- This step is MANDATORY - you cannot finish without it
+- If validation finds issues, fix them and validate again
+- MAXIMUM 3 VALIDATION ATTEMPTS: After 3 calls to validate_configuration, proceed to respond regardless of remaining issues
+
+STEP 3: RESPOND TO USER
+- Only after validation passes, provide your response
+
+NEVER respond to the user without calling validate_configuration first`;
+
+const WORKFLOW_JSON_DETECTION = `WORKFLOW JSON DETECTION:
+- You receive <current_workflow_json> in your context
+- If you see nodes in the workflow JSON, you MUST configure them IMMEDIATELY
+- Look at the workflow JSON, identify each node, and call update_node_parameters for ALL of them`;
+
+const PARAMETER_CONFIGURATION = `PARAMETER CONFIGURATION:
+Use update_node_parameters with natural language instructions:
+- "Set URL to https://api.example.com/weather"
+- "Add header Authorization: Bearer token"
+- "Set method to POST"
+- "Add field 'status' with value 'processed'"`;
+
+const TOOL_NODE_EXPRESSIONS = `SPECIAL EXPRESSIONS FOR TOOL NODES:
+Tool nodes (types ending in "Tool") support $fromAI expressions:
+- "Set sendTo to ={{ $fromAI('to') }}"
+- "Set subject to ={{ $fromAI('subject') }}"
+- "Set message to ={{ $fromAI('message_html') }}"
+- "Set timeMin to ={{ $fromAI('After', '', 'string') }}"
+
+$fromAI syntax: ={{ $fromAI('key', 'description', 'type', defaultValue) }}
+- ONLY use in tool nodes (check node type ends with "Tool")
+- Use for dynamic values that AI determines at runtime
+- For regular nodes, use static values or standard expressions`;
+
+const CRITICAL_PARAMETERS = `CRITICAL PARAMETERS TO ALWAYS SET:
+- HTTP Request: URL, method, headers (if auth needed)
+- Set node: Fields to set with values
+- Code node: The actual code to execute
+- IF node: Conditions to check
+- Switch node: Configure rules.values[] with conditions for each output branch (uses same filter structure as IF node)
+- Document Loader: dataType parameter ('binary' for files like PDF, 'json' for JSON data)
+- AI nodes: Prompts, models, configurations
+- Tool nodes: Use $fromAI for dynamic recipient/subject/message fields`;
+
+const DEFAULT_VALUES_WARNING = `NEVER RELY ON DEFAULT VALUES:
+Defaults are traps that cause runtime failures. Examples:
+- Document Loader defaults to 'json' but MUST be 'binary' when processing files
+- HTTP Request defaults to GET but APIs often need POST
+- Vector Store mode affects available connections - set explicitly (retrieve-as-tool when using with AI Agent)`;
+
+const SWITCH_NODE_CONFIGURATION = `<switch_node_configuration>
+Switch nodes require configuring rules.values[] array - each entry creates one output:
+
+Structure per rule:
+{{
+  "conditions": {{
+    "options": {{ "caseSensitive": true, "leftValue": "", "typeValidation": "strict" }},
+    "conditions": [
+      {{
+        "leftValue": "={{{{ $json.fieldName }}}}",
+        "rightValue": <value>,
+        "operator": {{ "type": "number|string", "operation": "lt|gt|equals|etc" }}
+      }}
+    ],
+    "combinator": "and"
+  }},
+  "renameOutput": true,
+  "outputKey": "Descriptive Label"
+}}
+
+For numeric ranges (e.g., $100-$1000):
+- Use TWO conditions with combinator: "and"
+- First: gte (greater than or equal)
+- Second: lte (less than or equal)
+
+Always set renameOutput: true and provide descriptive outputKey labels.
+</switch_node_configuration>`;
+
+const RESPONSE_FORMAT = `<response_format>
+After validation passes, provide a concise summary:
+- List any placeholders requiring user configuration (e.g., "URL placeholder needs actual endpoint")
+- Note which nodes were configured and key settings applied
+- Keep it brief - this output is used for coordination with other LLM agents, not displayed directly to users
+</response_format>`;
+
+const RESTRICTIONS = `DO NOT:
+- Respond before calling validate_configuration
+- Skip validation even if you think configuration is correct
+- Add commentary between tool calls - execute tools silently`;
+
+/** Uses {instanceUrl} as a LangChain template variable */
+export const INSTANCE_URL_PROMPT = `
+<instance_url>
+The n8n instance base URL is: {instanceUrl}
+
+This URL is essential for webhook nodes and chat triggers as it provides the base URL for:
+- Webhook URLs that external services need to call
+- Chat trigger URLs for conversational interfaces
+- Any node that requires the full instance URL to generate proper callback URLs
+
+When working with webhook or chat trigger nodes, use this URL as the base for constructing proper endpoint URLs.
+</instance_url>
+`;
+
+export function buildConfiguratorPrompt(): string {
+	return [
+		CONFIGURATOR_ROLE,
+		EXECUTION_SEQUENCE,
+		WORKFLOW_JSON_DETECTION,
+		PARAMETER_CONFIGURATION,
+		TOOL_NODE_EXPRESSIONS,
+		CRITICAL_PARAMETERS,
+		DEFAULT_VALUES_WARNING,
+		SWITCH_NODE_CONFIGURATION,
+		RESPONSE_FORMAT,
+		RESTRICTIONS,
+	].join('\n\n');
+}
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/prompts/agents/discovery.prompt.ts b/packages/@n8n/ai-workflow-builder.ee/src/prompts/agents/discovery.prompt.ts
new file mode 100644
index 00000000000..e0718bf091e
--- /dev/null
+++ b/packages/@n8n/ai-workflow-builder.ee/src/prompts/agents/discovery.prompt.ts
@@ -0,0 +1,315 @@
+/**
+ * Discovery Agent Prompt
+ *
+ * Identifies relevant n8n nodes and their connection-changing parameters based on
+ * the user's request. Categorizes the workflow by technique and searches for appropriate nodes.
+ */
+
+import {
+	TechniqueDescription,
+	WorkflowTechnique,
+	type WorkflowTechniqueType,
+} from '@/types/categorization';
+
+/** Few-shot examples for technique classification */
+export const exampleCategorizations: Array<{
+	prompt: string;
+	techniques: WorkflowTechniqueType[];
+}> = [
+	{
+		prompt: 'Monitor social channels for product mentions and auto-respond with campaign messages',
+		techniques: [
+			WorkflowTechnique.MONITORING,
+			WorkflowTechnique.CHATBOT,
+			WorkflowTechnique.CONTENT_GENERATION,
+		],
+	},
+	{
+		prompt: 'Collect partner referral submissions and verify client instances via BigQuery',
+		techniques: [
+			WorkflowTechnique.FORM_INPUT,
+			WorkflowTechnique.HUMAN_IN_THE_LOOP,
+			WorkflowTechnique.NOTIFICATION,
+		],
+	},
+	{
+		prompt: 'Scrape competitor pricing pages weekly and generate a summary report of changes',
+		techniques: [
+			WorkflowTechnique.SCHEDULING,
+			WorkflowTechnique.SCRAPING_AND_RESEARCH,
+			WorkflowTechnique.DATA_EXTRACTION,
+			WorkflowTechnique.DATA_ANALYSIS,
+		],
+	},
+	{
+		prompt: 'Process uploaded PDF contracts to extract client details and update CRM records',
+		techniques: [
+			WorkflowTechnique.DOCUMENT_PROCESSING,
+			WorkflowTechnique.DATA_EXTRACTION,
+			WorkflowTechnique.DATA_TRANSFORMATION,
+			WorkflowTechnique.ENRICHMENT,
+		],
+	},
+	{
+		prompt: 'Build a searchable internal knowledge base from past support tickets',
+		techniques: [
+			WorkflowTechnique.DATA_TRANSFORMATION,
+			WorkflowTechnique.DATA_ANALYSIS,
+			WorkflowTechnique.KNOWLEDGE_BASE,
+		],
+	},
+	{
+		prompt: 'Create an AI agent that writes and sends personalized emails to leads',
+		techniques: [WorkflowTechnique.CONTENT_GENERATION, WorkflowTechnique.NOTIFICATION],
+	},
+	{
+		prompt:
+			'Fetch trending topics from Google Trends and Reddit, select the best ones, and create social posts',
+		techniques: [
+			WorkflowTechnique.SCRAPING_AND_RESEARCH,
+			WorkflowTechnique.TRIAGE,
+			WorkflowTechnique.CONTENT_GENERATION,
+		],
+	},
+	{
+		prompt:
+			'Trigger when a new contact is created in HubSpot and enrich their profile with LinkedIn data',
+		techniques: [WorkflowTechnique.MONITORING, WorkflowTechnique.ENRICHMENT],
+	},
+	{
+		prompt: 'Get stock prices from financial APIs and analyze volatility patterns',
+		techniques: [WorkflowTechnique.SCRAPING_AND_RESEARCH, WorkflowTechnique.DATA_ANALYSIS],
+	},
+	{
+		prompt: 'Generate video reels from templates and auto-post to social media on schedule',
+		techniques: [
+			WorkflowTechnique.SCHEDULING,
+			WorkflowTechnique.DOCUMENT_PROCESSING,
+			WorkflowTechnique.CONTENT_GENERATION,
+		],
+	},
+	{
+		prompt: 'Receive news from Telegram channels, filter relevant ones, and forward to my channel',
+		techniques: [
+			WorkflowTechnique.MONITORING,
+			WorkflowTechnique.TRIAGE,
+			WorkflowTechnique.NOTIFICATION,
+		],
+	},
+	{
+		prompt: 'Analyze YouTube video performance data and generate a weekly report',
+		techniques: [
+			WorkflowTechnique.SCRAPING_AND_RESEARCH,
+			WorkflowTechnique.DATA_ANALYSIS,
+			WorkflowTechnique.DATA_TRANSFORMATION,
+		],
+	},
+	{
+		prompt:
+			'Create a chatbot that answers questions using data from a Google Sheet as knowledge base',
+		techniques: [WorkflowTechnique.CHATBOT, WorkflowTechnique.KNOWLEDGE_BASE],
+	},
+	{
+		prompt: 'Form submission with file upload triggers document extraction and approval workflow',
+		techniques: [
+			WorkflowTechnique.FORM_INPUT,
+			WorkflowTechnique.DOCUMENT_PROCESSING,
+			WorkflowTechnique.HUMAN_IN_THE_LOOP,
+		],
+	},
+];
+
+export function formatTechniqueList(): string {
+	return Object.entries(TechniqueDescription)
+		.map(([key, description]) => `- **${key}**: ${description}`)
+		.join('\n');
+}
+
+export function formatExampleCategorizations(): string {
+	return exampleCategorizations
+		.map((example) => `- ${example.prompt} → ${example.techniques.join(', ')}`)
+		.join('\n');
+}
+
+export interface DiscoveryPromptOptions {
+	includeExamples: boolean;
+}
+
+const DISCOVERY_ROLE = `You are a Discovery Agent for n8n AI Workflow Builder.
+
+YOUR ROLE: Identify relevant n8n nodes and their connection-changing parameters.`;
+
+const TECHNIQUE_CATEGORIZATION = `TECHNIQUE CATEGORIZATION:
+When calling get_best_practices, select techniques that match the user's workflow intent.
+
+<available_techniques>
+{techniques}
+</available_techniques>
+
+<example_categorizations>
+{exampleCategorizations}
+</example_categorizations>`;
+
+const TECHNIQUE_CLARIFICATIONS = `<technique_clarifications>
+Common distinctions to get right:
+- **NOTIFICATION vs CHATBOT**: Use NOTIFICATION when SENDING emails/messages/alerts (including to Telegram CHANNELS which are broadcast-only). Use CHATBOT only when RECEIVING and REPLYING to direct messages in a conversation.
+- **MONITORING**: Use when workflow TRIGGERS on external events (new record created, status changed, incoming webhook, new message in channel). NOT just scheduled runs.
+- **SCRAPING_AND_RESEARCH vs DATA_EXTRACTION**: Use SCRAPING when fetching from EXTERNAL sources (APIs, websites, social media). Use DATA_EXTRACTION for parsing INTERNAL data you already have.
+- **TRIAGE**: Use when SELECTING, PRIORITIZING, ROUTING, or QUALIFYING items (e.g., "pick the best", "route to correct team", "qualify leads").
+- **DOCUMENT_PROCESSING**: Use for ANY file handling - PDFs, images, videos, Excel, Google Sheets, audio files, file uploads in forms.
+- **HUMAN_IN_THE_LOOP**: Use when workflow PAUSES for human approval, review, signing documents, responding to polls, or any manual input before continuing.
+- **DATA_ANALYSIS**: Use when ANALYZING, CLASSIFYING, IDENTIFYING PATTERNS, or UNDERSTANDING data (e.g., "analyze outcomes", "learn from previous", "classify by type", "identify trends").
+- **KNOWLEDGE_BASE**: Use when storing/retrieving from a DATA SOURCE for Q&A - includes vector DBs, spreadsheets used as databases, document collections.
+- **DATA_TRANSFORMATION**: Use when CONVERTING data format, creating REPORTS/SUMMARIES from analyzed data, or restructuring output.
+</technique_clarifications>
+
+Technique selection rules:
+- Select ALL techniques that apply (most workflows use 2-4)
+- Maximum 5 techniques
+- Only select techniques you're confident apply`;
+
+const CONNECTION_PARAMETERS = `CONNECTION-CHANGING PARAMETERS - CRITICAL RULES:
+
+A parameter is connection-changing ONLY IF it appears in <input> or <output> expressions within <node_details>.
+
+**How to identify:**
+1. Look at the <connections> section in node details
+2. Check if <input> or <output> uses expressions like: ={{...parameterName...}}
+3. If a parameter is referenced in these expressions, it IS connection-changing
+4. If a parameter is NOT in <input>/<output> expressions, it is NOT connection-changing
+
+**Example from AI Agent:**
+\`\`\`xml
+<input>={{...hasOutputParser, needsFallback...}}</input>
+\`\`\`
+→ hasOutputParser and needsFallback ARE connection-changing (they control which inputs appear)
+
+**Counter-example:**
+\`\`\`xml
+<properties>
+  <property name="promptType">...</property>  <!-- NOT in <input>/<output> -->
+  <property name="systemMessage">...</property>  <!-- NOT in <input>/<output> -->
+</properties>
+\`\`\`
+→ promptType and systemMessage are NOT connection-changing (they don't affect connections)
+
+**Common connection-changing parameters:**
+- Vector Store: mode (appears in <input>/<output> expressions)
+- AI Agent: hasOutputParser, needsFallback (appears in <input> expression)
+- Merge: numberInputs (appears in <input> expression)
+- Webhook: responseMode (appears in <output> expression)`;
+
+const DYNAMIC_OUTPUT_NODES = `<dynamic_output_nodes>
+Some nodes have DYNAMIC outputs that depend on parameter values:
+
+**Switch Node** (n8n-nodes-base.switch):
+- When mode is "rules", the number of outputs equals the number of routing rules
+- Connection parameter: mode: "rules" - CRITICAL for enabling rule-based routing
+- Each rule in rules.values[] creates one output
+- The rules parameter uses the same filter structure as IF node conditions
+- ALWAYS flag mode as connection-changing with possibleValues: ["rules", "expression"]
+
+**Merge Node** (n8n-nodes-base.merge):
+- numberInputs parameter controls how many inputs the node accepts
+
+When you find these nodes, ALWAYS flag mode/numberInputs as connection-changing parameters with possibleValues.
+</dynamic_output_nodes>`;
+
+const SUB_NODES_SEARCHES = `SUB-NODES SEARCHES:
+When searching for AI nodes, ALSO search for their required sub-nodes:
+- "AI Agent" → also search for "Chat Model", "Memory", "Output Parser"
+- "Basic LLM Chain" → also search for "Chat Model", "Output Parser"
+- "Vector Store" → also search for "Embeddings", "Document Loader"`;
+
+const STRUCTURED_OUTPUT_PARSER = `STRUCTURED OUTPUT PARSER - WHEN TO INCLUDE:
+Search for "Structured Output Parser" (@n8n/n8n-nodes-langchain.outputParserStructured) when:
+- AI output will be used programmatically (conditions, formatting, database storage, API calls)
+- AI needs to extract specific fields (e.g., score, category, priority, action items)
+- AI needs to classify/categorize data into defined categories
+- Downstream nodes need to access specific fields from AI response (e.g., $json.score, $json.category)
+- Output will be displayed in a formatted way (e.g., HTML email with specific sections)
+- Data needs validation against a schema before processing
+
+
+- Always use search_nodes to find the exact node names and versions - NEVER guess versions`;
+
+const CRITICAL_RULES = `CRITICAL RULES:
+- NEVER ask clarifying questions
+- ALWAYS call get_best_practices first
+- THEN Call search_nodes to learn about available nodes and their inputs and outputs
+- FINALLY call get_node_details IN PARALLEL for speed to get more details about RELVANT node
+- ALWAYS extract version number from <version> tag in node details
+- NEVER guess node versions - always use search_nodes to find exact versions
+- ONLY flag connectionChangingParameters if they appear in <input> or <output> expressions
+- If no parameters appear in connection expressions, return empty array []
+- Output ONLY: nodesFound with {{ nodeName, version, reasoning, connectionChangingParameters }}`;
+
+const RESTRICTIONS = `DO NOT:
+- Output text commentary between tool calls
+- Include bestPractices or categorization in submit_discovery_results
+- Flag parameters that don't affect connections
+- Stop without calling submit_discovery_results`;
+
+function generateAvailableToolsList(options: DiscoveryPromptOptions): string {
+	const { includeExamples } = options;
+
+	const tools = [
+		'- get_best_practices: Retrieve best practices (internal context)',
+		'- search_nodes: Find n8n nodes by keyword',
+		'- get_node_details: Get complete node information including <connections>',
+	];
+
+	if (includeExamples) {
+		tools.push('- get_workflow_examples: Search for workflow examples as reference');
+	}
+
+	tools.push('- submit_discovery_results: Submit final results');
+
+	return tools.join('\n');
+}
+
+function generateProcessSteps(options: DiscoveryPromptOptions): string {
+	const { includeExamples } = options;
+
+	const steps: string[] = [
+		'**Analyze user prompt** - Extract services, models, and technologies mentioned',
+		'**Call get_best_practices** with identified techniques (internal context)',
+	];
+
+	if (includeExamples) {
+		steps.push('**Call get_workflow_examples** with search queries for mentioned services/models');
+	}
+
+	const examplesContext = includeExamples ? ', and examples' : '';
+	steps.push(
+		`**Identify workflow components** from user request, best practices${examplesContext}`,
+		'**Call search_nodes IN PARALLEL** for all components (e.g., "Gmail", "OpenAI", "Schedule")',
+		'**Call get_node_details IN PARALLEL** for ALL promising nodes (batch multiple calls)',
+		`**Extract node information** from each node_details response:
+   - Node name from <name> tag
+   - Version number from <version> tag (required - extract the number)
+   - Connection-changing parameters from <connections> section`,
+		'**Call submit_discovery_results** with complete nodesFound array',
+	);
+
+	return steps.map((step, index) => `${index + 1}. ${step}`).join('\n');
+}
+
+export function buildDiscoveryPrompt(options: DiscoveryPromptOptions): string {
+	const availableTools = generateAvailableToolsList(options);
+	const processSteps = generateProcessSteps(options);
+
+	return [
+		DISCOVERY_ROLE,
+		`AVAILABLE TOOLS:\n${availableTools}`,
+		`PROCESS:\n${processSteps}`,
+		TECHNIQUE_CATEGORIZATION,
+		TECHNIQUE_CLARIFICATIONS,
+		CONNECTION_PARAMETERS,
+		DYNAMIC_OUTPUT_NODES,
+		SUB_NODES_SEARCHES,
+		STRUCTURED_OUTPUT_PARSER,
+		CRITICAL_RULES,
+		RESTRICTIONS,
+	].join('\n\n');
+}
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/prompts/agents/responder.prompt.ts b/packages/@n8n/ai-workflow-builder.ee/src/prompts/agents/responder.prompt.ts
new file mode 100644
index 00000000000..1da43cfa8e4
--- /dev/null
+++ b/packages/@n8n/ai-workflow-builder.ee/src/prompts/agents/responder.prompt.ts
@@ -0,0 +1,45 @@
+/**
+ * Responder Agent Prompt
+ *
+ * Synthesizes final user-facing responses from workflow building context.
+ * Also handles conversational queries and explanations.
+ */
+
+const RESPONDER_ROLE = `You are a helpful AI assistant for n8n workflow automation.
+
+You have access to context about what has been built, including:
+- Discovery results (nodes found)
+- Builder output (workflow structure)
+- Configuration summary (setup instructions)`;
+
+const WORKFLOW_COMPLETION = `FOR WORKFLOW COMPLETION RESPONSES:
+When you receive [Internal Context], synthesize a clean user-facing response:
+1. Summarize what was built in a friendly way
+2. Explain the workflow structure briefly
+3. Include setup instructions if provided
+4. Ask if user wants adjustments
+
+Example response structure:
+"I've created your [workflow type] workflow! Here's what it does:
+[Brief explanation of the flow]
+
+**Setup Required:**
+[List any configuration steps from the context]
+
+Let me know if you'd like to adjust anything."`;
+
+const CONVERSATIONAL_RESPONSES = `FOR QUESTIONS/CONVERSATIONS:
+- Be friendly and concise
+- Explain n8n capabilities when asked
+- Provide practical examples when helpful`;
+
+const RESPONSE_STYLE = `RESPONSE STYLE:
+- Keep responses focused and not overly long
+- Use markdown formatting for readability
+- Be conversational and helpful`;
+
+export function buildResponderPrompt(): string {
+	return [RESPONDER_ROLE, WORKFLOW_COMPLETION, CONVERSATIONAL_RESPONSES, RESPONSE_STYLE].join(
+		'\n\n',
+	);
+}
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/prompts/agents/supervisor.prompt.ts b/packages/@n8n/ai-workflow-builder.ee/src/prompts/agents/supervisor.prompt.ts
new file mode 100644
index 00000000000..458c91d2c4e
--- /dev/null
+++ b/packages/@n8n/ai-workflow-builder.ee/src/prompts/agents/supervisor.prompt.ts
@@ -0,0 +1,57 @@
+/**
+ * Supervisor Agent Prompt
+ *
+ * Handles INITIAL routing based on user intent.
+ * After initial routing, deterministic routing takes over based on coordination log.
+ */
+
+const SUPERVISOR_ROLE = 'You are a Supervisor that routes user requests to specialist agents.';
+
+const AVAILABLE_AGENTS = `AVAILABLE AGENTS:
+- discovery: Find n8n nodes for building/modifying workflows
+- builder: Create nodes and connections (requires discovery first for new node types)
+- configurator: Set parameters on EXISTING nodes (no structural changes)
+- responder: Answer questions, confirm completion (TERMINAL)`;
+
+const ROUTING_DECISION_TREE = `ROUTING DECISION TREE:
+
+1. Is user asking a question or chatting? → responder
+   Examples: "what does this do?", "explain the workflow", "thanks"
+
+2. Does the request involve NEW or DIFFERENT node types? → discovery
+   Examples:
+   - "Build a workflow that..." (new workflow)
+   - "Use [ServiceB] instead of [ServiceA]" (replacing node type)
+   - "Add [some integration]" (new integration)
+   - "Switch from [ServiceA] to [ServiceB]" (swapping services)
+
+3. Is the request about connecting/disconnecting existing nodes? → builder
+   Examples: "Connect node A to node B", "Remove the connection to X"
+
+4. Is the request about changing VALUES in existing nodes? → configurator
+   Examples:
+   - "Change the URL to https://..."
+   - "Set the timeout to 30 seconds"
+   - "Update the email subject to..."`;
+
+/** Clarifies replacement (discovery) vs configuration - common confusion point */
+const KEY_DISTINCTION = `KEY DISTINCTION:
+- "Use [ServiceB] instead of [ServiceA]" = REPLACEMENT = discovery (new node type needed)
+- "Change the [ServiceA] API key" = CONFIGURATION = configurator (same node, different value)`;
+
+const OUTPUT_FORMAT = `OUTPUT:
+- reasoning: One sentence explaining your routing decision
+- next: Agent name`;
+
+export function buildSupervisorPrompt(): string {
+	return [
+		SUPERVISOR_ROLE,
+		AVAILABLE_AGENTS,
+		ROUTING_DECISION_TREE,
+		KEY_DISTINCTION,
+		OUTPUT_FORMAT,
+	].join('\n\n');
+}
+
+export const SUPERVISOR_PROMPT_SUFFIX =
+	'\n\nGiven the conversation above, which agent should act next? Provide your reasoning and selection.';
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/prompts/chains/categorization.prompt.ts b/packages/@n8n/ai-workflow-builder.ee/src/prompts/chains/categorization.prompt.ts
new file mode 100644
index 00000000000..c51e6002663
--- /dev/null
+++ b/packages/@n8n/ai-workflow-builder.ee/src/prompts/chains/categorization.prompt.ts
@@ -0,0 +1,91 @@
+import { PromptTemplate } from '@langchain/core/prompts';
+
+import { WorkflowTechnique, TechniqueDescription } from '@/types/categorization';
+
+/** Few-shot examples for prompt categorization - helps LLM understand expected output format */
+export const examplePrompts = [
+	{
+		prompt: 'Monitor social channels for product mentions and auto-respond with campaign messages',
+		techniques: [
+			WorkflowTechnique.MONITORING,
+			WorkflowTechnique.CHATBOT,
+			WorkflowTechnique.CONTENT_GENERATION,
+		],
+	},
+	{
+		prompt: 'Collect partner referral submissions and verify client instances via BigQuery',
+		techniques: [
+			WorkflowTechnique.FORM_INPUT,
+			WorkflowTechnique.HUMAN_IN_THE_LOOP,
+			WorkflowTechnique.NOTIFICATION,
+		],
+	},
+	{
+		prompt: 'Scrape competitor pricing pages weekly and generate a summary report of changes',
+		techniques: [
+			WorkflowTechnique.SCHEDULING,
+			WorkflowTechnique.SCRAPING_AND_RESEARCH,
+			WorkflowTechnique.DATA_EXTRACTION,
+			WorkflowTechnique.DATA_ANALYSIS,
+		],
+	},
+	{
+		prompt: 'Process uploaded PDF contracts to extract client details and update CRM records',
+		techniques: [
+			WorkflowTechnique.DOCUMENT_PROCESSING,
+			WorkflowTechnique.DATA_EXTRACTION,
+			WorkflowTechnique.DATA_TRANSFORMATION,
+			WorkflowTechnique.ENRICHMENT,
+		],
+	},
+	{
+		prompt: 'Build a searchable internal knowledge base from past support tickets',
+		techniques: [
+			WorkflowTechnique.DATA_TRANSFORMATION,
+			WorkflowTechnique.DATA_ANALYSIS,
+			WorkflowTechnique.KNOWLEDGE_BASE,
+		],
+	},
+];
+
+/** Formats example prompts as "prompt → techniques" for few-shot learning */
+export function formatExamplePrompts(): string {
+	return examplePrompts
+		.map((example) => `- ${example.prompt} → ${example.techniques.join(',')}`)
+		.join('\n');
+}
+
+/** Generates bullet list of all techniques with descriptions */
+export function formatTechniqueList(): string {
+	return Object.entries(TechniqueDescription)
+		.map(([key, description]) => `- **${key}**: ${description}`)
+		.join('\n');
+}
+
+/** Template for analyzing user prompts and identifying workflow techniques */
+export const promptCategorizationTemplate = PromptTemplate.fromTemplate(
+	`Analyze the following user prompt and identify the workflow techniques required to fulfill the request.
+Be specific and identify all relevant techniques.
+
+<user_prompt>
+{userPrompt}
+</user_prompt>
+
+<workflow_techniques>
+{techniques}
+</workflow_techniques>
+
+The following prompt categorization examples show a prompt → techniques involved to provide a sense
+of how the categorization should be carried out.
+<example_categorization>
+${formatExamplePrompts()}
+</example_categorization>
+
+Select a maximum of 5 techniques that you believe are applicable, but only select them if you are
+confident that they are applicable. If the prompt is ambiguous or does not provide an obvious workflow
+do not provide any techniques - if confidence is low avoid providing techniques.
+
+Select ALL techniques that apply to this workflow. Most workflows use multiple techniques.
+Rate your confidence in this categorization from 0.0 to 1.0.
+`,
+);
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/prompts/chains/compact.prompt.ts b/packages/@n8n/ai-workflow-builder.ee/src/prompts/chains/compact.prompt.ts
new file mode 100644
index 00000000000..38d88854223
--- /dev/null
+++ b/packages/@n8n/ai-workflow-builder.ee/src/prompts/chains/compact.prompt.ts
@@ -0,0 +1,16 @@
+import { PromptTemplate } from '@langchain/core/prompts';
+
+/** Template for summarizing multi-turn conversations into a structured format */
+export const compactPromptTemplate = PromptTemplate.fromTemplate(
+	`Please summarize the following conversation between a user and an AI assistant building an n8n workflow:
+
+<previous_summary>
+{previousSummary}
+</previous_summary>
+
+<conversation>
+{conversationText}
+</conversation>
+
+Provide a structured summary that captures the key points, decisions made, current state of the workflow, and suggested next steps.`,
+);
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/chains/prompts/base/common-patterns.ts b/packages/@n8n/ai-workflow-builder.ee/src/prompts/chains/parameter-updater/base/common-patterns.ts
similarity index 100%
rename from packages/@n8n/ai-workflow-builder.ee/src/chains/prompts/base/common-patterns.ts
rename to packages/@n8n/ai-workflow-builder.ee/src/prompts/chains/parameter-updater/base/common-patterns.ts
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/chains/prompts/base/core-instructions.ts b/packages/@n8n/ai-workflow-builder.ee/src/prompts/chains/parameter-updater/base/core-instructions.ts
similarity index 100%
rename from packages/@n8n/ai-workflow-builder.ee/src/chains/prompts/base/core-instructions.ts
rename to packages/@n8n/ai-workflow-builder.ee/src/prompts/chains/parameter-updater/base/core-instructions.ts
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/chains/prompts/base/expression-rules.ts b/packages/@n8n/ai-workflow-builder.ee/src/prompts/chains/parameter-updater/base/expression-rules.ts
similarity index 100%
rename from packages/@n8n/ai-workflow-builder.ee/src/chains/prompts/base/expression-rules.ts
rename to packages/@n8n/ai-workflow-builder.ee/src/prompts/chains/parameter-updater/base/expression-rules.ts
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/chains/prompts/base/output-format.ts b/packages/@n8n/ai-workflow-builder.ee/src/prompts/chains/parameter-updater/base/output-format.ts
similarity index 100%
rename from packages/@n8n/ai-workflow-builder.ee/src/chains/prompts/base/output-format.ts
rename to packages/@n8n/ai-workflow-builder.ee/src/prompts/chains/parameter-updater/base/output-format.ts
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/chains/prompts/examples/advanced/resource-locator-examples.ts b/packages/@n8n/ai-workflow-builder.ee/src/prompts/chains/parameter-updater/examples/advanced/resource-locator-examples.ts
similarity index 100%
rename from packages/@n8n/ai-workflow-builder.ee/src/chains/prompts/examples/advanced/resource-locator-examples.ts
rename to packages/@n8n/ai-workflow-builder.ee/src/prompts/chains/parameter-updater/examples/advanced/resource-locator-examples.ts
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/chains/prompts/examples/advanced/tool-node-examples.ts b/packages/@n8n/ai-workflow-builder.ee/src/prompts/chains/parameter-updater/examples/advanced/tool-node-examples.ts
similarity index 100%
rename from packages/@n8n/ai-workflow-builder.ee/src/chains/prompts/examples/advanced/tool-node-examples.ts
rename to packages/@n8n/ai-workflow-builder.ee/src/prompts/chains/parameter-updater/examples/advanced/tool-node-examples.ts
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/chains/prompts/examples/basic/if-node-examples.ts b/packages/@n8n/ai-workflow-builder.ee/src/prompts/chains/parameter-updater/examples/basic/if-node-examples.ts
similarity index 100%
rename from packages/@n8n/ai-workflow-builder.ee/src/chains/prompts/examples/basic/if-node-examples.ts
rename to packages/@n8n/ai-workflow-builder.ee/src/prompts/chains/parameter-updater/examples/basic/if-node-examples.ts
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/chains/prompts/examples/basic/set-node-examples.ts b/packages/@n8n/ai-workflow-builder.ee/src/prompts/chains/parameter-updater/examples/basic/set-node-examples.ts
similarity index 100%
rename from packages/@n8n/ai-workflow-builder.ee/src/chains/prompts/examples/basic/set-node-examples.ts
rename to packages/@n8n/ai-workflow-builder.ee/src/prompts/chains/parameter-updater/examples/basic/set-node-examples.ts
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/chains/prompts/examples/basic/simple-updates.ts b/packages/@n8n/ai-workflow-builder.ee/src/prompts/chains/parameter-updater/examples/basic/simple-updates.ts
similarity index 100%
rename from packages/@n8n/ai-workflow-builder.ee/src/chains/prompts/examples/basic/simple-updates.ts
rename to packages/@n8n/ai-workflow-builder.ee/src/prompts/chains/parameter-updater/examples/basic/simple-updates.ts
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/chains/prompts/examples/basic/switch-node-examples.ts b/packages/@n8n/ai-workflow-builder.ee/src/prompts/chains/parameter-updater/examples/basic/switch-node-examples.ts
similarity index 100%
rename from packages/@n8n/ai-workflow-builder.ee/src/chains/prompts/examples/basic/switch-node-examples.ts
rename to packages/@n8n/ai-workflow-builder.ee/src/prompts/chains/parameter-updater/examples/basic/switch-node-examples.ts
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/prompts/chains/parameter-updater/index.ts b/packages/@n8n/ai-workflow-builder.ee/src/prompts/chains/parameter-updater/index.ts
new file mode 100644
index 00000000000..d78bd6f28cd
--- /dev/null
+++ b/packages/@n8n/ai-workflow-builder.ee/src/prompts/chains/parameter-updater/index.ts
@@ -0,0 +1,26 @@
+export { ParameterUpdatePromptBuilder } from './prompt-builder';
+export { instanceUrlPrompt } from './instance-url';
+export {
+	DEFAULT_PROMPT_CONFIG,
+	getNodeTypeCategory,
+	mentionsResourceKeywords,
+	mentionsTextKeywords,
+} from './prompt-config';
+
+// Base prompts
+export { CORE_INSTRUCTIONS } from './base/core-instructions';
+export { EXPRESSION_RULES } from './base/expression-rules';
+export { COMMON_PATTERNS } from './base/common-patterns';
+export { OUTPUT_FORMAT } from './base/output-format';
+
+// Node type guides
+export { SET_NODE_GUIDE } from './node-types/set-node';
+export { IF_NODE_GUIDE } from './node-types/if-node';
+export { SWITCH_NODE_GUIDE } from './node-types/switch-node';
+export { HTTP_REQUEST_GUIDE } from './node-types/http-request';
+export { TOOL_NODES_GUIDE } from './node-types/tool-nodes';
+
+// Parameter type guides
+export { RESOURCE_LOCATOR_GUIDE } from './parameter-types/resource-locator';
+export { SYSTEM_MESSAGE_GUIDE } from './parameter-types/system-message';
+export { TEXT_FIELDS_GUIDE } from './parameter-types/text-fields';
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/chains/prompts/instance-url.ts b/packages/@n8n/ai-workflow-builder.ee/src/prompts/chains/parameter-updater/instance-url.ts
similarity index 100%
rename from packages/@n8n/ai-workflow-builder.ee/src/chains/prompts/instance-url.ts
rename to packages/@n8n/ai-workflow-builder.ee/src/prompts/chains/parameter-updater/instance-url.ts
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/chains/prompts/node-types/http-request.ts b/packages/@n8n/ai-workflow-builder.ee/src/prompts/chains/parameter-updater/node-types/http-request.ts
similarity index 100%
rename from packages/@n8n/ai-workflow-builder.ee/src/chains/prompts/node-types/http-request.ts
rename to packages/@n8n/ai-workflow-builder.ee/src/prompts/chains/parameter-updater/node-types/http-request.ts
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/chains/prompts/node-types/if-node.ts b/packages/@n8n/ai-workflow-builder.ee/src/prompts/chains/parameter-updater/node-types/if-node.ts
similarity index 100%
rename from packages/@n8n/ai-workflow-builder.ee/src/chains/prompts/node-types/if-node.ts
rename to packages/@n8n/ai-workflow-builder.ee/src/prompts/chains/parameter-updater/node-types/if-node.ts
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/chains/prompts/node-types/set-node.ts b/packages/@n8n/ai-workflow-builder.ee/src/prompts/chains/parameter-updater/node-types/set-node.ts
similarity index 100%
rename from packages/@n8n/ai-workflow-builder.ee/src/chains/prompts/node-types/set-node.ts
rename to packages/@n8n/ai-workflow-builder.ee/src/prompts/chains/parameter-updater/node-types/set-node.ts
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/chains/prompts/node-types/switch-node.ts b/packages/@n8n/ai-workflow-builder.ee/src/prompts/chains/parameter-updater/node-types/switch-node.ts
similarity index 100%
rename from packages/@n8n/ai-workflow-builder.ee/src/chains/prompts/node-types/switch-node.ts
rename to packages/@n8n/ai-workflow-builder.ee/src/prompts/chains/parameter-updater/node-types/switch-node.ts
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/chains/prompts/node-types/tool-nodes.ts b/packages/@n8n/ai-workflow-builder.ee/src/prompts/chains/parameter-updater/node-types/tool-nodes.ts
similarity index 100%
rename from packages/@n8n/ai-workflow-builder.ee/src/chains/prompts/node-types/tool-nodes.ts
rename to packages/@n8n/ai-workflow-builder.ee/src/prompts/chains/parameter-updater/node-types/tool-nodes.ts
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/chains/prompts/parameter-types/resource-locator.ts b/packages/@n8n/ai-workflow-builder.ee/src/prompts/chains/parameter-updater/parameter-types/resource-locator.ts
similarity index 100%
rename from packages/@n8n/ai-workflow-builder.ee/src/chains/prompts/parameter-types/resource-locator.ts
rename to packages/@n8n/ai-workflow-builder.ee/src/prompts/chains/parameter-updater/parameter-types/resource-locator.ts
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/chains/prompts/parameter-types/system-message.ts b/packages/@n8n/ai-workflow-builder.ee/src/prompts/chains/parameter-updater/parameter-types/system-message.ts
similarity index 100%
rename from packages/@n8n/ai-workflow-builder.ee/src/chains/prompts/parameter-types/system-message.ts
rename to packages/@n8n/ai-workflow-builder.ee/src/prompts/chains/parameter-updater/parameter-types/system-message.ts
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/chains/prompts/parameter-types/text-fields.ts b/packages/@n8n/ai-workflow-builder.ee/src/prompts/chains/parameter-updater/parameter-types/text-fields.ts
similarity index 100%
rename from packages/@n8n/ai-workflow-builder.ee/src/chains/prompts/parameter-types/text-fields.ts
rename to packages/@n8n/ai-workflow-builder.ee/src/prompts/chains/parameter-updater/parameter-types/text-fields.ts
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/chains/prompts/prompt-builder.ts b/packages/@n8n/ai-workflow-builder.ee/src/prompts/chains/parameter-updater/prompt-builder.ts
similarity index 99%
rename from packages/@n8n/ai-workflow-builder.ee/src/chains/prompts/prompt-builder.ts
rename to packages/@n8n/ai-workflow-builder.ee/src/prompts/chains/parameter-updater/prompt-builder.ts
index 70f7f3c249b..d6319693914 100644
--- a/packages/@n8n/ai-workflow-builder.ee/src/chains/prompts/prompt-builder.ts
+++ b/packages/@n8n/ai-workflow-builder.ee/src/prompts/chains/parameter-updater/prompt-builder.ts
@@ -1,5 +1,7 @@
 import type { INodeTypeDescription, INodeProperties } from 'n8n-workflow';
 
+import type { PromptBuilderContext } from '@/types/config';
+
 import { COMMON_PATTERNS } from './base/common-patterns';
 import { CORE_INSTRUCTIONS } from './base/core-instructions';
 import { EXPRESSION_RULES } from './base/expression-rules';
@@ -23,7 +25,6 @@ import {
 	getNodeTypeCategory,
 	mentionsResourceKeywords,
 } from './prompt-config';
-import type { PromptBuilderContext } from '../../types/config';
 
 export class ParameterUpdatePromptBuilder {
 	/**
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/chains/prompts/prompt-config.ts b/packages/@n8n/ai-workflow-builder.ee/src/prompts/chains/parameter-updater/prompt-config.ts
similarity index 96%
rename from packages/@n8n/ai-workflow-builder.ee/src/chains/prompts/prompt-config.ts
rename to packages/@n8n/ai-workflow-builder.ee/src/prompts/chains/parameter-updater/prompt-config.ts
index 31a3976215b..b2d20c56bf7 100644
--- a/packages/@n8n/ai-workflow-builder.ee/src/chains/prompts/prompt-config.ts
+++ b/packages/@n8n/ai-workflow-builder.ee/src/prompts/chains/parameter-updater/prompt-config.ts
@@ -1,4 +1,4 @@
-import type { NodePromptConfig } from '../../types/config';
+import type { NodePromptConfig } from '@/types/config';
 
 export const DEFAULT_PROMPT_CONFIG: NodePromptConfig = {
 	nodeTypePatterns: {
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/chains/prompts/test/prompt-builder.test.ts b/packages/@n8n/ai-workflow-builder.ee/src/prompts/chains/parameter-updater/test/prompt-builder.test.ts
similarity index 100%
rename from packages/@n8n/ai-workflow-builder.ee/src/chains/prompts/test/prompt-builder.test.ts
rename to packages/@n8n/ai-workflow-builder.ee/src/prompts/chains/parameter-updater/test/prompt-builder.test.ts
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/prompts/chains/workflow-name.prompt.ts b/packages/@n8n/ai-workflow-builder.ee/src/prompts/chains/workflow-name.prompt.ts
new file mode 100644
index 00000000000..7aadea22954
--- /dev/null
+++ b/packages/@n8n/ai-workflow-builder.ee/src/prompts/chains/workflow-name.prompt.ts
@@ -0,0 +1,13 @@
+import { PromptTemplate } from '@langchain/core/prompts';
+
+/** Template for generating descriptive workflow names from user prompts */
+export const workflowNamingPromptTemplate = PromptTemplate.fromTemplate(
+	`Based on the initial user prompt, please generate a name for the workflow that captures its essence and purpose.
+
+<initial_prompt>
+{initialPrompt}
+</initial_prompt>
+
+This name should be concise, descriptive, and suitable for a workflow that automates tasks related to the given prompt. The name should be in a format that is easy to read and understand. Do not include the word "workflow" in the name.
+`,
+);
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/prompts/index.ts b/packages/@n8n/ai-workflow-builder.ee/src/prompts/index.ts
new file mode 100644
index 00000000000..6bb2dc6c69f
--- /dev/null
+++ b/packages/@n8n/ai-workflow-builder.ee/src/prompts/index.ts
@@ -0,0 +1,56 @@
+/**
+ * Centralized prompts for AI Workflow Builder
+ *
+ * This directory contains all prompts used by the AI workflow builder agents and chains.
+ * Organization:
+ * - agents/ - Multi-agent system prompts (builder, configurator, discovery, etc.)
+ * - chains/ - Chain-level prompts (categorization, compact, workflow-name, parameter-updater)
+ * - legacy-agent.prompt.ts - Legacy single-agent mode prompt
+ */
+
+// Agent prompts (multi-agent system)
+export { buildBuilderPrompt } from './agents/builder.prompt';
+export {
+	buildDiscoveryPrompt,
+	formatTechniqueList,
+	formatExampleCategorizations,
+	type DiscoveryPromptOptions,
+} from './agents/discovery.prompt';
+export { buildConfiguratorPrompt, INSTANCE_URL_PROMPT } from './agents/configurator.prompt';
+export { buildSupervisorPrompt, SUPERVISOR_PROMPT_SUFFIX } from './agents/supervisor.prompt';
+export { buildResponderPrompt } from './agents/responder.prompt';
+
+// Legacy agent prompt (single-agent mode)
+export {
+	createMainAgentPrompt,
+	mainAgentPrompt,
+	type MainAgentPromptOptions,
+} from './legacy-agent.prompt';
+
+// Chain prompts
+export {
+	promptCategorizationTemplate,
+	examplePrompts,
+	formatExamplePrompts,
+	formatTechniqueList as formatCategorizationTechniqueList,
+} from './chains/categorization.prompt';
+export { compactPromptTemplate } from './chains/compact.prompt';
+export { workflowNamingPromptTemplate } from './chains/workflow-name.prompt';
+
+// Parameter updater prompts
+export {
+	ParameterUpdatePromptBuilder,
+	instanceUrlPrompt,
+	CORE_INSTRUCTIONS,
+	EXPRESSION_RULES,
+	COMMON_PATTERNS,
+	OUTPUT_FORMAT,
+	SET_NODE_GUIDE,
+	IF_NODE_GUIDE,
+	SWITCH_NODE_GUIDE,
+	HTTP_REQUEST_GUIDE,
+	TOOL_NODES_GUIDE,
+	RESOURCE_LOCATOR_GUIDE,
+	SYSTEM_MESSAGE_GUIDE,
+	TEXT_FIELDS_GUIDE,
+} from './chains/parameter-updater';
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/tools/prompts/main-agent.prompt.ts b/packages/@n8n/ai-workflow-builder.ee/src/prompts/legacy-agent.prompt.ts
similarity index 99%
rename from packages/@n8n/ai-workflow-builder.ee/src/tools/prompts/main-agent.prompt.ts
rename to packages/@n8n/ai-workflow-builder.ee/src/prompts/legacy-agent.prompt.ts
index ca0cf798cb5..c142798d547 100644
--- a/packages/@n8n/ai-workflow-builder.ee/src/tools/prompts/main-agent.prompt.ts
+++ b/packages/@n8n/ai-workflow-builder.ee/src/prompts/legacy-agent.prompt.ts
@@ -1,6 +1,6 @@
 import { ChatPromptTemplate } from '@langchain/core/prompts';
 
-import { instanceUrlPrompt } from '../../chains/prompts/instance-url';
+import { instanceUrlPrompt } from './chains/parameter-updater/instance-url';
 
 /**
  * Phase configuration for the workflow creation sequence
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/subgraphs/builder.subgraph.ts b/packages/@n8n/ai-workflow-builder.ee/src/subgraphs/builder.subgraph.ts
index 91aef3faa13..47cad888d00 100644
--- a/packages/@n8n/ai-workflow-builder.ee/src/subgraphs/builder.subgraph.ts
+++ b/packages/@n8n/ai-workflow-builder.ee/src/subgraphs/builder.subgraph.ts
@@ -7,6 +7,7 @@ import type { Logger } from '@n8n/backend-common';
 import type { INodeTypeDescription } from 'n8n-workflow';
 
 import { LLMServiceError } from '@/errors';
+import { buildBuilderPrompt } from '@/prompts/agents/builder.prompt';
 import type { ChatPayload } from '@/workflow-builder-agent';
 
 import { BaseSubgraph } from './subgraph-interface';
@@ -34,234 +35,6 @@ import {
 	createStandardShouldContinue,
 } from '../utils/subgraph-helpers';
 
-/**
- * Builder Agent Prompt
- */
-const BUILDER_PROMPT = `You are a Builder Agent specialized in constructing n8n workflows.
-
-MANDATORY EXECUTION SEQUENCE:
-You MUST follow these steps IN ORDER. Do not skip any step.
-
-STEP 1: CREATE NODES
-- Call add_nodes for EVERY node needed based on discovery results
-- Create multiple nodes in PARALLEL for efficiency
-- Do NOT respond with text - START BUILDING immediately
-
-STEP 2: CONNECT NODES
-- Call connect_nodes for ALL required connections
-- Connect multiple node pairs in PARALLEL
-
-STEP 3: VALIDATE (REQUIRED)
-- After ALL nodes and connections are created, call validate_structure
-- This step is MANDATORY - you cannot finish without it
-- If validation finds issues (missing trigger, invalid connections), fix them and validate again
-- MAXIMUM 3 VALIDATION ATTEMPTS: After 3 calls to validate_structure, proceed to respond regardless of remaining issues
-
-STEP 4: RESPOND TO USER
-- Only after validation passes, provide your brief summary
-
-⚠️ NEVER respond to the user without calling validate_structure first ⚠️
-
-NODE CREATION:
-Each add_nodes call creates ONE node. You must provide:
-- nodeType: The exact type from discovery (e.g., "n8n-nodes-base.httpRequest")
-- name: Descriptive name (e.g., "Fetch Weather Data")
-- connectionParametersReasoning: Explain your thinking about connection parameters
-- connectionParameters: Parameters that affect connections (or {{}} if none needed)
-
-<workflow_configuration_node>
-Always include a Workflow Configuration node at the start of every workflow.
-
-The Workflow Configuration node (n8n-nodes-base.set) should be placed immediately after the trigger node and before all other processing nodes.
-
-Placement rules:
-- Add between trigger and first processing node
-- Connect: Trigger → Workflow Configuration → First processing node
-- Name it "Workflow Configuration"
-</workflow_configuration_node>
-
-<data_parsing_strategy>
-For AI-generated structured data, prefer Structured Output Parser nodes over Code nodes.
-For binary file data, use Extract From File node to extract content from files before processing.
-Use Code nodes only for custom business logic beyond parsing.
-
-STRUCTURED OUTPUT PARSER RULE:
-When Discovery results include Structured Output Parser:
-1. Create the Structured Output Parser node
-2. Set AI Agent's hasOutputParser: true in connectionParameters
-3. Connect: Structured Output Parser → AI Agent (ai_outputParser connection)
-</data_parsing_strategy>
-
-<proactive_design>
-Anticipate workflow needs:
-- IF nodes for conditional logic when multiple outcomes exist
-- Set nodes for data transformation between incompatible formats
-- Schedule Triggers for recurring tasks
-- Error handling for external service calls
-
-NEVER use Split In Batches nodes.
-</proactive_design>
-
-<node_defaults_warning>
-CRITICAL: NEVER RELY ON DEFAULT PARAMETER VALUES FOR CONNECTIONS
-
-Default values often hide connection inputs/outputs. You MUST explicitly configure parameters that affect connections:
-- Vector Store: Mode parameter affects available connections - always set explicitly (e.g., mode: "insert", "retrieve", "retrieve-as-tool")
-- AI Agent: hasOutputParser default may not match your workflow needs
-- Document Loader: textSplittingMode affects whether it accepts a text splitter input
-
-ALWAYS check node details and set connectionParameters explicitly.
-</node_defaults_warning>
-
-CONNECTION PARAMETERS EXAMPLES:
-- Static nodes (HTTP Request, Set, Code): reasoning="Static inputs/outputs", parameters={{}}
-- AI Agent with structured output: reasoning="hasOutputParser enables ai_outputParser input for Structured Output Parser", parameters={{ hasOutputParser: true }}
-- Vector Store insert: reasoning="Insert mode requires document input", parameters={{ mode: "insert" }}
-- Document Loader custom: reasoning="Custom mode enables text splitter input", parameters={{ textSplittingMode: "custom" }}
-- Switch with routing rules: reasoning="Switch needs N outputs, creating N rules.values entries with outputKeys", parameters={{ mode: "rules", rules: {{ values: [...] }} }} - see <switch_node_pattern> for full structure
-
-<structured_output_parser_guidance>
-WHEN TO SET hasOutputParser: true on AI Agent:
-- Discovery found Structured Output Parser node → MUST set hasOutputParser: true
-- AI output will be used in conditions (IF/Switch nodes checking $json.field)
-- AI output will be formatted/displayed (HTML emails, reports with specific sections)
-- AI output will be stored in database/data tables with specific fields
-- AI is classifying, scoring, or extracting specific data fields
-</structured_output_parser_guidance>
-
-<node_connections_understanding>
-n8n connections flow from SOURCE (output) to TARGET (input).
-
-Regular data flow: Source node output → Target node input
-Example: HTTP Request → Set (HTTP Request is source, Set is target)
-
-AI sub-nodes PROVIDE capabilities, making them the SOURCE:
-- OpenAI Chat Model → AI Agent [ai_languageModel]
-- Calculator Tool → AI Agent [ai_tool]
-- Window Buffer Memory → AI Agent [ai_memory]
-- Token Splitter → Default Data Loader [ai_textSplitter]
-- Default Data Loader → Vector Store [ai_document]
-- Embeddings OpenAI → Vector Store [ai_embedding]
-</node_connections_understanding>
-
-<agent_node_distinction>
-Distinguish between two different agent node types:
-
-1. **AI Agent** (@n8n/n8n-nodes-langchain.agent)
-   - Main workflow node that orchestrates AI tasks
-   - Use for: Primary AI logic, chatbots, autonomous workflows
-
-2. **AI Agent Tool** (@n8n/n8n-nodes-langchain.agentTool)
-   - Sub-node that acts as a tool for another AI Agent
-   - Use for: Multi-agent systems where one agent calls another
-
-Default assumption: When discovery results include "agent", use AI Agent
-unless explicitly specified as "agent tool" or "sub-agent".
-</agent_node_distinction>
-
-<rag_workflow_pattern>
-For RAG (Retrieval-Augmented Generation) workflows:
-
-Main data flow:
-- Data source (e.g., HTTP Request) → Vector Store [main connection]
-
-AI capability connections:
-- Document Loader → Vector Store [ai_document]
-- Embeddings → Vector Store [ai_embedding]
-- Text Splitter → Document Loader [ai_textSplitter]
-
-Common mistake to avoid:
-- NEVER connect Document Loader to main data outputs
-- Document Loader is an AI sub-node that gives Vector Store document processing capability
-</rag_workflow_pattern>
-
-<switch_node_pattern>
-For Switch nodes with multiple routing paths:
-- The number of outputs is determined by the number of entries in rules.values[]
-- You MUST create the rules.values[] array with placeholder entries for each output branch
-- Each entry needs: conditions structure (with empty leftValue/rightValue) + renameOutput: true + descriptive outputKey
-- Configurator will fill in the actual condition values later
-- Use descriptive node names like "Route by Amount" or "Route by Status"
-
-Example connectionParameters for 3-way routing:
-{{
-  "mode": "rules",
-  "rules": {{
-    "values": [
-      {{
-        "conditions": {{
-          "options": {{ "caseSensitive": true, "leftValue": "", "typeValidation": "strict" }},
-          "conditions": [{{ "leftValue": "", "rightValue": "", "operator": {{ "type": "string", "operation": "equals" }} }}],
-          "combinator": "and"
-        }},
-        "renameOutput": true,
-        "outputKey": "Output 1 Name"
-      }},
-      {{
-        "conditions": {{
-          "options": {{ "caseSensitive": true, "leftValue": "", "typeValidation": "strict" }},
-          "conditions": [{{ "leftValue": "", "rightValue": "", "operator": {{ "type": "string", "operation": "equals" }} }}],
-          "combinator": "and"
-        }},
-        "renameOutput": true,
-        "outputKey": "Output 2 Name"
-      }},
-      {{
-        "conditions": {{
-          "options": {{ "caseSensitive": true, "leftValue": "", "typeValidation": "strict" }},
-          "conditions": [{{ "leftValue": "", "rightValue": "", "operator": {{ "type": "string", "operation": "equals" }} }}],
-          "combinator": "and"
-        }},
-        "renameOutput": true,
-        "outputKey": "Output 3 Name"
-      }}
-    ]
-  }}
-}}
-</switch_node_pattern>
-
-<connection_type_examples>
-**Main Connections** (regular data flow):
-- Trigger → HTTP Request → Set → Email
-
-**AI Language Model Connections** (ai_languageModel):
-- OpenAI Chat Model → AI Agent
-
-**AI Tool Connections** (ai_tool):
-- Calculator Tool → AI Agent
-- AI Agent Tool → AI Agent (for multi-agent systems)
-
-**AI Document Connections** (ai_document):
-- Document Loader → Vector Store
-
-**AI Embedding Connections** (ai_embedding):
-- OpenAI Embeddings → Vector Store
-
-**AI Text Splitter Connections** (ai_textSplitter):
-- Token Text Splitter → Document Loader
-
-**AI Memory Connections** (ai_memory):
-- Window Buffer Memory → AI Agent
-
-**AI Vector Store in retrieve-as-tool mode** (ai_tool):
-- Vector Store → AI Agent
-</connection_type_examples>
-
-DO NOT:
-- Respond before calling validate_structure
-- Skip validation even if you think structure is correct
-- Add commentary between tool calls - execute tools silently
-- Configure node parameters (that's the Configurator Agent's job)
-- Search for nodes (that's the Discovery Agent's job)
-- Make assumptions about node types - use exactly what Discovery found
-
-RESPONSE FORMAT (only after validation):
-Provide ONE brief text message summarizing:
-- What nodes were added
-- How they're connected
-
-Example: "Created 4 nodes: Trigger → Weather → Image Generation → Email"`;
-
 /**
  * Builder Subgraph State
  */
@@ -337,7 +110,7 @@ export class BuilderSubgraph extends BaseSubgraph<
 				[
 					{
 						type: 'text',
-						text: BUILDER_PROMPT,
+						text: buildBuilderPrompt(),
 						cache_control: { type: 'ephemeral' },
 					},
 				],
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/subgraphs/configurator.subgraph.ts b/packages/@n8n/ai-workflow-builder.ee/src/subgraphs/configurator.subgraph.ts
index 3d9c83a562d..747309c4a96 100644
--- a/packages/@n8n/ai-workflow-builder.ee/src/subgraphs/configurator.subgraph.ts
+++ b/packages/@n8n/ai-workflow-builder.ee/src/subgraphs/configurator.subgraph.ts
@@ -8,6 +8,7 @@ import type { Logger } from '@n8n/backend-common';
 import type { INodeTypeDescription } from 'n8n-workflow';
 
 import { LLMServiceError } from '@/errors';
+import { buildConfiguratorPrompt, INSTANCE_URL_PROMPT } from '@/prompts/agents/configurator.prompt';
 
 import { BaseSubgraph } from './subgraph-interface';
 import type { ParentGraphState } from '../parent-graph-state';
@@ -33,126 +34,6 @@ import {
 } from '../utils/subgraph-helpers';
 import type { ChatPayload } from '../workflow-builder-agent';
 
-/**
- * Configurator Agent Prompt
- */
-const CONFIGURATOR_PROMPT = `You are a Configurator Agent specialized in setting up n8n node parameters.
-
-MANDATORY EXECUTION SEQUENCE:
-You MUST follow these steps IN ORDER. Do not skip any step.
-
-STEP 1: CONFIGURE ALL NODES
-- Call update_node_parameters for EVERY node in the workflow
-- Configure multiple nodes in PARALLEL for efficiency
-- Do NOT respond with text - START CONFIGURING immediately
-
-STEP 2: VALIDATE (REQUIRED)
-- After ALL configurations complete, call validate_configuration
-- This step is MANDATORY - you cannot finish without it
-- If validation finds issues, fix them and validate again
-- MAXIMUM 3 VALIDATION ATTEMPTS: After 3 calls to validate_configuration, proceed to respond regardless of remaining issues
-
-STEP 3: RESPOND TO USER
-- Only after validation passes, provide your response
-
-NEVER respond to the user without calling validate_configuration first
-
-WORKFLOW JSON DETECTION:
-- You receive <current_workflow_json> in your context
-- If you see nodes in the workflow JSON, you MUST configure them IMMEDIATELY
-- Look at the workflow JSON, identify each node, and call update_node_parameters for ALL of them
-
-PARAMETER CONFIGURATION:
-Use update_node_parameters with natural language instructions:
-- "Set URL to https://api.example.com/weather"
-- "Add header Authorization: Bearer token"
-- "Set method to POST"
-- "Add field 'status' with value 'processed'"
-
-SPECIAL EXPRESSIONS FOR TOOL NODES:
-Tool nodes (types ending in "Tool") support $fromAI expressions:
-- "Set sendTo to ={{ $fromAI('to') }}"
-- "Set subject to ={{ $fromAI('subject') }}"
-- "Set message to ={{ $fromAI('message_html') }}"
-- "Set timeMin to ={{ $fromAI('After', '', 'string') }}"
-
-$fromAI syntax: ={{ $fromAI('key', 'description', 'type', defaultValue) }}
-- ONLY use in tool nodes (check node type ends with "Tool")
-- Use for dynamic values that AI determines at runtime
-- For regular nodes, use static values or standard expressions
-
-CRITICAL PARAMETERS TO ALWAYS SET:
-- HTTP Request: URL, method, headers (if auth needed)
-- Set node: Fields to set with values
-- Code node: The actual code to execute
-- IF node: Conditions to check
-- Switch node: Configure rules.values[] with conditions for each output branch (uses same filter structure as IF node)
-- Document Loader: dataType parameter ('binary' for files like PDF, 'json' for JSON data)
-- AI nodes: Prompts, models, configurations
-- Tool nodes: Use $fromAI for dynamic recipient/subject/message fields
-
-NEVER RELY ON DEFAULT VALUES:
-Defaults are traps that cause runtime failures. Examples:
-- Document Loader defaults to 'json' but MUST be 'binary' when processing files
-- HTTP Request defaults to GET but APIs often need POST
-- Vector Store mode affects available connections - set explicitly (retrieve-as-tool when using with AI Agent)
-
-<switch_node_configuration>
-Switch nodes require configuring rules.values[] array - each entry creates one output:
-
-Structure per rule:
-{{
-  "conditions": {{
-    "options": {{ "caseSensitive": true, "leftValue": "", "typeValidation": "strict" }},
-    "conditions": [
-      {{
-        "leftValue": "={{{{ $json.fieldName }}}}",
-        "rightValue": <value>,
-        "operator": {{ "type": "number|string", "operation": "lt|gt|equals|etc" }}
-      }}
-    ],
-    "combinator": "and"
-  }},
-  "renameOutput": true,
-  "outputKey": "Descriptive Label"
-}}
-
-For numeric ranges (e.g., $100-$1000):
-- Use TWO conditions with combinator: "and"
-- First: gte (greater than or equal)
-- Second: lte (less than or equal)
-
-Always set renameOutput: true and provide descriptive outputKey labels.
-</switch_node_configuration>
-
-<response_format>
-After validation passes, provide a concise summary:
-- List any placeholders requiring user configuration (e.g., "URL placeholder needs actual endpoint")
-- Note which nodes were configured and key settings applied
-- Keep it brief - this output is used for coordination with other LLM agents, not displayed directly to users
-</response_format>
-
-DO NOT:
-- Respond before calling validate_configuration
-- Skip validation even if you think configuration is correct
-- Add commentary between tool calls - execute tools silently`;
-
-/**
- * Instance URL prompt template
- */
-const INSTANCE_URL_PROMPT = `
-<instance_url>
-The n8n instance base URL is: {instanceUrl}
-
-This URL is essential for webhook nodes and chat triggers as it provides the base URL for:
-- Webhook URLs that external services need to call
-- Chat trigger URLs for conversational interfaces
-- Any node that requires the full instance URL to generate proper callback URLs
-
-When working with webhook or chat trigger nodes, use this URL as the base for constructing proper endpoint URLs.
-</instance_url>
-`;
-
 /**
  * Configurator Subgraph State
  */
@@ -243,7 +124,7 @@ export class ConfiguratorSubgraph extends BaseSubgraph<
 				[
 					{
 						type: 'text',
-						text: CONFIGURATOR_PROMPT,
+						text: buildConfiguratorPrompt(),
 					},
 					{
 						type: 'text',
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/subgraphs/discovery.subgraph.ts b/packages/@n8n/ai-workflow-builder.ee/src/subgraphs/discovery.subgraph.ts
index d0d9534011d..921d61fe4c0 100644
--- a/packages/@n8n/ai-workflow-builder.ee/src/subgraphs/discovery.subgraph.ts
+++ b/packages/@n8n/ai-workflow-builder.ee/src/subgraphs/discovery.subgraph.ts
@@ -11,10 +11,10 @@ import { z } from 'zod';
 
 import { LLMServiceError } from '@/errors';
 import {
-	TechniqueDescription,
-	WorkflowTechnique,
-	type WorkflowTechniqueType,
-} from '@/types/categorization';
+	buildDiscoveryPrompt,
+	formatTechniqueList,
+	formatExampleCategorizations,
+} from '@/prompts/agents/discovery.prompt';
 import type { BuilderFeatureFlags } from '@/workflow-builder-agent';
 
 import { BaseSubgraph } from './subgraph-interface';
@@ -31,136 +31,6 @@ import { buildWorkflowSummary, createContextMessage } from '../utils/context-bui
 import { appendArrayReducer, nodeConfigurationsReducer } from '../utils/state-reducers';
 import { executeSubgraphTools, extractUserRequest } from '../utils/subgraph-helpers';
 
-/**
- * Example categorizations to guide technique selection
- * Expanded with diverse examples to improve accuracy
- */
-const exampleCategorizations: Array<{
-	prompt: string;
-	techniques: WorkflowTechniqueType[];
-}> = [
-	{
-		prompt: 'Monitor social channels for product mentions and auto-respond with campaign messages',
-		techniques: [
-			WorkflowTechnique.MONITORING,
-			WorkflowTechnique.CHATBOT,
-			WorkflowTechnique.CONTENT_GENERATION,
-		],
-	},
-	{
-		prompt: 'Collect partner referral submissions and verify client instances via BigQuery',
-		techniques: [
-			WorkflowTechnique.FORM_INPUT,
-			WorkflowTechnique.HUMAN_IN_THE_LOOP,
-			WorkflowTechnique.NOTIFICATION,
-		],
-	},
-	{
-		prompt: 'Scrape competitor pricing pages weekly and generate a summary report of changes',
-		techniques: [
-			WorkflowTechnique.SCHEDULING,
-			WorkflowTechnique.SCRAPING_AND_RESEARCH,
-			WorkflowTechnique.DATA_EXTRACTION,
-			WorkflowTechnique.DATA_ANALYSIS,
-		],
-	},
-	{
-		prompt: 'Process uploaded PDF contracts to extract client details and update CRM records',
-		techniques: [
-			WorkflowTechnique.DOCUMENT_PROCESSING,
-			WorkflowTechnique.DATA_EXTRACTION,
-			WorkflowTechnique.DATA_TRANSFORMATION,
-			WorkflowTechnique.ENRICHMENT,
-		],
-	},
-	{
-		prompt: 'Build a searchable internal knowledge base from past support tickets',
-		techniques: [
-			WorkflowTechnique.DATA_TRANSFORMATION,
-			WorkflowTechnique.DATA_ANALYSIS,
-			WorkflowTechnique.KNOWLEDGE_BASE,
-		],
-	},
-	// Additional examples to address common misclassifications
-	{
-		prompt: 'Create an AI agent that writes and sends personalized emails to leads',
-		techniques: [WorkflowTechnique.CONTENT_GENERATION, WorkflowTechnique.NOTIFICATION],
-	},
-	{
-		prompt:
-			'Fetch trending topics from Google Trends and Reddit, select the best ones, and create social posts',
-		techniques: [
-			WorkflowTechnique.SCRAPING_AND_RESEARCH,
-			WorkflowTechnique.TRIAGE,
-			WorkflowTechnique.CONTENT_GENERATION,
-		],
-	},
-	{
-		prompt:
-			'Trigger when a new contact is created in HubSpot and enrich their profile with LinkedIn data',
-		techniques: [WorkflowTechnique.MONITORING, WorkflowTechnique.ENRICHMENT],
-	},
-	{
-		prompt: 'Get stock prices from financial APIs and analyze volatility patterns',
-		techniques: [WorkflowTechnique.SCRAPING_AND_RESEARCH, WorkflowTechnique.DATA_ANALYSIS],
-	},
-	{
-		prompt: 'Generate video reels from templates and auto-post to social media on schedule',
-		techniques: [
-			WorkflowTechnique.SCHEDULING,
-			WorkflowTechnique.DOCUMENT_PROCESSING,
-			WorkflowTechnique.CONTENT_GENERATION,
-		],
-	},
-	{
-		prompt: 'Receive news from Telegram channels, filter relevant ones, and forward to my channel',
-		techniques: [
-			WorkflowTechnique.MONITORING,
-			WorkflowTechnique.TRIAGE,
-			WorkflowTechnique.NOTIFICATION,
-		],
-	},
-	{
-		prompt: 'Analyze YouTube video performance data and generate a weekly report',
-		techniques: [
-			WorkflowTechnique.SCRAPING_AND_RESEARCH,
-			WorkflowTechnique.DATA_ANALYSIS,
-			WorkflowTechnique.DATA_TRANSFORMATION,
-		],
-	},
-	{
-		prompt:
-			'Create a chatbot that answers questions using data from a Google Sheet as knowledge base',
-		techniques: [WorkflowTechnique.CHATBOT, WorkflowTechnique.KNOWLEDGE_BASE],
-	},
-	{
-		prompt: 'Form submission with file upload triggers document extraction and approval workflow',
-		techniques: [
-			WorkflowTechnique.FORM_INPUT,
-			WorkflowTechnique.DOCUMENT_PROCESSING,
-			WorkflowTechnique.HUMAN_IN_THE_LOOP,
-		],
-	},
-];
-
-/**
- * Format technique descriptions for prompt
- */
-function formatTechniqueList(): string {
-	return Object.entries(TechniqueDescription)
-		.map(([key, description]) => `- **${key}**: ${description}`)
-		.join('\n');
-}
-
-/**
- * Format example categorizations for prompt
- */
-function formatExampleCategorizations(): string {
-	return exampleCategorizations
-		.map((example) => `- ${example.prompt} → ${example.techniques.join(', ')}`)
-		.join('\n');
-}
-
 /**
  * Strict Output Schema for Discovery
  * Simplified to reduce token usage while maintaining utility for downstream subgraphs
@@ -193,191 +63,6 @@ const discoveryOutputSchema = z.object({
 		.describe('List of n8n nodes identified as necessary for the workflow'),
 });
 
-interface DiscoveryPromptOptions {
-	includeExamples: boolean;
-}
-
-/**
- * Generate the process steps with proper numbering
- */
-function generateProcessSteps(options: DiscoveryPromptOptions): string {
-	const { includeExamples } = options;
-
-	const steps: string[] = [
-		'**Analyze user prompt** - Extract services, models, and technologies mentioned',
-		'**Call get_best_practices** with identified techniques (internal context)',
-	];
-
-	if (includeExamples) {
-		steps.push('**Call get_workflow_examples** with search queries for mentioned services/models');
-	}
-
-	const examplesContext = includeExamples ? ', and examples' : '';
-	steps.push(
-		`**Identify workflow components** from user request, best practices${examplesContext}`,
-		'**Call search_nodes IN PARALLEL** for all components (e.g., "Gmail", "OpenAI", "Schedule")',
-		'**Call get_node_details IN PARALLEL** for ALL promising nodes (batch multiple calls)',
-		`**Extract node information** from each node_details response:
-   - Node name from <name> tag
-   - Version number from <version> tag (required - extract the number)
-   - Connection-changing parameters from <connections> section`,
-		'**Call submit_discovery_results** with complete nodesFound array',
-	);
-
-	return steps.map((step, index) => `${index + 1}. ${step}`).join('\n');
-}
-
-/**
- * Generate available tools list based on feature flags
- */
-function generateAvailableToolsList(options: DiscoveryPromptOptions): string {
-	const { includeExamples } = options;
-
-	const tools = [
-		'- get_best_practices: Retrieve best practices (internal context)',
-		'- search_nodes: Find n8n nodes by keyword',
-		'- get_node_details: Get complete node information including <connections>',
-	];
-
-	if (includeExamples) {
-		tools.push('- get_workflow_examples: Search for workflow examples as reference');
-	}
-
-	tools.push('- submit_discovery_results: Submit final results');
-
-	return tools.join('\n');
-}
-
-/**
- * Discovery Agent Prompt
- */
-function generateDiscoveryPrompt(options: DiscoveryPromptOptions): string {
-	const availableTools = generateAvailableToolsList(options);
-	const processSteps = generateProcessSteps(options);
-
-	return `You are a Discovery Agent for n8n AI Workflow Builder.
-
-YOUR ROLE: Identify relevant n8n nodes and their connection-changing parameters.
-
-AVAILABLE TOOLS:
-${availableTools}
-
-PROCESS:
-${processSteps}
-
-TECHNIQUE CATEGORIZATION:
-When calling get_best_practices, select techniques that match the user's workflow intent.
-
-<available_techniques>
-{techniques}
-</available_techniques>
-
-<example_categorizations>
-{exampleCategorizations}
-</example_categorizations>
-
-<technique_clarifications>
-Common distinctions to get right:
-- **NOTIFICATION vs CHATBOT**: Use NOTIFICATION when SENDING emails/messages/alerts (including to Telegram CHANNELS which are broadcast-only). Use CHATBOT only when RECEIVING and REPLYING to direct messages in a conversation.
-- **MONITORING**: Use when workflow TRIGGERS on external events (new record created, status changed, incoming webhook, new message in channel). NOT just scheduled runs.
-- **SCRAPING_AND_RESEARCH vs DATA_EXTRACTION**: Use SCRAPING when fetching from EXTERNAL sources (APIs, websites, social media). Use DATA_EXTRACTION for parsing INTERNAL data you already have.
-- **TRIAGE**: Use when SELECTING, PRIORITIZING, ROUTING, or QUALIFYING items (e.g., "pick the best", "route to correct team", "qualify leads").
-- **DOCUMENT_PROCESSING**: Use for ANY file handling - PDFs, images, videos, Excel, Google Sheets, audio files, file uploads in forms.
-- **HUMAN_IN_THE_LOOP**: Use when workflow PAUSES for human approval, review, signing documents, responding to polls, or any manual input before continuing.
-- **DATA_ANALYSIS**: Use when ANALYZING, CLASSIFYING, IDENTIFYING PATTERNS, or UNDERSTANDING data (e.g., "analyze outcomes", "learn from previous", "classify by type", "identify trends").
-- **KNOWLEDGE_BASE**: Use when storing/retrieving from a DATA SOURCE for Q&A - includes vector DBs, spreadsheets used as databases, document collections.
-- **DATA_TRANSFORMATION**: Use when CONVERTING data format, creating REPORTS/SUMMARIES from analyzed data, or restructuring output.
-</technique_clarifications>
-
-Technique selection rules:
-- Select ALL techniques that apply (most workflows use 2-4)
-- Maximum 5 techniques
-- Only select techniques you're confident apply
-
-CONNECTION-CHANGING PARAMETERS - CRITICAL RULES:
-
-A parameter is connection-changing ONLY IF it appears in <input> or <output> expressions within <node_details>.
-
-**How to identify:**
-1. Look at the <connections> section in node details
-2. Check if <input> or <output> uses expressions like: ={{...parameterName...}}
-3. If a parameter is referenced in these expressions, it IS connection-changing
-4. If a parameter is NOT in <input>/<output> expressions, it is NOT connection-changing
-
-**Example from AI Agent:**
-\`\`\`xml
-<input>={{...hasOutputParser, needsFallback...}}</input>
-\`\`\`
-→ hasOutputParser and needsFallback ARE connection-changing (they control which inputs appear)
-
-**Counter-example:**
-\`\`\`xml
-<properties>
-  <property name="promptType">...</property>  <!-- NOT in <input>/<output> -->
-  <property name="systemMessage">...</property>  <!-- NOT in <input>/<output> -->
-</properties>
-\`\`\`
-→ promptType and systemMessage are NOT connection-changing (they don't affect connections)
-
-**Common connection-changing parameters:**
-- Vector Store: mode (appears in <input>/<output> expressions)
-- AI Agent: hasOutputParser, needsFallback (appears in <input> expression)
-- Merge: numberInputs (appears in <input> expression)
-- Webhook: responseMode (appears in <output> expression)
-
-<dynamic_output_nodes>
-Some nodes have DYNAMIC outputs that depend on parameter values:
-
-**Switch Node** (n8n-nodes-base.switch):
-- When mode is "rules", the number of outputs equals the number of routing rules
-- Connection parameter: mode: "rules" - CRITICAL for enabling rule-based routing
-- Each rule in rules.values[] creates one output
-- The rules parameter uses the same filter structure as IF node conditions
-- ALWAYS flag mode as connection-changing with possibleValues: ["rules", "expression"]
-
-**Merge Node** (n8n-nodes-base.merge):
-- numberInputs parameter controls how many inputs the node accepts
-
-When you find these nodes, ALWAYS flag mode/numberInputs as connection-changing parameters with possibleValues.
-</dynamic_output_nodes>
-
-SUB-NODES SEARCHES:
-When searching for AI nodes, ALSO search for their required sub-nodes:
-- "AI Agent" → also search for "Chat Model", "Memory", "Output Parser"
-- "Basic LLM Chain" → also search for "Chat Model", "Output Parser"
-- "Vector Store" → also search for "Embeddings", "Document Loader"
-
-STRUCTURED OUTPUT PARSER - WHEN TO INCLUDE:
-Search for "Structured Output Parser" (@n8n/n8n-nodes-langchain.outputParserStructured) when:
-- AI output will be used programmatically (conditions, formatting, database storage, API calls)
-- AI needs to extract specific fields (e.g., score, category, priority, action items)
-- AI needs to classify/categorize data into defined categories
-- Downstream nodes need to access specific fields from AI response (e.g., $json.score, $json.category)
-- Output will be displayed in a formatted way (e.g., HTML email with specific sections)
-- Data needs validation against a schema before processing
-
-
-- Always use search_nodes to find the exact node names and versions - NEVER guess versions
-
-CRITICAL RULES:
-- NEVER ask clarifying questions
-- ALWAYS call get_best_practices first
-- THEN Call search_nodes to learn about available nodes and their inputs and outputs
-- FINALLY call get_node_details IN PARALLEL for speed to get more details about RELVANT node
-- ALWAYS extract version number from <version> tag in node details
-- NEVER guess node versions - always use search_nodes to find exact versions
-- ONLY flag connectionChangingParameters if they appear in <input> or <output> expressions
-- If no parameters appear in connection expressions, return empty array []
-- Output ONLY: nodesFound with {{ nodeName, version, reasoning, connectionChangingParameters }}
-
-DO NOT:
-- Output text commentary between tool calls
-- Include bestPractices or categorization in submit_discovery_results
-- Flag parameters that don't affect connections
-- Stop without calling submit_discovery_results
-`;
-}
-
 /**
  * Discovery Subgraph State
  */
@@ -476,7 +161,7 @@ export class DiscoverySubgraph extends BaseSubgraph<
 		});
 
 		// Generate prompt based on feature flags
-		const discoveryPrompt = generateDiscoveryPrompt({ includeExamples });
+		const discoveryPrompt = buildDiscoveryPrompt({ includeExamples });
 
 		// Create agent with tools bound (including submit tool)
 		const systemPrompt = ChatPromptTemplate.fromMessages([
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/test/workflow-builder-agent.test.ts b/packages/@n8n/ai-workflow-builder.ee/src/test/workflow-builder-agent.test.ts
index 80c9384cb5f..22092414300 100644
--- a/packages/@n8n/ai-workflow-builder.ee/src/test/workflow-builder-agent.test.ts
+++ b/packages/@n8n/ai-workflow-builder.ee/src/test/workflow-builder-agent.test.ts
@@ -31,7 +31,7 @@ jest.mock('@/tools/update-node-parameters.tool', () => ({
 jest.mock('@/tools/get-node-parameter.tool', () => ({
 	createGetNodeParameterTool: jest.fn().mockReturnValue({ tool: { name: 'get_node_parameter' } }),
 }));
-jest.mock('@/tools/prompts/main-agent.prompt', () => ({
+jest.mock('@/prompts/legacy-agent.prompt', () => ({
 	mainAgentPrompt: {
 		invoke: jest.fn().mockResolvedValue('mocked prompt'),
 	},
@@ -67,7 +67,7 @@ Object.defineProperty(global, 'crypto', {
 
 import { MAX_AI_BUILDER_PROMPT_LENGTH } from '@/constants';
 import { ValidationError } from '@/errors';
-import { createMainAgentPrompt } from '@/tools/prompts/main-agent.prompt';
+import { createMainAgentPrompt } from '@/prompts/legacy-agent.prompt';
 import type { StreamOutput } from '@/types/streaming';
 import { createStreamProcessor } from '@/utils/stream-processor';
 import {
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/workflow-builder-agent.ts b/packages/@n8n/ai-workflow-builder.ee/src/workflow-builder-agent.ts
index 0b4c02c8383..6202724f094 100644
--- a/packages/@n8n/ai-workflow-builder.ee/src/workflow-builder-agent.ts
+++ b/packages/@n8n/ai-workflow-builder.ee/src/workflow-builder-agent.ts
@@ -19,6 +19,7 @@ import {
 	MAX_AI_BUILDER_PROMPT_LENGTH,
 	MAX_INPUT_TOKENS,
 } from '@/constants';
+import { createMainAgentPrompt } from '@/prompts/legacy-agent.prompt';
 import { trimWorkflowJSON } from '@/utils/trim-workflow-context';
 
 import { conversationCompactChain } from './chains/conversation-compact';
@@ -27,7 +28,6 @@ import { LLMServiceError, ValidationError, WorkflowStateError } from './errors';
 import { createMultiAgentWorkflowWithSubgraphs } from './multi-agent-workflow-subgraphs';
 import { SessionManagerService } from './session-manager.service';
 import { getBuilderTools } from './tools/builder-tools';
-import { createMainAgentPrompt } from './tools/prompts/main-agent.prompt';
 import type { SimpleWorkflow } from './types/workflow';
 import {
 	applyCacheControlMarkers,

From 7091bc780632fbbefaa66097f2c8f7f3289e69c3 Mon Sep 17 00:00:00 2001
From: Declan Carroll <declan@n8n.io>
Date: Fri, 5 Dec 2025 12:14:55 +0000
Subject: [PATCH 089/167] fix: AI session metadata call fix (#22775)

---
 .../features/ai/assistant/builder.store.ts    |  5 ++--
 ...ai-sessions-metadata-license-error.spec.ts | 24 +++++++++++++++++++
 2 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 packages/testing/playwright/tests/ui/regression/GHC-5776-ai-sessions-metadata-license-error.spec.ts

diff --git a/packages/frontend/editor-ui/src/features/ai/assistant/builder.store.ts b/packages/frontend/editor-ui/src/features/ai/assistant/builder.store.ts
index 49490cb8aef..2bbe440e681 100644
--- a/packages/frontend/editor-ui/src/features/ai/assistant/builder.store.ts
+++ b/packages/frontend/editor-ui/src/features/ai/assistant/builder.store.ts
@@ -542,11 +542,12 @@ export const useBuilderStore = defineStore(STORES.BUILDER, () => {
 	watch(
 		() => workflowsStore.workflowId,
 		(newWorkflowId) => {
-			// Only fetch if we have a valid workflow ID, and we're in a builder-enabled view
+			// Only fetch if we have a valid workflow ID, AI builder is enabled, and we're in a builder-enabled view
 			if (
 				newWorkflowId &&
 				newWorkflowId !== PLACEHOLDER_EMPTY_WORKFLOW_ID &&
-				BUILDER_ENABLED_VIEWS.includes(route.name as VIEWS)
+				BUILDER_ENABLED_VIEWS.includes(route.name as VIEWS) &&
+				isAIBuilderEnabled.value
 			) {
 				void fetchSessionsMetadata();
 			} else {
diff --git a/packages/testing/playwright/tests/ui/regression/GHC-5776-ai-sessions-metadata-license-error.spec.ts b/packages/testing/playwright/tests/ui/regression/GHC-5776-ai-sessions-metadata-license-error.spec.ts
new file mode 100644
index 00000000000..38e57f889e8
--- /dev/null
+++ b/packages/testing/playwright/tests/ui/regression/GHC-5776-ai-sessions-metadata-license-error.spec.ts
@@ -0,0 +1,24 @@
+import { test, expect } from '../../../fixtures/base';
+
+/**
+ * Regression test for GHC-5776
+ * https://linear.app/n8n/issue/GHC-5776/community-issue-plan-lacks-license-for-this-feature
+ *
+ * The AI builder was calling /rest/ai/sessions/metadata endpoint even when the
+ * AI builder feature was not licensed, causing 403 errors in the console.
+ * This test verifies that no such errors occur when navigating to the canvas.
+ */
+test.describe('GHC-5776: AI sessions metadata should not cause console errors', () => {
+	test('should not log license errors when navigating to canvas without AI builder license', async ({
+		n8n,
+	}) => {
+		await n8n.start.fromBlankCanvas();
+
+		// This is just to trigger the watch on the workflow id, which will trigger the fetch of the sessions metadata
+		await n8n.canvas.getOpenPublishModalButton().click();
+
+		const consoleMessages = await n8n.page.consoleMessages();
+		const errorMessages = consoleMessages.filter((msg) => msg.type() === 'error');
+		expect(errorMessages).toHaveLength(0);
+	});
+});

From 28c3018c954d26000ab6ed58aa693ec80d2b1110 Mon Sep 17 00:00:00 2001
From: Konstantin Tieber <46342664+konstantintieber@users.noreply.github.com>
Date: Fri, 5 Dec 2025 13:30:04 +0100
Subject: [PATCH 090/167] fix(core): Add version back to public settings
 (no-changelog) (#22804)

---
 .../src/services/__tests__/frontend.service.test.ts    | 10 ++++++----
 packages/cli/src/services/frontend.service.ts          |  3 +++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/packages/cli/src/services/__tests__/frontend.service.test.ts b/packages/cli/src/services/__tests__/frontend.service.test.ts
index 9da6558e4e2..1e7489eb514 100644
--- a/packages/cli/src/services/__tests__/frontend.service.test.ts
+++ b/packages/cli/src/services/__tests__/frontend.service.test.ts
@@ -202,6 +202,11 @@ describe('FrontendService', () => {
 
 	describe('getPublicSettings', () => {
 		it('should return public settings', () => {
+			const { service } = createMockService();
+			service.settings.versionCli = '1.123.0';
+
+			const settings = service.getPublicSettings();
+
 			const expectedPublicSettings: PublicFrontendSettings = {
 				settingsMode: 'public',
 				userManagement: {
@@ -209,6 +214,7 @@ describe('FrontendService', () => {
 					showSetupOnFirstLoad: true,
 					authenticationMethod: 'email',
 				},
+				versionCli: '1.123.0',
 				sso: {
 					saml: { loginEnabled: false },
 					ldap: { loginEnabled: false, loginLabel: '' },
@@ -221,10 +227,6 @@ describe('FrontendService', () => {
 				previewMode: false,
 				enterprise: { saml: false, ldap: false, oidc: false },
 			};
-
-			const { service } = createMockService();
-			const settings = service.getPublicSettings();
-
 			expect(settings).toEqual(expectedPublicSettings);
 		});
 	});
diff --git a/packages/cli/src/services/frontend.service.ts b/packages/cli/src/services/frontend.service.ts
index 36902840555..fa93d97af85 100644
--- a/packages/cli/src/services/frontend.service.ts
+++ b/packages/cli/src/services/frontend.service.ts
@@ -39,6 +39,8 @@ export type PublicFrontendSettings = {
 	/** Controls initialization flow in settings store */
 	settingsMode: FrontendSettings['settingsMode'];
 
+	versionCli: string;
+
 	/** Used to bypass authentication on the workflows/demo page */
 	previewMode: FrontendSettings['previewMode'];
 
@@ -540,6 +542,7 @@ export class FrontendService {
 					loginUrl: ssoOidc.loginUrl,
 				},
 			},
+			versionCli: this.settings.versionCli,
 			authCookie,
 			previewMode,
 			enterprise: { saml, ldap, oidc },

From 1d952014d8ae0c2096a0082ed5a882f449216850 Mon Sep 17 00:00:00 2001
From: Jaakko Husso <jaakko@n8n.io>
Date: Fri, 5 Dec 2025 15:01:54 +0200
Subject: [PATCH 091/167] refactor(core): Move the chat link (no-changelog)
 (#22812)

---
 .../src/app/components/MainSidebar.vue        | 11 ----------
 .../projects/components/ProjectNavigation.vue | 22 +++++++++++++++++++
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/packages/frontend/editor-ui/src/app/components/MainSidebar.vue b/packages/frontend/editor-ui/src/app/components/MainSidebar.vue
index acfa1a7ab19..efff1fc097f 100644
--- a/packages/frontend/editor-ui/src/app/components/MainSidebar.vue
+++ b/packages/frontend/editor-ui/src/app/components/MainSidebar.vue
@@ -28,7 +28,6 @@ import {
 	EXPERIMENT_TEMPLATES_DATA_QUALITY_KEY,
 } from '@/app/constants';
 import { EXTERNAL_LINKS } from '@/app/constants/externalLinks';
-import { CHAT_VIEW } from '@/features/ai/chatHub/constants';
 import { hasPermission } from '@/app/utils/rbac/permissions';
 import { useCloudPlanStore } from '@/app/stores/cloudPlan.store';
 import { useRootStore } from '@n8n/stores/useRootStore';
@@ -117,16 +116,6 @@ const mainMenuItems = computed<IMenuItem[]>(() => [
 		icon: 'cloud',
 		available: settingsStore.isCloudDeployment && hasPermission(['instanceOwner']),
 	},
-	{
-		id: 'chat',
-		icon: 'message-circle',
-		label: 'Chat',
-		position: 'bottom',
-		route: { to: { name: CHAT_VIEW } },
-		available:
-			settingsStore.isChatFeatureEnabled &&
-			hasPermission(['rbac'], { rbac: { scope: 'chatHub:message' } }),
-	},
 	{
 		// Link to in-app pre-built agent templates, available experiment is enabled
 		id: 'templates',
diff --git a/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectNavigation.vue b/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectNavigation.vue
index 0911e311243..c46d88eddca 100644
--- a/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectNavigation.vue
+++ b/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectNavigation.vue
@@ -9,8 +9,10 @@ import { useI18n } from '@n8n/i18n';
 import { computed, onBeforeMount, onBeforeUnmount } from 'vue';
 import { useProjectsStore } from '../projects.store';
 import type { ProjectListItem } from '../projects.types';
+import { CHAT_VIEW } from '@/features/ai/chatHub/constants';
 
 import { N8nButton, N8nHeading, N8nMenuItem, N8nTooltip } from '@n8n/design-system';
+import { hasPermission } from '@/app/utils/rbac/permissions';
 
 type Props = {
 	collapsed: boolean;
@@ -29,6 +31,11 @@ const usersStore = useUsersStore();
 const isCreatingProject = computed(() => globalEntityCreation.isCreatingProject.value);
 const displayProjects = computed(() => globalEntityCreation.displayProjects.value);
 const isFoldersFeatureEnabled = computed(() => settingsStore.isFoldersFeatureEnabled);
+const isChatLinkAvailable = computed(
+	() =>
+		settingsStore.isChatFeatureEnabled &&
+		hasPermission(['rbac'], { rbac: { scope: 'chatHub:message' } }),
+);
 const hasMultipleVerifiedUsers = computed(
 	() => usersStore.allUsers.filter((user) => !user.isPendingUser).length > 1,
 );
@@ -87,6 +94,14 @@ const activeTabId = computed(() => {
 	);
 });
 
+const chat = computed<IMenuItem>(() => ({
+	id: 'chat',
+	icon: 'message-circle',
+	label: 'Chat',
+	position: 'bottom',
+	route: { to: { name: CHAT_VIEW } },
+}));
+
 async function onSourceControlPull() {
 	// Update myProjects for the sidebar display
 	await projectsStore.getMyProjects();
@@ -128,6 +143,13 @@ onBeforeUnmount(() => {
 				:active="activeTabId === 'shared'"
 				data-test-id="project-shared-menu-item"
 			/>
+			<N8nMenuItem
+				v-if="isChatLinkAvailable"
+				:item="chat"
+				:compact="props.collapsed"
+				:active="activeTabId === 'chat'"
+				data-test-id="project-chat-menu-item"
+			/>
 		</div>
 		<N8nHeading
 			v-if="!props.collapsed && projectsStore.isTeamProjectFeatureEnabled"

From 4b1e0ce796d50367450eb6be13af7cf7d98219e8 Mon Sep 17 00:00:00 2001
From: oleg <me@olegivaniv.com>
Date: Fri, 5 Dec 2025 14:24:24 +0100
Subject: [PATCH 092/167] chore(ai-builder): Use isAIMessage for LangGraph v1
 compatibility (no-changelog) (#22807)

---
 .../@n8n/ai-workflow-builder.ee/src/workflow-builder-agent.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/@n8n/ai-workflow-builder.ee/src/workflow-builder-agent.ts b/packages/@n8n/ai-workflow-builder.ee/src/workflow-builder-agent.ts
index 6202724f094..b11858f1f9c 100644
--- a/packages/@n8n/ai-workflow-builder.ee/src/workflow-builder-agent.ts
+++ b/packages/@n8n/ai-workflow-builder.ee/src/workflow-builder-agent.ts
@@ -1,6 +1,6 @@
 import type { BaseChatModel } from '@langchain/core/language_models/chat_models';
 import type { ToolMessage } from '@langchain/core/messages';
-import { AIMessage, HumanMessage, RemoveMessage } from '@langchain/core/messages';
+import { AIMessage, HumanMessage, isAIMessage, RemoveMessage } from '@langchain/core/messages';
 import type { RunnableConfig } from '@langchain/core/runnables';
 import type { LangChainTracer } from '@langchain/core/tracers/tracer_langchain';
 import type { MemorySaver, StateSnapshot } from '@langchain/langgraph';
@@ -287,7 +287,7 @@ export class WorkflowBuilderAgent {
 
 		const shouldContinue = ({ messages }: typeof WorkflowState.State) => {
 			const lastMessage = messages[messages.length - 1];
-			if (!(lastMessage instanceof AIMessage)) {
+			if (!lastMessage || !isAIMessage(lastMessage)) {
 				throw new WorkflowStateError('Expected last message to be generated by the AI agent');
 			}
 

From 5c5de5c7ae0cebc85676187295272036268f1c03 Mon Sep 17 00:00:00 2001
From: Artem Sorokin <38620398+seemewalkin@users.noreply.github.com>
Date: Fri, 5 Dec 2025 14:29:30 +0100
Subject: [PATCH 093/167] test: Move canvas and editor tests to
 workflows/editor/ directory (#22801)

---
 .../editor/canvas/actions.spec.ts}            |   4 +-
 .../editor/canvas/canvas-nodes.spec.ts        | 227 +++++++++++++++++
 .../editor/canvas/canvas-zoom.spec.ts}        | 228 +-----------------
 .../editor/canvas/focus-panel.spec.ts}        |   4 +-
 .../editor/canvas/stickies.spec.ts}           |   2 +-
 .../editor/canvas/undo-redo.spec.ts}          |   6 +-
 .../editor-after-route-changes.spec.ts}       |   2 +-
 .../editor/routing.spec.ts}                   |   4 +-
 .../editor/tags.spec.ts}                      |   2 +-
 .../editor/viewer-permissions.spec.ts}        |   6 +-
 .../editor/workflow-actions.spec.ts}          |   8 +-
 11 files changed, 250 insertions(+), 243 deletions(-)
 rename packages/testing/playwright/tests/ui/{12-canvas-actions.spec.ts => workflows/editor/canvas/actions.spec.ts} (98%)
 create mode 100644 packages/testing/playwright/tests/ui/workflows/editor/canvas/canvas-nodes.spec.ts
 rename packages/testing/playwright/tests/ui/{12-canvas.spec.ts => workflows/editor/canvas/canvas-zoom.spec.ts} (51%)
 rename packages/testing/playwright/tests/ui/{54-focus-panel.spec.ts => workflows/editor/canvas/focus-panel.spec.ts} (92%)
 rename packages/testing/playwright/tests/ui/{25-stickies.spec.ts => workflows/editor/canvas/stickies.spec.ts} (94%)
 rename packages/testing/playwright/tests/ui/{10-undo-redo.spec.ts => workflows/editor/canvas/undo-redo.spec.ts} (98%)
 rename packages/testing/playwright/tests/ui/{30-editor-after-route-changes.spec.ts => workflows/editor/editor-after-route-changes.spec.ts} (96%)
 rename packages/testing/playwright/tests/ui/{44-routing.spec.ts => workflows/editor/routing.spec.ts} (95%)
 rename packages/testing/playwright/tests/ui/{17-workflow-tags.spec.ts => workflows/editor/tags.spec.ts} (99%)
 rename packages/testing/playwright/tests/ui/{56-workflow-viewer-permissions.spec.ts => workflows/editor/viewer-permissions.spec.ts} (95%)
 rename packages/testing/playwright/tests/ui/{7-workflow-actions.spec.ts => workflows/editor/workflow-actions.spec.ts} (98%)

diff --git a/packages/testing/playwright/tests/ui/12-canvas-actions.spec.ts b/packages/testing/playwright/tests/ui/workflows/editor/canvas/actions.spec.ts
similarity index 98%
rename from packages/testing/playwright/tests/ui/12-canvas-actions.spec.ts
rename to packages/testing/playwright/tests/ui/workflows/editor/canvas/actions.spec.ts
index df67a6b511a..50bc4e12c8c 100644
--- a/packages/testing/playwright/tests/ui/12-canvas-actions.spec.ts
+++ b/packages/testing/playwright/tests/ui/workflows/editor/canvas/actions.spec.ts
@@ -4,8 +4,8 @@ import {
 	CODE_NODE_NAME,
 	HTTP_REQUEST_NODE_NAME,
 	CODE_NODE_DISPLAY_NAME,
-} from '../../config/constants';
-import { test, expect } from '../../fixtures/base';
+} from '../../../../../config/constants';
+import { test, expect } from '../../../../../fixtures/base';
 
 test.describe('Canvas Actions', () => {
 	test.beforeEach(async ({ n8n }) => {
diff --git a/packages/testing/playwright/tests/ui/workflows/editor/canvas/canvas-nodes.spec.ts b/packages/testing/playwright/tests/ui/workflows/editor/canvas/canvas-nodes.spec.ts
new file mode 100644
index 00000000000..d30bdf3ac53
--- /dev/null
+++ b/packages/testing/playwright/tests/ui/workflows/editor/canvas/canvas-nodes.spec.ts
@@ -0,0 +1,227 @@
+import {
+	MANUAL_TRIGGER_NODE_NAME,
+	MANUAL_TRIGGER_NODE_DISPLAY_NAME,
+	SWITCH_NODE_NAME,
+	EDIT_FIELDS_SET_NODE_NAME,
+	MERGE_NODE_NAME,
+	CODE_NODE_NAME,
+	SCHEDULE_TRIGGER_NODE_NAME,
+	CODE_NODE_DISPLAY_NAME,
+} from '../../../../../config/constants';
+import { test, expect } from '../../../../../fixtures/base';
+
+test.describe('Canvas Node Manipulation and Navigation', () => {
+	test.beforeEach(async ({ n8n }) => {
+		await n8n.start.fromBlankCanvas();
+	});
+
+	test('should add switch node and test connections', async ({ n8n }) => {
+		const desiredOutputs = 4;
+		await n8n.canvas.addNode(MANUAL_TRIGGER_NODE_NAME);
+		await n8n.canvas.addNode(SWITCH_NODE_NAME);
+
+		for (let i = 0; i < desiredOutputs; i++) {
+			await n8n.page.getByText('Add Routing Rule').click();
+		}
+
+		await n8n.ndv.close();
+
+		for (let i = 0; i < desiredOutputs; i++) {
+			await n8n.canvas.clickNodePlusEndpoint(SWITCH_NODE_NAME);
+			await expect(n8n.canvas.nodeCreatorSearchBar()).toBeVisible();
+			await n8n.canvas.fillNodeCreatorSearchBar(EDIT_FIELDS_SET_NODE_NAME);
+			await n8n.canvas.clickNodeCreatorItemName(EDIT_FIELDS_SET_NODE_NAME);
+			await n8n.page.keyboard.press('Escape');
+			await n8n.canvas.clickZoomToFitButton();
+		}
+
+		await n8n.canvas.canvasPane().click({ position: { x: 10, y: 10 } });
+
+		await n8n.canvas.clickNodePlusEndpoint('Edit Fields3');
+		await n8n.canvas.fillNodeCreatorSearchBar(SWITCH_NODE_NAME);
+		await n8n.canvas.clickNodeCreatorItemName(SWITCH_NODE_NAME);
+		await n8n.page.keyboard.press('Escape');
+
+		await n8n.canvasComposer.saveWorkflowAndWaitForUrl();
+		await expect(n8n.canvas.getWorkflowSaveButton()).toContainText('Saved');
+
+		await n8n.canvasComposer.reloadAndWaitForCanvas();
+
+		await expect(
+			n8n.canvas.connectionBetweenNodes('Edit Fields3', `${SWITCH_NODE_NAME}1`),
+		).toBeAttached();
+
+		const editFieldsNodes = ['Edit Fields', 'Edit Fields1', 'Edit Fields2', 'Edit Fields3'];
+		for (const nodeName of editFieldsNodes) {
+			await expect(n8n.canvas.connectionBetweenNodes(SWITCH_NODE_NAME, nodeName)).toBeAttached();
+		}
+	});
+
+	test('should add merge node and test connections', async ({ n8n }) => {
+		const editFieldsNodeCount = 2;
+
+		const checkConnections = async () => {
+			await expect(
+				n8n.canvas.connectionBetweenNodes(MANUAL_TRIGGER_NODE_DISPLAY_NAME, 'Edit Fields1').first(),
+			).toBeAttached();
+			await expect(
+				n8n.canvas.connectionBetweenNodes('Edit Fields', MERGE_NODE_NAME).first(),
+			).toBeAttached();
+			await expect(
+				n8n.canvas.connectionBetweenNodes('Edit Fields1', MERGE_NODE_NAME).first(),
+			).toBeAttached();
+		};
+
+		await n8n.canvas.addNode(MANUAL_TRIGGER_NODE_NAME);
+		await n8n.canvas.nodeByName(MANUAL_TRIGGER_NODE_DISPLAY_NAME).click();
+
+		for (let i = 0; i < editFieldsNodeCount; i++) {
+			await n8n.canvas.addNode(EDIT_FIELDS_SET_NODE_NAME, { closeNDV: true });
+			await n8n.canvas.canvasPane().click({
+				position: { x: (i + 1) * 200, y: (i + 1) * 200 },
+				// eslint-disable-next-line playwright/no-force-option
+				force: true,
+			});
+		}
+		await n8n.canvas.clickZoomToFitButton();
+
+		await n8n.canvas.addNode(MERGE_NODE_NAME, { closeNDV: true });
+		await n8n.canvas.clickZoomToFitButton();
+
+		await n8n.canvas.connectNodesByDrag(MANUAL_TRIGGER_NODE_DISPLAY_NAME, 'Edit Fields1', 0, 0);
+		await expect(
+			n8n.canvas.connectionBetweenNodes(MANUAL_TRIGGER_NODE_DISPLAY_NAME, 'Edit Fields1').first(),
+		).toBeAttached();
+
+		await n8n.canvas.connectNodesByDrag('Edit Fields', MERGE_NODE_NAME, 0, 0);
+		await expect(
+			n8n.canvas.connectionBetweenNodes('Edit Fields', MERGE_NODE_NAME).first(),
+		).toBeAttached();
+
+		await n8n.canvas.connectNodesByDrag('Edit Fields1', MERGE_NODE_NAME, 0, 1);
+		await expect(
+			n8n.canvas.connectionBetweenNodes('Edit Fields1', MERGE_NODE_NAME).first(),
+		).toBeAttached();
+
+		await n8n.canvasComposer.saveWorkflowAndWaitForUrl();
+		await expect(n8n.canvas.getWorkflowSaveButton()).toContainText('Saved');
+
+		await n8n.canvasComposer.reloadAndWaitForCanvas();
+
+		await checkConnections();
+
+		await n8n.canvas.clickExecuteWorkflowButton();
+		await expect(n8n.canvas.stopExecutionButton()).toBeHidden();
+
+		await n8n.canvasComposer.reloadAndWaitForCanvas();
+
+		await checkConnections();
+
+		await n8n.canvas.clickExecuteWorkflowButton();
+		await expect(n8n.canvas.stopExecutionButton()).toBeHidden();
+
+		await expect(
+			n8n.canvas.getConnectionLabelBetweenNodes('Edit Fields1', MERGE_NODE_NAME).first(),
+		).toContainText('2 items');
+	});
+
+	test('should add nodes and check execution success', async ({ n8n }) => {
+		const nodeCount = 3;
+
+		await n8n.canvas.addNode(MANUAL_TRIGGER_NODE_NAME);
+		await n8n.canvas.nodeByName(MANUAL_TRIGGER_NODE_DISPLAY_NAME).click();
+
+		for (let i = 0; i < nodeCount; i++) {
+			await n8n.canvas.addNode(CODE_NODE_NAME, { action: 'Code in JavaScript', closeNDV: true });
+		}
+		await n8n.canvas.clickZoomToFitButton();
+
+		await n8n.canvas.clickExecuteWorkflowButton();
+		await expect(n8n.canvas.stopExecutionButton()).toBeHidden();
+
+		await expect(n8n.canvas.getSuccessEdges()).toHaveCount(nodeCount);
+		await expect(n8n.canvas.getAllNodeSuccessIndicators()).toHaveCount(nodeCount + 1);
+		await expect(n8n.canvas.getCanvasHandlePlusWrapper()).toHaveAttribute(
+			'data-plus-type',
+			'success',
+		);
+
+		await n8n.canvas.addNode(CODE_NODE_NAME, { action: 'Code in JavaScript', closeNDV: true });
+		await n8n.canvas.clickZoomToFitButton();
+
+		await expect(n8n.canvas.getCanvasHandlePlus()).not.toHaveAttribute('data-plus-type', 'success');
+
+		await expect(n8n.canvas.getSuccessEdges()).toHaveCount(nodeCount + 1);
+		await expect(n8n.canvas.getAllNodeSuccessIndicators()).toHaveCount(nodeCount + 1);
+	});
+
+	test('should delete node using context menu', async ({ n8n }) => {
+		await n8n.canvas.addNode(SCHEDULE_TRIGGER_NODE_NAME, { closeNDV: true });
+		await n8n.canvas.addNode(CODE_NODE_NAME, { action: 'Code in JavaScript', closeNDV: true });
+		await n8n.canvas.clickZoomToFitButton();
+
+		await n8n.canvas.deleteNodeFromContextMenu(CODE_NODE_DISPLAY_NAME);
+
+		await expect(n8n.canvas.getCanvasNodes()).toHaveCount(1);
+		await expect(n8n.canvas.nodeConnections()).toHaveCount(0);
+	});
+
+	test('should delete node using keyboard shortcut', async ({ n8n }) => {
+		await n8n.canvas.addNode(SCHEDULE_TRIGGER_NODE_NAME, { closeNDV: true });
+		await n8n.canvas.addNode(CODE_NODE_NAME, { action: 'Code in JavaScript', closeNDV: true });
+		await n8n.canvas.nodeByName(CODE_NODE_DISPLAY_NAME).click();
+		await n8n.page.keyboard.press('Backspace');
+
+		await expect(n8n.canvas.getCanvasNodes()).toHaveCount(1);
+		await expect(n8n.canvas.nodeConnections()).toHaveCount(0);
+	});
+
+	test('should delete node between two connected nodes', async ({ n8n }) => {
+		await n8n.canvas.addNode(SCHEDULE_TRIGGER_NODE_NAME, { closeNDV: true });
+		await n8n.canvas.addNode(CODE_NODE_NAME, { action: 'Code in JavaScript', closeNDV: true });
+		await n8n.canvas.addNode(EDIT_FIELDS_SET_NODE_NAME, { closeNDV: true });
+
+		await expect(n8n.canvas.getCanvasNodes()).toHaveCount(3);
+		await expect(n8n.canvas.nodeConnections()).toHaveCount(2);
+
+		await n8n.canvas.nodeByName(CODE_NODE_DISPLAY_NAME).click();
+		await n8n.canvas.clickZoomToFitButton();
+		await n8n.page.keyboard.press('Backspace');
+
+		await expect(n8n.canvas.getCanvasNodes()).toHaveCount(2);
+		await expect(n8n.canvas.nodeConnections()).toHaveCount(1);
+	});
+
+	test('should delete multiple nodes (context menu or shortcut)', async ({ n8n }) => {
+		await n8n.canvas.addNode(SCHEDULE_TRIGGER_NODE_NAME, { closeNDV: true });
+		await n8n.canvas.addNode(CODE_NODE_NAME, { action: 'Code in JavaScript', closeNDV: true });
+		await n8n.canvas.hitDeleteAllNodes();
+
+		await expect(n8n.canvas.getCanvasNodes()).toHaveCount(0);
+
+		await n8n.canvas.addNode(SCHEDULE_TRIGGER_NODE_NAME, { closeNDV: true });
+		await n8n.canvas.addNode(CODE_NODE_NAME, { action: 'Code in JavaScript', closeNDV: true });
+
+		await n8n.canvas.rightClickCanvas();
+		await n8n.canvas.getContextMenuItem('select_all').click();
+		await n8n.canvas.rightClickCanvas();
+		await n8n.canvas.getContextMenuItem('delete').click();
+
+		await expect(n8n.canvas.getCanvasNodes()).toHaveCount(0);
+	});
+
+	test('should move node', async ({ n8n }) => {
+		await n8n.canvas.addNode(MANUAL_TRIGGER_NODE_NAME);
+		await n8n.canvas.nodeByName(MANUAL_TRIGGER_NODE_DISPLAY_NAME).click();
+		await n8n.canvas.addNode(CODE_NODE_NAME, { action: 'Code in JavaScript', closeNDV: true });
+
+		await n8n.canvas.clickZoomToFitButton();
+
+		const pos1 = await n8n.canvas.getNodePosition(CODE_NODE_DISPLAY_NAME);
+		await n8n.canvas.dragNodeToRelativePosition(CODE_NODE_DISPLAY_NAME, 50, 150);
+		const pos2 = await n8n.canvas.getNodePosition(CODE_NODE_DISPLAY_NAME);
+
+		expect(pos2.x).toBeGreaterThan(pos1.x);
+		expect(pos2.y).toBeGreaterThan(pos1.y);
+	});
+});
diff --git a/packages/testing/playwright/tests/ui/12-canvas.spec.ts b/packages/testing/playwright/tests/ui/workflows/editor/canvas/canvas-zoom.spec.ts
similarity index 51%
rename from packages/testing/playwright/tests/ui/12-canvas.spec.ts
rename to packages/testing/playwright/tests/ui/workflows/editor/canvas/canvas-zoom.spec.ts
index 227e36a7fa3..d59ca687a2c 100644
--- a/packages/testing/playwright/tests/ui/12-canvas.spec.ts
+++ b/packages/testing/playwright/tests/ui/workflows/editor/canvas/canvas-zoom.spec.ts
@@ -3,16 +3,12 @@ import fs from 'fs';
 import {
 	MANUAL_TRIGGER_NODE_NAME,
 	MANUAL_TRIGGER_NODE_DISPLAY_NAME,
-	SWITCH_NODE_NAME,
-	EDIT_FIELDS_SET_NODE_NAME,
-	MERGE_NODE_NAME,
 	CODE_NODE_NAME,
-	SCHEDULE_TRIGGER_NODE_NAME,
 	CODE_NODE_DISPLAY_NAME,
-} from '../../config/constants';
-import { test, expect } from '../../fixtures/base';
-import type { n8nPage } from '../../pages/n8nPage';
-import { resolveFromRoot } from '../../utils/path-helper';
+} from '../../../../../config/constants';
+import { test, expect } from '../../../../../fixtures/base';
+import type { n8nPage } from '../../../../../pages/n8nPage';
+import { resolveFromRoot } from '../../../../../utils/path-helper';
 
 const DEFAULT_ZOOM_FACTOR = 1;
 const ZOOM_IN_X1_FACTOR = 1.25; // Expected zoom after 1 zoom-in click (125%)
@@ -21,222 +17,6 @@ const ZOOM_OUT_X1_FACTOR = 0.8; // Expected zoom after 1 zoom-out click (80%)
 const ZOOM_OUT_X2_FACTOR = 0.64; // Expected zoom after 2 zoom-out clicks (64%)
 const ZOOM_TOLERANCE = 0.2; // Acceptable variance for floating-point zoom comparisons
 
-test.describe('Canvas Node Manipulation and Navigation', () => {
-	test.beforeEach(async ({ n8n }) => {
-		await n8n.start.fromBlankCanvas();
-	});
-
-	test('should add switch node and test connections', async ({ n8n }) => {
-		const desiredOutputs = 4;
-		await n8n.canvas.addNode(MANUAL_TRIGGER_NODE_NAME);
-		await n8n.canvas.addNode(SWITCH_NODE_NAME);
-
-		for (let i = 0; i < desiredOutputs; i++) {
-			await n8n.page.getByText('Add Routing Rule').click();
-		}
-
-		await n8n.ndv.close();
-
-		for (let i = 0; i < desiredOutputs; i++) {
-			await n8n.canvas.clickNodePlusEndpoint(SWITCH_NODE_NAME);
-			await expect(n8n.canvas.nodeCreatorSearchBar()).toBeVisible();
-			await n8n.canvas.fillNodeCreatorSearchBar(EDIT_FIELDS_SET_NODE_NAME);
-			await n8n.canvas.clickNodeCreatorItemName(EDIT_FIELDS_SET_NODE_NAME);
-			await n8n.page.keyboard.press('Escape');
-			await n8n.canvas.clickZoomToFitButton();
-		}
-
-		await n8n.canvas.canvasPane().click({ position: { x: 10, y: 10 } });
-
-		await n8n.canvas.clickNodePlusEndpoint('Edit Fields3');
-		await n8n.canvas.fillNodeCreatorSearchBar(SWITCH_NODE_NAME);
-		await n8n.canvas.clickNodeCreatorItemName(SWITCH_NODE_NAME);
-		await n8n.page.keyboard.press('Escape');
-
-		await n8n.canvasComposer.saveWorkflowAndWaitForUrl();
-		await expect(n8n.canvas.getWorkflowSaveButton()).toContainText('Saved');
-
-		await n8n.canvasComposer.reloadAndWaitForCanvas();
-
-		await expect(
-			n8n.canvas.connectionBetweenNodes('Edit Fields3', `${SWITCH_NODE_NAME}1`),
-		).toBeAttached();
-
-		const editFieldsNodes = ['Edit Fields', 'Edit Fields1', 'Edit Fields2', 'Edit Fields3'];
-		for (const nodeName of editFieldsNodes) {
-			await expect(n8n.canvas.connectionBetweenNodes(SWITCH_NODE_NAME, nodeName)).toBeAttached();
-		}
-	});
-
-	test('should add merge node and test connections', async ({ n8n }) => {
-		const editFieldsNodeCount = 2;
-
-		const checkConnections = async () => {
-			await expect(
-				n8n.canvas.connectionBetweenNodes(MANUAL_TRIGGER_NODE_DISPLAY_NAME, 'Edit Fields1').first(),
-			).toBeAttached();
-			await expect(
-				n8n.canvas.connectionBetweenNodes('Edit Fields', MERGE_NODE_NAME).first(),
-			).toBeAttached();
-			await expect(
-				n8n.canvas.connectionBetweenNodes('Edit Fields1', MERGE_NODE_NAME).first(),
-			).toBeAttached();
-		};
-
-		await n8n.canvas.addNode(MANUAL_TRIGGER_NODE_NAME);
-		await n8n.canvas.nodeByName(MANUAL_TRIGGER_NODE_DISPLAY_NAME).click();
-
-		for (let i = 0; i < editFieldsNodeCount; i++) {
-			await n8n.canvas.addNode(EDIT_FIELDS_SET_NODE_NAME, { closeNDV: true });
-			await n8n.canvas.canvasPane().click({
-				position: { x: (i + 1) * 200, y: (i + 1) * 200 },
-				// eslint-disable-next-line playwright/no-force-option
-				force: true,
-			});
-		}
-		await n8n.canvas.clickZoomToFitButton();
-
-		await n8n.canvas.addNode(MERGE_NODE_NAME, { closeNDV: true });
-		await n8n.canvas.clickZoomToFitButton();
-
-		await n8n.canvas.connectNodesByDrag(MANUAL_TRIGGER_NODE_DISPLAY_NAME, 'Edit Fields1', 0, 0);
-		await expect(
-			n8n.canvas.connectionBetweenNodes(MANUAL_TRIGGER_NODE_DISPLAY_NAME, 'Edit Fields1').first(),
-		).toBeAttached();
-
-		await n8n.canvas.connectNodesByDrag('Edit Fields', MERGE_NODE_NAME, 0, 0);
-		await expect(
-			n8n.canvas.connectionBetweenNodes('Edit Fields', MERGE_NODE_NAME).first(),
-		).toBeAttached();
-
-		await n8n.canvas.connectNodesByDrag('Edit Fields1', MERGE_NODE_NAME, 0, 1);
-		await expect(
-			n8n.canvas.connectionBetweenNodes('Edit Fields1', MERGE_NODE_NAME).first(),
-		).toBeAttached();
-
-		await n8n.canvasComposer.saveWorkflowAndWaitForUrl();
-		await expect(n8n.canvas.getWorkflowSaveButton()).toContainText('Saved');
-
-		await n8n.canvasComposer.reloadAndWaitForCanvas();
-
-		await checkConnections();
-
-		await n8n.canvas.clickExecuteWorkflowButton();
-		await expect(n8n.canvas.stopExecutionButton()).toBeHidden();
-
-		await n8n.canvasComposer.reloadAndWaitForCanvas();
-
-		await checkConnections();
-
-		await n8n.canvas.clickExecuteWorkflowButton();
-		await expect(n8n.canvas.stopExecutionButton()).toBeHidden();
-
-		await expect(
-			n8n.canvas.getConnectionLabelBetweenNodes('Edit Fields1', MERGE_NODE_NAME).first(),
-		).toContainText('2 items');
-	});
-
-	test('should add nodes and check execution success', async ({ n8n }) => {
-		const nodeCount = 3;
-
-		await n8n.canvas.addNode(MANUAL_TRIGGER_NODE_NAME);
-		await n8n.canvas.nodeByName(MANUAL_TRIGGER_NODE_DISPLAY_NAME).click();
-
-		for (let i = 0; i < nodeCount; i++) {
-			await n8n.canvas.addNode(CODE_NODE_NAME, { action: 'Code in JavaScript', closeNDV: true });
-		}
-		await n8n.canvas.clickZoomToFitButton();
-
-		await n8n.canvas.clickExecuteWorkflowButton();
-		await expect(n8n.canvas.stopExecutionButton()).toBeHidden();
-
-		await expect(n8n.canvas.getSuccessEdges()).toHaveCount(nodeCount);
-		await expect(n8n.canvas.getAllNodeSuccessIndicators()).toHaveCount(nodeCount + 1);
-		await expect(n8n.canvas.getCanvasHandlePlusWrapper()).toHaveAttribute(
-			'data-plus-type',
-			'success',
-		);
-
-		await n8n.canvas.addNode(CODE_NODE_NAME, { action: 'Code in JavaScript', closeNDV: true });
-		await n8n.canvas.clickZoomToFitButton();
-
-		await expect(n8n.canvas.getCanvasHandlePlus()).not.toHaveAttribute('data-plus-type', 'success');
-
-		await expect(n8n.canvas.getSuccessEdges()).toHaveCount(nodeCount + 1);
-		await expect(n8n.canvas.getAllNodeSuccessIndicators()).toHaveCount(nodeCount + 1);
-	});
-
-	test('should delete node using context menu', async ({ n8n }) => {
-		await n8n.canvas.addNode(SCHEDULE_TRIGGER_NODE_NAME, { closeNDV: true });
-		await n8n.canvas.addNode(CODE_NODE_NAME, { action: 'Code in JavaScript', closeNDV: true });
-		await n8n.canvas.clickZoomToFitButton();
-
-		await n8n.canvas.deleteNodeFromContextMenu(CODE_NODE_DISPLAY_NAME);
-
-		await expect(n8n.canvas.getCanvasNodes()).toHaveCount(1);
-		await expect(n8n.canvas.nodeConnections()).toHaveCount(0);
-	});
-
-	test('should delete node using keyboard shortcut', async ({ n8n }) => {
-		await n8n.canvas.addNode(SCHEDULE_TRIGGER_NODE_NAME, { closeNDV: true });
-		await n8n.canvas.addNode(CODE_NODE_NAME, { action: 'Code in JavaScript', closeNDV: true });
-		await n8n.canvas.nodeByName(CODE_NODE_DISPLAY_NAME).click();
-		await n8n.page.keyboard.press('Backspace');
-
-		await expect(n8n.canvas.getCanvasNodes()).toHaveCount(1);
-		await expect(n8n.canvas.nodeConnections()).toHaveCount(0);
-	});
-
-	test('should delete node between two connected nodes', async ({ n8n }) => {
-		await n8n.canvas.addNode(SCHEDULE_TRIGGER_NODE_NAME, { closeNDV: true });
-		await n8n.canvas.addNode(CODE_NODE_NAME, { action: 'Code in JavaScript', closeNDV: true });
-		await n8n.canvas.addNode(EDIT_FIELDS_SET_NODE_NAME, { closeNDV: true });
-
-		await expect(n8n.canvas.getCanvasNodes()).toHaveCount(3);
-		await expect(n8n.canvas.nodeConnections()).toHaveCount(2);
-
-		await n8n.canvas.nodeByName(CODE_NODE_DISPLAY_NAME).click();
-		await n8n.canvas.clickZoomToFitButton();
-		await n8n.page.keyboard.press('Backspace');
-
-		await expect(n8n.canvas.getCanvasNodes()).toHaveCount(2);
-		await expect(n8n.canvas.nodeConnections()).toHaveCount(1);
-	});
-
-	test('should delete multiple nodes (context menu or shortcut)', async ({ n8n }) => {
-		await n8n.canvas.addNode(SCHEDULE_TRIGGER_NODE_NAME, { closeNDV: true });
-		await n8n.canvas.addNode(CODE_NODE_NAME, { action: 'Code in JavaScript', closeNDV: true });
-		await n8n.canvas.hitDeleteAllNodes();
-
-		await expect(n8n.canvas.getCanvasNodes()).toHaveCount(0);
-
-		await n8n.canvas.addNode(SCHEDULE_TRIGGER_NODE_NAME, { closeNDV: true });
-		await n8n.canvas.addNode(CODE_NODE_NAME, { action: 'Code in JavaScript', closeNDV: true });
-
-		await n8n.canvas.rightClickCanvas();
-		await n8n.canvas.getContextMenuItem('select_all').click();
-		await n8n.canvas.rightClickCanvas();
-		await n8n.canvas.getContextMenuItem('delete').click();
-
-		await expect(n8n.canvas.getCanvasNodes()).toHaveCount(0);
-	});
-
-	test('should move node', async ({ n8n }) => {
-		await n8n.canvas.addNode(MANUAL_TRIGGER_NODE_NAME);
-		await n8n.canvas.nodeByName(MANUAL_TRIGGER_NODE_DISPLAY_NAME).click();
-		await n8n.canvas.addNode(CODE_NODE_NAME, { action: 'Code in JavaScript', closeNDV: true });
-
-		await n8n.canvas.clickZoomToFitButton();
-
-		const pos1 = await n8n.canvas.getNodePosition(CODE_NODE_DISPLAY_NAME);
-		await n8n.canvas.dragNodeToRelativePosition(CODE_NODE_DISPLAY_NAME, 50, 150);
-		const pos2 = await n8n.canvas.getNodePosition(CODE_NODE_DISPLAY_NAME);
-
-		expect(pos2.x).toBeGreaterThan(pos1.x);
-		expect(pos2.y).toBeGreaterThan(pos1.y);
-	});
-});
-
 test.describe('Canvas Zoom Functionality', () => {
 	test.beforeEach(async ({ n8n }) => {
 		await n8n.start.fromBlankCanvas();
diff --git a/packages/testing/playwright/tests/ui/54-focus-panel.spec.ts b/packages/testing/playwright/tests/ui/workflows/editor/canvas/focus-panel.spec.ts
similarity index 92%
rename from packages/testing/playwright/tests/ui/54-focus-panel.spec.ts
rename to packages/testing/playwright/tests/ui/workflows/editor/canvas/focus-panel.spec.ts
index 80f91e1e515..361da20948b 100644
--- a/packages/testing/playwright/tests/ui/54-focus-panel.spec.ts
+++ b/packages/testing/playwright/tests/ui/workflows/editor/canvas/focus-panel.spec.ts
@@ -1,5 +1,5 @@
-import { test, expect } from '../../fixtures/base';
-import type { TestRequirements } from '../../Types';
+import { test, expect } from '../../../../../fixtures/base';
+import type { TestRequirements } from '../../../../../Types';
 
 test.describe('Focus panel', () => {
 	test.describe('With experimental NDV in focus panel enabled', () => {
diff --git a/packages/testing/playwright/tests/ui/25-stickies.spec.ts b/packages/testing/playwright/tests/ui/workflows/editor/canvas/stickies.spec.ts
similarity index 94%
rename from packages/testing/playwright/tests/ui/25-stickies.spec.ts
rename to packages/testing/playwright/tests/ui/workflows/editor/canvas/stickies.spec.ts
index c4174f0bb3d..8001f2a0a12 100644
--- a/packages/testing/playwright/tests/ui/25-stickies.spec.ts
+++ b/packages/testing/playwright/tests/ui/workflows/editor/canvas/stickies.spec.ts
@@ -1,4 +1,4 @@
-import { test, expect } from '../../fixtures/base';
+import { test, expect } from '../../../../../fixtures/base';
 
 test.describe('Canvas Actions', () => {
 	test('adds sticky to canvas with default text and position', async ({ n8n }) => {
diff --git a/packages/testing/playwright/tests/ui/10-undo-redo.spec.ts b/packages/testing/playwright/tests/ui/workflows/editor/canvas/undo-redo.spec.ts
similarity index 98%
rename from packages/testing/playwright/tests/ui/10-undo-redo.spec.ts
rename to packages/testing/playwright/tests/ui/workflows/editor/canvas/undo-redo.spec.ts
index b78051d2581..60ea38f10ce 100644
--- a/packages/testing/playwright/tests/ui/10-undo-redo.spec.ts
+++ b/packages/testing/playwright/tests/ui/workflows/editor/canvas/undo-redo.spec.ts
@@ -7,9 +7,9 @@ import {
 	EDIT_FIELDS_SET_NODE_NAME,
 	MANUAL_TRIGGER_NODE_NAME,
 	MANUAL_TRIGGER_NODE_DISPLAY_NAME,
-} from '../../config/constants';
-import { test, expect } from '../../fixtures/base';
-import { resolveFromRoot } from '../../utils/path-helper';
+} from '../../../../../config/constants';
+import { test, expect } from '../../../../../fixtures/base';
+import { resolveFromRoot } from '../../../../../utils/path-helper';
 
 test.describe('Undo/Redo', () => {
 	test.beforeEach(async ({ n8n }) => {
diff --git a/packages/testing/playwright/tests/ui/30-editor-after-route-changes.spec.ts b/packages/testing/playwright/tests/ui/workflows/editor/editor-after-route-changes.spec.ts
similarity index 96%
rename from packages/testing/playwright/tests/ui/30-editor-after-route-changes.spec.ts
rename to packages/testing/playwright/tests/ui/workflows/editor/editor-after-route-changes.spec.ts
index cfb36cccac2..ec378668787 100644
--- a/packages/testing/playwright/tests/ui/30-editor-after-route-changes.spec.ts
+++ b/packages/testing/playwright/tests/ui/workflows/editor/editor-after-route-changes.spec.ts
@@ -1,4 +1,4 @@
-import { test, expect } from '../../fixtures/base';
+import { test, expect } from '../../../../fixtures/base';
 
 const NOTIFICATIONS = {
 	WORKFLOW_CREATED: 'Workflow successfully created',
diff --git a/packages/testing/playwright/tests/ui/44-routing.spec.ts b/packages/testing/playwright/tests/ui/workflows/editor/routing.spec.ts
similarity index 95%
rename from packages/testing/playwright/tests/ui/44-routing.spec.ts
rename to packages/testing/playwright/tests/ui/workflows/editor/routing.spec.ts
index 60d22c535fd..636c0a1a182 100644
--- a/packages/testing/playwright/tests/ui/44-routing.spec.ts
+++ b/packages/testing/playwright/tests/ui/workflows/editor/routing.spec.ts
@@ -1,5 +1,5 @@
-import { EDIT_FIELDS_SET_NODE_NAME } from '../../config/constants';
-import { test, expect } from '../../fixtures/base';
+import { EDIT_FIELDS_SET_NODE_NAME } from '../../../../config/constants';
+import { test, expect } from '../../../../fixtures/base';
 
 test.describe('Routing', () => {
 	test('should ask to save unsaved changes before leaving route', async ({ n8n }) => {
diff --git a/packages/testing/playwright/tests/ui/17-workflow-tags.spec.ts b/packages/testing/playwright/tests/ui/workflows/editor/tags.spec.ts
similarity index 99%
rename from packages/testing/playwright/tests/ui/17-workflow-tags.spec.ts
rename to packages/testing/playwright/tests/ui/workflows/editor/tags.spec.ts
index bab05f6a501..bb2c8e4f30f 100644
--- a/packages/testing/playwright/tests/ui/17-workflow-tags.spec.ts
+++ b/packages/testing/playwright/tests/ui/workflows/editor/tags.spec.ts
@@ -1,6 +1,6 @@
 import { nanoid } from 'nanoid';
 
-import { test, expect } from '../../fixtures/base';
+import { test, expect } from '../../../../fixtures/base';
 
 test.describe('Workflow tags - Tag creation', () => {
 	test('should create and attach tags inline, then add more incrementally', async ({ n8n }) => {
diff --git a/packages/testing/playwright/tests/ui/56-workflow-viewer-permissions.spec.ts b/packages/testing/playwright/tests/ui/workflows/editor/viewer-permissions.spec.ts
similarity index 95%
rename from packages/testing/playwright/tests/ui/56-workflow-viewer-permissions.spec.ts
rename to packages/testing/playwright/tests/ui/workflows/editor/viewer-permissions.spec.ts
index e0f11897a10..64226d78488 100644
--- a/packages/testing/playwright/tests/ui/56-workflow-viewer-permissions.spec.ts
+++ b/packages/testing/playwright/tests/ui/workflows/editor/viewer-permissions.spec.ts
@@ -1,6 +1,6 @@
-import { INSTANCE_MEMBER_CREDENTIALS } from '../../config/test-users';
-import { test, expect } from '../../fixtures/base';
-import type { n8nPage } from '../../pages/n8nPage';
+import { INSTANCE_MEMBER_CREDENTIALS } from '../../../../config/test-users';
+import { test, expect } from '../../../../fixtures/base';
+import type { n8nPage } from '../../../../pages/n8nPage';
 
 const MEMBER_EMAIL = INSTANCE_MEMBER_CREDENTIALS[0].email;
 
diff --git a/packages/testing/playwright/tests/ui/7-workflow-actions.spec.ts b/packages/testing/playwright/tests/ui/workflows/editor/workflow-actions.spec.ts
similarity index 98%
rename from packages/testing/playwright/tests/ui/7-workflow-actions.spec.ts
rename to packages/testing/playwright/tests/ui/workflows/editor/workflow-actions.spec.ts
index 3ff30e40e04..6da899d593a 100644
--- a/packages/testing/playwright/tests/ui/7-workflow-actions.spec.ts
+++ b/packages/testing/playwright/tests/ui/workflows/editor/workflow-actions.spec.ts
@@ -7,10 +7,10 @@ import {
 	MANUAL_TRIGGER_NODE_NAME,
 	NOTION_NODE_NAME,
 	SCHEDULE_TRIGGER_NODE_NAME,
-} from '../../config/constants';
-import { test, expect } from '../../fixtures/base';
-import type { n8nPage } from '../../pages/n8nPage';
-import { resolveFromRoot } from '../../utils/path-helper';
+} from '../../../../config/constants';
+import { test, expect } from '../../../../fixtures/base';
+import type { n8nPage } from '../../../../pages/n8nPage';
+import { resolveFromRoot } from '../../../../utils/path-helper';
 
 async function saveWorkflowAndGetId(n8n: n8nPage): Promise<string> {
 	const saveResponsePromise = n8n.page.waitForResponse(

From 305ba9201abb41ce5d08e0c8d3933887106ba51a Mon Sep 17 00:00:00 2001
From: Artem Sorokin <38620398+seemewalkin@users.noreply.github.com>
Date: Fri, 5 Dec 2025 14:35:05 +0100
Subject: [PATCH 094/167] test: Migrate execution tests to
 workflows/editor/execution/ (#22818)

---
 .../editor/execution/debug.spec.ts}                           | 4 ++--
 .../editor/execution/execution.spec.ts}                       | 4 ++--
 .../editor/execution/inject-previous.spec.ts}                 | 4 ++--
 .../editor/execution/logs.spec.ts}                            | 2 +-
 .../editor/execution/partial.spec.ts}                         | 2 +-
 .../editor/execution/previous-nodes.spec.ts}                  | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)
 rename packages/testing/playwright/tests/ui/{28-debug.spec.ts => workflows/editor/execution/debug.spec.ts} (97%)
 rename packages/testing/playwright/tests/ui/{19-execution.spec.ts => workflows/editor/execution/execution.spec.ts} (99%)
 rename packages/testing/playwright/tests/ui/{inject-previous-execution.spec.ts => workflows/editor/execution/inject-previous.spec.ts} (93%)
 rename packages/testing/playwright/tests/ui/{50-logs.spec.ts => workflows/editor/execution/logs.spec.ts} (99%)
 rename packages/testing/playwright/tests/ui/{40-manual-partial-execution.spec.ts => workflows/editor/execution/partial.spec.ts} (96%)
 rename packages/testing/playwright/tests/ui/{execute-previous-nodes.spec.ts => workflows/editor/execution/previous-nodes.spec.ts} (96%)

diff --git a/packages/testing/playwright/tests/ui/28-debug.spec.ts b/packages/testing/playwright/tests/ui/workflows/editor/execution/debug.spec.ts
similarity index 97%
rename from packages/testing/playwright/tests/ui/28-debug.spec.ts
rename to packages/testing/playwright/tests/ui/workflows/editor/execution/debug.spec.ts
index 5a7ea187345..0bfe012ae0c 100644
--- a/packages/testing/playwright/tests/ui/28-debug.spec.ts
+++ b/packages/testing/playwright/tests/ui/workflows/editor/execution/debug.spec.ts
@@ -1,5 +1,5 @@
-import { test, expect } from '../../fixtures/base';
-import type { n8nPage } from '../../pages/n8nPage';
+import { test, expect } from '../../../../../fixtures/base';
+import type { n8nPage } from '../../../../../pages/n8nPage';
 
 // Example of using helper functions inside a test
 test.describe('Debug mode', () => {
diff --git a/packages/testing/playwright/tests/ui/19-execution.spec.ts b/packages/testing/playwright/tests/ui/workflows/editor/execution/execution.spec.ts
similarity index 99%
rename from packages/testing/playwright/tests/ui/19-execution.spec.ts
rename to packages/testing/playwright/tests/ui/workflows/editor/execution/execution.spec.ts
index d0181e0f9c2..ec94936909e 100644
--- a/packages/testing/playwright/tests/ui/19-execution.spec.ts
+++ b/packages/testing/playwright/tests/ui/workflows/editor/execution/execution.spec.ts
@@ -1,5 +1,5 @@
-import { test, expect } from '../../fixtures/base';
-import type { n8nPage } from '../../pages/n8nPage';
+import { test, expect } from '../../../../../fixtures/base';
+import type { n8nPage } from '../../../../../pages/n8nPage';
 
 const NODE_NAMES = {
 	PROCESS_THE_DATA: 'Process The Data',
diff --git a/packages/testing/playwright/tests/ui/inject-previous-execution.spec.ts b/packages/testing/playwright/tests/ui/workflows/editor/execution/inject-previous.spec.ts
similarity index 93%
rename from packages/testing/playwright/tests/ui/inject-previous-execution.spec.ts
rename to packages/testing/playwright/tests/ui/workflows/editor/execution/inject-previous.spec.ts
index 365180b0670..b62ff9da342 100644
--- a/packages/testing/playwright/tests/ui/inject-previous-execution.spec.ts
+++ b/packages/testing/playwright/tests/ui/workflows/editor/execution/inject-previous.spec.ts
@@ -1,5 +1,5 @@
-import { EDIT_FIELDS_SET_NODE_NAME } from '../../config/constants';
-import { test, expect } from '../../fixtures/base';
+import { EDIT_FIELDS_SET_NODE_NAME } from '../../../../../config/constants';
+import { test, expect } from '../../../../../fixtures/base';
 
 const NOTIFICATIONS = {
 	WORKFLOW_EXECUTED_SUCCESSFULLY: 'Workflow executed successfully',
diff --git a/packages/testing/playwright/tests/ui/50-logs.spec.ts b/packages/testing/playwright/tests/ui/workflows/editor/execution/logs.spec.ts
similarity index 99%
rename from packages/testing/playwright/tests/ui/50-logs.spec.ts
rename to packages/testing/playwright/tests/ui/workflows/editor/execution/logs.spec.ts
index 9b1a9b406ba..9a0ff4eff0a 100644
--- a/packages/testing/playwright/tests/ui/50-logs.spec.ts
+++ b/packages/testing/playwright/tests/ui/workflows/editor/execution/logs.spec.ts
@@ -1,4 +1,4 @@
-import { test, expect } from '../../fixtures/base';
+import { test, expect } from '../../../../../fixtures/base';
 
 // Node name constants
 const NODES = {
diff --git a/packages/testing/playwright/tests/ui/40-manual-partial-execution.spec.ts b/packages/testing/playwright/tests/ui/workflows/editor/execution/partial.spec.ts
similarity index 96%
rename from packages/testing/playwright/tests/ui/40-manual-partial-execution.spec.ts
rename to packages/testing/playwright/tests/ui/workflows/editor/execution/partial.spec.ts
index 6be0281a2ae..4ebdd369d02 100644
--- a/packages/testing/playwright/tests/ui/40-manual-partial-execution.spec.ts
+++ b/packages/testing/playwright/tests/ui/workflows/editor/execution/partial.spec.ts
@@ -1,4 +1,4 @@
-import { test, expect } from '../../fixtures/base';
+import { test, expect } from '../../../../../fixtures/base';
 
 test.describe('Manual partial execution', () => {
 	test('should not execute parent nodes with no run data', async ({ n8n }) => {
diff --git a/packages/testing/playwright/tests/ui/execute-previous-nodes.spec.ts b/packages/testing/playwright/tests/ui/workflows/editor/execution/previous-nodes.spec.ts
similarity index 96%
rename from packages/testing/playwright/tests/ui/execute-previous-nodes.spec.ts
rename to packages/testing/playwright/tests/ui/workflows/editor/execution/previous-nodes.spec.ts
index a0c9512f96a..92a1b6b2d34 100644
--- a/packages/testing/playwright/tests/ui/execute-previous-nodes.spec.ts
+++ b/packages/testing/playwright/tests/ui/workflows/editor/execution/previous-nodes.spec.ts
@@ -1,4 +1,4 @@
-import { test, expect } from '../../fixtures/base';
+import { test, expect } from '../../../../../fixtures/base';
 
 // eslint-disable-next-line n8n-local-rules/no-skipped-tests -- Flaky in multi-main mode: "execute previous nodes" also executes the current node
 test.describe.skip('Execute previous nodes', () => {

From 33a6aa665c70459d2de1959e5e455275eb263ecb Mon Sep 17 00:00:00 2001
From: Michael Drury <me@michaeldrury.co.uk>
Date: Fri, 5 Dec 2025 13:37:56 +0000
Subject: [PATCH 095/167] fix(ai-builder): Allow setting evaluation feature
 flags via environment variables (no-changelog) (#22813)

---
 .../evaluations/cli/runner.ts                 | 16 ++++++-
 .../evaluations/core/test-runner.ts           | 21 +++++++--
 .../evaluations/index.ts                      | 46 +++++++++++++++++--
 .../evaluations/langsmith/pairwise-runner.ts  | 28 +++++++++--
 .../evaluations/langsmith/runner.ts           | 21 +++++++--
 .../evaluations/utils/evaluation-helpers.ts   |  9 +++-
 6 files changed, 124 insertions(+), 17 deletions(-)

diff --git a/packages/@n8n/ai-workflow-builder.ee/evaluations/cli/runner.ts b/packages/@n8n/ai-workflow-builder.ee/evaluations/cli/runner.ts
index 320d438fdce..26d8e28eabe 100644
--- a/packages/@n8n/ai-workflow-builder.ee/evaluations/cli/runner.ts
+++ b/packages/@n8n/ai-workflow-builder.ee/evaluations/cli/runner.ts
@@ -2,6 +2,7 @@ import pLimit from 'p-limit';
 import pc from 'picocolors';
 
 import { createProgressBar, updateProgress, displayResults, displayError } from './display.js';
+import type { BuilderFeatureFlags } from '../../src/workflow-builder-agent.js';
 import { basicTestCases, generateTestCases } from '../chains/test-case-generator.js';
 import {
 	setupTestEnvironment,
@@ -25,6 +26,7 @@ type CliEvaluationOptions = {
 	testCaseFilter?: string; // Optional test case ID to run only a specific test
 	testCases?: TestCase[]; // Optional array of test cases to run (if not provided, uses defaults and generation)
 	repetitions?: number; // Number of times to run each test (e.g. for cache warming analysis)
+	featureFlags?: BuilderFeatureFlags; // Optional feature flags to pass to the agent (e.g. templateExamples, multiAgent)
 };
 
 /**
@@ -32,12 +34,20 @@ type CliEvaluationOptions = {
  * Supports concurrency control via EVALUATION_CONCURRENCY environment variable
  */
 export async function runCliEvaluation(options: CliEvaluationOptions = {}): Promise<void> {
-	const { repetitions = 1, testCaseFilter } = options;
+	const { repetitions = 1, testCaseFilter, featureFlags } = options;
 
 	console.log(formatHeader('AI Workflow Builder Full Evaluation', 70));
 	if (repetitions > 1) {
 		console.log(pc.yellow(`➔ Each test will be run ${repetitions} times for cache analysis`));
 	}
+	if (featureFlags) {
+		const enabledFlags = Object.entries(featureFlags)
+			.filter(([, v]) => v === true)
+			.map(([k]) => k);
+		if (enabledFlags.length > 0) {
+			console.log(pc.green(`➔ Feature flags enabled: ${enabledFlags.join(', ')}`));
+		}
+	}
 	console.log();
 	try {
 		// Setup test environment
@@ -105,7 +115,9 @@ export async function runCliEvaluation(options: CliEvaluationOptions = {}): Prom
 
 						// Create a dedicated agent for this test to avoid state conflicts
 						const testAgent = createAgent(parsedNodeTypes, llm, tracer);
-						const result = await runSingleTest(testAgent, llm, testCase, parsedNodeTypes);
+						const result = await runSingleTest(testAgent, llm, testCase, parsedNodeTypes, {
+							featureFlags,
+						});
 
 						testResults[testCase.id] = result.error ? 'fail' : 'pass';
 						completed++;
diff --git a/packages/@n8n/ai-workflow-builder.ee/evaluations/core/test-runner.ts b/packages/@n8n/ai-workflow-builder.ee/evaluations/core/test-runner.ts
index 3cdfbe0d488..aa814eedf82 100644
--- a/packages/@n8n/ai-workflow-builder.ee/evaluations/core/test-runner.ts
+++ b/packages/@n8n/ai-workflow-builder.ee/evaluations/core/test-runner.ts
@@ -1,7 +1,7 @@
 import type { BaseChatModel } from '@langchain/core/language_models/chat_models';
 import type { INodeTypeDescription } from 'n8n-workflow';
 
-import type { WorkflowBuilderAgent } from '../../src/workflow-builder-agent';
+import type { BuilderFeatureFlags, WorkflowBuilderAgent } from '../../src/workflow-builder-agent';
 import { evaluateWorkflow } from '../chains/workflow-evaluator';
 import { programmaticEvaluation } from '../programmatic/programmatic-evaluation';
 import type { EvaluationInput, TestCase } from '../types/evaluation';
@@ -69,12 +69,22 @@ export function createErrorResult(testCase: TestCase, error: unknown): TestResul
 	};
 }
 
+export interface RunSingleTestOptions {
+	agent: WorkflowBuilderAgent;
+	llm: BaseChatModel;
+	testCase: TestCase;
+	nodeTypes: INodeTypeDescription[];
+	userId?: string;
+	featureFlags?: BuilderFeatureFlags;
+}
+
 /**
  * Runs a single test case by generating a workflow and evaluating it
  * @param agent - The workflow builder agent to use
  * @param llm - Language model for evaluation
  * @param testCase - Test case to execute
- * @param userId - User ID for the session
+ * @param nodeTypes - Array of node type descriptions
+ * @params opts - userId, User ID for the session and featureFlags, Optional feature flags to pass to the agent
  * @returns Test result with generated workflow and evaluation
  */
 export async function runSingleTest(
@@ -82,12 +92,15 @@ export async function runSingleTest(
 	llm: BaseChatModel,
 	testCase: TestCase,
 	nodeTypes: INodeTypeDescription[],
-	userId: string = 'test-user',
+	opts?: { userId?: string; featureFlags?: BuilderFeatureFlags },
 ): Promise<TestResult> {
+	const userId = opts?.userId ?? 'test-user';
 	try {
 		// Generate workflow
 		const startTime = Date.now();
-		await consumeGenerator(agent.chat(getChatPayload(testCase.prompt, testCase.id), userId));
+		await consumeGenerator(
+			agent.chat(getChatPayload(testCase.prompt, testCase.id, opts?.featureFlags), userId),
+		);
 		const generationTime = Date.now() - startTime;
 
 		// Get generated workflow with validation
diff --git a/packages/@n8n/ai-workflow-builder.ee/evaluations/index.ts b/packages/@n8n/ai-workflow-builder.ee/evaluations/index.ts
index 10c6aac5f9c..162246f44d6 100644
--- a/packages/@n8n/ai-workflow-builder.ee/evaluations/index.ts
+++ b/packages/@n8n/ai-workflow-builder.ee/evaluations/index.ts
@@ -1,3 +1,5 @@
+import type { BuilderFeatureFlags } from '@/workflow-builder-agent';
+
 import { runCliEvaluation } from './cli/runner.js';
 import { runPairwiseLangsmithEvaluation } from './langsmith/pairwise-runner.js';
 import { runLangsmithEvaluation } from './langsmith/runner.js';
@@ -36,13 +38,21 @@ async function main(): Promise<void> {
 		: 1;
 	const repetitions = Number.isNaN(repetitionsArg) ? 1 : repetitionsArg;
 
+	// Parse feature flags from environment variables or CLI arguments
+	const featureFlags = parseFeatureFlags();
+
 	if (usePairwiseEval) {
-		await runPairwiseLangsmithEvaluation(repetitions);
+		await runPairwiseLangsmithEvaluation(repetitions, featureFlags);
 	} else if (useLangsmith) {
-		await runLangsmithEvaluation(repetitions);
+		await runLangsmithEvaluation(repetitions, featureFlags);
 	} else {
 		const csvTestCases = promptsCsvPath ? loadTestCasesFromCsv(promptsCsvPath) : undefined;
-		await runCliEvaluation({ testCases: csvTestCases, testCaseFilter: testCaseId, repetitions });
+		await runCliEvaluation({
+			testCases: csvTestCases,
+			testCaseFilter: testCaseId,
+			repetitions,
+			featureFlags,
+		});
 	}
 }
 
@@ -68,6 +78,36 @@ function getFlagValue(flag: string): string | undefined {
 	return undefined;
 }
 
+/**
+ * Parse feature flags from environment variables or CLI arguments.
+ * Environment variables:
+ *   - EVAL_FEATURE_TEMPLATE_EXAMPLES=true - Enable template examples feature
+ *   - EVAL_FEATURE_MULTI_AGENT=true - Enable multi-agent feature
+ * CLI arguments:
+ *   - --template-examples - Enable template examples feature
+ *   - --multi-agent - Enable multi-agent feature
+ */
+function parseFeatureFlags(): BuilderFeatureFlags | undefined {
+	const templateExamplesFromEnv = process.env.EVAL_FEATURE_TEMPLATE_EXAMPLES === 'true';
+	const multiAgentFromEnv = process.env.EVAL_FEATURE_MULTI_AGENT === 'true';
+
+	const templateExamplesFromCli = process.argv.includes('--template-examples');
+	const multiAgentFromCli = process.argv.includes('--multi-agent');
+
+	const templateExamples = templateExamplesFromEnv || templateExamplesFromCli;
+	const multiAgent = multiAgentFromEnv || multiAgentFromCli;
+
+	// Only return feature flags object if at least one flag is set
+	if (templateExamples || multiAgent) {
+		return {
+			templateExamples: templateExamples || undefined,
+			multiAgent: multiAgent || undefined,
+		};
+	}
+
+	return undefined;
+}
+
 // Run if called directly
 if (require.main === module) {
 	main().catch(console.error);
diff --git a/packages/@n8n/ai-workflow-builder.ee/evaluations/langsmith/pairwise-runner.ts b/packages/@n8n/ai-workflow-builder.ee/evaluations/langsmith/pairwise-runner.ts
index 7146569acb2..89187b1138d 100644
--- a/packages/@n8n/ai-workflow-builder.ee/evaluations/langsmith/pairwise-runner.ts
+++ b/packages/@n8n/ai-workflow-builder.ee/evaluations/langsmith/pairwise-runner.ts
@@ -7,6 +7,7 @@ import type { INodeTypeDescription } from 'n8n-workflow';
 import pc from 'picocolors';
 
 import type { SimpleWorkflow } from '../../src/types/workflow';
+import type { BuilderFeatureFlags } from '../../src/workflow-builder-agent';
 import { evaluateWorkflowPairwise } from '../chains/pairwise-evaluator';
 import { setupTestEnvironment, createAgent } from '../core/environment';
 import { generateRunId, isWorkflowStateValues } from '../types/langsmith';
@@ -41,6 +42,7 @@ function createPairwiseWorkflowGenerator(
 	parsedNodeTypes: INodeTypeDescription[],
 	llm: BaseChatModel,
 	tracer?: LangChainTracer,
+	featureFlags?: BuilderFeatureFlags,
 ) {
 	return async (inputs: PairwiseDatasetInput) => {
 		const runId = generateRunId();
@@ -50,7 +52,10 @@ function createPairwiseWorkflowGenerator(
 
 		// Use the prompt from the dataset
 		await consumeGenerator(
-			agent.chat(getChatPayload(inputs.prompt, runId), 'langsmith-pairwise-eval-user'),
+			agent.chat(
+				getChatPayload(inputs.prompt, runId, featureFlags),
+				'langsmith-pairwise-eval-user',
+			),
 		);
 
 		// Get generated workflow
@@ -117,9 +122,21 @@ function createPairwiseLangsmithEvaluator(llm: BaseChatModel) {
 	};
 }
 
-export async function runPairwiseLangsmithEvaluation(repetitions: number = 1): Promise<void> {
+export async function runPairwiseLangsmithEvaluation(
+	repetitions: number = 1,
+	featureFlags?: BuilderFeatureFlags,
+): Promise<void> {
 	console.log(formatHeader('AI Workflow Builder Pairwise Evaluation', 70));
 
+	if (featureFlags) {
+		const enabledFlags = Object.entries(featureFlags)
+			.filter(([, v]) => v === true)
+			.map(([k]) => k);
+		if (enabledFlags.length > 0) {
+			console.log(pc.green(`➔ Feature flags enabled: ${enabledFlags.join(', ')}`));
+		}
+	}
+
 	if (!process.env.LANGSMITH_API_KEY) {
 		console.error(pc.red('✗ LANGSMITH_API_KEY environment variable not set'));
 		process.exit(1);
@@ -161,7 +178,12 @@ export async function runPairwiseLangsmithEvaluation(repetitions: number = 1): P
 			data = examples;
 		}
 
-		const generateWorkflow = createPairwiseWorkflowGenerator(parsedNodeTypes, llm, tracer);
+		const generateWorkflow = createPairwiseWorkflowGenerator(
+			parsedNodeTypes,
+			llm,
+			tracer,
+			featureFlags,
+		);
 		const evaluator = createPairwiseLangsmithEvaluator(llm);
 
 		await evaluate(generateWorkflow, {
diff --git a/packages/@n8n/ai-workflow-builder.ee/evaluations/langsmith/runner.ts b/packages/@n8n/ai-workflow-builder.ee/evaluations/langsmith/runner.ts
index 8ea144ab2b9..f0c6d91e35c 100644
--- a/packages/@n8n/ai-workflow-builder.ee/evaluations/langsmith/runner.ts
+++ b/packages/@n8n/ai-workflow-builder.ee/evaluations/langsmith/runner.ts
@@ -5,6 +5,7 @@ import type { INodeTypeDescription } from 'n8n-workflow';
 import pc from 'picocolors';
 
 import { createLangsmithEvaluator } from './evaluator';
+import type { BuilderFeatureFlags } from '../../src/workflow-builder-agent';
 import type { WorkflowState } from '../../src/workflow-state';
 import { setupTestEnvironment, createAgent } from '../core/environment';
 import {
@@ -20,12 +21,14 @@ import { consumeGenerator, formatHeader, getChatPayload } from '../utils/evaluat
  * @param parsedNodeTypes - Node types
  * @param llm - Language model
  * @param tracer - Optional tracer
+ * @param featureFlags - Optional feature flags to pass to the agent
  * @returns Function that generates workflows from inputs
  */
 function createWorkflowGenerator(
 	parsedNodeTypes: INodeTypeDescription[],
 	llm: BaseChatModel,
 	tracer?: LangChainTracer,
+	featureFlags?: BuilderFeatureFlags,
 ) {
 	return async (inputs: typeof WorkflowState.State) => {
 		// Generate a unique ID for this evaluation run
@@ -43,7 +46,7 @@ function createWorkflowGenerator(
 		// Create agent for this run
 		const agent = createAgent(parsedNodeTypes, llm, tracer);
 		await consumeGenerator(
-			agent.chat(getChatPayload(messageContent, runId), 'langsmith-eval-user'),
+			agent.chat(getChatPayload(messageContent, runId, featureFlags), 'langsmith-eval-user'),
 		);
 
 		// Get generated workflow with validation
@@ -75,12 +78,24 @@ function createWorkflowGenerator(
 /**
  * Runs evaluation using Langsmith
  * @param repetitions - Number of times to run each example (default: 1)
+ * @param featureFlags - Optional feature flags to pass to the agent
  */
-export async function runLangsmithEvaluation(repetitions: number = 1): Promise<void> {
+export async function runLangsmithEvaluation(
+	repetitions: number = 1,
+	featureFlags?: BuilderFeatureFlags,
+): Promise<void> {
 	console.log(formatHeader('AI Workflow Builder Langsmith Evaluation', 70));
 	if (repetitions > 1) {
 		console.log(pc.yellow(`➔ Each example will be run ${repetitions} times`));
 	}
+	if (featureFlags) {
+		const enabledFlags = Object.entries(featureFlags)
+			.filter(([, v]) => v === true)
+			.map(([k]) => k);
+		if (enabledFlags.length > 0) {
+			console.log(pc.green(`➔ Feature flags enabled: ${enabledFlags.join(', ')}`));
+		}
+	}
 	console.log();
 
 	// Check for Langsmith API key
@@ -123,7 +138,7 @@ export async function runLangsmithEvaluation(repetitions: number = 1): Promise<v
 		const startTime = Date.now();
 
 		// Create workflow generation function
-		const generateWorkflow = createWorkflowGenerator(parsedNodeTypes, llm, tracer);
+		const generateWorkflow = createWorkflowGenerator(parsedNodeTypes, llm, tracer, featureFlags);
 
 		// Create evaluator with both LLM-based and programmatic evaluation
 		const evaluator = createLangsmithEvaluator(llm, parsedNodeTypes);
diff --git a/packages/@n8n/ai-workflow-builder.ee/evaluations/utils/evaluation-helpers.ts b/packages/@n8n/ai-workflow-builder.ee/evaluations/utils/evaluation-helpers.ts
index 91988d961bc..071a3e62ffe 100644
--- a/packages/@n8n/ai-workflow-builder.ee/evaluations/utils/evaluation-helpers.ts
+++ b/packages/@n8n/ai-workflow-builder.ee/evaluations/utils/evaluation-helpers.ts
@@ -8,7 +8,7 @@ import { join } from 'path';
 import pc from 'picocolors';
 
 import { anthropicClaudeSonnet45 } from '../../src/llm-config';
-import type { ChatPayload } from '../../src/workflow-builder-agent';
+import type { BuilderFeatureFlags, ChatPayload } from '../../src/workflow-builder-agent';
 import { WorkflowBuilderAgent } from '../../src/workflow-builder-agent';
 import type { Violation } from '../types/evaluation';
 import type { TestResult } from '../types/test-result';
@@ -277,11 +277,16 @@ export async function consumeGenerator<T>(gen: AsyncGenerator<T>) {
 	}
 }
 
-export function getChatPayload(message: string, id: string): ChatPayload {
+export function getChatPayload(
+	message: string,
+	id: string,
+	featureFlags?: BuilderFeatureFlags,
+): ChatPayload {
 	return {
 		message,
 		workflowContext: {
 			currentWorkflow: { id, nodes: [], connections: {} },
 		},
+		featureFlags,
 	};
 }

From 367643025d5e5053bf266deabc883aee58a574ff Mon Sep 17 00:00:00 2001
From: Suguru Inoue <suguru@n8n.io>
Date: Fri, 5 Dec 2025 14:47:23 +0100
Subject: [PATCH 096/167] fix(editor): Address chat UI feedback (no-changelog)
 (#22819)

---
 .../frontend/editor-ui/src/features/ai/chatHub/ChatView.vue  | 3 ++-
 .../src/features/ai/chatHub/components/ChatMessage.vue       | 5 +++++
 .../src/features/ai/chatHub/components/ChatPrompt.vue        | 2 ++
 .../src/features/ai/chatHub/components/ChatSidebarLink.vue   | 2 +-
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/packages/frontend/editor-ui/src/features/ai/chatHub/ChatView.vue b/packages/frontend/editor-ui/src/features/ai/chatHub/ChatView.vue
index fcc7d08b57e..32226551527 100644
--- a/packages/frontend/editor-ui/src/features/ai/chatHub/ChatView.vue
+++ b/packages/frontend/editor-ui/src/features/ai/chatHub/ChatView.vue
@@ -320,6 +320,7 @@ watch(
 	[sessionId, isNewSession],
 	async ([id, isNew]) => {
 		didSubmitInCurrentSession.value = false;
+		editingMessageId.value = undefined;
 
 		if (!isNew && !chatStore.getConversation(id)) {
 			try {
@@ -365,7 +366,7 @@ watch(
 watch(
 	defaultAgent,
 	(agent, prevAgent) => {
-		if (defaultModel.value && agent && agent.name !== prevAgent?.name) {
+		if (defaultModel.value && agent?.name && agent.name !== prevAgent?.name) {
 			defaultModel.value = { ...defaultModel.value, cachedDisplayName: agent.name };
 		}
 
diff --git a/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatMessage.vue b/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatMessage.vue
index f720dc6d3fa..9b107822895 100644
--- a/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatMessage.vue
+++ b/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatMessage.vue
@@ -114,6 +114,11 @@ function handleConfirmEdit() {
 }
 
 function handleKeydownTextarea(e: KeyboardEvent) {
+	if (e.key === 'Escape') {
+		emit('cancelEdit');
+		return;
+	}
+
 	const trimmed = editedText.value.trim();
 
 	if (e.key === 'Enter' && isCtrlKeyPressed(e) && !e.isComposing && trimmed) {
diff --git a/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatPrompt.vue b/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatPrompt.vue
index 8ce4e72d107..d8e93315089 100644
--- a/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatPrompt.vue
+++ b/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatPrompt.vue
@@ -125,6 +125,8 @@ function handleSubmitForm() {
 function handleKeydownTextarea(e: KeyboardEvent) {
 	const trimmed = message.value.trim();
 
+	speechInput.stop();
+
 	if (e.key === 'Enter' && !e.shiftKey && !e.isComposing && trimmed) {
 		e.preventDefault();
 		speechInput.stop();
diff --git a/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatSidebarLink.vue b/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatSidebarLink.vue
index df3f1a05791..9310587baaa 100644
--- a/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatSidebarLink.vue
+++ b/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatSidebarLink.vue
@@ -108,9 +108,9 @@ defineSlots<{
 
 .actionDropdown {
 	opacity: 0;
-	transition: opacity 0.2s;
 	flex-shrink: 0;
 	width: 0;
+	overflow: hidden;
 
 	.menuItem:has([aria-expanded='true']) &,
 	.menuItem:has(:focus) &,

From 3979e76c1bcf654b805be3566d4330a395c469ca Mon Sep 17 00:00:00 2001
From: Konstantin Tieber <46342664+konstantintieber@users.noreply.github.com>
Date: Fri, 5 Dec 2025 14:53:41 +0100
Subject: [PATCH 097/167] chore: Revert add version back to public settings
 (no-changelog) (#22821)

---
 .../src/services/__tests__/frontend.service.test.ts    | 10 ++++------
 packages/cli/src/services/frontend.service.ts          |  3 ---
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/packages/cli/src/services/__tests__/frontend.service.test.ts b/packages/cli/src/services/__tests__/frontend.service.test.ts
index 1e7489eb514..9da6558e4e2 100644
--- a/packages/cli/src/services/__tests__/frontend.service.test.ts
+++ b/packages/cli/src/services/__tests__/frontend.service.test.ts
@@ -202,11 +202,6 @@ describe('FrontendService', () => {
 
 	describe('getPublicSettings', () => {
 		it('should return public settings', () => {
-			const { service } = createMockService();
-			service.settings.versionCli = '1.123.0';
-
-			const settings = service.getPublicSettings();
-
 			const expectedPublicSettings: PublicFrontendSettings = {
 				settingsMode: 'public',
 				userManagement: {
@@ -214,7 +209,6 @@ describe('FrontendService', () => {
 					showSetupOnFirstLoad: true,
 					authenticationMethod: 'email',
 				},
-				versionCli: '1.123.0',
 				sso: {
 					saml: { loginEnabled: false },
 					ldap: { loginEnabled: false, loginLabel: '' },
@@ -227,6 +221,10 @@ describe('FrontendService', () => {
 				previewMode: false,
 				enterprise: { saml: false, ldap: false, oidc: false },
 			};
+
+			const { service } = createMockService();
+			const settings = service.getPublicSettings();
+
 			expect(settings).toEqual(expectedPublicSettings);
 		});
 	});
diff --git a/packages/cli/src/services/frontend.service.ts b/packages/cli/src/services/frontend.service.ts
index fa93d97af85..36902840555 100644
--- a/packages/cli/src/services/frontend.service.ts
+++ b/packages/cli/src/services/frontend.service.ts
@@ -39,8 +39,6 @@ export type PublicFrontendSettings = {
 	/** Controls initialization flow in settings store */
 	settingsMode: FrontendSettings['settingsMode'];
 
-	versionCli: string;
-
 	/** Used to bypass authentication on the workflows/demo page */
 	previewMode: FrontendSettings['previewMode'];
 
@@ -542,7 +540,6 @@ export class FrontendService {
 					loginUrl: ssoOidc.loginUrl,
 				},
 			},
-			versionCli: this.settings.versionCli,
 			authCookie,
 			previewMode,
 			enterprise: { saml, ldap, oidc },

From 0596e1a5b33460b2232decfb44b68e91b29593a8 Mon Sep 17 00:00:00 2001
From: Artem Sorokin <38620398+seemewalkin@users.noreply.github.com>
Date: Fri, 5 Dec 2025 14:57:22 +0100
Subject: [PATCH 098/167] test: Migrate expression and code editor tests
 (#22820)

---
 .../editor/code/code-node.spec.ts}                          | 4 ++--
 .../editor/code/editors.spec.ts}                            | 6 +++---
 .../editor/expressions/inline.spec.ts}                      | 4 ++--
 .../editor/expressions/mapping.spec.ts}                     | 2 +-
 .../editor/expressions/modal.spec.ts}                       | 2 +-
 .../editor/expressions/transformation.spec.ts}              | 4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)
 rename packages/testing/playwright/tests/ui/{6-code-node.spec.ts => workflows/editor/code/code-node.spec.ts} (98%)
 rename packages/testing/playwright/tests/ui/{41-editors.spec.ts => workflows/editor/code/editors.spec.ts} (97%)
 rename packages/testing/playwright/tests/ui/{11-inline-expression-editor.spec.ts => workflows/editor/expressions/inline.spec.ts} (98%)
 rename packages/testing/playwright/tests/ui/{14-mapping.spec.ts => workflows/editor/expressions/mapping.spec.ts} (99%)
 rename packages/testing/playwright/tests/ui/{9-expression-editor-modal.spec.ts => workflows/editor/expressions/modal.spec.ts} (98%)
 rename packages/testing/playwright/tests/ui/{14-data-transformation-expressions.spec.ts => workflows/editor/expressions/transformation.spec.ts} (97%)

diff --git a/packages/testing/playwright/tests/ui/6-code-node.spec.ts b/packages/testing/playwright/tests/ui/workflows/editor/code/code-node.spec.ts
similarity index 98%
rename from packages/testing/playwright/tests/ui/6-code-node.spec.ts
rename to packages/testing/playwright/tests/ui/workflows/editor/code/code-node.spec.ts
index cd134a521d9..4423c5b45f3 100644
--- a/packages/testing/playwright/tests/ui/6-code-node.spec.ts
+++ b/packages/testing/playwright/tests/ui/workflows/editor/code/code-node.spec.ts
@@ -4,8 +4,8 @@ import {
 	CODE_NODE_DISPLAY_NAME,
 	CODE_NODE_NAME,
 	MANUAL_TRIGGER_NODE_NAME,
-} from '../../config/constants';
-import { test, expect } from '../../fixtures/base';
+} from '../../../../../config/constants';
+import { test, expect } from '../../../../../fixtures/base';
 
 test.describe('Code node', () => {
 	test.describe('Code editor', () => {
diff --git a/packages/testing/playwright/tests/ui/41-editors.spec.ts b/packages/testing/playwright/tests/ui/workflows/editor/code/editors.spec.ts
similarity index 97%
rename from packages/testing/playwright/tests/ui/41-editors.spec.ts
rename to packages/testing/playwright/tests/ui/workflows/editor/code/editors.spec.ts
index a40eb177dbc..3b5cd97503d 100644
--- a/packages/testing/playwright/tests/ui/41-editors.spec.ts
+++ b/packages/testing/playwright/tests/ui/workflows/editor/code/editors.spec.ts
@@ -1,8 +1,8 @@
 import fs from 'fs';
 
-import { MANUAL_TRIGGER_NODE_DISPLAY_NAME } from '../../config/constants';
-import { test, expect } from '../../fixtures/base';
-import { resolveFromRoot } from '../../utils/path-helper';
+import { MANUAL_TRIGGER_NODE_DISPLAY_NAME } from '../../../../../config/constants';
+import { test, expect } from '../../../../../fixtures/base';
+import { resolveFromRoot } from '../../../../../utils/path-helper';
 
 test.describe('Editors', () => {
 	test.beforeEach(async ({ n8n }) => {
diff --git a/packages/testing/playwright/tests/ui/11-inline-expression-editor.spec.ts b/packages/testing/playwright/tests/ui/workflows/editor/expressions/inline.spec.ts
similarity index 98%
rename from packages/testing/playwright/tests/ui/11-inline-expression-editor.spec.ts
rename to packages/testing/playwright/tests/ui/workflows/editor/expressions/inline.spec.ts
index adfd9d529e8..cf9d98d3559 100644
--- a/packages/testing/playwright/tests/ui/11-inline-expression-editor.spec.ts
+++ b/packages/testing/playwright/tests/ui/workflows/editor/expressions/inline.spec.ts
@@ -3,8 +3,8 @@ import {
 	SCHEDULE_TRIGGER_NODE_NAME,
 	NO_OPERATION_NODE_NAME,
 	HACKER_NEWS_NODE_NAME,
-} from '../../config/constants';
-import { test, expect } from '../../fixtures/base';
+} from '../../../../../config/constants';
+import { test, expect } from '../../../../../fixtures/base';
 
 const SCHEDULE_PARAMETER_NAME = 'daysInterval';
 const HACKER_NEWS_ACTION = 'Get many items';
diff --git a/packages/testing/playwright/tests/ui/14-mapping.spec.ts b/packages/testing/playwright/tests/ui/workflows/editor/expressions/mapping.spec.ts
similarity index 99%
rename from packages/testing/playwright/tests/ui/14-mapping.spec.ts
rename to packages/testing/playwright/tests/ui/workflows/editor/expressions/mapping.spec.ts
index e01c189c352..0bf064d21dc 100644
--- a/packages/testing/playwright/tests/ui/14-mapping.spec.ts
+++ b/packages/testing/playwright/tests/ui/workflows/editor/expressions/mapping.spec.ts
@@ -1,4 +1,4 @@
-import { test, expect } from '../../fixtures/base';
+import { test, expect } from '../../../../../fixtures/base';
 
 test.describe('Data Mapping', () => {
 	test.describe
diff --git a/packages/testing/playwright/tests/ui/9-expression-editor-modal.spec.ts b/packages/testing/playwright/tests/ui/workflows/editor/expressions/modal.spec.ts
similarity index 98%
rename from packages/testing/playwright/tests/ui/9-expression-editor-modal.spec.ts
rename to packages/testing/playwright/tests/ui/workflows/editor/expressions/modal.spec.ts
index e9262e7aeb8..4cb8c8b0e83 100644
--- a/packages/testing/playwright/tests/ui/9-expression-editor-modal.spec.ts
+++ b/packages/testing/playwright/tests/ui/workflows/editor/expressions/modal.spec.ts
@@ -1,4 +1,4 @@
-import { test, expect } from '../../fixtures/base';
+import { test, expect } from '../../../../../fixtures/base';
 
 test.describe('Expression editor modal', () => {
 	test.beforeEach(async ({ n8n }) => {
diff --git a/packages/testing/playwright/tests/ui/14-data-transformation-expressions.spec.ts b/packages/testing/playwright/tests/ui/workflows/editor/expressions/transformation.spec.ts
similarity index 97%
rename from packages/testing/playwright/tests/ui/14-data-transformation-expressions.spec.ts
rename to packages/testing/playwright/tests/ui/workflows/editor/expressions/transformation.spec.ts
index 38830c73fd5..3e96641c83e 100644
--- a/packages/testing/playwright/tests/ui/14-data-transformation-expressions.spec.ts
+++ b/packages/testing/playwright/tests/ui/workflows/editor/expressions/transformation.spec.ts
@@ -1,5 +1,5 @@
-import { test, expect } from '../../fixtures/base';
-import type { n8nPage } from '../../pages/n8nPage';
+import { test, expect } from '../../../../../fixtures/base';
+import type { n8nPage } from '../../../../../pages/n8nPage';
 
 test.describe('Data transformation expressions', () => {
 	test.beforeEach(async ({ n8n }) => {

From fe4f4677c4eb10bdd2ebbd0a9d3c09463a27f9bb Mon Sep 17 00:00:00 2001
From: Benjamin Schroth <68321970+schrothbn@users.noreply.github.com>
Date: Fri, 5 Dec 2025 15:13:49 +0100
Subject: [PATCH 099/167] chore: Update @modelcontextprotocol/sdk (#22823)

---
 .../__test__/McpClientTool.node.test.ts       | 12 ++--
 .../nodes-langchain/nodes/mcp/shared/utils.ts |  2 +-
 packages/@n8n/nodes-langchain/package.json    |  2 +-
 .../__tests__/execute-workflow.tool.test.ts   |  2 +-
 .../mcp/__tests__/mcp-oauth-service.test.ts   | 32 ++++++++++
 .../cli/src/modules/mcp/mcp-oauth-service.ts  |  2 +
 pnpm-lock.yaml                                | 58 +++++++++++++------
 7 files changed, 85 insertions(+), 25 deletions(-)

diff --git a/packages/@n8n/nodes-langchain/nodes/mcp/McpClientTool/__test__/McpClientTool.node.test.ts b/packages/@n8n/nodes-langchain/nodes/mcp/McpClientTool/__test__/McpClientTool.node.test.ts
index 8a413e5d168..63108cef58b 100644
--- a/packages/@n8n/nodes-langchain/nodes/mcp/McpClientTool/__test__/McpClientTool.node.test.ts
+++ b/packages/@n8n/nodes-langchain/nodes/mcp/McpClientTool/__test__/McpClientTool.node.test.ts
@@ -292,7 +292,9 @@ describe('McpClientTool', () => {
 
 		it('should successfully execute a tool', async () => {
 			jest.spyOn(Client.prototype, 'connect').mockResolvedValue();
-			jest.spyOn(Client.prototype, 'callTool').mockResolvedValue({ content: 'Sunny' });
+			jest
+				.spyOn(Client.prototype, 'callTool')
+				.mockResolvedValue({ toolResult: 'Sunny', content: [] });
 			jest.spyOn(Client.prototype, 'listTools').mockResolvedValue({
 				tools: [
 					{
@@ -326,9 +328,11 @@ describe('McpClientTool', () => {
 
 		it('should handle tool errors', async () => {
 			jest.spyOn(Client.prototype, 'connect').mockResolvedValue();
-			jest
-				.spyOn(Client.prototype, 'callTool')
-				.mockResolvedValue({ isError: true, content: [{ text: 'Weather unknown at location' }] });
+			jest.spyOn(Client.prototype, 'callTool').mockResolvedValue({
+				isError: true,
+				toolResult: 'Weather unknown at location',
+				content: [{ text: 'Weather unknown at location' }],
+			});
 			jest.spyOn(Client.prototype, 'listTools').mockResolvedValue({
 				tools: [
 					{
diff --git a/packages/@n8n/nodes-langchain/nodes/mcp/shared/utils.ts b/packages/@n8n/nodes-langchain/nodes/mcp/shared/utils.ts
index 40134dcdc9f..dc60019b415 100644
--- a/packages/@n8n/nodes-langchain/nodes/mcp/shared/utils.ts
+++ b/packages/@n8n/nodes-langchain/nodes/mcp/shared/utils.ts
@@ -114,7 +114,7 @@ export async function connectMcpClient({
 		return createResultError({ type: 'invalid_url', error: endpoint.error });
 	}
 
-	const client = new Client({ name, version: version.toString() }, { capabilities: { tools: {} } });
+	const client = new Client({ name, version: version.toString() }, { capabilities: {} });
 
 	if (serverTransport === 'httpStreamable') {
 		try {
diff --git a/packages/@n8n/nodes-langchain/package.json b/packages/@n8n/nodes-langchain/package.json
index da12d9a8d45..1c17987d915 100644
--- a/packages/@n8n/nodes-langchain/package.json
+++ b/packages/@n8n/nodes-langchain/package.json
@@ -203,7 +203,7 @@
     "@langchain/redis": "1.0.1",
     "@langchain/textsplitters": "1.0.1",
     "@langchain/weaviate": "1.0.1",
-    "@modelcontextprotocol/sdk": "1.20.0",
+    "@modelcontextprotocol/sdk": "1.24.0",
     "@mozilla/readability": "0.6.0",
     "@n8n/client-oauth2": "workspace:*",
     "@n8n/config": "workspace:*",
diff --git a/packages/cli/src/modules/mcp/__tests__/execute-workflow.tool.test.ts b/packages/cli/src/modules/mcp/__tests__/execute-workflow.tool.test.ts
index 7c6ac46bd32..f9a5fa21772 100644
--- a/packages/cli/src/modules/mcp/__tests__/execute-workflow.tool.test.ts
+++ b/packages/cli/src/modules/mcp/__tests__/execute-workflow.tool.test.ts
@@ -738,7 +738,7 @@ describe('execute-workflow MCP tool', () => {
 				);
 
 				// Call through the tool handler to test telemetry
-				await tool.handler({ workflowId: 'error-tracking' }, {} as any);
+				await tool.handler({ workflowId: 'error-tracking', inputs: undefined }, {} as any);
 
 				expect(telemetry.track).toHaveBeenCalledWith(
 					'User called mcp tool',
diff --git a/packages/cli/src/modules/mcp/__tests__/mcp-oauth-service.test.ts b/packages/cli/src/modules/mcp/__tests__/mcp-oauth-service.test.ts
index 9a2b77127cf..05eca7a3b47 100644
--- a/packages/cli/src/modules/mcp/__tests__/mcp-oauth-service.test.ts
+++ b/packages/cli/src/modules/mcp/__tests__/mcp-oauth-service.test.ts
@@ -68,6 +68,8 @@ describe('McpOAuthService', () => {
 					token_endpoint_auth_method: 'none',
 					response_types: ['code'],
 					scope: SUPPORTED_SCOPES.join(' '),
+					logo_uri: undefined,
+					tos_uri: undefined,
 				});
 			});
 
@@ -111,6 +113,8 @@ describe('McpOAuthService', () => {
 					token_endpoint_auth_method: 'none',
 					response_types: ['code'],
 					scope: 'read write',
+					logo_uri: undefined,
+					tos_uri: undefined,
 				};
 
 				oauthClientRepository.insert.mockResolvedValue({} as any);
@@ -140,6 +144,8 @@ describe('McpOAuthService', () => {
 					client_secret_expires_at: 1234567890,
 					response_types: ['code'],
 					scope: 'read',
+					logo_uri: undefined,
+					tos_uri: undefined,
 				};
 
 				oauthClientRepository.insert.mockResolvedValue({} as any);
@@ -166,6 +172,8 @@ describe('McpOAuthService', () => {
 					token_endpoint_auth_method: 'none',
 					response_types: ['code'],
 					scope: 'read',
+					logo_uri: undefined,
+					tos_uri: undefined,
 				};
 
 				const error = new Error('Database error');
@@ -192,6 +200,8 @@ describe('McpOAuthService', () => {
 				token_endpoint_auth_method: 'none',
 				response_types: ['code'],
 				scope: 'read write',
+				logo_uri: undefined,
+				tos_uri: undefined,
 			};
 
 			const params = {
@@ -222,6 +232,8 @@ describe('McpOAuthService', () => {
 				token_endpoint_auth_method: 'none',
 				response_types: ['code'],
 				scope: 'read',
+				logo_uri: undefined,
+				tos_uri: undefined,
 			};
 
 			const params = {
@@ -250,6 +262,8 @@ describe('McpOAuthService', () => {
 				token_endpoint_auth_method: 'none',
 				response_types: ['code'],
 				scope: 'read',
+				logo_uri: undefined,
+				tos_uri: undefined,
 			};
 
 			const params = {
@@ -291,6 +305,8 @@ describe('McpOAuthService', () => {
 				token_endpoint_auth_method: 'none',
 				response_types: ['code'],
 				scope: 'read',
+				logo_uri: undefined,
+				tos_uri: undefined,
 			};
 
 			authorizationCodeService.getCodeChallenge.mockResolvedValue('challenge-123');
@@ -315,6 +331,8 @@ describe('McpOAuthService', () => {
 				token_endpoint_auth_method: 'none',
 				response_types: ['code'],
 				scope: 'read',
+				logo_uri: undefined,
+				tos_uri: undefined,
 			};
 
 			const authRecord = {
@@ -365,6 +383,8 @@ describe('McpOAuthService', () => {
 				token_endpoint_auth_method: 'none',
 				response_types: ['code'],
 				scope: 'read',
+				logo_uri: undefined,
+				tos_uri: undefined,
 			};
 
 			const authRecord = {
@@ -398,6 +418,8 @@ describe('McpOAuthService', () => {
 				token_endpoint_auth_method: 'none',
 				response_types: ['code'],
 				scope: 'read',
+				logo_uri: undefined,
+				tos_uri: undefined,
 			};
 
 			const newTokens = {
@@ -447,6 +469,8 @@ describe('McpOAuthService', () => {
 				token_endpoint_auth_method: 'none',
 				response_types: ['code'],
 				scope: 'read',
+				logo_uri: undefined,
+				tos_uri: undefined,
 			};
 
 			tokenService.revokeAccessToken.mockResolvedValue(true);
@@ -469,6 +493,8 @@ describe('McpOAuthService', () => {
 				token_endpoint_auth_method: 'none',
 				response_types: ['code'],
 				scope: 'read',
+				logo_uri: undefined,
+				tos_uri: undefined,
 			};
 
 			tokenService.revokeRefreshToken.mockResolvedValue(true);
@@ -491,6 +517,8 @@ describe('McpOAuthService', () => {
 				token_endpoint_auth_method: 'none',
 				response_types: ['code'],
 				scope: 'read',
+				logo_uri: undefined,
+				tos_uri: undefined,
 			};
 
 			tokenService.revokeAccessToken.mockResolvedValue(true);
@@ -512,6 +540,8 @@ describe('McpOAuthService', () => {
 				token_endpoint_auth_method: 'none',
 				response_types: ['code'],
 				scope: 'read',
+				logo_uri: undefined,
+				tos_uri: undefined,
 			};
 
 			tokenService.revokeAccessToken.mockResolvedValue(false);
@@ -534,6 +564,8 @@ describe('McpOAuthService', () => {
 				token_endpoint_auth_method: 'none',
 				response_types: ['code'],
 				scope: 'read',
+				logo_uri: undefined,
+				tos_uri: undefined,
 			};
 
 			tokenService.revokeAccessToken.mockResolvedValue(false);
diff --git a/packages/cli/src/modules/mcp/mcp-oauth-service.ts b/packages/cli/src/modules/mcp/mcp-oauth-service.ts
index e84127eb8f9..13c76e58e10 100644
--- a/packages/cli/src/modules/mcp/mcp-oauth-service.ts
+++ b/packages/cli/src/modules/mcp/mcp-oauth-service.ts
@@ -57,6 +57,8 @@ export class McpOAuthService implements OAuthServerProvider {
 					}),
 					response_types: ['code'],
 					scope: SUPPORTED_SCOPES.join(' '),
+					logo_uri: undefined,
+					tos_uri: undefined,
 				};
 			},
 			registerClient: async (
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 2779171a65a..2b78bafa3bf 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -378,7 +378,7 @@ importers:
         version: 1.1.0(@opentelemetry/api@1.9.0)(@opentelemetry/sdk-trace-base@1.30.1(@opentelemetry/api@1.9.0))(openai@6.9.1(ws@8.18.3(bufferutil@4.0.9)(utf-8-validate@5.0.10))(zod@3.25.67))
       '@langchain/langgraph':
         specifier: 1.0.2
-        version: 1.0.2(@langchain/core@1.1.0(@opentelemetry/api@1.9.0)(@opentelemetry/sdk-trace-base@1.30.1(@opentelemetry/api@1.9.0))(openai@6.9.1(ws@8.18.3(bufferutil@4.0.9)(utf-8-validate@5.0.10))(zod@3.25.67)))(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(zod-to-json-schema@3.24.6(zod@3.25.67))(zod@3.25.67)
+        version: 1.0.2(@langchain/core@1.1.0(@opentelemetry/api@1.9.0)(@opentelemetry/sdk-trace-base@1.30.1(@opentelemetry/api@1.9.0))(openai@6.9.1(ws@8.18.3(bufferutil@4.0.9)(utf-8-validate@5.0.10))(zod@3.25.67)))(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(zod-to-json-schema@3.25.0(zod@3.25.67))(zod@3.25.67)
       '@langchain/openai':
         specifier: 'catalog:'
         version: 1.1.3(@langchain/core@1.1.0(@opentelemetry/api@1.9.0)(@opentelemetry/sdk-trace-base@1.30.1(@opentelemetry/api@1.9.0))(openai@6.9.1(ws@8.18.3(bufferutil@4.0.9)(utf-8-validate@5.0.10))(zod@3.25.67)))(ws@8.18.3(bufferutil@4.0.9)(utf-8-validate@5.0.10))
@@ -1078,7 +1078,7 @@ importers:
         version: 5.3.0(encoding@0.1.13)
       '@google/genai':
         specifier: 1.19.0
-        version: 1.19.0(@modelcontextprotocol/sdk@1.20.0)(bufferutil@4.0.9)(utf-8-validate@5.0.10)
+        version: 1.19.0(@modelcontextprotocol/sdk@1.24.0(zod@3.25.67))(bufferutil@4.0.9)(utf-8-validate@5.0.10)
       '@google/generative-ai':
         specifier: 0.21.0
         version: 0.21.0
@@ -1099,7 +1099,7 @@ importers:
         version: 1.0.1(@langchain/core@1.1.0(@opentelemetry/api@1.9.0)(@opentelemetry/sdk-trace-base@1.30.1(@opentelemetry/api@1.9.0))(openai@6.9.1(ws@8.18.3(bufferutil@4.0.9)(utf-8-validate@5.0.10))(zod@3.25.67)))(encoding@0.1.13)
       '@langchain/community':
         specifier: 'catalog:'
-        version: 1.0.5(e0c14078fc79d0957987f04ba80f836a)
+        version: 1.0.5(98d49f2e32edc045c97e45bba7d1d36c)
       '@langchain/core':
         specifier: 'catalog:'
         version: 1.1.0(@opentelemetry/api@1.9.0)(@opentelemetry/sdk-trace-base@1.30.1(@opentelemetry/api@1.9.0))(openai@6.9.1(ws@8.18.3(bufferutil@4.0.9)(utf-8-validate@5.0.10))(zod@3.25.67))
@@ -1140,8 +1140,8 @@ importers:
         specifier: 1.0.1
         version: 1.0.1(@langchain/core@1.1.0(@opentelemetry/api@1.9.0)(@opentelemetry/sdk-trace-base@1.30.1(@opentelemetry/api@1.9.0))(openai@6.9.1(ws@8.18.3(bufferutil@4.0.9)(utf-8-validate@5.0.10))(zod@3.25.67)))(encoding@0.1.13)
       '@modelcontextprotocol/sdk':
-        specifier: 1.20.0
-        version: 1.20.0
+        specifier: 1.24.0
+        version: 1.24.0(zod@3.25.67)
       '@mozilla/readability':
         specifier: 0.6.0
         version: 0.6.0
@@ -6248,9 +6248,15 @@ packages:
   '@mistralai/mistralai@1.10.0':
     resolution: {integrity: sha512-tdIgWs4Le8vpvPiUEWne6tK0qbVc+jMenujnvTqOjogrJUsCSQhus0tHTU1avDDh5//Rq2dFgP9mWRAdIEoBqg==}
 
-  '@modelcontextprotocol/sdk@1.20.0':
-    resolution: {integrity: sha512-kOQ4+fHuT4KbR2iq2IjeV32HiihueuOf1vJkq18z08CLZ1UQrTc8BXJpVfxZkq45+inLLD+D4xx4nBjUelJa4Q==}
+  '@modelcontextprotocol/sdk@1.24.0':
+    resolution: {integrity: sha512-D8h5KXY2vHFW8zTuxn2vuZGN0HGrQ5No6LkHwlEA9trVgNdPL3TF1dSqKA7Dny6BbBYKSW/rOBDXdC8KJAjUCg==}
     engines: {node: '>=18'}
+    peerDependencies:
+      '@cfworker/json-schema': ^4.1.1
+      zod: 3.25.67
+    peerDependenciesMeta:
+      '@cfworker/json-schema':
+        optional: true
 
   '@mongodb-js/saslprep@1.1.9':
     resolution: {integrity: sha512-tVkljjeEaAhCqTzajSdgbQ6gE6f3oneVwa3iXR6csiEwXXOFsiC6Uh9iAjAhXPtqa/XMDHWjjeNH/77m/Yq2dw==}
@@ -13261,6 +13267,9 @@ packages:
   jose@6.0.11:
     resolution: {integrity: sha512-QxG7EaliDARm1O1S8BGakqncGT9s25bKL1WSf6/oa17Tkqwi8D2ZNglqCF+DsYF88/rV66Q/Q2mFAy697E1DUg==}
 
+  jose@6.1.2:
+    resolution: {integrity: sha512-MpcPtHLE5EmztuFIqB0vzHAWJPpmN1E6L4oo+kze56LIs3MyXIj9ZHMDxqOvkP38gBR7K1v3jqd4WU2+nrfONQ==}
+
   joycon@3.1.1:
     resolution: {integrity: sha512-34wB/Y7MW7bzjKRjUKTa46I2Z7eV62Rkhva+KkopW7Qvv/OSWBqvkSY7vusOPrNuZcUG3tApvdVgNB8POj3SPw==}
     engines: {node: '>=10'}
@@ -18414,6 +18423,11 @@ packages:
     peerDependencies:
       zod: 3.25.67
 
+  zod-to-json-schema@3.25.0:
+    resolution: {integrity: sha512-HvWtU2UG41LALjajJrML6uQejQhNJx+JBO9IflpSja4R03iNWfKXrj6W2h7ljuLyc1nKS+9yDyL/9tD1U/yBnQ==}
+    peerDependencies:
+      zod: 3.25.67
+
   zod@3.25.67:
     resolution: {integrity: sha512-idA2YXwpCdqUSKRCACDE6ItZD9TZzy3OZMtpfLoh6oPR47lipysRrJfjzMqFxQ3uJuUPyUeWe1r9vLH33xO/Qw==}
 
@@ -21076,13 +21090,13 @@ snapshots:
     transitivePeerDependencies:
       - encoding
 
-  '@browserbasehq/stagehand@1.9.0(@playwright/test@1.56.0)(bufferutil@4.0.9)(deepmerge@4.3.1)(dotenv@16.6.1)(encoding@0.1.13)(openai@6.9.1(ws@8.18.3(bufferutil@4.0.9)(utf-8-validate@5.0.10))(zod@3.25.67))(utf-8-validate@5.0.10)(zod@3.25.67)':
+  '@browserbasehq/stagehand@1.9.0(@playwright/test@1.56.0)(bufferutil@4.0.9)(deepmerge@4.3.1)(dotenv@17.2.3)(encoding@0.1.13)(openai@6.9.1(ws@8.18.3(bufferutil@4.0.9)(utf-8-validate@5.0.10))(zod@3.25.67))(utf-8-validate@5.0.10)(zod@3.25.67)':
     dependencies:
       '@anthropic-ai/sdk': 0.27.3(encoding@0.1.13)
       '@browserbasehq/sdk': 2.6.0(encoding@0.1.13)
       '@playwright/test': 1.56.0
       deepmerge: 4.3.1
-      dotenv: 16.6.1
+      dotenv: 17.2.3
       openai: 6.9.1(ws@8.18.3(bufferutil@4.0.9)(utf-8-validate@5.0.10))(zod@3.25.67)
       sharp: 0.33.5
       ws: 8.18.3(bufferutil@4.0.9)(utf-8-validate@5.0.10)
@@ -21655,12 +21669,12 @@ snapshots:
       - encoding
       - supports-color
 
-  '@google/genai@1.19.0(@modelcontextprotocol/sdk@1.20.0)(bufferutil@4.0.9)(utf-8-validate@5.0.10)':
+  '@google/genai@1.19.0(@modelcontextprotocol/sdk@1.24.0(zod@3.25.67))(bufferutil@4.0.9)(utf-8-validate@5.0.10)':
     dependencies:
       google-auth-library: 9.15.1
       ws: 8.18.3(bufferutil@4.0.9)(utf-8-validate@5.0.10)
     optionalDependencies:
-      '@modelcontextprotocol/sdk': 1.20.0
+      '@modelcontextprotocol/sdk': 1.24.0(zod@3.25.67)
     transitivePeerDependencies:
       - bufferutil
       - supports-color
@@ -22303,9 +22317,9 @@ snapshots:
       - aws-crt
       - encoding
 
-  '@langchain/community@1.0.5(e0c14078fc79d0957987f04ba80f836a)':
+  '@langchain/community@1.0.5(98d49f2e32edc045c97e45bba7d1d36c)':
     dependencies:
-      '@browserbasehq/stagehand': 1.9.0(@playwright/test@1.56.0)(bufferutil@4.0.9)(deepmerge@4.3.1)(dotenv@16.6.1)(encoding@0.1.13)(openai@6.9.1(ws@8.18.3(bufferutil@4.0.9)(utf-8-validate@5.0.10))(zod@3.25.67))(utf-8-validate@5.0.10)(zod@3.25.67)
+      '@browserbasehq/stagehand': 1.9.0(@playwright/test@1.56.0)(bufferutil@4.0.9)(deepmerge@4.3.1)(dotenv@17.2.3)(encoding@0.1.13)(openai@6.9.1(ws@8.18.3(bufferutil@4.0.9)(utf-8-validate@5.0.10))(zod@3.25.67))(utf-8-validate@5.0.10)(zod@3.25.67)
       '@ibm-cloud/watsonx-ai': 1.1.2
       '@langchain/classic': 1.0.5(@langchain/core@1.1.0(@opentelemetry/api@1.9.0)(@opentelemetry/sdk-trace-base@1.30.1(@opentelemetry/api@1.9.0))(openai@6.9.1(ws@8.18.3(bufferutil@4.0.9)(utf-8-validate@5.0.10))(zod@3.25.67)))(@opentelemetry/api@1.9.0)(@opentelemetry/sdk-trace-base@1.30.1(@opentelemetry/api@1.9.0))(cheerio@1.0.0)(openai@6.9.1(ws@8.18.3(bufferutil@4.0.9)(utf-8-validate@5.0.10))(zod@3.25.67))(ws@8.18.3(bufferutil@4.0.9)(utf-8-validate@5.0.10))
       '@langchain/core': 1.1.0(@opentelemetry/api@1.9.0)(@opentelemetry/sdk-trace-base@1.30.1(@opentelemetry/api@1.9.0))(openai@6.9.1(ws@8.18.3(bufferutil@4.0.9)(utf-8-validate@5.0.10))(zod@3.25.67))
@@ -22434,7 +22448,7 @@ snapshots:
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
 
-  '@langchain/langgraph@1.0.2(@langchain/core@1.1.0(@opentelemetry/api@1.9.0)(@opentelemetry/sdk-trace-base@1.30.1(@opentelemetry/api@1.9.0))(openai@6.9.1(ws@8.18.3(bufferutil@4.0.9)(utf-8-validate@5.0.10))(zod@3.25.67)))(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(zod-to-json-schema@3.24.6(zod@3.25.67))(zod@3.25.67)':
+  '@langchain/langgraph@1.0.2(@langchain/core@1.1.0(@opentelemetry/api@1.9.0)(@opentelemetry/sdk-trace-base@1.30.1(@opentelemetry/api@1.9.0))(openai@6.9.1(ws@8.18.3(bufferutil@4.0.9)(utf-8-validate@5.0.10))(zod@3.25.67)))(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(zod-to-json-schema@3.25.0(zod@3.25.67))(zod@3.25.67)':
     dependencies:
       '@langchain/core': 1.1.0(@opentelemetry/api@1.9.0)(@opentelemetry/sdk-trace-base@1.30.1(@opentelemetry/api@1.9.0))(openai@6.9.1(ws@8.18.3(bufferutil@4.0.9)(utf-8-validate@5.0.10))(zod@3.25.67))
       '@langchain/langgraph-checkpoint': 1.0.0(@langchain/core@1.1.0(@opentelemetry/api@1.9.0)(@opentelemetry/sdk-trace-base@1.30.1(@opentelemetry/api@1.9.0))(openai@6.9.1(ws@8.18.3(bufferutil@4.0.9)(utf-8-validate@5.0.10))(zod@3.25.67)))
@@ -22442,7 +22456,7 @@ snapshots:
       uuid: 10.0.0
       zod: 3.25.67
     optionalDependencies:
-      zod-to-json-schema: 3.24.6(zod@3.25.67)
+      zod-to-json-schema: 3.25.0(zod@3.25.67)
     transitivePeerDependencies:
       - react
       - react-dom
@@ -22616,9 +22630,10 @@ snapshots:
       zod: 3.25.67
       zod-to-json-schema: 3.24.6(zod@3.25.67)
 
-  '@modelcontextprotocol/sdk@1.20.0':
+  '@modelcontextprotocol/sdk@1.24.0(zod@3.25.67)':
     dependencies:
-      ajv: 6.12.6
+      ajv: 8.17.1
+      ajv-formats: 3.0.1(ajv@8.17.1)
       content-type: 1.0.5
       cors: 2.8.5
       cross-spawn: 7.0.6
@@ -22626,10 +22641,11 @@ snapshots:
       eventsource-parser: 3.0.1
       express: 5.1.0
       express-rate-limit: 7.5.0(express@5.1.0)
+      jose: 6.1.2
       pkce-challenge: 5.0.0(patch_hash=651e785d0b7bbf5be9210e1e895c39a16dc3ce8a5a3843b4819565fb6e175b90)
       raw-body: 3.0.0
       zod: 3.25.67
-      zod-to-json-schema: 3.24.6(zod@3.25.67)
+      zod-to-json-schema: 3.25.0(zod@3.25.67)
     transitivePeerDependencies:
       - supports-color
 
@@ -31406,6 +31422,8 @@ snapshots:
 
   jose@6.0.11: {}
 
+  jose@6.1.2: {}
+
   joycon@3.1.1: {}
 
   js-base64@3.7.2(patch_hash=bb02fdf69495c7b0768791b60ab6e1a002053b8decd19a174f5755691e5c9500): {}
@@ -37483,6 +37501,10 @@ snapshots:
     dependencies:
       zod: 3.25.67
 
+  zod-to-json-schema@3.25.0(zod@3.25.67):
+    dependencies:
+      zod: 3.25.67
+
   zod@3.25.67: {}
 
   zod@4.1.12: {}

From be254b270f91e1fd3bd330582d3928a1f9bd8a84 Mon Sep 17 00:00:00 2001
From: Artem Sorokin <38620398+seemewalkin@users.noreply.github.com>
Date: Fri, 5 Dec 2025 16:15:23 +0100
Subject: [PATCH 100/167] test: Migrate workflow list/templates/checklist tests
 to workflows/ (#22831)

---
 .../checklist/production-checklist.spec.ts}        |  2 +-
 .../list/import.spec.ts}                           |  4 ++--
 .../list/workflows.spec.ts}                        |  2 +-
 .../templates/credentials-setup.spec.ts}           |  6 +++---
 .../templates/templates.spec.ts}                   | 14 +++++++-------
 5 files changed, 14 insertions(+), 14 deletions(-)
 rename packages/testing/playwright/tests/ui/{53-workflow-production-checklist.spec.ts => workflows/checklist/production-checklist.spec.ts} (99%)
 rename packages/testing/playwright/tests/ui/{39-import-workflow.spec.ts => workflows/list/import.spec.ts} (95%)
 rename packages/testing/playwright/tests/ui/{1-workflows.spec.ts => workflows/list/workflows.spec.ts} (98%)
 rename packages/testing/playwright/tests/ui/{34-template-credentials-setup.spec.ts => workflows/templates/credentials-setup.spec.ts} (98%)
 rename packages/testing/playwright/tests/ui/{29-templates.spec.ts => workflows/templates/templates.spec.ts} (94%)

diff --git a/packages/testing/playwright/tests/ui/53-workflow-production-checklist.spec.ts b/packages/testing/playwright/tests/ui/workflows/checklist/production-checklist.spec.ts
similarity index 99%
rename from packages/testing/playwright/tests/ui/53-workflow-production-checklist.spec.ts
rename to packages/testing/playwright/tests/ui/workflows/checklist/production-checklist.spec.ts
index 4379b4b7be6..05ffdd051b1 100644
--- a/packages/testing/playwright/tests/ui/53-workflow-production-checklist.spec.ts
+++ b/packages/testing/playwright/tests/ui/workflows/checklist/production-checklist.spec.ts
@@ -1,4 +1,4 @@
-import { test, expect } from '../../fixtures/base';
+import { test, expect } from '../../../../fixtures/base';
 
 const SCHEDULE_TRIGGER_NODE_NAME = 'Schedule Trigger';
 
diff --git a/packages/testing/playwright/tests/ui/39-import-workflow.spec.ts b/packages/testing/playwright/tests/ui/workflows/list/import.spec.ts
similarity index 95%
rename from packages/testing/playwright/tests/ui/39-import-workflow.spec.ts
rename to packages/testing/playwright/tests/ui/workflows/list/import.spec.ts
index 8083f6c148c..b9e3361268f 100644
--- a/packages/testing/playwright/tests/ui/39-import-workflow.spec.ts
+++ b/packages/testing/playwright/tests/ui/workflows/list/import.spec.ts
@@ -1,5 +1,5 @@
-import { test, expect } from '../../fixtures/base';
-import onboardingWorkflow from '../../workflows/Onboarding_workflow.json';
+import { test, expect } from '../../../../fixtures/base';
+import onboardingWorkflow from '../../../../workflows/Onboarding_workflow.json';
 
 test.describe('Import workflow', () => {
 	test.describe('From URL', () => {
diff --git a/packages/testing/playwright/tests/ui/1-workflows.spec.ts b/packages/testing/playwright/tests/ui/workflows/list/workflows.spec.ts
similarity index 98%
rename from packages/testing/playwright/tests/ui/1-workflows.spec.ts
rename to packages/testing/playwright/tests/ui/workflows/list/workflows.spec.ts
index 42403824ec5..45d2f9caf2c 100644
--- a/packages/testing/playwright/tests/ui/1-workflows.spec.ts
+++ b/packages/testing/playwright/tests/ui/workflows/list/workflows.spec.ts
@@ -1,6 +1,6 @@
 import { nanoid } from 'nanoid';
 
-import { test, expect } from '../../fixtures/base';
+import { test, expect } from '../../../../fixtures/base';
 
 const NOTIFICATIONS = {
 	CREATED: 'Workflow successfully created',
diff --git a/packages/testing/playwright/tests/ui/34-template-credentials-setup.spec.ts b/packages/testing/playwright/tests/ui/workflows/templates/credentials-setup.spec.ts
similarity index 98%
rename from packages/testing/playwright/tests/ui/34-template-credentials-setup.spec.ts
rename to packages/testing/playwright/tests/ui/workflows/templates/credentials-setup.spec.ts
index 61000b25a1b..3b150ca10ae 100644
--- a/packages/testing/playwright/tests/ui/34-template-credentials-setup.spec.ts
+++ b/packages/testing/playwright/tests/ui/workflows/templates/credentials-setup.spec.ts
@@ -1,8 +1,8 @@
 import { readFileSync } from 'fs';
 
-import { test, expect } from '../../fixtures/base';
-import type { TestRequirements } from '../../Types';
-import { resolveFromRoot } from '../../utils/path-helper';
+import { test, expect } from '../../../../fixtures/base';
+import type { TestRequirements } from '../../../../Types';
+import { resolveFromRoot } from '../../../../utils/path-helper';
 
 const TEMPLATE_HOST = 'https://api.n8n.io/api/';
 const TEMPLATE_ID = 1205;
diff --git a/packages/testing/playwright/tests/ui/29-templates.spec.ts b/packages/testing/playwright/tests/ui/workflows/templates/templates.spec.ts
similarity index 94%
rename from packages/testing/playwright/tests/ui/29-templates.spec.ts
rename to packages/testing/playwright/tests/ui/workflows/templates/templates.spec.ts
index d2b88f71a99..00a522ff49a 100644
--- a/packages/testing/playwright/tests/ui/29-templates.spec.ts
+++ b/packages/testing/playwright/tests/ui/workflows/templates/templates.spec.ts
@@ -1,10 +1,10 @@
-import { test, expect } from '../../fixtures/base';
-import type { n8nPage } from '../../pages/n8nPage';
-import type { TestRequirements } from '../../Types';
-import allTemplatesSearchResponse from '../../workflows/all_templates_search_response.json';
-import onboardingWorkflow from '../../workflows/Onboarding_workflow.json';
-import salesTemplatesSearchResponse from '../../workflows/sales_templates_search_response.json';
-import workflowTemplate from '../../workflows/Workflow_template_write_http_query.json';
+import { test, expect } from '../../../../fixtures/base';
+import type { n8nPage } from '../../../../pages/n8nPage';
+import type { TestRequirements } from '../../../../Types';
+import allTemplatesSearchResponse from '../../../../workflows/all_templates_search_response.json';
+import onboardingWorkflow from '../../../../workflows/Onboarding_workflow.json';
+import salesTemplatesSearchResponse from '../../../../workflows/sales_templates_search_response.json';
+import workflowTemplate from '../../../../workflows/Workflow_template_write_http_query.json';
 
 const TEMPLATE_HOST = {
 	N8N_API: 'https://api.n8n.io/api/',

From decbc162aa3d4bddbce75b8743af35703f8fe987 Mon Sep 17 00:00:00 2001
From: Artem Sorokin <38620398+seemewalkin@users.noreply.github.com>
Date: Fri, 5 Dec 2025 16:15:44 +0100
Subject: [PATCH 101/167] test: Migrate subworkflow tests to
 workflows/editor/subworkflows/ (#22827)

---
 .../editor/subworkflows/debugging.spec.ts}                  | 2 +-
 .../editor/subworkflows/extraction.spec.ts}                 | 2 +-
 .../editor/subworkflows/wait.spec.ts}                       | 6 +++---
 .../editor/subworkflows/workflow-selector.spec.ts}          | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)
 rename packages/testing/playwright/tests/ui/{47-subworkflow-debugging.spec.ts => workflows/editor/subworkflows/debugging.spec.ts} (98%)
 rename packages/testing/playwright/tests/ui/{51-subworkflow-extraction.spec.ts => workflows/editor/subworkflows/extraction.spec.ts} (97%)
 rename packages/testing/playwright/tests/ui/{subworkflow-wait.spec.ts => workflows/editor/subworkflows/wait.spec.ts} (94%)
 rename packages/testing/playwright/tests/ui/{45-workflow-selector-parameter.spec.ts => workflows/editor/subworkflows/workflow-selector.spec.ts} (94%)

diff --git a/packages/testing/playwright/tests/ui/47-subworkflow-debugging.spec.ts b/packages/testing/playwright/tests/ui/workflows/editor/subworkflows/debugging.spec.ts
similarity index 98%
rename from packages/testing/playwright/tests/ui/47-subworkflow-debugging.spec.ts
rename to packages/testing/playwright/tests/ui/workflows/editor/subworkflows/debugging.spec.ts
index 82a311e8304..57e84baa867 100644
--- a/packages/testing/playwright/tests/ui/47-subworkflow-debugging.spec.ts
+++ b/packages/testing/playwright/tests/ui/workflows/editor/subworkflows/debugging.spec.ts
@@ -1,4 +1,4 @@
-import { test, expect } from '../../fixtures/base';
+import { test, expect } from '../../../../../fixtures/base';
 
 const WORKFLOW_FILE = 'Subworkflow-debugging-execute-workflow.json';
 
diff --git a/packages/testing/playwright/tests/ui/51-subworkflow-extraction.spec.ts b/packages/testing/playwright/tests/ui/workflows/editor/subworkflows/extraction.spec.ts
similarity index 97%
rename from packages/testing/playwright/tests/ui/51-subworkflow-extraction.spec.ts
rename to packages/testing/playwright/tests/ui/workflows/editor/subworkflows/extraction.spec.ts
index 932f2f2f53b..1de6b3be313 100644
--- a/packages/testing/playwright/tests/ui/51-subworkflow-extraction.spec.ts
+++ b/packages/testing/playwright/tests/ui/workflows/editor/subworkflows/extraction.spec.ts
@@ -1,4 +1,4 @@
-import { test, expect } from '../../fixtures/base';
+import { test, expect } from '../../../../../fixtures/base';
 
 const EDIT_FIELDS_NAMES = [
 	'Edit Fields0',
diff --git a/packages/testing/playwright/tests/ui/subworkflow-wait.spec.ts b/packages/testing/playwright/tests/ui/workflows/editor/subworkflows/wait.spec.ts
similarity index 94%
rename from packages/testing/playwright/tests/ui/subworkflow-wait.spec.ts
rename to packages/testing/playwright/tests/ui/workflows/editor/subworkflows/wait.spec.ts
index d02afd11faf..a2560a429c1 100644
--- a/packages/testing/playwright/tests/ui/subworkflow-wait.spec.ts
+++ b/packages/testing/playwright/tests/ui/workflows/editor/subworkflows/wait.spec.ts
@@ -1,9 +1,9 @@
 import { readFileSync } from 'fs';
 import type { IWorkflowBase } from 'n8n-workflow';
 
-import { test, expect } from '../../fixtures/base';
-import { resolveFromRoot } from '../../utils/path-helper';
-import { retryUntil } from '../../utils/retry-utils';
+import { test, expect } from '../../../../../fixtures/base';
+import { resolveFromRoot } from '../../../../../utils/path-helper';
+import { retryUntil } from '../../../../../utils/retry-utils';
 
 test.describe('Parent that does not wait for sub-workflow', () => {
 	test('should not wait for the sub-workflow', async ({ api }) => {
diff --git a/packages/testing/playwright/tests/ui/45-workflow-selector-parameter.spec.ts b/packages/testing/playwright/tests/ui/workflows/editor/subworkflows/workflow-selector.spec.ts
similarity index 94%
rename from packages/testing/playwright/tests/ui/45-workflow-selector-parameter.spec.ts
rename to packages/testing/playwright/tests/ui/workflows/editor/subworkflows/workflow-selector.spec.ts
index 6b920bf2fa9..0c8f8fccaec 100644
--- a/packages/testing/playwright/tests/ui/45-workflow-selector-parameter.spec.ts
+++ b/packages/testing/playwright/tests/ui/workflows/editor/subworkflows/workflow-selector.spec.ts
@@ -1,6 +1,6 @@
-import { MANUAL_TRIGGER_NODE_NAME } from '../../config/constants';
-import { test, expect } from '../../fixtures/base';
-import { n8nPage } from '../../pages/n8nPage';
+import { MANUAL_TRIGGER_NODE_NAME } from '../../../../../config/constants';
+import { test, expect } from '../../../../../fixtures/base';
+import { n8nPage } from '../../../../../pages/n8nPage';
 
 const EXECUTE_WORKFLOW_NODE_NAME = 'Execute Sub-workflow';
 

From 5926ebf0940d3483665f06cdd0e0ee2465ff53fb Mon Sep 17 00:00:00 2001
From: Stephen Wright <sjw948@gmail.com>
Date: Fri, 5 Dec 2025 15:16:10 +0000
Subject: [PATCH 102/167] feat: Make underlying oauth abstractions more generic
 (#22741)

---
 .../abstract-oauth.controller.test.ts         |  47 -
 .../oauth1-credential.controller.test.ts      | 230 +---
 .../oauth2-credential.controller.test.ts      | 983 +++++++-----------
 .../oauth/oauth1-credential.controller.ts     |  47 +-
 .../oauth/oauth2-credential.controller.ts     |  59 +-
 .../src/oauth/__tests__/oauth.service.test.ts | 693 ++++++++++++
 .../oauth.service.ts}                         |  82 +-
 .../controllers/oauth/oauth2.api.test.ts      |  14 +-
 8 files changed, 1233 insertions(+), 922 deletions(-)
 delete mode 100644 packages/cli/src/controllers/oauth/__tests__/abstract-oauth.controller.test.ts
 create mode 100644 packages/cli/src/oauth/__tests__/oauth.service.test.ts
 rename packages/cli/src/{controllers/oauth/abstract-oauth.controller.ts => oauth/oauth.service.ts} (77%)

diff --git a/packages/cli/src/controllers/oauth/__tests__/abstract-oauth.controller.test.ts b/packages/cli/src/controllers/oauth/__tests__/abstract-oauth.controller.test.ts
deleted file mode 100644
index 01f4633340d..00000000000
--- a/packages/cli/src/controllers/oauth/__tests__/abstract-oauth.controller.test.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import { shouldSkipAuthOnOAuthCallback } from '../abstract-oauth.controller';
-
-describe('shouldSkipAuthOnOAuthCallback', () => {
-	const originalEnv = process.env.N8N_SKIP_AUTH_ON_OAUTH_CALLBACK;
-
-	afterEach(() => {
-		// Restore original environment variable after each test
-		if (originalEnv === undefined) {
-			delete process.env.N8N_SKIP_AUTH_ON_OAUTH_CALLBACK;
-		} else {
-			process.env.N8N_SKIP_AUTH_ON_OAUTH_CALLBACK = originalEnv;
-		}
-	});
-
-	describe('when N8N_SKIP_AUTH_ON_OAUTH_CALLBACK is not set', () => {
-		beforeEach(() => {
-			delete process.env.N8N_SKIP_AUTH_ON_OAUTH_CALLBACK;
-		});
-
-		it('should return true', () => {
-			expect(shouldSkipAuthOnOAuthCallback()).toBe(false);
-		});
-	});
-
-	describe('with various environment variable values', () => {
-		const testCases = [
-			{ value: 'true', expected: true },
-			{ value: 'TRUE', expected: true },
-			{ value: 'True', expected: true },
-			{ value: 'false', expected: false },
-			{ value: 'FALSE', expected: false },
-			{ value: 'False', expected: false },
-			{ value: '', expected: false },
-			{ value: '1', expected: false },
-			{ value: 'yes', expected: false },
-			{ value: 'on', expected: false },
-			{ value: 'enabled', expected: false },
-			{ value: '   ', expected: false },
-			{ value: ' true ', expected: false },
-		] as const;
-
-		test.each(testCases)('"%s" value should return %s', ({ value, expected }) => {
-			process.env.N8N_SKIP_AUTH_ON_OAUTH_CALLBACK = value;
-			expect(shouldSkipAuthOnOAuthCallback()).toBe(expected);
-		});
-	});
-});
diff --git a/packages/cli/src/controllers/oauth/__tests__/oauth1-credential.controller.test.ts b/packages/cli/src/controllers/oauth/__tests__/oauth1-credential.controller.test.ts
index d87459b5276..2f48de84687 100644
--- a/packages/cli/src/controllers/oauth/__tests__/oauth1-credential.controller.test.ts
+++ b/packages/cli/src/controllers/oauth/__tests__/oauth1-credential.controller.test.ts
@@ -1,57 +1,22 @@
 import { Logger } from '@n8n/backend-common';
 import { mockInstance } from '@n8n/backend-test-utils';
-import { Time } from '@n8n/constants';
-import type { CredentialsEntity, User } from '@n8n/db';
-import { CredentialsRepository, GLOBAL_OWNER_ROLE } from '@n8n/db';
+import { type CredentialsEntity, type User } from '@n8n/db';
 import { Container } from '@n8n/di';
-import Csrf from 'csrf';
+import { mock } from 'jest-mock-extended';
+import axios from 'axios';
 import type { Response } from 'express';
-import { captor, mock } from 'jest-mock-extended';
-import { Cipher, type InstanceSettings, ExternalSecretsProxy } from 'n8n-core';
-import type { IWorkflowExecuteAdditionalData } from 'n8n-workflow';
-import nock from 'nock';
-
 import { OAuth1CredentialController } from '@/controllers/oauth/oauth1-credential.controller';
-import { CredentialsFinderService } from '@/credentials/credentials-finder.service';
-import { CredentialsHelper } from '@/credentials-helper';
-import { VariablesService } from '@/environments.ee/variables/variables.service.ee';
-import { BadRequestError } from '@/errors/response-errors/bad-request.error';
-import { NotFoundError } from '@/errors/response-errors/not-found.error';
-import { ExternalHooks } from '@/external-hooks';
 import type { OAuthRequest } from '@/requests';
-import * as WorkflowExecuteAdditionalData from '@/workflow-execute-additional-data';
+import { OauthService } from '@/oauth/oauth.service';
+import { ExternalHooks } from '@/external-hooks';
 
-jest.mock('@/workflow-execute-additional-data');
+jest.mock('axios');
 
 describe('OAuth1CredentialController', () => {
+	const oauthService = mockInstance(OauthService);
+
 	mockInstance(Logger);
 	mockInstance(ExternalHooks);
-	mockInstance(ExternalSecretsProxy);
-	mockInstance(VariablesService, {
-		getAllCached: async () => [],
-	});
-	const additionalData = mock<IWorkflowExecuteAdditionalData>();
-	(WorkflowExecuteAdditionalData.getBase as jest.Mock).mockReturnValue(additionalData);
-
-	const cipher = new Cipher(mock<InstanceSettings>({ encryptionKey: 'password' }));
-	Container.set(Cipher, cipher);
-	const credentialsHelper = mockInstance(CredentialsHelper);
-	const credentialsRepository = mockInstance(CredentialsRepository);
-	const credentialsFinderService = mockInstance(CredentialsFinderService);
-
-	const csrfSecret = 'csrf-secret';
-	const user = mock<User>({
-		id: '123',
-		password: 'password',
-		authIdentities: [],
-		role: GLOBAL_OWNER_ROLE,
-	});
-	const credential = mock<CredentialsEntity>({
-		id: '1',
-		name: 'Test Credential',
-		type: 'oAuth1Api',
-		data: cipher.encrypt({}),
-	});
 
 	const controller = Container.get(OAuth1CredentialController);
 
@@ -64,64 +29,26 @@ describe('OAuth1CredentialController', () => {
 	});
 
 	describe('getAuthUri', () => {
-		it('should throw a BadRequestError when credentialId is missing in the query', async () => {
-			const req = mock<OAuthRequest.OAuth1Credential.Auth>({ query: { id: '' } });
-			await expect(controller.getAuthUri(req)).rejects.toThrowError(
-				new BadRequestError('Required credential ID is missing'),
-			);
-		});
-
-		it('should throw a NotFoundError when no matching credential is found for the user', async () => {
-			credentialsFinderService.findCredentialForUser.mockResolvedValueOnce(null);
-
-			const req = mock<OAuthRequest.OAuth1Credential.Auth>({ user, query: { id: '1' } });
-			await expect(controller.getAuthUri(req)).rejects.toThrowError(
-				new NotFoundError('Credential not found'),
-			);
-		});
-
 		it('should return a valid auth URI', async () => {
-			jest.spyOn(Csrf.prototype, 'secretSync').mockReturnValueOnce(csrfSecret);
-			jest.spyOn(Csrf.prototype, 'create').mockReturnValueOnce('token');
-			credentialsFinderService.findCredentialForUser.mockResolvedValueOnce(credential);
-			credentialsHelper.getDecrypted.mockResolvedValueOnce({});
-			credentialsHelper.applyDefaultsAndOverwrites.mockResolvedValueOnce({
+			const mockResolvedCredential = mock<CredentialsEntity>({ id: '1' });
+			oauthService.getCredential.mockResolvedValueOnce(mockResolvedCredential);
+			oauthService.createCsrfState.mockReturnValueOnce(['csrf-secret', 'state']);
+			oauthService.getOAuthCredentials.mockResolvedValueOnce({
 				requestTokenUrl: 'https://example.domain/oauth/request_token',
 				authUrl: 'https://example.domain/oauth/authorize',
 				accessTokenUrl: 'https://example.domain/oauth/access_token',
-				signatureMethod: 'HMAC-SHA1',
+				signatureMethod: 'HMAC-SHA1' as const,
+			});
+			jest.mocked(axios).request.mockResolvedValueOnce({ data: { oauth_token: 'random-token' } });
+			const req = mock<OAuthRequest.OAuth1Credential.Auth>({
+				user: mock<User>({ id: '123' }),
+				query: { id: '1' },
 			});
-			nock('https://example.domain')
-				.post('/oauth/request_token', {
-					oauth_callback:
-						'http://localhost:5678/rest/oauth1-credential/callback?state=eyJ0b2tlbiI6InRva2VuIiwiY2lkIjoiMSIsImNyZWF0ZWRBdCI6MTcwNjc1MDYyNTY3OCwidXNlcklkIjoiMTIzIn0=',
-				})
-				.once()
-				.reply(200, { oauth_token: 'random-token' });
-
-			const req = mock<OAuthRequest.OAuth1Credential.Auth>({ user, query: { id: '1' } });
 			const authUri = await controller.getAuthUri(req);
 			expect(authUri).toEqual('https://example.domain/oauth/authorize?oauth_token=random-token');
-			const dataCaptor = captor();
-			expect(credentialsRepository.update).toHaveBeenCalledWith(
-				'1',
-				expect.objectContaining({
-					data: dataCaptor,
-					id: '1',
-					name: 'Test Credential',
-					type: 'oAuth1Api',
-				}),
-			);
-			expect(cipher.decrypt(dataCaptor.value)).toEqual(
-				JSON.stringify({ csrfSecret: 'csrf-secret' }),
-			);
-			expect(credentialsHelper.getDecrypted).toHaveBeenCalledWith(
-				additionalData,
-				credential,
-				credential.type,
-				'internal',
-				undefined,
-				false,
+			expect(oauthService.encryptAndSaveData).toHaveBeenCalledWith(
+				mockResolvedCredential,
+				expect.objectContaining({ csrfSecret: 'csrf-secret' }),
 			);
 		});
 	});
@@ -149,113 +76,40 @@ describe('OAuth1CredentialController', () => {
 			invalidReq.query = { state: 'test' } as OAuthRequest.OAuth1Credential.Callback['query'];
 			await controller.handleCallback(invalidReq, res);
 
-			expect(res.render).toHaveBeenCalledWith('oauth-error-callback', {
-				error: {
-					message: 'Insufficient parameters for OAuth1 callback.',
-					reason: 'Received following query parameters: {"state":"test"}',
-				},
-			});
-			expect(credentialsRepository.findOneBy).not.toHaveBeenCalled();
-		});
-
-		it('should render the error page when `state` query param is invalid', async () => {
-			const invalidReq = mock<OAuthRequest.OAuth1Credential.Callback>({
-				query: {
-					oauth_verifier: 'verifier',
-					oauth_token: 'token',
-					state: 'test',
-				},
-			});
-			await controller.handleCallback(invalidReq, res);
-
-			expect(res.render).toHaveBeenCalledWith('oauth-error-callback', {
-				error: {
-					message: 'Invalid state format',
-				},
-			});
-			expect(credentialsRepository.findOneBy).not.toHaveBeenCalled();
-		});
-
-		it('should render the error page when credential is not found in DB', async () => {
-			credentialsRepository.findOneBy.mockResolvedValueOnce(null);
-
-			await controller.handleCallback(req, res);
-
-			expect(res.render).toHaveBeenCalledWith('oauth-error-callback', {
-				error: {
-					message: 'OAuth callback failed because of insufficient permissions',
-				},
-			});
-			expect(credentialsRepository.findOneBy).toHaveBeenCalledTimes(1);
-			expect(credentialsRepository.findOneBy).toHaveBeenCalledWith({ id: '1' });
-		});
-
-		it('should render the error page when state differs from the stored state in the credential', async () => {
-			credentialsRepository.findOneBy.mockResolvedValue(credential);
-			credentialsHelper.getDecrypted.mockResolvedValue({ csrfSecret: 'invalid' });
-
-			await controller.handleCallback(req, res);
-
-			expect(res.render).toHaveBeenCalledWith('oauth-error-callback', {
-				error: {
-					message: 'The OAuth callback state is invalid!',
-				},
-			});
-		});
-
-		it('should render the error page when state is older than 5 minutes', async () => {
-			credentialsRepository.findOneBy.mockResolvedValue(credential);
-			credentialsHelper.getDecrypted.mockResolvedValue({ csrfSecret });
-			jest.spyOn(Csrf.prototype, 'verify').mockReturnValueOnce(true);
-
-			jest.advanceTimersByTime(10 * Time.minutes.toMilliseconds);
-
-			await controller.handleCallback(req, res);
-
-			expect(res.render).toHaveBeenCalledWith('oauth-error-callback', {
-				error: {
-					message: 'The OAuth callback state is invalid!',
-				},
-			});
+			expect(oauthService.renderCallbackError).toHaveBeenCalledWith(
+				res,
+				'Insufficient parameters for OAuth1 callback.',
+				'Received following query parameters: {"state":"test"}',
+			);
 		});
 
 		it('should exchange the code for a valid token, and save it to DB', async () => {
-			credentialsRepository.findOneBy.mockResolvedValue(credential);
-			credentialsHelper.getDecrypted.mockResolvedValue({ csrfSecret });
-			credentialsHelper.applyDefaultsAndOverwrites.mockResolvedValueOnce({
+			const mockResolvedCredential = mock<CredentialsEntity>({ id: '1' });
+			oauthService.getCredential.mockResolvedValueOnce(mockResolvedCredential);
+			// @ts-ignore
+			oauthService.getDecryptedData.mockResolvedValue({ csrfSecret: 'invalid' });
+			oauthService.getOAuthCredentials.mockResolvedValueOnce({
 				requestTokenUrl: 'https://example.domain/oauth/request_token',
 				accessTokenUrl: 'https://example.domain/oauth/access_token',
 				signatureMethod: 'HMAC-SHA1',
 			});
-			jest.spyOn(Csrf.prototype, 'verify').mockReturnValueOnce(true);
-			nock('https://example.domain')
-				.post('/oauth/access_token', 'oauth_token=token&oauth_verifier=verifier')
-				.once()
-				.reply(200, 'access_token=new_token');
+			oauthService.resolveCredential.mockResolvedValueOnce([
+				mockResolvedCredential,
+				{ csrfSecret: 'invalid' },
+				{ accessTokenUrl: 'https://example.domain/oauth/access_token' },
+			]);
+			jest.mocked(axios).post.mockResolvedValueOnce({ data: { access_token: 'new_token' } });
 
 			await controller.handleCallback(req, res);
-			const dataCaptor = captor();
-			expect(credentialsRepository.update).toHaveBeenCalledWith(
-				'1',
+			// @ts-ignore
+			expect(oauthService.encryptAndSaveData).toHaveBeenCalledWith(
+				mockResolvedCredential,
 				expect.objectContaining({
-					data: dataCaptor,
-					id: '1',
-					name: 'Test Credential',
-					type: 'oAuth1Api',
+					oauthTokenData: { access_token: 'new_token' },
 				}),
-			);
-			expect(cipher.decrypt(dataCaptor.value)).toEqual(
-				JSON.stringify({ oauthTokenData: { access_token: 'new_token' } }),
+				['csrfSecret'],
 			);
 			expect(res.render).toHaveBeenCalledWith('oauth-callback');
-			expect(credentialsHelper.getDecrypted).toHaveBeenCalledWith(
-				additionalData,
-				credential,
-				credential.type,
-				'internal',
-				undefined,
-				true,
-			);
 		});
 	});
 });
diff --git a/packages/cli/src/controllers/oauth/__tests__/oauth2-credential.controller.test.ts b/packages/cli/src/controllers/oauth/__tests__/oauth2-credential.controller.test.ts
index 57b69314ac5..6e17f64efd9 100644
--- a/packages/cli/src/controllers/oauth/__tests__/oauth2-credential.controller.test.ts
+++ b/packages/cli/src/controllers/oauth/__tests__/oauth2-credential.controller.test.ts
@@ -1,60 +1,23 @@
 import { Logger } from '@n8n/backend-common';
 import { mockInstance } from '@n8n/backend-test-utils';
-import { Time } from '@n8n/constants';
-import type { CredentialsEntity, User } from '@n8n/db';
-import { CredentialsRepository, GLOBAL_OWNER_ROLE } from '@n8n/db';
+import { type CredentialsEntity, type User } from '@n8n/db';
 import { Container } from '@n8n/di';
-import Csrf from 'csrf';
-import { type Response } from 'express';
-import { captor, mock } from 'jest-mock-extended';
-import { Cipher, type InstanceSettings, ExternalSecretsProxy } from 'n8n-core';
-import type { IWorkflowExecuteAdditionalData } from 'n8n-workflow';
-import nock from 'nock';
-import * as pkceChallenge from 'pkce-challenge';
-
-import { CREDENTIAL_BLANKING_VALUE } from '@/constants';
+import { mock } from 'jest-mock-extended';
+import type { Response } from 'express';
 import { OAuth2CredentialController } from '@/controllers/oauth/oauth2-credential.controller';
-import { CredentialsFinderService } from '@/credentials/credentials-finder.service';
-import { CredentialsHelper } from '@/credentials-helper';
-import { VariablesService } from '@/environments.ee/variables/variables.service.ee';
-import { BadRequestError } from '@/errors/response-errors/bad-request.error';
-import { NotFoundError } from '@/errors/response-errors/not-found.error';
-import { ExternalHooks } from '@/external-hooks';
 import type { OAuthRequest } from '@/requests';
-import * as WorkflowExecuteAdditionalData from '@/workflow-execute-additional-data';
+import { OauthService } from '@/oauth/oauth.service';
+import { ExternalHooks } from '@/external-hooks';
 
-jest.mock('@/workflow-execute-additional-data');
+jest.mock('axios');
+jest.mock('@n8n/client-oauth2');
+jest.mock('pkce-challenge');
 
 describe('OAuth2CredentialController', () => {
-	mockInstance(Logger);
-	mockInstance(ExternalSecretsProxy);
-	mockInstance(VariablesService, {
-		getAllCached: async () => [],
-	});
-	const additionalData = mock<IWorkflowExecuteAdditionalData>();
-	(WorkflowExecuteAdditionalData.getBase as jest.Mock).mockReturnValue(additionalData);
-
-	const cipher = new Cipher(mock<InstanceSettings>({ encryptionKey: 'password' }));
-	Container.set(Cipher, cipher);
-
+	const oauthService = mockInstance(OauthService);
 	const externalHooks = mockInstance(ExternalHooks);
-	const credentialsHelper = mockInstance(CredentialsHelper);
-	const credentialsRepository = mockInstance(CredentialsRepository);
-	const credentialsFinderService = mockInstance(CredentialsFinderService);
 
-	const csrfSecret = 'csrf-secret';
-	const user = mock<User>({
-		id: '123',
-		password: 'password',
-		authIdentities: [],
-		role: GLOBAL_OWNER_ROLE,
-	});
-	const credential = mock<CredentialsEntity>({
-		id: '1',
-		name: 'Test Credential',
-		type: 'oAuth2Api',
-		data: cipher.encrypt({}),
-	});
+	mockInstance(Logger);
 
 	const controller = Container.get(OAuth2CredentialController);
 
@@ -64,335 +27,147 @@ describe('OAuth2CredentialController', () => {
 	beforeEach(() => {
 		jest.setSystemTime(new Date(timestamp));
 		jest.clearAllMocks();
-
-		credentialsHelper.applyDefaultsAndOverwrites.mockResolvedValue({
-			clientId: 'test-client-id',
-			clientSecret: 'oauth-secret',
-			authUrl: 'https://example.domain/o/oauth2/v2/auth',
-			accessTokenUrl: 'https://example.domain/token',
-		});
 	});
 
 	describe('getAuthUri', () => {
-		it('should throw a BadRequestError when credentialId is missing in the query', async () => {
-			const req = mock<OAuthRequest.OAuth2Credential.Auth>({ query: { id: '' } });
-			await expect(controller.getAuthUri(req)).rejects.toThrowError(
-				new BadRequestError('Required credential ID is missing'),
-			);
-		});
-
-		it('should throw a NotFoundError when no matching credential is found for the user', async () => {
-			credentialsFinderService.findCredentialForUser.mockResolvedValueOnce(null);
-
-			const req = mock<OAuthRequest.OAuth2Credential.Auth>({ user, query: { id: '1' } });
-			await expect(controller.getAuthUri(req)).rejects.toThrowError(
-				new NotFoundError('Credential not found'),
-			);
-		});
-
 		it('should return a valid auth URI', async () => {
-			jest.spyOn(Csrf.prototype, 'secretSync').mockReturnValueOnce(csrfSecret);
-			jest.spyOn(Csrf.prototype, 'create').mockReturnValueOnce('token');
-			credentialsFinderService.findCredentialForUser.mockResolvedValueOnce(credential);
-			credentialsHelper.getDecrypted.mockResolvedValueOnce({});
-
-			const req = mock<OAuthRequest.OAuth2Credential.Auth>({ user, query: { id: '1' } });
-			const authUri = await controller.getAuthUri(req);
-			expect(authUri).toEqual(
-				'https://example.domain/o/oauth2/v2/auth?client_id=test-client-id&redirect_uri=http%3A%2F%2Flocalhost%3A5678%2Frest%2Foauth2-credential%2Fcallback&response_type=code&state=eyJ0b2tlbiI6InRva2VuIiwiY2lkIjoiMSIsImNyZWF0ZWRBdCI6MTcwNjc1MDYyNTY3OCwidXNlcklkIjoiMTIzIn0%3D&scope=openid',
-			);
-			const state = new URL(authUri).searchParams.get('state');
-			expect(JSON.parse(Buffer.from(state!, 'base64').toString())).toEqual({
-				token: 'token',
-				cid: '1',
-				createdAt: timestamp,
-				userId: '123',
+			const { ClientOAuth2 } = await import('@n8n/client-oauth2');
+			const mockGetUri = jest.fn().mockReturnValue({
+				toString: () =>
+					'https://example.domain/oauth2/auth?client_id=client_id&redirect_uri=http://localhost:5678/rest/oauth2-credential/callback&response_type=code&state=state&scope=openid',
 			});
-			const dataCaptor = captor();
-			expect(credentialsRepository.update).toHaveBeenCalledWith(
-				'1',
+			jest.mocked(ClientOAuth2).mockImplementation(
+				() =>
+					({
+						code: {
+							getUri: mockGetUri,
+						},
+					}) as any,
+			);
+
+			const mockResolvedCredential = mock<CredentialsEntity>({ id: '1' });
+			oauthService.getCredential.mockResolvedValueOnce(mockResolvedCredential);
+			oauthService.createCsrfState.mockReturnValueOnce(['csrf-secret', 'state']);
+			oauthService.getOAuthCredentials.mockResolvedValueOnce({
+				clientId: 'client_id',
+				clientSecret: 'client_secret',
+				authUrl: 'https://example.domain/oauth2/auth',
+				accessTokenUrl: 'https://example.domain/oauth2/token',
+				scope: 'openid',
+				grantType: 'authorizationCode',
+				authentication: 'header',
+			});
+			oauthService.getBaseUrl.mockReturnValue('http://localhost:5678/rest/oauth2-credential');
+			externalHooks.run.mockResolvedValue(undefined);
+
+			const req = mock<OAuthRequest.OAuth2Credential.Auth>({
+				user: mock<User>({ id: '123' }),
+				query: { id: '1' },
+			});
+
+			const authUri = await controller.getAuthUri(req);
+
+			expect(authUri).toContain('https://example.domain/oauth2/auth');
+			expect(oauthService.encryptAndSaveData).toHaveBeenCalledWith(
+				mockResolvedCredential,
+				expect.objectContaining({ csrfSecret: 'csrf-secret' }),
+			);
+			expect(externalHooks.run).toHaveBeenCalledWith('oauth2.authenticate', expect.any(Array));
+		});
+
+		it('should return a valid auth URI with PKCE', async () => {
+			const pkceChallenge = await import('pkce-challenge');
+			jest.mocked(pkceChallenge.default).mockResolvedValueOnce({
+				code_verifier: 'code_verifier',
+				code_challenge: 'code_challenge',
+			});
+
+			const { ClientOAuth2 } = await import('@n8n/client-oauth2');
+			const mockGetUri = jest.fn().mockReturnValue({
+				toString: () =>
+					'https://example.domain/oauth2/auth?client_id=client_id&redirect_uri=http://localhost:5678/rest/oauth2-credential/callback&response_type=code&state=state&scope=openid&code_challenge=code_challenge&code_challenge_method=S256',
+			});
+			jest.mocked(ClientOAuth2).mockImplementation(
+				() =>
+					({
+						code: {
+							getUri: mockGetUri,
+						},
+					}) as any,
+			);
+
+			const mockResolvedCredential = mock<CredentialsEntity>({ id: '1' });
+			oauthService.getCredential.mockResolvedValueOnce(mockResolvedCredential);
+			oauthService.createCsrfState.mockReturnValueOnce(['csrf-secret', 'state']);
+			oauthService.getOAuthCredentials.mockResolvedValueOnce({
+				clientId: 'client_id',
+				clientSecret: 'client_secret',
+				authUrl: 'https://example.domain/oauth2/auth',
+				accessTokenUrl: 'https://example.domain/oauth2/token',
+				scope: 'openid',
+				grantType: 'pkce',
+				authentication: 'header',
+			});
+			oauthService.getBaseUrl.mockReturnValue('http://localhost:5678/rest/oauth2-credential');
+			externalHooks.run.mockResolvedValue(undefined);
+
+			const req = mock<OAuthRequest.OAuth2Credential.Auth>({
+				user: mock<User>({ id: '123' }),
+				query: { id: '1' },
+			});
+
+			const authUri = await controller.getAuthUri(req);
+
+			expect(authUri).toContain('code_challenge=code_challenge');
+			expect(authUri).toContain('code_challenge_method=S256');
+			expect(oauthService.encryptAndSaveData).toHaveBeenCalledWith(
+				mockResolvedCredential,
 				expect.objectContaining({
-					data: dataCaptor,
-					id: '1',
-					name: 'Test Credential',
-					type: 'oAuth2Api',
+					csrfSecret: 'csrf-secret',
+					codeVerifier: 'code_verifier',
 				}),
 			);
-			expect(cipher.decrypt(dataCaptor.value)).toEqual(
-				JSON.stringify({ csrfSecret: 'csrf-secret' }),
-			);
-			expect(credentialsHelper.getDecrypted).toHaveBeenCalledWith(
-				additionalData,
-				credential,
-				credential.type,
-				'internal',
-				undefined,
-				false,
-			);
 		});
 
-		it.each([
-			[
-				['authorization_code', 'refresh_token'],
-				['client_secret_basic', 'client_secret_post', 'none'],
-				['S256'],
-				['authorization_code', 'refresh_token'],
-				'none',
-				{
-					code_challenge: 'code-challenge',
-					code_challenge_method: 'S256',
-					client_id: 'test-client-id',
-					redirect_uri: 'http://localhost:5678/rest/oauth2-credential/callback',
-					response_type: 'code',
-					scope: 'openid',
-				},
-			],
-			[
-				['authorization_code', 'refresh_token'],
-				['client_secret_basic', 'client_secret_post'],
-				['S256'],
-				['authorization_code', 'refresh_token'],
-				'none',
-				{
-					code_challenge: 'code-challenge',
-					code_challenge_method: 'S256',
-					client_id: 'test-client-id',
-					redirect_uri: 'http://localhost:5678/rest/oauth2-credential/callback',
-					response_type: 'code',
-					scope: 'openid',
-				},
-			],
-			[
-				['authorization_code', 'refresh_token'],
-				['client_secret_basic', 'client_secret_post'],
-				[],
-				['authorization_code', 'refresh_token'],
-				'client_secret_basic',
-				{
-					client_id: 'test-client-id',
-					redirect_uri: 'http://localhost:5678/rest/oauth2-credential/callback',
-					response_type: 'code',
-					scope: 'openid',
-				},
-			],
-			[
-				['authorization_code', 'refresh_token'],
-				['client_secret_post'],
-				[],
-				['authorization_code', 'refresh_token'],
-				'client_secret_post',
-				{
-					client_id: 'test-client-id',
-					redirect_uri: 'http://localhost:5678/rest/oauth2-credential/callback',
-					response_type: 'code',
-					scope: 'openid',
-				},
-			],
-			[
-				['client_credentials'],
-				['client_secret_basic', 'client_secret_post'],
-				[],
-				['client_credentials'],
-				'client_secret_basic',
-				{
-					client_id: 'test-client-id',
-					redirect_uri: 'http://localhost:5678/rest/oauth2-credential/callback',
-					response_type: 'code',
-					scope: 'openid',
-				},
-			],
-			[
-				['client_credentials'],
-				['client_secret_post'],
-				[],
-				['client_credentials'],
-				'client_secret_post',
-				{
-					client_id: 'test-client-id',
-					redirect_uri: 'http://localhost:5678/rest/oauth2-credential/callback',
-					response_type: 'code',
-					scope: 'openid',
-				},
-			],
-		])(
-			'should return a valid auth URI for dynamic client registration',
-			async (
-				supportedGrantTypes,
-				supportedTokenEndpointAuthMethods,
-				supportedCodeChallengeMethods,
-				expectedGrantTypes,
-				expectedTokenEndpointAuthMethod,
-				expectedQueryParams,
-			) => {
-				jest.spyOn(Csrf.prototype, 'secretSync').mockReturnValueOnce(csrfSecret);
-				jest.spyOn(Csrf.prototype, 'create').mockReturnValueOnce('token');
-				jest.spyOn(pkceChallenge, 'default').mockResolvedValueOnce({
-					code_verifier: 'code-verifier',
-					code_challenge: 'code-challenge',
-				});
-				credentialsFinderService.findCredentialForUser.mockResolvedValueOnce(credential);
-				credentialsHelper.getDecrypted.mockResolvedValueOnce({});
-				credentialsHelper.applyDefaultsAndOverwrites.mockResolvedValue({
-					useDynamicClientRegistration: true,
-					serverUrl: 'https://example.com',
-				});
-				nock('https://example.com')
-					.get('/.well-known/oauth-authorization-server')
-					.reply(200, {
-						authorization_endpoint: 'https://example.com/auth',
-						token_endpoint: 'https://example.com/token',
-						registration_endpoint: 'https://example.com/registration',
-						grant_types_supported: supportedGrantTypes,
-						token_endpoint_auth_methods_supported: supportedTokenEndpointAuthMethods,
-						code_challenge_methods_supported: supportedCodeChallengeMethods,
-					})
-					.post('/registration', {
-						redirect_uris: ['http://localhost:5678/rest/oauth2-credential/callback'],
-						token_endpoint_auth_method: expectedTokenEndpointAuthMethod,
-						grant_types: expectedGrantTypes,
-						response_types: ['code'],
-						client_name: 'n8n',
-						client_uri: 'https://n8n.io/',
-					})
-					.reply(200, { client_id: 'test-client-id', client_secret: 'test-client-secret' });
-
-				const req = mock<OAuthRequest.OAuth2Credential.Auth>({ user, query: { id: '1' } });
-				const authUri = await controller.getAuthUri(req);
-
-				const url = new URL(authUri);
-				expect(url.origin).toEqual('https://example.com');
-				expect(url.pathname).toEqual('/auth');
-				Object.entries(expectedQueryParams).forEach(([param, value]) => {
-					expect(url.searchParams.get(param)).toEqual(value);
-				});
-			},
-		);
-
-		it.each([
-			[
-				{
-					authorization_endpoint: 'invalid',
-					token_endpoint: 'https://example.com/token',
-					registration_endpoint: 'https://example.com/registration',
-				},
-			],
-			[
-				{
-					authorization_endpoint: 'https://example.com/auth',
-					token_endpoint: 'invalid',
-					registration_endpoint: 'https://example.com/registration',
-				},
-			],
-			[
-				{
-					authorization_endpoint: 'https://example.com/auth',
-					token_endpoint: 'https://example.com/token',
-					registration_endpoint: 'invalid',
-				},
-			],
-		])(
-			'should throw a BadRequestError when OAuth2 server metadata is invalid',
-			async (response) => {
-				credentialsFinderService.findCredentialForUser.mockResolvedValueOnce(credential);
-				credentialsHelper.getDecrypted.mockResolvedValueOnce({});
-				credentialsHelper.applyDefaultsAndOverwrites.mockResolvedValue({
-					useDynamicClientRegistration: true,
-					serverUrl: 'https://example.com',
-				});
-				nock('https://example.com')
-					.get('/.well-known/oauth-authorization-server')
-					.reply(200, response);
-
-				const req = mock<OAuthRequest.OAuth2Credential.Auth>({ user, query: { id: '1' } });
-				await expect(controller.getAuthUri(req)).rejects.toThrowError(
-					/Invalid OAuth2 server metadata/,
-				);
-			},
-		);
-
-		it('should throw a BadRequestError when the registration response is invalid', async () => {
-			credentialsFinderService.findCredentialForUser.mockResolvedValueOnce(credential);
-			credentialsHelper.getDecrypted.mockResolvedValueOnce({});
-			credentialsHelper.applyDefaultsAndOverwrites.mockResolvedValue({
-				useDynamicClientRegistration: true,
-				serverUrl: 'https://example.com',
+		it('should return a valid auth URI with auth query parameters', async () => {
+			const { ClientOAuth2 } = await import('@n8n/client-oauth2');
+			const mockGetUri = jest.fn().mockReturnValue({
+				toString: () =>
+					'https://example.domain/oauth2/auth?client_id=client_id&redirect_uri=http://localhost:5678/rest/oauth2-credential/callback&response_type=code&state=state&scope=openid&access_type=offline',
 			});
-			nock('https://example.com')
-				.get('/.well-known/oauth-authorization-server')
-				.reply(200, {
-					authorization_endpoint: 'https://example.com/auth',
-					token_endpoint: 'https://example.com/token',
-					registration_endpoint: 'https://example.com/registration',
-					grant_types_supported: ['authorization_code', 'refresh_token'],
-					token_endpoint_auth_methods_supported: ['client_secret_basic'],
-				})
-				.post('/registration', {
-					redirect_uris: ['http://localhost:5678/rest/oauth2-credential/callback'],
-					token_endpoint_auth_method: 'client_secret_basic',
-					grant_types: ['authorization_code', 'refresh_token'],
-					response_types: ['code'],
-					client_name: 'n8n',
-					client_uri: 'https://n8n.io/',
-				})
-				.reply(200, { invalid: 'invalid' });
-
-			const req = mock<OAuthRequest.OAuth2Credential.Auth>({ user, query: { id: '1' } });
-			await expect(controller.getAuthUri(req)).rejects.toThrowError(
-				/Invalid client registration response/,
+			jest.mocked(ClientOAuth2).mockImplementation(
+				() =>
+					({
+						code: {
+							getUri: mockGetUri,
+						},
+					}) as any,
 			);
-		});
 
-		it('should request scopes from scopes_supported for dynamic client registration', async () => {
-			jest.spyOn(Csrf.prototype, 'secretSync').mockReturnValueOnce(csrfSecret);
-			jest.spyOn(Csrf.prototype, 'create').mockReturnValueOnce('token');
-			jest.spyOn(pkceChallenge, 'default').mockResolvedValueOnce({
-				code_verifier: 'code-verifier',
-				code_challenge: 'code-challenge',
+			const mockResolvedCredential = mock<CredentialsEntity>({ id: '1' });
+			oauthService.getCredential.mockResolvedValueOnce(mockResolvedCredential);
+			oauthService.createCsrfState.mockReturnValueOnce(['csrf-secret', 'state']);
+			oauthService.getOAuthCredentials.mockResolvedValueOnce({
+				clientId: 'client_id',
+				clientSecret: 'client_secret',
+				authUrl: 'https://example.domain/oauth2/auth',
+				accessTokenUrl: 'https://example.domain/oauth2/token',
+				scope: 'openid',
+				authQueryParameters: 'access_type=offline',
+				grantType: 'authorizationCode',
+				authentication: 'header',
+			});
+			oauthService.getBaseUrl.mockReturnValue('http://localhost:5678/rest/oauth2-credential');
+			externalHooks.run.mockResolvedValue(undefined);
+
+			const req = mock<OAuthRequest.OAuth2Credential.Auth>({
+				user: mock<User>({ id: '123' }),
+				query: { id: '1' },
 			});
-			credentialsFinderService.findCredentialForUser.mockResolvedValueOnce(credential);
-			credentialsHelper.getDecrypted.mockResolvedValueOnce({});
-			credentialsHelper.applyDefaultsAndOverwrites.mockResolvedValue({
-				useDynamicClientRegistration: true,
-				serverUrl: 'https://example.com',
-			});
-			nock('https://example.com')
-				.get('/.well-known/oauth-authorization-server')
-				.reply(200, {
-					authorization_endpoint: 'https://example.com/auth',
-					token_endpoint: 'https://example.com/token',
-					registration_endpoint: 'https://example.com/registration',
-					grant_types_supported: ['authorization_code', 'refresh_token'],
-					token_endpoint_auth_methods_supported: ['client_secret_basic'],
-					code_challenge_methods_supported: ['S256'],
-					scopes_supported: ['openid', 'somescope'],
-				})
-				.post('/registration', {
-					redirect_uris: ['http://localhost:5678/rest/oauth2-credential/callback'],
-					token_endpoint_auth_method: 'none',
-					grant_types: ['authorization_code', 'refresh_token'],
-					response_types: ['code'],
-					client_name: 'n8n',
-					client_uri: 'https://n8n.io/',
-					scope: 'openid somescope',
-				})
-				.reply(200, { client_id: 'test-client-id', client_secret: 'test-client-secret' });
 
-			const req = mock<OAuthRequest.OAuth2Credential.Auth>({ user, query: { id: '1' } });
 			const authUri = await controller.getAuthUri(req);
 
-			const url = new URL(authUri);
-			expect(url.origin).toEqual('https://example.com');
-			expect(url.pathname).toEqual('/auth');
-			Object.entries({
-				code_challenge: 'code-challenge',
-				code_challenge_method: 'S256',
-				client_id: 'test-client-id',
-				redirect_uri: 'http://localhost:5678/rest/oauth2-credential/callback',
-				response_type: 'code',
-				scope: 'openid somescope',
-			}).forEach(([param, value]) => {
-				expect(url.searchParams.get(param)).toEqual(value);
-			});
+			expect(authUri).toContain('access_type=offline');
 		});
 	});
 
@@ -401,264 +176,280 @@ describe('OAuth2CredentialController', () => {
 			JSON.stringify({
 				token: 'token',
 				cid: '1',
+				userId: '123',
 				createdAt: timestamp,
 			}),
 		).toString('base64');
 
 		const res = mock<Response>();
-		const req = mock<OAuthRequest.OAuth2Credential.Callback>({
-			query: { code: 'code', state: validState },
-			originalUrl: '?code=code',
-		});
 
 		it('should render the error page when required query params are missing', async () => {
-			const invalidReq = mock<OAuthRequest.OAuth2Credential.Callback>({
-				query: { code: undefined, state: undefined },
-			});
+			const invalidReq = mock<OAuthRequest.OAuth2Credential.Callback>();
+			invalidReq.query = { state: 'test' } as OAuthRequest.OAuth2Credential.Callback['query'];
 			await controller.handleCallback(invalidReq, res);
 
-			expect(res.render).toHaveBeenCalledWith('oauth-error-callback', {
-				error: {
-					message: 'Insufficient parameters for OAuth2 callback.',
-					reason: 'Received following query parameters: undefined',
-				},
-			});
-			expect(credentialsRepository.findOneBy).not.toHaveBeenCalled();
-		});
-
-		it('should render the error page when `state` query param is invalid', async () => {
-			const invalidReq = mock<OAuthRequest.OAuth2Credential.Callback>({
-				query: { code: 'code', state: 'invalid-state' },
-			});
-
-			await controller.handleCallback(invalidReq, res);
-
-			expect(res.render).toHaveBeenCalledWith('oauth-error-callback', {
-				error: {
-					message: 'Invalid state format',
-				},
-			});
-			expect(credentialsRepository.findOneBy).not.toHaveBeenCalled();
-		});
-
-		it('should render the error page when credential is not found in DB', async () => {
-			credentialsRepository.findOneBy.mockResolvedValueOnce(null);
-
-			await controller.handleCallback(req, res);
-
-			expect(res.render).toHaveBeenCalledWith('oauth-error-callback', {
-				error: {
-					message: 'OAuth callback failed because of insufficient permissions',
-				},
-			});
-			expect(credentialsRepository.findOneBy).toHaveBeenCalledTimes(1);
-			expect(credentialsRepository.findOneBy).toHaveBeenCalledWith({ id: '1' });
-		});
-
-		it('should render the error page when csrfSecret on the saved credential does not match the state', async () => {
-			credentialsRepository.findOneBy.mockResolvedValueOnce(credential);
-			credentialsHelper.getDecrypted.mockResolvedValueOnce({ csrfSecret });
-			jest.spyOn(Csrf.prototype, 'verify').mockReturnValueOnce(false);
-
-			await controller.handleCallback(req, res);
-			expect(res.render).toHaveBeenCalledWith('oauth-error-callback', {
-				error: {
-					message: 'The OAuth callback state is invalid!',
-				},
-			});
-			expect(externalHooks.run).not.toHaveBeenCalled();
-		});
-
-		it('should render the error page when state is older than 5 minutes', async () => {
-			credentialsRepository.findOneBy.mockResolvedValueOnce(credential);
-			credentialsHelper.getDecrypted.mockResolvedValueOnce({ csrfSecret });
-			jest.spyOn(Csrf.prototype, 'verify').mockReturnValueOnce(true);
-
-			jest.advanceTimersByTime(10 * Time.minutes.toMilliseconds);
-
-			await controller.handleCallback(req, res);
-
-			expect(res.render).toHaveBeenCalledWith('oauth-error-callback', {
-				error: {
-					message: 'The OAuth callback state is invalid!',
-				},
-			});
-			expect(externalHooks.run).not.toHaveBeenCalled();
-		});
-
-		it('should render the error page when code exchange fails', async () => {
-			credentialsRepository.findOneBy.mockResolvedValueOnce(credential);
-			credentialsHelper.getDecrypted.mockResolvedValueOnce({ csrfSecret });
-			jest.spyOn(Csrf.prototype, 'verify').mockReturnValueOnce(true);
-			nock('https://example.domain')
-				.post(
-					'/token',
-					'code=code&grant_type=authorization_code&redirect_uri=http%3A%2F%2Flocalhost%3A5678%2Frest%2Foauth2-credential%2Fcallback',
-				)
-				.reply(403, { error: 'Code could not be exchanged' });
-
-			await controller.handleCallback(req, res);
-
-			expect(externalHooks.run).toHaveBeenCalled();
-			expect(res.render).toHaveBeenCalledWith('oauth-error-callback', {
-				error: {
-					message: 'Code could not be exchanged',
-					reason: '{"error":"Code could not be exchanged"}',
-				},
-			});
-		});
-
-		it('should render the error page when code exchange fails, and the server responses with html', async () => {
-			credentialsRepository.findOneBy.mockResolvedValueOnce(credential);
-			credentialsHelper.getDecrypted.mockResolvedValueOnce({ csrfSecret });
-			jest.spyOn(Csrf.prototype, 'verify').mockReturnValueOnce(true);
-			nock('https://example.domain')
-				.post(
-					'/token',
-					'code=code&grant_type=authorization_code&redirect_uri=http%3A%2F%2Flocalhost%3A5678%2Frest%2Foauth2-credential%2Fcallback',
-				)
-				.reply(403, '<html><body>Code could not be exchanged</body></html>', {
-					'Content-Type': 'text/html',
-				});
-
-			await controller.handleCallback(req, res);
-
-			expect(externalHooks.run).toHaveBeenCalled();
-			expect(res.render).toHaveBeenCalledWith('oauth-error-callback', {
-				error: {
-					message: 'Unsupported content type: text/html',
-					reason: '"<html><body>Code could not be exchanged</body></html>"',
-				},
-			});
+			expect(oauthService.renderCallbackError).toHaveBeenCalledWith(
+				res,
+				'Insufficient parameters for OAuth2 callback.',
+				'Received following query parameters: {"state":"test"}',
+			);
 		});
 
 		it('should exchange the code for a valid token, and save it to DB', async () => {
-			credentialsRepository.findOneBy.mockResolvedValueOnce(credential);
-			credentialsHelper.getDecrypted.mockResolvedValueOnce({ csrfSecret });
-			jest.spyOn(Csrf.prototype, 'verify').mockReturnValueOnce(true);
-			nock('https://example.domain')
-				.post(
-					'/token',
-					'code=code&grant_type=authorization_code&redirect_uri=http%3A%2F%2Flocalhost%3A5678%2Frest%2Foauth2-credential%2Fcallback',
-				)
-				.reply(200, { access_token: 'access-token', refresh_token: 'refresh-token' });
+			const { ClientOAuth2 } = await import('@n8n/client-oauth2');
+			const mockGetToken = jest.fn().mockResolvedValue({
+				data: { access_token: 'new_token', refresh_token: 'refresh_token' },
+			});
+			jest.mocked(ClientOAuth2).mockImplementation(
+				() =>
+					({
+						code: {
+							getToken: mockGetToken,
+						},
+					}) as any,
+			);
+
+			const mockResolvedCredential = mock<CredentialsEntity>({ id: '1' });
+			oauthService.resolveCredential.mockResolvedValueOnce([
+				mockResolvedCredential,
+				{ csrfSecret: 'csrf-secret' },
+				{
+					clientId: 'client_id',
+					clientSecret: 'client_secret',
+					authUrl: 'https://example.domain/oauth2/auth',
+					accessTokenUrl: 'https://example.domain/oauth2/token',
+					scope: 'openid',
+					grantType: 'authorizationCode',
+					authentication: 'header',
+				},
+			]);
+			oauthService.getBaseUrl.mockReturnValue('http://localhost:5678/rest/oauth2-credential');
+			externalHooks.run.mockResolvedValue(undefined);
+
+			const req = mock<OAuthRequest.OAuth2Credential.Callback>({
+				query: {
+					code: 'auth_code',
+					state: validState,
+				},
+				originalUrl: '/oauth2-credential/callback?code=auth_code&state=state',
+			});
 
 			await controller.handleCallback(req, res);
 
-			expect(externalHooks.run).toHaveBeenCalledWith('oauth2.callback', [
+			expect(oauthService.encryptAndSaveData).toHaveBeenCalledWith(
+				mockResolvedCredential,
 				expect.objectContaining({
-					clientId: 'test-client-id',
-					redirectUri: 'http://localhost:5678/rest/oauth2-credential/callback',
-				}),
-			]);
-			const dataCaptor = captor();
-			expect(credentialsRepository.update).toHaveBeenCalledWith(
-				'1',
-				expect.objectContaining({
-					data: dataCaptor,
-					id: '1',
-					name: 'Test Credential',
-					type: 'oAuth2Api',
-				}),
-			);
-			expect(cipher.decrypt(dataCaptor.value)).toEqual(
-				JSON.stringify({
-					oauthTokenData: { access_token: 'access-token', refresh_token: 'refresh-token' },
+					oauthTokenData: { access_token: 'new_token', refresh_token: 'refresh_token' },
 				}),
+				['csrfSecret'],
 			);
 			expect(res.render).toHaveBeenCalledWith('oauth-callback');
-			expect(credentialsHelper.getDecrypted).toHaveBeenCalledWith(
-				additionalData,
-				credential,
-				credential.type,
-				'internal',
+			expect(externalHooks.run).toHaveBeenCalledWith('oauth2.callback', expect.any(Array));
+		});
+
+		it('should handle PKCE flow', async () => {
+			const { ClientOAuth2 } = await import('@n8n/client-oauth2');
+			const mockGetToken = jest.fn().mockResolvedValue({
+				data: { access_token: 'new_token' },
+			});
+			jest.mocked(ClientOAuth2).mockImplementation(
+				() =>
+					({
+						code: {
+							getToken: mockGetToken,
+						},
+					}) as any,
+			);
+
+			const mockResolvedCredential = mock<CredentialsEntity>({ id: '1' });
+			oauthService.resolveCredential.mockResolvedValueOnce([
+				mockResolvedCredential,
+				{ csrfSecret: 'csrf-secret', codeVerifier: 'code_verifier' },
+				{
+					clientId: 'client_id',
+					clientSecret: 'client_secret',
+					authUrl: 'https://example.domain/oauth2/auth',
+					accessTokenUrl: 'https://example.domain/oauth2/token',
+					scope: 'openid',
+					grantType: 'pkce',
+					authentication: 'header',
+				},
+			]);
+			oauthService.getBaseUrl.mockReturnValue('http://localhost:5678/rest/oauth2-credential');
+			externalHooks.run.mockResolvedValue(undefined);
+
+			const req = mock<OAuthRequest.OAuth2Credential.Callback>({
+				query: {
+					code: 'auth_code',
+					state: validState,
+				},
+				originalUrl: '/oauth2-credential/callback?code=auth_code&state=state',
+			});
+
+			await controller.handleCallback(req, res);
+
+			expect(mockGetToken).toHaveBeenCalledWith(
+				expect.stringContaining('code=auth_code'),
+				expect.objectContaining({
+					body: { code_verifier: 'code_verifier' },
+				}),
+			);
+			expect(oauthService.encryptAndSaveData).toHaveBeenCalled();
+		});
+
+		it('should handle body authentication method', async () => {
+			const { ClientOAuth2 } = await import('@n8n/client-oauth2');
+			const mockGetToken = jest.fn().mockResolvedValue({
+				data: { access_token: 'new_token' },
+			});
+			jest.mocked(ClientOAuth2).mockImplementation(
+				() =>
+					({
+						code: {
+							getToken: mockGetToken,
+						},
+					}) as any,
+			);
+
+			const mockResolvedCredential = mock<CredentialsEntity>({ id: '1' });
+			oauthService.resolveCredential.mockResolvedValueOnce([
+				mockResolvedCredential,
+				{ csrfSecret: 'csrf-secret' },
+				{
+					clientId: 'client_id',
+					clientSecret: 'client_secret',
+					authUrl: 'https://example.domain/oauth2/auth',
+					accessTokenUrl: 'https://example.domain/oauth2/token',
+					scope: 'openid',
+					grantType: 'authorizationCode',
+					authentication: 'body',
+				},
+			]);
+			oauthService.getBaseUrl.mockReturnValue('http://localhost:5678/rest/oauth2-credential');
+			externalHooks.run.mockResolvedValue(undefined);
+
+			const req = mock<OAuthRequest.OAuth2Credential.Callback>({
+				query: {
+					code: 'auth_code',
+					state: validState,
+				},
+				originalUrl: '/oauth2-credential/callback?code=auth_code&state=state',
+			});
+
+			await controller.handleCallback(req, res);
+
+			expect(mockGetToken).toHaveBeenCalledWith(
+				expect.stringContaining('code=auth_code'),
+				expect.objectContaining({
+					body: expect.objectContaining({
+						client_id: 'client_id',
+						client_secret: 'client_secret',
+					}),
+				}),
+			);
+		});
+
+		it('should handle callback with additional query parameters', async () => {
+			const { ClientOAuth2 } = await import('@n8n/client-oauth2');
+			const mockGetToken = jest.fn().mockResolvedValue({
+				data: { access_token: 'new_token' },
+			});
+			jest.mocked(ClientOAuth2).mockImplementation(
+				() =>
+					({
+						code: {
+							getToken: mockGetToken,
+						},
+					}) as any,
+			);
+
+			const mockResolvedCredential = mock<CredentialsEntity>({ id: '1' });
+			oauthService.resolveCredential.mockResolvedValueOnce([
+				mockResolvedCredential,
+				{ csrfSecret: 'csrf-secret' },
+				{
+					clientId: 'client_id',
+					clientSecret: 'client_secret',
+					authUrl: 'https://example.domain/oauth2/auth',
+					accessTokenUrl: 'https://example.domain/oauth2/token',
+					scope: 'openid',
+					grantType: 'authorizationCode',
+					authentication: 'header',
+				},
+			]);
+			oauthService.getBaseUrl.mockReturnValue('http://localhost:5678/rest/oauth2-credential');
+			externalHooks.run.mockResolvedValue(undefined);
+
+			const req = mock<OAuthRequest.OAuth2Credential.Callback>({
+				query: {
+					code: 'auth_code',
+					state: validState,
+					extra: 'param',
+				} as OAuthRequest.OAuth2Credential.Callback['query'] & { extra: string },
+				originalUrl: '/oauth2-credential/callback?code=auth_code&state=state&extra=param',
+			});
+
+			await controller.handleCallback(req, res);
+
+			expect(mockGetToken).toHaveBeenCalled();
+			expect(oauthService.encryptAndSaveData).toHaveBeenCalledWith(
+				mockResolvedCredential,
+				expect.objectContaining({
+					oauthTokenData: expect.objectContaining({
+						access_token: 'new_token',
+						callbackQueryString: expect.objectContaining({
+							extra: 'param',
+						}),
+					}),
+				}),
+				['csrfSecret'],
+			);
+		});
+
+		it('should handle errors and render error page', async () => {
+			const { ClientOAuth2 } = await import('@n8n/client-oauth2');
+			const mockGetToken = jest.fn().mockRejectedValue(new Error('Token exchange failed'));
+			jest.mocked(ClientOAuth2).mockImplementation(
+				() =>
+					({
+						code: {
+							getToken: mockGetToken,
+						},
+					}) as any,
+			);
+
+			const mockResolvedCredential = mock<CredentialsEntity>({ id: '1' });
+			oauthService.resolveCredential.mockResolvedValueOnce([
+				mockResolvedCredential,
+				{ csrfSecret: 'csrf-secret' },
+				{
+					clientId: 'client_id',
+					clientSecret: 'client_secret',
+					authUrl: 'https://example.domain/oauth2/auth',
+					accessTokenUrl: 'https://example.domain/oauth2/token',
+					scope: 'openid',
+					grantType: 'authorizationCode',
+					authentication: 'header',
+				},
+			]);
+			oauthService.getBaseUrl.mockReturnValue('http://localhost:5678/rest/oauth2-credential');
+			externalHooks.run.mockResolvedValue(undefined);
+
+			const req = mock<OAuthRequest.OAuth2Credential.Callback>({
+				query: {
+					code: 'auth_code',
+					state: validState,
+				},
+				originalUrl: '/oauth2-credential/callback?code=auth_code&state=state',
+			});
+
+			await controller.handleCallback(req, res);
+
+			expect(oauthService.renderCallbackError).toHaveBeenCalledWith(
+				res,
+				'Token exchange failed',
 				undefined,
-				true,
 			);
 		});
-
-		it('merges oauthTokenData if it already exists', async () => {
-			credentialsRepository.findOneBy.mockResolvedValueOnce(credential);
-			credentialsHelper.getDecrypted.mockResolvedValueOnce({
-				csrfSecret,
-				oauthTokenData: { token: true },
-			});
-			jest.spyOn(Csrf.prototype, 'verify').mockReturnValueOnce(true);
-			nock('https://example.domain')
-				.post(
-					'/token',
-					'code=code&grant_type=authorization_code&redirect_uri=http%3A%2F%2Flocalhost%3A5678%2Frest%2Foauth2-credential%2Fcallback',
-				)
-				.reply(200, { access_token: 'access-token', refresh_token: 'refresh-token' });
-
-			await controller.handleCallback(req, res);
-
-			expect(externalHooks.run).toHaveBeenCalledWith('oauth2.callback', [
-				expect.objectContaining({
-					clientId: 'test-client-id',
-					redirectUri: 'http://localhost:5678/rest/oauth2-credential/callback',
-				}),
-			]);
-			const dataCaptor = captor();
-			expect(credentialsRepository.update).toHaveBeenCalledWith(
-				'1',
-				expect.objectContaining({
-					data: dataCaptor,
-					id: '1',
-					name: 'Test Credential',
-					type: 'oAuth2Api',
-				}),
-			);
-			expect(cipher.decrypt(dataCaptor.value)).toEqual(
-				JSON.stringify({
-					oauthTokenData: {
-						token: true,
-						access_token: 'access-token',
-						refresh_token: 'refresh-token',
-					},
-				}),
-			);
-			expect(res.render).toHaveBeenCalledWith('oauth-callback');
-		});
-
-		it('overwrites oauthTokenData if it is a string', async () => {
-			credentialsRepository.findOneBy.mockResolvedValueOnce(credential);
-			credentialsHelper.getDecrypted.mockResolvedValueOnce({
-				csrfSecret,
-				oauthTokenData: CREDENTIAL_BLANKING_VALUE,
-			});
-			jest.spyOn(Csrf.prototype, 'verify').mockReturnValueOnce(true);
-			nock('https://example.domain')
-				.post(
-					'/token',
-					'code=code&grant_type=authorization_code&redirect_uri=http%3A%2F%2Flocalhost%3A5678%2Frest%2Foauth2-credential%2Fcallback',
-				)
-				.reply(200, { access_token: 'access-token', refresh_token: 'refresh-token' });
-
-			await controller.handleCallback(req, res);
-
-			expect(externalHooks.run).toHaveBeenCalledWith('oauth2.callback', [
-				expect.objectContaining({
-					clientId: 'test-client-id',
-					redirectUri: 'http://localhost:5678/rest/oauth2-credential/callback',
-				}),
-			]);
-			const dataCaptor = captor();
-			expect(credentialsRepository.update).toHaveBeenCalledWith(
-				'1',
-				expect.objectContaining({
-					data: dataCaptor,
-					id: '1',
-					name: 'Test Credential',
-					type: 'oAuth2Api',
-				}),
-			);
-			expect(cipher.decrypt(dataCaptor.value)).toEqual(
-				JSON.stringify({
-					oauthTokenData: { access_token: 'access-token', refresh_token: 'refresh-token' },
-				}),
-			);
-			expect(res.render).toHaveBeenCalledWith('oauth-callback');
-		});
 	});
 });
diff --git a/packages/cli/src/controllers/oauth/oauth1-credential.controller.ts b/packages/cli/src/controllers/oauth/oauth1-credential.controller.ts
index 9809e86d938..d762203693a 100644
--- a/packages/cli/src/controllers/oauth/oauth1-credential.controller.ts
+++ b/packages/cli/src/controllers/oauth/oauth1-credential.controller.ts
@@ -9,7 +9,9 @@ import clientOAuth1 from 'oauth-1.0a';
 
 import { OAuthRequest } from '@/requests';
 
-import { AbstractOAuthController, skipAuthOnOAuthCallback } from './abstract-oauth.controller';
+import { OauthService, OauthVersion, skipAuthOnOAuthCallback } from '@/oauth/oauth.service';
+import { Logger } from '@n8n/backend-common';
+import { ExternalHooks } from '@/external-hooks';
 
 interface OAuth1CredentialData {
 	signatureMethod: 'HMAC-SHA256' | 'HMAC-SHA512' | 'HMAC-SHA1';
@@ -27,24 +29,24 @@ const algorithmMap = {
 } as const;
 
 @RestController('/oauth1-credential')
-export class OAuth1CredentialController extends AbstractOAuthController {
-	override oauthVersion = 1;
+export class OAuth1CredentialController {
+	constructor(
+		private readonly oauthService: OauthService,
+		private readonly externalHooks: ExternalHooks,
+		private readonly logger: Logger,
+	) {}
 
 	/** Get Authorization url */
 	@Get('/auth')
 	async getAuthUri(req: OAuthRequest.OAuth1Credential.Auth): Promise<string> {
-		const credential = await this.getCredential(req);
-		const additionalData = await this.getAdditionalData();
-		const decryptedDataOriginal = await this.getDecryptedDataForAuthUri(credential, additionalData);
-		const oauthCredentials = await this.applyDefaultsAndOverwrites<OAuth1CredentialData>(
-			credential,
-			decryptedDataOriginal,
-			additionalData,
-		);
-		const [csrfSecret, state] = this.createCsrfState(
-			credential.id,
-			skipAuthOnOAuthCallback ? undefined : req.user.id,
-		);
+		const credential = await this.oauthService.getCredential(req);
+		const oauthCredentials =
+			await this.oauthService.getOAuthCredentials<OAuth1CredentialData>(credential);
+
+		const [csrfSecret, state] = this.oauthService.createCsrfState({
+			cid: credential.id,
+			userId: skipAuthOnOAuthCallback ? undefined : req.user.id,
+		});
 
 		const signatureMethod = oauthCredentials.signatureMethod;
 
@@ -62,7 +64,7 @@ export class OAuth1CredentialController extends AbstractOAuthController {
 		};
 
 		const oauthRequestData = {
-			oauth_callback: `${this.baseUrl}/callback?state=${state}`,
+			oauth_callback: `${this.oauthService.getBaseUrl(OauthVersion.V1)}/callback?state=${state}`,
 		};
 
 		await this.externalHooks.run('oauth1.authenticate', [oAuthOptions, oauthRequestData]);
@@ -91,7 +93,7 @@ export class OAuth1CredentialController extends AbstractOAuthController {
 
 		const returnUri = `${oauthCredentials.authUrl}?oauth_token=${responseJson.oauth_token}`;
 
-		await this.encryptAndSaveData(credential, { csrfSecret });
+		await this.oauthService.encryptAndSaveData(credential, { csrfSecret });
 
 		this.logger.debug('OAuth1 authorization successful for new credential', {
 			userId: req.user.id,
@@ -108,7 +110,7 @@ export class OAuth1CredentialController extends AbstractOAuthController {
 			const { oauth_verifier, oauth_token, state: encodedState } = req.query;
 
 			if (!oauth_verifier || !oauth_token || !encodedState) {
-				return this.renderCallbackError(
+				return this.oauthService.renderCallbackError(
 					res,
 					'Insufficient parameters for OAuth1 callback.',
 					`Received following query parameters: ${JSON.stringify(req.query)}`,
@@ -116,7 +118,7 @@ export class OAuth1CredentialController extends AbstractOAuthController {
 			}
 
 			const [credential, _, oauthCredentials] =
-				await this.resolveCredential<OAuth1CredentialData>(req);
+				await this.oauthService.resolveCredential<OAuth1CredentialData>(req);
 
 			// Form URL encoded body https://datatracker.ietf.org/doc/html/rfc5849#section-3.5.2
 			const oauthToken = await axios.post<string>(
@@ -131,15 +133,18 @@ export class OAuth1CredentialController extends AbstractOAuthController {
 
 			const oauthTokenData = Object.fromEntries(paramParser.entries());
 
-			await this.encryptAndSaveData(credential, { oauthTokenData }, ['csrfSecret']);
+			console.log('oauthTokenData', oauthTokenData);
+
+			await this.oauthService.encryptAndSaveData(credential, { oauthTokenData }, ['csrfSecret']);
 
 			this.logger.debug('OAuth1 callback successful for new credential', {
 				credentialId: credential.id,
 			});
 			return res.render('oauth-callback');
 		} catch (e) {
+			console.log('error', e);
 			const error = ensureError(e);
-			return this.renderCallbackError(
+			return this.oauthService.renderCallbackError(
 				res,
 				error.message,
 				'body' in error ? jsonStringify(error.body) : undefined,
diff --git a/packages/cli/src/controllers/oauth/oauth2-credential.controller.ts b/packages/cli/src/controllers/oauth/oauth2-credential.controller.ts
index 7e1f6c8bc86..3f708efa27e 100644
--- a/packages/cli/src/controllers/oauth/oauth2-credential.controller.ts
+++ b/packages/cli/src/controllers/oauth/oauth2-credential.controller.ts
@@ -20,44 +20,31 @@ import {
 import pkceChallenge from 'pkce-challenge';
 import * as qs from 'querystring';
 
-import { AbstractOAuthController, skipAuthOnOAuthCallback } from './abstract-oauth.controller';
 import {
 	oAuthAuthorizationServerMetadataSchema,
 	dynamicClientRegistrationResponseSchema,
 } from './oauth2-dynamic-client-registration.schema';
 
-import { GENERIC_OAUTH2_CREDENTIALS_WITH_EDITABLE_SCOPE as GENERIC_OAUTH2_CREDENTIALS_WITH_EDITABLE_SCOPE } from '@/constants';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 import { OAuthRequest } from '@/requests';
+import { OauthService, OauthVersion, skipAuthOnOAuthCallback } from '@/oauth/oauth.service';
+import { Logger } from '@n8n/backend-common';
+import { ExternalHooks } from '@/external-hooks';
 
 @RestController('/oauth2-credential')
-export class OAuth2CredentialController extends AbstractOAuthController {
-	override oauthVersion = 2;
+export class OAuth2CredentialController {
+	constructor(
+		private readonly oauthService: OauthService,
+		private readonly logger: Logger,
+		private readonly externalHooks: ExternalHooks,
+	) {}
 
 	/** Get Authorization url */
 	@Get('/auth')
 	async getAuthUri(req: OAuthRequest.OAuth2Credential.Auth): Promise<string> {
-		const credential = await this.getCredential(req);
-		const additionalData = await this.getAdditionalData();
-		const decryptedDataOriginal = await this.getDecryptedDataForAuthUri(credential, additionalData);
-
-		// At some point in the past we saved hidden scopes to credentials (but shouldn't)
-		// Delete scope before applying defaults to make sure new scopes are present on reconnect
-		// Generic Oauth2 API is an exception because it needs to save the scope
-
-		if (
-			decryptedDataOriginal?.scope &&
-			credential.type.includes('OAuth2') &&
-			!GENERIC_OAUTH2_CREDENTIALS_WITH_EDITABLE_SCOPE.includes(credential.type)
-		) {
-			delete decryptedDataOriginal.scope;
-		}
-
-		const oauthCredentials = await this.applyDefaultsAndOverwrites<OAuth2CredentialData>(
-			credential,
-			decryptedDataOriginal,
-			additionalData,
-		);
+		const credential = await this.oauthService.getCredential(req);
+		const oauthCredentials: OAuth2CredentialData =
+			await this.oauthService.getOAuthCredentials<OAuth2CredentialData>(credential);
 
 		const toUpdate: ICredentialDataDecryptedObject = {};
 
@@ -102,7 +89,7 @@ export class OAuth2CredentialController extends AbstractOAuthController {
 				authentication,
 			);
 			const registerPayload = {
-				redirect_uris: [`${this.baseUrl}/callback`],
+				redirect_uris: [`${this.oauthService.getBaseUrl(OauthVersion.V2)}/callback`],
 				token_endpoint_auth_method,
 				grant_types,
 				response_types: ['code'],
@@ -135,10 +122,10 @@ export class OAuth2CredentialController extends AbstractOAuthController {
 		}
 
 		// Generate a CSRF prevention token and send it as an OAuth2 state string
-		const [csrfSecret, state] = this.createCsrfState(
-			credential.id,
-			skipAuthOnOAuthCallback ? undefined : req.user.id,
-		);
+		const [csrfSecret, state] = this.oauthService.createCsrfState({
+			cid: credential.id,
+			userId: skipAuthOnOAuthCallback ? undefined : req.user.id,
+		});
 
 		const oAuthOptions = {
 			...this.convertCredentialToOptions(oauthCredentials),
@@ -162,7 +149,7 @@ export class OAuth2CredentialController extends AbstractOAuthController {
 			toUpdate.codeVerifier = code_verifier;
 		}
 
-		await this.encryptAndSaveData(credential, toUpdate);
+		await this.oauthService.encryptAndSaveData(credential, toUpdate);
 
 		const oAuthObj = new ClientOAuth2(oAuthOptions);
 		const returnUri = oAuthObj.code.getUri();
@@ -181,7 +168,7 @@ export class OAuth2CredentialController extends AbstractOAuthController {
 		try {
 			const { code, state: encodedState } = req.query;
 			if (!code || !encodedState) {
-				return this.renderCallbackError(
+				return this.oauthService.renderCallbackError(
 					res,
 					'Insufficient parameters for OAuth2 callback.',
 					`Received following query parameters: ${JSON.stringify(req.query)}`,
@@ -189,7 +176,7 @@ export class OAuth2CredentialController extends AbstractOAuthController {
 			}
 
 			const [credential, decryptedDataOriginal, oauthCredentials] =
-				await this.resolveCredential<OAuth2CredentialData>(req);
+				await this.oauthService.resolveCredential<OAuth2CredentialData>(req);
 
 			let options: Partial<ClientOAuth2Options> = {};
 
@@ -233,7 +220,7 @@ export class OAuth2CredentialController extends AbstractOAuthController {
 				...oauthToken.data,
 			};
 
-			await this.encryptAndSaveData(credential, { oauthTokenData }, ['csrfSecret']);
+			await this.oauthService.encryptAndSaveData(credential, { oauthTokenData }, ['csrfSecret']);
 
 			this.logger.debug('OAuth2 callback successful for credential', {
 				credentialId: credential.id,
@@ -242,7 +229,7 @@ export class OAuth2CredentialController extends AbstractOAuthController {
 			return res.render('oauth-callback');
 		} catch (e) {
 			const error = ensureError(e);
-			return this.renderCallbackError(
+			return this.oauthService.renderCallbackError(
 				res,
 				error.message,
 				'body' in error ? jsonStringify(error.body) : undefined,
@@ -257,7 +244,7 @@ export class OAuth2CredentialController extends AbstractOAuthController {
 			accessTokenUri: credential.accessTokenUrl ?? '',
 			authorizationUri: credential.authUrl ?? '',
 			authentication: credential.authentication ?? 'header',
-			redirectUri: `${this.baseUrl}/callback`,
+			redirectUri: `${this.oauthService.getBaseUrl(OauthVersion.V2)}/callback`,
 			scopes: split(credential.scope ?? 'openid', ','),
 			scopesSeparator: credential.scope?.includes(',') ? ',' : ' ',
 			ignoreSSLIssues: credential.ignoreSSLIssues ?? false,
diff --git a/packages/cli/src/oauth/__tests__/oauth.service.test.ts b/packages/cli/src/oauth/__tests__/oauth.service.test.ts
new file mode 100644
index 00000000000..5539ca89a68
--- /dev/null
+++ b/packages/cli/src/oauth/__tests__/oauth.service.test.ts
@@ -0,0 +1,693 @@
+import { Logger } from '@n8n/backend-common';
+import { GlobalConfig } from '@n8n/config';
+import { Time } from '@n8n/constants';
+import { mockInstance } from '@n8n/backend-test-utils';
+import type { AuthenticatedRequest, CredentialsEntity, ICredentialsDb, User } from '@n8n/db';
+import { CredentialsRepository } from '@n8n/db';
+import { Container } from '@n8n/di';
+import { mock } from 'jest-mock-extended';
+import type { Response } from 'express';
+import type { IWorkflowExecuteAdditionalData } from 'n8n-workflow';
+import { UnexpectedError } from 'n8n-workflow';
+
+import { OauthService, OauthVersion, shouldSkipAuthOnOAuthCallback } from '@/oauth/oauth.service';
+import { CredentialsFinderService } from '@/credentials/credentials-finder.service';
+import { CredentialsHelper } from '@/credentials-helper';
+import { AuthError } from '@/errors/response-errors/auth.error';
+import { BadRequestError } from '@/errors/response-errors/bad-request.error';
+import { NotFoundError } from '@/errors/response-errors/not-found.error';
+import type { OAuthRequest } from '@/requests';
+import { UrlService } from '@/services/url.service';
+import * as WorkflowExecuteAdditionalData from '@/workflow-execute-additional-data';
+
+jest.mock('@/workflow-execute-additional-data');
+
+describe('OauthService', () => {
+	const logger = mockInstance(Logger);
+	const credentialsHelper = mockInstance(CredentialsHelper);
+	const credentialsRepository = mockInstance(CredentialsRepository);
+	const credentialsFinderService = mockInstance(CredentialsFinderService);
+	const urlService = mockInstance(UrlService);
+	const globalConfig = mockInstance(GlobalConfig);
+
+	let service: OauthService;
+
+	const timestamp = 1706750625678;
+	jest.useFakeTimers({ advanceTimers: true });
+
+	beforeEach(() => {
+		jest.setSystemTime(new Date(timestamp));
+		jest.clearAllMocks();
+
+		globalConfig.endpoints = { rest: 'rest' } as any;
+		urlService.getInstanceBaseUrl.mockReturnValue('http://localhost:5678');
+		jest
+			.mocked(WorkflowExecuteAdditionalData.getBase)
+			.mockResolvedValue(mock<IWorkflowExecuteAdditionalData>());
+
+		service = new OauthService(
+			logger,
+			credentialsHelper,
+			credentialsRepository,
+			credentialsFinderService,
+			urlService,
+			globalConfig,
+		);
+	});
+
+	describe('shouldSkipAuthOnOAuthCallback', () => {
+		it('should return false when env var is not set', () => {
+			delete process.env.N8N_SKIP_AUTH_ON_OAUTH_CALLBACK;
+			expect(shouldSkipAuthOnOAuthCallback()).toBe(false);
+		});
+
+		it('should return false when env var is "false"', () => {
+			process.env.N8N_SKIP_AUTH_ON_OAUTH_CALLBACK = 'false';
+			expect(shouldSkipAuthOnOAuthCallback()).toBe(false);
+		});
+
+		it('should return true when env var is "true"', () => {
+			process.env.N8N_SKIP_AUTH_ON_OAUTH_CALLBACK = 'true';
+			expect(shouldSkipAuthOnOAuthCallback()).toBe(true);
+		});
+
+		it('should return true when env var is "TRUE" (case insensitive)', () => {
+			process.env.N8N_SKIP_AUTH_ON_OAUTH_CALLBACK = 'TRUE';
+			expect(shouldSkipAuthOnOAuthCallback()).toBe(true);
+		});
+	});
+
+	describe('getBaseUrl', () => {
+		it('should return correct URL for OAuth1', () => {
+			const url = service.getBaseUrl(OauthVersion.V1);
+			expect(url).toBe('http://localhost:5678/rest/oauth1-credential');
+			expect(urlService.getInstanceBaseUrl).toHaveBeenCalled();
+		});
+
+		it('should return correct URL for OAuth2', () => {
+			const url = service.getBaseUrl(OauthVersion.V2);
+			expect(url).toBe('http://localhost:5678/rest/oauth2-credential');
+		});
+	});
+
+	describe('getCredential', () => {
+		it('should throw BadRequestError when credential ID is missing', async () => {
+			const req = {
+				query: {},
+				user: mock<User>({ id: '123' }),
+			} as unknown as OAuthRequest.OAuth2Credential.Auth;
+
+			Object.defineProperty(req.query, 'id', {
+				value: undefined,
+				writable: true,
+				enumerable: true,
+			});
+
+			const promise = service.getCredential(req);
+			await expect(promise).rejects.toThrow(BadRequestError);
+			await expect(promise).rejects.toThrow('Required credential ID is missing');
+		});
+
+		it('should throw NotFoundError when credential is not found', async () => {
+			const req = mock<OAuthRequest.OAuth2Credential.Auth>({
+				query: { id: 'credential-id' },
+				user: mock<User>({ id: '123' }),
+			});
+
+			credentialsFinderService.findCredentialForUser.mockResolvedValue(null);
+
+			await expect(service.getCredential(req)).rejects.toThrow(NotFoundError);
+			expect(logger.error).toHaveBeenCalledWith(
+				'OAuth credential authorization failed because the current user does not have the correct permissions',
+				{ userId: '123' },
+			);
+		});
+
+		it('should return credential when found', async () => {
+			const mockCredential = mock<CredentialsEntity>({ id: 'credential-id' });
+			const req = mock<OAuthRequest.OAuth2Credential.Auth>({
+				query: { id: 'credential-id' },
+				user: mock<User>({ id: '123' }),
+			});
+
+			credentialsFinderService.findCredentialForUser.mockResolvedValue(mockCredential);
+
+			const result = await service.getCredential(req);
+
+			expect(result).toBe(mockCredential);
+			expect(credentialsFinderService.findCredentialForUser).toHaveBeenCalledWith(
+				'credential-id',
+				req.user,
+				['credential:read'],
+			);
+		});
+	});
+
+	describe('getAdditionalData', () => {
+		it('should return workflow execute additional data', async () => {
+			const mockAdditionalData = mock<IWorkflowExecuteAdditionalData>();
+			jest.mocked(WorkflowExecuteAdditionalData.getBase).mockResolvedValue(mockAdditionalData);
+
+			const result = await (service as any).getAdditionalData();
+
+			expect(result).toBe(mockAdditionalData);
+			expect(WorkflowExecuteAdditionalData.getBase).toHaveBeenCalled();
+		});
+	});
+
+	describe('getDecryptedDataForAuthUri', () => {
+		it('should call getDecryptedData with raw=false', async () => {
+			const credential = mock<ICredentialsDb>({ id: '1', type: 'test' });
+			const additionalData = mock<IWorkflowExecuteAdditionalData>();
+			const mockDecryptedData = { clientId: 'test' };
+
+			credentialsHelper.getDecrypted.mockResolvedValue(mockDecryptedData);
+
+			const result = await (service as any).getDecryptedDataForAuthUri(credential, additionalData);
+
+			expect(result).toBe(mockDecryptedData);
+			expect(credentialsHelper.getDecrypted).toHaveBeenCalledWith(
+				additionalData,
+				credential,
+				credential.type,
+				'internal',
+				undefined,
+				false,
+			);
+		});
+	});
+
+	describe('getDecryptedDataForCallback', () => {
+		it('should call getDecryptedData with raw=true', async () => {
+			const credential = mock<ICredentialsDb>({ id: '1', type: 'test' });
+			const additionalData = mock<IWorkflowExecuteAdditionalData>();
+			const mockDecryptedData = { csrfSecret: 'secret' };
+
+			credentialsHelper.getDecrypted.mockResolvedValue(mockDecryptedData);
+
+			const result = await (service as any).getDecryptedDataForCallback(credential, additionalData);
+
+			expect(result).toBe(mockDecryptedData);
+			expect(credentialsHelper.getDecrypted).toHaveBeenCalledWith(
+				additionalData,
+				credential,
+				credential.type,
+				'internal',
+				undefined,
+				true,
+			);
+		});
+	});
+
+	describe('applyDefaultsAndOverwrites', () => {
+		it('should apply defaults and overwrites', async () => {
+			const credential = mock<ICredentialsDb>({ id: '1', type: 'test' });
+			const decryptedData = { clientId: 'test' };
+			const additionalData = mock<IWorkflowExecuteAdditionalData>();
+			const mockResult = { clientId: 'test', clientSecret: 'secret' };
+
+			credentialsHelper.applyDefaultsAndOverwrites.mockResolvedValue(mockResult);
+
+			const result = await (service as any).applyDefaultsAndOverwrites(
+				credential,
+				decryptedData,
+				additionalData,
+			);
+
+			expect(result).toBe(mockResult);
+			expect(credentialsHelper.applyDefaultsAndOverwrites).toHaveBeenCalledWith(
+				additionalData,
+				decryptedData,
+				credential,
+				credential.type,
+				'internal',
+				undefined,
+				undefined,
+			);
+		});
+	});
+
+	describe('encryptAndSaveData', () => {
+		it('should encrypt and save data to repository', async () => {
+			const { Cipher } = await import('n8n-core');
+			const cipher = Container.get(Cipher);
+			const encryptedData = cipher.encrypt({ existing: 'data' });
+
+			const credential = mock<ICredentialsDb>({
+				id: '1',
+				type: 'test',
+				data: encryptedData,
+			});
+			const toUpdate = { clientId: 'new-id' };
+			const toDelete = ['oldField'];
+
+			await service.encryptAndSaveData(credential, toUpdate, toDelete);
+
+			expect(credentialsRepository.update).toHaveBeenCalledWith('1', {
+				id: '1',
+				name: expect.anything(),
+				type: 'test',
+				data: expect.any(String),
+				updatedAt: expect.any(Date),
+			});
+		});
+
+		it('should use empty array for toDelete when not provided', async () => {
+			const { Cipher } = await import('n8n-core');
+			const cipher = Container.get(Cipher);
+			const encryptedData = cipher.encrypt({ existing: 'data' });
+
+			const credential = mock<ICredentialsDb>({
+				id: '1',
+				type: 'test',
+				data: encryptedData,
+			});
+			const toUpdate = { clientId: 'new-id' };
+
+			await service.encryptAndSaveData(credential, toUpdate);
+
+			expect(credentialsRepository.update).toHaveBeenCalledWith('1', {
+				id: '1',
+				name: expect.anything(),
+				type: 'test',
+				data: expect.any(String),
+				updatedAt: expect.any(Date),
+			});
+		});
+	});
+
+	describe('getCredentialWithoutUser', () => {
+		it('should return credential from repository', async () => {
+			const mockCredential = mock<ICredentialsDb>({ id: '1' });
+			credentialsRepository.findOneBy.mockResolvedValue(mockCredential as any);
+
+			const result = await (service as any).getCredentialWithoutUser('1');
+
+			expect(result).toBe(mockCredential);
+			expect(credentialsRepository.findOneBy).toHaveBeenCalledWith({ id: '1' });
+		});
+
+		it('should return null when credential not found', async () => {
+			credentialsRepository.findOneBy.mockResolvedValue(null);
+
+			const result = await (service as any).getCredentialWithoutUser('1');
+
+			expect(result).toBeNull();
+		});
+	});
+
+	describe('createCsrfState', () => {
+		it('should create CSRF state with correct structure', () => {
+			const data = { cid: 'credential-id', userId: 'user-id' };
+			jest.setSystemTime(new Date(timestamp));
+
+			const [csrfSecret, encodedState] = service.createCsrfState(data);
+
+			expect(typeof csrfSecret).toBe('string');
+			expect(csrfSecret.length).toBeGreaterThan(0);
+
+			const decoded = JSON.parse(Buffer.from(encodedState, 'base64').toString());
+			expect(decoded.cid).toBe('credential-id');
+			expect(decoded.userId).toBe('user-id');
+			expect(decoded.token).toBeDefined();
+			expect(decoded.createdAt).toBe(timestamp);
+		});
+
+		it('should include additional data in state', () => {
+			const data = { cid: 'credential-id', customField: 'custom-value' };
+			jest.setSystemTime(new Date(timestamp));
+
+			const [, encodedState] = service.createCsrfState(data);
+
+			const decoded = JSON.parse(Buffer.from(encodedState, 'base64').toString());
+			expect(decoded.customField).toBe('custom-value');
+		});
+	});
+
+	describe('decodeCsrfState', () => {
+		it('should decode valid CSRF state', () => {
+			const state = {
+				token: 'token',
+				cid: 'credential-id',
+				userId: 'user-id',
+				createdAt: timestamp,
+			};
+			const encodedState = Buffer.from(JSON.stringify(state)).toString('base64');
+			const req = mock<AuthenticatedRequest>({
+				user: mock<User>({ id: 'user-id' }),
+			});
+
+			const result = (service as any).decodeCsrfState(encodedState, req);
+
+			expect(result).toEqual(state);
+		});
+
+		it('should throw error when state format is invalid', () => {
+			const invalidState = 'not-base64-json';
+			const req = mock<AuthenticatedRequest>({
+				user: mock<User>({ id: 'user-id' }),
+			});
+
+			expect(() => (service as any).decodeCsrfState(invalidState, req)).toThrow(
+				'Invalid state format',
+			);
+		});
+
+		it('should throw UnexpectedError when cid is missing', () => {
+			const state = {
+				token: 'token',
+				createdAt: timestamp,
+			};
+			const encodedState = Buffer.from(JSON.stringify(state)).toString('base64');
+			const req = mock<AuthenticatedRequest>({
+				user: mock<User>({ id: 'user-id' }),
+			});
+
+			expect(() => (service as any).decodeCsrfState(encodedState, req)).toThrow(UnexpectedError);
+		});
+
+		it('should throw UnexpectedError when token is missing', () => {
+			const state = {
+				cid: 'credential-id',
+				createdAt: timestamp,
+			};
+			const encodedState = Buffer.from(JSON.stringify(state)).toString('base64');
+			const req = mock<AuthenticatedRequest>({
+				user: mock<User>({ id: 'user-id' }),
+			});
+
+			expect(() => (service as any).decodeCsrfState(encodedState, req)).toThrow(UnexpectedError);
+		});
+
+		it('should throw AuthError when userId does not match', () => {
+			const state = {
+				token: 'token',
+				cid: 'credential-id',
+				userId: 'different-user-id',
+				createdAt: timestamp,
+			};
+			const encodedState = Buffer.from(JSON.stringify(state)).toString('base64');
+			const req = mock<AuthenticatedRequest>({
+				user: mock<User>({ id: 'user-id' }),
+			});
+
+			expect(() => (service as any).decodeCsrfState(encodedState, req)).toThrow(AuthError);
+			expect(() => (service as any).decodeCsrfState(encodedState, req)).toThrow('Unauthorized');
+		});
+
+		it('should throw AuthError when req.user is undefined', () => {
+			const state = {
+				token: 'token',
+				cid: 'credential-id',
+				userId: 'user-id',
+				createdAt: timestamp,
+			};
+			const encodedState = Buffer.from(JSON.stringify(state)).toString('base64');
+			const req = mock<AuthenticatedRequest>({
+				user: undefined,
+			});
+
+			expect(() => (service as any).decodeCsrfState(encodedState, req)).toThrow(AuthError);
+		});
+	});
+
+	describe('verifyCsrfState', () => {
+		it('should return true for valid CSRF state', () => {
+			const csrfSecret = 'csrf-secret';
+			const token = new (require('csrf'))();
+			const stateToken = token.create(csrfSecret);
+
+			const state = {
+				token: stateToken,
+				cid: 'credential-id',
+				createdAt: Date.now(),
+			};
+			const decrypted = { csrfSecret };
+
+			const result = (service as any).verifyCsrfState(decrypted, state);
+
+			expect(result).toBe(true);
+		});
+
+		it('should return false when CSRF state is expired', () => {
+			const csrfSecret = 'csrf-secret';
+			const token = new (require('csrf'))();
+			const stateToken = token.create(csrfSecret);
+
+			const expiredTime = Date.now() - 6 * Time.minutes.toMilliseconds;
+			const state = {
+				token: stateToken,
+				cid: 'credential-id',
+				createdAt: expiredTime,
+			};
+			const decrypted = { csrfSecret };
+
+			const result = (service as any).verifyCsrfState(decrypted, state);
+
+			expect(result).toBe(false);
+		});
+
+		it('should return false when csrfSecret is missing', () => {
+			const token = new (require('csrf'))();
+			const csrfSecret = 'csrf-secret';
+			const stateToken = token.create(csrfSecret);
+
+			const state = {
+				token: stateToken,
+				cid: 'credential-id',
+				createdAt: Date.now(),
+			};
+			const decrypted = {};
+
+			const result = (service as any).verifyCsrfState(decrypted, state);
+
+			expect(result).toBe(false);
+		});
+
+		it('should return false when token verification fails', () => {
+			const state = {
+				token: 'invalid-token',
+				cid: 'credential-id',
+				createdAt: Date.now(),
+			};
+			const decrypted = { csrfSecret: 'csrf-secret' };
+
+			const result = (service as any).verifyCsrfState(decrypted, state);
+
+			expect(result).toBe(false);
+		});
+	});
+
+	describe('resolveCredential', () => {
+		it('should resolve credential successfully', async () => {
+			const state = {
+				token: 'token',
+				cid: 'credential-id',
+				userId: 'user-id',
+				createdAt: timestamp,
+			};
+
+			const mockCredential = mock<CredentialsEntity>({ id: 'credential-id' });
+			const mockDecryptedData = { csrfSecret: 'csrf-secret' };
+			const mockOAuthCredentials = { clientId: 'client-id' };
+			const mockAdditionalData = mock<IWorkflowExecuteAdditionalData>();
+
+			const token = new (require('csrf'))();
+			const stateToken = token.create('csrf-secret');
+			state.token = stateToken;
+
+			const req = mock<OAuthRequest.OAuth2Credential.Callback>({
+				query: { state: Buffer.from(JSON.stringify(state)).toString('base64') },
+				user: mock<User>({ id: 'user-id' }),
+			});
+
+			credentialsRepository.findOneBy.mockResolvedValue(mockCredential);
+			jest.mocked(WorkflowExecuteAdditionalData.getBase).mockResolvedValue(mockAdditionalData);
+			credentialsHelper.getDecrypted.mockResolvedValue(mockDecryptedData);
+			credentialsHelper.applyDefaultsAndOverwrites.mockResolvedValue(mockOAuthCredentials);
+
+			jest.spyOn(service as any, 'verifyCsrfState').mockReturnValue(true);
+
+			const result = await service.resolveCredential(req);
+
+			expect(result).toEqual([mockCredential, mockDecryptedData, mockOAuthCredentials]);
+		});
+
+		it('should throw UnexpectedError when credential is not found', async () => {
+			const state = {
+				token: 'token',
+				cid: 'credential-id',
+				userId: 'user-id',
+				createdAt: timestamp,
+			};
+			const encodedState = Buffer.from(JSON.stringify(state)).toString('base64');
+
+			const req = mock<OAuthRequest.OAuth2Credential.Callback>({
+				query: { state: encodedState },
+				user: mock<User>({ id: 'user-id' }),
+			});
+
+			credentialsRepository.findOneBy.mockResolvedValue(null);
+
+			await expect(service.resolveCredential(req)).rejects.toThrow(UnexpectedError);
+			await expect(service.resolveCredential(req)).rejects.toThrow(
+				'OAuth callback failed because of insufficient permissions',
+			);
+		});
+
+		it('should throw UnexpectedError when CSRF state is invalid', async () => {
+			const state = {
+				token: 'token',
+				cid: 'credential-id',
+				userId: 'user-id',
+				createdAt: timestamp,
+			};
+			const encodedState = Buffer.from(JSON.stringify(state)).toString('base64');
+
+			const mockCredential = mock<CredentialsEntity>({ id: 'credential-id' });
+			const mockDecryptedData = { csrfSecret: 'csrf-secret' };
+			const mockOAuthCredentials = { clientId: 'client-id' };
+			const mockAdditionalData = mock<IWorkflowExecuteAdditionalData>();
+
+			const req = mock<OAuthRequest.OAuth2Credential.Callback>({
+				query: { state: encodedState },
+				user: mock<User>({ id: 'user-id' }),
+			});
+
+			credentialsRepository.findOneBy.mockResolvedValue(mockCredential);
+			jest.mocked(WorkflowExecuteAdditionalData.getBase).mockResolvedValue(mockAdditionalData);
+			credentialsHelper.getDecrypted.mockResolvedValue(mockDecryptedData);
+			credentialsHelper.applyDefaultsAndOverwrites.mockResolvedValue(mockOAuthCredentials);
+
+			jest.spyOn(service as any, 'verifyCsrfState').mockReturnValue(false);
+
+			await expect(service.resolveCredential(req)).rejects.toThrow(UnexpectedError);
+			await expect(service.resolveCredential(req)).rejects.toThrow(
+				'The OAuth callback state is invalid!',
+			);
+		});
+	});
+
+	describe('renderCallbackError', () => {
+		it('should render error page with message', () => {
+			const res = mock<Response>();
+			const message = 'Test error message';
+
+			service.renderCallbackError(res, message);
+
+			expect(res.render).toHaveBeenCalledWith('oauth-error-callback', {
+				error: { message },
+			});
+		});
+
+		it('should render error page with message and reason', () => {
+			const res = mock<Response>();
+			const message = 'Test error message';
+			const reason = 'Test reason';
+
+			service.renderCallbackError(res, message, reason);
+
+			expect(res.render).toHaveBeenCalledWith('oauth-error-callback', {
+				error: { message, reason },
+			});
+		});
+	});
+
+	describe('getOAuthCredentials', () => {
+		it('should return OAuth credentials', async () => {
+			const credential = mock<CredentialsEntity>({
+				id: '1',
+				type: 'testOAuth2Api',
+			});
+			const mockDecryptedData = { clientId: 'client-id' };
+			const mockOAuthCredentials = { clientId: 'client-id', clientSecret: 'secret' };
+			const mockAdditionalData = mock<IWorkflowExecuteAdditionalData>();
+
+			jest.mocked(WorkflowExecuteAdditionalData.getBase).mockResolvedValue(mockAdditionalData);
+			credentialsHelper.getDecrypted.mockResolvedValue(mockDecryptedData);
+			credentialsHelper.applyDefaultsAndOverwrites.mockResolvedValue(mockOAuthCredentials);
+
+			const result = await service.getOAuthCredentials(credential);
+
+			expect(result).toBe(mockOAuthCredentials);
+		});
+
+		it('should delete scope for non-generic OAuth2 credentials', async () => {
+			const credential = mock<CredentialsEntity>({
+				id: '1',
+				type: 'testOAuth2Api',
+			});
+			const mockDecryptedData = { clientId: 'client-id', scope: 'old-scope' };
+			const mockOAuthCredentials = { clientId: 'client-id' };
+			const mockAdditionalData = mock<IWorkflowExecuteAdditionalData>();
+
+			jest.mocked(WorkflowExecuteAdditionalData.getBase).mockResolvedValue(mockAdditionalData);
+			credentialsHelper.getDecrypted.mockResolvedValue(mockDecryptedData);
+			credentialsHelper.applyDefaultsAndOverwrites.mockResolvedValue(mockOAuthCredentials);
+
+			await service.getOAuthCredentials(credential);
+
+			expect(credentialsHelper.applyDefaultsAndOverwrites).toHaveBeenCalledWith(
+				mockAdditionalData,
+				{ clientId: 'client-id' },
+				credential,
+				credential.type,
+				'internal',
+				undefined,
+				undefined,
+			);
+		});
+
+		it('should not delete scope for generic OAuth2 credentials with editable scope', async () => {
+			const credential = mock<CredentialsEntity>({
+				id: '1',
+				type: 'oAuth2Api',
+			});
+			const mockDecryptedData = { clientId: 'client-id', scope: 'old-scope' };
+			const mockOAuthCredentials = { clientId: 'client-id', scope: 'old-scope' };
+			const mockAdditionalData = mock<IWorkflowExecuteAdditionalData>();
+
+			jest.mocked(WorkflowExecuteAdditionalData.getBase).mockResolvedValue(mockAdditionalData);
+			credentialsHelper.getDecrypted.mockResolvedValue(mockDecryptedData);
+			credentialsHelper.applyDefaultsAndOverwrites.mockResolvedValue(mockOAuthCredentials);
+
+			await service.getOAuthCredentials(credential);
+
+			expect(credentialsHelper.applyDefaultsAndOverwrites).toHaveBeenCalledWith(
+				mockAdditionalData,
+				{ clientId: 'client-id', scope: 'old-scope' },
+				credential,
+				credential.type,
+				'internal',
+				undefined,
+				undefined,
+			);
+		});
+
+		it('should not delete scope for non-OAuth2 credentials', async () => {
+			const credential = mock<CredentialsEntity>({
+				id: '1',
+				type: 'testApi',
+			});
+			const mockDecryptedData = { clientId: 'client-id', scope: 'old-scope' };
+			const mockOAuthCredentials = { clientId: 'client-id', scope: 'old-scope' };
+			const mockAdditionalData = mock<IWorkflowExecuteAdditionalData>();
+
+			jest.mocked(WorkflowExecuteAdditionalData.getBase).mockResolvedValue(mockAdditionalData);
+			credentialsHelper.getDecrypted.mockResolvedValue(mockDecryptedData);
+			credentialsHelper.applyDefaultsAndOverwrites.mockResolvedValue(mockOAuthCredentials);
+
+			await service.getOAuthCredentials(credential);
+
+			expect(credentialsHelper.applyDefaultsAndOverwrites).toHaveBeenCalledWith(
+				mockAdditionalData,
+				{ clientId: 'client-id', scope: 'old-scope' },
+				credential,
+				credential.type,
+				'internal',
+				undefined,
+				undefined,
+			);
+		});
+	});
+});
diff --git a/packages/cli/src/controllers/oauth/abstract-oauth.controller.ts b/packages/cli/src/oauth/oauth.service.ts
similarity index 77%
rename from packages/cli/src/controllers/oauth/abstract-oauth.controller.ts
rename to packages/cli/src/oauth/oauth.service.ts
index 8ab590b9eff..2874ff82ed3 100644
--- a/packages/cli/src/controllers/oauth/abstract-oauth.controller.ts
+++ b/packages/cli/src/oauth/oauth.service.ts
@@ -10,28 +10,33 @@ import { Credentials } from 'n8n-core';
 import type { ICredentialDataDecryptedObject, IWorkflowExecuteAdditionalData } from 'n8n-workflow';
 import { jsonParse, UnexpectedError } from 'n8n-workflow';
 
-import { RESPONSE_ERROR_MESSAGES } from '@/constants';
+import {
+	GENERIC_OAUTH2_CREDENTIALS_WITH_EDITABLE_SCOPE,
+	RESPONSE_ERROR_MESSAGES,
+} from '@/constants';
 import { CredentialsFinderService } from '@/credentials/credentials-finder.service';
 import { CredentialsHelper } from '@/credentials-helper';
 import { AuthError } from '@/errors/response-errors/auth.error';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 import { NotFoundError } from '@/errors/response-errors/not-found.error';
-import { ExternalHooks } from '@/external-hooks';
 import type { OAuthRequest } from '@/requests';
 import { UrlService } from '@/services/url.service';
 import * as WorkflowExecuteAdditionalData from '@/workflow-execute-additional-data';
 
-type CsrfStateParam = {
-	/** Id of the oAuth credential in the DB */
-	cid: string;
+type CsrfStateRequired = {
 	/** Random CSRF token, used to verify the signature of the CSRF state */
 	token: string;
 	/** Creation timestamp of the CSRF state. Used for expiration.  */
 	createdAt: number;
-	/** User who initiated OAuth flow, included to prevent cross-user credential hijacking. Optional only if `skipAuthOnOAuthCallback` is enabled. */
-	userId?: string;
 };
 
+type CreateCsrfStateData = {
+	cid: string;
+	[key: string]: unknown;
+};
+
+type CsrfState = CsrfStateRequired & CreateCsrfStateData;
+
 const MAX_CSRF_AGE = 5 * Time.minutes.toMilliseconds;
 
 export function shouldSkipAuthOnOAuthCallback() {
@@ -41,13 +46,15 @@ export function shouldSkipAuthOnOAuthCallback() {
 
 export const skipAuthOnOAuthCallback = shouldSkipAuthOnOAuthCallback();
 
-@Service()
-export abstract class AbstractOAuthController {
-	abstract oauthVersion: number;
+export const enum OauthVersion {
+	V1 = 1,
+	V2 = 2,
+}
 
+@Service()
+export class OauthService {
 	constructor(
 		protected readonly logger: Logger,
-		protected readonly externalHooks: ExternalHooks,
 		private readonly credentialsHelper: CredentialsHelper,
 		private readonly credentialsRepository: CredentialsRepository,
 		private readonly credentialsFinderService: CredentialsFinderService,
@@ -55,14 +62,12 @@ export abstract class AbstractOAuthController {
 		private readonly globalConfig: GlobalConfig,
 	) {}
 
-	get baseUrl() {
+	getBaseUrl(oauthVersion: OauthVersion) {
 		const restUrl = `${this.urlService.getInstanceBaseUrl()}/${this.globalConfig.endpoints.rest}`;
-		return `${restUrl}/oauth${this.oauthVersion}-credential`;
+		return `${restUrl}/oauth${oauthVersion}-credential`;
 	}
 
-	protected async getCredential(
-		req: OAuthRequest.OAuth2Credential.Auth,
-	): Promise<CredentialsEntity> {
+	async getCredential(req: OAuthRequest.OAuth2Credential.Auth): Promise<CredentialsEntity> {
 		const { id: credentialId } = req.query;
 
 		if (!credentialId) {
@@ -77,7 +82,7 @@ export abstract class AbstractOAuthController {
 
 		if (!credential) {
 			this.logger.error(
-				`OAuth${this.oauthVersion} credential authorization failed because the current user does not have the correct permissions`,
+				'OAuth credential authorization failed because the current user does not have the correct permissions',
 				{ userId: req.user.id },
 			);
 			throw new NotFoundError(RESPONSE_ERROR_MESSAGES.NO_CREDENTIAL);
@@ -141,7 +146,7 @@ export abstract class AbstractOAuthController {
 		)) as unknown as T;
 	}
 
-	protected async encryptAndSaveData(
+	async encryptAndSaveData(
 		credential: ICredentialsDb,
 		toUpdate: ICredentialDataDecryptedObject,
 		toDelete: string[] = [],
@@ -159,21 +164,20 @@ export abstract class AbstractOAuthController {
 		return await this.credentialsRepository.findOneBy({ id: credentialId });
 	}
 
-	createCsrfState(credentialsId: string, userId?: string): [string, string] {
+	createCsrfState(data: CreateCsrfStateData): [string, string] {
 		const token = new Csrf();
 		const csrfSecret = token.secretSync();
-		const state: CsrfStateParam = {
+		const state: CsrfState = {
 			token: token.create(csrfSecret),
-			cid: credentialsId,
 			createdAt: Date.now(),
-			userId,
+			...data,
 		};
 		return [csrfSecret, Buffer.from(JSON.stringify(state)).toString('base64')];
 	}
 
-	protected decodeCsrfState(encodedState: string, req: AuthenticatedRequest): CsrfStateParam {
+	protected decodeCsrfState(encodedState: string, req: AuthenticatedRequest): CsrfState {
 		const errorMessage = 'Invalid state format';
-		const decoded = jsonParse<CsrfStateParam>(Buffer.from(encodedState, 'base64').toString(), {
+		const decoded = jsonParse<CsrfState>(Buffer.from(encodedState, 'base64').toString(), {
 			errorMessage,
 		});
 
@@ -190,7 +194,7 @@ export abstract class AbstractOAuthController {
 
 	protected verifyCsrfState(
 		decrypted: ICredentialDataDecryptedObject & { csrfSecret?: string },
-		state: CsrfStateParam,
+		state: CsrfState,
 	) {
 		const token = new Csrf();
 
@@ -201,7 +205,7 @@ export abstract class AbstractOAuthController {
 		);
 	}
 
-	protected async resolveCredential<T>(
+	async resolveCredential<T>(
 		req: OAuthRequest.OAuth1Credential.Callback | OAuthRequest.OAuth2Credential.Callback,
 	): Promise<[ICredentialsDb, ICredentialDataDecryptedObject, T]> {
 		const { state: encodedState } = req.query;
@@ -230,7 +234,31 @@ export abstract class AbstractOAuthController {
 		return [credential, decryptedDataOriginal, oauthCredentials];
 	}
 
-	protected renderCallbackError(res: Response, message: string, reason?: string) {
+	renderCallbackError(res: Response, message: string, reason?: string) {
 		res.render('oauth-error-callback', { error: { message, reason } });
 	}
+
+	async getOAuthCredentials<T>(credential: CredentialsEntity): Promise<T> {
+		const additionalData = await this.getAdditionalData();
+		const decryptedDataOriginal = await this.getDecryptedDataForAuthUri(credential, additionalData);
+
+		// At some point in the past we saved hidden scopes to credentials (but shouldn't)
+		// Delete scope before applying defaults to make sure new scopes are present on reconnect
+		// Generic Oauth2 API is an exception because it needs to save the scope
+		if (
+			decryptedDataOriginal?.scope &&
+			credential.type.includes('OAuth2') &&
+			!GENERIC_OAUTH2_CREDENTIALS_WITH_EDITABLE_SCOPE.includes(credential.type)
+		) {
+			delete decryptedDataOriginal.scope;
+		}
+
+		const oauthCredentials = await this.applyDefaultsAndOverwrites<T>(
+			credential,
+			decryptedDataOriginal,
+			additionalData,
+		);
+
+		return oauthCredentials;
+	}
 }
diff --git a/packages/cli/test/integration/controllers/oauth/oauth2.api.test.ts b/packages/cli/test/integration/controllers/oauth/oauth2.api.test.ts
index e098d7c95b9..18bbfc373ef 100644
--- a/packages/cli/test/integration/controllers/oauth/oauth2.api.test.ts
+++ b/packages/cli/test/integration/controllers/oauth/oauth2.api.test.ts
@@ -5,8 +5,8 @@ import { response as Response } from 'express';
 import nock from 'nock';
 import { parse as parseQs } from 'querystring';
 
-import { OAuth2CredentialController } from '@/controllers/oauth/oauth2-credential.controller';
 import { CredentialsHelper } from '@/credentials-helper';
+import { OauthService } from '@/oauth/oauth.service';
 import { saveCredential } from '@test-integration/db/credentials';
 import { createMember, createOwner } from '@test-integration/db/users';
 import type { SuperAgentTest } from '@test-integration/types';
@@ -52,8 +52,8 @@ describe('OAuth2 API', () => {
 	});
 
 	it('should return a valid auth URL when the auth flow is initiated', async () => {
-		const controller = Container.get(OAuth2CredentialController);
-		const csrfSpy = jest.spyOn(controller, 'createCsrfState').mockClear();
+		const oauthService = Container.get(OauthService);
+		const csrfSpy = jest.spyOn(oauthService, 'createCsrfState').mockClear();
 
 		const response = await ownerAgent
 			.get('/oauth2-credential/auth')
@@ -76,8 +76,8 @@ describe('OAuth2 API', () => {
 	});
 
 	it('should fail on auth when callback is called as another user', async () => {
-		const controller = Container.get(OAuth2CredentialController);
-		const csrfSpy = jest.spyOn(controller, 'createCsrfState').mockClear();
+		const oauthService = Container.get(OauthService);
+		const csrfSpy = jest.spyOn(oauthService, 'createCsrfState').mockClear();
 		const renderSpy = (Response.render = jest.fn(function () {
 			this.end();
 		}));
@@ -98,8 +98,8 @@ describe('OAuth2 API', () => {
 	});
 
 	it('should handle a valid callback without auth', async () => {
-		const controller = Container.get(OAuth2CredentialController);
-		const csrfSpy = jest.spyOn(controller, 'createCsrfState').mockClear();
+		const oauthService = Container.get(OauthService);
+		const csrfSpy = jest.spyOn(oauthService, 'createCsrfState').mockClear();
 		const renderSpy = (Response.render = jest.fn(function () {
 			this.end();
 		}));

From f85f1107a66a9fbb9dd38cd6056e01f550368fe4 Mon Sep 17 00:00:00 2001
From: Artem Sorokin <38620398+seemewalkin@users.noreply.github.com>
Date: Fri, 5 Dec 2025 16:25:37 +0100
Subject: [PATCH 103/167] test: Migrate trigger tests to triggers/ directory
 (#22832)

---
 .../scheduler.spec.ts}                                      | 2 +-
 .../webhook-external.spec.ts}                               | 2 +-
 .../webhook-isolation.spec.ts}                              | 2 +-
 .../{16-webhook-node.spec.ts => triggers/webhook.spec.ts}   | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename packages/testing/playwright/tests/ui/{15-scheduler-node.spec.ts => triggers/scheduler.spec.ts} (88%)
 rename packages/testing/playwright/tests/ui/{webhook-external-trigger.spec.ts => triggers/webhook-external.spec.ts} (95%)
 rename packages/testing/playwright/tests/ui/{webhook-origin-isolation.spec.ts => triggers/webhook-isolation.spec.ts} (96%)
 rename packages/testing/playwright/tests/ui/{16-webhook-node.spec.ts => triggers/webhook.spec.ts} (97%)

diff --git a/packages/testing/playwright/tests/ui/15-scheduler-node.spec.ts b/packages/testing/playwright/tests/ui/triggers/scheduler.spec.ts
similarity index 88%
rename from packages/testing/playwright/tests/ui/15-scheduler-node.spec.ts
rename to packages/testing/playwright/tests/ui/triggers/scheduler.spec.ts
index 5fc4917d987..f50e62b99ee 100644
--- a/packages/testing/playwright/tests/ui/15-scheduler-node.spec.ts
+++ b/packages/testing/playwright/tests/ui/triggers/scheduler.spec.ts
@@ -1,4 +1,4 @@
-import { test, expect } from '../../fixtures/base';
+import { test, expect } from '../../../fixtures/base';
 
 test.describe('Schedule Trigger node', () => {
 	test.beforeEach(async ({ n8n }) => {
diff --git a/packages/testing/playwright/tests/ui/webhook-external-trigger.spec.ts b/packages/testing/playwright/tests/ui/triggers/webhook-external.spec.ts
similarity index 95%
rename from packages/testing/playwright/tests/ui/webhook-external-trigger.spec.ts
rename to packages/testing/playwright/tests/ui/triggers/webhook-external.spec.ts
index 283bc37f053..bdc714fac69 100644
--- a/packages/testing/playwright/tests/ui/webhook-external-trigger.spec.ts
+++ b/packages/testing/playwright/tests/ui/triggers/webhook-external.spec.ts
@@ -1,4 +1,4 @@
-import { test, expect } from '../../fixtures/base';
+import { test, expect } from '../../../fixtures/base';
 
 test.describe('External Webhook Triggering', () => {
 	test('should create workflow via API, activate it, trigger webhook externally, and verify execution', async ({
diff --git a/packages/testing/playwright/tests/ui/webhook-origin-isolation.spec.ts b/packages/testing/playwright/tests/ui/triggers/webhook-isolation.spec.ts
similarity index 96%
rename from packages/testing/playwright/tests/ui/webhook-origin-isolation.spec.ts
rename to packages/testing/playwright/tests/ui/triggers/webhook-isolation.spec.ts
index ec8d26965e9..ce2e0f37ba3 100644
--- a/packages/testing/playwright/tests/ui/webhook-origin-isolation.spec.ts
+++ b/packages/testing/playwright/tests/ui/triggers/webhook-isolation.spec.ts
@@ -1,4 +1,4 @@
-import { test, expect } from '../../fixtures/base';
+import { test, expect } from '../../../fixtures/base';
 
 test.describe('Webhook Origin Isolation', () => {
 	test.beforeAll(async ({ api }) => {
diff --git a/packages/testing/playwright/tests/ui/16-webhook-node.spec.ts b/packages/testing/playwright/tests/ui/triggers/webhook.spec.ts
similarity index 97%
rename from packages/testing/playwright/tests/ui/16-webhook-node.spec.ts
rename to packages/testing/playwright/tests/ui/triggers/webhook.spec.ts
index 482cd77321a..13613b9d737 100644
--- a/packages/testing/playwright/tests/ui/16-webhook-node.spec.ts
+++ b/packages/testing/playwright/tests/ui/triggers/webhook.spec.ts
@@ -1,8 +1,8 @@
 import { nanoid } from 'nanoid';
 
-import { test, expect } from '../../fixtures/base';
-import type { n8nPage } from '../../pages/n8nPage';
-import { EditFieldsNode } from '../../pages/nodes/EditFieldsNode';
+import { test, expect } from '../../../fixtures/base';
+import type { n8nPage } from '../../../pages/n8nPage';
+import { EditFieldsNode } from '../../../pages/nodes/EditFieldsNode';
 
 const cowBase64 =
 	'data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEAYABgAAD/2wBDAAYEBQYFBAYGBQYHBwYIChAKCgkJChQODwwQFxQYGBcUFhYaHSUfGhsjHBYWICwgIyYnKSopGR8tMC0oMCUoKSj/2wBDAQcHBwoIChMKChMoGhYaKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCj/wAARCAABAAEDASIAAhEBAxEB/8QAFQABAQAAAAAAAAAAAAAAAAAAAAv/xAAUEAEAAAAAAAAAAAAAAAAAAAAA/8QAFQEBAQAAAAAAAAAAAAAAAAAAAAX/xAAUEQEAAAAAAAAAAAAAAAAAAAAA/9oADAMBAAIRAxEAPwCdABmX/9k=';

From 3292132c493340e9e187c4e73da283d34002d74d Mon Sep 17 00:00:00 2001
From: Artem Sorokin <38620398+seemewalkin@users.noreply.github.com>
Date: Fri, 5 Dec 2025 16:27:08 +0100
Subject: [PATCH 104/167] test: Migrate node-specific tests to nodes/ directory
 (#22835)

---
 .../community-nodes.spec.ts}                         | 12 ++++++------
 .../email-send-node.spec.ts}                         |  2 +-
 .../form-trigger-node.spec.ts}                       |  2 +-
 .../http-request-node.spec.ts}                       |  2 +-
 .../ui/{30-if-node.spec.ts => nodes/if-node.spec.ts} |  4 ++--
 .../tests/ui/{pdf.spec.ts => nodes/pdf-node.spec.ts} |  2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)
 rename packages/testing/playwright/tests/ui/{21-community-nodes.spec.ts => nodes/community-nodes.spec.ts} (87%)
 rename packages/testing/playwright/tests/ui/{30-mail-node.spec.ts => nodes/email-send-node.spec.ts} (97%)
 rename packages/testing/playwright/tests/ui/{16-form-trigger-node.spec.ts => nodes/form-trigger-node.spec.ts} (98%)
 rename packages/testing/playwright/tests/ui/{8-http-request-node.spec.ts => nodes/http-request-node.spec.ts} (95%)
 rename packages/testing/playwright/tests/ui/{30-if-node.spec.ts => nodes/if-node.spec.ts} (94%)
 rename packages/testing/playwright/tests/ui/{pdf.spec.ts => nodes/pdf-node.spec.ts} (87%)

diff --git a/packages/testing/playwright/tests/ui/21-community-nodes.spec.ts b/packages/testing/playwright/tests/ui/nodes/community-nodes.spec.ts
similarity index 87%
rename from packages/testing/playwright/tests/ui/21-community-nodes.spec.ts
rename to packages/testing/playwright/tests/ui/nodes/community-nodes.spec.ts
index da1f67432c8..9516f64ac86 100644
--- a/packages/testing/playwright/tests/ui/21-community-nodes.spec.ts
+++ b/packages/testing/playwright/tests/ui/nodes/community-nodes.spec.ts
@@ -1,9 +1,9 @@
-import { MANUAL_TRIGGER_NODE_NAME } from '../../config/constants';
-import { test, expect } from '../../fixtures/base';
-import customCredential from '../../workflows/Custom_credential.json';
-import customNodeFixture from '../../workflows/Custom_node.json';
-import customNodeWithCustomCredentialFixture from '../../workflows/Custom_node_custom_credential.json';
-import customNodeWithN8nCredentialFixture from '../../workflows/Custom_node_n8n_credential.json';
+import { MANUAL_TRIGGER_NODE_NAME } from '../../../config/constants';
+import { test, expect } from '../../../fixtures/base';
+import customCredential from '../../../workflows/Custom_credential.json';
+import customNodeFixture from '../../../workflows/Custom_node.json';
+import customNodeWithCustomCredentialFixture from '../../../workflows/Custom_node_custom_credential.json';
+import customNodeWithN8nCredentialFixture from '../../../workflows/Custom_node_n8n_credential.json';
 
 const CUSTOM_NODE_NAME = 'E2E Node';
 const CUSTOM_NODE_WITH_N8N_CREDENTIAL = 'E2E Node with native n8n credential';
diff --git a/packages/testing/playwright/tests/ui/30-mail-node.spec.ts b/packages/testing/playwright/tests/ui/nodes/email-send-node.spec.ts
similarity index 97%
rename from packages/testing/playwright/tests/ui/30-mail-node.spec.ts
rename to packages/testing/playwright/tests/ui/nodes/email-send-node.spec.ts
index 6ccd601809a..996c052e043 100644
--- a/packages/testing/playwright/tests/ui/30-mail-node.spec.ts
+++ b/packages/testing/playwright/tests/ui/nodes/email-send-node.spec.ts
@@ -1,4 +1,4 @@
-import { test, expect } from '../../fixtures/base';
+import { test, expect } from '../../../fixtures/base';
 
 test.use({ addContainerCapability: { email: true } });
 
diff --git a/packages/testing/playwright/tests/ui/16-form-trigger-node.spec.ts b/packages/testing/playwright/tests/ui/nodes/form-trigger-node.spec.ts
similarity index 98%
rename from packages/testing/playwright/tests/ui/16-form-trigger-node.spec.ts
rename to packages/testing/playwright/tests/ui/nodes/form-trigger-node.spec.ts
index fa4843d519d..a02c16cf82c 100644
--- a/packages/testing/playwright/tests/ui/16-form-trigger-node.spec.ts
+++ b/packages/testing/playwright/tests/ui/nodes/form-trigger-node.spec.ts
@@ -1,4 +1,4 @@
-import { test, expect } from '../../fixtures/base';
+import { test, expect } from '../../../fixtures/base';
 
 test.describe('Form Trigger', () => {
 	test.beforeEach(async ({ n8n }) => {
diff --git a/packages/testing/playwright/tests/ui/8-http-request-node.spec.ts b/packages/testing/playwright/tests/ui/nodes/http-request-node.spec.ts
similarity index 95%
rename from packages/testing/playwright/tests/ui/8-http-request-node.spec.ts
rename to packages/testing/playwright/tests/ui/nodes/http-request-node.spec.ts
index 87b339d9ce4..220dd9b6f99 100644
--- a/packages/testing/playwright/tests/ui/8-http-request-node.spec.ts
+++ b/packages/testing/playwright/tests/ui/nodes/http-request-node.spec.ts
@@ -1,4 +1,4 @@
-import { test, expect } from '../../fixtures/base';
+import { test, expect } from '../../../fixtures/base';
 
 test.describe('HTTP Request node', () => {
 	test.beforeEach(async ({ n8n }) => {
diff --git a/packages/testing/playwright/tests/ui/30-if-node.spec.ts b/packages/testing/playwright/tests/ui/nodes/if-node.spec.ts
similarity index 94%
rename from packages/testing/playwright/tests/ui/30-if-node.spec.ts
rename to packages/testing/playwright/tests/ui/nodes/if-node.spec.ts
index 3c03ea9fa8d..85b25f35663 100644
--- a/packages/testing/playwright/tests/ui/30-if-node.spec.ts
+++ b/packages/testing/playwright/tests/ui/nodes/if-node.spec.ts
@@ -1,5 +1,5 @@
-import { IF_NODE_NAME } from '../../config/constants';
-import { test, expect } from '../../fixtures/base';
+import { IF_NODE_NAME } from '../../../config/constants';
+import { test, expect } from '../../../fixtures/base';
 
 const FILTER_PARAM_NAME = 'conditions';
 
diff --git a/packages/testing/playwright/tests/ui/pdf.spec.ts b/packages/testing/playwright/tests/ui/nodes/pdf-node.spec.ts
similarity index 87%
rename from packages/testing/playwright/tests/ui/pdf.spec.ts
rename to packages/testing/playwright/tests/ui/nodes/pdf-node.spec.ts
index b6681a3a087..f3c4f1dbaba 100644
--- a/packages/testing/playwright/tests/ui/pdf.spec.ts
+++ b/packages/testing/playwright/tests/ui/nodes/pdf-node.spec.ts
@@ -1,4 +1,4 @@
-import { expect, test } from '../../fixtures/base';
+import { expect, test } from '../../../fixtures/base';
 
 test.describe('PDF Test', () => {
 	test('Can read and write PDF files and extract text', async ({ n8n }) => {

From b04970a478c4c88430ab26a26c0a8b1b80118b5b Mon Sep 17 00:00:00 2001
From: Artem Sorokin <38620398+seemewalkin@users.noreply.github.com>
Date: Fri, 5 Dec 2025 16:42:37 +0100
Subject: [PATCH 105/167] test: Move cloud tests to cloud/ directory (#22840)

---
 .../tests/ui/{27-cloud.spec.ts => cloud/cloud.spec.ts}    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
 rename packages/testing/playwright/tests/ui/{27-cloud.spec.ts => cloud/cloud.spec.ts} (93%)

diff --git a/packages/testing/playwright/tests/ui/27-cloud.spec.ts b/packages/testing/playwright/tests/ui/cloud/cloud.spec.ts
similarity index 93%
rename from packages/testing/playwright/tests/ui/27-cloud.spec.ts
rename to packages/testing/playwright/tests/ui/cloud/cloud.spec.ts
index 2fcf825207b..04ced8d2f6a 100644
--- a/packages/testing/playwright/tests/ui/27-cloud.spec.ts
+++ b/packages/testing/playwright/tests/ui/cloud/cloud.spec.ts
@@ -1,7 +1,7 @@
-import { test, expect } from '../../fixtures/base';
-import basePlanData from '../../fixtures/plan-data-trial.json';
-import type { n8nPage } from '../../pages/n8nPage';
-import type { TestRequirements } from '../../Types';
+import { test, expect } from '../../../fixtures/base';
+import basePlanData from '../../../fixtures/plan-data-trial.json';
+import type { n8nPage } from '../../../pages/n8nPage';
+import type { TestRequirements } from '../../../Types';
 
 const fiveDaysFromNow = new Date(Date.now() + 5 * 24 * 60 * 60 * 1000);
 const planData = { ...basePlanData, expirationDate: fiveDaysFromNow.toJSON() };

From a939ac6e1ac97e7da01f5462b78cfd1395924b3c Mon Sep 17 00:00:00 2001
From: Artem Sorokin <38620398+seemewalkin@users.noreply.github.com>
Date: Fri, 5 Dec 2025 17:08:31 +0100
Subject: [PATCH 106/167] test: Migrate tests to app-config/ and capabilities/
 directories (#22843)

---
 .../become-creator.spec.ts}                               | 4 ++--
 .../tests/ui/{31-demo.spec.ts => app-config/demo.spec.ts} | 8 ++++----
 .../tests/ui/{ => app-config}/env-feature-flags.spec.ts   | 2 +-
 .../nps-survey.spec.ts}                                   | 4 ++--
 .../ui/{ => app-config}/security-notifications.spec.ts    | 4 ++--
 .../{36-versions.spec.ts => app-config/versions.spec.ts}  | 4 ++--
 .../proxy-server.spec.ts}                                 | 2 +-
 .../task-runner.spec.ts}                                  | 4 ++--
 8 files changed, 16 insertions(+), 16 deletions(-)
 rename packages/testing/playwright/tests/ui/{37-become-creator-cta.spec.ts => app-config/become-creator.spec.ts} (90%)
 rename packages/testing/playwright/tests/ui/{31-demo.spec.ts => app-config/demo.spec.ts} (84%)
 rename packages/testing/playwright/tests/ui/{ => app-config}/env-feature-flags.spec.ts (96%)
 rename packages/testing/playwright/tests/ui/{42-nps-survey.spec.ts => app-config/nps-survey.spec.ts} (97%)
 rename packages/testing/playwright/tests/ui/{ => app-config}/security-notifications.spec.ts (98%)
 rename packages/testing/playwright/tests/ui/{36-versions.spec.ts => app-config/versions.spec.ts} (94%)
 rename packages/testing/playwright/tests/ui/{env-mock-server.spec.ts => capabilities/proxy-server.spec.ts} (98%)
 rename packages/testing/playwright/tests/ui/{task-runner-demo.spec.ts => capabilities/task-runner.spec.ts} (94%)

diff --git a/packages/testing/playwright/tests/ui/37-become-creator-cta.spec.ts b/packages/testing/playwright/tests/ui/app-config/become-creator.spec.ts
similarity index 90%
rename from packages/testing/playwright/tests/ui/37-become-creator-cta.spec.ts
rename to packages/testing/playwright/tests/ui/app-config/become-creator.spec.ts
index 865ea57f5a4..0577230bf88 100644
--- a/packages/testing/playwright/tests/ui/37-become-creator-cta.spec.ts
+++ b/packages/testing/playwright/tests/ui/app-config/become-creator.spec.ts
@@ -1,5 +1,5 @@
-import { test, expect } from '../../fixtures/base';
-import type { TestRequirements } from '../../Types';
+import { test, expect } from '../../../fixtures/base';
+import type { TestRequirements } from '../../../Types';
 
 test.describe('Become creator CTA', () => {
 	test('should not show the CTA if user is not eligible', async ({ n8n, setupRequirements }) => {
diff --git a/packages/testing/playwright/tests/ui/31-demo.spec.ts b/packages/testing/playwright/tests/ui/app-config/demo.spec.ts
similarity index 84%
rename from packages/testing/playwright/tests/ui/31-demo.spec.ts
rename to packages/testing/playwright/tests/ui/app-config/demo.spec.ts
index ba57c5579fd..2fa5a141453 100644
--- a/packages/testing/playwright/tests/ui/31-demo.spec.ts
+++ b/packages/testing/playwright/tests/ui/app-config/demo.spec.ts
@@ -1,7 +1,7 @@
-import { test, expect } from '../../fixtures/base';
-import type { TestRequirements } from '../../Types';
-import simpleWorkflow from '../../workflows/Manual_wait_set.json';
-import workflowWithPinned from '../../workflows/Webhook_set_pinned.json';
+import { test, expect } from '../../../fixtures/base';
+import type { TestRequirements } from '../../../Types';
+import simpleWorkflow from '../../../workflows/Manual_wait_set.json';
+import workflowWithPinned from '../../../workflows/Webhook_set_pinned.json';
 
 const requirements: TestRequirements = {
 	config: {
diff --git a/packages/testing/playwright/tests/ui/env-feature-flags.spec.ts b/packages/testing/playwright/tests/ui/app-config/env-feature-flags.spec.ts
similarity index 96%
rename from packages/testing/playwright/tests/ui/env-feature-flags.spec.ts
rename to packages/testing/playwright/tests/ui/app-config/env-feature-flags.spec.ts
index 06d94c71033..0fc97236f33 100644
--- a/packages/testing/playwright/tests/ui/env-feature-flags.spec.ts
+++ b/packages/testing/playwright/tests/ui/app-config/env-feature-flags.spec.ts
@@ -1,4 +1,4 @@
-import { test, expect } from '../../fixtures/base';
+import { test, expect } from '../../../fixtures/base';
 
 test.describe
 	.serial('Environment Feature Flags', () => {
diff --git a/packages/testing/playwright/tests/ui/42-nps-survey.spec.ts b/packages/testing/playwright/tests/ui/app-config/nps-survey.spec.ts
similarity index 97%
rename from packages/testing/playwright/tests/ui/42-nps-survey.spec.ts
rename to packages/testing/playwright/tests/ui/app-config/nps-survey.spec.ts
index bdd62b5330d..d6d80a664b0 100644
--- a/packages/testing/playwright/tests/ui/42-nps-survey.spec.ts
+++ b/packages/testing/playwright/tests/ui/app-config/nps-survey.spec.ts
@@ -1,5 +1,5 @@
-import { test, expect } from '../../fixtures/base';
-import type { TestRequirements } from '../../Types';
+import { test, expect } from '../../../fixtures/base';
+import type { TestRequirements } from '../../../Types';
 
 const NOW = Date.now();
 const ONE_DAY = 24 * 60 * 60 * 1000;
diff --git a/packages/testing/playwright/tests/ui/security-notifications.spec.ts b/packages/testing/playwright/tests/ui/app-config/security-notifications.spec.ts
similarity index 98%
rename from packages/testing/playwright/tests/ui/security-notifications.spec.ts
rename to packages/testing/playwright/tests/ui/app-config/security-notifications.spec.ts
index 102136277a9..a3386fc9d61 100644
--- a/packages/testing/playwright/tests/ui/security-notifications.spec.ts
+++ b/packages/testing/playwright/tests/ui/app-config/security-notifications.spec.ts
@@ -1,5 +1,5 @@
-import { test, expect } from '../../fixtures/base';
-import type { n8nPage } from '../../pages/n8nPage';
+import { test, expect } from '../../../fixtures/base';
+import type { n8nPage } from '../../../pages/n8nPage';
 
 test.describe('Security Notifications', () => {
 	async function setupVersionsApiMock(
diff --git a/packages/testing/playwright/tests/ui/36-versions.spec.ts b/packages/testing/playwright/tests/ui/app-config/versions.spec.ts
similarity index 94%
rename from packages/testing/playwright/tests/ui/36-versions.spec.ts
rename to packages/testing/playwright/tests/ui/app-config/versions.spec.ts
index d4665caa70c..2a454a0cd54 100644
--- a/packages/testing/playwright/tests/ui/36-versions.spec.ts
+++ b/packages/testing/playwright/tests/ui/app-config/versions.spec.ts
@@ -1,5 +1,5 @@
-import { test, expect } from '../../fixtures/base';
-import type { TestRequirements } from '../../Types';
+import { test, expect } from '../../../fixtures/base';
+import type { TestRequirements } from '../../../Types';
 
 const requirements: TestRequirements = {
 	config: {
diff --git a/packages/testing/playwright/tests/ui/env-mock-server.spec.ts b/packages/testing/playwright/tests/ui/capabilities/proxy-server.spec.ts
similarity index 98%
rename from packages/testing/playwright/tests/ui/env-mock-server.spec.ts
rename to packages/testing/playwright/tests/ui/capabilities/proxy-server.spec.ts
index a8affdbd77e..659ef952d91 100644
--- a/packages/testing/playwright/tests/ui/env-mock-server.spec.ts
+++ b/packages/testing/playwright/tests/ui/capabilities/proxy-server.spec.ts
@@ -1,6 +1,6 @@
 import assert from 'node:assert';
 
-import { test, expect } from '../../fixtures/base';
+import { test, expect } from '../../../fixtures/base';
 
 test.use({
 	addContainerCapability: {
diff --git a/packages/testing/playwright/tests/ui/task-runner-demo.spec.ts b/packages/testing/playwright/tests/ui/capabilities/task-runner.spec.ts
similarity index 94%
rename from packages/testing/playwright/tests/ui/task-runner-demo.spec.ts
rename to packages/testing/playwright/tests/ui/capabilities/task-runner.spec.ts
index 4343e618568..69b3015a816 100644
--- a/packages/testing/playwright/tests/ui/task-runner-demo.spec.ts
+++ b/packages/testing/playwright/tests/ui/capabilities/task-runner.spec.ts
@@ -1,5 +1,5 @@
-import { CODE_NODE_NAME, MANUAL_TRIGGER_NODE_NAME } from '../../config/constants';
-import { test, expect } from '../../fixtures/base';
+import { CODE_NODE_NAME, MANUAL_TRIGGER_NODE_NAME } from '../../../config/constants';
+import { test, expect } from '../../../fixtures/base';
 
 test.use({
 	addContainerCapability: {

From b97b5d5bf8fb3499368e072189e0d4d434f526c9 Mon Sep 17 00:00:00 2001
From: oleg <me@olegivaniv.com>
Date: Fri, 5 Dec 2025 17:12:18 +0100
Subject: [PATCH 107/167] feat(ai-builder): Add multi-judge pairwise evals and
 local mode (no-changelog) (#22708)

Signed-off-by: Oleg Ivaniv <me@olegivaniv.com>
---
 .../evaluations/README.md                     | 262 ++++-
 .../chains/pairwise-evaluator.test.ts         |  13 +-
 .../evaluations/chains/pairwise-evaluator.ts  |  11 +-
 .../evaluations/core/environment.ts           |   4 +
 .../evaluations/index.ts                      |  95 +-
 .../evaluations/langsmith/pairwise-runner.ts  | 918 ++++++++++++++++--
 .../evaluations/utils/evaluation-helpers.ts   |   5 +-
 .../evaluations/utils/logger.ts               |  41 +
 .../src/workflow-builder-agent.ts             |   2 +
 9 files changed, 1215 insertions(+), 136 deletions(-)
 create mode 100644 packages/@n8n/ai-workflow-builder.ee/evaluations/utils/logger.ts

diff --git a/packages/@n8n/ai-workflow-builder.ee/evaluations/README.md b/packages/@n8n/ai-workflow-builder.ee/evaluations/README.md
index 06dac6f3618..ad1b1fd2ef6 100644
--- a/packages/@n8n/ai-workflow-builder.ee/evaluations/README.md
+++ b/packages/@n8n/ai-workflow-builder.ee/evaluations/README.md
@@ -104,21 +104,29 @@ The Langsmith integration provides two key components:
 
 #### 6. Pairwise Evaluation
 
-Pairwise evaluation provides a simpler, criteria-based approach to workflow evaluation. Instead of using the complex multi-metric evaluation system, it evaluates workflows against a custom set of "do" and "don't" rules defined in the dataset.
+Pairwise evaluation provides a criteria-based approach to workflow evaluation with hierarchical scoring and multi-judge consensus. It evaluates workflows against a custom set of "do" and "don't" rules defined in the dataset.
 
 **Evaluator (`chains/pairwise-evaluator.ts`):**
 - Evaluates workflows against a checklist of criteria (dos and don'ts)
 - Uses an LLM to determine if each criterion passes or fails
 - Requires evidence-based justification for each decision
-- Calculates a simple pass/fail score (passes / total rules)
+- Returns `primaryPass` (true only if ALL criteria pass) and `diagnosticScore` (ratio of passes)
 
 **Runner (`langsmith/pairwise-runner.ts`):**
 - Generates workflows from prompts in the dataset
-- Applies pairwise evaluation to each generated workflow
-- Reports three metrics to Langsmith:
-  - `pairwise_score`: Overall score (0-1)
-  - `pairwise_passed_count`: Number of criteria passed
-  - `pairwise_failed_count`: Number of criteria violated
+- Runs multiple LLM judges in parallel for each evaluation (configurable via `--judges`)
+- Aggregates judge results using majority vote
+- Supports filtering by `notion_id` metadata for single-example runs
+- Reports five metrics to Langsmith:
+  - `pairwise_primary`: Majority vote result (0 or 1)
+  - `pairwise_diagnostic`: Average diagnostic score across judges
+  - `pairwise_judges_passed`: Count of judges that passed
+  - `pairwise_total_violations`: Sum of all violations
+  - `pairwise_total_passes`: Sum of all passes
+
+**Logger (`utils/logger.ts`):**
+- Simple evaluation logger with verbose mode support
+- Controls output verbosity via `--verbose` flag
 
 **Dataset Format:**
 The pairwise evaluation expects a Langsmith dataset with examples containing:
@@ -217,6 +225,9 @@ GENERATE_TEST_CASES=true pnpm eval
 
 # With custom concurrency
 EVALUATION_CONCURRENCY=10 pnpm eval
+
+# With feature flags enabled
+pnpm eval --multi-agent --template-examples
 ```
 
 ### Langsmith Evaluation
@@ -229,11 +240,59 @@ export LANGSMITH_DATASET_NAME=your_dataset_name
 
 # Run evaluation
 pnpm eval:langsmith
+
+# With feature flags enabled
+pnpm eval:langsmith --multi-agent
 ```
 
 ### Pairwise Evaluation
 
-Pairwise evaluation uses a dataset with custom do/don't criteria for each prompt.
+Pairwise evaluation uses a dataset with custom do/don't criteria for each prompt. It implements a hierarchical scoring system with multiple LLM judges per evaluation.
+
+#### CLI Options
+
+| Option | Description | Default |
+|--------|-------------|---------|
+| `--prompt <text>` | Run local evaluation with this prompt (no LangSmith required) | - |
+| `--dos <rules>` | Newline-separated "do" rules for local evaluation | - |
+| `--donts <rules>` | Newline-separated "don't" rules for local evaluation | - |
+| `--notion-id <id>` | Filter to a single example by its `notion_id` metadata | (all examples) |
+| `--max-examples <n>` | Limit number of examples to evaluate (useful for testing) | (no limit) |
+| `--repetitions <n>` | Number of times to repeat the entire evaluation | 1 |
+| `--generations <n>` | Number of workflow generations per prompt (for variance reduction) | 1 |
+| `--judges <n>` | Number of LLM judges per evaluation | 3 |
+| `--concurrency <n>` | Number of prompts to evaluate in parallel | 5 |
+| `--name <name>` | Custom experiment name in LangSmith | `pairwise-evals` |
+| `--output-dir <path>` | Save generated workflows and evaluation results to this directory | - |
+| `--verbose`, `-v` | Enable verbose logging (shows judge details, violations, etc.) | false |
+| `--multi-agent` | Enable multi-agent architecture (see [Feature Flags](#feature-flags)) | false |
+| `--template-examples` | Enable template-based examples (see [Feature Flags](#feature-flags)) | false |
+
+#### Local Mode (No LangSmith Required)
+
+Run a single pairwise evaluation locally without needing a LangSmith account:
+
+```bash
+# Basic local evaluation
+pnpm eval:pairwise --prompt "Create a workflow that sends Slack messages" --dos "Use Slack node"
+
+# With don'ts and multiple judges
+pnpm eval:pairwise \
+  --prompt "Create a workflow that fetches data from an API" \
+  --dos "Use HTTP Request node\nHandle errors" \
+  --donts "Don't hardcode URLs" \
+  --judges 5 \
+  --verbose
+```
+
+Local mode is useful for:
+- Testing prompts before adding them to a dataset
+- Quick iteration on evaluation criteria
+- Running evaluations without LangSmith setup
+
+#### LangSmith Mode
+
+For dataset-based evaluation with experiment tracking:
 
 ```bash
 # Set required environment variables
@@ -242,14 +301,104 @@ export LANGSMITH_API_KEY=your_api_key
 # Run pairwise evaluation (uses default dataset: notion-pairwise-workflows)
 pnpm eval:pairwise
 
+# Run a single example by notion_id
+pnpm eval:pairwise --notion-id 30d29454-b397-4a35-8e0b-74a2302fa81a
+
+# Run with 3 repetitions and 5 judges, custom experiment name
+pnpm eval:pairwise --repetitions 3 --judges 5 --name "my-experiment"
+
+# Enable verbose logging to see all judge details
+pnpm eval:pairwise --notion-id abc123 --verbose
+
 # Use a custom dataset
 LANGSMITH_DATASET_NAME=my-pairwise-dataset pnpm eval:pairwise
 
 # Limit to specific number of examples (useful for testing)
-EVAL_MAX_EXAMPLES=2 pnpm eval:pairwise
+pnpm eval:pairwise --max-examples 2
+```
 
-# Run with multiple repetitions
-pnpm eval:pairwise --repetitions 3
+#### Multi-Generation Evaluation
+
+The `--generations` flag enables multiple workflow generations per prompt, providing a **Generation Correctness** metric:
+
+```bash
+# Run 3 generations per prompt with 3 judges each
+pnpm eval:pairwise --generations 3 --judges 3 --verbose
+
+# Example output:
+# Gen 1: 2/3 judges → ✓ PASS (diag=85%)
+# Gen 2: 1/3 judges → ✗ FAIL (diag=60%)
+# Gen 3: 3/3 judges → ✓ PASS (diag=95%)
+# 📊 [#1] 2/3 gens → PASS (gen_corr=0.67, diag=80%)
+```
+
+**Generation Correctness** = (# passing generations) / total generations:
+- With `--generations 3`: Values are 0, 0.33, 0.67, or 1
+- With `--generations 5`: Values are 0, 0.2, 0.4, 0.6, 0.8, or 1
+
+#### Hierarchical Scoring System
+
+The pairwise evaluation uses a multi-level scoring hierarchy:
+
+| Level | Primary Score | Secondary Score |
+|-------|--------------|-----------------|
+| Individual do/don't | Binary (true/false) | 0 or 1 |
+| 1 LLM judge | false if ANY criterion fails | Average of criteria scores |
+| N judges on 1 generation | Majority vote (≥50% pass) | Average diagnostic across judges |
+| N generations on 1 prompt | (# passing gens) / N | Average diagnostic across generations |
+| Full dataset | Average across prompts | Average diagnostic across all |
+
+This approach reduces variance from LLM non-determinism by using multiple judges and generations.
+
+#### Saving Artifacts with --output-dir
+
+The `--output-dir` flag saves all generated workflows and evaluation results to disk:
+
+```bash
+# Save artifacts to ./eval-output directory
+pnpm eval:pairwise --generations 3 --output-dir ./eval-output --verbose
+```
+
+**Output structure:**
+```
+eval-output/
+├── prompt-1/
+│   ├── prompt.txt              # Original prompt text
+│   ├── criteria.json           # dos/donts criteria
+│   ├── gen-1/
+│   │   ├── workflow.json       # Importable n8n workflow
+│   │   └── evaluation.json     # Judge results for this generation
+│   ├── gen-2/
+│   │   ├── workflow.json
+│   │   └── evaluation.json
+│   └── gen-3/
+│       ├── workflow.json
+│       └── evaluation.json
+├── prompt-2/
+│   └── ...
+└── summary.json                # Overall results summary
+```
+
+**workflow.json**: Directly importable into n8n (File → Import from file)
+
+**evaluation.json**: Contains per-judge results including violations and passes:
+```json
+{
+  "generationIndex": 1,
+  "majorityPass": false,
+  "primaryPasses": 1,
+  "numJudges": 3,
+  "diagnosticScore": 0.35,
+  "judges": [
+    {
+      "judgeIndex": 1,
+      "primaryPass": false,
+      "diagnosticScore": 0.30,
+      "violations": [{"rule": "...", "justification": "..."}],
+      "passes": [{"rule": "...", "justification": "..."}]
+    }
+  ]
+}
 ```
 
 ## Configuration
@@ -282,10 +431,77 @@ The evaluation will fail with a clear error message if `nodes.json` is missing.
 - `USE_LANGSMITH_EVAL` - Set to "true" to use Langsmith mode
 - `USE_PAIRWISE_EVAL` - Set to "true" to use pairwise evaluation mode
 - `LANGSMITH_DATASET_NAME` - Override default dataset name
-- `EVAL_MAX_EXAMPLES` - Limit number of examples to evaluate (useful for testing)
 - `EVALUATION_CONCURRENCY` - Number of parallel test executions (default: 5)
 - `GENERATE_TEST_CASES` - Set to "true" to generate additional test cases
 - `LLM_MODEL` - Model identifier for metadata tracking
+- `EVAL_FEATURE_MULTI_AGENT` - Set to "true" to enable multi-agent mode
+- `EVAL_FEATURE_TEMPLATE_EXAMPLES` - Set to "true" to enable template examples
+
+### Feature Flags
+
+Feature flags control experimental or optional behaviors in the AI Workflow Builder agent during evaluations. They can be set via environment variables or CLI arguments.
+
+#### Available Flags
+
+| Flag | Description | Default |
+|------|-------------|---------|
+| `multiAgent` | Enables multi-agent architecture with specialized sub-agents (supervisor, builder, configurator, discovery) | `false` |
+| `templateExamples` | Enables template-based examples in agent prompts | `false` |
+
+#### Setting Feature Flags
+
+**Via Environment Variables:**
+```bash
+# Enable multi-agent mode
+EVAL_FEATURE_MULTI_AGENT=true pnpm eval
+
+# Enable template examples
+EVAL_FEATURE_TEMPLATE_EXAMPLES=true pnpm eval:pairwise
+
+# Enable both
+EVAL_FEATURE_MULTI_AGENT=true EVAL_FEATURE_TEMPLATE_EXAMPLES=true pnpm eval:langsmith
+```
+
+**Via CLI Arguments:**
+```bash
+# Enable multi-agent mode
+pnpm eval --multi-agent
+
+# Enable template examples
+pnpm eval:pairwise --template-examples
+
+# Enable both
+pnpm eval:langsmith --multi-agent --template-examples
+```
+
+#### Usage Across Evaluation Modes
+
+Feature flags work consistently across all evaluation modes:
+
+**CLI Evaluation:**
+```bash
+pnpm eval --multi-agent --template-examples
+```
+
+**Langsmith Evaluation:**
+```bash
+pnpm eval:langsmith --multi-agent
+```
+
+**Pairwise Evaluation (LangSmith mode):**
+```bash
+pnpm eval:pairwise --multi-agent --template-examples
+```
+
+**Pairwise Evaluation (Local mode):**
+```bash
+pnpm eval:pairwise --prompt "Create a Slack workflow" --dos "Use Slack node" --multi-agent
+```
+
+When feature flags are enabled, they are logged at the start of the evaluation:
+```
+➔ Feature flags enabled: multiAgent, templateExamples
+```
 
 ## Output
 
@@ -304,14 +520,22 @@ The evaluation will fail with a clear error message if `nodes.json` is missing.
 ### Pairwise Evaluation Output
 
 - Results are stored in Langsmith dashboard
-- Experiment name format: `pairwise-evals-[uuid]`
-- Metrics reported:
-  - `pairwise_score`: Overall pass rate (0-1)
-  - `pairwise_passed_count`: Number of criteria that passed
-  - `pairwise_failed_count`: Number of criteria that were violated
+- Experiment name format: `<name>-[uuid]` (default: `pairwise-evals-[uuid]`)
+- Metrics reported (single generation mode):
+  - `pairwise_primary`: Binary pass/fail based on majority vote (0 or 1)
+  - `pairwise_diagnostic`: Average diagnostic score across judges (0-1)
+  - `pairwise_judges_passed`: Number of judges that returned primaryPass=true
+  - `pairwise_total_violations`: Sum of violations across all judges
+  - `pairwise_total_passes`: Sum of passes across all judges
+- Additional metrics reported (multi-generation mode with `--generations N`):
+  - `pairwise_generation_correctness`: (# passing generations) / N (0, 0.33, 0.67, 1 for N=3)
+  - `pairwise_aggregated_diagnostic`: Average diagnostic score across all generations
+  - `pairwise_generations_passed`: Count of generations that passed majority vote
+  - `pairwise_total_judge_calls`: Total judge invocations (generations × judges)
 - Each result includes detailed comments with:
-  - List of violations with justifications
-  - List of passes with justifications
+  - Majority vote summary
+  - List of violations with justifications (per judge)
+  - List of passes (per judge)
 
 ## Adding New Test Cases
 
diff --git a/packages/@n8n/ai-workflow-builder.ee/evaluations/chains/pairwise-evaluator.test.ts b/packages/@n8n/ai-workflow-builder.ee/evaluations/chains/pairwise-evaluator.test.ts
index ea0434c0f45..2c4c98bf73a 100644
--- a/packages/@n8n/ai-workflow-builder.ee/evaluations/chains/pairwise-evaluator.test.ts
+++ b/packages/@n8n/ai-workflow-builder.ee/evaluations/chains/pairwise-evaluator.test.ts
@@ -52,7 +52,8 @@ describe('evaluateWorkflowPairwise', () => {
 
 		expect(result).toEqual({
 			...mockResult,
-			score: 1,
+			primaryPass: true,
+			diagnosticScore: 1,
 		});
 		expect(baseEvaluator.createEvaluatorChain).toHaveBeenCalledWith(
 			mockLlm,
@@ -69,7 +70,7 @@ describe('evaluateWorkflowPairwise', () => {
 		);
 	});
 
-	it('should calculate score correctly with violations', async () => {
+	it('should calculate diagnosticScore correctly with violations', async () => {
 		const mockResult = {
 			violations: [{ rule: "Don't do that", justification: 'Did it' }],
 			passes: [{ rule: 'Do this', justification: 'Done' }],
@@ -79,10 +80,11 @@ describe('evaluateWorkflowPairwise', () => {
 
 		const result = await evaluateWorkflowPairwise(mockLlm, input);
 
-		expect(result.score).toBe(0.5);
+		expect(result.primaryPass).toBe(false);
+		expect(result.diagnosticScore).toBe(0.5);
 	});
 
-	it('should return score 0 when no rules evaluated', async () => {
+	it('should return diagnosticScore 0 when no rules evaluated', async () => {
 		const mockResult = {
 			violations: [],
 			passes: [],
@@ -92,6 +94,7 @@ describe('evaluateWorkflowPairwise', () => {
 
 		const result = await evaluateWorkflowPairwise(mockLlm, input);
 
-		expect(result.score).toBe(0);
+		expect(result.primaryPass).toBe(true);
+		expect(result.diagnosticScore).toBe(0);
 	});
 });
diff --git a/packages/@n8n/ai-workflow-builder.ee/evaluations/chains/pairwise-evaluator.ts b/packages/@n8n/ai-workflow-builder.ee/evaluations/chains/pairwise-evaluator.ts
index bbe28a3192e..9b38808c0bb 100644
--- a/packages/@n8n/ai-workflow-builder.ee/evaluations/chains/pairwise-evaluator.ts
+++ b/packages/@n8n/ai-workflow-builder.ee/evaluations/chains/pairwise-evaluator.ts
@@ -32,7 +32,10 @@ const pairwiseEvaluationLLMResultSchema = z.object({
 });
 
 export type PairwiseEvaluationResult = z.infer<typeof pairwiseEvaluationLLMResultSchema> & {
-	score: number;
+	/** True only if ALL criteria passed (no violations) */
+	primaryPass: boolean;
+	/** Ratio of passed criteria to total criteria (0-1) */
+	diagnosticScore: number;
 };
 
 const EVALUATOR_SYSTEM_PROMPT = `You are an expert n8n workflow auditor. Your task is to strictly evaluate a candidate workflow against a provided set of requirements.
@@ -96,10 +99,12 @@ export async function evaluateWorkflowPairwise(
 	});
 
 	const totalRules = result.passes.length + result.violations.length;
-	const score = totalRules > 0 ? result.passes.length / totalRules : 0;
+	const diagnosticScore = totalRules > 0 ? result.passes.length / totalRules : 0;
+	const primaryPass = result.violations.length === 0;
 
 	return {
 		...result,
-		score,
+		primaryPass,
+		diagnosticScore,
 	};
 }
diff --git a/packages/@n8n/ai-workflow-builder.ee/evaluations/core/environment.ts b/packages/@n8n/ai-workflow-builder.ee/evaluations/core/environment.ts
index 309d2b6d360..bf4b5a637c1 100644
--- a/packages/@n8n/ai-workflow-builder.ee/evaluations/core/environment.ts
+++ b/packages/@n8n/ai-workflow-builder.ee/evaluations/core/environment.ts
@@ -5,6 +5,7 @@ import { Client } from 'langsmith/client';
 import type { INodeTypeDescription } from 'n8n-workflow';
 
 import { anthropicClaudeSonnet45 } from '../../src/llm-config.js';
+import type { BuilderFeatureFlags } from '../../src/workflow-builder-agent.js';
 import { WorkflowBuilderAgent } from '../../src/workflow-builder-agent.js';
 import { loadNodesFromFile } from '../load-nodes.js';
 
@@ -76,12 +77,14 @@ export async function setupTestEnvironment(): Promise<TestEnvironment> {
  * @param parsedNodeTypes - Array of parsed node type descriptions
  * @param llm - Language model instance
  * @param tracer - Optional LangChain tracer
+ * @param featureFlags - Optional feature flags
  * @returns Configured WorkflowBuilderAgent
  */
 export function createAgent(
 	parsedNodeTypes: INodeTypeDescription[],
 	llm: BaseChatModel,
 	tracer?: LangChainTracer,
+	featureFlags?: BuilderFeatureFlags,
 ): WorkflowBuilderAgent {
 	return new WorkflowBuilderAgent({
 		parsedNodeTypes,
@@ -89,6 +92,7 @@ export function createAgent(
 		llmComplexTask: llm,
 		checkpointer: new MemorySaver(),
 		tracer,
+		featureFlags,
 	});
 }
 
diff --git a/packages/@n8n/ai-workflow-builder.ee/evaluations/index.ts b/packages/@n8n/ai-workflow-builder.ee/evaluations/index.ts
index 162246f44d6..a872220804e 100644
--- a/packages/@n8n/ai-workflow-builder.ee/evaluations/index.ts
+++ b/packages/@n8n/ai-workflow-builder.ee/evaluations/index.ts
@@ -1,17 +1,54 @@
 import type { BuilderFeatureFlags } from '@/workflow-builder-agent';
 
 import { runCliEvaluation } from './cli/runner.js';
-import { runPairwiseLangsmithEvaluation } from './langsmith/pairwise-runner.js';
+import {
+	runLocalPairwiseEvaluation,
+	runPairwiseLangsmithEvaluation,
+} from './langsmith/pairwise-runner.js';
 import { runLangsmithEvaluation } from './langsmith/runner.js';
 import { loadTestCasesFromCsv } from './utils/csv-prompt-loader.js';
 
 // Re-export for external use if needed
 export { runCliEvaluation } from './cli/runner.js';
 export { runLangsmithEvaluation } from './langsmith/runner.js';
-export { runPairwiseLangsmithEvaluation } from './langsmith/pairwise-runner.js';
+export {
+	runLocalPairwiseEvaluation,
+	runPairwiseLangsmithEvaluation,
+} from './langsmith/pairwise-runner.js';
 export { runSingleTest } from './core/test-runner.js';
 export { setupTestEnvironment, createAgent } from './core/environment.js';
 
+/** Parse an integer flag with default value */
+function getIntFlag(flag: string, defaultValue: number, max?: number): number {
+	const arg = getFlagValue(flag);
+	if (!arg) return defaultValue;
+	const parsed = parseInt(arg, 10);
+	if (Number.isNaN(parsed) || parsed < 1) return defaultValue;
+	return max ? Math.min(parsed, max) : parsed;
+}
+
+/** Parse all CLI arguments */
+function parseCliArgs() {
+	return {
+		testCaseId: process.argv.includes('--test-case')
+			? process.argv[process.argv.indexOf('--test-case') + 1]
+			: undefined,
+		promptsCsvPath: getFlagValue('--prompts-csv') ?? process.env.PROMPTS_CSV_FILE,
+		repetitions: getIntFlag('--repetitions', 1),
+		notionId: getFlagValue('--notion-id'),
+		numJudges: getIntFlag('--judges', 3),
+		numGenerations: getIntFlag('--generations', 1, 10),
+		concurrency: getIntFlag('--concurrency', 5),
+		maxExamples: getIntFlag('--max-examples', 0), // 0 means no limit
+		verbose: process.argv.includes('--verbose') || process.argv.includes('-v'),
+		experimentName: getFlagValue('--name'),
+		outputDir: getFlagValue('--output-dir'),
+		prompt: getFlagValue('--prompt'),
+		dos: getFlagValue('--dos'),
+		donts: getFlagValue('--donts'),
+	};
+}
+
 /**
  * Main entry point for evaluation
  * Determines which evaluation mode to run based on environment variables
@@ -19,38 +56,52 @@ export { setupTestEnvironment, createAgent } from './core/environment.js';
 async function main(): Promise<void> {
 	const useLangsmith = process.env.USE_LANGSMITH_EVAL === 'true';
 	const usePairwiseEval = process.env.USE_PAIRWISE_EVAL === 'true';
+	const args = parseCliArgs();
 
-	// Parse command line arguments for single test case
-	const testCaseId = process.argv.includes('--test-case')
-		? process.argv[process.argv.indexOf('--test-case') + 1]
-		: undefined;
-
-	// Parse command line argument for CSV prompts file path
-	const promptsCsvPath = getFlagValue('--prompts-csv') ?? process.env.PROMPTS_CSV_FILE;
-
-	if (promptsCsvPath && (useLangsmith || usePairwiseEval)) {
+	if (args.promptsCsvPath && (useLangsmith || usePairwiseEval)) {
 		console.warn('CSV-driven evaluations are only supported in CLI mode. Ignoring --prompts-csv.');
 	}
 
-	// Parse command line arguments for a number of repetitions (applies to both modes)
-	const repetitionsArg = process.argv.includes('--repetitions')
-		? parseInt(process.argv[process.argv.indexOf('--repetitions') + 1], 10)
-		: 1;
-	const repetitions = Number.isNaN(repetitionsArg) ? 1 : repetitionsArg;
-
 	// Parse feature flags from environment variables or CLI arguments
 	const featureFlags = parseFeatureFlags();
 
 	if (usePairwiseEval) {
-		await runPairwiseLangsmithEvaluation(repetitions, featureFlags);
+		if (args.prompt) {
+			// Local mode - run single evaluation without LangSmith
+			await runLocalPairwiseEvaluation({
+				prompt: args.prompt,
+				criteria: { dos: args.dos ?? '', donts: args.donts ?? '' },
+				numJudges: args.numJudges,
+				numGenerations: args.numGenerations,
+				verbose: args.verbose,
+				outputDir: args.outputDir,
+				featureFlags,
+			});
+		} else {
+			// LangSmith mode
+			await runPairwiseLangsmithEvaluation({
+				repetitions: args.repetitions,
+				notionId: args.notionId,
+				numJudges: args.numJudges,
+				numGenerations: args.numGenerations,
+				verbose: args.verbose,
+				experimentName: args.experimentName,
+				outputDir: args.outputDir,
+				concurrency: args.concurrency,
+				maxExamples: args.maxExamples || undefined,
+				featureFlags,
+			});
+		}
 	} else if (useLangsmith) {
-		await runLangsmithEvaluation(repetitions, featureFlags);
+		await runLangsmithEvaluation(args.repetitions, featureFlags);
 	} else {
-		const csvTestCases = promptsCsvPath ? loadTestCasesFromCsv(promptsCsvPath) : undefined;
+		const csvTestCases = args.promptsCsvPath
+			? loadTestCasesFromCsv(args.promptsCsvPath)
+			: undefined;
 		await runCliEvaluation({
 			testCases: csvTestCases,
-			testCaseFilter: testCaseId,
-			repetitions,
+			testCaseFilter: args.testCaseId,
+			repetitions: args.repetitions,
 			featureFlags,
 		});
 	}
diff --git a/packages/@n8n/ai-workflow-builder.ee/evaluations/langsmith/pairwise-runner.ts b/packages/@n8n/ai-workflow-builder.ee/evaluations/langsmith/pairwise-runner.ts
index 89187b1138d..b9b11e4e273 100644
--- a/packages/@n8n/ai-workflow-builder.ee/evaluations/langsmith/pairwise-runner.ts
+++ b/packages/@n8n/ai-workflow-builder.ee/evaluations/langsmith/pairwise-runner.ts
@@ -1,17 +1,27 @@
 import type { BaseChatModel } from '@langchain/core/language_models/chat_models';
 import type { LangChainTracer } from '@langchain/core/tracers/tracer_langchain';
+import * as fs from 'fs';
 import { evaluate } from 'langsmith/evaluation';
 import type { EvaluationResult as LangsmithEvaluationResult } from 'langsmith/evaluation';
 import type { Run, Example } from 'langsmith/schemas';
 import type { INodeTypeDescription } from 'n8n-workflow';
+import * as path from 'path';
 import pc from 'picocolors';
 
 import type { SimpleWorkflow } from '../../src/types/workflow';
 import type { BuilderFeatureFlags } from '../../src/workflow-builder-agent';
-import { evaluateWorkflowPairwise } from '../chains/pairwise-evaluator';
+import {
+	evaluateWorkflowPairwise,
+	type PairwiseEvaluationResult,
+} from '../chains/pairwise-evaluator';
 import { setupTestEnvironment, createAgent } from '../core/environment';
 import { generateRunId, isWorkflowStateValues } from '../types/langsmith';
 import { consumeGenerator, formatHeader, getChatPayload } from '../utils/evaluation-helpers';
+import { createLogger, type EvalLogger } from '../utils/logger';
+
+// ============================================================================
+// Types
+// ============================================================================
 
 interface PairwiseDatasetInput {
 	evals: {
@@ -21,10 +31,34 @@ interface PairwiseDatasetInput {
 	prompt: string;
 }
 
+interface GenerationResult {
+	workflow: SimpleWorkflow;
+	judgeResults: PairwiseEvaluationResult[];
+	primaryPasses: number;
+	majorityPass: boolean;
+	avgDiagnosticScore: number;
+}
+
+interface MultiGenerationAggregation {
+	/** Generation correctness: (# passing generations) / total generations */
+	generationCorrectness: number;
+	/** Average diagnostic score across all generations */
+	aggregatedDiagnosticScore: number;
+	/** Number of generations that passed majority vote */
+	passingGenerations: number;
+	/** Total number of generations run */
+	totalGenerations: number;
+	/** Detailed results for each generation */
+	generationDetails: GenerationResult[];
+}
+
 interface PairwiseGeneratorOutput {
 	workflow: SimpleWorkflow;
 	evalCriteria: PairwiseDatasetInput['evals'];
 	prompt: string;
+	evaluationResults: LangsmithEvaluationResult[];
+	/** Multi-generation aggregation data (present when numGenerations > 1) */
+	multiGenerationAggregation?: MultiGenerationAggregation;
 }
 
 function isPairwiseGeneratorOutput(outputs: unknown): outputs is PairwiseGeneratorOutput {
@@ -34,114 +68,604 @@ function isPairwiseGeneratorOutput(outputs: unknown): outputs is PairwiseGenerat
 
 	if (!obj.workflow || typeof obj.workflow !== 'object') return false;
 	if (!obj.evalCriteria || typeof obj.evalCriteria !== 'object') return false;
+	if (!obj.evaluationResults || !Array.isArray(obj.evaluationResults)) return false;
 
 	return true;
 }
 
+// ============================================================================
+// Helpers
+// ============================================================================
+
+const DEFAULT_NUM_JUDGES = 3;
+const DEFAULT_NUM_GENERATIONS = 1;
+const DEFAULT_EXPERIMENT_NAME = 'pairwise-evals';
+
+// ============================================================================
+// Artifact Saver
+// ============================================================================
+
+interface ArtifactSaver {
+	savePrompt(promptId: string, prompt: string, criteria: { dos: string; donts: string }): void;
+	saveGeneration(promptId: string, genIndex: number, result: GenerationResult): void;
+	saveSummary(results: Array<{ promptId: string; aggregation: MultiGenerationAggregation }>): void;
+}
+
+/** Creates an artifact saver if outputDir is provided, otherwise returns null */
+function createArtifactSaver(outputDir: string | undefined, log: EvalLogger): ArtifactSaver | null {
+	if (!outputDir) return null;
+
+	// Create output directory if it doesn't exist
+	fs.mkdirSync(outputDir, { recursive: true });
+
+	return {
+		savePrompt(promptId: string, prompt: string, criteria: { dos: string; donts: string }): void {
+			const promptDir = path.join(outputDir, `prompt-${promptId}`);
+			fs.mkdirSync(promptDir, { recursive: true });
+
+			// Save prompt text
+			fs.writeFileSync(path.join(promptDir, 'prompt.txt'), prompt, 'utf-8');
+
+			// Save criteria
+			fs.writeFileSync(
+				path.join(promptDir, 'criteria.json'),
+				JSON.stringify(criteria, null, 2),
+				'utf-8',
+			);
+
+			log.verbose(`  📁 Saved prompt artifacts to ${promptDir}`);
+		},
+
+		saveGeneration(promptId: string, genIndex: number, result: GenerationResult): void {
+			const genDir = path.join(outputDir, `prompt-${promptId}`, `gen-${genIndex + 1}`);
+			fs.mkdirSync(genDir, { recursive: true });
+
+			// Save workflow as importable n8n JSON
+			const workflowForExport = {
+				name: result.workflow.name ?? `Generated Workflow - Gen ${genIndex + 1}`,
+				nodes: result.workflow.nodes ?? [],
+				connections: result.workflow.connections ?? {},
+			};
+			fs.writeFileSync(
+				path.join(genDir, 'workflow.json'),
+				JSON.stringify(workflowForExport, null, 2),
+				'utf-8',
+			);
+
+			// Save evaluation results
+			const evalResult = {
+				generationIndex: genIndex + 1,
+				majorityPass: result.majorityPass,
+				primaryPasses: result.primaryPasses,
+				numJudges: result.judgeResults.length,
+				diagnosticScore: result.avgDiagnosticScore,
+				judges: result.judgeResults.map((jr, i) => ({
+					judgeIndex: i + 1,
+					primaryPass: jr.primaryPass,
+					diagnosticScore: jr.diagnosticScore,
+					violations: jr.violations,
+					passes: jr.passes,
+				})),
+			};
+			fs.writeFileSync(
+				path.join(genDir, 'evaluation.json'),
+				JSON.stringify(evalResult, null, 2),
+				'utf-8',
+			);
+
+			log.verbose(`  📁 Saved gen-${genIndex + 1} artifacts to ${genDir}`);
+		},
+
+		saveSummary(
+			results: Array<{ promptId: string; aggregation: MultiGenerationAggregation }>,
+		): void {
+			const summary = {
+				timestamp: new Date().toISOString(),
+				totalPrompts: results.length,
+				results: results.map((r) => ({
+					promptId: r.promptId,
+					generationCorrectness: r.aggregation.generationCorrectness,
+					aggregatedDiagnosticScore: r.aggregation.aggregatedDiagnosticScore,
+					passingGenerations: r.aggregation.passingGenerations,
+					totalGenerations: r.aggregation.totalGenerations,
+				})),
+				averageGenerationCorrectness:
+					results.reduce((sum, r) => sum + r.aggregation.generationCorrectness, 0) / results.length,
+				averageDiagnosticScore:
+					results.reduce((sum, r) => sum + r.aggregation.aggregatedDiagnosticScore, 0) /
+					results.length,
+			};
+			fs.writeFileSync(
+				path.join(outputDir, 'summary.json'),
+				JSON.stringify(summary, null, 2),
+				'utf-8',
+			);
+
+			log.info(`📁 Saved summary to ${path.join(outputDir, 'summary.json')}`);
+		},
+	};
+}
+
+/** Calculate minimum judges needed for majority (e.g., 2 for 3 judges, 3 for 5 judges) */
+function getMajorityThreshold(numJudges: number): number {
+	return Math.ceil(numJudges / 2);
+}
+
+/** Extract notion_id from metadata if present */
+function getNotionId(metadata: unknown): string | undefined {
+	if (typeof metadata === 'object' && metadata !== null && 'notion_id' in metadata) {
+		const id = (metadata as { notion_id: unknown }).notion_id;
+		return typeof id === 'string' ? id : undefined;
+	}
+	return undefined;
+}
+
+/** Build LangSmith-compatible evaluation results from judge panel output */
+function buildLangsmithResults(
+	judgeResults: PairwiseEvaluationResult[],
+	numJudges: number,
+	primaryPasses: number,
+	majorityPass: boolean,
+	avgDiagnosticScore: number,
+): LangsmithEvaluationResult[] {
+	const allViolations = judgeResults.flatMap((r, i) =>
+		r.violations.map((v) => `[Judge ${i + 1}] ${v.rule}: ${v.justification}`),
+	);
+	const allPasses = judgeResults.flatMap((r, i) =>
+		r.passes.map((p) => `[Judge ${i + 1}] ${p.rule}`),
+	);
+
+	const comment = [
+		`Majority vote: ${primaryPasses}/${numJudges} judges passed`,
+		allViolations.length > 0 ? `\nViolations:\n${allViolations.join('\n')}` : '',
+		allPasses.length > 0 ? `\nPasses:\n${allPasses.join('\n')}` : '',
+	]
+		.filter(Boolean)
+		.join('');
+
+	return [
+		{ key: 'pairwise_primary', score: majorityPass ? 1 : 0, comment },
+		{
+			key: 'pairwise_diagnostic',
+			score: avgDiagnosticScore,
+			comment: `Average diagnostic score across ${numJudges} judges`,
+		},
+		{
+			key: 'pairwise_judges_passed',
+			score: primaryPasses,
+			comment: `${primaryPasses} of ${numJudges} judges returned primaryPass=true`,
+		},
+		{
+			key: 'pairwise_total_violations',
+			score: judgeResults.reduce((sum, r) => sum + r.violations.length, 0),
+		},
+		{
+			key: 'pairwise_total_passes',
+			score: judgeResults.reduce((sum, r) => sum + r.passes.length, 0),
+		},
+	];
+}
+
+/** Build LangSmith-compatible evaluation results for multi-generation aggregation */
+function buildMultiGenerationLangsmithResults(
+	aggregation: MultiGenerationAggregation,
+	numJudges: number,
+): LangsmithEvaluationResult[] {
+	const { generationCorrectness, aggregatedDiagnosticScore, passingGenerations, totalGenerations } =
+		aggregation;
+
+	// Build detailed comment with per-generation breakdown
+	const genBreakdown = aggregation.generationDetails
+		.map(
+			(g, i) =>
+				`Gen ${i + 1}: ${g.majorityPass ? 'PASS' : 'FAIL'} (${g.primaryPasses}/${numJudges} judges, ${(g.avgDiagnosticScore * 100).toFixed(0)}%)`,
+		)
+		.join('\n');
+
+	const comment = [
+		`Generation Correctness: ${passingGenerations}/${totalGenerations} generations passed`,
+		`\nPer-generation breakdown:\n${genBreakdown}`,
+	].join('');
+
+	// Use first generation for backward-compatible metrics
+	const firstGen = aggregation.generationDetails[0];
+
+	// Aggregate counts across all generations
+	const totalJudgesPassed = aggregation.generationDetails.reduce(
+		(sum, g) => sum + g.primaryPasses,
+		0,
+	);
+	const totalViolations = aggregation.generationDetails.reduce(
+		(sum, g) => sum + g.judgeResults.reduce((jSum, r) => jSum + r.violations.length, 0),
+		0,
+	);
+	const totalPasses = aggregation.generationDetails.reduce(
+		(sum, g) => sum + g.judgeResults.reduce((jSum, r) => jSum + r.passes.length, 0),
+		0,
+	);
+
+	return [
+		// Primary aggregated metrics (new)
+		{
+			key: 'pairwise_generation_correctness',
+			score: generationCorrectness,
+			comment: `${passingGenerations} of ${totalGenerations} generations passed majority vote`,
+		},
+		{
+			key: 'pairwise_aggregated_diagnostic',
+			score: aggregatedDiagnosticScore,
+			comment: `Average diagnostic score across ${totalGenerations} generations`,
+		},
+		// Legacy metrics (backward compat, use first generation)
+		{
+			key: 'pairwise_primary',
+			score: firstGen.majorityPass ? 1 : 0,
+			comment: `First generation: ${firstGen.primaryPasses}/${numJudges} judges passed`,
+		},
+		{
+			key: 'pairwise_diagnostic',
+			score: firstGen.avgDiagnosticScore,
+			comment: 'First generation diagnostic score',
+		},
+		// Summary metrics
+		{
+			key: 'pairwise_generations_passed',
+			score: passingGenerations,
+			comment,
+		},
+		{
+			key: 'pairwise_total_judge_calls',
+			score: totalGenerations * numJudges,
+			comment: `${totalGenerations} generations x ${numJudges} judges`,
+		},
+		// Aggregated detail metrics (across all generations)
+		{
+			key: 'pairwise_judges_passed',
+			score: totalJudgesPassed,
+			comment: `${totalJudgesPassed} of ${totalGenerations * numJudges} total judge calls passed`,
+		},
+		{
+			key: 'pairwise_total_violations',
+			score: totalViolations,
+			comment: `Total violations across all ${totalGenerations} generations`,
+		},
+		{
+			key: 'pairwise_total_passes',
+			score: totalPasses,
+			comment: `Total criteria passes across all ${totalGenerations} generations`,
+		},
+	];
+}
+
+/** Run a single generation and its judge panel */
+async function runSingleGeneration(
+	parsedNodeTypes: INodeTypeDescription[],
+	llm: BaseChatModel,
+	numJudges: number,
+	inputs: PairwiseDatasetInput,
+	generationIndex: number,
+	log: EvalLogger,
+	featureFlags?: BuilderFeatureFlags,
+	tracer?: LangChainTracer,
+): Promise<GenerationResult> {
+	const startTime = Date.now();
+	const runId = generateRunId();
+
+	// Create dedicated agent for this generation
+	const agent = createAgent(parsedNodeTypes, llm, tracer, featureFlags);
+
+	// Generate workflow
+	await consumeGenerator(
+		agent.chat(getChatPayload(inputs.prompt, runId, featureFlags), `pairwise-gen-${generationIndex}`),
+	);
+
+	const state = await agent.getState(runId, `pairwise-gen-${generationIndex}`);
+
+	if (!state.values || !isWorkflowStateValues(state.values)) {
+		throw new Error(`Invalid workflow state for generation ${generationIndex + 1}`);
+	}
+
+	const workflow = state.values.workflowJSON;
+	const genTime = (Date.now() - startTime) / 1000;
+
+	log.verbose(
+		`  Gen ${generationIndex + 1}: Workflow done (${workflow?.nodes?.length ?? 0} nodes) [${genTime.toFixed(1)}s]`,
+	);
+
+	// Run judges for this generation in parallel
+	const judgeResults = await Promise.all(
+		Array.from({ length: numJudges }, async () => {
+			return await evaluateWorkflowPairwise(llm, {
+				workflowJSON: workflow,
+				evalCriteria: inputs.evals,
+			});
+		}),
+	);
+
+	// Aggregate judge results for this generation
+	const primaryPasses = judgeResults.filter((r) => r.primaryPass).length;
+	const majorityPass = primaryPasses >= getMajorityThreshold(numJudges);
+	const avgDiagnosticScore =
+		judgeResults.reduce((sum, r) => sum + r.diagnosticScore, 0) / numJudges;
+
+	// Log per-generation judge results
+	const totalViolations = judgeResults.reduce((sum, r) => sum + r.violations.length, 0);
+	log.verbose(
+		`  Gen ${generationIndex + 1}: ${primaryPasses}/${numJudges} judges → ` +
+			`${majorityPass ? '✓ PASS' : '✗ FAIL'} (diag=${(avgDiagnosticScore * 100).toFixed(0)}%` +
+			`${totalViolations > 0 ? `, ${totalViolations} violations` : ''})`,
+	);
+
+	return {
+		workflow,
+		judgeResults,
+		primaryPasses,
+		majorityPass,
+		avgDiagnosticScore,
+	};
+}
+
+// ============================================================================
+// Workflow Generator (for LangSmith)
+// ============================================================================
+
+// Counter to track generations across repetitions
+let generationCounter = 0;
+
+/** Creates a generator function that produces workflows and runs judge evaluation */
 function createPairwiseWorkflowGenerator(
 	parsedNodeTypes: INodeTypeDescription[],
 	llm: BaseChatModel,
-	tracer?: LangChainTracer,
+	numJudges: number,
+	numGenerations: number,
+	log: EvalLogger,
+	artifactSaver: ArtifactSaver | null,
 	featureFlags?: BuilderFeatureFlags,
+	tracer?: LangChainTracer,
 ) {
 	return async (inputs: PairwiseDatasetInput) => {
-		const runId = generateRunId();
+		const startTime = Date.now();
+		generationCounter++;
+		const currentEvalNumber = generationCounter;
+		const promptId = String(currentEvalNumber);
+		const promptPreview = inputs.prompt.slice(0, 60).replace(/\n/g, ' ');
 
-		// Create agent for this run
-		const agent = createAgent(parsedNodeTypes, llm, tracer);
+		log.verbose(
+			`\n🔄 [#${currentEvalNumber}] "${promptPreview}${inputs.prompt.length > 60 ? '...' : ''}"`,
+		);
+		log.verbose(`   Running ${numGenerations} generation(s) x ${numJudges} judges...`);
 
-		// Use the prompt from the dataset
-		await consumeGenerator(
-			agent.chat(
-				getChatPayload(inputs.prompt, runId, featureFlags),
-				'langsmith-pairwise-eval-user',
+		// Save prompt artifacts if output dir is configured
+		artifactSaver?.savePrompt(promptId, inputs.prompt, inputs.evals);
+
+		// Run all generations in parallel
+		const generationResults = await Promise.all(
+			Array.from({ length: numGenerations }, async (_, i) => {
+				return await runSingleGeneration(parsedNodeTypes, llm, numJudges, inputs, i, log, featureFlags, tracer);
+			}),
+		);
+
+		// Save generation artifacts
+		if (artifactSaver) {
+			for (let i = 0; i < generationResults.length; i++) {
+				artifactSaver.saveGeneration(promptId, i, generationResults[i]);
+			}
+		}
+
+		// Aggregate across generations
+		const passingGenerations = generationResults.filter((g) => g.majorityPass).length;
+		const generationCorrectness = passingGenerations / numGenerations;
+		const aggregatedDiagnosticScore =
+			generationResults.reduce((sum, g) => sum + g.avgDiagnosticScore, 0) / numGenerations;
+
+		const totalTime = (Date.now() - startTime) / 1000;
+
+		// Log aggregated result
+		console.log(
+			pc.dim(
+				`  📊 [#${currentEvalNumber}] ${passingGenerations}/${numGenerations} gens → ` +
+					`${generationCorrectness >= 0.5 ? pc.green('PASS') : pc.red('FAIL')} ` +
+					`(gen_corr=${generationCorrectness.toFixed(2)}, diag=${(aggregatedDiagnosticScore * 100).toFixed(0)}%) ` +
+					`[${totalTime.toFixed(1)}s]`,
 			),
 		);
 
-		// Get generated workflow
-		const state = await agent.getState(runId, 'langsmith-pairwise-eval-user');
+		// Build aggregation object
+		const multiGenerationAggregation: MultiGenerationAggregation = {
+			generationCorrectness,
+			aggregatedDiagnosticScore,
+			passingGenerations,
+			totalGenerations: numGenerations,
+			generationDetails: generationResults,
+		};
 
-		if (!state.values || !isWorkflowStateValues(state.values)) {
-			throw new Error('Invalid workflow state');
-		}
+		// Choose appropriate results builder based on numGenerations
+		const evaluationResults =
+			numGenerations > 1
+				? buildMultiGenerationLangsmithResults(multiGenerationAggregation, numJudges)
+				: buildLangsmithResults(
+						generationResults[0].judgeResults,
+						numJudges,
+						generationResults[0].primaryPasses,
+						generationResults[0].majorityPass,
+						generationResults[0].avgDiagnosticScore,
+					);
 
 		return {
-			workflow: state.values.workflowJSON,
+			workflow: generationResults[0].workflow,
 			evalCriteria: inputs.evals,
 			prompt: inputs.prompt,
+			evaluationResults,
+			multiGenerationAggregation: numGenerations > 1 ? multiGenerationAggregation : undefined,
 		};
 	};
 }
 
-function createPairwiseLangsmithEvaluator(llm: BaseChatModel) {
+// ============================================================================
+// LangSmith Evaluator
+// ============================================================================
+
+/**
+ * Simple evaluator that extracts pre-computed results from the generator output.
+ * The actual judge evaluation is done in createPairwiseWorkflowGenerator for better parallelism.
+ */
+function createPairwiseLangsmithEvaluator() {
 	return async (rootRun: Run, _example?: Example): Promise<LangsmithEvaluationResult[]> => {
 		const outputs = rootRun.outputs;
 
 		if (!isPairwiseGeneratorOutput(outputs)) {
 			return [
 				{
-					key: 'pairwise_score',
+					key: 'pairwise_primary',
 					score: 0,
-					comment: 'Missing or invalid workflow/evaluation criteria in outputs',
+					comment: 'Invalid output - missing evaluation results',
 				},
+				{ key: 'pairwise_diagnostic', score: 0 },
 			];
 		}
 
-		const result = await evaluateWorkflowPairwise(llm, {
-			workflowJSON: outputs.workflow,
-			evalCriteria: outputs.evalCriteria,
-		});
-
-		const violationsText =
-			result.violations.length > 0
-				? `Violations:\n${result.violations.map((v) => `- ${v.rule}: ${v.justification}`).join('\n')}`
-				: '';
-
-		const passesText =
-			result.passes.length > 0
-				? `Passes:\n${result.passes.map((p) => `- ${p.rule}: ${p.justification}`).join('\n')}`
-				: '';
-
-		const comment = [violationsText, passesText].filter(Boolean).join('\n\n');
-
-		return [
-			{
-				key: 'pairwise_score',
-				score: result.score,
-				comment: comment || 'No comments',
-			},
-			{
-				key: 'pairwise_passed_count',
-				score: result.passes.length,
-			},
-			{
-				key: 'pairwise_failed_count',
-				score: result.violations.length,
-			},
-		];
+		// Just pass through the pre-computed results from the generator
+		return outputs.evaluationResults;
 	};
 }
 
-export async function runPairwiseLangsmithEvaluation(
-	repetitions: number = 1,
-	featureFlags?: BuilderFeatureFlags,
-): Promise<void> {
-	console.log(formatHeader('AI Workflow Builder Pairwise Evaluation', 70));
+/** Filter examples by notion_id or limit count */
+function filterExamples(
+	allExamples: Example[],
+	notionId: string | undefined,
+	maxExamples: number | undefined,
+	log: EvalLogger,
+): Example[] {
+	if (notionId) {
+		log.warn(`🔍 Filtering by notion_id: ${notionId}`);
+		const filtered = allExamples.filter((e) => getNotionId(e.metadata) === notionId);
 
-	if (featureFlags) {
-		const enabledFlags = Object.entries(featureFlags)
-			.filter(([, v]) => v === true)
-			.map(([k]) => k);
-		if (enabledFlags.length > 0) {
-			console.log(pc.green(`➔ Feature flags enabled: ${enabledFlags.join(', ')}`));
+		if (filtered.length === 0) {
+			log.error(`❌ No example found with notion_id: ${notionId}`);
+			const availableIds = allExamples.map((e) => getNotionId(e.metadata)).filter(Boolean);
+			log.dim(`Available: ${availableIds.join(', ')}`);
+			process.exit(1);
 		}
+
+		log.success(`✅ Found ${filtered.length} example(s)`);
+		log.verbose(`Metadata: ${JSON.stringify(filtered[0].metadata, null, 2)}`);
+		return filtered;
 	}
 
+	if (maxExamples && maxExamples > 0) {
+		log.warn(`➔ Limiting to ${maxExamples} example(s)`);
+		return allExamples.slice(0, maxExamples);
+	}
+
+	return allExamples;
+}
+
+/** Create repeated data array for LangSmith evaluation */
+function createRepeatedData(data: Example[], repetitions: number): Example[] {
+	const repeatedData: Example[] = [];
+	for (let i = 0; i < repetitions; i++) {
+		repeatedData.push(...data);
+	}
+	return repeatedData;
+}
+
+// ============================================================================
+// Public API
+// ============================================================================
+
+export interface PairwiseEvaluationOptions {
+	repetitions?: number;
+	notionId?: string;
+	numJudges?: number;
+	numGenerations?: number;
+	verbose?: boolean;
+	experimentName?: string;
+	outputDir?: string;
+	concurrency?: number;
+	maxExamples?: number;
+	featureFlags?: BuilderFeatureFlags;
+}
+
+/** Log enabled feature flags */
+function logFeatureFlags(featureFlags?: BuilderFeatureFlags): void {
+	if (!featureFlags) return;
+	const enabledFlags = Object.entries(featureFlags)
+		.filter(([, v]) => v === true)
+		.map(([k]) => k);
+	if (enabledFlags.length > 0) {
+		console.log(pc.green(`➔ Feature flags enabled: ${enabledFlags.join(', ')}`));
+	}
+}
+
+/** Log configuration for pairwise evaluation */
+function logPairwiseConfig(
+	log: EvalLogger,
+	experimentName: string,
+	numGenerations: number,
+	numJudges: number,
+	repetitions: number,
+	concurrency: number,
+	verbose: boolean,
+): void {
+	log.info(`➔ Experiment: ${experimentName}`);
+	log.info(
+		`➔ Config: ${numGenerations} gen(s) × ${numJudges} judges × ${repetitions} reps (concurrency: ${concurrency})${verbose ? ' (verbose)' : ''}`,
+	);
+	if (numGenerations > 1) {
+		log.verbose('   Generation Correctness: (# passing gens) / total gens');
+		log.verbose('   Aggregated Diagnostic: average across all generations');
+	} else {
+		log.verbose('   Primary: ALL criteria must pass → majority vote');
+		log.verbose('   Secondary: Average diagnostic score');
+	}
+}
+
+/**
+ * Runs pairwise evaluation using LangSmith.
+ * Generates workflows from dataset prompts and evaluates them against do/don't criteria.
+ */
+export async function runPairwiseLangsmithEvaluation(
+	options: PairwiseEvaluationOptions = {},
+): Promise<void> {
+	const {
+		repetitions = 1,
+		notionId,
+		numJudges = DEFAULT_NUM_JUDGES,
+		numGenerations = DEFAULT_NUM_GENERATIONS,
+		verbose = false,
+		experimentName = DEFAULT_EXPERIMENT_NAME,
+		outputDir,
+		concurrency = 5,
+		maxExamples,
+		featureFlags,
+	} = options;
+	const log = createLogger(verbose);
+
+	console.log(formatHeader('AI Workflow Builder Pairwise Evaluation', 70));
+	logPairwiseConfig(
+		log,
+		experimentName,
+		numGenerations,
+		numJudges,
+		repetitions,
+		concurrency,
+		verbose,
+	);
+
+	if (outputDir) {
+		log.info(`➔ Output directory: ${outputDir}`);
+	}
+
+	logFeatureFlags(featureFlags);
+
 	if (!process.env.LANGSMITH_API_KEY) {
-		console.error(pc.red('✗ LANGSMITH_API_KEY environment variable not set'));
+		log.error('✗ LANGSMITH_API_KEY environment variable not set');
 		process.exit(1);
 	}
 
+	// Reset counter for this run
+	generationCounter = 0;
+
 	try {
 		const { parsedNodeTypes, llm, tracer, lsClient } = await setupTestEnvironment();
 
@@ -150,7 +674,7 @@ export async function runPairwiseLangsmithEvaluation(
 		}
 
 		const datasetName = process.env.LANGSMITH_DATASET_NAME ?? 'notion-pairwise-workflows';
-		console.log(pc.blue(`➔ Using dataset: ${datasetName}`));
+		log.info(`➔ Dataset: ${datasetName}`);
 
 		// Verify dataset exists and get dataset info
 		let datasetId: string;
@@ -158,45 +682,267 @@ export async function runPairwiseLangsmithEvaluation(
 			const dataset = await lsClient.readDataset({ datasetName });
 			datasetId = dataset.id;
 		} catch (error) {
-			console.error(pc.red(`✗ Dataset "${datasetName}" not found`));
+			log.error(`✗ Dataset "${datasetName}" not found`);
 			process.exit(1);
 		}
 
-		// Check if we should limit examples
-		const maxExamplesEnv = process.env.EVAL_MAX_EXAMPLES;
-		const maxExamples = maxExamplesEnv ? parseInt(maxExamplesEnv, 10) : undefined;
-
-		// Fetch examples if limiting, otherwise use dataset name
-		let data: string | Example[] = datasetName;
-		if (maxExamples && maxExamples > 0) {
-			console.log(pc.yellow(`➔ Limiting to ${maxExamples} example(s)`));
-			const examples: Example[] = [];
-			for await (const example of lsClient.listExamples({ datasetId })) {
-				examples.push(example);
-				if (examples.length >= maxExamples) break;
+		// Fetch all examples from dataset for filtering/inspection
+		const allExamples: Example[] = [];
+		log.verbose('➔ Fetching examples from dataset...');
+		for await (const example of lsClient.listExamples({ datasetId })) {
+			// Log first example structure for debugging (verbose only)
+			if (allExamples.length === 0) {
+				log.verbose(
+					`📊 First example: ${JSON.stringify(
+						{
+							id: example.id,
+							metadata: example.metadata,
+							inputsKeys: Object.keys(example.inputs ?? {}),
+						},
+						null,
+						2,
+					)}`,
+				);
 			}
-			data = examples;
+			allExamples.push(example);
 		}
+		log.verbose(`📊 Total examples in dataset: ${allExamples.length}`);
+
+		// Filter examples based on notionId or maxExamples
+		const data = filterExamples(allExamples, notionId, maxExamples, log);
+
+		// Create artifact saver if output directory is configured
+		const artifactSaver = createArtifactSaver(outputDir, log);
+
+		// NOTE: LangSmith's numRepetitions doesn't work when passing Example[] array directly
+		// (it only works with dataset names). We manually duplicate examples to work around this.
+		const repeatedData = createRepeatedData(data, repetitions);
+
+		log.info(`➔ Running ${data.length} × ${repetitions} = ${repeatedData.length} generations`);
 
 		const generateWorkflow = createPairwiseWorkflowGenerator(
 			parsedNodeTypes,
 			llm,
-			tracer,
+			numJudges,
+			numGenerations,
+			log,
+			artifactSaver,
 			featureFlags,
+			tracer,
 		);
-		const evaluator = createPairwiseLangsmithEvaluator(llm);
+		const evaluator = createPairwiseLangsmithEvaluator();
+
+		const evalStartTime = Date.now();
 
 		await evaluate(generateWorkflow, {
-			data,
+			data: repeatedData,
 			evaluators: [evaluator],
-			maxConcurrency: 5,
-			experimentPrefix: 'pairwise-evals',
-			numRepetitions: repetitions,
+			maxConcurrency: concurrency,
+			experimentPrefix: experimentName,
+			// numRepetitions not used - we manually duplicate examples above
+			metadata: {
+				numJudges,
+				numGenerations,
+				repetitions,
+				concurrency,
+				scoringMethod: numGenerations > 1 ? 'hierarchical-multi-generation' : 'hierarchical',
+			},
 		});
 
-		console.log(pc.green('✓ Pairwise evaluation completed'));
+		const totalEvalTime = Date.now() - evalStartTime;
+
+		log.success('\n✓ Pairwise evaluation completed');
+		log.dim(
+			`   Prompts evaluated: ${generationCounter} | ` +
+				`Total workflow generations: ${generationCounter * numGenerations} | ` +
+				`Judge calls: ${generationCounter * numGenerations * numJudges}`,
+		);
+		log.dim(`   Total time: ${(totalEvalTime / 1000).toFixed(1)}s`);
+		log.dim('   View results in LangSmith dashboard');
 	} catch (error) {
-		console.error(pc.red('✗ Pairwise evaluation failed:'), error);
+		log.error(
+			`✗ Pairwise evaluation failed: ${error instanceof Error ? error.message : String(error)}`,
+		);
+		process.exit(1);
+	}
+}
+
+export interface LocalPairwiseOptions {
+	prompt: string;
+	criteria: { dos: string; donts: string };
+	numJudges?: number;
+	numGenerations?: number;
+	verbose?: boolean;
+	outputDir?: string;
+	featureFlags?: BuilderFeatureFlags;
+}
+
+/** Log configuration for local pairwise evaluation */
+function logLocalPairwiseConfig(
+	log: EvalLogger,
+	numGenerations: number,
+	numJudges: number,
+	outputDir: string | undefined,
+	prompt: string,
+	criteria: { dos: string; donts: string },
+): void {
+	log.info(`➔ Generations: ${numGenerations}, Judges: ${numJudges}`);
+	if (outputDir) {
+		log.info(`➔ Output directory: ${outputDir}`);
+	}
+	log.verbose(`➔ Prompt: ${prompt.slice(0, 80)}${prompt.length > 80 ? '...' : ''}`);
+	log.verbose(`➔ Dos: ${criteria.dos.slice(0, 60)}${criteria.dos.length > 60 ? '...' : ''}`);
+	if (criteria.donts) {
+		log.verbose(
+			`➔ Donts: ${criteria.donts.slice(0, 60)}${criteria.donts.length > 60 ? '...' : ''}`,
+		);
+	}
+}
+
+/**
+ * Runs a single pairwise evaluation locally without LangSmith.
+ * Useful for testing prompts and criteria before running full dataset evaluation.
+ */
+export async function runLocalPairwiseEvaluation(options: LocalPairwiseOptions): Promise<void> {
+	const {
+		prompt,
+		criteria,
+		numJudges = DEFAULT_NUM_JUDGES,
+		numGenerations = DEFAULT_NUM_GENERATIONS,
+		verbose = false,
+		outputDir,
+		featureFlags,
+	} = options;
+	const log = createLogger(verbose);
+
+	console.log(formatHeader('Local Pairwise Evaluation', 50));
+	logLocalPairwiseConfig(log, numGenerations, numJudges, outputDir, prompt, criteria);
+
+	const startTime = Date.now();
+
+	try {
+		const { parsedNodeTypes, llm } = await setupTestEnvironment();
+
+		// Create artifact saver if output directory is configured
+		const artifactSaver = createArtifactSaver(outputDir, log);
+		const promptId = 'local';
+
+		// Save prompt artifacts
+		artifactSaver?.savePrompt(promptId, prompt, criteria);
+
+		log.info(`➔ Running ${numGenerations} generation(s)...`);
+
+		// Run all generations in parallel
+		const generationResults = await Promise.all(
+			Array.from({ length: numGenerations }, async (_, genIndex) => {
+				const genStartTime = Date.now();
+				const runId = generateRunId();
+				const agent = createAgent(parsedNodeTypes, llm, undefined, featureFlags);
+				await consumeGenerator(agent.chat(getChatPayload(prompt, runId, featureFlags), `local-gen-${genIndex}`));
+				const state = await agent.getState(runId, `local-gen-${genIndex}`);
+
+				if (!state.values || !isWorkflowStateValues(state.values)) {
+					throw new Error(`Invalid workflow state for generation ${genIndex + 1}`);
+				}
+
+				const workflow = state.values.workflowJSON;
+				const genTime = (Date.now() - genStartTime) / 1000;
+
+				log.verbose(
+					`  Gen ${genIndex + 1}: Workflow done (${workflow?.nodes?.length ?? 0} nodes) [${genTime.toFixed(1)}s]`,
+				);
+
+				// Run judges for this generation
+				const judgeResults = await Promise.all(
+					Array.from({ length: numJudges }, async () => {
+						return await evaluateWorkflowPairwise(llm, {
+							workflowJSON: workflow,
+							evalCriteria: criteria,
+						});
+					}),
+				);
+
+				const primaryPasses = judgeResults.filter((r) => r.primaryPass).length;
+				const majorityPass = primaryPasses >= getMajorityThreshold(numJudges);
+				const avgDiagnosticScore =
+					judgeResults.reduce((sum, r) => sum + r.diagnosticScore, 0) / numJudges;
+
+				log.verbose(
+					`  Gen ${genIndex + 1}: ${majorityPass ? '✓ PASS' : '✗ FAIL'} (${primaryPasses}/${numJudges} judges, ${(avgDiagnosticScore * 100).toFixed(0)}%)`,
+				);
+
+				return { workflow, judgeResults, primaryPasses, majorityPass, avgDiagnosticScore };
+			}),
+		);
+
+		// Save generation artifacts
+		if (artifactSaver) {
+			for (let i = 0; i < generationResults.length; i++) {
+				artifactSaver.saveGeneration(promptId, i, generationResults[i]);
+			}
+		}
+
+		// Aggregate across generations
+		const passingGenerations = generationResults.filter((g) => g.majorityPass).length;
+		const generationCorrectness = passingGenerations / numGenerations;
+		const aggregatedDiagnosticScore =
+			generationResults.reduce((sum, g) => sum + g.avgDiagnosticScore, 0) / numGenerations;
+
+		const totalTime = (Date.now() - startTime) / 1000;
+
+		// Display aggregated result
+		if (numGenerations > 1) {
+			console.log(
+				`\n📊 Generation Correctness: ${passingGenerations}/${numGenerations} → ` +
+					`${generationCorrectness >= 0.5 ? pc.green(generationCorrectness.toFixed(2)) : pc.red(generationCorrectness.toFixed(2))}`,
+			);
+			console.log(`   Aggregated Diagnostic: ${(aggregatedDiagnosticScore * 100).toFixed(0)}%`);
+		} else {
+			// Single generation - show original format
+			const firstGen = generationResults[0];
+			console.log(
+				`\n📊 Result: ${firstGen.primaryPasses}/${numJudges} judges → ` +
+					`${firstGen.majorityPass ? pc.green('PASS') : pc.red('FAIL')} ` +
+					`(${(firstGen.avgDiagnosticScore * 100).toFixed(0)}%)`,
+			);
+		}
+		log.dim(`   Timing: ${totalTime.toFixed(1)}s total`);
+
+		// Per-generation breakdown (verbose or multi-gen)
+		if (verbose && numGenerations > 1) {
+			console.log(pc.dim('\nPer-generation breakdown:'));
+			generationResults.forEach((g, i) => {
+				console.log(
+					pc.dim(
+						`  Gen ${i + 1}: ${g.majorityPass ? 'PASS' : 'FAIL'} ` +
+							`(${g.primaryPasses}/${numJudges} judges, ${(g.avgDiagnosticScore * 100).toFixed(0)}%)`,
+					),
+				);
+			});
+		}
+
+		// Show violations if any (from first generation for simplicity)
+		const allViolations = generationResults[0].judgeResults.flatMap((r, i) =>
+			r.violations.map((v) => ({ judge: i + 1, rule: v.rule, justification: v.justification })),
+		);
+		if (allViolations.length > 0) {
+			console.log(pc.yellow('\nViolations (Gen 1):'));
+			for (const v of allViolations) {
+				console.log(pc.dim(`  [Judge ${v.judge}] ${v.rule}: ${v.justification}`));
+			}
+		}
+
+		// Show workflow summary
+		if (verbose && generationResults[0].workflow.nodes) {
+			console.log(pc.dim('\nWorkflow nodes (Gen 1):'));
+			for (const node of generationResults[0].workflow.nodes) {
+				console.log(pc.dim(`  - ${node.name} (${node.type})`));
+			}
+		}
+	} catch (error) {
+		log.error(
+			`✗ Local evaluation failed: ${error instanceof Error ? error.message : String(error)}`,
+		);
 		process.exit(1);
 	}
 }
diff --git a/packages/@n8n/ai-workflow-builder.ee/evaluations/utils/evaluation-helpers.ts b/packages/@n8n/ai-workflow-builder.ee/evaluations/utils/evaluation-helpers.ts
index 071a3e62ffe..016a2c47592 100644
--- a/packages/@n8n/ai-workflow-builder.ee/evaluations/utils/evaluation-helpers.ts
+++ b/packages/@n8n/ai-workflow-builder.ee/evaluations/utils/evaluation-helpers.ts
@@ -283,10 +283,13 @@ export function getChatPayload(
 	featureFlags?: BuilderFeatureFlags,
 ): ChatPayload {
 	return {
+		featureFlags: featureFlags ?? {
+			multiAgent: true,
+			templateExamples: false,
+		},
 		message,
 		workflowContext: {
 			currentWorkflow: { id, nodes: [], connections: {} },
 		},
-		featureFlags,
 	};
 }
diff --git a/packages/@n8n/ai-workflow-builder.ee/evaluations/utils/logger.ts b/packages/@n8n/ai-workflow-builder.ee/evaluations/utils/logger.ts
new file mode 100644
index 00000000000..a0e967d8efa
--- /dev/null
+++ b/packages/@n8n/ai-workflow-builder.ee/evaluations/utils/logger.ts
@@ -0,0 +1,41 @@
+import pc from 'picocolors';
+
+/**
+ * Simple evaluation logger with verbose mode support.
+ *
+ * Usage:
+ *   const log = createLogger(isVerbose);
+ *   log.info('Always shown');
+ *   log.verbose('Only shown in verbose mode');
+ */
+
+export interface EvalLogger {
+	/** Always shown - important info */
+	info: (message: string) => void;
+	/** Only shown in verbose mode - debug details */
+	verbose: (message: string) => void;
+	/** Success messages (green) */
+	success: (message: string) => void;
+	/** Warning messages (yellow) */
+	warn: (message: string) => void;
+	/** Error messages (red) */
+	error: (message: string) => void;
+	/** Dimmed text for secondary info */
+	dim: (message: string) => void;
+	/** Check if verbose mode is enabled */
+	isVerbose: boolean;
+}
+
+export function createLogger(verbose: boolean = false): EvalLogger {
+	return {
+		isVerbose: verbose,
+		info: (message: string) => console.log(pc.blue(message)),
+		verbose: (message: string) => {
+			if (verbose) console.log(pc.dim(message));
+		},
+		success: (message: string) => console.log(pc.green(message)),
+		warn: (message: string) => console.log(pc.yellow(message)),
+		error: (message: string) => console.log(pc.red(message)),
+		dim: (message: string) => console.log(pc.dim(message)),
+	};
+}
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/workflow-builder-agent.ts b/packages/@n8n/ai-workflow-builder.ee/src/workflow-builder-agent.ts
index b11858f1f9c..b871bcd8b9f 100644
--- a/packages/@n8n/ai-workflow-builder.ee/src/workflow-builder-agent.ts
+++ b/packages/@n8n/ai-workflow-builder.ee/src/workflow-builder-agent.ts
@@ -143,6 +143,8 @@ export interface WorkflowBuilderAgentConfig {
 	onGenerationSuccess?: () => Promise<void>;
 	/** Metadata to include in LangSmith traces */
 	runMetadata?: Record<string, unknown>;
+	/** Feature flags for enabling/disabling features */
+	featureFlags?: BuilderFeatureFlags;
 }
 
 export interface ExpressionValue {

From 5234b286acab3e9c7e73dacc07ab6460fcd066d2 Mon Sep 17 00:00:00 2001
From: Artem Sorokin <38620398+seemewalkin@users.noreply.github.com>
Date: Fri, 5 Dec 2025 17:30:12 +0100
Subject: [PATCH 108/167] test: Migrate data tables tests to data-tables/
 directory (#22841)

---
 .../details.spec.ts}                                          | 4 ++--
 .../ui/{data-tables.spec.ts => data-tables/tables.spec.ts}    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename packages/testing/playwright/tests/ui/{data-table-details.spec.ts => data-tables/details.spec.ts} (99%)
 rename packages/testing/playwright/tests/ui/{data-tables.spec.ts => data-tables/tables.spec.ts} (98%)

diff --git a/packages/testing/playwright/tests/ui/data-table-details.spec.ts b/packages/testing/playwright/tests/ui/data-tables/details.spec.ts
similarity index 99%
rename from packages/testing/playwright/tests/ui/data-table-details.spec.ts
rename to packages/testing/playwright/tests/ui/data-tables/details.spec.ts
index 273a70264e7..03ed696d7a5 100644
--- a/packages/testing/playwright/tests/ui/data-table-details.spec.ts
+++ b/packages/testing/playwright/tests/ui/data-tables/details.spec.ts
@@ -1,7 +1,7 @@
 import { nanoid } from 'nanoid';
 
-import { test, expect } from '../../fixtures/base';
-import type { n8nPage } from '../../pages/n8nPage';
+import { test, expect } from '../../../fixtures/base';
+import type { n8nPage } from '../../../pages/n8nPage';
 
 test.describe('Data Table details view', () => {
 	let testDataTableName: string;
diff --git a/packages/testing/playwright/tests/ui/data-tables.spec.ts b/packages/testing/playwright/tests/ui/data-tables/tables.spec.ts
similarity index 98%
rename from packages/testing/playwright/tests/ui/data-tables.spec.ts
rename to packages/testing/playwright/tests/ui/data-tables/tables.spec.ts
index f368638c2d7..028017ff719 100644
--- a/packages/testing/playwright/tests/ui/data-tables.spec.ts
+++ b/packages/testing/playwright/tests/ui/data-tables/tables.spec.ts
@@ -1,6 +1,6 @@
 import { nanoid } from 'nanoid';
 
-import { test, expect } from '../../fixtures/base';
+import { test, expect } from '../../../fixtures/base';
 
 test.describe('Data Table list view', () => {
 	test.beforeEach(async ({ n8n, api }) => {

From 39a4b29b9db8a47bf8f6b9cbd61f12beff099571 Mon Sep 17 00:00:00 2001
From: Artem Sorokin <38620398+seemewalkin@users.noreply.github.com>
Date: Fri, 5 Dec 2025 17:51:00 +0100
Subject: [PATCH 109/167] test: Rename building-blocks tests to remove numeric
 prefixes (#22846)

---
 .../{02-canvas-actions.spec.ts => canvas-actions.spec.ts}       | 0
 .../{04-credentials.spec.ts => credentials.spec.ts}             | 2 +-
 ...configuration.spec.ts => node-details-configuration.spec.ts} | 2 +-
 .../user-service.spec.ts}                                       | 2 +-
 ...kflow-entry-points.spec.ts => workflow-entry-points.spec.ts} | 2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename packages/testing/playwright/tests/ui/building-blocks/{02-canvas-actions.spec.ts => canvas-actions.spec.ts} (100%)
 rename packages/testing/playwright/tests/ui/building-blocks/{04-credentials.spec.ts => credentials.spec.ts} (98%)
 rename packages/testing/playwright/tests/ui/building-blocks/{03-node-details-configuration.spec.ts => node-details-configuration.spec.ts} (98%)
 rename packages/testing/playwright/tests/ui/{18-user-service.spec.ts => building-blocks/user-service.spec.ts} (97%)
 rename packages/testing/playwright/tests/ui/building-blocks/{01-workflow-entry-points.spec.ts => workflow-entry-points.spec.ts} (97%)

diff --git a/packages/testing/playwright/tests/ui/building-blocks/02-canvas-actions.spec.ts b/packages/testing/playwright/tests/ui/building-blocks/canvas-actions.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/building-blocks/02-canvas-actions.spec.ts
rename to packages/testing/playwright/tests/ui/building-blocks/canvas-actions.spec.ts
diff --git a/packages/testing/playwright/tests/ui/building-blocks/04-credentials.spec.ts b/packages/testing/playwright/tests/ui/building-blocks/credentials.spec.ts
similarity index 98%
rename from packages/testing/playwright/tests/ui/building-blocks/04-credentials.spec.ts
rename to packages/testing/playwright/tests/ui/building-blocks/credentials.spec.ts
index 3c84edbf752..1a1380e9fc7 100644
--- a/packages/testing/playwright/tests/ui/building-blocks/04-credentials.spec.ts
+++ b/packages/testing/playwright/tests/ui/building-blocks/credentials.spec.ts
@@ -2,7 +2,7 @@ import { nanoid } from 'nanoid';
 
 import { test, expect } from '../../../fixtures/base';
 
-test.describe('04 - Credentials', () => {
+test.describe('Credentials', () => {
 	test('composer: createFromList creates credential', async ({ n8n }) => {
 		const projectId = await n8n.start.fromNewProject();
 		const credentialName = `credential-${nanoid()}`;
diff --git a/packages/testing/playwright/tests/ui/building-blocks/03-node-details-configuration.spec.ts b/packages/testing/playwright/tests/ui/building-blocks/node-details-configuration.spec.ts
similarity index 98%
rename from packages/testing/playwright/tests/ui/building-blocks/03-node-details-configuration.spec.ts
rename to packages/testing/playwright/tests/ui/building-blocks/node-details-configuration.spec.ts
index 1256c3d4238..b6f28b73ffc 100644
--- a/packages/testing/playwright/tests/ui/building-blocks/03-node-details-configuration.spec.ts
+++ b/packages/testing/playwright/tests/ui/building-blocks/node-details-configuration.spec.ts
@@ -1,6 +1,6 @@
 import { test, expect } from '../../../fixtures/base';
 
-test.describe('03 - Node Details Configuration', () => {
+test.describe('Node Details Configuration', () => {
 	test.beforeEach(async ({ n8n }) => {
 		await n8n.start.fromBlankCanvas();
 	});
diff --git a/packages/testing/playwright/tests/ui/18-user-service.spec.ts b/packages/testing/playwright/tests/ui/building-blocks/user-service.spec.ts
similarity index 97%
rename from packages/testing/playwright/tests/ui/18-user-service.spec.ts
rename to packages/testing/playwright/tests/ui/building-blocks/user-service.spec.ts
index 9bf5d2122b0..3402346f996 100644
--- a/packages/testing/playwright/tests/ui/18-user-service.spec.ts
+++ b/packages/testing/playwright/tests/ui/building-blocks/user-service.spec.ts
@@ -1,4 +1,4 @@
-import { expect, test } from '../../fixtures/base';
+import { expect, test } from '../../../fixtures/base';
 
 test.describe('User API Service', () => {
 	test('should create a user with default values', async ({ api }) => {
diff --git a/packages/testing/playwright/tests/ui/building-blocks/01-workflow-entry-points.spec.ts b/packages/testing/playwright/tests/ui/building-blocks/workflow-entry-points.spec.ts
similarity index 97%
rename from packages/testing/playwright/tests/ui/building-blocks/01-workflow-entry-points.spec.ts
rename to packages/testing/playwright/tests/ui/building-blocks/workflow-entry-points.spec.ts
index 4692af37adf..b1bfbb24f8e 100644
--- a/packages/testing/playwright/tests/ui/building-blocks/01-workflow-entry-points.spec.ts
+++ b/packages/testing/playwright/tests/ui/building-blocks/workflow-entry-points.spec.ts
@@ -1,6 +1,6 @@
 import { test, expect } from '../../../fixtures/base';
 
-test.describe('01 - UI Test Entry Points', () => {
+test.describe('UI Test Entry Points', () => {
 	test.describe('Entry Point: Home Page', () => {
 		test('should navigate from home', async ({ n8n }) => {
 			await n8n.start.fromHome();

From e9c4c8d99a85c6ce9fb5242e01975ef585f17398 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 5 Dec 2025 16:53:52 +0000
Subject: [PATCH 110/167] chore: Update cloudflare/wrangler-action digest to
 707f637 (#22322)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Declan Carroll <declan@n8n.io>
---
 .github/workflows/storybook.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/storybook.yml b/.github/workflows/storybook.yml
index 0e91e310bc9..3d26f01c1bc 100644
--- a/.github/workflows/storybook.yml
+++ b/.github/workflows/storybook.yml
@@ -43,7 +43,7 @@ jobs:
           pnpm add --global wrangler
 
       - name: Deploy
-        uses: cloudflare/wrangler-action@da0e0dfe58b7a431659754fdf3f186c529afbe65
+        uses: cloudflare/wrangler-action@707f63750981584eb6abc365a50d441516fb04b8
         id: cloudflare_deployment
         with:
           apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}

From d3e7713632245214c1a3dc73919996a5413462f5 Mon Sep 17 00:00:00 2001
From: Artem Sorokin <38620398+seemewalkin@users.noreply.github.com>
Date: Fri, 5 Dec 2025 18:13:26 +0100
Subject: [PATCH 111/167] test: Split sharing tests into sharing/ directory
 (#22849)

---
 .../ui/sharing/credential-visibility.spec.ts  | 175 ++++++++++++++++++
 .../sharing.spec.ts}                          | 170 +----------------
 2 files changed, 176 insertions(+), 169 deletions(-)
 create mode 100644 packages/testing/playwright/tests/ui/sharing/credential-visibility.spec.ts
 rename packages/testing/playwright/tests/ui/{17-sharing.spec.ts => sharing/sharing.spec.ts} (64%)

diff --git a/packages/testing/playwright/tests/ui/sharing/credential-visibility.spec.ts b/packages/testing/playwright/tests/ui/sharing/credential-visibility.spec.ts
new file mode 100644
index 00000000000..8a947b8fb43
--- /dev/null
+++ b/packages/testing/playwright/tests/ui/sharing/credential-visibility.spec.ts
@@ -0,0 +1,175 @@
+import { test, expect } from '../../../fixtures/base';
+
+const OWNER_EMAIL = 'nathan@n8n.io';
+const ADMIN_EMAIL = 'admin@n8n.io';
+const MEMBER_0_EMAIL = 'member@n8n.io'; // U2
+
+test.describe('@isolated', () => {
+	test.describe('Credential Usage in Cross Shared Workflows', () => {
+		test.beforeEach(async ({ n8n, api }) => {
+			await api.resetDatabase();
+			await api.enableFeature('sharing');
+			await api.enableFeature('advancedPermissions');
+			await api.enableFeature('projectRole:admin');
+			await api.enableFeature('projectRole:editor');
+			await api.setMaxTeamProjectsQuota(-1);
+
+			await n8n.api.signin('owner');
+			await n8n.navigate.toCredentials();
+		});
+
+		test('should only show credentials from the same team project', async ({ n8n }) => {
+			await n8n.credentialsComposer.createFromList('Notion API', { apiKey: 'test' });
+
+			const devProject = await n8n.projectComposer.createProject('Development');
+			await n8n.projectTabs.clickCredentialsTab();
+			await n8n.credentialsComposer.createFromList(
+				'Notion API',
+				{ apiKey: 'test' },
+				{ projectId: devProject.projectId },
+			);
+
+			const testProject = await n8n.projectComposer.createProject('Test');
+			await n8n.projectTabs.clickCredentialsTab();
+			await n8n.credentialsComposer.createFromList(
+				'Notion API',
+				{ apiKey: 'test' },
+				{ projectId: testProject.projectId },
+			);
+
+			await n8n.projectTabs.clickWorkflowsTab();
+			await n8n.workflows.clickNewWorkflowCard();
+
+			await n8n.canvas.addNode('Notion');
+			await n8n.canvas.getFirstAction().click();
+
+			// Only Test project credential visible
+			await n8n.ndv.getNodeCredentialsSelect().click();
+			await expect(n8n.ndv.getVisiblePopper().locator('li')).toHaveCount(1);
+		});
+
+		test('should only show credentials in their personal project for members', async ({ n8n }) => {
+			await n8n.credentialsComposer.createFromList('Notion API', { apiKey: 'test' });
+
+			await n8n.navigate.toCredentials();
+			await n8n.credentials.addResource.credential();
+			await n8n.credentials.selectCredentialType('Notion API');
+			await n8n.credentials.credentialModal.fillField('apiKey', 'test');
+			await n8n.credentials.credentialModal.save();
+
+			await n8n.credentials.credentialModal.changeTab('Sharing');
+			await n8n.credentials.credentialModal.addUserToSharing(MEMBER_0_EMAIL);
+			await n8n.credentials.credentialModal.saveSharing();
+			await n8n.credentials.credentialModal.close();
+
+			await n8n.api.signin('member', 0);
+			await n8n.navigate.toCredentials();
+			await n8n.credentialsComposer.createFromList('Notion API', { apiKey: 'test' });
+
+			await n8n.navigate.toWorkflow('new');
+
+			await n8n.canvas.addNode('Notion');
+			await n8n.canvas.getFirstAction().click();
+
+			// Own credential and shared credential visible
+			await n8n.ndv.getNodeCredentialsSelect().click();
+			await expect(n8n.ndv.getVisiblePopper().locator('li')).toHaveCount(2);
+		});
+
+		test('should only show credentials in their personal project for members if the workflow was shared with them', async ({
+			n8n,
+		}) => {
+			const workflowName = 'Test workflow';
+
+			await n8n.credentialsComposer.createFromList('Notion API', { apiKey: 'test' });
+
+			await n8n.navigate.toWorkflow('new');
+			await n8n.canvas.setWorkflowName(workflowName);
+			await n8n.page.keyboard.press('Enter');
+			await n8n.canvas.openShareModal();
+			await n8n.workflowSharingModal.addUser(MEMBER_0_EMAIL);
+			await n8n.workflowSharingModal.save();
+
+			await n8n.api.signin('member', 0);
+			await n8n.navigate.toCredentials();
+			await n8n.credentialsComposer.createFromList('Notion API', { apiKey: 'test' });
+
+			await n8n.navigate.toWorkflows();
+			await n8n.workflows.cards.getWorkflow(workflowName).click();
+
+			await n8n.canvas.addNode('Notion');
+			await n8n.canvas.getFirstAction().click();
+
+			// Only own credential visible (not owner's)
+			await n8n.ndv.getNodeCredentialsSelect().click();
+			await expect(n8n.ndv.getVisiblePopper().locator('li')).toHaveCount(1);
+		});
+
+		test("should show all credentials from all personal projects the workflow's been shared into for the global owner", async ({
+			n8n,
+		}) => {
+			const workflowName = 'Test workflow';
+
+			await n8n.api.signin('member', 1);
+			await n8n.navigate.toCredentials();
+			await n8n.credentials.addResource.credential();
+			await n8n.credentials.selectCredentialType('Notion API');
+			await n8n.credentials.credentialModal.fillField('apiKey', 'test');
+			await n8n.credentials.credentialModal.save();
+			await n8n.credentials.credentialModal.close();
+
+			await n8n.api.signin('admin');
+			await n8n.navigate.toCredentials();
+			await n8n.credentials.addResource.credential();
+			await n8n.credentials.selectCredentialType('Notion API');
+			await n8n.credentials.credentialModal.fillField('apiKey', 'test');
+			await n8n.credentials.credentialModal.save();
+			await n8n.credentials.credentialModal.close();
+
+			await n8n.api.signin('member', 0);
+			await n8n.navigate.toCredentials();
+			await n8n.credentialsComposer.createFromList('Notion API', { apiKey: 'test' });
+			await n8n.navigate.toWorkflow('new');
+			await n8n.canvas.setWorkflowName(workflowName);
+			await n8n.page.keyboard.press('Enter');
+			await n8n.canvas.openShareModal();
+			await n8n.workflowSharingModal.addUser(OWNER_EMAIL);
+			await n8n.workflowSharingModal.addUser(ADMIN_EMAIL);
+			await n8n.workflowSharingModal.save();
+
+			await n8n.api.signin('owner');
+			await n8n.navigate.toCredentials();
+			await n8n.credentialsComposer.createFromList('Notion API', { apiKey: 'test' });
+			await n8n.navigate.toWorkflows();
+			await n8n.workflows.cards.getWorkflow(workflowName).click();
+
+			await n8n.canvas.addNode('Notion');
+			await n8n.canvas.getFirstAction().click();
+
+			// Owner sees 3 credentials: admin's, U2's, owner's
+			await n8n.ndv.getNodeCredentialsSelect().click();
+			await expect(n8n.ndv.getVisiblePopper().locator('li')).toHaveCount(3);
+		});
+
+		test('should show all personal credentials if the global owner owns the workflow', async ({
+			n8n,
+		}) => {
+			await n8n.api.signin('member', 0);
+			await n8n.navigate.toCredentials();
+			await n8n.credentials.addResource.credential();
+			await n8n.credentials.selectCredentialType('Notion API');
+			await n8n.credentials.credentialModal.fillField('apiKey', 'test');
+			await n8n.credentials.credentialModal.save();
+			await n8n.credentials.credentialModal.close();
+
+			await n8n.api.signin('owner');
+			await n8n.navigate.toWorkflow('new');
+			await n8n.canvas.addNode('Notion');
+			await n8n.canvas.getFirstAction().click();
+
+			// Owner sees member's credential (global owner privilege)
+			await n8n.ndv.getNodeCredentialsSelect().click();
+			await expect(n8n.ndv.getVisiblePopper().locator('li')).toHaveCount(1);
+		});
+	});
+});
diff --git a/packages/testing/playwright/tests/ui/17-sharing.spec.ts b/packages/testing/playwright/tests/ui/sharing/sharing.spec.ts
similarity index 64%
rename from packages/testing/playwright/tests/ui/17-sharing.spec.ts
rename to packages/testing/playwright/tests/ui/sharing/sharing.spec.ts
index 3ed82fff8cc..7cbcfca3d63 100644
--- a/packages/testing/playwright/tests/ui/17-sharing.spec.ts
+++ b/packages/testing/playwright/tests/ui/sharing/sharing.spec.ts
@@ -1,4 +1,4 @@
-import { test, expect } from '../../fixtures/base';
+import { test, expect } from '../../../fixtures/base';
 
 const OWNER_EMAIL = 'nathan@n8n.io';
 const ADMIN_EMAIL = 'admin@n8n.io';
@@ -302,172 +302,4 @@ test.describe('@isolated', () => {
 			).toHaveCount(1);
 		});
 	});
-
-	test.describe('Credential Usage in Cross Shared Workflows', () => {
-		test.beforeEach(async ({ n8n, api }) => {
-			await api.resetDatabase();
-			await api.enableFeature('sharing');
-			await api.enableFeature('advancedPermissions');
-			await api.enableFeature('projectRole:admin');
-			await api.enableFeature('projectRole:editor');
-			await api.setMaxTeamProjectsQuota(-1);
-
-			await n8n.api.signin('owner');
-			await n8n.navigate.toCredentials();
-		});
-
-		test('should only show credentials from the same team project', async ({ n8n }) => {
-			await n8n.credentialsComposer.createFromList('Notion API', { apiKey: 'test' });
-
-			const devProject = await n8n.projectComposer.createProject('Development');
-			await n8n.projectTabs.clickCredentialsTab();
-			await n8n.credentialsComposer.createFromList(
-				'Notion API',
-				{ apiKey: 'test' },
-				{ projectId: devProject.projectId },
-			);
-
-			const testProject = await n8n.projectComposer.createProject('Test');
-			await n8n.projectTabs.clickCredentialsTab();
-			await n8n.credentialsComposer.createFromList(
-				'Notion API',
-				{ apiKey: 'test' },
-				{ projectId: testProject.projectId },
-			);
-
-			await n8n.projectTabs.clickWorkflowsTab();
-			await n8n.workflows.clickNewWorkflowCard();
-
-			await n8n.canvas.addNode('Notion');
-			await n8n.canvas.getFirstAction().click();
-
-			// Only Test project credential visible
-			await n8n.ndv.getNodeCredentialsSelect().click();
-			await expect(n8n.ndv.getVisiblePopper().locator('li')).toHaveCount(1);
-		});
-
-		test('should only show credentials in their personal project for members', async ({ n8n }) => {
-			await n8n.credentialsComposer.createFromList('Notion API', { apiKey: 'test' });
-
-			await n8n.navigate.toCredentials();
-			await n8n.credentials.addResource.credential();
-			await n8n.credentials.selectCredentialType('Notion API');
-			await n8n.credentials.credentialModal.fillField('apiKey', 'test');
-			await n8n.credentials.credentialModal.save();
-
-			await n8n.credentials.credentialModal.changeTab('Sharing');
-			await n8n.credentials.credentialModal.addUserToSharing(MEMBER_0_EMAIL);
-			await n8n.credentials.credentialModal.saveSharing();
-			await n8n.credentials.credentialModal.close();
-
-			await n8n.api.signin('member', 0);
-			await n8n.navigate.toCredentials();
-			await n8n.credentialsComposer.createFromList('Notion API', { apiKey: 'test' });
-
-			await n8n.navigate.toWorkflow('new');
-
-			await n8n.canvas.addNode('Notion');
-			await n8n.canvas.getFirstAction().click();
-
-			// Own credential and shared credential visible
-			await n8n.ndv.getNodeCredentialsSelect().click();
-			await expect(n8n.ndv.getVisiblePopper().locator('li')).toHaveCount(2);
-		});
-
-		test('should only show credentials in their personal project for members if the workflow was shared with them', async ({
-			n8n,
-		}) => {
-			const workflowName = 'Test workflow';
-
-			await n8n.credentialsComposer.createFromList('Notion API', { apiKey: 'test' });
-
-			await n8n.navigate.toWorkflow('new');
-			await n8n.canvas.setWorkflowName(workflowName);
-			await n8n.page.keyboard.press('Enter');
-			await n8n.canvas.openShareModal();
-			await n8n.workflowSharingModal.addUser(MEMBER_0_EMAIL);
-			await n8n.workflowSharingModal.save();
-
-			await n8n.api.signin('member', 0);
-			await n8n.navigate.toCredentials();
-			await n8n.credentialsComposer.createFromList('Notion API', { apiKey: 'test' });
-
-			await n8n.navigate.toWorkflows();
-			await n8n.workflows.cards.getWorkflow(workflowName).click();
-
-			await n8n.canvas.addNode('Notion');
-			await n8n.canvas.getFirstAction().click();
-
-			// Only own credential visible (not owner's)
-			await n8n.ndv.getNodeCredentialsSelect().click();
-			await expect(n8n.ndv.getVisiblePopper().locator('li')).toHaveCount(1);
-		});
-
-		test("should show all credentials from all personal projects the workflow's been shared into for the global owner", async ({
-			n8n,
-		}) => {
-			const workflowName = 'Test workflow';
-
-			await n8n.api.signin('member', 1);
-			await n8n.navigate.toCredentials();
-			await n8n.credentials.addResource.credential();
-			await n8n.credentials.selectCredentialType('Notion API');
-			await n8n.credentials.credentialModal.fillField('apiKey', 'test');
-			await n8n.credentials.credentialModal.save();
-			await n8n.credentials.credentialModal.close();
-
-			await n8n.api.signin('admin');
-			await n8n.navigate.toCredentials();
-			await n8n.credentials.addResource.credential();
-			await n8n.credentials.selectCredentialType('Notion API');
-			await n8n.credentials.credentialModal.fillField('apiKey', 'test');
-			await n8n.credentials.credentialModal.save();
-			await n8n.credentials.credentialModal.close();
-
-			await n8n.api.signin('member', 0);
-			await n8n.navigate.toCredentials();
-			await n8n.credentialsComposer.createFromList('Notion API', { apiKey: 'test' });
-			await n8n.navigate.toWorkflow('new');
-			await n8n.canvas.setWorkflowName(workflowName);
-			await n8n.page.keyboard.press('Enter');
-			await n8n.canvas.openShareModal();
-			await n8n.workflowSharingModal.addUser(OWNER_EMAIL);
-			await n8n.workflowSharingModal.addUser(ADMIN_EMAIL);
-			await n8n.workflowSharingModal.save();
-
-			await n8n.api.signin('owner');
-			await n8n.navigate.toCredentials();
-			await n8n.credentialsComposer.createFromList('Notion API', { apiKey: 'test' });
-			await n8n.navigate.toWorkflows();
-			await n8n.workflows.cards.getWorkflow(workflowName).click();
-
-			await n8n.canvas.addNode('Notion');
-			await n8n.canvas.getFirstAction().click();
-
-			// Owner sees 3 credentials: admin's, U2's, owner's
-			await n8n.ndv.getNodeCredentialsSelect().click();
-			await expect(n8n.ndv.getVisiblePopper().locator('li')).toHaveCount(3);
-		});
-
-		test('should show all personal credentials if the global owner owns the workflow', async ({
-			n8n,
-		}) => {
-			await n8n.api.signin('member', 0);
-			await n8n.navigate.toCredentials();
-			await n8n.credentials.addResource.credential();
-			await n8n.credentials.selectCredentialType('Notion API');
-			await n8n.credentials.credentialModal.fillField('apiKey', 'test');
-			await n8n.credentials.credentialModal.save();
-			await n8n.credentials.credentialModal.close();
-
-			await n8n.api.signin('owner');
-			await n8n.navigate.toWorkflow('new');
-			await n8n.canvas.addNode('Notion');
-			await n8n.canvas.getFirstAction().click();
-
-			// Owner sees member's credential (global owner privilege)
-			await n8n.ndv.getNodeCredentialsSelect().click();
-			await expect(n8n.ndv.getVisiblePopper().locator('li')).toHaveCount(1);
-		});
-	});
 });

From 68693b5b261e9aba8c14a3335336cffcab954fec Mon Sep 17 00:00:00 2001
From: Artem Sorokin <38620398+seemewalkin@users.noreply.github.com>
Date: Fri, 5 Dec 2025 18:37:18 +0100
Subject: [PATCH 112/167] test: Split workflow-actions.spec.ts into focused
 test files (#22850)

---
 .../workflows/editor/workflow-actions.spec.ts | 581 ------------------
 .../editor/workflow-actions/archive.spec.ts   | 194 ++++++
 .../workflow-actions/copy-paste.spec.ts       |  66 ++
 .../editor/workflow-actions/duplicate.spec.ts |  31 +
 .../editor/workflow-actions/publish.spec.ts   |  63 ++
 .../editor/workflow-actions/run.spec.ts       |  61 ++
 .../editor/workflow-actions/save.spec.ts      | 146 +++++
 .../editor/workflow-actions/settings.spec.ts  |  73 +++
 8 files changed, 634 insertions(+), 581 deletions(-)
 delete mode 100644 packages/testing/playwright/tests/ui/workflows/editor/workflow-actions.spec.ts
 create mode 100644 packages/testing/playwright/tests/ui/workflows/editor/workflow-actions/archive.spec.ts
 create mode 100644 packages/testing/playwright/tests/ui/workflows/editor/workflow-actions/copy-paste.spec.ts
 create mode 100644 packages/testing/playwright/tests/ui/workflows/editor/workflow-actions/duplicate.spec.ts
 create mode 100644 packages/testing/playwright/tests/ui/workflows/editor/workflow-actions/publish.spec.ts
 create mode 100644 packages/testing/playwright/tests/ui/workflows/editor/workflow-actions/run.spec.ts
 create mode 100644 packages/testing/playwright/tests/ui/workflows/editor/workflow-actions/save.spec.ts
 create mode 100644 packages/testing/playwright/tests/ui/workflows/editor/workflow-actions/settings.spec.ts

diff --git a/packages/testing/playwright/tests/ui/workflows/editor/workflow-actions.spec.ts b/packages/testing/playwright/tests/ui/workflows/editor/workflow-actions.spec.ts
deleted file mode 100644
index 6da899d593a..00000000000
--- a/packages/testing/playwright/tests/ui/workflows/editor/workflow-actions.spec.ts
+++ /dev/null
@@ -1,581 +0,0 @@
-import fs from 'fs';
-import { nanoid } from 'nanoid';
-
-import {
-	CODE_NODE_NAME,
-	EDIT_FIELDS_SET_NODE_NAME,
-	MANUAL_TRIGGER_NODE_NAME,
-	NOTION_NODE_NAME,
-	SCHEDULE_TRIGGER_NODE_NAME,
-} from '../../../../config/constants';
-import { test, expect } from '../../../../fixtures/base';
-import type { n8nPage } from '../../../../pages/n8nPage';
-import { resolveFromRoot } from '../../../../utils/path-helper';
-
-async function saveWorkflowAndGetId(n8n: n8nPage): Promise<string> {
-	const saveResponsePromise = n8n.page.waitForResponse(
-		(response) =>
-			response.url().includes('/rest/workflows') &&
-			(response.request().method() === 'POST' || response.request().method() === 'PATCH'),
-	);
-	await n8n.canvas.saveWorkflow();
-	const saveResponse = await saveResponsePromise;
-	const {
-		data: { id },
-	} = await saveResponse.json();
-	return id;
-}
-
-async function goToWorkflow(n8n: n8nPage, workflowId: string): Promise<void> {
-	const loadResponsePromise = n8n.page.waitForResponse(
-		(response) =>
-			response.url().includes(`/rest/workflows/${workflowId}`) &&
-			response.request().method() === 'GET' &&
-			response.status() === 200,
-	);
-	await n8n.page.goto(`/workflow/${workflowId}`);
-	await loadResponsePromise;
-}
-
-// eslint-disable-next-line playwright/no-skipped-test
-test.skip('Workflow Actions', () => {
-	test.beforeEach(async ({ n8n }) => {
-		await n8n.start.fromBlankCanvas();
-	});
-
-	test('should be able to save on button click', async ({ n8n }) => {
-		const saveButton = n8n.canvas.getWorkflowSaveButton();
-
-		await expect(saveButton).toContainText('Save');
-
-		await n8n.canvas.saveWorkflow();
-
-		await expect(saveButton).toContainText('Saved');
-
-		const tagName = await saveButton.evaluate((el) => el.tagName);
-		expect(tagName).toBe('SPAN');
-
-		await expect(n8n.page).not.toHaveURL(/\/workflow\/new$/);
-		await expect(n8n.page).toHaveURL(/\/workflow\/[a-zA-Z0-9]+$/);
-	});
-
-	test('should save workflow on keyboard shortcut', async ({ n8n }) => {
-		const saveButton = n8n.canvas.getWorkflowSaveButton();
-
-		await n8n.canvas.deselectAll();
-
-		await n8n.canvas.hitSaveWorkflow();
-
-		await expect(saveButton).toContainText('Saved');
-
-		const tagName = await saveButton.evaluate((el) => el.tagName);
-		expect(tagName).toBe('SPAN');
-	});
-
-	test('should not save already saved workflow', async ({ n8n }) => {
-		const patchRequests: string[] = [];
-		n8n.page.on('request', (request) => {
-			if (request.method() === 'PATCH' && request.url().includes('/rest/workflows/')) {
-				patchRequests.push(request.url());
-			}
-		});
-
-		const saveButton = n8n.canvas.getWorkflowSaveButton();
-		await expect(saveButton).toContainText('Save');
-		await n8n.canvas.saveWorkflow();
-		await expect(saveButton).toContainText('Saved');
-
-		await n8n.canvas.addNode(MANUAL_TRIGGER_NODE_NAME);
-
-		const patchPromise = n8n.page.waitForRequest(
-			(req) => req.method() === 'PATCH' && req.url().includes('/rest/workflows/'),
-		);
-		await n8n.canvas.saveWorkflow();
-		await patchPromise;
-		await expect(saveButton).toContainText('Saved');
-
-		expect(await saveButton.evaluate((el) => el.tagName)).toBe('SPAN');
-
-		await n8n.canvas.hitSaveWorkflow();
-		await n8n.canvas.hitSaveWorkflow();
-
-		expect(patchRequests).toHaveLength(1);
-	});
-
-	test('should not be able to publish workflow without trigger node', async ({ n8n }) => {
-		await n8n.canvas.addNode(MANUAL_TRIGGER_NODE_NAME);
-		await n8n.canvas.getOpenPublishModalButton().click();
-
-		await expect(n8n.canvas.getPublishButton()).toBeDisabled();
-	});
-
-	test('should be able to publish workflow', async ({ n8n }) => {
-		await n8n.canvas.addNode(SCHEDULE_TRIGGER_NODE_NAME, { closeNDV: true });
-		await expect(n8n.canvas.getPublishedIndicator()).not.toBeVisible();
-
-		await n8n.canvas.publishWorkflow();
-
-		await expect(n8n.canvas.getPublishedIndicator()).toBeVisible();
-	});
-
-	test('should not be able to publish workflow when nodes have errors', async ({ n8n }) => {
-		await n8n.canvas.addNode(SCHEDULE_TRIGGER_NODE_NAME, { closeNDV: true });
-		await n8n.canvas.addNode(NOTION_NODE_NAME, { action: 'Append a block', closeNDV: true });
-		await n8n.canvas.saveWorkflow();
-
-		await n8n.canvas.getOpenPublishModalButton().click();
-
-		await expect(n8n.canvas.getPublishButton()).toBeDisabled();
-
-		await expect(n8n.canvas.getPublishModalCallout()).toBeVisible();
-	});
-
-	test('should be able to publish workflow when nodes with errors are disabled', async ({
-		n8n,
-	}) => {
-		await n8n.canvas.addNode(SCHEDULE_TRIGGER_NODE_NAME, { closeNDV: true });
-		await n8n.canvas.addNode(NOTION_NODE_NAME, { action: 'Append a block', closeNDV: true });
-		await n8n.canvas.saveWorkflow();
-
-		await expect(n8n.notifications.getSuccessNotifications().first()).toBeVisible();
-
-		await n8n.canvas.getOpenPublishModalButton().click();
-
-		await expect(n8n.canvas.getPublishButton()).toBeDisabled();
-		await n8n.canvas.cancelPublishWorkflowModal();
-
-		const nodeName = await n8n.canvas.getCanvasNodes().last().getAttribute('data-node-name');
-		await n8n.canvas.toggleNodeEnabled(nodeName!);
-
-		await n8n.canvas.publishWorkflow();
-
-		await expect(n8n.canvas.getPublishedIndicator()).toBeVisible();
-	});
-
-	test('should save new workflow after renaming', async ({ n8n }) => {
-		await n8n.canvas.setWorkflowName('Something else');
-		await n8n.canvas.getWorkflowNameInput().press('Enter');
-
-		await expect(n8n.canvas.getWorkflowSaveButton()).toContainText('Saved');
-	});
-
-	test('should rename workflow', async ({ n8n }) => {
-		await n8n.canvas.addNode(SCHEDULE_TRIGGER_NODE_NAME, { closeNDV: true });
-		await n8n.canvas.saveWorkflow();
-		await expect(n8n.canvas.getWorkflowSaveButton()).toContainText('Saved');
-
-		await n8n.canvas.setWorkflowName('Something else');
-		await n8n.canvas.getWorkflowNameInput().press('Enter');
-
-		await expect(n8n.canvas.getWorkflowSaveButton()).toContainText('Saved');
-		await expect(n8n.canvas.getWorkflowName()).toHaveAttribute('title', 'Something else');
-	});
-
-	test('should not save workflow if canvas is loading', async ({ n8n }) => {
-		let patchCount = 0;
-
-		n8n.page.on('request', (req) => {
-			if (req.method() === 'PATCH' && req.url().includes('/rest/workflows/')) {
-				patchCount++;
-			}
-		});
-
-		await n8n.canvas.addNode(MANUAL_TRIGGER_NODE_NAME);
-		await n8n.canvas.saveWorkflow();
-
-		await expect(n8n.canvas.getWorkflowSaveButton()).toContainText('Saved');
-		const workflowId = n8n.canvas.getWorkflowIdFromUrl();
-
-		await n8n.canvasComposer.delayWorkflowLoad(workflowId);
-
-		await n8n.page.reload();
-		await expect(n8n.canvas.getLoadingMask()).toBeVisible();
-
-		await n8n.canvas.hitSaveWorkflow();
-		await n8n.canvas.hitSaveWorkflow();
-		await n8n.canvas.hitSaveWorkflow();
-
-		expect(patchCount).toBe(0);
-
-		await expect(n8n.page.getByTestId('node-view-loader')).not.toBeAttached();
-		await expect(n8n.canvas.getLoadingMask()).not.toBeAttached();
-		await n8n.canvasComposer.undelayWorkflowLoad(workflowId);
-
-		await n8n.canvas.addNode(SCHEDULE_TRIGGER_NODE_NAME, { closeNDV: true });
-
-		const patchPromise = n8n.page.waitForRequest(
-			(req) => req.method() === 'PATCH' && req.url().includes('/rest/workflows/'),
-		);
-		await n8n.canvas.hitSaveWorkflow();
-		await patchPromise;
-
-		expect(patchCount).toBe(1);
-	});
-
-	test('should not save workflow twice when save is in progress', async ({ n8n }) => {
-		const oldName = await n8n.canvas.getWorkflowNameInput().inputValue();
-
-		await n8n.canvas.getWorkflowName().click();
-		await n8n.canvas.getWorkflowNameInput().press('ControlOrMeta+a');
-		await n8n.canvas.getWorkflowNameInput().pressSequentially('Test');
-		await n8n.canvas.getWorkflowSaveButton().click();
-
-		await expect(n8n.canvas.getWorkflowNameInput()).toHaveValue('Test');
-
-		await n8n.navigate.toHome();
-
-		await expect(n8n.workflows.cards.getWorkflow(oldName)).toBeHidden();
-	});
-
-	test('should copy nodes', async ({ n8n }) => {
-		await n8n.canvas.addNode(SCHEDULE_TRIGGER_NODE_NAME, { closeNDV: true });
-		await n8n.canvas.addNode(CODE_NODE_NAME, { action: 'Code in JavaScript', closeNDV: true });
-
-		await expect(n8n.canvas.getCanvasNodes()).toHaveCount(2);
-
-		await expect(n8n.canvas.nodeCreator.getRoot()).not.toBeAttached();
-
-		await n8n.clipboard.grant();
-
-		await n8n.canvas.selectAll();
-		await n8n.canvas.copyNodes();
-
-		await n8n.notifications.waitForNotificationAndClose('Copied to clipboard');
-		const clipboardText = await n8n.clipboard.readText();
-		const copiedWorkflow = JSON.parse(clipboardText);
-
-		expect(copiedWorkflow.nodes).toHaveLength(2);
-	});
-
-	test('should paste nodes (both current and old node versions)', async ({ n8n }) => {
-		const workflowJson = fs.readFileSync(
-			resolveFromRoot('workflows', 'Test_workflow-actions_paste-data.json'),
-			'utf-8',
-		);
-
-		await n8n.canvas.canvasPane().click();
-		await n8n.clipboard.paste(workflowJson);
-		await n8n.canvas.clickZoomToFitButton();
-
-		await expect(n8n.canvas.getCanvasNodes()).toHaveCount(5);
-		await expect(n8n.canvas.nodeConnections()).toHaveCount(5);
-	});
-
-	test('should allow importing nodes without names', async ({ n8n }) => {
-		const workflowJson = fs.readFileSync(
-			resolveFromRoot('workflows', 'Test_workflow-actions_import_nodes_empty_name.json'),
-			'utf-8',
-		);
-
-		await n8n.canvas.canvasPane().click();
-		await n8n.clipboard.paste(workflowJson);
-		await n8n.canvas.clickZoomToFitButton();
-
-		await expect(n8n.canvas.getCanvasNodes()).toHaveCount(3);
-		await expect(n8n.canvas.nodeConnections()).toHaveCount(2);
-
-		const nodes = n8n.canvas.getCanvasNodes();
-		const count = await nodes.count();
-		for (let i = 0; i < count; i++) {
-			await expect(nodes.nth(i)).toHaveAttribute('data-node-name');
-		}
-	});
-
-	test('should update workflow settings', async ({ n8n }) => {
-		await n8n.navigate.toHome();
-
-		const workflowsResponsePromise = n8n.page.waitForResponse(
-			(response) =>
-				response.url().includes('/rest/workflows') && response.request().method() === 'GET',
-		);
-
-		await n8n.sideBar.addWorkflowFromUniversalAdd('Personal');
-
-		const workflowsResponse = await workflowsResponsePromise;
-		const responseBody = await workflowsResponse.json();
-		const totalWorkflows = responseBody.count;
-
-		await n8n.canvas.saveWorkflow();
-
-		await n8n.workflowSettingsModal.open();
-		await expect(n8n.workflowSettingsModal.getModal()).toBeVisible();
-
-		await n8n.workflowSettingsModal.getErrorWorkflowField().click();
-		const optionCount = await n8n.page.getByRole('option').count();
-		expect(optionCount).toBeGreaterThanOrEqual(totalWorkflows + 2);
-		await n8n.page.getByRole('option').last().click();
-
-		await n8n.workflowSettingsModal.getTimezoneField().click();
-		await expect(n8n.page.getByRole('option').first()).toBeVisible();
-		await n8n.page.getByRole('option').nth(1).click();
-
-		await n8n.workflowSettingsModal.getSaveFailedExecutionsField().click();
-		await expect(n8n.page.getByRole('option')).toHaveCount(3);
-		await n8n.page.getByRole('option').last().click();
-
-		await n8n.workflowSettingsModal.getSaveSuccessExecutionsField().click();
-		await expect(n8n.page.getByRole('option')).toHaveCount(3);
-		await n8n.page.getByRole('option').last().click();
-
-		await n8n.workflowSettingsModal.getSaveManualExecutionsField().click();
-		await expect(n8n.page.getByRole('option')).toHaveCount(3);
-		await n8n.page.getByRole('option').last().click();
-
-		await n8n.workflowSettingsModal.getSaveExecutionProgressField().click();
-		await expect(n8n.page.getByRole('option')).toHaveCount(3);
-		await n8n.page.getByRole('option').last().click();
-
-		await n8n.workflowSettingsModal.getTimeoutSwitch().click();
-		await n8n.workflowSettingsModal.getTimeoutInput().fill('1');
-
-		await n8n.workflowSettingsModal.clickSave();
-
-		await expect(n8n.workflowSettingsModal.getModal()).toBeHidden();
-		await expect(n8n.notifications.getSuccessNotifications().first()).toBeVisible();
-	});
-
-	test('should not be able to archive or delete unsaved workflow', async ({ n8n }) => {
-		await expect(n8n.workflowSettingsModal.getWorkflowMenu()).toBeVisible();
-		await n8n.workflowSettingsModal.getWorkflowMenu().click();
-
-		await expect(n8n.workflowSettingsModal.getDeleteMenuItem()).toBeHidden();
-		await expect(n8n.workflowSettingsModal.getArchiveMenuItem().locator('..')).toHaveClass(
-			/is-disabled/,
-		);
-	});
-
-	test('should archive nonactive workflow and then delete it', async ({ n8n }) => {
-		const workflowId = await saveWorkflowAndGetId(n8n);
-		await expect(n8n.canvas.getArchivedTag()).not.toBeAttached();
-
-		await expect(n8n.workflowSettingsModal.getWorkflowMenu()).toBeVisible();
-		await n8n.workflowSettingsModal.getWorkflowMenu().click();
-
-		await n8n.workflowSettingsModal.clickArchiveMenuItem();
-
-		await expect(n8n.notifications.getSuccessNotifications().first()).toBeVisible();
-		await expect(n8n.page).toHaveURL(/\/workflows$/);
-
-		await goToWorkflow(n8n, workflowId);
-
-		await expect(n8n.canvas.getArchivedTag()).toBeVisible();
-		await expect(n8n.canvas.getNodeCreatorPlusButton()).not.toBeAttached();
-
-		await expect(n8n.workflowSettingsModal.getWorkflowMenu()).toBeVisible();
-		await n8n.workflowSettingsModal.getWorkflowMenu().click();
-		await n8n.workflowSettingsModal.clickDeleteMenuItem();
-		await n8n.workflowSettingsModal.confirmDeleteModal();
-
-		await expect(n8n.notifications.getSuccessNotifications().first()).toBeVisible();
-		await expect(n8n.page).toHaveURL(/\/workflows$/);
-	});
-
-	// eslint-disable-next-line n8n-local-rules/no-skipped-tests -- Flaky in multi-main mode
-	test.skip('should archive published workflow and then delete it', async ({ n8n }) => {
-		await n8n.canvas.addNode(SCHEDULE_TRIGGER_NODE_NAME, { closeNDV: true });
-		const workflowId = await saveWorkflowAndGetId(n8n);
-		await n8n.canvas.publishWorkflow();
-		await n8n.page.keyboard.press('Escape');
-
-		await expect(n8n.canvas.getPublishedIndicator()).toBeVisible();
-		await expect(n8n.canvas.getArchivedTag()).not.toBeAttached();
-
-		await expect(n8n.workflowSettingsModal.getWorkflowMenu()).toBeVisible();
-		await n8n.workflowSettingsModal.getWorkflowMenu().click();
-		await n8n.workflowSettingsModal.clickArchiveMenuItem();
-		await n8n.workflowSettingsModal.confirmArchiveModal();
-
-		await expect(n8n.notifications.getSuccessNotifications().first()).toBeVisible();
-		await expect(n8n.page).toHaveURL(/\/workflows$/);
-
-		await goToWorkflow(n8n, workflowId);
-
-		await expect(n8n.canvas.getArchivedTag()).toBeVisible();
-		await expect(n8n.canvas.getNodeCreatorPlusButton()).not.toBeAttached();
-		await expect(n8n.canvas.getPublishedIndicator()).not.toBeVisible();
-
-		await expect(n8n.workflowSettingsModal.getWorkflowMenu()).toBeVisible();
-		await n8n.workflowSettingsModal.getWorkflowMenu().click();
-		await n8n.workflowSettingsModal.clickDeleteMenuItem();
-		await n8n.workflowSettingsModal.confirmDeleteModal();
-
-		await expect(n8n.notifications.getSuccessNotifications().first()).toBeVisible();
-		await expect(n8n.page).toHaveURL(/\/workflows$/);
-	});
-
-	test('should archive nonactive workflow and then unarchive it', async ({ n8n }) => {
-		const workflowId = await saveWorkflowAndGetId(n8n);
-		await expect(n8n.canvas.getArchivedTag()).not.toBeAttached();
-
-		await expect(n8n.workflowSettingsModal.getWorkflowMenu()).toBeVisible();
-		await n8n.workflowSettingsModal.getWorkflowMenu().click();
-
-		await n8n.workflowSettingsModal.clickArchiveMenuItem();
-
-		await expect(n8n.notifications.getSuccessNotifications().first()).toBeVisible();
-		await expect(n8n.page).toHaveURL(/\/workflows$/);
-
-		await goToWorkflow(n8n, workflowId);
-
-		await expect(n8n.canvas.getArchivedTag()).toBeVisible();
-		await expect(n8n.canvas.getNodeCreatorPlusButton()).not.toBeAttached();
-
-		await expect(n8n.workflowSettingsModal.getWorkflowMenu()).toBeVisible();
-		await n8n.workflowSettingsModal.getWorkflowMenu().click();
-		await n8n.workflowSettingsModal.clickUnarchiveMenuItem();
-
-		await expect(n8n.notifications.getSuccessNotifications().first()).toBeVisible();
-		await expect(n8n.canvas.getArchivedTag()).not.toBeAttached();
-		await expect(n8n.canvas.getNodeCreatorPlusButton()).toBeVisible();
-	});
-
-	test('should not show unpublish menu item for non-published workflow', async ({ n8n }) => {
-		await n8n.canvas.addNode(SCHEDULE_TRIGGER_NODE_NAME, { closeNDV: true });
-		await n8n.canvas.saveWorkflow();
-
-		await expect(n8n.canvas.getPublishedIndicator()).not.toBeVisible();
-
-		await n8n.workflowSettingsModal.getWorkflowMenu().click();
-		await expect(n8n.workflowSettingsModal.getUnpublishMenuItem()).not.toBeAttached();
-	});
-
-	// TODO: flaky test - 18 similar failures across 10 branches in last 14 days
-	test.skip('should unpublish a published workflow', async ({ n8n }) => {
-		await n8n.canvas.addNode(SCHEDULE_TRIGGER_NODE_NAME, { closeNDV: true });
-		await n8n.canvas.publishWorkflow();
-		await n8n.page.keyboard.press('Escape');
-
-		await expect(n8n.canvas.getPublishedIndicator()).toBeVisible();
-
-		await n8n.workflowSettingsModal.getWorkflowMenu().click();
-		await n8n.workflowSettingsModal.clickUnpublishMenuItem();
-
-		await expect(n8n.workflowSettingsModal.getUnpublishModal()).toBeVisible();
-		await n8n.workflowSettingsModal.confirmUnpublishModal();
-
-		await expect(n8n.notifications.getSuccessNotifications().first()).toBeVisible();
-		await expect(n8n.canvas.getPublishedIndicator()).not.toBeVisible();
-	});
-
-	// eslint-disable-next-line n8n-local-rules/no-skipped-tests -- Flaky in multi-main mode
-	test.skip('should unpublish published workflow on archive', async ({ n8n }) => {
-		await n8n.canvas.addNode(SCHEDULE_TRIGGER_NODE_NAME, { closeNDV: true });
-		const workflowId = await saveWorkflowAndGetId(n8n);
-		await n8n.canvas.publishWorkflow();
-		await n8n.page.keyboard.press('Escape');
-
-		await expect(n8n.canvas.getPublishedIndicator()).toBeVisible();
-
-		await n8n.workflowSettingsModal.getWorkflowMenu().click();
-		await n8n.workflowSettingsModal.clickArchiveMenuItem();
-		await n8n.workflowSettingsModal.confirmArchiveModal();
-
-		await expect(n8n.notifications.getSuccessNotifications().first()).toBeVisible();
-		await expect(n8n.page).toHaveURL(/\/workflows$/);
-
-		await goToWorkflow(n8n, workflowId);
-
-		await expect(n8n.canvas.getArchivedTag()).toBeVisible();
-		await expect(n8n.canvas.getPublishedIndicator()).not.toBeVisible();
-		await expect(n8n.canvas.getPublishButton()).not.toBeVisible();
-
-		await expect(n8n.workflowSettingsModal.getWorkflowMenu()).toBeVisible();
-		await n8n.workflowSettingsModal.getWorkflowMenu().click();
-		await n8n.workflowSettingsModal.clickUnarchiveMenuItem();
-
-		await expect(n8n.notifications.getSuccessNotifications().first()).toBeVisible();
-		await expect(n8n.canvas.getArchivedTag()).not.toBeAttached();
-
-		await n8n.canvas.publishWorkflow();
-		await n8n.page.keyboard.press('Escape');
-
-		await expect(n8n.canvas.getPublishedIndicator()).toBeVisible();
-		await expect(n8n.canvas.getOpenPublishModalButton()).toBeVisible();
-	});
-
-	test.describe('duplicate workflow', () => {
-		const DUPLICATE_WORKFLOW_NAME = 'Duplicated workflow';
-
-		test.beforeEach(async ({ n8n }) => {
-			await n8n.canvas.addNode(MANUAL_TRIGGER_NODE_NAME);
-		});
-
-		test('should duplicate unsaved workflow', async ({ n8n }) => {
-			const uniqueTag = `Duplicate-${nanoid(6)}`;
-			await n8n.workflowComposer.duplicateWorkflow(DUPLICATE_WORKFLOW_NAME, uniqueTag);
-
-			await expect(n8n.notifications.getErrorNotifications()).toHaveCount(0);
-		});
-
-		test('should duplicate saved workflow', async ({ n8n }) => {
-			await n8n.canvas.saveWorkflow();
-			await expect(n8n.canvas.getWorkflowSaveButton()).toContainText('Saved');
-
-			const uniqueTag = `Duplicate-${nanoid(6)}`;
-			await n8n.workflowComposer.duplicateWorkflow(DUPLICATE_WORKFLOW_NAME, uniqueTag);
-
-			await expect(n8n.notifications.getErrorNotifications()).toHaveCount(0);
-		});
-	});
-
-	test('should keep endpoint click working when switching between execution and editor tab', async ({
-		n8n,
-	}) => {
-		await n8n.canvas.addNode(MANUAL_TRIGGER_NODE_NAME);
-		await n8n.canvas.addNode(EDIT_FIELDS_SET_NODE_NAME, { closeNDV: true });
-		await n8n.canvas.saveWorkflow();
-
-		await n8n.canvas.clickNodePlusEndpoint('Edit Fields');
-		await expect(n8n.canvas.nodeCreatorSearchBar()).toBeVisible();
-		await n8n.page.keyboard.press('Escape');
-
-		await n8n.canvas.clickExecutionsTab();
-		await n8n.page.waitForURL(/\/executions/);
-
-		await n8n.canvas.clickEditorTab();
-
-		await n8n.canvas.clickNodePlusEndpoint('Edit Fields');
-		await expect(n8n.canvas.nodeCreatorSearchBar()).toBeVisible();
-	});
-
-	test('should run workflow on button click', async ({ n8n }) => {
-		await n8n.canvas.addNode(MANUAL_TRIGGER_NODE_NAME);
-		await n8n.canvas.saveWorkflow();
-
-		await n8n.canvas.clickExecuteWorkflowButton();
-		await expect(
-			n8n.notifications.getNotificationByTitle('Workflow executed successfully'),
-		).toBeVisible();
-	});
-
-	test('should run workflow using keyboard shortcut', async ({ n8n }) => {
-		await n8n.canvas.addNode(MANUAL_TRIGGER_NODE_NAME);
-		await n8n.canvas.saveWorkflow();
-
-		await n8n.canvas.hitExecuteWorkflow();
-		await expect(
-			n8n.notifications.getNotificationByTitle('Workflow executed successfully'),
-		).toBeVisible();
-	});
-
-	test('should not run empty workflows', async ({ n8n }) => {
-		await expect(n8n.canvas.getCanvasNodes()).toHaveCount(0);
-
-		await expect(n8n.canvas.getExecuteWorkflowButton()).not.toBeAttached();
-
-		await n8n.canvas.hitExecuteWorkflow();
-		await expect(n8n.notifications.getSuccessNotifications()).toHaveCount(0);
-	});
-
-	test.describe('Menu entry Push To Git', () => {
-		test('should not show up in the menu for members @auth:member', async ({ n8n }) => {
-			await n8n.workflowSettingsModal.getWorkflowMenu().click();
-			await expect(n8n.workflowSettingsModal.getPushToGitMenuItem()).not.toBeAttached();
-		});
-
-		test('should show up for owners @auth:owner', async ({ n8n }) => {
-			await n8n.workflowSettingsModal.getWorkflowMenu().click();
-			await expect(n8n.workflowSettingsModal.getPushToGitMenuItem()).toBeVisible();
-		});
-	});
-});
diff --git a/packages/testing/playwright/tests/ui/workflows/editor/workflow-actions/archive.spec.ts b/packages/testing/playwright/tests/ui/workflows/editor/workflow-actions/archive.spec.ts
new file mode 100644
index 00000000000..43afb59899d
--- /dev/null
+++ b/packages/testing/playwright/tests/ui/workflows/editor/workflow-actions/archive.spec.ts
@@ -0,0 +1,194 @@
+import { SCHEDULE_TRIGGER_NODE_NAME } from '../../../../../config/constants';
+import { test, expect } from '../../../../../fixtures/base';
+import type { n8nPage } from '../../../../../pages/n8nPage';
+
+async function saveWorkflowAndGetId(n8n: n8nPage): Promise<string> {
+	const saveResponsePromise = n8n.page.waitForResponse(
+		(response) =>
+			response.url().includes('/rest/workflows') &&
+			(response.request().method() === 'POST' || response.request().method() === 'PATCH'),
+	);
+	await n8n.canvas.saveWorkflow();
+	const saveResponse = await saveResponsePromise;
+	const {
+		data: { id },
+	} = await saveResponse.json();
+	return id;
+}
+
+async function goToWorkflow(n8n: n8nPage, workflowId: string): Promise<void> {
+	const loadResponsePromise = n8n.page.waitForResponse(
+		(response) =>
+			response.url().includes(`/rest/workflows/${workflowId}`) &&
+			response.request().method() === 'GET' &&
+			response.status() === 200,
+	);
+	await n8n.page.goto(`/workflow/${workflowId}`);
+	await loadResponsePromise;
+}
+
+// eslint-disable-next-line playwright/no-skipped-test
+test.skip('Workflow Archive', () => {
+	test.beforeEach(async ({ n8n }) => {
+		await n8n.start.fromBlankCanvas();
+	});
+
+	test('should not be able to archive or delete unsaved workflow', async ({ n8n }) => {
+		await expect(n8n.workflowSettingsModal.getWorkflowMenu()).toBeVisible();
+		await n8n.workflowSettingsModal.getWorkflowMenu().click();
+
+		await expect(n8n.workflowSettingsModal.getDeleteMenuItem()).toBeHidden();
+		await expect(n8n.workflowSettingsModal.getArchiveMenuItem().locator('..')).toHaveClass(
+			/is-disabled/,
+		);
+	});
+
+	test('should archive nonactive workflow and then delete it', async ({ n8n }) => {
+		const workflowId = await saveWorkflowAndGetId(n8n);
+		await expect(n8n.canvas.getArchivedTag()).not.toBeAttached();
+
+		await expect(n8n.workflowSettingsModal.getWorkflowMenu()).toBeVisible();
+		await n8n.workflowSettingsModal.getWorkflowMenu().click();
+
+		await n8n.workflowSettingsModal.clickArchiveMenuItem();
+
+		await expect(n8n.notifications.getSuccessNotifications().first()).toBeVisible();
+		await expect(n8n.page).toHaveURL(/\/workflows$/);
+
+		await goToWorkflow(n8n, workflowId);
+
+		await expect(n8n.canvas.getArchivedTag()).toBeVisible();
+		await expect(n8n.canvas.getNodeCreatorPlusButton()).not.toBeAttached();
+
+		await expect(n8n.workflowSettingsModal.getWorkflowMenu()).toBeVisible();
+		await n8n.workflowSettingsModal.getWorkflowMenu().click();
+		await n8n.workflowSettingsModal.clickDeleteMenuItem();
+		await n8n.workflowSettingsModal.confirmDeleteModal();
+
+		await expect(n8n.notifications.getSuccessNotifications().first()).toBeVisible();
+		await expect(n8n.page).toHaveURL(/\/workflows$/);
+	});
+
+	// eslint-disable-next-line n8n-local-rules/no-skipped-tests -- Flaky in multi-main mode
+	test.skip('should archive published workflow and then delete it', async ({ n8n }) => {
+		await n8n.canvas.addNode(SCHEDULE_TRIGGER_NODE_NAME, { closeNDV: true });
+		const workflowId = await saveWorkflowAndGetId(n8n);
+		await n8n.canvas.publishWorkflow();
+		await n8n.page.keyboard.press('Escape');
+
+		await expect(n8n.canvas.getPublishedIndicator()).toBeVisible();
+		await expect(n8n.canvas.getArchivedTag()).not.toBeAttached();
+
+		await expect(n8n.workflowSettingsModal.getWorkflowMenu()).toBeVisible();
+		await n8n.workflowSettingsModal.getWorkflowMenu().click();
+		await n8n.workflowSettingsModal.clickArchiveMenuItem();
+		await n8n.workflowSettingsModal.confirmArchiveModal();
+
+		await expect(n8n.notifications.getSuccessNotifications().first()).toBeVisible();
+		await expect(n8n.page).toHaveURL(/\/workflows$/);
+
+		await goToWorkflow(n8n, workflowId);
+
+		await expect(n8n.canvas.getArchivedTag()).toBeVisible();
+		await expect(n8n.canvas.getNodeCreatorPlusButton()).not.toBeAttached();
+		await expect(n8n.canvas.getPublishedIndicator()).not.toBeVisible();
+
+		await expect(n8n.workflowSettingsModal.getWorkflowMenu()).toBeVisible();
+		await n8n.workflowSettingsModal.getWorkflowMenu().click();
+		await n8n.workflowSettingsModal.clickDeleteMenuItem();
+		await n8n.workflowSettingsModal.confirmDeleteModal();
+
+		await expect(n8n.notifications.getSuccessNotifications().first()).toBeVisible();
+		await expect(n8n.page).toHaveURL(/\/workflows$/);
+	});
+
+	test('should archive nonactive workflow and then unarchive it', async ({ n8n }) => {
+		const workflowId = await saveWorkflowAndGetId(n8n);
+		await expect(n8n.canvas.getArchivedTag()).not.toBeAttached();
+
+		await expect(n8n.workflowSettingsModal.getWorkflowMenu()).toBeVisible();
+		await n8n.workflowSettingsModal.getWorkflowMenu().click();
+
+		await n8n.workflowSettingsModal.clickArchiveMenuItem();
+
+		await expect(n8n.notifications.getSuccessNotifications().first()).toBeVisible();
+		await expect(n8n.page).toHaveURL(/\/workflows$/);
+
+		await goToWorkflow(n8n, workflowId);
+
+		await expect(n8n.canvas.getArchivedTag()).toBeVisible();
+		await expect(n8n.canvas.getNodeCreatorPlusButton()).not.toBeAttached();
+
+		await expect(n8n.workflowSettingsModal.getWorkflowMenu()).toBeVisible();
+		await n8n.workflowSettingsModal.getWorkflowMenu().click();
+		await n8n.workflowSettingsModal.clickUnarchiveMenuItem();
+
+		await expect(n8n.notifications.getSuccessNotifications().first()).toBeVisible();
+		await expect(n8n.canvas.getArchivedTag()).not.toBeAttached();
+		await expect(n8n.canvas.getNodeCreatorPlusButton()).toBeVisible();
+	});
+
+	test('should not show unpublish menu item for non-published workflow', async ({ n8n }) => {
+		await n8n.canvas.addNode(SCHEDULE_TRIGGER_NODE_NAME, { closeNDV: true });
+		await n8n.canvas.saveWorkflow();
+
+		await expect(n8n.canvas.getPublishedIndicator()).not.toBeVisible();
+
+		await n8n.workflowSettingsModal.getWorkflowMenu().click();
+		await expect(n8n.workflowSettingsModal.getUnpublishMenuItem()).not.toBeAttached();
+	});
+
+	// TODO: flaky test - 18 similar failures across 10 branches in last 14 days
+	test.skip('should unpublish a published workflow', async ({ n8n }) => {
+		await n8n.canvas.addNode(SCHEDULE_TRIGGER_NODE_NAME, { closeNDV: true });
+		await n8n.canvas.publishWorkflow();
+		await n8n.page.keyboard.press('Escape');
+
+		await expect(n8n.canvas.getPublishedIndicator()).toBeVisible();
+
+		await n8n.workflowSettingsModal.getWorkflowMenu().click();
+		await n8n.workflowSettingsModal.clickUnpublishMenuItem();
+
+		await expect(n8n.workflowSettingsModal.getUnpublishModal()).toBeVisible();
+		await n8n.workflowSettingsModal.confirmUnpublishModal();
+
+		await expect(n8n.notifications.getSuccessNotifications().first()).toBeVisible();
+		await expect(n8n.canvas.getPublishedIndicator()).not.toBeVisible();
+	});
+
+	// eslint-disable-next-line n8n-local-rules/no-skipped-tests -- Flaky in multi-main mode
+	test.skip('should unpublish published workflow on archive', async ({ n8n }) => {
+		await n8n.canvas.addNode(SCHEDULE_TRIGGER_NODE_NAME, { closeNDV: true });
+		const workflowId = await saveWorkflowAndGetId(n8n);
+		await n8n.canvas.publishWorkflow();
+		await n8n.page.keyboard.press('Escape');
+
+		await expect(n8n.canvas.getPublishedIndicator()).toBeVisible();
+
+		await n8n.workflowSettingsModal.getWorkflowMenu().click();
+		await n8n.workflowSettingsModal.clickArchiveMenuItem();
+		await n8n.workflowSettingsModal.confirmArchiveModal();
+
+		await expect(n8n.notifications.getSuccessNotifications().first()).toBeVisible();
+		await expect(n8n.page).toHaveURL(/\/workflows$/);
+
+		await goToWorkflow(n8n, workflowId);
+
+		await expect(n8n.canvas.getArchivedTag()).toBeVisible();
+		await expect(n8n.canvas.getPublishedIndicator()).not.toBeVisible();
+		await expect(n8n.canvas.getPublishButton()).not.toBeVisible();
+
+		await expect(n8n.workflowSettingsModal.getWorkflowMenu()).toBeVisible();
+		await n8n.workflowSettingsModal.getWorkflowMenu().click();
+		await n8n.workflowSettingsModal.clickUnarchiveMenuItem();
+
+		await expect(n8n.notifications.getSuccessNotifications().first()).toBeVisible();
+		await expect(n8n.canvas.getArchivedTag()).not.toBeAttached();
+
+		await n8n.canvas.publishWorkflow();
+		await n8n.page.keyboard.press('Escape');
+
+		await expect(n8n.canvas.getPublishedIndicator()).toBeVisible();
+		await expect(n8n.canvas.getOpenPublishModalButton()).toBeVisible();
+	});
+});
diff --git a/packages/testing/playwright/tests/ui/workflows/editor/workflow-actions/copy-paste.spec.ts b/packages/testing/playwright/tests/ui/workflows/editor/workflow-actions/copy-paste.spec.ts
new file mode 100644
index 00000000000..d52f8c6f2ae
--- /dev/null
+++ b/packages/testing/playwright/tests/ui/workflows/editor/workflow-actions/copy-paste.spec.ts
@@ -0,0 +1,66 @@
+import fs from 'fs';
+
+import { CODE_NODE_NAME, SCHEDULE_TRIGGER_NODE_NAME } from '../../../../../config/constants';
+import { test, expect } from '../../../../../fixtures/base';
+import { resolveFromRoot } from '../../../../../utils/path-helper';
+
+// eslint-disable-next-line playwright/no-skipped-test
+test.skip('Workflow Copy Paste', () => {
+	test.beforeEach(async ({ n8n }) => {
+		await n8n.start.fromBlankCanvas();
+	});
+
+	test('should copy nodes', async ({ n8n }) => {
+		await n8n.canvas.addNode(SCHEDULE_TRIGGER_NODE_NAME, { closeNDV: true });
+		await n8n.canvas.addNode(CODE_NODE_NAME, { action: 'Code in JavaScript', closeNDV: true });
+
+		await expect(n8n.canvas.getCanvasNodes()).toHaveCount(2);
+
+		await expect(n8n.canvas.nodeCreator.getRoot()).not.toBeAttached();
+
+		await n8n.clipboard.grant();
+
+		await n8n.canvas.selectAll();
+		await n8n.canvas.copyNodes();
+
+		await n8n.notifications.waitForNotificationAndClose('Copied to clipboard');
+		const clipboardText = await n8n.clipboard.readText();
+		const copiedWorkflow = JSON.parse(clipboardText);
+
+		expect(copiedWorkflow.nodes).toHaveLength(2);
+	});
+
+	test('should paste nodes (both current and old node versions)', async ({ n8n }) => {
+		const workflowJson = fs.readFileSync(
+			resolveFromRoot('workflows', 'Test_workflow-actions_paste-data.json'),
+			'utf-8',
+		);
+
+		await n8n.canvas.canvasPane().click();
+		await n8n.clipboard.paste(workflowJson);
+		await n8n.canvas.clickZoomToFitButton();
+
+		await expect(n8n.canvas.getCanvasNodes()).toHaveCount(5);
+		await expect(n8n.canvas.nodeConnections()).toHaveCount(5);
+	});
+
+	test('should allow importing nodes without names', async ({ n8n }) => {
+		const workflowJson = fs.readFileSync(
+			resolveFromRoot('workflows', 'Test_workflow-actions_import_nodes_empty_name.json'),
+			'utf-8',
+		);
+
+		await n8n.canvas.canvasPane().click();
+		await n8n.clipboard.paste(workflowJson);
+		await n8n.canvas.clickZoomToFitButton();
+
+		await expect(n8n.canvas.getCanvasNodes()).toHaveCount(3);
+		await expect(n8n.canvas.nodeConnections()).toHaveCount(2);
+
+		const nodes = n8n.canvas.getCanvasNodes();
+		const count = await nodes.count();
+		for (let i = 0; i < count; i++) {
+			await expect(nodes.nth(i)).toHaveAttribute('data-node-name');
+		}
+	});
+});
diff --git a/packages/testing/playwright/tests/ui/workflows/editor/workflow-actions/duplicate.spec.ts b/packages/testing/playwright/tests/ui/workflows/editor/workflow-actions/duplicate.spec.ts
new file mode 100644
index 00000000000..b9f379e918a
--- /dev/null
+++ b/packages/testing/playwright/tests/ui/workflows/editor/workflow-actions/duplicate.spec.ts
@@ -0,0 +1,31 @@
+import { nanoid } from 'nanoid';
+
+import { MANUAL_TRIGGER_NODE_NAME } from '../../../../../config/constants';
+import { test, expect } from '../../../../../fixtures/base';
+
+// eslint-disable-next-line playwright/no-skipped-test
+test.skip('Workflow Duplicate', () => {
+	const DUPLICATE_WORKFLOW_NAME = 'Duplicated workflow';
+
+	test.beforeEach(async ({ n8n }) => {
+		await n8n.start.fromBlankCanvas();
+		await n8n.canvas.addNode(MANUAL_TRIGGER_NODE_NAME);
+	});
+
+	test('should duplicate unsaved workflow', async ({ n8n }) => {
+		const uniqueTag = `Duplicate-${nanoid(6)}`;
+		await n8n.workflowComposer.duplicateWorkflow(DUPLICATE_WORKFLOW_NAME, uniqueTag);
+
+		await expect(n8n.notifications.getErrorNotifications()).toHaveCount(0);
+	});
+
+	test('should duplicate saved workflow', async ({ n8n }) => {
+		await n8n.canvas.saveWorkflow();
+		await expect(n8n.canvas.getWorkflowSaveButton()).toContainText('Saved');
+
+		const uniqueTag = `Duplicate-${nanoid(6)}`;
+		await n8n.workflowComposer.duplicateWorkflow(DUPLICATE_WORKFLOW_NAME, uniqueTag);
+
+		await expect(n8n.notifications.getErrorNotifications()).toHaveCount(0);
+	});
+});
diff --git a/packages/testing/playwright/tests/ui/workflows/editor/workflow-actions/publish.spec.ts b/packages/testing/playwright/tests/ui/workflows/editor/workflow-actions/publish.spec.ts
new file mode 100644
index 00000000000..66c6bc683ef
--- /dev/null
+++ b/packages/testing/playwright/tests/ui/workflows/editor/workflow-actions/publish.spec.ts
@@ -0,0 +1,63 @@
+import {
+	MANUAL_TRIGGER_NODE_NAME,
+	NOTION_NODE_NAME,
+	SCHEDULE_TRIGGER_NODE_NAME,
+} from '../../../../../config/constants';
+import { test, expect } from '../../../../../fixtures/base';
+
+// eslint-disable-next-line playwright/no-skipped-test
+test.skip('Workflow Publish', () => {
+	test.beforeEach(async ({ n8n }) => {
+		await n8n.start.fromBlankCanvas();
+	});
+
+	test('should not be able to publish workflow without trigger node', async ({ n8n }) => {
+		await n8n.canvas.addNode(MANUAL_TRIGGER_NODE_NAME);
+		await n8n.canvas.getOpenPublishModalButton().click();
+
+		await expect(n8n.canvas.getPublishButton()).toBeDisabled();
+	});
+
+	test('should be able to publish workflow', async ({ n8n }) => {
+		await n8n.canvas.addNode(SCHEDULE_TRIGGER_NODE_NAME, { closeNDV: true });
+		await expect(n8n.canvas.getPublishedIndicator()).not.toBeVisible();
+
+		await n8n.canvas.publishWorkflow();
+
+		await expect(n8n.canvas.getPublishedIndicator()).toBeVisible();
+	});
+
+	test('should not be able to publish workflow when nodes have errors', async ({ n8n }) => {
+		await n8n.canvas.addNode(SCHEDULE_TRIGGER_NODE_NAME, { closeNDV: true });
+		await n8n.canvas.addNode(NOTION_NODE_NAME, { action: 'Append a block', closeNDV: true });
+		await n8n.canvas.saveWorkflow();
+
+		await n8n.canvas.getOpenPublishModalButton().click();
+
+		await expect(n8n.canvas.getPublishButton()).toBeDisabled();
+
+		await expect(n8n.canvas.getPublishModalCallout()).toBeVisible();
+	});
+
+	test('should be able to publish workflow when nodes with errors are disabled', async ({
+		n8n,
+	}) => {
+		await n8n.canvas.addNode(SCHEDULE_TRIGGER_NODE_NAME, { closeNDV: true });
+		await n8n.canvas.addNode(NOTION_NODE_NAME, { action: 'Append a block', closeNDV: true });
+		await n8n.canvas.saveWorkflow();
+
+		await expect(n8n.notifications.getSuccessNotifications().first()).toBeVisible();
+
+		await n8n.canvas.getOpenPublishModalButton().click();
+
+		await expect(n8n.canvas.getPublishButton()).toBeDisabled();
+		await n8n.canvas.cancelPublishWorkflowModal();
+
+		const nodeName = await n8n.canvas.getCanvasNodes().last().getAttribute('data-node-name');
+		await n8n.canvas.toggleNodeEnabled(nodeName!);
+
+		await n8n.canvas.publishWorkflow();
+
+		await expect(n8n.canvas.getPublishedIndicator()).toBeVisible();
+	});
+});
diff --git a/packages/testing/playwright/tests/ui/workflows/editor/workflow-actions/run.spec.ts b/packages/testing/playwright/tests/ui/workflows/editor/workflow-actions/run.spec.ts
new file mode 100644
index 00000000000..9e75b6e58e7
--- /dev/null
+++ b/packages/testing/playwright/tests/ui/workflows/editor/workflow-actions/run.spec.ts
@@ -0,0 +1,61 @@
+import {
+	EDIT_FIELDS_SET_NODE_NAME,
+	MANUAL_TRIGGER_NODE_NAME,
+} from '../../../../../config/constants';
+import { test, expect } from '../../../../../fixtures/base';
+
+// eslint-disable-next-line playwright/no-skipped-test
+test.skip('Workflow Run', () => {
+	test.beforeEach(async ({ n8n }) => {
+		await n8n.start.fromBlankCanvas();
+	});
+
+	test('should keep endpoint click working when switching between execution and editor tab', async ({
+		n8n,
+	}) => {
+		await n8n.canvas.addNode(MANUAL_TRIGGER_NODE_NAME);
+		await n8n.canvas.addNode(EDIT_FIELDS_SET_NODE_NAME, { closeNDV: true });
+		await n8n.canvas.saveWorkflow();
+
+		await n8n.canvas.clickNodePlusEndpoint('Edit Fields');
+		await expect(n8n.canvas.nodeCreatorSearchBar()).toBeVisible();
+		await n8n.page.keyboard.press('Escape');
+
+		await n8n.canvas.clickExecutionsTab();
+		await n8n.page.waitForURL(/\/executions/);
+
+		await n8n.canvas.clickEditorTab();
+
+		await n8n.canvas.clickNodePlusEndpoint('Edit Fields');
+		await expect(n8n.canvas.nodeCreatorSearchBar()).toBeVisible();
+	});
+
+	test('should run workflow on button click', async ({ n8n }) => {
+		await n8n.canvas.addNode(MANUAL_TRIGGER_NODE_NAME);
+		await n8n.canvas.saveWorkflow();
+
+		await n8n.canvas.clickExecuteWorkflowButton();
+		await expect(
+			n8n.notifications.getNotificationByTitle('Workflow executed successfully'),
+		).toBeVisible();
+	});
+
+	test('should run workflow using keyboard shortcut', async ({ n8n }) => {
+		await n8n.canvas.addNode(MANUAL_TRIGGER_NODE_NAME);
+		await n8n.canvas.saveWorkflow();
+
+		await n8n.canvas.hitExecuteWorkflow();
+		await expect(
+			n8n.notifications.getNotificationByTitle('Workflow executed successfully'),
+		).toBeVisible();
+	});
+
+	test('should not run empty workflows', async ({ n8n }) => {
+		await expect(n8n.canvas.getCanvasNodes()).toHaveCount(0);
+
+		await expect(n8n.canvas.getExecuteWorkflowButton()).not.toBeAttached();
+
+		await n8n.canvas.hitExecuteWorkflow();
+		await expect(n8n.notifications.getSuccessNotifications()).toHaveCount(0);
+	});
+});
diff --git a/packages/testing/playwright/tests/ui/workflows/editor/workflow-actions/save.spec.ts b/packages/testing/playwright/tests/ui/workflows/editor/workflow-actions/save.spec.ts
new file mode 100644
index 00000000000..1f0efffe1f5
--- /dev/null
+++ b/packages/testing/playwright/tests/ui/workflows/editor/workflow-actions/save.spec.ts
@@ -0,0 +1,146 @@
+import {
+	MANUAL_TRIGGER_NODE_NAME,
+	SCHEDULE_TRIGGER_NODE_NAME,
+} from '../../../../../config/constants';
+import { test, expect } from '../../../../../fixtures/base';
+
+// eslint-disable-next-line playwright/no-skipped-test
+test.skip('Workflow Save', () => {
+	test.beforeEach(async ({ n8n }) => {
+		await n8n.start.fromBlankCanvas();
+	});
+
+	test('should be able to save on button click', async ({ n8n }) => {
+		const saveButton = n8n.canvas.getWorkflowSaveButton();
+
+		await expect(saveButton).toContainText('Save');
+
+		await n8n.canvas.saveWorkflow();
+
+		await expect(saveButton).toContainText('Saved');
+
+		const tagName = await saveButton.evaluate((el) => el.tagName);
+		expect(tagName).toBe('SPAN');
+
+		await expect(n8n.page).not.toHaveURL(/\/workflow\/new$/);
+		await expect(n8n.page).toHaveURL(/\/workflow\/[a-zA-Z0-9]+$/);
+	});
+
+	test('should save workflow on keyboard shortcut', async ({ n8n }) => {
+		const saveButton = n8n.canvas.getWorkflowSaveButton();
+
+		await n8n.canvas.deselectAll();
+
+		await n8n.canvas.hitSaveWorkflow();
+
+		await expect(saveButton).toContainText('Saved');
+
+		const tagName = await saveButton.evaluate((el) => el.tagName);
+		expect(tagName).toBe('SPAN');
+	});
+
+	test('should not save already saved workflow', async ({ n8n }) => {
+		const patchRequests: string[] = [];
+		n8n.page.on('request', (request) => {
+			if (request.method() === 'PATCH' && request.url().includes('/rest/workflows/')) {
+				patchRequests.push(request.url());
+			}
+		});
+
+		const saveButton = n8n.canvas.getWorkflowSaveButton();
+		await expect(saveButton).toContainText('Save');
+		await n8n.canvas.saveWorkflow();
+		await expect(saveButton).toContainText('Saved');
+
+		await n8n.canvas.addNode(MANUAL_TRIGGER_NODE_NAME);
+
+		const patchPromise = n8n.page.waitForRequest(
+			(req) => req.method() === 'PATCH' && req.url().includes('/rest/workflows/'),
+		);
+		await n8n.canvas.saveWorkflow();
+		await patchPromise;
+		await expect(saveButton).toContainText('Saved');
+
+		expect(await saveButton.evaluate((el) => el.tagName)).toBe('SPAN');
+
+		await n8n.canvas.hitSaveWorkflow();
+		await n8n.canvas.hitSaveWorkflow();
+
+		expect(patchRequests).toHaveLength(1);
+	});
+
+	test('should save new workflow after renaming', async ({ n8n }) => {
+		await n8n.canvas.setWorkflowName('Something else');
+		await n8n.canvas.getWorkflowNameInput().press('Enter');
+
+		await expect(n8n.canvas.getWorkflowSaveButton()).toContainText('Saved');
+	});
+
+	test('should rename workflow', async ({ n8n }) => {
+		await n8n.canvas.addNode(SCHEDULE_TRIGGER_NODE_NAME, { closeNDV: true });
+		await n8n.canvas.saveWorkflow();
+		await expect(n8n.canvas.getWorkflowSaveButton()).toContainText('Saved');
+
+		await n8n.canvas.setWorkflowName('Something else');
+		await n8n.canvas.getWorkflowNameInput().press('Enter');
+
+		await expect(n8n.canvas.getWorkflowSaveButton()).toContainText('Saved');
+		await expect(n8n.canvas.getWorkflowName()).toHaveAttribute('title', 'Something else');
+	});
+
+	test('should not save workflow if canvas is loading', async ({ n8n }) => {
+		let patchCount = 0;
+
+		n8n.page.on('request', (req) => {
+			if (req.method() === 'PATCH' && req.url().includes('/rest/workflows/')) {
+				patchCount++;
+			}
+		});
+
+		await n8n.canvas.addNode(MANUAL_TRIGGER_NODE_NAME);
+		await n8n.canvas.saveWorkflow();
+
+		await expect(n8n.canvas.getWorkflowSaveButton()).toContainText('Saved');
+		const workflowId = n8n.canvas.getWorkflowIdFromUrl();
+
+		await n8n.canvasComposer.delayWorkflowLoad(workflowId);
+
+		await n8n.page.reload();
+		await expect(n8n.canvas.getLoadingMask()).toBeVisible();
+
+		await n8n.canvas.hitSaveWorkflow();
+		await n8n.canvas.hitSaveWorkflow();
+		await n8n.canvas.hitSaveWorkflow();
+
+		expect(patchCount).toBe(0);
+
+		await expect(n8n.page.getByTestId('node-view-loader')).not.toBeAttached();
+		await expect(n8n.canvas.getLoadingMask()).not.toBeAttached();
+		await n8n.canvasComposer.undelayWorkflowLoad(workflowId);
+
+		await n8n.canvas.addNode(SCHEDULE_TRIGGER_NODE_NAME, { closeNDV: true });
+
+		const patchPromise = n8n.page.waitForRequest(
+			(req) => req.method() === 'PATCH' && req.url().includes('/rest/workflows/'),
+		);
+		await n8n.canvas.hitSaveWorkflow();
+		await patchPromise;
+
+		expect(patchCount).toBe(1);
+	});
+
+	test('should not save workflow twice when save is in progress', async ({ n8n }) => {
+		const oldName = await n8n.canvas.getWorkflowNameInput().inputValue();
+
+		await n8n.canvas.getWorkflowName().click();
+		await n8n.canvas.getWorkflowNameInput().press('ControlOrMeta+a');
+		await n8n.canvas.getWorkflowNameInput().pressSequentially('Test');
+		await n8n.canvas.getWorkflowSaveButton().click();
+
+		await expect(n8n.canvas.getWorkflowNameInput()).toHaveValue('Test');
+
+		await n8n.navigate.toHome();
+
+		await expect(n8n.workflows.cards.getWorkflow(oldName)).toBeHidden();
+	});
+});
diff --git a/packages/testing/playwright/tests/ui/workflows/editor/workflow-actions/settings.spec.ts b/packages/testing/playwright/tests/ui/workflows/editor/workflow-actions/settings.spec.ts
new file mode 100644
index 00000000000..22149aeb0d6
--- /dev/null
+++ b/packages/testing/playwright/tests/ui/workflows/editor/workflow-actions/settings.spec.ts
@@ -0,0 +1,73 @@
+import { test, expect } from '../../../../../fixtures/base';
+
+// eslint-disable-next-line playwright/no-skipped-test
+test.skip('Workflow Settings', () => {
+	test.beforeEach(async ({ n8n }) => {
+		await n8n.start.fromBlankCanvas();
+	});
+
+	test('should update workflow settings', async ({ n8n }) => {
+		await n8n.navigate.toHome();
+
+		const workflowsResponsePromise = n8n.page.waitForResponse(
+			(response) =>
+				response.url().includes('/rest/workflows') && response.request().method() === 'GET',
+		);
+
+		await n8n.sideBar.addWorkflowFromUniversalAdd('Personal');
+
+		const workflowsResponse = await workflowsResponsePromise;
+		const responseBody = await workflowsResponse.json();
+		const totalWorkflows = responseBody.count;
+
+		await n8n.canvas.saveWorkflow();
+
+		await n8n.workflowSettingsModal.open();
+		await expect(n8n.workflowSettingsModal.getModal()).toBeVisible();
+
+		await n8n.workflowSettingsModal.getErrorWorkflowField().click();
+		const optionCount = await n8n.page.getByRole('option').count();
+		expect(optionCount).toBeGreaterThanOrEqual(totalWorkflows + 2);
+		await n8n.page.getByRole('option').last().click();
+
+		await n8n.workflowSettingsModal.getTimezoneField().click();
+		await expect(n8n.page.getByRole('option').first()).toBeVisible();
+		await n8n.page.getByRole('option').nth(1).click();
+
+		await n8n.workflowSettingsModal.getSaveFailedExecutionsField().click();
+		await expect(n8n.page.getByRole('option')).toHaveCount(3);
+		await n8n.page.getByRole('option').last().click();
+
+		await n8n.workflowSettingsModal.getSaveSuccessExecutionsField().click();
+		await expect(n8n.page.getByRole('option')).toHaveCount(3);
+		await n8n.page.getByRole('option').last().click();
+
+		await n8n.workflowSettingsModal.getSaveManualExecutionsField().click();
+		await expect(n8n.page.getByRole('option')).toHaveCount(3);
+		await n8n.page.getByRole('option').last().click();
+
+		await n8n.workflowSettingsModal.getSaveExecutionProgressField().click();
+		await expect(n8n.page.getByRole('option')).toHaveCount(3);
+		await n8n.page.getByRole('option').last().click();
+
+		await n8n.workflowSettingsModal.getTimeoutSwitch().click();
+		await n8n.workflowSettingsModal.getTimeoutInput().fill('1');
+
+		await n8n.workflowSettingsModal.clickSave();
+
+		await expect(n8n.workflowSettingsModal.getModal()).toBeHidden();
+		await expect(n8n.notifications.getSuccessNotifications().first()).toBeVisible();
+	});
+
+	test.describe('Menu entry Push To Git', () => {
+		test('should not show up in the menu for members @auth:member', async ({ n8n }) => {
+			await n8n.workflowSettingsModal.getWorkflowMenu().click();
+			await expect(n8n.workflowSettingsModal.getPushToGitMenuItem()).not.toBeAttached();
+		});
+
+		test('should show up for owners @auth:owner', async ({ n8n }) => {
+			await n8n.workflowSettingsModal.getWorkflowMenu().click();
+			await expect(n8n.workflowSettingsModal.getPushToGitMenuItem()).toBeVisible();
+		});
+	});
+});

From 5c76f1ec56dea862543c79a06352bbd92ee8afdf Mon Sep 17 00:00:00 2001
From: James Gee <1285296+geemanjs@users.noreply.github.com>
Date: Fri, 5 Dec 2025 21:04:12 +0100
Subject: [PATCH 113/167] fix: PAY-4074 - Owner registration in multi-main
 setup (#22520)

Signed-off-by: James Gee <james@justec.io>
Signed-off-by: James Gee <1285296+geemanjs@users.noreply.github.com>
---
 .../src/auth/__tests__/auth.service.test.ts   |  29 +++-
 packages/cli/src/auth/auth.service.ts         |   7 +-
 .../cli/src/commands/user-management/reset.ts |   7 +-
 packages/cli/src/config/schema.ts             |   6 +-
 packages/cli/src/config/types.ts              |   1 -
 .../__tests__/invitation.controller.test.ts   | 139 +++++-------------
 .../__tests__/owner.controller.test.ts        |  87 ++---------
 .../cli/src/controllers/e2e.controller.ts     |  13 +-
 .../src/controllers/invitation.controller.ts  |   5 +-
 .../cli/src/controllers/owner.controller.ts   |  61 +-------
 packages/cli/src/server.ts                    |   8 +-
 .../__tests__/frontend.service.test.ts        |  40 +++--
 .../ownership.service.integration.test.ts     |  60 ++++++++
 .../__tests__/ownership.service.test.ts       |  72 ++++++++-
 packages/cli/src/services/frontend.service.ts |  22 +--
 .../cli/src/services/ownership.service.ts     |  76 +++++++++-
 .../cli/test/integration/api-keys.api.test.ts |   1 -
 .../cli/test/integration/auth.api.test.ts     |   1 -
 .../integration/commands/reset.cmd.test.ts    |  12 --
 .../external-secrets.api.test.ts              |   2 -
 .../test/integration/ldap/ldap.api.test.ts    |   2 -
 packages/cli/test/integration/me.api.test.ts  |   2 -
 .../cli/test/integration/owner.api.test.ts    |   9 +-
 .../cli/test/integration/shared/db/users.ts   |   3 +-
 .../test/integration/shared/utils/index.ts    |  24 +--
 .../integration/shared/utils/test-server.ts   |   2 -
 26 files changed, 343 insertions(+), 348 deletions(-)
 create mode 100644 packages/cli/src/services/__tests__/ownership.service.integration.test.ts

diff --git a/packages/cli/src/auth/__tests__/auth.service.test.ts b/packages/cli/src/auth/__tests__/auth.service.test.ts
index d1e89284fc8..573f23ad7dc 100644
--- a/packages/cli/src/auth/__tests__/auth.service.test.ts
+++ b/packages/cli/src/auth/__tests__/auth.service.test.ts
@@ -6,6 +6,7 @@ import type {
 	InvalidAuthTokenRepository,
 	UserRepository,
 } from '@n8n/db';
+import { GLOBAL_OWNER_ROLE } from '@n8n/db';
 import type { NextFunction, Response } from 'express';
 import { mock } from 'jest-mock-extended';
 import jwt from 'jsonwebtoken';
@@ -15,6 +16,7 @@ import { AUTH_COOKIE_NAME } from '@/constants';
 import type { MfaService } from '@/mfa/mfa.service';
 import { JwtService } from '@/services/jwt.service';
 import type { UrlService } from '@/services/url.service';
+import type { License } from '@/license';
 
 describe('AuthService', () => {
 	const browserId = 'test-browser-id';
@@ -35,10 +37,11 @@ describe('AuthService', () => {
 	const userRepository = mock<UserRepository>();
 	const invalidAuthTokenRepository = mock<InvalidAuthTokenRepository>();
 	const mfaService = mock<MfaService>();
+	const license = mock<License>();
 	const authService = new AuthService(
 		globalConfig,
 		mock(),
-		mock(),
+		license,
 		jwtService,
 		urlService,
 		userRepository,
@@ -61,6 +64,7 @@ describe('AuthService', () => {
 		globalConfig.userManagement.jwtSessionDurationHours = 168;
 		globalConfig.userManagement.jwtRefreshTimeoutHours = 0;
 		globalConfig.auth.cookie = { secure: true, samesite: 'lax' };
+		license.isWithinUsersLimit.mockReturnValue(true);
 	});
 
 	describe('createJWTHash', () => {
@@ -520,6 +524,29 @@ describe('AuthService', () => {
 			});
 		});
 
+		describe('when user limit is reached', () => {
+			it('should block issuance if the user is not the global owner', async () => {
+				license.isWithinUsersLimit.mockReturnValue(false);
+				expect(() => {
+					authService.issueCookie(res, user, false, browserId);
+				}).toThrowError('Maximum number of users reached');
+			});
+
+			it('should allow issuance if the user is the global owner', async () => {
+				license.isWithinUsersLimit.mockReturnValue(false);
+				user.role = GLOBAL_OWNER_ROLE;
+				expect(() => {
+					authService.issueCookie(res, user, false, browserId);
+				}).not.toThrowError('Maximum number of users reached');
+				expect(res.cookie).toHaveBeenCalledWith('n8n-auth', validToken, {
+					httpOnly: true,
+					maxAge: 604800000,
+					sameSite: 'lax',
+					secure: true,
+				});
+			});
+		});
+
 		it('should issue a cookie with the correct options, when 2FA was used', () => {
 			authService.issueCookie(res, user, true, browserId);
 
diff --git a/packages/cli/src/auth/auth.service.ts b/packages/cli/src/auth/auth.service.ts
index ee139c40167..ccf72bd1049 100644
--- a/packages/cli/src/auth/auth.service.ts
+++ b/packages/cli/src/auth/auth.service.ts
@@ -10,7 +10,6 @@ import type { NextFunction, Response } from 'express';
 import { JsonWebTokenError, TokenExpiredError } from 'jsonwebtoken';
 import type { StringValue as TimeUnitValue } from 'ms';
 
-import config from '@/config';
 import { AuthError } from '@/errors/response-errors/auth.error';
 import { ForbiddenError } from '@/errors/response-errors/forbidden.error';
 import { License } from '@/license';
@@ -171,11 +170,7 @@ export class AuthService {
 		// TODO: move this check to the login endpoint in AuthController
 		// If the instance has exceeded its user quota, prevent non-owners from logging in
 		const isWithinUsersLimit = this.license.isWithinUsersLimit();
-		if (
-			config.getEnv('userManagement.isInstanceOwnerSetUp') &&
-			user.role.slug !== GLOBAL_OWNER_ROLE.slug &&
-			!isWithinUsersLimit
-		) {
+		if (user.role.slug !== GLOBAL_OWNER_ROLE.slug && !isWithinUsersLimit) {
 			throw new ForbiddenError(RESPONSE_ERROR_MESSAGES.USERS_QUOTA_REACHED);
 		}
 
diff --git a/packages/cli/src/commands/user-management/reset.ts b/packages/cli/src/commands/user-management/reset.ts
index cddd2027d82..91a9289d053 100644
--- a/packages/cli/src/commands/user-management/reset.ts
+++ b/packages/cli/src/commands/user-management/reset.ts
@@ -3,7 +3,6 @@ import {
 	User,
 	CredentialsRepository,
 	ProjectRepository,
-	SettingsRepository,
 	SharedCredentialsRepository,
 	SharedWorkflowRepository,
 	UserRepository,
@@ -19,6 +18,7 @@ const defaultUserProps = {
 	lastName: null,
 	email: null,
 	password: null,
+	lastActiveAt: null,
 	role: 'global:owner',
 };
 
@@ -53,11 +53,6 @@ export class Reset extends BaseCommand {
 		);
 		await Container.get(SharedCredentialsRepository).save(newSharedCredentials);
 
-		await Container.get(SettingsRepository).update(
-			{ key: 'userManagement.isInstanceOwnerSetUp' },
-			{ value: 'false' },
-		);
-
 		this.logger.info('Successfully reset the database to default user state.');
 	}
 
diff --git a/packages/cli/src/config/schema.ts b/packages/cli/src/config/schema.ts
index 294f200878a..fe2a30ff312 100644
--- a/packages/cli/src/config/schema.ts
+++ b/packages/cli/src/config/schema.ts
@@ -7,10 +7,12 @@ import { Container } from '@n8n/di';
 export const schema = {
 	userManagement: {
 		/**
-		 * @important Do not remove until after cloud hooks are updated to stop using convict config.
+		 * @important Do not remove isInstanceOwnerSetUp until after cloud hooks (user-management) are updated to stop using
+		 * this property
+		 * @deprecated
 		 */
 		isInstanceOwnerSetUp: {
-			// n8n loads this setting from DB on startup
+			// n8n loads this setting from SettingsRepository (DB) on startup
 			doc: "Whether the instance owner's account has been set up",
 			format: Boolean,
 			default: false,
diff --git a/packages/cli/src/config/types.ts b/packages/cli/src/config/types.ts
index aae7da82f63..314d6fa5931 100644
--- a/packages/cli/src/config/types.ts
+++ b/packages/cli/src/config/types.ts
@@ -76,7 +76,6 @@ type ToReturnType<T extends ConfigOptionPath> = T extends NumericPath
 type ExceptionPaths = {
 	'queue.bull.redis': RedisOptions;
 	processedDataManager: IProcessedDataConfig;
-	'userManagement.isInstanceOwnerSetUp': boolean;
 	'ui.banners.dismissed': string[] | undefined;
 	easyAIWorkflowOnboarded: boolean | undefined;
 };
diff --git a/packages/cli/src/controllers/__tests__/invitation.controller.test.ts b/packages/cli/src/controllers/__tests__/invitation.controller.test.ts
index 638baf6fa0b..4f3a1211ee7 100644
--- a/packages/cli/src/controllers/__tests__/invitation.controller.test.ts
+++ b/packages/cli/src/controllers/__tests__/invitation.controller.test.ts
@@ -22,6 +22,7 @@ import { ForbiddenError } from '@/errors/response-errors/forbidden.error';
 import config from '@/config';
 import type { AuthlessRequest } from '@/requests';
 import { v4 as uuidv4 } from 'uuid';
+import { OwnershipService } from '@/services/ownership.service';
 
 describe('InvitationController', () => {
 	const logger: Logger = mockInstance(Logger);
@@ -33,22 +34,29 @@ describe('InvitationController', () => {
 	const userRepository: UserRepository = mockInstance(UserRepository);
 	const postHog: PostHogClient = mockInstance(PostHogClient);
 	const eventService: EventService = mockInstance(EventService);
+	const ownershipService: OwnershipService = mockInstance(OwnershipService);
+
+	function defaultInvitationController() {
+		return new InvitationController(
+			logger,
+			externalHooks,
+			authService,
+			userService,
+			license,
+			passwordUtility,
+			userRepository,
+			postHog,
+			eventService,
+			ownershipService,
+		);
+	}
 
 	describe('inviteUser', () => {
 		it('throws a BadRequestError if SSO is enabled', async () => {
 			jest.spyOn(ssoHelpers, 'isSsoCurrentAuthenticationMethod').mockReturnValue(true);
+			jest.spyOn(ownershipService, 'hasInstanceOwner').mockReturnValue(Promise.resolve(true));
 
-			const invitationController = new InvitationController(
-				logger,
-				externalHooks,
-				authService,
-				userService,
-				license,
-				passwordUtility,
-				userRepository,
-				postHog,
-				eventService,
-			);
+			const invitationController = defaultInvitationController();
 
 			const user = mock<User>({
 				id: '123',
@@ -77,18 +85,9 @@ describe('InvitationController', () => {
 		it('throws a ForbiddenError if the user limit quota has been reached', async () => {
 			jest.spyOn(ssoHelpers, 'isSsoCurrentAuthenticationMethod').mockReturnValue(false);
 			jest.spyOn(license, 'isWithinUsersLimit').mockReturnValue(false);
+			jest.spyOn(ownershipService, 'hasInstanceOwner').mockReturnValue(Promise.resolve(true));
 
-			const invitationController = new InvitationController(
-				logger,
-				externalHooks,
-				authService,
-				userService,
-				license,
-				passwordUtility,
-				userRepository,
-				postHog,
-				eventService,
-			);
+			const invitationController = defaultInvitationController();
 
 			const user = mock<User>({
 				id: '123',
@@ -112,18 +111,9 @@ describe('InvitationController', () => {
 			jest.spyOn(ssoHelpers, 'isSsoCurrentAuthenticationMethod').mockReturnValue(false);
 			jest.spyOn(license, 'isWithinUsersLimit').mockReturnValue(true);
 			jest.spyOn(config, 'getEnv').mockReturnValue(false);
+			jest.spyOn(ownershipService, 'hasInstanceOwner').mockReturnValue(Promise.resolve(false));
 
-			const invitationController = new InvitationController(
-				logger,
-				externalHooks,
-				authService,
-				userService,
-				license,
-				passwordUtility,
-				userRepository,
-				postHog,
-				eventService,
-			);
+			const invitationController = defaultInvitationController();
 
 			const user = mock<User>({
 				id: '123',
@@ -148,18 +138,9 @@ describe('InvitationController', () => {
 			jest.spyOn(license, 'isWithinUsersLimit').mockReturnValue(true);
 			jest.spyOn(config, 'getEnv').mockReturnValue(true);
 			jest.spyOn(license, 'isAdvancedPermissionsLicensed').mockReturnValue(false);
+			jest.spyOn(ownershipService, 'hasInstanceOwner').mockReturnValue(Promise.resolve(true));
 
-			const invitationController = new InvitationController(
-				logger,
-				externalHooks,
-				authService,
-				userService,
-				license,
-				passwordUtility,
-				userRepository,
-				postHog,
-				eventService,
-			);
+			const invitationController = defaultInvitationController();
 
 			const user = mock<User>({
 				id: '123',
@@ -209,17 +190,9 @@ describe('InvitationController', () => {
 			jest.spyOn(config, 'getEnv').mockReturnValue(true);
 			jest.spyOn(license, 'isAdvancedPermissionsLicensed').mockReturnValue(true);
 			jest.spyOn(userService, 'inviteUsers').mockResolvedValue(inviteUsersResult);
-			const invitationController = new InvitationController(
-				logger,
-				externalHooks,
-				authService,
-				userService,
-				license,
-				passwordUtility,
-				userRepository,
-				postHog,
-				eventService,
-			);
+			jest.spyOn(ownershipService, 'hasInstanceOwner').mockReturnValue(Promise.resolve(true));
+
+			const invitationController = defaultInvitationController();
 
 			const user = mock<User>({
 				id: '123',
@@ -255,19 +228,11 @@ describe('InvitationController', () => {
 	describe('acceptInvitation', () => {
 		it('throws a BadRequestError if SSO is enabled', async () => {
 			jest.spyOn(ssoHelpers, 'isSsoCurrentAuthenticationMethod').mockReturnValue(true);
+			jest.spyOn(ownershipService, 'hasInstanceOwner').mockReturnValue(Promise.resolve(true));
+
 			const id = uuidv4();
 
-			const invitationController = new InvitationController(
-				logger,
-				externalHooks,
-				authService,
-				userService,
-				license,
-				passwordUtility,
-				userRepository,
-				postHog,
-				eventService,
-			);
+			const invitationController = defaultInvitationController();
 
 			const payload = new AcceptInvitationRequestDto({
 				inviterId: id,
@@ -291,19 +256,11 @@ describe('InvitationController', () => {
 
 		it('throws a BadRequestError if the inviter ID and invitee ID are not found in the database', async () => {
 			jest.spyOn(ssoHelpers, 'isSsoCurrentAuthenticationMethod').mockReturnValue(false);
+			jest.spyOn(ownershipService, 'hasInstanceOwner').mockReturnValue(Promise.resolve(true));
+
 			const id = uuidv4();
 
-			const invitationController = new InvitationController(
-				logger,
-				externalHooks,
-				authService,
-				userService,
-				license,
-				passwordUtility,
-				userRepository,
-				postHog,
-				eventService,
-			);
+			const invitationController = defaultInvitationController();
 
 			const payload = new AcceptInvitationRequestDto({
 				inviterId: id,
@@ -332,6 +289,8 @@ describe('InvitationController', () => {
 
 		it('throws a BadRequestError if the invitee already has a password', async () => {
 			jest.spyOn(ssoHelpers, 'isSsoCurrentAuthenticationMethod').mockReturnValue(false);
+			jest.spyOn(ownershipService, 'hasInstanceOwner').mockReturnValue(Promise.resolve(true));
+
 			const invitee = mock<User>({
 				id: '123',
 				email: 'valid@email.com',
@@ -346,17 +305,7 @@ describe('InvitationController', () => {
 			jest.spyOn(userRepository, 'find').mockResolvedValue([inviter, invitee]);
 			const id = uuidv4();
 
-			const invitationController = new InvitationController(
-				logger,
-				externalHooks,
-				authService,
-				userService,
-				license,
-				passwordUtility,
-				userRepository,
-				postHog,
-				eventService,
-			);
+			const invitationController = defaultInvitationController();
 
 			const payload = new AcceptInvitationRequestDto({
 				inviterId: id,
@@ -379,6 +328,8 @@ describe('InvitationController', () => {
 
 		it('accepts the invitation successfully', async () => {
 			jest.spyOn(ssoHelpers, 'isSsoCurrentAuthenticationMethod').mockReturnValue(false);
+			jest.spyOn(ownershipService, 'hasInstanceOwner').mockReturnValue(Promise.resolve(true));
+
 			const id = uuidv4();
 			const inviter = mock<User>({
 				id: '124',
@@ -400,17 +351,7 @@ describe('InvitationController', () => {
 			jest.spyOn(userService, 'toPublic').mockResolvedValue(invitee as unknown as PublicUser);
 			jest.spyOn(externalHooks, 'run').mockResolvedValue(invitee as never);
 
-			const invitationController = new InvitationController(
-				logger,
-				externalHooks,
-				authService,
-				userService,
-				license,
-				passwordUtility,
-				userRepository,
-				postHog,
-				eventService,
-			);
+			const invitationController = defaultInvitationController();
 
 			const payload = new AcceptInvitationRequestDto({
 				inviterId: id,
diff --git a/packages/cli/src/controllers/__tests__/owner.controller.test.ts b/packages/cli/src/controllers/__tests__/owner.controller.test.ts
index ebabd8cb697..1edfbd8af20 100644
--- a/packages/cli/src/controllers/__tests__/owner.controller.test.ts
+++ b/packages/cli/src/controllers/__tests__/owner.controller.test.ts
@@ -1,103 +1,40 @@
-import type { DismissBannerRequestDto, OwnerSetupRequestDto } from '@n8n/api-types';
-import type { Logger } from '@n8n/backend-common';
-import {
-	type AuthenticatedRequest,
-	type User,
-	type PublicUser,
-	type SettingsRepository,
-	type UserRepository,
-	GLOBAL_OWNER_ROLE,
-} from '@n8n/db';
-import type { Response } from 'express';
+import type { DismissBannerRequestDto } from '@n8n/api-types';
 import { mock } from 'jest-mock-extended';
 
 import type { AuthService } from '@/auth/auth.service';
-import config from '@/config';
 import { OwnerController } from '@/controllers/owner.controller';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
-import type { EventService } from '@/events/event.service';
 import type { BannerService } from '@/services/banner.service';
-import type { PasswordUtility } from '@/services/password.utility';
 import type { UserService } from '@/services/user.service';
+import type { OwnershipService } from '@/services/ownership.service';
+import type { PostHogClient } from '@/posthog';
 
 describe('OwnerController', () => {
-	const configGetSpy = jest.spyOn(config, 'getEnv');
-	const configSetSpy = jest.spyOn(config, 'set');
-
-	const logger = mock<Logger>();
-	const eventService = mock<EventService>();
 	const authService = mock<AuthService>();
 	const bannerService = mock<BannerService>();
 	const userService = mock<UserService>();
-	const userRepository = mock<UserRepository>();
-	const settingsRepository = mock<SettingsRepository>();
-	const passwordUtility = mock<PasswordUtility>();
+	const ownershipService = mock<OwnershipService>();
+	const postHogClient = mock<PostHogClient>();
 
 	const controller = new OwnerController(
-		logger,
-		eventService,
-		settingsRepository,
 		authService,
 		bannerService,
 		userService,
-		passwordUtility,
-		mock(),
-		userRepository,
+		postHogClient,
+		ownershipService,
 	);
 
 	describe('setupOwner', () => {
-		it('should throw a BadRequestError if the instance owner is already setup', async () => {
-			configGetSpy.mockReturnValue(true);
+		it('should pass on errors from the service', async () => {
+			jest
+				.spyOn(ownershipService, 'setupOwner')
+				.mockRejectedValueOnce(new BadRequestError('Instance owner already setup'));
+
 			await expect(controller.setupOwner(mock(), mock(), mock())).rejects.toThrowError(
 				new BadRequestError('Instance owner already setup'),
 			);
 
-			expect(userRepository.findOneOrFail).not.toHaveBeenCalled();
-			expect(userRepository.save).not.toHaveBeenCalled();
 			expect(authService.issueCookie).not.toHaveBeenCalled();
-			expect(settingsRepository.update).not.toHaveBeenCalled();
-			expect(configSetSpy).not.toHaveBeenCalled();
-			expect(eventService.emit).not.toHaveBeenCalled();
-			expect(logger.debug).toHaveBeenCalledWith(
-				'Request to claim instance ownership failed because instance owner already exists',
-			);
-		});
-
-		it('should setup the instance owner successfully', async () => {
-			const user = mock<User>({
-				id: 'userId',
-				role: GLOBAL_OWNER_ROLE,
-				authIdentities: [],
-			});
-			const browserId = 'test-browser-id';
-			const req = mock<AuthenticatedRequest>({ user, browserId, authInfo: { usedMfa: false } });
-			const res = mock<Response>();
-			const payload = mock<OwnerSetupRequestDto>({
-				email: 'valid@email.com',
-				password: 'NewPassword123',
-				firstName: 'Jane',
-				lastName: 'Doe',
-			});
-			configGetSpy.mockReturnValue(false);
-			userRepository.findOneOrFail.mockResolvedValue(user);
-			userRepository.save.mockResolvedValue(user);
-			userService.toPublic.mockResolvedValue(mock<PublicUser>({ id: 'newUserId' }));
-
-			const result = await controller.setupOwner(req, res, payload);
-
-			expect(userRepository.findOneOrFail).toHaveBeenCalledWith({
-				where: { role: { slug: GLOBAL_OWNER_ROLE.slug } },
-				relations: ['role'],
-			});
-			expect(userRepository.save).toHaveBeenCalledWith(user, { transaction: false });
-			expect(authService.issueCookie).toHaveBeenCalledWith(res, user, false, browserId);
-			expect(settingsRepository.update).toHaveBeenCalledWith(
-				{ key: 'userManagement.isInstanceOwnerSetUp' },
-				{ value: JSON.stringify(true) },
-			);
-			expect(configSetSpy).toHaveBeenCalledWith('userManagement.isInstanceOwnerSetUp', true);
-			expect(eventService.emit).toHaveBeenCalledWith('instance-owner-setup', { userId: 'userId' });
-			expect(result.id).toEqual('newUserId');
 		});
 	});
 
diff --git a/packages/cli/src/controllers/e2e.controller.ts b/packages/cli/src/controllers/e2e.controller.ts
index 3548867b510..8faf4910330 100644
--- a/packages/cli/src/controllers/e2e.controller.ts
+++ b/packages/cli/src/controllers/e2e.controller.ts
@@ -16,7 +16,6 @@ import { Request } from 'express';
 import { v4 as uuid } from 'uuid';
 
 import { ActiveWorkflowManager } from '@/active-workflow-manager';
-import config from '@/config';
 import { inE2ETests } from '@/constants';
 import { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus';
 import type { FeatureReturnType } from '@/license';
@@ -223,8 +222,7 @@ export class E2EController {
 
 	@Get('/env-feature-flags', { skipAuth: true })
 	async getEnvFeatureFlags() {
-		const currentFlags = this.frontendService.getSettings().envFeatureFlags;
-		return currentFlags;
+		return (await this.frontendService.getSettings()).envFeatureFlags;
 	}
 
 	@Patch('/env-feature-flags', { skipAuth: true })
@@ -254,7 +252,7 @@ export class E2EController {
 		}
 
 		// Return the current environment feature flags
-		const currentFlags = this.frontendService.getSettings().envFeatureFlags;
+		const currentFlags = (await this.frontendService.getSettings()).envFeatureFlags;
 		return {
 			success: true,
 			message: 'Environment feature flags updated',
@@ -364,13 +362,6 @@ export class E2EController {
 				mfaRecoveryCodes: encryptedRecoveryCodes,
 			});
 		}
-
-		await this.settingsRepo.update(
-			{ key: 'userManagement.isInstanceOwnerSetUp' },
-			{ value: 'true' },
-		);
-
-		config.set('userManagement.isInstanceOwnerSetUp', true);
 	}
 
 	private async resetCache() {
diff --git a/packages/cli/src/controllers/invitation.controller.ts b/packages/cli/src/controllers/invitation.controller.ts
index 2be98a7f2b8..84391593a8b 100644
--- a/packages/cli/src/controllers/invitation.controller.ts
+++ b/packages/cli/src/controllers/invitation.controller.ts
@@ -6,7 +6,6 @@ import { Post, GlobalScope, RestController, Body, Param } from '@n8n/decorators'
 import { Response } from 'express';
 
 import { AuthService } from '@/auth/auth.service';
-import config from '@/config';
 import { RESPONSE_ERROR_MESSAGES } from '@/constants';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 import { ForbiddenError } from '@/errors/response-errors/forbidden.error';
@@ -17,6 +16,7 @@ import { PostHogClient } from '@/posthog';
 import { AuthlessRequest } from '@/requests';
 import { PasswordUtility } from '@/services/password.utility';
 import { UserService } from '@/services/user.service';
+import { OwnershipService } from '@/services/ownership.service';
 import { isSsoCurrentAuthenticationMethod } from '@/sso.ee/sso-helpers';
 
 @RestController('/invitations')
@@ -31,6 +31,7 @@ export class InvitationController {
 		private readonly userRepository: UserRepository,
 		private readonly postHog: PostHogClient,
 		private readonly eventService: EventService,
+		private readonly ownershipService: OwnershipService,
 	) {}
 
 	/**
@@ -64,7 +65,7 @@ export class InvitationController {
 			throw new ForbiddenError(RESPONSE_ERROR_MESSAGES.USERS_QUOTA_REACHED);
 		}
 
-		if (!config.getEnv('userManagement.isInstanceOwnerSetUp')) {
+		if (!(await this.ownershipService.hasInstanceOwner())) {
 			this.logger.debug(
 				'Request to send email invite(s) to user(s) failed because the owner account is not set up',
 			);
diff --git a/packages/cli/src/controllers/owner.controller.ts b/packages/cli/src/controllers/owner.controller.ts
index 6192fed4cb8..1365cbb526b 100644
--- a/packages/cli/src/controllers/owner.controller.ts
+++ b/packages/cli/src/controllers/owner.controller.ts
@@ -1,82 +1,31 @@
 import { DismissBannerRequestDto, OwnerSetupRequestDto } from '@n8n/api-types';
-import { Logger } from '@n8n/backend-common';
-import {
-	AuthenticatedRequest,
-	GLOBAL_OWNER_ROLE,
-	SettingsRepository,
-	UserRepository,
-} from '@n8n/db';
+import { AuthenticatedRequest } from '@n8n/db';
 import { Body, GlobalScope, Post, RestController } from '@n8n/decorators';
 import { Response } from 'express';
 
 import { AuthService } from '@/auth/auth.service';
-import config from '@/config';
-import { BadRequestError } from '@/errors/response-errors/bad-request.error';
-import { EventService } from '@/events/event.service';
-import { validateEntity } from '@/generic-helpers';
 import { PostHogClient } from '@/posthog';
 import { BannerService } from '@/services/banner.service';
-import { PasswordUtility } from '@/services/password.utility';
 import { UserService } from '@/services/user.service';
+import { OwnershipService } from '@/services/ownership.service';
 
 @RestController('/owner')
 export class OwnerController {
 	constructor(
-		private readonly logger: Logger,
-		private readonly eventService: EventService,
-		private readonly settingsRepository: SettingsRepository,
 		private readonly authService: AuthService,
 		private readonly bannerService: BannerService,
 		private readonly userService: UserService,
-		private readonly passwordUtility: PasswordUtility,
 		private readonly postHog: PostHogClient,
-		private readonly userRepository: UserRepository,
+		private readonly ownershipService: OwnershipService,
 	) {}
 
 	/**
-	 * Promote a shell into the owner of the n8n instance,
-	 * and enable `isInstanceOwnerSetUp` setting.
+	 * Promote a shell into the owner of the n8n instance
 	 */
 	@Post('/setup', { skipAuth: true })
 	async setupOwner(req: AuthenticatedRequest, res: Response, @Body payload: OwnerSetupRequestDto) {
-		const { email, firstName, lastName, password } = payload;
-
-		if (config.getEnv('userManagement.isInstanceOwnerSetUp')) {
-			this.logger.debug(
-				'Request to claim instance ownership failed because instance owner already exists',
-			);
-			throw new BadRequestError('Instance owner already setup');
-		}
-
-		let owner = await this.userRepository.findOneOrFail({
-			where: { role: { slug: GLOBAL_OWNER_ROLE.slug } },
-			relations: ['role'],
-		});
-		owner.email = email;
-		owner.firstName = firstName;
-		owner.lastName = lastName;
-		owner.password = await this.passwordUtility.hash(password);
-
-		// TODO: move XSS validation out into the DTO class
-		await validateEntity(owner);
-
-		owner = await this.userRepository.save(owner, { transaction: false });
-
-		this.logger.info('Owner was set up successfully');
-
-		await this.settingsRepository.update(
-			{ key: 'userManagement.isInstanceOwnerSetUp' },
-			{ value: JSON.stringify(true) },
-		);
-
-		config.set('userManagement.isInstanceOwnerSetUp', true);
-
-		this.logger.debug('Setting isInstanceOwnerSetUp updated successfully');
-
+		const owner = await this.ownershipService.setupOwner(payload);
 		this.authService.issueCookie(res, owner, req.authInfo?.usedMfa ?? false, req.browserId);
-
-		this.eventService.emit('instance-owner-setup', { userId: owner.id });
-
 		return await this.userService.toPublic(owner, { posthog: this.postHog, withScopes: true });
 	}
 
diff --git a/packages/cli/src/server.ts b/packages/cli/src/server.ts
index a5fc76eaca8..e237016a263 100644
--- a/packages/cli/src/server.ts
+++ b/packages/cli/src/server.ts
@@ -200,7 +200,7 @@ export class Server extends AbstractServer {
 
 		const { frontendService } = this;
 		if (frontendService) {
-			await this.externalHooks.run('frontend.settings', [frontendService.getSettings()]);
+			await this.externalHooks.run('frontend.settings', [await frontendService.getSettings()]);
 		}
 
 		await this.postHogClient.init();
@@ -215,7 +215,7 @@ export class Server extends AbstractServer {
 			const { apiRouters, apiLatestVersion } = await loadPublicApiVersions(publicApiEndpoint);
 			this.app.use(...apiRouters);
 			if (frontendService) {
-				frontendService.settings.publicApi.latestVersion = apiLatestVersion;
+				(await frontendService.getSettings()).publicApi.latestVersion = apiLatestVersion;
 			}
 		}
 
@@ -487,7 +487,9 @@ export class Server extends AbstractServer {
 				`/${this.restEndpoint}/settings`,
 				authService.createAuthMiddleware({ allowSkipMFA: false, allowUnauthenticated: true }),
 				ResponseHelper.send(async (req: AuthenticatedRequest) => {
-					return req.user ? frontendService.getSettings() : frontendService.getPublicSettings();
+					return req.user
+						? await frontendService.getSettings()
+						: await frontendService.getPublicSettings();
 				}),
 			);
 		}
diff --git a/packages/cli/src/services/__tests__/frontend.service.test.ts b/packages/cli/src/services/__tests__/frontend.service.test.ts
index 9da6558e4e2..94c061f809f 100644
--- a/packages/cli/src/services/__tests__/frontend.service.test.ts
+++ b/packages/cli/src/services/__tests__/frontend.service.test.ts
@@ -14,6 +14,7 @@ import type { PushConfig } from '@/push/push.config';
 import { FrontendService, type PublicFrontendSettings } from '@/services/frontend.service';
 import type { UrlService } from '@/services/url.service';
 import type { UserManagementMailer } from '@/user-management/email';
+import type { OwnershipService } from '../ownership.service';
 
 // Mock the workflow history helper functions to avoid DI container issues in tests
 jest.mock('@/workflows/workflow-history/workflow-history-helper', () => ({
@@ -148,6 +149,10 @@ describe('FrontendService', () => {
 		isMFAEnforced: jest.fn().mockReturnValue(false),
 	});
 
+	const ownershipService = mock<OwnershipService>({
+		hasInstanceOwner: jest.fn().mockReturnValue(false),
+	});
+
 	const createMockService = () => {
 		Container.set(
 			CommunityPackagesConfig,
@@ -173,6 +178,7 @@ describe('FrontendService', () => {
 				licenseState,
 				moduleRegistry,
 				mfaService,
+				ownershipService,
 			),
 			license,
 		};
@@ -188,9 +194,9 @@ describe('FrontendService', () => {
 	});
 
 	describe('getSettings', () => {
-		it('should return frontend settings', () => {
+		it('should return frontend settings', async () => {
 			const { service } = createMockService();
-			const settings = service.getSettings();
+			const settings = await service.getSettings();
 
 			expect(settings).toEqual(
 				expect.objectContaining({
@@ -201,7 +207,7 @@ describe('FrontendService', () => {
 	});
 
 	describe('getPublicSettings', () => {
-		it('should return public settings', () => {
+		it('should return public settings', async () => {
 			const expectedPublicSettings: PublicFrontendSettings = {
 				settingsMode: 'public',
 				userManagement: {
@@ -223,7 +229,7 @@ describe('FrontendService', () => {
 			};
 
 			const { service } = createMockService();
-			const settings = service.getPublicSettings();
+			const settings = await service.getPublicSettings();
 
 			expect(settings).toEqual(expectedPublicSettings);
 		});
@@ -282,29 +288,31 @@ describe('FrontendService', () => {
 		});
 
 		describe('settings integration', () => {
-			it('should include envFeatureFlags in initial settings', () => {
+			it('should include envFeatureFlags in initial settings', async () => {
 				process.env = {
 					N8N_ENV_FEAT_INIT_FLAG: 'true',
 					N8N_ENV_FEAT_ANOTHER_FLAG: 'false',
 				};
 
 				const { service } = createMockService();
+				const settings = await service.getSettings();
 
-				expect(service.settings.envFeatureFlags).toEqual({
+				expect(settings.envFeatureFlags).toEqual({
 					N8N_ENV_FEAT_INIT_FLAG: 'true',
 					N8N_ENV_FEAT_ANOTHER_FLAG: 'false',
 				});
 			});
 
-			it('should refresh envFeatureFlags when getSettings is called', () => {
+			it('should refresh envFeatureFlags when getSettings is called', async () => {
 				process.env = {
 					N8N_ENV_FEAT_INITIAL_FLAG: 'true',
 				};
 
 				const { service } = createMockService();
+				const initialSettings = await service.getSettings();
 
 				// Verify initial state
-				expect(service.settings.envFeatureFlags).toEqual({
+				expect(initialSettings.envFeatureFlags).toEqual({
 					N8N_ENV_FEAT_INITIAL_FLAG: 'true',
 				});
 
@@ -315,7 +323,7 @@ describe('FrontendService', () => {
 				};
 
 				// getSettings should refresh the flags
-				const settings = service.getSettings();
+				const settings = await service.getSettings();
 
 				expect(settings.envFeatureFlags).toEqual({
 					N8N_ENV_FEAT_INITIAL_FLAG: 'false',
@@ -326,33 +334,33 @@ describe('FrontendService', () => {
 	});
 
 	describe('aiBuilder setting', () => {
-		it('should initialize aiBuilder setting as disabled by default', () => {
+		it('should initialize aiBuilder setting as disabled by default', async () => {
 			const { service } = createMockService();
-
-			expect(service.settings.aiBuilder).toEqual({
+			const initialSettings = await service.getSettings();
+			expect(initialSettings.aiBuilder).toEqual({
 				enabled: false,
 				setup: false,
 			});
 		});
 
-		it('should set aiBuilder.enabled to true when license has feat:aiBuilder', () => {
+		it('should set aiBuilder.enabled to true when license has feat:aiBuilder', async () => {
 			const { service, license } = createMockService();
 
 			license.isLicensed.mockImplementation((feature) => {
 				return feature === 'feat:aiBuilder';
 			});
 
-			const settings = service.getSettings();
+			const settings = await service.getSettings();
 
 			expect(settings.aiBuilder.enabled).toBe(true);
 		});
 
-		it('should keep aiBuilder.enabled as false when license does not have feat:aiBuilder', () => {
+		it('should keep aiBuilder.enabled as false when license does not have feat:aiBuilder', async () => {
 			const { service, license } = createMockService();
 
 			license.isLicensed.mockReturnValue(false);
 
-			const settings = service.getSettings();
+			const settings = await service.getSettings();
 
 			expect(settings.aiBuilder.enabled).toBe(false);
 		});
diff --git a/packages/cli/src/services/__tests__/ownership.service.integration.test.ts b/packages/cli/src/services/__tests__/ownership.service.integration.test.ts
new file mode 100644
index 00000000000..30c0fabdfc1
--- /dev/null
+++ b/packages/cli/src/services/__tests__/ownership.service.integration.test.ts
@@ -0,0 +1,60 @@
+import { testDb } from '@n8n/backend-test-utils';
+import { GLOBAL_OWNER_ROLE } from '@n8n/db';
+import { Container } from '@n8n/di';
+
+import { HooksService } from '@/services/hooks.service';
+import { OwnershipService } from '@/services/ownership.service';
+import { createUserShell } from '@test-integration/db/users';
+
+let hookService: HooksService;
+let ownershipService: OwnershipService;
+
+// See PAY-4247 - This test case can be deleted when the ticket is complete
+describe('Ownership Service integration test', () => {
+	beforeEach(async () => {
+		await testDb.truncate(['User']);
+		await createUserShell(GLOBAL_OWNER_ROLE);
+		jest.clearAllMocks();
+	});
+
+	beforeAll(async () => {
+		await testDb.init();
+		hookService = Container.get(HooksService);
+		ownershipService = Container.get(OwnershipService);
+	});
+
+	afterAll(async () => {
+		await testDb.terminate();
+	});
+
+	it('should recognise ownership creation from cloud hooks', async () => {
+		expect(await ownershipService.hasInstanceOwner()).toBeFalsy();
+		const shellOwnerUser = await hookService.findOneUser({
+			where: {
+				role: {
+					slug: GLOBAL_OWNER_ROLE.slug,
+				},
+			},
+		});
+		// @ts-expect-error - this is how this function is called in the cloud hook so I match it here
+		await hookService.saveUser({
+			firstName: 'FN',
+			lastName: 'LN',
+			email: 'fn@ln.com',
+			password: '<hashed_password>',
+			id: shellOwnerUser!.id,
+		});
+		expect(await ownershipService.hasInstanceOwner()).toBeTruthy();
+	});
+
+	it('should recognise ownership creation from api', async () => {
+		expect(await ownershipService.hasInstanceOwner()).toBeFalsy();
+		await ownershipService.setupOwner({
+			firstName: 'TEST',
+			lastName: 'LN',
+			password: 'PW',
+			email: 'EM@em.com',
+		});
+		expect(await ownershipService.hasInstanceOwner()).toBeTruthy();
+	});
+});
diff --git a/packages/cli/src/services/__tests__/ownership.service.test.ts b/packages/cli/src/services/__tests__/ownership.service.test.ts
index 824e2756d10..d9e5a278d9b 100644
--- a/packages/cli/src/services/__tests__/ownership.service.test.ts
+++ b/packages/cli/src/services/__tests__/ownership.service.test.ts
@@ -1,5 +1,5 @@
+import { Logger } from '@n8n/backend-common';
 import { mockInstance } from '@n8n/backend-test-utils';
-import type { SharedCredentials } from '@n8n/db';
 import {
 	Project,
 	SharedWorkflow,
@@ -12,10 +12,15 @@ import {
 	GLOBAL_OWNER_ROLE,
 	PROJECT_OWNER_ROLE,
 } from '@n8n/db';
+import type { SharedCredentials, SettingsRepository } from '@n8n/db';
 import { PROJECT_OWNER_ROLE_SLUG } from '@n8n/permissions';
+import { mock } from 'jest-mock-extended';
 import { v4 as uuid } from 'uuid';
 
+import { BadRequestError } from '@/errors/response-errors/bad-request.error';
+import type { EventService } from '@/events/event.service';
 import { OwnershipService } from '@/services/ownership.service';
+import { PasswordUtility } from '@/services/password.utility';
 import { mockCredential, mockProject } from '@test/mock-objects';
 
 import { CacheService } from '../cache/cache.service';
@@ -25,11 +30,20 @@ describe('OwnershipService', () => {
 	const sharedWorkflowRepository = mockInstance(SharedWorkflowRepository);
 	const projectRelationRepository = mockInstance(ProjectRelationRepository);
 	const cacheService = mockInstance(CacheService);
+	const passwordUtility = mockInstance(PasswordUtility);
+	const logger = mockInstance(Logger);
+	const eventService = mock<EventService>();
+	const settingsRepository = mock<SettingsRepository>();
+
 	const ownershipService = new OwnershipService(
 		cacheService,
-		userRepository,
+		eventService,
+		logger,
+		passwordUtility,
 		projectRelationRepository,
 		sharedWorkflowRepository,
+		userRepository,
+		settingsRepository,
 	);
 
 	beforeEach(() => {
@@ -67,7 +81,8 @@ describe('OwnershipService', () => {
 			owner.role = GLOBAL_OWNER_ROLE;
 			const projectRelation = new ProjectRelation();
 			projectRelation.role = PROJECT_OWNER_ROLE;
-			(projectRelation.project = project), (projectRelation.user = owner);
+			projectRelation.project = project;
+			projectRelation.user = owner;
 
 			projectRelationRepository.getPersonalProjectOwners.mockResolvedValueOnce([projectRelation]);
 
@@ -94,8 +109,9 @@ describe('OwnershipService', () => {
 			owner.id = uuid();
 			owner.role = GLOBAL_OWNER_ROLE;
 			const projectRelation = new ProjectRelation();
-			projectRelation.role = { slug: PROJECT_OWNER_ROLE_SLUG } as any;
-			(projectRelation.project = project), (projectRelation.user = owner);
+			projectRelation.role = PROJECT_OWNER_ROLE;
+			projectRelation.project = project;
+			projectRelation.user = owner;
 
 			cacheService.getHashValue.mockResolvedValueOnce(owner);
 			userRepository.create.mockReturnValueOnce(owner);
@@ -226,4 +242,50 @@ describe('OwnershipService', () => {
 			});
 		});
 	});
+
+	describe('setupOwner()', () => {
+		it('should throw a BadRequestError if the instance owner is already setup', async () => {
+			jest.spyOn(userRepository, 'exists').mockResolvedValueOnce(true);
+
+			await expect(ownershipService.setupOwner(mock())).rejects.toThrowError(
+				new BadRequestError('Instance owner already setup'),
+			);
+
+			expect(userRepository.save).not.toHaveBeenCalled();
+			expect(eventService.emit).not.toHaveBeenCalled();
+			expect(logger.debug).toHaveBeenCalledWith(
+				'Request to claim instance ownership failed because instance owner already exists',
+			);
+		});
+
+		it('should setup the instance owner successfully', async () => {
+			const user = mock<User>({
+				id: 'userId',
+				role: GLOBAL_OWNER_ROLE,
+				authIdentities: [],
+			});
+
+			const payload = {
+				email: 'valid@email.com',
+				password: 'NewPassword123',
+				firstName: 'Jane',
+				lastName: 'Doe',
+			};
+
+			//	not quite perfect as we hash the password.
+			const expected = { ...user, ...payload, id: 'newUserId' };
+
+			userRepository.exists.mockResolvedValueOnce(false);
+			userRepository.findOneOrFail.mockResolvedValueOnce(user);
+			userRepository.save.mockResolvedValueOnce(expected);
+
+			const actual = await ownershipService.setupOwner(payload);
+
+			expect(userRepository.save).toHaveBeenCalledWith(user, { transaction: false });
+			expect(eventService.emit).toHaveBeenCalledWith('instance-owner-setup', {
+				userId: 'newUserId',
+			});
+			expect(actual.id).toEqual('newUserId');
+		});
+	});
 });
diff --git a/packages/cli/src/services/frontend.service.ts b/packages/cli/src/services/frontend.service.ts
index 36902840555..ff7759f6f5b 100644
--- a/packages/cli/src/services/frontend.service.ts
+++ b/packages/cli/src/services/frontend.service.ts
@@ -20,6 +20,7 @@ import { getLdapLoginLabel } from '@/ldap.ee/helpers.ee';
 import { License } from '@/license';
 import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials';
 import { MfaService } from '@/mfa/mfa.service';
+import { OwnershipService } from '@/services/ownership.service';
 import { CommunityPackagesConfig } from '@/modules/community-packages/community-packages.config';
 import type { CommunityPackagesService } from '@/modules/community-packages/community-packages.service';
 import { isApiEnabled } from '@/public-api';
@@ -93,7 +94,7 @@ export type PublicFrontendSettings = {
 
 @Service()
 export class FrontendService {
-	settings: FrontendSettings;
+	private settings: FrontendSettings;
 
 	private communityPackagesService?: CommunityPackagesService;
 
@@ -113,12 +114,10 @@ export class FrontendService {
 		private readonly licenseState: LicenseState,
 		private readonly moduleRegistry: ModuleRegistry,
 		private readonly mfaService: MfaService,
+		private readonly ownershipService: OwnershipService,
 	) {
 		loadNodesAndCredentials.addPostProcessor(async () => await this.generateTypes());
 		void this.generateTypes();
-
-		this.initSettings();
-
 		// @TODO: Move to community-packages module
 		if (Container.get(CommunityPackagesConfig).enabled) {
 			void import('@/modules/community-packages/community-packages.service').then(
@@ -141,7 +140,7 @@ export class FrontendService {
 		return envFeatureFlags;
 	}
 
-	private initSettings() {
+	private async initSettings() {
 		const instanceBaseUrl = this.urlService.getInstanceBaseUrl();
 		const restEndpoint = this.globalConfig.endpoints.rest;
 
@@ -230,7 +229,7 @@ export class FrontendService {
 			defaultLocale: this.globalConfig.defaultLocale,
 			userManagement: {
 				quota: this.license.getUsersLimit(),
-				showSetupOnFirstLoad: !config.getEnv('userManagement.isInstanceOwnerSetUp'),
+				showSetupOnFirstLoad: !(await this.ownershipService.hasInstanceOwner()),
 				smtpSetup: this.mailer.isEmailSetUp,
 				authenticationMethod: getCurrentAuthenticationMethod(),
 			},
@@ -374,7 +373,10 @@ export class FrontendService {
 		this.writeStaticJSON('credentials', credentials);
 	}
 
-	getSettings(): FrontendSettings {
+	async getSettings(): Promise<FrontendSettings> {
+		if (!this.settings) {
+			await this.initSettings();
+		}
 		const restEndpoint = this.globalConfig.endpoints.rest;
 
 		// Update all urls, in case `WEBHOOK_URL` was updated by `--tunnel`
@@ -390,7 +392,7 @@ export class FrontendService {
 		Object.assign(this.settings.userManagement, {
 			quota: this.license.getUsersLimit(),
 			authenticationMethod: getCurrentAuthenticationMethod(),
-			showSetupOnFirstLoad: !config.getEnv('userManagement.isInstanceOwnerSetUp'),
+			showSetupOnFirstLoad: !(await this.ownershipService.hasInstanceOwner()),
 		});
 
 		let dismissedBanners: string[] = [];
@@ -517,7 +519,7 @@ export class FrontendService {
 	 * Only add settings that are absolutely necessary for non-authenticated pages
 	 * @returns Public settings for unauthenticated users
 	 */
-	getPublicSettings(): PublicFrontendSettings {
+	async getPublicSettings(): Promise<PublicFrontendSettings> {
 		// Get full settings to ensure all required properties are initialized
 		const {
 			userManagement: { authenticationMethod, showSetupOnFirstLoad, smtpSetup },
@@ -525,7 +527,7 @@ export class FrontendService {
 			authCookie,
 			previewMode,
 			enterprise: { saml, ldap, oidc },
-		} = this.getSettings();
+		} = await this.getSettings();
 
 		const publicSettings: PublicFrontendSettings = {
 			settingsMode: 'public',
diff --git a/packages/cli/src/services/ownership.service.ts b/packages/cli/src/services/ownership.service.ts
index 196fc39c914..46c44d45181 100644
--- a/packages/cli/src/services/ownership.service.ts
+++ b/packages/cli/src/services/ownership.service.ts
@@ -7,19 +7,31 @@ import {
 	SharedWorkflowRepository,
 	UserRepository,
 	Role,
+	SettingsRepository,
 	Scope,
 } from '@n8n/db';
 import { Service } from '@n8n/di';
-
+import { Logger } from '@n8n/backend-common';
 import { CacheService } from '@/services/cache/cache.service';
+import { OwnerSetupRequestDto } from '@n8n/api-types';
+import { BadRequestError } from '@/errors/response-errors/bad-request.error';
+import { EventService } from '@/events/event.service';
+import { PasswordUtility } from './password.utility';
+import { IsNull } from '@n8n/typeorm/find-options/operator/IsNull';
+import { Not } from '@n8n/typeorm/find-options/operator/Not';
+import config from '@/config';
 
 @Service()
 export class OwnershipService {
 	constructor(
 		private cacheService: CacheService,
-		private userRepository: UserRepository,
+		private eventService: EventService,
+		private logger: Logger,
+		private passwordUtility: PasswordUtility,
 		private projectRelationRepository: ProjectRelationRepository,
 		private sharedWorkflowRepository: SharedWorkflowRepository,
+		private userRepository: UserRepository,
+		private settingsRepository: SettingsRepository,
 	) {}
 
 	// To make use of the cache service we should store POJOs, these
@@ -179,4 +191,64 @@ export class OwnershipService {
 			where: { role: { slug: GLOBAL_OWNER_ROLE.slug } },
 		});
 	}
+
+	async hasInstanceOwner() {
+		return await this.userRepository.exists({
+			where: [
+				{
+					role: { slug: GLOBAL_OWNER_ROLE.slug },
+					// We use this to avoid selecting the "shell" user
+					lastActiveAt: Not(IsNull()),
+				},
+				// OR
+				// This condition only exists because of PAY-4247
+				{
+					role: { slug: GLOBAL_OWNER_ROLE.slug },
+					// We use this to avoid selecting the "shell" user
+					password: Not(IsNull()),
+				},
+			],
+			relations: ['role'],
+		});
+	}
+
+	async setupOwner(payload: OwnerSetupRequestDto) {
+		const { email, firstName, lastName, password } = payload;
+		if (await this.hasInstanceOwner()) {
+			this.logger.debug(
+				'Request to claim instance ownership failed because instance owner already exists',
+			);
+			throw new BadRequestError('Instance owner already setup');
+		}
+
+		let shellUser = await this.userRepository.findOneOrFail({
+			where: { role: { slug: GLOBAL_OWNER_ROLE.slug } },
+			relations: ['role'],
+		});
+
+		shellUser.email = email;
+		shellUser.firstName = firstName;
+		shellUser.lastName = lastName;
+		shellUser.lastActiveAt = new Date();
+		shellUser.password = await this.passwordUtility.hash(password);
+
+		shellUser = await this.userRepository.save(shellUser, { transaction: false });
+
+		this.logger.info('Owner was set up successfully');
+		this.eventService.emit('instance-owner-setup', { userId: shellUser.id });
+
+		// The next block needs to be deleted and is temporary for now
+		// See packages/cli/src/config/schema.ts for more info
+		// We update the SettingsRepository so when we "startup" next time
+		// the config state is restored.
+		// #region Delete me
+		await this.settingsRepository.update(
+			{ key: 'userManagement.isInstanceOwnerSetUp' },
+			{ value: JSON.stringify(true) },
+		);
+		config.set('userManagement.isInstanceOwnerSetUp', true);
+		// #endregion
+
+		return shellUser;
+	}
 }
diff --git a/packages/cli/test/integration/api-keys.api.test.ts b/packages/cli/test/integration/api-keys.api.test.ts
index 5187c60bedc..1bd4f4d5794 100644
--- a/packages/cli/test/integration/api-keys.api.test.ts
+++ b/packages/cli/test/integration/api-keys.api.test.ts
@@ -326,7 +326,6 @@ describe('Member', () => {
 			password: memberPassword,
 			role: GLOBAL_MEMBER_ROLE,
 		});
-		await utils.setInstanceOwnerSetUp(true);
 	});
 
 	test('POST /api-keys should create an api key with no expiration', async () => {
diff --git a/packages/cli/test/integration/auth.api.test.ts b/packages/cli/test/integration/auth.api.test.ts
index b4f0aa87e50..bc7ae310552 100644
--- a/packages/cli/test/integration/auth.api.test.ts
+++ b/packages/cli/test/integration/auth.api.test.ts
@@ -31,7 +31,6 @@ beforeAll(async () => {
 beforeEach(async () => {
 	await testDb.truncate(['User']);
 	config.set('ldap.disabled', true);
-	await utils.setInstanceOwnerSetUp(true);
 });
 
 describe('POST /login', () => {
diff --git a/packages/cli/test/integration/commands/reset.cmd.test.ts b/packages/cli/test/integration/commands/reset.cmd.test.ts
index e1262d5fe3e..728bf72dbbc 100644
--- a/packages/cli/test/integration/commands/reset.cmd.test.ts
+++ b/packages/cli/test/integration/commands/reset.cmd.test.ts
@@ -7,7 +7,6 @@ import {
 } from '@n8n/backend-test-utils';
 import {
 	CredentialsEntity,
-	SettingsRepository,
 	CredentialsRepository,
 	SharedCredentialsRepository,
 	SharedWorkflowRepository,
@@ -54,12 +53,6 @@ test('user-management:reset should reset DB to default user state', async () =>
 		await encryptCredentialData(Object.assign(new CredentialsEntity(), randomCredentialPayload())),
 	);
 
-	// mark instance as set up
-	await Container.get(SettingsRepository).update(
-		{ key: 'userManagement.isInstanceOwnerSetUp' },
-		{ value: 'true' },
-	);
-
 	//
 	// ACT
 	//
@@ -100,9 +93,4 @@ test('user-management:reset should reset DB to default user state', async () =>
 	await expect(
 		Container.get(SharedCredentialsRepository).findBy({ credentialsId: danglingCredential.id }),
 	).resolves.toMatchObject([{ projectId: ownerProject.id, role: 'credential:owner' }]);
-
-	// the instance is marked as not set up:
-	await expect(
-		Container.get(SettingsRepository).findBy({ key: 'userManagement.isInstanceOwnerSetUp' }),
-	).resolves.toMatchObject([{ value: 'false' }]);
 });
diff --git a/packages/cli/test/integration/external-secrets/external-secrets.api.test.ts b/packages/cli/test/integration/external-secrets/external-secrets.api.test.ts
index 2f4aa357027..e4328176b7a 100644
--- a/packages/cli/test/integration/external-secrets/external-secrets.api.test.ts
+++ b/packages/cli/test/integration/external-secrets/external-secrets.api.test.ts
@@ -6,7 +6,6 @@ import { mock } from 'jest-mock-extended';
 import { Cipher } from 'n8n-core';
 import type { IDataObject } from 'n8n-workflow';
 
-import config from '@/config';
 import { CREDENTIAL_BLANKING_VALUE } from '@/constants';
 import type { EventService } from '@/events/event.service';
 import { License } from '@/license';
@@ -112,7 +111,6 @@ beforeAll(async () => {
 	authOwnerAgent = testServer.authAgentFor(owner);
 	const member = await createUser();
 	authMemberAgent = testServer.authAgentFor(member);
-	config.set('userManagement.isInstanceOwnerSetUp', true);
 	Container.set(
 		ExternalSecretsManager,
 		new ExternalSecretsManager(
diff --git a/packages/cli/test/integration/ldap/ldap.api.test.ts b/packages/cli/test/integration/ldap/ldap.api.test.ts
index 403c86951ac..cdcfffe1f97 100644
--- a/packages/cli/test/integration/ldap/ldap.api.test.ts
+++ b/packages/cli/test/integration/ldap/ldap.api.test.ts
@@ -64,8 +64,6 @@ beforeEach(async () => {
 
 	jest.mock('@/telemetry');
 
-	config.set('userManagement.isInstanceOwnerSetUp', true);
-
 	await setCurrentAuthenticationMethod('email');
 });
 
diff --git a/packages/cli/test/integration/me.api.test.ts b/packages/cli/test/integration/me.api.test.ts
index df0b2b35c8c..708c53f88b4 100644
--- a/packages/cli/test/integration/me.api.test.ts
+++ b/packages/cli/test/integration/me.api.test.ts
@@ -144,7 +144,6 @@ describe('Member', () => {
 			role: { slug: 'global:member' },
 		});
 		authMemberAgent = testServer.authAgentFor(member);
-		await utils.setInstanceOwnerSetUp(true);
 	});
 
 	test('PATCH /me should succeed with valid inputs', async () => {
@@ -286,7 +285,6 @@ describe('Chat User', () => {
 			role: { slug: 'global:chatUser' },
 		});
 		authMemberAgent = testServer.authAgentFor(member);
-		await utils.setInstanceOwnerSetUp(true);
 	});
 
 	test('PATCH /me should succeed with valid inputs', async () => {
diff --git a/packages/cli/test/integration/owner.api.test.ts b/packages/cli/test/integration/owner.api.test.ts
index f1f096e6258..52c1eb8deca 100644
--- a/packages/cli/test/integration/owner.api.test.ts
+++ b/packages/cli/test/integration/owner.api.test.ts
@@ -7,11 +7,10 @@ import {
 } from '@n8n/backend-test-utils';
 import type { User } from '@n8n/db';
 import { GLOBAL_OWNER_ROLE, UserRepository } from '@n8n/db';
+import { OwnershipService } from '@/services/ownership.service';
 import { Container } from '@n8n/di';
 import validator from 'validator';
 
-import config from '@/config';
-
 import { createUserShell } from './shared/db/users';
 import * as utils from './shared/utils/';
 
@@ -21,7 +20,6 @@ let ownerShell: User;
 
 beforeEach(async () => {
 	ownerShell = await createUserShell(GLOBAL_OWNER_ROLE);
-	config.set('userManagement.isInstanceOwnerSetUp', false);
 });
 
 afterEach(async () => {
@@ -71,10 +69,7 @@ describe('POST /owner/setup', () => {
 		expect(storedOwner.firstName).toBe(newOwnerData.firstName);
 		expect(storedOwner.lastName).toBe(newOwnerData.lastName);
 
-		const isInstanceOwnerSetUpConfig = config.getEnv('userManagement.isInstanceOwnerSetUp');
-		expect(isInstanceOwnerSetUpConfig).toBe(true);
-
-		const isInstanceOwnerSetUpSetting = await utils.isInstanceOwnerSetUp();
+		const isInstanceOwnerSetUpSetting = await Container.get(OwnershipService).hasInstanceOwner();
 		expect(isInstanceOwnerSetUpSetting).toBe(true);
 	});
 
diff --git a/packages/cli/test/integration/shared/db/users.ts b/packages/cli/test/integration/shared/db/users.ts
index 12831513dcc..eb59e4a48e5 100644
--- a/packages/cli/test/integration/shared/db/users.ts
+++ b/packages/cli/test/integration/shared/db/users.ts
@@ -43,13 +43,14 @@ async function handlePasswordSetup(password: string | null | undefined): Promise
 
 /** Store a new user object, defaulting to a `member` */
 export async function newUser(attributes: DeepPartial<User> = {}): Promise<User> {
-	const { email, password, firstName, lastName, role, ...rest } = attributes;
+	const { email, password, firstName, lastName, role, lastActiveAt, ...rest } = attributes;
 	return Container.get(UserRepository).create({
 		email: email ?? randomEmail(),
 		password: await handlePasswordSetup(password),
 		firstName: firstName ?? randomName(),
 		lastName: lastName ?? randomName(),
 		role: role ?? GLOBAL_MEMBER_ROLE,
+		lastActiveAt: lastActiveAt ?? new Date(),
 		...rest,
 	});
 }
diff --git a/packages/cli/test/integration/shared/utils/index.ts b/packages/cli/test/integration/shared/utils/index.ts
index ce9e02457a8..8157e56f1e5 100644
--- a/packages/cli/test/integration/shared/utils/index.ts
+++ b/packages/cli/test/integration/shared/utils/index.ts
@@ -1,6 +1,6 @@
 import type { Logger } from '@n8n/backend-common';
 import { mockInstance } from '@n8n/backend-test-utils';
-import { SettingsRepository, WorkflowEntity } from '@n8n/db';
+import { WorkflowEntity } from '@n8n/db';
 import { Container } from '@n8n/di';
 import { mock } from 'jest-mock-extended';
 import {
@@ -25,7 +25,6 @@ import type { INodeTypeData, INode } from 'n8n-workflow';
 import type request from 'supertest';
 import { v4 as uuid } from 'uuid';
 
-import config from '@/config';
 import { AUTH_COOKIE_NAME } from '@/constants';
 import { ExecutionService } from '@/executions/execution.service';
 import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials';
@@ -159,27 +158,6 @@ export function getAuthToken(response: request.Response, authCookieName = AUTH_C
 	return match.groups.token;
 }
 
-// ----------------------------------
-//            settings
-// ----------------------------------
-
-export async function isInstanceOwnerSetUp() {
-	const { value } = await Container.get(SettingsRepository).findOneByOrFail({
-		key: 'userManagement.isInstanceOwnerSetUp',
-	});
-
-	return Boolean(value);
-}
-
-export const setInstanceOwnerSetUp = async (value: boolean) => {
-	config.set('userManagement.isInstanceOwnerSetUp', value);
-
-	await Container.get(SettingsRepository).update(
-		{ key: 'userManagement.isInstanceOwnerSetUp' },
-		{ value: JSON.stringify(value) },
-	);
-};
-
 // ----------------------------------
 //           community nodes
 // ----------------------------------
diff --git a/packages/cli/test/integration/shared/utils/test-server.ts b/packages/cli/test/integration/shared/utils/test-server.ts
index 5a6a8ed9239..e10388f23d6 100644
--- a/packages/cli/test/integration/shared/utils/test-server.ts
+++ b/packages/cli/test/integration/shared/utils/test-server.ts
@@ -10,7 +10,6 @@ import request from 'supertest';
 import { URL } from 'url';
 
 import { AuthService } from '@/auth/auth.service';
-import config from '@/config';
 import { AUTH_COOKIE_NAME } from '@/constants';
 import { ControllerRegistry } from '@/controller.registry';
 import { License } from '@/license';
@@ -129,7 +128,6 @@ export const setupTestServer = ({
 		await testDb.init();
 
 		Container.get(GlobalConfig).userManagement.jwtSecret = 'My JWT secret';
-		config.set('userManagement.isInstanceOwnerSetUp', true);
 
 		testServer.license.mock(Container.get(License));
 		testServer.license.mockLicenseState(Container.get(LicenseState));

From f72bbaf088f8f44c2621c9e9dfa04739134e308e Mon Sep 17 00:00:00 2001
From: Suguru Inoue <suguru@n8n.io>
Date: Fri, 5 Dec 2025 21:15:48 +0100
Subject: [PATCH 114/167] fix(core): GET /models endpoint doesn't return n8n
 workflow agents (no-changelog) (#22845)

---
 packages/cli/src/modules/chat-hub/chat-hub.models.service.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/cli/src/modules/chat-hub/chat-hub.models.service.ts b/packages/cli/src/modules/chat-hub/chat-hub.models.service.ts
index 8dfa5915c3e..f5a888b8edf 100644
--- a/packages/cli/src/modules/chat-hub/chat-hub.models.service.ts
+++ b/packages/cli/src/modules/chat-hub/chat-hub.models.service.ts
@@ -1,4 +1,4 @@
-import { In, type WorkflowRepository, type User } from '@n8n/db';
+import { In, WorkflowRepository, type User } from '@n8n/db';
 import { getBase } from '@/workflow-execute-additional-data';
 
 import { ChatHubAgentService } from './chat-hub-agent.service';

From 85d9465ad9110d0a07623aaf08adb256d4009325 Mon Sep 17 00:00:00 2001
From: yehorkardash <yehor.kardash@n8n.io>
Date: Mon, 8 Dec 2025 06:53:13 +0100
Subject: [PATCH 115/167] chore: Fix lefthook config for windows (#22676)

Co-authored-by: RomanDavydchuk <roman.davydchuk@n8n.io>
---
 lefthook.yml                     | 13 +------------
 scripts/check-workspace-deps.mjs | 33 ++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 12 deletions(-)
 create mode 100644 scripts/check-workspace-deps.mjs

diff --git a/lefthook.yml b/lefthook.yml
index a01d0d1df78..90393a16f44 100644
--- a/lefthook.yml
+++ b/lefthook.yml
@@ -28,18 +28,7 @@ pre-commit:
         - rebase
     workspace_deps_check:
       glob: '**/package.json'
-      run: |
-        if grep -l '"workspace:\^"' {staged_files} 2>/dev/null; then
-          echo ""
-          echo "ERROR: Found 'workspace:^' in package.json files."
-          echo ""
-          echo "Use 'workspace:*' instead to pin exact versions."
-          echo "Using 'workspace:^' causes npm to resolve semver ranges when users"
-          echo "install from npm, which can lead to version mismatches between"
-          echo "@n8n/* packages and break n8n startup."
-          echo ""
-          exit 1
-        fi
+      run: node scripts/check-workspace-deps.mjs {staged_files}
       skip:
         - merge
         - rebase
diff --git a/scripts/check-workspace-deps.mjs b/scripts/check-workspace-deps.mjs
new file mode 100644
index 00000000000..69a534a6aaf
--- /dev/null
+++ b/scripts/check-workspace-deps.mjs
@@ -0,0 +1,33 @@
+#!/usr/bin/env node
+
+import { readFileSync } from 'node:fs';
+import { existsSync } from 'node:fs';
+
+const isPackageJson = (file) => file.endsWith('package.json');
+const files = process.argv.slice(2).filter((file) => file && isPackageJson(file) && existsSync(file));
+let foundError = false;
+
+for (const file of files) {
+	try {
+		const content = readFileSync(file, 'utf8');
+		if (content.includes('"workspace:^"')) {
+			if (!foundError) {
+				console.log('');
+				console.log("ERROR: Found 'workspace:^' in package.json files.");
+				console.log('');
+				console.log("Use 'workspace:*' instead to pin exact versions.");
+				console.log("Using 'workspace:^' causes npm to resolve semver ranges when users");
+				console.log("install from npm, which can lead to version mismatches between");
+				console.log("@n8n/* packages and break n8n startup.");
+				console.log('');
+			}
+			foundError = true;
+		}
+	} catch (error) {
+		// Ignore read errors for individual files
+	}
+}
+
+if (foundError) {
+	process.exit(1);
+}

From bc557ec9e952e3f074fc5f04c5afb69ea18cbbfc Mon Sep 17 00:00:00 2001
From: Suguru Inoue <suguru@n8n.io>
Date: Mon, 8 Dec 2025 10:38:08 +0100
Subject: [PATCH 116/167] fix(editor): Improve chat error handling
 (no-changelog) (#22822)

---
 .../frontend/@n8n/i18n/src/locales/en.json    | 13 ++++-
 .../@n8n/rest-api-client/src/utils.test.ts    | 49 ++++++++++++++++++-
 .../@n8n/rest-api-client/src/utils.ts         | 24 ++++++---
 .../src/features/ai/chatHub/ChatView.vue      |  6 +--
 .../src/features/ai/chatHub/chat.store.ts     | 41 +++++++++++-----
 5 files changed, 108 insertions(+), 25 deletions(-)

diff --git a/packages/frontend/@n8n/i18n/src/locales/en.json b/packages/frontend/@n8n/i18n/src/locales/en.json
index c8762b583eb..175a81bc48f 100644
--- a/packages/frontend/@n8n/i18n/src/locales/en.json
+++ b/packages/frontend/@n8n/i18n/src/locales/en.json
@@ -411,7 +411,18 @@
 	"chatHub.message.actions.executionId": "Execution ID",
 	"chatHub.message.edit.cancel": "Cancel",
 	"chatHub.message.edit.send": "Send",
-	"chatHub.message.error.unknown": "Error: Unknown error occurred",
+	"chatHub.message.error.unknown": "Something went wrong. Please try again.",
+	"chatHub.error.payloadTooLarge": "Message too large",
+	"chatHub.error.badRequest": "Invalid request",
+	"chatHub.error.forbidden": "Permission denied",
+	"chatHub.error.serverError": "Server error",
+	"chatHub.error.serverErrorWithReason": "Server error: {error}",
+	"chatHub.error.unknown": "Unknown error",
+	"chatHub.error.noConnection": "Connection failed",
+	"chatHub.error.fetchConversationFailed": "Failed to load conversation",
+	"chatHub.error.sendMessageFailed": "Failed to send message",
+	"chatHub.error.updateModelFailed": "Failed to update model",
+	"chatHub.error.updateToolsFailed": "Failed to update tools",
 	"chatHub.models.selector.defaultLabel": "Select model",
 	"chatHub.models.byIdSelector.title": "Choose {provider} model by ID",
 	"chatHub.models.byIdSelector.choose": "Enter model identifier (e.g. \"gpt-4\")",
diff --git a/packages/frontend/@n8n/rest-api-client/src/utils.test.ts b/packages/frontend/@n8n/rest-api-client/src/utils.test.ts
index 75b08432ff9..b638a577928 100644
--- a/packages/frontend/@n8n/rest-api-client/src/utils.test.ts
+++ b/packages/frontend/@n8n/rest-api-client/src/utils.test.ts
@@ -54,7 +54,7 @@ describe('streamRequest', () => {
 		expect(onErrorMock).not.toHaveBeenCalled();
 	});
 
-	it('should stream error response from the API endpoint', async () => {
+	it('should stream error response with error data from the API endpoint', async () => {
 		const testError = { code: 500, message: 'Error happened' };
 		const encoder = new TextEncoder();
 		const mockResponse = new ReadableStream({
@@ -66,6 +66,8 @@ describe('streamRequest', () => {
 
 		const mockFetch = vi.fn().mockResolvedValue({
 			ok: false,
+			status: 500,
+			statusText: 'Internal Server Error',
 			body: mockResponse,
 		});
 
@@ -98,8 +100,51 @@ describe('streamRequest', () => {
 		});
 
 		expect(onChunkMock).not.toHaveBeenCalled();
+		expect(onDoneMock).not.toHaveBeenCalled();
+		expect(onErrorMock).toHaveBeenCalledExactlyOnceWith(
+			new ResponseError(testError.message, { httpStatusCode: 500 }),
+		);
+	});
+
+	it('should call onError when stream ends immediately with non-ok status and no chunks', async () => {
+		const mockResponse = new ReadableStream({
+			start(controller) {
+				// Empty stream that just closes without sending any chunks
+				controller.close();
+			},
+		});
+
+		const mockFetch = vi.fn().mockResolvedValue({
+			ok: false,
+			status: 403,
+			statusText: 'Forbidden',
+			body: mockResponse,
+		});
+
+		global.fetch = mockFetch;
+
+		const onChunkMock = vi.fn();
+		const onDoneMock = vi.fn();
+		const onErrorMock = vi.fn();
+
+		await streamRequest(
+			{
+				baseUrl: 'https://api.example.com',
+				pushRef: '',
+			},
+			'/data',
+			{ key: 'value' },
+			onChunkMock,
+			onDoneMock,
+			onErrorMock,
+		);
+
+		expect(onChunkMock).not.toHaveBeenCalled();
+		expect(onDoneMock).not.toHaveBeenCalled();
 		expect(onErrorMock).toHaveBeenCalledTimes(1);
-		expect(onErrorMock).toHaveBeenCalledWith(new ResponseError(testError.message));
+		expect(onErrorMock).toHaveBeenCalledExactlyOnceWith(
+			new ResponseError('Forbidden', { httpStatusCode: 403 }),
+		);
 	});
 
 	it('should handle broken stream data', async () => {
diff --git a/packages/frontend/@n8n/rest-api-client/src/utils.ts b/packages/frontend/@n8n/rest-api-client/src/utils.ts
index d0953750f85..1ba344c6b7c 100644
--- a/packages/frontend/@n8n/rest-api-client/src/utils.ts
+++ b/packages/frontend/@n8n/rest-api-client/src/utils.ts
@@ -234,6 +234,10 @@ export async function streamRequest<T extends object>(
 	separator = STREAM_SEPARATOR,
 	abortSignal?: AbortSignal,
 ): Promise<void> {
+	let onErrorOnce: ((e: Error) => void) | undefined = (e: Error) => {
+		onErrorOnce = undefined;
+		onError?.(e);
+	};
 	const headers: Record<string, string> = {
 		'browser-id': getBrowserId(),
 		'Content-Type': 'application/json',
@@ -258,7 +262,15 @@ export async function streamRequest<T extends object>(
 			async function readStream() {
 				const { done, value } = await reader.read();
 				if (done) {
-					onDone?.();
+					if (response.ok) {
+						onDone?.();
+					} else {
+						onErrorOnce?.(
+							new ResponseError(response.statusText, {
+								httpStatusCode: response.status,
+							}),
+						);
+					}
 					return;
 				}
 				const chunk = decoder.decode(value);
@@ -286,7 +298,7 @@ export async function streamRequest<T extends object>(
 							} else {
 								// Otherwise, call error callback
 								const message = 'message' in data ? data.message : response.statusText;
-								onError?.(
+								onErrorOnce?.(
 									new ResponseError(String(message), {
 										httpStatusCode: response.status,
 									}),
@@ -294,7 +306,7 @@ export async function streamRequest<T extends object>(
 							}
 						} catch (e: unknown) {
 							if (e instanceof Error) {
-								onError?.(e);
+								onErrorOnce?.(e);
 							}
 						}
 					}
@@ -304,11 +316,11 @@ export async function streamRequest<T extends object>(
 
 			// Start reading the stream
 			await readStream();
-		} else if (onError) {
-			onError(new Error(response.statusText));
+		} else if (onErrorOnce) {
+			onErrorOnce(new Error(response.statusText));
 		}
 	} catch (e: unknown) {
 		assert(e instanceof Error);
-		onError?.(e);
+		onErrorOnce?.(e);
 	}
 }
diff --git a/packages/frontend/editor-ui/src/features/ai/chatHub/ChatView.vue b/packages/frontend/editor-ui/src/features/ai/chatHub/ChatView.vue
index 32226551527..9771cef8f60 100644
--- a/packages/frontend/editor-ui/src/features/ai/chatHub/ChatView.vue
+++ b/packages/frontend/editor-ui/src/features/ai/chatHub/ChatView.vue
@@ -326,7 +326,7 @@ watch(
 			try {
 				await chatStore.fetchMessages(id);
 			} catch (error) {
-				toast.showError(error, 'Error fetching a conversation');
+				toast.showError(error, i18n.baseText('chatHub.error.fetchConversationFailed'));
 				await router.push({ name: CHAT_VIEW });
 			}
 		}
@@ -473,7 +473,7 @@ async function handleSelectModel(selection: ChatHubConversationModel, displayNam
 		try {
 			await chatStore.updateSessionModel(sessionId.value, selection, agentName);
 		} catch (error) {
-			toast.showError(error, 'Could not update selected model');
+			toast.showError(error, i18n.baseText('chatHub.error.updateModelFailed'));
 		}
 	} else {
 		defaultModel.value = { ...selection, cachedDisplayName: agentName };
@@ -507,7 +507,7 @@ async function handleUpdateTools(newTools: INode[]) {
 		try {
 			await chatStore.updateToolsInSession(sessionId.value, newTools);
 		} catch (error) {
-			toast.showError(error, 'Could not update selected tools');
+			toast.showError(error, i18n.baseText('chatHub.error.updateToolsFailed'));
 		}
 	}
 }
diff --git a/packages/frontend/editor-ui/src/features/ai/chatHub/chat.store.ts b/packages/frontend/editor-ui/src/features/ai/chatHub/chat.store.ts
index f090961939c..56e36298772 100644
--- a/packages/frontend/editor-ui/src/features/ai/chatHub/chat.store.ts
+++ b/packages/frontend/editor-ui/src/features/ai/chatHub/chat.store.ts
@@ -2,6 +2,7 @@ import { defineStore } from 'pinia';
 import { CHAT_STORE } from './constants';
 import { computed, ref } from 'vue';
 import { v4 as uuidv4 } from 'uuid';
+import { useI18n } from '@n8n/i18n';
 import {
 	fetchChatModelsApi,
 	sendMessageApi,
@@ -58,11 +59,13 @@ import { useTelemetry } from '@/app/composables/useTelemetry';
 import { deepCopy, type INode } from 'n8n-workflow';
 import type { ChatHubLLMProvider, ChatProviderSettingsDto } from '@n8n/api-types';
 import { convertFileToBinaryData } from '@/app/utils/fileUtils';
+import { ResponseError } from '@n8n/rest-api-client';
 
 export const useChatStore = defineStore(CHAT_STORE, () => {
 	const rootStore = useRootStore();
 	const toast = useToast();
 	const telemetry = useTelemetry();
+	const i18n = useI18n();
 
 	const agents = ref<ChatModelsResponse>();
 	const customAgents = ref<Partial<Record<string, ChatHubAgentDto>>>({});
@@ -455,24 +458,36 @@ export const useChatStore = defineStore(CHAT_STORE, () => {
 			return;
 		}
 
-		toast.showError(error, 'Could not send message');
+		const cause =
+			error instanceof ResponseError
+				? new Error(getErrorMessageByStatusCode(error.httpStatusCode, error.message))
+				: error.message.includes('Failed to fetch')
+					? new Error(i18n.baseText('chatHub.error.noConnection'))
+					: error;
 
-		const { sessionId } = streaming.value;
+		toast.showError(cause, i18n.baseText('chatHub.error.sendMessageFailed'));
 
 		streaming.value = undefined;
+	}
 
-		const conversation = getConversation(sessionId);
-		if (!conversation) {
-			return;
-		}
+	function getErrorMessageByStatusCode(
+		statusCode: number | undefined,
+		message: string | undefined,
+	): string {
+		const errorMessages: Record<number, string> = {
+			[413]: i18n.baseText('chatHub.error.payloadTooLarge'),
+			[400]: i18n.baseText('chatHub.error.badRequest'),
+			[403]: i18n.baseText('chatHub.error.forbidden'),
+			[500]: message
+				? i18n.baseText('chatHub.error.serverErrorWithReason', {
+						interpolate: { error: message },
+					})
+				: i18n.baseText('chatHub.error.serverError'),
+		};
 
-		// TODO: Not sure if we want to mark all running messages as errored?
-		for (const messageId of conversation.activeMessageChain) {
-			const message = conversation.messages[messageId];
-			if (message.status === 'running') {
-				updateMessage(sessionId, messageId, 'error');
-			}
-		}
+		return (
+			(statusCode && errorMessages[statusCode]) || message || i18n.baseText('chatHub.error.unknown')
+		);
 	}
 
 	async function sendMessage(

From 8364430471e12ea016d311cd26a8bfcfb3c49199 Mon Sep 17 00:00:00 2001
From: Filipe Tavares <rstfilipe@gmail.com>
Date: Mon, 8 Dec 2025 09:43:46 +0000
Subject: [PATCH 117/167] chore(editor): Add trial upgrade button to main
 sidebar experiment (no-changelog) (#22151)

Co-authored-by: Giulio Andreini <g.andreini@gmail.com>
Co-authored-by: Romeo Balta <7095569+romeobalta@users.noreply.github.com>
---
 .../__tests__/owner.controller.test.ts        |  4 +-
 .../services/__tests__/banner.service.test.ts | 28 ++++--
 .../frontend/@n8n/i18n/src/locales/en.json    |  2 +
 packages/frontend/editor-ui/src/Interface.ts  |  8 +-
 .../src/app/components/MainSidebar.vue        |  2 +
 .../components/MainSidebarTrialUpgrade.vue    | 85 +++++++++++++++++
 .../src/app/constants/experiments.ts          |  7 ++
 .../frontend/editor-ui/src/app/init.test.ts   | 41 ++++++++-
 packages/frontend/editor-ui/src/app/init.ts   |  4 +-
 .../src/app/stores/cloudPlan.store.ts         | 12 ++-
 .../components/banners/TrialBanner.vue        |  2 +-
 .../components/banners/TrialOverBanner.vue    |  9 +-
 .../fixtures/plan-data-non-trial.json         | 24 +++++
 .../testing/playwright/pages/SidebarPage.ts   |  4 +
 .../playwright/tests/ui/cloud/cloud.spec.ts   | 91 ++++++++++++++++++-
 15 files changed, 301 insertions(+), 22 deletions(-)
 create mode 100644 packages/frontend/editor-ui/src/app/components/MainSidebarTrialUpgrade.vue
 create mode 100644 packages/testing/playwright/fixtures/plan-data-non-trial.json

diff --git a/packages/cli/src/controllers/__tests__/owner.controller.test.ts b/packages/cli/src/controllers/__tests__/owner.controller.test.ts
index 1edfbd8af20..1b4f5b9fafd 100644
--- a/packages/cli/src/controllers/__tests__/owner.controller.test.ts
+++ b/packages/cli/src/controllers/__tests__/owner.controller.test.ts
@@ -49,11 +49,11 @@ describe('OwnerController', () => {
 		});
 
 		it('should call dismissBanner with the correct banner name', async () => {
-			const payload = mock<DismissBannerRequestDto>({ banner: 'TRIAL' });
+			const payload = mock<DismissBannerRequestDto>({ banner: 'TRIAL_OVER' });
 
 			await controller.dismissBanner(mock(), mock(), payload);
 
-			expect(bannerService.dismissBanner).toHaveBeenCalledWith('TRIAL');
+			expect(bannerService.dismissBanner).toHaveBeenCalledWith('TRIAL_OVER');
 		});
 	});
 });
diff --git a/packages/cli/src/services/__tests__/banner.service.test.ts b/packages/cli/src/services/__tests__/banner.service.test.ts
index f2bc5582972..14bacd5dacd 100644
--- a/packages/cli/src/services/__tests__/banner.service.test.ts
+++ b/packages/cli/src/services/__tests__/banner.service.test.ts
@@ -1,4 +1,3 @@
-import type { BannerName } from '@n8n/api-types';
 import type { SettingsRepository } from '@n8n/db';
 import { mock } from 'jest-mock-extended';
 import type { ErrorReporter } from 'n8n-core';
@@ -17,15 +16,14 @@ describe('BannerService', () => {
 
 	describe('dismissBanner', () => {
 		const key = 'ui.banners.dismissed';
-		const bannerName: BannerName = 'TRIAL';
 
 		it('should save the banner name to settings if no banners are dismissed yet', async () => {
 			settingsRepo.findOneBy.mockResolvedValue(null);
 
-			await bannerService.dismissBanner(bannerName);
+			await bannerService.dismissBanner('TRIAL');
 
 			expect(settingsRepo.save).toHaveBeenCalledWith(
-				{ key, value: JSON.stringify([bannerName]), loadOnStartup: true },
+				{ key, value: JSON.stringify(['TRIAL']), loadOnStartup: true },
 				{ transaction: false },
 			);
 		});
@@ -38,11 +36,27 @@ describe('BannerService', () => {
 				loadOnStartup: false,
 			});
 
-			await bannerService.dismissBanner(bannerName);
+			await bannerService.dismissBanner('TRIAL');
 
 			expect(settingsRepo.update).toHaveBeenCalledWith(
 				{ key },
-				{ value: JSON.stringify([bannerName, 'TRIAL_OVER']), loadOnStartup: true },
+				{ value: JSON.stringify(['TRIAL', 'TRIAL_OVER']), loadOnStartup: true },
+			);
+		});
+
+		it('should not create duplicate entries if already dismissed', async () => {
+			const dismissedBanners = ['TRIAL', 'TRIAL_OVER'];
+			settingsRepo.findOneBy.mockResolvedValue({
+				key,
+				value: JSON.stringify(dismissedBanners),
+				loadOnStartup: false,
+			});
+
+			await bannerService.dismissBanner('TRIAL');
+
+			expect(settingsRepo.update).toHaveBeenCalledWith(
+				{ key },
+				{ value: JSON.stringify(['TRIAL', 'TRIAL_OVER']), loadOnStartup: true },
 			);
 		});
 
@@ -51,7 +65,7 @@ describe('BannerService', () => {
 			settingsRepo.findOneBy.mockResolvedValue(null);
 			settingsRepo.save.mockRejectedValue(error);
 
-			await bannerService.dismissBanner(bannerName);
+			await bannerService.dismissBanner('TRIAL');
 
 			expect(errorReporter.error).toHaveBeenCalledWith(error);
 		});
diff --git a/packages/frontend/@n8n/i18n/src/locales/en.json b/packages/frontend/@n8n/i18n/src/locales/en.json
index 175a81bc48f..07e2932c510 100644
--- a/packages/frontend/@n8n/i18n/src/locales/en.json
+++ b/packages/frontend/@n8n/i18n/src/locales/en.json
@@ -104,6 +104,8 @@
 	"generic.unsavedWork.confirmMessage.message": "If you don't save, you will lose your changes.",
 	"generic.unsavedWork.confirmMessage.confirmButtonText": "Save",
 	"generic.unsavedWork.confirmMessage.cancelButtonText": "Leave without saving",
+	"generic.trial.message": "1 day left | {count} days left",
+	"generic.trial.tooltip": "1 day left in your trial. Upgrade to keep using n8n. | {count} days left in your trial. Upgrade to keep using n8n.",
 	"generic.upgrade": "Upgrade",
 	"generic.upgradeNow": "Upgrade now",
 	"generic.update": "Update",
diff --git a/packages/frontend/editor-ui/src/Interface.ts b/packages/frontend/editor-ui/src/Interface.ts
index 1970d850865..5f9549255fc 100644
--- a/packages/frontend/editor-ui/src/Interface.ts
+++ b/packages/frontend/editor-ui/src/Interface.ts
@@ -847,11 +847,11 @@ export type CloudUpdateLinkSourceType =
 	| 'evaluations'
 	| 'ai-builder-sidebar'
 	| 'ai-builder-canvas'
-	| 'custom-roles';
+	| 'custom-roles'
+	| 'main-sidebar';
 
 export type UTMCampaign =
 	| 'upgrade-custom-data-filter'
-	| 'upgrade-canvas-nav'
 	| 'upgrade-concurrency'
 	| 'upgrade-workflow-sharing'
 	| 'upgrade-credentials-sharing'
@@ -874,7 +874,9 @@ export type UTMCampaign =
 	| 'upgrade-insights'
 	| 'upgrade-evaluations'
 	| 'upgrade-builder'
-	| 'upgrade-custom-roles';
+	| 'upgrade-custom-roles'
+	| 'upgrade-canvas-nav'
+	| 'upgrade-main-sidebar';
 
 export type AddedNode = {
 	type: string;
diff --git a/packages/frontend/editor-ui/src/app/components/MainSidebar.vue b/packages/frontend/editor-ui/src/app/components/MainSidebar.vue
index efff1fc097f..99738301779 100644
--- a/packages/frontend/editor-ui/src/app/components/MainSidebar.vue
+++ b/packages/frontend/editor-ui/src/app/components/MainSidebar.vue
@@ -57,6 +57,7 @@ import { useKeybindings } from '@/app/composables/useKeybindings';
 import { useCalloutHelpers } from '@/app/composables/useCalloutHelpers';
 import ProjectNavigation from '@/features/collaboration/projects/components/ProjectNavigation.vue';
 import MainSidebarSourceControl from './MainSidebarSourceControl.vue';
+import MainSidebarTrialUpgrade from './MainSidebarTrialUpgrade.vue';
 import MainSidebarUserArea from '@/app/components/MainSidebarUserArea.vue';
 
 const becomeTemplateCreatorStore = useBecomeTemplateCreatorStore();
@@ -580,6 +581,7 @@ onClickOutside(createBtn as Ref<VueInstance>, () => {
 		</N8nScrollArea>
 
 		<MainSidebarSourceControl :is-collapsed="isCollapsed" />
+		<MainSidebarTrialUpgrade />
 		<MainSidebarUserArea
 			v-if="showUserArea"
 			ref="user"
diff --git a/packages/frontend/editor-ui/src/app/components/MainSidebarTrialUpgrade.vue b/packages/frontend/editor-ui/src/app/components/MainSidebarTrialUpgrade.vue
new file mode 100644
index 00000000000..c2e0b96590e
--- /dev/null
+++ b/packages/frontend/editor-ui/src/app/components/MainSidebarTrialUpgrade.vue
@@ -0,0 +1,85 @@
+<script setup lang="ts">
+import { N8nButton, N8nTooltip } from '@n8n/design-system';
+import { computed } from 'vue';
+import { useCloudPlanStore } from '@/app/stores/cloudPlan.store';
+import { useUIStore } from '@/app/stores/ui.store';
+import { i18n as locale } from '@n8n/i18n';
+import { usePageRedirectionHelper } from '@/app/composables/usePageRedirectionHelper';
+
+const cloudPlanStore = useCloudPlanStore();
+const pageRedirectionHelper = usePageRedirectionHelper();
+const uiStore = useUIStore();
+
+const isCollapsed = computed(() => uiStore.sidebarMenuCollapsed);
+
+const isVisible = computed(() => {
+	return cloudPlanStore.userIsTrialing && cloudPlanStore.isTrialUpgradeOnSidebar;
+});
+
+const trialDaysLeft = computed(() => -1 * cloudPlanStore.trialDaysLeft);
+
+const trialMessage = computed(() => {
+	return locale.baseText('generic.trial.message', {
+		adjustToNumber: trialDaysLeft.value,
+		interpolate: { count: String(trialDaysLeft.value) },
+	});
+});
+
+const tooltipContent = computed(() => {
+	return locale.baseText('generic.trial.tooltip', {
+		adjustToNumber: trialDaysLeft.value,
+		interpolate: { count: String(trialDaysLeft.value) },
+	});
+});
+
+const onUpgradeClick = () => {
+	void pageRedirectionHelper.goToUpgrade('main-sidebar', 'upgrade-main-sidebar', 'redirect');
+};
+</script>
+
+<template>
+	<div
+		v-if="isVisible"
+		:class="[$style.mainSidebarTrialUpgrade, { [$style.collapsed]: isCollapsed }]"
+		data-test-id="main-sidebar-trial-upgrade"
+	>
+		<N8nTooltip :placement="isCollapsed ? 'right' : 'top'">
+			<template #content>
+				{{ tooltipContent }}
+			</template>
+			<N8nButton
+				type="success"
+				size="mini"
+				icon="zap"
+				:label="isCollapsed ? '' : locale.baseText('generic.upgrade')"
+				:square="isCollapsed"
+				data-test-id="trial-upgrade-button"
+				@click="onUpgradeClick"
+			/>
+		</N8nTooltip>
+
+		<div v-if="!isCollapsed" :class="$style.mainSidebarTrialMessage">
+			{{ trialMessage }}
+		</div>
+	</div>
+</template>
+
+<style lang="scss" module>
+.mainSidebarTrialUpgrade {
+	display: flex;
+	align-items: center;
+	padding: var(--spacing--sm) var(--spacing--xs);
+	border-top: var(--border-width) var(--border-style) var(--color--foreground);
+	gap: var(--spacing--2xs);
+
+	&.collapsed {
+		justify-content: center;
+	}
+}
+
+.mainSidebarTrialMessage {
+	font-size: var(--font-size--2xs);
+	color: var(--color--text);
+	line-height: var(--line-height--sm);
+}
+</style>
diff --git a/packages/frontend/editor-ui/src/app/constants/experiments.ts b/packages/frontend/editor-ui/src/app/constants/experiments.ts
index f0100f412b1..372824e31e5 100644
--- a/packages/frontend/editor-ui/src/app/constants/experiments.ts
+++ b/packages/frontend/editor-ui/src/app/constants/experiments.ts
@@ -55,6 +55,12 @@ export const TEMPLATE_RECO_V2 = {
 	variant: 'variant',
 };
 
+export const UPGRADE_PLAN_CTA_EXPERIMENT = {
+	name: '054_upgrade_plan_cta',
+	control: 'control',
+	variant: 'variant',
+};
+
 export const TEMPLATES_DATA_QUALITY_EXPERIMENT = {
 	name: '046_templates_data_quality',
 	control: 'control',
@@ -114,6 +120,7 @@ export const EXPERIMENTS_TO_TRACK = [
 	TEMPLATE_RECO_V2.name,
 	TEMPLATES_DATA_QUALITY_EXPERIMENT.name,
 	READY_TO_RUN_V2_PART2_EXPERIMENT.name,
+	UPGRADE_PLAN_CTA_EXPERIMENT.name,
 	AI_BUILDER_TEMPLATE_EXAMPLES_EXPERIMENT.name,
 	AI_BUILDER_MULTI_AGENT_EXPERIMENT.name,
 	TIME_SAVED_NODE_EXPERIMENT.name,
diff --git a/packages/frontend/editor-ui/src/app/init.test.ts b/packages/frontend/editor-ui/src/app/init.test.ts
index 8cf9b8876fd..5dcfc164c95 100644
--- a/packages/frontend/editor-ui/src/app/init.test.ts
+++ b/packages/frontend/editor-ui/src/app/init.test.ts
@@ -20,6 +20,7 @@ import merge from 'lodash/merge';
 import { setActivePinia } from 'pinia';
 import { mock } from 'vitest-mock-extended';
 import { telemetry } from '@/app/plugins/telemetry';
+import { usePostHog } from './stores/posthog.store';
 
 const showMessage = vi.fn();
 const showToast = vi.fn();
@@ -47,6 +48,7 @@ describe('Init', () => {
 	let ssoStore: ReturnType<typeof mockedStore<typeof useSSOStore>>;
 	let rootStore: ReturnType<typeof mockedStore<typeof useRootStore>>;
 	let bannersStore: ReturnType<typeof mockedStore<typeof useBannersStore>>;
+	let posthogStore: ReturnType<typeof mockedStore<typeof usePostHog>>;
 
 	beforeEach(() => {
 		setActivePinia(
@@ -67,6 +69,7 @@ describe('Init', () => {
 		ssoStore = mockedStore(useSSOStore);
 		rootStore = mockedStore(useRootStore);
 		bannersStore = mockedStore(useBannersStore);
+		posthogStore = mockedStore(usePostHog);
 	});
 
 	describe('initializeCore()', () => {
@@ -291,7 +294,7 @@ describe('Init', () => {
 				expect(bannersStore.pushBannerToStack).toHaveBeenCalledWith('TRIAL_OVER');
 			});
 
-			it('should push TRIAL banner if trial is active', async () => {
+			it('should push TRIAL banner if trial is active and does not have feature flag set', async () => {
 				settingsStore.settings.deployment.type = 'cloud';
 				usersStore.usersById = { '123': { id: '123', email: '' } as IUser };
 				usersStore.currentUserId = '123';
@@ -307,6 +310,42 @@ describe('Init', () => {
 				expect(bannersStore.pushBannerToStack).toHaveBeenCalledWith('TRIAL');
 			});
 
+			it('should push TRIAL banner if trial is active and has feature flag control', async () => {
+				settingsStore.settings.deployment.type = 'cloud';
+				usersStore.usersById = { '123': { id: '123', email: '' } as IUser };
+				usersStore.currentUserId = '123';
+
+				cloudPlanStore.userIsTrialing = true;
+				cloudPlanStore.trialExpired = false;
+
+				const posthogStoreSpy = vi.spyOn(posthogStore, 'getVariant').mockReturnValueOnce('control');
+				const cloudStoreSpy = vi.spyOn(cloudPlanStore, 'initialize').mockResolvedValueOnce();
+
+				await initializeAuthenticatedFeatures(false);
+
+				expect(posthogStoreSpy).toHaveBeenCalled();
+				expect(cloudStoreSpy).toHaveBeenCalled();
+				expect(bannersStore.pushBannerToStack).toHaveBeenCalledWith('TRIAL');
+			});
+
+			it('should not push TRIAL banner if trial is active and has feature flag variant', async () => {
+				settingsStore.settings.deployment.type = 'cloud';
+				usersStore.usersById = { '123': { id: '123', email: '' } as IUser };
+				usersStore.currentUserId = '123';
+
+				cloudPlanStore.userIsTrialing = true;
+				cloudPlanStore.trialExpired = false;
+
+				const posthogStoreSpy = vi.spyOn(posthogStore, 'getVariant').mockReturnValueOnce('variant');
+				const cloudStoreSpy = vi.spyOn(cloudPlanStore, 'initialize').mockResolvedValueOnce();
+
+				await initializeAuthenticatedFeatures(false);
+
+				expect(posthogStoreSpy).toHaveBeenCalled();
+				expect(cloudStoreSpy).toHaveBeenCalled();
+				expect(bannersStore.pushBannerToStack).not.toHaveBeenCalledWith('TRIAL');
+			});
+
 			it('should push EMAIL_CONFIRMATION banner if user cloud info is not confirmed', async () => {
 				settingsStore.settings.deployment.type = 'cloud';
 				usersStore.usersById = { '123': { id: '123', email: '' } as IUser };
diff --git a/packages/frontend/editor-ui/src/app/init.ts b/packages/frontend/editor-ui/src/app/init.ts
index 139e86693fe..52f80d68020 100644
--- a/packages/frontend/editor-ui/src/app/init.ts
+++ b/packages/frontend/editor-ui/src/app/init.ts
@@ -163,7 +163,9 @@ export async function initializeAuthenticatedFeatures(
 					if (cloudPlanStore.trialExpired) {
 						bannersStore.pushBannerToStack('TRIAL_OVER');
 					} else {
-						bannersStore.pushBannerToStack('TRIAL');
+						if (!cloudPlanStore.isTrialUpgradeOnSidebar) {
+							bannersStore.pushBannerToStack('TRIAL');
+						}
 					}
 				} else if (cloudPlanStore.currentUserCloudInfo?.confirmed === false) {
 					bannersStore.pushBannerToStack('EMAIL_CONFIRMATION');
diff --git a/packages/frontend/editor-ui/src/app/stores/cloudPlan.store.ts b/packages/frontend/editor-ui/src/app/stores/cloudPlan.store.ts
index 9f94a10e68b..402162f1528 100644
--- a/packages/frontend/editor-ui/src/app/stores/cloudPlan.store.ts
+++ b/packages/frontend/editor-ui/src/app/stores/cloudPlan.store.ts
@@ -10,10 +10,11 @@ import {
 	getCurrentUsage,
 } from '@n8n/rest-api-client/api/cloudPlans';
 import { DateTime } from 'luxon';
-import { CLOUD_TRIAL_CHECK_INTERVAL } from '@/app/constants';
+import { CLOUD_TRIAL_CHECK_INTERVAL, UPGRADE_PLAN_CTA_EXPERIMENT } from '@/app/constants';
 import { STORES } from '@n8n/stores';
 import { hasPermission } from '@/app/utils/rbac/permissions';
 import * as cloudApi from '@n8n/rest-api-client/api/cloudPlans';
+import { usePostHog } from './posthog.store';
 
 const DEFAULT_STATE: CloudPlanState = {
 	initialized: false,
@@ -27,6 +28,7 @@ const DYNAMIC_TRIAL_BANNER_DISMISSED_KEY = 'n8n-dynamic-trial-banner-dismissed';
 export const useCloudPlanStore = defineStore(STORES.CLOUD_PLAN, () => {
 	const rootStore = useRootStore();
 	const settingsStore = useSettingsStore();
+	const posthogStore = usePostHog();
 
 	const state = reactive<CloudPlanState>(DEFAULT_STATE);
 	const currentUserCloudInfo = ref<Cloud.UserAccount | null>(null);
@@ -114,6 +116,13 @@ export const useCloudPlanStore = defineStore(STORES.CLOUD_PLAN, () => {
 		return await getAdminPanelLoginCode(rootStore.restApiContext);
 	};
 
+	const isTrialUpgradeOnSidebar = computed(() => {
+		return (
+			posthogStore.getVariant(UPGRADE_PLAN_CTA_EXPERIMENT.name) ===
+			UPGRADE_PLAN_CTA_EXPERIMENT.variant
+		);
+	});
+
 	const getOwnerCurrentPlan = async () => {
 		if (!hasCloudPlan.value) throw new Error('User does not have a cloud plan');
 		state.loadingPlan = true;
@@ -242,5 +251,6 @@ export const useCloudPlanStore = defineStore(STORES.CLOUD_PLAN, () => {
 		dynamicTrialBannerText,
 		shouldShowDynamicTrialBanner,
 		dismissDynamicTrialBanner,
+		isTrialUpgradeOnSidebar,
 	};
 });
diff --git a/packages/frontend/editor-ui/src/features/shared/banners/components/banners/TrialBanner.vue b/packages/frontend/editor-ui/src/features/shared/banners/components/banners/TrialBanner.vue
index 146c43ac078..45e73324222 100644
--- a/packages/frontend/editor-ui/src/features/shared/banners/components/banners/TrialBanner.vue
+++ b/packages/frontend/editor-ui/src/features/shared/banners/components/banners/TrialBanner.vue
@@ -102,7 +102,7 @@ function onUpdatePlanClick() {
 					:bold="true"
 					>{{ trialBannerText }}</N8nBadge
 				>
-				<N8nButton type="success" icon="gem" size="small" @click="onUpdatePlanClick">{{
+				<N8nButton type="success" icon="zap" size="small" @click="onUpdatePlanClick">{{
 					locale.baseText('generic.upgradeNow')
 				}}</N8nButton>
 			</div>
diff --git a/packages/frontend/editor-ui/src/features/shared/banners/components/banners/TrialOverBanner.vue b/packages/frontend/editor-ui/src/features/shared/banners/components/banners/TrialOverBanner.vue
index f2c5748007c..12635005cea 100644
--- a/packages/frontend/editor-ui/src/features/shared/banners/components/banners/TrialOverBanner.vue
+++ b/packages/frontend/editor-ui/src/features/shared/banners/components/banners/TrialOverBanner.vue
@@ -4,8 +4,11 @@ import { usePageRedirectionHelper } from '@/app/composables/usePageRedirectionHe
 import { i18n as locale } from '@n8n/i18n';
 
 import { N8nButton } from '@n8n/design-system';
-function onUpdatePlanClick() {
-	void usePageRedirectionHelper().goToUpgrade('canvas-nav', 'upgrade-canvas-nav', 'redirect');
+
+const pageRedirectionHelper = usePageRedirectionHelper();
+
+function onUpgradePlanClick() {
+	void pageRedirectionHelper.goToUpgrade('canvas-nav', 'upgrade-canvas-nav', 'redirect');
 }
 </script>
 
@@ -15,7 +18,7 @@ function onUpdatePlanClick() {
 			<span>{{ locale.baseText('banners.trialOver.message') }}</span>
 		</template>
 		<template #trailingContent>
-			<N8nButton type="success" icon="gem" size="small" @click="onUpdatePlanClick">{{
+			<N8nButton type="success" icon="zap" size="small" @click="onUpgradePlanClick">{{
 				locale.baseText('generic.upgradeNow')
 			}}</N8nButton>
 		</template>
diff --git a/packages/testing/playwright/fixtures/plan-data-non-trial.json b/packages/testing/playwright/fixtures/plan-data-non-trial.json
new file mode 100644
index 00000000000..2801406a192
--- /dev/null
+++ b/packages/testing/playwright/fixtures/plan-data-non-trial.json
@@ -0,0 +1,24 @@
+{
+	"id": 200,
+	"planId": 1,
+	"pruneExecutionsInterval": 168,
+	"monthlyExecutionsLimit": 1000,
+	"activeWorkflowsLimit": 20,
+	"credentialsLimit": 100,
+	"supportTier": "community",
+	"displayName": "Starter",
+	"enabledFeatures": ["userManagement", "advancedExecutionFilters", "sharing"],
+	"licenseFeatures": {
+		"feat:sharing": true,
+		"feat:advancedExecutionFilters": true,
+		"quota:users": -1,
+		"quota:maxVariables": -1,
+		"feat:variables": true
+	},
+	"metadata": {
+		"version": "v1",
+		"group": "starter",
+		"slug": "starter"
+	},
+	"expirationDate": "2023-08-30T15:47:27.611Z"
+}
diff --git a/packages/testing/playwright/pages/SidebarPage.ts b/packages/testing/playwright/pages/SidebarPage.ts
index 3b520321df0..e1a8eac3adc 100644
--- a/packages/testing/playwright/pages/SidebarPage.ts
+++ b/packages/testing/playwright/pages/SidebarPage.ts
@@ -98,6 +98,10 @@ export class SidebarPage {
 		return this.page.getByTestId('banners-TRIAL');
 	}
 
+	getMainSidebarTrialUpgrade(): Locator {
+		return this.page.getByTestId('main-sidebar-trial-upgrade');
+	}
+
 	getTemplatesLink(): Locator {
 		return this.page.getByTestId('templates').locator('a');
 	}
diff --git a/packages/testing/playwright/tests/ui/cloud/cloud.spec.ts b/packages/testing/playwright/tests/ui/cloud/cloud.spec.ts
index 04ced8d2f6a..d595953140f 100644
--- a/packages/testing/playwright/tests/ui/cloud/cloud.spec.ts
+++ b/packages/testing/playwright/tests/ui/cloud/cloud.spec.ts
@@ -1,4 +1,5 @@
 import { test, expect } from '../../../fixtures/base';
+import nonTrialPlanData from '../../../fixtures/plan-data-non-trial.json';
 import basePlanData from '../../../fixtures/plan-data-trial.json';
 import type { n8nPage } from '../../../pages/n8nPage';
 import type { TestRequirements } from '../../../Types';
@@ -6,7 +7,7 @@ import type { TestRequirements } from '../../../Types';
 const fiveDaysFromNow = new Date(Date.now() + 5 * 24 * 60 * 60 * 1000);
 const planData = { ...basePlanData, expirationDate: fiveDaysFromNow.toJSON() };
 
-const cloudTrialRequirements = {
+const cloudTrialRequirements: TestRequirements = {
 	config: {
 		settings: {
 			deployment: { type: 'cloud' },
@@ -32,6 +33,32 @@ const cloudTrialRequirements = {
 	},
 };
 
+const cloudNonTrialRequirements: TestRequirements = {
+	config: {
+		settings: {
+			deployment: { type: 'cloud' },
+			n8nMetadata: { userId: '1' },
+			aiCredits: {
+				enabled: true,
+				credits: 100,
+			},
+			banners: {
+				dismissed: ['V1'], // Prevent V1 banner interference
+			},
+		},
+	},
+	intercepts: {
+		'cloud-plan': {
+			url: '**/rest/admin/cloud-plan',
+			response: { ...nonTrialPlanData, expirationDate: fiveDaysFromNow.toJSON() },
+		},
+		'cloud-user': {
+			url: '**/rest/cloud/proxy/user/me',
+			response: {},
+		},
+	},
+};
+
 const setupCloudTest = async (
 	n8n: n8nPage,
 	setupRequirements: (requirements: TestRequirements) => Promise<void>,
@@ -48,14 +75,72 @@ const createProjectAndNavigate = async (n8n: n8nPage) => {
 };
 
 test.describe('Cloud @db:reset @auth:owner', () => {
-	test.describe('Trial Banner', () => {
-		test('should render trial banner for opt-in cloud user', async ({ n8n, setupRequirements }) => {
+	test.describe('Trial Upgrade', () => {
+		test('should render trial banner for opt-in cloud user and has feature flag control', async ({
+			n8n,
+			setupRequirements,
+		}) => {
+			await setupCloudTest(n8n, setupRequirements, cloudTrialRequirements);
+			await n8n.start.fromBlankCanvas();
+			await n8n.sideBar.expand();
+
+			await n8n.page.evaluate(() => {
+				(
+					window as unknown as { featureFlags: { override: (name: string, value: string) => void } }
+				).featureFlags?.override('054_upgrade_plan_cta', 'control');
+			});
+
+			await expect(n8n.sideBar.getTrialBanner()).toBeVisible();
+		});
+
+		test('should render trial banner for opt-in cloud user and has no feature flag set', async ({
+			n8n,
+			setupRequirements,
+		}) => {
 			await setupCloudTest(n8n, setupRequirements, cloudTrialRequirements);
 			await n8n.start.fromBlankCanvas();
 			await n8n.sideBar.expand();
 
 			await expect(n8n.sideBar.getTrialBanner()).toBeVisible();
 		});
+
+		test('should show trial upgrade in the main sidebar if user is trialing and has feature flag enabled', async ({
+			n8n,
+			setupRequirements,
+		}) => {
+			await setupCloudTest(n8n, setupRequirements, cloudTrialRequirements);
+			await n8n.start.fromBlankCanvas();
+			await n8n.sideBar.expand();
+
+			await n8n.page.evaluate(() => {
+				(
+					window as unknown as { featureFlags: { override: (name: string, value: string) => void } }
+				).featureFlags?.override('054_upgrade_plan_cta', 'variant');
+			});
+
+			await n8n.page.reload();
+
+			await expect(n8n.sideBar.getMainSidebarTrialUpgrade()).toBeVisible();
+		});
+
+		test('should not show trial upgrade in the main sidebar if user is not trialing and feature flag is enabled', async ({
+			n8n,
+			setupRequirements,
+		}) => {
+			await setupCloudTest(n8n, setupRequirements, cloudNonTrialRequirements);
+			await n8n.start.fromBlankCanvas();
+			await n8n.sideBar.expand();
+
+			await n8n.page.evaluate(() => {
+				(
+					window as unknown as { featureFlags: { override: (name: string, value: string) => void } }
+				).featureFlags?.override('054_upgrade_plan_cta', 'variant');
+			});
+
+			await n8n.page.reload();
+
+			await expect(n8n.sideBar.getMainSidebarTrialUpgrade()).not.toBeVisible();
+		});
 	});
 
 	test.describe('Admin Home', () => {

From 4df815e6ddba8e74efaf9777d16985a481b04089 Mon Sep 17 00:00:00 2001
From: yehorkardash <yehor.kardash@n8n.io>
Date: Mon, 8 Dec 2025 10:54:11 +0100
Subject: [PATCH 118/167] fix(Read/Write Files from Disk Node): Throw error
 when file not found, normalize windows path (#22455)

---
 .../Files/ReadWriteFile/ReadWriteFile.node.ts |  2 +-
 .../ReadWriteFile/actions/read.operation.ts   | 26 +++++-----
 .../Files/ReadWriteFile/helpers/utils.ts      | 14 ++++++
 .../Files/ReadWriteFile/test/utils.test.ts    | 48 +++++++++++++++----
 4 files changed, 68 insertions(+), 22 deletions(-)

diff --git a/packages/nodes-base/nodes/Files/ReadWriteFile/ReadWriteFile.node.ts b/packages/nodes-base/nodes/Files/ReadWriteFile/ReadWriteFile.node.ts
index 33bf8dca62f..3c160cd6db0 100644
--- a/packages/nodes-base/nodes/Files/ReadWriteFile/ReadWriteFile.node.ts
+++ b/packages/nodes-base/nodes/Files/ReadWriteFile/ReadWriteFile.node.ts
@@ -15,7 +15,7 @@ export class ReadWriteFile implements INodeType {
 		name: 'readWriteFile',
 		icon: 'file:readWriteFile.svg',
 		group: ['input'],
-		version: 1,
+		version: [1, 1.1],
 		description: 'Read or write files from the computer that runs n8n',
 		defaults: {
 			name: 'Read/Write Files from Disk',
diff --git a/packages/nodes-base/nodes/Files/ReadWriteFile/actions/read.operation.ts b/packages/nodes-base/nodes/Files/ReadWriteFile/actions/read.operation.ts
index 89396660e4f..783981399ae 100644
--- a/packages/nodes-base/nodes/Files/ReadWriteFile/actions/read.operation.ts
+++ b/packages/nodes-base/nodes/Files/ReadWriteFile/actions/read.operation.ts
@@ -1,5 +1,5 @@
 import glob from 'fast-glob';
-import { NodeApiError } from 'n8n-workflow';
+import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 import type {
 	IExecuteFunctions,
 	INodeExecutionData,
@@ -9,7 +9,7 @@ import type {
 
 import { updateDisplayOptions } from '@utils/utilities';
 
-import { errorMapper, escapeSpecialCharacters } from '../helpers/utils';
+import { errorMapper, normalizeFileSelector } from '../helpers/utils';
 
 export const properties: INodeProperties[] = [
 	{
@@ -76,18 +76,15 @@ const displayOptions = {
 export const description = updateDisplayOptions(displayOptions, properties);
 
 export async function execute(this: IExecuteFunctions, items: INodeExecutionData[]) {
+	const nodeVersion = this.getNode().typeVersion;
 	const returnData: INodeExecutionData[] = [];
 	let fileSelector;
 
 	for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
 		try {
-			fileSelector = String(this.getNodeParameter('fileSelector', itemIndex));
-
-			fileSelector = escapeSpecialCharacters(fileSelector);
-
-			if (/^[a-zA-Z]:/.test(fileSelector)) {
-				fileSelector = fileSelector.replace(/\\\\/g, '/');
-			}
+			fileSelector = normalizeFileSelector(
+				this.getNodeParameter('fileSelector', itemIndex) as string,
+			);
 
 			const options = this.getNodeParameter('options', itemIndex, {});
 
@@ -99,6 +96,13 @@ export async function execute(this: IExecuteFunctions, items: INodeExecutionData
 
 			const files = await glob(fileSelector);
 
+			if (files.length === 0 && nodeVersion > 1) {
+				throw new NodeOperationError(this.getNode(), 'No file(s) found', {
+					itemIndex,
+					description: `No file matching the selector "${fileSelector}" found`,
+				});
+			}
+
 			const newItems: INodeExecutionData[] = [];
 			for (const filePath of files) {
 				const stream = await this.helpers.createReadStream(filePath);
@@ -134,14 +138,14 @@ export async function execute(this: IExecuteFunctions, items: INodeExecutionData
 			}
 			returnData.push(...newItems);
 		} catch (error) {
-			const nodeOperatioinError = errorMapper.call(this, error, itemIndex, {
+			const nodeOperationError = errorMapper.call(this, error, itemIndex, {
 				filePath: fileSelector,
 				operation: 'read',
 			});
 			if (this.continueOnFail()) {
 				returnData.push({
 					json: {
-						error: nodeOperatioinError.message,
+						error: nodeOperationError.message,
 					},
 					pairedItem: {
 						item: itemIndex,
diff --git a/packages/nodes-base/nodes/Files/ReadWriteFile/helpers/utils.ts b/packages/nodes-base/nodes/Files/ReadWriteFile/helpers/utils.ts
index 706b9802927..cfab860e4b8 100644
--- a/packages/nodes-base/nodes/Files/ReadWriteFile/helpers/utils.ts
+++ b/packages/nodes-base/nodes/Files/ReadWriteFile/helpers/utils.ts
@@ -1,5 +1,6 @@
 import type { IDataObject, IExecuteFunctions } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
+import path from 'node:path';
 
 export function errorMapper(
 	this: IExecuteFunctions,
@@ -39,3 +40,16 @@ export function escapeSpecialCharacters(str: string) {
 
 	return str;
 }
+
+export function normalizeFileSelector(fileSelectorRaw: string) {
+	let fileSelector = String(fileSelectorRaw);
+
+	const isWindows = /^[a-zA-Z]:/.test(fileSelector);
+	if (isWindows) {
+		fileSelector = path.win32.normalize(fileSelector).replace(/\\/g, '/');
+	}
+
+	fileSelector = escapeSpecialCharacters(fileSelector);
+
+	return fileSelector;
+}
diff --git a/packages/nodes-base/nodes/Files/ReadWriteFile/test/utils.test.ts b/packages/nodes-base/nodes/Files/ReadWriteFile/test/utils.test.ts
index fb9dece3b20..5360d79a15e 100644
--- a/packages/nodes-base/nodes/Files/ReadWriteFile/test/utils.test.ts
+++ b/packages/nodes-base/nodes/Files/ReadWriteFile/test/utils.test.ts
@@ -1,15 +1,43 @@
-import { escapeSpecialCharacters } from '../helpers/utils';
+import { escapeSpecialCharacters, normalizeFileSelector } from '../helpers/utils';
 
-describe('Read/Write Files from Disk, escapeSpecialCharacters', () => {
-	it('should escape parentheses in a string', () => {
-		const input = '/home/michael/Desktop/test(1).txt';
-		const expectedOutput = '/home/michael/Desktop/test\\(1\\).txt';
-		expect(escapeSpecialCharacters(input)).toBe(expectedOutput);
+describe('Read/Write Files from Disk', () => {
+	describe('escapeSpecialCharacters', () => {
+		it('should escape parentheses in a string', () => {
+			const input = '/home/michael/Desktop/test(1).txt';
+			const expectedOutput = '/home/michael/Desktop/test\\(1\\).txt';
+			expect(escapeSpecialCharacters(input)).toBe(expectedOutput);
+		});
+
+		it('should not modify strings that do not contain parentheses', () => {
+			const input = '/home/michael/Desktop/test.txt';
+			const expectedOutput = '/home/michael/Desktop/test.txt';
+			expect(escapeSpecialCharacters(input)).toBe(expectedOutput);
+		});
 	});
 
-	it('should not modify strings that do not contain parentheses', () => {
-		const input = '/home/michael/Desktop/test.txt';
-		const expectedOutput = '/home/michael/Desktop/test.txt';
-		expect(escapeSpecialCharacters(input)).toBe(expectedOutput);
+	describe('normalizeFileSelector', () => {
+		it('should normalize UNIX file selector with parentheses', () => {
+			const input = '/home/michael/Desktop/test(1).txt';
+			const expectedOutput = '/home/michael/Desktop/test\\(1\\).txt';
+			expect(normalizeFileSelector(input)).toBe(expectedOutput);
+		});
+
+		it('should normalize Windows file selector with \\ and parentheses', () => {
+			const input = 'C:\\Users\\michael\\Desktop\\test(1).txt';
+			const expectedOutput = 'C:/Users/michael/Desktop/test\\(1\\).txt';
+			expect(normalizeFileSelector(input)).toBe(expectedOutput);
+		});
+
+		it('should normalize Windows file selector with \\\\', () => {
+			const input = 'C:\\\\Users\\\\michael\\\\Desktop\\\\test.txt';
+			const expectedOutput = 'C:/Users/michael/Desktop/test.txt';
+			expect(normalizeFileSelector(input)).toBe(expectedOutput);
+		});
+
+		it('should normalize Windows file selector with /', () => {
+			const input = 'C:/Users/michael/Desktop/test.txt';
+			const expectedOutput = 'C:/Users/michael/Desktop/test.txt';
+			expect(normalizeFileSelector(input)).toBe(expectedOutput);
+		});
 	});
 });

From dcbc24d3f756d5ce4370bf2277118ee31604d863 Mon Sep 17 00:00:00 2001
From: Mutasem Aldmour <4711238+mutdmour@users.noreply.github.com>
Date: Mon, 8 Dec 2025 10:56:38 +0100
Subject: [PATCH 119/167] feat(ai-builder): Consolidate builder telemetry
 (#22644)

---
 .../evaluations/core/test-runner.ts           |   5 +-
 .../evaluations/langsmith/pairwise-runner.ts  |  23 +-
 .../evaluations/langsmith/runner.ts           |   5 +-
 .../evaluations/utils/evaluation-helpers.ts   |   7 +-
 .../src/ai-workflow-builder-agent.service.ts  |  24 +-
 .../ai-workflow-builder-agent.service.test.ts |   5 +-
 .../src/test/workflow-builder-agent.test.ts   |  10 +-
 .../src/workflow-builder-agent.ts             |   1 +
 .../ai/__tests__/ai-build-request.dto.test.ts |  18 +
 .../src/dto/ai/ai-build-request.dto.ts        |   1 +
 .../__tests__/ai.controller.test.ts           |   3 +
 packages/cli/src/controllers/ai.controller.ts |   3 +-
 .../ai-workflow-builder.service.test.ts       |   9 +
 .../handlers/executionFinished.test.ts        |  94 ++-
 .../handlers/executionFinished.ts             |  30 +-
 .../handlers/executionRecovered.ts            |   2 +-
 .../src/app/composables/useWorkflowState.ts   |   2 +
 .../editor-ui/src/app/views/NodeView.vue      |   2 +-
 .../ai/assistant/assistant.api.test.ts        |   6 +
 .../features/ai/assistant/assistant.store.ts  |   2 +
 .../features/ai/assistant/assistant.types.ts  |   1 +
 .../ai/assistant/builder.store.test.ts        | 574 +++++++++++++++++-
 .../features/ai/assistant/builder.store.ts    | 232 +++++--
 .../features/ai/assistant/builder.utils.ts    |   8 +-
 .../Agent/AskAssistantBuild.test.ts           | 243 --------
 .../components/Agent/AskAssistantBuild.vue    |  85 +--
 .../components/Agent/ExecuteMessage.vue       |  97 +--
 .../composables/useBuilderMessages.test.ts    |  23 +-
 .../composables/useBuilderMessages.ts         |  16 +-
 .../composables/useBuilderTodos.test.ts       | 183 ++++++
 .../assistant/composables/useBuilderTodos.ts  | 164 +++++
 packages/workflow/src/index.ts                |   1 +
 packages/workflow/src/utils.ts                |   4 +
 packages/workflow/src/workflow.ts             |   5 +-
 pnpm-lock.yaml                                |  14 +-
 pnpm-workspace.yaml                           |   2 +-
 36 files changed, 1376 insertions(+), 528 deletions(-)
 create mode 100644 packages/frontend/editor-ui/src/features/ai/assistant/composables/useBuilderTodos.test.ts
 create mode 100644 packages/frontend/editor-ui/src/features/ai/assistant/composables/useBuilderTodos.ts

diff --git a/packages/@n8n/ai-workflow-builder.ee/evaluations/core/test-runner.ts b/packages/@n8n/ai-workflow-builder.ee/evaluations/core/test-runner.ts
index aa814eedf82..742f059d259 100644
--- a/packages/@n8n/ai-workflow-builder.ee/evaluations/core/test-runner.ts
+++ b/packages/@n8n/ai-workflow-builder.ee/evaluations/core/test-runner.ts
@@ -99,7 +99,10 @@ export async function runSingleTest(
 		// Generate workflow
 		const startTime = Date.now();
 		await consumeGenerator(
-			agent.chat(getChatPayload(testCase.prompt, testCase.id, opts?.featureFlags), userId),
+			agent.chat(
+				getChatPayload('single-eval', testCase.prompt, testCase.id, opts?.featureFlags),
+				userId,
+			),
 		);
 		const generationTime = Date.now() - startTime;
 
diff --git a/packages/@n8n/ai-workflow-builder.ee/evaluations/langsmith/pairwise-runner.ts b/packages/@n8n/ai-workflow-builder.ee/evaluations/langsmith/pairwise-runner.ts
index b9b11e4e273..3053ebc8d8c 100644
--- a/packages/@n8n/ai-workflow-builder.ee/evaluations/langsmith/pairwise-runner.ts
+++ b/packages/@n8n/ai-workflow-builder.ee/evaluations/langsmith/pairwise-runner.ts
@@ -356,7 +356,10 @@ async function runSingleGeneration(
 
 	// Generate workflow
 	await consumeGenerator(
-		agent.chat(getChatPayload(inputs.prompt, runId, featureFlags), `pairwise-gen-${generationIndex}`),
+		agent.chat(
+			getChatPayload('pairewise-gen', inputs.prompt, runId, featureFlags),
+			`pairwise-gen-${generationIndex}`,
+		),
 	);
 
 	const state = await agent.getState(runId, `pairwise-gen-${generationIndex}`);
@@ -441,7 +444,16 @@ function createPairwiseWorkflowGenerator(
 		// Run all generations in parallel
 		const generationResults = await Promise.all(
 			Array.from({ length: numGenerations }, async (_, i) => {
-				return await runSingleGeneration(parsedNodeTypes, llm, numJudges, inputs, i, log, featureFlags, tracer);
+				return await runSingleGeneration(
+					parsedNodeTypes,
+					llm,
+					numJudges,
+					inputs,
+					i,
+					log,
+					featureFlags,
+					tracer,
+				);
 			}),
 		);
 
@@ -838,7 +850,12 @@ export async function runLocalPairwiseEvaluation(options: LocalPairwiseOptions):
 				const genStartTime = Date.now();
 				const runId = generateRunId();
 				const agent = createAgent(parsedNodeTypes, llm, undefined, featureFlags);
-				await consumeGenerator(agent.chat(getChatPayload(prompt, runId, featureFlags), `local-gen-${genIndex}`));
+				await consumeGenerator(
+					agent.chat(
+						getChatPayload('pairwise-local', prompt, runId, featureFlags),
+						`local-gen-${genIndex}`,
+					),
+				);
 				const state = await agent.getState(runId, `local-gen-${genIndex}`);
 
 				if (!state.values || !isWorkflowStateValues(state.values)) {
diff --git a/packages/@n8n/ai-workflow-builder.ee/evaluations/langsmith/runner.ts b/packages/@n8n/ai-workflow-builder.ee/evaluations/langsmith/runner.ts
index f0c6d91e35c..f40902d592b 100644
--- a/packages/@n8n/ai-workflow-builder.ee/evaluations/langsmith/runner.ts
+++ b/packages/@n8n/ai-workflow-builder.ee/evaluations/langsmith/runner.ts
@@ -46,7 +46,10 @@ function createWorkflowGenerator(
 		// Create agent for this run
 		const agent = createAgent(parsedNodeTypes, llm, tracer);
 		await consumeGenerator(
-			agent.chat(getChatPayload(messageContent, runId, featureFlags), 'langsmith-eval-user'),
+			agent.chat(
+				getChatPayload('langsmith-evals', messageContent, runId, featureFlags),
+				'langsmith-eval-user',
+			),
 		);
 
 		// Get generated workflow with validation
diff --git a/packages/@n8n/ai-workflow-builder.ee/evaluations/utils/evaluation-helpers.ts b/packages/@n8n/ai-workflow-builder.ee/evaluations/utils/evaluation-helpers.ts
index 016a2c47592..0ff3141c999 100644
--- a/packages/@n8n/ai-workflow-builder.ee/evaluations/utils/evaluation-helpers.ts
+++ b/packages/@n8n/ai-workflow-builder.ee/evaluations/utils/evaluation-helpers.ts
@@ -6,6 +6,7 @@ import { Client } from 'langsmith';
 import type { INodeTypeDescription } from 'n8n-workflow';
 import { join } from 'path';
 import pc from 'picocolors';
+import { v4 as uuid } from 'uuid';
 
 import { anthropicClaudeSonnet45 } from '../../src/llm-config';
 import type { BuilderFeatureFlags, ChatPayload } from '../../src/workflow-builder-agent';
@@ -278,18 +279,20 @@ export async function consumeGenerator<T>(gen: AsyncGenerator<T>) {
 }
 
 export function getChatPayload(
+	evalType: string,
 	message: string,
-	id: string,
+	workflowId: string,
 	featureFlags?: BuilderFeatureFlags,
 ): ChatPayload {
 	return {
+		id: `${evalType}-${uuid()}`,
 		featureFlags: featureFlags ?? {
 			multiAgent: true,
 			templateExamples: false,
 		},
 		message,
 		workflowContext: {
-			currentWorkflow: { id, nodes: [], connections: {} },
+			currentWorkflow: { id: workflowId, nodes: [], connections: {} },
 		},
 	};
 }
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/ai-workflow-builder-agent.service.ts b/packages/@n8n/ai-workflow-builder.ee/src/ai-workflow-builder-agent.service.ts
index db80d6f58f4..8d273c0256f 100644
--- a/packages/@n8n/ai-workflow-builder.ee/src/ai-workflow-builder-agent.service.ts
+++ b/packages/@n8n/ai-workflow-builder.ee/src/ai-workflow-builder-agent.service.ts
@@ -61,10 +61,10 @@ export class AiWorkflowBuilderService {
 		});
 	}
 
-	private async getApiProxyAuthHeaders(user: IUser) {
+	private async getApiProxyAuthHeaders(user: IUser, userMessageId: string) {
 		assert(this.client);
 
-		const authResponse = await this.client.getBuilderApiProxyToken(user);
+		const authResponse = await this.client.getBuilderApiProxyToken(user, { userMessageId });
 		const authHeaders = {
 			// eslint-disable-next-line @typescript-eslint/naming-convention
 			Authorization: `${authResponse.tokenType} ${authResponse.accessToken}`,
@@ -73,7 +73,10 @@ export class AiWorkflowBuilderService {
 		return authHeaders;
 	}
 
-	private async setupModels(user: IUser): Promise<{
+	private async setupModels(
+		user: IUser,
+		userMessageId: string,
+	): Promise<{
 		anthropicClaude: ChatAnthropic;
 		tracingClient?: TracingClient;
 		// eslint-disable-next-line @typescript-eslint/naming-convention
@@ -82,7 +85,7 @@ export class AiWorkflowBuilderService {
 		try {
 			// If client is provided, use it for API proxy
 			if (this.client) {
-				const authHeaders = await this.getApiProxyAuthHeaders(user);
+				const authHeaders = await this.getApiProxyAuthHeaders(user, userMessageId);
 
 				// Extract baseUrl from client configuration
 				const baseUrl = this.client.getApiProxyBaseUrl();
@@ -158,8 +161,11 @@ export class AiWorkflowBuilderService {
 		});
 	}
 
-	private async getAgent(user: IUser, featureFlags?: BuilderFeatureFlags) {
-		const { anthropicClaude, tracingClient, authHeaders } = await this.setupModels(user);
+	private async getAgent(user: IUser, userMessageId: string, featureFlags?: BuilderFeatureFlags) {
+		const { anthropicClaude, tracingClient, authHeaders } = await this.setupModels(
+			user,
+			userMessageId,
+		);
 
 		const agent = new WorkflowBuilderAgent({
 			parsedNodeTypes: this.parsedNodeTypes,
@@ -208,7 +214,7 @@ export class AiWorkflowBuilderService {
 	}
 
 	async *chat(payload: ChatPayload, user: IUser, abortSignal?: AbortSignal) {
-		const agent = await this.getAgent(user, payload.featureFlags);
+		const agent = await this.getAgent(user, payload.id, payload.featureFlags);
 		const userId = user?.id?.toString();
 		const workflowId = payload.workflowContext?.currentWorkflow?.id;
 
@@ -219,7 +225,7 @@ export class AiWorkflowBuilderService {
 		// After the stream completes, track telemetry
 		if (this.onTelemetryEvent && userId) {
 			try {
-				await this.trackBuilderReplyTelemetry(agent, workflowId, userId);
+				await this.trackBuilderReplyTelemetry(agent, workflowId, userId, payload.id);
 			} catch (error) {
 				this.logger?.error('Failed to track builder reply telemetry', { error });
 			}
@@ -230,6 +236,7 @@ export class AiWorkflowBuilderService {
 		agent: WorkflowBuilderAgent,
 		workflowId: string | undefined,
 		userId: string,
+		userMessageId: string,
 	): Promise<void> {
 		if (!this.onTelemetryEvent) return;
 
@@ -270,6 +277,7 @@ export class AiWorkflowBuilderService {
 			...(state.values.templateIds.length > 0 && {
 				templates_selected: state.values.templateIds,
 			}),
+			user_message_id: userMessageId,
 		};
 
 		this.onTelemetryEvent('Builder replied to user message', properties);
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/test/ai-workflow-builder-agent.service.test.ts b/packages/@n8n/ai-workflow-builder.ee/src/test/ai-workflow-builder-agent.service.test.ts
index e78864ab8c6..85a15f4446b 100644
--- a/packages/@n8n/ai-workflow-builder.ee/src/test/ai-workflow-builder-agent.service.test.ts
+++ b/packages/@n8n/ai-workflow-builder.ee/src/test/ai-workflow-builder-agent.service.test.ts
@@ -151,9 +151,6 @@ describe('AiWorkflowBuilderService', () => {
 
 		// Mock AI assistant client
 		mockClient = mock<AiAssistantClient>();
-		(mockClient.generateApiProxyCredentials as jest.Mock).mockResolvedValue({
-			apiKey: 'test-api-key',
-		});
 		(mockClient.getBuilderApiProxyToken as jest.Mock).mockResolvedValue({
 			tokenType: 'Bearer',
 			accessToken: 'test-access-token',
@@ -301,6 +298,7 @@ describe('AiWorkflowBuilderService', () => {
 
 		beforeEach(() => {
 			mockPayload = {
+				id: '12345',
 				message: 'Create a simple workflow',
 				workflowContext: {
 					currentWorkflow: { id: 'test-workflow' },
@@ -571,6 +569,7 @@ describe('AiWorkflowBuilderService', () => {
 		it('should handle complete workflow from chat to session retrieval', async () => {
 			const workflowId = 'integration-test-workflow';
 			const mockPayload: ChatPayload = {
+				id: '545623',
 				message: 'Create a workflow with HTTP request',
 				workflowContext: {
 					currentWorkflow: { id: workflowId },
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/test/workflow-builder-agent.test.ts b/packages/@n8n/ai-workflow-builder.ee/src/test/workflow-builder-agent.test.ts
index 22092414300..793679c9fef 100644
--- a/packages/@n8n/ai-workflow-builder.ee/src/test/workflow-builder-agent.test.ts
+++ b/packages/@n8n/ai-workflow-builder.ee/src/test/workflow-builder-agent.test.ts
@@ -146,6 +146,7 @@ describe('WorkflowBuilderAgent', () => {
 
 		beforeEach(() => {
 			mockPayload = {
+				id: '12345',
 				message: 'Create a workflow',
 				workflowContext: {
 					currentWorkflow: { id: 'workflow-123' },
@@ -156,6 +157,7 @@ describe('WorkflowBuilderAgent', () => {
 		it('should throw ValidationError when message exceeds maximum length', async () => {
 			const longMessage = 'x'.repeat(MAX_AI_BUILDER_PROMPT_LENGTH + 1);
 			const payload: ChatPayload = {
+				id: '12345',
 				message: longMessage,
 			};
 
@@ -173,6 +175,7 @@ describe('WorkflowBuilderAgent', () => {
 		it('should handle valid message length', async () => {
 			const validMessage = 'Create a simple workflow';
 			const payload: ChatPayload = {
+				id: '12345',
 				message: validMessage,
 			};
 
@@ -491,6 +494,7 @@ describe('WorkflowBuilderAgent', () => {
 			);
 
 			const generator = agent.chat({
+				id: '12345',
 				message: 'Create a workflow',
 				featureFlags: { templateExamples: true },
 			});
@@ -511,6 +515,7 @@ describe('WorkflowBuilderAgent', () => {
 			);
 
 			const generator = agent.chat({
+				id: '12345',
 				message: 'Create a workflow',
 				featureFlags: { templateExamples: false },
 			});
@@ -530,7 +535,10 @@ describe('WorkflowBuilderAgent', () => {
 				mockAsyncGenerator,
 			);
 
-			const generator = agent.chat({ message: 'Create a workflow' });
+			const generator = agent.chat({
+				id: '12345',
+				message: 'Create a workflow',
+			});
 			await generator.next();
 
 			expect(mockCreateMainAgentPrompt).toHaveBeenCalledWith({ includeExamplesPhase: false });
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/workflow-builder-agent.ts b/packages/@n8n/ai-workflow-builder.ee/src/workflow-builder-agent.ts
index b871bcd8b9f..e1557a0ca72 100644
--- a/packages/@n8n/ai-workflow-builder.ee/src/workflow-builder-agent.ts
+++ b/packages/@n8n/ai-workflow-builder.ee/src/workflow-builder-agent.ts
@@ -159,6 +159,7 @@ export interface BuilderFeatureFlags {
 }
 
 export interface ChatPayload {
+	id: string;
 	message: string;
 	workflowContext?: {
 		executionSchema?: NodeExecutionSchema[];
diff --git a/packages/@n8n/api-types/src/dto/ai/__tests__/ai-build-request.dto.test.ts b/packages/@n8n/api-types/src/dto/ai/__tests__/ai-build-request.dto.test.ts
index e31edc8ff7b..e8b2be09f15 100644
--- a/packages/@n8n/api-types/src/dto/ai/__tests__/ai-build-request.dto.test.ts
+++ b/packages/@n8n/api-types/src/dto/ai/__tests__/ai-build-request.dto.test.ts
@@ -3,6 +3,7 @@ import { AiBuilderChatRequestDto } from '../ai-build-request.dto';
 describe('AiBuilderChatRequestDto', () => {
 	const validBasePayload = {
 		payload: {
+			id: '12345',
 			role: 'user' as const,
 			type: 'message' as const,
 			text: 'Build me a workflow',
@@ -305,6 +306,7 @@ describe('AiBuilderChatRequestDto', () => {
 			const invalidRequest = {
 				...validBasePayload,
 				payload: {
+					id: '12345',
 					role: 'user' as const,
 					type: 'message' as const,
 					workflowContext: validBasePayload.payload.workflowContext,
@@ -315,5 +317,21 @@ describe('AiBuilderChatRequestDto', () => {
 
 			expect(result.success).toBe(false);
 		});
+
+		it('should fail when id is missing', () => {
+			const invalidRequest = {
+				...validBasePayload,
+				payload: {
+					role: 'user' as const,
+					type: 'message' as const,
+					text: 'text',
+					workflowContext: validBasePayload.payload.workflowContext,
+				},
+			};
+
+			const result = AiBuilderChatRequestDto.safeParse(invalidRequest);
+
+			expect(result.success).toBe(false);
+		});
 	});
 });
diff --git a/packages/@n8n/api-types/src/dto/ai/ai-build-request.dto.ts b/packages/@n8n/api-types/src/dto/ai/ai-build-request.dto.ts
index 5ad8fc703b7..bb6cde31c10 100644
--- a/packages/@n8n/api-types/src/dto/ai/ai-build-request.dto.ts
+++ b/packages/@n8n/api-types/src/dto/ai/ai-build-request.dto.ts
@@ -10,6 +10,7 @@ export interface ExpressionValue {
 
 export class AiBuilderChatRequestDto extends Z.class({
 	payload: z.object({
+		id: z.string(),
 		role: z.literal('user'),
 		type: z.literal('message'),
 		text: z.string(),
diff --git a/packages/cli/src/controllers/__tests__/ai.controller.test.ts b/packages/cli/src/controllers/__tests__/ai.controller.test.ts
index 7dd17f2a83c..a78e9fd003c 100644
--- a/packages/cli/src/controllers/__tests__/ai.controller.test.ts
+++ b/packages/cli/src/controllers/__tests__/ai.controller.test.ts
@@ -118,6 +118,7 @@ describe('AiController', () => {
 	describe('build', () => {
 		const payload: AiBuilderChatRequestDto = {
 			payload: {
+				id: '12345',
 				text: 'Create a workflow',
 				type: 'message',
 				role: 'user',
@@ -146,6 +147,8 @@ describe('AiController', () => {
 
 			expect(workflowBuilderService.chat).toHaveBeenCalledWith(
 				{
+					id: '12345',
+					featureFlags: undefined,
 					message: 'Create a workflow',
 					workflowContext: {
 						currentWorkflow: { id: 'workflow123' },
diff --git a/packages/cli/src/controllers/ai.controller.ts b/packages/cli/src/controllers/ai.controller.ts
index c513b8492e6..7dba4e368bc 100644
--- a/packages/cli/src/controllers/ai.controller.ts
+++ b/packages/cli/src/controllers/ai.controller.ts
@@ -55,9 +55,10 @@ export class AiController {
 
 			res.on('close', handleClose);
 
-			const { text, workflowContext, featureFlags } = payload.payload;
+			const { id, text, workflowContext, featureFlags } = payload.payload;
 			const aiResponse = this.workflowBuilderService.chat(
 				{
+					id,
 					message: text,
 					workflowContext: {
 						currentWorkflow: workflowContext.currentWorkflow,
diff --git a/packages/cli/src/services/__tests__/ai-workflow-builder.service.test.ts b/packages/cli/src/services/__tests__/ai-workflow-builder.service.test.ts
index f24e3a9afe8..c3e6824bf35 100644
--- a/packages/cli/src/services/__tests__/ai-workflow-builder.service.test.ts
+++ b/packages/cli/src/services/__tests__/ai-workflow-builder.service.test.ts
@@ -100,6 +100,7 @@ describe('WorkflowBuilderService', () => {
 	describe('chat', () => {
 		it('should create AiWorkflowBuilderService on first chat call without AI assistant client', async () => {
 			const mockPayload = {
+				id: '12345',
 				message: 'test message',
 				workflowContext: {},
 			};
@@ -134,6 +135,7 @@ describe('WorkflowBuilderService', () => {
 
 			const mockPayload = {
 				message: 'test message',
+				id: '12345',
 				workflowContext: {},
 			};
 
@@ -170,6 +172,7 @@ describe('WorkflowBuilderService', () => {
 		it('should reuse the same service instance on subsequent calls', async () => {
 			const mockPayload = {
 				message: 'test message',
+				id: '12345',
 				workflowContext: {},
 			};
 
@@ -201,6 +204,7 @@ describe('WorkflowBuilderService', () => {
 		it('should pass abort signal to underlying service', async () => {
 			const mockPayload = {
 				message: 'test message',
+				id: '12345',
 				workflowContext: {},
 			};
 
@@ -265,6 +269,7 @@ describe('WorkflowBuilderService', () => {
 		it('should send push notification when credits are updated', async () => {
 			const mockPayload = {
 				message: 'test message',
+				id: '12345',
 				workflowContext: {},
 			};
 
@@ -313,6 +318,7 @@ describe('WorkflowBuilderService', () => {
 		it('should handle multiple credit updates', async () => {
 			const mockPayload = {
 				message: 'test message',
+				id: '12345',
 				workflowContext: {},
 			};
 
@@ -373,6 +379,7 @@ describe('WorkflowBuilderService', () => {
 		it('should call telemetry.track when telemetry event is triggered', async () => {
 			const mockPayload = {
 				message: 'test message',
+				id: '12345',
 				workflowContext: {},
 			};
 
@@ -419,6 +426,7 @@ describe('WorkflowBuilderService', () => {
 		it('should handle multiple telemetry events', async () => {
 			const mockPayload = {
 				message: 'test message',
+				id: '12345',
 				workflowContext: {},
 			};
 
@@ -463,6 +471,7 @@ describe('WorkflowBuilderService', () => {
 		it('should handle telemetry events with empty properties', async () => {
 			const mockPayload = {
 				message: 'test message',
+				id: '12345',
 				workflowContext: {},
 			};
 
diff --git a/packages/frontend/editor-ui/src/app/composables/usePushConnection/handlers/executionFinished.test.ts b/packages/frontend/editor-ui/src/app/composables/usePushConnection/handlers/executionFinished.test.ts
index d3d29e7b7ae..fbfbb49b83b 100644
--- a/packages/frontend/editor-ui/src/app/composables/usePushConnection/handlers/executionFinished.test.ts
+++ b/packages/frontend/editor-ui/src/app/composables/usePushConnection/handlers/executionFinished.test.ts
@@ -4,9 +4,11 @@ import {
 	continueEvaluationLoop,
 	executionFinished,
 	getRunExecutionData,
+	handleExecutionFinishedWithSuccessOrOther,
+	handleExecutionFinishedWithErrorOrCanceled,
 	type SimplifiedExecution,
 } from './executionFinished';
-import type { ITaskData } from 'n8n-workflow';
+import type { IRunExecutionData, ITaskData } from 'n8n-workflow';
 import { EVALUATION_TRIGGER_NODE_TYPE } from 'n8n-workflow';
 import type { INodeUi, IWorkflowDb } from '@/Interface';
 import type { Router } from 'vue-router';
@@ -17,6 +19,7 @@ import { useWorkflowsStore } from '@/app/stores/workflows.store';
 import { useUIStore } from '@/app/stores/ui.store';
 import { mockedStore } from '@/__tests__/utils';
 import { useReadyToRunStore } from '@/features/workflows/readyToRun/stores/readyToRun.store';
+import { useBuilderStore } from '@/features/ai/assistant/builder.store';
 
 const opts = {
 	workflowState: mock<WorkflowState>(),
@@ -524,3 +527,92 @@ describe('executionFinished', () => {
 		expect(runWorkflow).not.toHaveBeenCalled();
 	});
 });
+
+describe('manual execution stats tracking', () => {
+	beforeEach(() => {
+		vi.resetAllMocks();
+	});
+
+	describe('handleExecutionFinishedWithSuccessOrOther', () => {
+		it('increments success stats on successful execution', () => {
+			const pinia = createTestingPinia();
+			setActivePinia(pinia);
+
+			const builderStore = mockedStore(useBuilderStore);
+			const incrementSpy = vi.spyOn(builderStore, 'incrementManualExecutionStats');
+
+			handleExecutionFinishedWithSuccessOrOther(mock<WorkflowState>(), 'success', false);
+
+			expect(incrementSpy).toHaveBeenCalledWith('success');
+		});
+
+		it('does not increment success stats when successToastAlreadyShown is true', () => {
+			const pinia = createTestingPinia();
+			setActivePinia(pinia);
+
+			const builderStore = mockedStore(useBuilderStore);
+			const incrementSpy = vi.spyOn(builderStore, 'incrementManualExecutionStats');
+
+			handleExecutionFinishedWithSuccessOrOther(mock<WorkflowState>(), 'success', true);
+
+			expect(incrementSpy).not.toHaveBeenCalled();
+		});
+
+		it('does not increment stats for non-success status', () => {
+			const pinia = createTestingPinia();
+			setActivePinia(pinia);
+
+			const builderStore = mockedStore(useBuilderStore);
+			const incrementSpy = vi.spyOn(builderStore, 'incrementManualExecutionStats');
+
+			handleExecutionFinishedWithSuccessOrOther(mock<WorkflowState>(), 'error', false);
+
+			expect(incrementSpy).not.toHaveBeenCalled();
+		});
+	});
+
+	describe('handleExecutionFinishedWithErrorOrCanceled', () => {
+		it('increments error stats on execution error', () => {
+			const pinia = createTestingPinia();
+			setActivePinia(pinia);
+
+			const builderStore = mockedStore(useBuilderStore);
+			const incrementSpy = vi.spyOn(builderStore, 'incrementManualExecutionStats');
+
+			const execution = mock<SimplifiedExecution>({
+				status: 'error',
+				data: {
+					resultData: {
+						error: { message: 'test error', name: 'Error' },
+					},
+				},
+			});
+
+			handleExecutionFinishedWithErrorOrCanceled(
+				execution,
+				mock<IRunExecutionData>({ resultData: { error: { message: 'test', name: 'Error' } } }),
+			);
+
+			expect(incrementSpy).toHaveBeenCalledWith('error');
+		});
+
+		it('does not increment stats for canceled executions', () => {
+			const pinia = createTestingPinia();
+			setActivePinia(pinia);
+
+			const builderStore = mockedStore(useBuilderStore);
+			const incrementSpy = vi.spyOn(builderStore, 'incrementManualExecutionStats');
+
+			const execution = mock<SimplifiedExecution>({
+				status: 'canceled',
+			});
+
+			handleExecutionFinishedWithErrorOrCanceled(
+				execution,
+				mock<IRunExecutionData>({ resultData: {} }),
+			);
+
+			expect(incrementSpy).not.toHaveBeenCalled();
+		});
+	});
+});
diff --git a/packages/frontend/editor-ui/src/app/composables/usePushConnection/handlers/executionFinished.ts b/packages/frontend/editor-ui/src/app/composables/usePushConnection/handlers/executionFinished.ts
index 420e71a5209..85edd57c046 100644
--- a/packages/frontend/editor-ui/src/app/composables/usePushConnection/handlers/executionFinished.ts
+++ b/packages/frontend/editor-ui/src/app/composables/usePushConnection/handlers/executionFinished.ts
@@ -14,6 +14,7 @@ import { useNodeTypesStore } from '@/app/stores/nodeTypes.store';
 import { useSettingsStore } from '@/app/stores/settings.store';
 import { useUIStore } from '@/app/stores/ui.store';
 import { useWorkflowsStore } from '@/app/stores/workflows.store';
+import { useBuilderStore } from '@/features/ai/assistant/builder.store';
 import {
 	SampleTemplates,
 	isPrebuiltAgentTemplateId,
@@ -28,7 +29,13 @@ import { getTriggerNodeServiceName } from '@/app/utils/nodeTypesUtils';
 import type { ExecutionFinished } from '@n8n/api-types/push/execution';
 import { useI18n } from '@n8n/i18n';
 import { parse } from 'flatted';
-import type { ExpressionError, IDataObject, IRunExecutionData, IWorkflowBase } from 'n8n-workflow';
+import type {
+	ExecutionStatus,
+	ExpressionError,
+	IDataObject,
+	IRunExecutionData,
+	IWorkflowBase,
+} from 'n8n-workflow';
 import {
 	EVALUATION_TRIGGER_NODE_TYPE,
 	TelemetryHelpers,
@@ -115,7 +122,11 @@ export async function executionFinished(
 	let successToastAlreadyShown = false;
 
 	if (data.status === 'success') {
-		handleExecutionFinishedWithSuccessOrOther(options.workflowState, successToastAlreadyShown);
+		handleExecutionFinishedWithSuccessOrOther(
+			options.workflowState,
+			data.status,
+			successToastAlreadyShown,
+		);
 		successToastAlreadyShown = true;
 	}
 
@@ -140,7 +151,11 @@ export async function executionFinished(
 	} else if (execution.status === 'error' || execution.status === 'canceled') {
 		handleExecutionFinishedWithErrorOrCanceled(execution, runExecutionData);
 	} else {
-		handleExecutionFinishedWithSuccessOrOther(options.workflowState, successToastAlreadyShown);
+		handleExecutionFinishedWithSuccessOrOther(
+			options.workflowState,
+			execution.status,
+			successToastAlreadyShown,
+		);
 	}
 
 	setRunExecutionData(execution, runExecutionData, options.workflowState);
@@ -351,6 +366,8 @@ export function handleExecutionFinishedWithErrorOrCanceled(
 		});
 
 		toast.showMessage({ title, message, type: 'error', duration: 0 });
+
+		useBuilderStore().incrementManualExecutionStats('error');
 	}
 }
 
@@ -381,6 +398,7 @@ function handleExecutionFinishedSuccessfully(
  */
 export function handleExecutionFinishedWithSuccessOrOther(
 	workflowState: WorkflowState,
+	executionStatus: ExecutionStatus,
 	successToastAlreadyShown: boolean,
 ) {
 	const workflowsStore = useWorkflowsStore();
@@ -427,6 +445,12 @@ export function handleExecutionFinishedWithSuccessOrOther(
 			workflowState,
 		);
 	}
+
+	// Execution finished is triggered multiple times
+	// use "successToastAlreadyShown" flag to avoid double counting executions
+	if (executionStatus === 'success' && !successToastAlreadyShown) {
+		useBuilderStore().incrementManualExecutionStats('success');
+	}
 }
 
 export function setRunExecutionData(
diff --git a/packages/frontend/editor-ui/src/app/composables/usePushConnection/handlers/executionRecovered.ts b/packages/frontend/editor-ui/src/app/composables/usePushConnection/handlers/executionRecovered.ts
index 63e8942764c..924af739305 100644
--- a/packages/frontend/editor-ui/src/app/composables/usePushConnection/handlers/executionRecovered.ts
+++ b/packages/frontend/editor-ui/src/app/composables/usePushConnection/handlers/executionRecovered.ts
@@ -40,7 +40,7 @@ export async function executionRecovered(
 	} else if (execution.status === 'error' || execution.status === 'canceled') {
 		handleExecutionFinishedWithErrorOrCanceled(execution, runExecutionData);
 	} else {
-		handleExecutionFinishedWithSuccessOrOther(options.workflowState, false);
+		handleExecutionFinishedWithSuccessOrOther(options.workflowState, execution.status, false);
 	}
 
 	setRunExecutionData(execution, runExecutionData, options.workflowState);
diff --git a/packages/frontend/editor-ui/src/app/composables/useWorkflowState.ts b/packages/frontend/editor-ui/src/app/composables/useWorkflowState.ts
index fe30b66bdf2..0482f6948ec 100644
--- a/packages/frontend/editor-ui/src/app/composables/useWorkflowState.ts
+++ b/packages/frontend/editor-ui/src/app/composables/useWorkflowState.ts
@@ -15,6 +15,7 @@ import type {
 } from '@/features/execution/executions/executions.types';
 import { useUIStore } from '@/app/stores/ui.store';
 import { useWorkflowsStore } from '@/app/stores/workflows.store';
+import { useBuilderStore } from '@/features/ai/assistant/builder.store';
 import { getPairedItemsMapping } from '@/app/utils/pairedItemUtils';
 import {
 	type INodeIssueData,
@@ -233,6 +234,7 @@ export function useWorkflowState() {
 		setActiveExecutionId(undefined);
 		workflowStateStore.executingNode.executingNode.length = 0;
 		ws.executionWaitingForWebhook = false;
+		useBuilderStore().resetManualExecutionStats();
 	}
 
 	////
diff --git a/packages/frontend/editor-ui/src/app/views/NodeView.vue b/packages/frontend/editor-ui/src/app/views/NodeView.vue
index 2c5343a46bb..1a34b8c2e28 100644
--- a/packages/frontend/editor-ui/src/app/views/NodeView.vue
+++ b/packages/frontend/editor-ui/src/app/views/NodeView.vue
@@ -2149,7 +2149,7 @@ onBeforeUnmount(() => {
 				v-if="builderStore.streaming"
 				:class="$style.thinkingPill"
 				show-stop
-				@stop="builderStore.stopStreaming"
+				@stop="builderStore.abortStreaming"
 			/>
 
 			<Suspense>
diff --git a/packages/frontend/editor-ui/src/features/ai/assistant/assistant.api.test.ts b/packages/frontend/editor-ui/src/features/ai/assistant/assistant.api.test.ts
index 90092709627..94cc8453d77 100644
--- a/packages/frontend/editor-ui/src/features/ai/assistant/assistant.api.test.ts
+++ b/packages/frontend/editor-ui/src/features/ai/assistant/assistant.api.test.ts
@@ -38,6 +38,7 @@ describe('API: ai', () => {
 		it('should call streamRequest with the correct parameters', () => {
 			const payload: ChatRequest.RequestPayload = {
 				payload: {
+					id: '12345',
 					role: 'user',
 					type: 'message',
 					text: 'Build me a workflow',
@@ -62,6 +63,7 @@ describe('API: ai', () => {
 		it('should pass abort signal when provided', () => {
 			const payload: ChatRequest.RequestPayload = {
 				payload: {
+					id: '12345',
 					role: 'user',
 					type: 'message',
 					text: 'Build me a workflow',
@@ -177,6 +179,7 @@ describe('API: ai', () => {
 
 			const payload: ChatRequest.RequestPayload = {
 				payload: {
+					id: '12345',
 					role: 'user',
 					type: 'message',
 					text: 'Build me a workflow',
@@ -211,6 +214,7 @@ describe('API: ai', () => {
 
 			const payload: ChatRequest.RequestPayload = {
 				payload: {
+					id: '12345',
 					role: 'user',
 					type: 'message',
 					text: 'Build me a workflow',
@@ -228,6 +232,7 @@ describe('API: ai', () => {
 		it('should handle complex workflow context in payload', () => {
 			const payload: ChatRequest.RequestPayload = {
 				payload: {
+					id: '12345',
 					role: 'user',
 					type: 'message',
 					text: 'Improve my workflow',
@@ -271,6 +276,7 @@ describe('API: ai', () => {
 		it('should handle undefined parameters correctly', () => {
 			const payload: ChatRequest.RequestPayload = {
 				payload: {
+					id: '12345',
 					role: 'user',
 					type: 'message',
 					text: 'Build me a workflow',
diff --git a/packages/frontend/editor-ui/src/features/ai/assistant/assistant.store.ts b/packages/frontend/editor-ui/src/features/ai/assistant/assistant.store.ts
index b249e4c11ef..601ac7bd051 100644
--- a/packages/frontend/editor-ui/src/features/ai/assistant/assistant.store.ts
+++ b/packages/frontend/editor-ui/src/features/ai/assistant/assistant.store.ts
@@ -29,6 +29,7 @@ import { useChatPanelStateStore } from './chatPanelState.store';
 import { useCredentialsStore } from '@/features/credentials/credentials.store';
 import { useAIAssistantHelpers } from '@/features/ai/assistant/composables/useAIAssistantHelpers';
 import type { WorkflowState } from '@/app/composables/useWorkflowState';
+import { v4 as uuid } from 'uuid';
 
 export const ENABLED_VIEWS = ASSISTANT_ENABLED_VIEWS;
 const READABLE_TYPES = ['code-diff', 'text', 'block'];
@@ -555,6 +556,7 @@ export const useAssistantStore = defineStore(STORES.ASSISTANT, () => {
 				rootStore.restApiContext,
 				{
 					payload: {
+						id: uuid(),
 						role: 'user',
 						type: 'message',
 						text: chatMessage.text,
diff --git a/packages/frontend/editor-ui/src/features/ai/assistant/assistant.types.ts b/packages/frontend/editor-ui/src/features/ai/assistant/assistant.types.ts
index 54bf17b437b..b734f2ad2a5 100644
--- a/packages/frontend/editor-ui/src/features/ai/assistant/assistant.types.ts
+++ b/packages/frontend/editor-ui/src/features/ai/assistant/assistant.types.ts
@@ -102,6 +102,7 @@ export namespace ChatRequest {
 		role: 'user';
 		type: 'message';
 		text: string;
+		id: string;
 		quickReplyType?: string;
 		context?: UserContext;
 		workflowContext?: WorkflowContext;
diff --git a/packages/frontend/editor-ui/src/features/ai/assistant/builder.store.test.ts b/packages/frontend/editor-ui/src/features/ai/assistant/builder.store.test.ts
index e328b275926..5acabfed3a8 100644
--- a/packages/frontend/editor-ui/src/features/ai/assistant/builder.store.test.ts
+++ b/packages/frontend/editor-ui/src/features/ai/assistant/builder.store.test.ts
@@ -606,7 +606,7 @@ describe('AI Builder store', () => {
 			expect(builderStore.streamingAbortController).toBeInstanceOf(AbortController);
 		});
 
-		it('should call abort on existing controller when stopStreaming is called', () => {
+		it('should call abort on existing controller when abortStreaming is called', () => {
 			const builderStore = useBuilderStore();
 
 			// First start a request to create an abort controller
@@ -620,8 +620,8 @@ describe('AI Builder store', () => {
 			// Spy on the abort method
 			const abortSpy = vi.spyOn(controller!, 'abort');
 
-			// Call stopStreaming
-			builderStore.stopStreaming();
+			// Call abortStreaming
+			builderStore.abortStreaming();
 
 			// Verify abort was called
 			expect(abortSpy).toHaveBeenCalled();
@@ -698,7 +698,7 @@ describe('AI Builder store', () => {
 			expect(builderStore.streamingAbortController).toBe(firstController);
 
 			// Now properly stop streaming first
-			builderStore.stopStreaming();
+			builderStore.abortStreaming();
 
 			// Verify abort was called and controller was cleared
 			expect(abortSpy).toHaveBeenCalled();
@@ -1708,4 +1708,570 @@ describe('AI Builder store', () => {
 			expect(builderStore.creditsRemaining).toBe(80);
 		});
 	});
+
+	describe('abortStreaming telemetry', () => {
+		it('tracks end of response with aborted flag when aborting', () => {
+			const builderStore = useBuilderStore();
+
+			apiSpy.mockImplementationOnce(() => {});
+			builderStore.sendChatMessage({ text: 'test' });
+
+			track.mockClear();
+			builderStore.abortStreaming();
+
+			expect(track).toHaveBeenCalledWith(
+				'End of response from builder',
+				expect.objectContaining({
+					aborted: true,
+					user_message_id: expect.any(String),
+					workflow_id: 'test-workflow-id',
+				}),
+			);
+		});
+
+		it('includes workflow modifications in abort telemetry', () => {
+			const builderStore = useBuilderStore();
+
+			apiSpy.mockImplementationOnce(() => {});
+			builderStore.sendChatMessage({ text: 'test' });
+
+			track.mockClear();
+			builderStore.abortStreaming();
+
+			expect(track).toHaveBeenCalledWith(
+				'End of response from builder',
+				expect.objectContaining({
+					tools_called: expect.any(Array),
+					start_workflow_json: expect.any(String),
+					end_workflow_json: expect.any(String),
+				}),
+			);
+		});
+
+		it('includes todos count in abort telemetry', () => {
+			const builderStore = useBuilderStore();
+
+			apiSpy.mockImplementationOnce(() => {});
+			builderStore.sendChatMessage({ text: 'test' });
+
+			track.mockClear();
+			builderStore.abortStreaming();
+
+			expect(track).toHaveBeenCalledWith(
+				'End of response from builder',
+				expect.objectContaining({
+					credentials_todo_count: expect.any(Number),
+					placeholders_todo_count: expect.any(Number),
+					todos: expect.any(Array),
+				}),
+			);
+		});
+
+		it('does not track telemetry if no streaming message in progress', () => {
+			const builderStore = useBuilderStore();
+
+			// Don't start any streaming
+			track.mockClear();
+
+			builderStore.abortStreaming();
+
+			expect(track).not.toHaveBeenCalledWith('End of response from builder', expect.anything());
+		});
+	});
+
+	describe('workflowTodos', () => {
+		it('returns empty array when no validation issues exist', () => {
+			workflowsStore.workflowValidationIssues = [];
+			workflowsStore.workflow.nodes = [];
+
+			const builderStore = useBuilderStore();
+			expect(builderStore.workflowTodos).toEqual([]);
+		});
+
+		it('includes credential validation issues', () => {
+			workflowsStore.workflowValidationIssues = [
+				{ node: 'HTTP Request', type: 'credentials', value: 'Missing credentials' },
+			];
+
+			const builderStore = useBuilderStore();
+			expect(builderStore.workflowTodos).toContainEqual(
+				expect.objectContaining({ type: 'credentials' }),
+			);
+		});
+
+		it('includes placeholder issues from node parameters', () => {
+			workflowsStore.workflowValidationIssues = [];
+			workflowsStore.workflow.nodes = [
+				{
+					id: 'node-1',
+					name: 'HTTP Request',
+					type: 'n8n-nodes-base.httpRequest',
+					typeVersion: 1,
+					position: [0, 0],
+					parameters: {
+						url: '<__PLACEHOLDER_VALUE__Enter URL__>',
+					},
+				},
+			];
+
+			const builderStore = useBuilderStore();
+			expect(builderStore.workflowTodos).toContainEqual(
+				expect.objectContaining({ type: 'parameters', node: 'HTTP Request' }),
+			);
+		});
+
+		it('combines credential and placeholder issues', () => {
+			workflowsStore.workflowValidationIssues = [
+				{ node: 'HTTP Request', type: 'credentials', value: 'Missing credentials' },
+			];
+			workflowsStore.workflow.nodes = [
+				{
+					id: 'node-1',
+					name: 'HTTP Request',
+					type: 'n8n-nodes-base.httpRequest',
+					typeVersion: 1,
+					position: [0, 0],
+					parameters: {
+						url: '<__PLACEHOLDER_VALUE__Enter URL__>',
+					},
+				},
+			];
+
+			const builderStore = useBuilderStore();
+			expect(builderStore.workflowTodos.length).toBeGreaterThanOrEqual(2);
+			expect(builderStore.workflowTodos).toContainEqual(
+				expect.objectContaining({ type: 'credentials' }),
+			);
+			expect(builderStore.workflowTodos).toContainEqual(
+				expect.objectContaining({ type: 'parameters' }),
+			);
+		});
+	});
+
+	describe('placeholderIssues', () => {
+		it('returns empty array when nodes have no parameters', () => {
+			workflowsStore.workflowValidationIssues = [];
+			workflowsStore.workflow.nodes = [
+				{
+					id: 'node-1',
+					name: 'Start',
+					type: 'n8n-nodes-base.start',
+					typeVersion: 1,
+					position: [0, 0],
+					parameters: {},
+				},
+			];
+
+			const builderStore = useBuilderStore();
+			expect(builderStore.workflowTodos).toEqual([]);
+		});
+
+		it('returns empty array when node has undefined parameters', () => {
+			workflowsStore.workflowValidationIssues = [];
+			workflowsStore.workflow.nodes = [
+				{
+					id: 'node-1',
+					name: 'Start',
+					type: 'n8n-nodes-base.start',
+					typeVersion: 1,
+					position: [0, 0],
+				} as Parameters<typeof workflowsStore.workflow.nodes.push>[0],
+			];
+
+			const builderStore = useBuilderStore();
+			expect(builderStore.workflowTodos).toEqual([]);
+		});
+
+		it('detects placeholders in nested object parameters', () => {
+			workflowsStore.workflowValidationIssues = [];
+			workflowsStore.workflow.nodes = [
+				{
+					id: 'node-1',
+					name: 'HTTP Request',
+					type: 'n8n-nodes-base.httpRequest',
+					typeVersion: 1,
+					position: [0, 0],
+					parameters: {
+						options: {
+							headers: {
+								authorization: '<__PLACEHOLDER_VALUE__Enter API Key__>',
+							},
+						},
+					},
+				},
+			];
+
+			const builderStore = useBuilderStore();
+			const placeholderIssues = builderStore.workflowTodos.filter((t) => t.type === 'parameters');
+			expect(placeholderIssues).toHaveLength(1);
+			expect(placeholderIssues[0]).toMatchObject({
+				node: 'HTTP Request',
+				type: 'parameters',
+			});
+		});
+
+		it('detects placeholders in array parameters', () => {
+			workflowsStore.workflowValidationIssues = [];
+			workflowsStore.workflow.nodes = [
+				{
+					id: 'node-1',
+					name: 'HTTP Request',
+					type: 'n8n-nodes-base.httpRequest',
+					typeVersion: 1,
+					position: [0, 0],
+					parameters: {
+						headers: [
+							{ name: 'Content-Type', value: 'application/json' },
+							{ name: 'Authorization', value: '<__PLACEHOLDER_VALUE__Enter Token__>' },
+						],
+					},
+				},
+			];
+
+			const builderStore = useBuilderStore();
+			const placeholderIssues = builderStore.workflowTodos.filter((t) => t.type === 'parameters');
+			expect(placeholderIssues).toHaveLength(1);
+			expect(placeholderIssues[0]).toMatchObject({
+				node: 'HTTP Request',
+				type: 'parameters',
+			});
+		});
+
+		it('detects multiple placeholders in the same node', () => {
+			workflowsStore.workflowValidationIssues = [];
+			workflowsStore.workflow.nodes = [
+				{
+					id: 'node-1',
+					name: 'HTTP Request',
+					type: 'n8n-nodes-base.httpRequest',
+					typeVersion: 1,
+					position: [0, 0],
+					parameters: {
+						url: '<__PLACEHOLDER_VALUE__Enter URL__>',
+						body: '<__PLACEHOLDER_VALUE__Enter Body__>',
+					},
+				},
+			];
+
+			const builderStore = useBuilderStore();
+			const placeholderIssues = builderStore.workflowTodos.filter((t) => t.type === 'parameters');
+			expect(placeholderIssues).toHaveLength(2);
+		});
+
+		it('detects placeholders across multiple nodes', () => {
+			workflowsStore.workflowValidationIssues = [];
+			workflowsStore.workflow.nodes = [
+				{
+					id: 'node-1',
+					name: 'HTTP Request',
+					type: 'n8n-nodes-base.httpRequest',
+					typeVersion: 1,
+					position: [0, 0],
+					parameters: {
+						url: '<__PLACEHOLDER_VALUE__Enter URL__>',
+					},
+				},
+				{
+					id: 'node-2',
+					name: 'Slack',
+					type: 'n8n-nodes-base.slack',
+					typeVersion: 1,
+					position: [200, 0],
+					parameters: {
+						channel: '<__PLACEHOLDER_VALUE__Enter Channel__>',
+					},
+				},
+			];
+
+			const builderStore = useBuilderStore();
+			const placeholderIssues = builderStore.workflowTodos.filter((t) => t.type === 'parameters');
+			expect(placeholderIssues).toHaveLength(2);
+			expect(placeholderIssues).toContainEqual(expect.objectContaining({ node: 'HTTP Request' }));
+			expect(placeholderIssues).toContainEqual(expect.objectContaining({ node: 'Slack' }));
+		});
+
+		it('deduplicates identical placeholder issues (same node, path, and label)', () => {
+			workflowsStore.workflowValidationIssues = [];
+			// Simulate a scenario where the same placeholder appears twice
+			// (which shouldn't happen in practice but tests the deduplication)
+			workflowsStore.workflow.nodes = [
+				{
+					id: 'node-1',
+					name: 'HTTP Request',
+					type: 'n8n-nodes-base.httpRequest',
+					typeVersion: 1,
+					position: [0, 0],
+					parameters: {
+						url: '<__PLACEHOLDER_VALUE__Enter URL__>',
+					},
+				},
+			];
+
+			const builderStore = useBuilderStore();
+			const placeholderIssues = builderStore.workflowTodos.filter((t) => t.type === 'parameters');
+			// Should only have 1 issue, not duplicates
+			expect(placeholderIssues).toHaveLength(1);
+		});
+
+		it('skips placeholder when existing parameter issue already has the same message', () => {
+			const placeholderLabel = 'Enter URL';
+			// The message format from the store uses i18n which is mocked to return the key
+			const expectedMessage = 'aiAssistant.builder.executeMessage.fillParameter';
+
+			workflowsStore.workflow.nodes = [
+				{
+					id: 'node-1',
+					name: 'HTTP Request',
+					type: 'n8n-nodes-base.httpRequest',
+					typeVersion: 1,
+					position: [0, 0],
+					parameters: {
+						url: `<__PLACEHOLDER_VALUE__${placeholderLabel}__>`,
+					},
+					issues: {
+						parameters: {
+							url: [expectedMessage],
+						},
+					},
+				},
+			];
+			workflowsStore.workflowValidationIssues = [];
+
+			const builderStore = useBuilderStore();
+			const placeholderIssues = builderStore.workflowTodos.filter((t) => t.type === 'parameters');
+			// Should be skipped because the message already exists
+			expect(placeholderIssues).toHaveLength(0);
+		});
+
+		it('does not skip placeholder when existing parameter issue has different message', () => {
+			workflowsStore.workflow.nodes = [
+				{
+					id: 'node-1',
+					name: 'HTTP Request',
+					type: 'n8n-nodes-base.httpRequest',
+					typeVersion: 1,
+					position: [0, 0],
+					parameters: {
+						url: '<__PLACEHOLDER_VALUE__Enter URL__>',
+					},
+					issues: {
+						parameters: {
+							url: ['Some other validation error'],
+						},
+					},
+				},
+			];
+			workflowsStore.workflowValidationIssues = [];
+
+			const builderStore = useBuilderStore();
+			const placeholderIssues = builderStore.workflowTodos.filter((t) => t.type === 'parameters');
+			// Should still create the placeholder issue
+			expect(placeholderIssues).toHaveLength(1);
+		});
+
+		it('ignores non-string parameter values', () => {
+			workflowsStore.workflowValidationIssues = [];
+			workflowsStore.workflow.nodes = [
+				{
+					id: 'node-1',
+					name: 'HTTP Request',
+					type: 'n8n-nodes-base.httpRequest',
+					typeVersion: 1,
+					position: [0, 0],
+					parameters: {
+						timeout: 5000,
+						enabled: true,
+						config: null,
+					},
+				},
+			];
+
+			const builderStore = useBuilderStore();
+			expect(builderStore.workflowTodos).toEqual([]);
+		});
+
+		it('ignores strings that do not match placeholder format', () => {
+			workflowsStore.workflowValidationIssues = [];
+			workflowsStore.workflow.nodes = [
+				{
+					id: 'node-1',
+					name: 'HTTP Request',
+					type: 'n8n-nodes-base.httpRequest',
+					typeVersion: 1,
+					position: [0, 0],
+					parameters: {
+						url: 'https://example.com',
+						body: 'regular string',
+						partial: '<__PLACEHOLDER_VALUE__missing end',
+						wrongPrefix: 'PLACEHOLDER__test__>',
+					},
+				},
+			];
+
+			const builderStore = useBuilderStore();
+			expect(builderStore.workflowTodos).toEqual([]);
+		});
+
+		it('ignores placeholder with empty label', () => {
+			workflowsStore.workflowValidationIssues = [];
+			workflowsStore.workflow.nodes = [
+				{
+					id: 'node-1',
+					name: 'HTTP Request',
+					type: 'n8n-nodes-base.httpRequest',
+					typeVersion: 1,
+					position: [0, 0],
+					parameters: {
+						url: '<__PLACEHOLDER_VALUE____>', // empty label
+						body: '<__PLACEHOLDER_VALUE__   __>', // whitespace-only label
+					},
+				},
+			];
+
+			const builderStore = useBuilderStore();
+			expect(builderStore.workflowTodos).toEqual([]);
+		});
+
+		it('filters out non-credential and non-parameter validation issues', () => {
+			workflowsStore.workflowValidationIssues = [
+				{ node: 'HTTP Request', type: 'credentials', value: 'Missing credentials' },
+				{ node: 'HTTP Request', type: 'parameters', value: 'Missing parameter' },
+				{ node: 'HTTP Request', type: 'execution', value: 'Execution error' },
+				{ node: 'HTTP Request', type: 'unknown' as 'parameters', value: 'Unknown issue' },
+			];
+			workflowsStore.workflow.nodes = [];
+
+			const builderStore = useBuilderStore();
+			// Should only include credentials and parameters types
+			expect(builderStore.workflowTodos).toHaveLength(2);
+			expect(builderStore.workflowTodos).toContainEqual(
+				expect.objectContaining({ type: 'credentials' }),
+			);
+			expect(builderStore.workflowTodos).toContainEqual(
+				expect.objectContaining({ type: 'parameters' }),
+			);
+		});
+	});
+
+	describe('manual execution stats telemetry', () => {
+		it('should include success count in telemetry when sending message', () => {
+			const builderStore = useBuilderStore();
+
+			apiSpy.mockImplementationOnce(() => {});
+
+			builderStore.incrementManualExecutionStats('success');
+			builderStore.sendChatMessage({ text: 'test' });
+
+			expect(track).toHaveBeenCalledWith(
+				'User submitted builder message',
+				expect.objectContaining({
+					manual_exec_success_count_since_prev_msg: 1,
+					manual_exec_error_count_since_prev_msg: 0,
+				}),
+			);
+		});
+
+		it('should include error count in telemetry when sending message', () => {
+			const builderStore = useBuilderStore();
+
+			apiSpy.mockImplementationOnce(() => {});
+
+			builderStore.incrementManualExecutionStats('error');
+			builderStore.sendChatMessage({ text: 'test' });
+
+			expect(track).toHaveBeenCalledWith(
+				'User submitted builder message',
+				expect.objectContaining({
+					manual_exec_success_count_since_prev_msg: 0,
+					manual_exec_error_count_since_prev_msg: 1,
+				}),
+			);
+		});
+
+		it('should include multiple incremented counts in telemetry', () => {
+			const builderStore = useBuilderStore();
+
+			apiSpy.mockImplementationOnce(() => {});
+
+			builderStore.incrementManualExecutionStats('success');
+			builderStore.incrementManualExecutionStats('success');
+			builderStore.incrementManualExecutionStats('error');
+			builderStore.sendChatMessage({ text: 'test' });
+
+			expect(track).toHaveBeenCalledWith(
+				'User submitted builder message',
+				expect.objectContaining({
+					manual_exec_success_count_since_prev_msg: 2,
+					manual_exec_error_count_since_prev_msg: 1,
+				}),
+			);
+		});
+
+		it('should reset stats after sending message', async () => {
+			const builderStore = useBuilderStore();
+
+			// First message with some stats
+			apiSpy.mockImplementationOnce((_ctx, _payload, onMessage, onDone) => {
+				onMessage({
+					messages: [{ type: 'message', role: 'assistant', text: 'Hello!' }],
+					sessionId: 'test-session',
+				});
+				onDone();
+			});
+
+			builderStore.incrementManualExecutionStats('success');
+			builderStore.incrementManualExecutionStats('error');
+			builderStore.sendChatMessage({ text: 'first message' });
+
+			await vi.waitFor(() => expect(builderStore.streaming).toBe(false));
+
+			// Verify first message had the stats
+			expect(track).toHaveBeenCalledWith(
+				'User submitted builder message',
+				expect.objectContaining({
+					manual_exec_success_count_since_prev_msg: 1,
+					manual_exec_error_count_since_prev_msg: 1,
+				}),
+			);
+
+			track.mockClear();
+
+			// Second message should have reset stats (zero counts)
+			apiSpy.mockImplementationOnce((_ctx, _payload, onMessage, onDone) => {
+				onMessage({
+					messages: [{ type: 'message', role: 'assistant', text: 'Hello again!' }],
+					sessionId: 'test-session',
+				});
+				onDone();
+			});
+
+			builderStore.sendChatMessage({ text: 'second message' });
+
+			await vi.waitFor(() => expect(builderStore.streaming).toBe(false));
+
+			expect(track).toHaveBeenCalledWith(
+				'User submitted builder message',
+				expect.objectContaining({
+					manual_exec_success_count_since_prev_msg: 0,
+					manual_exec_error_count_since_prev_msg: 0,
+				}),
+			);
+		});
+
+		it('should include zero counts when no manual executions occurred', () => {
+			const builderStore = useBuilderStore();
+
+			apiSpy.mockImplementationOnce(() => {});
+
+			builderStore.sendChatMessage({ text: 'test' });
+
+			expect(track).toHaveBeenCalledWith(
+				'User submitted builder message',
+				expect.objectContaining({
+					manual_exec_success_count_since_prev_msg: 0,
+					manual_exec_error_count_since_prev_msg: 0,
+				}),
+			);
+		});
+	});
 });
diff --git a/packages/frontend/editor-ui/src/features/ai/assistant/builder.store.ts b/packages/frontend/editor-ui/src/features/ai/assistant/builder.store.ts
index 2bbe440e681..6af43da868c 100644
--- a/packages/frontend/editor-ui/src/features/ai/assistant/builder.store.ts
+++ b/packages/frontend/editor-ui/src/features/ai/assistant/builder.store.ts
@@ -20,10 +20,11 @@ import {
 	getSessionsMetadata,
 } from '@/features/ai/assistant/assistant.api';
 import { generateMessageId, createBuilderPayload } from './builder.utils';
+import { useBuilderTodos, type TodosTrackingPayload } from './composables/useBuilderTodos';
 import { useRootStore } from '@n8n/stores/useRootStore';
 import type { WorkflowDataUpdate } from '@n8n/rest-api-client/api/workflows';
 import pick from 'lodash/pick';
-import { type INodeExecutionData, jsonParse } from 'n8n-workflow';
+import { type ITelemetryTrackProperties, type INodeExecutionData, jsonParse } from 'n8n-workflow';
 import { useToast } from '@/app/composables/useToast';
 import { injectWorkflowState } from '@/app/composables/useWorkflowState';
 import { useNodeTypesStore } from '@/app/stores/nodeTypes.store';
@@ -31,10 +32,34 @@ import { useCredentialsStore } from '@/features/credentials/credentials.store';
 import { getAuthTypeForNodeCredential, getMainAuthField } from '@/app/utils/nodeTypesUtils';
 import { stringSizeInBytes } from '@/app/utils/typesUtils';
 import { useNDVStore } from '@/features/ndv/shared/ndv.store';
+import { dedupe } from 'n8n-workflow';
 
 const INFINITE_CREDITS = -1;
 export const ENABLED_VIEWS = BUILDER_ENABLED_VIEWS;
 
+interface EndOfStreamingTrackingPayload {
+	userMessageId: string;
+	startWorkflowJson: string;
+}
+
+interface UserSubmittedBuilderMessageTrackingPayload
+	extends ITelemetryTrackProperties,
+		TodosTrackingPayload {
+	source: 'chat' | 'canvas';
+	message: string;
+	session_id: string;
+	start_workflow_json: string;
+	workflow_id: string;
+	type: 'message' | 'execution';
+	manual_exec_success_count_since_prev_msg: number;
+	manual_exec_error_count_since_prev_msg: number;
+	user_message_id: string;
+	execution_data?: string;
+	execution_status?: string;
+	error_message?: string;
+	error_node_type?: string;
+}
+
 export const useBuilderStore = defineStore(STORES.BUILDER, () => {
 	// Core state
 	const chatMessages = ref<ChatUI.AssistantMessage[]>([]);
@@ -45,6 +70,12 @@ export const useBuilderStore = defineStore(STORES.BUILDER, () => {
 	const creditsQuota = ref<number | undefined>();
 	const creditsClaimed = ref<number | undefined>();
 	const hasMessages = ref<boolean>(false);
+	const manualExecStatsInBetweenMessages = ref<{ success: number; error: number }>({
+		success: 0,
+		error: 0,
+	});
+
+	const currentStreamingMessage = ref<EndOfStreamingTrackingPayload | undefined>();
 
 	// Store dependencies
 	const settings = useSettingsStore();
@@ -70,6 +101,8 @@ export const useBuilderStore = defineStore(STORES.BUILDER, () => {
 		getRunningTools,
 	} = useBuilderMessages();
 
+	const { workflowTodos, getTodosToTrack } = useBuilderTodos();
+
 	const trackingSessionId = computed(() => rootStore.pushRef);
 
 	const workflowPrompt = computed(() => {
@@ -124,17 +157,74 @@ export const useBuilderStore = defineStore(STORES.BUILDER, () => {
 		initialGeneration.value = false;
 	}
 
+	function incrementManualExecutionStats(type: 'success' | 'error') {
+		manualExecStatsInBetweenMessages.value[type]++;
+	}
+
+	function resetManualExecutionStats() {
+		manualExecStatsInBetweenMessages.value = {
+			success: 0,
+			error: 0,
+		};
+	}
+
 	// Message handling functions
 	function addLoadingAssistantMessage(message: string) {
 		builderThinkingMessage.value = message;
 	}
 
-	function stopStreaming() {
+	function getWorkflowModifications({
+		userMessageId,
+		startWorkflowJson,
+	}: EndOfStreamingTrackingPayload) {
+		const newToolMessages = toolMessages.value.filter((toolMsg) =>
+			toolMsg.id?.startsWith(userMessageId),
+		);
+		const endWorkflowJson = getWorkflowSnapshot();
+
+		return {
+			tools_called: dedupe(newToolMessages.map((toolMsg) => toolMsg.toolName)),
+			start_workflow_json: startWorkflowJson,
+			end_workflow_json: endWorkflowJson,
+		};
+	}
+
+	type StopStreamingPayload =
+		| {
+				error: string;
+		  }
+		| { aborted: true };
+	function trackEndBuilderResponse(payload?: StopStreamingPayload) {
+		if (!currentStreamingMessage.value) {
+			return;
+		}
+
+		const { userMessageId } = currentStreamingMessage.value;
+
+		telemetry.track('End of response from builder', {
+			// todo user_id available as trait already?
+			user_message_id: userMessageId,
+			workflow_id: workflowsStore.workflowId,
+			session_id: trackingSessionId.value,
+			...getWorkflowModifications(currentStreamingMessage.value),
+			...payload,
+			...getTodosToTrack(),
+		});
+	}
+
+	function stopStreaming(payload?: StopStreamingPayload) {
 		streaming.value = false;
 		if (streamingAbortController.value) {
 			streamingAbortController.value.abort();
 			streamingAbortController.value = null;
 		}
+
+		trackEndBuilderResponse(payload);
+		currentStreamingMessage.value = undefined;
+	}
+
+	function abortStreaming() {
+		stopStreaming({ aborted: true });
 	}
 
 	// Error handling
@@ -144,10 +234,12 @@ export const useBuilderStore = defineStore(STORES.BUILDER, () => {
 	 * The retry function, if provided, will remove the error message before retrying.
 	 * Tracks error telemetry
 	 */
-	function handleServiceError(e: unknown, id: string, retry?: () => Promise<void>) {
+	function handleServiceError(e: unknown, userMessageId: string, retry?: () => Promise<void>) {
 		assert(e instanceof Error);
 
-		stopStreaming();
+		stopStreaming({
+			error: e.message,
+		});
 		builderThinkingMessage.value = undefined;
 
 		if (e.name === 'AbortError') {
@@ -163,17 +255,11 @@ export const useBuilderStore = defineStore(STORES.BUILDER, () => {
 
 		const errorMessage = createErrorMessage(
 			locale.baseText('aiAssistant.serviceError.message', { interpolate: { message: e.message } }),
-			id,
+			userMessageId,
 			retry,
 		);
 
 		chatMessages.value = [...chatMessages.value, errorMessage];
-
-		telemetry.track('Workflow generation errored', {
-			error: e.message,
-			session_id: trackingSessionId.value,
-			workflow_id: workflowsStore.workflowId,
-		});
 	}
 
 	// Helper functions
@@ -203,6 +289,68 @@ export const useBuilderStore = defineStore(STORES.BUILDER, () => {
 		};
 	}
 
+	// Telemetry functions
+	/**
+	 * Tracks when a user submits a message to the builder.
+	 * Captures workflow state, execution data, and todo counts for analytics.
+	 */
+	function trackUserSubmittedBuilderMessage(options: {
+		text: string;
+		source: 'chat' | 'canvas';
+		type: 'message' | 'execution';
+		userMessageId: string;
+		currentWorkflowJson: string;
+		errorMessage?: string;
+		errorNodeType?: string;
+		executionStatus?: string;
+	}) {
+		const {
+			text,
+			source,
+			type,
+			userMessageId,
+			currentWorkflowJson,
+			errorMessage,
+			errorNodeType,
+			executionStatus,
+		} = options;
+
+		const trackingPayload: UserSubmittedBuilderMessageTrackingPayload = {
+			source,
+			message: text,
+			session_id: trackingSessionId.value,
+			start_workflow_json: currentWorkflowJson,
+			workflow_id: workflowsStore.workflowId,
+			type,
+			manual_exec_success_count_since_prev_msg: manualExecStatsInBetweenMessages.value.success,
+			manual_exec_error_count_since_prev_msg: manualExecStatsInBetweenMessages.value.error,
+			user_message_id: userMessageId,
+			...getTodosToTrack(),
+		};
+
+		if (type === 'execution') {
+			let resultData = '{}';
+			let resultDataSizeKb = 0;
+
+			try {
+				resultData = JSON.stringify(workflowsStore.workflowExecutionData ?? {});
+				resultDataSizeKb = stringSizeInBytes(resultData) / 1024;
+			} catch (error) {
+				// Handle circular structure errors gracefully
+				console.warn('Failed to stringify execution data for telemetry:', error);
+			}
+
+			trackingPayload.execution_data = resultDataSizeKb > 512 ? '{}' : resultData;
+			trackingPayload.execution_status = executionStatus ?? '';
+			if (executionStatus === 'error') {
+				trackingPayload.error_message = errorMessage ?? '';
+				trackingPayload.error_node_type = errorNodeType ?? '';
+			}
+		}
+
+		telemetry.track('User submitted builder message', trackingPayload);
+	}
+
 	// Core API functions
 	/**
 	 * Sends a message to the AI builder service and handles the streaming response.
@@ -242,51 +390,38 @@ export const useBuilderStore = defineStore(STORES.BUILDER, () => {
 		if (options.initialGeneration !== undefined) {
 			initialGeneration.value = options.initialGeneration;
 		}
-		const messageId = generateMessageId();
-
+		const userMessageId = generateMessageId();
 		const currentWorkflowJson = getWorkflowSnapshot();
-		const trackingPayload: Record<string, string> = {
-			source,
-			message: text,
-			session_id: trackingSessionId.value,
-			start_workflow_json: currentWorkflowJson,
-			workflow_id: workflowsStore.workflowId,
-			type,
+
+		currentStreamingMessage.value = {
+			userMessageId,
+			startWorkflowJson: currentWorkflowJson,
 		};
 
-		if (type === 'execution') {
-			let resultData = '{}';
-			let resultDataSizeKb = 0;
+		trackUserSubmittedBuilderMessage({
+			text,
+			source,
+			type,
+			userMessageId,
+			currentWorkflowJson,
+			errorMessage,
+			errorNodeType,
+			executionStatus,
+		});
 
-			try {
-				resultData = JSON.stringify(workflowsStore.workflowExecutionData ?? {});
-				resultDataSizeKb = stringSizeInBytes(resultData) / 1024;
-			} catch (error) {
-				// Handle circular structure errors gracefully
-				console.warn('Failed to stringify execution data for telemetry:', error);
-			}
+		resetManualExecutionStats();
 
-			trackingPayload.execution_data = resultDataSizeKb > 512 ? '{}' : resultData;
-			trackingPayload.execution_status = executionStatus ?? '';
-			if (executionStatus === 'error') {
-				trackingPayload.error_message = errorMessage ?? '';
-				trackingPayload.error_node_type = errorNodeType ?? '';
-			}
-		}
-
-		telemetry.track('User submitted builder message', trackingPayload);
-
-		prepareForStreaming(text, messageId);
+		prepareForStreaming(text, userMessageId);
 
 		const executionResult = workflowsStore.workflowExecutionData?.data?.resultData;
-		const payload = createBuilderPayload(text, {
+		const payload = createBuilderPayload(text, userMessageId, {
 			quickReplyType,
 			workflow: workflowsStore.workflow,
 			executionData: executionResult,
 			nodesForSchema: Object.keys(workflowsStore.nodesByName),
 		});
 
-		const retry = createRetryHandler(messageId, async () => sendChatMessage(options));
+		const retry = createRetryHandler(userMessageId, async () => sendChatMessage(options));
 
 		// Abort previous streaming request if any
 		if (streamingAbortController.value) {
@@ -302,7 +437,7 @@ export const useBuilderStore = defineStore(STORES.BUILDER, () => {
 					const result = processAssistantMessages(
 						chatMessages.value,
 						response.messages,
-						generateMessageId(),
+						userMessageId,
 						retry,
 					);
 					chatMessages.value = result.messages;
@@ -315,11 +450,11 @@ export const useBuilderStore = defineStore(STORES.BUILDER, () => {
 					}
 				},
 				() => stopStreaming(),
-				(e) => handleServiceError(e, messageId, retry),
+				(e) => handleServiceError(e, userMessageId, retry),
 				streamingAbortController.value?.signal,
 			);
 		} catch (e: unknown) {
-			handleServiceError(e, messageId, retry);
+			handleServiceError(e, userMessageId, retry);
 		}
 	}
 
@@ -574,9 +709,10 @@ export const useBuilderStore = defineStore(STORES.BUILDER, () => {
 		creditsRemaining,
 		hasNoCreditsRemaining,
 		hasMessages: computed(() => hasMessages.value),
+		workflowTodos,
 
 		// Methods
-		stopStreaming,
+		abortStreaming,
 		resetBuilderChat,
 		sendChatMessage,
 		loadSessions,
@@ -586,5 +722,7 @@ export const useBuilderStore = defineStore(STORES.BUILDER, () => {
 		updateBuilderCredits,
 		getRunningTools,
 		fetchSessionsMetadata,
+		incrementManualExecutionStats,
+		resetManualExecutionStats,
 	};
 });
diff --git a/packages/frontend/editor-ui/src/features/ai/assistant/builder.utils.ts b/packages/frontend/editor-ui/src/features/ai/assistant/builder.utils.ts
index 7ecf56f1b6a..3fefce02360 100644
--- a/packages/frontend/editor-ui/src/features/ai/assistant/builder.utils.ts
+++ b/packages/frontend/editor-ui/src/features/ai/assistant/builder.utils.ts
@@ -8,12 +8,17 @@ import {
 import type { IRunExecutionData } from 'n8n-workflow';
 import type { IWorkflowDb } from '@/Interface';
 
+export function generateShortId() {
+	return Math.random().toString(36).substr(2, 9);
+}
+
 export function generateMessageId(): string {
-	return `${Date.now()}-${Math.random().toString(36).substr(2, 9)}`;
+	return `${Date.now()}-${generateShortId()}`;
 }
 
 export function createBuilderPayload(
 	text: string,
+	id: string,
 	options: {
 		quickReplyType?: string;
 		executionData?: IRunExecutionData['resultData'];
@@ -67,6 +72,7 @@ export function createBuilderPayload(
 	return {
 		role: 'user',
 		type: 'message',
+		id,
 		text,
 		quickReplyType: options.quickReplyType,
 		workflowContext,
diff --git a/packages/frontend/editor-ui/src/features/ai/assistant/components/Agent/AskAssistantBuild.test.ts b/packages/frontend/editor-ui/src/features/ai/assistant/components/Agent/AskAssistantBuild.test.ts
index 08c610f0b1d..0ef45d86cfb 100644
--- a/packages/frontend/editor-ui/src/features/ai/assistant/components/Agent/AskAssistantBuild.test.ts
+++ b/packages/frontend/editor-ui/src/features/ai/assistant/components/Agent/AskAssistantBuild.test.ts
@@ -1354,249 +1354,6 @@ describe('AskAssistantBuild', () => {
 		});
 	});
 
-	it('should track categorization telemetry when categorize_prompt tool completes', async () => {
-		renderComponent();
-
-		// Simulate streaming starts
-		builderStore.$patch({ streaming: true });
-		await flushPromises();
-
-		// Add categorization tool message
-		builderStore.toolMessages = [
-			{
-				id: faker.string.uuid(),
-				role: 'assistant' as const,
-				type: 'tool' as const,
-				toolName: 'categorize_prompt',
-				toolCallId: faker.string.uuid(),
-				status: 'completed',
-				updates: [
-					{
-						type: 'output',
-						data: {
-							categorization: {
-								techniques: ['chatbot', 'notification'],
-								confidence: 0.85,
-							},
-						},
-					},
-				],
-			},
-		];
-
-		// Simulate streaming stops (this triggers trackWorkflowModifications)
-		builderStore.$patch({ streaming: false });
-		await flushPromises();
-
-		expect(trackMock).toHaveBeenCalledWith('Classifier labels user prompt', {
-			user_id: undefined,
-			workflow_id: 'abc123',
-			classifier_labels: ['chatbot', 'notification'],
-			confidence: 0.85,
-			session_id: 'app_session_id',
-			timestamp: expect.any(String),
-		});
-	});
-
-	it('should handle multiple canvas generations correctly', async () => {
-		const originalWorkflow = {
-			nodes: [],
-			connections: {},
-		};
-		builderStore.getWorkflowSnapshot.mockReturnValue(JSON.stringify(originalWorkflow));
-
-		const intermediaryWorkflow = {
-			nodes: [
-				{
-					id: 'node1',
-					name: 'Start',
-					type: 'n8n-nodes-base.start',
-					position: [0, 0],
-					typeVersion: 1,
-					parameters: {},
-				} as INodeUi,
-			],
-			connections: {},
-		};
-
-		const finalWorkflow = {
-			nodes: [
-				{
-					id: 'node1',
-					name: 'Start',
-					type: 'n8n-nodes-base.start',
-					position: [0, 0],
-					typeVersion: 1,
-					parameters: {},
-				} as INodeUi,
-
-				{
-					id: 'node2',
-					name: 'HttpReuqest',
-					type: 'n8n-nodes-base.httpRequest',
-					position: [0, 0],
-					typeVersion: 1,
-					parameters: {},
-				} as INodeUi,
-			],
-			connections: {},
-		};
-		workflowsStore.$patch({
-			workflow: originalWorkflow,
-		});
-
-		renderComponent();
-
-		builderStore.$patch({ streaming: true });
-		await flushPromises();
-
-		// Trigger the watcher by updating workflowMessages
-		builderStore.workflowMessages = [
-			{
-				id: faker.string.uuid(),
-				role: 'assistant' as const,
-				type: 'workflow-updated' as const,
-				codeSnippet: JSON.stringify(intermediaryWorkflow),
-			},
-			{
-				id: faker.string.uuid(),
-				role: 'assistant' as const,
-				type: 'workflow-updated' as const,
-				codeSnippet: JSON.stringify(finalWorkflow),
-			},
-		];
-
-		const toolCallId1_1 = '1234';
-		const toolCallId1_2 = '3333';
-		const toolCallId2 = '4567';
-		const toolCallId3 = '8901';
-
-		builderStore.toolMessages = [
-			{
-				id: faker.string.uuid(),
-				role: 'assistant' as const,
-				type: 'tool' as const,
-				toolName: 'first-tool',
-				toolCallId: toolCallId1_1,
-				status: 'completed',
-				updates: [],
-			},
-			{
-				id: faker.string.uuid(),
-				role: 'assistant' as const,
-				type: 'tool' as const,
-				toolName: 'first-tool',
-				toolCallId: toolCallId1_2,
-				status: 'completed',
-				updates: [],
-			},
-			{
-				id: faker.string.uuid(),
-				role: 'assistant' as const,
-				type: 'tool' as const,
-				toolName: 'second-tool',
-				toolCallId: toolCallId2,
-				status: 'running',
-				updates: [],
-			},
-		];
-
-		builderStore.$patch({ streaming: false });
-		await flushPromises();
-
-		expect(trackMock).toHaveBeenCalledOnce();
-		expect(trackMock).toHaveBeenCalledWith('Workflow modified by builder', {
-			end_workflow_json: JSON.stringify(finalWorkflow),
-			session_id: 'app_session_id',
-			start_workflow_json: JSON.stringify(originalWorkflow),
-			// first-tool is added once, even though it completed twice
-			// second-tool is ignored because it's running
-			tools_called: ['first-tool'],
-			workflow_id: 'abc123',
-		});
-
-		trackMock.mockClear();
-
-		builderStore.$patch({ streaming: true });
-
-		await flushPromises();
-		// second run after new messages
-		const updatedWorkflow2 = {
-			...finalWorkflow,
-			nodes: [
-				...finalWorkflow.nodes,
-				{
-					id: 'node1',
-					name: 'Updated',
-					type: 'n8n-nodes-base.updated',
-					position: [0, 0],
-					typeVersion: 1,
-					parameters: {},
-				},
-			],
-		};
-		builderStore.workflowMessages = [
-			{
-				id: faker.string.uuid(),
-				role: 'assistant' as const,
-				type: 'workflow-updated' as const,
-				codeSnippet: JSON.stringify(updatedWorkflow2),
-			},
-		];
-
-		builderStore.toolMessages = [
-			{
-				id: faker.string.uuid(),
-				role: 'assistant' as const,
-				type: 'tool' as const,
-				toolName: 'first-tool',
-				toolCallId: toolCallId1_1,
-				status: 'completed',
-				updates: [],
-			},
-			{
-				id: faker.string.uuid(),
-				role: 'assistant' as const,
-				type: 'tool' as const,
-				toolName: 'first-tool',
-				toolCallId: toolCallId1_2,
-				status: 'completed',
-				updates: [],
-			},
-			{
-				id: faker.string.uuid(),
-				role: 'assistant' as const,
-				type: 'tool' as const,
-				toolName: 'second-tool',
-				toolCallId: toolCallId2,
-				status: 'completed',
-				updates: [],
-			},
-			{
-				id: faker.string.uuid(),
-				role: 'assistant' as const,
-				type: 'tool' as const,
-				toolName: 'third-tool',
-				toolCallId: toolCallId3,
-				status: 'completed',
-				updates: [],
-			},
-		];
-
-		builderStore.$patch({ streaming: false });
-		await flushPromises();
-
-		expect(trackMock).toHaveBeenCalledOnce();
-		expect(trackMock).toHaveBeenCalledWith('Workflow modified by builder', {
-			end_workflow_json: JSON.stringify(updatedWorkflow2),
-			session_id: 'app_session_id',
-			start_workflow_json: JSON.stringify(originalWorkflow),
-			// first-tool is ignored, because it was tracked in first run (same tool call id)
-			tools_called: ['second-tool', 'third-tool'],
-			workflow_id: 'abc123',
-		});
-	});
-
 	describe('shouldTidyUp logic', () => {
 		it('should set tidyUp to true when new nodes are added', async () => {
 			const originalWorkflow = { nodes: [], connections: {} };
diff --git a/packages/frontend/editor-ui/src/features/ai/assistant/components/Agent/AskAssistantBuild.vue b/packages/frontend/editor-ui/src/features/ai/assistant/components/Agent/AskAssistantBuild.vue
index 317975bf44a..de6f41bb340 100644
--- a/packages/frontend/editor-ui/src/features/ai/assistant/components/Agent/AskAssistantBuild.vue
+++ b/packages/frontend/editor-ui/src/features/ai/assistant/components/Agent/AskAssistantBuild.vue
@@ -33,9 +33,6 @@ const { goToUpgrade } = usePageRedirectionHelper();
 
 // Track processed workflow updates
 const processedWorkflowUpdates = ref(new Set<string>());
-const trackedTools = ref(new Set<string>());
-const trackedCategorizations = ref(new Set<string>());
-const workflowUpdated = ref<{ start: string; end: string } | undefined>();
 const shouldTidyUp = ref(false);
 const n8nChatRef = ref<InstanceType<typeof N8nAskAssistantChat>>();
 
@@ -107,9 +104,6 @@ async function onUserMessage(content: string) {
 function onNewWorkflow() {
 	builderStore.resetBuilderChat();
 	processedWorkflowUpdates.value.clear();
-	trackedTools.value.clear();
-	trackedCategorizations.value.clear();
-	workflowUpdated.value = undefined;
 	shouldTidyUp.value = false;
 }
 
@@ -130,71 +124,6 @@ function onFeedback(feedback: RatingFeedback) {
 	}
 }
 
-function dedupeToolNames(toolNames: string[]): string[] {
-	return [...new Set(toolNames)];
-}
-
-function isCategorizationData(
-	data: unknown,
-): data is { techniques: string[]; confidence?: number } {
-	return (
-		typeof data === 'object' &&
-		data !== null &&
-		'techniques' in data &&
-		Array.isArray(data.techniques) &&
-		data.techniques.every((t) => typeof t === 'string')
-	);
-}
-
-function trackWorkflowCategorization() {
-	// Track categorization telemetry
-	builderStore.toolMessages.forEach((toolMsg) => {
-		if (toolMsg.toolName !== 'categorize_prompt') return;
-		if (toolMsg.status !== 'completed') return;
-		if (!toolMsg.toolCallId) return;
-		if (trackedCategorizations.value.has(toolMsg.toolCallId)) return;
-
-		const outputUpdate = toolMsg.updates.find((u) => u.type === 'output');
-		const categorizationData = outputUpdate?.data?.categorization;
-
-		if (!isCategorizationData(categorizationData)) return;
-
-		trackedCategorizations.value.add(toolMsg.toolCallId);
-
-		telemetry.track('Classifier labels user prompt', {
-			user_id: usersStore.currentUserId ?? undefined,
-			workflow_id: workflowsStore.workflowId,
-			classifier_labels: categorizationData.techniques,
-			confidence: categorizationData.confidence,
-			session_id: builderStore.trackingSessionId,
-			timestamp: new Date().toISOString(),
-		});
-	});
-}
-
-function trackWorkflowModifications() {
-	if (workflowUpdated.value) {
-		// Track tool usage for telemetry
-		const newToolMessages = builderStore.toolMessages.filter(
-			(toolMsg) =>
-				toolMsg.status !== 'running' &&
-				toolMsg.toolCallId &&
-				!trackedTools.value.has(toolMsg.toolCallId),
-		);
-
-		newToolMessages.forEach((toolMsg) => trackedTools.value.add(toolMsg.toolCallId ?? ''));
-		telemetry.track('Workflow modified by builder', {
-			tools_called: dedupeToolNames(newToolMessages.map((toolMsg) => toolMsg.toolName)),
-			session_id: builderStore.trackingSessionId,
-			start_workflow_json: workflowUpdated.value.start,
-			end_workflow_json: workflowUpdated.value.end,
-			workflow_id: workflowsStore.workflowId,
-		});
-
-		workflowUpdated.value = undefined;
-	}
-}
-
 function onWorkflowExecuted() {
 	const executionData = workflowsStore.workflowExecutionData;
 	const executionStatus = executionData?.status ?? 'unknown';
@@ -257,8 +186,6 @@ watch(
 				if (msg.id && isWorkflowUpdatedMessage(msg)) {
 					processedWorkflowUpdates.value.add(msg.id);
 
-					const originalWorkflowJson =
-						workflowUpdated.value?.start ?? builderStore.getWorkflowSnapshot();
 					const result = builderStore.applyWorkflowUpdate(msg.codeSnippet);
 
 					if (result.success) {
@@ -274,11 +201,6 @@ watch(
 							regenerateIds: false,
 							trackEvents: false,
 						});
-
-						workflowUpdated.value = {
-							start: originalWorkflowJson,
-							end: msg.codeSnippet,
-						};
 					}
 				}
 			});
@@ -291,11 +213,6 @@ watch(
 watch(
 	() => builderStore.streaming,
 	async (isStreaming) => {
-		if (!isStreaming) {
-			trackWorkflowModifications();
-			trackWorkflowCategorization();
-		}
-
 		if (
 			builderStore.initialGeneration &&
 			!isStreaming &&
@@ -348,7 +265,7 @@ defineExpose({
 			@message="onUserMessage"
 			@upgrade-click="() => goToUpgrade('ai-builder-sidebar', 'upgrade-builder')"
 			@feedback="onFeedback"
-			@stop="builderStore.stopStreaming"
+			@stop="builderStore.abortStreaming"
 		>
 			<template #header>
 				<slot name="header" />
diff --git a/packages/frontend/editor-ui/src/features/ai/assistant/components/Agent/ExecuteMessage.vue b/packages/frontend/editor-ui/src/features/ai/assistant/components/Agent/ExecuteMessage.vue
index eb2bcdbb62a..41bc7e216ef 100644
--- a/packages/frontend/editor-ui/src/features/ai/assistant/components/Agent/ExecuteMessage.vue
+++ b/packages/frontend/editor-ui/src/features/ai/assistant/components/Agent/ExecuteMessage.vue
@@ -16,7 +16,6 @@ import { useToast } from '@/app/composables/useToast';
 import { N8nTooltip } from '@n8n/design-system';
 import { nextTick } from 'vue';
 import { useBuilderStore } from '@/features/ai/assistant/builder.store';
-import type { WorkflowValidationIssue } from '@/Interface';
 
 interface Emits {
 	/** Emitted when workflow execution completes */
@@ -37,49 +36,6 @@ const builderStore = useBuilderStore();
 // Workflow execution composable
 const { runWorkflow } = useRunWorkflow({ router });
 
-const PLACEHOLDER_PREFIX = '<__PLACEHOLDER_VALUE__';
-const PLACEHOLDER_SUFFIX = '__>';
-
-interface PlaceholderDetail {
-	path: string[];
-	label: string;
-}
-
-function extractPlaceholderLabel(value: unknown): string | null {
-	if (typeof value !== 'string') return null;
-	if (!value.startsWith(PLACEHOLDER_PREFIX) || !value.endsWith(PLACEHOLDER_SUFFIX)) return null;
-
-	const label = value
-		.slice(PLACEHOLDER_PREFIX.length, value.length - PLACEHOLDER_SUFFIX.length)
-		.trim();
-	return label.length > 0 ? label : null;
-}
-
-function findPlaceholderDetails(value: unknown, path: string[] = []): PlaceholderDetail[] {
-	const label = extractPlaceholderLabel(value);
-	if (label) return [{ path, label }];
-
-	if (Array.isArray(value)) {
-		return value.flatMap((item, index) => findPlaceholderDetails(item, [...path, `[${index}]`]));
-	}
-
-	if (value !== null && typeof value === 'object') {
-		return Object.entries(value).flatMap(([key, nested]) =>
-			findPlaceholderDetails(nested, [...path, key]),
-		);
-	}
-
-	return [];
-}
-
-function formatPlaceholderPath(path: string[]): string {
-	if (path.length === 0) return 'parameters';
-
-	return path
-		.map((segment, index) => (segment.startsWith('[') || index === 0 ? segment : `.${segment}`))
-		.join('');
-}
-
 let executionWatcherStop: WatchStopHandle | undefined;
 
 const containerRef = ref<HTMLElement>();
@@ -115,56 +71,7 @@ const ensureExecutionWatcher = () => {
 	);
 };
 
-// Workflow validation from store
-const baseWorkflowIssues = computed(() =>
-	workflowsStore.workflowValidationIssues.filter((issue) =>
-		['credentials', 'parameters'].includes(issue.type),
-	),
-);
-
-const placeholderIssues = computed(() => {
-	const issues: WorkflowValidationIssue[] = [];
-	const seen = new Set<string>();
-
-	for (const node of workflowsStore.workflow.nodes) {
-		if (!node?.parameters) continue;
-
-		const placeholders = findPlaceholderDetails(node.parameters);
-		if (placeholders.length === 0) continue;
-
-		const existingParameterIssues = node.issues?.parameters ?? {};
-
-		for (const placeholder of placeholders) {
-			const path = formatPlaceholderPath(placeholder.path);
-			const message = i18n.baseText('aiAssistant.builder.executeMessage.fillParameter', {
-				interpolate: { label: placeholder.label },
-			});
-			const rawMessages = existingParameterIssues[path];
-			const existingMessages = rawMessages
-				? Array.isArray(rawMessages)
-					? rawMessages
-					: [rawMessages]
-				: [];
-
-			if (existingMessages.includes(message)) continue;
-
-			const key = `${node.name}|${path}|${placeholder.label}`;
-			if (seen.has(key)) continue;
-			seen.add(key);
-
-			issues.push({
-				node: node.name,
-				type: 'parameters',
-				value: message,
-			});
-		}
-	}
-
-	return issues;
-});
-
-const workflowIssues = computed(() => [...baseWorkflowIssues.value, ...placeholderIssues.value]);
-const hasValidationIssues = computed(() => workflowIssues.value.length > 0);
+const hasValidationIssues = computed(() => builderStore.workflowTodos.length > 0);
 const formatIssueMessage = workflowsStore.formatIssueMessage;
 
 const triggerNodes = computed(() =>
@@ -261,7 +168,7 @@ onBeforeUnmount(() => {
 				aria-label="Workflow validation issues"
 			>
 				<NodeIssueItem
-					v-for="issue in workflowIssues"
+					v-for="issue in builderStore.workflowTodos"
 					:key="`${formatIssueMessage(issue.value)}_${issue.node}`"
 					:issue="issue"
 					:get-node-type="getNodeTypeByName"
diff --git a/packages/frontend/editor-ui/src/features/ai/assistant/composables/useBuilderMessages.test.ts b/packages/frontend/editor-ui/src/features/ai/assistant/composables/useBuilderMessages.test.ts
index 9b295487751..bf93588641a 100644
--- a/packages/frontend/editor-ui/src/features/ai/assistant/composables/useBuilderMessages.test.ts
+++ b/packages/frontend/editor-ui/src/features/ai/assistant/composables/useBuilderMessages.test.ts
@@ -10,6 +10,11 @@ vi.mock('@n8n/i18n', () => ({
 	}),
 }));
 
+// Mock generateShortId to return a predictable value for testing
+vi.mock('../builder.utils', () => ({
+	generateShortId: () => 'abc123',
+}));
+
 describe('useBuilderMessages', () => {
 	let builderMessages: ReturnType<typeof useBuilderMessages>;
 
@@ -36,7 +41,7 @@ describe('useBuilderMessages', () => {
 
 			expect(result.messages).toHaveLength(1);
 			expect(result.messages[0]).toMatchObject({
-				id: 'test-id-0',
+				id: 'test-id--abc123--0',
 				role: 'assistant',
 				type: 'text',
 				content: 'Hello, how can I help?',
@@ -72,7 +77,7 @@ describe('useBuilderMessages', () => {
 			expect(result.messages).toHaveLength(1);
 			const toolMessage = result.messages[0] as ChatUI.ToolMessage;
 			expect(toolMessage).toMatchObject({
-				id: 'call-123', // Should use toolCallId as ID
+				id: 'test-id--abc123--0-call-123', // Format is messageId-toolCallId
 				role: 'assistant',
 				type: 'tool',
 				toolName: 'add_nodes',
@@ -164,7 +169,7 @@ describe('useBuilderMessages', () => {
 
 			expect(result.messages).toHaveLength(1);
 			expect(result.messages[0]).toMatchObject({
-				id: 'test-id-0', // Should fall back to generated ID
+				id: 'test-id--abc123--0-undefined', // Format is messageId-toolCallId (undefined when missing)
 				type: 'tool',
 				toolName: 'some_tool',
 			});
@@ -224,7 +229,7 @@ describe('useBuilderMessages', () => {
 
 			expect(result.messages).toHaveLength(1);
 			expect(result.messages[0]).toMatchObject({
-				id: 'test-id-0',
+				id: 'test-id--abc123--0',
 				type: 'workflow-updated',
 				codeSnippet: '{"nodes": [], "connections": {}}',
 				read: false,
@@ -262,11 +267,11 @@ describe('useBuilderMessages', () => {
 
 			expect(result.messages).toHaveLength(3);
 			expect(result.messages[0].type).toBe('text');
-			expect(result.messages[0].id).toBe('batch-id-0');
+			expect(result.messages[0].id).toBe('batch-id--abc123--0');
 			expect(result.messages[1].type).toBe('tool');
-			expect(result.messages[1].id).toBe('call-123'); // Uses toolCallId
+			expect(result.messages[1].id).toBe('batch-id--abc123--1-call-123'); // Format is messageId-toolCallId
 			expect(result.messages[2].type).toBe('workflow-updated');
-			expect(result.messages[2].id).toBe('batch-id-2');
+			expect(result.messages[2].id).toBe('batch-id--abc123--2');
 		});
 
 		it('should show tool name when tool is in progress with displayTitle', () => {
@@ -988,7 +993,7 @@ describe('useBuilderMessages', () => {
 			);
 
 			expect(result.messages).toHaveLength(1);
-			expect(result.messages[0].id).toBe('test-id-0');
+			expect(result.messages[0].id).toBe('test-id--abc123--0-undefined'); // Format is messageId-toolCallId (undefined when missing)
 		});
 
 		it('should handle workflow-updated messages with invalid JSON', () => {
@@ -1526,7 +1531,7 @@ describe('useBuilderMessages', () => {
 			expect(result.messages).toHaveLength(1);
 			const errorMessage = result.messages[0] as ChatUI.ErrorMessage;
 			expect(errorMessage).toMatchObject({
-				id: 'test-id-0',
+				id: 'test-id--abc123--0',
 				role: 'assistant',
 				type: 'error',
 				content: 'Something went wrong',
diff --git a/packages/frontend/editor-ui/src/features/ai/assistant/composables/useBuilderMessages.ts b/packages/frontend/editor-ui/src/features/ai/assistant/composables/useBuilderMessages.ts
index 76c304ccb7c..20884eb7639 100644
--- a/packages/frontend/editor-ui/src/features/ai/assistant/composables/useBuilderMessages.ts
+++ b/packages/frontend/editor-ui/src/features/ai/assistant/composables/useBuilderMessages.ts
@@ -2,6 +2,7 @@ import type { ChatUI } from '@n8n/design-system/types/assistant';
 import type { ChatRequest } from '../assistant.types';
 import { useI18n } from '@n8n/i18n';
 import { isTextMessage, isWorkflowUpdatedMessage, isToolMessage } from '../assistant.types';
+import { generateShortId } from '../builder.utils';
 
 export interface MessageProcessingResult {
 	messages: ChatUI.AssistantMessage[];
@@ -98,9 +99,6 @@ export function useBuilderMessages() {
 		msg: ChatRequest.ToolMessage,
 		messageId: string,
 	): void {
-		// Use toolCallId as the message ID for consistency across updates
-		const toolMessageId = msg.toolCallId ?? messageId;
-
 		// Check if we already have this tool message
 		const existingIndex = msg.toolCallId
 			? messages.findIndex((m) => m.type === 'tool' && m.toolCallId === msg.toolCallId)
@@ -111,6 +109,7 @@ export function useBuilderMessages() {
 			const existing = messages[existingIndex] as ChatUI.ToolMessage;
 			const toolMessage: ChatUI.ToolMessage = {
 				...existing,
+				id: `${messageId}-${msg.toolCallId}`,
 				status: msg.status,
 				updates: [...(existing.updates || []), ...(msg.updates || [])],
 			};
@@ -118,7 +117,7 @@ export function useBuilderMessages() {
 		} else {
 			// Add new tool message
 			const toolMessage: ChatUI.AssistantMessage = {
-				id: toolMessageId,
+				id: `${messageId}-${msg.toolCallId}`,
 				role: 'assistant',
 				type: 'tool',
 				toolName: msg.toolName,
@@ -269,15 +268,18 @@ export function useBuilderMessages() {
 	function processAssistantMessages(
 		currentMessages: ChatUI.AssistantMessage[],
 		newMessages: ChatRequest.MessageResponse[],
-		baseId: string,
+		userMessageId: string,
 		retry?: () => Promise<void>,
 	): MessageProcessingResult {
 		const mutableMessages = [...currentMessages];
 		let shouldClearThinking = false;
 
+		const messageGroupId = generateShortId();
+
 		newMessages.forEach((msg, index) => {
-			// Generate unique ID for each message in the batch
-			const messageId = `${baseId}-${index}`;
+			// Generate unique ID for each message in the batch, based on original user message id.
+			// Used in telemetry to track events related to a specific user message
+			const messageId = `${userMessageId}--${messageGroupId}--${index}`;
 			const clearThinking = processSingleMessage(mutableMessages, msg, messageId, retry);
 			shouldClearThinking = shouldClearThinking || clearThinking;
 		});
diff --git a/packages/frontend/editor-ui/src/features/ai/assistant/composables/useBuilderTodos.test.ts b/packages/frontend/editor-ui/src/features/ai/assistant/composables/useBuilderTodos.test.ts
new file mode 100644
index 00000000000..63c772d0820
--- /dev/null
+++ b/packages/frontend/editor-ui/src/features/ai/assistant/composables/useBuilderTodos.test.ts
@@ -0,0 +1,183 @@
+import { describe, it, expect } from 'vitest';
+import {
+	extractPlaceholderLabel,
+	findPlaceholderDetails,
+	formatPlaceholderPath,
+} from './useBuilderTodos';
+
+describe('useBuilderTodos', () => {
+	describe('extractPlaceholderLabel', () => {
+		it('returns null for non-string values', () => {
+			expect(extractPlaceholderLabel(123)).toBeNull();
+			expect(extractPlaceholderLabel(true)).toBeNull();
+			expect(extractPlaceholderLabel(null)).toBeNull();
+			expect(extractPlaceholderLabel(undefined)).toBeNull();
+			expect(extractPlaceholderLabel({})).toBeNull();
+			expect(extractPlaceholderLabel([])).toBeNull();
+		});
+
+		it('returns null for strings without placeholder format', () => {
+			expect(extractPlaceholderLabel('regular string')).toBeNull();
+			expect(extractPlaceholderLabel('https://example.com')).toBeNull();
+			expect(extractPlaceholderLabel('')).toBeNull();
+		});
+
+		it('returns null for partial placeholder format', () => {
+			expect(extractPlaceholderLabel('<__PLACEHOLDER_VALUE__missing end')).toBeNull();
+			expect(extractPlaceholderLabel('PLACEHOLDER__test__>')).toBeNull();
+			expect(extractPlaceholderLabel('__PLACEHOLDER_VALUE__test__>')).toBeNull();
+		});
+
+		it('returns null for empty label', () => {
+			expect(extractPlaceholderLabel('<__PLACEHOLDER_VALUE____>')).toBeNull();
+		});
+
+		it('returns null for whitespace-only label', () => {
+			expect(extractPlaceholderLabel('<__PLACEHOLDER_VALUE__   __>')).toBeNull();
+		});
+
+		it('extracts label from valid placeholder', () => {
+			expect(extractPlaceholderLabel('<__PLACEHOLDER_VALUE__Enter URL__>')).toBe('Enter URL');
+			expect(extractPlaceholderLabel('<__PLACEHOLDER_VALUE__API Key__>')).toBe('API Key');
+		});
+
+		it('trims whitespace from label', () => {
+			expect(extractPlaceholderLabel('<__PLACEHOLDER_VALUE__  Enter URL  __>')).toBe('Enter URL');
+		});
+	});
+
+	describe('findPlaceholderDetails', () => {
+		it('returns empty array for primitive non-placeholder values', () => {
+			expect(findPlaceholderDetails('regular string')).toEqual([]);
+			expect(findPlaceholderDetails(123)).toEqual([]);
+			expect(findPlaceholderDetails(true)).toEqual([]);
+			expect(findPlaceholderDetails(null)).toEqual([]);
+		});
+
+		it('returns empty array for empty object', () => {
+			expect(findPlaceholderDetails({})).toEqual([]);
+		});
+
+		it('returns empty array for empty array', () => {
+			expect(findPlaceholderDetails([])).toEqual([]);
+		});
+
+		it('finds placeholder at root level', () => {
+			const result = findPlaceholderDetails('<__PLACEHOLDER_VALUE__Enter URL__>');
+			expect(result).toEqual([{ path: [], label: 'Enter URL' }]);
+		});
+
+		it('finds placeholder in simple object', () => {
+			const result = findPlaceholderDetails({
+				url: '<__PLACEHOLDER_VALUE__Enter URL__>',
+			});
+			expect(result).toEqual([{ path: ['url'], label: 'Enter URL' }]);
+		});
+
+		it('finds multiple placeholders in object', () => {
+			const result = findPlaceholderDetails({
+				url: '<__PLACEHOLDER_VALUE__Enter URL__>',
+				body: '<__PLACEHOLDER_VALUE__Enter Body__>',
+			});
+			expect(result).toHaveLength(2);
+			expect(result).toContainEqual({ path: ['url'], label: 'Enter URL' });
+			expect(result).toContainEqual({ path: ['body'], label: 'Enter Body' });
+		});
+
+		it('finds placeholder in nested object', () => {
+			const result = findPlaceholderDetails({
+				options: {
+					headers: {
+						authorization: '<__PLACEHOLDER_VALUE__Enter API Key__>',
+					},
+				},
+			});
+			expect(result).toEqual([
+				{ path: ['options', 'headers', 'authorization'], label: 'Enter API Key' },
+			]);
+		});
+
+		it('finds placeholder in array', () => {
+			const result = findPlaceholderDetails([
+				'regular value',
+				'<__PLACEHOLDER_VALUE__Enter Value__>',
+			]);
+			expect(result).toEqual([{ path: ['[1]'], label: 'Enter Value' }]);
+		});
+
+		it('finds placeholder in array of objects', () => {
+			const result = findPlaceholderDetails({
+				headers: [
+					{ name: 'Content-Type', value: 'application/json' },
+					{ name: 'Authorization', value: '<__PLACEHOLDER_VALUE__Enter Token__>' },
+				],
+			});
+			expect(result).toEqual([{ path: ['headers', '[1]', 'value'], label: 'Enter Token' }]);
+		});
+
+		it('finds placeholders in mixed structure', () => {
+			const result = findPlaceholderDetails({
+				url: '<__PLACEHOLDER_VALUE__Enter URL__>',
+				options: {
+					items: [{ key: '<__PLACEHOLDER_VALUE__Enter Key__>' }, { value: 'static' }],
+				},
+			});
+			expect(result).toHaveLength(2);
+			expect(result).toContainEqual({ path: ['url'], label: 'Enter URL' });
+			expect(result).toContainEqual({
+				path: ['options', 'items', '[0]', 'key'],
+				label: 'Enter Key',
+			});
+		});
+
+		it('ignores non-placeholder strings in object', () => {
+			const result = findPlaceholderDetails({
+				url: 'https://example.com',
+				method: 'GET',
+				placeholder: '<__PLACEHOLDER_VALUE__Enter Value__>',
+			});
+			expect(result).toEqual([{ path: ['placeholder'], label: 'Enter Value' }]);
+		});
+
+		it('handles custom starting path', () => {
+			const result = findPlaceholderDetails({ url: '<__PLACEHOLDER_VALUE__Enter URL__>' }, [
+				'parameters',
+			]);
+			expect(result).toEqual([{ path: ['parameters', 'url'], label: 'Enter URL' }]);
+		});
+	});
+
+	describe('formatPlaceholderPath', () => {
+		it('returns "parameters" for empty path', () => {
+			expect(formatPlaceholderPath([])).toBe('parameters');
+		});
+
+		it('formats single segment path', () => {
+			expect(formatPlaceholderPath(['url'])).toBe('url');
+		});
+
+		it('formats multi-segment path with dot notation', () => {
+			expect(formatPlaceholderPath(['options', 'headers', 'authorization'])).toBe(
+				'options.headers.authorization',
+			);
+		});
+
+		it('formats path with array indices without leading dot', () => {
+			expect(formatPlaceholderPath(['headers', '[0]', 'value'])).toBe('headers[0].value');
+		});
+
+		it('formats path starting with array index', () => {
+			expect(formatPlaceholderPath(['[0]', 'key'])).toBe('[0].key');
+		});
+
+		it('formats path with multiple array indices', () => {
+			expect(formatPlaceholderPath(['items', '[0]', 'options', '[1]', 'value'])).toBe(
+				'items[0].options[1].value',
+			);
+		});
+
+		it('formats path with consecutive array indices', () => {
+			expect(formatPlaceholderPath(['matrix', '[0]', '[1]'])).toBe('matrix[0][1]');
+		});
+	});
+});
diff --git a/packages/frontend/editor-ui/src/features/ai/assistant/composables/useBuilderTodos.ts b/packages/frontend/editor-ui/src/features/ai/assistant/composables/useBuilderTodos.ts
new file mode 100644
index 00000000000..ef26bbdbe72
--- /dev/null
+++ b/packages/frontend/editor-ui/src/features/ai/assistant/composables/useBuilderTodos.ts
@@ -0,0 +1,164 @@
+import { computed } from 'vue';
+import { useI18n } from '@n8n/i18n';
+import { useWorkflowsStore } from '@/app/stores/workflows.store';
+import type { WorkflowValidationIssue } from '@/Interface';
+
+const PLACEHOLDER_PREFIX = '<__PLACEHOLDER_VALUE__';
+const PLACEHOLDER_SUFFIX = '__>';
+
+export interface PlaceholderDetail {
+	path: string[];
+	label: string;
+}
+
+export interface TodoTrackingItem {
+	type: string;
+	node_type: string | undefined;
+	label: string | string[];
+}
+
+export interface TodosTrackingPayload {
+	credentials_todo_count: number;
+	placeholders_todo_count: number;
+	todos: TodoTrackingItem[];
+}
+
+/**
+ * Extracts the label from a placeholder value string.
+ * Returns null if the value is not a valid placeholder.
+ */
+export function extractPlaceholderLabel(value: unknown): string | null {
+	if (typeof value !== 'string') return null;
+	if (!value.startsWith(PLACEHOLDER_PREFIX) || !value.endsWith(PLACEHOLDER_SUFFIX)) return null;
+
+	const label = value
+		.slice(PLACEHOLDER_PREFIX.length, value.length - PLACEHOLDER_SUFFIX.length)
+		.trim();
+	return label.length > 0 ? label : null;
+}
+
+/**
+ * Recursively searches through a value (object, array, or primitive) to find
+ * all placeholder values and their paths.
+ */
+export function findPlaceholderDetails(value: unknown, path: string[] = []): PlaceholderDetail[] {
+	const label = extractPlaceholderLabel(value);
+	if (label) return [{ path, label }];
+
+	if (Array.isArray(value)) {
+		return value.flatMap((item, index) => findPlaceholderDetails(item, [...path, `[${index}]`]));
+	}
+
+	if (value !== null && typeof value === 'object') {
+		return Object.entries(value).flatMap(([key, nested]) =>
+			findPlaceholderDetails(nested, [...path, key]),
+		);
+	}
+
+	return [];
+}
+
+/**
+ * Formats a path array into a dot-notation string for display.
+ * Array indices are preserved as [N] without leading dots.
+ */
+export function formatPlaceholderPath(path: string[]): string {
+	if (path.length === 0) return 'parameters';
+
+	return path
+		.map((segment, index) => (segment.startsWith('[') || index === 0 ? segment : `.${segment}`))
+		.join('');
+}
+
+/**
+ * Composable for managing workflow todos (validation issues and placeholders)
+ * used by the AI builder.
+ */
+export function useBuilderTodos() {
+	const workflowsStore = useWorkflowsStore();
+	const locale = useI18n();
+
+	/**
+	 * Base workflow validation issues filtered to only credentials and parameters types.
+	 */
+	const baseWorkflowIssues = computed(() =>
+		workflowsStore.workflowValidationIssues.filter((issue) =>
+			['credentials', 'parameters'].includes(issue.type),
+		),
+	);
+
+	/**
+	 * Placeholder issues detected in workflow node parameters.
+	 * These are values with the format <__PLACEHOLDER_VALUE__label__>.
+	 */
+	const placeholderIssues = computed(() => {
+		const issues: WorkflowValidationIssue[] = [];
+		const seen = new Set<string>();
+
+		for (const node of workflowsStore.workflow.nodes) {
+			if (!node?.parameters) continue;
+
+			const placeholders = findPlaceholderDetails(node.parameters);
+			if (placeholders.length === 0) continue;
+
+			const existingParameterIssues = node.issues?.parameters ?? {};
+
+			for (const placeholder of placeholders) {
+				const path = formatPlaceholderPath(placeholder.path);
+				const message = locale.baseText('aiAssistant.builder.executeMessage.fillParameter', {
+					interpolate: { label: placeholder.label },
+				});
+				const rawMessages = existingParameterIssues[path];
+				const existingMessages = rawMessages
+					? Array.isArray(rawMessages)
+						? rawMessages
+						: [rawMessages]
+					: [];
+
+				if (existingMessages.includes(message)) continue;
+
+				const key = `${node.name}|${path}|${placeholder.label}`;
+				if (seen.has(key)) continue;
+				seen.add(key);
+
+				issues.push({
+					node: node.name,
+					type: 'parameters',
+					value: message,
+				});
+			}
+		}
+
+		return issues;
+	});
+
+	/**
+	 * Combined list of all workflow todos (base issues + placeholder issues).
+	 */
+	const workflowTodos = computed(() => [...baseWorkflowIssues.value, ...placeholderIssues.value]);
+
+	/**
+	 * Returns todos data formatted for telemetry tracking.
+	 */
+	function getTodosToTrack(): TodosTrackingPayload {
+		const credentials_todo_count = workflowsStore.workflowValidationIssues.filter(
+			(issue) => issue.type === 'credentials',
+		).length;
+		const placeholders_todo_count = placeholderIssues.value.length;
+		return {
+			credentials_todo_count,
+			placeholders_todo_count,
+			todos: workflowTodos.value.map((todo) => ({
+				type: todo.type,
+				node_type: workflowsStore.getNodeByName(todo.node)?.type,
+				label: todo.value,
+			})),
+		};
+	}
+
+	return {
+		workflowTodos,
+		placeholderIssues,
+		getTodosToTrack,
+	};
+}
diff --git a/packages/workflow/src/index.ts b/packages/workflow/src/index.ts
index f5f67077548..854b9792ed8 100644
--- a/packages/workflow/src/index.ts
+++ b/packages/workflow/src/index.ts
@@ -51,6 +51,7 @@ export {
 	setSafeObjectProperty,
 	isDomainAllowed,
 	isCommunityPackageName,
+	dedupe,
 } from './utils';
 export {
 	isINodeProperties,
diff --git a/packages/workflow/src/utils.ts b/packages/workflow/src/utils.ts
index 6dc0946d407..5890db24172 100644
--- a/packages/workflow/src/utils.ts
+++ b/packages/workflow/src/utils.ts
@@ -438,3 +438,7 @@ export function isCommunityPackageName(packageName: string): boolean {
 
 	return !!nameMatch;
 }
+
+export function dedupe<T>(arr: T[]): T[] {
+	return [...new Set(arr)];
+}
diff --git a/packages/workflow/src/workflow.ts b/packages/workflow/src/workflow.ts
index c79cb612ccd..0ff01bfa194 100644
--- a/packages/workflow/src/workflow.ts
+++ b/packages/workflow/src/workflow.ts
@@ -42,10 +42,7 @@ import * as NodeHelpers from './node-helpers';
 import { renameFormFields } from './node-parameters/rename-node-utils';
 import { applyAccessPatterns } from './node-reference-parser-utils';
 import * as ObservableObject from './observable-object';
-
-function dedupe<T>(arr: T[]): T[] {
-	return [...new Set(arr)];
-}
+import { dedupe } from './utils';
 
 export interface WorkflowParameters {
 	id?: string;
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 2b78bafa3bf..af1898c3d36 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -22,8 +22,8 @@ catalogs:
       specifier: 0.3.20-15
       version: 0.3.20-15
     '@n8n_io/ai-assistant-sdk':
-      specifier: 1.17.0
-      version: 1.17.0
+      specifier: 1.18.0
+      version: 1.18.0
     '@sentry/node':
       specifier: ^9.42.1
       version: 9.42.1
@@ -396,7 +396,7 @@ importers:
         version: link:../utils
       '@n8n_io/ai-assistant-sdk':
         specifier: 'catalog:'
-        version: 1.17.0
+        version: 1.18.0
       csv-parse:
         specifier: 5.5.0
         version: 5.5.0
@@ -1534,7 +1534,7 @@ importers:
         version: link:../@n8n/utils
       '@n8n_io/ai-assistant-sdk':
         specifier: 'catalog:'
-        version: 1.17.0
+        version: 1.18.0
       '@n8n_io/license-sdk':
         specifier: 2.24.1
         version: 2.24.1
@@ -6339,8 +6339,8 @@ packages:
     engines: {node: '>=18.10', pnpm: '>=9.6'}
     hasBin: true
 
-  '@n8n_io/ai-assistant-sdk@1.17.0':
-    resolution: {integrity: sha512-Zwfgf9N4aK9klCVC15xHL8R5ID8h9f6OAlW6fPJRV00cmBjX2gD8ZYaX92A9iGiKpmW5YG3mxPU7XTFVexB7wQ==}
+  '@n8n_io/ai-assistant-sdk@1.18.0':
+    resolution: {integrity: sha512-lWsGJ5AniMd/s6FqtQuCS5YJ/iWIA53GjdLieQWgpjwmc52zOAIhfpPGbI5tmm0kpvExYpGDvVRH8UzOHlt9QA==}
     engines: {node: '>=20.15', pnpm: '>=8.14'}
 
   '@n8n_io/license-sdk@2.24.1':
@@ -22728,7 +22728,7 @@ snapshots:
       acorn: 8.12.1
       acorn-walk: 8.3.4
 
-  '@n8n_io/ai-assistant-sdk@1.17.0': {}
+  '@n8n_io/ai-assistant-sdk@1.18.0': {}
 
   '@n8n_io/license-sdk@2.24.1':
     dependencies:
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 3aa4516db62..03a80a440e7 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -11,7 +11,7 @@ catalog:
   '@langchain/core': 1.1.0
   '@langchain/openai': 1.1.3
   '@n8n/typeorm': 0.3.20-15
-  '@n8n_io/ai-assistant-sdk': 1.17.0
+  '@n8n_io/ai-assistant-sdk': 1.18.0
   '@sentry/node': ^9.42.1
   '@types/basic-auth': ^1.1.3
   '@types/express': ^5.0.1

From f20420e36f8a8170f33db33943cda57c3560a4c1 Mon Sep 17 00:00:00 2001
From: yehorkardash <yehor.kardash@n8n.io>
Date: Mon, 8 Dec 2025 11:36:29 +0100
Subject: [PATCH 120/167] fix(Guardrails Node): Remove Guardrails from "Source
 for Prompt" (#22435)

---
 .../nodes/agents/Agent/Agent.node.ts          |  4 +++-
 .../nodes/agents/Agent/V1/AgentV1.node.ts     |  4 ++--
 .../nodes/agents/Agent/V2/AgentV2.node.ts     |  4 ++--
 .../nodes/agents/Agent/V3/AgentV3.node.ts     | 12 ++++++++--
 .../Agent/agents/SqlAgent/description.ts      |  4 ++--
 .../nodes/chains/ChainLLM/ChainLlm.node.ts    |  2 +-
 .../nodes/chains/ChainLLM/methods/config.ts   | 13 +++++++++--
 .../ChainRetrievalQA/ChainRetrievalQa.node.ts | 15 ++++++++++---
 .../v1/actions/assistant/message.operation.ts |  4 ++--
 .../nodes-langchain/utils/descriptions.ts     | 22 ++++++++++++++++++-
 10 files changed, 66 insertions(+), 18 deletions(-)

diff --git a/packages/@n8n/nodes-langchain/nodes/agents/Agent/Agent.node.ts b/packages/@n8n/nodes-langchain/nodes/agents/Agent/Agent.node.ts
index 45c83627fc5..e56583f99d7 100644
--- a/packages/@n8n/nodes-langchain/nodes/agents/Agent/Agent.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/Agent.node.ts
@@ -28,7 +28,7 @@ export class Agent extends VersionedNodeType {
 					],
 				},
 			},
-			defaultVersion: 3,
+			defaultVersion: 3.1,
 		};
 
 		const nodeVersions: IVersionedNodeType['nodeVersions'] = {
@@ -45,7 +45,9 @@ export class Agent extends VersionedNodeType {
 			2: new AgentV2(baseDescription),
 			2.1: new AgentV2(baseDescription),
 			2.2: new AgentV2(baseDescription),
+			2.3: new AgentV2(baseDescription),
 			3: new AgentV3(baseDescription),
+			3.1: new AgentV3(baseDescription),
 			// IMPORTANT Reminder to update AgentTool
 		};
 
diff --git a/packages/@n8n/nodes-langchain/nodes/agents/Agent/V1/AgentV1.node.ts b/packages/@n8n/nodes-langchain/nodes/agents/Agent/V1/AgentV1.node.ts
index b046e52c5b6..390ab5a7e86 100644
--- a/packages/@n8n/nodes-langchain/nodes/agents/Agent/V1/AgentV1.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/V1/AgentV1.node.ts
@@ -12,7 +12,7 @@ import type {
 } from 'n8n-workflow';
 
 import {
-	promptTypeOptions,
+	promptTypeOptionsDeprecated,
 	textFromGuardrailsNode,
 	textFromPreviousNode,
 	textInput,
@@ -374,7 +374,7 @@ export class AgentV1 implements INodeType {
 					default: 'toolsAgent',
 				},
 				{
-					...promptTypeOptions,
+					...promptTypeOptionsDeprecated,
 					displayOptions: {
 						hide: {
 							'@version': [{ _cnd: { lte: 1.2 } }],
diff --git a/packages/@n8n/nodes-langchain/nodes/agents/Agent/V2/AgentV2.node.ts b/packages/@n8n/nodes-langchain/nodes/agents/Agent/V2/AgentV2.node.ts
index 3a6a9380a54..4538ed4a013 100644
--- a/packages/@n8n/nodes-langchain/nodes/agents/Agent/V2/AgentV2.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/V2/AgentV2.node.ts
@@ -8,7 +8,7 @@ import type {
 } from 'n8n-workflow';
 
 import {
-	promptTypeOptions,
+	promptTypeOptionsDeprecated,
 	textFromGuardrailsNode,
 	textFromPreviousNode,
 	textInput,
@@ -58,7 +58,7 @@ export class AgentV2 implements INodeType {
 					},
 					default: '',
 				},
-				promptTypeOptions,
+				promptTypeOptionsDeprecated,
 				{
 					...textFromGuardrailsNode,
 					displayOptions: {
diff --git a/packages/@n8n/nodes-langchain/nodes/agents/Agent/V3/AgentV3.node.ts b/packages/@n8n/nodes-langchain/nodes/agents/Agent/V3/AgentV3.node.ts
index 19183d20ea0..e3c14db106f 100644
--- a/packages/@n8n/nodes-langchain/nodes/agents/Agent/V3/AgentV3.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/V3/AgentV3.node.ts
@@ -11,6 +11,7 @@ import type {
 
 import {
 	promptTypeOptions,
+	promptTypeOptionsDeprecated,
 	textFromGuardrailsNode,
 	textFromPreviousNode,
 	textInput,
@@ -27,7 +28,7 @@ export class AgentV3 implements INodeType {
 	constructor(baseDescription: INodeTypeBaseDescription) {
 		this.description = {
 			...baseDescription,
-			version: [3],
+			version: [3, 3.1],
 			defaults: {
 				name: 'AI Agent',
 				color: '#404040',
@@ -47,7 +48,14 @@ export class AgentV3 implements INodeType {
 					type: 'callout',
 					default: '',
 				},
-				promptTypeOptions,
+				{
+					...promptTypeOptionsDeprecated,
+					displayOptions: { show: { '@version': [{ _cnd: { lt: 3.1 } }] } },
+				},
+				{
+					...promptTypeOptions,
+					displayOptions: { show: { '@version': [{ _cnd: { gte: 3.1 } }] } },
+				},
 				{
 					...textFromGuardrailsNode,
 					displayOptions: {
diff --git a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/description.ts b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/description.ts
index 68e9ec28172..4f4d11f4476 100644
--- a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/description.ts
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/description.ts
@@ -1,7 +1,7 @@
 import type { INodeProperties } from 'n8n-workflow';
 
 import {
-	promptTypeOptions,
+	promptTypeOptionsDeprecated,
 	textFromGuardrailsNode,
 	textFromPreviousNode,
 	textInput,
@@ -110,7 +110,7 @@ export const sqlAgentAgentProperties: INodeProperties[] = [
 		},
 	},
 	{
-		...promptTypeOptions,
+		...promptTypeOptionsDeprecated,
 		displayOptions: {
 			hide: {
 				'@version': [{ _cnd: { lte: 1.2 } }],
diff --git a/packages/@n8n/nodes-langchain/nodes/chains/ChainLLM/ChainLlm.node.ts b/packages/@n8n/nodes-langchain/nodes/chains/ChainLLM/ChainLlm.node.ts
index 66d102e4058..1b8b1398f24 100644
--- a/packages/@n8n/nodes-langchain/nodes/chains/ChainLLM/ChainLlm.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/chains/ChainLLM/ChainLlm.node.ts
@@ -27,7 +27,7 @@ export class ChainLlm implements INodeType {
 		icon: 'fa:link',
 		iconColor: 'black',
 		group: ['transform'],
-		version: [1, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7],
+		version: [1, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7, 1.8],
 		description: 'A simple chain to prompt a large language model',
 		defaults: {
 			name: 'Basic LLM Chain',
diff --git a/packages/@n8n/nodes-langchain/nodes/chains/ChainLLM/methods/config.ts b/packages/@n8n/nodes-langchain/nodes/chains/ChainLLM/methods/config.ts
index 322d7b016aa..3946732eff0 100644
--- a/packages/@n8n/nodes-langchain/nodes/chains/ChainLLM/methods/config.ts
+++ b/packages/@n8n/nodes-langchain/nodes/chains/ChainLLM/methods/config.ts
@@ -8,6 +8,7 @@ import { NodeConnectionTypes } from 'n8n-workflow';
 
 import {
 	promptTypeOptions,
+	promptTypeOptionsDeprecated,
 	textFromGuardrailsNode,
 	textFromPreviousNode,
 } from '@utils/descriptions';
@@ -95,10 +96,18 @@ export const nodeProperties: INodeProperties[] = [
 		},
 	},
 	{
-		...promptTypeOptions,
+		...promptTypeOptionsDeprecated,
 		displayOptions: {
 			hide: {
-				'@version': [1, 1.1, 1.2, 1.3],
+				'@version': [{ _cnd: { lte: 1.3 } }, { _cnd: { gte: 1.8 } }],
+			},
+		},
+	},
+	{
+		...promptTypeOptions,
+		displayOptions: {
+			show: {
+				'@version': [{ _cnd: { gte: 1.8 } }],
 			},
 		},
 	},
diff --git a/packages/@n8n/nodes-langchain/nodes/chains/ChainRetrievalQA/ChainRetrievalQa.node.ts b/packages/@n8n/nodes-langchain/nodes/chains/ChainRetrievalQA/ChainRetrievalQa.node.ts
index f4b9c71d4a8..a93ac5433db 100644
--- a/packages/@n8n/nodes-langchain/nodes/chains/ChainRetrievalQA/ChainRetrievalQa.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/chains/ChainRetrievalQA/ChainRetrievalQa.node.ts
@@ -8,6 +8,7 @@ import {
 
 import {
 	promptTypeOptions,
+	promptTypeOptionsDeprecated,
 	textFromGuardrailsNode,
 	textFromPreviousNode,
 } from '@utils/descriptions';
@@ -23,7 +24,7 @@ export class ChainRetrievalQa implements INodeType {
 		icon: 'fa:link',
 		iconColor: 'black',
 		group: ['transform'],
-		version: [1, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6],
+		version: [1, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7],
 		description: 'Answer questions about retrieved documents',
 		defaults: {
 			name: 'Question and Answer Chain',
@@ -100,10 +101,18 @@ export class ChainRetrievalQa implements INodeType {
 				},
 			},
 			{
-				...promptTypeOptions,
+				...promptTypeOptionsDeprecated,
 				displayOptions: {
 					hide: {
-						'@version': [{ _cnd: { lte: 1.2 } }],
+						'@version': [{ _cnd: { lte: 1.2 } }, { _cnd: { gte: 1.7 } }],
+					},
+				},
+			},
+			{
+				...promptTypeOptions,
+				displayOptions: {
+					show: {
+						'@version': [{ _cnd: { gte: 1.7 } }],
 					},
 				},
 			},
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/v1/actions/assistant/message.operation.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/v1/actions/assistant/message.operation.ts
index 4a209ba43ed..9c90bf616f5 100644
--- a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/v1/actions/assistant/message.operation.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/v1/actions/assistant/message.operation.ts
@@ -18,7 +18,7 @@ import {
 } from 'n8n-workflow';
 import { OpenAI as OpenAIClient } from 'openai';
 
-import { promptTypeOptions } from '@utils/descriptions';
+import { promptTypeOptionsDeprecated } from '@utils/descriptions';
 import { getConnectedTools, getPromptInputByType } from '@utils/helpers';
 import { getTracingConfig } from '@utils/tracing';
 
@@ -29,7 +29,7 @@ import { getProxyAgent } from '@utils/httpProxyAgent';
 const properties: INodeProperties[] = [
 	assistantRLC,
 	{
-		...promptTypeOptions,
+		...promptTypeOptionsDeprecated,
 		name: 'prompt',
 	},
 	{
diff --git a/packages/@n8n/nodes-langchain/utils/descriptions.ts b/packages/@n8n/nodes-langchain/utils/descriptions.ts
index b420264db13..890dbb84002 100644
--- a/packages/@n8n/nodes-langchain/utils/descriptions.ts
+++ b/packages/@n8n/nodes-langchain/utils/descriptions.ts
@@ -100,7 +100,7 @@ export const buildInputSchemaField = (props?: {
 
 export const inputSchemaField = buildInputSchemaField();
 
-export const promptTypeOptions: INodeProperties = {
+export const promptTypeOptionsDeprecated: INodeProperties = {
 	displayName: 'Source for Prompt (User Message)',
 	name: 'promptType',
 	type: 'options',
@@ -126,6 +126,26 @@ export const promptTypeOptions: INodeProperties = {
 	default: 'auto',
 };
 
+export const promptTypeOptions: INodeProperties = {
+	displayName: 'Source for Prompt (User Message)',
+	name: 'promptType',
+	type: 'options',
+	options: [
+		{
+			name: 'Connected Chat Trigger Node',
+			value: 'auto',
+			description:
+				"Looks for an input field called 'chatInput' that is coming from a directly connected Chat Trigger",
+		},
+		{
+			name: 'Define below',
+			value: 'define',
+			description: 'Use an expression to reference data in previous nodes or enter static text',
+		},
+	],
+	default: 'auto',
+};
+
 export const textInput: INodeProperties = {
 	displayName: 'Prompt (User Message)',
 	name: 'text',

From 99c30edf1da2e3886fd2e2ca60139907e2e4438c Mon Sep 17 00:00:00 2001
From: James Gee <1285296+geemanjs@users.noreply.github.com>
Date: Mon, 8 Dec 2025 12:00:14 +0100
Subject: [PATCH 121/167] fix(core): Make workers memory constraints more
 container aware (#22698)

---
 packages/@n8n/api-types/src/scaling.ts        | 17 ++++
 .../src/scaling/worker-status.service.ee.ts   | 23 +++++-
 .../frontend/@n8n/i18n/src/locales/en.json    |  1 +
 .../components/WorkerCard.vue                 | 12 ++-
 .../components/WorkerChartsAccordion.vue      | 36 ++++++---
 .../WorkerMemoryMonitorAccordion.vue          | 81 +++++++++++++++++++
 .../orchestration.ee/orchestration.utils.ts   |  8 +-
 7 files changed, 160 insertions(+), 18 deletions(-)
 create mode 100644 packages/frontend/editor-ui/src/features/settings/orchestration.ee/components/WorkerMemoryMonitorAccordion.vue

diff --git a/packages/@n8n/api-types/src/scaling.ts b/packages/@n8n/api-types/src/scaling.ts
index 30db754a112..f2dcbb52b95 100644
--- a/packages/@n8n/api-types/src/scaling.ts
+++ b/packages/@n8n/api-types/src/scaling.ts
@@ -13,6 +13,23 @@ export type RunningJobSummary = {
 export type WorkerStatus = {
 	senderId: string;
 	runningJobsSummary: RunningJobSummary[];
+	isInContainer: boolean;
+	process: {
+		memory: {
+			available: number;
+			constraint: number;
+			rss: number;
+			heapTotal: number;
+			heapUsed: number;
+		};
+		uptime: number;
+	};
+	host: {
+		memory: {
+			total: number;
+			free: number;
+		};
+	};
 	freeMem: number;
 	totalMem: number;
 	uptime: number;
diff --git a/packages/cli/src/scaling/worker-status.service.ee.ts b/packages/cli/src/scaling/worker-status.service.ee.ts
index b5668138222..5f86bb570ed 100644
--- a/packages/cli/src/scaling/worker-status.service.ee.ts
+++ b/packages/cli/src/scaling/worker-status.service.ee.ts
@@ -3,6 +3,7 @@ import { OnPubSubEvent } from '@n8n/decorators';
 import { Service } from '@n8n/di';
 import { InstanceSettings } from 'n8n-core';
 import os from 'node:os';
+import process from 'node:process';
 
 import { N8N_VERSION } from '@/constants';
 import { Push } from '@/push';
@@ -46,9 +47,29 @@ export class WorkerStatusService {
 	}
 
 	private generateStatus(): WorkerStatus {
+		const constrainedMemory = process.constrainedMemory();
+
+		// See https://github.com/nodejs/node/issues/59227 for information about why we cap at MAX_SAFE_INTEGER
+		// The number 18446744073709552000 does come back when running in a container with no constraints
+		const isInContainer = constrainedMemory > 0 && constrainedMemory < Number.MAX_SAFE_INTEGER;
 		return {
 			senderId: this.instanceSettings.hostId,
 			runningJobsSummary: this.jobProcessor.getRunningJobsSummary(),
+			isInContainer,
+			process: {
+				memory: {
+					available: process.availableMemory(),
+					constraint: process.constrainedMemory(),
+					...process.memoryUsage(),
+				},
+				uptime: process.uptime(),
+			},
+			host: {
+				memory: {
+					total: os.totalmem(),
+					free: os.freemem(),
+				},
+			},
 			freeMem: os.freemem(),
 			totalMem: os.totalmem(),
 			uptime: process.uptime(),
@@ -73,6 +94,6 @@ export class WorkerStatusService {
 
 		if (cpus.length === 0) return 'no CPU info';
 
-		return `${cpus.length}x ${cpus[0].model} - speed: ${cpus[0].speed}`;
+		return `${cpus.length}x ${cpus[0].model}`;
 	}
 }
diff --git a/packages/frontend/@n8n/i18n/src/locales/en.json b/packages/frontend/@n8n/i18n/src/locales/en.json
index 07e2932c510..7d67132a5c9 100644
--- a/packages/frontend/@n8n/i18n/src/locales/en.json
+++ b/packages/frontend/@n8n/i18n/src/locales/en.json
@@ -1081,6 +1081,7 @@
 	"workerList.item.jobList.empty": "No current jobs",
 	"workerList.item.jobListTitle": "Current Jobs",
 	"workerList.item.netListTitle": "Network Interfaces",
+	"workerList.item.memoryMonitorTitle": "Memory Monitoring",
 	"workerList.item.chartsTitle": "Performance Monitoring",
 	"workerList.item.copyAddressToClipboard": "Address copied to clipboard",
 	"workerList.actionBox.title": "Available on the Enterprise plan",
diff --git a/packages/frontend/editor-ui/src/features/settings/orchestration.ee/components/WorkerCard.vue b/packages/frontend/editor-ui/src/features/settings/orchestration.ee/components/WorkerCard.vue
index 240cb670882..e465e8fe0ed 100644
--- a/packages/frontend/editor-ui/src/features/settings/orchestration.ee/components/WorkerCard.vue
+++ b/packages/frontend/editor-ui/src/features/settings/orchestration.ee/components/WorkerCard.vue
@@ -7,6 +7,7 @@ import { averageWorkerLoadFromLoadsAsString, memAsGb } from '../orchestration.ut
 import WorkerJobAccordion from './WorkerJobAccordion.vue';
 import WorkerNetAccordion from './WorkerNetAccordion.vue';
 import WorkerChartsAccordion from './WorkerChartsAccordion.vue';
+import WorkerMemoryMonitorAccordion from './WorkerMemoryMonitorAccordion.vue';
 import { sortByProperty } from '@n8n/utils/sort/sortByProperty';
 import { useI18n } from '@n8n/i18n';
 
@@ -69,8 +70,13 @@ onBeforeUnmount(() => {
 				data-test-id="worker-card-name"
 			>
 				Name: {{ worker.senderId }} ({{ worker.hostname }}) <br />
-				Average Load: {{ averageWorkerLoadFromLoadsAsString(worker.loadAvg ?? [0]) }} | Free Memory:
-				{{ memAsGb(worker.freeMem).toFixed(2) }}GB / {{ memAsGb(worker.totalMem).toFixed(2) }}GB
+				Average Load: {{ averageWorkerLoadFromLoadsAsString(worker.loadAvg ?? [0]) }} | Free memory:
+				{{ memAsGb(worker.process.memory.available) }}GB /
+				{{
+					memAsGb(
+						worker.isInContainer ? worker.process.memory.constraint : worker.host.memory.total,
+					)
+				}}GB
 				{{ stale ? ' (stale)' : '' }}
 			</N8nHeading>
 		</template>
@@ -81,9 +87,11 @@ onBeforeUnmount(() => {
 					ago | n8n-Version: {{ worker.version }} | Architecture: {{ worker.arch }} (
 					{{ worker.platform }}) | Uptime: {{ upTime(worker.uptime) }}</span
 				>
+				<br />
 				<WorkerJobAccordion :items="worker.runningJobsSummary" />
 				<WorkerNetAccordion :items="sortedWorkerInterfaces" />
 				<WorkerChartsAccordion :worker-id="worker.senderId" />
+				<WorkerMemoryMonitorAccordion :worker="worker" />
 			</N8nText>
 		</div>
 		<template #append>
diff --git a/packages/frontend/editor-ui/src/features/settings/orchestration.ee/components/WorkerChartsAccordion.vue b/packages/frontend/editor-ui/src/features/settings/orchestration.ee/components/WorkerChartsAccordion.vue
index 5d362545334..90da188a6f3 100644
--- a/packages/frontend/editor-ui/src/features/settings/orchestration.ee/components/WorkerChartsAccordion.vue
+++ b/packages/frontend/editor-ui/src/features/settings/orchestration.ee/components/WorkerChartsAccordion.vue
@@ -5,7 +5,7 @@ import { ref } from 'vue';
 import type { ChartData, ChartOptions } from 'chart.js';
 import type { ChartComponentRef } from 'vue-chartjs';
 import { Chart } from 'vue-chartjs';
-import { averageWorkerLoadFromLoads, memAsGb } from '../orchestration.utils';
+import { averageWorkerLoadFromLoads } from '../orchestration.utils';
 import { useI18n } from '@n8n/i18n';
 
 const props = defineProps<{
@@ -28,7 +28,7 @@ const blankDataSet = (label: string, color: string, prefill: number = 0) => ({
 const orchestrationStore = useOrchestrationStore();
 const chartRefJobs = ref<ChartComponentRef | undefined>(undefined);
 const chartRefCPU = ref<ChartComponentRef | undefined>(undefined);
-const chartRefMemory = ref<ChartComponentRef | undefined>(undefined);
+const chartRefMemoryUsage = ref<ChartComponentRef | undefined>(undefined);
 const optionsBase: () => Partial<ChartOptions<'line'>> = () => ({
 	responsive: true,
 	maintainAspectRatio: true,
@@ -49,9 +49,8 @@ const optionsBase: () => Partial<ChartOptions<'line'>> = () => ({
 const optionsJobs: Partial<ChartOptions<'line'>> = optionsBase();
 const optionsCPU: Partial<ChartOptions<'line'>> = optionsBase();
 if (optionsCPU.scales?.y) optionsCPU.scales.y.suggestedMax = 100;
-const maxMemory = memAsGb(orchestrationStore.workers[props.workerId]?.totalMem) ?? 1;
 const optionsMemory: Partial<ChartOptions<'line'>> = optionsBase();
-if (optionsMemory.scales?.y) optionsMemory.scales.y.suggestedMax = maxMemory;
+if (optionsMemory.scales?.y) optionsMemory.scales.y.suggestedMax = 100;
 
 // prefilled initial arrays
 const dataJobs = ref<ChartData>(
@@ -60,8 +59,8 @@ const dataJobs = ref<ChartData>(
 const dataCPU = ref<ChartData>(
 	blankDataSet('Processor Usage', 'rgb(19, 205, 103)', WORKER_HISTORY_LENGTH),
 );
-const dataMemory = ref<ChartData>(
-	blankDataSet('Memory Usage', 'rgb(244, 216, 174)', WORKER_HISTORY_LENGTH),
+const dataMemoryUsage = ref<ChartData>(
+	blankDataSet('Memory Usage (%)', 'rgb(244, 216, 174)', WORKER_HISTORY_LENGTH),
 );
 
 orchestrationStore.$onAction(({ name, store }) => {
@@ -74,22 +73,33 @@ orchestrationStore.$onAction(({ name, store }) => {
 			'rgb(19, 205, 103)',
 			prefillCount,
 		);
-		const newDataMemory: ChartData = blankDataSet(
-			'Memory Usage',
+		const newDataMemoryUsage: ChartData = blankDataSet(
+			'Memory Usage (%)',
 			'rgb(244, 216, 174)',
 			prefillCount,
 		);
+
 		store.workersHistory[props.workerId]?.forEach((item) => {
 			newDataJobs.datasets[0].data.push(item.data.runningJobsSummary.length);
 			newDataJobs.labels?.push(new Date(item.timestamp).toLocaleTimeString());
 			newDataCPU.datasets[0].data.push(averageWorkerLoadFromLoads(item.data.loadAvg));
+
+			//	Map the x axis timestamps to the labels
 			newDataCPU.labels = newDataJobs.labels;
-			newDataMemory.datasets[0].data.push(maxMemory - memAsGb(item.data.freeMem));
-			newDataMemory.labels = newDataJobs.labels;
+			newDataMemoryUsage.labels = newDataJobs.labels;
+
+			const totalMem = item.data.isInContainer
+				? item.data.process.memory.constraint
+				: item.data.host.memory.total;
+
+			const usedMem = totalMem - item.data.process.memory.available;
+
+			const usage = (usedMem / totalMem) * 100;
+			newDataMemoryUsage.datasets[0].data.push(usage);
 		});
 		dataJobs.value = newDataJobs;
 		dataCPU.value = newDataCPU;
-		dataMemory.value = newDataMemory;
+		dataMemoryUsage.value = newDataMemoryUsage;
 	}
 });
 </script>
@@ -116,9 +126,9 @@ orchestrationStore.$onAction(({ name, store }) => {
 					:class="$style.chart"
 				/>
 				<Chart
-					ref="chartRefMemory"
+					ref="chartRefMemoryUsage"
 					type="line"
-					:data="dataMemory"
+					:data="dataMemoryUsage"
 					:options="optionsMemory"
 					:class="$style.chart"
 				/>
diff --git a/packages/frontend/editor-ui/src/features/settings/orchestration.ee/components/WorkerMemoryMonitorAccordion.vue b/packages/frontend/editor-ui/src/features/settings/orchestration.ee/components/WorkerMemoryMonitorAccordion.vue
new file mode 100644
index 00000000000..2c3122dbe41
--- /dev/null
+++ b/packages/frontend/editor-ui/src/features/settings/orchestration.ee/components/WorkerMemoryMonitorAccordion.vue
@@ -0,0 +1,81 @@
+<script setup lang="ts">
+import type { WorkerStatus } from '@n8n/api-types';
+import WorkerAccordion from './WorkerAccordion.vue';
+import { useI18n } from '@n8n/i18n';
+import { memAsGb, memAsMb } from '@/features/settings/orchestration.ee/orchestration.utils';
+
+const props = defineProps<{
+	worker: WorkerStatus;
+}>();
+
+const i18n = useI18n();
+</script>
+
+<template>
+	<WorkerAccordion icon="list-checks" icon-color="text-dark" :initial-expanded="false">
+		<template #title>
+			{{ i18n.baseText('workerList.item.memoryMonitorTitle') }}
+		</template>
+		<template #content>
+			<div :class="$style['accordion-content']">
+				<strong>Host/OS Memory:</strong>
+				<table>
+					<tbody>
+						<tr>
+							<th>Total (os.totalmem)</th>
+							<td>{{ memAsGb(props.worker.host.memory.total) }}GB</td>
+						</tr>
+						<tr>
+							<th>Free (os.freemem)</th>
+							<td>{{ memAsGb(props.worker.host.memory.free) }}GB</td>
+						</tr>
+					</tbody>
+				</table>
+				<br />
+				<strong>Process Memory:</strong><br />
+				<table>
+					<tbody>
+						<tr v-if="worker.isInContainer">
+							<th>Constraint: (process.constrainedMemory)</th>
+							<td>{{ memAsMb(props.worker.process.memory.constraint) }}MB</td>
+						</tr>
+						<tr>
+							<th>Available: (process.availableMemory)</th>
+							<td>{{ memAsMb(props.worker.process.memory.available) }}MB</td>
+						</tr>
+						<tr>
+							<th>RSS: (process.memoryUsage().rss)</th>
+							<td>{{ memAsMb(props.worker.process.memory.rss) }}MB</td>
+						</tr>
+						<tr>
+							<th>Heap total: (process.memoryUsage().heapTotal)</th>
+							<td>{{ memAsMb(props.worker.process.memory.heapTotal) }}MB</td>
+						</tr>
+						<tr>
+							<th>Heap used: (process.memoryUsage().heapUsed)</th>
+							<td>{{ memAsMb(props.worker.process.memory.heapUsed) }}MB</td>
+						</tr>
+					</tbody>
+				</table>
+			</div>
+		</template>
+	</WorkerAccordion>
+</template>
+
+<style lang="scss" module>
+table {
+	th,
+	td {
+		text-align: left;
+		font-weight: normal;
+	}
+	td {
+		font-variant-numeric: tabular-nums;
+		padding-left: 8px;
+	}
+}
+
+.accordion-content {
+	padding: var(--spacing--2xs);
+}
+</style>
diff --git a/packages/frontend/editor-ui/src/features/settings/orchestration.ee/orchestration.utils.ts b/packages/frontend/editor-ui/src/features/settings/orchestration.ee/orchestration.utils.ts
index d7891ff0629..ea316c3c857 100644
--- a/packages/frontend/editor-ui/src/features/settings/orchestration.ee/orchestration.utils.ts
+++ b/packages/frontend/editor-ui/src/features/settings/orchestration.ee/orchestration.utils.ts
@@ -6,6 +6,10 @@ export function averageWorkerLoadFromLoadsAsString(loads: number[]): string {
 	return averageWorkerLoadFromLoads(loads).toFixed(2);
 }
 
-export function memAsGb(mem: number): number {
-	return mem / 1024 / 1024 / 1024;
+export function memAsGb(mem: number, decimalPlaces: number = 2): number {
+	return Number((mem / 1024 / 1024 / 1024).toFixed(decimalPlaces));
+}
+
+export function memAsMb(mem: number, decimalPlaces: number = 2): number {
+	return Number((mem / 1024 / 1024).toFixed(decimalPlaces));
 }

From fb9f913492ea61d9d11b80d8e4b8394a3cd4795b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Mon, 8 Dec 2025 12:30:24 +0100
Subject: [PATCH 122/167] fix(core): Allowlist `HOME` env var in JS runner
 config (#22839)

---
 docker/images/runners/n8n-task-runners.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docker/images/runners/n8n-task-runners.json b/docker/images/runners/n8n-task-runners.json
index d7c760114e2..d5dcc089a62 100644
--- a/docker/images/runners/n8n-task-runners.json
+++ b/docker/images/runners/n8n-task-runners.json
@@ -20,7 +20,8 @@
 				"N8N_SENTRY_DSN",
 				"N8N_VERSION",
 				"ENVIRONMENT",
-				"DEPLOYMENT_NAME"
+				"DEPLOYMENT_NAME",
+				"HOME"
 			],
 			"env-overrides": {
 				"NODE_FUNCTION_ALLOW_BUILTIN": "crypto",

From b8d433f3bf41f4aa9280dac4dd691839dad8cf2e Mon Sep 17 00:00:00 2001
From: Konstantin Tieber <46342664+konstantintieber@users.noreply.github.com>
Date: Mon, 8 Dec 2025 12:31:54 +0100
Subject: [PATCH 123/167] fix(core): Workflow diff preview errors out in push
 dialog for workflow that's newly created (#22861)

---
 packages/@n8n/api-types/src/index.ts          |  2 +
 .../schemas/source-controlled-file.schema.ts  |  6 ++
 .../useWorkflowDiffRouting.test.ts            | 83 +++++++++++++++++++
 .../app/composables/useWorkflowDiffRouting.ts |  9 +-
 .../components/SourceControlPushModal.test.ts | 69 +++++++++++++--
 .../components/SourceControlPushModal.vue     | 10 +--
 .../workflowDiff/WorkflowDiffModal.test.ts    | 65 +++++++++++++++
 .../workflowDiff/WorkflowDiffModal.vue        | 13 ++-
 8 files changed, 244 insertions(+), 13 deletions(-)

diff --git a/packages/@n8n/api-types/src/index.ts b/packages/@n8n/api-types/src/index.ts
index ffd29775a75..6a7b0c46aab 100644
--- a/packages/@n8n/api-types/src/index.ts
+++ b/packages/@n8n/api-types/src/index.ts
@@ -68,6 +68,8 @@ export type {
 } from './schemas/project.schema';
 
 export {
+	isSourceControlledFileStatus,
+	type SourceControlledFileStatus,
 	type SourceControlledFile,
 	SOURCE_CONTROL_FILE_LOCATION,
 	SOURCE_CONTROL_FILE_STATUS,
diff --git a/packages/@n8n/api-types/src/schemas/source-controlled-file.schema.ts b/packages/@n8n/api-types/src/schemas/source-controlled-file.schema.ts
index a3c6c94fe99..0ac2e391256 100644
--- a/packages/@n8n/api-types/src/schemas/source-controlled-file.schema.ts
+++ b/packages/@n8n/api-types/src/schemas/source-controlled-file.schema.ts
@@ -24,6 +24,12 @@ const FileStatusSchema = z.enum([
 ]);
 export const SOURCE_CONTROL_FILE_STATUS = FileStatusSchema.Values;
 
+export type SourceControlledFileStatus = z.infer<typeof FileStatusSchema>;
+
+export function isSourceControlledFileStatus(value: unknown): value is SourceControlledFileStatus {
+	return FileStatusSchema.safeParse(value).success;
+}
+
 const FileLocationSchema = z.enum(['local', 'remote']);
 export const SOURCE_CONTROL_FILE_LOCATION = FileLocationSchema.Values;
 
diff --git a/packages/frontend/editor-ui/src/app/composables/useWorkflowDiffRouting.test.ts b/packages/frontend/editor-ui/src/app/composables/useWorkflowDiffRouting.test.ts
index 38a9d64cb6e..0bf90b24eab 100644
--- a/packages/frontend/editor-ui/src/app/composables/useWorkflowDiffRouting.test.ts
+++ b/packages/frontend/editor-ui/src/app/composables/useWorkflowDiffRouting.test.ts
@@ -85,6 +85,68 @@ describe('useWorkflowDiffRouting', () => {
 			});
 		});
 
+		it('should parse valid workflowStatus query parameter when diff is present', async () => {
+			mockRoute.value.query = {
+				diff: 'workflow-123',
+				direction: 'push',
+				workflowStatus: 'modified',
+			};
+
+			useWorkflowDiffRouting();
+			await nextTick();
+
+			expect(mockUiStore.openModalWithData).toHaveBeenCalledWith({
+				name: WORKFLOW_DIFF_MODAL_KEY,
+				data: {
+					eventBus: mockEventBus,
+					workflowId: 'workflow-123',
+					workflowStatus: 'modified',
+					direction: 'push',
+				},
+			});
+		});
+
+		it('should ignore workflowStatus when diff is not present', async () => {
+			mockRoute.value.query = {
+				direction: 'push',
+				workflowStatus: 'modified',
+			};
+
+			useWorkflowDiffRouting();
+			await nextTick();
+
+			expect(mockUiStore.openModalWithData).toHaveBeenCalledWith({
+				name: SOURCE_CONTROL_PUSH_MODAL_KEY,
+				data: { eventBus: mockEventBus },
+			});
+
+			expect(mockUiStore.openModalWithData).not.toHaveBeenCalledWith(
+				expect.objectContaining({
+					name: WORKFLOW_DIFF_MODAL_KEY,
+				}),
+			);
+		});
+
+		it('should ignore invalid workflowStatus values', async () => {
+			mockRoute.value.query = {
+				diff: 'workflow-123',
+				direction: 'push',
+				workflowStatus: 'invalid-status',
+			};
+
+			useWorkflowDiffRouting();
+			await nextTick();
+
+			expect(mockUiStore.openModalWithData).toHaveBeenCalledWith({
+				name: WORKFLOW_DIFF_MODAL_KEY,
+				data: {
+					eventBus: mockEventBus,
+					workflowId: 'workflow-123',
+					direction: 'push',
+				},
+			});
+		});
+
 		it('should ignore invalid diff query parameter types', async () => {
 			mockRoute.value.query = {
 				diff: ['array-value'],
@@ -173,6 +235,27 @@ describe('useWorkflowDiffRouting', () => {
 			});
 		});
 
+		it('should include workflowStatus in diff modal data when provided', async () => {
+			mockRoute.value.query = {
+				diff: 'workflow-456',
+				direction: 'pull',
+				workflowStatus: 'created',
+			};
+
+			useWorkflowDiffRouting();
+			await nextTick();
+
+			expect(mockUiStore.openModalWithData).toHaveBeenCalledWith({
+				name: WORKFLOW_DIFF_MODAL_KEY,
+				data: {
+					eventBus: mockEventBus,
+					workflowId: 'workflow-456',
+					workflowStatus: 'created',
+					direction: 'pull',
+				},
+			});
+		});
+
 		it('should not open diff modal when diff is present but direction is missing', async () => {
 			mockRoute.value.query = {
 				diff: 'workflow-456',
diff --git a/packages/frontend/editor-ui/src/app/composables/useWorkflowDiffRouting.ts b/packages/frontend/editor-ui/src/app/composables/useWorkflowDiffRouting.ts
index e9c0c6c6a7a..f046482f7fc 100644
--- a/packages/frontend/editor-ui/src/app/composables/useWorkflowDiffRouting.ts
+++ b/packages/frontend/editor-ui/src/app/composables/useWorkflowDiffRouting.ts
@@ -1,6 +1,7 @@
 import { watch } from 'vue';
 import { useRoute } from 'vue-router';
 import { createEventBus } from '@n8n/utils/event-bus';
+import { isSourceControlledFileStatus, type SourceControlledFileStatus } from '@n8n/api-types';
 import { useUIStore } from '@/app/stores/ui.store';
 import { WORKFLOW_DIFF_MODAL_KEY } from '@/app/constants';
 import {
@@ -48,6 +49,7 @@ export function useWorkflowDiffRouting() {
 
 	const handleDiffModal = (
 		diffWorkflowId: string | undefined,
+		diffWorkflowStatus: SourceControlledFileStatus | undefined,
 		direction: Direction | undefined,
 	) => {
 		const shouldOpen = diffWorkflowId && direction;
@@ -59,6 +61,7 @@ export function useWorkflowDiffRouting() {
 				data: {
 					eventBus: workflowDiffEventBus,
 					workflowId: diffWorkflowId,
+					workflowStatus: diffWorkflowStatus,
 					direction,
 				},
 			});
@@ -107,6 +110,10 @@ export function useWorkflowDiffRouting() {
 
 	const handleRouteChange = () => {
 		const diffWorkflowId = typeof route.query.diff === 'string' ? route.query.diff : undefined;
+		const diffWorkflowStatus =
+			diffWorkflowId && isSourceControlledFileStatus(route.query.workflowStatus)
+				? route.query.workflowStatus
+				: undefined;
 		const direction =
 			typeof route.query.direction === 'string' &&
 			(route.query.direction === 'push' || route.query.direction === 'pull')
@@ -118,7 +125,7 @@ export function useWorkflowDiffRouting() {
 				? route.query.sourceControl
 				: undefined;
 
-		handleDiffModal(diffWorkflowId, direction);
+		handleDiffModal(diffWorkflowId, diffWorkflowStatus, direction);
 		handleSourceControlModals(sourceControl, diffWorkflowId, direction);
 	};
 
diff --git a/packages/frontend/editor-ui/src/features/integrations/sourceControl.ee/components/SourceControlPushModal.test.ts b/packages/frontend/editor-ui/src/features/integrations/sourceControl.ee/components/SourceControlPushModal.test.ts
index c62c19dcabd..9a6abf4083f 100644
--- a/packages/frontend/editor-ui/src/features/integrations/sourceControl.ee/components/SourceControlPushModal.test.ts
+++ b/packages/frontend/editor-ui/src/features/integrations/sourceControl.ee/components/SourceControlPushModal.test.ts
@@ -22,16 +22,20 @@ const mockRoute = reactive({
 	name: '',
 	params: {},
 	fullPath: '',
+	query: {},
 });
 
+const mockRouterInstance = {
+	back: vi.fn(),
+	push: vi.fn(),
+	replace: vi.fn(),
+	go: vi.fn(),
+	currentRoute: { value: mockRoute },
+};
+
 vi.mock('vue-router', () => ({
 	useRoute: () => mockRoute,
-	useRouter: () => ({
-		back: vi.fn(),
-		push: vi.fn(),
-		replace: vi.fn(),
-		go: vi.fn(),
-	}),
+	useRouter: () => mockRouterInstance,
 	RouterLink: {
 		template: '<a><slot></slot></a>',
 		props: ['to', 'target'],
@@ -859,6 +863,59 @@ describe('SourceControlPushModal', () => {
 		});
 	});
 
+	describe('workflow diff button', () => {
+		beforeEach(() => {
+			settingsStore.settings.enterprise.workflowDiffs = true;
+			vi.clearAllMocks();
+		});
+
+		it('should set workflowStatus url param when diff button is clicked for created workflow', async () => {
+			const status: SourceControlledFile[] = [
+				{
+					id: 'workflow-2',
+					name: 'New workflow',
+					type: 'workflow',
+					status: 'created',
+					location: 'local',
+					conflict: false,
+					file: '/home/user/.n8n/git/workflows/workflow-2.json',
+					updatedAt: '2024-09-20T10:31:40.000Z',
+				},
+			];
+
+			sourceControlStore.getAggregatedStatus.mockResolvedValue(status);
+
+			const { getByTestId, getByText, getAllByTestId } = renderModal({
+				pinia,
+				props: {
+					data: {
+						eventBus,
+						status,
+					},
+				},
+			});
+
+			await waitFor(() => {
+				expect(getByText('Commit and push changes')).toBeInTheDocument();
+			});
+
+			await waitFor(() => {
+				expect(getAllByTestId('source-control-push-modal-file-checkbox')).toHaveLength(1);
+			});
+
+			const compareButton = getByTestId('source-control-workflow-diff-button');
+			await userEvent.click(compareButton);
+
+			expect(mockRouterInstance.push).toHaveBeenCalledWith({
+				query: expect.objectContaining({
+					diff: 'workflow-2',
+					workflowStatus: 'created',
+					direction: 'push',
+				}),
+			});
+		});
+	});
+
 	describe('Enter key behavior', () => {
 		it('should trigger commit and push when Enter is pressed and submit is enabled', async () => {
 			const status: SourceControlledFile[] = [
diff --git a/packages/frontend/editor-ui/src/features/integrations/sourceControl.ee/components/SourceControlPushModal.vue b/packages/frontend/editor-ui/src/features/integrations/sourceControl.ee/components/SourceControlPushModal.vue
index 02409b98ffa..7d72d1b71d8 100644
--- a/packages/frontend/editor-ui/src/features/integrations/sourceControl.ee/components/SourceControlPushModal.vue
+++ b/packages/frontend/editor-ui/src/features/integrations/sourceControl.ee/components/SourceControlPushModal.vue
@@ -16,7 +16,7 @@ import type {
 } from '@/features/collaboration/projects/projects.types';
 import { ResourceType } from '@/features/collaboration/projects/projects.utils';
 import { getPushPriorityByStatus, getStatusText, getStatusTheme } from '../sourceControl.utils';
-import type { SourceControlledFile } from '@n8n/api-types';
+import type { SourceControlledFile, SourceControlledFileStatus } from '@n8n/api-types';
 import {
 	ROLE,
 	SOURCE_CONTROL_FILE_LOCATION,
@@ -134,8 +134,6 @@ const projectsForFilters = computed(() => {
 const concatenateWithAnd = (messages: string[]) =>
 	new Intl.ListFormat(i18n.locale, { style: 'long', type: 'conjunction' }).format(messages);
 
-type SourceControlledFileStatus = SourceControlledFile['status'];
-
 type SourceControlledFileWithProject = SourceControlledFile & { project?: ProjectListItem };
 
 type Changes = {
@@ -665,7 +663,7 @@ function castProject(project: ProjectListItem): WorkflowResource {
 	return resource;
 }
 
-function openDiffModal(id: string) {
+function openDiffModal(id: string, workflowStatus: SourceControlledFileStatus) {
 	telemetry.track('User clicks compare workflows', {
 		workflow_id: id,
 		context: 'source_control_push',
@@ -676,6 +674,7 @@ function openDiffModal(id: string) {
 		query: {
 			...route.query,
 			diff: id,
+			workflowStatus,
 			direction: 'push',
 		},
 	});
@@ -929,9 +928,10 @@ onMounted(async () => {
 														placement="top"
 													>
 														<N8nIconButton
+															data-test-id="source-control-workflow-diff-button"
 															icon="file-diff"
 															type="secondary"
-															@click="openDiffModal(file.id)"
+															@click="openDiffModal(file.id, file.status)"
 														/>
 													</N8nTooltip>
 												</template>
diff --git a/packages/frontend/editor-ui/src/features/workflows/workflowDiff/WorkflowDiffModal.test.ts b/packages/frontend/editor-ui/src/features/workflows/workflowDiff/WorkflowDiffModal.test.ts
index 8b6d07c8288..a28598f2bdd 100644
--- a/packages/frontend/editor-ui/src/features/workflows/workflowDiff/WorkflowDiffModal.test.ts
+++ b/packages/frontend/editor-ui/src/features/workflows/workflowDiff/WorkflowDiffModal.test.ts
@@ -151,6 +151,7 @@ describe('WorkflowDiffModal', () => {
 				data: {
 					eventBus,
 					workflowId: 'test-workflow-id',
+					workflowStatus: 'modified',
 					direction: 'push',
 				},
 			},
@@ -167,6 +168,7 @@ describe('WorkflowDiffModal', () => {
 				data: {
 					eventBus,
 					workflowId: 'test-workflow-id',
+					workflowStatus: 'modified',
 					direction: 'push',
 				},
 			},
@@ -185,6 +187,7 @@ describe('WorkflowDiffModal', () => {
 				data: {
 					eventBus,
 					workflowId: 'test-workflow-id',
+					workflowStatus: 'modified',
 					direction: 'push',
 				},
 			},
@@ -201,6 +204,7 @@ describe('WorkflowDiffModal', () => {
 				data: {
 					eventBus,
 					workflowId: 'test-workflow-id',
+					workflowStatus: 'modified',
 					direction: 'push',
 				},
 			},
@@ -222,6 +226,7 @@ describe('WorkflowDiffModal', () => {
 				data: {
 					eventBus,
 					workflowId: 'test-workflow-id',
+					workflowStatus: 'modified',
 					direction: 'push',
 				},
 			},
@@ -238,6 +243,7 @@ describe('WorkflowDiffModal', () => {
 				data: {
 					eventBus,
 					workflowId: 'test-workflow-id',
+					workflowStatus: 'modified',
 					direction: 'push',
 				},
 			},
@@ -266,6 +272,7 @@ describe('WorkflowDiffModal', () => {
 				data: {
 					eventBus,
 					workflowId: 'test-workflow-id',
+					workflowStatus: 'modified',
 					direction: 'push',
 				},
 			},
@@ -280,6 +287,7 @@ describe('WorkflowDiffModal', () => {
 				data: {
 					eventBus,
 					workflowId: 'test-workflow-id',
+					workflowStatus: 'modified',
 					direction: 'push',
 				},
 			},
@@ -295,6 +303,7 @@ describe('WorkflowDiffModal', () => {
 				data: {
 					eventBus,
 					workflowId: 'test-workflow-id',
+					workflowStatus: 'modified',
 					direction: 'pull',
 				},
 			},
@@ -305,6 +314,7 @@ describe('WorkflowDiffModal', () => {
 				data: {
 					eventBus,
 					workflowId: 'test-workflow-id',
+					workflowStatus: 'modified',
 					direction: 'push',
 				},
 			},
@@ -321,6 +331,7 @@ describe('WorkflowDiffModal', () => {
 				data: {
 					eventBus,
 					workflowId: 'test-workflow-id',
+					workflowStatus: 'modified',
 					direction: 'push',
 				},
 			},
@@ -350,6 +361,7 @@ describe('WorkflowDiffModal', () => {
 				data: {
 					eventBus,
 					workflowId: 'test-workflow-id',
+					workflowStatus: 'modified',
 					direction: 'push',
 				},
 			},
@@ -378,6 +390,7 @@ describe('WorkflowDiffModal', () => {
 				data: {
 					eventBus,
 					workflowId: 'test-workflow-id',
+					workflowStatus: 'modified',
 					direction: 'push',
 				},
 			},
@@ -413,6 +426,7 @@ describe('WorkflowDiffModal', () => {
 					data: {
 						eventBus,
 						workflowId: 'new-workflow-id',
+						workflowStatus: 'modified',
 						direction: 'pull',
 					},
 				},
@@ -433,6 +447,7 @@ describe('WorkflowDiffModal', () => {
 					data: {
 						eventBus,
 						workflowId: 'missing-workflow-id',
+						workflowStatus: 'modified',
 						direction: 'push',
 					},
 				},
@@ -450,6 +465,7 @@ describe('WorkflowDiffModal', () => {
 					data: {
 						eventBus,
 						workflowId: 'test-workflow-id',
+						workflowStatus: 'modified',
 						direction: 'push',
 					},
 				},
@@ -466,6 +482,7 @@ describe('WorkflowDiffModal', () => {
 					data: {
 						eventBus,
 						workflowId: 'test-workflow-id',
+						workflowStatus: 'modified',
 						direction: 'pull',
 					},
 				},
@@ -488,6 +505,7 @@ describe('WorkflowDiffModal', () => {
 					data: {
 						eventBus,
 						workflowId: 'test-workflow-id',
+						workflowStatus: 'modified',
 						direction: 'push',
 					},
 				},
@@ -509,6 +527,7 @@ describe('WorkflowDiffModal', () => {
 					data: {
 						eventBus,
 						workflowId: 'test-workflow-id',
+						workflowStatus: 'modified',
 						direction: 'push',
 					},
 				},
@@ -529,6 +548,7 @@ describe('WorkflowDiffModal', () => {
 					data: {
 						eventBus,
 						workflowId: 'test-workflow-id',
+						workflowStatus: 'modified',
 						direction: 'push',
 					},
 				},
@@ -548,6 +568,7 @@ describe('WorkflowDiffModal', () => {
 					data: {
 						eventBus,
 						workflowId: 'test-workflow-id',
+						workflowStatus: 'modified',
 						direction: 'push',
 					},
 				},
@@ -571,6 +592,7 @@ describe('WorkflowDiffModal', () => {
 					data: {
 						eventBus,
 						workflowId: 'test-workflow-id',
+						workflowStatus: 'modified',
 						direction: 'push',
 					},
 				},
@@ -590,6 +612,7 @@ describe('WorkflowDiffModal', () => {
 					data: {
 						eventBus,
 						workflowId: 'test-workflow-id',
+						workflowStatus: 'modified',
 						direction: 'push',
 					},
 				},
@@ -607,6 +630,7 @@ describe('WorkflowDiffModal', () => {
 					data: {
 						eventBus,
 						workflowId: 'test-workflow-id',
+						workflowStatus: 'modified',
 						direction: 'push',
 					},
 				},
@@ -623,6 +647,7 @@ describe('WorkflowDiffModal', () => {
 					data: {
 						eventBus,
 						workflowId: 'test-workflow-id',
+						workflowStatus: 'modified',
 						direction: 'push',
 					},
 				},
@@ -650,6 +675,7 @@ describe('WorkflowDiffModal', () => {
 					data: {
 						eventBus,
 						workflowId: 'test-workflow-id',
+						workflowStatus: 'modified',
 						direction: 'push',
 					},
 				},
@@ -676,6 +702,7 @@ describe('WorkflowDiffModal', () => {
 					data: {
 						eventBus,
 						workflowId: 'test-workflow-id',
+						workflowStatus: 'modified',
 						direction: 'push',
 					},
 				},
@@ -691,4 +718,42 @@ describe('WorkflowDiffModal', () => {
 			});
 		});
 	});
+
+	describe('remote workflow loading', () => {
+		it('should not call getRemoteWorkflow when direction is push and workflowStatus is created', async () => {
+			renderModal({
+				props: {
+					data: {
+						eventBus,
+						workflowId: 'test-workflow-id',
+						workflowStatus: 'created',
+						direction: 'push',
+					},
+				},
+			});
+
+			await vi.waitFor(() => {
+				expect(workflowsStore.fetchWorkflow).toHaveBeenCalledWith('test-workflow-id');
+			});
+
+			expect(sourceControlStore.getRemoteWorkflow).not.toHaveBeenCalled();
+		});
+
+		it('should call getRemoteWorkflow when direction is push and workflowStatus is not created', async () => {
+			renderModal({
+				props: {
+					data: {
+						eventBus,
+						workflowId: 'test-workflow-id',
+						workflowStatus: 'modified',
+						direction: 'push',
+					},
+				},
+			});
+
+			await vi.waitFor(() => {
+				expect(sourceControlStore.getRemoteWorkflow).toHaveBeenCalledWith('test-workflow-id');
+			});
+		});
+	});
 });
diff --git a/packages/frontend/editor-ui/src/features/workflows/workflowDiff/WorkflowDiffModal.vue b/packages/frontend/editor-ui/src/features/workflows/workflowDiff/WorkflowDiffModal.vue
index 124185cea59..dce433a22a0 100644
--- a/packages/frontend/editor-ui/src/features/workflows/workflowDiff/WorkflowDiffModal.vue
+++ b/packages/frontend/editor-ui/src/features/workflows/workflowDiff/WorkflowDiffModal.vue
@@ -11,6 +11,7 @@ import SyncedWorkflowCanvas from '@/features/workflows/workflowDiff/SyncedWorkfl
 import { useProvideViewportSync } from '@/features/workflows/workflowDiff/useViewportSync';
 import { useWorkflowDiff } from '@/features/workflows/workflowDiff/useWorkflowDiff';
 import type { IWorkflowDb } from '@/Interface';
+import type { SourceControlledFileStatus } from '@n8n/api-types';
 import { useNodeTypesStore } from '@/app/stores/nodeTypes.store';
 import { useSourceControlStore } from '@/features/integrations/sourceControl.ee/sourceControl.store';
 import { useWorkflowsStore } from '@/app/stores/workflows.store';
@@ -36,7 +37,12 @@ import {
 	N8nText,
 } from '@n8n/design-system';
 const props = defineProps<{
-	data: { eventBus: EventBus; workflowId: string; direction: 'push' | 'pull' };
+	data: {
+		eventBus: EventBus;
+		workflowId: string;
+		direction: 'push' | 'pull';
+		workflowStatus?: SourceControlledFileStatus;
+	};
 }>();
 
 const { selectedDetailId, onNodeClick, syncIsEnabled } = useProvideViewportSync();
@@ -62,6 +68,11 @@ const isClosed = ref(false);
 
 const remote = useAsyncState<{ workflow?: IWorkflowDb; remote: boolean } | undefined, [], false>(
 	async () => {
+		if (props.data.direction === 'push' && props.data.workflowStatus === 'created') {
+			// a new workflow that has yet to be pushed cannot be on remote.
+			return { workflow: undefined, remote: true };
+		}
+
 		try {
 			const { workflowId } = props.data;
 			const { content: workflow } = await sourceControlStore.getRemoteWorkflow(workflowId);

From 5799cf712a4e20d122c2f0b0dbadf65cbdd1f6b0 Mon Sep 17 00:00:00 2001
From: Guillaume Jacquart <jacquart.guillaume@gmail.com>
Date: Mon, 8 Dec 2025 12:52:24 +0100
Subject: [PATCH 124/167] feat(core): Dynamic credential resolvers API routes
 (#22862)

---
 .../create-credential-resolver.dto.test.ts    | 199 +++++++++++++
 .../update-credential-resolver.dto.test.ts    | 161 +++++++++++
 .../create-credential-resolver.dto.ts         |  13 +
 .../update-credential-resolver.dto.ts         |  11 +
 packages/@n8n/api-types/src/dto/index.ts      |   3 +
 packages/@n8n/api-types/src/index.ts          |   5 +
 .../credential-resolver.schema.test.ts        | 261 ++++++++++++++++++
 .../src/schemas/credential-resolver.schema.ts |  20 ++
 .../scope-information.test.ts.snap            |   6 +
 packages/@n8n/permissions/src/constants.ee.ts |   1 +
 .../src/roles/scopes/global-scopes.ee.ts      |   5 +
 .../get-resource-permissions.test.ts          |   2 +
 .../credential-resolvers.controller.ts        | 143 ++++++++++
 .../dynamic-credentials.module.ts             |   1 +
 .../services/credential-resolver.service.ts   |   2 +-
 .../credential-resolvers.api.test.ts          | 195 +++++++++++++
 packages/cli/test/integration/shared/types.ts |   8 +-
 .../editor-ui/src/app/stores/rbac.store.ts    |   1 +
 18 files changed, 1035 insertions(+), 2 deletions(-)
 create mode 100644 packages/@n8n/api-types/src/dto/credential-resolver/__tests__/create-credential-resolver.dto.test.ts
 create mode 100644 packages/@n8n/api-types/src/dto/credential-resolver/__tests__/update-credential-resolver.dto.test.ts
 create mode 100644 packages/@n8n/api-types/src/dto/credential-resolver/create-credential-resolver.dto.ts
 create mode 100644 packages/@n8n/api-types/src/dto/credential-resolver/update-credential-resolver.dto.ts
 create mode 100644 packages/@n8n/api-types/src/schemas/__tests__/credential-resolver.schema.test.ts
 create mode 100644 packages/@n8n/api-types/src/schemas/credential-resolver.schema.ts
 create mode 100644 packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers.controller.ts
 create mode 100644 packages/cli/test/integration/dynamic-credentials.ee/credential-resolvers.api.test.ts

diff --git a/packages/@n8n/api-types/src/dto/credential-resolver/__tests__/create-credential-resolver.dto.test.ts b/packages/@n8n/api-types/src/dto/credential-resolver/__tests__/create-credential-resolver.dto.test.ts
new file mode 100644
index 00000000000..1f090af015f
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/credential-resolver/__tests__/create-credential-resolver.dto.test.ts
@@ -0,0 +1,199 @@
+import { CreateCredentialResolverDto } from '../create-credential-resolver.dto';
+
+describe('CreateCredentialResolverDto', () => {
+	describe('Valid requests', () => {
+		test.each([
+			{
+				name: 'basic valid resolver',
+				data: {
+					name: 'Test Resolver',
+					type: 'credential-resolver.stub-1.0',
+					config: { prefix: 'test-' },
+				},
+			},
+			{
+				name: 'resolver with complex config',
+				data: {
+					name: 'AWS Secrets Manager',
+					type: 'credential-resolver.aws-secrets-1.0',
+					config: {
+						region: 'us-east-1',
+						accessKeyId: 'AKIAIOSFODNN7EXAMPLE',
+						secretAccessKey: 'wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY',
+					},
+				},
+			},
+			{
+				name: 'resolver with empty config',
+				data: {
+					name: 'Simple Resolver',
+					type: 'credential-resolver.simple-1.0',
+					config: {},
+				},
+			},
+			{
+				name: 'resolver with minimum name length',
+				data: {
+					name: 'A',
+					type: 'type',
+					config: {},
+				},
+			},
+		])('should succeed validation for $name', ({ data }) => {
+			const result = CreateCredentialResolverDto.safeParse(data);
+
+			expect(result.success).toBe(true);
+			if (result.success) {
+				expect(result.data.name).toBe(data.name);
+				expect(result.data.type).toBe(data.type);
+				expect(result.data.config).toEqual(data.config);
+			}
+		});
+	});
+
+	describe('Invalid requests', () => {
+		test.each([
+			{
+				name: 'missing name',
+				data: {
+					type: 'credential-resolver.stub-1.0',
+					config: {},
+				},
+				expectedErrorPath: ['name'],
+			},
+			{
+				name: 'missing type',
+				data: {
+					name: 'Test Resolver',
+					config: {},
+				},
+				expectedErrorPath: ['type'],
+			},
+			{
+				name: 'missing config',
+				data: {
+					name: 'Test Resolver',
+					type: 'credential-resolver.stub-1.0',
+				},
+				expectedErrorPath: ['config'],
+			},
+			{
+				name: 'empty name',
+				data: {
+					name: '',
+					type: 'credential-resolver.stub-1.0',
+					config: {},
+				},
+				expectedErrorPath: ['name'],
+			},
+			{
+				name: 'whitespace-only name',
+				data: {
+					name: '   ',
+					type: 'credential-resolver.stub-1.0',
+					config: {},
+				},
+				expectedErrorPath: ['name'],
+			},
+			{
+				name: 'name too long (>255 chars)',
+				data: {
+					name: 'a'.repeat(256),
+					type: 'credential-resolver.stub-1.0',
+					config: {},
+				},
+				expectedErrorPath: ['name'],
+			},
+			{
+				name: 'empty type',
+				data: {
+					name: 'Test Resolver',
+					type: '',
+					config: {},
+				},
+				expectedErrorPath: ['type'],
+			},
+			{
+				name: 'whitespace-only type',
+				data: {
+					name: 'Test Resolver',
+					type: '   ',
+					config: {},
+				},
+				expectedErrorPath: ['type'],
+			},
+			{
+				name: 'type too long (>255 chars)',
+				data: {
+					name: 'Test Resolver',
+					type: 'a'.repeat(256),
+					config: {},
+				},
+				expectedErrorPath: ['type'],
+			},
+			{
+				name: 'config as string',
+				data: {
+					name: 'Test Resolver',
+					type: 'credential-resolver.stub-1.0',
+					config: 'invalid',
+				},
+				expectedErrorPath: ['config'],
+			},
+			{
+				name: 'config as array',
+				data: {
+					name: 'Test Resolver',
+					type: 'credential-resolver.stub-1.0',
+					config: [],
+				},
+				expectedErrorPath: ['config'],
+			},
+			{
+				name: 'config as null',
+				data: {
+					name: 'Test Resolver',
+					type: 'credential-resolver.stub-1.0',
+					config: null,
+				},
+				expectedErrorPath: ['config'],
+			},
+		])('should fail validation for $name', ({ data, expectedErrorPath }) => {
+			const result = CreateCredentialResolverDto.safeParse(data);
+
+			expect(result.success).toBe(false);
+
+			if (expectedErrorPath && !result.success) {
+				expect(result.error.issues[0].path).toEqual(expectedErrorPath);
+			}
+		});
+	});
+
+	describe('Trimming', () => {
+		test('should trim name', () => {
+			const result = CreateCredentialResolverDto.safeParse({
+				name: '  Test Resolver  ',
+				type: 'credential-resolver.stub-1.0',
+				config: {},
+			});
+
+			expect(result.success).toBe(true);
+			if (result.success) {
+				expect(result.data.name).toBe('Test Resolver');
+			}
+		});
+
+		test('should trim type', () => {
+			const result = CreateCredentialResolverDto.safeParse({
+				name: 'Test Resolver',
+				type: '  credential-resolver.stub-1.0  ',
+				config: {},
+			});
+
+			expect(result.success).toBe(true);
+			if (result.success) {
+				expect(result.data.type).toBe('credential-resolver.stub-1.0');
+			}
+		});
+	});
+});
diff --git a/packages/@n8n/api-types/src/dto/credential-resolver/__tests__/update-credential-resolver.dto.test.ts b/packages/@n8n/api-types/src/dto/credential-resolver/__tests__/update-credential-resolver.dto.test.ts
new file mode 100644
index 00000000000..a8d284eba03
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/credential-resolver/__tests__/update-credential-resolver.dto.test.ts
@@ -0,0 +1,161 @@
+import { UpdateCredentialResolverDto } from '../update-credential-resolver.dto';
+
+describe('UpdateCredentialResolverDto', () => {
+	describe('Valid requests', () => {
+		test.each([
+			{
+				name: 'update only name',
+				data: {
+					name: 'Updated Resolver',
+				},
+			},
+			{
+				name: 'update only config',
+				data: {
+					config: { prefix: 'updated-' },
+				},
+			},
+			{
+				name: 'update both name and config',
+				data: {
+					name: 'Updated Resolver',
+					config: { prefix: 'updated-' },
+				},
+			},
+			{
+				name: 'update with empty config',
+				data: {
+					name: 'Updated Resolver',
+					config: {},
+				},
+			},
+			{
+				name: 'update with complex config',
+				data: {
+					config: {
+						region: 'eu-west-1',
+						timeout: 5000,
+						nested: {
+							value: true,
+						},
+					},
+				},
+			},
+			{
+				name: 'empty update (all optional)',
+				data: {},
+			},
+			{
+				name: 'minimum name length',
+				data: {
+					name: 'A',
+				},
+			},
+		])('should succeed validation for $name', ({ data }) => {
+			const result = UpdateCredentialResolverDto.safeParse(data);
+
+			expect(result.success).toBe(true);
+			if (result.success) {
+				if (data.name !== undefined) {
+					expect(result.data.name).toBe(data.name);
+				}
+				if (data.config !== undefined) {
+					expect(result.data.config).toEqual(data.config);
+				}
+			}
+		});
+	});
+
+	describe('Invalid requests', () => {
+		test.each([
+			{
+				name: 'empty name',
+				data: {
+					name: '',
+				},
+				expectedErrorPath: ['name'],
+			},
+			{
+				name: 'whitespace-only name',
+				data: {
+					name: '   ',
+				},
+				expectedErrorPath: ['name'],
+			},
+			{
+				name: 'name too long (>255 chars)',
+				data: {
+					name: 'a'.repeat(256),
+				},
+				expectedErrorPath: ['name'],
+			},
+			{
+				name: 'config as string',
+				data: {
+					config: 'invalid',
+				},
+				expectedErrorPath: ['config'],
+			},
+			{
+				name: 'config as array',
+				data: {
+					config: [],
+				},
+				expectedErrorPath: ['config'],
+			},
+			{
+				name: 'config as null',
+				data: {
+					config: null,
+				},
+				expectedErrorPath: ['config'],
+			},
+			{
+				name: 'name as number',
+				data: {
+					name: 123,
+				},
+				expectedErrorPath: ['name'],
+			},
+			{
+				name: 'name as object',
+				data: {
+					name: { value: 'test' },
+				},
+				expectedErrorPath: ['name'],
+			},
+		])('should fail validation for $name', ({ data, expectedErrorPath }) => {
+			const result = UpdateCredentialResolverDto.safeParse(data);
+
+			expect(result.success).toBe(false);
+
+			if (expectedErrorPath && !result.success) {
+				expect(result.error.issues[0].path).toEqual(expectedErrorPath);
+			}
+		});
+	});
+
+	describe('Trimming', () => {
+		test('should trim name when provided', () => {
+			const result = UpdateCredentialResolverDto.safeParse({
+				name: '  Updated Resolver  ',
+			});
+
+			expect(result.success).toBe(true);
+			if (result.success) {
+				expect(result.data.name).toBe('Updated Resolver');
+			}
+		});
+
+		test('should not affect config', () => {
+			const result = UpdateCredentialResolverDto.safeParse({
+				config: { key: '  value with spaces  ' },
+			});
+
+			expect(result.success).toBe(true);
+			if (result.success) {
+				expect(result.data.config).toEqual({ key: '  value with spaces  ' });
+			}
+		});
+	});
+});
diff --git a/packages/@n8n/api-types/src/dto/credential-resolver/create-credential-resolver.dto.ts b/packages/@n8n/api-types/src/dto/credential-resolver/create-credential-resolver.dto.ts
new file mode 100644
index 00000000000..a1fc58f83d0
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/credential-resolver/create-credential-resolver.dto.ts
@@ -0,0 +1,13 @@
+import { Z } from 'zod-class';
+
+import {
+	credentialResolverNameSchema,
+	credentialResolverTypeSchema,
+	credentialResolverConfigSchema,
+} from '../../schemas/credential-resolver.schema';
+
+export class CreateCredentialResolverDto extends Z.class({
+	name: credentialResolverNameSchema,
+	type: credentialResolverTypeSchema,
+	config: credentialResolverConfigSchema,
+}) {}
diff --git a/packages/@n8n/api-types/src/dto/credential-resolver/update-credential-resolver.dto.ts b/packages/@n8n/api-types/src/dto/credential-resolver/update-credential-resolver.dto.ts
new file mode 100644
index 00000000000..442b35ee89d
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/credential-resolver/update-credential-resolver.dto.ts
@@ -0,0 +1,11 @@
+import { Z } from 'zod-class';
+
+import {
+	credentialResolverNameSchema,
+	credentialResolverConfigSchema,
+} from '../../schemas/credential-resolver.schema';
+
+export class UpdateCredentialResolverDto extends Z.class({
+	name: credentialResolverNameSchema.optional(),
+	config: credentialResolverConfigSchema.optional(),
+}) {}
diff --git a/packages/@n8n/api-types/src/dto/index.ts b/packages/@n8n/api-types/src/dto/index.ts
index 5b0cfec8718..b4d8ac15d26 100644
--- a/packages/@n8n/api-types/src/dto/index.ts
+++ b/packages/@n8n/api-types/src/dto/index.ts
@@ -12,6 +12,9 @@ export { BinaryDataSignedQueryDto } from './binary-data/binary-data-signed-query
 export { LoginRequestDto } from './auth/login-request.dto';
 export { ResolveSignupTokenQueryDto } from './auth/resolve-signup-token-query.dto';
 
+export { CreateCredentialResolverDto } from './credential-resolver/create-credential-resolver.dto';
+export { UpdateCredentialResolverDto } from './credential-resolver/update-credential-resolver.dto';
+
 export { OptionsRequestDto } from './dynamic-node-parameters/options-request.dto';
 export { ResourceLocatorRequestDto } from './dynamic-node-parameters/resource-locator-request.dto';
 export { ResourceMapperFieldsRequestDto } from './dynamic-node-parameters/resource-mapper-fields-request.dto';
diff --git a/packages/@n8n/api-types/src/index.ts b/packages/@n8n/api-types/src/index.ts
index 6a7b0c46aab..d686345c8ce 100644
--- a/packages/@n8n/api-types/src/index.ts
+++ b/packages/@n8n/api-types/src/index.ts
@@ -60,6 +60,11 @@ export type { SendWorkerStatusMessage } from './push/worker';
 export type { BannerName } from './schemas/banner-name.schema';
 export { ViewableMimeTypes } from './schemas/binary-data.schema';
 export { passwordSchema } from './schemas/password.schema';
+export {
+	credentialResolverSchema,
+	credentialResolversSchema,
+	type CredentialResolver,
+} from './schemas/credential-resolver.schema';
 
 export type {
 	ProjectType,
diff --git a/packages/@n8n/api-types/src/schemas/__tests__/credential-resolver.schema.test.ts b/packages/@n8n/api-types/src/schemas/__tests__/credential-resolver.schema.test.ts
new file mode 100644
index 00000000000..7a046b72784
--- /dev/null
+++ b/packages/@n8n/api-types/src/schemas/__tests__/credential-resolver.schema.test.ts
@@ -0,0 +1,261 @@
+import {
+	credentialResolverIdSchema,
+	credentialResolverNameSchema,
+	credentialResolverTypeSchema,
+	credentialResolverConfigSchema,
+	credentialResolverSchema,
+	credentialResolversSchema,
+} from '../credential-resolver.schema';
+
+describe('credential-resolver.schema', () => {
+	describe('credentialResolverIdSchema', () => {
+		test.each([
+			{ name: 'valid UUID', value: '550e8400-e29b-41d4-a716-446655440000', expected: true },
+			{ name: 'short ID', value: 'abc123', expected: true },
+			{ name: 'nanoid', value: 'V1StGXR8_Z5jdHi6B-myT', expected: true },
+			{ name: 'ID at max length (36 chars)', value: 'a'.repeat(36), expected: true },
+			{ name: 'ID too long (37 chars)', value: 'a'.repeat(37), expected: false },
+			{ name: 'empty ID', value: '', expected: true }, // zod string allows empty by default
+		])('should validate $name', ({ value, expected }) => {
+			const result = credentialResolverIdSchema.safeParse(value);
+			expect(result.success).toBe(expected);
+		});
+	});
+
+	describe('credentialResolverNameSchema', () => {
+		test.each([
+			{ name: 'valid name', value: 'Test Resolver', expected: true },
+			{ name: 'minimum length (1 char)', value: 'A', expected: true },
+			{ name: 'maximum length (255 chars)', value: 'a'.repeat(255), expected: true },
+			{ name: 'name with special chars', value: 'Test-Resolver_123', expected: true },
+			{ name: 'name with unicode', value: 'Tëst Rësölvër 🚀', expected: true },
+			{ name: 'empty name', value: '', expected: false },
+			{ name: 'whitespace-only name', value: '   ', expected: false },
+			{ name: 'name too long (256 chars)', value: 'a'.repeat(256), expected: false },
+		])('should validate $name', ({ value, expected }) => {
+			const result = credentialResolverNameSchema.safeParse(value);
+			expect(result.success).toBe(expected);
+		});
+
+		test('should trim whitespace', () => {
+			const result = credentialResolverNameSchema.safeParse('  Test Resolver  ');
+			expect(result.success).toBe(true);
+			if (result.success) {
+				expect(result.data).toBe('Test Resolver');
+			}
+		});
+	});
+
+	describe('credentialResolverTypeSchema', () => {
+		test.each([
+			{ name: 'valid type', value: 'credential-resolver.stub-1.0', expected: true },
+			{ name: 'simple type', value: 'simple', expected: true },
+			{ name: 'type with dots', value: 'resolver.aws.v2', expected: true },
+			{ name: 'minimum length (1 char)', value: 'A', expected: true },
+			{ name: 'maximum length (255 chars)', value: 'a'.repeat(255), expected: true },
+			{ name: 'empty type', value: '', expected: false },
+			{ name: 'whitespace-only type', value: '   ', expected: false },
+			{ name: 'type too long (256 chars)', value: 'a'.repeat(256), expected: false },
+		])('should validate $name', ({ value, expected }) => {
+			const result = credentialResolverTypeSchema.safeParse(value);
+			expect(result.success).toBe(expected);
+		});
+
+		test('should trim whitespace', () => {
+			const result = credentialResolverTypeSchema.safeParse('  credential-resolver.stub-1.0  ');
+			expect(result.success).toBe(true);
+			if (result.success) {
+				expect(result.data).toBe('credential-resolver.stub-1.0');
+			}
+		});
+	});
+
+	describe('credentialResolverConfigSchema', () => {
+		test.each([
+			{ name: 'empty object', value: {}, expected: true },
+			{ name: 'simple config', value: { prefix: 'test-' }, expected: true },
+			{
+				name: 'complex config',
+				value: {
+					region: 'us-east-1',
+					timeout: 5000,
+					nested: { value: true },
+				},
+				expected: true,
+			},
+			{
+				name: 'config with various types',
+				value: {
+					stringValue: 'value',
+					numberValue: 123,
+					booleanValue: true,
+					nullValue: null,
+					arrayValue: [1, 2, 3],
+					objectValue: { key: 'value' },
+				},
+				expected: true,
+			},
+			{ name: 'string instead of object', value: 'invalid', expected: false },
+			{ name: 'array instead of object', value: [], expected: false },
+			{ name: 'null instead of object', value: null, expected: false },
+			{ name: 'number instead of object', value: 123, expected: false },
+		])('should validate $name', ({ value, expected }) => {
+			const result = credentialResolverConfigSchema.safeParse(value);
+			expect(result.success).toBe(expected);
+		});
+	});
+
+	describe('credentialResolverSchema', () => {
+		const validResolver = {
+			id: 'resolver-123',
+			name: 'Test Resolver',
+			type: 'credential-resolver.stub-1.0',
+			config: 'encrypted-config-string',
+			decryptedConfig: { prefix: 'test-' },
+			createdAt: new Date('2024-01-01T00:00:00.000Z'),
+			updatedAt: new Date('2024-01-02T00:00:00.000Z'),
+		};
+
+		test('should validate complete resolver object', () => {
+			const result = credentialResolverSchema.safeParse(validResolver);
+			expect(result.success).toBe(true);
+		});
+
+		test('should allow missing optional decryptedConfig', () => {
+			const { decryptedConfig, ...resolverWithoutDecrypted } = validResolver;
+			const result = credentialResolverSchema.safeParse(resolverWithoutDecrypted);
+			expect(result.success).toBe(true);
+		});
+
+		test.each([
+			{
+				name: 'missing id',
+				data: { ...validResolver, id: undefined },
+				expectedErrorPath: ['id'],
+			},
+			{
+				name: 'missing name',
+				data: { ...validResolver, name: undefined },
+				expectedErrorPath: ['name'],
+			},
+			{
+				name: 'missing type',
+				data: { ...validResolver, type: undefined },
+				expectedErrorPath: ['type'],
+			},
+			{
+				name: 'missing config',
+				data: { ...validResolver, config: undefined },
+				expectedErrorPath: ['config'],
+			},
+			{
+				name: 'missing createdAt',
+				data: { ...validResolver, createdAt: undefined },
+				expectedErrorPath: ['createdAt'],
+			},
+			{
+				name: 'missing updatedAt',
+				data: { ...validResolver, updatedAt: undefined },
+				expectedErrorPath: ['updatedAt'],
+			},
+			{
+				name: 'invalid createdAt format',
+				data: { ...validResolver, createdAt: 'invalid-date' },
+				expectedErrorPath: ['createdAt'],
+			},
+			{
+				name: 'config as object instead of string',
+				data: { ...validResolver, config: { key: 'value' } },
+				expectedErrorPath: ['config'],
+			},
+		])('should fail validation for $name', ({ data, expectedErrorPath }) => {
+			const result = credentialResolverSchema.safeParse(data);
+			expect(result.success).toBe(false);
+			if (!result.success) {
+				expect(result.error.issues[0].path).toEqual(expectedErrorPath);
+			}
+		});
+
+		test('should accept date strings and coerce to Date', () => {
+			const resolverWithStringDates = {
+				...validResolver,
+				createdAt: '2024-01-01T00:00:00.000Z',
+				updatedAt: '2024-01-02T00:00:00.000Z',
+			};
+			const result = credentialResolverSchema.safeParse(resolverWithStringDates);
+			expect(result.success).toBe(true);
+			if (result.success) {
+				expect(result.data.createdAt).toBeInstanceOf(Date);
+				expect(result.data.updatedAt).toBeInstanceOf(Date);
+			}
+		});
+
+		test('should accept Date objects directly', () => {
+			const result = credentialResolverSchema.safeParse(validResolver);
+			expect(result.success).toBe(true);
+			if (result.success) {
+				expect(result.data.createdAt).toBeInstanceOf(Date);
+				expect(result.data.updatedAt).toBeInstanceOf(Date);
+			}
+		});
+	});
+
+	describe('credentialResolversSchema', () => {
+		const validResolver1 = {
+			id: 'resolver-1',
+			name: 'Test Resolver 1',
+			type: 'credential-resolver.stub-1.0',
+			config: 'encrypted-config-1',
+			createdAt: new Date('2024-01-01T00:00:00.000Z'),
+			updatedAt: new Date('2024-01-02T00:00:00.000Z'),
+		};
+
+		const validResolver2 = {
+			id: 'resolver-2',
+			name: 'Test Resolver 2',
+			type: 'credential-resolver.stub-2.0',
+			config: 'encrypted-config-2',
+			decryptedConfig: { prefix: 'test-' },
+			createdAt: new Date('2024-01-03T00:00:00.000Z'),
+			updatedAt: new Date('2024-01-04T00:00:00.000Z'),
+		};
+
+		test('should validate empty array', () => {
+			const result = credentialResolversSchema.safeParse([]);
+			expect(result.success).toBe(true);
+			if (result.success) {
+				expect(result.data).toEqual([]);
+			}
+		});
+
+		test('should validate array with single resolver', () => {
+			const result = credentialResolversSchema.safeParse([validResolver1]);
+			expect(result.success).toBe(true);
+			if (result.success) {
+				expect(result.data).toHaveLength(1);
+			}
+		});
+
+		test('should validate array with multiple resolvers', () => {
+			const result = credentialResolversSchema.safeParse([validResolver1, validResolver2]);
+			expect(result.success).toBe(true);
+			if (result.success) {
+				expect(result.data).toHaveLength(2);
+			}
+		});
+
+		test('should fail if any resolver is invalid', () => {
+			const invalidResolver = { ...validResolver1, name: '' };
+			const result = credentialResolversSchema.safeParse([validResolver1, invalidResolver]);
+			expect(result.success).toBe(false);
+			if (!result.success) {
+				expect(result.error.issues[0].path).toEqual([1, 'name']);
+			}
+		});
+
+		test('should fail for non-array input', () => {
+			const result = credentialResolversSchema.safeParse(validResolver1);
+			expect(result.success).toBe(false);
+		});
+	});
+});
diff --git a/packages/@n8n/api-types/src/schemas/credential-resolver.schema.ts b/packages/@n8n/api-types/src/schemas/credential-resolver.schema.ts
new file mode 100644
index 00000000000..8e9bad6d6d6
--- /dev/null
+++ b/packages/@n8n/api-types/src/schemas/credential-resolver.schema.ts
@@ -0,0 +1,20 @@
+import { z } from 'zod';
+
+export const credentialResolverIdSchema = z.string().max(36);
+export const credentialResolverNameSchema = z.string().trim().min(1).max(255);
+export const credentialResolverTypeSchema = z.string().trim().min(1).max(255);
+export const credentialResolverConfigSchema = z.record(z.unknown());
+
+export const credentialResolverSchema = z.object({
+	id: credentialResolverIdSchema,
+	name: credentialResolverNameSchema,
+	type: credentialResolverTypeSchema,
+	config: z.string(), // Encrypted config
+	decryptedConfig: credentialResolverConfigSchema.optional(),
+	createdAt: z.coerce.date(),
+	updatedAt: z.coerce.date(),
+});
+
+export const credentialResolversSchema = z.array(credentialResolverSchema);
+
+export type CredentialResolver = z.infer<typeof credentialResolverSchema>;
diff --git a/packages/@n8n/permissions/src/__tests__/__snapshots__/scope-information.test.ts.snap b/packages/@n8n/permissions/src/__tests__/__snapshots__/scope-information.test.ts.snap
index cea5aff1737..feafe00b87a 100644
--- a/packages/@n8n/permissions/src/__tests__/__snapshots__/scope-information.test.ts.snap
+++ b/packages/@n8n/permissions/src/__tests__/__snapshots__/scope-information.test.ts.snap
@@ -162,6 +162,12 @@ exports[`Scope Information ensure scopes are defined correctly 1`] = `
   "breakingChanges:*",
   "apiKey:manage",
   "apiKey:*",
+  "credentialResolver:create",
+  "credentialResolver:read",
+  "credentialResolver:update",
+  "credentialResolver:delete",
+  "credentialResolver:list",
+  "credentialResolver:*",
   "*",
 ]
 `;
diff --git a/packages/@n8n/permissions/src/constants.ee.ts b/packages/@n8n/permissions/src/constants.ee.ts
index 8f9d5f83f7e..1c7b9bed059 100644
--- a/packages/@n8n/permissions/src/constants.ee.ts
+++ b/packages/@n8n/permissions/src/constants.ee.ts
@@ -38,6 +38,7 @@ export const RESOURCES = {
 	chatHubAgent: [...DEFAULT_OPERATIONS] as const,
 	breakingChanges: ['list'] as const,
 	apiKey: ['manage'] as const,
+	credentialResolver: [...DEFAULT_OPERATIONS] as const,
 } as const;
 
 export const API_KEY_RESOURCES = {
diff --git a/packages/@n8n/permissions/src/roles/scopes/global-scopes.ee.ts b/packages/@n8n/permissions/src/roles/scopes/global-scopes.ee.ts
index 6c6910504f4..ad5905f64d7 100644
--- a/packages/@n8n/permissions/src/roles/scopes/global-scopes.ee.ts
+++ b/packages/@n8n/permissions/src/roles/scopes/global-scopes.ee.ts
@@ -113,6 +113,11 @@ export const GLOBAL_OWNER_SCOPES: Scope[] = [
 	'chatHubAgent:list',
 	'breakingChanges:list',
 	'apiKey:manage',
+	'credentialResolver:create',
+	'credentialResolver:read',
+	'credentialResolver:update',
+	'credentialResolver:delete',
+	'credentialResolver:list',
 ];
 
 export const GLOBAL_ADMIN_SCOPES = GLOBAL_OWNER_SCOPES.concat();
diff --git a/packages/@n8n/permissions/src/utilities/__tests__/get-resource-permissions.test.ts b/packages/@n8n/permissions/src/utilities/__tests__/get-resource-permissions.test.ts
index f37b702507b..fe1370706b5 100644
--- a/packages/@n8n/permissions/src/utilities/__tests__/get-resource-permissions.test.ts
+++ b/packages/@n8n/permissions/src/utilities/__tests__/get-resource-permissions.test.ts
@@ -43,6 +43,7 @@ describe('permissions', () => {
 			chatHubAgent: {},
 			breakingChanges: {},
 			apiKey: {},
+			credentialResolver: {},
 		});
 	});
 	it('getResourcePermissions', () => {
@@ -163,6 +164,7 @@ describe('permissions', () => {
 			apiKey: {
 				manage: true,
 			},
+			credentialResolver: {},
 		};
 
 		expect(getResourcePermissions(scopes)).toEqual(permissionRecord);
diff --git a/packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers.controller.ts b/packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers.controller.ts
new file mode 100644
index 00000000000..b519d063e79
--- /dev/null
+++ b/packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers.controller.ts
@@ -0,0 +1,143 @@
+import {
+	CreateCredentialResolverDto,
+	CredentialResolver,
+	credentialResolverSchema,
+	credentialResolversSchema,
+	UpdateCredentialResolverDto,
+} from '@n8n/api-types';
+import { AuthenticatedRequest } from '@n8n/db';
+import {
+	Body,
+	Delete,
+	Get,
+	GlobalScope,
+	Param,
+	Patch,
+	Post,
+	RestController,
+	CredentialResolverValidationError,
+} from '@n8n/decorators';
+import { Response } from 'express';
+
+import { BadRequestError } from '@/errors/response-errors/bad-request.error';
+import { InternalServerError } from '@/errors/response-errors/internal-server.error';
+import { NotFoundError } from '@/errors/response-errors/not-found.error';
+
+import { DynamicCredentialResolverNotFoundError } from './errors/credential-resolver-not-found.error';
+import { DynamicCredentialResolverService } from './services/credential-resolver.service';
+
+@RestController('/credential-resolvers')
+export class CredentialResolversController {
+	constructor(private readonly service: DynamicCredentialResolverService) {}
+
+	@Get('/')
+	@GlobalScope('credentialResolver:list')
+	async listResolvers(
+		_req: AuthenticatedRequest,
+		_res: Response,
+	): Promise<Array<CredentialResolver>> {
+		try {
+			return credentialResolversSchema.parse(await this.service.findAll());
+		} catch (e: unknown) {
+			if (e instanceof Error) {
+				throw new InternalServerError(e.message, e);
+			}
+			throw e;
+		}
+	}
+
+	@Post('/')
+	@GlobalScope('credentialResolver:create')
+	async createResolver(
+		_req: AuthenticatedRequest,
+		_res: Response,
+		@Body dto: CreateCredentialResolverDto,
+	): Promise<CredentialResolver> {
+		try {
+			const createdResolver = await this.service.create({
+				name: dto.name,
+				type: dto.type,
+				config: dto.config,
+			});
+			return credentialResolverSchema.parse(createdResolver);
+		} catch (e: unknown) {
+			if (e instanceof CredentialResolverValidationError) {
+				throw new BadRequestError(e.message);
+			}
+			if (e instanceof Error) {
+				throw new InternalServerError(e.message, e);
+			}
+			throw e;
+		}
+	}
+
+	@Get('/:id')
+	@GlobalScope('credentialResolver:read')
+	async getResolver(
+		_req: AuthenticatedRequest,
+		_res: Response,
+		@Param('id') id: string,
+	): Promise<CredentialResolver> {
+		try {
+			return credentialResolverSchema.parse(await this.service.findById(id));
+		} catch (e: unknown) {
+			if (e instanceof DynamicCredentialResolverNotFoundError) {
+				throw new NotFoundError(e.message);
+			}
+			if (e instanceof Error) {
+				throw new InternalServerError(e.message, e);
+			}
+			throw e;
+		}
+	}
+
+	@Patch('/:id')
+	@GlobalScope('credentialResolver:update')
+	async updateResolver(
+		_req: AuthenticatedRequest,
+		_res: Response,
+		@Param('id') id: string,
+		@Body dto: UpdateCredentialResolverDto,
+	): Promise<CredentialResolver> {
+		try {
+			return credentialResolverSchema.parse(
+				await this.service.update(id, {
+					name: dto.name,
+					config: dto.config,
+				}),
+			);
+		} catch (e: unknown) {
+			if (e instanceof DynamicCredentialResolverNotFoundError) {
+				throw new NotFoundError(e.message);
+			}
+			if (e instanceof CredentialResolverValidationError) {
+				throw new BadRequestError(e.message);
+			}
+			if (e instanceof Error) {
+				throw new InternalServerError(e.message, e);
+			}
+			throw e;
+		}
+	}
+
+	@Delete('/:id')
+	@GlobalScope('credentialResolver:delete')
+	async deleteResolver(
+		_req: AuthenticatedRequest,
+		_res: Response,
+		@Param('id') id: string,
+	): Promise<{ success: true }> {
+		try {
+			await this.service.delete(id);
+			return { success: true };
+		} catch (e: unknown) {
+			if (e instanceof DynamicCredentialResolverNotFoundError) {
+				throw new NotFoundError(e.message);
+			}
+			if (e instanceof Error) {
+				throw new InternalServerError(e.message, e);
+			}
+			throw e;
+		}
+	}
+}
diff --git a/packages/cli/src/modules/dynamic-credentials.ee/dynamic-credentials.module.ts b/packages/cli/src/modules/dynamic-credentials.ee/dynamic-credentials.module.ts
index 613d469ebaa..cf371bafefd 100644
--- a/packages/cli/src/modules/dynamic-credentials.ee/dynamic-credentials.module.ts
+++ b/packages/cli/src/modules/dynamic-credentials.ee/dynamic-credentials.module.ts
@@ -5,6 +5,7 @@ import { Container } from '@n8n/di';
 @BackendModule({ name: 'dynamic-credentials', licenseFlag: 'feat:externalSecrets' })
 export class DynamicCredentialsModule implements ModuleInterface {
 	async init() {
+		await import('./credential-resolvers.controller');
 		await import('./context-establishment-hooks');
 		await import('./credential-resolvers');
 		const { DynamicCredentialResolverRegistry } = await import('./services');
diff --git a/packages/cli/src/modules/dynamic-credentials.ee/services/credential-resolver.service.ts b/packages/cli/src/modules/dynamic-credentials.ee/services/credential-resolver.service.ts
index a72305b7965..72d9238cf96 100644
--- a/packages/cli/src/modules/dynamic-credentials.ee/services/credential-resolver.service.ts
+++ b/packages/cli/src/modules/dynamic-credentials.ee/services/credential-resolver.service.ts
@@ -58,7 +58,7 @@ export class DynamicCredentialResolverService {
 		const saved = await this.repository.save(resolver);
 		this.logger.debug(`Created credential resolver "${saved.name}" (${saved.id})`);
 
-		return saved;
+		return this.withDecryptedConfig(saved);
 	}
 
 	/**
diff --git a/packages/cli/test/integration/dynamic-credentials.ee/credential-resolvers.api.test.ts b/packages/cli/test/integration/dynamic-credentials.ee/credential-resolvers.api.test.ts
new file mode 100644
index 00000000000..0b07e657763
--- /dev/null
+++ b/packages/cli/test/integration/dynamic-credentials.ee/credential-resolvers.api.test.ts
@@ -0,0 +1,195 @@
+import { LicenseState } from '@n8n/backend-common';
+import { mockInstance } from '@n8n/backend-test-utils';
+import type { User } from '@n8n/db';
+import { GLOBAL_OWNER_ROLE, GLOBAL_MEMBER_ROLE } from '@n8n/db';
+import { Container } from '@n8n/di';
+import { mock } from 'jest-mock-extended';
+
+import { Telemetry } from '@/telemetry';
+import { DynamicCredentialResolverService } from '@/modules/dynamic-credentials.ee/services/credential-resolver.service';
+import { DynamicCredentialResolverRepository } from '@/modules/dynamic-credentials.ee/database/repositories/credential-resolver.repository';
+
+import { createUser } from '../shared/db/users';
+import type { SuperAgentTest } from '../shared/types';
+import * as utils from '../shared/utils/';
+
+mockInstance(Telemetry);
+
+const licenseMock = mock<LicenseState>();
+licenseMock.isLicensed.mockReturnValue(true);
+Container.set(LicenseState, licenseMock);
+
+const testServer = utils.setupTestServer({
+	endpointGroups: ['credentials'],
+	enabledFeatures: ['feat:externalSecrets'],
+	modules: ['dynamic-credentials'],
+});
+
+describe('Credential Resolvers API', () => {
+	let owner: User;
+	let member: User;
+	let ownerAgent: SuperAgentTest;
+	let memberAgent: SuperAgentTest;
+	let service: DynamicCredentialResolverService;
+	let repository: DynamicCredentialResolverRepository;
+
+	beforeAll(async () => {
+		owner = await createUser({ role: GLOBAL_OWNER_ROLE });
+		member = await createUser({ role: GLOBAL_MEMBER_ROLE });
+
+		ownerAgent = testServer.authAgentFor(owner);
+		memberAgent = testServer.authAgentFor(member);
+
+		service = Container.get(DynamicCredentialResolverService);
+		repository = Container.get(DynamicCredentialResolverRepository);
+	});
+
+	beforeEach(async () => {
+		await repository.delete({});
+	});
+
+	describe('GET /credential-resolvers', () => {
+		it('should return empty list when no resolvers exist', async () => {
+			const response = await ownerAgent.get('/credential-resolvers').expect(200);
+			expect(response.body.data).toEqual([]);
+		});
+
+		it('should list all resolvers', async () => {
+			// Create resolvers using service
+			await service.create({
+				name: 'Resolver 1',
+				type: 'credential-resolver.stub-1.0',
+				config: { prefix: 'test1-' },
+			});
+			await service.create({
+				name: 'Resolver 2',
+				type: 'credential-resolver.stub-1.0',
+				config: { prefix: 'test2-' },
+			});
+
+			const response = await ownerAgent.get('/credential-resolvers').expect(200);
+
+			expect(response.body.data).toHaveLength(2);
+			expect(response.body.data[0]).toMatchObject({
+				id: expect.any(String),
+				name: 'Resolver 1',
+				type: 'credential-resolver.stub-1.0',
+			});
+		});
+
+		it('should reject access for members', async () => {
+			await memberAgent.get('/credential-resolvers').expect(403);
+		});
+	});
+
+	describe('POST /credential-resolvers', () => {
+		it('should create a resolver', async () => {
+			const payload = {
+				name: 'Test Resolver',
+				type: 'credential-resolver.stub-1.0',
+				config: { prefix: 'test-' },
+			};
+
+			const response = await ownerAgent.post('/credential-resolvers').send(payload).expect(200);
+
+			expect(response.body.data).toMatchObject({
+				id: expect.any(String),
+				name: 'Test Resolver',
+				type: 'credential-resolver.stub-1.0',
+			});
+			expect(response.body.data.decryptedConfig).toEqual({ prefix: 'test-' });
+
+			// Verify it was actually created
+			const resolvers = await repository.find();
+			expect(resolvers).toHaveLength(1);
+		});
+
+		it('should reject unknown resolver type', async () => {
+			const payload = {
+				name: 'Test Resolver',
+				type: 'unknown-type',
+				config: {},
+			};
+
+			const response = await ownerAgent.post('/credential-resolvers').send(payload).expect(400);
+			expect(response.body.message).toContain('Unknown resolver type');
+		});
+
+		it('should reject access for members', async () => {
+			const payload = {
+				name: 'Test Resolver',
+				type: 'credential-resolver.stub-1.0',
+				config: { prefix: 'test-' },
+			};
+
+			await memberAgent.post('/credential-resolvers').send(payload).expect(403);
+		});
+	});
+
+	describe('GET /resolvers/:id', () => {
+		it('should return a specific resolver', async () => {
+			const resolver = await service.create({
+				name: 'Test Resolver',
+				type: 'credential-resolver.stub-1.0',
+				config: { prefix: 'test-' },
+			});
+
+			const response = await ownerAgent.get(`/credential-resolvers/${resolver.id}`).expect(200);
+
+			expect(response.body.data).toMatchObject({
+				id: resolver.id,
+				name: 'Test Resolver',
+				type: 'credential-resolver.stub-1.0',
+			});
+		});
+
+		it('should return 404 for non-existent resolver', async () => {
+			await ownerAgent.get('/credential-resolvers/non-existent-id').expect(404);
+		});
+	});
+
+	describe('PATCH /resolvers/:id', () => {
+		it('should update resolver name', async () => {
+			const resolver = await service.create({
+				name: 'Original Name',
+				type: 'credential-resolver.stub-1.0',
+				config: { prefix: 'test-' },
+			});
+
+			const response = await ownerAgent
+				.patch(`/credential-resolvers/${resolver.id}`)
+				.send({ name: 'Updated Name' })
+				.expect(200);
+
+			expect(response.body.data.name).toBe('Updated Name');
+		});
+
+		it('should return 404 for non-existent resolver', async () => {
+			await ownerAgent
+				.patch('/credential-resolvers/non-existent-id')
+				.send({ name: 'New Name' })
+				.expect(404);
+		});
+	});
+
+	describe('DELETE /resolvers/:id', () => {
+		it('should delete a resolver', async () => {
+			const resolver = await service.create({
+				name: 'Test Resolver',
+				type: 'credential-resolver.stub-1.0',
+				config: { prefix: 'test-' },
+			});
+
+			const response = await ownerAgent.delete(`/credential-resolvers/${resolver.id}`).expect(200);
+			expect(response.body.data).toEqual({ success: true });
+
+			// Verify it was actually deleted
+			const remaining = await repository.find();
+			expect(remaining).toHaveLength(0);
+		});
+
+		it('should return 404 for non-existent resolver', async () => {
+			await ownerAgent.delete('/credential-resolvers/non-existent-id').expect(404);
+		});
+	});
+});
diff --git a/packages/cli/test/integration/shared/types.ts b/packages/cli/test/integration/shared/types.ts
index 9b4e1d495be..d5afbe47696 100644
--- a/packages/cli/test/integration/shared/types.ts
+++ b/packages/cli/test/integration/shared/types.ts
@@ -48,7 +48,13 @@ type EndpointGroup =
 	| 'third-party-licenses'
 	| 'mcp';
 
-type ModuleName = 'insights' | 'external-secrets' | 'community-packages' | 'data-table' | 'mcp';
+type ModuleName =
+	| 'insights'
+	| 'external-secrets'
+	| 'community-packages'
+	| 'data-table'
+	| 'mcp'
+	| 'dynamic-credentials';
 
 export interface SetupProps {
 	endpointGroups?: EndpointGroup[];
diff --git a/packages/frontend/editor-ui/src/app/stores/rbac.store.ts b/packages/frontend/editor-ui/src/app/stores/rbac.store.ts
index 93abc502349..3c0847fbfeb 100644
--- a/packages/frontend/editor-ui/src/app/stores/rbac.store.ts
+++ b/packages/frontend/editor-ui/src/app/stores/rbac.store.ts
@@ -49,6 +49,7 @@ export const useRBACStore = defineStore(STORES.RBAC, () => {
 		chatHubAgent: {},
 		breakingChanges: {},
 		apiKey: {},
+		credentialResolver: {},
 	});
 
 	function addGlobalRole(role: Role) {

From bbdc99176b1fc8fd5ed909636359e19dcd01d8e4 Mon Sep 17 00:00:00 2001
From: Mutasem Aldmour <4711238+mutdmour@users.noreply.github.com>
Date: Mon, 8 Dec 2025 13:26:44 +0100
Subject: [PATCH 125/167] feat: Add and update telemetry events (#22762)

---
 .../__tests__/telemetry-event-relay.test.ts   |   4 +
 .../cli/src/events/maps/relay.event-map.ts    |   2 +
 .../events/relays/telemetry.event-relay.ts    |  39 ++-
 .../cli/src/workflows/workflow.request.ts     |   1 +
 .../cli/src/workflows/workflow.service.ts     |   4 +
 .../cli/src/workflows/workflows.controller.ts |   3 +-
 .../@n8n/rest-api-client/src/api/workflows.ts |   1 +
 .../app/composables/useRunWorkflow.test.ts    |  13 +
 .../src/app/composables/useWorkflowSaving.ts  |   8 +
 .../ai/assistant/builder.store.test.ts        | 128 ++++++++
 .../features/ai/assistant/builder.store.ts    |  90 +++++-
 .../components/Agent/ExecuteMessage.test.ts   |  46 ++-
 .../components/Agent/ExecuteMessage.vue       |   9 +
 .../components/Agent/NodeIssueItem.test.ts    |  19 ++
 .../components/Agent/NodeIssueItem.vue        |   7 +
 .../composables/useBuilderTodos.test.ts       |  37 +++
 .../assistant/composables/useBuilderTodos.ts  |   8 +
 .../components/ParameterInput.test.ts         | 121 +++++++
 .../parameters/components/ParameterInput.vue  |  12 +
 packages/workflow/src/telemetry-helpers.ts    |  94 +++++-
 packages/workflow/src/workflow-diff.ts        |  74 ++++-
 .../workflow/test/telemetry-helpers.test.ts   | 191 +++++++++++
 packages/workflow/test/workflow-diff.test.ts  | 300 +++++++++++++++++-
 23 files changed, 1195 insertions(+), 16 deletions(-)

diff --git a/packages/cli/src/events/__tests__/telemetry-event-relay.test.ts b/packages/cli/src/events/__tests__/telemetry-event-relay.test.ts
index 19b9dac30bd..b48832c6c5d 100644
--- a/packages/cli/src/events/__tests__/telemetry-event-relay.test.ts
+++ b/packages/cli/src/events/__tests__/telemetry-event-relay.test.ts
@@ -882,6 +882,10 @@ describe('TelemetryEventRelay', () => {
 				num_tags: 0,
 				public_api: false,
 				sharing_role: undefined,
+				meta: undefined, // workflow.meta is undefined in mock
+				workflow_edited_no_pos: false,
+				credential_edited: false,
+				ai_builder_assisted: false,
 			});
 		});
 
diff --git a/packages/cli/src/events/maps/relay.event-map.ts b/packages/cli/src/events/maps/relay.event-map.ts
index b2c3414eb7a..26a2813f7ef 100644
--- a/packages/cli/src/events/maps/relay.event-map.ts
+++ b/packages/cli/src/events/maps/relay.event-map.ts
@@ -86,6 +86,8 @@ export type RelayEventMap = {
 		user: UserLike;
 		workflow: IWorkflowDb;
 		publicApi: boolean;
+		previousWorkflow?: IWorkflowDb;
+		aiBuilderAssisted?: boolean;
 	};
 
 	'workflow-activated': {
diff --git a/packages/cli/src/events/relays/telemetry.event-relay.ts b/packages/cli/src/events/relays/telemetry.event-relay.ts
index 4428103c883..61610342110 100644
--- a/packages/cli/src/events/relays/telemetry.event-relay.ts
+++ b/packages/cli/src/events/relays/telemetry.event-relay.ts
@@ -10,7 +10,7 @@ import { PROJECT_OWNER_ROLE_SLUG } from '@n8n/permissions';
 import { snakeCase } from 'change-case';
 import { BinaryDataConfig, InstanceSettings } from 'n8n-core';
 import type { ExecutionStatus, INodesGraphResult, ITelemetryTrackProperties } from 'n8n-workflow';
-import { TelemetryHelpers } from 'n8n-workflow';
+import { hasCredentialChanges, hasNonPositionalChanges, TelemetryHelpers } from 'n8n-workflow';
 import os from 'node:os';
 import { get as pslGet } from 'psl';
 
@@ -621,7 +621,13 @@ export class TelemetryEventRelay extends EventRelay {
 		});
 	}
 
-	private async workflowSaved({ user, workflow, publicApi }: RelayEventMap['workflow-saved']) {
+	private async workflowSaved({
+		user,
+		workflow,
+		publicApi,
+		previousWorkflow,
+		aiBuilderAssisted,
+	}: RelayEventMap['workflow-saved']) {
 		const isCloudDeployment = this.globalConfig.deployment.type === 'cloud';
 
 		const { nodeGraph } = TelemetryHelpers.generateNodesGraph(workflow, this.nodeTypes, {
@@ -654,6 +660,18 @@ export class TelemetryEventRelay extends EventRelay {
 			(note) => note.overlapping,
 		).length;
 
+		let workflowEditedNoPos = false;
+		let credentialEdited = false;
+		if (previousWorkflow) {
+			workflowEditedNoPos = hasNonPositionalChanges(
+				previousWorkflow.nodes,
+				workflow.nodes,
+				previousWorkflow.connections,
+				workflow.connections,
+			);
+			credentialEdited = hasCredentialChanges(previousWorkflow.nodes, workflow.nodes);
+		}
+
 		this.telemetry.track('User saved workflow', {
 			user_id: user.id,
 			workflow_id: workflow.id,
@@ -665,6 +683,9 @@ export class TelemetryEventRelay extends EventRelay {
 			public_api: publicApi,
 			sharing_role: userRole,
 			meta: JSON.stringify(workflow.meta),
+			workflow_edited_no_pos: workflowEditedNoPos,
+			credential_edited: credentialEdited,
+			ai_builder_assisted: aiBuilderAssisted ?? false,
 		});
 	}
 
@@ -813,13 +834,17 @@ export class TelemetryEventRelay extends EventRelay {
 							manualExecEventProperties.is_managed = credential.isManaged;
 						}
 					}
+					const destinationNodeName = runData.data.startData?.destinationNode.nodeName;
 					const telemetryPayload: ITelemetryTrackProperties = {
 						...manualExecEventProperties,
-						node_type: TelemetryHelpers.getNodeTypeForName(
-							workflow,
-							runData.data.startData?.destinationNode.nodeName,
-						)?.type,
-						node_id: nodeGraphResult.nameIndices[runData.data.startData?.destinationNode.nodeName],
+						node_type: TelemetryHelpers.getNodeTypeForName(workflow, destinationNodeName)?.type,
+						node_id: nodeGraphResult.nameIndices[destinationNodeName],
+						node_role: TelemetryHelpers.getNodeRole(
+							destinationNodeName,
+							workflow.connections,
+							this.nodeTypes,
+							workflow.nodes,
+						),
 					};
 
 					this.telemetry.track('Manual node exec finished', telemetryPayload);
diff --git a/packages/cli/src/workflows/workflow.request.ts b/packages/cli/src/workflows/workflow.request.ts
index 2d63c8f654c..738e027237d 100644
--- a/packages/cli/src/workflows/workflow.request.ts
+++ b/packages/cli/src/workflows/workflow.request.ts
@@ -27,6 +27,7 @@ export declare namespace WorkflowRequest {
 		projectId: string;
 		parentFolderId?: string;
 		uiContext?: string;
+		aiBuilderAssisted?: boolean;
 	}>;
 
 	// TODO: Use a discriminator when CAT-1809 lands
diff --git a/packages/cli/src/workflows/workflow.service.ts b/packages/cli/src/workflows/workflow.service.ts
index d9c683b4702..5fae59af30f 100644
--- a/packages/cli/src/workflows/workflow.service.ts
+++ b/packages/cli/src/workflows/workflow.service.ts
@@ -226,6 +226,7 @@ export class WorkflowService {
 			forceSave?: boolean;
 			publicApi?: boolean;
 			publishIfActive?: boolean;
+			aiBuilderAssisted?: boolean;
 		} = {},
 	): Promise<WorkflowEntity> {
 		const {
@@ -234,6 +235,7 @@ export class WorkflowService {
 			forceSave = false,
 			publicApi = false,
 			publishIfActive = false,
+			aiBuilderAssisted = false,
 		} = options;
 		const workflow = await this.workflowFinderService.findWorkflowForUser(
 			workflowId,
@@ -414,6 +416,8 @@ export class WorkflowService {
 			user,
 			workflow: updatedWorkflow,
 			publicApi,
+			previousWorkflow: workflow,
+			aiBuilderAssisted,
 		});
 
 		// Activate workflow if requested, or
diff --git a/packages/cli/src/workflows/workflows.controller.ts b/packages/cli/src/workflows/workflows.controller.ts
index f528b645ea2..b4b7e7cdc7f 100644
--- a/packages/cli/src/workflows/workflows.controller.ts
+++ b/packages/cli/src/workflows/workflows.controller.ts
@@ -420,7 +420,7 @@ export class WorkflowsController {
 		const forceSave = req.query.forceSave === 'true';
 
 		let updateData = new WorkflowEntity();
-		const { tags, parentFolderId, ...rest } = req.body;
+		const { tags, parentFolderId, aiBuilderAssisted, ...rest } = req.body;
 
 		// TODO: Add zod validation for entire `rest` object before assigning to `updateData`
 		if (
@@ -445,6 +445,7 @@ export class WorkflowsController {
 			tagIds: tags,
 			parentFolderId,
 			forceSave: isSharingEnabled ? forceSave : true,
+			aiBuilderAssisted,
 		});
 
 		const scopes = await this.workflowService.getWorkflowScopes(req.user, workflowId);
diff --git a/packages/frontend/@n8n/rest-api-client/src/api/workflows.ts b/packages/frontend/@n8n/rest-api-client/src/api/workflows.ts
index 264f3e9b7f7..b1244541f32 100644
--- a/packages/frontend/@n8n/rest-api-client/src/api/workflows.ts
+++ b/packages/frontend/@n8n/rest-api-client/src/api/workflows.ts
@@ -38,6 +38,7 @@ export interface WorkflowDataUpdate {
 	meta?: WorkflowMetadata;
 	parentFolderId?: string;
 	uiContext?: string;
+	aiBuilderAssisted?: boolean;
 }
 
 export interface WorkflowDataCreate extends WorkflowDataUpdate {
diff --git a/packages/frontend/editor-ui/src/app/composables/useRunWorkflow.test.ts b/packages/frontend/editor-ui/src/app/composables/useRunWorkflow.test.ts
index a7d06f45527..c34fed6301f 100644
--- a/packages/frontend/editor-ui/src/app/composables/useRunWorkflow.test.ts
+++ b/packages/frontend/editor-ui/src/app/composables/useRunWorkflow.test.ts
@@ -45,6 +45,19 @@ vi.mock('@/app/stores/workflows.store', () => {
 		nodesIssuesExist: false,
 		executionWaitingForWebhook: false,
 		workflowObject: { id: '123' } as Workflow,
+		workflowValidationIssues: [],
+		workflow: {
+			nodes: [],
+			id: '',
+			name: '',
+			active: false,
+			isArchived: false,
+			createdAt: '',
+			updatedAt: '',
+			connections: {},
+			versionId: '',
+			activeVersionId: null,
+		},
 		getNodeByName: vi
 			.fn()
 			.mockImplementation((name) =>
diff --git a/packages/frontend/editor-ui/src/app/composables/useWorkflowSaving.ts b/packages/frontend/editor-ui/src/app/composables/useWorkflowSaving.ts
index 0fe169ff1e0..842c5cd17a5 100644
--- a/packages/frontend/editor-ui/src/app/composables/useWorkflowSaving.ts
+++ b/packages/frontend/editor-ui/src/app/composables/useWorkflowSaving.ts
@@ -30,6 +30,7 @@ import { useTemplatesStore } from '@/features/workflows/templates/templates.stor
 import { useFocusPanelStore } from '@/app/stores/focusPanel.store';
 import { injectWorkflowState, type WorkflowState } from '@/app/composables/useWorkflowState';
 import { getResourcePermissions } from '@n8n/permissions';
+import { useBuilderStore } from '@/features/ai/assistant/builder.store';
 
 export function useWorkflowSaving({
 	router,
@@ -47,6 +48,7 @@ export function useWorkflowSaving({
 	const telemetry = useTelemetry();
 	const nodeHelpers = useNodeHelpers();
 	const templatesStore = useTemplatesStore();
+	const builderStore = useBuilderStore();
 	const { getWorkflowDataToSave, checkConflictingWebhooks, getWorkflowProjectRole } =
 		useWorkflowHelpers();
 
@@ -220,6 +222,9 @@ export function useWorkflowSaving({
 
 			workflowDataRequest.versionId = workflowsStore.workflowVersionId;
 
+			// Check if AI Builder made edits since last save
+			workflowDataRequest.aiBuilderAssisted = builderStore.getAiBuilderMadeEdits();
+
 			const deactivateReason = await getWorkflowDeactivationInfo(
 				currentWorkflow,
 				workflowDataRequest,
@@ -255,6 +260,9 @@ export function useWorkflowSaving({
 			uiStore.removeActiveAction('workflowSaving');
 			void useExternalHooks().run('workflow.afterUpdate', { workflowData });
 
+			// Reset AI Builder edits flag only after successful save
+			builderStore.resetAiBuilderMadeEdits();
+
 			return true;
 		} catch (error) {
 			console.error(error);
diff --git a/packages/frontend/editor-ui/src/features/ai/assistant/builder.store.test.ts b/packages/frontend/editor-ui/src/features/ai/assistant/builder.store.test.ts
index 5acabfed3a8..d956b66b4d0 100644
--- a/packages/frontend/editor-ui/src/features/ai/assistant/builder.store.test.ts
+++ b/packages/frontend/editor-ui/src/features/ai/assistant/builder.store.test.ts
@@ -430,6 +430,20 @@ describe('AI Builder store', () => {
 		builderStore.resetBuilderChat();
 		expect(builderStore.chatMessages).toEqual([]);
 		expect(builderStore.builderThinkingMessage).toBeUndefined();
+
+		// Verify last_user_message_id is reset (tracked via trackWorkflowBuilderJourney)
+		track.mockClear();
+		builderStore.trackWorkflowBuilderJourney('user_clicked_todo');
+		expect(track).toHaveBeenCalledWith('Workflow builder journey', {
+			workflow_id: 'test-workflow-id',
+			session_id: expect.any(String),
+			event_type: 'user_clicked_todo',
+		});
+		// Should NOT have last_user_message_id after reset
+		expect(track).not.toHaveBeenCalledWith(
+			'Workflow builder journey',
+			expect.objectContaining({ last_user_message_id: expect.any(String) }),
+		);
 	});
 
 	describe('isAIBuilderEnabled computed property', () => {
@@ -1709,6 +1723,120 @@ describe('AI Builder store', () => {
 		});
 	});
 
+	describe('trackWorkflowBuilderJourney', () => {
+		it('tracks event with workflow_id, session_id, and event_type (without last_user_message_id when no message sent)', () => {
+			const builderStore = useBuilderStore();
+
+			builderStore.trackWorkflowBuilderJourney('user_clicked_todo');
+
+			expect(track).toHaveBeenCalledWith('Workflow builder journey', {
+				workflow_id: 'test-workflow-id',
+				session_id: expect.any(String),
+				event_type: 'user_clicked_todo',
+			});
+		});
+
+		it('includes last_user_message_id after user sends a message', async () => {
+			const builderStore = useBuilderStore();
+
+			apiSpy.mockImplementationOnce((_ctx, _payload, onMessage, onDone) => {
+				onMessage({
+					messages: [{ type: 'message', role: 'assistant', text: 'Hello!' }],
+					sessionId: 'test-session',
+				});
+				onDone();
+			});
+
+			builderStore.sendChatMessage({ text: 'test' });
+			await vi.waitFor(() => expect(builderStore.streaming).toBe(false));
+
+			track.mockClear();
+			builderStore.trackWorkflowBuilderJourney('user_clicked_todo');
+
+			expect(track).toHaveBeenCalledWith('Workflow builder journey', {
+				workflow_id: 'test-workflow-id',
+				session_id: expect.any(String),
+				event_type: 'user_clicked_todo',
+				last_user_message_id: expect.any(String),
+			});
+		});
+
+		it('includes event_properties when provided', () => {
+			const builderStore = useBuilderStore();
+
+			builderStore.trackWorkflowBuilderJourney('user_clicked_todo', {
+				node_type: 'n8n-nodes-base.httpRequest',
+				type: 'parameters',
+			});
+
+			expect(track).toHaveBeenCalledWith('Workflow builder journey', {
+				workflow_id: 'test-workflow-id',
+				session_id: expect.any(String),
+				event_type: 'user_clicked_todo',
+				event_properties: {
+					node_type: 'n8n-nodes-base.httpRequest',
+					type: 'parameters',
+				},
+			});
+		});
+
+		it('omits event_properties when empty object provided', () => {
+			const builderStore = useBuilderStore();
+
+			builderStore.trackWorkflowBuilderJourney('field_focus_placeholder_in_ndv', {});
+
+			expect(track).toHaveBeenCalledWith('Workflow builder journey', {
+				workflow_id: 'test-workflow-id',
+				session_id: expect.any(String),
+				event_type: 'field_focus_placeholder_in_ndv',
+			});
+		});
+
+		it('omits event_properties when not provided', () => {
+			const builderStore = useBuilderStore();
+
+			builderStore.trackWorkflowBuilderJourney('no_placeholder_values_left');
+
+			expect(track).toHaveBeenCalledWith('Workflow builder journey', {
+				workflow_id: 'test-workflow-id',
+				session_id: expect.any(String),
+				event_type: 'no_placeholder_values_left',
+			});
+		});
+
+		it('includes both event_properties and last_user_message_id when both are present', async () => {
+			const builderStore = useBuilderStore();
+
+			apiSpy.mockImplementationOnce((_ctx, _payload, onMessage, onDone) => {
+				onMessage({
+					messages: [{ type: 'message', role: 'assistant', text: 'Hello!' }],
+					sessionId: 'test-session',
+				});
+				onDone();
+			});
+
+			builderStore.sendChatMessage({ text: 'test' });
+			await vi.waitFor(() => expect(builderStore.streaming).toBe(false));
+
+			track.mockClear();
+			builderStore.trackWorkflowBuilderJourney('user_clicked_todo', {
+				node_type: 'n8n-nodes-base.httpRequest',
+				type: 'parameters',
+			});
+
+			expect(track).toHaveBeenCalledWith('Workflow builder journey', {
+				workflow_id: 'test-workflow-id',
+				session_id: expect.any(String),
+				event_type: 'user_clicked_todo',
+				event_properties: {
+					node_type: 'n8n-nodes-base.httpRequest',
+					type: 'parameters',
+				},
+				last_user_message_id: expect.any(String),
+			});
+		});
+	});
+
 	describe('abortStreaming telemetry', () => {
 		it('tracks end of response with aborted flag when aborting', () => {
 			const builderStore = useBuilderStore();
diff --git a/packages/frontend/editor-ui/src/features/ai/assistant/builder.store.ts b/packages/frontend/editor-ui/src/features/ai/assistant/builder.store.ts
index 6af43da868c..06daf43febf 100644
--- a/packages/frontend/editor-ui/src/features/ai/assistant/builder.store.ts
+++ b/packages/frontend/editor-ui/src/features/ai/assistant/builder.store.ts
@@ -24,7 +24,7 @@ import { useBuilderTodos, type TodosTrackingPayload } from './composables/useBui
 import { useRootStore } from '@n8n/stores/useRootStore';
 import type { WorkflowDataUpdate } from '@n8n/rest-api-client/api/workflows';
 import pick from 'lodash/pick';
-import { type ITelemetryTrackProperties, type INodeExecutionData, jsonParse } from 'n8n-workflow';
+import { type INodeExecutionData, type ITelemetryTrackProperties, jsonParse } from 'n8n-workflow';
 import { useToast } from '@/app/composables/useToast';
 import { injectWorkflowState } from '@/app/composables/useWorkflowState';
 import { useNodeTypesStore } from '@/app/stores/nodeTypes.store';
@@ -37,6 +37,27 @@ import { dedupe } from 'n8n-workflow';
 const INFINITE_CREDITS = -1;
 export const ENABLED_VIEWS = BUILDER_ENABLED_VIEWS;
 
+/**
+ * Event types for the Workflow builder journey telemetry event
+ */
+export type WorkflowBuilderJourneyEventType =
+	| 'user_clicked_todo'
+	| 'field_focus_placeholder_in_ndv'
+	| 'no_placeholder_values_left';
+
+interface WorkflowBuilderJourneyEventProperties {
+	node_type?: string;
+	type?: string;
+}
+
+interface WorkflowBuilderJourneyPayload extends ITelemetryTrackProperties {
+	workflow_id: string;
+	session_id: string;
+	event_type: WorkflowBuilderJourneyEventType;
+	event_properties?: WorkflowBuilderJourneyEventProperties;
+	last_user_message_id?: string;
+}
+
 interface EndOfStreamingTrackingPayload {
 	userMessageId: string;
 	startWorkflowJson: string;
@@ -75,8 +96,14 @@ export const useBuilderStore = defineStore(STORES.BUILDER, () => {
 		error: 0,
 	});
 
+	// Track whether AI Builder made edits since last save (resets after each save)
+	const aiBuilderMadeEdits = ref(false);
+
 	const currentStreamingMessage = ref<EndOfStreamingTrackingPayload | undefined>();
 
+	// Track the last user message ID for telemetry
+	const lastUserMessageId = ref<string | undefined>();
+
 	// Store dependencies
 	const settings = useSettingsStore();
 	const rootStore = useRootStore();
@@ -155,6 +182,7 @@ export const useBuilderStore = defineStore(STORES.BUILDER, () => {
 		chatMessages.value = clearMessages();
 		builderThinkingMessage.value = undefined;
 		initialGeneration.value = false;
+		lastUserMessageId.value = undefined;
 	}
 
 	function incrementManualExecutionStats(type: 'success' | 'error') {
@@ -391,6 +419,7 @@ export const useBuilderStore = defineStore(STORES.BUILDER, () => {
 			initialGeneration.value = options.initialGeneration;
 		}
 		const userMessageId = generateMessageId();
+		lastUserMessageId.value = userMessageId;
 		const currentWorkflowJson = getWorkflowSnapshot();
 
 		currentStreamingMessage.value = {
@@ -627,6 +656,9 @@ export const useBuilderStore = defineStore(STORES.BUILDER, () => {
 			workflowData.pinData = restoredPinData;
 		}
 
+		// Mark that AI Builder made edits (will be reset after save)
+		aiBuilderMadeEdits.value = true;
+
 		return {
 			success: true,
 			workflowData,
@@ -639,6 +671,22 @@ export const useBuilderStore = defineStore(STORES.BUILDER, () => {
 		return JSON.stringify(pick(workflowsStore.workflow, ['nodes', 'connections']));
 	}
 
+	/**
+	 * Returns true if AI Builder made edits since the last save.
+	 * Use resetAiBuilderMadeEdits() after successful save to clear the flag.
+	 */
+	function getAiBuilderMadeEdits(): boolean {
+		return aiBuilderMadeEdits.value;
+	}
+
+	/**
+	 * Resets the AI Builder edits flag.
+	 * Should only be called after a successful workflow save.
+	 */
+	function resetAiBuilderMadeEdits(): void {
+		aiBuilderMadeEdits.value = false;
+	}
+
 	function updateBuilderCredits(quota?: number, claimed?: number) {
 		creditsQuota.value = quota;
 		creditsClaimed.value = claimed;
@@ -691,6 +739,43 @@ export const useBuilderStore = defineStore(STORES.BUILDER, () => {
 		},
 	);
 
+	/**
+	 * Tracks workflow builder journey events for telemetry
+	 * @param eventType - The type of event being tracked
+	 * @param eventProperties - Optional event-specific attributes
+	 */
+	function trackWorkflowBuilderJourney(
+		eventType: WorkflowBuilderJourneyEventType,
+		eventProperties?: WorkflowBuilderJourneyEventProperties,
+	) {
+		const payload: WorkflowBuilderJourneyPayload = {
+			workflow_id: workflowsStore.workflowId,
+			session_id: trackingSessionId.value,
+			event_type: eventType,
+		};
+
+		if (eventProperties && Object.keys(eventProperties).length > 0) {
+			payload.event_properties = eventProperties;
+		}
+
+		if (lastUserMessageId.value) {
+			payload.last_user_message_id = lastUserMessageId.value;
+		}
+
+		telemetry.track('Workflow builder journey', payload);
+	}
+
+	watch(
+		workflowTodos,
+		(newTodos, oldTodos) => {
+			// Only track if we had todos before and now we don't
+			if (oldTodos && oldTodos.length > 0 && newTodos.length === 0) {
+				trackWorkflowBuilderJourney('no_placeholder_values_left');
+			}
+		},
+		{ deep: true },
+	);
+
 	// Public API
 	return {
 		// State
@@ -722,6 +807,9 @@ export const useBuilderStore = defineStore(STORES.BUILDER, () => {
 		updateBuilderCredits,
 		getRunningTools,
 		fetchSessionsMetadata,
+		trackWorkflowBuilderJourney,
+		getAiBuilderMadeEdits,
+		resetAiBuilderMadeEdits,
 		incrementManualExecutionStats,
 		resetManualExecutionStats,
 	};
diff --git a/packages/frontend/editor-ui/src/features/ai/assistant/components/Agent/ExecuteMessage.test.ts b/packages/frontend/editor-ui/src/features/ai/assistant/components/Agent/ExecuteMessage.test.ts
index 022146d61fe..300d09a530f 100644
--- a/packages/frontend/editor-ui/src/features/ai/assistant/components/Agent/ExecuteMessage.test.ts
+++ b/packages/frontend/editor-ui/src/features/ai/assistant/components/Agent/ExecuteMessage.test.ts
@@ -18,6 +18,7 @@ import { useBuilderStore } from '../../builder.store';
 const workflowValidationIssuesRef = ref<
 	Array<{ node: string; type: string; value: string | string[] }>
 >([]);
+const workflowTodosRef = ref<Array<{ node: string; type: string; value: string | string[] }>>([]);
 const executionWaitingForWebhookRef = ref(false);
 const selectedTriggerNodeNameRef = ref<string | undefined>(undefined);
 const hasNoCreditsRemainingRef = ref(false);
@@ -68,7 +69,8 @@ const renderComponent = createComponentRenderer(ExecuteMessage);
 
 vi.mock('./NodeIssueItem.vue', () => ({
 	default: {
-		template: '<li />',
+		template: '<li data-test-id="node-issue-item" @click="$emit(\'click\')" />',
+		emits: ['click'],
 	},
 }));
 
@@ -84,6 +86,7 @@ describe('ExecuteMessage', () => {
 		runWorkflowMock.mockReset();
 		showMessageMock.mockReset();
 		workflowValidationIssuesRef.value = [];
+		workflowTodosRef.value = [];
 		executionWaitingForWebhookRef.value = false;
 		selectedTriggerNodeNameRef.value = undefined;
 		hasNoCreditsRemainingRef.value = false;
@@ -139,14 +142,18 @@ describe('ExecuteMessage', () => {
 		Object.defineProperty(builderStore, 'hasNoCreditsRemaining', {
 			get: () => hasNoCreditsRemainingRef.value,
 		});
+		Object.defineProperty(builderStore, 'workflowTodos', {
+			get: () => workflowTodosRef.value,
+		});
+		builderStore.trackWorkflowBuilderJourney = vi.fn();
 
 		renderExecuteMessage = () => renderComponent({ pinia });
 	});
 
 	it('disables execution when validation issues exist', () => {
-		workflowValidationIssuesRef.value = [
-			{ node: 'Start Trigger', type: 'parameters', value: 'Missing field' },
-		];
+		const issue = { node: 'Start Trigger', type: 'parameters', value: 'Missing field' };
+		workflowValidationIssuesRef.value = [issue];
+		workflowTodosRef.value = [issue];
 
 		const { getAllByTestId, getByText } = renderExecuteMessage();
 
@@ -159,6 +166,9 @@ describe('ExecuteMessage', () => {
 		workflowNodes[0].parameters = {
 			url: '<__PLACEHOLDER_VALUE__API endpoint URL__>',
 		};
+		workflowTodosRef.value = [
+			{ node: 'Start Trigger', type: 'parameters', value: 'Fill in placeholder value' },
+		];
 
 		const { getAllByTestId, getByText } = renderExecuteMessage();
 
@@ -327,6 +337,10 @@ describe('ExecuteMessage', () => {
 				url: ['Some other validation error'],
 			},
 		};
+		workflowTodosRef.value = [
+			{ node: 'Start Trigger', type: 'parameters', value: 'Some other validation error' },
+			{ node: 'Start Trigger', type: 'parameters', value: 'Fill in placeholder value' },
+		];
 
 		const { getAllByTestId, container } = renderExecuteMessage();
 		const button = getAllByTestId('execute-workflow-button')[0] as HTMLButtonElement;
@@ -337,4 +351,28 @@ describe('ExecuteMessage', () => {
 		// Should have both the existing issue and the placeholder issue
 		expect(issueItems.length).toBeGreaterThan(0);
 	});
+
+	it('tracks user_clicked_todo when clicking on an issue item', async () => {
+		const todoIssue = { node: 'HTTP Request', type: 'parameters', value: 'Missing URL' };
+		workflowTodosRef.value = [todoIssue];
+		workflowNodes.push({
+			id: '2',
+			name: 'HTTP Request',
+			type: 'n8n-nodes-base.httpRequest',
+			position: [100, 0],
+			parameters: {},
+			typeVersion: 1,
+			issues: {},
+		});
+
+		const { getAllByTestId } = renderExecuteMessage();
+		const issueItem = getAllByTestId('node-issue-item')[0];
+
+		await fireEvent.click(issueItem);
+
+		expect(builderStore.trackWorkflowBuilderJourney).toHaveBeenCalledWith('user_clicked_todo', {
+			node_type: 'n8n-nodes-base.httpRequest',
+			type: 'parameters',
+		});
+	});
 });
diff --git a/packages/frontend/editor-ui/src/features/ai/assistant/components/Agent/ExecuteMessage.vue b/packages/frontend/editor-ui/src/features/ai/assistant/components/Agent/ExecuteMessage.vue
index 41bc7e216ef..7e0faf96c23 100644
--- a/packages/frontend/editor-ui/src/features/ai/assistant/components/Agent/ExecuteMessage.vue
+++ b/packages/frontend/editor-ui/src/features/ai/assistant/components/Agent/ExecuteMessage.vue
@@ -16,6 +16,7 @@ import { useToast } from '@/app/composables/useToast';
 import { N8nTooltip } from '@n8n/design-system';
 import { nextTick } from 'vue';
 import { useBuilderStore } from '@/features/ai/assistant/builder.store';
+import type { WorkflowValidationIssue } from '@/Interface';
 
 interface Emits {
 	/** Emitted when workflow execution completes */
@@ -141,6 +142,13 @@ function scrollIntoView() {
 	});
 }
 
+function trackBuilderPlaceholders(issue: WorkflowValidationIssue) {
+	builderStore.trackWorkflowBuilderJourney('user_clicked_todo', {
+		node_type: workflowsStore.getNodeByName(issue.node)?.type,
+		type: issue.type,
+	});
+}
+
 onMounted(scrollIntoView);
 
 onBeforeUnmount(() => {
@@ -173,6 +181,7 @@ onBeforeUnmount(() => {
 					:issue="issue"
 					:get-node-type="getNodeTypeByName"
 					:format-issue-message="formatIssueMessage"
+					@click="() => trackBuilderPlaceholders(issue)"
 				/>
 			</TransitionGroup>
 		</template>
diff --git a/packages/frontend/editor-ui/src/features/ai/assistant/components/Agent/NodeIssueItem.test.ts b/packages/frontend/editor-ui/src/features/ai/assistant/components/Agent/NodeIssueItem.test.ts
index fa5a07cda11..07e7617a42f 100644
--- a/packages/frontend/editor-ui/src/features/ai/assistant/components/Agent/NodeIssueItem.test.ts
+++ b/packages/frontend/editor-ui/src/features/ai/assistant/components/Agent/NodeIssueItem.test.ts
@@ -63,4 +63,23 @@ describe('NodeIssueItem', () => {
 		await fireEvent.click(getByLabelText('Edit Linear node'));
 		expect(ndvStore.setActiveNodeName).toHaveBeenCalledWith('Linear', 'other');
 	});
+
+	it('emits click event when item is clicked', async () => {
+		const nodeType = {
+			name: 'n8n-nodes-base.linear',
+			displayName: 'Linear',
+		} as INodeTypeDescription;
+		const { getByLabelText, emitted } = renderComponent({
+			pinia,
+			props: {
+				issue: { node: 'Linear', type: 'parameters', value: 'Missing API key' },
+				getNodeType: vi.fn(() => nodeType),
+				formatIssueMessage,
+			},
+		});
+
+		await fireEvent.click(getByLabelText('Edit Linear node'));
+
+		expect(emitted().click).toHaveLength(1);
+	});
 });
diff --git a/packages/frontend/editor-ui/src/features/ai/assistant/components/Agent/NodeIssueItem.vue b/packages/frontend/editor-ui/src/features/ai/assistant/components/Agent/NodeIssueItem.vue
index 6f60bc6d136..6a85dd22fa3 100644
--- a/packages/frontend/editor-ui/src/features/ai/assistant/components/Agent/NodeIssueItem.vue
+++ b/packages/frontend/editor-ui/src/features/ai/assistant/components/Agent/NodeIssueItem.vue
@@ -19,12 +19,19 @@ interface Props {
 	formatIssueMessage: (value: WorkflowNodeIssue['value']) => string;
 }
 
+interface Emits {
+	click: [];
+}
+
 const props = defineProps<Props>();
+const emit = defineEmits<Emits>();
 
 const ndvStore = useNDVStore();
 
 function handleEditClick() {
 	ndvStore.setActiveNodeName(props.issue.node, 'other');
+
+	emit('click');
 }
 </script>
 
diff --git a/packages/frontend/editor-ui/src/features/ai/assistant/composables/useBuilderTodos.test.ts b/packages/frontend/editor-ui/src/features/ai/assistant/composables/useBuilderTodos.test.ts
index 63c772d0820..a54e551b193 100644
--- a/packages/frontend/editor-ui/src/features/ai/assistant/composables/useBuilderTodos.test.ts
+++ b/packages/frontend/editor-ui/src/features/ai/assistant/composables/useBuilderTodos.test.ts
@@ -3,6 +3,7 @@ import {
 	extractPlaceholderLabel,
 	findPlaceholderDetails,
 	formatPlaceholderPath,
+	isPlaceholderValue,
 } from './useBuilderTodos';
 
 describe('useBuilderTodos', () => {
@@ -180,4 +181,40 @@ describe('useBuilderTodos', () => {
 			expect(formatPlaceholderPath(['matrix', '[0]', '[1]'])).toBe('matrix[0][1]');
 		});
 	});
+
+	describe('isPlaceholderValue', () => {
+		it('returns true for placeholder values', () => {
+			expect(isPlaceholderValue('<__PLACEHOLDER_VALUE__API endpoint URL__>')).toBe(true);
+			expect(isPlaceholderValue('<__PLACEHOLDER_VALUE__label__>')).toBe(true);
+			expect(isPlaceholderValue('<__PLACEHOLDER_VALUE____>')).toBe(true);
+		});
+
+		it('returns false for non-placeholder strings', () => {
+			expect(isPlaceholderValue('regular string')).toBe(false);
+			expect(isPlaceholderValue('')).toBe(false);
+			expect(isPlaceholderValue('https://api.example.com')).toBe(false);
+			expect(isPlaceholderValue('={{ $json.field }}')).toBe(false);
+		});
+
+		it('returns false for malformed placeholders missing suffix', () => {
+			// Has prefix but missing suffix - should be false
+			expect(isPlaceholderValue('<__PLACEHOLDER_VALUE__missing suffix')).toBe(false);
+			expect(isPlaceholderValue('<__PLACEHOLDER_VALUE__some text without end')).toBe(false);
+		});
+
+		it('returns false for malformed placeholders missing prefix', () => {
+			// Has suffix but missing prefix - should be false
+			expect(isPlaceholderValue('missing prefix__>')).toBe(false);
+			expect(isPlaceholderValue('some text without start__>')).toBe(false);
+		});
+
+		it('returns false for non-string values', () => {
+			expect(isPlaceholderValue(123)).toBe(false);
+			expect(isPlaceholderValue(null)).toBe(false);
+			expect(isPlaceholderValue(undefined)).toBe(false);
+			expect(isPlaceholderValue({ key: 'value' })).toBe(false);
+			expect(isPlaceholderValue(['array'])).toBe(false);
+			expect(isPlaceholderValue(true)).toBe(false);
+		});
+	});
 });
diff --git a/packages/frontend/editor-ui/src/features/ai/assistant/composables/useBuilderTodos.ts b/packages/frontend/editor-ui/src/features/ai/assistant/composables/useBuilderTodos.ts
index ef26bbdbe72..eb1549481dc 100644
--- a/packages/frontend/editor-ui/src/features/ai/assistant/composables/useBuilderTodos.ts
+++ b/packages/frontend/editor-ui/src/features/ai/assistant/composables/useBuilderTodos.ts
@@ -70,6 +70,14 @@ export function formatPlaceholderPath(path: string[]): string {
 		.join('');
 }
 
+/**
+ * Checks if a value is a placeholder value
+ */
+export function isPlaceholderValue(value: unknown): boolean {
+	if (typeof value !== 'string') return false;
+	return value.startsWith(PLACEHOLDER_PREFIX) && value.endsWith(PLACEHOLDER_SUFFIX);
+}
+
 /**
  * Composable for managing workflow todos (validation issues and placeholders)
  * used by the AI builder.
diff --git a/packages/frontend/editor-ui/src/features/ndv/parameters/components/ParameterInput.test.ts b/packages/frontend/editor-ui/src/features/ndv/parameters/components/ParameterInput.test.ts
index 705d99106ce..4bc38f6d5b6 100644
--- a/packages/frontend/editor-ui/src/features/ndv/parameters/components/ParameterInput.test.ts
+++ b/packages/frontend/editor-ui/src/features/ndv/parameters/components/ParameterInput.test.ts
@@ -61,6 +61,9 @@ beforeEach(() => {
 	mockNdvState = getNdvStateMock();
 	mockNodeTypesState = getNodeTypesStateMock();
 	mockCompletionResult = {};
+	mockBuilderState.trackWorkflowBuilderJourney.mockClear();
+	mockIsPlaceholderValue.mockClear();
+	mockBuilderState.isAIBuilderEnabled = true;
 });
 
 vi.mock('@/features/ndv/shared/ndv.store', () => {
@@ -95,6 +98,25 @@ vi.mock('vue-router', () => {
 	};
 });
 
+const mockBuilderState = {
+	trackWorkflowBuilderJourney: vi.fn(),
+	isAIBuilderEnabled: true,
+};
+
+vi.mock('@/features/ai/assistant/builder.store', () => {
+	return {
+		useBuilderStore: vi.fn(() => mockBuilderState),
+	};
+});
+
+const mockIsPlaceholderValue = vi.fn();
+
+vi.mock('@/features/ai/assistant/composables/useBuilderTodos', () => {
+	return {
+		isPlaceholderValue: (value: unknown) => mockIsPlaceholderValue(value),
+	};
+});
+
 const renderComponent = createComponentRenderer(ParameterInput, {
 	pinia: createTestingPinia(),
 });
@@ -758,4 +780,103 @@ describe('ParameterInput.vue', () => {
 			expect(rendered.queryByTestId('ndv-input-panel')).not.toBeInTheDocument();
 		});
 	});
+
+	describe('placeholder tracking', () => {
+		it('tracks field_focus_placeholder_in_ndv when focusing placeholder value', async () => {
+			mockIsPlaceholderValue.mockReturnValue(true);
+			mockNdvState = {
+				...getNdvStateMock(),
+				activeNode: {
+					id: faker.string.uuid(),
+					name: 'Test Node',
+					parameters: {},
+					position: [0, 0],
+					type: 'n8n-nodes-base.httpRequest',
+					typeVersion: 1,
+				},
+			};
+
+			const rendered = renderComponent({
+				props: {
+					path: 'url',
+					parameter: createTestNodeProperties({ name: 'url', type: 'string' }),
+					modelValue: '<__PLACEHOLDER_VALUE__API URL__>',
+				},
+			});
+
+			await nextTick();
+			const input = rendered.container.querySelector('input');
+			if (input) {
+				await fireEvent.focus(input);
+			}
+
+			expect(mockBuilderState.trackWorkflowBuilderJourney).toHaveBeenCalledWith(
+				'field_focus_placeholder_in_ndv',
+				{ node_type: 'n8n-nodes-base.httpRequest' },
+			);
+		});
+
+		it('does not track when value is not a placeholder', async () => {
+			mockIsPlaceholderValue.mockReturnValue(false);
+			mockNdvState = {
+				...getNdvStateMock(),
+				activeNode: {
+					id: faker.string.uuid(),
+					name: 'Test Node',
+					parameters: {},
+					position: [0, 0],
+					type: 'n8n-nodes-base.httpRequest',
+					typeVersion: 1,
+				},
+			};
+
+			const rendered = renderComponent({
+				props: {
+					path: 'url',
+					parameter: createTestNodeProperties({ name: 'url', type: 'string' }),
+					modelValue: 'https://api.example.com',
+				},
+			});
+
+			await nextTick();
+			const input = rendered.container.querySelector('input');
+			if (input) {
+				await fireEvent.focus(input);
+			}
+
+			expect(mockBuilderState.trackWorkflowBuilderJourney).not.toHaveBeenCalled();
+		});
+
+		it('does not track when AI builder is disabled', async () => {
+			mockIsPlaceholderValue.mockReturnValue(true);
+			mockBuilderState.isAIBuilderEnabled = false;
+			mockNdvState = {
+				...getNdvStateMock(),
+				activeNode: {
+					id: faker.string.uuid(),
+					name: 'Test Node',
+					parameters: {},
+					position: [0, 0],
+					type: 'n8n-nodes-base.httpRequest',
+					typeVersion: 1,
+				},
+			};
+
+			const rendered = renderComponent({
+				props: {
+					path: 'url',
+					parameter: createTestNodeProperties({ name: 'url', type: 'string' }),
+					modelValue: '<__PLACEHOLDER_VALUE__API URL__>',
+				},
+			});
+
+			await nextTick();
+			const input = rendered.container.querySelector('input');
+			if (input) {
+				await fireEvent.focus(input);
+			}
+
+			expect(mockBuilderState.trackWorkflowBuilderJourney).not.toHaveBeenCalled();
+		});
+	});
 });
diff --git a/packages/frontend/editor-ui/src/features/ndv/parameters/components/ParameterInput.vue b/packages/frontend/editor-ui/src/features/ndv/parameters/components/ParameterInput.vue
index d32c082127f..0ceb95b929a 100644
--- a/packages/frontend/editor-ui/src/features/ndv/parameters/components/ParameterInput.vue
+++ b/packages/frontend/editor-ui/src/features/ndv/parameters/components/ParameterInput.vue
@@ -95,10 +95,12 @@ import ExperimentalEmbeddedNdvMapper from '@/features/workflows/canvas/experimen
 import { useExperimentalNdvStore } from '@/features/workflows/canvas/experimental/experimentalNdv.store';
 import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
 import { getParameterDisplayableOptions } from '@/app/utils/nodes/nodeTransforms';
+import { useBuilderStore } from '@/features/ai/assistant/builder.store';
 
 import { ElColorPicker, ElDatePicker, ElDialog, ElSwitch } from 'element-plus';
 import { N8nIcon, N8nInput, N8nInputNumber, N8nOption, N8nSelect } from '@n8n/design-system';
 import { injectWorkflowState } from '@/app/composables/useWorkflowState';
+import { isPlaceholderValue } from '@/features/ai/assistant/composables/useBuilderTodos';
 type Picker = { $emit: (arg0: string, arg1: Date) => void };
 
 type Props = {
@@ -165,6 +167,7 @@ const uiStore = useUIStore();
 const focusPanelStore = useFocusPanelStore();
 const experimentalNdvStore = useExperimentalNdvStore();
 const projectsStore = useProjectsStore();
+const builderStore = useBuilderStore();
 
 const expressionLocalResolveCtx = inject(ExpressionLocalResolveContextSymbol, undefined);
 
@@ -801,6 +804,14 @@ function selectInput() {
 	}
 }
 
+function trackBuilderPlaceholders() {
+	if (node.value && isPlaceholderValue(props.modelValue) && builderStore.isAIBuilderEnabled) {
+		builderStore.trackWorkflowBuilderJourney('field_focus_placeholder_in_ndv', {
+			node_type: node.value.type,
+		});
+	}
+}
+
 async function setFocus() {
 	if (['json'].includes(props.parameter.type) && getTypeOption('alwaysOpenEditWindow')) {
 		displayEditDialog();
@@ -830,6 +841,7 @@ async function setFocus() {
 	}
 
 	emit('focus');
+	trackBuilderPlaceholders();
 }
 
 function rgbaToHex(value: string): string | null {
diff --git a/packages/workflow/src/telemetry-helpers.ts b/packages/workflow/src/telemetry-helpers.ts
index 551adc0c589..81d78d32305 100644
--- a/packages/workflow/src/telemetry-helpers.ts
+++ b/packages/workflow/src/telemetry-helpers.ts
@@ -28,6 +28,7 @@ import { ApplicationError } from '@n8n/errors';
 import type { NodeApiError } from './errors/node-api.error';
 import type {
 	IConnection,
+	IConnections,
 	INode,
 	INodeNameIndex,
 	INodesGraph,
@@ -42,7 +43,7 @@ import type {
 	INodeParameterResourceLocator,
 } from './interfaces';
 import { NodeConnectionTypes } from './interfaces';
-import { getNodeParameters } from './node-helpers';
+import { getNodeParameters, isSubNodeType } from './node-helpers';
 import { jsonParse } from './utils';
 import { DEFAULT_EVALUATION_METRIC } from './evaluation-helpers';
 
@@ -808,3 +809,94 @@ export function extractLastExecutedNodeStructuredOutputErrorInfo(
 
 	return info;
 }
+
+export type NodeRole = 'trigger' | 'terminal' | 'internal';
+
+/**
+ * Determines the role of a node in a workflow based on its connections.
+ *
+ * @param nodeName - The name of the node to check
+ * @param connections - The workflow connections (connectionsBySourceNode format)
+ * @param nodeTypes - The node types registry
+ * @param nodes - The workflow nodes
+ * @returns The role of the node:
+ *   - 'trigger': Has no incoming main connections and is not a subnode
+ *   - 'terminal': Has no outgoing connections
+ *   - 'internal': Has both incoming and outgoing connections, or is a subnode
+ */
+export function getNodeRole(
+	nodeName: string,
+	connections: IConnections,
+	nodeTypes: INodeTypes,
+	nodes: INode[],
+): NodeRole {
+	// partial executions of tools get a special name
+	if (nodeName === 'PartialExecutionToolExecutor') {
+		return 'internal';
+	}
+
+	// Check if node is a subnode based on its type description
+	const node = nodes.find((n) => n.name === nodeName);
+	const nodeTypeDescription = node
+		? (nodeTypes.getByNameAndVersion(node.type, node.typeVersion)?.description ?? null)
+		: null;
+	const isSubnode = isSubNodeType(nodeTypeDescription);
+
+	// Subnodes are always internal (they connect via AI connection types, not main)
+	if (isSubnode) {
+		return 'internal';
+	}
+
+	const hasOutgoingConnections = hasOutgoing(nodeName, connections);
+	const hasIncomingMainConnections = hasIncomingMain(nodeName, connections);
+
+	// A trigger has no incoming main connections
+	if (!hasIncomingMainConnections) {
+		return 'trigger';
+	}
+
+	// A terminal node has no outgoing connections
+	if (!hasOutgoingConnections) {
+		return 'terminal';
+	}
+
+	// Otherwise it's internal
+	return 'internal';
+}
+
+function hasOutgoing(nodeName: string, connections: IConnections): boolean {
+	const mainConnections = connections[nodeName]?.[NodeConnectionTypes.Main];
+	if (!mainConnections) {
+		return false;
+	}
+
+	for (const outputIndex of mainConnections) {
+		if (outputIndex && outputIndex.length > 0) {
+			return true;
+		}
+	}
+
+	return false;
+}
+
+function hasIncomingMain(nodeName: string, connections: IConnections): boolean {
+	// Check all source nodes to see if any connect to this node via main connection
+	for (const sourceNode of Object.keys(connections)) {
+		const sourceConnections = connections[sourceNode];
+		const mainConnections = sourceConnections?.[NodeConnectionTypes.Main];
+
+		if (!mainConnections) continue;
+
+		for (const outputIndex of mainConnections) {
+			if (!outputIndex) continue;
+
+			for (const conn of outputIndex) {
+				if (conn.node === nodeName) {
+					return true;
+				}
+			}
+		}
+	}
+
+	return false;
+}
diff --git a/packages/workflow/src/workflow-diff.ts b/packages/workflow/src/workflow-diff.ts
index a4a23752886..f9ce63e44f2 100644
--- a/packages/workflow/src/workflow-diff.ts
+++ b/packages/workflow/src/workflow-diff.ts
@@ -1,6 +1,7 @@
 import isEqual from 'lodash/isEqual';
 import pick from 'lodash/pick';
-import type { INode, IWorkflowBase } from '.';
+
+import type { IConnections, INode, IWorkflowBase } from '.';
 
 export type DiffableNode = Pick<INode, 'id' | 'parameters' | 'name'>;
 export type DiffableWorkflow<N extends DiffableNode = DiffableNode> = {
@@ -260,3 +261,74 @@ export function groupWorkflows<W extends IWorkflowBase = IWorkflowBase>(
 
 	return diffs;
 }
+
+/**
+ * Checks if workflows have non-positional differences (changes to nodes or connections,
+ * excluding position changes).
+ * Returns true if there are meaningful changes, false if only positions changed.
+ */
+export function hasNonPositionalChanges(
+	oldNodes: INode[],
+	newNodes: INode[],
+	oldConnections: IConnections,
+	newConnections: IConnections,
+): boolean {
+	// Check for node changes (compareNodes already excludes position)
+	const nodesDiff = compareWorkflowsNodes(oldNodes, newNodes);
+	for (const diff of nodesDiff.values()) {
+		if (diff.status !== NodeDiffStatus.Eq) {
+			return true;
+		}
+	}
+
+	// Check for connection changes (connections don't have position data)
+	if (!isEqual(oldConnections, newConnections)) {
+		return true;
+	}
+
+	return false;
+}
+
+/**
+ * Checks if any credential IDs changed between old and new workflow nodes.
+ * Compares node by node - returns true if for any node:
+ * - A credential was added (new credential type not in old node)
+ * - A credential was removed (old credential type not in new node)
+ * - A credential was changed (same credential type but different credential ID)
+ */
+export function hasCredentialChanges(oldNodes: INode[], newNodes: INode[]): boolean {
+	const newNodesMap = new Map(newNodes.map((node) => [node.id, node]));
+
+	for (const oldNode of oldNodes) {
+		const newNode = newNodesMap.get(oldNode.id);
+
+		// Skip nodes that were deleted - deletion is not a credential change
+		if (!newNode) continue;
+
+		const oldCreds = oldNode.credentials ?? {};
+		const newCreds = newNode.credentials ?? {};
+
+		const oldCredTypes = Object.keys(oldCreds);
+		const newCredTypes = Object.keys(newCreds);
+
+		// Check for removed credentials (in old but not in new)
+		for (const credType of oldCredTypes) {
+			if (!(credType in newCreds)) {
+				return true; // Credential removed
+			}
+			// Check for changed credentials (same type but different ID)
+			if (oldCreds[credType]?.id !== newCreds[credType]?.id) {
+				return true; // Credential changed
+			}
+		}
+
+		// Check for added credentials (in new but not in old)
+		for (const credType of newCredTypes) {
+			if (!(credType in oldCreds)) {
+				return true; // Credential added
+			}
+		}
+	}
+
+	return false;
+}
diff --git a/packages/workflow/test/telemetry-helpers.test.ts b/packages/workflow/test/telemetry-helpers.test.ts
index d6e51ad2715..48dbdc9bdb3 100644
--- a/packages/workflow/test/telemetry-helpers.test.ts
+++ b/packages/workflow/test/telemetry-helpers.test.ts
@@ -6,8 +6,10 @@ import type { NodeTypes } from './node-types';
 import { STICKY_NODE_TYPE } from '../src/constants';
 import { ApplicationError, ExpressionError, NodeApiError } from '../src/errors';
 import type {
+	IConnections,
 	INode,
 	INodeTypeDescription,
+	INodeTypes,
 	IRun,
 	IRunData,
 	NodeConnectionType,
@@ -23,6 +25,7 @@ import {
 	generateNodesGraph,
 	getDomainBase,
 	getDomainPath,
+	getNodeRole,
 	resolveAIMetrics,
 	resolveVectorStoreMetrics,
 	userInInstanceRanOutOfFreeAiCredits,
@@ -3306,3 +3309,191 @@ describe('extractLastExecutedNodeStructuredOutputErrorInfo', () => {
 		});
 	});
 });
+
+describe('getNodeRole', () => {
+	const makeNode = (name: string, type: string, typeVersion = 1): INode => ({
+		id: `${name}-id`,
+		name,
+		type,
+		typeVersion,
+		position: [0, 0],
+		parameters: {},
+	});
+
+	describe('trigger role', () => {
+		it('should return trigger for node with no incoming main connections', () => {
+			const nodes = [
+				makeNode('Trigger', 'n8n-nodes-base.manualTrigger'),
+				makeNode('Set', 'n8n-nodes-base.set'),
+			];
+
+			const connections: IConnections = {
+				Trigger: {
+					[NodeConnectionTypes.Main]: [[{ node: 'Set', type: NodeConnectionTypes.Main, index: 0 }]],
+				},
+			};
+
+			const result = getNodeRole('Trigger', connections, nodeTypes, nodes);
+			expect(result).toBe('trigger');
+		});
+
+		it('should return trigger for isolated node with no connections', () => {
+			const nodes = [makeNode('Trigger', 'n8n-nodes-base.manualTrigger')];
+
+			const connections: IConnections = {};
+
+			const result = getNodeRole('Trigger', connections, nodeTypes, nodes);
+			expect(result).toBe('trigger');
+		});
+	});
+
+	describe('terminal role', () => {
+		it('should return terminal for node with incoming but no outgoing connections', () => {
+			const nodes = [
+				makeNode('Trigger', 'n8n-nodes-base.manualTrigger'),
+				makeNode('Set', 'n8n-nodes-base.set'),
+			];
+
+			const connections: IConnections = {
+				Trigger: {
+					[NodeConnectionTypes.Main]: [[{ node: 'Set', type: NodeConnectionTypes.Main, index: 0 }]],
+				},
+			};
+
+			const result = getNodeRole('Set', connections, nodeTypes, nodes);
+			expect(result).toBe('terminal');
+		});
+	});
+
+	describe('internal role', () => {
+		it('should return internal for node with both incoming and outgoing connections', () => {
+			const nodes = [
+				makeNode('Trigger', 'n8n-nodes-base.manualTrigger'),
+				makeNode('Middle', 'n8n-nodes-base.set'),
+				makeNode('End', 'n8n-nodes-base.set'),
+			];
+
+			const connections: IConnections = {
+				Trigger: {
+					[NodeConnectionTypes.Main]: [
+						[{ node: 'Middle', type: NodeConnectionTypes.Main, index: 0 }],
+					],
+				},
+				Middle: {
+					[NodeConnectionTypes.Main]: [[{ node: 'End', type: NodeConnectionTypes.Main, index: 0 }]],
+				},
+			};
+
+			const result = getNodeRole('Middle', connections, nodeTypes, nodes);
+			expect(result).toBe('internal');
+		});
+
+		it('should return internal for subnode even without main connections', () => {
+			const nodes = [
+				makeNode('Agent', '@n8n/n8n-nodes-langchain.agent'),
+				makeNode('Wikipedia', '@n8n/n8n-nodes-langchain.toolWikipedia'),
+			];
+
+			const connections: IConnections = {
+				Wikipedia: {
+					[NodeConnectionTypes.AiTool]: [
+						[{ node: 'Agent', type: NodeConnectionTypes.AiTool, index: 0 }],
+					],
+				},
+			};
+
+			const result = getNodeRole('Wikipedia', connections, nodeTypes, nodes);
+			expect(result).toBe('internal');
+		});
+
+		it('should return internal for calculator tool subnode', () => {
+			const nodes = [
+				makeNode('Agent', '@n8n/n8n-nodes-langchain.agent'),
+				makeNode('Calculator', '@n8n/n8n-nodes-langchain.toolCalculator'),
+			];
+
+			const connections: IConnections = {
+				Calculator: {
+					[NodeConnectionTypes.AiTool]: [
+						[{ node: 'Agent', type: NodeConnectionTypes.AiTool, index: 0 }],
+					],
+				},
+			};
+
+			const result = getNodeRole('Calculator', connections, nodeTypes, nodes);
+			expect(result).toBe('internal');
+		});
+
+		it('should return internal for PartialExecutionToolExecutor', () => {
+			const nodes: INode[] = [];
+			const connections: IConnections = {};
+
+			const result = getNodeRole('PartialExecutionToolExecutor', connections, nodeTypes, nodes);
+			expect(result).toBe('internal');
+		});
+	});
+
+	describe('edge cases', () => {
+		it('should return trigger for node not in connections', () => {
+			const nodes = [makeNode('Isolated', 'n8n-nodes-base.set')];
+			const connections: IConnections = {};
+
+			const result = getNodeRole('Isolated', connections, nodeTypes, nodes);
+			expect(result).toBe('trigger');
+		});
+
+		it('should handle node with empty output arrays', () => {
+			const nodes = [
+				makeNode('Trigger', 'n8n-nodes-base.manualTrigger'),
+				makeNode('Set', 'n8n-nodes-base.set'),
+			];
+
+			const connections: IConnections = {
+				Trigger: {
+					[NodeConnectionTypes.Main]: [[{ node: 'Set', type: NodeConnectionTypes.Main, index: 0 }]],
+				},
+				Set: {
+					[NodeConnectionTypes.Main]: [[]],
+				},
+			};
+
+			const result = getNodeRole('Set', connections, nodeTypes, nodes);
+			expect(result).toBe('terminal');
+		});
+
+		it('should handle multiple output branches', () => {
+			const nodes = [
+				makeNode('Trigger', 'n8n-nodes-base.manualTrigger'),
+				makeNode('Set1', 'n8n-nodes-base.set'),
+				makeNode('TrueBranch', 'n8n-nodes-base.set'),
+				makeNode('FalseBranch', 'n8n-nodes-base.set'),
+			];
+
+			const connections: IConnections = {
+				Trigger: {
+					[NodeConnectionTypes.Main]: [
+						[{ node: 'Set1', type: NodeConnectionTypes.Main, index: 0 }],
+					],
+				},
+				Set1: {
+					[NodeConnectionTypes.Main]: [
+						[{ node: 'TrueBranch', type: NodeConnectionTypes.Main, index: 0 }],
+						[{ node: 'FalseBranch', type: NodeConnectionTypes.Main, index: 0 }],
+					],
+				},
+			};
+
+			const result = getNodeRole('Set1', connections, nodeTypes, nodes);
+			expect(result).toBe('internal');
+		});
+
+		it('should handle node not found in nodes array', () => {
+			const nodes = [makeNode('Trigger', 'n8n-nodes-base.manualTrigger')];
+			const connections: IConnections = {};
+
+			// Node 'NotInArray' is not in the nodes array
+			const result = getNodeRole('NotInArray', connections, nodeTypes, nodes);
+			expect(result).toBe('trigger');
+		});
+	});
+});
diff --git a/packages/workflow/test/workflow-diff.test.ts b/packages/workflow/test/workflow-diff.test.ts
index 301f37c45da..912dc37a362 100644
--- a/packages/workflow/test/workflow-diff.test.ts
+++ b/packages/workflow/test/workflow-diff.test.ts
@@ -1,10 +1,12 @@
 import { mock } from 'vitest-mock-extended';
 
-import { type INodeParameters, type IWorkflowBase } from '../src';
+import { type IConnections, type INode, type INodeParameters, type IWorkflowBase } from '../src';
 import {
 	compareNodes,
 	compareWorkflowsNodes,
 	groupWorkflows,
+	hasCredentialChanges,
+	hasNonPositionalChanges,
 	NodeDiffStatus,
 	RULES,
 	WorkflowChangeSet,
@@ -513,3 +515,299 @@ describe('groupWorkflows', () => {
 		});
 	});
 });
+
+describe('hasNonPositionalChanges', () => {
+	const createNode = (id: string, overrides: Partial<INode> = {}): INode => ({
+		id,
+		name: `Node ${id}`,
+		type: 'test-type',
+		typeVersion: 1,
+		position: [100, 200],
+		parameters: {},
+		...overrides,
+	});
+
+	it('should return false when only positions changed', () => {
+		const oldNodes = [createNode('1', { position: [100, 200] })];
+		const newNodes = [createNode('1', { position: [300, 400] })];
+
+		const result = hasNonPositionalChanges(oldNodes, newNodes, {}, {});
+
+		expect(result).toBe(false);
+	});
+
+	it('should return true when a node is added', () => {
+		const oldNodes = [createNode('1')];
+		const newNodes = [createNode('1'), createNode('2')];
+
+		const result = hasNonPositionalChanges(oldNodes, newNodes, {}, {});
+
+		expect(result).toBe(true);
+	});
+
+	it('should return true when a node is deleted', () => {
+		const oldNodes = [createNode('1'), createNode('2')];
+		const newNodes = [createNode('1')];
+
+		const result = hasNonPositionalChanges(oldNodes, newNodes, {}, {});
+
+		expect(result).toBe(true);
+	});
+
+	it('should return true when node name changes', () => {
+		const oldNodes = [createNode('1', { name: 'Original Name' })];
+		const newNodes = [createNode('1', { name: 'New Name' })];
+
+		const result = hasNonPositionalChanges(oldNodes, newNodes, {}, {});
+
+		expect(result).toBe(true);
+	});
+
+	it('should return true when node parameters change', () => {
+		const oldNodes = [createNode('1', { parameters: { param1: 'value1' } })];
+		const newNodes = [createNode('1', { parameters: { param1: 'value2' } })];
+
+		const result = hasNonPositionalChanges(oldNodes, newNodes, {}, {});
+
+		expect(result).toBe(true);
+	});
+
+	it('should return true when connections change', () => {
+		const oldNodes = [createNode('1'), createNode('2')];
+		const newNodes = [createNode('1'), createNode('2')];
+		const oldConnections: IConnections = {};
+		const newConnections: IConnections = {
+			'Node 1': {
+				main: [[{ node: 'Node 2', type: 'main', index: 0 }]],
+			},
+		};
+
+		const result = hasNonPositionalChanges(oldNodes, newNodes, oldConnections, newConnections);
+
+		expect(result).toBe(true);
+	});
+
+	it('should return false when nodes and connections are identical', () => {
+		const oldNodes = [createNode('1'), createNode('2')];
+		const newNodes = [createNode('1'), createNode('2')];
+		const connections: IConnections = {
+			'Node 1': {
+				main: [[{ node: 'Node 2', type: 'main', index: 0 }]],
+			},
+		};
+
+		const result = hasNonPositionalChanges(oldNodes, newNodes, connections, connections);
+
+		expect(result).toBe(false);
+	});
+
+	it('should return false for empty workflows', () => {
+		const result = hasNonPositionalChanges([], [], {}, {});
+
+		expect(result).toBe(false);
+	});
+});
+
+describe('hasCredentialChanges', () => {
+	const createNode = (id: string, overrides: Partial<INode> = {}): INode => ({
+		id,
+		name: `Node ${id}`,
+		type: 'test-type',
+		typeVersion: 1,
+		position: [100, 200],
+		parameters: {},
+		...overrides,
+	});
+
+	it('should return false when no credentials exist', () => {
+		const oldNodes = [createNode('1')];
+		const newNodes = [createNode('1')];
+
+		const result = hasCredentialChanges(oldNodes, newNodes);
+
+		expect(result).toBe(false);
+	});
+
+	it('should return false when credentials are identical', () => {
+		const oldNodes = [
+			createNode('1', {
+				credentials: { testApi: { id: 'cred-1', name: 'Test Credential' } },
+			}),
+		];
+		const newNodes = [
+			createNode('1', {
+				credentials: { testApi: { id: 'cred-1', name: 'Test Credential' } },
+			}),
+		];
+
+		const result = hasCredentialChanges(oldNodes, newNodes);
+
+		expect(result).toBe(false);
+	});
+
+	it('should return true when credential is added to a node', () => {
+		const oldNodes = [createNode('1')];
+		const newNodes = [
+			createNode('1', {
+				credentials: { testApi: { id: 'cred-1', name: 'Test Credential' } },
+			}),
+		];
+
+		const result = hasCredentialChanges(oldNodes, newNodes);
+
+		expect(result).toBe(true);
+	});
+
+	it('should return true when credential is removed from a node', () => {
+		const oldNodes = [
+			createNode('1', {
+				credentials: { testApi: { id: 'cred-1', name: 'Test Credential' } },
+			}),
+		];
+		const newNodes = [createNode('1')];
+
+		const result = hasCredentialChanges(oldNodes, newNodes);
+
+		expect(result).toBe(true);
+	});
+
+	it('should return true when credential ID changes', () => {
+		const oldNodes = [
+			createNode('1', {
+				credentials: { testApi: { id: 'cred-1', name: 'Test Credential' } },
+			}),
+		];
+		const newNodes = [
+			createNode('1', {
+				credentials: { testApi: { id: 'cred-2', name: 'Test Credential' } },
+			}),
+		];
+
+		const result = hasCredentialChanges(oldNodes, newNodes);
+
+		expect(result).toBe(true);
+	});
+
+	it('should return false when only credential name changes but ID stays the same', () => {
+		const oldNodes = [
+			createNode('1', {
+				credentials: { testApi: { id: 'cred-1', name: 'Old Name' } },
+			}),
+		];
+		const newNodes = [
+			createNode('1', {
+				credentials: { testApi: { id: 'cred-1', name: 'New Name' } },
+			}),
+		];
+
+		const result = hasCredentialChanges(oldNodes, newNodes);
+
+		expect(result).toBe(false);
+	});
+
+	it('should return true when a new credential type is added', () => {
+		const oldNodes = [
+			createNode('1', {
+				credentials: { testApi: { id: 'cred-1', name: 'Test Credential' } },
+			}),
+		];
+		const newNodes = [
+			createNode('1', {
+				credentials: {
+					testApi: { id: 'cred-1', name: 'Test Credential' },
+					anotherApi: { id: 'cred-2', name: 'Another Credential' },
+				},
+			}),
+		];
+
+		const result = hasCredentialChanges(oldNodes, newNodes);
+
+		expect(result).toBe(true);
+	});
+
+	it('should return true when a credential type is removed', () => {
+		const oldNodes = [
+			createNode('1', {
+				credentials: {
+					testApi: { id: 'cred-1', name: 'Test Credential' },
+					anotherApi: { id: 'cred-2', name: 'Another Credential' },
+				},
+			}),
+		];
+		const newNodes = [
+			createNode('1', {
+				credentials: { testApi: { id: 'cred-1', name: 'Test Credential' } },
+			}),
+		];
+
+		const result = hasCredentialChanges(oldNodes, newNodes);
+
+		expect(result).toBe(true);
+	});
+
+	it('should handle multiple nodes correctly', () => {
+		const oldNodes = [
+			createNode('1', {
+				credentials: { testApi: { id: 'cred-1', name: 'Test Credential' } },
+			}),
+			createNode('2', {
+				credentials: { testApi: { id: 'cred-2', name: 'Test Credential 2' } },
+			}),
+		];
+		const newNodes = [
+			createNode('1', {
+				credentials: { testApi: { id: 'cred-1', name: 'Test Credential' } },
+			}),
+			createNode('2', {
+				credentials: { testApi: { id: 'cred-2', name: 'Test Credential 2' } },
+			}),
+		];
+
+		const result = hasCredentialChanges(oldNodes, newNodes);
+
+		expect(result).toBe(false);
+	});
+
+	it('should return true when credential changes in second node', () => {
+		const oldNodes = [
+			createNode('1', {
+				credentials: { testApi: { id: 'cred-1', name: 'Test Credential' } },
+			}),
+			createNode('2', {
+				credentials: { testApi: { id: 'cred-2', name: 'Test Credential 2' } },
+			}),
+		];
+		const newNodes = [
+			createNode('1', {
+				credentials: { testApi: { id: 'cred-1', name: 'Test Credential' } },
+			}),
+			createNode('2', {
+				credentials: { testApi: { id: 'cred-3', name: 'Test Credential 3' } },
+			}),
+		];
+
+		const result = hasCredentialChanges(oldNodes, newNodes);
+
+		expect(result).toBe(true);
+	});
+
+	it('should return false for empty node arrays', () => {
+		const result = hasCredentialChanges([], []);
+
+		expect(result).toBe(false);
+	});
+
+	it('should return false when node is deleted (deletion is not a credential change)', () => {
+		const oldNodes = [
+			createNode('1', {
+				credentials: { testApi: { id: 'cred-1', name: 'Test Credential' } },
+			}),
+		];
+		const newNodes: INode[] = [];
+
+		const result = hasCredentialChanges(oldNodes, newNodes);
+
+		// When a node is deleted, it's not considered a credential change
+		expect(result).toBe(false);
+	});
+});

From 40ff0479a8219aa548092bc2e9df3095d012290f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milorad=20FIlipovi=C4=87?= <milorad@n8n.io>
Date: Mon, 8 Dec 2025 13:29:06 +0100
Subject: [PATCH 126/167] feat(editor): Redesign MCP settings page (#22677)

Co-authored-by: Robert Squires <robtf9@icloud.com>
---
 .../__tests__/mcp.settings.controller.test.ts |   4 +-
 .../modules/mcp/mcp.settings.controller.ts    |   4 +-
 .../frontend/@n8n/i18n/src/locales/en.json    |  50 +-
 .../ai/mcpAccess/SettingsMCPView.test.ts      | 342 +++++++++++--
 .../features/ai/mcpAccess/SettingsMCPView.vue | 182 ++++---
 .../components/ConnectionParameter.vue        |  94 ----
 .../MCPConnectionInstructions.test.ts         | 150 ------
 .../components/MCPConnectionInstructions.vue  | 113 -----
 .../ai/mcpAccess/components/MCPEmptyState.vue |  73 +++
 .../components/McpAccessToggle.test.ts        | 199 --------
 .../mcpAccess/components/McpAccessToggle.vue  | 105 ----
 .../components/WorkflowsTable.test.ts         | 368 --------------
 .../AccessTokenConnectionInstructions.vue     | 272 ----------
 .../ConnectionParameter.vue                   | 103 ----
 .../OAuthClientsTable.test.ts                 | 242 ---------
 .../OAuthConnectionInstructions.vue           | 140 -----
 .../components/header/MCPHeaderActions.vue    |  54 ++
 .../components/header/McpAccessToggle.vue     |  71 +++
 .../connectPopover/ConnectionParameter.vue    | 186 +++++++
 .../MCPAccessTokenPopoverTab.test.ts          | 220 ++++++++
 .../MCPAccessTokenPopoverTab.vue              | 265 ++++++++++
 .../connectPopover/MCPOAuthPopoverTab.test.ts |  67 +++
 .../connectPopover/MCPOAuthPopoverTab.vue     |  38 ++
 .../connectPopover/McpConnectPopover.test.ts  | 159 ++++++
 .../connectPopover/McpConnectPopover.vue      | 137 +++++
 .../components/tabs/OAuthClientsTable.test.ts | 124 +++++
 .../OAuthClientsTable.vue                     |  68 ++-
 .../components/tabs/WorkflowsTable.test.ts    | 477 ++++++++++++++++++
 .../components/{ => tabs}/WorkflowsTable.vue  | 263 +++++-----
 .../features/ai/mcpAccess/mcp.constants.ts    |   7 +-
 .../src/features/ai/mcpAccess/mcp.store.ts    |   5 +
 .../ai/mcpAccess/module.descriptor.ts         |   2 +-
 32 files changed, 2483 insertions(+), 2101 deletions(-)
 delete mode 100644 packages/frontend/editor-ui/src/features/ai/mcpAccess/components/ConnectionParameter.vue
 delete mode 100644 packages/frontend/editor-ui/src/features/ai/mcpAccess/components/MCPConnectionInstructions.test.ts
 delete mode 100644 packages/frontend/editor-ui/src/features/ai/mcpAccess/components/MCPConnectionInstructions.vue
 create mode 100644 packages/frontend/editor-ui/src/features/ai/mcpAccess/components/MCPEmptyState.vue
 delete mode 100644 packages/frontend/editor-ui/src/features/ai/mcpAccess/components/McpAccessToggle.test.ts
 delete mode 100644 packages/frontend/editor-ui/src/features/ai/mcpAccess/components/McpAccessToggle.vue
 delete mode 100644 packages/frontend/editor-ui/src/features/ai/mcpAccess/components/WorkflowsTable.test.ts
 delete mode 100644 packages/frontend/editor-ui/src/features/ai/mcpAccess/components/connectionInstructions/AccessTokenConnectionInstructions.vue
 delete mode 100644 packages/frontend/editor-ui/src/features/ai/mcpAccess/components/connectionInstructions/ConnectionParameter.vue
 delete mode 100644 packages/frontend/editor-ui/src/features/ai/mcpAccess/components/connectionInstructions/OAuthClientsTable.test.ts
 delete mode 100644 packages/frontend/editor-ui/src/features/ai/mcpAccess/components/connectionInstructions/OAuthConnectionInstructions.vue
 create mode 100644 packages/frontend/editor-ui/src/features/ai/mcpAccess/components/header/MCPHeaderActions.vue
 create mode 100644 packages/frontend/editor-ui/src/features/ai/mcpAccess/components/header/McpAccessToggle.vue
 create mode 100644 packages/frontend/editor-ui/src/features/ai/mcpAccess/components/header/connectPopover/ConnectionParameter.vue
 create mode 100644 packages/frontend/editor-ui/src/features/ai/mcpAccess/components/header/connectPopover/MCPAccessTokenPopoverTab.test.ts
 create mode 100644 packages/frontend/editor-ui/src/features/ai/mcpAccess/components/header/connectPopover/MCPAccessTokenPopoverTab.vue
 create mode 100644 packages/frontend/editor-ui/src/features/ai/mcpAccess/components/header/connectPopover/MCPOAuthPopoverTab.test.ts
 create mode 100644 packages/frontend/editor-ui/src/features/ai/mcpAccess/components/header/connectPopover/MCPOAuthPopoverTab.vue
 create mode 100644 packages/frontend/editor-ui/src/features/ai/mcpAccess/components/header/connectPopover/McpConnectPopover.test.ts
 create mode 100644 packages/frontend/editor-ui/src/features/ai/mcpAccess/components/header/connectPopover/McpConnectPopover.vue
 create mode 100644 packages/frontend/editor-ui/src/features/ai/mcpAccess/components/tabs/OAuthClientsTable.test.ts
 rename packages/frontend/editor-ui/src/features/ai/mcpAccess/components/{connectionInstructions => tabs}/OAuthClientsTable.vue (69%)
 create mode 100644 packages/frontend/editor-ui/src/features/ai/mcpAccess/components/tabs/WorkflowsTable.test.ts
 rename packages/frontend/editor-ui/src/features/ai/mcpAccess/components/{ => tabs}/WorkflowsTable.vue (59%)

diff --git a/packages/cli/src/modules/mcp/__tests__/mcp.settings.controller.test.ts b/packages/cli/src/modules/mcp/__tests__/mcp.settings.controller.test.ts
index 450fd17af83..34b0446036f 100644
--- a/packages/cli/src/modules/mcp/__tests__/mcp.settings.controller.test.ts
+++ b/packages/cli/src/modules/mcp/__tests__/mcp.settings.controller.test.ts
@@ -226,7 +226,7 @@ describe('McpSettingsController', () => {
 				controller.toggleWorkflowMCPAccess(createReq({}, { user }), mock<Response>(), workflowId, {
 					availableInMCP: true,
 				}),
-			).rejects.toThrow(new BadRequestError('MCP access can only be set for active workflows'));
+			).rejects.toThrow(new BadRequestError('MCP access can only be set for published workflows'));
 
 			expect(workflowService.update).not.toHaveBeenCalled();
 		});
@@ -274,7 +274,7 @@ describe('McpSettingsController', () => {
 				}),
 			).rejects.toThrow(
 				new BadRequestError(
-					'MCP access can only be set for active workflows with one of the following trigger nodes: Schedule Trigger, Webhook Trigger, Form Trigger, Chat Trigger.',
+					'MCP access can only be set for published workflows with one of the following trigger nodes: Schedule Trigger, Webhook Trigger, Form Trigger, Chat Trigger.',
 				),
 			);
 
diff --git a/packages/cli/src/modules/mcp/mcp.settings.controller.ts b/packages/cli/src/modules/mcp/mcp.settings.controller.ts
index abc257bd97b..65881c70e8c 100644
--- a/packages/cli/src/modules/mcp/mcp.settings.controller.ts
+++ b/packages/cli/src/modules/mcp/mcp.settings.controller.ts
@@ -93,14 +93,14 @@ export class McpSettingsController {
 
 		if (dto.availableInMCP) {
 			if (!workflow.activeVersionId) {
-				throw new BadRequestError('MCP access can only be set for active workflows');
+				throw new BadRequestError('MCP access can only be set for published workflows');
 			}
 			const nodes = workflow.activeVersion?.nodes ?? [];
 			const supportedTrigger = findMcpSupportedTrigger(nodes);
 
 			if (!supportedTrigger) {
 				throw new BadRequestError(
-					`MCP access can only be set for active workflows with one of the following trigger nodes: ${Object.values(SUPPORTED_MCP_TRIGGERS).join(', ')}.`,
+					`MCP access can only be set for published workflows with one of the following trigger nodes: ${Object.values(SUPPORTED_MCP_TRIGGERS).join(', ')}.`,
 				);
 			}
 		}
diff --git a/packages/frontend/@n8n/i18n/src/locales/en.json b/packages/frontend/@n8n/i18n/src/locales/en.json
index 7d67132a5c9..9ec190a8e8a 100644
--- a/packages/frontend/@n8n/i18n/src/locales/en.json
+++ b/packages/frontend/@n8n/i18n/src/locales/en.json
@@ -42,8 +42,10 @@
 	"generic.any": "Any",
 	"generic.allow": "Allow",
 	"generic.deny": "Deny",
+	"generic.docs": "Docs",
 	"generic.back": "Back",
 	"generic.cancel": "Cancel",
+	"generic.connect": "Connect",
 	"generic.open": "Open",
 	"generic.openResource": "Open {resource}",
 	"generic.add": "Add",
@@ -1316,7 +1318,7 @@
 	"mainSidebar.workersView": "Workers",
 	"mainSidebar.whatsNew": "What’s New",
 	"mainSidebar.whatsNew.fullChangelog": "Full changelog",
-	"mcp.workflowNotEligable.description": "Only active workflows with one of the following trigger nodes can be accessible via MCP: {triggers}",
+	"mcp.workflowNotEligable.description": "Only published workflows with one of the following trigger nodes can be accessible via MCP: {triggers}",
 	"mcp.instanceLevelAccessDisabled.description": "Instance-level MCP access is disabled. Enable it to allow workflow-level access.",
 	"mcp.workflowDeactivated.title": "MCP Access Disabled",
 	"mcp.productionChecklist.title": "Enable MCP access",
@@ -2353,42 +2355,44 @@
 	"settings.communityNodes.confirmModal.update.buttonLabel": "Confirm update",
 	"settings.communityNodes.confirmModal.update.buttonLoadingLabel": "Updating...",
 	"settings.communityNodes.confirmModal.cancel": "Cancel",
-	"settings.mcp": "MCP Access",
-	"settings.mcp.toggle.label": "Enable MCP",
-	"settings.mcp.toggle.description": "Enable MCP access to this n8n instance",
+	"settings.mcp": "MCP Server",
+	"settings.mcp.header.toggle.enabled": "Enabled",
+	"settings.mcp.header.toggle.disabled": "Disabled",
+	"settings.mcp.actionBox.heading": "Connect AI assistants to your workflows",
+	"settings.mcp.actionBox.button.label": "Enable MCP server",
+	"settings.mcp.emptyState.docs.part1": "Read our docs to",
 	"settings.mcp.toggle.disabled.notice": "Let MCP clients like Claude, Lovable, and other AI tools discover and execute your n8n workflows.",
-	"settings.mcp.available.workflows.heading": "Available Workflows",
-	"settings.mcp.connection.info.heading": "How to connect",
-	"settings.mcp.workflows.table.action.removeMCPAccess": "Remove MCP Access",
-	"settings.mcp.empty.title": "No workflows available for MCP",
-	"settings.mcp.empty.description": "Enable MCP access in each workflow's settings to see them here.",
+	"settings.mcp.tabs.workflows": "Workflows",
+	"settings.mcp.tabs.oauth": "Connected clients",
+	"settings.mcp.access.token.notice": "Make sure to copy your access token, you won't be able to see it again",
+	"settings.mcp.workflows.table.action.removeMCPAccess": "Remove Access",
+	"settings.mcp.workflows.table.column.name": "Name",
+	"settings.mcp.workflows.table.column.location": "Location",
+	"settings.mcp.workflows.table.column.description.emptyContent": "No description",
+	"settings.mcp.workflows.table.column.description.emptyTooltip": "Helps MCP clients understand when and how to use this workflow",
+	"settings.mcp.workflows.table.empty.title": "No workflows connected",
+	"settings.mcp.workflows.table.empty.description": "Enable MCP access in each workflow's settings to see them here",
+	"settings.mcp.workflows.table.empty.button.label": "Find workflows",
+	"settings.mcp.oauth.table.empty.title": "No OAuth clients connected",
+	"settings.mcp.oauth.table.empty.description": "Clients that connect via OAuth will show up here",
 	"settings.mcp.toggle.disabled.tooltip": "Only instance admins can change this",
 	"settings.mcp.toggle.error": "Error updating MCP access",
-	"settings.mcp.instructions.tabs.oauth": "OAuth",
-	"settings.mcp.instructions.tabs.apiKey": "Access Token",
-	"settings.mcp.instructions.enableAccess": "Enable workflow access in at least one workflow via its settings",
-	"settings.mcp.instructions.serverUrl": "Server URL",
-	"settings.mcp.instructions.apiKey.label": "Access token",
-	"settings.mcp.instructions.json": "Or use the following code in your 'mcp.json' file",
-	"settings.mcp.instructions.docs.part1": "For more detailed instructions and examples, have a look at",
-	"settings.mcp.instructions.docs.part2": "our docs",
-	"settings.mcp.instructions.rotateKey.tooltip": "Generate new token.<br/>This one will be automatically revoked.",
+	"settings.mcp.instructions.rotateKey.tooltip": "Generate new token.<br/>This one will be automatically revoked",
 	"settings.mcp.instructions.apiKey.tip": "Use this as an authorization token. May be named differently in different clients",
-	"settings.mcp.newKey.notice": "Make sure to copy your access token now. You won’t be able to see or copy it again!",
 	"settings.mcp.error.fetching.apiKey": "Error fetching access token",
 	"settings.mcp.error.rotating.apiKey": "Error generating new access token",
 	"settings.mcp.error.fetching.oAuthClients": "Error fetching list of OAuth clients",
-	"settings.mcp.oAuthClients.heading": "Connected OAuth clients",
 	"settings.mcp.oAuthClients.table.clientName": "Client Name",
 	"settings.mcp.oAuthClients.table.connectedAt": "Connected At",
-	"settings.mcp.oAuthClients.table.lastUsedAt": "Last Used At",
 	"settings.mcp.oAuthClients.table.action.revokeAccess": "Revoke Access",
 	"settings.mcp.oAuthClients.revoke.success.title": "Access revoked",
 	"settings.mcp.oAuthClients.revoke.success.message": "Client {name} access has been revoked",
 	"settings.mcp.oAuthClients.revoke.error": "Error revoking client access",
-	"settings.mcp.oAuthClients.table.empty.title": "No OAuth clients connected",
 	"settings.mcp.refresh.tooltip": "Refresh list",
-	"settings.mcp.workflowsTable.workflow": "Workflow",
+	"settings.mcp.connectPopover.tab.oauth": "OAuth",
+	"settings.mcp.connectPopover.tab.accessToken": "Access token",
+	"settings.mcp.connectPopover.serverUrl": "Server URL",
+	"settings.mcp.connectPopover.jsonConfig": "Configuration JSON",
 	"settings.chatHub": "Chat",
 	"settings.chatHub.providers.fetching.error": "Error fetching chat provider settings",
 	"settings.chatHub.providers.updated.success": "Chat provider settings updated",
diff --git a/packages/frontend/editor-ui/src/features/ai/mcpAccess/SettingsMCPView.test.ts b/packages/frontend/editor-ui/src/features/ai/mcpAccess/SettingsMCPView.test.ts
index 5d45fa56df1..6406cb231e0 100644
--- a/packages/frontend/editor-ui/src/features/ai/mcpAccess/SettingsMCPView.test.ts
+++ b/packages/frontend/editor-ui/src/features/ai/mcpAccess/SettingsMCPView.test.ts
@@ -1,12 +1,25 @@
-import { createComponentRenderer } from '@/__tests__/render';
-import SettingsMCPView from './SettingsMCPView.vue';
-import { vi } from 'vitest';
-import { mockedStore, waitAllPromises } from '@/__tests__/utils';
+import { nextTick } from 'vue';
 import { createTestingPinia } from '@pinia/testing';
-import { useRootStore } from '@n8n/stores/useRootStore';
+import { waitFor, within } from '@testing-library/vue';
+import userEvent from '@testing-library/user-event';
+import { createComponentRenderer } from '@/__tests__/render';
+import { mockedStore, type MockedStore } from '@/__tests__/utils';
+import SettingsMCPView from '@/features/ai/mcpAccess/SettingsMCPView.vue';
+import { useMCPStore } from '@/features/ai/mcpAccess/mcp.store';
 import { useUsersStore } from '@/features/settings/users/users.store';
-import { useWorkflowsStore } from '@/app/stores/workflows.store';
-import { useMCPStore } from './mcp.store';
+import { useSettingsStore } from '@/app/stores/settings.store';
+import type { FrontendSettings } from '@n8n/api-types';
+
+vi.mock('vue-router', async (importOriginal) => ({
+	...(await importOriginal()),
+	useRouter: vi.fn(),
+	useRoute: vi.fn(() => ({
+		params: {},
+	})),
+	RouterLink: {
+		template: '<a><slot /></a>',
+	},
+}));
 
 vi.mock('@/app/composables/useDocumentTitle', () => ({
 	useDocumentTitle: () => ({
@@ -14,74 +27,315 @@ vi.mock('@/app/composables/useDocumentTitle', () => ({
 	}),
 }));
 
-vi.mock('@/app/composables/useToast', () => ({
-	useToast: () => ({
-		showError: vi.fn(),
+vi.mock('@/features/ai/mcpAccess/composables/useMcp', () => ({
+	useMcp: () => ({
+		trackUserToggledMcpAccess: vi.fn(),
 	}),
 }));
 
-const renderComponent = createComponentRenderer(SettingsMCPView, {
+let pinia: ReturnType<typeof createTestingPinia>;
+let mcpStore: MockedStore<typeof useMCPStore>;
+let usersStore: MockedStore<typeof useUsersStore>;
+let settingsStore: MockedStore<typeof useSettingsStore>;
+
+const createComponent = createComponentRenderer(SettingsMCPView, {
 	global: {
 		stubs: {
-			MCPConnectionInstructions: {
-				template: '<div data-test-id="mcp-connection-instructions" />',
+			MCPEmptyState: {
+				props: ['disabled', 'loading'],
+				template:
+					'<div data-test-id="mcp-empty-state"><button data-test-id="enable-mcp-button" :disabled="disabled" @click="$emit(\'turnOnMcp\')">Turn On</button></div>',
+			},
+			MCpHeaderActions: {
+				props: ['toggleDisabled', 'loading'],
+				template:
+					'<div data-test-id="mcp-header-actions"><button data-test-id="disable-mcp-button" :disabled="toggleDisabled" @click="$emit(\'disableMcpAccess\')">Disable</button></div>',
+			},
+			WorkflowsTable: {
+				inheritAttrs: true,
+				template: '<div>Workflows Table</div>',
+			},
+			OAuthClientsTable: {
+				inheritAttrs: true,
+				template: '<div>OAuth Clients Table</div>',
 			},
 		},
 	},
 });
 
-let pinia: ReturnType<typeof createTestingPinia>;
-let mcpStore: ReturnType<typeof mockedStore<typeof useMCPStore>>;
-let rootStore: ReturnType<typeof mockedStore<typeof useRootStore>>;
-let userStore: ReturnType<typeof mockedStore<typeof useUsersStore>>;
-let workflowsStore: ReturnType<typeof mockedStore<typeof useWorkflowsStore>>;
+const clickTab = async (container: Element, tabTestId: string) => {
+	if (!(container instanceof HTMLElement)) {
+		throw new Error('Container is not an HTMLElement');
+	}
+	const tabWrapper = within(container).getByTestId(tabTestId);
+	const clickableTab = tabWrapper.querySelector('.tab');
+	if (clickableTab) {
+		await userEvent.click(clickableTab);
+	}
+};
 
 describe('SettingsMCPView', () => {
 	beforeEach(() => {
 		pinia = createTestingPinia();
-		rootStore = mockedStore(useRootStore);
-		userStore = mockedStore(useUsersStore);
-		workflowsStore = mockedStore(useWorkflowsStore);
 		mcpStore = mockedStore(useMCPStore);
+		usersStore = mockedStore(useUsersStore);
+		settingsStore = mockedStore(useSettingsStore);
 
-		mcpStore.mcpAccessEnabled = false;
-		rootStore.urlBaseEditor = 'http://localhost:5678';
-		userStore.isInstanceOwner = true;
-		workflowsStore.updateWorkflowSetting = vi.fn();
-		mcpStore.fetchWorkflowsAvailableForMCP = vi.fn().mockResolvedValue([]);
+		settingsStore.settings = {
+			enterprise: {},
+		} as FrontendSettings;
+
+		settingsStore.moduleSettings = {
+			mcp: {
+				mcpAccessEnabled: false,
+			},
+		};
 	});
 
 	afterEach(() => {
 		vi.clearAllMocks();
 	});
 
-	test('always renders the MCP access toggle', async () => {
-		const { getByTestId, queryByTestId } = renderComponent({ pinia });
-		await waitAllPromises();
+	describe('Empty state (MCP disabled)', () => {
+		it('should render empty state when MCP access is disabled', async () => {
+			const { getByTestId, queryByTestId } = createComponent({ pinia });
+			await nextTick();
 
-		expect(getByTestId('mcp-access-toggle')).toBeInTheDocument();
-		expect(getByTestId('mcp-access-toggle')).not.toHaveClass('is-disabled');
-		expect(queryByTestId('mcp-enabled-section')).not.toBeInTheDocument();
+			expect(getByTestId('mcp-settings-header')).toBeVisible();
+			expect(getByTestId('mcp-empty-state')).toBeVisible();
+			expect(queryByTestId('mcp-header-actions')).toBeVisible();
+			expect(queryByTestId('mcp-enabled-section')).not.toBeInTheDocument();
+		});
 	});
 
-	test('renders the enabled section only when MCP access is enabled', async () => {
-		mcpStore.mcpAccessEnabled = true;
+	describe('MCP enabled state', () => {
+		beforeEach(() => {
+			settingsStore.moduleSettings = {
+				mcp: {
+					mcpAccessEnabled: true,
+				},
+			};
+			mcpStore.fetchWorkflowsAvailableForMCP.mockResolvedValue([]);
+		});
 
-		const { getByTestId } = renderComponent({ pinia });
-		await waitAllPromises();
+		it('should render enabled section when MCP access is enabled', async () => {
+			const { getByTestId, queryByTestId } = createComponent({ pinia });
+			await nextTick();
 
-		expect(getByTestId('mcp-access-toggle')).toBeInTheDocument();
-		expect(getByTestId('mcp-enabled-section')).toBeInTheDocument();
+			expect(getByTestId('mcp-settings-header')).toBeVisible();
+			expect(getByTestId('mcp-header-actions')).toBeVisible();
+			expect(getByTestId('mcp-enabled-section')).toBeVisible();
+			expect(queryByTestId('mcp-empty-state')).not.toBeInTheDocument();
+		});
+
+		it('should render workflows table by default', async () => {
+			const { getByTestId, queryByTestId } = createComponent({ pinia });
+			await nextTick();
+
+			expect(getByTestId('mcp-workflow-table')).toBeVisible();
+			expect(queryByTestId('mcp-oauth-clients-table')).not.toBeInTheDocument();
+		});
 	});
 
-	test('disables the MCP access toggle for non-owners', async () => {
-		userStore.isInstanceOwner = false;
+	describe('Toggle MCP on/off', () => {
+		beforeEach(() => {
+			// Set user as admin to allow toggling
+			usersStore.isAdmin = true;
+		});
 
-		const { getByTestId } = renderComponent({ pinia });
-		await waitAllPromises();
+		it('should call setMcpAccessEnabled when turning on MCP', async () => {
+			mcpStore.setMcpAccessEnabled.mockResolvedValue(true);
 
-		const toggle = getByTestId('mcp-access-toggle');
+			const { getByTestId } = createComponent({ pinia });
+			await nextTick();
 
-		expect(toggle).toHaveClass('is-disabled');
+			const enableButton = getByTestId('enable-mcp-button');
+			await userEvent.click(enableButton);
+
+			expect(mcpStore.setMcpAccessEnabled).toHaveBeenCalledWith(true);
+		});
+
+		it('should call setMcpAccessEnabled when turning off MCP', async () => {
+			settingsStore.moduleSettings = {
+				mcp: {
+					mcpAccessEnabled: true,
+				},
+			};
+			mcpStore.fetchWorkflowsAvailableForMCP.mockResolvedValue([]);
+			mcpStore.setMcpAccessEnabled.mockResolvedValue(false);
+
+			const { getByTestId } = createComponent({ pinia });
+			await nextTick();
+
+			const disableButton = getByTestId('disable-mcp-button');
+			await userEvent.click(disableButton);
+
+			expect(mcpStore.setMcpAccessEnabled).toHaveBeenCalledWith(false);
+		});
+
+		it('should fetch workflows and oauth clients after enabling MCP', async () => {
+			mcpStore.setMcpAccessEnabled.mockResolvedValue(true);
+			mcpStore.fetchWorkflowsAvailableForMCP.mockResolvedValue([]);
+			mcpStore.getAllOAuthClients.mockResolvedValue([]);
+
+			const { getByTestId } = createComponent({ pinia });
+			await nextTick();
+
+			const enableButton = getByTestId('enable-mcp-button');
+			await userEvent.click(enableButton);
+
+			expect(mcpStore.fetchWorkflowsAvailableForMCP).toHaveBeenCalled();
+			expect(mcpStore.getAllOAuthClients).toHaveBeenCalled();
+		});
+	});
+
+	describe('Tab switching', () => {
+		beforeEach(() => {
+			settingsStore.moduleSettings = {
+				mcp: {
+					mcpAccessEnabled: true,
+				},
+			};
+			mcpStore.fetchWorkflowsAvailableForMCP.mockResolvedValue([]);
+			mcpStore.getAllOAuthClients.mockResolvedValue([]);
+		});
+
+		it('should switch to OAuth tab and show OAuth clients table', async () => {
+			const { getByTestId, queryByTestId, container } = createComponent({ pinia });
+			await nextTick();
+
+			// Initially workflows tab is active
+			expect(getByTestId('mcp-workflow-table')).toBeVisible();
+			expect(queryByTestId('mcp-oauth-clients-table')).not.toBeInTheDocument();
+
+			// Click on OAuth tab
+			await clickTab(container, 'tab-oauth');
+
+			await waitFor(() => {
+				expect(getByTestId('mcp-oauth-clients-table')).toBeVisible();
+			});
+			expect(queryByTestId('mcp-workflow-table')).not.toBeInTheDocument();
+		});
+
+		it('should fetch OAuth clients when switching to OAuth tab', async () => {
+			const { container } = createComponent({ pinia });
+			await nextTick();
+
+			// Reset mock call count after initial render
+			mcpStore.getAllOAuthClients.mockClear();
+
+			// Click on OAuth tab
+			await clickTab(container, 'tab-oauth');
+
+			await waitFor(() => {
+				expect(mcpStore.getAllOAuthClients).toHaveBeenCalled();
+			});
+		});
+
+		it('should switch back to Workflows tab and show workflows table', async () => {
+			const { getByTestId, queryByTestId, container } = createComponent({ pinia });
+			await nextTick();
+
+			// Click on OAuth tab first
+			await clickTab(container, 'tab-oauth');
+			await waitFor(() => {
+				expect(getByTestId('mcp-oauth-clients-table')).toBeVisible();
+			});
+
+			// Then click on Workflows tab
+			await clickTab(container, 'tab-workflows');
+
+			await waitFor(() => {
+				expect(getByTestId('mcp-workflow-table')).toBeVisible();
+			});
+			expect(queryByTestId('mcp-oauth-clients-table')).not.toBeInTheDocument();
+		});
+	});
+
+	describe('Permissions', () => {
+		it('should disable toggle button for non-owner/non-admin users', async () => {
+			usersStore.isInstanceOwner = false;
+			usersStore.isAdmin = false;
+
+			const { getByTestId } = createComponent({ pinia });
+			await nextTick();
+
+			const enableButton = getByTestId('enable-mcp-button');
+			expect(enableButton).toBeDisabled();
+		});
+
+		it('should enable toggle button for admin users', async () => {
+			usersStore.isInstanceOwner = false;
+			usersStore.isAdmin = true;
+
+			const { getByTestId } = createComponent({ pinia });
+			await nextTick();
+
+			const enableButton = getByTestId('enable-mcp-button');
+			expect(enableButton).not.toBeDisabled();
+		});
+
+		it('should enable toggle button for owner users', async () => {
+			usersStore.isInstanceOwner = true;
+			usersStore.isAdmin = false;
+
+			const { getByTestId } = createComponent({ pinia });
+			await nextTick();
+
+			const enableButton = getByTestId('enable-mcp-button');
+			expect(enableButton).not.toBeDisabled();
+		});
+	});
+
+	describe('Refresh button', () => {
+		beforeEach(() => {
+			settingsStore.moduleSettings = {
+				mcp: {
+					mcpAccessEnabled: true,
+				},
+			};
+			mcpStore.fetchWorkflowsAvailableForMCP.mockResolvedValue([]);
+			mcpStore.getAllOAuthClients.mockResolvedValue([]);
+		});
+
+		it('should refresh workflows when on workflows tab', async () => {
+			const { getByTestId } = createComponent({ pinia });
+			await nextTick();
+
+			// Clear mocks after initial load
+			mcpStore.fetchWorkflowsAvailableForMCP.mockClear();
+			mcpStore.getAllOAuthClients.mockClear();
+
+			const refreshButton = getByTestId('mcp-workflows-refresh-button');
+			await userEvent.click(refreshButton);
+
+			await waitFor(() => {
+				expect(mcpStore.fetchWorkflowsAvailableForMCP).toHaveBeenCalled();
+			});
+			expect(mcpStore.getAllOAuthClients).not.toHaveBeenCalled();
+		});
+
+		it('should refresh OAuth clients when on OAuth tab', async () => {
+			const { getByTestId, container } = createComponent({ pinia });
+			await nextTick();
+
+			// Switch to OAuth tab
+			await clickTab(container, 'tab-oauth');
+			await waitFor(() => {
+				expect(getByTestId('mcp-oauth-clients-table')).toBeVisible();
+			});
+
+			// Clear mocks
+			mcpStore.fetchWorkflowsAvailableForMCP.mockClear();
+			mcpStore.getAllOAuthClients.mockClear();
+
+			const refreshButton = getByTestId('mcp-workflows-refresh-button');
+			await userEvent.click(refreshButton);
+
+			await waitFor(() => {
+				expect(mcpStore.getAllOAuthClients).toHaveBeenCalled();
+			});
+			expect(mcpStore.fetchWorkflowsAvailableForMCP).not.toHaveBeenCalled();
+		});
 	});
 });
diff --git a/packages/frontend/editor-ui/src/features/ai/mcpAccess/SettingsMCPView.vue b/packages/frontend/editor-ui/src/features/ai/mcpAccess/SettingsMCPView.vue
index 4ebcb5438e8..617d8fc3a92 100644
--- a/packages/frontend/editor-ui/src/features/ai/mcpAccess/SettingsMCPView.vue
+++ b/packages/frontend/editor-ui/src/features/ai/mcpAccess/SettingsMCPView.vue
@@ -3,19 +3,22 @@ import { useDocumentTitle } from '@/app/composables/useDocumentTitle';
 import { useToast } from '@/app/composables/useToast';
 import type { WorkflowListItem } from '@/Interface';
 import { useWorkflowsStore } from '@/app/stores/workflows.store';
-import { useRootStore } from '@n8n/stores/useRootStore';
 import { useI18n } from '@n8n/i18n';
 import { computed, onMounted, ref } from 'vue';
 import { useMCPStore } from '@/features/ai/mcpAccess/mcp.store';
 import { useUsersStore } from '@/features/settings/users/users.store';
-import MCPConnectionInstructions from '@/features/ai/mcpAccess/components/MCPConnectionInstructions.vue';
 import { LOADING_INDICATOR_TIMEOUT } from '@/features/ai/mcpAccess/mcp.constants';
-import WorkflowsTable from '@/features/ai/mcpAccess/components/WorkflowsTable.vue';
-import McpAccessToggle from '@/features/ai/mcpAccess/components/McpAccessToggle.vue';
-import { N8nHeading } from '@n8n/design-system';
+import MCPEmptyState from '@/features/ai/mcpAccess/components/MCPEmptyState.vue';
+import MCpHeaderActions from '@/features/ai/mcpAccess/components/header/MCPHeaderActions.vue';
+import WorkflowsTable from '@/features/ai/mcpAccess/components/tabs/WorkflowsTable.vue';
+import OAuthClientsTable from '@/features/ai/mcpAccess/components/tabs/OAuthClientsTable.vue';
+import { N8nHeading, N8nTabs, N8nTooltip, N8nButton } from '@n8n/design-system';
+import type { TabOptions } from '@n8n/design-system';
 import { useMcp } from '@/features/ai/mcpAccess/composables/useMcp';
 import type { OAuthClientResponseDto } from '@n8n/api-types';
 
+type MCPTabs = 'workflows' | 'oauth';
+
 const i18n = useI18n();
 const toast = useToast();
 const documentTitle = useDocumentTitle();
@@ -24,15 +27,25 @@ const mcp = useMcp();
 const workflowsStore = useWorkflowsStore();
 const mcpStore = useMCPStore();
 const usersStore = useUsersStore();
-const rootStore = useRootStore();
 
 const mcpStatusLoading = ref(false);
-const workflowsLoading = ref(false);
-const mcpKeyLoading = ref(false);
-const oAuthClientsLoading = ref(false);
+const selectedTab = ref<MCPTabs>('workflows');
 
+const tabs = ref<Array<TabOptions<MCPTabs>>>([
+	{
+		label: i18n.baseText('settings.mcp.tabs.workflows'),
+		value: 'workflows',
+	},
+	{
+		label: i18n.baseText('settings.mcp.tabs.oauth'),
+		value: 'oauth',
+	},
+]);
+
+const workflowsLoading = ref(false);
 const availableWorkflows = ref<WorkflowListItem[]>([]);
-const apiKey = computed(() => mcpStore.currentUserMCPKey);
+
+const oAuthClientsLoading = ref(false);
 const connectedOAuthClients = ref<OAuthClientResponseDto[]>([]);
 
 const isOwner = computed(() => usersStore.isInstanceOwner);
@@ -40,13 +53,21 @@ const isAdmin = computed(() => usersStore.isAdmin);
 
 const canToggleMCP = computed(() => isOwner.value || isAdmin.value);
 
+const onTabSelected = async (tab: MCPTabs) => {
+	selectedTab.value = tab;
+	if (tab === 'workflows' && availableWorkflows.value.length === 0) {
+		await fetchAvailableWorkflows();
+	} else if (tab === 'oauth' && connectedOAuthClients.value.length === 0) {
+		await fetchoAuthCLients();
+	}
+};
+
 const onToggleMCPAccess = async (enabled: boolean) => {
 	try {
 		mcpStatusLoading.value = true;
 		const updated = await mcpStore.setMcpAccessEnabled(enabled);
 		if (updated) {
 			await fetchAvailableWorkflows();
-			await fetchApiKey();
 			await fetchoAuthCLients();
 		} else {
 			workflowsLoading.value = false;
@@ -69,6 +90,22 @@ const onRemoveMCPAccess = async (workflow: WorkflowListItem) => {
 	}
 };
 
+const onTableRefresh = async () => {
+	if (selectedTab.value === 'workflows') {
+		await fetchAvailableWorkflows();
+	} else if (selectedTab.value === 'oauth') {
+		await fetchoAuthCLients();
+	}
+};
+
+onMounted(async () => {
+	documentTitle.set(i18n.baseText('settings.mcp'));
+	if (!mcpStore.mcpAccessEnabled) {
+		return;
+	}
+	await fetchAvailableWorkflows();
+});
+
 const fetchAvailableWorkflows = async () => {
 	workflowsLoading.value = true;
 	try {
@@ -83,30 +120,8 @@ const fetchAvailableWorkflows = async () => {
 	}
 };
 
-const fetchApiKey = async () => {
-	try {
-		mcpKeyLoading.value = true;
-		await mcpStore.getOrCreateApiKey();
-	} catch (error) {
-		toast.showError(error, i18n.baseText('settings.mcp.error.fetching.apiKey'));
-	} finally {
-		setTimeout(() => {
-			mcpKeyLoading.value = false;
-		}, LOADING_INDICATOR_TIMEOUT);
-	}
-};
-
-const rotateKey = async () => {
-	try {
-		mcpKeyLoading.value = true;
-		await mcpStore.generateNewApiKey();
-	} catch (error) {
-		toast.showError(error, i18n.baseText('settings.mcp.error.rotating.apiKey'));
-	} finally {
-		setTimeout(() => {
-			mcpKeyLoading.value = false;
-		}, LOADING_INDICATOR_TIMEOUT);
-	}
+const onRefreshWorkflows = async () => {
+	await fetchAvailableWorkflows();
 };
 
 const fetchoAuthCLients = async () => {
@@ -138,58 +153,60 @@ const revokeClientAccess = async (client: OAuthClientResponseDto) => {
 		toast.showError(error, i18n.baseText('settings.mcp.oAuthClients.revoke.error'));
 	}
 };
-
-const onRefreshOAuthClients = async () => {
-	await fetchoAuthCLients();
-};
-
-const onRefreshWorkflows = async () => {
-	await fetchAvailableWorkflows();
-};
-
-onMounted(async () => {
-	documentTitle.set(i18n.baseText('settings.mcp'));
-	if (!mcpStore.mcpAccessEnabled) {
-		return;
-	}
-	await fetchAvailableWorkflows();
-	await fetchApiKey();
-	await fetchoAuthCLients();
-});
 </script>
 <template>
 	<div :class="$style.container">
-		<N8nHeading size="2xlarge" class="mb-2xs">{{ i18n.baseText('settings.mcp') }}</N8nHeading>
-		<McpAccessToggle
-			data-test-id="mcp-toggle-section"
-			:model-value="mcpStore.mcpAccessEnabled"
+		<header :class="$style['main-header']" data-test-id="mcp-settings-header">
+			<N8nHeading size="2xlarge" class="mb-2xs">{{ i18n.baseText('settings.mcp') }}</N8nHeading>
+			<MCpHeaderActions
+				:access-enabled="mcpStore.mcpAccessEnabled"
+				:toggle-disabled="!canToggleMCP"
+				:loading="mcpStatusLoading"
+				@disable-mcp-access="onToggleMCPAccess(!mcpStore.mcpAccessEnabled)"
+			/>
+		</header>
+		<MCPEmptyState
+			v-if="!mcpStore.mcpAccessEnabled"
 			:disabled="!canToggleMCP"
 			:loading="mcpStatusLoading"
-			@toggle-mcp-access="onToggleMCPAccess"
+			@turn-on-mcp="onToggleMCPAccess(true)"
 		/>
 		<div
 			v-if="mcpStore.mcpAccessEnabled"
 			:class="$style.container"
 			data-test-id="mcp-enabled-section"
 		>
-			<MCPConnectionInstructions
-				v-if="apiKey"
-				:loading-api-key="mcpKeyLoading"
-				:base-url="rootStore.urlBaseEditor"
-				:api-key="apiKey"
-				:o-auth-clients="connectedOAuthClients"
-				:loading-o-auth-clients="oAuthClientsLoading"
-				@rotate-key="rotateKey"
-				@revoke-client="revokeClientAccess"
-				@refresh-client-list="onRefreshOAuthClients"
-			/>
-			<WorkflowsTable
-				:data-test-id="'mcp-workflow-table'"
-				:workflows="availableWorkflows"
-				:loading="workflowsLoading"
-				@remove-mcp-access="onRemoveMCPAccess"
-				@refresh="onRefreshWorkflows"
-			/>
+			<header :class="$style['tabs-header']">
+				<N8nTabs :model-value="selectedTab" :options="tabs" @update:model-value="onTabSelected" />
+				<N8nTooltip :content="i18n.baseText('settings.mcp.refresh.tooltip')">
+					<N8nButton
+						data-test-id="mcp-workflows-refresh-button"
+						size="small"
+						type="tertiary"
+						icon="refresh-cw"
+						:square="true"
+						@click="onTableRefresh"
+					/>
+				</N8nTooltip>
+			</header>
+			<main>
+				<WorkflowsTable
+					v-if="selectedTab === 'workflows'"
+					:data-test-id="'mcp-workflow-table'"
+					:workflows="availableWorkflows"
+					:loading="workflowsLoading"
+					@remove-mcp-access="onRemoveMCPAccess"
+					@refresh="onRefreshWorkflows"
+				/>
+				<OAuthClientsTable
+					v-else-if="selectedTab === 'oauth'"
+					:data-test-id="'mcp-oauth-clients-table'"
+					:clients="connectedOAuthClients"
+					:loading="oAuthClientsLoading"
+					@revoke-client="revokeClientAccess"
+					@refresh="onTableRefresh"
+				/>
+			</main>
 		</div>
 	</div>
 </template>
@@ -198,6 +215,17 @@ onMounted(async () => {
 .container {
 	display: flex;
 	flex-direction: column;
-	gap: var(--spacing--lg);
+}
+
+.main-header {
+	display: flex;
+	justify-content: space-between;
+	margin-bottom: var(--spacing--lg);
+}
+
+.tabs-header {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
 }
 </style>
diff --git a/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/ConnectionParameter.vue b/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/ConnectionParameter.vue
deleted file mode 100644
index ba955389826..00000000000
--- a/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/ConnectionParameter.vue
+++ /dev/null
@@ -1,94 +0,0 @@
-<script setup lang="ts">
-import { useI18n } from '@n8n/i18n';
-import { useClipboard } from '@/app/composables/useClipboard';
-import { N8nButton, N8nTooltip } from '@n8n/design-system';
-
-type Props = {
-	value: string;
-	allowCopy?: boolean;
-	maxWidth?: number;
-};
-
-const { copy, copied, isSupported } = useClipboard();
-const i18n = useI18n();
-
-const props = withDefaults(defineProps<Props>(), {
-	allowCopy: true,
-	maxWidth: undefined,
-});
-</script>
-
-<template>
-	<div
-		:class="$style.container"
-		:style="{ maxWidth: props.maxWidth ? props.maxWidth + 'px' : 'none' }"
-	>
-		<code>{{ props.value }}</code>
-		<div :class="$style['copy-button-wrapper']">
-			<slot name="customActions" />
-			<N8nTooltip
-				:disabled="!isSupported"
-				:content="copied ? i18n.baseText('generic.copied') : i18n.baseText('generic.copy')"
-				placement="right"
-			>
-				<N8nButton
-					v-if="props.allowCopy && isSupported"
-					type="tertiary"
-					:icon="copied ? 'clipboard-check' : 'clipboard'"
-					:square="true"
-					:class="$style['copy-button']"
-					@click="copy(props.value)"
-				/>
-			</N8nTooltip>
-		</div>
-	</div>
-</template>
-
-<style module lang="scss">
-.container {
-	display: flex;
-	align-items: stretch;
-	gap: var(--spacing--2xs);
-	background: var(--color--background--light-3);
-	border: var(--border);
-	border-radius: var(--radius);
-	font-size: var(--font-size--sm);
-	overflow: hidden;
-
-	button {
-		border: none;
-		border-radius: 0;
-
-		&:hover {
-			border-color: inherit;
-		}
-	}
-
-	button + button {
-		border-left: var(--border);
-	}
-
-	@media screen and (max-width: 820px) {
-		word-wrap: break-word;
-		margin-top: var(--spacing--2xs);
-	}
-}
-
-code {
-	text-overflow: ellipsis;
-	overflow: hidden;
-	white-space: pre;
-	padding: var(--spacing--2xs) var(--spacing--3xs);
-}
-
-.copy-button-wrapper {
-	display: flex;
-	align-items: center;
-	border-left: var(--border);
-}
-
-.copy-button {
-	border: none;
-	border-radius: 0;
-}
-</style>
diff --git a/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/MCPConnectionInstructions.test.ts b/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/MCPConnectionInstructions.test.ts
deleted file mode 100644
index 343dd64b242..00000000000
--- a/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/MCPConnectionInstructions.test.ts
+++ /dev/null
@@ -1,150 +0,0 @@
-import { createComponentRenderer } from '@/__tests__/render';
-import MCPConnectionInstructions from './MCPConnectionInstructions.vue';
-import { describe, it, expect, beforeEach, vi } from 'vitest';
-import { createPinia, setActivePinia } from 'pinia';
-import userEvent from '@testing-library/user-event';
-import type { ApiKey, OAuthClientResponseDto } from '@n8n/api-types';
-import { MCP_DOCS_PAGE_URL } from '@/features/ai/mcpAccess/mcp.constants';
-
-const renderComponent = createComponentRenderer(MCPConnectionInstructions);
-
-let pinia: ReturnType<typeof createPinia>;
-
-vi.mock(
-	'@/features/ai/mcpAccess/components/connectionInstructions/OAuthConnectionInstructions.vue',
-	() => ({
-		default: {
-			name: 'OAuthConnectionInstructions',
-			template: '<div data-test-id="oauth-instructions">OAuth Instructions</div>',
-			props: ['serverUrl', 'clients', 'clientsLoading'],
-		},
-	}),
-);
-
-vi.mock(
-	'@/features/ai/mcpAccess/components/connectionInstructions/AccessTokenConnectionInstructions.vue',
-	() => ({
-		default: {
-			name: 'AccessTokenConnectionInstructions',
-			template: '<div data-test-id="token-instructions">Token Instructions</div>',
-			props: ['serverUrl', 'apiKey', 'loadingApiKey'],
-		},
-	}),
-);
-
-describe('MCPConnectionInstructions', () => {
-	const mockApiKey: ApiKey = {
-		id: '123',
-		label: 'Test Key',
-		apiKey: 'test-api-key',
-		createdAt: '2024-01-01',
-		updatedAt: '2024-01-01',
-		expiresAt: null,
-		scopes: [],
-	};
-
-	const mockOAuthClients: OAuthClientResponseDto[] = [
-		{
-			id: '1',
-			name: 'Test Client',
-			redirectUris: ['http://localhost/callback'],
-			grantTypes: ['authorization_code'],
-			tokenEndpointAuthMethod: 'client_secret_basic',
-			createdAt: '2024-01-01T00:00:00.000Z',
-			updatedAt: '2024-01-01T00:00:00.000Z',
-		},
-	];
-
-	const defaultProps = {
-		baseUrl: 'http://localhost:5678',
-		apiKey: mockApiKey,
-		loadingApiKey: false,
-		oAuthClients: mockOAuthClients,
-		loadingOAuthClients: false,
-	};
-
-	beforeEach(() => {
-		pinia = createPinia();
-		setActivePinia(pinia);
-	});
-
-	it('should render default configuration correctly', () => {
-		const { container, getByText, getByTestId } = renderComponent({
-			pinia,
-			props: defaultProps,
-		});
-
-		// Main heading
-		expect(getByText('How to connect')).toBeInTheDocument();
-
-		// Both tabs
-		const tabs = container.querySelectorAll('.n8n-tabs .tab');
-		expect(tabs).toHaveLength(2);
-		expect(tabs[0]).toHaveTextContent('OAuth');
-		expect(tabs[1]).toHaveTextContent('Access Token');
-		// OAuth tab should be active by default
-		expect(getByTestId('oauth-instructions')).toBeInTheDocument();
-		expect(getByTestId('oauth-instructions')).toBeVisible();
-
-		// Documentation link
-		const docsText = getByTestId('mcp-connection-instructions-docs-text');
-		expect(docsText).toBeInTheDocument();
-		const docsLink = docsText.querySelector('a');
-		expect(docsLink).toBeInTheDocument();
-		expect(docsLink).toHaveAttribute('href', MCP_DOCS_PAGE_URL);
-		expect(docsLink).toHaveAttribute('target', '_blank');
-	});
-
-	it('should switch to API Key tab when clicked', async () => {
-		const { container, getByTestId, queryByTestId } = renderComponent({
-			pinia,
-			props: defaultProps,
-		});
-
-		// Find and click the API Key tab
-		const tabs = container.querySelectorAll('.n8n-tabs .tab');
-		const oauthTab = tabs[0];
-		const apiKeyTab = tabs[1];
-		expect(apiKeyTab).toHaveTextContent('Access Token');
-
-		await userEvent.click(apiKeyTab);
-
-		// OAuth instructions should be hidden
-		expect(getByTestId('token-instructions')).toBeInTheDocument();
-		expect(queryByTestId('oauth-instructions')).not.toBeVisible();
-		expect(oauthTab).not.toHaveClass('activeTab');
-
-		// Token instructions should be visible
-		expect(getByTestId('token-instructions')).toBeInTheDocument();
-		expect(getByTestId('token-instructions')).toBeVisible();
-		expect(apiKeyTab).toHaveClass('activeTab');
-	});
-
-	it('should switch back to OAuth tab when clicked', async () => {
-		const { container, getByTestId, queryByTestId } = renderComponent({
-			pinia,
-			props: defaultProps,
-		});
-
-		// First switch to API Key tab
-		const tabs = container.querySelectorAll('.n8n-tabs .tab');
-		const oauthTab = tabs[0];
-		const apiKeyTab = tabs[1];
-		await userEvent.click(apiKeyTab);
-
-		// Verify API Key tab is active
-		expect(queryByTestId('oauth-instructions')).not.toBeVisible();
-		expect(oauthTab).not.toHaveClass('activeTab');
-		expect(getByTestId('token-instructions')).toBeVisible();
-		expect(apiKeyTab).toHaveClass('activeTab');
-
-		// Switch back to OAuth tab
-		await userEvent.click(oauthTab);
-
-		// OAuth instructions should be visible again
-		expect(getByTestId('oauth-instructions')).toBeVisible();
-		expect(oauthTab).toHaveClass('activeTab');
-		expect(queryByTestId('token-instructions')).not.toBeVisible();
-		expect(apiKeyTab).not.toHaveClass('activeTab');
-	});
-});
diff --git a/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/MCPConnectionInstructions.vue b/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/MCPConnectionInstructions.vue
deleted file mode 100644
index 57a86d3db6b..00000000000
--- a/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/MCPConnectionInstructions.vue
+++ /dev/null
@@ -1,113 +0,0 @@
-<script setup lang="ts">
-import { ref } from 'vue';
-import { useI18n } from '@n8n/i18n';
-import { N8nHeading, N8nTabs, N8nText } from '@n8n/design-system';
-import type { ApiKey } from '@n8n/api-types';
-import type { TabOptions } from '@n8n/design-system';
-import type { OAuthClientResponseDto } from '@n8n/api-types';
-import OAuthConnectionInstructions from '@/features/ai/mcpAccess/components/connectionInstructions/OAuthConnectionInstructions.vue';
-import AccessTokenConnectionInstructions from '@/features/ai/mcpAccess/components/connectionInstructions/AccessTokenConnectionInstructions.vue';
-import { MCP_DOCS_PAGE_URL } from '@/features/ai/mcpAccess/mcp.constants';
-import { useTelemetry } from '@/app/composables/useTelemetry';
-
-const MCP_ENDPOINT = 'mcp-server/http';
-
-type ConnectionTabType = 'oauth' | 'token';
-
-type Props = {
-	baseUrl: string;
-	apiKey: ApiKey;
-	loadingApiKey: boolean;
-	oAuthClients: OAuthClientResponseDto[];
-	loadingOAuthClients: boolean;
-};
-
-const props = defineProps<Props>();
-
-const emit = defineEmits<{
-	rotateKey: [];
-	revokeClient: [client: OAuthClientResponseDto];
-	refreshClientList: [];
-}>();
-
-const i18n = useI18n();
-const telemetry = useTelemetry();
-
-const selectedTab = ref<ConnectionTabType>('oauth');
-
-const tabs = ref<Array<TabOptions<ConnectionTabType>>>([
-	{
-		label: i18n.baseText('settings.mcp.instructions.tabs.oauth'),
-		value: 'oauth',
-	},
-	{
-		label: i18n.baseText('settings.mcp.instructions.tabs.apiKey'),
-		value: 'token',
-	},
-]);
-
-const onTabSelected = (tab: ConnectionTabType) => {
-	selectedTab.value = tab;
-};
-
-const onClientRevoked = (client: OAuthClientResponseDto) => {
-	emit('revokeClient', client);
-	telemetry.track('User revoked access for MCP OAuth client', {
-		client_name: client.name,
-	});
-};
-
-const trackCopyEvent = (payload: {
-	item: 'server-url' | 'access-token' | 'mcp-json';
-	source: 'oauth-tab' | 'token-tab';
-}) => {
-	telemetry.track('User copied MCP connection parameter', {
-		parameter: payload.item,
-		source: payload.source,
-	});
-};
-</script>
-
-<template>
-	<div :class="$style.container">
-		<N8nHeading size="medium" :bold="true">
-			{{ i18n.baseText('settings.mcp.connection.info.heading') }}
-		</N8nHeading>
-		<div>
-			<N8nTabs :model-value="selectedTab" :options="tabs" @update:model-value="onTabSelected" />
-			<OAuthConnectionInstructions
-				v-show="selectedTab === 'oauth'"
-				:server-url="`${props.baseUrl}${MCP_ENDPOINT}`"
-				:clients="props.oAuthClients"
-				:clients-loading="props.loadingOAuthClients"
-				@revoke-client="onClientRevoked"
-				@refresh="emit('refreshClientList')"
-				@url-copied="trackCopyEvent({ item: 'server-url', source: 'oauth-tab' })"
-			/>
-			<AccessTokenConnectionInstructions
-				v-show="selectedTab === 'token'"
-				:server-url="`${props.baseUrl}${MCP_ENDPOINT}`"
-				:api-key="props.apiKey"
-				:loading-api-key="props.loadingApiKey"
-				@rotate-key="emit('rotateKey')"
-				@connection-string-copied="trackCopyEvent({ item: 'mcp-json', source: 'token-tab' })"
-				@access-token-copied="trackCopyEvent({ item: 'access-token', source: 'token-tab' })"
-				@url-copied="trackCopyEvent({ item: 'server-url', source: 'token-tab' })"
-			/>
-			<N8nText size="small" data-test-id="mcp-connection-instructions-docs-text">
-				{{ i18n.baseText('settings.mcp.instructions.docs.part1') }}
-				<a :href="MCP_DOCS_PAGE_URL" target="_blank">
-					{{ i18n.baseText('settings.mcp.instructions.docs.part2') }}
-				</a>
-			</N8nText>
-		</div>
-	</div>
-</template>
-
-<style module lang="scss">
-.container {
-	display: flex;
-	flex-direction: column;
-	gap: var(--spacing--md);
-}
-</style>
diff --git a/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/MCPEmptyState.vue b/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/MCPEmptyState.vue
new file mode 100644
index 00000000000..302f5623a47
--- /dev/null
+++ b/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/MCPEmptyState.vue
@@ -0,0 +1,73 @@
+<script setup lang="ts">
+import { N8nActionBox } from '@n8n/design-system';
+import { N8nText } from '@n8n/design-system';
+import { MCP_DOCS_PAGE_URL } from '@/features/ai/mcpAccess/mcp.constants';
+import { useI18n } from '@n8n/i18n';
+
+type Props = {
+	disabled?: boolean;
+	loading?: boolean;
+};
+
+const props = withDefaults(defineProps<Props>(), {
+	disabled: false,
+	loading: false,
+});
+
+const emit = defineEmits<{
+	turnOnMcp: [];
+}>();
+
+const i18n = useI18n();
+</script>
+
+<template>
+	<div :class="$style.container" data-test-id="mcp-empty-state-container">
+		<N8nActionBox
+			:icon="{ type: 'icon', value: 'mcp' }"
+			:heading="i18n.baseText('settings.mcp.actionBox.heading')"
+			:description="i18n.baseText('settings.mcp.toggle.disabled.notice')"
+			:button-text="i18n.baseText('settings.mcp.actionBox.button.label')"
+			:button-disabled="props.disabled || props.loading"
+			button-variant="primary"
+			data-test-id="enable-mcp-access-button"
+			@click:button="emit('turnOnMcp')"
+		>
+			<template #disabledButtonTooltip>
+				<span v-if="props.loading">{{ i18n.baseText('generic.loading') }}...</span>
+				<span v-else-if="props.disabled">
+					{{ i18n.baseText('settings.mcp.toggle.disabled.tooltip') }}
+				</span>
+			</template>
+			<template #additionalContent>
+				<N8nText color="text-light" size="small">
+					{{ i18n.baseText('settings.mcp.emptyState.docs.part1') }}
+					<a
+						:href="MCP_DOCS_PAGE_URL"
+						:class="$style['docs-link']"
+						target="_blank"
+						rel="noopener noreferrer"
+					>
+						{{ i18n.baseText('generic.learnMore').toLowerCase() }}
+					</a>
+				</N8nText>
+			</template>
+		</N8nActionBox>
+	</div>
+</template>
+
+<style lang="scss" module>
+.container {
+	display: flex;
+	flex-direction: column;
+	gap: var(--spacing--lg);
+
+	button {
+		margin-bottom: var(--spacing--2xs);
+	}
+}
+
+.docs-link {
+	text-decoration: underline;
+}
+</style>
diff --git a/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/McpAccessToggle.test.ts b/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/McpAccessToggle.test.ts
deleted file mode 100644
index bfa17c3b639..00000000000
--- a/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/McpAccessToggle.test.ts
+++ /dev/null
@@ -1,199 +0,0 @@
-import { createComponentRenderer } from '@/__tests__/render';
-import McpAccessToggle from './McpAccessToggle.vue';
-import { describe, it, expect, beforeEach } from 'vitest';
-import { createPinia, setActivePinia } from 'pinia';
-import userEvent from '@testing-library/user-event';
-import { waitFor } from '@testing-library/vue';
-
-const renderComponent = createComponentRenderer(McpAccessToggle);
-
-let pinia: ReturnType<typeof createPinia>;
-
-describe('McpAccessToggle', () => {
-	beforeEach(() => {
-		pinia = createPinia();
-		setActivePinia(pinia);
-	});
-
-	describe('Component rendering', () => {
-		it('should handle modelValue and disabled prop combinations correctly', () => {
-			// Test modelValue=true, disabled=true
-			{
-				const { getByTestId, unmount } = renderComponent({
-					pinia,
-					props: { modelValue: true, disabled: true },
-				});
-				const toggle = getByTestId('mcp-access-toggle');
-				expect(toggle).toHaveClass('is-checked');
-				expect(toggle).toHaveClass('is-disabled');
-				unmount();
-			}
-
-			// Test modelValue=true, disabled=false
-			{
-				const { getByTestId, unmount } = renderComponent({
-					pinia,
-					props: { modelValue: true, disabled: false },
-				});
-				const toggle = getByTestId('mcp-access-toggle');
-				expect(toggle).toHaveClass('is-checked');
-				expect(toggle).not.toHaveClass('is-disabled');
-				unmount();
-			}
-
-			// Test modelValue=false, disabled=true
-			{
-				const { getByTestId, unmount } = renderComponent({
-					pinia,
-					props: { modelValue: false, disabled: true },
-				});
-				const toggle = getByTestId('mcp-access-toggle');
-				expect(toggle).not.toHaveClass('is-checked');
-				expect(toggle).toHaveClass('is-disabled');
-				unmount();
-			}
-
-			// Test modelValue=false, disabled=false
-			{
-				const { getByTestId, unmount } = renderComponent({
-					pinia,
-					props: { modelValue: false, disabled: false },
-				});
-				const toggle = getByTestId('mcp-access-toggle');
-				expect(toggle).not.toHaveClass('is-checked');
-				expect(toggle).not.toHaveClass('is-disabled');
-				unmount();
-			}
-		});
-
-		it('should handle loading prop correctly', () => {
-			const { getByTestId, unmount: unmount1 } = renderComponent({
-				pinia,
-				props: { modelValue: false, loading: true },
-			});
-			expect(getByTestId('mcp-access-toggle')).toBeInTheDocument();
-			unmount1();
-
-			const { getByTestId: getByTestId2, unmount: unmount2 } = renderComponent({
-				pinia,
-				props: { modelValue: false, loading: false },
-			});
-			expect(getByTestId2('mcp-access-toggle')).toBeInTheDocument();
-			unmount2();
-		});
-	});
-
-	describe('Disabled state', () => {
-		it('should render as disabled when disabled prop is true', () => {
-			const { getByTestId } = renderComponent({
-				pinia,
-				props: {
-					modelValue: false,
-					disabled: true,
-				},
-			});
-
-			const toggle = getByTestId('mcp-access-toggle');
-			expect(toggle).toHaveClass('is-disabled');
-		});
-
-		it('should render as enabled when disabled prop is false', () => {
-			const { getByTestId } = renderComponent({
-				pinia,
-				props: {
-					modelValue: false,
-					disabled: false,
-				},
-			});
-
-			const toggle = getByTestId('mcp-access-toggle');
-			expect(toggle).not.toHaveClass('is-disabled');
-		});
-
-		it('should show tooltip when disabled', async () => {
-			const { container, queryByRole } = renderComponent({
-				pinia,
-				props: {
-					modelValue: false,
-					disabled: true,
-				},
-			});
-
-			const tooltipTrigger = container.querySelector('.el-tooltip__trigger');
-			expect(tooltipTrigger).toBeInTheDocument();
-
-			await userEvent.hover(tooltipTrigger!);
-			await waitFor(() => {
-				const tooltip = queryByRole('tooltip');
-				expect(tooltip).toBeInTheDocument();
-				expect(tooltip).toHaveTextContent('Only instance admins can change this');
-			});
-		});
-
-		it('should not show tooltip when enabled', async () => {
-			const { container, queryByRole } = renderComponent({
-				pinia,
-				props: {
-					modelValue: false,
-					disabled: false,
-				},
-			});
-
-			const tooltipTrigger = container.querySelector('.el-tooltip__trigger');
-			expect(tooltipTrigger).toBeInTheDocument();
-
-			await userEvent.hover(tooltipTrigger!);
-
-			expect(queryByRole('tooltip')).not.toBeInTheDocument();
-		});
-	});
-
-	describe('Event emissions', () => {
-		it('should emit toggleMcpAccess event with true when toggled on', async () => {
-			const { getByTestId, emitted } = renderComponent({
-				pinia,
-				props: {
-					modelValue: false,
-				},
-			});
-
-			const toggle = getByTestId('mcp-access-toggle');
-			await userEvent.click(toggle);
-
-			expect(emitted()).toHaveProperty('toggleMcpAccess');
-			expect(emitted().toggleMcpAccess).toHaveLength(1);
-			expect(emitted().toggleMcpAccess[0]).toEqual([true]);
-		});
-
-		it('should emit toggleMcpAccess event with false when toggled off', async () => {
-			const { getByTestId, emitted } = renderComponent({
-				pinia,
-				props: {
-					modelValue: true,
-				},
-			});
-
-			const toggle = getByTestId('mcp-access-toggle');
-			await userEvent.click(toggle);
-
-			expect(emitted()).toHaveProperty('toggleMcpAccess');
-			expect(emitted().toggleMcpAccess).toHaveLength(1);
-			expect(emitted().toggleMcpAccess[0]).toEqual([false]);
-		});
-
-		it('should not emit event when disabled', async () => {
-			const { getByTestId, emitted } = renderComponent({
-				pinia,
-				props: {
-					modelValue: false,
-					disabled: true,
-				},
-			});
-
-			const toggle = getByTestId('mcp-access-toggle');
-			await userEvent.click(toggle);
-
-			expect(emitted()).not.toHaveProperty('toggleMcpAccess');
-		});
-	});
-});
diff --git a/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/McpAccessToggle.vue b/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/McpAccessToggle.vue
deleted file mode 100644
index 4bd1c99cbea..00000000000
--- a/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/McpAccessToggle.vue
+++ /dev/null
@@ -1,105 +0,0 @@
-<script setup lang="ts">
-import { ElSwitch } from 'element-plus';
-import { N8nLink, N8nText, N8nTooltip } from '@n8n/design-system';
-import { useI18n } from '@n8n/i18n';
-import { MCP_DOCS_PAGE_URL } from '@/features/ai/mcpAccess/mcp.constants';
-
-type Props = {
-	modelValue: boolean;
-	disabled?: boolean;
-	loading?: boolean;
-};
-
-const props = withDefaults(defineProps<Props>(), {
-	disabled: false,
-	loading: false,
-});
-
-const emit = defineEmits<{
-	toggleMcpAccess: [enabled: boolean];
-}>();
-
-const i18n = useI18n();
-
-const onUpdateMCPEnabled = (value: string | number | boolean) => {
-	const boolValue = typeof value === 'boolean' ? value : Boolean(value);
-	emit('toggleMcpAccess', boolValue);
-};
-</script>
-
-<template>
-	<div :class="$style['mcp-access-toggle']">
-		<div :class="$style['main-toggle-container']">
-			<div :class="$style['main-toggle-info']">
-				<N8nText :bold="true">{{ i18n.baseText('settings.mcp.toggle.label') }}</N8nText>
-				<N8nText size="small" color="text-light">
-					{{ i18n.baseText('settings.mcp.toggle.description') }}
-				</N8nText>
-			</div>
-			<div :class="$style['main-toggle']" data-test-id="mcp-toggle-container">
-				<N8nTooltip
-					:content="i18n.baseText('settings.mcp.toggle.disabled.tooltip')"
-					:disabled="!props.disabled"
-					placement="top"
-				>
-					<ElSwitch
-						size="large"
-						data-test-id="mcp-access-toggle"
-						:model-value="props.modelValue"
-						:disabled="props.disabled"
-						:loading="props.loading"
-						@update:model-value="onUpdateMCPEnabled"
-					/>
-				</N8nTooltip>
-			</div>
-		</div>
-		<div v-if="!props.modelValue" :class="$style['toggle-notice']">
-			<N8nText color="text-base" data-test-id="mcp-toggle-disabled-notice">
-				{{ i18n.baseText('settings.mcp.toggle.disabled.notice') }}
-			</N8nText>
-			<N8nLink :to="MCP_DOCS_PAGE_URL" :new-window="true">
-				{{ i18n.baseText('generic.learnMore') }}
-			</N8nLink>
-		</div>
-	</div>
-</template>
-
-<style module lang="scss">
-.mcp-access-toggle {
-	display: flex;
-	flex-direction: column;
-	gap: var(--spacing--sm);
-	width: 100%;
-}
-
-.main-toggle-container {
-	display: flex;
-	align-items: center;
-	padding: var(--spacing--sm);
-	justify-content: space-between;
-	flex-shrink: 0;
-
-	border-radius: var(--radius);
-	border: var(--border);
-}
-
-.main-toggle-info {
-	display: flex;
-	flex-direction: column;
-	justify-content: center;
-	align-items: flex-start;
-}
-
-.main-toggle {
-	display: flex;
-	justify-content: flex-end;
-	align-items: center;
-	flex-shrink: 0;
-}
-
-.toggle-notice {
-	display: flex;
-	align-items: center;
-	gap: var(--spacing--4xs);
-}
-</style>
diff --git a/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/WorkflowsTable.test.ts b/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/WorkflowsTable.test.ts
deleted file mode 100644
index 24d77fa22b3..00000000000
--- a/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/WorkflowsTable.test.ts
+++ /dev/null
@@ -1,368 +0,0 @@
-import { createComponentRenderer } from '@/__tests__/render';
-import WorkflowsTable from './WorkflowsTable.vue';
-import { describe, it, expect, beforeEach, vi } from 'vitest';
-import { createPinia, setActivePinia } from 'pinia';
-import userEvent from '@testing-library/user-event';
-import type { WorkflowListItem } from '@/Interface';
-import router from '@/app/router';
-import { VIEWS } from '@/app/constants';
-
-const renderComponent = createComponentRenderer(WorkflowsTable);
-
-let pinia: ReturnType<typeof createPinia>;
-
-// Mock router
-vi.mock('@/app/router', () => ({
-	default: {
-		resolve: vi.fn((route) => ({
-			fullPath: `/mock-path/${route.params?.name || route.params?.projectId}`,
-		})),
-	},
-}));
-
-const mockWorkflow = (id: string, overrides?: Partial<WorkflowListItem>): WorkflowListItem => ({
-	id,
-	name: `Workflow ${id}`,
-	active: true,
-	activeVersionId: 'v1',
-	isArchived: false,
-	createdAt: '2024-01-01T00:00:00.000Z',
-	updatedAt: '2024-01-02T00:00:00.000Z',
-	versionId: 'v1',
-	resource: 'workflow',
-	homeProject: {
-		id: 'project-1',
-		name: 'Test Project',
-		type: 'team',
-		icon: { type: 'icon', value: 'layers' },
-		createdAt: '2024-01-01T00:00:00.000Z',
-		updatedAt: '2024-01-01T00:00:00.000Z',
-	},
-	parentFolder: {
-		id: 'folder-1',
-		name: 'Test Folder',
-		parentFolderId: null,
-		createdAt: '2024-01-01T00:00:00.000Z',
-		updatedAt: '2024-01-01T00:00:00.000Z',
-	},
-	...overrides,
-});
-
-describe('WorkflowsTable', () => {
-	beforeEach(() => {
-		pinia = createPinia();
-		setActivePinia(pinia);
-		vi.clearAllMocks();
-	});
-
-	describe('Component rendering', () => {
-		it('should render loading state correctly', () => {
-			const { container, getByTestId } = renderComponent({
-				pinia,
-				props: {
-					workflows: [],
-					loading: true,
-				},
-			});
-
-			const loadingElements = container.querySelectorAll('.n8n-loading');
-			expect(loadingElements.length).toBeGreaterThan(0);
-
-			expect(() => getByTestId('mcp-workflow-table')).toThrow();
-			expect(() => getByTestId('empty-workflow-list-box')).toThrow();
-		});
-
-		it('should render empty state when no workflows exist', () => {
-			const { getByTestId } = renderComponent({
-				pinia,
-				props: {
-					workflows: [],
-					loading: false,
-				},
-			});
-
-			expect(getByTestId('empty-workflow-list-box')).toBeInTheDocument();
-		});
-
-		it('should render workflows table with correct data', () => {
-			const workflows = [mockWorkflow('1'), mockWorkflow('2', { name: 'Second Workflow' })];
-
-			const { getByTestId, getByText } = renderComponent({
-				pinia,
-				props: {
-					workflows,
-					loading: false,
-				},
-			});
-
-			const table = getByTestId('mcp-workflow-table');
-			expect(table).toBeInTheDocument();
-
-			expect(getByText(`Available Workflows (${workflows.length})`)).toBeInTheDocument();
-
-			workflows.forEach((workflow) => {
-				expect(getByText(workflow.name)).toBeInTheDocument();
-			});
-		});
-
-		it('should render refresh button', () => {
-			const { getByTestId } = renderComponent({
-				pinia,
-				props: {
-					workflows: [mockWorkflow('1')],
-					loading: false,
-				},
-			});
-
-			const refreshButton = getByTestId('mcp-workflows-refresh-button');
-			expect(refreshButton).toBeInTheDocument();
-		});
-	});
-
-	describe('Table data display', () => {
-		it('should display workflow and folder names as links', () => {
-			const workflow = mockWorkflow('1');
-			const { getByTestId } = renderComponent({
-				pinia,
-				props: {
-					workflows: [workflow],
-					loading: false,
-				},
-			});
-
-			const nameLink = getByTestId('mcp-workflow-name-link');
-			expect(nameLink).toHaveTextContent(workflow.name);
-			expect(nameLink).toHaveAttribute('href', `/mock-path/${workflow.id}`);
-
-			const folderElement = getByTestId('mcp-workflow-folder-link');
-			expect(folderElement).toHaveTextContent(workflow.parentFolder?.name ?? '');
-			expect(folderElement).toHaveAttribute(
-				'href',
-				`/projects/${workflow.homeProject?.id}/folders/${workflow.parentFolder?.id}/workflows`,
-			);
-		});
-
-		it('should render only workflow link if no parent folder', () => {
-			const workflow = mockWorkflow('1', {
-				parentFolder: undefined,
-			});
-
-			const { getByTestId, queryByTestId } = renderComponent({
-				pinia,
-				props: {
-					workflows: [workflow],
-					loading: false,
-				},
-			});
-
-			// Should render workflow link
-			const nameLink = getByTestId('mcp-workflow-name-link');
-			expect(nameLink).toBeInTheDocument();
-			expect(nameLink).toHaveTextContent(workflow.name);
-
-			// Should not render folder elements, separators or ellipsis
-			expect(queryByTestId('mcp-workflow-folder-link')).not.toBeInTheDocument();
-			expect(queryByTestId('mcp-workflow-folder-name')).not.toBeInTheDocument();
-			expect(queryByTestId('mcp-workflow-folder-separator')).not.toBeInTheDocument();
-			expect(queryByTestId('mcp-workflow-ellipsis-separator')).not.toBeInTheDocument();
-			expect(queryByTestId('mcp-workflow-grandparent-folder')).not.toBeInTheDocument();
-		});
-
-		it('should render ellipsis if parent folder has parent', () => {
-			const workflow = mockWorkflow('1', {
-				parentFolder: {
-					id: 'folder-1',
-					name: 'Child Folder',
-					parentFolderId: 'parent-folder-1', // This indicates it has a parent
-					createdAt: '2024-01-01T00:00:00.000Z',
-					updatedAt: '2024-01-01T00:00:00.000Z',
-				},
-			});
-
-			const { getByTestId } = renderComponent({
-				pinia,
-				props: {
-					workflows: [workflow],
-					loading: false,
-				},
-			});
-
-			// Should render ellipsis for grandparent
-			const grandparentElement = getByTestId('mcp-workflow-grandparent-folder');
-			expect(grandparentElement).toBeInTheDocument();
-
-			const ellipsis = grandparentElement.querySelector('.ellipsis');
-			expect(ellipsis).toBeInTheDocument();
-			expect(ellipsis).toHaveTextContent('...');
-
-			// Check for separator after ellipsis
-			const ellipsisSeparator = getByTestId('mcp-workflow-ellipsis-separator');
-			expect(ellipsisSeparator).toBeInTheDocument();
-			expect(ellipsisSeparator).toHaveTextContent('/');
-
-			// Should still render parent folder
-			const folderLink = getByTestId('mcp-workflow-folder-link');
-			expect(folderLink).toBeInTheDocument();
-			expect(folderLink).toHaveTextContent(workflow.parentFolder?.name ?? '');
-
-			// Should render separator after folder
-			const folderSeparator = getByTestId('mcp-workflow-folder-separator');
-			expect(folderSeparator).toBeInTheDocument();
-			expect(folderSeparator).toHaveTextContent('/');
-
-			// Should render workflow link
-			const nameLink = getByTestId('mcp-workflow-name-link');
-			expect(nameLink).toBeInTheDocument();
-			expect(nameLink).toHaveTextContent(workflow.name);
-		});
-
-		it('should not render ellipsis if parent folder has no parent', () => {
-			const workflow = mockWorkflow('1', {
-				parentFolder: {
-					id: 'folder-1',
-					name: 'Root Folder',
-					parentFolderId: null, // No parent
-					createdAt: '2024-01-01T00:00:00.000Z',
-					updatedAt: '2024-01-01T00:00:00.000Z',
-				},
-			});
-
-			const { getByTestId, queryByTestId } = renderComponent({
-				pinia,
-				props: {
-					workflows: [workflow],
-					loading: false,
-				},
-			});
-
-			// Should NOT render ellipsis for grandparent
-			expect(queryByTestId('mcp-workflow-grandparent-folder')).not.toBeInTheDocument();
-
-			// Should NOT render ellipsis separator
-			expect(queryByTestId('mcp-workflow-ellipsis-separator')).not.toBeInTheDocument();
-
-			// Should render parent folder
-			const folderLink = getByTestId('mcp-workflow-folder-link');
-			expect(folderLink).toBeInTheDocument();
-			expect(folderLink).toHaveTextContent(workflow.parentFolder?.name ?? '');
-
-			// Should render separator after folder
-			const folderSeparator = getByTestId('mcp-workflow-folder-separator');
-			expect(folderSeparator).toBeInTheDocument();
-			expect(folderSeparator).toHaveTextContent('/');
-
-			// Should render workflow link
-			const nameLink = getByTestId('mcp-workflow-name-link');
-			expect(nameLink).toBeInTheDocument();
-			expect(nameLink).toHaveTextContent(workflow.name);
-		});
-
-		it('should display folder without link when homeProject does not exist', () => {
-			const workflow = mockWorkflow('1', {
-				homeProject: undefined,
-			});
-
-			const { getByTestId, queryByTestId } = renderComponent({
-				pinia,
-				props: {
-					workflows: [workflow],
-					loading: false,
-				},
-			});
-
-			expect(queryByTestId('mcp-workflow-folder-link')).not.toBeInTheDocument();
-			const folderName = getByTestId('mcp-workflow-folder-name');
-			expect(folderName).toHaveTextContent(workflow.parentFolder?.name ?? '');
-		});
-
-		it('should display project information correctly for team project', () => {
-			const workflow = mockWorkflow('1');
-			const { getByTestId } = renderComponent({
-				pinia,
-				props: {
-					workflows: [workflow],
-					loading: false,
-				},
-			});
-
-			const projectLink = getByTestId('mcp-workflow-project-link');
-			expect(projectLink).toBeInTheDocument();
-
-			const projectName = getByTestId('mcp-workflow-project-name');
-			expect(projectName).toHaveTextContent(workflow.homeProject?.name ?? '');
-
-			expect(router.resolve).toHaveBeenCalledWith({
-				name: VIEWS.PROJECTS_WORKFLOWS,
-				params: { projectId: workflow.homeProject?.id ?? '' },
-			});
-		});
-
-		it('should display "-" when no project exists', () => {
-			const workflow = mockWorkflow('1', {
-				homeProject: undefined,
-			});
-
-			const { getByTestId } = renderComponent({
-				pinia,
-				props: {
-					workflows: [workflow],
-					loading: false,
-				},
-			});
-
-			const noProject = getByTestId('mcp-workflow-no-project');
-			expect(noProject).toHaveTextContent('-');
-		});
-	});
-
-	describe('User interactions and events', () => {
-		it('should emit refresh event when refresh button is clicked', async () => {
-			const { getByTestId, emitted } = renderComponent({
-				pinia,
-				props: {
-					workflows: [mockWorkflow('1')],
-					loading: false,
-				},
-			});
-
-			const refreshButton = getByTestId('mcp-workflows-refresh-button');
-			await userEvent.click(refreshButton);
-
-			expect(emitted()).toHaveProperty('refresh');
-			expect(emitted().refresh).toHaveLength(1);
-		});
-
-		it('should emit removeMcpAccess event when action is selected', async () => {
-			const workflow = mockWorkflow('1');
-			const { getByTestId, emitted } = renderComponent({
-				pinia,
-				props: {
-					workflows: [workflow],
-					loading: false,
-				},
-			});
-
-			const actionToggle = getByTestId('mcp-workflow-action-toggle');
-			expect(actionToggle).toBeInTheDocument();
-
-			const actionButton = actionToggle?.querySelector('[role=button]');
-			if (!actionButton) {
-				throw new Error('Action button not found');
-			}
-
-			await userEvent.click(actionButton);
-
-			const actionToggleId = actionButton.getAttribute('aria-controls');
-			const actionDropdown = document.getElementById(actionToggleId as string) as HTMLElement;
-			expect(actionDropdown).toBeInTheDocument();
-
-			const removeAction = actionDropdown.querySelector('[data-test-id="action-removeFromMCP"]');
-			expect(removeAction).toBeInTheDocument();
-			await userEvent.click(removeAction!);
-
-			expect(emitted()).toHaveProperty('removeMcpAccess');
-			expect(emitted().removeMcpAccess).toHaveLength(1);
-			expect(emitted().removeMcpAccess[0]).toEqual([workflow]);
-		});
-	});
-});
diff --git a/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/connectionInstructions/AccessTokenConnectionInstructions.vue b/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/connectionInstructions/AccessTokenConnectionInstructions.vue
deleted file mode 100644
index d8db588232b..00000000000
--- a/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/connectionInstructions/AccessTokenConnectionInstructions.vue
+++ /dev/null
@@ -1,272 +0,0 @@
-<script setup lang="ts">
-import { computed } from 'vue';
-import type { ApiKey } from '@n8n/api-types';
-import { useClipboard } from '@/app/composables/useClipboard';
-import { useI18n } from '@n8n/i18n';
-import {
-	N8nButton,
-	N8nInfoAccordion,
-	N8nInfoTip,
-	N8nLoading,
-	N8nMarkdown,
-	N8nNotice,
-	N8nTooltip,
-} from '@n8n/design-system';
-import ConnectionParameter from '@/features/ai/mcpAccess/components/connectionInstructions/ConnectionParameter.vue';
-
-type Props = {
-	serverUrl: string;
-	apiKey: ApiKey;
-	loadingApiKey: boolean;
-};
-
-const props = defineProps<Props>();
-
-const emit = defineEmits<{
-	rotateKey: [];
-	urlCopied: [url: string];
-	accessTokenCopied: [];
-	connectionStringCopied: [];
-}>();
-
-const { copy, copied, isSupported } = useClipboard();
-const i18n = useI18n();
-
-// mcp.json value that's to be copied
-const connectionString = computed(() => {
-	return `
-{
-  "mcpServers": {
-    "n8n-mcp": {
-      "command": "npx",
-      "args": [
-        "-y",
-        "supergateway",
-        "--streamableHttp",
-        "${props.serverUrl}",
-        "--header",
-        "authorization:Bearer ${apiKeyText.value}"
-      ]
-    }
-  }
-}
-`;
-});
-
-const isKeyRedacted = computed(() => {
-	return props.apiKey.apiKey.includes('******');
-});
-
-// formatted code block for markdown component
-const connectionCode = computed(() => {
-	return `\`\`\`json${connectionString.value}\`\`\``;
-});
-
-const apiKeyText = computed(() => {
-	if (props.loadingApiKey) {
-		return `<${i18n.baseText('generic.loading')}...>`;
-	}
-	return isKeyRedacted.value ? '<YOUR_ACCESS_TOKEN_HERE>' : props.apiKey.apiKey;
-});
-
-const handleConnectionStringCopy = async () => {
-	await copy(connectionString.value);
-	emit('connectionStringCopied');
-};
-
-const handleUrlCopy = (url: string) => {
-	emit('urlCopied', url);
-};
-
-const handleAccessTokenCopy = () => {
-	emit('accessTokenCopied');
-};
-</script>
-
-<template>
-	<div :class="$style.container">
-		<div :class="$style['instructions-container']">
-			<ol :class="$style.instructions">
-				<li>
-					<div :class="$style.item">
-						<span :class="$style.label">
-							{{ i18n.baseText('settings.mcp.instructions.enableAccess') }}
-						</span>
-					</div>
-				</li>
-				<li>
-					<div :class="$style.item">
-						<span :class="$style.label">
-							{{ i18n.baseText('settings.mcp.instructions.serverUrl') }}:
-						</span>
-						<ConnectionParameter :value="props.serverUrl" @copy="handleUrlCopy" />
-					</div>
-				</li>
-				<li>
-					<div :class="$style.item">
-						<span :class="$style.label">
-							{{ i18n.baseText('settings.mcp.instructions.apiKey.label') }}:
-						</span>
-						<N8nLoading
-							v-if="props.loadingApiKey"
-							:loading="props.loadingApiKey"
-							:class="$style['api-key-loader']"
-						/>
-						<ConnectionParameter
-							v-else
-							:value="props.apiKey.apiKey"
-							:max-width="400"
-							:allow-copy="!isKeyRedacted"
-							@copy="handleAccessTokenCopy"
-						>
-							<template #customActions>
-								<N8nTooltip :content="i18n.baseText('settings.mcp.instructions.rotateKey.tooltip')">
-									<N8nButton
-										type="tertiary"
-										icon="refresh-cw"
-										:square="true"
-										@click="emit('rotateKey')"
-									/>
-								</N8nTooltip>
-							</template>
-						</ConnectionParameter>
-						<N8nInfoTip v-if="!props.loadingApiKey" type="tooltip" tooltip-placement="right">
-							{{ i18n.baseText('settings.mcp.instructions.apiKey.tip') }}
-						</N8nInfoTip>
-					</div>
-				</li>
-			</ol>
-			<N8nNotice
-				v-if="!isKeyRedacted && !props.loadingApiKey"
-				theme="warning"
-				:class="$style['copy-key-notice']"
-				:content="i18n.baseText('settings.mcp.newKey.notice')"
-			/>
-		</div>
-		<div :class="$style.connectionString">
-			<N8nInfoAccordion :title="i18n.baseText('settings.mcp.instructions.json')">
-				<template #customContent>
-					<N8nMarkdown :content="connectionCode"></N8nMarkdown>
-					<N8nTooltip
-						:disabled="!isSupported"
-						:content="copied ? i18n.baseText('generic.copied') : i18n.baseText('generic.copy')"
-					>
-						<N8nButton
-							v-if="isSupported && !props.loadingApiKey"
-							type="tertiary"
-							:icon="copied ? 'clipboard-check' : 'clipboard'"
-							:square="true"
-							:class="$style['copy-json-button']"
-							@click="handleConnectionStringCopy"
-						/>
-					</N8nTooltip>
-				</template>
-			</N8nInfoAccordion>
-		</div>
-	</div>
-</template>
-
-<style module lang="scss">
-.container {
-	display: flex;
-	flex-direction: column;
-	padding: var(--spacing--xs);
-}
-
-.instructions-container {
-	:global(.notice) {
-		margin: var(--spacing--sm) var(--spacing--lg) var(--spacing--md);
-	}
-}
-
-.instructions {
-	display: flex;
-	flex-direction: column;
-	gap: var(--spacing--xs);
-	padding-left: var(--spacing--lg);
-	margin: var(--spacing--sm);
-
-	li {
-		min-height: var(--spacing--lg);
-	}
-
-	.item {
-		display: flex;
-		align-items: center;
-		gap: var(--spacing--2xs);
-
-		:global(.n8n-loading) div {
-			height: 32px;
-			width: 300px;
-			margin: 0;
-		}
-	}
-
-	.label {
-		font-size: var(--font-size--sm);
-		flex: none;
-	}
-
-	.url {
-		display: flex;
-		align-items: stretch;
-		gap: var(--spacing--2xs);
-		background: var(--color--background--light-3);
-		border: var(--border);
-		border-radius: var(--radius);
-		font-size: var(--font-size--sm);
-		overflow: hidden;
-
-		code {
-			text-overflow: ellipsis;
-			overflow: hidden;
-			white-space: pre;
-			padding: var(--spacing--2xs) var(--spacing--3xs);
-		}
-
-		.copy-url-wrapper {
-			display: flex;
-			align-items: center;
-			border-left: var(--border);
-		}
-
-		.copy-url-button {
-			border: none;
-			border-radius: 0;
-		}
-
-		@media screen and (max-width: 820px) {
-			word-wrap: break-word;
-			margin-top: var(--spacing--2xs);
-		}
-	}
-}
-
-.connectionString {
-	flex-grow: 1;
-	position: relative;
-	padding: 0 var(--spacing--lg);
-	margin-bottom: var(--spacing--sm);
-
-	:global(.n8n-markdown) {
-		width: 100%;
-	}
-	code {
-		font-size: var(--font-size--xs);
-		tab-size: 1;
-	}
-
-	&:hover {
-		.copy-json-button {
-			display: flex;
-		}
-	}
-}
-
-.copy-json-button {
-	position: absolute;
-	top: var(--spacing--xl);
-	right: var(--spacing--2xl);
-	display: none;
-}
-</style>
diff --git a/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/connectionInstructions/ConnectionParameter.vue b/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/connectionInstructions/ConnectionParameter.vue
deleted file mode 100644
index c7d200b51a4..00000000000
--- a/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/connectionInstructions/ConnectionParameter.vue
+++ /dev/null
@@ -1,103 +0,0 @@
-<script setup lang="ts">
-import { useI18n } from '@n8n/i18n';
-import { useClipboard } from '@/app/composables/useClipboard';
-import { N8nButton, N8nTooltip } from '@n8n/design-system';
-
-type Props = {
-	value: string;
-	allowCopy?: boolean;
-	maxWidth?: number;
-};
-
-const { copy, copied, isSupported } = useClipboard();
-const i18n = useI18n();
-
-const props = withDefaults(defineProps<Props>(), {
-	allowCopy: true,
-	maxWidth: undefined,
-});
-
-const emit = defineEmits<{
-	copy: [value: string];
-}>();
-
-const handleCopy = async (value: string) => {
-	await copy(value);
-	emit('copy', value);
-};
-</script>
-
-<template>
-	<div
-		:class="$style.container"
-		:style="{ maxWidth: props.maxWidth ? props.maxWidth + 'px' : 'none' }"
-	>
-		<code>{{ props.value }}</code>
-		<div :class="$style['copy-button-wrapper']">
-			<slot name="customActions" />
-			<N8nTooltip
-				:disables="!isSupported"
-				:content="copied ? i18n.baseText('generic.copied') : i18n.baseText('generic.copy')"
-				placement="right"
-			>
-				<N8nButton
-					v-if="props.allowCopy && isSupported"
-					type="tertiary"
-					:icon="copied ? 'clipboard-check' : 'clipboard'"
-					:square="true"
-					:class="$style['copy-button']"
-					@click="handleCopy(props.value)"
-				/>
-			</N8nTooltip>
-		</div>
-	</div>
-</template>
-
-<style module lang="scss">
-.container {
-	display: flex;
-	align-items: stretch;
-	gap: var(--spacing--2xs);
-	background: var(--color--background--light-3);
-	border: var(--border);
-	border-radius: var(--radius);
-	font-size: var(--font-size--sm);
-	overflow: hidden;
-
-	button {
-		border: none;
-		border-radius: 0;
-
-		&:hover {
-			border-color: inherit;
-		}
-	}
-
-	button + button {
-		border-left: var(--border);
-	}
-
-	@media screen and (max-width: 820px) {
-		word-wrap: break-word;
-		margin-top: var(--spacing--2xs);
-	}
-}
-
-code {
-	text-overflow: ellipsis;
-	overflow: hidden;
-	white-space: pre;
-	padding: var(--spacing--2xs) var(--spacing--3xs);
-}
-
-.copy-button-wrapper {
-	display: flex;
-	align-items: center;
-	border-left: var(--border);
-}
-
-.copy-button {
-	border: none;
-	border-radius: 0;
-}
-</style>
diff --git a/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/connectionInstructions/OAuthClientsTable.test.ts b/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/connectionInstructions/OAuthClientsTable.test.ts
deleted file mode 100644
index 8d375f21899..00000000000
--- a/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/connectionInstructions/OAuthClientsTable.test.ts
+++ /dev/null
@@ -1,242 +0,0 @@
-import { createComponentRenderer } from '@/__tests__/render';
-import OAuthClientsTable from './OAuthClientsTable.vue';
-import { describe, it, expect, beforeEach, vi } from 'vitest';
-import { createPinia, setActivePinia } from 'pinia';
-import userEvent from '@testing-library/user-event';
-import type { OAuthClientResponseDto } from '@n8n/api-types';
-
-const renderComponent = createComponentRenderer(OAuthClientsTable);
-
-let pinia: ReturnType<typeof createPinia>;
-
-const mockOAuthClient = (
-	id: string,
-	overrides?: Partial<OAuthClientResponseDto>,
-): OAuthClientResponseDto => ({
-	id,
-	name: `OAuth Client ${id}`,
-	createdAt: '2024-01-01T00:00:00.000Z',
-	updatedAt: '2024-01-02T00:00:00.000Z',
-	redirectUris: [],
-	grantTypes: ['authorization_code'],
-	tokenEndpointAuthMethod: 'client_secret_post',
-	...overrides,
-});
-
-describe('OAuthClientsTable', () => {
-	beforeEach(() => {
-		pinia = createPinia();
-		setActivePinia(pinia);
-		vi.clearAllMocks();
-	});
-
-	describe('Component rendering', () => {
-		it('should render loading state correctly', () => {
-			const { container, getByTestId } = renderComponent({
-				pinia,
-				props: {
-					clients: [],
-					loading: true,
-				},
-			});
-
-			const loadingElements = container.querySelectorAll('.n8n-loading');
-			expect(loadingElements.length).toBeGreaterThan(0);
-
-			expect(() => getByTestId('oauth-clients-data-table')).toThrow();
-			expect(() => getByTestId('empty-workflow-list-box')).toThrow();
-		});
-
-		it('should render empty state when no clients exist', () => {
-			const { getByTestId, getByText } = renderComponent({
-				pinia,
-				props: {
-					clients: [],
-					loading: false,
-				},
-			});
-
-			expect(getByTestId('empty-oauth-clients-list-box')).toBeInTheDocument();
-			expect(getByText('Connected OAuth clients (0)')).toBeInTheDocument();
-		});
-
-		it('should render clients table with correct data', () => {
-			const clients = [mockOAuthClient('1'), mockOAuthClient('2', { name: 'Second Client' })];
-
-			const { getByTestId, getByText } = renderComponent({
-				pinia,
-				props: {
-					clients,
-					loading: false,
-				},
-			});
-
-			const table = getByTestId('oauth-clients-data-table');
-			expect(table).toBeInTheDocument();
-
-			expect(getByText(`Connected OAuth clients (${clients.length})`)).toBeInTheDocument();
-
-			clients.forEach((client) => {
-				expect(getByText(client.name)).toBeInTheDocument();
-			});
-		});
-
-		it('should render refresh button', () => {
-			const { getByTestId } = renderComponent({
-				pinia,
-				props: {
-					clients: [mockOAuthClient('1')],
-					loading: false,
-				},
-			});
-
-			const refreshButton = getByTestId('mcp-oauth-clients-refresh-button');
-			expect(refreshButton).toBeInTheDocument();
-		});
-	});
-
-	describe('Table data display', () => {
-		it('should display client name correctly', () => {
-			const client = mockOAuthClient('1', { name: 'Test OAuth Client' });
-			const { getByText } = renderComponent({
-				pinia,
-				props: {
-					clients: [client],
-					loading: false,
-				},
-			});
-
-			expect(getByText(client.name)).toBeInTheDocument();
-		});
-
-		it('should display created at date', () => {
-			const client = mockOAuthClient('1', {
-				createdAt: '2024-01-01T12:00:00.000Z',
-			});
-			const { getByTestId } = renderComponent({
-				pinia,
-				props: {
-					clients: [client],
-					loading: false,
-				},
-			});
-
-			const createdAtElement = getByTestId('mcp-client-created-at');
-			expect(createdAtElement).toBeInTheDocument();
-		});
-
-		it('should display action toggle for each client', () => {
-			const clients = [mockOAuthClient('1'), mockOAuthClient('2')];
-			const { getAllByTestId } = renderComponent({
-				pinia,
-				props: {
-					clients,
-					loading: false,
-				},
-			});
-
-			const actionToggles = getAllByTestId('mcp-oauth-client-action-toggle');
-			expect(actionToggles).toHaveLength(clients.length);
-		});
-	});
-
-	describe('User interactions and events', () => {
-		it('should emit refresh event when refresh button is clicked', async () => {
-			const { getByTestId, emitted } = renderComponent({
-				pinia,
-				props: {
-					clients: [mockOAuthClient('1')],
-					loading: false,
-				},
-			});
-
-			const refreshButton = getByTestId('mcp-oauth-clients-refresh-button');
-			await userEvent.click(refreshButton);
-
-			expect(emitted()).toHaveProperty('refresh');
-			expect(emitted().refresh).toHaveLength(1);
-		});
-
-		it('should emit revokeClient event when action is selected', async () => {
-			const client = mockOAuthClient('1');
-			const { getByTestId, emitted } = renderComponent({
-				pinia,
-				props: {
-					clients: [client],
-					loading: false,
-				},
-			});
-
-			const actionToggle = getByTestId('mcp-oauth-client-action-toggle');
-			expect(actionToggle).toBeInTheDocument();
-
-			const actionButton = actionToggle?.querySelector('[role=button]');
-			if (!actionButton) {
-				throw new Error('Action button not found');
-			}
-
-			await userEvent.click(actionButton);
-
-			const actionToggleId = actionButton.getAttribute('aria-controls');
-			const actionDropdown = document.getElementById(actionToggleId as string) as HTMLElement;
-			expect(actionDropdown).toBeInTheDocument();
-
-			const revokeAction = actionDropdown.querySelector('[data-test-id="action-revokeClient"]');
-			expect(revokeAction).toBeInTheDocument();
-			await userEvent.click(revokeAction!);
-
-			expect(emitted()).toHaveProperty('revokeClient');
-			expect(emitted().revokeClient).toHaveLength(1);
-			expect(emitted().revokeClient[0]).toEqual([client]);
-		});
-
-		it('should not emit events when loading', () => {
-			const { queryByTestId, emitted } = renderComponent({
-				pinia,
-				props: {
-					clients: [mockOAuthClient('1')],
-					loading: true,
-				},
-			});
-
-			const actionToggle = queryByTestId('mcp-oauth-client-action-toggle');
-			expect(actionToggle).not.toBeInTheDocument();
-
-			expect(emitted()).not.toHaveProperty('revokeClient');
-			expect(emitted()).not.toHaveProperty('refresh');
-		});
-	});
-
-	describe('Edge cases', () => {
-		it('should handle empty client name gracefully', () => {
-			const client = mockOAuthClient('1', { name: '' });
-			const { container } = renderComponent({
-				pinia,
-				props: {
-					clients: [client],
-					loading: false,
-				},
-			});
-
-			const table = container.querySelector('[data-test-id="oauth-clients-data-table"]');
-			expect(table).toBeInTheDocument();
-		});
-
-		it('should handle large number of clients', () => {
-			const clients = Array.from({ length: 50 }, (_, i) =>
-				mockOAuthClient(`${i + 1}`, { name: `Client ${i + 1}` }),
-			);
-
-			const { getByText, getByTestId } = renderComponent({
-				pinia,
-				props: {
-					clients,
-					loading: false,
-				},
-			});
-
-			expect(getByText('Connected OAuth clients (50)')).toBeInTheDocument();
-			expect(getByTestId('oauth-clients-data-table')).toBeInTheDocument();
-		});
-	});
-});
diff --git a/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/connectionInstructions/OAuthConnectionInstructions.vue b/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/connectionInstructions/OAuthConnectionInstructions.vue
deleted file mode 100644
index 52e049a8a41..00000000000
--- a/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/connectionInstructions/OAuthConnectionInstructions.vue
+++ /dev/null
@@ -1,140 +0,0 @@
-<script setup lang="ts">
-import type { OAuthClientResponseDto } from '@n8n/api-types';
-import ConnectionParameter from '@/features/ai/mcpAccess/components/connectionInstructions/ConnectionParameter.vue';
-import OAuthClientsTable from '@/features/ai/mcpAccess/components/connectionInstructions/OAuthClientsTable.vue';
-import { useI18n } from '@n8n/i18n';
-
-type Props = {
-	serverUrl: string;
-	clients: OAuthClientResponseDto[];
-	clientsLoading: boolean;
-};
-
-const props = defineProps<Props>();
-
-const emit = defineEmits<{
-	revokeClient: [client: OAuthClientResponseDto];
-	refresh: [];
-	urlCopied: [url: string];
-}>();
-
-const i18n = useI18n();
-
-const onRefreshOAuthClients = () => {
-	emit('refresh');
-};
-
-const onRevokeClientAccess = (client: OAuthClientResponseDto) => {
-	emit('revokeClient', client);
-};
-
-const onUrlCopied = (url: string) => {
-	emit('urlCopied', url);
-};
-</script>
-
-<template>
-	<div :class="$style.container">
-		<ol :class="$style.instructions">
-			<li>
-				<div :class="$style.item">
-					<span :class="$style.label">
-						{{ i18n.baseText('settings.mcp.instructions.enableAccess') }}
-					</span>
-				</div>
-			</li>
-			<li>
-				<div :class="$style.item">
-					<span :class="$style.label">
-						{{ i18n.baseText('settings.mcp.instructions.serverUrl') }}:
-					</span>
-					<ConnectionParameter :value="props.serverUrl" @copy="onUrlCopied" />
-				</div>
-			</li>
-		</ol>
-		<div :class="$style['clients-table']">
-			<OAuthClientsTable
-				:data-test-id="'mcp-oauth-clients-table'"
-				:clients="props.clients"
-				:loading="props.clientsLoading"
-				@revoke-client="onRevokeClientAccess"
-				@refresh="onRefreshOAuthClients"
-			/>
-		</div>
-	</div>
-</template>
-
-<style module lang="scss">
-.container {
-	display: flex;
-	flex-direction: column;
-	padding: var(--spacing--xs) var(--spacing--xs) 0;
-}
-
-.instructions {
-	display: flex;
-	flex-direction: column;
-	gap: var(--spacing--xs);
-	padding-left: var(--spacing--lg);
-	margin: var(--spacing--sm);
-
-	li {
-		min-height: var(--spacing--lg);
-	}
-
-	.item {
-		display: flex;
-		align-items: center;
-		gap: var(--spacing--2xs);
-
-		:global(.n8n-loading) div {
-			height: 32px;
-			width: 300px;
-			margin: 0;
-		}
-	}
-
-	.label {
-		font-size: var(--font-size--sm);
-		flex: none;
-	}
-
-	.url {
-		display: flex;
-		align-items: stretch;
-		gap: var(--spacing--2xs);
-		background: var(--color--background--light-3);
-		border: var(--border);
-		border-radius: var(--radius);
-		font-size: var(--font-size--sm);
-		overflow: hidden;
-
-		code {
-			text-overflow: ellipsis;
-			overflow: hidden;
-			white-space: pre;
-			padding: var(--spacing--2xs) var(--spacing--3xs);
-		}
-
-		.copy-url-wrapper {
-			display: flex;
-			align-items: center;
-			border-left: var(--border);
-		}
-
-		.copy-url-button {
-			border: none;
-			border-radius: 0;
-		}
-
-		@media screen and (max-width: 820px) {
-			word-wrap: break-word;
-			margin-top: var(--spacing--2xs);
-		}
-	}
-}
-
-.clients-table {
-	padding: 0 var(--spacing--lg);
-}
-</style>
diff --git a/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/header/MCPHeaderActions.vue b/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/header/MCPHeaderActions.vue
new file mode 100644
index 00000000000..e78ab22af2c
--- /dev/null
+++ b/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/header/MCPHeaderActions.vue
@@ -0,0 +1,54 @@
+<script setup lang="ts">
+import { MCP_DOCS_PAGE_URL } from '@/features/ai/mcpAccess/mcp.constants';
+import ExternalLink from '@n8n/design-system/components/N8nExternalLink/ExternalLink.vue';
+import MCPAccessToggle from '@/features/ai/mcpAccess/components/header/McpAccessToggle.vue';
+import McpConnectPopover from '@/features/ai/mcpAccess/components/header/connectPopover/McpConnectPopover.vue';
+import { useI18n } from '@n8n/i18n';
+
+type Props = {
+	toggleDisabled?: boolean;
+	loading?: boolean;
+	accessEnabled: boolean;
+};
+
+const props = withDefaults(defineProps<Props>(), {
+	toggleDisabled: false,
+	loading: false,
+});
+
+const emit = defineEmits<{
+	disableMcpAccess: [];
+}>();
+
+const i18n = useI18n();
+</script>
+
+<template>
+	<div :class="$style.container" data-test-id="mcp-header-actions">
+		<ExternalLink :href="MCP_DOCS_PAGE_URL">{{ i18n.baseText('generic.docs') }}</ExternalLink>
+		<MCPAccessToggle
+			:model-value="accessEnabled"
+			:disabled="props.toggleDisabled"
+			:loading="props.loading"
+			:class="$style['mcp-access-toggle']"
+			@disable-mcp-access="emit('disableMcpAccess')"
+		/>
+		<McpConnectPopover :disabled="!accessEnabled" />
+	</div>
+</template>
+
+<style lang="scss" module>
+.container {
+	display: flex;
+	gap: var(--spacing--md);
+	align-items: center;
+
+	// Docs link doesn't have outline when not hovered
+	// so we pull it closer to the rest of the elements
+	// to make horizontal alignment visually balanced
+	a {
+		font-size: var(--font-size--2xs);
+		margin-right: calc(-1 * var(--spacing--2xs));
+	}
+}
+</style>
diff --git a/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/header/McpAccessToggle.vue b/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/header/McpAccessToggle.vue
new file mode 100644
index 00000000000..017722367a5
--- /dev/null
+++ b/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/header/McpAccessToggle.vue
@@ -0,0 +1,71 @@
+<script setup lang="ts">
+import { ElSwitch } from 'element-plus';
+import { N8nText, N8nTooltip } from '@n8n/design-system';
+import { useI18n } from '@n8n/i18n';
+
+type Props = {
+	modelValue: boolean;
+	disabled?: boolean;
+	loading?: boolean;
+};
+
+const props = withDefaults(defineProps<Props>(), {
+	disabled: false,
+	loading: false,
+});
+
+const emit = defineEmits<{
+	disableMcpAccess: [];
+}>();
+
+const i18n = useI18n();
+
+const onUpdateMCPEnabled = () => {
+	emit('disableMcpAccess');
+};
+</script>
+
+<template>
+	<div :class="$style['main-toggle-container']">
+		<div :class="$style['main-toggle-info']">
+			<N8nText :bold="true" :color="modelValue ? `success` : `text-light`">
+				{{
+					modelValue
+						? i18n.baseText('settings.mcp.header.toggle.enabled')
+						: i18n.baseText('settings.mcp.header.toggle.disabled')
+				}}
+			</N8nText>
+		</div>
+		<div :class="$style['main-toggle']" data-test-id="mcp-toggle-container">
+			<N8nTooltip
+				:content="i18n.baseText('settings.mcp.toggle.disabled.tooltip')"
+				:disabled="!props.disabled"
+				placement="top"
+			>
+				<ElSwitch
+					size="large"
+					data-test-id="mcp-access-toggle"
+					:model-value="props.modelValue"
+					:disabled="props.disabled"
+					:loading="props.loading"
+					@update:model-value="onUpdateMCPEnabled"
+				/>
+			</N8nTooltip>
+		</div>
+	</div>
+</template>
+
+<style module lang="scss">
+.main-toggle-container {
+	display: flex;
+	align-items: center;
+	gap: var(--spacing--2xs);
+}
+
+.main-toggle {
+	display: flex;
+	justify-content: flex-end;
+	align-items: center;
+	flex-shrink: 0;
+}
+</style>
diff --git a/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/header/connectPopover/ConnectionParameter.vue b/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/header/connectPopover/ConnectionParameter.vue
new file mode 100644
index 00000000000..ad429e18c46
--- /dev/null
+++ b/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/header/connectPopover/ConnectionParameter.vue
@@ -0,0 +1,186 @@
+<script setup lang="ts">
+import { useI18n } from '@n8n/i18n';
+import { useClipboard } from '@/app/composables/useClipboard';
+import { N8nButton, N8nTooltip, N8nInfoTip, N8nInput, N8nLoading } from '@n8n/design-system';
+import { MCP_TOOLTIP_DELAY } from '@/features/ai/mcpAccess/mcp.constants';
+
+type Props = {
+	id: string;
+	label: string;
+	value: string;
+	valueLoading?: boolean;
+	infoTip?: string;
+	allowCopy?: boolean;
+};
+
+const { copy, copied, isSupported } = useClipboard();
+const i18n = useI18n();
+
+const props = withDefaults(defineProps<Props>(), {
+	allowCopy: true,
+	maxWidth: undefined,
+	infoTip: undefined,
+	valueLoading: false,
+});
+
+const emit = defineEmits<{
+	copy: [value: string];
+}>();
+
+const handleCopy = async (value: string) => {
+	await copy(value);
+	emit('copy', value);
+};
+</script>
+
+<template>
+	<div :class="$style.container">
+		<div :class="$style['label-wrapper']">
+			<label :class="$style.label" :for="`connection-parameter-${props.id}`">
+				{{ props.label }}
+			</label>
+			<div v-if="props.infoTip" :class="$style['info-tip']">
+				<N8nInfoTip type="tooltip" size="small">
+					{{ props.infoTip }}
+				</N8nInfoTip>
+			</div>
+		</div>
+		<div
+			:id="`connection-parameter-${props.id}`"
+			:class="{
+				[$style['parameter-value']]: true,
+				[$style['parameter-value--loading']]: props.valueLoading,
+			}"
+			data-test-id="connection-parameter-value"
+		>
+			<div :class="$style['input-wrapper']">
+				<N8nLoading
+					v-if="props.valueLoading"
+					:loading="props.valueLoading"
+					variant="h1"
+					:class="$style['parameter-skeleton']"
+				/>
+				<N8nInput v-else v-model="props.value" type="text" :readonly="true" />
+			</div>
+			<div :class="$style['copy-button-wrapper']">
+				<slot name="customActions" />
+				<N8nTooltip
+					:disabled="!isSupported"
+					:content="copied ? i18n.baseText('generic.copied') : i18n.baseText('generic.copy')"
+					:show-after="MCP_TOOLTIP_DELAY"
+					placement="bottom"
+				>
+					<N8nButton
+						v-if="props.allowCopy && isSupported"
+						type="tertiary"
+						:icon="copied ? 'check' : 'copy'"
+						:square="true"
+						:class="$style['copy-button']"
+						:disabled="props.valueLoading"
+						@click="handleCopy(props.value)"
+					/>
+				</N8nTooltip>
+			</div>
+		</div>
+	</div>
+</template>
+
+<style module lang="scss">
+.container {
+	display: flex;
+	flex-direction: column;
+	gap: var(--spacing--4xs);
+}
+
+.label-wrapper {
+	display: flex;
+	align-items: center;
+	gap: var(--spacing--4xs);
+
+	.info-tip {
+		display: none;
+		cursor: pointer;
+	}
+
+	&:hover .info-tip {
+		display: block;
+	}
+}
+
+.label {
+	font-size: var(--font-size--sm);
+	color: var(--color--text--shade-1);
+}
+
+.parameter-value {
+	display: flex;
+	align-items: stretch;
+	justify-content: space-between;
+	font-size: var(--font-size--2xs);
+	color: var(--color--text);
+	gap: var(--spacing--2xs);
+	border: var(--border);
+	border-radius: var(--radius);
+	overflow: hidden;
+
+	&--loading {
+		gap: 0;
+	}
+
+	.input-wrapper {
+		flex: 1;
+		min-width: 0;
+		display: flex;
+		align-items: center;
+	}
+
+	:global(.n8n-input) {
+		flex: 1;
+		align-items: center;
+
+		input {
+			font-family: monospace;
+			font-size: var(--font-size--2xs);
+			border: none;
+			color: var(--color--text);
+			min-height: var(--spacing--md);
+			height: var(--spacing--md);
+		}
+	}
+
+	.parameter-skeleton div {
+		margin: 0;
+		height: calc(var(--spacing--xl) - 2 * var(--border-width));
+		border-radius: 0 0 var(--radius) var(--radius);
+	}
+
+	button {
+		border: none;
+		border-radius: 0;
+
+		&:hover {
+			border-color: inherit;
+		}
+	}
+
+	button + button {
+		border-left: var(--border);
+	}
+
+	@media screen and (max-width: 820px) {
+		word-wrap: break-word;
+		margin-top: var(--spacing--2xs);
+	}
+}
+
+.copy-button-wrapper {
+	display: flex;
+	align-items: center;
+	border-left: var(--border);
+}
+
+.copy-button {
+	border: none;
+	border-radius: 0;
+}
+</style>
diff --git a/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/header/connectPopover/MCPAccessTokenPopoverTab.test.ts b/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/header/connectPopover/MCPAccessTokenPopoverTab.test.ts
new file mode 100644
index 00000000000..fe0f7460cf5
--- /dev/null
+++ b/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/header/connectPopover/MCPAccessTokenPopoverTab.test.ts
@@ -0,0 +1,220 @@
+import userEvent from '@testing-library/user-event';
+import { waitFor } from '@testing-library/vue';
+import { createComponentRenderer } from '@/__tests__/render';
+import { createTestingPinia } from '@pinia/testing';
+import MCPAccessTokenPopoverTab from './MCPAccessTokenPopoverTab.vue';
+
+const mockCopy = vi.fn();
+const mockCopied = { value: false };
+
+vi.mock('@/app/composables/useClipboard', () => ({
+	useClipboard: () => ({
+		copy: mockCopy,
+		copied: mockCopied,
+		isSupported: { value: true },
+	}),
+}));
+
+const mockGetOrCreateApiKey = vi.fn();
+const mockGenerateNewApiKey = vi.fn();
+const mockResetCurrentUserMCPKey = vi.fn();
+let mockCurrentUserMCPKey: { apiKey: string } | null = { apiKey: 'test-api-key-12345' };
+
+vi.mock('@/features/ai/mcpAccess/mcp.store', () => ({
+	useMCPStore: () => ({
+		get currentUserMCPKey() {
+			return mockCurrentUserMCPKey;
+		},
+		getOrCreateApiKey: mockGetOrCreateApiKey,
+		generateNewApiKey: mockGenerateNewApiKey,
+		resetCurrentUserMCPKey: mockResetCurrentUserMCPKey,
+	}),
+}));
+
+vi.mock('./ConnectionParameter.vue', () => ({
+	default: {
+		name: 'ConnectionParameter',
+		template: `
+			<div :data-test-id="'connection-parameter-' + id">
+				<span data-test-id="connection-parameter-label">{{ label }}</span>
+				<span data-test-id="connection-parameter-value">{{ value }}</span>
+				<button data-test-id="connection-parameter-copy-button" @click="$emit('copy', value)">Copy</button>
+			</div>
+		`,
+		props: ['id', 'label', 'value', 'infoTip', 'maxWidth', 'allowCopy'],
+		emits: ['copy'],
+	},
+}));
+
+const renderComponent = createComponentRenderer(MCPAccessTokenPopoverTab, {
+	pinia: createTestingPinia(),
+});
+
+describe('MCPAccessTokenPopoverTab', () => {
+	beforeEach(() => {
+		vi.useFakeTimers();
+		mockCurrentUserMCPKey = { apiKey: 'test-api-key-12345' };
+		mockGetOrCreateApiKey.mockResolvedValue({ apiKey: 'test-api-key-12345' });
+		mockGenerateNewApiKey.mockResolvedValue({ apiKey: 'new-api-key-67890' });
+	});
+
+	afterEach(() => {
+		vi.clearAllMocks();
+		vi.useRealTimers();
+	});
+
+	describe('Rendering', () => {
+		it('should render server URL connection parameter', () => {
+			const serverUrl = 'http://localhost:5678/mcp';
+			const { getByTestId } = renderComponent({
+				props: {
+					serverUrl,
+				},
+			});
+
+			expect(getByTestId('mcp-access-token-popover-tab')).toBeVisible();
+			const serverUrlParam = getByTestId('connection-parameter-oauth-server-url');
+			expect(serverUrlParam).toBeVisible();
+			expect(
+				serverUrlParam.querySelector('[data-test-id="connection-parameter-value"]'),
+			).toHaveTextContent(serverUrl);
+		});
+
+		it('should render access token connection parameter when API key is loaded', async () => {
+			const { getByTestId } = renderComponent({
+				props: {
+					serverUrl: 'http://localhost:5678/mcp',
+				},
+			});
+
+			// Advance timers to complete loading timeout
+			await vi.runAllTimersAsync();
+
+			await waitFor(() => {
+				const accessTokenParam = getByTestId('connection-parameter-access-token');
+				expect(accessTokenParam).toBeVisible();
+				expect(
+					accessTokenParam.querySelector('[data-test-id="connection-parameter-value"]'),
+				).toHaveTextContent('test-api-key-12345');
+			});
+		});
+
+		it('should render JSON configuration block when loaded', async () => {
+			const { getByTestId } = renderComponent({
+				props: {
+					serverUrl: 'http://localhost:5678/mcp',
+				},
+			});
+
+			await vi.runAllTimersAsync();
+
+			await waitFor(() => {
+				expect(getByTestId('mcp-access-token-json')).toBeVisible();
+			});
+		});
+	});
+
+	describe('Events', () => {
+		it('should emit copy event with serverUrl type when server URL is copied', async () => {
+			const user = userEvent.setup({ advanceTimers: vi.advanceTimersByTime });
+			const serverUrl = 'http://localhost:5678/mcp';
+			const { getByTestId, emitted } = renderComponent({
+				props: {
+					serverUrl,
+				},
+			});
+
+			const serverUrlParam = getByTestId('connection-parameter-oauth-server-url');
+			const copyButton = serverUrlParam.querySelector(
+				'[data-test-id="connection-parameter-copy-button"]',
+			) as HTMLButtonElement;
+
+			await user.click(copyButton);
+
+			expect(emitted().copy).toBeTruthy();
+			expect(emitted().copy[0]).toEqual(['serverUrl', serverUrl]);
+		});
+
+		it('should emit copy event with accessToken type when access token is copied', async () => {
+			const user = userEvent.setup({ advanceTimers: vi.advanceTimersByTime });
+			const { getByTestId, emitted } = renderComponent({
+				props: {
+					serverUrl: 'http://localhost:5678/mcp',
+				},
+			});
+
+			await vi.runAllTimersAsync();
+
+			await waitFor(() => {
+				expect(getByTestId('connection-parameter-access-token')).toBeVisible();
+			});
+
+			const accessTokenParam = getByTestId('connection-parameter-access-token');
+			const copyButton = accessTokenParam.querySelector(
+				'[data-test-id="connection-parameter-copy-button"]',
+			) as HTMLButtonElement;
+
+			await user.click(copyButton);
+
+			expect(emitted().copy).toBeTruthy();
+			expect(emitted().copy[0]).toEqual(['accessToken', 'test-api-key-12345']);
+		});
+
+		it('should emit copy event with mcpJson type when JSON config is copied', async () => {
+			const user = userEvent.setup({ advanceTimers: vi.advanceTimersByTime });
+			const { getByTestId, emitted } = renderComponent({
+				props: {
+					serverUrl: 'http://localhost:5678/mcp',
+				},
+			});
+
+			await vi.runAllTimersAsync();
+
+			await waitFor(() => {
+				expect(getByTestId('mcp-json-copy-button')).toBeVisible();
+			});
+
+			const copyButton = getByTestId('mcp-json-copy-button');
+
+			await user.click(copyButton);
+
+			expect(emitted().copy).toBeTruthy();
+			const copyEvent = emitted().copy[0];
+			expect(Array.isArray(copyEvent)).toBe(true);
+			if (Array.isArray(copyEvent)) {
+				expect(copyEvent[0]).toEqual('mcpJson');
+				expect(copyEvent[1]).toContain('mcpServers');
+			}
+		});
+	});
+
+	describe('API Key handling', () => {
+		it('should call getOrCreateApiKey on mount when no API key exists', async () => {
+			mockCurrentUserMCPKey = null;
+
+			renderComponent({
+				props: {
+					serverUrl: 'http://localhost:5678/mcp',
+				},
+			});
+
+			await vi.runAllTimersAsync();
+
+			expect(mockGetOrCreateApiKey).toHaveBeenCalled();
+		});
+
+		it('should not call getOrCreateApiKey on mount when API key already exists', async () => {
+			mockCurrentUserMCPKey = { apiKey: 'existing-key' };
+
+			renderComponent({
+				props: {
+					serverUrl: 'http://localhost:5678/mcp',
+				},
+			});
+
+			await vi.runAllTimersAsync();
+
+			expect(mockGetOrCreateApiKey).not.toHaveBeenCalled();
+		});
+	});
+});
diff --git a/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/header/connectPopover/MCPAccessTokenPopoverTab.vue b/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/header/connectPopover/MCPAccessTokenPopoverTab.vue
new file mode 100644
index 00000000000..a51d4d08702
--- /dev/null
+++ b/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/header/connectPopover/MCPAccessTokenPopoverTab.vue
@@ -0,0 +1,265 @@
+<script setup lang="ts">
+import { computed, onMounted, ref } from 'vue';
+import { useI18n } from '@n8n/i18n';
+import { useToast } from '@/app/composables/useToast';
+import { useClipboard } from '@/app/composables/useClipboard';
+import { useMCPStore } from '@/features/ai/mcpAccess/mcp.store';
+import {
+	LOADING_INDICATOR_TIMEOUT,
+	MCP_TOOLTIP_DELAY,
+} from '@/features/ai/mcpAccess/mcp.constants';
+import { N8nLoading, N8nTooltip, N8nButton, N8nMarkdown, N8nNotice } from '@n8n/design-system';
+import ConnectionParameter from '@/features/ai/mcpAccess/components/header/connectPopover/ConnectionParameter.vue';
+
+type Props = {
+	serverUrl: string;
+};
+
+const props = defineProps<Props>();
+
+const emit = defineEmits<{
+	copy: [type: 'serverUrl' | 'accessToken' | 'mcpJson', value: string];
+}>();
+
+const i18n = useI18n();
+const toast = useToast();
+const mcpStore = useMCPStore();
+
+const loadingApiKey = ref(true);
+const keyRotating = ref(false);
+const apiKey = computed(() => mcpStore.currentUserMCPKey);
+
+const { copy, copied, isSupported } = useClipboard();
+
+// mcp.json value that's to be copied
+const connectionString = computed(() => {
+	return `
+{
+  "mcpServers": {
+    "n8n-mcp": {
+      "command": "npx",
+      "args": [
+        "-y",
+        "supergateway",
+        "--streamableHttp",
+        "${props.serverUrl}",
+        "--header",
+        "authorization:Bearer ${apiKeyText.value}"
+      ]
+    }
+  }
+}
+`;
+});
+
+const isKeyRedacted = computed(() => {
+	return apiKey.value?.apiKey?.includes('******') ?? false;
+});
+
+// formatted code block for markdown component
+const connectionCode = computed(() => {
+	return `\`\`\`json${connectionString.value}\`\`\``;
+});
+
+const apiKeyText = computed(() => {
+	if (keyRotating.value) {
+		return `<${i18n.baseText('generic.loading')}...>`;
+	}
+	return isKeyRedacted.value ? '<YOUR_ACCESS_TOKEN_HERE>' : apiKey.value?.apiKey;
+});
+
+const fetchApiKey = async () => {
+	try {
+		loadingApiKey.value = true;
+		await mcpStore.getOrCreateApiKey();
+	} catch (error) {
+		toast.showError(error, i18n.baseText('settings.mcp.error.fetching.apiKey'));
+	} finally {
+		setTimeout(() => {
+			loadingApiKey.value = false;
+		}, LOADING_INDICATOR_TIMEOUT);
+	}
+};
+
+const rotateKey = async () => {
+	try {
+		keyRotating.value = true;
+		await mcpStore.generateNewApiKey();
+	} catch (error) {
+		toast.showError(error, i18n.baseText('settings.mcp.error.rotating.apiKey'));
+	} finally {
+		setTimeout(() => {
+			keyRotating.value = false;
+		}, LOADING_INDICATOR_TIMEOUT);
+	}
+};
+
+const handleConnectionStringCopy = async () => {
+	await copy(connectionString.value);
+	emit('copy', 'mcpJson', connectionString.value);
+};
+
+const handleUrlCopy = (url: string) => {
+	emit('copy', 'serverUrl', url);
+};
+
+const handleAccessTokenCopy = () => {
+	if (apiKey.value?.apiKey) {
+		emit('copy', 'accessToken', apiKey.value.apiKey);
+	}
+};
+
+onMounted(async () => {
+	if (!apiKey.value) {
+		await fetchApiKey();
+	} else {
+		loadingApiKey.value = false;
+	}
+});
+</script>
+
+<template>
+	<div :class="$style.container" data-test-id="mcp-access-token-popover-tab">
+		<ConnectionParameter
+			id="oauth-server-url"
+			:label="i18n.baseText('settings.mcp.connectPopover.serverUrl')"
+			:value="props.serverUrl"
+			@copy="handleUrlCopy"
+		/>
+		<div v-if="loadingApiKey" :class="$style['loading-container']">
+			<N8nLoading :loading="loadingApiKey" variant="h1" :class="$style['url-skeleton']" />
+			<N8nLoading :loading="loadingApiKey" variant="button" :class="$style['code-skeleton']" />
+		</div>
+
+		<div v-else-if="apiKey?.apiKey" :class="$style['parameters-container']">
+			<ConnectionParameter
+				id="access-token"
+				:value="apiKey.apiKey"
+				:value-loading="keyRotating"
+				:label="i18n.baseText('settings.mcp.connectPopover.tab.accessToken')"
+				:info-tip="i18n.baseText('settings.mcp.instructions.apiKey.tip')"
+				:allow-copy="!isKeyRedacted"
+				@copy="handleAccessTokenCopy"
+			>
+				<template #customActions>
+					<N8nTooltip
+						:content="i18n.baseText('settings.mcp.instructions.rotateKey.tooltip')"
+						:show-after="MCP_TOOLTIP_DELAY"
+					>
+						<N8nButton
+							type="tertiary"
+							icon="refresh-cw"
+							:square="true"
+							:disabled="keyRotating"
+							@click="rotateKey"
+						/>
+					</N8nTooltip>
+				</template>
+			</ConnectionParameter>
+			<N8nNotice v-if="!isKeyRedacted">
+				{{ i18n.baseText('settings.mcp.access.token.notice') }}
+			</N8nNotice>
+			<div :class="$style['json-container']" data-test-id="mcp-access-token-json">
+				<label :class="$style.label" for="mcp-json">
+					{{ i18n.baseText('settings.mcp.connectPopover.jsonConfig') }}
+				</label>
+				<N8nMarkdown id="mcp-json" :content="connectionCode"></N8nMarkdown>
+				<N8nTooltip
+					:disabled="!isSupported"
+					:content="copied ? i18n.baseText('generic.copied') : i18n.baseText('generic.copy')"
+					:show-after="MCP_TOOLTIP_DELAY"
+				>
+					<N8nButton
+						v-if="isSupported && !loadingApiKey && !keyRotating"
+						type="tertiary"
+						:icon="copied ? 'check' : 'copy'"
+						:square="true"
+						:class="$style['copy-json-button']"
+						data-test-id="mcp-json-copy-button"
+						@click="handleConnectionStringCopy"
+					/>
+				</N8nTooltip>
+			</div>
+		</div>
+	</div>
+</template>
+
+<style lang="scss" module>
+.container {
+	display: flex;
+	flex-direction: column;
+}
+
+.loading-container {
+	display: flex;
+	flex-direction: column;
+	gap: var(--spacing--xs);
+}
+
+// Make skeletons same height as the actual content
+// so nothing moves when loading finishes
+.url-skeleton div {
+	width: 100%;
+	min-height: 40px;
+}
+
+.code-skeleton div {
+	width: 100%;
+	min-height: 350px;
+}
+
+.parameters-container {
+	display: flex;
+	flex-direction: column;
+
+	padding-top: var(--spacing--sm);
+}
+
+.json-container {
+	flex-grow: 1;
+	position: relative;
+	margin-top: var(--spacing--sm);
+
+	.label {
+		display: inline-flex;
+		font-size: var(--font-size--sm);
+		color: var(--color--text--shade-1);
+		margin-bottom: var(--spacing--4xs);
+	}
+
+	:global(.n8n-markdown) {
+		width: 100%;
+	}
+
+	code {
+		color: var(--color--text) !important;
+		font-size: var(--font-size--2xs);
+		padding: var(--spacing--2xs) !important;
+		tab-size: 1;
+		background: none !important;
+		border: var(--border);
+		border-radius: var(--radius);
+	}
+
+	&:hover {
+		.copy-json-button {
+			display: flex;
+		}
+	}
+}
+
+.copy-json-button {
+	position: absolute;
+	top: var(--spacing--lg);
+	right: var(--spacing--3xs);
+	display: none;
+	border: none;
+	outline: none;
+
+	&:hover {
+		border: none;
+		outline: none;
+		background: none;
+	}
+}
+</style>
diff --git a/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/header/connectPopover/MCPOAuthPopoverTab.test.ts b/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/header/connectPopover/MCPOAuthPopoverTab.test.ts
new file mode 100644
index 00000000000..87bd401a134
--- /dev/null
+++ b/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/header/connectPopover/MCPOAuthPopoverTab.test.ts
@@ -0,0 +1,67 @@
+import userEvent from '@testing-library/user-event';
+import { createComponentRenderer } from '@/__tests__/render';
+import MCPOAuthPopoverTab from './MCPOAuthPopoverTab.vue';
+
+vi.mock('./ConnectionParameter.vue', () => ({
+	default: {
+		name: 'ConnectionParameter',
+		template: `
+			<div data-test-id="connection-parameter">
+				<span data-test-id="connection-parameter-label">{{ label }}</span>
+				<span data-test-id="connection-parameter-value">{{ value }}</span>
+				<button data-test-id="connection-parameter-copy-button" @click="$emit('copy', value)">Copy</button>
+			</div>
+		`,
+		props: ['id', 'label', 'value'],
+		emits: ['copy'],
+	},
+}));
+
+const renderComponent = createComponentRenderer(MCPOAuthPopoverTab);
+
+describe('MCPOAuthPopoverTab', () => {
+	afterEach(() => {
+		vi.clearAllMocks();
+	});
+
+	describe('Rendering', () => {
+		it('should render the component with correct test id', () => {
+			const { getByTestId } = renderComponent({
+				props: {
+					serverUrl: 'http://localhost:5678/mcp',
+				},
+			});
+
+			expect(getByTestId('mcp-oauth-popover-tab')).toBeVisible();
+		});
+
+		it('should render the ConnectionParameter with correct serverUrl prop', () => {
+			const serverUrl = 'http://localhost:5678/mcp';
+			const { getByTestId } = renderComponent({
+				props: {
+					serverUrl,
+				},
+			});
+
+			expect(getByTestId('connection-parameter')).toBeVisible();
+			expect(getByTestId('connection-parameter-value')).toHaveTextContent(serverUrl);
+		});
+	});
+
+	describe('Events', () => {
+		it('should emit copy event when ConnectionParameter emits copy', async () => {
+			const user = userEvent.setup();
+			const serverUrl = 'http://localhost:5678/mcp';
+			const { getByTestId, emitted } = renderComponent({
+				props: {
+					serverUrl,
+				},
+			});
+
+			await user.click(getByTestId('connection-parameter-copy-button'));
+
+			expect(emitted().copy).toBeTruthy();
+			expect(emitted().copy[0]).toEqual([serverUrl]);
+		});
+	});
+});
diff --git a/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/header/connectPopover/MCPOAuthPopoverTab.vue b/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/header/connectPopover/MCPOAuthPopoverTab.vue
new file mode 100644
index 00000000000..697c7895e9b
--- /dev/null
+++ b/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/header/connectPopover/MCPOAuthPopoverTab.vue
@@ -0,0 +1,38 @@
+<script setup lang="ts">
+import { useI18n } from '@n8n/i18n';
+import ConnectionParameter from '@/features/ai/mcpAccess/components/header/connectPopover/ConnectionParameter.vue';
+
+type Props = {
+	serverUrl: string;
+};
+
+const props = defineProps<Props>();
+
+const emit = defineEmits<{
+	copy: [value: string];
+}>();
+
+const i18n = useI18n();
+
+const handleServerUrlCopy = (value: string) => {
+	emit('copy', value);
+};
+</script>
+
+<template>
+	<div :class="$style.container" data-test-id="mcp-oauth-popover-tab">
+		<ConnectionParameter
+			id="oauth-server-url"
+			:label="i18n.baseText('settings.mcp.connectPopover.serverUrl')"
+			:value="props.serverUrl"
+			@copy="handleServerUrlCopy"
+		/>
+	</div>
+</template>
+
+<style lang="scss" module>
+.container {
+	display: flex;
+	flex-direction: column;
+}
+</style>
diff --git a/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/header/connectPopover/McpConnectPopover.test.ts b/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/header/connectPopover/McpConnectPopover.test.ts
new file mode 100644
index 00000000000..0eee4550c86
--- /dev/null
+++ b/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/header/connectPopover/McpConnectPopover.test.ts
@@ -0,0 +1,159 @@
+import { createTestingPinia } from '@pinia/testing';
+import { waitFor } from '@testing-library/vue';
+import userEvent from '@testing-library/user-event';
+import { createComponentRenderer } from '@/__tests__/render';
+import { mockedStore } from '@/__tests__/utils';
+import { useRootStore } from '@n8n/stores/useRootStore';
+import McpConnectPopover from './McpConnectPopover.vue';
+
+vi.mock('@/app/composables/useTelemetry', () => ({
+	useTelemetry: () => ({
+		track: vi.fn(),
+	}),
+}));
+
+const mockResetCurrentUserMCPKey = vi.fn();
+
+vi.mock('@/features/ai/mcpAccess/mcp.store', () => ({
+	useMCPStore: () => ({
+		resetCurrentUserMCPKey: mockResetCurrentUserMCPKey,
+	}),
+}));
+
+vi.mock('./MCPOAuthPopoverTab.vue', () => ({
+	default: {
+		name: 'MCPOAuthPopoverTab',
+		template: '<div data-test-id="mcp-oauth-popover-tab">OAuth Tab Content</div>',
+		props: ['serverUrl'],
+	},
+}));
+
+vi.mock('./MCPAccessTokenPopoverTab.vue', () => ({
+	default: {
+		name: 'MCPAccessTokenPopoverTab',
+		template: '<div data-test-id="mcp-access-token-popover-tab">Access Token Tab Content</div>',
+		props: ['serverUrl'],
+	},
+}));
+
+let rootStore: ReturnType<typeof mockedStore<typeof useRootStore>>;
+let renderComponent: ReturnType<typeof createComponentRenderer>;
+
+describe('McpConnectPopover', () => {
+	beforeEach(() => {
+		renderComponent = createComponentRenderer(McpConnectPopover, {
+			pinia: createTestingPinia(),
+		});
+
+		rootStore = mockedStore(useRootStore);
+		rootStore.urlBaseEditor = 'http://localhost:5678/';
+	});
+
+	afterEach(() => {
+		vi.clearAllMocks();
+	});
+
+	describe('Initial rendering', () => {
+		it('should render the Connect button', () => {
+			const { getByTestId } = renderComponent();
+
+			expect(getByTestId('mcp-connect-popover-trigger-button')).toBeVisible();
+			expect(getByTestId('mcp-connect-popover-trigger-button')).toHaveTextContent('Connect');
+		});
+
+		it('should not show popover content initially', () => {
+			const { queryByTestId } = renderComponent();
+
+			expect(queryByTestId('mcp-connect-popover-content')).not.toBeInTheDocument();
+		});
+	});
+
+	describe('Popover interaction', () => {
+		it('should show popover when clicking the Connect button', async () => {
+			const user = userEvent.setup();
+			const { getByTestId } = renderComponent();
+
+			await user.click(getByTestId('mcp-connect-popover-trigger-button'));
+
+			await waitFor(() => {
+				expect(getByTestId('mcp-connect-popover-content')).toBeVisible();
+				expect(getByTestId('mcp-connect-popover-tabs')).toBeVisible();
+			});
+		});
+
+		it('should show OAuth tab content by default', async () => {
+			const user = userEvent.setup();
+			const { getByTestId, queryByTestId } = renderComponent();
+
+			await user.click(getByTestId('mcp-connect-popover-trigger-button'));
+
+			await waitFor(() => {
+				expect(getByTestId('mcp-oauth-popover-tab')).toBeVisible();
+				expect(queryByTestId('mcp-access-token-popover-tab')).not.toBeInTheDocument();
+			});
+		});
+
+		it('should reset current user MCP key when popover closes', async () => {
+			const user = userEvent.setup();
+			const { getByTestId } = renderComponent();
+
+			await user.click(getByTestId('mcp-connect-popover-trigger-button'));
+
+			await waitFor(() => {
+				expect(getByTestId('mcp-connect-popover-content')).toBeVisible();
+			});
+
+			await user.keyboard('{Escape}');
+
+			await waitFor(() => {
+				expect(mockResetCurrentUserMCPKey).toHaveBeenCalled();
+			});
+		});
+	});
+
+	describe('Tab switching', () => {
+		it('should switch to Access Token tab when clicking the Access Token option', async () => {
+			const user = userEvent.setup();
+			const { getByTestId, queryByTestId } = renderComponent();
+
+			await user.click(getByTestId('mcp-connect-popover-trigger-button'));
+
+			await waitFor(() => {
+				expect(getByTestId('mcp-connect-popover-tabs')).toBeVisible();
+			});
+
+			await user.click(getByTestId('radio-button-accessToken'));
+
+			await waitFor(() => {
+				expect(getByTestId('mcp-access-token-popover-tab')).toBeVisible();
+				expect(queryByTestId('mcp-oauth-popover-tab')).not.toBeInTheDocument();
+			});
+		});
+
+		it('should switch back to OAuth tab when clicking the OAuth option', async () => {
+			const user = userEvent.setup();
+			const { getByTestId, queryByTestId } = renderComponent();
+
+			await user.click(getByTestId('mcp-connect-popover-trigger-button'));
+
+			await waitFor(() => {
+				expect(getByTestId('mcp-connect-popover-tabs')).toBeVisible();
+			});
+
+			// Switch to Access Token tab first
+			await user.click(getByTestId('radio-button-accessToken'));
+
+			await waitFor(() => {
+				expect(getByTestId('mcp-access-token-popover-tab')).toBeVisible();
+			});
+
+			// Switch back to OAuth tab
+			await user.click(getByTestId('radio-button-oauth'));
+
+			await waitFor(() => {
+				expect(getByTestId('mcp-oauth-popover-tab')).toBeVisible();
+				expect(queryByTestId('mcp-access-token-popover-tab')).not.toBeInTheDocument();
+			});
+		});
+	});
+});
diff --git a/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/header/connectPopover/McpConnectPopover.vue b/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/header/connectPopover/McpConnectPopover.vue
new file mode 100644
index 00000000000..180bcea64f5
--- /dev/null
+++ b/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/header/connectPopover/McpConnectPopover.vue
@@ -0,0 +1,137 @@
+<script setup lang="ts">
+import { useI18n } from '@n8n/i18n';
+import { ref, watch } from 'vue';
+import { N8nButton, N8nPopoverReka, N8nRadioButtons } from '@n8n/design-system';
+import MCPOAuthPopoverTab from '@/features/ai/mcpAccess/components/header/connectPopover/MCPOAuthPopoverTab.vue';
+import MCPAccessTokenPopoverTab from '@/features/ai/mcpAccess/components/header/connectPopover/MCPAccessTokenPopoverTab.vue';
+import { useRootStore } from '@n8n/stores/useRootStore';
+import { useTelemetry } from '@/app/composables/useTelemetry';
+import { useMCPStore } from '@/features/ai/mcpAccess/mcp.store';
+import { MCP_ENDPOINT, MCP_CONNECT_POPOVER_WIDTH } from '@/features/ai/mcpAccess/mcp.constants';
+
+const i18n = useI18n();
+const telemetry = useTelemetry();
+const rootStore = useRootStore();
+const mcpStore = useMCPStore();
+
+const props = defineProps<{
+	disabled?: boolean;
+}>();
+
+const popoverOpen = ref(false);
+
+const TABS = {
+	ACCESS_TOKEN: 'accessToken',
+	OAUTH: 'oauth',
+};
+
+const tabItems = ref([
+	{ value: TABS.OAUTH, label: i18n.baseText('settings.mcp.connectPopover.tab.oauth') },
+	{ value: TABS.ACCESS_TOKEN, label: i18n.baseText('settings.mcp.connectPopover.tab.accessToken') },
+]);
+
+const serverUrl = ref(`${rootStore.urlBaseEditor}${MCP_ENDPOINT}`);
+
+const activeTab = ref(tabItems.value[0].value);
+
+const handlePopoverOpenChange = (isOpen: boolean) => {
+	popoverOpen.value = isOpen;
+	if (!isOpen) {
+		mcpStore.resetCurrentUserMCPKey();
+	}
+};
+
+const handleTabChange = (newTab: string) => {
+	activeTab.value = newTab;
+};
+
+const handleAccessTokenTabCopy = (type: 'serverUrl' | 'accessToken' | 'mcpJson') => {
+	const itemMap = {
+		serverUrl: 'server-url',
+		accessToken: 'access-token',
+		mcpJson: 'mcp-json',
+	} as const;
+	trackCopyEvent({ item: itemMap[type], source: 'token-tab' });
+};
+
+const trackCopyEvent = (payload: {
+	item: 'server-url' | 'access-token' | 'mcp-json';
+	source: 'oauth-tab' | 'token-tab';
+}) => {
+	telemetry.track('User copied MCP connection parameter', {
+		parameter: payload.item,
+		source: payload.source,
+	});
+};
+
+// Automatically open the popover when mcp access is turned on
+watch(
+	() => props.disabled,
+	(newValue) => {
+		if (!newValue) {
+			popoverOpen.value = true;
+		}
+	},
+);
+</script>
+
+<template>
+	<div>
+		<N8nPopoverReka
+			:id="'mcp-connect-popover'"
+			:open="popoverOpen"
+			:popper-options="{ strategy: 'fixed' }"
+			:content-class="$style.popper"
+			:show-arrow="false"
+			:width="`${MCP_CONNECT_POPOVER_WIDTH}px`"
+			@update:open="handlePopoverOpenChange"
+		>
+			<template #trigger>
+				<N8nButton
+					data-test-id="mcp-connect-popover-trigger-button"
+					type="tertiary"
+					:disabled="disabled"
+				>
+					{{ i18n.baseText('generic.connect') }}
+				</N8nButton>
+			</template>
+			<template #content>
+				<div :class="$style['popper-content']" data-test-id="mcp-connect-popover-content">
+					<header>
+						<N8nRadioButtons
+							data-test-id="mcp-connect-popover-tabs"
+							:model-value="activeTab"
+							:options="tabItems"
+							@update:model-value="handleTabChange"
+						/>
+					</header>
+					<main>
+						<MCPOAuthPopoverTab
+							v-if="activeTab === TABS.OAUTH"
+							:server-url="serverUrl"
+							@copy="trackCopyEvent({ item: 'server-url', source: 'oauth-tab' })"
+						/>
+						<MCPAccessTokenPopoverTab
+							v-else-if="activeTab === TABS.ACCESS_TOKEN"
+							:server-url="serverUrl"
+							@copy="handleAccessTokenTabCopy"
+						/>
+					</main>
+				</div>
+			</template>
+		</N8nPopoverReka>
+	</div>
+</template>
+
+<style lang="scss" module>
+.popper {
+	margin-right: var(--spacing--sm);
+}
+
+.popper-content {
+	padding: var(--spacing--xs);
+	display: flex;
+	flex-direction: column;
+	gap: var(--spacing--sm);
+}
+</style>
diff --git a/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/tabs/OAuthClientsTable.test.ts b/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/tabs/OAuthClientsTable.test.ts
new file mode 100644
index 00000000000..51fc5e87f59
--- /dev/null
+++ b/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/tabs/OAuthClientsTable.test.ts
@@ -0,0 +1,124 @@
+import { within } from '@testing-library/vue';
+import userEvent from '@testing-library/user-event';
+import { createComponentRenderer } from '@/__tests__/render';
+import OAuthClientsTable from '@/features/ai/mcpAccess/components/tabs/OAuthClientsTable.vue';
+import type { OAuthClientResponseDto } from '@n8n/api-types';
+
+vi.mock('@/app/components/TimeAgo.vue', () => ({
+	default: {
+		name: 'TimeAgo',
+		props: ['date'],
+		template: '<span>{{ date }}</span>',
+	},
+}));
+
+const createComponent = createComponentRenderer(OAuthClientsTable);
+
+const createClient = (overrides: Partial<OAuthClientResponseDto> = {}): OAuthClientResponseDto => ({
+	id: 'client-1',
+	name: 'Test Client',
+	createdAt: '2025-09-09T14:14:04.155Z',
+	updatedAt: '2025-09-09T14:14:04.155Z',
+	redirectUris: [],
+	grantTypes: ['authorization_code'],
+	tokenEndpointAuthMethod: 'client_secret_basic',
+	...overrides,
+});
+
+describe('OAuthClientsTable', () => {
+	afterEach(() => {
+		vi.clearAllMocks();
+	});
+
+	describe('Loading state', () => {
+		it('should render loading skeleton when loading is true', () => {
+			const { container, queryByTestId } = createComponent({
+				props: {
+					clients: [],
+					loading: true,
+				},
+			});
+
+			expect(container.querySelector('.n8n-loading')).toBeInTheDocument();
+			expect(queryByTestId('oauth-clients-data-table')).not.toBeInTheDocument();
+		});
+	});
+
+	describe('Empty state', () => {
+		it('should render empty state when clients array is empty', () => {
+			const { getByTestId } = createComponent({
+				props: {
+					clients: [],
+					loading: false,
+				},
+			});
+
+			expect(getByTestId('mcp-workflow-table-empty-state')).toBeVisible();
+			expect(getByTestId('mcp-workflow-table-empty-state-description')).toBeVisible();
+		});
+	});
+
+	describe('Client rendering', () => {
+		it('should render client name and creation date', () => {
+			const client = createClient({
+				name: 'My OAuth Client',
+				createdAt: '2025-10-15T10:30:00.000Z',
+			});
+
+			const { getByTestId } = createComponent({
+				props: {
+					clients: [client],
+					loading: false,
+				},
+			});
+
+			expect(getByTestId('mcp-client-name')).toHaveTextContent('My OAuth Client');
+			expect(getByTestId('mcp-client-created-at')).toBeVisible();
+		});
+
+		it('should render multiple clients in the table', () => {
+			const clients = [
+				createClient({ id: 'client-1', name: 'First Client' }),
+				createClient({ id: 'client-2', name: 'Second Client' }),
+				createClient({ id: 'client-3', name: 'Third Client' }),
+			];
+
+			const { getAllByTestId } = createComponent({
+				props: {
+					clients,
+					loading: false,
+				},
+			});
+
+			const clientNames = getAllByTestId('mcp-client-name');
+			expect(clientNames).toHaveLength(3);
+			expect(clientNames[0]).toHaveTextContent('First Client');
+			expect(clientNames[1]).toHaveTextContent('Second Client');
+			expect(clientNames[2]).toHaveTextContent('Third Client');
+		});
+	});
+
+	describe('Actions menu', () => {
+		it('should emit revokeClient event when revoke action is clicked', async () => {
+			const client = createClient({ name: 'Client to Revoke' });
+
+			const { getByTestId, emitted } = createComponent({
+				props: {
+					clients: [client],
+					loading: false,
+				},
+			});
+
+			const actionToggle = getByTestId('mcp-oauth-client-action-toggle');
+			const toggleButton = within(actionToggle).getByRole('button');
+			await userEvent.click(toggleButton);
+
+			const menuItem = document.querySelector('[data-test-id="action-revokeClient"]');
+			expect(menuItem).not.toBeNull();
+			await userEvent.click(menuItem!);
+
+			expect(emitted('revokeClient')).toBeTruthy();
+			expect(emitted('revokeClient')[0]).toEqual([client]);
+		});
+	});
+});
diff --git a/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/connectionInstructions/OAuthClientsTable.vue b/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/tabs/OAuthClientsTable.vue
similarity index 69%
rename from packages/frontend/editor-ui/src/features/ai/mcpAccess/components/connectionInstructions/OAuthClientsTable.vue
rename to packages/frontend/editor-ui/src/features/ai/mcpAccess/components/tabs/OAuthClientsTable.vue
index 4dba004598e..122555c3bc9 100644
--- a/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/connectionInstructions/OAuthClientsTable.vue
+++ b/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/tabs/OAuthClientsTable.vue
@@ -2,16 +2,7 @@
 import { useI18n } from '@n8n/i18n';
 import type { OAuthClientResponseDto } from '@n8n/api-types';
 import type { UserAction } from '@/Interface';
-import {
-	N8nActionBox,
-	N8nActionToggle,
-	N8nButton,
-	N8nDataTableServer,
-	N8nHeading,
-	N8nLoading,
-	N8nText,
-	N8nTooltip,
-} from '@n8n/design-system';
+import { N8nActionToggle, N8nDataTableServer, N8nLoading, N8nText } from '@n8n/design-system';
 import { ref } from 'vue';
 import type { TableHeader } from '@n8n/design-system/components/N8nDataTableServer';
 import TimeAgo from '@/app/components/TimeAgo.vue';
@@ -27,7 +18,6 @@ const props = defineProps<Props>();
 
 const emit = defineEmits<{
 	revokeClient: [client: OAuthClientResponseDto];
-	refresh: [];
 }>();
 
 const tableHeaders = ref<Array<TableHeader<OAuthClientResponseDto>>>([
@@ -36,8 +26,8 @@ const tableHeaders = ref<Array<TableHeader<OAuthClientResponseDto>>>([
 		key: 'name',
 		width: 250,
 		disableSort: true,
-		value(client: OAuthClientResponseDto) {
-			return client.name;
+		value() {
+			return;
 		},
 	},
 	{
@@ -82,35 +72,33 @@ const onTableAction = (action: string, item: OAuthClientResponseDto) => {
 			<N8nLoading :loading="props.loading" variant="p" :rows="5" :shrink-last="false" />
 		</div>
 		<div v-else class="mt-s mb-xl">
-			<div :class="[$style.header, 'mb-s']">
-				<N8nHeading size="medium" :bold="true">
-					{{ i18n.baseText('settings.mcp.oAuthClients.heading') }} ({{ props.clients.length }})
-				</N8nHeading>
-				<N8nTooltip :content="i18n.baseText('settings.mcp.refresh.tooltip')">
-					<N8nButton
-						data-test-id="mcp-oauth-clients-refresh-button"
-						size="small"
-						type="tertiary"
-						icon="refresh-cw"
-						:square="true"
-						@click="$emit('refresh')"
-					/>
-				</N8nTooltip>
-			</div>
-			<N8nActionBox
-				v-if="props.clients.length === 0"
-				data-test-id="empty-oauth-clients-list-box"
-				:heading="i18n.baseText('settings.mcp.oAuthClients.table.empty.title')"
-			/>
 			<N8nDataTableServer
-				v-else
 				data-test-id="oauth-clients-data-table"
 				:headers="tableHeaders"
 				:items="props.clients"
 				:items-length="props.clients.length"
 			>
+				<template v-if="props.clients.length === 0" #cover>
+					<div :class="$style['empty-state']">
+						<N8nText data-test-id="mcp-workflow-table-empty-state" size="large" color="text-base">
+							{{ i18n.baseText('settings.mcp.oauth.table.empty.title') }}
+						</N8nText>
+						<N8nText
+							data-test-id="mcp-workflow-table-empty-state-description"
+							size="small"
+							color="text-base"
+						>
+							{{ i18n.baseText('settings.mcp.oauth.table.empty.description') }}
+						</N8nText>
+					</div>
+				</template>
+				<template #[`item.name`]="{ item }">
+					<N8nText data-test-id="mcp-client-name" color="text-base">
+						{{ item.name }}
+					</N8nText>
+				</template>
 				<template #[`item.createdAt`]="{ item }">
-					<N8nText data-test-id="mcp-client-created-at">
+					<N8nText data-test-id="mcp-client-created-at" color="text-base">
 						<TimeAgo :date="String(item.createdAt)" />
 					</N8nText>
 				</template>
@@ -134,4 +122,14 @@ const onTableAction = (action: string, item: OAuthClientResponseDto) => {
 	justify-content: space-between;
 	align-items: center;
 }
+
+.empty-state {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	gap: var(--spacing--sm);
+	padding: var(--spacing--lg) 0;
+	min-height: 250px;
+}
 </style>
diff --git a/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/tabs/WorkflowsTable.test.ts b/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/tabs/WorkflowsTable.test.ts
new file mode 100644
index 00000000000..da5f4bb00d8
--- /dev/null
+++ b/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/tabs/WorkflowsTable.test.ts
@@ -0,0 +1,477 @@
+import { within } from '@testing-library/vue';
+import userEvent from '@testing-library/user-event';
+import { createComponentRenderer } from '@/__tests__/render';
+import WorkflowsTable from '@/features/ai/mcpAccess/components/tabs/WorkflowsTable.vue';
+import type { WorkflowListItem } from '@/Interface';
+
+const { mockRouterPush } = vi.hoisted(() => ({
+	mockRouterPush: vi.fn(),
+}));
+
+vi.mock('@/app/router', () => ({
+	default: {
+		resolve: vi.fn(({ name, params }) => ({
+			fullPath:
+				name === 'NodeViewExisting' ? `/workflows/${params.name}` : `/projects/${params.projectId}`,
+		})),
+		push: mockRouterPush,
+	},
+}));
+
+const createComponent = createComponentRenderer(WorkflowsTable);
+
+const createWorkflow = (overrides: Partial<WorkflowListItem> = {}): WorkflowListItem => ({
+	resource: 'workflow',
+	id: 'test-workflow-1',
+	createdAt: '2025-09-09T14:14:04.155Z',
+	updatedAt: '2025-09-23T08:13:45.000Z',
+	name: 'Test Workflow',
+	active: true,
+	activeVersionId: 'v1',
+	isArchived: false,
+	settings: {
+		availableInMCP: true,
+		executionOrder: 'v1',
+	},
+	versionId: 'v1',
+	tags: [],
+	scopes: ['workflow:read', 'workflow:update'],
+	homeProject: {
+		id: 'project1',
+		type: 'team',
+		name: 'Test Project',
+		icon: {
+			type: 'icon',
+			value: 'bot',
+		},
+		createdAt: '2025-09-09T14:13:50.000Z',
+		updatedAt: '2025-09-09T14:13:50.000Z',
+	},
+	sharedWithProjects: [],
+	...overrides,
+});
+
+describe('WorkflowsTable', () => {
+	afterEach(() => {
+		vi.clearAllMocks();
+	});
+
+	describe('Empty state', () => {
+		it('should render empty state when workflows array is empty', () => {
+			const { getByTestId } = createComponent({
+				props: {
+					workflows: [],
+					loading: false,
+				},
+			});
+
+			expect(getByTestId('mcp-workflow-table-empty-state')).toBeVisible();
+			expect(getByTestId('mcp-workflow-table-empty-state-description')).toBeVisible();
+		});
+
+		it('should navigate to workflows list when button is clicked', async () => {
+			const { getByTestId } = createComponent({
+				props: {
+					workflows: [],
+					loading: false,
+				},
+			});
+
+			const button = getByTestId('mcp-workflow-table-empty-state-button');
+			await userEvent.click(button);
+
+			expect(mockRouterPush).toHaveBeenCalledWith({ name: 'WorkflowsView' });
+		});
+	});
+
+	describe('Loading state', () => {
+		it('should render loading skeleton when loading is true', () => {
+			const { container, queryByTestId } = createComponent({
+				props: {
+					workflows: [],
+					loading: true,
+				},
+			});
+
+			expect(container.querySelector('.n8n-loading')).toBeInTheDocument();
+			expect(queryByTestId('mcp-workflow-table')).not.toBeInTheDocument();
+		});
+	});
+
+	describe('Workflow in project root', () => {
+		it('should render workflow with project location only (no folder)', () => {
+			const workflow = createWorkflow({
+				name: 'Workflow In Project Root',
+				homeProject: {
+					id: 'project1',
+					type: 'team',
+					name: 'My Project',
+					icon: { type: 'icon', value: 'folder' },
+					createdAt: '2025-01-01',
+					updatedAt: '2025-01-01',
+				},
+				parentFolder: undefined,
+			});
+
+			const { getByTestId, queryByTestId } = createComponent({
+				props: {
+					workflows: [workflow],
+					loading: false,
+				},
+			});
+
+			expect(getByTestId('mcp-workflow-name')).toHaveTextContent('Workflow In Project Root');
+			expect(getByTestId('mcp-workflow-project-name')).toHaveTextContent('My Project');
+			expect(queryByTestId('mcp-workflow-folder-name')).not.toBeInTheDocument();
+			expect(queryByTestId('mcp-workflow-ellipsis-separator')).not.toBeInTheDocument();
+		});
+
+		it('should render personal project name correctly', () => {
+			const workflow = createWorkflow({
+				homeProject: {
+					id: 'personal-project',
+					type: 'personal',
+					name: 'User<user@n8n.io>',
+					icon: { type: 'icon', value: 'user' },
+					createdAt: '2025-01-01',
+					updatedAt: '2025-01-01',
+				},
+			});
+
+			const { getByTestId } = createComponent({
+				props: {
+					workflows: [workflow],
+					loading: false,
+				},
+			});
+
+			expect(getByTestId('mcp-workflow-project-name')).toHaveTextContent('Personal');
+		});
+	});
+
+	describe('Workflow in folder', () => {
+		it('should render workflow in folder without ellipsis (folder in project root)', () => {
+			const workflow = createWorkflow({
+				name: 'Workflow In Folder',
+				homeProject: {
+					id: 'project1',
+					type: 'team',
+					name: 'My Project',
+					icon: { type: 'icon', value: 'folder' },
+					createdAt: '2025-01-01',
+					updatedAt: '2025-01-01',
+				},
+				parentFolder: {
+					id: 'folder1',
+					name: 'Parent Folder',
+					parentFolderId: null,
+				},
+			});
+
+			const { getByTestId, queryByTestId } = createComponent({
+				props: {
+					workflows: [workflow],
+					loading: false,
+				},
+			});
+
+			expect(getByTestId('mcp-workflow-project-name')).toHaveTextContent('My Project');
+			expect(getByTestId('mcp-workflow-folder-name')).toHaveTextContent('Parent Folder');
+			// Only one separator (between project and folder)
+			expect(getByTestId('mcp-workflow-ellipsis-separator')).toBeVisible();
+			expect(queryByTestId('mcp-workflow-grandparent-folder')).not.toBeInTheDocument();
+		});
+
+		it('should render workflow in nested folder with ellipsis', () => {
+			const workflow = createWorkflow({
+				name: 'Workflow In Nested Folder',
+				homeProject: {
+					id: 'project1',
+					type: 'team',
+					name: 'My Project',
+					icon: { type: 'icon', value: 'folder' },
+					createdAt: '2025-01-01',
+					updatedAt: '2025-01-01',
+				},
+				parentFolder: {
+					id: 'folder2',
+					name: 'Child Folder',
+					parentFolderId: 'folder1', // Has a grandparent folder
+				},
+			});
+
+			const { getByTestId, getAllByTestId } = createComponent({
+				props: {
+					workflows: [workflow],
+					loading: false,
+				},
+			});
+
+			expect(getByTestId('mcp-workflow-project-name')).toHaveTextContent('My Project');
+			expect(getByTestId('mcp-workflow-folder-name')).toHaveTextContent('Child Folder');
+			expect(getByTestId('mcp-workflow-grandparent-folder')).toBeVisible();
+			// Multiple separators (between project and ellipsis, and between ellipsis and folder)
+			expect(getAllByTestId('mcp-workflow-ellipsis-separator').length).toBeGreaterThanOrEqual(2);
+		});
+	});
+
+	describe('Workflow description', () => {
+		it('should render workflow description when present', () => {
+			const workflow = createWorkflow({
+				description: 'This is a test workflow description',
+			});
+
+			const { getByTestId } = createComponent({
+				props: {
+					workflows: [workflow],
+					loading: false,
+				},
+			});
+
+			expect(getByTestId('mcp-workflow-description')).toHaveTextContent(
+				'This is a test workflow description',
+			);
+		});
+
+		it('should render warning when workflow has no description', () => {
+			const workflow = createWorkflow({
+				description: undefined,
+			});
+
+			const { getByTestId, queryByTestId } = createComponent({
+				props: {
+					workflows: [workflow],
+					loading: false,
+				},
+			});
+
+			expect(getByTestId('mcp-workflow-description-empty')).toBeVisible();
+			expect(queryByTestId('mcp-workflow-description')).not.toBeInTheDocument();
+		});
+
+		it('should render warning when workflow description is empty string', () => {
+			const workflow = createWorkflow({
+				description: '',
+			});
+
+			const { getByTestId, queryByTestId } = createComponent({
+				props: {
+					workflows: [workflow],
+					loading: false,
+				},
+			});
+
+			expect(getByTestId('mcp-workflow-description-empty')).toBeVisible();
+			expect(queryByTestId('mcp-workflow-description')).not.toBeInTheDocument();
+		});
+	});
+
+	describe('Actions menu', () => {
+		it('should enable "Remove Access" action when user has update permissions', async () => {
+			const workflow = createWorkflow({
+				scopes: ['workflow:read', 'workflow:update'],
+			});
+
+			const { getByTestId } = createComponent({
+				props: {
+					workflows: [workflow],
+					loading: false,
+				},
+			});
+
+			const actionToggle = getByTestId('mcp-workflow-action-toggle');
+			const toggleButton = within(actionToggle).getByRole('button');
+			await userEvent.click(toggleButton);
+
+			// Check that the action menu item is not disabled
+			const menuItems = document.querySelectorAll('[data-test-id="action-removeFromMCP"]');
+			expect(menuItems.length).toBe(1);
+			expect(menuItems[0]).not.toHaveAttribute('disabled');
+		});
+
+		it('should disable "Remove Access" action when user lacks update permissions', async () => {
+			const workflow = createWorkflow({
+				scopes: ['workflow:read'], // No workflow:update scope
+			});
+
+			const { getByTestId } = createComponent({
+				props: {
+					workflows: [workflow],
+					loading: false,
+				},
+			});
+
+			const actionToggle = getByTestId('mcp-workflow-action-toggle');
+			const toggleButton = within(actionToggle).getByRole('button');
+			await userEvent.click(toggleButton);
+
+			// Check that the action menu item is disabled
+			const menuItems = document.querySelectorAll('[data-test-id="action-removeFromMCP"]');
+			expect(menuItems.length).toBe(1);
+			expect(menuItems[0]).toHaveClass('is-disabled');
+		});
+
+		it('should emit removeMcpAccess event when action is clicked', async () => {
+			const workflow = createWorkflow({
+				scopes: ['workflow:read', 'workflow:update'],
+			});
+
+			const { getByTestId, emitted } = createComponent({
+				props: {
+					workflows: [workflow],
+					loading: false,
+				},
+			});
+
+			const actionToggle = getByTestId('mcp-workflow-action-toggle');
+			const toggleButton = within(actionToggle).getByRole('button');
+			await userEvent.click(toggleButton);
+
+			const menuItem = document.querySelector('[data-test-id="action-removeFromMCP"]');
+			expect(menuItem).not.toBeNull();
+			await userEvent.click(menuItem!);
+
+			expect(emitted('removeMcpAccess')).toBeTruthy();
+			expect(emitted('removeMcpAccess')[0]).toEqual([workflow]);
+		});
+	});
+
+	describe('Workflow links', () => {
+		it('should render workflow name as link to workflow editor', () => {
+			const workflow = createWorkflow({
+				id: 'workflow-123',
+				name: 'My Workflow',
+			});
+
+			const { getByTestId } = createComponent({
+				props: {
+					workflows: [workflow],
+					loading: false,
+				},
+			});
+
+			const workflowLink = getByTestId('mcp-workflow-name-link');
+			expect(workflowLink).toHaveAttribute('href', '/workflows/workflow-123');
+		});
+
+		it('should render project name as link to project workflows', () => {
+			const workflow = createWorkflow({
+				homeProject: {
+					id: 'project-456',
+					type: 'team',
+					name: 'Team Project',
+					icon: { type: 'icon', value: 'folder' },
+					createdAt: '2025-01-01',
+					updatedAt: '2025-01-01',
+				},
+			});
+
+			const { getByTestId } = createComponent({
+				props: {
+					workflows: [workflow],
+					loading: false,
+				},
+			});
+
+			const projectLink = getByTestId('mcp-workflow-project-link');
+			expect(projectLink).toHaveAttribute('href', '/projects/project-456');
+		});
+	});
+
+	describe('Multiple workflows', () => {
+		it('should render multiple workflows in the table', () => {
+			const workflows = [
+				createWorkflow({
+					id: 'workflow-1',
+					name: 'First Workflow',
+					description: 'First description',
+					homeProject: {
+						id: 'project1',
+						type: 'team',
+						name: 'Project A',
+						icon: { type: 'icon', value: 'folder' },
+						createdAt: '2025-01-01',
+						updatedAt: '2025-01-01',
+					},
+				}),
+				createWorkflow({
+					id: 'workflow-2',
+					name: 'Second Workflow',
+					description: undefined,
+					homeProject: {
+						id: 'project2',
+						type: 'personal',
+						name: 'User<user@n8n.io>',
+						icon: { type: 'icon', value: 'user' },
+						createdAt: '2025-01-01',
+						updatedAt: '2025-01-01',
+					},
+					parentFolder: {
+						id: 'folder1',
+						name: 'My Folder',
+						parentFolderId: null,
+					},
+				}),
+				createWorkflow({
+					id: 'workflow-3',
+					name: 'Third Workflow',
+					description: 'Third description',
+					homeProject: {
+						id: 'project3',
+						type: 'team',
+						name: 'Project B',
+						icon: { type: 'icon', value: 'folder' },
+						createdAt: '2025-01-01',
+						updatedAt: '2025-01-01',
+					},
+					parentFolder: {
+						id: 'folder2',
+						name: 'Nested Folder',
+						parentFolderId: 'folder1',
+					},
+				}),
+			];
+
+			const { getAllByTestId } = createComponent({
+				props: {
+					workflows,
+					loading: false,
+				},
+			});
+
+			// Verify all workflows are rendered
+			const workflowCells = getAllByTestId('mcp-workflow-cell');
+			expect(workflowCells).toHaveLength(3);
+
+			// Verify workflow names
+			const workflowNames = getAllByTestId('mcp-workflow-name');
+			expect(workflowNames).toHaveLength(3);
+			expect(workflowNames[0]).toHaveTextContent('First Workflow');
+			expect(workflowNames[1]).toHaveTextContent('Second Workflow');
+			expect(workflowNames[2]).toHaveTextContent('Third Workflow');
+
+			// Verify project names (second one should show "Personal")
+			const projectNames = getAllByTestId('mcp-workflow-project-name');
+			expect(projectNames).toHaveLength(3);
+			expect(projectNames[0]).toHaveTextContent('Project A');
+			expect(projectNames[1]).toHaveTextContent('Personal');
+			expect(projectNames[2]).toHaveTextContent('Project B');
+
+			// Verify descriptions (second workflow has no description, so warning should show)
+			const descriptions = getAllByTestId('mcp-workflow-description');
+			expect(descriptions).toHaveLength(2);
+			const emptyDescriptions = getAllByTestId('mcp-workflow-description-empty');
+			expect(emptyDescriptions).toHaveLength(1);
+
+			// Verify folder names (only workflows 2 and 3 have folders)
+			const folderNames = getAllByTestId('mcp-workflow-folder-name');
+			expect(folderNames).toHaveLength(2);
+			expect(folderNames[0]).toHaveTextContent('My Folder');
+			expect(folderNames[1]).toHaveTextContent('Nested Folder');
+
+			// Verify ellipsis for nested folder (only workflow 3)
+			const grandparentFolders = getAllByTestId('mcp-workflow-grandparent-folder');
+			expect(grandparentFolders).toHaveLength(1);
+		});
+	});
+});
diff --git a/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/WorkflowsTable.vue b/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/tabs/WorkflowsTable.vue
similarity index 59%
rename from packages/frontend/editor-ui/src/features/ai/mcpAccess/components/WorkflowsTable.vue
rename to packages/frontend/editor-ui/src/features/ai/mcpAccess/components/tabs/WorkflowsTable.vue
index d0526769f7e..a14ceb2c3ed 100644
--- a/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/WorkflowsTable.vue
+++ b/packages/frontend/editor-ui/src/features/ai/mcpAccess/components/tabs/WorkflowsTable.vue
@@ -4,21 +4,19 @@ import { useI18n } from '@n8n/i18n';
 import type { WorkflowListItem, UserAction } from '@/Interface';
 import { type TableHeader } from '@n8n/design-system/components/N8nDataTableServer';
 import {
-	N8nActionBox,
 	N8nActionToggle,
 	N8nButton,
 	N8nDataTableServer,
-	N8nHeading,
 	N8nIcon,
 	N8nLink,
 	N8nLoading,
 	N8nText,
 	N8nTooltip,
 } from '@n8n/design-system';
-import ProjectIcon from '@/features/collaboration/projects/components/ProjectIcon.vue';
 import { VIEWS } from '@/app/constants';
+import { MCP_TOOLTIP_DELAY } from '@/features/ai/mcpAccess/mcp.constants';
 import router from '@/app/router';
-import { isIconOrEmoji, type IconOrEmoji } from '@n8n/design-system/components/N8nIconPicker/types';
+import { getResourcePermissions } from '@n8n/permissions';
 
 type Props = {
 	workflows: WorkflowListItem[];
@@ -29,15 +27,14 @@ const props = defineProps<Props>();
 
 const emit = defineEmits<{
 	removeMcpAccess: [workflow: WorkflowListItem];
-	refresh: [];
 }>();
 
 const i18n = useI18n();
 
 const tableHeaders = ref<Array<TableHeader<WorkflowListItem>>>([
 	{
-		title: i18n.baseText('generic.project'),
-		key: 'homeProject',
+		title: i18n.baseText('settings.mcp.workflows.table.column.name'),
+		key: 'workflow',
 		width: 150,
 		disableSort: true,
 		value() {
@@ -45,8 +42,8 @@ const tableHeaders = ref<Array<TableHeader<WorkflowListItem>>>([
 		},
 	},
 	{
-		title: i18n.baseText('settings.mcp.workflowsTable.workflow'),
-		key: 'workflow',
+		title: i18n.baseText('settings.mcp.workflows.table.column.location'),
+		key: 'location',
 		width: 200,
 		disableSort: true,
 		value() {
@@ -74,23 +71,16 @@ const tableHeaders = ref<Array<TableHeader<WorkflowListItem>>>([
 	},
 ]);
 
-const tableActions = ref<Array<UserAction<WorkflowListItem>>>([
-	{
-		label: i18n.baseText('settings.mcp.workflows.table.action.removeMCPAccess'),
-		value: 'removeFromMCP',
-	},
-]);
+const getAvailableActions = (workflow: WorkflowListItem): Array<UserAction<WorkflowListItem>> => {
+	const permissions = getResourcePermissions(workflow.scopes);
 
-const getProjectIcon = (workflow: WorkflowListItem): IconOrEmoji => {
-	if (workflow.homeProject?.type === 'personal') {
-		return { type: 'icon', value: 'user' };
-	} else if (workflow.homeProject?.name) {
-		return isIconOrEmoji(workflow.homeProject.icon)
-			? workflow.homeProject.icon
-			: { type: 'icon', value: 'layers' };
-	} else {
-		return { type: 'icon', value: 'house' };
-	}
+	return [
+		{
+			label: i18n.baseText('settings.mcp.workflows.table.action.removeMCPAccess'),
+			value: 'removeFromMCP',
+			disabled: !permissions.workflow.update,
+		},
+	];
 };
 
 const getProjectName = (workflow: WorkflowListItem): string => {
@@ -109,6 +99,10 @@ const onWorkflowAction = (action: string, workflow: WorkflowListItem) => {
 			break;
 	}
 };
+
+const navigateToWorkflowList = () => {
+	void router.push({ name: VIEWS.WORKFLOWS });
+};
 </script>
 
 <template>
@@ -118,39 +112,77 @@ const onWorkflowAction = (action: string, workflow: WorkflowListItem) => {
 			<N8nLoading :loading="props.loading" variant="p" :rows="5" :shrink-last="false" />
 		</div>
 		<div v-else class="mt-s mb-xl">
-			<div :class="[$style.header, 'mb-s']">
-				<N8nHeading size="medium" :bold="true">
-					{{ i18n.baseText('settings.mcp.available.workflows.heading') }} ({{
-						props.workflows.length
-					}})
-				</N8nHeading>
-				<N8nTooltip :content="i18n.baseText('settings.mcp.refresh.tooltip')">
-					<N8nButton
-						data-test-id="mcp-workflows-refresh-button"
-						size="small"
-						type="tertiary"
-						icon="refresh-cw"
-						:square="true"
-						@click="$emit('refresh')"
-					/>
-				</N8nTooltip>
-			</div>
-			<N8nActionBox
-				v-if="props.workflows.length === 0"
-				data-test-id="empty-workflow-list-box"
-				:heading="i18n.baseText('settings.mcp.empty.title')"
-				:description="i18n.baseText('settings.mcp.empty.description')"
-			/>
 			<N8nDataTableServer
-				v-else
 				:class="$style['workflow-table']"
 				data-test-id="mcp-workflow-table"
 				:headers="tableHeaders"
 				:items="props.workflows"
 				:items-length="props.workflows.length"
 			>
+				<template v-if="props.workflows.length === 0" #cover>
+					<div :class="$style['empty-state']">
+						<N8nText data-test-id="mcp-workflow-table-empty-state" size="large" color="text-base">
+							{{ i18n.baseText('settings.mcp.workflows.table.empty.title') }}
+						</N8nText>
+						<N8nText
+							data-test-id="mcp-workflow-table-empty-state-description"
+							size="small"
+							color="text-base"
+						>
+							{{ i18n.baseText('settings.mcp.workflows.table.empty.description') }}
+						</N8nText>
+						<N8nButton
+							data-test-id="mcp-workflow-table-empty-state-button"
+							type="primary"
+							:label="i18n.baseText('settings.mcp.workflows.table.empty.button.label')"
+							@click="navigateToWorkflowList"
+						/>
+					</div>
+				</template>
 				<template #[`item.workflow`]="{ item }">
 					<div :class="$style['workflow-cell']" data-test-id="mcp-workflow-cell">
+						<N8nLink
+							data-test-id="mcp-workflow-name-link"
+							:new-window="true"
+							:to="
+								router.resolve({
+									name: VIEWS.WORKFLOW,
+									params: { name: item.id },
+								}).fullPath
+							"
+							:theme="'text'"
+							:class="$style['table-link']"
+						>
+							<N8nText data-test-id="mcp-workflow-name">{{ item.name }}</N8nText>
+						</N8nLink>
+					</div>
+				</template>
+				<template #[`item.location`]="{ item }">
+					<div :class="$style['location-cell']" data-test-id="mcp-workflow-location-cell">
+						<span v-if="item.homeProject">
+							<N8nLink
+								data-test-id="mcp-workflow-project-link"
+								:to="
+									router.resolve({
+										name: VIEWS.PROJECTS_WORKFLOWS,
+										params: { projectId: item.homeProject.id },
+									}).fullPath
+								"
+								:theme="'text'"
+								:class="[$style['table-link'], $style['project-link']]"
+								:new-window="true"
+							>
+								<N8nText data-test-id="mcp-workflow-project-name">
+									{{ getProjectName(item) }}
+								</N8nText>
+							</N8nLink>
+						</span>
+						<span
+							v-if="item.parentFolder"
+							:class="$style.separator"
+							data-test-id="mcp-workflow-ellipsis-separator"
+							>/</span
+						>
 						<span
 							v-if="item.parentFolder?.parentFolderId"
 							:class="$style['parent-folder']"
@@ -181,77 +213,40 @@ const onWorkflowAction = (action: string, workflow: WorkflowListItem) => {
 								</N8nText>
 							</span>
 						</span>
-						<span
-							v-if="item.parentFolder"
-							:class="$style['separator']"
-							data-test-id="mcp-workflow-folder-separator"
-							>/</span
-						>
-						<N8nLink
-							data-test-id="mcp-workflow-name-link"
-							:new-window="true"
-							:to="
-								router.resolve({
-									name: VIEWS.WORKFLOW,
-									params: { name: item.id },
-								}).fullPath
-							"
-							:theme="'text'"
-							:class="$style['table-link']"
-						>
-							<N8nText data-test-id="mcp-workflow-name">{{ item.name }}</N8nText>
-						</N8nLink>
 					</div>
 				</template>
 				<template #[`item.description`]="{ item }">
 					<N8nTooltip
-						:content="item.description"
-						:disabled="!item.description"
+						:content="
+							item.description ||
+							i18n.baseText('settings.mcp.workflows.table.column.description.emptyTooltip')
+						"
+						:show-after="MCP_TOOLTIP_DELAY"
 						:popper-class="$style['description-popper']"
 					>
 						<div :class="$style['description-cell']">
-							<N8nText data-test-id="mcp-workflow-description">
-								{{ item.description || '' }}
-							</N8nText>
+							<span v-if="item.description">
+								<N8nText data-test-id="mcp-workflow-description">
+									{{ item.description }}
+								</N8nText>
+							</span>
+							<span v-else>
+								<N8nIcon icon="triangle-alert" :size="14" color="warning" class="mr-2xs" />
+								<N8nText data-test-id="mcp-workflow-description-empty">
+									{{
+										i18n.baseText('settings.mcp.workflows.table.column.description.emptyContent')
+									}}
+								</N8nText>
+							</span>
 						</div>
 					</N8nTooltip>
 				</template>
-				<template #[`item.homeProject`]="{ item }">
-					<span v-if="item.homeProject">
-						<N8nLink
-							data-test-id="mcp-workflow-project-link"
-							:to="
-								router.resolve({
-									name: VIEWS.PROJECTS_WORKFLOWS,
-									params: { projectId: item.homeProject.id },
-								}).fullPath
-							"
-							:theme="'text'"
-							:class="[$style['table-link'], $style['project-link']]"
-							:new-window="true"
-						>
-							<ProjectIcon
-								v-if="item.homeProject"
-								:icon="getProjectIcon(item)"
-								:border-less="true"
-							/>
-							<N8nText data-test-id="mcp-workflow-project-name">
-								{{ getProjectName(item) }}
-							</N8nText>
-							<N8nIcon
-								icon="external-link"
-								:class="$style['link-icon']"
-								color="text-light"
-							></N8nIcon>
-						</N8nLink>
-					</span>
-					<N8nText v-else data-test-id="mcp-workflow-no-project">-</N8nText>
-				</template>
 				<template #[`item.actions`]="{ item }">
 					<N8nActionToggle
+						:class="$style['action-toggle']"
 						data-test-id="mcp-workflow-action-toggle"
 						placement="bottom"
-						:actions="tableActions"
+						:actions="getAvailableActions(item)"
 						theme="dark"
 						@action="onWorkflowAction($event, item)"
 					/>
@@ -280,12 +275,19 @@ const onWorkflowAction = (action: string, workflow: WorkflowListItem) => {
 	}
 }
 
-.workflow-cell,
-.parent-folder {
+.empty-state {
 	display: flex;
+	flex-direction: column;
 	align-items: center;
-	gap: var(--spacing--4xs);
+	justify-content: center;
+	gap: var(--spacing--sm);
+	padding: var(--spacing--lg) 0;
+	min-height: 250px;
+}
 
+.workflow-cell {
+	display: flex;
+	padding: var(--spacing--2xs) 0;
 	.separator,
 	.ellipsis {
 		padding-bottom: 1px;
@@ -293,13 +295,35 @@ const onWorkflowAction = (action: string, workflow: WorkflowListItem) => {
 	}
 }
 
+.location-cell {
+	display: flex;
+	align-items: center;
+	gap: var(--spacing--4xs);
+}
+
+.ellipsis {
+	padding-right: var(--spacing--4xs);
+}
+
+.ellipsis,
+.separator {
+	user-select: none;
+	color: var(--color--text--tint-1);
+}
+
 .description-cell {
 	display: -webkit-inline-box;
 	-webkit-box-orient: vertical;
 	-webkit-line-clamp: 3;
 	line-clamp: 3;
 	overflow: hidden;
-	font-style: italic;
+	color: var(--color--text);
+	padding: var(--spacing--2xs) 0;
+
+	span {
+		display: flex;
+		align-items: center;
+	}
 }
 
 .description-popper {
@@ -313,25 +337,6 @@ const onWorkflowAction = (action: string, workflow: WorkflowListItem) => {
 		display: flex;
 		align-items: center;
 		gap: var(--spacing--3xs);
-
-		.link-icon {
-			display: none;
-		}
-
-		&:hover {
-			.link-icon {
-				display: inline-flex;
-			}
-		}
-	}
-
-	&.project-link {
-		:global(.n8n-text) {
-			gap: 0;
-		}
-		.link-icon {
-			margin-left: var(--spacing--3xs);
-		}
 	}
 }
 </style>
diff --git a/packages/frontend/editor-ui/src/features/ai/mcpAccess/mcp.constants.ts b/packages/frontend/editor-ui/src/features/ai/mcpAccess/mcp.constants.ts
index b09d38de6a6..07c8486d075 100644
--- a/packages/frontend/editor-ui/src/features/ai/mcpAccess/mcp.constants.ts
+++ b/packages/frontend/editor-ui/src/features/ai/mcpAccess/mcp.constants.ts
@@ -1,7 +1,10 @@
-export const MCP_SETTINGS_VIEW = 'McpSettings';
+export const MCP_ENDPOINT = 'mcp-server/http';
+export const MCP_DOCS_PAGE_URL = 'https://docs.n8n.io/advanced-ai/accessing-n8n-mcp-server';
 
+export const MCP_SETTINGS_VIEW = 'McpSettings';
 export const MCP_STORE = 'mcp';
 
 export const LOADING_INDICATOR_TIMEOUT = 200;
+export const MCP_TOOLTIP_DELAY = 100;
 
-export const MCP_DOCS_PAGE_URL = 'https://docs.n8n.io/advanced-ai/accessing-n8n-mcp-server';
+export const MCP_CONNECT_POPOVER_WIDTH = 460;
diff --git a/packages/frontend/editor-ui/src/features/ai/mcpAccess/mcp.store.ts b/packages/frontend/editor-ui/src/features/ai/mcpAccess/mcp.store.ts
index c1aac5ff3a8..d03baf79fab 100644
--- a/packages/frontend/editor-ui/src/features/ai/mcpAccess/mcp.store.ts
+++ b/packages/frontend/editor-ui/src/features/ai/mcpAccess/mcp.store.ts
@@ -100,6 +100,10 @@ export const useMCPStore = defineStore(MCP_STORE, () => {
 		return apiKey;
 	}
 
+	function resetCurrentUserMCPKey(): void {
+		currentUserMCPKey.value = null;
+	}
+
 	async function getAllOAuthClients(): Promise<OAuthClientResponseDto[]> {
 		const response = await fetchOAuthClients(rootStore.restApiContext);
 		oauthClients.value = response.data;
@@ -121,6 +125,7 @@ export const useMCPStore = defineStore(MCP_STORE, () => {
 		currentUserMCPKey,
 		getOrCreateApiKey,
 		generateNewApiKey,
+		resetCurrentUserMCPKey,
 		oauthClients,
 		getAllOAuthClients,
 		removeOAuthClient,
diff --git a/packages/frontend/editor-ui/src/features/ai/mcpAccess/module.descriptor.ts b/packages/frontend/editor-ui/src/features/ai/mcpAccess/module.descriptor.ts
index 5b04a6fd282..9e81b1c83bf 100644
--- a/packages/frontend/editor-ui/src/features/ai/mcpAccess/module.descriptor.ts
+++ b/packages/frontend/editor-ui/src/features/ai/mcpAccess/module.descriptor.ts
@@ -9,7 +9,7 @@ const SettingsMCPView = async () => await import('@/features/ai/mcpAccess/Settin
 
 export const MCPModule: FrontendModuleDescription = {
 	id: 'mcp',
-	name: 'MCP Access',
+	name: 'MCP Server',
 	description: 'Access your n8n instance through MCP clients',
 	icon: 'mcp',
 	routes: [

From 15a8e1b567981b7700aa9df4c97555321734b1c9 Mon Sep 17 00:00:00 2001
From: mfsiega <93014743+mfsiega@users.noreply.github.com>
Date: Mon, 8 Dec 2025 14:36:15 +0100
Subject: [PATCH 127/167] fix(Form Node): Remove uploaded files from tmp
 (#22873)

---
 .../nodes-base/nodes/Form/test/utils.test.ts  | 25 +++++++++++++++++++
 packages/nodes-base/nodes/Form/utils/utils.ts |  4 +++
 2 files changed, 29 insertions(+)

diff --git a/packages/nodes-base/nodes/Form/test/utils.test.ts b/packages/nodes-base/nodes/Form/test/utils.test.ts
index 8bc7811c824..09fd09f2344 100644
--- a/packages/nodes-base/nodes/Form/test/utils.test.ts
+++ b/packages/nodes-base/nodes/Form/test/utils.test.ts
@@ -1490,6 +1490,31 @@ describe('prepareFormReturnItem', () => {
 		expect(result.binary!.Multiple_Files_1).toEqual({});
 	});
 
+	it('should call rm to clean up temporary files after file processing', async () => {
+		// Using require() here for inline jest.spyOn() pattern - this is acceptable in tests
+		// eslint-disable-next-line @typescript-eslint/no-require-imports
+		const rmSpy = jest.spyOn(require('fs/promises'), 'rm').mockResolvedValue(undefined);
+
+		const mockFiles: Array<Partial<MultiPartFormData.File>> = [
+			{ filepath: '/tmp/file1', originalFilename: 'file1.txt', mimetype: 'text/plain', size: 1024 },
+			{ filepath: '/tmp/file2', originalFilename: 'file2.txt', mimetype: 'text/plain', size: 2048 },
+		];
+
+		mockContext.getBodyData.mockReturnValue({
+			data: {},
+			files: { 'field-0': mockFiles },
+		});
+
+		const formFields = [{ fieldLabel: 'Multiple Files', fieldType: 'file', multipleFiles: true }];
+		await prepareFormReturnItem(mockContext, formFields, 'test');
+
+		expect(rmSpy).toHaveBeenCalledTimes(2);
+		expect(rmSpy).toHaveBeenCalledWith('/tmp/file1', { force: true });
+		expect(rmSpy).toHaveBeenCalledWith('/tmp/file2', { force: true });
+
+		rmSpy.mockRestore();
+	});
+
 	it('should format date fields', async () => {
 		mockContext.getBodyData.mockReturnValue({
 			data: { 'field-0': '2023-04-01' },
diff --git a/packages/nodes-base/nodes/Form/utils/utils.ts b/packages/nodes-base/nodes/Form/utils/utils.ts
index 3df9d11441f..dcda7f1c9b2 100644
--- a/packages/nodes-base/nodes/Form/utils/utils.ts
+++ b/packages/nodes-base/nodes/Form/utils/utils.ts
@@ -1,4 +1,5 @@
 import type { Response } from 'express';
+import { rm } from 'fs/promises';
 import isbot from 'isbot';
 import { DateTime } from 'luxon';
 import type {
@@ -422,6 +423,9 @@ export async function prepareFormReturnItem(
 				file.originalFilename ?? file.newFilename,
 				file.mimetype,
 			);
+
+			// Delete original file to prevent tmp directory from growing too large
+			await rm(file.filepath, { force: true });
 		}
 	}
 

From dcd094eaf98d9f1e355f1e3ae06d1899f1e8db3d Mon Sep 17 00:00:00 2001
From: mfsiega <93014743+mfsiega@users.noreply.github.com>
Date: Mon, 8 Dec 2025 14:54:02 +0100
Subject: [PATCH 128/167] fix(core): Handle misformed nodes in credential
 indexing (no-changelog) (#22915)

---
 .../__tests__/workflow-index.service.test.ts  | 113 ++++++++++++++++++
 .../workflow-index/workflow-index.service.ts  |  27 +++--
 2 files changed, 130 insertions(+), 10 deletions(-)

diff --git a/packages/cli/src/modules/workflow-index/__tests__/workflow-index.service.test.ts b/packages/cli/src/modules/workflow-index/__tests__/workflow-index.service.test.ts
index 4d53d469ada..07c5ca66a40 100644
--- a/packages/cli/src/modules/workflow-index/__tests__/workflow-index.service.test.ts
+++ b/packages/cli/src/modules/workflow-index/__tests__/workflow-index.service.test.ts
@@ -242,6 +242,119 @@ describe('WorkflowIndexService', () => {
 				}),
 			);
 		});
+
+		it('should skip credentials with null or empty id', async () => {
+			mockWorkflowDependencyRepository.updateDependenciesForWorkflow.mockResolvedValue(true);
+
+			const workflow = createWorkflow([
+				createNode({
+					id: 'node-1',
+					type: 'n8n-nodes-base.httpRequest',
+					credentials: {
+						httpAuth: { id: 'cred-1', name: 'Valid Auth' },
+						apiKey: { id: null, name: 'Invalid API Key' },
+						oAuth2: { id: '', name: 'Empty OAuth2' },
+					},
+				}),
+			]);
+
+			await service.updateIndexFor(workflow);
+
+			const call = mockWorkflowDependencyRepository.updateDependenciesForWorkflow.mock.calls[0];
+			const dependencies = call[1].dependencies;
+
+			// Should have nodeType + only 1 credential (cred-1)
+			expect(dependencies).toHaveLength(2);
+			expect(dependencies).toEqual(
+				expect.arrayContaining([
+					expect.objectContaining({
+						dependencyType: 'nodeType',
+						dependencyKey: 'n8n-nodes-base.httpRequest',
+						dependencyInfo: { nodeId: 'node-1', nodeVersion: 1 },
+					}),
+					expect.objectContaining({
+						dependencyType: 'credentialId',
+						dependencyKey: 'cred-1',
+						dependencyInfo: { nodeId: 'node-1', nodeVersion: 1 },
+					}),
+				]),
+			);
+		});
+
+		it('should skip nodes with missing type', async () => {
+			mockWorkflowDependencyRepository.updateDependenciesForWorkflow.mockResolvedValue(true);
+
+			const workflow = createWorkflow([
+				createNode({
+					id: 'node-1',
+					type: 'n8n-nodes-base.httpRequest',
+				}),
+				{
+					id: 'node-2',
+					name: 'node-2',
+					typeVersion: 1,
+					position: [0, 0] as [number, number],
+					parameters: {},
+				} as INode,
+			]);
+
+			await service.updateIndexFor(workflow);
+
+			const call = mockWorkflowDependencyRepository.updateDependenciesForWorkflow.mock.calls[0];
+			const dependencies = call[1].dependencies;
+
+			expect(dependencies).toHaveLength(1);
+			expect(dependencies[0]).toEqual(
+				expect.objectContaining({
+					dependencyType: 'nodeType',
+					dependencyKey: 'n8n-nodes-base.httpRequest',
+					dependencyInfo: { nodeId: 'node-1', nodeVersion: 1 },
+				}),
+			);
+		});
+
+		it('should skip webhook nodes with missing path', async () => {
+			mockWorkflowDependencyRepository.updateDependenciesForWorkflow.mockResolvedValue(true);
+
+			const workflow = createWorkflow([
+				createNode({
+					id: 'node-1',
+					type: 'n8n-nodes-base.webhook',
+					parameters: { path: 'valid-path' },
+				}),
+				createNode({
+					id: 'node-2',
+					type: 'n8n-nodes-base.webhook',
+					parameters: {},
+				}),
+			]);
+
+			await service.updateIndexFor(workflow);
+
+			const call = mockWorkflowDependencyRepository.updateDependenciesForWorkflow.mock.calls[0];
+			const dependencies = call[1].dependencies;
+
+			expect(dependencies).toHaveLength(3);
+			expect(dependencies).toEqual(
+				expect.arrayContaining([
+					expect.objectContaining({
+						dependencyType: 'nodeType',
+						dependencyKey: 'n8n-nodes-base.webhook',
+						dependencyInfo: { nodeId: 'node-1', nodeVersion: 1 },
+					}),
+					expect.objectContaining({
+						dependencyType: 'nodeType',
+						dependencyKey: 'n8n-nodes-base.webhook',
+						dependencyInfo: { nodeId: 'node-2', nodeVersion: 1 },
+					}),
+					expect.objectContaining({
+						dependencyType: 'webhookPath',
+						dependencyKey: 'valid-path',
+						dependencyInfo: { nodeId: 'node-1', nodeVersion: 1 },
+					}),
+				]),
+			);
+		});
 	});
 
 	describe('init()', () => {
diff --git a/packages/cli/src/modules/workflow-index/workflow-index.service.ts b/packages/cli/src/modules/workflow-index/workflow-index.service.ts
index 3c079bd450a..e8b412788bc 100644
--- a/packages/cli/src/modules/workflow-index/workflow-index.service.ts
+++ b/packages/cli/src/modules/workflow-index/workflow-index.service.ts
@@ -120,11 +120,13 @@ export class WorkflowIndexService {
 	}
 
 	private addNodeTypeDependencies(node: INode, dependencyUpdates: WorkflowDependencies): void {
-		dependencyUpdates.add({
-			dependencyType: 'nodeType',
-			dependencyKey: node.type,
-			dependencyInfo: { nodeId: node.id, nodeVersion: node.typeVersion },
-		});
+		if (node.type) {
+			dependencyUpdates.add({
+				dependencyType: 'nodeType',
+				dependencyKey: node.type,
+				dependencyInfo: { nodeId: node.id, nodeVersion: node.typeVersion },
+			});
+		}
 	}
 
 	private addCredentialDependencies(node: INode, dependencyUpdates: WorkflowDependencies): void {
@@ -133,6 +135,9 @@ export class WorkflowIndexService {
 		}
 		for (const credentialDetails of Object.values(node.credentials)) {
 			const { id } = credentialDetails;
+			if (!id) {
+				continue;
+			}
 			dependencyUpdates.add({
 				dependencyType: 'credentialId',
 				dependencyKey: id,
@@ -161,11 +166,13 @@ export class WorkflowIndexService {
 			return;
 		}
 		const webhookPath = node.parameters.path as string;
-		dependencyUpdates.add({
-			dependencyType: 'webhookPath',
-			dependencyKey: webhookPath,
-			dependencyInfo: { nodeId: node.id, nodeVersion: node.typeVersion },
-		});
+		if (webhookPath) {
+			dependencyUpdates.add({
+				dependencyType: 'webhookPath',
+				dependencyKey: webhookPath,
+				dependencyInfo: { nodeId: node.id, nodeVersion: node.typeVersion },
+			});
+		}
 	}
 
 	private getCalledWorkflowIdFrom(node: INode): string | undefined {

From df9b15c734391c15c8111835d653a6eccf8b8787 Mon Sep 17 00:00:00 2001
From: Suguru Inoue <suguru@n8n.io>
Date: Mon, 8 Dec 2025 14:59:45 +0100
Subject: [PATCH 129/167] fix: Don't show unavailable models in model selector
 (no-changelog) (#22763)

---
 packages/@n8n/api-types/src/chat-hub.ts       |   1 +
 .../modules/chat-hub/chat-hub.constants.ts    | 244 ++++++++++++++++--
 .../chat-hub/chat-hub.models.service.ts       |  32 ++-
 .../src/features/ai/chatHub/chat.store.ts     |   2 +
 .../ai/chatHub/components/ModelSelector.vue   |   1 +
 5 files changed, 240 insertions(+), 40 deletions(-)

diff --git a/packages/@n8n/api-types/src/chat-hub.ts b/packages/@n8n/api-types/src/chat-hub.ts
index dcfbc15dd85..5d22a39f3ea 100644
--- a/packages/@n8n/api-types/src/chat-hub.ts
+++ b/packages/@n8n/api-types/src/chat-hub.ts
@@ -214,6 +214,7 @@ export interface ChatModelMetadataDto {
 	capabilities: {
 		functionCalling: boolean;
 	};
+	available: boolean;
 }
 
 export interface ChatModelDto {
diff --git a/packages/cli/src/modules/chat-hub/chat-hub.constants.ts b/packages/cli/src/modules/chat-hub/chat-hub.constants.ts
index e27de85a0cd..01a26b83730 100644
--- a/packages/cli/src/modules/chat-hub/chat-hub.constants.ts
+++ b/packages/cli/src/modules/chat-hub/chat-hub.constants.ts
@@ -86,6 +86,7 @@ const DEFAULT_MODEL_METADATA: ChatModelMetadataDto = {
 	capabilities: {
 		functionCalling: true,
 	},
+	available: true,
 };
 
 const MODEL_METADATA_REGISTRY: Partial<
@@ -127,29 +128,67 @@ const MODEL_METADATA_REGISTRY: Partial<
 		},
 	},
 	openai: {
+		// Search models - specialized for search, not general chat
 		'gpt-4o-mini-search-preview': {
-			inputModalities: ['text'],
-			capabilities: {
-				functionCalling: false,
-			},
+			available: false,
 		},
 		'gpt-4o-mini-search-preview-2025-03-11': {
-			inputModalities: ['text'],
-			capabilities: {
-				functionCalling: false,
-			},
+			available: false,
 		},
 		'gpt-4o-search-preview': {
-			inputModalities: ['text'],
-			capabilities: {
-				functionCalling: false,
-			},
+			available: false,
 		},
 		'gpt-4o-search-preview-2025-03-11': {
-			inputModalities: ['text'],
-			capabilities: {
-				functionCalling: false,
-			},
+			available: false,
+		},
+		'gpt-5-search-api': {
+			available: false,
+		},
+		'gpt-5-search-api-2025-10-14': {
+			available: false,
+		},
+		// Transcription models - for speech-to-text, not chat
+		'gpt-4o-transcribe': {
+			available: false,
+		},
+		'gpt-4o-mini-transcribe': {
+			available: false,
+		},
+		'gpt-4o-transcribe-diarize': {
+			available: false,
+		},
+		// Image generation models - for creating images, not chat
+		'gpt-image-1': {
+			available: false,
+		},
+		'gpt-image-1-mini': {
+			available: false,
+		},
+		// Deep research models - long-running research, not interactive chat
+		'o4-mini-deep-research': {
+			available: false,
+		},
+		'o4-mini-deep-research-2025-06-26': {
+			available: false,
+		},
+		// Audio models - designed for audio I/O, not text chat
+		'gpt-4o-audio-preview': {
+			available: false,
+		},
+		'gpt-4o-audio-preview-2024-10-01': {
+			available: false,
+		},
+		'gpt-4o-audio-preview-2024-12-17': {
+			available: false,
+		},
+		'gpt-4o-audio-preview-2025-06-03': {
+			available: false,
+		},
+		'gpt-4o-mini-audio-preview': {
+			available: false,
+		},
+		'gpt-4o-mini-audio-preview-2024-12-17': {
+			available: false,
 		},
 		'gpt-3.5-turbo': {
 			inputModalities: ['text'],
@@ -199,6 +238,21 @@ const MODEL_METADATA_REGISTRY: Partial<
 		'o3-pro-2025-06-10': {
 			inputModalities: ['text'],
 		},
+		'gpt-audio': {
+			available: false,
+		},
+		'gpt-audio-2025-08-28': {
+			available: false,
+		},
+		'gpt-audio-mini': {
+			available: false,
+		},
+		'gpt-audio-mini-2025-10-06': {
+			available: false,
+		},
+		'gpt-3.5-turbo-16k': {
+			available: false,
+		},
 	},
 	mistralCloud: {
 		// Most Mistral models support text and image
@@ -262,21 +316,33 @@ const MODEL_METADATA_REGISTRY: Partial<
 		'ministral-8b-latest': {
 			inputModalities: ['text'],
 		},
+		'mistral-moderation-2411': {
+			available: false,
+		},
+		'mistral-moderation-latest': {
+			available: false,
+		},
+		'mistral-ocr-2503': {
+			available: false,
+		},
+		'mistral-ocr-2505': {
+			available: false,
+		},
+		'mistral-ocr-latest': {
+			available: false,
+		},
+		'voxtral-mini-transcribe-2507': {
+			available: false,
+		},
 	},
 	// Reference: https://ai.google.dev/gemini-api/docs/models
 	google: {
 		// Gemini 3 series - latest models with advanced multimodal understanding
-		'models/gemini-3-pro-preview': {},
 		'models/gemini-3-pro-image-preview': {
 			inputModalities: ['text', 'image'],
 			capabilities: { functionCalling: false },
 		},
 		// Gemini 2.5 Pro series
-		'models/gemini-2.5-pro': {},
-		'models/gemini-2.5-pro-exp-03-25': {},
-		'models/gemini-2.5-pro-preview-03-25': {},
-		'models/gemini-2.5-pro-preview-05-06': {},
-		'models/gemini-2.5-pro-preview-06-05': {},
 		'models/gemini-2.5-pro-preview-tts': {
 			inputModalities: ['text'],
 			capabilities: { functionCalling: false },
@@ -312,12 +378,6 @@ const MODEL_METADATA_REGISTRY: Partial<
 		'models/gemini-live-2.5-flash-preview': {
 			inputModalities: ['text', 'audio', 'video'],
 		},
-		// Gemini 2.5 Flash-Lite series
-		'models/gemini-2.5-flash-lite': {},
-		'models/gemini-2.5-flash-lite-preview-06-17': {},
-		'models/gemini-2.5-flash-lite-preview-09-2025': {},
-		// Gemini 2.0 Pro series
-		'models/gemini-2.0-pro-exp-02-05': {},
 		// Gemini 2.0 Flash series
 		'models/gemini-2.0-flash': {
 			inputModalities: ['text', 'image', 'video', 'audio'],
@@ -354,6 +414,133 @@ const MODEL_METADATA_REGISTRY: Partial<
 			inputModalities: ['text', 'image', 'video', 'audio'],
 		},
 	},
+	groq: {
+		'meta-llama/llama-prompt-guard-2-22m': {
+			available: false,
+		},
+		'meta-llama/llama-prompt-guard-2-86m': {
+			available: false,
+		},
+		'whisper-large-v3': {
+			available: false,
+		},
+		'whisper-large-v3-turbo': {
+			available: false,
+		},
+	},
+	vercelAiGateway: {
+		'alibaba/qwen3-embedding-0.6b': {
+			available: false,
+		},
+		'alibaba/qwen3-embedding-4b': {
+			available: false,
+		},
+		'alibaba/qwen3-embedding-8b': {
+			available: false,
+		},
+		'amazon/titan-embed-text-v2': {
+			available: false,
+		},
+		'cohere/embed-v4.0': {
+			available: false,
+		},
+		'google/gemini-embedding-001': {
+			available: false,
+		},
+		'google/text-embedding-005': {
+			available: false,
+		},
+		'google/text-multilingual-embedding-002': {
+			available: false,
+		},
+		'mistral/codestral-embed': {
+			available: false,
+		},
+		'mistral/mistral-embed': {
+			available: false,
+		},
+		'openai/text-embedding-3-large': {
+			available: false,
+		},
+		'openai/text-embedding-3-small': {
+			available: false,
+		},
+		'openai/text-embedding-ada-002': {
+			available: false,
+		},
+		'bfl/flux-kontext-max': {
+			available: false,
+		},
+		'bfl/flux-kontext-pro': {
+			available: false,
+		},
+		'bfl/flux-pro-1.0-fill': {
+			available: false,
+		},
+		'bfl/flux-pro-1.1': {
+			available: false,
+		},
+		'bfl/flux-pro-1.1-ultra': {
+			available: false,
+		},
+		'google/imagen-4.0-fast-generate-001': {
+			available: false,
+		},
+		'google/imagen-4.0-generate-001': {
+			available: false,
+		},
+		'google/imagen-4.0-ultra-generate-001': {
+			available: false,
+		},
+		// Instruct models - not suitable for chat
+		'openai/gpt-3.5-turbo-instruct': {
+			available: false,
+		},
+		// Deep research models - require specific tools
+		'openai/o3-deep-research': {
+			available: false,
+		},
+		// Model not found - may have been deprecated
+		'meituan/longcat-flash-thinking': {
+			available: false,
+		},
+		// Voyage models - language model method not implemented
+		'voyage/voyage-3-large': {
+			available: false,
+		},
+		'voyage/voyage-3.5': {
+			available: false,
+		},
+		'voyage/voyage-3.5-lite': {
+			available: false,
+		},
+		'voyage/voyage-code-2': {
+			available: false,
+		},
+		'voyage/voyage-code-3': {
+			available: false,
+		},
+		'voyage/voyage-finance-2': {
+			available: false,
+		},
+		'voyage/voyage-law-2': {
+			available: false,
+		},
+	},
+	openRouter: {
+		'openai/gpt-4o-audio-preview': {
+			available: false, // "Provider returned error"
+		},
+		'morph/morph-v3-fast': {
+			available: false, // Not supporting multi-turn conversations
+		},
+		'morph/morph-v3-large': {
+			available: false, // Not supporting multi-turn conversations
+		},
+		'relace/relace-apply-3': {
+			available: false, // Not supporting multi-turn conversations
+		},
+	},
 };
 
 export function getModelMetadata(
@@ -375,5 +562,6 @@ export function getModelMetadata(
 				modelOverride.capabilities?.functionCalling ??
 				DEFAULT_MODEL_METADATA.capabilities.functionCalling,
 		},
+		available: modelOverride.available ?? true,
 	};
 }
diff --git a/packages/cli/src/modules/chat-hub/chat-hub.models.service.ts b/packages/cli/src/modules/chat-hub/chat-hub.models.service.ts
index f5a888b8edf..2c8f2896116 100644
--- a/packages/cli/src/modules/chat-hub/chat-hub.models.service.ts
+++ b/packages/cli/src/modules/chat-hub/chat-hub.models.service.ts
@@ -778,6 +778,7 @@ export class ChatHubModelsService {
 					capabilities: {
 						functionCalling: false,
 					},
+					available: true,
 				},
 			});
 		}
@@ -791,21 +792,28 @@ export class ChatHubModelsService {
 		rawModels: INodePropertyOptions[],
 		provider: ChatHubLLMProvider,
 	): ChatModelDto[] {
-		return rawModels.map((model) => {
+		return rawModels.flatMap((model) => {
 			const id = String(model.value);
+			const metadata = getModelMetadata(provider, id);
 
-			return {
-				id,
-				name: model.name,
-				description: model.description ?? null,
-				model: {
-					provider,
-					model: id,
+			if (!metadata.available) {
+				return [];
+			}
+
+			return [
+				{
+					id,
+					name: model.name,
+					description: model.description ?? null,
+					model: {
+						provider,
+						model: id,
+					},
+					createdAt: null,
+					updatedAt: null,
+					metadata,
 				},
-				createdAt: null,
-				updatedAt: null,
-				metadata: getModelMetadata(provider, id),
-			};
+			];
 		});
 	}
 }
diff --git a/packages/frontend/editor-ui/src/features/ai/chatHub/chat.store.ts b/packages/frontend/editor-ui/src/features/ai/chatHub/chat.store.ts
index 56e36298772..a181c38306a 100644
--- a/packages/frontend/editor-ui/src/features/ai/chatHub/chat.store.ts
+++ b/packages/frontend/editor-ui/src/features/ai/chatHub/chat.store.ts
@@ -795,6 +795,7 @@ export const useChatStore = defineStore(CHAT_STORE, () => {
 			metadata: baseModel?.metadata ?? {
 				capabilities: { functionCalling: false },
 				inputModalities: [],
+				available: true,
 			},
 		};
 		agents.value?.['custom-agent'].models.push(agent);
@@ -866,6 +867,7 @@ export const useChatStore = defineStore(CHAT_STORE, () => {
 				capabilities: {
 					functionCalling: true,
 				},
+				available: true,
 			},
 		};
 	}
diff --git a/packages/frontend/editor-ui/src/features/ai/chatHub/components/ModelSelector.vue b/packages/frontend/editor-ui/src/features/ai/chatHub/components/ModelSelector.vue
index 424d8800406..f97ff79f457 100644
--- a/packages/frontend/editor-ui/src/features/ai/chatHub/components/ModelSelector.vue
+++ b/packages/frontend/editor-ui/src/features/ai/chatHub/components/ModelSelector.vue
@@ -188,6 +188,7 @@ const menu = computed(() => {
 						capabilities: {
 							functionCalling: true,
 						},
+						available: true,
 					},
 				});
 			}

From fd7cc85f0655af17466c167b1e5e3bf88abf3692 Mon Sep 17 00:00:00 2001
From: Guillaume Jacquart <jacquart.guillaume@gmail.com>
Date: Mon, 8 Dec 2025 15:01:25 +0100
Subject: [PATCH 130/167] feat(core): Add types endpoint to get all credential
 resolver types (#22923)

---
 .../create-credential-resolver.dto.ts         |   4 +-
 packages/@n8n/api-types/src/index.ts          |   3 +
 .../credential-resolver.schema.test.ts        | 189 +++++++++++++++++-
 .../src/schemas/credential-resolver.schema.ts |  15 +-
 .../credential-resolvers.controller.ts        |  21 +-
 .../services/credential-resolver.service.ts   |   8 +
 .../credential-resolvers.api.test.ts          |  25 +++
 7 files changed, 254 insertions(+), 11 deletions(-)

diff --git a/packages/@n8n/api-types/src/dto/credential-resolver/create-credential-resolver.dto.ts b/packages/@n8n/api-types/src/dto/credential-resolver/create-credential-resolver.dto.ts
index a1fc58f83d0..61ecf4b4d05 100644
--- a/packages/@n8n/api-types/src/dto/credential-resolver/create-credential-resolver.dto.ts
+++ b/packages/@n8n/api-types/src/dto/credential-resolver/create-credential-resolver.dto.ts
@@ -2,12 +2,12 @@ import { Z } from 'zod-class';
 
 import {
 	credentialResolverNameSchema,
-	credentialResolverTypeSchema,
 	credentialResolverConfigSchema,
+	credentialResolverTypeNameSchema,
 } from '../../schemas/credential-resolver.schema';
 
 export class CreateCredentialResolverDto extends Z.class({
 	name: credentialResolverNameSchema,
-	type: credentialResolverTypeSchema,
+	type: credentialResolverTypeNameSchema,
 	config: credentialResolverConfigSchema,
 }) {}
diff --git a/packages/@n8n/api-types/src/index.ts b/packages/@n8n/api-types/src/index.ts
index d686345c8ce..222e360081d 100644
--- a/packages/@n8n/api-types/src/index.ts
+++ b/packages/@n8n/api-types/src/index.ts
@@ -63,7 +63,10 @@ export { passwordSchema } from './schemas/password.schema';
 export {
 	credentialResolverSchema,
 	credentialResolversSchema,
+	credentialResolverTypeSchema,
+	credentialResolverTypesSchema,
 	type CredentialResolver,
+	type CredentialResolverType,
 } from './schemas/credential-resolver.schema';
 
 export type {
diff --git a/packages/@n8n/api-types/src/schemas/__tests__/credential-resolver.schema.test.ts b/packages/@n8n/api-types/src/schemas/__tests__/credential-resolver.schema.test.ts
index 7a046b72784..2a0d658a5d5 100644
--- a/packages/@n8n/api-types/src/schemas/__tests__/credential-resolver.schema.test.ts
+++ b/packages/@n8n/api-types/src/schemas/__tests__/credential-resolver.schema.test.ts
@@ -1,7 +1,9 @@
 import {
 	credentialResolverIdSchema,
 	credentialResolverNameSchema,
+	credentialResolverTypeNameSchema,
 	credentialResolverTypeSchema,
+	credentialResolverTypesSchema,
 	credentialResolverConfigSchema,
 	credentialResolverSchema,
 	credentialResolversSchema,
@@ -46,7 +48,7 @@ describe('credential-resolver.schema', () => {
 		});
 	});
 
-	describe('credentialResolverTypeSchema', () => {
+	describe('credentialResolverTypeNameSchema', () => {
 		test.each([
 			{ name: 'valid type', value: 'credential-resolver.stub-1.0', expected: true },
 			{ name: 'simple type', value: 'simple', expected: true },
@@ -57,12 +59,12 @@ describe('credential-resolver.schema', () => {
 			{ name: 'whitespace-only type', value: '   ', expected: false },
 			{ name: 'type too long (256 chars)', value: 'a'.repeat(256), expected: false },
 		])('should validate $name', ({ value, expected }) => {
-			const result = credentialResolverTypeSchema.safeParse(value);
+			const result = credentialResolverTypeNameSchema.safeParse(value);
 			expect(result.success).toBe(expected);
 		});
 
 		test('should trim whitespace', () => {
-			const result = credentialResolverTypeSchema.safeParse('  credential-resolver.stub-1.0  ');
+			const result = credentialResolverTypeNameSchema.safeParse('  credential-resolver.stub-1.0  ');
 			expect(result.success).toBe(true);
 			if (result.success) {
 				expect(result.data).toBe('credential-resolver.stub-1.0');
@@ -70,6 +72,187 @@ describe('credential-resolver.schema', () => {
 		});
 	});
 
+	describe('credentialResolverTypeSchema', () => {
+		const validType = {
+			name: 'credential-resolver.stub-1.0',
+			displayName: 'Stub Resolver',
+			description: 'A stub resolver for testing',
+			options: [{ key: 'value' }],
+		};
+
+		test('should validate complete type object', () => {
+			const result = credentialResolverTypeSchema.safeParse(validType);
+			expect(result.success).toBe(true);
+		});
+
+		test('should allow missing optional description', () => {
+			const { description, ...typeWithoutDescription } = validType;
+			const result = credentialResolverTypeSchema.safeParse(typeWithoutDescription);
+			expect(result.success).toBe(true);
+		});
+
+		test('should allow missing optional options', () => {
+			const { options, ...typeWithoutOptions } = validType;
+			const result = credentialResolverTypeSchema.safeParse(typeWithoutOptions);
+			expect(result.success).toBe(true);
+		});
+
+		test('should allow empty description', () => {
+			const typeWithEmptyDescription = { ...validType, description: '' };
+			const result = credentialResolverTypeSchema.safeParse(typeWithEmptyDescription);
+			expect(result.success).toBe(true);
+		});
+
+		test('should allow empty options array', () => {
+			const typeWithEmptyOptions = { ...validType, options: [] };
+			const result = credentialResolverTypeSchema.safeParse(typeWithEmptyOptions);
+			expect(result.success).toBe(true);
+		});
+
+		test.each([
+			{
+				name: 'missing name',
+				data: { ...validType, name: undefined },
+				expectedErrorPath: ['name'],
+			},
+			{
+				name: 'missing displayName',
+				data: { ...validType, displayName: undefined },
+				expectedErrorPath: ['displayName'],
+			},
+			{
+				name: 'empty name',
+				data: { ...validType, name: '' },
+				expectedErrorPath: ['name'],
+			},
+			{
+				name: 'empty displayName',
+				data: { ...validType, displayName: '' },
+				expectedErrorPath: ['displayName'],
+			},
+			{
+				name: 'whitespace-only name',
+				data: { ...validType, name: '   ' },
+				expectedErrorPath: ['name'],
+			},
+			{
+				name: 'whitespace-only displayName',
+				data: { ...validType, displayName: '   ' },
+				expectedErrorPath: ['displayName'],
+			},
+			{
+				name: 'name too long (256 chars)',
+				data: { ...validType, name: 'a'.repeat(256) },
+				expectedErrorPath: ['name'],
+			},
+			{
+				name: 'displayName too long (256 chars)',
+				data: { ...validType, displayName: 'a'.repeat(256) },
+				expectedErrorPath: ['displayName'],
+			},
+			{
+				name: 'description too long (1025 chars)',
+				data: { ...validType, description: 'a'.repeat(1025) },
+				expectedErrorPath: ['description'],
+			},
+			{
+				name: 'options as string',
+				data: { ...validType, options: 'invalid' },
+				expectedErrorPath: ['options'],
+			},
+			{
+				name: 'options as object',
+				data: { ...validType, options: { key: 'value' } },
+				expectedErrorPath: ['options'],
+			},
+		])('should fail validation for $name', ({ data, expectedErrorPath }) => {
+			const result = credentialResolverTypeSchema.safeParse(data);
+			expect(result.success).toBe(false);
+			if (!result.success) {
+				expect(result.error.issues[0].path).toEqual(expectedErrorPath);
+			}
+		});
+
+		test('should trim name', () => {
+			const typeWithWhitespace = { ...validType, name: '  stub-resolver  ' };
+			const result = credentialResolverTypeSchema.safeParse(typeWithWhitespace);
+			expect(result.success).toBe(true);
+			if (result.success) {
+				expect(result.data.name).toBe('stub-resolver');
+			}
+		});
+
+		test('should trim displayName', () => {
+			const typeWithWhitespace = { ...validType, displayName: '  Stub Resolver  ' };
+			const result = credentialResolverTypeSchema.safeParse(typeWithWhitespace);
+			expect(result.success).toBe(true);
+			if (result.success) {
+				expect(result.data.displayName).toBe('Stub Resolver');
+			}
+		});
+
+		test('should trim description', () => {
+			const typeWithWhitespace = { ...validType, description: '  A stub resolver  ' };
+			const result = credentialResolverTypeSchema.safeParse(typeWithWhitespace);
+			expect(result.success).toBe(true);
+			if (result.success) {
+				expect(result.data.description).toBe('A stub resolver');
+			}
+		});
+	});
+
+	describe('credentialResolverTypesSchema', () => {
+		const validType1 = {
+			name: 'credential-resolver.stub-1.0',
+			displayName: 'Stub Resolver',
+			description: 'A stub resolver for testing',
+			options: [{ key: 'value' }],
+		};
+
+		const validType2 = {
+			name: 'credential-resolver.aws-1.0',
+			displayName: 'AWS Resolver',
+		};
+
+		test('should validate empty array', () => {
+			const result = credentialResolverTypesSchema.safeParse([]);
+			expect(result.success).toBe(true);
+			if (result.success) {
+				expect(result.data).toEqual([]);
+			}
+		});
+
+		test('should validate array with single type', () => {
+			const result = credentialResolverTypesSchema.safeParse([validType1]);
+			expect(result.success).toBe(true);
+			if (result.success) {
+				expect(result.data).toHaveLength(1);
+			}
+		});
+
+		test('should validate array with multiple types', () => {
+			const result = credentialResolverTypesSchema.safeParse([validType1, validType2]);
+			expect(result.success).toBe(true);
+			if (result.success) {
+				expect(result.data).toHaveLength(2);
+			}
+		});
+
+		test('should fail if any type is invalid', () => {
+			const invalidType = { ...validType1, name: '' };
+			const result = credentialResolverTypesSchema.safeParse([validType1, invalidType]);
+			expect(result.success).toBe(false);
+			if (!result.success) {
+				expect(result.error.issues[0].path).toEqual([1, 'name']);
+			}
+		});
+
+		test('should fail for non-array input', () => {
+			const result = credentialResolverTypesSchema.safeParse(validType1);
+			expect(result.success).toBe(false);
+		});
+	});
+
 	describe('credentialResolverConfigSchema', () => {
 		test.each([
 			{ name: 'empty object', value: {}, expected: true },
diff --git a/packages/@n8n/api-types/src/schemas/credential-resolver.schema.ts b/packages/@n8n/api-types/src/schemas/credential-resolver.schema.ts
index 8e9bad6d6d6..ac5a7c1f5c3 100644
--- a/packages/@n8n/api-types/src/schemas/credential-resolver.schema.ts
+++ b/packages/@n8n/api-types/src/schemas/credential-resolver.schema.ts
@@ -2,19 +2,30 @@ import { z } from 'zod';
 
 export const credentialResolverIdSchema = z.string().max(36);
 export const credentialResolverNameSchema = z.string().trim().min(1).max(255);
-export const credentialResolverTypeSchema = z.string().trim().min(1).max(255);
+export const credentialResolverTypeNameSchema = z.string().trim().min(1).max(255);
 export const credentialResolverConfigSchema = z.record(z.unknown());
 
 export const credentialResolverSchema = z.object({
 	id: credentialResolverIdSchema,
 	name: credentialResolverNameSchema,
-	type: credentialResolverTypeSchema,
+	type: credentialResolverTypeNameSchema,
 	config: z.string(), // Encrypted config
 	decryptedConfig: credentialResolverConfigSchema.optional(),
 	createdAt: z.coerce.date(),
 	updatedAt: z.coerce.date(),
 });
 
+export const credentialResolverTypeSchema = z.object({
+	name: credentialResolverTypeNameSchema,
+	displayName: z.string().trim().min(1).max(255),
+	description: z.string().trim().max(1024).optional(),
+	options: z.array(z.record(z.unknown())).optional(),
+});
+
+export const credentialResolverTypesSchema = z.array(credentialResolverTypeSchema);
+
+export type CredentialResolverType = z.infer<typeof credentialResolverTypeSchema>;
+
 export const credentialResolversSchema = z.array(credentialResolverSchema);
 
 export type CredentialResolver = z.infer<typeof credentialResolverSchema>;
diff --git a/packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers.controller.ts b/packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers.controller.ts
index b519d063e79..61fc0510ef7 100644
--- a/packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers.controller.ts
+++ b/packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers.controller.ts
@@ -4,6 +4,8 @@ import {
 	credentialResolverSchema,
 	credentialResolversSchema,
 	UpdateCredentialResolverDto,
+	CredentialResolverType,
+	credentialResolverTypesSchema,
 } from '@n8n/api-types';
 import { AuthenticatedRequest } from '@n8n/db';
 import {
@@ -32,10 +34,7 @@ export class CredentialResolversController {
 
 	@Get('/')
 	@GlobalScope('credentialResolver:list')
-	async listResolvers(
-		_req: AuthenticatedRequest,
-		_res: Response,
-	): Promise<Array<CredentialResolver>> {
+	async listResolvers(_req: AuthenticatedRequest, _res: Response): Promise<CredentialResolver[]> {
 		try {
 			return credentialResolversSchema.parse(await this.service.findAll());
 		} catch (e: unknown) {
@@ -46,6 +45,20 @@ export class CredentialResolversController {
 		}
 	}
 
+	@Get('/types')
+	@GlobalScope('credentialResolver:list')
+	listResolverTypes(_req: AuthenticatedRequest, _res: Response): CredentialResolverType[] {
+		try {
+			const types = this.service.getAvailableTypes();
+			return credentialResolverTypesSchema.parse(types.map((t) => t.metadata));
+		} catch (e: unknown) {
+			if (e instanceof Error) {
+				throw new InternalServerError(e.message, e);
+			}
+			throw e;
+		}
+	}
+
 	@Post('/')
 	@GlobalScope('credentialResolver:create')
 	async createResolver(
diff --git a/packages/cli/src/modules/dynamic-credentials.ee/services/credential-resolver.service.ts b/packages/cli/src/modules/dynamic-credentials.ee/services/credential-resolver.service.ts
index 72d9238cf96..283cc354aff 100644
--- a/packages/cli/src/modules/dynamic-credentials.ee/services/credential-resolver.service.ts
+++ b/packages/cli/src/modules/dynamic-credentials.ee/services/credential-resolver.service.ts
@@ -2,6 +2,7 @@ import { Logger } from '@n8n/backend-common';
 import {
 	CredentialResolverConfiguration,
 	CredentialResolverValidationError,
+	ICredentialResolver,
 } from '@n8n/decorators';
 import { Service } from '@n8n/di';
 import { Cipher } from 'n8n-core';
@@ -70,6 +71,13 @@ export class DynamicCredentialResolverService {
 		return resolvers.map((resolver) => this.withDecryptedConfig(resolver));
 	}
 
+	/**
+	 * Retrieves all available resolver types.
+	 */
+	getAvailableTypes(): ICredentialResolver[] {
+		return this.registry.getAllResolvers();
+	}
+
 	/**
 	 * Retrieves a credential resolver by ID.
 	 * Config is returned decrypted.
diff --git a/packages/cli/test/integration/dynamic-credentials.ee/credential-resolvers.api.test.ts b/packages/cli/test/integration/dynamic-credentials.ee/credential-resolvers.api.test.ts
index 0b07e657763..af0368d5d1f 100644
--- a/packages/cli/test/integration/dynamic-credentials.ee/credential-resolvers.api.test.ts
+++ b/packages/cli/test/integration/dynamic-credentials.ee/credential-resolvers.api.test.ts
@@ -82,6 +82,31 @@ describe('Credential Resolvers API', () => {
 		});
 	});
 
+	describe('GET /credential-resolvers/types', () => {
+		it('should return available resolver types', async () => {
+			const response = await ownerAgent.get('/credential-resolvers/types').expect(200);
+
+			expect(response.body.data).toBeInstanceOf(Array);
+			expect(response.body.data.length).toBeGreaterThan(0);
+
+			// Verify the stub resolver is present
+			const stubResolver = response.body.data.find(
+				(type: { name: string }) => type.name === 'credential-resolver.stub-1.0',
+			);
+			expect(stubResolver).toBeDefined();
+			expect(stubResolver).toMatchObject({
+				name: 'credential-resolver.stub-1.0',
+				displayName: 'Stub Resolver',
+				description: 'A stub credential resolver for testing purposes',
+				options: expect.any(Array),
+			});
+		});
+
+		it('should reject access for members', async () => {
+			await memberAgent.get('/credential-resolvers/types').expect(403);
+		});
+	});
+
 	describe('POST /credential-resolvers', () => {
 		it('should create a resolver', async () => {
 			const payload = {

From c69a517579753bc5ab08efdbe0cc3305abb52504 Mon Sep 17 00:00:00 2001
From: Michael Drury <me@michaeldrury.co.uk>
Date: Mon, 8 Dec 2025 14:35:20 +0000
Subject: [PATCH 131/167] feat(ai-builder): Design updates for workflow builder
 chat experience (#22765)

---
 .../src/prompts/agents/responder.prompt.ts    |   3 +-
 .../src/prompts/legacy-agent.prompt.ts        |  11 +-
 .../AskAssistantChat/AskAssistantChat.test.ts | 372 ++++--------------
 .../AskAssistantChat/AskAssistantChat.vue     | 203 +++++++---
 .../AskAssistantChat.test.ts.snap             |  40 ++
 .../AskAssistantChat/messages/BaseMessage.vue |  37 +-
 .../AskAssistantChat/messages/TextMessage.vue | 117 +++++-
 .../messages/ThinkingMessage.vue              | 168 ++++++++
 .../AskAssistantChat/messages/helpers.ts      |   1 +
 .../N8nPromptInput/N8nPromptInput.vue         |   4 +-
 .../design-system/src/css/_tokens.dark.scss   |   7 +
 .../@n8n/design-system/src/css/_tokens.scss   |   9 +
 .../src/css/mixins/animations.scss            |   2 +-
 .../@n8n/design-system/src/types/assistant.ts |  21 +
 .../frontend/@n8n/i18n/src/locales/en.json    |   4 +-
 .../components/Agent/ExecuteMessage.vue       |  92 +++--
 .../components/Agent/NodeIssueItem.vue        |  25 +-
 17 files changed, 655 insertions(+), 461 deletions(-)
 create mode 100644 packages/frontend/@n8n/design-system/src/components/AskAssistantChat/messages/ThinkingMessage.vue

diff --git a/packages/@n8n/ai-workflow-builder.ee/src/prompts/agents/responder.prompt.ts b/packages/@n8n/ai-workflow-builder.ee/src/prompts/agents/responder.prompt.ts
index 1da43cfa8e4..c77a35ecd6c 100644
--- a/packages/@n8n/ai-workflow-builder.ee/src/prompts/agents/responder.prompt.ts
+++ b/packages/@n8n/ai-workflow-builder.ee/src/prompts/agents/responder.prompt.ts
@@ -36,7 +36,8 @@ const CONVERSATIONAL_RESPONSES = `FOR QUESTIONS/CONVERSATIONS:
 const RESPONSE_STYLE = `RESPONSE STYLE:
 - Keep responses focused and not overly long
 - Use markdown formatting for readability
-- Be conversational and helpful`;
+- Be conversational and helpful
+- Do not use emojis in your response`;
 
 export function buildResponderPrompt(): string {
 	return [RESPONDER_ROLE, WORKFLOW_COMPLETION, CONVERSATIONAL_RESPONSES, RESPONSE_STYLE].join(
diff --git a/packages/@n8n/ai-workflow-builder.ee/src/prompts/legacy-agent.prompt.ts b/packages/@n8n/ai-workflow-builder.ee/src/prompts/legacy-agent.prompt.ts
index c142798d547..3394142f881 100644
--- a/packages/@n8n/ai-workflow-builder.ee/src/prompts/legacy-agent.prompt.ts
+++ b/packages/@n8n/ai-workflow-builder.ee/src/prompts/legacy-agent.prompt.ts
@@ -126,9 +126,8 @@ After receiving tool results, reflect on their quality and determine optimal nex
 </core_principle>
 
 <communication_style>
-Keep responses concise.
-
 CRITICAL: Do NOT provide commentary between tool calls. Execute tools silently.
+- NO emojis under any circumstances
 - NO progress messages like "Perfect!", "Now let me...", "Excellent!"
 - NO descriptions of what was built or how it works
 - NO workflow features or capabilities explanations
@@ -583,17 +582,17 @@ When tool execution fails, provide a brief acknowledgment before attempting fixe
 Then proceed with debugging/fixing without additional commentary.
 
 Response format conditions:
-- Include "**⚙️ How to Setup**" section ONLY if this is the initial workflow creation
-- Include "**📝 What's changed**" section ONLY for non-initial modifications (skip for first workflow creation)
+- Include "**How to Setup**" section ONLY if this is the initial workflow creation
+- Include "**What's changed**" section ONLY for non-initial modifications (skip for first workflow creation)
 - Skip setup section for minor tweaks, bug fixes, or cosmetic changes
 
 When changes section is included:
-**📝 What's changed**
+**What's changed**
 - Brief bullets highlighting key modifications made
 - Focus on functional changes, not technical implementation details
 
 When setup section is included:
-**⚙️ How to Setup** (numbered format)
+**How to Setup** (numbered format)
 - List only parameter placeholders requiring user configuration
 - Include only incomplete tasks needing user action (skip pre-configured items)
 - IMPORTANT: NEVER instruct user to set-up authentication or credentials for nodes - this will be handled in the UI
diff --git a/packages/frontend/@n8n/design-system/src/components/AskAssistantChat/AskAssistantChat.test.ts b/packages/frontend/@n8n/design-system/src/components/AskAssistantChat/AskAssistantChat.test.ts
index 27140126268..b9c29ca8f54 100644
--- a/packages/frontend/@n8n/design-system/src/components/AskAssistantChat/AskAssistantChat.test.ts
+++ b/packages/frontend/@n8n/design-system/src/components/AskAssistantChat/AskAssistantChat.test.ts
@@ -289,13 +289,20 @@ describe('AskAssistantChat', () => {
 		// We can verify the component receives the prop via snapshot
 	});
 
-	describe('collapseToolMessages', () => {
+	describe('groupToolMessagesIntoThinking', () => {
+		// Tool messages are now grouped into thinking-group messages and rendered by ThinkingMessage component
+		// instead of MessageWrapper. These tests verify the grouping behavior.
+
+		const ThinkingMessageMock = vi.fn(() => ({
+			template: '<div data-testid="thinking-message-mock"></div>',
+		}));
 		const MessageWrapperMock = vi.fn(() => ({
 			template: '<div data-testid="message-wrapper-mock"></div>',
 		}));
-		const stubsWithCustomMessageWrapper = {
+		const stubsWithMocks = {
 			...Object.fromEntries(stubs.map((stub) => [stub, true])),
 			MessageWrapper: MessageWrapperMock,
+			ThinkingMessage: ThinkingMessageMock,
 		};
 
 		const createToolMessage = (
@@ -313,8 +320,9 @@ describe('AskAssistantChat', () => {
 
 		const renderWithMessages = (messages: ChatUI.AssistantMessage[], extraProps = {}) => {
 			MessageWrapperMock.mockClear();
+			ThinkingMessageMock.mockClear();
 			return render(AskAssistantChat, {
-				global: { stubs: stubsWithCustomMessageWrapper },
+				global: { stubs: stubsWithMocks },
 				props: {
 					user: { firstName: 'Kobi', lastName: 'Dog' },
 					messages,
@@ -325,10 +333,11 @@ describe('AskAssistantChat', () => {
 
 		const renderWithDirectives = (messages: ChatUI.AssistantMessage[], extraProps = {}) => {
 			MessageWrapperMock.mockClear();
+			ThinkingMessageMock.mockClear();
 			return render(AskAssistantChat, {
 				global: {
 					directives: { n8nHtml },
-					stubs: stubsWithCustomMessageWrapper,
+					stubs: stubsWithMocks,
 				},
 				props: {
 					user: { firstName: 'Kobi', lastName: 'Dog' },
@@ -338,24 +347,19 @@ describe('AskAssistantChat', () => {
 			});
 		};
 
+		const getThinkingMessageProps = (callIndex = 0) => {
+			const mockCall = ThinkingMessageMock.mock.calls[callIndex];
+			expect(mockCall).toBeDefined();
+			return mockCall as unknown as [{ items: ChatUI.ThinkingItem[]; latestStatusText: string }];
+		};
+
 		const getMessageWrapperProps = (callIndex = 0): MessageWrapperProps => {
 			const mockCall = MessageWrapperMock.mock.calls[callIndex];
 			expect(mockCall).toBeDefined();
 			return (mockCall as unknown as [props: MessageWrapperProps])[0];
 		};
 
-		const expectMessageWrapperCalledTimes = (times: number) => {
-			expect(MessageWrapperMock).toHaveBeenCalledTimes(times);
-		};
-
-		const expectToolMessage = (
-			props: MessageWrapperProps,
-			expectedProps: Partial<ChatUI.ToolMessage & { id: string; read?: boolean }>,
-		) => {
-			expect(props.message).toEqual(expect.objectContaining(expectedProps));
-		};
-
-		it('should not collapse single tool message', () => {
+		it('should group single tool message into thinking-group', () => {
 			const message = createToolMessage({
 				id: '1',
 				displayTitle: 'Search Results',
@@ -364,16 +368,16 @@ describe('AskAssistantChat', () => {
 
 			renderWithMessages([message]);
 
-			expectMessageWrapperCalledTimes(1);
-			const props = getMessageWrapperProps();
+			// Tool messages are rendered as ThinkingMessage, not MessageWrapper
+			expect(ThinkingMessageMock).toHaveBeenCalledTimes(1);
+			expect(MessageWrapperMock).toHaveBeenCalledTimes(0);
 
-			expectToolMessage(props, {
-				...message,
-				read: true,
-			});
+			const props = getThinkingMessageProps()[0];
+			expect(props.items).toHaveLength(1);
+			expect(props.items[0].displayTitle).toBe('Search Results');
 		});
 
-		it('should collapse consecutive tool messages with same toolName', () => {
+		it('should group consecutive tool messages with same toolName into single thinking-group', () => {
 			const messages = [
 				createToolMessage({
 					id: '1',
@@ -398,27 +402,16 @@ describe('AskAssistantChat', () => {
 
 			renderWithMessages(messages);
 
-			expectMessageWrapperCalledTimes(1);
-			const props = getMessageWrapperProps();
+			// All tool messages with same toolName should be grouped into one thinking-group
+			expect(ThinkingMessageMock).toHaveBeenCalledTimes(1);
+			expect(MessageWrapperMock).toHaveBeenCalledTimes(0);
 
-			expectToolMessage(props, {
-				id: '3',
-				role: 'assistant',
-				type: 'tool',
-				toolName: 'search',
-				status: 'running',
-				displayTitle: 'Still searching...',
-				customDisplayTitle: 'Custom Search Title',
-				updates: [
-					{ type: 'progress', data: { status: 'Initializing search' } },
-					{ type: 'progress', data: { status: 'Processing results' } },
-					{ type: 'output', data: { result: 'Found 10 items' } },
-				],
-				read: true,
-			});
+			const props = getThinkingMessageProps()[0];
+			// Should have 1 item after deduplication by toolName
+			expect(props.items).toHaveLength(1);
 		});
 
-		it('should collapse tool messages with same toolName with hidden messages in between', () => {
+		it('should group tool messages with same toolName even with hidden messages in between', () => {
 			const messages: Array<ChatUI.AssistantMessage & { id: string }> = [
 				createToolMessage({
 					id: '1',
@@ -439,19 +432,6 @@ describe('AskAssistantChat', () => {
 					],
 					read: true,
 				},
-				createToolMessage({
-					id: '2',
-					status: 'running',
-					displayTitle: 'Still searching...',
-					customDisplayTitle: 'Custom Search Title',
-					updates: [{ type: 'progress', data: { status: 'Processing results' } }],
-				}),
-				{
-					id: 'test',
-					role: 'assistant',
-					type: 'workflow-updated',
-					codeSnippet: '',
-				},
 				createToolMessage({
 					id: '3',
 					status: 'completed',
@@ -462,27 +442,12 @@ describe('AskAssistantChat', () => {
 
 			renderWithMessages(messages);
 
-			expectMessageWrapperCalledTimes(1);
-			const props = getMessageWrapperProps();
-
-			expectToolMessage(props, {
-				id: '3',
-				role: 'assistant',
-				type: 'tool',
-				toolName: 'search',
-				status: 'running',
-				displayTitle: 'Still searching...',
-				customDisplayTitle: 'Custom Search Title',
-				updates: [
-					{ type: 'progress', data: { status: 'Initializing search' } },
-					{ type: 'progress', data: { status: 'Processing results' } },
-					{ type: 'output', data: { result: 'Found 10 items' } },
-				],
-				read: true,
-			});
+			// Hidden messages are filtered out, so tool messages are grouped together
+			expect(ThinkingMessageMock).toHaveBeenCalledTimes(1);
+			expect(MessageWrapperMock).toHaveBeenCalledTimes(0);
 		});
 
-		it('should not collapse tool messages with different toolNames', () => {
+		it('should show different tools as separate items in thinking-group', () => {
 			const messages = [
 				createToolMessage({
 					id: '1',
@@ -500,113 +465,15 @@ describe('AskAssistantChat', () => {
 
 			renderWithMessages(messages);
 
-			expectMessageWrapperCalledTimes(2);
+			// Both tools should be in the same thinking-group but as separate items
+			expect(ThinkingMessageMock).toHaveBeenCalledTimes(1);
+			expect(MessageWrapperMock).toHaveBeenCalledTimes(0);
 
-			const firstProps = getMessageWrapperProps(0);
-			expectToolMessage(firstProps, {
-				id: '1',
-				toolName: 'search',
-				status: 'completed',
-				displayTitle: 'Search Results',
-			});
-
-			const secondProps = getMessageWrapperProps(1);
-			expectToolMessage(secondProps, {
-				id: '2',
-				toolName: 'fetch',
-				status: 'completed',
-				displayTitle: 'Data Fetched',
-			});
+			const props = getThinkingMessageProps()[0];
+			expect(props.items).toHaveLength(2);
 		});
 
-		it('should collapse completed and error statuses', () => {
-			const messages = [
-				createToolMessage({
-					id: '1',
-					status: 'completed',
-					displayTitle: 'Search Complete',
-					updates: [{ type: 'output', data: { result: 'Found some items' } }],
-				}),
-				createToolMessage({
-					id: '2',
-					status: 'error',
-					displayTitle: 'Search error',
-					customDisplayTitle: 'Custom Running Title',
-					updates: [{ type: 'progress', data: { status: 'Processing more results' } }],
-				}),
-				createToolMessage({
-					id: '3',
-					status: 'completed',
-					displayTitle: 'Final Search Complete',
-					updates: [{ type: 'output', data: { result: 'All done' } }],
-				}),
-			];
-
-			renderWithMessages(messages);
-
-			expectMessageWrapperCalledTimes(1);
-			const props = getMessageWrapperProps();
-
-			expectToolMessage(props, {
-				id: '3',
-				status: 'error',
-				displayTitle: 'Search error',
-				customDisplayTitle: undefined,
-				updates: [
-					{ type: 'output', data: { result: 'Found some items' } },
-					{ type: 'progress', data: { status: 'Processing more results' } },
-					{ type: 'output', data: { result: 'All done' } },
-				],
-			});
-		});
-
-		it('should collapse running, completed and error statuses into running', () => {
-			const messages = [
-				createToolMessage({
-					id: '1',
-					status: 'running',
-					displayTitle: 'Search Running',
-					customDisplayTitle: 'Custom Search Title',
-					updates: [{ type: 'output', data: { result: 'Found some items' } }],
-				}),
-				createToolMessage({
-					id: '2',
-					status: 'error',
-					displayTitle: 'Search error',
-					customDisplayTitle: 'Custom Error Title',
-					updates: [{ type: 'progress', data: { status: 'Processing more results' } }],
-				}),
-				createToolMessage({
-					id: '3',
-					status: 'completed',
-					displayTitle: 'Final Search Complete',
-					updates: [{ type: 'output', data: { result: 'All done' } }],
-				}),
-			];
-
-			renderWithMessages(messages);
-
-			expectMessageWrapperCalledTimes(1);
-			const props = getMessageWrapperProps();
-
-			expectToolMessage(props, {
-				id: '3',
-				role: 'assistant',
-				type: 'tool',
-				toolName: 'search',
-				status: 'running',
-				displayTitle: 'Search Running',
-				customDisplayTitle: 'Custom Search Title',
-				updates: [
-					{ type: 'output', data: { result: 'Found some items' } },
-					{ type: 'progress', data: { status: 'Processing more results' } },
-					{ type: 'output', data: { result: 'All done' } },
-				],
-				read: true,
-			});
-		});
-
-		it('should preserve running status when collapsing messages with running status', () => {
+		it('should show running status when there is a running tool', () => {
 			const messages = [
 				createToolMessage({
 					id: '1',
@@ -617,74 +484,20 @@ describe('AskAssistantChat', () => {
 				createToolMessage({
 					id: '2',
 					status: 'running',
-					displayTitle: 'Still searching...',
-					customDisplayTitle: 'Custom Running Title',
+					displayTitle: 'Fetching data...',
+					toolName: 'fetch',
 					updates: [{ type: 'progress', data: { status: 'Processing more results' } }],
 				}),
-				createToolMessage({
-					id: '3',
-					status: 'completed',
-					displayTitle: 'Final Search Complete',
-					updates: [{ type: 'output', data: { result: 'All done' } }],
-				}),
 			];
 
 			renderWithMessages(messages);
 
-			expectMessageWrapperCalledTimes(1);
-			const props = getMessageWrapperProps();
-
-			expectToolMessage(props, {
-				id: '3',
-				status: 'running',
-				displayTitle: 'Still searching...',
-				customDisplayTitle: 'Custom Running Title',
-				updates: [
-					{ type: 'output', data: { result: 'Found some items' } },
-					{ type: 'progress', data: { status: 'Processing more results' } },
-					{ type: 'output', data: { result: 'All done' } },
-				],
-			});
+			// Should render as ThinkingMessage with running tool
+			expect(ThinkingMessageMock).toHaveBeenCalledTimes(1);
+			expect(MessageWrapperMock).toHaveBeenCalledTimes(0);
 		});
 
-		it('should combine all updates from collapsed messages', () => {
-			const messages = [
-				createToolMessage({
-					id: '1',
-					status: 'running',
-					displayTitle: 'Searching...',
-					updates: [
-						{ type: 'progress', data: { status: 'Starting search' } },
-						{ type: 'input', data: { query: 'test query' } },
-					],
-				}),
-				createToolMessage({
-					id: '2',
-					status: 'completed',
-					displayTitle: 'Search Complete',
-					updates: [
-						{ type: 'progress', data: { status: 'Processing results' } },
-						{ type: 'output', data: { result: 'Found 10 items' } },
-					],
-				}),
-			];
-
-			renderWithMessages(messages);
-
-			expectMessageWrapperCalledTimes(1);
-			const props = getMessageWrapperProps();
-
-			const toolMessage = props.message as ChatUI.ToolMessage;
-			expect(toolMessage.status).toEqual('running');
-			expect(toolMessage.updates).toEqual([
-				{ type: 'progress', data: { status: 'Starting search' } },
-				{ type: 'input', data: { query: 'test query' } },
-				{ type: 'progress', data: { status: 'Processing results' } },
-				{ type: 'output', data: { result: 'Found 10 items' } },
-			]);
-		});
-
-		it('should not collapse tool messages separated by non-tool messages', () => {
+		it('should not group tool messages separated by visible non-tool messages', () => {
 			const messages = [
 				createToolMessage({
 					id: '1',
@@ -708,62 +521,18 @@ describe('AskAssistantChat', () => {
 
 			renderWithDirectives(messages);
 
-			expectMessageWrapperCalledTimes(3);
+			// Should have 2 thinking-groups and 1 text message
+			expect(ThinkingMessageMock).toHaveBeenCalledTimes(2);
+			expect(MessageWrapperMock).toHaveBeenCalledTimes(1);
 
-			const firstProps = getMessageWrapperProps(0);
-			expectToolMessage(firstProps, {
-				id: '1',
-				type: 'tool',
-				toolName: 'search',
-				displayTitle: 'First Search',
-			});
-
-			const secondProps = getMessageWrapperProps(1);
-			expect(secondProps.message).toEqual(
+			const textMessageProps = getMessageWrapperProps(0);
+			expect(textMessageProps.message).toEqual(
 				expect.objectContaining({
 					id: '2',
 					type: 'text',
 					content: 'Here are the search results',
 				}),
 			);
-
-			const thirdProps = getMessageWrapperProps(2);
-			expectToolMessage(thirdProps, {
-				id: '3',
-				type: 'tool',
-				toolName: 'search',
-				displayTitle: 'Second Search',
-			});
-		});
-
-		it('should handle customDisplayTitle correctly for running status', () => {
-			const messages = [
-				createToolMessage({
-					id: '1',
-					status: 'completed',
-					displayTitle: 'Search Complete',
-					customDisplayTitle: 'Should be ignored for completed',
-					updates: [{ type: 'output', data: { result: 'Found items' } }],
-				}),
-				createToolMessage({
-					id: '2',
-					status: 'running',
-					displayTitle: 'Searching...',
-					customDisplayTitle: 'Custom Running Title',
-					updates: [{ type: 'progress', data: { status: 'In progress' } }],
-				}),
-			];
-
-			renderWithMessages(messages);
-
-			expectMessageWrapperCalledTimes(1);
-			const props = getMessageWrapperProps();
-
-			expectToolMessage(props, {
-				status: 'running',
-				displayTitle: 'Searching...',
-				customDisplayTitle: 'Custom Running Title',
-			});
 		});
 
 		it('should handle mixed message types correctly', () => {
@@ -796,7 +565,9 @@ describe('AskAssistantChat', () => {
 
 			renderWithDirectives(messages);
 
-			expectMessageWrapperCalledTimes(3);
+			// 2 text messages via MessageWrapper, 1 thinking-group via ThinkingMessage
+			expect(MessageWrapperMock).toHaveBeenCalledTimes(2);
+			expect(ThinkingMessageMock).toHaveBeenCalledTimes(1);
 
 			const firstProps = getMessageWrapperProps(0);
 			expect(firstProps.message).toEqual(
@@ -809,20 +580,7 @@ describe('AskAssistantChat', () => {
 			);
 
 			const secondProps = getMessageWrapperProps(1);
-			expectToolMessage(secondProps, {
-				id: '3',
-				role: 'assistant',
-				type: 'tool',
-				toolName: 'search',
-				status: 'running',
-				updates: [
-					{ type: 'progress', data: { status: 'Starting' } },
-					{ type: 'output', data: { result: 'Found results' } },
-				],
-			});
-
-			const thirdProps = getMessageWrapperProps(2);
-			expect(thirdProps.message).toEqual(
+			expect(secondProps.message).toEqual(
 				expect.objectContaining({
 					id: '4',
 					role: 'assistant',
@@ -831,6 +589,18 @@ describe('AskAssistantChat', () => {
 				}),
 			);
 		});
+
+		it('should show initial thinking-group when streaming with no tool messages', () => {
+			renderWithMessages([], { streaming: true, loadingMessage: 'Thinking...' });
+
+			// Should create an initial thinking-group
+			expect(ThinkingMessageMock).toHaveBeenCalledTimes(1);
+
+			const props = getThinkingMessageProps()[0];
+			expect(props.items).toHaveLength(1);
+			expect(props.items[0].displayTitle).toBe('Thinking...');
+			expect(props.items[0].status).toBe('running');
+		});
 	});
 
 	describe('Quick Replies', () => {
diff --git a/packages/frontend/@n8n/design-system/src/components/AskAssistantChat/AskAssistantChat.vue b/packages/frontend/@n8n/design-system/src/components/AskAssistantChat/AskAssistantChat.vue
index 139e597d018..5300615fb15 100644
--- a/packages/frontend/@n8n/design-system/src/components/AskAssistantChat/AskAssistantChat.vue
+++ b/packages/frontend/@n8n/design-system/src/components/AskAssistantChat/AskAssistantChat.vue
@@ -2,9 +2,10 @@
 import { computed, nextTick, onUnmounted, ref, useCssModule, watch } from 'vue';
 
 import MessageWrapper from './messages/MessageWrapper.vue';
+import ThinkingMessage from './messages/ThinkingMessage.vue';
 import { useI18n } from '../../composables/useI18n';
 import type { ChatUI, RatingFeedback, WorkflowSuggestion } from '../../types/assistant';
-import { isTaskAbortedMessage, isToolMessage } from '../../types/assistant';
+import { isTaskAbortedMessage, isToolMessage, isThinkingGroupMessage } from '../../types/assistant';
 import AssistantIcon from '../AskAssistantIcon/AssistantIcon.vue';
 import AssistantLoadingMessage from '../AskAssistantLoadingMessage/AssistantLoadingMessage.vue';
 import AssistantText from '../AskAssistantText/AssistantText.vue';
@@ -17,6 +18,7 @@ import N8nScrollArea from '../N8nScrollArea/N8nScrollArea.vue';
 import { getSupportedMessageComponent } from './messages/helpers';
 
 const { t } = useI18n();
+const $style = useCssModule();
 
 interface Props {
 	user?: {
@@ -78,79 +80,147 @@ function filterOutHiddenMessages(messages: ChatUI.AssistantMessage[]): ChatUI.As
 	);
 }
 
-function collapseToolMessages(messages: ChatUI.AssistantMessage[]): ChatUI.AssistantMessage[] {
+function groupToolMessagesIntoThinking(
+	messages: ChatUI.AssistantMessage[],
+	options: { streaming?: boolean; loadingMessage?: string } = {},
+): ChatUI.AssistantMessage[] {
 	const result: ChatUI.AssistantMessage[] = [];
 	let i = 0;
 
 	while (i < messages.length) {
 		const currentMsg = messages[i];
 
-		// If it's not a tool message, add it as-is and continue
+		// If it's not a tool message, add it as-is
 		if (!isToolMessage(currentMsg)) {
 			result.push(currentMsg);
 			i++;
 			continue;
 		}
 
-		// Collect consecutive tool messages with the same toolName
-		const toolMessagesGroup = [currentMsg];
+		// Collect ALL consecutive tool messages
+		const toolGroup: ChatUI.ToolMessage[] = [currentMsg];
 		let j = i + 1;
 
 		while (j < messages.length) {
-			const nextMsg = messages[j];
-			if (isToolMessage(nextMsg) && nextMsg.toolName === currentMsg.toolName) {
-				toolMessagesGroup.push(nextMsg);
-				j++;
-			} else {
-				break;
-			}
+			const msg = messages[j];
+			if (!isToolMessage(msg)) break;
+			toolGroup.push(msg);
+			j++;
 		}
 
-		// If we have multiple tool messages with the same toolName, collapse them
-		if (toolMessagesGroup.length > 1) {
-			// Determine the status to show based on priority rules
-			const lastMessage = toolMessagesGroup[toolMessagesGroup.length - 1];
-			let titleSource = lastMessage;
+		// Deduplicate tool messages by toolName, keeping the latest status for each unique tool type
+		// This matches the original behavior where multiple calls to the same tool (e.g., get_node_details)
+		// are collapsed into a single entry showing the most recent status
+		const uniqueToolsMap = new Map<string, ChatUI.ToolMessage>();
+		for (const tool of toolGroup) {
+			// Group by toolName so multiple calls to the same tool are collapsed
+			const key = tool.toolName;
+			// Later messages in the array have the most recent status, so they overwrite earlier ones
+			uniqueToolsMap.set(key, tool);
+		}
+		const uniqueTools = Array.from(uniqueToolsMap.values());
 
-			// Check if we have running messages - if so, show the last running one and use its titles
-			const runningMessages = toolMessagesGroup.filter((msg) => msg.status === 'running');
-			const errorMessage = toolMessagesGroup.find((msg) => msg.status === 'error');
-			if (runningMessages.length > 0) {
-				const lastRunning = runningMessages[runningMessages.length - 1];
-				titleSource = lastRunning;
-			} else if (errorMessage) {
-				titleSource = errorMessage;
-			}
+		// Check if this is the last group of tools in the messages
+		const isLastToolGroup = j >= messages.length;
+		const allToolsCompleted = uniqueTools.every((m) => m.status === 'completed');
+		const hasRunningTool = uniqueTools.some((m) => m.status === 'running');
 
-			// Combine all updates from all messages in the group
-			const combinedUpdates = toolMessagesGroup.flatMap((msg) => msg.updates || []);
+		// Build the items array - use toolName as id since we dedupe by toolName
+		const items: ChatUI.ThinkingItem[] = uniqueTools.map((m) => ({
+			id: `tool-${m.toolName}`,
+			displayTitle:
+				m.customDisplayTitle ||
+				m.displayTitle ||
+				m.toolName
+					.split('_')
+					.map((word) => word.charAt(0).toUpperCase() + word.slice(1))
+					.join(' '),
+			status: m.status,
+		}));
 
-			// Create collapsed message using last message as base, but with titles from titleSource
-			const collapsedMessage: ChatUI.ToolMessage = {
-				...lastMessage,
-				displayTitle: titleSource.displayTitle,
-				customDisplayTitle:
-					titleSource.status === 'running' ? titleSource.customDisplayTitle : undefined,
-				status: titleSource.status,
-				updates: combinedUpdates,
-			};
+		// If this is the last group, all tools completed, and we're still streaming,
+		// add a "Thinking..." item to show the AI is processing
+		if (isLastToolGroup && allToolsCompleted && options.streaming && options.loadingMessage) {
+			items.push({
+				id: 'thinking-item',
+				displayTitle: options.loadingMessage,
+				status: 'running',
+			});
+		}
 
-			result.push(collapsedMessage);
+		// Determine the latest status text - prioritize running tools, then thinking state, then completed
+		const runningTool = uniqueTools.find((m) => m.status === 'running');
+		let latestStatus: string;
+
+		if (hasRunningTool) {
+			latestStatus =
+				runningTool?.customDisplayTitle ||
+				runningTool?.displayTitle ||
+				runningTool?.toolName
+					.split('_')
+					.map((word) => word.charAt(0).toUpperCase() + word.slice(1))
+					.join(' ') ||
+				'Processing...';
+		} else if (
+			isLastToolGroup &&
+			allToolsCompleted &&
+			options.streaming &&
+			options.loadingMessage
+		) {
+			// Still streaming after tools completed - show thinking message
+			latestStatus = options.loadingMessage;
+		} else if (allToolsCompleted) {
+			// All tools completed and not streaming - show "Workflow generated"
+			latestStatus = 'Workflow generated';
 		} else {
-			// Single tool message, add as-is
-			result.push(currentMsg);
+			latestStatus = 'Processing...';
 		}
 
+		// Create a ThinkingGroup message with deduplicated items
+		// Use a stable ID so Vue preserves component state when items update
+		const thinkingGroup: ChatUI.ThinkingGroupMessage = {
+			id: 'thinking-group',
+			role: 'assistant',
+			type: 'thinking-group',
+			items,
+			latestStatusText: latestStatus,
+		};
+
+		result.push(thinkingGroup);
 		i = j;
 	}
 
+	// If streaming with a loadingMessage but no thinking-group exists yet (no tool messages received),
+	// create an initial thinking-group with just the "Thinking..." item
+	// Use the same stable ID as tool-based thinking-groups so Vue preserves component state
+	const hasThinkingGroup = result.some((msg) => msg.type === 'thinking-group');
+	if (options.streaming && options.loadingMessage && !hasThinkingGroup) {
+		const initialThinkingGroup: ChatUI.ThinkingGroupMessage = {
+			id: 'thinking-group',
+			role: 'assistant',
+			type: 'thinking-group',
+			items: [
+				{
+					id: 'thinking-item',
+					displayTitle: options.loadingMessage,
+					status: 'running',
+				},
+			],
+			latestStatusText: options.loadingMessage,
+		};
+		result.push(initialThinkingGroup);
+	}
+
 	return result;
 }
 
-// Ensure all messages have required id and read properties, and collapse tool messages
+// Ensure all messages have required id and read properties, and group tool messages into thinking blocks
 const normalizedMessages = computed(() => {
 	const normalized = normalizeMessages(props.messages);
-	return collapseToolMessages(filterOutHiddenMessages(normalized));
+	return groupToolMessagesIntoThinking(filterOutHiddenMessages(normalized), {
+		streaming: props.streaming,
+		loadingMessage: props.loadingMessage,
+	});
 });
 
 // Get quickReplies from the last message in the original messages (before filtering)
@@ -186,6 +256,12 @@ const showSuggestions = computed(() => {
 	return showPlaceholder.value && props.suggestions && props.suggestions.length > 0;
 });
 
+// Check if we have any thinking group - hides the generic loading message when tool status is shown
+// The ThinkingMessage component handles displaying the current status with shimmer animation
+const hasAnyThinkingGroup = computed(() => {
+	return normalizedMessages.value.some((msg) => msg.type === 'thinking-group');
+});
+
 const showBottomInput = computed(() => {
 	// Hide bottom input when showing suggestions (blank state with suggestions)
 	return !showSuggestions.value;
@@ -272,16 +348,15 @@ onUnmounted(() => {
 });
 
 function getMessageStyles(message: ChatUI.AssistantMessage, messageCount: number) {
-	const $style = useCssModule();
+	const isToolOrThinking = message.type === 'tool' || message.type === 'thinking-group';
+	const nextMsg = normalizedMessages.value[messageCount + 1];
+	const nextIsToolOrThinking = nextMsg?.type === 'tool' || nextMsg?.type === 'thinking-group';
+
 	return {
-		[$style.firstToolMessage]:
-			message.type === 'tool' &&
-			(messageCount === 0 || normalizedMessages.value[messageCount - 1].type !== 'tool'),
 		[$style.lastToolMessage]:
-			message.type === 'tool' &&
+			isToolOrThinking &&
 			((messageCount === normalizedMessages.value.length - 1 && !props.loadingMessage) ||
-				(messageCount < normalizedMessages.value.length - 1 &&
-					normalizedMessages.value[messageCount + 1]?.type !== 'tool')),
+				(messageCount < normalizedMessages.value.length - 1 && !nextIsToolOrThinking)),
 	};
 }
 
@@ -333,7 +408,18 @@ defineExpose({
 									message.role === 'assistant' ? 'chat-message-assistant' : 'chat-message-user'
 								"
 							>
+								<!-- Handle ThinkingGroup messages -->
+								<ThinkingMessage
+									v-if="isThinkingGroupMessage(message)"
+									:items="message.items"
+									:latest-status-text="message.latestStatusText"
+									:is-streaming="streaming"
+									:class="getMessageStyles(message, i)"
+								/>
+
+								<!-- Handle regular messages -->
 								<MessageWrapper
+									v-else
 									:message="message"
 									:is-first-of-role="i === 0 || message.role !== normalizedMessages[i - 1].role"
 									:user="user"
@@ -376,13 +462,10 @@ defineExpose({
 							<slot name="messagesFooter" />
 						</div>
 						<div
-							v-if="loadingMessage"
+							v-if="loadingMessage && !hasAnyThinkingGroup"
 							:class="{
 								[$style.message]: true,
 								[$style.loading]: normalizedMessages?.length,
-								[$style.firstToolMessage]:
-									normalizedMessages?.length === 0 ||
-									normalizedMessages[normalizedMessages.length - 1].type !== 'tool',
 								[$style.lastToolMessage]: true,
 							}"
 						>
@@ -513,6 +596,7 @@ defineExpose({
 	border-top: 0;
 	border-bottom: 0;
 	position: relative;
+	line-height: var(--line-height--xl);
 
 	pre,
 	code {
@@ -548,20 +632,21 @@ defineExpose({
 .messagesContent {
 	padding: var(--spacing--xs);
 	padding-bottom: var(--spacing--xl); // Extra padding for fade area
+
+	// Override p line-height from reset.scss (1.8) to use chat standard (1.5)
+	:global(p) {
+		line-height: var(--line-height--xl);
+	}
 }
 
 .message {
 	margin-bottom: var(--spacing--sm);
-	font-size: var(--font-size--2xs);
+	font-size: var(--font-size--sm);
 	line-height: var(--line-height--xl);
 }
 
-.firstToolMessage {
-	margin-top: var(--spacing--md);
-}
-
 .lastToolMessage {
-	margin-bottom: var(--spacing--lg);
+	margin-bottom: var(--spacing--sm);
 }
 
 .chatTitle {
diff --git a/packages/frontend/@n8n/design-system/src/components/AskAssistantChat/__snapshots__/AskAssistantChat.test.ts.snap b/packages/frontend/@n8n/design-system/src/components/AskAssistantChat/__snapshots__/AskAssistantChat.test.ts.snap
index a70b1db3a10..8e65281bc53 100644
--- a/packages/frontend/@n8n/design-system/src/components/AskAssistantChat/__snapshots__/AskAssistantChat.test.ts.snap
+++ b/packages/frontend/@n8n/design-system/src/components/AskAssistantChat/__snapshots__/AskAssistantChat.test.ts.snap
@@ -178,6 +178,9 @@ exports[`AskAssistantChat > renders chat with messages correctly 1`] = `
                   <data
                     data-test-id="chat-message-assistant"
                   >
+                    <!-- Handle ThinkingGroup messages -->
+                    
+                    <!-- Handle regular messages -->
                     <div
                       class=""
                       data-test-id="message-wrapper-stub"
@@ -188,11 +191,15 @@ exports[`AskAssistantChat > renders chat with messages correctly 1`] = `
                     >
                       {"id":"1","type":"text","role":"assistant","content":"Hi Max! Here is my top solution to fix the error in your **Transform data** node👇","read":false}
                     </div>
+                    
                     <!--v-if-->
                   </data>
                   <data
                     data-test-id="chat-message-assistant"
                   >
+                    <!-- Handle ThinkingGroup messages -->
+                    
+                    <!-- Handle regular messages -->
                     <div
                       class=""
                       data-test-id="message-wrapper-stub"
@@ -203,11 +210,15 @@ exports[`AskAssistantChat > renders chat with messages correctly 1`] = `
                     >
                       {"id":"1","type":"code-diff","role":"assistant","description":"Short solution description here that can spill over to two lines","codeDiff":"@@ -1,7 +1,6 @@\\n-The Way that can be told of is not the eternal Way;\\n-The name that can be named is not the eternal name.\\nThe Nameless is the origin of Heaven and Earth;\\n-The Named is the mother of all things.\\n+The named is the mother of all things.\\n+\\nTherefore let there always be non-being,\\nso we may see their subtlety,\\nAnd let there always be being,\\n@@ -9,3 +8,6 @@\\n The two are the same,\\n But after they are produced,\\n they have different names.\\n+They both may be called deep and profound.\\n+Deeper and more profound,\\n+The door of all subtleties!","suggestionId":"test","quickReplies":[{"type":"new-suggestion","text":"Give me another solution"},{"type":"resolved","text":"All good"}],"read":false}
                     </div>
+                    
                     <!--v-if-->
                   </data>
                   <data
                     data-test-id="chat-message-user"
                   >
+                    <!-- Handle ThinkingGroup messages -->
+                    
+                    <!-- Handle regular messages -->
                     <div
                       class=""
                       data-test-id="message-wrapper-stub"
@@ -218,11 +229,15 @@ exports[`AskAssistantChat > renders chat with messages correctly 1`] = `
                     >
                       {"id":"2","type":"text","role":"user","content":"Give it to me **ignore this markdown**","read":false}
                     </div>
+                    
                     <!--v-if-->
                   </data>
                   <data
                     data-test-id="chat-message-assistant"
                   >
+                    <!-- Handle ThinkingGroup messages -->
+                    
+                    <!-- Handle regular messages -->
                     <div
                       class=""
                       data-test-id="message-wrapper-stub"
@@ -233,11 +248,15 @@ exports[`AskAssistantChat > renders chat with messages correctly 1`] = `
                     >
                       {"id":"2","type":"block","role":"assistant","title":"Credential doesn’t have correct permissions to send a message","content":"Solution steps:\\n1. Lorem ipsum dolor sit amet, consectetur **adipiscing** elit. Proin id nulla placerat, tristique ex at, euismod dui.\\n2. Copy this into somewhere\\n3. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin id nulla placerat, tristique ex at, euismod dui.\\n4. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin id nulla placerat, tristique ex at, euismod dui. \\n Testing more code \\n - Unordered item 1 \\n - Unordered item 2","read":false}
                     </div>
+                    
                     <!--v-if-->
                   </data>
                   <data
                     data-test-id="chat-message-assistant"
                   >
+                    <!-- Handle ThinkingGroup messages -->
+                    
+                    <!-- Handle regular messages -->
                     <div
                       class=""
                       data-test-id="message-wrapper-stub"
@@ -248,6 +267,7 @@ exports[`AskAssistantChat > renders chat with messages correctly 1`] = `
                     >
                       {"id":"2","type":"code-diff","role":"assistant","description":"Short solution with min height","codeDiff":"@@ -1,7 +1,6 @@\\n-The Way that can be told of is not the eternal Way;\\n-The name that can be named is not the eternal name.\\n+The door of all subtleties!","quickReplies":[{"type":"new-suggestion","text":"Give me another solution"},{"type":"resolved","text":"All good"}],"suggestionId":"test","read":false}
                     </div>
+                    
                     <div
                       class="quickReplies"
                     >
@@ -514,6 +534,9 @@ exports[`AskAssistantChat > renders end of session chat correctly 1`] = `
                   <data
                     data-test-id="chat-message-assistant"
                   >
+                    <!-- Handle ThinkingGroup messages -->
+                    
+                    <!-- Handle regular messages -->
                     <div
                       class=""
                       data-test-id="message-wrapper-stub"
@@ -524,11 +547,15 @@ exports[`AskAssistantChat > renders end of session chat correctly 1`] = `
                     >
                       {"id":"1","type":"text","role":"assistant","content":"Hi Max! Here is my top solution to fix the error in your **Transform data** node👇","read":false}
                     </div>
+                    
                     <!--v-if-->
                   </data>
                   <data
                     data-test-id="chat-message-assistant"
                   >
+                    <!-- Handle ThinkingGroup messages -->
+                    
+                    <!-- Handle regular messages -->
                     <div
                       class=""
                       data-test-id="message-wrapper-stub"
@@ -539,6 +566,7 @@ exports[`AskAssistantChat > renders end of session chat correctly 1`] = `
                     >
                       {"id":"123","role":"assistant","type":"event","eventName":"end-session","read":false}
                     </div>
+                    
                     <!--v-if-->
                   </data>
                   
@@ -659,6 +687,9 @@ exports[`AskAssistantChat > renders error message correctly with retry button 1`
                   <data
                     data-test-id="chat-message-assistant"
                   >
+                    <!-- Handle ThinkingGroup messages -->
+                    
+                    <!-- Handle regular messages -->
                     <div
                       class=""
                       data-test-id="message-wrapper-stub"
@@ -669,6 +700,7 @@ exports[`AskAssistantChat > renders error message correctly with retry button 1`
                     >
                       {"id":"1","role":"assistant","type":"error","content":"This is an error message.","read":false}
                     </div>
+                    
                     <!--v-if-->
                   </data>
                   
@@ -789,6 +821,9 @@ exports[`AskAssistantChat > renders message with code snippet 1`] = `
                   <data
                     data-test-id="chat-message-assistant"
                   >
+                    <!-- Handle ThinkingGroup messages -->
+                    
+                    <!-- Handle regular messages -->
                     <div
                       class=""
                       data-test-id="message-wrapper-stub"
@@ -799,6 +834,7 @@ exports[`AskAssistantChat > renders message with code snippet 1`] = `
                     >
                       {"id":"1","type":"text","role":"assistant","content":"Hi Max! Here is my top solution to fix the error in your **Transform data** node👇","codeSnippet":"node.on('input', function(msg) {\\n  if (msg.seed) { dummyjson.seed = msg.seed; }\\n  try {\\n      var value = dummyjson.parse(node.template, {mockdata: msg});\\n      if (node.syntax === 'json') {\\n          try { value = JSON.parse(value); }\\n          catch(e) { node.error(RED._('datagen.errors.json-error')); }\\n      }\\n      if (node.fieldType === 'msg') {\\n          RED.util.setMessageProperty(msg,node.field,value);\\n      }\\n      else if (node.fieldType === 'flow') {\\n          node.context().flow.set(node.field,value);\\n      }\\n      else if (node.fieldType === 'global') {\\n          node.context().global.set(node.field,value);\\n      }\\n      node.send(msg);\\n  }\\n  catch(e) {","read":false}
                     </div>
+                    
                     <!--v-if-->
                   </data>
                   
@@ -919,6 +955,9 @@ exports[`AskAssistantChat > renders streaming chat correctly 1`] = `
                   <data
                     data-test-id="chat-message-assistant"
                   >
+                    <!-- Handle ThinkingGroup messages -->
+                    
+                    <!-- Handle regular messages -->
                     <div
                       class=""
                       data-test-id="message-wrapper-stub"
@@ -929,6 +968,7 @@ exports[`AskAssistantChat > renders streaming chat correctly 1`] = `
                     >
                       {"id":"1","type":"text","role":"assistant","content":"Hi Max! Here is my top solution to fix the error in your **Transform data** node👇","read":false}
                     </div>
+                    
                     <!--v-if-->
                   </data>
                   
diff --git a/packages/frontend/@n8n/design-system/src/components/AskAssistantChat/messages/BaseMessage.vue b/packages/frontend/@n8n/design-system/src/components/AskAssistantChat/messages/BaseMessage.vue
index d8882c0792b..3cbc6f30921 100644
--- a/packages/frontend/@n8n/design-system/src/components/AskAssistantChat/messages/BaseMessage.vue
+++ b/packages/frontend/@n8n/design-system/src/components/AskAssistantChat/messages/BaseMessage.vue
@@ -2,10 +2,7 @@
 import { computed } from 'vue';
 
 import MessageRating from './MessageRating.vue';
-import { useI18n } from '../../../composables/useI18n';
 import type { ChatUI, RatingFeedback } from '../../../types/assistant';
-import AssistantAvatar from '../../AskAssistantAvatar/AssistantAvatar.vue';
-import N8nAvatar from '../../N8nAvatar';
 
 interface Props {
 	message: ChatUI.AssistantMessage;
@@ -22,8 +19,6 @@ const emit = defineEmits<{
 	feedback: [RatingFeedback];
 }>();
 
-const { t } = useI18n();
-
 const isUserMessage = computed(() => props.message.role === 'user');
 
 function onRate(rating: RatingFeedback) {
@@ -33,19 +28,6 @@ function onRate(rating: RatingFeedback) {
 
 <template>
 	<div :class="$style.message">
-		<div
-			v-if="isFirstOfRole"
-			:class="{ [$style.roleName]: true, [$style.userSection]: !isUserMessage }"
-		>
-			<template v-if="isUserMessage">
-				<N8nAvatar :first-name="user?.firstName" :last-name="user?.lastName" size="xsmall" />
-				<span>{{ t('assistantChat.you') }}</span>
-			</template>
-			<template v-else>
-				<AssistantAvatar />
-				<span>{{ t('assistantChat.aiAssistantName') }}</span>
-			</template>
-		</div>
 		<slot></slot>
 		<MessageRating
 			v-if="message.showRating && !isUserMessage"
@@ -59,24 +41,7 @@ function onRate(rating: RatingFeedback) {
 <style lang="scss" module>
 .message {
 	margin-bottom: var(--spacing--sm);
-	font-size: var(--font-size--2xs);
+	font-size: var(--font-size--sm);
 	line-height: var(--line-height--xl);
 }
-
-.roleName {
-	display: flex;
-	align-items: center;
-	margin-bottom: var(--spacing--3xs);
-	height: var(--spacing--xl);
-	font-weight: var(--font-weight--bold);
-	font-size: var(--font-size--2xs);
-
-	> * {
-		margin-right: var(--spacing--3xs);
-	}
-}
-
-.userSection {
-	margin-top: var(--spacing--md);
-}
 </style>
diff --git a/packages/frontend/@n8n/design-system/src/components/AskAssistantChat/messages/TextMessage.vue b/packages/frontend/@n8n/design-system/src/components/AskAssistantChat/messages/TextMessage.vue
index c7ecfbcf4d8..7186eb9c4e2 100644
--- a/packages/frontend/@n8n/design-system/src/components/AskAssistantChat/messages/TextMessage.vue
+++ b/packages/frontend/@n8n/design-system/src/components/AskAssistantChat/messages/TextMessage.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { computed } from 'vue';
+import { computed, ref, onMounted, nextTick, watch } from 'vue';
 
 import BaseMessage from './BaseMessage.vue';
 import { useMarkdown } from './useMarkdown';
@@ -20,7 +20,7 @@ interface Props {
 	color?: string;
 }
 
-defineProps<Props>();
+const props = defineProps<Props>();
 
 const emit = defineEmits<{
 	feedback: [RatingFeedback];
@@ -32,6 +32,38 @@ const isClipboardSupported = computed(() => {
 	return navigator.clipboard?.writeText;
 });
 
+// User message expand/collapse functionality
+const isExpanded = ref(false);
+const userContentRef = ref<HTMLElement | null>(null);
+const isOverflowing = ref(false);
+// Should match --assistant--text-message--collapsed--max-height in _tokens.scss
+const MAX_HEIGHT = 200;
+
+function checkOverflow() {
+	if (userContentRef.value) {
+		isOverflowing.value = userContentRef.value.scrollHeight > MAX_HEIGHT;
+	}
+}
+
+function toggleExpanded() {
+	isExpanded.value = !isExpanded.value;
+}
+
+onMounted(() => {
+	void nextTick(() => {
+		checkOverflow();
+	});
+});
+
+watch(
+	() => props.message.content,
+	() => {
+		void nextTick(() => {
+			checkOverflow();
+		});
+	},
+);
+
 async function onCopyButtonClick(content: string, e: MouseEvent) {
 	const button = e.target as HTMLButtonElement;
 	await navigator.clipboard.writeText(content);
@@ -49,12 +81,25 @@ async function onCopyButtonClick(content: string, e: MouseEvent) {
 		:user="user"
 		@feedback="(feedback) => emit('feedback', feedback)"
 	>
-		<div :class="$style.textMessage">
-			<span
-				v-if="message.role === 'user'"
-				v-n8n-html="renderMarkdown(message.content)"
-				:class="$style.renderedContent"
-			></span>
+		<div :class="[$style.textMessage, { [$style.userMessage]: message.role === 'user' }]">
+			<!-- User message with container -->
+			<div v-if="message.role === 'user'" :class="$style.userMessageContainer">
+				<div
+					ref="userContentRef"
+					:class="[$style.userContent, { [$style.collapsed]: !isExpanded && isOverflowing }]"
+				>
+					<span v-n8n-html="renderMarkdown(message.content)" :class="$style.renderedContent"></span>
+				</div>
+				<button
+					v-if="isOverflowing"
+					:class="$style.showMoreButton"
+					type="button"
+					@click="toggleExpanded"
+				>
+					{{ isExpanded ? t('notice.showLess') : t('notice.showMore') }}
+				</button>
+			</div>
+			<!-- Assistant message - simple text without container -->
 			<div
 				v-else
 				v-n8n-html="renderMarkdown(message.content)"
@@ -92,12 +137,49 @@ async function onCopyButtonClick(content: string, e: MouseEvent) {
 .textMessage {
 	display: flex;
 	flex-direction: column;
-	gap: var(--spacing--xs);
-	font-size: var(--font-size--2xs);
-	line-height: 1.6;
+	gap: var(--spacing--2xs);
+	font-size: var(--font-size--sm);
+	line-height: var(--line-height--xl);
 	word-break: break-word;
 }
 
+// User messages align right
+.userMessage {
+	align-items: flex-end;
+}
+
+// User message container styles per Figma
+.userMessageContainer {
+	background-color: var(--assistant--color--background--user-bubble);
+	border-radius: var(--radius--lg);
+	padding: var(--spacing--2xs) var(--spacing--xs);
+	color: var(--assistant--color--text--user-bubble);
+	max-width: calc(100% - 40px);
+}
+
+.userContent {
+	&.collapsed {
+		max-height: var(--assistant--text-message--collapsed--max-height);
+		overflow: hidden;
+	}
+}
+
+.showMoreButton {
+	background: none;
+	border: none;
+	padding: 0;
+	margin-top: var(--spacing--2xs);
+	color: var(--assistant--color--text--subtle);
+	font-size: var(--font-size--sm);
+	font-weight: 500;
+	cursor: pointer;
+	text-align: left;
+
+	&:hover {
+		text-decoration: underline;
+	}
+}
+
 .codeSnippet {
 	position: relative;
 	border: var(--border);
@@ -135,15 +217,26 @@ async function onCopyButtonClick(content: string, e: MouseEvent) {
 	}
 }
 
+// Assistant message - simple text
 .assistantText {
 	display: inline-flex;
 	flex-direction: column;
+	color: var(--assistant--color--text);
+	font-size: var(--font-size--sm);
+	line-height: var(--line-height--xl);
+	max-width: calc(100% - 40px);
 }
 
 .renderedContent {
 	p {
 		margin: 0;
-		margin: var(--spacing--4xs) 0;
+	}
+
+	// Add top padding to strong elements only when there's content before them
+	:not(:first-child) > strong:first-child,
+	* + strong {
+		display: inline-block;
+		padding-top: var(--spacing--md);
 	}
 
 	h1,
diff --git a/packages/frontend/@n8n/design-system/src/components/AskAssistantChat/messages/ThinkingMessage.vue b/packages/frontend/@n8n/design-system/src/components/AskAssistantChat/messages/ThinkingMessage.vue
new file mode 100644
index 00000000000..d9f00c6fd18
--- /dev/null
+++ b/packages/frontend/@n8n/design-system/src/components/AskAssistantChat/messages/ThinkingMessage.vue
@@ -0,0 +1,168 @@
+<script setup lang="ts">
+import { ref, computed } from 'vue';
+
+import type { ChatUI } from '../../../types/assistant';
+import N8nIcon from '../../N8nIcon';
+
+interface Props {
+	items: ChatUI.ThinkingItem[];
+	latestStatusText: string;
+	isStreaming?: boolean;
+}
+
+const props = withDefaults(defineProps<Props>(), {
+	isStreaming: false,
+});
+
+const isExpanded = ref(false);
+
+const hasRunningItem = computed(() => props.items.some((item) => item.status === 'running'));
+
+const shouldShowShimmer = computed(() => hasRunningItem.value);
+
+const toggleExpanded = () => {
+	isExpanded.value = !isExpanded.value;
+};
+
+function getIconForStatus(status: ChatUI.ThinkingItem['status']) {
+	switch (status) {
+		case 'completed':
+			return { icon: 'circle-check' as const, spin: false };
+		case 'running':
+			return { icon: 'spinner' as const, spin: true };
+		case 'error':
+			return { icon: 'triangle-alert' as const, spin: false };
+		default:
+			return { icon: 'circle' as const, spin: false };
+	}
+}
+</script>
+
+<template>
+	<div :class="$style.thinkingContainer">
+		<!-- Collapsed header with shimmer -->
+		<button :class="$style.header" type="button" @click="toggleExpanded">
+			<span :class="[$style.statusText, { [$style.shimmer]: shouldShowShimmer }]">
+				{{ latestStatusText }}
+			</span>
+			<N8nIcon :icon="isExpanded ? 'chevron-down' : 'chevron-right'" :class="$style.chevron" />
+		</button>
+
+		<!-- Expanded item list -->
+		<Transition name="expand">
+			<div v-if="isExpanded" :class="$style.itemList">
+				<div v-for="item in items" :key="item.id" :class="$style.item">
+					<N8nIcon
+						:icon="getIconForStatus(item.status).icon"
+						:spin="getIconForStatus(item.status).spin"
+						:class="$style.itemIcon"
+					/>
+					<span :class="$style.itemText">
+						{{ item.displayTitle }}
+					</span>
+				</div>
+			</div>
+		</Transition>
+	</div>
+</template>
+
+<style lang="scss" module>
+@use '../../../css/mixins/animations';
+
+.thinkingContainer {
+	margin: var(--spacing--2xs) 0;
+}
+
+.header {
+	display: flex;
+	align-items: center;
+	gap: var(--spacing--4xs);
+	padding: var(--spacing--2xs) 0;
+	background: transparent;
+	border: none;
+	cursor: pointer;
+	width: 100%;
+	text-align: left;
+
+	&:hover {
+		opacity: 0.8;
+	}
+}
+
+.chevron {
+	color: var(--assistant--color--text--subtle);
+	flex-shrink: 0;
+	width: var(--font-size--lg);
+	height: var(--font-size--lg);
+	padding-top: 1px;
+
+	svg {
+		width: var(--font-size--lg);
+		height: var(--font-size--lg);
+	}
+}
+
+.statusText {
+	color: var(--assistant--color--text--subtle);
+	font-size: var(--font-size--sm);
+	font-weight: var(--font-weight--medium);
+	line-height: var(--line-height--xl);
+}
+
+.shimmer {
+	@include animations.shimmer;
+}
+
+.itemList {
+	padding-left: var(--spacing--4xs);
+	padding-bottom: var(--spacing--2xs);
+	display: flex;
+	flex-direction: column;
+	gap: var(--spacing--2xs);
+}
+
+.item {
+	display: flex;
+	align-items: center;
+	gap: var(--spacing--2xs);
+}
+
+.itemIcon {
+	flex-shrink: 0;
+	width: var(--font-size--md);
+	height: var(--font-size--md);
+	color: var(--assistant--icon-color--subtle);
+
+	svg {
+		width: var(--font-size--md);
+		height: var(--font-size--md);
+	}
+}
+
+.itemText {
+	color: var(--assistant--color--text--subtle);
+	font-size: var(--font-size--sm);
+	line-height: var(--line-height--xl);
+}
+</style>
+
+<style lang="scss" scoped>
+// Expand transition
+.expand-enter-active,
+.expand-leave-active {
+	transition: all 0.2s ease;
+	overflow: hidden;
+}
+
+.expand-enter-from,
+.expand-leave-to {
+	opacity: 0;
+	max-height: 0;
+}
+
+.expand-enter-to,
+.expand-leave-from {
+	opacity: 1;
+	max-height: 500px;
+}
+</style>
diff --git a/packages/frontend/@n8n/design-system/src/components/AskAssistantChat/messages/helpers.ts b/packages/frontend/@n8n/design-system/src/components/AskAssistantChat/messages/helpers.ts
index f17d5c35a23..c46a861ef1d 100644
--- a/packages/frontend/@n8n/design-system/src/components/AskAssistantChat/messages/helpers.ts
+++ b/packages/frontend/@n8n/design-system/src/components/AskAssistantChat/messages/helpers.ts
@@ -21,6 +21,7 @@ export function getSupportedMessageComponent(type: ChatUI.AssistantMessage['type
 			return EventMessage;
 		case 'tool':
 			return ToolMessage;
+		case 'thinking-group': // Handled directly in AskAssistantChat.vue
 		case 'agent-suggestion':
 		case 'workflow-updated':
 		case 'custom':
diff --git a/packages/frontend/@n8n/design-system/src/components/N8nPromptInput/N8nPromptInput.vue b/packages/frontend/@n8n/design-system/src/components/N8nPromptInput/N8nPromptInput.vue
index 814e2869a3e..d965aef99f6 100644
--- a/packages/frontend/@n8n/design-system/src/components/N8nPromptInput/N8nPromptInput.vue
+++ b/packages/frontend/@n8n/design-system/src/components/N8nPromptInput/N8nPromptInput.vue
@@ -509,7 +509,7 @@ defineExpose({
 	resize: none;
 	outline: none;
 	font-family: var(--font-family), sans-serif;
-	font-size: var(--font-size--2xs);
+	font-size: var(--font-size--sm);
 	line-height: 24px;
 	color: var(--color--text--shade-1);
 	padding: 0 var(--spacing--2xs);
@@ -542,7 +542,7 @@ defineExpose({
 	resize: none;
 	outline: none;
 	font-family: var(--font-family), sans-serif;
-	font-size: var(--font-size--2xs);
+	font-size: var(--font-size--sm);
 	line-height: 18px;
 	color: var(--color--text--shade-1);
 	padding: var(--spacing--3xs);
diff --git a/packages/frontend/@n8n/design-system/src/css/_tokens.dark.scss b/packages/frontend/@n8n/design-system/src/css/_tokens.dark.scss
index 52cf7edeae3..25dd13d891e 100644
--- a/packages/frontend/@n8n/design-system/src/css/_tokens.dark.scss
+++ b/packages/frontend/@n8n/design-system/src/css/_tokens.dark.scss
@@ -60,6 +60,13 @@
 		var(--assistant--color--highlight-1) 100%
 	);
 
+	// AI Chat text and icon colors
+	--assistant--color--text--subtle: var(--color--neutral-250);
+	--assistant--icon-color--subtle: var(--color--neutral-250);
+	--assistant--color--text: var(--color--neutral-white);
+	--assistant--color--text--user-bubble: #f0f3f9;
+	--assistant--color--background--user-bubble: var(--color--neutral-800);
+
 	// LangChain
 	--lm-chat--messages--color--background: var(--color--neutral-950);
 	--lm-chat--bot--color--background: var(--color--neutral-850);
diff --git a/packages/frontend/@n8n/design-system/src/css/_tokens.scss b/packages/frontend/@n8n/design-system/src/css/_tokens.scss
index 6dada289531..1600de6f1a5 100644
--- a/packages/frontend/@n8n/design-system/src/css/_tokens.scss
+++ b/packages/frontend/@n8n/design-system/src/css/_tokens.scss
@@ -234,6 +234,15 @@
 		var(--assistant--color--highlight-2) 50%,
 		var(--assistant--color--highlight-1) 100%
 	);
+
+	// AI Chat text and icon colors
+	--assistant--color--text--subtle: var(--color--neutral-500);
+	--assistant--icon-color--subtle: var(--color--neutral-500);
+	--assistant--color--text: var(--color--neutral-800);
+	--assistant--color--text--user-bubble: #414244;
+	--assistant--color--background--user-bubble: var(--color--neutral-150);
+	--assistant--text-message--collapsed--max-height: 200px;
+
 	--assistant--button--color--background--hover: linear-gradient(
 		108.82deg,
 		rgba(236, 123, 142, 0.12) 0%,
diff --git a/packages/frontend/@n8n/design-system/src/css/mixins/animations.scss b/packages/frontend/@n8n/design-system/src/css/mixins/animations.scss
index b516205014f..11965a03c64 100644
--- a/packages/frontend/@n8n/design-system/src/css/mixins/animations.scss
+++ b/packages/frontend/@n8n/design-system/src/css/mixins/animations.scss
@@ -3,7 +3,7 @@
 	background-clip: text;
 	color: transparent;
 	background-size: 200% 100%;
-	animation: shimmer 2.5s linear infinite;
+	animation: shimmer 3.33s linear infinite;
 }
 
 @keyframes shimmer {
diff --git a/packages/frontend/@n8n/design-system/src/types/assistant.ts b/packages/frontend/@n8n/design-system/src/types/assistant.ts
index e67237d7e77..06c1c67ff1e 100644
--- a/packages/frontend/@n8n/design-system/src/types/assistant.ts
+++ b/packages/frontend/@n8n/design-system/src/types/assistant.ts
@@ -92,6 +92,20 @@ export namespace ChatUI {
 		}>;
 	}
 
+	export interface ThinkingItem {
+		id: string;
+		displayTitle: string;
+		status: 'pending' | 'running' | 'completed' | 'error';
+	}
+
+	export interface ThinkingGroupMessage {
+		id?: string;
+		role: 'assistant';
+		type: 'thinking-group';
+		items: ThinkingItem[];
+		latestStatusText: string;
+	}
+
 	export interface CustomMessage {
 		id?: string;
 		role: 'assistant' | 'user';
@@ -121,6 +135,7 @@ export namespace ChatUI {
 		| AgentSuggestionMessage
 		| WorkflowUpdatedMessage
 		| ToolMessage
+		| ThinkingGroupMessage
 		| CustomMessage
 	) & {
 		id?: string;
@@ -214,6 +229,12 @@ export function isCustomMessage(
 	return msg.type === 'custom';
 }
 
+export function isThinkingGroupMessage(
+	msg: ChatUI.AssistantMessage,
+): msg is ChatUI.ThinkingGroupMessage & { id?: string; read?: boolean } {
+	return msg.type === 'thinking-group';
+}
+
 // Helper to ensure message has required id and read properties
 export function hasRequiredProps<T extends ChatUI.AssistantMessage>(
 	msg: T,
diff --git a/packages/frontend/@n8n/i18n/src/locales/en.json b/packages/frontend/@n8n/i18n/src/locales/en.json
index 9ec190a8e8a..7ac659907ea 100644
--- a/packages/frontend/@n8n/i18n/src/locales/en.json
+++ b/packages/frontend/@n8n/i18n/src/locales/en.json
@@ -238,10 +238,12 @@
 	"aiAssistant.builder.canvasPrompt.startManually.subTitle": "Add the first node",
 	"aiAssistant.builder.canvasPrompt.buildWithAI": "Build with AI",
 	"aiAssistant.builder.streamAbortedMessage": "Task aborted",
-	"aiAssistant.builder.executeMessage.description": "Complete these steps before executing your workflow:",
+	"aiAssistant.builder.executeMessage.description": "Complete these steps before executing your workflow",
 	"aiAssistant.builder.executeMessage.noIssues": "Your workflow is ready to be executed",
 	"aiAssistant.builder.executeMessage.validationTooltip": "Complete the steps above before executing",
 	"aiAssistant.builder.executeMessage.execute": "Execute and refine",
+	"aiAssistant.builder.executeMessage.chooseModel": "Choose model",
+	"aiAssistant.builder.executeMessage.chooseCredentials": "Choose credentials",
 	"aiAssistant.builder.executeMessage.noExecutionData": "Workflow execution could not be started. Please try again.",
 	"aiAssistant.builder.executeMessage.executionSuccess": "Workflow executed successfully.",
 	"aiAssistant.builder.executeMessage.executionFailedOnNode": "Workflow execution failed on node \"{nodeName}\": {errorMessage}",
diff --git a/packages/frontend/editor-ui/src/features/ai/assistant/components/Agent/ExecuteMessage.vue b/packages/frontend/editor-ui/src/features/ai/assistant/components/Agent/ExecuteMessage.vue
index 7e0faf96c23..ec89eda4688 100644
--- a/packages/frontend/editor-ui/src/features/ai/assistant/components/Agent/ExecuteMessage.vue
+++ b/packages/frontend/editor-ui/src/features/ai/assistant/components/Agent/ExecuteMessage.vue
@@ -4,7 +4,7 @@ import { useWorkflowsStore } from '@/app/stores/workflows.store';
 import { useNodeTypesStore } from '@/app/stores/nodeTypes.store';
 
 import { useRunWorkflow } from '@/app/composables/useRunWorkflow';
-import { useI18n } from '@n8n/i18n';
+import { useI18n, type BaseTextKey } from '@n8n/i18n';
 import { computed, onBeforeUnmount, onMounted, ref, watch, type WatchStopHandle } from 'vue';
 import { useRouter } from 'vue-router';
 
@@ -73,12 +73,48 @@ const ensureExecutionWatcher = () => {
 };
 
 const hasValidationIssues = computed(() => builderStore.workflowTodos.length > 0);
-const formatIssueMessage = workflowsStore.formatIssueMessage;
-
 const triggerNodes = computed(() =>
 	workflowsStore.workflow.nodes.filter((node) => nodeTypesStore.isTriggerNode(node.type)),
 );
 
+/**
+ * Converts a locale string pattern with placeholders into a regex.
+ * E.g., "Credentials for {type} are not set." → /Credentials for .+ are not set\./i
+ */
+function localePatternToRegex(localeKey: BaseTextKey): RegExp {
+	const pattern = i18n.baseText(localeKey, { interpolate: { type: '.+' } });
+	const escaped = pattern.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+	const withPlaceholder = escaped.replace('\\.\\+', '.+');
+	return new RegExp(withPlaceholder, 'i');
+}
+
+const credentialsNotSetPattern = localePatternToRegex('nodeIssues.credentials.notSet');
+const parameterRequiredPattern = /Parameter\s+".+"\s+is\s+required/i;
+
+/**
+ * Custom formatter for issue messages in the execute panel.
+ * Transforms verbose validation messages into user-friendly action prompts.
+ */
+function formatIssueMessage(issue: string | string[]): string {
+	const baseMessage = workflowsStore.formatIssueMessage(issue);
+
+	// Transform "Parameter "X" is required" → "Choose model" (for Model) or keep original
+	if (parameterRequiredPattern.test(baseMessage)) {
+		// Extract parameter name and check if it's "Model"
+		const match = baseMessage.match(/Parameter\s+"(.+)"\s+is\s+required/i);
+		if (match?.[1]?.toLowerCase() === 'model') {
+			return i18n.baseText('aiAssistant.builder.executeMessage.chooseModel' as BaseTextKey);
+		}
+	}
+
+	// Transform "Credentials for '...' are not set" → "Choose credentials"
+	if (credentialsNotSetPattern.test(baseMessage)) {
+		return i18n.baseText('aiAssistant.builder.executeMessage.chooseCredentials' as BaseTextKey);
+	}
+
+	return baseMessage;
+}
+
 // Helper to get node type
 function getNodeTypeByName(nodeName: string) {
 	const node = workflowsStore.workflow.nodes.find((n) => n.name === nodeName);
@@ -168,22 +204,24 @@ onBeforeUnmount(() => {
 			<p :class="$style.description">
 				{{ i18n.baseText('aiAssistant.builder.executeMessage.description') }}
 			</p>
-			<TransitionGroup
-				name="fade"
-				tag="ul"
-				:class="$style.issuesList"
-				role="list"
-				aria-label="Workflow validation issues"
-			>
-				<NodeIssueItem
-					v-for="issue in builderStore.workflowTodos"
-					:key="`${formatIssueMessage(issue.value)}_${issue.node}`"
-					:issue="issue"
-					:get-node-type="getNodeTypeByName"
-					:format-issue-message="formatIssueMessage"
-					@click="() => trackBuilderPlaceholders(issue)"
-				/>
-			</TransitionGroup>
+			<div :class="$style.issuesBox">
+				<TransitionGroup
+					name="fade"
+					tag="ul"
+					:class="$style.issuesList"
+					role="list"
+					aria-label="Workflow validation issues"
+				>
+					<NodeIssueItem
+						v-for="issue in builderStore.workflowTodos"
+						:key="`${formatIssueMessage(issue.value)}_${issue.node}`"
+						:issue="issue"
+						:get-node-type="getNodeTypeByName"
+						:format-issue-message="formatIssueMessage"
+						@click="() => trackBuilderPlaceholders(issue)"
+					/>
+				</TransitionGroup>
+			</div>
 		</template>
 
 		<!-- No Issues Section -->
@@ -231,14 +269,10 @@ onBeforeUnmount(() => {
 .container {
 	display: flex;
 	flex-direction: column;
-	padding: var(--spacing--xs);
 	gap: var(--spacing--xs);
-	background-color: var(--color--background--light-3);
-	border: var(--border);
-	border-radius: var(--radius--lg);
 	line-height: var(--line-height--lg);
 	position: relative;
-	font-size: var(--font-size--2xs);
+	font-size: var(--font-size--sm);
 }
 
 .description {
@@ -252,10 +286,20 @@ onBeforeUnmount(() => {
 	color: var(--color--text--shade-1);
 }
 
+.issuesBox {
+	padding: var(--spacing--2xs) var(--spacing--xs);
+	background-color: var(--color--background--light-3);
+	border: var(--border);
+	border-radius: var(--radius--lg);
+}
+
 .issuesList {
 	margin: 0;
 	padding: 0;
 	position: relative;
+	display: flex;
+	flex-direction: column;
+	gap: var(--spacing--4xs);
 }
 
 .runButton {
diff --git a/packages/frontend/editor-ui/src/features/ai/assistant/components/Agent/NodeIssueItem.vue b/packages/frontend/editor-ui/src/features/ai/assistant/components/Agent/NodeIssueItem.vue
index 6a85dd22fa3..f8f5852da4e 100644
--- a/packages/frontend/editor-ui/src/features/ai/assistant/components/Agent/NodeIssueItem.vue
+++ b/packages/frontend/editor-ui/src/features/ai/assistant/components/Agent/NodeIssueItem.vue
@@ -59,8 +59,8 @@ function handleEditClick() {
 			{{ formatIssueMessage(issue.value) }}
 		</div>
 
-		<!-- Edit button -->
-		<N8nIcon size="large" icon="pencil" />
+		<!-- Navigate chevron -->
+		<N8nIcon :class="$style.chevron" icon="chevron-right" />
 	</li>
 </template>
 
@@ -69,28 +69,17 @@ function handleEditClick() {
 	list-style: none;
 	display: flex;
 	align-items: center;
-	padding: var(--spacing--3xs) 0;
-	border-bottom: 1px solid var(--color--foreground--tint-1);
+	padding: var(--spacing--2xs) 0;
 	cursor: pointer;
 
 	&:hover {
 		color: var(--color--primary);
 	}
-
-	&:first-child {
-		padding-top: 0;
-	}
-
-	&:last-child {
-		border-bottom: none;
-	}
 }
 
 .nodeIcon {
 	margin-right: var(--spacing--2xs);
-	margin-top: var(--spacing--4xs);
 	flex-shrink: 0;
-	align-self: flex-start;
 }
 
 .nodeName {
@@ -104,10 +93,10 @@ function handleEditClick() {
 	line-height: var(--line-height--md);
 }
 
-.editButton {
-	--button--border-color: transparent;
-	margin-left: auto;
+.chevron {
+	width: 16px;
+	height: 16px;
 	flex-shrink: 0;
-	align-self: center;
+	color: var(--color--text);
 }
 </style>

From 902e1a8706615e6fe4ac663cf636d4c3deaeb933 Mon Sep 17 00:00:00 2001
From: Declan Carroll <declan@n8n.io>
Date: Mon, 8 Dec 2025 14:35:31 +0000
Subject: [PATCH 132/167] fix: Remove apk tools from runner image (#22925)

---
 docker/images/runners/Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docker/images/runners/Dockerfile b/docker/images/runners/Dockerfile
index 718f3f05b5f..31ab09c7cf2 100644
--- a/docker/images/runners/Dockerfile
+++ b/docker/images/runners/Dockerfile
@@ -120,7 +120,8 @@ COPY --from=node-alpine /usr/local/bin/node /usr/local/bin/node
 
 # libstdc++ is required by Node
 # libc6-compat is required by task-runner-launcher
-RUN apk add --no-cache ca-certificates tini libstdc++ libc6-compat
+RUN apk add --no-cache ca-certificates tini libstdc++ libc6-compat && \
+    apk del apk-tools
 
 # Bring corepack and pnpm over, to make the image easier to extend
 COPY --from=node-alpine /usr/local/lib/node_modules /usr/local/lib/node_modules

From 58cf94a9d9941ecf778631dba56c37d06a162395 Mon Sep 17 00:00:00 2001
From: Jaakko Husso <jaakko@n8n.io>
Date: Mon, 8 Dec 2025 16:50:40 +0200
Subject: [PATCH 133/167] feat(core): Add 'Project Chat User' role for chat
 only access use case (no-changelog) (#22837)

---
 packages/@n8n/db/src/constants.ts             |  3 ++
 .../trigger/ChatTrigger/ChatTrigger.node.ts   |  2 +-
 .../scope-information.test.ts.snap            |  1 +
 packages/@n8n/permissions/src/constants.ee.ts | 11 ++++-
 .../@n8n/permissions/src/roles/all-roles.ts   |  5 +++
 .../permissions/src/roles/role-maps.ee.ts     | 17 ++++----
 .../src/roles/scopes/global-scopes.ee.ts      |  1 +
 .../src/roles/scopes/project-scopes.ee.ts     |  6 +++
 .../scopes/workflow-sharing-scopes.ee.ts      |  2 +
 packages/@n8n/permissions/src/schemas.ee.ts   |  7 +++-
 .../modules/chat-hub/chat-hub.controller.ts   |  8 ++--
 .../chat-hub/chat-hub.models.service.ts       | 41 ++++++++++---------
 .../src/modules/chat-hub/chat-hub.service.ts  | 22 +++++-----
 .../workflows/workflows.controller.test.ts    | 19 ++++++++-
 .../editor-ui/src/app/stores/roles.store.ts   | 19 ++++++++-
 .../chatHub/components/ChatMessageActions.vue |  9 +++-
 .../components/ProjectMembersRoleCell.vue     |  2 +-
 .../components/ProjectMembersTable.vue        |  1 +
 18 files changed, 125 insertions(+), 51 deletions(-)

diff --git a/packages/@n8n/db/src/constants.ts b/packages/@n8n/db/src/constants.ts
index ee38ef185ca..d516245fb88 100644
--- a/packages/@n8n/db/src/constants.ts
+++ b/packages/@n8n/db/src/constants.ts
@@ -3,6 +3,7 @@ import {
 	PROJECT_EDITOR_ROLE_SLUG,
 	PROJECT_OWNER_ROLE_SLUG,
 	PROJECT_VIEWER_ROLE_SLUG,
+	PROJECT_CHAT_USER_ROLE_SLUG,
 	ALL_ROLES,
 	type ProjectRole,
 	type GlobalRole,
@@ -57,6 +58,7 @@ export const PROJECT_OWNER_ROLE = ALL_BUILTIN_ROLES[PROJECT_OWNER_ROLE_SLUG];
 export const PROJECT_ADMIN_ROLE = ALL_BUILTIN_ROLES[PROJECT_ADMIN_ROLE_SLUG];
 export const PROJECT_EDITOR_ROLE = ALL_BUILTIN_ROLES[PROJECT_EDITOR_ROLE_SLUG];
 export const PROJECT_VIEWER_ROLE = ALL_BUILTIN_ROLES[PROJECT_VIEWER_ROLE_SLUG];
+export const PROJECT_CHAT_USER_ROLE = ALL_BUILTIN_ROLES[PROJECT_CHAT_USER_ROLE_SLUG];
 
 export const GLOBAL_ROLES: Record<GlobalRole, Role> = {
 	'global:owner': GLOBAL_OWNER_ROLE,
@@ -70,4 +72,5 @@ export const PROJECT_ROLES: Record<ProjectRole, Role> = {
 	[PROJECT_ADMIN_ROLE_SLUG]: PROJECT_ADMIN_ROLE,
 	[PROJECT_EDITOR_ROLE_SLUG]: PROJECT_EDITOR_ROLE,
 	[PROJECT_VIEWER_ROLE_SLUG]: PROJECT_VIEWER_ROLE,
+	[PROJECT_CHAT_USER_ROLE_SLUG]: PROJECT_CHAT_USER_ROLE,
 };
diff --git a/packages/@n8n/nodes-langchain/nodes/trigger/ChatTrigger/ChatTrigger.node.ts b/packages/@n8n/nodes-langchain/nodes/trigger/ChatTrigger/ChatTrigger.node.ts
index de087b51a4e..9efcbf1347f 100644
--- a/packages/@n8n/nodes-langchain/nodes/trigger/ChatTrigger/ChatTrigger.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/trigger/ChatTrigger/ChatTrigger.node.ts
@@ -408,7 +408,7 @@ export class ChatTrigger extends Node {
 			},
 			{
 				displayName:
-					'Your n8n users will be able to use this agent in <a href="/home/chat/" target="_blank">Chat</a> once this workflow is published. Make sure to share this workflow with at least viewer access to all users who should use it. Currently, only streaming response mode is supported.',
+					'Your n8n users will be able to use this agent in <a href="/home/chat/" target="_blank">Chat</a> once this workflow is published. Make sure to share this workflow with at least \'workflow:execute-chat\' access to all users who should use it. Currently, only streaming response mode is supported.',
 				name: 'availableInChatNotice',
 				type: 'notice',
 				displayOptions: {
diff --git a/packages/@n8n/permissions/src/__tests__/__snapshots__/scope-information.test.ts.snap b/packages/@n8n/permissions/src/__tests__/__snapshots__/scope-information.test.ts.snap
index feafe00b87a..669c8844c50 100644
--- a/packages/@n8n/permissions/src/__tests__/__snapshots__/scope-information.test.ts.snap
+++ b/packages/@n8n/permissions/src/__tests__/__snapshots__/scope-information.test.ts.snap
@@ -101,6 +101,7 @@ exports[`Scope Information ensure scopes are defined correctly 1`] = `
   "workersView:*",
   "workflow:share",
   "workflow:execute",
+  "workflow:execute-chat",
   "workflow:move",
   "workflow:activate",
   "workflow:deactivate",
diff --git a/packages/@n8n/permissions/src/constants.ee.ts b/packages/@n8n/permissions/src/constants.ee.ts
index 1c7b9bed059..73d7ad9eb28 100644
--- a/packages/@n8n/permissions/src/constants.ee.ts
+++ b/packages/@n8n/permissions/src/constants.ee.ts
@@ -23,7 +23,15 @@ export const RESOURCES = {
 	variable: [...DEFAULT_OPERATIONS] as const,
 	projectVariable: [...DEFAULT_OPERATIONS] as const,
 	workersView: ['manage'] as const,
-	workflow: ['share', 'execute', 'move', 'activate', 'deactivate', ...DEFAULT_OPERATIONS] as const,
+	workflow: [
+		'share',
+		'execute',
+		'execute-chat',
+		'move',
+		'activate',
+		'deactivate',
+		...DEFAULT_OPERATIONS,
+	] as const,
 	folder: [...DEFAULT_OPERATIONS, 'move'] as const,
 	insights: ['list'] as const,
 	oidc: ['manage'] as const,
@@ -58,3 +66,4 @@ export const PROJECT_OWNER_ROLE_SLUG = 'project:personalOwner';
 export const PROJECT_ADMIN_ROLE_SLUG = 'project:admin';
 export const PROJECT_EDITOR_ROLE_SLUG = 'project:editor';
 export const PROJECT_VIEWER_ROLE_SLUG = 'project:viewer';
+export const PROJECT_CHAT_USER_ROLE_SLUG = 'project:chatUser';
diff --git a/packages/@n8n/permissions/src/roles/all-roles.ts b/packages/@n8n/permissions/src/roles/all-roles.ts
index 30610d57710..0bd2e7cae2a 100644
--- a/packages/@n8n/permissions/src/roles/all-roles.ts
+++ b/packages/@n8n/permissions/src/roles/all-roles.ts
@@ -1,8 +1,10 @@
+/* eslint-disable @typescript-eslint/naming-convention */
 import {
 	PROJECT_ADMIN_ROLE_SLUG,
 	PROJECT_EDITOR_ROLE_SLUG,
 	PROJECT_OWNER_ROLE_SLUG,
 	PROJECT_VIEWER_ROLE_SLUG,
+	PROJECT_CHAT_USER_ROLE_SLUG,
 } from '../constants.ee';
 import {
 	CREDENTIALS_SHARING_SCOPE_MAP,
@@ -22,6 +24,7 @@ const ROLE_NAMES: Record<AllRoleTypes, string> = {
 	[PROJECT_ADMIN_ROLE_SLUG]: 'Project Admin',
 	[PROJECT_EDITOR_ROLE_SLUG]: 'Project Editor',
 	[PROJECT_VIEWER_ROLE_SLUG]: 'Project Viewer',
+	[PROJECT_CHAT_USER_ROLE_SLUG]: 'Project Chat User',
 	'credential:user': 'Credential User',
 	'credential:owner': 'Credential Owner',
 	'workflow:owner': 'Workflow Owner',
@@ -38,6 +41,8 @@ const ROLE_DESCRIPTIONS: Record<AllRoleTypes, string> = {
 		'Full control of settings, members, workflows, credentials and executions',
 	[PROJECT_EDITOR_ROLE_SLUG]: 'Create, edit, and delete workflows, credentials, and executions',
 	[PROJECT_VIEWER_ROLE_SLUG]: 'Read-only access to workflows, credentials, and executions',
+	[PROJECT_CHAT_USER_ROLE_SLUG]:
+		'Chat-only access to chatting with workflows that have n8n Chat enabled',
 	'credential:user': 'Credential User',
 	'credential:owner': 'Credential Owner',
 	'workflow:owner': 'Workflow Owner',
diff --git a/packages/@n8n/permissions/src/roles/role-maps.ee.ts b/packages/@n8n/permissions/src/roles/role-maps.ee.ts
index 0c9e707f70a..ed105b9ec1e 100644
--- a/packages/@n8n/permissions/src/roles/role-maps.ee.ts
+++ b/packages/@n8n/permissions/src/roles/role-maps.ee.ts
@@ -1,3 +1,11 @@
+/* eslint-disable @typescript-eslint/naming-convention */
+import type {
+	CredentialSharingRole,
+	GlobalRole,
+	ProjectRole,
+	Scope,
+	WorkflowSharingRole,
+} from '../types.ee';
 import {
 	CREDENTIALS_SHARING_OWNER_SCOPES,
 	CREDENTIALS_SHARING_USER_SCOPES,
@@ -13,18 +21,12 @@ import {
 	PERSONAL_PROJECT_OWNER_SCOPES,
 	PROJECT_EDITOR_SCOPES,
 	PROJECT_VIEWER_SCOPES,
+	PROJECT_CHAT_USER_SCOPES,
 } from './scopes/project-scopes.ee';
 import {
 	WORKFLOW_SHARING_OWNER_SCOPES,
 	WORKFLOW_SHARING_EDITOR_SCOPES,
 } from './scopes/workflow-sharing-scopes.ee';
-import type {
-	CredentialSharingRole,
-	GlobalRole,
-	ProjectRole,
-	Scope,
-	WorkflowSharingRole,
-} from '../types.ee';
 
 export const GLOBAL_SCOPE_MAP: Record<GlobalRole, Scope[]> = {
 	'global:owner': GLOBAL_OWNER_SCOPES,
@@ -38,6 +40,7 @@ export const PROJECT_SCOPE_MAP: Record<ProjectRole, Scope[]> = {
 	'project:personalOwner': PERSONAL_PROJECT_OWNER_SCOPES,
 	'project:editor': PROJECT_EDITOR_SCOPES,
 	'project:viewer': PROJECT_VIEWER_SCOPES,
+	'project:chatUser': PROJECT_CHAT_USER_SCOPES,
 };
 
 export const CREDENTIALS_SHARING_SCOPE_MAP: Record<CredentialSharingRole, Scope[]> = {
diff --git a/packages/@n8n/permissions/src/roles/scopes/global-scopes.ee.ts b/packages/@n8n/permissions/src/roles/scopes/global-scopes.ee.ts
index ad5905f64d7..6f6b1b2f429 100644
--- a/packages/@n8n/permissions/src/roles/scopes/global-scopes.ee.ts
+++ b/packages/@n8n/permissions/src/roles/scopes/global-scopes.ee.ts
@@ -75,6 +75,7 @@ export const GLOBAL_OWNER_SCOPES: Scope[] = [
 	'workflow:list',
 	'workflow:share',
 	'workflow:execute',
+	'workflow:execute-chat',
 	'workflow:move',
 	'workersView:manage',
 	'project:list',
diff --git a/packages/@n8n/permissions/src/roles/scopes/project-scopes.ee.ts b/packages/@n8n/permissions/src/roles/scopes/project-scopes.ee.ts
index 2b4ee344a27..b4ce4bc3cd1 100644
--- a/packages/@n8n/permissions/src/roles/scopes/project-scopes.ee.ts
+++ b/packages/@n8n/permissions/src/roles/scopes/project-scopes.ee.ts
@@ -13,6 +13,7 @@ export const REGULAR_PROJECT_ADMIN_SCOPES: Scope[] = [
 	'workflow:delete',
 	'workflow:list',
 	'workflow:execute',
+	'workflow:execute-chat',
 	'workflow:move',
 	'credential:create',
 	'credential:read',
@@ -53,6 +54,7 @@ export const PERSONAL_PROJECT_OWNER_SCOPES: Scope[] = [
 	'workflow:delete',
 	'workflow:list',
 	'workflow:execute',
+	'workflow:execute-chat',
 	'workflow:share',
 	'workflow:move',
 	'credential:create',
@@ -86,6 +88,7 @@ export const PROJECT_EDITOR_SCOPES: Scope[] = [
 	'workflow:delete',
 	'workflow:list',
 	'workflow:execute',
+	'workflow:execute-chat',
 	'credential:create',
 	'credential:read',
 	'credential:update',
@@ -119,6 +122,7 @@ export const PROJECT_VIEWER_SCOPES: Scope[] = [
 	'project:read',
 	'workflow:list',
 	'workflow:read',
+	'workflow:execute-chat',
 	'folder:read',
 	'folder:list',
 	'dataTable:listProject',
@@ -127,3 +131,5 @@ export const PROJECT_VIEWER_SCOPES: Scope[] = [
 	'projectVariable:list',
 	'projectVariable:read',
 ];
+
+export const PROJECT_CHAT_USER_SCOPES: Scope[] = ['workflow:execute-chat'];
diff --git a/packages/@n8n/permissions/src/roles/scopes/workflow-sharing-scopes.ee.ts b/packages/@n8n/permissions/src/roles/scopes/workflow-sharing-scopes.ee.ts
index 1487846b875..061ad4b600e 100644
--- a/packages/@n8n/permissions/src/roles/scopes/workflow-sharing-scopes.ee.ts
+++ b/packages/@n8n/permissions/src/roles/scopes/workflow-sharing-scopes.ee.ts
@@ -7,10 +7,12 @@ export const WORKFLOW_SHARING_OWNER_SCOPES: Scope[] = [
 	'workflow:execute',
 	'workflow:share',
 	'workflow:move',
+	'workflow:execute-chat',
 ];
 
 export const WORKFLOW_SHARING_EDITOR_SCOPES: Scope[] = [
 	'workflow:read',
 	'workflow:update',
 	'workflow:execute',
+	'workflow:execute-chat',
 ];
diff --git a/packages/@n8n/permissions/src/schemas.ee.ts b/packages/@n8n/permissions/src/schemas.ee.ts
index ba2ac186f73..99107387d27 100644
--- a/packages/@n8n/permissions/src/schemas.ee.ts
+++ b/packages/@n8n/permissions/src/schemas.ee.ts
@@ -30,7 +30,12 @@ export const personalRoleSchema = z.enum([
 ]);
 
 // Those are the system roles for projects assignable to a user
-export const teamRoleSchema = z.enum(['project:admin', 'project:editor', 'project:viewer']);
+export const teamRoleSchema = z.enum([
+	'project:admin',
+	'project:editor',
+	'project:viewer',
+	'project:chatUser',
+]);
 
 // Custom project role can be anything but the system roles
 export const customProjectRoleSchema = z
diff --git a/packages/cli/src/modules/chat-hub/chat-hub.controller.ts b/packages/cli/src/modules/chat-hub/chat-hub.controller.ts
index 834b72a995f..53ffe3a7643 100644
--- a/packages/cli/src/modules/chat-hub/chat-hub.controller.ts
+++ b/packages/cli/src/modules/chat-hub/chat-hub.controller.ts
@@ -31,14 +31,14 @@ import type { Response } from 'express';
 import { jsonStringify } from 'n8n-workflow';
 import { strict as assert } from 'node:assert';
 
-import { ResponseError } from '@/errors/response-errors/abstract/response.error';
-import { BadRequestError } from '@/errors/response-errors/bad-request.error';
-
 import { ChatHubAgentService } from './chat-hub-agent.service';
 import { ChatHubAttachmentService } from './chat-hub.attachment.service';
+import { ChatHubModelsService } from './chat-hub.models.service';
 import { ChatHubService } from './chat-hub.service';
 import { ChatModelsRequestDto } from './dto/chat-models-request.dto';
-import { ChatHubModelsService } from './chat-hub.models.service';
+
+import { ResponseError } from '@/errors/response-errors/abstract/response.error';
+import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 
 @RestController('/chat')
 export class ChatHubController {
diff --git a/packages/cli/src/modules/chat-hub/chat-hub.models.service.ts b/packages/cli/src/modules/chat-hub/chat-hub.models.service.ts
index 2c8f2896116..8e917b6be2e 100644
--- a/packages/cli/src/modules/chat-hub/chat-hub.models.service.ts
+++ b/packages/cli/src/modules/chat-hub/chat-hub.models.service.ts
@@ -1,20 +1,3 @@
-import { In, WorkflowRepository, type User } from '@n8n/db';
-import { getBase } from '@/workflow-execute-additional-data';
-
-import { ChatHubAgentService } from './chat-hub-agent.service';
-import { ChatHubWorkflowService } from './chat-hub-workflow.service';
-
-import { CredentialsFinderService } from '@/credentials/credentials-finder.service';
-import { DynamicNodeParametersService } from '@/services/dynamic-node-parameters.service';
-import { WorkflowService } from '@/workflows/workflow.service';
-import { getModelMetadata, PROVIDER_NODE_TYPE_MAP } from './chat-hub.constants';
-import {
-	AGENT_LANGCHAIN_NODE_TYPE,
-	CHAT_TRIGGER_NODE_TYPE,
-	type INodeCredentials,
-	type INodePropertyOptions,
-	type IWorkflowExecuteAdditionalData,
-} from 'n8n-workflow';
 import {
 	chatHubProviderSchema,
 	emptyChatModelsResponse,
@@ -24,8 +7,25 @@ import {
 	type ChatModelDto,
 	type ChatModelsResponse,
 } from '@n8n/api-types';
-import { validChatTriggerParamsShape } from './chat-hub.types';
+import { In, WorkflowRepository, type User } from '@n8n/db';
 import { Service } from '@n8n/di';
+import {
+	AGENT_LANGCHAIN_NODE_TYPE,
+	CHAT_TRIGGER_NODE_TYPE,
+	type INodeCredentials,
+	type INodePropertyOptions,
+	type IWorkflowExecuteAdditionalData,
+} from 'n8n-workflow';
+
+import { CredentialsFinderService } from '@/credentials/credentials-finder.service';
+import { DynamicNodeParametersService } from '@/services/dynamic-node-parameters.service';
+import { getBase } from '@/workflow-execute-additional-data';
+import { WorkflowService } from '@/workflows/workflow.service';
+
+import { ChatHubAgentService } from './chat-hub-agent.service';
+import { ChatHubWorkflowService } from './chat-hub-workflow.service';
+import { getModelMetadata, PROVIDER_NODE_TYPE_MAP } from './chat-hub.constants';
+import { validChatTriggerParamsShape } from './chat-hub.types';
 
 @Service()
 export class ChatHubModelsService {
@@ -724,8 +724,9 @@ export class ChatHubModelsService {
 		);
 
 		const activeWorkflows = workflowsWithChatTrigger
-			// Ensure the user has at least read access to the workflows
-			.filter((workflow) => workflow.scopes.includes('workflow:read'))
+			// Ensure the user has chat execution access to the workflow
+			.filter((workflow) => workflow.scopes.includes('workflow:execute-chat'))
+			// The workflow has to be active
 			.filter((workflow) => !!workflow.activeVersionId);
 
 		const workflows = await this.workflowRepository.find({
diff --git a/packages/cli/src/modules/chat-hub/chat-hub.service.ts b/packages/cli/src/modules/chat-hub/chat-hub.service.ts
index f21c423045e..9ec36379e0d 100644
--- a/packages/cli/src/modules/chat-hub/chat-hub.service.ts
+++ b/packages/cli/src/modules/chat-hub/chat-hub.service.ts
@@ -16,10 +16,10 @@ import {
 	type ChatHubUpdateConversationRequest,
 } from '@n8n/api-types';
 import { Logger } from '@n8n/backend-common';
+import { GlobalConfig } from '@n8n/config';
 import { ExecutionRepository, IExecutionResponse, User, WorkflowRepository } from '@n8n/db';
 import { Service } from '@n8n/di';
 import type { EntityManager } from '@n8n/typeorm';
-import { GlobalConfig } from '@n8n/config';
 import type { Response } from 'express';
 import { ErrorReporter, InstanceSettings } from 'n8n-core';
 import {
@@ -41,13 +41,6 @@ import {
 	ExecutionStatus,
 } from 'n8n-workflow';
 
-import { ActiveExecutions } from '@/active-executions';
-import { BadRequestError } from '@/errors/response-errors/bad-request.error';
-import { NotFoundError } from '@/errors/response-errors/not-found.error';
-import { ExecutionService } from '@/executions/execution.service';
-import { WorkflowExecutionService } from '@/workflows/workflow-execution.service';
-import { WorkflowFinderService } from '@/workflows/workflow-finder.service';
-
 import { ChatHubAgentService } from './chat-hub-agent.service';
 import { ChatHubCredentialsService } from './chat-hub-credentials.service';
 import type { ChatHubMessage } from './chat-hub-message.entity';
@@ -65,6 +58,13 @@ import { ChatHubMessageRepository } from './chat-message.repository';
 import { ChatHubSessionRepository } from './chat-session.repository';
 import { interceptResponseWrites, createStructuredChunkAggregator } from './stream-capturer';
 
+import { ActiveExecutions } from '@/active-executions';
+import { BadRequestError } from '@/errors/response-errors/bad-request.error';
+import { NotFoundError } from '@/errors/response-errors/not-found.error';
+import { ExecutionService } from '@/executions/execution.service';
+import { WorkflowExecutionService } from '@/workflows/workflow-execution.service';
+import { WorkflowFinderService } from '@/workflows/workflow-finder.service';
+
 const EXECUTION_POLL_INTERVAL = 1000;
 const EXECUTION_FINISHED_STATUSES: ExecutionStatus[] = ['canceled', 'crashed', 'error', 'success'];
 
@@ -540,7 +540,7 @@ export class ChatHubService {
 		const workflowEntity = await this.workflowFinderService.findWorkflowForUser(
 			workflowId,
 			user,
-			['workflow:read'],
+			['workflow:execute-chat'],
 			{ includeTags: false, includeParentFolder: false, includeActiveVersion: true },
 		);
 
@@ -981,7 +981,7 @@ export class ChatHubService {
 		const workflowEntity = await this.workflowFinderService.findWorkflowForUser(
 			workflowId,
 			user,
-			['workflow:read'],
+			['workflow:execute-chat'],
 			{ includeTags: false, includeParentFolder: false, includeActiveVersion: true, em: trx },
 		);
 
@@ -1447,7 +1447,7 @@ export class ChatHubService {
 			const workflowEntity = await this.workflowFinderService.findWorkflowForUser(
 				model.workflowId,
 				user,
-				['workflow:read'],
+				['workflow:execute-chat'],
 				{ includeTags: false, includeParentFolder: false, includeActiveVersion: true },
 			);
 
diff --git a/packages/cli/test/integration/workflows/workflows.controller.test.ts b/packages/cli/test/integration/workflows/workflows.controller.test.ts
index 06f73288726..66cd7271c68 100644
--- a/packages/cli/test/integration/workflows/workflows.controller.test.ts
+++ b/packages/cli/test/integration/workflows/workflows.controller.test.ts
@@ -166,6 +166,7 @@ describe('POST /workflows', () => {
 			[
 				'workflow:delete',
 				'workflow:execute',
+				'workflow:execute-chat',
 				'workflow:move',
 				'workflow:read',
 				'workflow:share',
@@ -810,6 +811,7 @@ describe('GET /workflows', () => {
 				[
 					'workflow:delete',
 					'workflow:execute',
+					'workflow:execute-chat',
 					'workflow:move',
 					'workflow:read',
 					'workflow:update',
@@ -818,7 +820,9 @@ describe('GET /workflows', () => {
 
 			// Shared workflow
 			expect(wf2.id).toBe(savedWorkflow2.id);
-			expect(wf2.scopes).toEqual(['workflow:read', 'workflow:update', 'workflow:execute'].sort());
+			expect(wf2.scopes).toEqual(
+				['workflow:read', 'workflow:update', 'workflow:execute', 'workflow:execute-chat'].sort(),
+			);
 		}
 
 		{
@@ -836,6 +840,7 @@ describe('GET /workflows', () => {
 			expect(wf1.scopes).toEqual([
 				'workflow:delete',
 				'workflow:execute',
+				'workflow:execute-chat',
 				'workflow:read',
 				'workflow:update',
 			]);
@@ -846,6 +851,7 @@ describe('GET /workflows', () => {
 				[
 					'workflow:delete',
 					'workflow:execute',
+					'workflow:execute-chat',
 					'workflow:move',
 					'workflow:read',
 					'workflow:share',
@@ -871,6 +877,7 @@ describe('GET /workflows', () => {
 					'workflow:create',
 					'workflow:delete',
 					'workflow:execute',
+					'workflow:execute-chat',
 					'workflow:list',
 					'workflow:move',
 					'workflow:read',
@@ -886,6 +893,7 @@ describe('GET /workflows', () => {
 					'workflow:create',
 					'workflow:delete',
 					'workflow:execute',
+					'workflow:execute-chat',
 					'workflow:list',
 					'workflow:move',
 					'workflow:read',
@@ -1852,6 +1860,7 @@ describe('GET /workflows?includeFolders=true', () => {
 				[
 					'workflow:delete',
 					'workflow:execute',
+					'workflow:execute-chat',
 					'workflow:move',
 					'workflow:read',
 					'workflow:update',
@@ -1860,7 +1869,9 @@ describe('GET /workflows?includeFolders=true', () => {
 
 			// Shared workflow
 			expect(wf2.id).toBe(savedWorkflow2.id);
-			expect(wf2.scopes).toEqual(['workflow:read', 'workflow:update', 'workflow:execute'].sort());
+			expect(wf2.scopes).toEqual(
+				['workflow:read', 'workflow:update', 'workflow:execute', 'workflow:execute-chat'].sort(),
+			);
 
 			expect(f1.id).toBe(savedFolder1.id);
 		}
@@ -1883,6 +1894,7 @@ describe('GET /workflows?includeFolders=true', () => {
 			expect(wf1.scopes).toEqual([
 				'workflow:delete',
 				'workflow:execute',
+				'workflow:execute-chat',
 				'workflow:read',
 				'workflow:update',
 			]);
@@ -1893,6 +1905,7 @@ describe('GET /workflows?includeFolders=true', () => {
 				[
 					'workflow:delete',
 					'workflow:execute',
+					'workflow:execute-chat',
 					'workflow:move',
 					'workflow:read',
 					'workflow:share',
@@ -1923,6 +1936,7 @@ describe('GET /workflows?includeFolders=true', () => {
 					'workflow:create',
 					'workflow:delete',
 					'workflow:execute',
+					'workflow:execute-chat',
 					'workflow:list',
 					'workflow:move',
 					'workflow:read',
@@ -1938,6 +1952,7 @@ describe('GET /workflows?includeFolders=true', () => {
 					'workflow:create',
 					'workflow:delete',
 					'workflow:execute',
+					'workflow:execute-chat',
 					'workflow:list',
 					'workflow:move',
 					'workflow:read',
diff --git a/packages/frontend/editor-ui/src/app/stores/roles.store.ts b/packages/frontend/editor-ui/src/app/stores/roles.store.ts
index f5933f18f0c..73cd3bd4616 100644
--- a/packages/frontend/editor-ui/src/app/stores/roles.store.ts
+++ b/packages/frontend/editor-ui/src/app/stores/roles.store.ts
@@ -1,12 +1,19 @@
-import { type AllRolesMap, type Role, PROJECT_OWNER_ROLE_SLUG } from '@n8n/permissions';
+import {
+	type AllRolesMap,
+	type Role,
+	PROJECT_OWNER_ROLE_SLUG,
+	PROJECT_CHAT_USER_ROLE_SLUG,
+} from '@n8n/permissions';
 import { defineStore } from 'pinia';
 import { ref, computed } from 'vue';
 import * as rolesApi from '@n8n/rest-api-client/api/roles';
 import { useRootStore } from '@n8n/stores/useRootStore';
 import type { CreateRoleDto, UpdateRoleDto } from '@n8n/api-types';
+import { useSettingsStore } from './settings.store';
 
 export const useRolesStore = defineStore('roles', () => {
 	const rootStore = useRootStore();
+	const settingsStore = useSettingsStore();
 
 	const roles = ref<AllRolesMap>({
 		global: [],
@@ -14,7 +21,12 @@ export const useRolesStore = defineStore('roles', () => {
 		credential: [],
 		workflow: [],
 	});
-	const projectRoleOrder = ref<string[]>(['project:viewer', 'project:editor', 'project:admin']);
+	const projectRoleOrder = ref<string[]>([
+		'project:viewer',
+		'project:chatUser',
+		'project:editor',
+		'project:admin',
+	]);
 	const projectRoleOrderMap = computed<Map<string, number>>(
 		() => new Map(projectRoleOrder.value.map((role, idx) => [role, idx])),
 	);
@@ -22,6 +34,9 @@ export const useRolesStore = defineStore('roles', () => {
 	const processedProjectRoles = computed<AllRolesMap['project']>(() =>
 		roles.value.project
 			.filter((role) => role.slug !== PROJECT_OWNER_ROLE_SLUG)
+			.filter(
+				(role) => settingsStore.isChatFeatureEnabled || role.slug !== PROJECT_CHAT_USER_ROLE_SLUG,
+			)
 			.sort(
 				(a, b) =>
 					(projectRoleOrderMap.value.get(a.slug) ?? Number.MAX_SAFE_INTEGER) -
diff --git a/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatMessageActions.vue b/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatMessageActions.vue
index 7a1dc9aa6bc..c192bc11cf7 100644
--- a/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatMessageActions.vue
+++ b/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatMessageActions.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import { VIEWS } from '@/app/constants';
+import { hasPermission } from '@/app/utils/rbac/permissions';
 import type { ChatMessage } from '@/features/ai/chatHub/chat.types';
 import CopyButton from '@/features/ai/chatHub/components/CopyButton.vue';
 import type { ChatMessageId } from '@n8n/api-types';
@@ -29,7 +30,13 @@ const currentAlternativeIndex = computed(() => {
 	return alternatives.findIndex((id) => id === message.id);
 });
 
+const showExecutionUrl = computed(() => {
+	return hasPermission(['rbac'], { rbac: { scope: 'workflow:read' } });
+});
+
 const executionUrl = computed(() => {
+	if (!showExecutionUrl.value) return undefined;
+
 	if (message.type === 'ai' && message.provider === 'n8n' && message.executionId) {
 		return router.resolve({
 			name: VIEWS.EXECUTION_PREVIEW,
@@ -87,7 +94,7 @@ function handleReadAloud() {
 			/>
 			<template #content>{{ i18n.baseText('chatHub.message.actions.regenerate') }}</template>
 		</N8nTooltip>
-		<N8nTooltip v-if="executionUrl && message.executionId" placement="bottom" :show-after="300">
+		<N8nTooltip v-if="executionUrl" placement="bottom" :show-after="300">
 			<N8nIconButton icon="info" type="tertiary" size="medium" text />
 			<template #content>
 				{{ i18n.baseText('chatHub.message.actions.executionId') }}:
diff --git a/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectMembersRoleCell.vue b/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectMembersRoleCell.vue
index 88dc45b9600..8eb5e40ef11 100644
--- a/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectMembersRoleCell.vue
+++ b/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectMembersRoleCell.vue
@@ -31,7 +31,7 @@ const onActionSelect = (role: Role['slug']) => {
 		v-if="isEditable"
 		placement="bottom-start"
 		:items="props.actions"
-		:max-height="280"
+		:max-height="380"
 		data-test-id="project-member-role-dropdown"
 		@select="onActionSelect"
 		@badge-click="emit('badge-click', $event)"
diff --git a/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectMembersTable.vue b/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectMembersTable.vue
index 908cd02a4b3..d7d7626d9a8 100644
--- a/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectMembersTable.vue
+++ b/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectMembersTable.vue
@@ -52,6 +52,7 @@ const headers = ref<Array<TableHeader<ProjectMemberData>>>([
 	{
 		title: i18n.baseText('projects.settings.table.header.role'),
 		key: 'role',
+		width: 200,
 		disableSort: true,
 	},
 	{

From fc932720213fb3e8d74864f9f00e900d6d927255 Mon Sep 17 00:00:00 2001
From: mfsiega <93014743+mfsiega@users.noreply.github.com>
Date: Mon, 8 Dec 2025 16:04:21 +0100
Subject: [PATCH 134/167] fix(core): Only resolve the filepath once (#22767)

Co-authored-by: cubic-dev-ai[bot] <191113872+cubic-dev-ai[bot]@users.noreply.github.com>
---
 .../file-system-helper-functions.test.ts      | 123 ++++++++++++------
 .../utils/file-system-helper-functions.ts     |  71 +++++++---
 .../nodes/Crypto/test/Crypto.test.ts          |   7 +-
 .../ReadWriteFile/actions/read.operation.ts   |   4 +-
 .../ReadWriteFile/actions/write.operation.ts  |  11 +-
 packages/nodes-base/nodes/Git/Git.node.ts     |   9 +-
 .../nodes/Git/__test__/Git.node.test.ts       |  33 ++++-
 .../nodes/Git/test/Git.node.test.ts           |   2 +
 .../ReadBinaryFile/ReadBinaryFile.node.ts     |   4 +-
 .../ReadBinaryFiles/ReadBinaryFiles.node.ts   |   2 +-
 .../WriteBinaryFile/WriteBinaryFile.node.ts   |  11 +-
 packages/workflow/src/interfaces.ts           |  24 +++-
 12 files changed, 226 insertions(+), 75 deletions(-)

diff --git a/packages/core/src/execution-engine/node-execution-context/utils/__tests__/file-system-helper-functions.test.ts b/packages/core/src/execution-engine/node-execution-context/utils/__tests__/file-system-helper-functions.test.ts
index 6710ff04fdf..6e1385e1987 100644
--- a/packages/core/src/execution-engine/node-execution-context/utils/__tests__/file-system-helper-functions.test.ts
+++ b/packages/core/src/execution-engine/node-execution-context/utils/__tests__/file-system-helper-functions.test.ts
@@ -1,7 +1,7 @@
 import { SecurityConfig } from '@n8n/config';
 import { Container } from '@n8n/di';
 import type { INode } from 'n8n-workflow';
-import { createReadStream } from 'node:fs';
+import { constants, createReadStream } from 'node:fs';
 import { access as fsAccess, realpath as fsRealpath } from 'node:fs/promises';
 import { join } from 'node:path';
 
@@ -15,7 +15,7 @@ import {
 } from '@/constants';
 import { InstanceSettings } from '@/instance-settings';
 
-import { getFileSystemHelperFunctions, isFilePathBlocked } from '../file-system-helper-functions';
+import { getFileSystemHelperFunctions } from '../file-system-helper-functions';
 
 jest.mock('node:fs');
 jest.mock('node:fs/promises');
@@ -39,78 +39,80 @@ beforeEach(() => {
 });
 
 describe('isFilePathBlocked', () => {
+	const node = { type: 'TestNode' } as INode;
+	const { isFilePathBlocked, resolvePath } = getFileSystemHelperFunctions(node);
 	beforeEach(() => {
 		process.env[BLOCK_FILE_ACCESS_TO_N8N_FILES] = 'true';
 	});
 
 	it('should return true for static cache dir', async () => {
 		const filePath = instanceSettings.staticCacheDir;
-		expect(await isFilePathBlocked(filePath)).toBe(true);
+		expect(isFilePathBlocked(await resolvePath(filePath))).toBe(true);
 	});
 
 	it('should return true for restricted paths', async () => {
 		const restrictedPath = instanceSettings.n8nFolder;
-		expect(await isFilePathBlocked(restrictedPath)).toBe(true);
+		expect(isFilePathBlocked(await resolvePath(restrictedPath))).toBe(true);
 	});
 
 	it('should handle empty allowed paths', async () => {
 		securityConfig.restrictFileAccessTo = '';
-		const result = await isFilePathBlocked('/some/random/path');
+		const result = isFilePathBlocked(await resolvePath('/some/random/path'));
 		expect(result).toBe(false);
 	});
 
 	it('should handle multiple allowed paths', async () => {
 		securityConfig.restrictFileAccessTo = '/path1;/path2;/path3';
 		const allowedPath = '/path2/somefile';
-		expect(await isFilePathBlocked(allowedPath)).toBe(false);
+		expect(isFilePathBlocked(await resolvePath(allowedPath))).toBe(false);
 	});
 
 	it('should handle empty strings in allowed paths', async () => {
 		securityConfig.restrictFileAccessTo = '/path1;;/path2';
 		const allowedPath = '/path2/somefile';
-		expect(await isFilePathBlocked(allowedPath)).toBe(false);
+		expect(isFilePathBlocked(await resolvePath(allowedPath))).toBe(false);
 	});
 
 	it('should trim whitespace in allowed paths', async () => {
 		securityConfig.restrictFileAccessTo = ' /path1 ; /path2 ; /path3 ';
 		const allowedPath = '/path2/somefile';
-		expect(await isFilePathBlocked(allowedPath)).toBe(false);
+		expect(isFilePathBlocked(await resolvePath(allowedPath))).toBe(false);
 	});
 
 	it('should return false when BLOCK_FILE_ACCESS_TO_N8N_FILES is false', async () => {
 		process.env[BLOCK_FILE_ACCESS_TO_N8N_FILES] = 'false';
 		const restrictedPath = instanceSettings.n8nFolder;
-		expect(await isFilePathBlocked(restrictedPath)).toBe(false);
+		expect(isFilePathBlocked(await resolvePath(restrictedPath))).toBe(false);
 	});
 
 	it('should return true when path is in allowed paths but still restricted', async () => {
 		securityConfig.restrictFileAccessTo = '/some/allowed/path';
 		const restrictedPath = instanceSettings.n8nFolder;
-		expect(await isFilePathBlocked(restrictedPath)).toBe(true);
+		expect(isFilePathBlocked(await resolvePath(restrictedPath))).toBe(true);
 	});
 
 	it('should return false when path is in allowed paths', async () => {
 		const allowedPath = '/some/allowed/path';
 		securityConfig.restrictFileAccessTo = allowedPath;
-		expect(await isFilePathBlocked(allowedPath)).toBe(false);
+		expect(isFilePathBlocked(await resolvePath(allowedPath))).toBe(false);
 	});
 
 	it('should return true when file paths in CONFIG_FILES', async () => {
 		process.env[CONFIG_FILES] = '/path/to/config1,/path/to/config2';
 		const configPath = '/path/to/config1/somefile';
-		expect(await isFilePathBlocked(configPath)).toBe(true);
+		expect(isFilePathBlocked(await resolvePath(configPath))).toBe(true);
 	});
 
 	it('should return true when file paths in CUSTOM_EXTENSION_ENV', async () => {
 		process.env[CUSTOM_EXTENSION_ENV] = '/path/to/extensions1;/path/to/extensions2';
 		const extensionPath = '/path/to/extensions1/somefile';
-		expect(await isFilePathBlocked(extensionPath)).toBe(true);
+		expect(isFilePathBlocked(await resolvePath(extensionPath))).toBe(true);
 	});
 
 	it('should return true when file paths in BINARY_DATA_STORAGE_PATH', async () => {
 		process.env[BINARY_DATA_STORAGE_PATH] = '/path/to/binary/storage';
 		const binaryPath = '/path/to/binary/storage/somefile';
-		expect(await isFilePathBlocked(binaryPath)).toBe(true);
+		expect(isFilePathBlocked(await resolvePath(binaryPath))).toBe(true);
 	});
 
 	it('should block file paths in email template paths', async () => {
@@ -120,8 +122,8 @@ describe('isFilePathBlocked', () => {
 		const invitePath = '/path/to/invite/templates/invite.html';
 		const pwResetPath = '/path/to/pwreset/templates/reset.html';
 
-		expect(await isFilePathBlocked(invitePath)).toBe(true);
-		expect(await isFilePathBlocked(pwResetPath)).toBe(true);
+		expect(isFilePathBlocked(await resolvePath(invitePath))).toBe(true);
+		expect(isFilePathBlocked(await resolvePath(pwResetPath))).toBe(true);
 	});
 
 	it('should block access to n8n files if restrict and block are set', async () => {
@@ -131,7 +133,7 @@ describe('isFilePathBlocked', () => {
 		securityConfig.restrictFileAccessTo = userHome;
 		process.env[BLOCK_FILE_ACCESS_TO_N8N_FILES] = 'true';
 		const restrictedPath = instanceSettings.n8nFolder;
-		expect(await isFilePathBlocked(restrictedPath)).toBe(true);
+		expect(isFilePathBlocked(await resolvePath(restrictedPath))).toBe(true);
 	});
 
 	it('should allow access to parent folder if restrict and block are set', async () => {
@@ -140,8 +142,8 @@ describe('isFilePathBlocked', () => {
 
 		securityConfig.restrictFileAccessTo = userHome;
 		process.env[BLOCK_FILE_ACCESS_TO_N8N_FILES] = 'true';
-		const restrictedPath = join(userHome, 'somefile.txt');
-		expect(await isFilePathBlocked(restrictedPath)).toBe(false);
+		const restrictedPath = await resolvePath(join(userHome, 'somefile.txt'));
+		expect(isFilePathBlocked(restrictedPath)).toBe(false);
 	});
 
 	it('should not block similar paths', async () => {
@@ -150,8 +152,8 @@ describe('isFilePathBlocked', () => {
 
 		securityConfig.restrictFileAccessTo = userHome;
 		process.env[BLOCK_FILE_ACCESS_TO_N8N_FILES] = 'true';
-		const restrictedPath = join(userHome, '.n8n_x');
-		expect(await isFilePathBlocked(restrictedPath)).toBe(false);
+		const restrictedPath = await resolvePath(join(userHome, '.n8n_x'));
+		expect(isFilePathBlocked(restrictedPath)).toBe(false);
 	});
 
 	it('should return true for a symlink in a allowed path to a restricted path', async () => {
@@ -161,7 +163,7 @@ describe('isFilePathBlocked', () => {
 		(fsRealpath as jest.Mock).mockImplementation((path: string) =>
 			path === allowedPath ? actualPath : path,
 		);
-		expect(await isFilePathBlocked(allowedPath)).toBe(true);
+		expect(isFilePathBlocked(await resolvePath(allowedPath))).toBe(true);
 	});
 
 	it('should handle non-existent file when it is allowed', async () => {
@@ -170,7 +172,7 @@ describe('isFilePathBlocked', () => {
 		// @ts-expect-error undefined property
 		error.code = 'ENOENT';
 		(fsRealpath as jest.Mock).mockRejectedValueOnce(error);
-		expect(await isFilePathBlocked(filePath)).toBe(false);
+		expect(isFilePathBlocked(await resolvePath(filePath))).toBe(false);
 	});
 
 	it('should handle non-existent file when it is not allowed', async () => {
@@ -181,7 +183,7 @@ describe('isFilePathBlocked', () => {
 		// @ts-expect-error undefined property
 		error.code = 'ENOENT';
 		(fsRealpath as jest.Mock).mockRejectedValueOnce(error);
-		expect(await isFilePathBlocked(filePath)).toBe(true);
+		expect(isFilePathBlocked(await resolvePath(filePath))).toBe(true);
 	});
 });
 
@@ -213,17 +215,17 @@ describe('getFileSystemHelperFunctions', () => {
 			error.code = 'ENOENT';
 			(fsAccess as jest.Mock).mockRejectedValueOnce(error);
 
-			await expect(helperFunctions.createReadStream(filePath)).rejects.toThrow(
-				`The file "${filePath}" could not be accessed.`,
-			);
+			await expect(
+				helperFunctions.createReadStream(await helperFunctions.resolvePath(filePath)),
+			).rejects.toThrow(`The file "${filePath}" could not be accessed.`);
 		});
 
 		it('should throw when file access is blocked', async () => {
 			securityConfig.restrictFileAccessTo = '/allowed/path';
 			(fsAccess as jest.Mock).mockResolvedValueOnce({});
-			await expect(helperFunctions.createReadStream('/blocked/path')).rejects.toThrow(
-				'Access to the file is not allowed',
-			);
+			await expect(
+				helperFunctions.createReadStream(await helperFunctions.resolvePath('/blocked/path')),
+			).rejects.toThrow('Access to the file is not allowed');
 		});
 
 		it('should not reveal if file exists if it is within restricted path', async () => {
@@ -234,16 +236,63 @@ describe('getFileSystemHelperFunctions', () => {
 			error.code = 'ENOENT';
 			(fsAccess as jest.Mock).mockRejectedValueOnce(error);
 
-			await expect(helperFunctions.createReadStream('/blocked/path')).rejects.toThrow(
-				'Access to the file is not allowed',
-			);
+			await expect(
+				helperFunctions.createReadStream(await helperFunctions.resolvePath('/blocked/path')),
+			).rejects.toThrow('Access to the file is not allowed');
 		});
 
 		it('should create a read stream if file access is permitted', async () => {
 			const filePath = '/allowed/path';
 			(fsAccess as jest.Mock).mockResolvedValueOnce({});
-			await helperFunctions.createReadStream(filePath);
-			expect(createReadStream).toHaveBeenCalledWith(filePath);
+
+			// Mock createReadStream to return a proper stream-like object
+			const mockStream: { once: jest.Mock } = {
+				once: jest.fn((event: string, callback: (error?: Error) => void): typeof mockStream => {
+					if (event === 'open') {
+						// Immediately call the open callback
+						setImmediate(() => callback());
+					}
+					return mockStream;
+				}),
+			};
+			(createReadStream as jest.Mock).mockReturnValueOnce(mockStream);
+
+			await helperFunctions.createReadStream(await helperFunctions.resolvePath(filePath));
+			expect(createReadStream).toHaveBeenCalledWith(
+				filePath,
+				expect.objectContaining({
+					flags: expect.any(Number),
+				}),
+			);
+		});
+
+		it('should reject symlinks with O_NOFOLLOW to prevent TOCTOU attacks', async () => {
+			const filePath = '/allowed/path/file';
+
+			// Clear previous mocks and set up fresh mocks
+			(fsAccess as jest.Mock).mockReset();
+			(fsAccess as jest.Mock).mockResolvedValue(undefined);
+
+			// Simulate the ELOOP error that occurs when O_NOFOLLOW encounters a symlink
+			const eloopError = new Error('ELOOP: too many symbolic links encountered');
+			// @ts-expect-error undefined property
+			eloopError.code = 'ELOOP';
+
+			// Mock createReadStream to return a stream that emits an error event
+			const mockStream: { once: jest.Mock } = {
+				once: jest.fn((event: string, callback: (error?: Error) => void): typeof mockStream => {
+					if (event === 'error') {
+						// Emit the error asynchronously
+						setImmediate(() => callback(eloopError));
+					}
+					return mockStream;
+				}),
+			};
+			(createReadStream as jest.Mock).mockReturnValueOnce(mockStream);
+
+			await expect(
+				helperFunctions.createReadStream(await helperFunctions.resolvePath(filePath)),
+			).rejects.toThrow('ELOOP: too many symbolic links encountered');
 		});
 	});
 
@@ -253,9 +302,9 @@ describe('getFileSystemHelperFunctions', () => {
 
 			await expect(
 				helperFunctions.writeContentToFile(
-					instanceSettings.n8nFolder + '/test.txt',
+					await helperFunctions.resolvePath(instanceSettings.n8nFolder + '/test.txt'),
 					'content',
-					'w',
+					constants.O_WRONLY | constants.O_CREAT | constants.O_TRUNC,
 				),
 			).rejects.toThrow('not writable');
 		});
diff --git a/packages/core/src/execution-engine/node-execution-context/utils/file-system-helper-functions.ts b/packages/core/src/execution-engine/node-execution-context/utils/file-system-helper-functions.ts
index 24c0c27360d..b4ad30bcdd7 100644
--- a/packages/core/src/execution-engine/node-execution-context/utils/file-system-helper-functions.ts
+++ b/packages/core/src/execution-engine/node-execution-context/utils/file-system-helper-functions.ts
@@ -1,9 +1,10 @@
 import { isContainedWithin, safeJoinPath } from '@n8n/backend-common';
 import { SecurityConfig } from '@n8n/config';
 import { Container } from '@n8n/di';
-import type { FileSystemHelperFunctions, INode } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
-import { createReadStream } from 'node:fs';
+import type { FileSystemHelperFunctions, INode, ResolvedFilePath } from 'n8n-workflow';
+import type { PathLike } from 'node:fs';
+import { constants, createReadStream } from 'node:fs';
 import {
 	access as fsAccess,
 	writeFile as fsWriteFile,
@@ -35,18 +36,19 @@ const getAllowedPaths = () => {
 	return allowedPaths;
 };
 
-export async function isFilePathBlocked(filePath: string): Promise<boolean> {
-	const allowedPaths = getAllowedPaths();
-	let resolvedFilePath = '';
+async function resolvePath(path: PathLike): Promise<ResolvedFilePath> {
 	try {
-		resolvedFilePath = await fsRealpath(filePath);
+		return (await fsRealpath(path)) as ResolvedFilePath; // apply brand, since we know it's resolved now
 	} catch (error: unknown) {
 		if (error instanceof Error && 'code' in error && error.code === 'ENOENT') {
-			resolvedFilePath = resolve(filePath);
-		} else {
-			throw error;
+			return resolve(path.toString()) as ResolvedFilePath; // apply brand, since we know it's resolved now
 		}
+		throw error;
 	}
+}
+
+function isFilePathBlocked(resolvedFilePath: ResolvedFilePath): boolean {
+	const allowedPaths = getAllowedPaths();
 	const blockFileAccessToN8nFiles = process.env[BLOCK_FILE_ACCESS_TO_N8N_FILES] !== 'false';
 
 	const restrictedPaths = blockFileAccessToN8nFiles ? getN8nRestrictedPaths() : [];
@@ -64,8 +66,8 @@ export async function isFilePathBlocked(filePath: string): Promise<boolean> {
 }
 
 export const getFileSystemHelperFunctions = (node: INode): FileSystemHelperFunctions => ({
-	async createReadStream(filePath) {
-		if (await isFilePathBlocked(filePath.toString())) {
+	async createReadStream(resolvedFilePath) {
+		if (isFilePathBlocked(resolvedFilePath)) {
 			const allowedPaths = getAllowedPaths();
 			const message = allowedPaths.length ? ` Allowed paths: ${allowedPaths.join(', ')}` : '';
 			throw new NodeOperationError(node, `Access to the file is not allowed.${message}`, {
@@ -74,34 +76,61 @@ export const getFileSystemHelperFunctions = (node: INode): FileSystemHelperFunct
 		}
 
 		try {
-			await fsAccess(filePath);
+			await fsAccess(resolvedFilePath);
 		} catch (error) {
 			// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
 			throw error.code === 'ENOENT'
 				? // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
 					new NodeOperationError(node, error, {
-						message: `The file "${String(filePath)}" could not be accessed.`,
+						message: `The file "${String(resolvedFilePath)}" could not be accessed.`,
 						level: 'warning',
 					})
 				: error;
 		}
 
-		return createReadStream(filePath);
+		// Use O_NOFOLLOW to prevent createReadStream from following symlinks. We require that the path
+		// already be resolved beforehand.
+		const stream = createReadStream(resolvedFilePath, {
+			flags: (constants.O_RDONLY | constants.O_NOFOLLOW) as unknown as string,
+		});
+
+		return await new Promise<ReturnType<typeof createReadStream>>((resolve, reject) => {
+			stream.once('error', (error) => {
+				if ((error as NodeJS.ErrnoException).code === 'ELOOP') {
+					reject(
+						new NodeOperationError(node, error, {
+							level: 'warning',
+							description: 'Symlinks are not allowed.',
+						}),
+					);
+				} else {
+					reject(error);
+				}
+			});
+			stream.once('open', () => resolve(stream));
+		});
 	},
 
 	getStoragePath() {
 		return safeJoinPath(Container.get(InstanceSettings).n8nFolder, `storage/${node.type}`);
 	},
 
-	async writeContentToFile(filePath, content, flag) {
-		if (await isFilePathBlocked(filePath as string)) {
-			throw new NodeOperationError(node, `The file "${String(filePath)}" is not writable.`, {
-				level: 'warning',
-			});
+	async writeContentToFile(resolvedFilePath, content, flag) {
+		if (isFilePathBlocked(resolvedFilePath)) {
+			throw new NodeOperationError(
+				node,
+				`The file "${String(resolvedFilePath)}" is not writable.`,
+				{
+					level: 'warning',
+				},
+			);
 		}
-		return await fsWriteFile(filePath, content, { encoding: 'binary', flag });
+		return await fsWriteFile(resolvedFilePath, content, {
+			encoding: 'binary',
+			flag: (flag ?? 0) | constants.O_NOFOLLOW,
+		});
 	},
-
+	resolvePath,
 	isFilePathBlocked,
 });
 
diff --git a/packages/nodes-base/nodes/Crypto/test/Crypto.test.ts b/packages/nodes-base/nodes/Crypto/test/Crypto.test.ts
index b6a53e8d61d..117554a7687 100644
--- a/packages/nodes-base/nodes/Crypto/test/Crypto.test.ts
+++ b/packages/nodes-base/nodes/Crypto/test/Crypto.test.ts
@@ -10,7 +10,12 @@ describe('Test Crypto Node', () => {
 	const realpathSpy = jest.spyOn(fsPromises, 'realpath');
 	realpathSpy.mockImplementation(async (path) => path as string);
 	jest.mock('fs');
-	fs.createReadStream = () => Readable.from(Buffer.from('test')) as fs.ReadStream;
+	fs.createReadStream = () => {
+		const stream = Readable.from(Buffer.from('test')) as fs.ReadStream;
+		// Emit 'open' event asynchronously to match real fs.ReadStream behavior
+		setImmediate(() => stream.emit('open'));
+		return stream;
+	};
 
 	new NodeTestHarness().setupTests();
 });
diff --git a/packages/nodes-base/nodes/Files/ReadWriteFile/actions/read.operation.ts b/packages/nodes-base/nodes/Files/ReadWriteFile/actions/read.operation.ts
index 783981399ae..258df540523 100644
--- a/packages/nodes-base/nodes/Files/ReadWriteFile/actions/read.operation.ts
+++ b/packages/nodes-base/nodes/Files/ReadWriteFile/actions/read.operation.ts
@@ -105,7 +105,9 @@ export async function execute(this: IExecuteFunctions, items: INodeExecutionData
 
 			const newItems: INodeExecutionData[] = [];
 			for (const filePath of files) {
-				const stream = await this.helpers.createReadStream(filePath);
+				const stream = await this.helpers.createReadStream(
+					await this.helpers.resolvePath(filePath),
+				);
 				const binaryData = await this.helpers.prepareBinaryData(stream, filePath);
 
 				if (options.fileName !== undefined) {
diff --git a/packages/nodes-base/nodes/Files/ReadWriteFile/actions/write.operation.ts b/packages/nodes-base/nodes/Files/ReadWriteFile/actions/write.operation.ts
index 5f4d28775a6..ba844767971 100644
--- a/packages/nodes-base/nodes/Files/ReadWriteFile/actions/write.operation.ts
+++ b/packages/nodes-base/nodes/Files/ReadWriteFile/actions/write.operation.ts
@@ -10,6 +10,7 @@ import type { Readable } from 'stream';
 import { updateDisplayOptions } from '@utils/utilities';
 
 import { errorMapper } from '../helpers/utils';
+import { constants } from 'node:fs';
 
 export const properties: INodeProperties[] = [
 	{
@@ -68,7 +69,9 @@ export async function execute(this: IExecuteFunctions, items: INodeExecutionData
 			const dataPropertyName = this.getNodeParameter('dataPropertyName', itemIndex);
 			fileName = this.getNodeParameter('fileName', itemIndex) as string;
 			const options = this.getNodeParameter('options', itemIndex, {});
-			const flag: string = options.append ? 'a' : 'w';
+			const flag: number = options.append
+				? constants.O_APPEND
+				: constants.O_WRONLY | constants.O_CREAT | constants.O_TRUNC;
 
 			item = items[itemIndex];
 
@@ -90,7 +93,11 @@ export async function execute(this: IExecuteFunctions, items: INodeExecutionData
 			}
 
 			// Write the file to disk
-			await this.helpers.writeContentToFile(fileName, fileContent, flag);
+			await this.helpers.writeContentToFile(
+				await this.helpers.resolvePath(fileName),
+				fileContent,
+				flag,
+			);
 
 			if (item.binary !== undefined) {
 				// Create a shallow copy of the binary data so that the old
diff --git a/packages/nodes-base/nodes/Git/Git.node.ts b/packages/nodes-base/nodes/Git/Git.node.ts
index ac722bc0b8d..03d4f177e10 100644
--- a/packages/nodes-base/nodes/Git/Git.node.ts
+++ b/packages/nodes-base/nodes/Git/Git.node.ts
@@ -287,7 +287,8 @@ export class Git implements INodeType {
 		for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
 			try {
 				const repositoryPath = this.getNodeParameter('repositoryPath', itemIndex, '') as string;
-				const isFilePathBlocked = await this.helpers.isFilePathBlocked(repositoryPath);
+				const resolvedRepositoryPath = await this.helpers.resolvePath(repositoryPath);
+				const isFilePathBlocked = this.helpers.isFilePathBlocked(resolvedRepositoryPath);
 				if (isFilePathBlocked) {
 					throw new NodeOperationError(
 						this.getNode(),
@@ -300,9 +301,9 @@ export class Git implements INodeType {
 				if (operation === 'clone') {
 					// Create repository folder if it does not exist
 					try {
-						await access(repositoryPath);
+						await access(resolvedRepositoryPath);
 					} catch (error) {
-						await mkdir(repositoryPath);
+						await mkdir(resolvedRepositoryPath);
 					}
 				}
 
@@ -321,7 +322,7 @@ export class Git implements INodeType {
 				}
 
 				const gitOptions: Partial<SimpleGitOptions> = {
-					baseDir: repositoryPath,
+					baseDir: resolvedRepositoryPath,
 					config: gitConfig,
 				};
 
diff --git a/packages/nodes-base/nodes/Git/__test__/Git.node.test.ts b/packages/nodes-base/nodes/Git/__test__/Git.node.test.ts
index 5256b92e872..4b30fdb0922 100644
--- a/packages/nodes-base/nodes/Git/__test__/Git.node.test.ts
+++ b/packages/nodes-base/nodes/Git/__test__/Git.node.test.ts
@@ -145,11 +145,42 @@ describe('Git Node', () => {
 
 	describe('Restricted file paths', () => {
 		it('should throw an error if the repository path is blocked', async () => {
-			(executeFunctions.helpers.isFilePathBlocked as jest.Mock).mockResolvedValue(true);
+			(executeFunctions.helpers.isFilePathBlocked as jest.Mock).mockReturnValue(true);
+			(executeFunctions.helpers.resolvePath as jest.Mock).mockResolvedValue('/tmp/test-repo');
 
 			await expect(gitNode.execute.call(executeFunctions)).rejects.toThrow(
 				'Access to the repository path is not allowed',
 			);
 		});
+
+		it('should use the resolved repository path for git operations', async () => {
+			const originalPath = '/tmp/link-to-repo';
+			const resolvedPath = '/tmp/actual-repo';
+
+			executeFunctions.getNodeParameter.mockImplementation((name: string) => {
+				switch (name) {
+					case 'operation':
+						return 'log';
+					case 'repositoryPath':
+						return originalPath;
+					case 'options':
+						return {};
+					default:
+						return '';
+				}
+			});
+
+			(executeFunctions.helpers.resolvePath as jest.Mock).mockResolvedValue(resolvedPath);
+			(executeFunctions.helpers.isFilePathBlocked as jest.Mock).mockReturnValue(false);
+
+			await gitNode.execute.call(executeFunctions);
+
+			// Verify git is initialized with the resolved path, not the original
+			expect(mockSimpleGit).toHaveBeenCalledWith(
+				expect.objectContaining({
+					baseDir: resolvedPath,
+				}),
+			);
+		});
 	});
 });
diff --git a/packages/nodes-base/nodes/Git/test/Git.node.test.ts b/packages/nodes-base/nodes/Git/test/Git.node.test.ts
index 568511249eb..7d6006c5ee4 100644
--- a/packages/nodes-base/nodes/Git/test/Git.node.test.ts
+++ b/packages/nodes-base/nodes/Git/test/Git.node.test.ts
@@ -50,6 +50,8 @@ describe('Git Node', () => {
 			continueOnFail: jest.fn(() => false),
 			helpers: {
 				returnJsonArray: jest.fn((data: any[]) => data.map((item: any) => ({ json: item }))),
+				resolvePath: jest.fn(async (path: string) => path as any),
+				isFilePathBlocked: jest.fn(() => false),
 			},
 		});
 		jest.clearAllMocks();
diff --git a/packages/nodes-base/nodes/ReadBinaryFile/ReadBinaryFile.node.ts b/packages/nodes-base/nodes/ReadBinaryFile/ReadBinaryFile.node.ts
index 7944e5194b0..483a6536598 100644
--- a/packages/nodes-base/nodes/ReadBinaryFile/ReadBinaryFile.node.ts
+++ b/packages/nodes-base/nodes/ReadBinaryFile/ReadBinaryFile.node.ts
@@ -69,7 +69,9 @@ export class ReadBinaryFile implements INodeType {
 
 				const filePath = this.getNodeParameter('filePath', itemIndex);
 
-				const stream = await this.helpers.createReadStream(filePath);
+				const stream = await this.helpers.createReadStream(
+					await this.helpers.resolvePath(filePath),
+				);
 				const dataPropertyName = this.getNodeParameter('dataPropertyName', itemIndex);
 
 				newItem.binary![dataPropertyName] = await this.helpers.prepareBinaryData(stream, filePath);
diff --git a/packages/nodes-base/nodes/ReadBinaryFiles/ReadBinaryFiles.node.ts b/packages/nodes-base/nodes/ReadBinaryFiles/ReadBinaryFiles.node.ts
index af73db19a1c..1569e0b89e7 100644
--- a/packages/nodes-base/nodes/ReadBinaryFiles/ReadBinaryFiles.node.ts
+++ b/packages/nodes-base/nodes/ReadBinaryFiles/ReadBinaryFiles.node.ts
@@ -54,7 +54,7 @@ export class ReadBinaryFiles implements INodeType {
 
 		const items: INodeExecutionData[] = [];
 		for (const filePath of files) {
-			const stream = await this.helpers.createReadStream(filePath);
+			const stream = await this.helpers.createReadStream(await this.helpers.resolvePath(filePath));
 			items.push({
 				binary: {
 					[dataPropertyName]: await this.helpers.prepareBinaryData(stream, filePath),
diff --git a/packages/nodes-base/nodes/WriteBinaryFile/WriteBinaryFile.node.ts b/packages/nodes-base/nodes/WriteBinaryFile/WriteBinaryFile.node.ts
index 2cfcf21e194..ab978bb017f 100644
--- a/packages/nodes-base/nodes/WriteBinaryFile/WriteBinaryFile.node.ts
+++ b/packages/nodes-base/nodes/WriteBinaryFile/WriteBinaryFile.node.ts
@@ -5,6 +5,7 @@ import type {
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
+import { constants } from 'node:fs';
 import type { Readable } from 'stream';
 
 export class WriteBinaryFile implements INodeType {
@@ -75,7 +76,9 @@ export class WriteBinaryFile implements INodeType {
 
 				const options = this.getNodeParameter('options', 0, {});
 
-				const flag: string = options.append ? 'a' : 'w';
+				const flag: number = options.append
+					? constants.O_APPEND
+					: constants.O_WRONLY | constants.O_CREAT | constants.O_TRUNC;
 
 				item = items[itemIndex];
 
@@ -98,7 +101,11 @@ export class WriteBinaryFile implements INodeType {
 
 				// Write the file to disk
 
-				await this.helpers.writeContentToFile(fileName, fileContent, flag);
+				await this.helpers.writeContentToFile(
+					await this.helpers.resolvePath(fileName),
+					fileContent,
+					flag,
+				);
 
 				if (item.binary !== undefined) {
 					// Create a shallow copy of the binary data so that the old
diff --git a/packages/workflow/src/interfaces.ts b/packages/workflow/src/interfaces.ts
index 5415f80d462..2292c2934b0 100644
--- a/packages/workflow/src/interfaces.ts
+++ b/packages/workflow/src/interfaces.ts
@@ -694,14 +694,30 @@ export interface BaseHelperFunctions {
 	returnJsonArray(jsonData: IDataObject | IDataObject[]): INodeExecutionData[];
 }
 
+const __brand = Symbol('resolvedFilePath');
+
+export type ResolvedFilePath = string & {
+	[__brand]: 'ResolvedFilePath';
+};
+
 export interface FileSystemHelperFunctions {
-	isFilePathBlocked(filePath: string): Promise<boolean>;
-	createReadStream(path: PathLike): Promise<Readable>;
+	resolvePath(path: PathLike): Promise<ResolvedFilePath>;
+	/**
+	 * Use {@link resolvePath} to resolve the path first.
+	 */
+	isFilePathBlocked(filePath: ResolvedFilePath): boolean;
+	/**
+	 * Use {@link resolvePath} to resolve the path first.
+	 */
+	createReadStream(filePath: ResolvedFilePath): Promise<Readable>;
 	getStoragePath(): string;
+	/**
+	 * Use {@link resolvePath} to resolve the path first.
+	 */
 	writeContentToFile(
-		path: PathLike,
+		path: ResolvedFilePath,
 		content: string | Buffer | Readable,
-		flag?: string,
+		flag?: number,
 	): Promise<void>;
 }
 

From f62e698fb8ed618b9efcaaf3fa871aeb883b2212 Mon Sep 17 00:00:00 2001
From: Artem Sorokin <38620398+seemewalkin@users.noreply.github.com>
Date: Mon, 8 Dec 2025 17:41:57 +0100
Subject: [PATCH 135/167] =?UTF-8?q?test:=20Rename=20tests/ui=20to=20tests/?=
 =?UTF-8?q?e2e=20and=20reorganize,=20move=20tests=20to=20api=20=E2=80=A6?=
 =?UTF-8?q?=20(#22935)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/testing/playwright/playwright-projects.ts        | 8 ++++----
 .../tests/{ui => e2e}/ai/assistant-basic.spec.ts          | 0
 .../tests/{ui => e2e}/ai/assistant-code-help.spec.ts      | 0
 .../{ui => e2e}/ai/assistant-credential-help.spec.ts      | 0
 .../tests/{ui => e2e}/ai/assistant-support-chat.spec.ts   | 0
 .../playwright/tests/{ui => e2e}/ai/chat-session.spec.ts  | 0
 .../playwright/tests/{ui => e2e}/ai/evaluations.spec.ts   | 0
 .../tests/{ui => e2e}/ai/langchain-agents.spec.ts         | 0
 .../tests/{ui => e2e}/ai/langchain-chains.spec.ts         | 0
 .../tests/{ui => e2e}/ai/langchain-memory.spec.ts         | 0
 .../tests/{ui => e2e}/ai/langchain-tools.spec.ts          | 0
 .../tests/{ui => e2e}/ai/langchain-vectorstores.spec.ts   | 0
 .../playwright/tests/{ui => e2e}/ai/rag-callout.spec.ts   | 0
 .../tests/{ui => e2e}/ai/workflow-builder.spec.ts         | 0
 .../{ui/triggers => e2e/api}/webhook-external.spec.ts     | 0
 .../{ui/triggers => e2e/api}/webhook-isolation.spec.ts    | 0
 .../tests/{ui/triggers => e2e/api}/webhook.spec.ts        | 0
 .../tests/{ui => e2e}/app-config/become-creator.spec.ts   | 0
 .../playwright/tests/{ui => e2e}/app-config/demo.spec.ts  | 0
 .../{ui => e2e}/app-config/env-feature-flags.spec.ts      | 0
 .../tests/{ui => e2e}/app-config/nps-survey.spec.ts       | 0
 .../{ui => e2e}/app-config/security-notifications.spec.ts | 0
 .../tests/{ui => e2e}/app-config/versions.spec.ts         | 0
 .../playwright/tests/{ui => e2e}/auth/admin-smoke.spec.ts | 0
 .../tests/{ui => e2e}/auth/authenticated.spec.ts          | 0
 .../tests/{ui => e2e}/auth/password-reset.spec.ts         | 0
 .../playwright/tests/{ui => e2e}/auth/signin.spec.ts      | 0
 .../{ui => e2e}/building-blocks/canvas-actions.spec.ts    | 0
 .../tests/{ui => e2e}/building-blocks/credentials.spec.ts | 0
 .../building-blocks/node-details-configuration.spec.ts    | 0
 .../{ui => e2e}/building-blocks/user-service.spec.ts      | 0
 .../building-blocks/workflow-entry-points.spec.ts         | 0
 .../tests/{ui => e2e}/capabilities/proxy-server.spec.ts   | 0
 .../tests/{ui => e2e}/capabilities/task-runner.spec.ts    | 0
 .../playwright/tests/{ui => e2e}/cloud/cloud.spec.ts      | 0
 .../tests/{ui => e2e}/credentials/api-operations.spec.ts  | 0
 .../playwright/tests/{ui => e2e}/credentials/crud.spec.ts | 0
 .../tests/{ui => e2e}/credentials/global.spec.ts          | 0
 .../tests/{ui => e2e}/credentials/oauth.spec.ts           | 0
 .../tests/{ui => e2e}/data-tables/details.spec.ts         | 0
 .../tests/{ui => e2e}/data-tables/tables.spec.ts          | 0
 .../tests/{ui => e2e}/node-creator/actions.spec.ts        | 0
 .../tests/{ui => e2e}/node-creator/categories.spec.ts     | 0
 .../tests/{ui => e2e}/node-creator/navigation.spec.ts     | 0
 .../tests/{ui => e2e}/node-creator/special-nodes.spec.ts  | 0
 .../tests/{ui => e2e}/node-creator/vector-stores.spec.ts  | 0
 .../tests/{ui => e2e}/node-creator/workflows.spec.ts      | 0
 .../tests/{ui => e2e}/nodes/community-nodes.spec.ts       | 0
 .../tests/{ui => e2e}/nodes/email-send-node.spec.ts       | 0
 .../tests/{ui => e2e}/nodes/form-trigger-node.spec.ts     | 0
 .../tests/{ui => e2e}/nodes/http-request-node.spec.ts     | 0
 .../playwright/tests/{ui => e2e}/nodes/if-node.spec.ts    | 0
 .../playwright/tests/{ui => e2e}/nodes/pdf-node.spec.ts   | 0
 .../nodes/schedule-trigger-node.spec.ts}                  | 0
 .../tests/{ui => e2e}/projects/folders-advanced.spec.ts   | 0
 .../tests/{ui => e2e}/projects/folders-basic.spec.ts      | 0
 .../tests/{ui => e2e}/projects/folders-operations.spec.ts | 0
 .../tests/{ui => e2e}/projects/project-settings.spec.ts   | 0
 .../tests/{ui => e2e}/projects/projects.spec.ts           | 0
 .../regression/ADO-1338-ndv-missing-input-panel.spec.ts   | 0
 .../regression/ADO-2230-ndv-reset-data-pagination.spec.ts | 0
 ...-opening-webhook-ndv-marks-workflow-as-unsaved.spec.ts | 0
 .../regression/ADO-2372-prevent-clipping-params.spec.ts   | 0
 .../ADO-2929-can-load-old-switch-node-workflows.spec.ts   | 0
 .../regression/ADO-4462-template-setup-experiment.spec.ts | 0
 .../regression/AI-1401-sub-nodes-input-panel.spec.ts      | 0
 ...I-716-correctly-set-up-agent-model-shows-error.spec.ts | 0
 ...2-partial-execs-broken-when-using-chat-trigger.spec.ts | 0
 ...de-connectors-not-rendered-when-nodes-inserted.spec.ts | 0
 .../GHC-5776-ai-sessions-metadata-license-error.spec.ts   | 0
 .../SUG-121-fields-reset-after-closing-ndv.spec.ts        | 0
 .../regression/SUG-38-inline-expression-preview.spec.ts   | 0
 .../settings/community-nodes/community-nodes.spec.ts      | 0
 .../settings/environments/source-control.spec.ts          | 0
 .../{ui => e2e}/settings/environments/variables.spec.ts   | 0
 .../settings/log-streaming/log-streaming.spec.ts          | 0
 .../tests/{ui => e2e}/settings/personal/personal.spec.ts  | 0
 .../settings/personal/two-factor-authentication.spec.ts   | 0
 .../tests/{ui => e2e}/settings/users/users.spec.ts        | 0
 .../tests/{ui => e2e}/settings/workers/workers.spec.ts    | 0
 .../{ui => e2e}/sharing/credential-visibility.spec.ts     | 0
 .../playwright/tests/{ui => e2e}/sharing/sharing.spec.ts  | 0
 .../workflows/checklist/production-checklist.spec.ts      | 0
 .../{ui => e2e}/workflows/editor/canvas/actions.spec.ts   | 0
 .../workflows/editor/canvas/canvas-nodes.spec.ts          | 0
 .../workflows/editor/canvas/canvas-zoom.spec.ts           | 0
 .../workflows/editor/canvas/focus-panel.spec.ts           | 0
 .../{ui => e2e}/workflows/editor/canvas/stickies.spec.ts  | 0
 .../{ui => e2e}/workflows/editor/canvas/undo-redo.spec.ts | 0
 .../{ui => e2e}/workflows/editor/code/code-node.spec.ts   | 0
 .../{ui => e2e}/workflows/editor/code/editors.spec.ts     | 0
 .../workflows/editor/editor-after-route-changes.spec.ts   | 0
 .../{ui => e2e}/workflows/editor/execution/debug.spec.ts  | 0
 .../workflows/editor/execution/execution.spec.ts          | 0
 .../workflows/editor/execution/inject-previous.spec.ts    | 0
 .../{ui => e2e}/workflows/editor/execution/logs.spec.ts   | 0
 .../workflows/editor/execution/partial.spec.ts            | 0
 .../workflows/editor/execution/previous-nodes.spec.ts     | 0
 .../workflows/editor/expressions/inline.spec.ts           | 0
 .../workflows/editor/expressions/mapping.spec.ts          | 0
 .../workflows/editor/expressions/modal.spec.ts            | 0
 .../workflows/editor/expressions/transformation.spec.ts   | 0
 .../{ui => e2e}/workflows/editor/ndv/io-filter.spec.ts    | 0
 .../{ui => e2e}/workflows/editor/ndv/ndv-core.spec.ts     | 0
 .../workflows/editor/ndv/ndv-data-display.spec.ts         | 0
 .../workflows/editor/ndv/ndv-floating-nodes.spec.ts       | 0
 .../workflows/editor/ndv/ndv-parameters.spec.ts           | 0
 .../{ui => e2e}/workflows/editor/ndv/paired-item.spec.ts  | 0
 .../{ui => e2e}/workflows/editor/ndv/pinning.spec.ts      | 0
 .../workflows/editor/ndv/resource-locator.spec.ts         | 0
 .../workflows/editor/ndv/resource-mapper.spec.ts          | 0
 .../tests/{ui => e2e}/workflows/editor/routing.spec.ts    | 0
 .../workflows/editor/subworkflows/debugging.spec.ts       | 0
 .../workflows/editor/subworkflows/extraction.spec.ts      | 0
 .../workflows/editor/subworkflows/wait.spec.ts            | 0
 .../editor/subworkflows/workflow-selector.spec.ts         | 0
 .../tests/{ui => e2e}/workflows/editor/tags.spec.ts       | 0
 .../workflows/editor/viewer-permissions.spec.ts           | 0
 .../workflows/editor/workflow-actions/archive.spec.ts     | 0
 .../workflows/editor/workflow-actions/copy-paste.spec.ts  | 0
 .../workflows/editor/workflow-actions/duplicate.spec.ts   | 0
 .../workflows/editor/workflow-actions/publish.spec.ts     | 0
 .../workflows/editor/workflow-actions/run.spec.ts         | 0
 .../workflows/editor/workflow-actions/save.spec.ts        | 0
 .../workflows/editor/workflow-actions/settings.spec.ts    | 0
 .../tests/{ui => e2e}/workflows/executions/list.spec.ts   | 0
 .../tests/{ui => e2e}/workflows/list/import.spec.ts       | 0
 .../tests/{ui => e2e}/workflows/list/workflows.spec.ts    | 0
 .../workflows/templates/credentials-setup.spec.ts         | 0
 .../{ui => e2e}/workflows/templates/templates.spec.ts     | 0
 130 files changed, 4 insertions(+), 4 deletions(-)
 rename packages/testing/playwright/tests/{ui => e2e}/ai/assistant-basic.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/ai/assistant-code-help.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/ai/assistant-credential-help.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/ai/assistant-support-chat.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/ai/chat-session.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/ai/evaluations.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/ai/langchain-agents.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/ai/langchain-chains.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/ai/langchain-memory.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/ai/langchain-tools.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/ai/langchain-vectorstores.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/ai/rag-callout.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/ai/workflow-builder.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui/triggers => e2e/api}/webhook-external.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui/triggers => e2e/api}/webhook-isolation.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui/triggers => e2e/api}/webhook.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/app-config/become-creator.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/app-config/demo.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/app-config/env-feature-flags.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/app-config/nps-survey.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/app-config/security-notifications.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/app-config/versions.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/auth/admin-smoke.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/auth/authenticated.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/auth/password-reset.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/auth/signin.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/building-blocks/canvas-actions.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/building-blocks/credentials.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/building-blocks/node-details-configuration.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/building-blocks/user-service.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/building-blocks/workflow-entry-points.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/capabilities/proxy-server.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/capabilities/task-runner.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/cloud/cloud.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/credentials/api-operations.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/credentials/crud.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/credentials/global.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/credentials/oauth.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/data-tables/details.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/data-tables/tables.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/node-creator/actions.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/node-creator/categories.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/node-creator/navigation.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/node-creator/special-nodes.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/node-creator/vector-stores.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/node-creator/workflows.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/nodes/community-nodes.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/nodes/email-send-node.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/nodes/form-trigger-node.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/nodes/http-request-node.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/nodes/if-node.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/nodes/pdf-node.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui/triggers/scheduler.spec.ts => e2e/nodes/schedule-trigger-node.spec.ts} (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/projects/folders-advanced.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/projects/folders-basic.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/projects/folders-operations.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/projects/project-settings.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/projects/projects.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/regression/ADO-1338-ndv-missing-input-panel.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/regression/ADO-2230-ndv-reset-data-pagination.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/regression/ADO-2270-opening-webhook-ndv-marks-workflow-as-unsaved.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/regression/ADO-2372-prevent-clipping-params.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/regression/ADO-2929-can-load-old-switch-node-workflows.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/regression/ADO-4462-template-setup-experiment.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/regression/AI-1401-sub-nodes-input-panel.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/regression/AI-716-correctly-set-up-agent-model-shows-error.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/regression/AI-812-partial-execs-broken-when-using-chat-trigger.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/regression/CAT-726-canvas-node-connectors-not-rendered-when-nodes-inserted.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/regression/GHC-5776-ai-sessions-metadata-license-error.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/regression/SUG-121-fields-reset-after-closing-ndv.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/regression/SUG-38-inline-expression-preview.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/settings/community-nodes/community-nodes.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/settings/environments/source-control.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/settings/environments/variables.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/settings/log-streaming/log-streaming.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/settings/personal/personal.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/settings/personal/two-factor-authentication.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/settings/users/users.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/settings/workers/workers.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/sharing/credential-visibility.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/sharing/sharing.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/workflows/checklist/production-checklist.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/workflows/editor/canvas/actions.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/workflows/editor/canvas/canvas-nodes.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/workflows/editor/canvas/canvas-zoom.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/workflows/editor/canvas/focus-panel.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/workflows/editor/canvas/stickies.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/workflows/editor/canvas/undo-redo.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/workflows/editor/code/code-node.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/workflows/editor/code/editors.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/workflows/editor/editor-after-route-changes.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/workflows/editor/execution/debug.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/workflows/editor/execution/execution.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/workflows/editor/execution/inject-previous.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/workflows/editor/execution/logs.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/workflows/editor/execution/partial.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/workflows/editor/execution/previous-nodes.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/workflows/editor/expressions/inline.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/workflows/editor/expressions/mapping.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/workflows/editor/expressions/modal.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/workflows/editor/expressions/transformation.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/workflows/editor/ndv/io-filter.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/workflows/editor/ndv/ndv-core.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/workflows/editor/ndv/ndv-data-display.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/workflows/editor/ndv/ndv-floating-nodes.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/workflows/editor/ndv/ndv-parameters.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/workflows/editor/ndv/paired-item.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/workflows/editor/ndv/pinning.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/workflows/editor/ndv/resource-locator.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/workflows/editor/ndv/resource-mapper.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/workflows/editor/routing.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/workflows/editor/subworkflows/debugging.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/workflows/editor/subworkflows/extraction.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/workflows/editor/subworkflows/wait.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/workflows/editor/subworkflows/workflow-selector.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/workflows/editor/tags.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/workflows/editor/viewer-permissions.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/workflows/editor/workflow-actions/archive.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/workflows/editor/workflow-actions/copy-paste.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/workflows/editor/workflow-actions/duplicate.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/workflows/editor/workflow-actions/publish.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/workflows/editor/workflow-actions/run.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/workflows/editor/workflow-actions/save.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/workflows/editor/workflow-actions/settings.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/workflows/executions/list.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/workflows/list/import.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/workflows/list/workflows.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/workflows/templates/credentials-setup.spec.ts (100%)
 rename packages/testing/playwright/tests/{ui => e2e}/workflows/templates/templates.spec.ts (100%)

diff --git a/packages/testing/playwright/playwright-projects.ts b/packages/testing/playwright/playwright-projects.ts
index f16911800e0..7bb59db240e 100644
--- a/packages/testing/playwright/playwright-projects.ts
+++ b/packages/testing/playwright/playwright-projects.ts
@@ -38,7 +38,7 @@ export function getProjects(): Project[] {
 		projects.push(
 			{
 				name: 'ui',
-				testDir: './tests/ui',
+				testDir: './tests/e2e',
 				grepInvert: new RegExp(
 					[CONTAINER_ONLY.source, SERIAL_EXECUTION.source, ISOLATED_ONLY.source].join('|'),
 				),
@@ -47,7 +47,7 @@ export function getProjects(): Project[] {
 			},
 			{
 				name: 'ui:isolated',
-				testDir: './tests/ui',
+				testDir: './tests/e2e',
 				grep: new RegExp([SERIAL_EXECUTION.source, ISOLATED_ONLY.source].join('|')),
 				workers: 1,
 				use: { baseURL: process.env.N8N_BASE_URL },
@@ -59,7 +59,7 @@ export function getProjects(): Project[] {
 			projects.push(
 				{
 					name: `${name}:ui`,
-					testDir: './tests/ui',
+					testDir: './tests/e2e',
 					grepInvert: new RegExp(grepInvertPatterns.join('|')),
 					timeout: name === 'standard' ? 60000 : 180000, // 60 seconds for standard container test, 180 for containers to allow startup etc
 					fullyParallel: true,
@@ -67,7 +67,7 @@ export function getProjects(): Project[] {
 				},
 				{
 					name: `${name}:ui:isolated`,
-					testDir: './tests/ui',
+					testDir: './tests/e2e',
 					grep: new RegExp([SERIAL_EXECUTION.source, ISOLATED_ONLY.source].join('|')),
 					workers: 1,
 					use: { containerConfig: config },
diff --git a/packages/testing/playwright/tests/ui/ai/assistant-basic.spec.ts b/packages/testing/playwright/tests/e2e/ai/assistant-basic.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/ai/assistant-basic.spec.ts
rename to packages/testing/playwright/tests/e2e/ai/assistant-basic.spec.ts
diff --git a/packages/testing/playwright/tests/ui/ai/assistant-code-help.spec.ts b/packages/testing/playwright/tests/e2e/ai/assistant-code-help.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/ai/assistant-code-help.spec.ts
rename to packages/testing/playwright/tests/e2e/ai/assistant-code-help.spec.ts
diff --git a/packages/testing/playwright/tests/ui/ai/assistant-credential-help.spec.ts b/packages/testing/playwright/tests/e2e/ai/assistant-credential-help.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/ai/assistant-credential-help.spec.ts
rename to packages/testing/playwright/tests/e2e/ai/assistant-credential-help.spec.ts
diff --git a/packages/testing/playwright/tests/ui/ai/assistant-support-chat.spec.ts b/packages/testing/playwright/tests/e2e/ai/assistant-support-chat.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/ai/assistant-support-chat.spec.ts
rename to packages/testing/playwright/tests/e2e/ai/assistant-support-chat.spec.ts
diff --git a/packages/testing/playwright/tests/ui/ai/chat-session.spec.ts b/packages/testing/playwright/tests/e2e/ai/chat-session.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/ai/chat-session.spec.ts
rename to packages/testing/playwright/tests/e2e/ai/chat-session.spec.ts
diff --git a/packages/testing/playwright/tests/ui/ai/evaluations.spec.ts b/packages/testing/playwright/tests/e2e/ai/evaluations.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/ai/evaluations.spec.ts
rename to packages/testing/playwright/tests/e2e/ai/evaluations.spec.ts
diff --git a/packages/testing/playwright/tests/ui/ai/langchain-agents.spec.ts b/packages/testing/playwright/tests/e2e/ai/langchain-agents.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/ai/langchain-agents.spec.ts
rename to packages/testing/playwright/tests/e2e/ai/langchain-agents.spec.ts
diff --git a/packages/testing/playwright/tests/ui/ai/langchain-chains.spec.ts b/packages/testing/playwright/tests/e2e/ai/langchain-chains.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/ai/langchain-chains.spec.ts
rename to packages/testing/playwright/tests/e2e/ai/langchain-chains.spec.ts
diff --git a/packages/testing/playwright/tests/ui/ai/langchain-memory.spec.ts b/packages/testing/playwright/tests/e2e/ai/langchain-memory.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/ai/langchain-memory.spec.ts
rename to packages/testing/playwright/tests/e2e/ai/langchain-memory.spec.ts
diff --git a/packages/testing/playwright/tests/ui/ai/langchain-tools.spec.ts b/packages/testing/playwright/tests/e2e/ai/langchain-tools.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/ai/langchain-tools.spec.ts
rename to packages/testing/playwright/tests/e2e/ai/langchain-tools.spec.ts
diff --git a/packages/testing/playwright/tests/ui/ai/langchain-vectorstores.spec.ts b/packages/testing/playwright/tests/e2e/ai/langchain-vectorstores.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/ai/langchain-vectorstores.spec.ts
rename to packages/testing/playwright/tests/e2e/ai/langchain-vectorstores.spec.ts
diff --git a/packages/testing/playwright/tests/ui/ai/rag-callout.spec.ts b/packages/testing/playwright/tests/e2e/ai/rag-callout.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/ai/rag-callout.spec.ts
rename to packages/testing/playwright/tests/e2e/ai/rag-callout.spec.ts
diff --git a/packages/testing/playwright/tests/ui/ai/workflow-builder.spec.ts b/packages/testing/playwright/tests/e2e/ai/workflow-builder.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/ai/workflow-builder.spec.ts
rename to packages/testing/playwright/tests/e2e/ai/workflow-builder.spec.ts
diff --git a/packages/testing/playwright/tests/ui/triggers/webhook-external.spec.ts b/packages/testing/playwright/tests/e2e/api/webhook-external.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/triggers/webhook-external.spec.ts
rename to packages/testing/playwright/tests/e2e/api/webhook-external.spec.ts
diff --git a/packages/testing/playwright/tests/ui/triggers/webhook-isolation.spec.ts b/packages/testing/playwright/tests/e2e/api/webhook-isolation.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/triggers/webhook-isolation.spec.ts
rename to packages/testing/playwright/tests/e2e/api/webhook-isolation.spec.ts
diff --git a/packages/testing/playwright/tests/ui/triggers/webhook.spec.ts b/packages/testing/playwright/tests/e2e/api/webhook.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/triggers/webhook.spec.ts
rename to packages/testing/playwright/tests/e2e/api/webhook.spec.ts
diff --git a/packages/testing/playwright/tests/ui/app-config/become-creator.spec.ts b/packages/testing/playwright/tests/e2e/app-config/become-creator.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/app-config/become-creator.spec.ts
rename to packages/testing/playwright/tests/e2e/app-config/become-creator.spec.ts
diff --git a/packages/testing/playwright/tests/ui/app-config/demo.spec.ts b/packages/testing/playwright/tests/e2e/app-config/demo.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/app-config/demo.spec.ts
rename to packages/testing/playwright/tests/e2e/app-config/demo.spec.ts
diff --git a/packages/testing/playwright/tests/ui/app-config/env-feature-flags.spec.ts b/packages/testing/playwright/tests/e2e/app-config/env-feature-flags.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/app-config/env-feature-flags.spec.ts
rename to packages/testing/playwright/tests/e2e/app-config/env-feature-flags.spec.ts
diff --git a/packages/testing/playwright/tests/ui/app-config/nps-survey.spec.ts b/packages/testing/playwright/tests/e2e/app-config/nps-survey.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/app-config/nps-survey.spec.ts
rename to packages/testing/playwright/tests/e2e/app-config/nps-survey.spec.ts
diff --git a/packages/testing/playwright/tests/ui/app-config/security-notifications.spec.ts b/packages/testing/playwright/tests/e2e/app-config/security-notifications.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/app-config/security-notifications.spec.ts
rename to packages/testing/playwright/tests/e2e/app-config/security-notifications.spec.ts
diff --git a/packages/testing/playwright/tests/ui/app-config/versions.spec.ts b/packages/testing/playwright/tests/e2e/app-config/versions.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/app-config/versions.spec.ts
rename to packages/testing/playwright/tests/e2e/app-config/versions.spec.ts
diff --git a/packages/testing/playwright/tests/ui/auth/admin-smoke.spec.ts b/packages/testing/playwright/tests/e2e/auth/admin-smoke.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/auth/admin-smoke.spec.ts
rename to packages/testing/playwright/tests/e2e/auth/admin-smoke.spec.ts
diff --git a/packages/testing/playwright/tests/ui/auth/authenticated.spec.ts b/packages/testing/playwright/tests/e2e/auth/authenticated.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/auth/authenticated.spec.ts
rename to packages/testing/playwright/tests/e2e/auth/authenticated.spec.ts
diff --git a/packages/testing/playwright/tests/ui/auth/password-reset.spec.ts b/packages/testing/playwright/tests/e2e/auth/password-reset.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/auth/password-reset.spec.ts
rename to packages/testing/playwright/tests/e2e/auth/password-reset.spec.ts
diff --git a/packages/testing/playwright/tests/ui/auth/signin.spec.ts b/packages/testing/playwright/tests/e2e/auth/signin.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/auth/signin.spec.ts
rename to packages/testing/playwright/tests/e2e/auth/signin.spec.ts
diff --git a/packages/testing/playwright/tests/ui/building-blocks/canvas-actions.spec.ts b/packages/testing/playwright/tests/e2e/building-blocks/canvas-actions.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/building-blocks/canvas-actions.spec.ts
rename to packages/testing/playwright/tests/e2e/building-blocks/canvas-actions.spec.ts
diff --git a/packages/testing/playwright/tests/ui/building-blocks/credentials.spec.ts b/packages/testing/playwright/tests/e2e/building-blocks/credentials.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/building-blocks/credentials.spec.ts
rename to packages/testing/playwright/tests/e2e/building-blocks/credentials.spec.ts
diff --git a/packages/testing/playwright/tests/ui/building-blocks/node-details-configuration.spec.ts b/packages/testing/playwright/tests/e2e/building-blocks/node-details-configuration.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/building-blocks/node-details-configuration.spec.ts
rename to packages/testing/playwright/tests/e2e/building-blocks/node-details-configuration.spec.ts
diff --git a/packages/testing/playwright/tests/ui/building-blocks/user-service.spec.ts b/packages/testing/playwright/tests/e2e/building-blocks/user-service.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/building-blocks/user-service.spec.ts
rename to packages/testing/playwright/tests/e2e/building-blocks/user-service.spec.ts
diff --git a/packages/testing/playwright/tests/ui/building-blocks/workflow-entry-points.spec.ts b/packages/testing/playwright/tests/e2e/building-blocks/workflow-entry-points.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/building-blocks/workflow-entry-points.spec.ts
rename to packages/testing/playwright/tests/e2e/building-blocks/workflow-entry-points.spec.ts
diff --git a/packages/testing/playwright/tests/ui/capabilities/proxy-server.spec.ts b/packages/testing/playwright/tests/e2e/capabilities/proxy-server.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/capabilities/proxy-server.spec.ts
rename to packages/testing/playwright/tests/e2e/capabilities/proxy-server.spec.ts
diff --git a/packages/testing/playwright/tests/ui/capabilities/task-runner.spec.ts b/packages/testing/playwright/tests/e2e/capabilities/task-runner.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/capabilities/task-runner.spec.ts
rename to packages/testing/playwright/tests/e2e/capabilities/task-runner.spec.ts
diff --git a/packages/testing/playwright/tests/ui/cloud/cloud.spec.ts b/packages/testing/playwright/tests/e2e/cloud/cloud.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/cloud/cloud.spec.ts
rename to packages/testing/playwright/tests/e2e/cloud/cloud.spec.ts
diff --git a/packages/testing/playwright/tests/ui/credentials/api-operations.spec.ts b/packages/testing/playwright/tests/e2e/credentials/api-operations.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/credentials/api-operations.spec.ts
rename to packages/testing/playwright/tests/e2e/credentials/api-operations.spec.ts
diff --git a/packages/testing/playwright/tests/ui/credentials/crud.spec.ts b/packages/testing/playwright/tests/e2e/credentials/crud.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/credentials/crud.spec.ts
rename to packages/testing/playwright/tests/e2e/credentials/crud.spec.ts
diff --git a/packages/testing/playwright/tests/ui/credentials/global.spec.ts b/packages/testing/playwright/tests/e2e/credentials/global.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/credentials/global.spec.ts
rename to packages/testing/playwright/tests/e2e/credentials/global.spec.ts
diff --git a/packages/testing/playwright/tests/ui/credentials/oauth.spec.ts b/packages/testing/playwright/tests/e2e/credentials/oauth.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/credentials/oauth.spec.ts
rename to packages/testing/playwright/tests/e2e/credentials/oauth.spec.ts
diff --git a/packages/testing/playwright/tests/ui/data-tables/details.spec.ts b/packages/testing/playwright/tests/e2e/data-tables/details.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/data-tables/details.spec.ts
rename to packages/testing/playwright/tests/e2e/data-tables/details.spec.ts
diff --git a/packages/testing/playwright/tests/ui/data-tables/tables.spec.ts b/packages/testing/playwright/tests/e2e/data-tables/tables.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/data-tables/tables.spec.ts
rename to packages/testing/playwright/tests/e2e/data-tables/tables.spec.ts
diff --git a/packages/testing/playwright/tests/ui/node-creator/actions.spec.ts b/packages/testing/playwright/tests/e2e/node-creator/actions.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/node-creator/actions.spec.ts
rename to packages/testing/playwright/tests/e2e/node-creator/actions.spec.ts
diff --git a/packages/testing/playwright/tests/ui/node-creator/categories.spec.ts b/packages/testing/playwright/tests/e2e/node-creator/categories.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/node-creator/categories.spec.ts
rename to packages/testing/playwright/tests/e2e/node-creator/categories.spec.ts
diff --git a/packages/testing/playwright/tests/ui/node-creator/navigation.spec.ts b/packages/testing/playwright/tests/e2e/node-creator/navigation.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/node-creator/navigation.spec.ts
rename to packages/testing/playwright/tests/e2e/node-creator/navigation.spec.ts
diff --git a/packages/testing/playwright/tests/ui/node-creator/special-nodes.spec.ts b/packages/testing/playwright/tests/e2e/node-creator/special-nodes.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/node-creator/special-nodes.spec.ts
rename to packages/testing/playwright/tests/e2e/node-creator/special-nodes.spec.ts
diff --git a/packages/testing/playwright/tests/ui/node-creator/vector-stores.spec.ts b/packages/testing/playwright/tests/e2e/node-creator/vector-stores.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/node-creator/vector-stores.spec.ts
rename to packages/testing/playwright/tests/e2e/node-creator/vector-stores.spec.ts
diff --git a/packages/testing/playwright/tests/ui/node-creator/workflows.spec.ts b/packages/testing/playwright/tests/e2e/node-creator/workflows.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/node-creator/workflows.spec.ts
rename to packages/testing/playwright/tests/e2e/node-creator/workflows.spec.ts
diff --git a/packages/testing/playwright/tests/ui/nodes/community-nodes.spec.ts b/packages/testing/playwright/tests/e2e/nodes/community-nodes.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/nodes/community-nodes.spec.ts
rename to packages/testing/playwright/tests/e2e/nodes/community-nodes.spec.ts
diff --git a/packages/testing/playwright/tests/ui/nodes/email-send-node.spec.ts b/packages/testing/playwright/tests/e2e/nodes/email-send-node.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/nodes/email-send-node.spec.ts
rename to packages/testing/playwright/tests/e2e/nodes/email-send-node.spec.ts
diff --git a/packages/testing/playwright/tests/ui/nodes/form-trigger-node.spec.ts b/packages/testing/playwright/tests/e2e/nodes/form-trigger-node.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/nodes/form-trigger-node.spec.ts
rename to packages/testing/playwright/tests/e2e/nodes/form-trigger-node.spec.ts
diff --git a/packages/testing/playwright/tests/ui/nodes/http-request-node.spec.ts b/packages/testing/playwright/tests/e2e/nodes/http-request-node.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/nodes/http-request-node.spec.ts
rename to packages/testing/playwright/tests/e2e/nodes/http-request-node.spec.ts
diff --git a/packages/testing/playwright/tests/ui/nodes/if-node.spec.ts b/packages/testing/playwright/tests/e2e/nodes/if-node.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/nodes/if-node.spec.ts
rename to packages/testing/playwright/tests/e2e/nodes/if-node.spec.ts
diff --git a/packages/testing/playwright/tests/ui/nodes/pdf-node.spec.ts b/packages/testing/playwright/tests/e2e/nodes/pdf-node.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/nodes/pdf-node.spec.ts
rename to packages/testing/playwright/tests/e2e/nodes/pdf-node.spec.ts
diff --git a/packages/testing/playwright/tests/ui/triggers/scheduler.spec.ts b/packages/testing/playwright/tests/e2e/nodes/schedule-trigger-node.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/triggers/scheduler.spec.ts
rename to packages/testing/playwright/tests/e2e/nodes/schedule-trigger-node.spec.ts
diff --git a/packages/testing/playwright/tests/ui/projects/folders-advanced.spec.ts b/packages/testing/playwright/tests/e2e/projects/folders-advanced.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/projects/folders-advanced.spec.ts
rename to packages/testing/playwright/tests/e2e/projects/folders-advanced.spec.ts
diff --git a/packages/testing/playwright/tests/ui/projects/folders-basic.spec.ts b/packages/testing/playwright/tests/e2e/projects/folders-basic.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/projects/folders-basic.spec.ts
rename to packages/testing/playwright/tests/e2e/projects/folders-basic.spec.ts
diff --git a/packages/testing/playwright/tests/ui/projects/folders-operations.spec.ts b/packages/testing/playwright/tests/e2e/projects/folders-operations.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/projects/folders-operations.spec.ts
rename to packages/testing/playwright/tests/e2e/projects/folders-operations.spec.ts
diff --git a/packages/testing/playwright/tests/ui/projects/project-settings.spec.ts b/packages/testing/playwright/tests/e2e/projects/project-settings.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/projects/project-settings.spec.ts
rename to packages/testing/playwright/tests/e2e/projects/project-settings.spec.ts
diff --git a/packages/testing/playwright/tests/ui/projects/projects.spec.ts b/packages/testing/playwright/tests/e2e/projects/projects.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/projects/projects.spec.ts
rename to packages/testing/playwright/tests/e2e/projects/projects.spec.ts
diff --git a/packages/testing/playwright/tests/ui/regression/ADO-1338-ndv-missing-input-panel.spec.ts b/packages/testing/playwright/tests/e2e/regression/ADO-1338-ndv-missing-input-panel.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/regression/ADO-1338-ndv-missing-input-panel.spec.ts
rename to packages/testing/playwright/tests/e2e/regression/ADO-1338-ndv-missing-input-panel.spec.ts
diff --git a/packages/testing/playwright/tests/ui/regression/ADO-2230-ndv-reset-data-pagination.spec.ts b/packages/testing/playwright/tests/e2e/regression/ADO-2230-ndv-reset-data-pagination.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/regression/ADO-2230-ndv-reset-data-pagination.spec.ts
rename to packages/testing/playwright/tests/e2e/regression/ADO-2230-ndv-reset-data-pagination.spec.ts
diff --git a/packages/testing/playwright/tests/ui/regression/ADO-2270-opening-webhook-ndv-marks-workflow-as-unsaved.spec.ts b/packages/testing/playwright/tests/e2e/regression/ADO-2270-opening-webhook-ndv-marks-workflow-as-unsaved.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/regression/ADO-2270-opening-webhook-ndv-marks-workflow-as-unsaved.spec.ts
rename to packages/testing/playwright/tests/e2e/regression/ADO-2270-opening-webhook-ndv-marks-workflow-as-unsaved.spec.ts
diff --git a/packages/testing/playwright/tests/ui/regression/ADO-2372-prevent-clipping-params.spec.ts b/packages/testing/playwright/tests/e2e/regression/ADO-2372-prevent-clipping-params.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/regression/ADO-2372-prevent-clipping-params.spec.ts
rename to packages/testing/playwright/tests/e2e/regression/ADO-2372-prevent-clipping-params.spec.ts
diff --git a/packages/testing/playwright/tests/ui/regression/ADO-2929-can-load-old-switch-node-workflows.spec.ts b/packages/testing/playwright/tests/e2e/regression/ADO-2929-can-load-old-switch-node-workflows.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/regression/ADO-2929-can-load-old-switch-node-workflows.spec.ts
rename to packages/testing/playwright/tests/e2e/regression/ADO-2929-can-load-old-switch-node-workflows.spec.ts
diff --git a/packages/testing/playwright/tests/ui/regression/ADO-4462-template-setup-experiment.spec.ts b/packages/testing/playwright/tests/e2e/regression/ADO-4462-template-setup-experiment.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/regression/ADO-4462-template-setup-experiment.spec.ts
rename to packages/testing/playwright/tests/e2e/regression/ADO-4462-template-setup-experiment.spec.ts
diff --git a/packages/testing/playwright/tests/ui/regression/AI-1401-sub-nodes-input-panel.spec.ts b/packages/testing/playwright/tests/e2e/regression/AI-1401-sub-nodes-input-panel.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/regression/AI-1401-sub-nodes-input-panel.spec.ts
rename to packages/testing/playwright/tests/e2e/regression/AI-1401-sub-nodes-input-panel.spec.ts
diff --git a/packages/testing/playwright/tests/ui/regression/AI-716-correctly-set-up-agent-model-shows-error.spec.ts b/packages/testing/playwright/tests/e2e/regression/AI-716-correctly-set-up-agent-model-shows-error.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/regression/AI-716-correctly-set-up-agent-model-shows-error.spec.ts
rename to packages/testing/playwright/tests/e2e/regression/AI-716-correctly-set-up-agent-model-shows-error.spec.ts
diff --git a/packages/testing/playwright/tests/ui/regression/AI-812-partial-execs-broken-when-using-chat-trigger.spec.ts b/packages/testing/playwright/tests/e2e/regression/AI-812-partial-execs-broken-when-using-chat-trigger.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/regression/AI-812-partial-execs-broken-when-using-chat-trigger.spec.ts
rename to packages/testing/playwright/tests/e2e/regression/AI-812-partial-execs-broken-when-using-chat-trigger.spec.ts
diff --git a/packages/testing/playwright/tests/ui/regression/CAT-726-canvas-node-connectors-not-rendered-when-nodes-inserted.spec.ts b/packages/testing/playwright/tests/e2e/regression/CAT-726-canvas-node-connectors-not-rendered-when-nodes-inserted.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/regression/CAT-726-canvas-node-connectors-not-rendered-when-nodes-inserted.spec.ts
rename to packages/testing/playwright/tests/e2e/regression/CAT-726-canvas-node-connectors-not-rendered-when-nodes-inserted.spec.ts
diff --git a/packages/testing/playwright/tests/ui/regression/GHC-5776-ai-sessions-metadata-license-error.spec.ts b/packages/testing/playwright/tests/e2e/regression/GHC-5776-ai-sessions-metadata-license-error.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/regression/GHC-5776-ai-sessions-metadata-license-error.spec.ts
rename to packages/testing/playwright/tests/e2e/regression/GHC-5776-ai-sessions-metadata-license-error.spec.ts
diff --git a/packages/testing/playwright/tests/ui/regression/SUG-121-fields-reset-after-closing-ndv.spec.ts b/packages/testing/playwright/tests/e2e/regression/SUG-121-fields-reset-after-closing-ndv.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/regression/SUG-121-fields-reset-after-closing-ndv.spec.ts
rename to packages/testing/playwright/tests/e2e/regression/SUG-121-fields-reset-after-closing-ndv.spec.ts
diff --git a/packages/testing/playwright/tests/ui/regression/SUG-38-inline-expression-preview.spec.ts b/packages/testing/playwright/tests/e2e/regression/SUG-38-inline-expression-preview.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/regression/SUG-38-inline-expression-preview.spec.ts
rename to packages/testing/playwright/tests/e2e/regression/SUG-38-inline-expression-preview.spec.ts
diff --git a/packages/testing/playwright/tests/ui/settings/community-nodes/community-nodes.spec.ts b/packages/testing/playwright/tests/e2e/settings/community-nodes/community-nodes.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/settings/community-nodes/community-nodes.spec.ts
rename to packages/testing/playwright/tests/e2e/settings/community-nodes/community-nodes.spec.ts
diff --git a/packages/testing/playwright/tests/ui/settings/environments/source-control.spec.ts b/packages/testing/playwright/tests/e2e/settings/environments/source-control.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/settings/environments/source-control.spec.ts
rename to packages/testing/playwright/tests/e2e/settings/environments/source-control.spec.ts
diff --git a/packages/testing/playwright/tests/ui/settings/environments/variables.spec.ts b/packages/testing/playwright/tests/e2e/settings/environments/variables.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/settings/environments/variables.spec.ts
rename to packages/testing/playwright/tests/e2e/settings/environments/variables.spec.ts
diff --git a/packages/testing/playwright/tests/ui/settings/log-streaming/log-streaming.spec.ts b/packages/testing/playwright/tests/e2e/settings/log-streaming/log-streaming.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/settings/log-streaming/log-streaming.spec.ts
rename to packages/testing/playwright/tests/e2e/settings/log-streaming/log-streaming.spec.ts
diff --git a/packages/testing/playwright/tests/ui/settings/personal/personal.spec.ts b/packages/testing/playwright/tests/e2e/settings/personal/personal.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/settings/personal/personal.spec.ts
rename to packages/testing/playwright/tests/e2e/settings/personal/personal.spec.ts
diff --git a/packages/testing/playwright/tests/ui/settings/personal/two-factor-authentication.spec.ts b/packages/testing/playwright/tests/e2e/settings/personal/two-factor-authentication.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/settings/personal/two-factor-authentication.spec.ts
rename to packages/testing/playwright/tests/e2e/settings/personal/two-factor-authentication.spec.ts
diff --git a/packages/testing/playwright/tests/ui/settings/users/users.spec.ts b/packages/testing/playwright/tests/e2e/settings/users/users.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/settings/users/users.spec.ts
rename to packages/testing/playwright/tests/e2e/settings/users/users.spec.ts
diff --git a/packages/testing/playwright/tests/ui/settings/workers/workers.spec.ts b/packages/testing/playwright/tests/e2e/settings/workers/workers.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/settings/workers/workers.spec.ts
rename to packages/testing/playwright/tests/e2e/settings/workers/workers.spec.ts
diff --git a/packages/testing/playwright/tests/ui/sharing/credential-visibility.spec.ts b/packages/testing/playwright/tests/e2e/sharing/credential-visibility.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/sharing/credential-visibility.spec.ts
rename to packages/testing/playwright/tests/e2e/sharing/credential-visibility.spec.ts
diff --git a/packages/testing/playwright/tests/ui/sharing/sharing.spec.ts b/packages/testing/playwright/tests/e2e/sharing/sharing.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/sharing/sharing.spec.ts
rename to packages/testing/playwright/tests/e2e/sharing/sharing.spec.ts
diff --git a/packages/testing/playwright/tests/ui/workflows/checklist/production-checklist.spec.ts b/packages/testing/playwright/tests/e2e/workflows/checklist/production-checklist.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/workflows/checklist/production-checklist.spec.ts
rename to packages/testing/playwright/tests/e2e/workflows/checklist/production-checklist.spec.ts
diff --git a/packages/testing/playwright/tests/ui/workflows/editor/canvas/actions.spec.ts b/packages/testing/playwright/tests/e2e/workflows/editor/canvas/actions.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/workflows/editor/canvas/actions.spec.ts
rename to packages/testing/playwright/tests/e2e/workflows/editor/canvas/actions.spec.ts
diff --git a/packages/testing/playwright/tests/ui/workflows/editor/canvas/canvas-nodes.spec.ts b/packages/testing/playwright/tests/e2e/workflows/editor/canvas/canvas-nodes.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/workflows/editor/canvas/canvas-nodes.spec.ts
rename to packages/testing/playwright/tests/e2e/workflows/editor/canvas/canvas-nodes.spec.ts
diff --git a/packages/testing/playwright/tests/ui/workflows/editor/canvas/canvas-zoom.spec.ts b/packages/testing/playwright/tests/e2e/workflows/editor/canvas/canvas-zoom.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/workflows/editor/canvas/canvas-zoom.spec.ts
rename to packages/testing/playwright/tests/e2e/workflows/editor/canvas/canvas-zoom.spec.ts
diff --git a/packages/testing/playwright/tests/ui/workflows/editor/canvas/focus-panel.spec.ts b/packages/testing/playwright/tests/e2e/workflows/editor/canvas/focus-panel.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/workflows/editor/canvas/focus-panel.spec.ts
rename to packages/testing/playwright/tests/e2e/workflows/editor/canvas/focus-panel.spec.ts
diff --git a/packages/testing/playwright/tests/ui/workflows/editor/canvas/stickies.spec.ts b/packages/testing/playwright/tests/e2e/workflows/editor/canvas/stickies.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/workflows/editor/canvas/stickies.spec.ts
rename to packages/testing/playwright/tests/e2e/workflows/editor/canvas/stickies.spec.ts
diff --git a/packages/testing/playwright/tests/ui/workflows/editor/canvas/undo-redo.spec.ts b/packages/testing/playwright/tests/e2e/workflows/editor/canvas/undo-redo.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/workflows/editor/canvas/undo-redo.spec.ts
rename to packages/testing/playwright/tests/e2e/workflows/editor/canvas/undo-redo.spec.ts
diff --git a/packages/testing/playwright/tests/ui/workflows/editor/code/code-node.spec.ts b/packages/testing/playwright/tests/e2e/workflows/editor/code/code-node.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/workflows/editor/code/code-node.spec.ts
rename to packages/testing/playwright/tests/e2e/workflows/editor/code/code-node.spec.ts
diff --git a/packages/testing/playwright/tests/ui/workflows/editor/code/editors.spec.ts b/packages/testing/playwright/tests/e2e/workflows/editor/code/editors.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/workflows/editor/code/editors.spec.ts
rename to packages/testing/playwright/tests/e2e/workflows/editor/code/editors.spec.ts
diff --git a/packages/testing/playwright/tests/ui/workflows/editor/editor-after-route-changes.spec.ts b/packages/testing/playwright/tests/e2e/workflows/editor/editor-after-route-changes.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/workflows/editor/editor-after-route-changes.spec.ts
rename to packages/testing/playwright/tests/e2e/workflows/editor/editor-after-route-changes.spec.ts
diff --git a/packages/testing/playwright/tests/ui/workflows/editor/execution/debug.spec.ts b/packages/testing/playwright/tests/e2e/workflows/editor/execution/debug.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/workflows/editor/execution/debug.spec.ts
rename to packages/testing/playwright/tests/e2e/workflows/editor/execution/debug.spec.ts
diff --git a/packages/testing/playwright/tests/ui/workflows/editor/execution/execution.spec.ts b/packages/testing/playwright/tests/e2e/workflows/editor/execution/execution.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/workflows/editor/execution/execution.spec.ts
rename to packages/testing/playwright/tests/e2e/workflows/editor/execution/execution.spec.ts
diff --git a/packages/testing/playwright/tests/ui/workflows/editor/execution/inject-previous.spec.ts b/packages/testing/playwright/tests/e2e/workflows/editor/execution/inject-previous.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/workflows/editor/execution/inject-previous.spec.ts
rename to packages/testing/playwright/tests/e2e/workflows/editor/execution/inject-previous.spec.ts
diff --git a/packages/testing/playwright/tests/ui/workflows/editor/execution/logs.spec.ts b/packages/testing/playwright/tests/e2e/workflows/editor/execution/logs.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/workflows/editor/execution/logs.spec.ts
rename to packages/testing/playwright/tests/e2e/workflows/editor/execution/logs.spec.ts
diff --git a/packages/testing/playwright/tests/ui/workflows/editor/execution/partial.spec.ts b/packages/testing/playwright/tests/e2e/workflows/editor/execution/partial.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/workflows/editor/execution/partial.spec.ts
rename to packages/testing/playwright/tests/e2e/workflows/editor/execution/partial.spec.ts
diff --git a/packages/testing/playwright/tests/ui/workflows/editor/execution/previous-nodes.spec.ts b/packages/testing/playwright/tests/e2e/workflows/editor/execution/previous-nodes.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/workflows/editor/execution/previous-nodes.spec.ts
rename to packages/testing/playwright/tests/e2e/workflows/editor/execution/previous-nodes.spec.ts
diff --git a/packages/testing/playwright/tests/ui/workflows/editor/expressions/inline.spec.ts b/packages/testing/playwright/tests/e2e/workflows/editor/expressions/inline.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/workflows/editor/expressions/inline.spec.ts
rename to packages/testing/playwright/tests/e2e/workflows/editor/expressions/inline.spec.ts
diff --git a/packages/testing/playwright/tests/ui/workflows/editor/expressions/mapping.spec.ts b/packages/testing/playwright/tests/e2e/workflows/editor/expressions/mapping.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/workflows/editor/expressions/mapping.spec.ts
rename to packages/testing/playwright/tests/e2e/workflows/editor/expressions/mapping.spec.ts
diff --git a/packages/testing/playwright/tests/ui/workflows/editor/expressions/modal.spec.ts b/packages/testing/playwright/tests/e2e/workflows/editor/expressions/modal.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/workflows/editor/expressions/modal.spec.ts
rename to packages/testing/playwright/tests/e2e/workflows/editor/expressions/modal.spec.ts
diff --git a/packages/testing/playwright/tests/ui/workflows/editor/expressions/transformation.spec.ts b/packages/testing/playwright/tests/e2e/workflows/editor/expressions/transformation.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/workflows/editor/expressions/transformation.spec.ts
rename to packages/testing/playwright/tests/e2e/workflows/editor/expressions/transformation.spec.ts
diff --git a/packages/testing/playwright/tests/ui/workflows/editor/ndv/io-filter.spec.ts b/packages/testing/playwright/tests/e2e/workflows/editor/ndv/io-filter.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/workflows/editor/ndv/io-filter.spec.ts
rename to packages/testing/playwright/tests/e2e/workflows/editor/ndv/io-filter.spec.ts
diff --git a/packages/testing/playwright/tests/ui/workflows/editor/ndv/ndv-core.spec.ts b/packages/testing/playwright/tests/e2e/workflows/editor/ndv/ndv-core.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/workflows/editor/ndv/ndv-core.spec.ts
rename to packages/testing/playwright/tests/e2e/workflows/editor/ndv/ndv-core.spec.ts
diff --git a/packages/testing/playwright/tests/ui/workflows/editor/ndv/ndv-data-display.spec.ts b/packages/testing/playwright/tests/e2e/workflows/editor/ndv/ndv-data-display.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/workflows/editor/ndv/ndv-data-display.spec.ts
rename to packages/testing/playwright/tests/e2e/workflows/editor/ndv/ndv-data-display.spec.ts
diff --git a/packages/testing/playwright/tests/ui/workflows/editor/ndv/ndv-floating-nodes.spec.ts b/packages/testing/playwright/tests/e2e/workflows/editor/ndv/ndv-floating-nodes.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/workflows/editor/ndv/ndv-floating-nodes.spec.ts
rename to packages/testing/playwright/tests/e2e/workflows/editor/ndv/ndv-floating-nodes.spec.ts
diff --git a/packages/testing/playwright/tests/ui/workflows/editor/ndv/ndv-parameters.spec.ts b/packages/testing/playwright/tests/e2e/workflows/editor/ndv/ndv-parameters.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/workflows/editor/ndv/ndv-parameters.spec.ts
rename to packages/testing/playwright/tests/e2e/workflows/editor/ndv/ndv-parameters.spec.ts
diff --git a/packages/testing/playwright/tests/ui/workflows/editor/ndv/paired-item.spec.ts b/packages/testing/playwright/tests/e2e/workflows/editor/ndv/paired-item.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/workflows/editor/ndv/paired-item.spec.ts
rename to packages/testing/playwright/tests/e2e/workflows/editor/ndv/paired-item.spec.ts
diff --git a/packages/testing/playwright/tests/ui/workflows/editor/ndv/pinning.spec.ts b/packages/testing/playwright/tests/e2e/workflows/editor/ndv/pinning.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/workflows/editor/ndv/pinning.spec.ts
rename to packages/testing/playwright/tests/e2e/workflows/editor/ndv/pinning.spec.ts
diff --git a/packages/testing/playwright/tests/ui/workflows/editor/ndv/resource-locator.spec.ts b/packages/testing/playwright/tests/e2e/workflows/editor/ndv/resource-locator.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/workflows/editor/ndv/resource-locator.spec.ts
rename to packages/testing/playwright/tests/e2e/workflows/editor/ndv/resource-locator.spec.ts
diff --git a/packages/testing/playwright/tests/ui/workflows/editor/ndv/resource-mapper.spec.ts b/packages/testing/playwright/tests/e2e/workflows/editor/ndv/resource-mapper.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/workflows/editor/ndv/resource-mapper.spec.ts
rename to packages/testing/playwright/tests/e2e/workflows/editor/ndv/resource-mapper.spec.ts
diff --git a/packages/testing/playwright/tests/ui/workflows/editor/routing.spec.ts b/packages/testing/playwright/tests/e2e/workflows/editor/routing.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/workflows/editor/routing.spec.ts
rename to packages/testing/playwright/tests/e2e/workflows/editor/routing.spec.ts
diff --git a/packages/testing/playwright/tests/ui/workflows/editor/subworkflows/debugging.spec.ts b/packages/testing/playwright/tests/e2e/workflows/editor/subworkflows/debugging.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/workflows/editor/subworkflows/debugging.spec.ts
rename to packages/testing/playwright/tests/e2e/workflows/editor/subworkflows/debugging.spec.ts
diff --git a/packages/testing/playwright/tests/ui/workflows/editor/subworkflows/extraction.spec.ts b/packages/testing/playwright/tests/e2e/workflows/editor/subworkflows/extraction.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/workflows/editor/subworkflows/extraction.spec.ts
rename to packages/testing/playwright/tests/e2e/workflows/editor/subworkflows/extraction.spec.ts
diff --git a/packages/testing/playwright/tests/ui/workflows/editor/subworkflows/wait.spec.ts b/packages/testing/playwright/tests/e2e/workflows/editor/subworkflows/wait.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/workflows/editor/subworkflows/wait.spec.ts
rename to packages/testing/playwright/tests/e2e/workflows/editor/subworkflows/wait.spec.ts
diff --git a/packages/testing/playwright/tests/ui/workflows/editor/subworkflows/workflow-selector.spec.ts b/packages/testing/playwright/tests/e2e/workflows/editor/subworkflows/workflow-selector.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/workflows/editor/subworkflows/workflow-selector.spec.ts
rename to packages/testing/playwright/tests/e2e/workflows/editor/subworkflows/workflow-selector.spec.ts
diff --git a/packages/testing/playwright/tests/ui/workflows/editor/tags.spec.ts b/packages/testing/playwright/tests/e2e/workflows/editor/tags.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/workflows/editor/tags.spec.ts
rename to packages/testing/playwright/tests/e2e/workflows/editor/tags.spec.ts
diff --git a/packages/testing/playwright/tests/ui/workflows/editor/viewer-permissions.spec.ts b/packages/testing/playwright/tests/e2e/workflows/editor/viewer-permissions.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/workflows/editor/viewer-permissions.spec.ts
rename to packages/testing/playwright/tests/e2e/workflows/editor/viewer-permissions.spec.ts
diff --git a/packages/testing/playwright/tests/ui/workflows/editor/workflow-actions/archive.spec.ts b/packages/testing/playwright/tests/e2e/workflows/editor/workflow-actions/archive.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/workflows/editor/workflow-actions/archive.spec.ts
rename to packages/testing/playwright/tests/e2e/workflows/editor/workflow-actions/archive.spec.ts
diff --git a/packages/testing/playwright/tests/ui/workflows/editor/workflow-actions/copy-paste.spec.ts b/packages/testing/playwright/tests/e2e/workflows/editor/workflow-actions/copy-paste.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/workflows/editor/workflow-actions/copy-paste.spec.ts
rename to packages/testing/playwright/tests/e2e/workflows/editor/workflow-actions/copy-paste.spec.ts
diff --git a/packages/testing/playwright/tests/ui/workflows/editor/workflow-actions/duplicate.spec.ts b/packages/testing/playwright/tests/e2e/workflows/editor/workflow-actions/duplicate.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/workflows/editor/workflow-actions/duplicate.spec.ts
rename to packages/testing/playwright/tests/e2e/workflows/editor/workflow-actions/duplicate.spec.ts
diff --git a/packages/testing/playwright/tests/ui/workflows/editor/workflow-actions/publish.spec.ts b/packages/testing/playwright/tests/e2e/workflows/editor/workflow-actions/publish.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/workflows/editor/workflow-actions/publish.spec.ts
rename to packages/testing/playwright/tests/e2e/workflows/editor/workflow-actions/publish.spec.ts
diff --git a/packages/testing/playwright/tests/ui/workflows/editor/workflow-actions/run.spec.ts b/packages/testing/playwright/tests/e2e/workflows/editor/workflow-actions/run.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/workflows/editor/workflow-actions/run.spec.ts
rename to packages/testing/playwright/tests/e2e/workflows/editor/workflow-actions/run.spec.ts
diff --git a/packages/testing/playwright/tests/ui/workflows/editor/workflow-actions/save.spec.ts b/packages/testing/playwright/tests/e2e/workflows/editor/workflow-actions/save.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/workflows/editor/workflow-actions/save.spec.ts
rename to packages/testing/playwright/tests/e2e/workflows/editor/workflow-actions/save.spec.ts
diff --git a/packages/testing/playwright/tests/ui/workflows/editor/workflow-actions/settings.spec.ts b/packages/testing/playwright/tests/e2e/workflows/editor/workflow-actions/settings.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/workflows/editor/workflow-actions/settings.spec.ts
rename to packages/testing/playwright/tests/e2e/workflows/editor/workflow-actions/settings.spec.ts
diff --git a/packages/testing/playwright/tests/ui/workflows/executions/list.spec.ts b/packages/testing/playwright/tests/e2e/workflows/executions/list.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/workflows/executions/list.spec.ts
rename to packages/testing/playwright/tests/e2e/workflows/executions/list.spec.ts
diff --git a/packages/testing/playwright/tests/ui/workflows/list/import.spec.ts b/packages/testing/playwright/tests/e2e/workflows/list/import.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/workflows/list/import.spec.ts
rename to packages/testing/playwright/tests/e2e/workflows/list/import.spec.ts
diff --git a/packages/testing/playwright/tests/ui/workflows/list/workflows.spec.ts b/packages/testing/playwright/tests/e2e/workflows/list/workflows.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/workflows/list/workflows.spec.ts
rename to packages/testing/playwright/tests/e2e/workflows/list/workflows.spec.ts
diff --git a/packages/testing/playwright/tests/ui/workflows/templates/credentials-setup.spec.ts b/packages/testing/playwright/tests/e2e/workflows/templates/credentials-setup.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/workflows/templates/credentials-setup.spec.ts
rename to packages/testing/playwright/tests/e2e/workflows/templates/credentials-setup.spec.ts
diff --git a/packages/testing/playwright/tests/ui/workflows/templates/templates.spec.ts b/packages/testing/playwright/tests/e2e/workflows/templates/templates.spec.ts
similarity index 100%
rename from packages/testing/playwright/tests/ui/workflows/templates/templates.spec.ts
rename to packages/testing/playwright/tests/e2e/workflows/templates/templates.spec.ts

From edeeacfeefb4ae73cb1b5d3bf8efbedbcd7584d8 Mon Sep 17 00:00:00 2001
From: Csaba Tuncsik <csaba@n8n.io>
Date: Mon, 8 Dec 2025 19:24:59 +0200
Subject: [PATCH 136/167] chore: Use wrangler-action@v3 for Storybook
 Cloudflare deploy (PAY-4282) (#22933)

Co-authored-by: cubic-dev-ai[bot] <191113872+cubic-dev-ai[bot]@users.noreply.github.com>
---
 .github/workflows/storybook.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/storybook.yml b/.github/workflows/storybook.yml
index 3d26f01c1bc..8174a49841d 100644
--- a/.github/workflows/storybook.yml
+++ b/.github/workflows/storybook.yml
@@ -43,7 +43,7 @@ jobs:
           pnpm add --global wrangler
 
       - name: Deploy
-        uses: cloudflare/wrangler-action@707f63750981584eb6abc365a50d441516fb04b8
+        uses: cloudflare/wrangler-action@da0e0dfe58b7a431659754fdf3f186c529afbe65 # v3.14.1
         id: cloudflare_deployment
         with:
           apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}

From cb2ac857251721e065614dc65454b0a5c351a06c Mon Sep 17 00:00:00 2001
From: RomanDavydchuk <roman.davydchuk@n8n.io>
Date: Mon, 8 Dec 2025 20:26:08 +0200
Subject: [PATCH 137/167] fix(Webhook Node): Assign default binary property
 names if it's empty or whitespace (#21857)

Co-authored-by: Shireen Missi <94372015+ShireenMissi@users.noreply.github.com>
---
 .../nodes-base/nodes/Webhook/Webhook.node.ts  |  70 +-------
 .../nodes/Webhook/test/utils.test.ts          | 153 +++++++++++++++++-
 packages/nodes-base/nodes/Webhook/utils.ts    |  68 ++++++++
 3 files changed, 223 insertions(+), 68 deletions(-)

diff --git a/packages/nodes-base/nodes/Webhook/Webhook.node.ts b/packages/nodes-base/nodes/Webhook/Webhook.node.ts
index 31679ec0834..670c2e6dc4a 100644
--- a/packages/nodes-base/nodes/Webhook/Webhook.node.ts
+++ b/packages/nodes-base/nodes/Webhook/Webhook.node.ts
@@ -1,6 +1,6 @@
 /* eslint-disable n8n-nodes-base/node-execute-block-wrong-error-thrown */
 import { createWriteStream } from 'fs';
-import { rm, stat } from 'fs/promises';
+import { stat } from 'fs/promises';
 import isbot from 'isbot';
 import type {
 	IWebhookFunctions,
@@ -8,11 +8,9 @@ import type {
 	INodeExecutionData,
 	INodeTypeDescription,
 	IWebhookResponseData,
-	MultiPartFormData,
 	INodeProperties,
 } from 'n8n-workflow';
 import { BINARY_ENCODING, NodeOperationError, Node } from 'n8n-workflow';
-import * as a from 'node:assert';
 import { pipeline } from 'stream/promises';
 import { file as tmpFile } from 'tmp-promise';
 import { v4 as uuid } from 'uuid';
@@ -34,6 +32,7 @@ import { WebhookAuthorizationError } from './error';
 import {
 	checkResponseModeConfiguration,
 	configuredOutputs,
+	handleFormData,
 	isIpWhitelisted,
 	setupOutputConnection,
 	validateWebhookAuthentication,
@@ -252,7 +251,7 @@ export class Webhook extends Node {
 		}
 
 		if (req.contentType === 'multipart/form-data') {
-			return await this.handleFormData(context, prepareOutput);
+			return await handleFormData(context, prepareOutput);
 		}
 
 		if (nodeVersion > 1 && !req.body && !options.rawBody) {
@@ -312,69 +311,6 @@ export class Webhook extends Node {
 		return await validateWebhookAuthentication(context, this.authPropertyName);
 	}
 
-	private async handleFormData(
-		context: IWebhookFunctions,
-		prepareOutput: (data: INodeExecutionData) => INodeExecutionData[][],
-	) {
-		const req = context.getRequestObject() as MultiPartFormData.Request;
-		a.ok(req.contentType === 'multipart/form-data', 'Expected multipart/form-data');
-		const options = context.getNodeParameter('options', {}) as IDataObject;
-		const { data, files } = req.body;
-
-		const returnItem: INodeExecutionData = {
-			json: {
-				headers: req.headers,
-				params: req.params,
-				query: req.query,
-				body: data,
-			},
-		};
-
-		if (files && Object.keys(files).length) {
-			returnItem.binary = {};
-		}
-
-		let count = 0;
-
-		for (const key of Object.keys(files)) {
-			const processFiles: MultiPartFormData.File[] = [];
-			let multiFile = false;
-			if (Array.isArray(files[key])) {
-				processFiles.push(...files[key]);
-				multiFile = true;
-			} else {
-				processFiles.push(files[key]);
-			}
-
-			let fileCount = 0;
-			for (const file of processFiles) {
-				let binaryPropertyName = key;
-				if (binaryPropertyName.endsWith('[]')) {
-					binaryPropertyName = binaryPropertyName.slice(0, -2);
-				}
-				if (multiFile) {
-					binaryPropertyName += fileCount++;
-				}
-				if (options.binaryPropertyName) {
-					binaryPropertyName = `${options.binaryPropertyName}${count}`;
-				}
-
-				returnItem.binary![binaryPropertyName] = await context.nodeHelpers.copyBinaryFile(
-					file.filepath,
-					file.originalFilename ?? file.newFilename,
-					file.mimetype,
-				);
-
-				// Delete original file to prevent tmp directory from growing too large
-				await rm(file.filepath, { force: true });
-
-				count += 1;
-			}
-		}
-
-		return { workflowData: prepareOutput(returnItem) };
-	}
-
 	private async handleBinaryData(
 		context: IWebhookFunctions,
 		prepareOutput: (data: INodeExecutionData) => INodeExecutionData[][],
diff --git a/packages/nodes-base/nodes/Webhook/test/utils.test.ts b/packages/nodes-base/nodes/Webhook/test/utils.test.ts
index 6ec867e46a3..953e4a14392 100644
--- a/packages/nodes-base/nodes/Webhook/test/utils.test.ts
+++ b/packages/nodes-base/nodes/Webhook/test/utils.test.ts
@@ -1,5 +1,11 @@
 import jwt from 'jsonwebtoken';
-import { ApplicationError, type IWebhookFunctions } from 'n8n-workflow';
+import {
+	ApplicationError,
+	type IWebhookFunctions,
+	type INodeExecutionData,
+	type IDataObject,
+	type MultiPartFormData,
+} from 'n8n-workflow';
 
 import type { WebhookParameters } from '../utils';
 import {
@@ -7,6 +13,7 @@ import {
 	configuredOutputs,
 	getResponseCode,
 	getResponseData,
+	handleFormData,
 	isIpWhitelisted,
 	setupOutputConnection,
 	validateWebhookAuthentication,
@@ -471,4 +478,148 @@ describe('Webhook Utils', () => {
 			expect(result).toEqual(decodedPayload);
 		});
 	});
+
+	describe('handleFormData', () => {
+		const mockCopyBinaryFile = jest.fn().mockResolvedValue({
+			data: 'binary-data',
+			mimeType: 'text/plain',
+		});
+
+		const createMockContext = (options: IDataObject = {}): IWebhookFunctions =>
+			({
+				getRequestObject: jest.fn().mockReturnValue({
+					contentType: 'multipart/form-data',
+					headers: { 'content-type': 'multipart/form-data' },
+					params: {},
+					query: {},
+					body: {
+						data: { field1: 'value1' },
+						files: {},
+					},
+				}),
+				getNodeParameter: jest.fn().mockReturnValue(options),
+				nodeHelpers: {
+					copyBinaryFile: mockCopyBinaryFile,
+				},
+			}) as any;
+
+		const mockPrepareOutput = jest.fn().mockImplementation((data: INodeExecutionData) => [[data]]);
+
+		beforeEach(() => {
+			jest.clearAllMocks();
+		});
+
+		it('should use default binary property name for empty filename', async () => {
+			const context = createMockContext();
+			const req = context.getRequestObject() as MultiPartFormData.Request;
+			req.body.files = {
+				'': {
+					filepath: '/tmp/file1',
+					originalFilename: '',
+					newFilename: 'temp1',
+					mimetype: 'text/plain',
+				},
+			};
+
+			const result = await handleFormData(context, mockPrepareOutput);
+
+			expect(result.workflowData[0][0].binary).toEqual({
+				data0: expect.any(Object),
+			});
+		});
+
+		it('should use default binary property name for whitespace-only filename', async () => {
+			const context = createMockContext();
+			const req = context.getRequestObject() as MultiPartFormData.Request;
+			req.body.files = {
+				'   ': {
+					filepath: '/tmp/file1',
+					originalFilename: '   ',
+					newFilename: 'temp1',
+					mimetype: 'text/plain',
+				},
+			};
+
+			const result = await handleFormData(context, mockPrepareOutput);
+
+			expect(result.workflowData[0][0].binary).toEqual({
+				data0: expect.any(Object),
+			});
+		});
+
+		it('should handle multiple files with empty/whitespace filenames', async () => {
+			const context = createMockContext();
+			const req = context.getRequestObject() as MultiPartFormData.Request;
+			req.body.files = {
+				'': [
+					{
+						filepath: '/tmp/file1',
+						originalFilename: '',
+						newFilename: 'temp1',
+						mimetype: 'text/plain',
+					},
+					{
+						filepath: '/tmp/file2',
+						originalFilename: '',
+						newFilename: 'temp2',
+						mimetype: 'text/plain',
+					},
+				],
+				'  ': [
+					{
+						filepath: '/tmp/file3',
+						originalFilename: '  ',
+						newFilename: 'temp3',
+						mimetype: 'image/png',
+					},
+				],
+			};
+
+			const result = await handleFormData(context, mockPrepareOutput);
+
+			expect(result.workflowData[0][0].binary).toEqual({
+				data0: expect.any(Object),
+				data1: expect.any(Object),
+				data2: expect.any(Object),
+			});
+		});
+
+		it('should use custom binaryPropertyName with count for empty filenames', async () => {
+			const context = createMockContext({ binaryPropertyName: 'myFile' });
+			const req = context.getRequestObject() as MultiPartFormData.Request;
+			req.body.files = {
+				'': {
+					filepath: '/tmp/file1',
+					originalFilename: '',
+					newFilename: 'temp1',
+					mimetype: 'text/plain',
+				},
+			};
+
+			const result = await handleFormData(context, mockPrepareOutput);
+
+			expect(result.workflowData[0][0].binary).toEqual({
+				myFile0: expect.any(Object),
+			});
+		});
+
+		it('should preserve valid filename without using default naming', async () => {
+			const context = createMockContext();
+			const req = context.getRequestObject() as MultiPartFormData.Request;
+			req.body.files = {
+				validFile: {
+					filepath: '/tmp/file1',
+					originalFilename: 'validFile.txt',
+					newFilename: 'temp1',
+					mimetype: 'text/plain',
+				},
+			};
+
+			const result = await handleFormData(context, mockPrepareOutput);
+
+			expect(result.workflowData[0][0].binary).toEqual({
+				validFile: expect.any(Object),
+			});
+		});
+	});
 });
diff --git a/packages/nodes-base/nodes/Webhook/utils.ts b/packages/nodes-base/nodes/Webhook/utils.ts
index ba0706be915..5adea08eb4c 100644
--- a/packages/nodes-base/nodes/Webhook/utils.ts
+++ b/packages/nodes-base/nodes/Webhook/utils.ts
@@ -1,4 +1,5 @@
 import basicAuth from 'basic-auth';
+import { rm } from 'fs/promises';
 import jwt from 'jsonwebtoken';
 import { WorkflowConfigurationError } from 'n8n-workflow';
 import type {
@@ -6,7 +7,9 @@ import type {
 	INodeExecutionData,
 	IDataObject,
 	ICredentialDataDecryptedObject,
+	MultiPartFormData,
 } from 'n8n-workflow';
+import * as a from 'node:assert';
 
 import { WebhookAuthorizationError } from './error';
 import { formatPrivateKey } from '../../utils/utilities';
@@ -284,3 +287,68 @@ export async function validateWebhookAuthentication(
 		}
 	}
 }
+
+export async function handleFormData(
+	context: IWebhookFunctions,
+	prepareOutput: (data: INodeExecutionData) => INodeExecutionData[][],
+) {
+	const req = context.getRequestObject() as MultiPartFormData.Request;
+	a.ok(req.contentType === 'multipart/form-data', 'Expected multipart/form-data');
+	const options = context.getNodeParameter('options', {}) as IDataObject;
+	const { data, files } = req.body;
+
+	const returnItem: INodeExecutionData = {
+		json: {
+			headers: req.headers,
+			params: req.params,
+			query: req.query,
+			body: data,
+		},
+	};
+
+	if (files && Object.keys(files).length) {
+		returnItem.binary = {};
+	}
+
+	let count = 0;
+
+	for (const key of Object.keys(files)) {
+		const processFiles: MultiPartFormData.File[] = [];
+		let multiFile = false;
+		if (Array.isArray(files[key])) {
+			processFiles.push.apply(processFiles, files[key]);
+			multiFile = true;
+		} else {
+			processFiles.push(files[key]);
+		}
+
+		let fileCount = 0;
+		for (const file of processFiles) {
+			let binaryPropertyName = key;
+			if (binaryPropertyName.endsWith('[]')) {
+				binaryPropertyName = binaryPropertyName.slice(0, -2);
+			}
+			if (!binaryPropertyName.trim().length) {
+				binaryPropertyName = `data${count}`;
+			} else if (multiFile) {
+				binaryPropertyName += fileCount++;
+			}
+			if (options.binaryPropertyName) {
+				binaryPropertyName = `${options.binaryPropertyName}${count}`;
+			}
+
+			returnItem.binary![binaryPropertyName] = await context.nodeHelpers.copyBinaryFile(
+				file.filepath,
+				file.originalFilename ?? file.newFilename,
+				file.mimetype,
+			);
+
+			// Delete original file to prevent tmp directory from growing too large
+			await rm(file.filepath, { force: true });
+
+			count += 1;
+		}
+	}
+
+	return { workflowData: prepareOutput(returnItem) };
+}

From d710895dc09c02bd47f80b856ed402f3c00ed8f9 Mon Sep 17 00:00:00 2001
From: RomanDavydchuk <roman.davydchuk@n8n.io>
Date: Mon, 8 Dec 2025 21:39:35 +0200
Subject: [PATCH 138/167] feat(FTP Node): Add timeout option (#21868)

Co-authored-by: Shireen Missi <94372015+ShireenMissi@users.noreply.github.com>
---
 packages/nodes-base/nodes/Ftp/Ftp.node.ts     |  48 +++++-
 .../nodes/Ftp/__test__/Ftp.node.test.ts       | 152 ++++++++++++++++++
 2 files changed, 198 insertions(+), 2 deletions(-)
 create mode 100644 packages/nodes-base/nodes/Ftp/__test__/Ftp.node.test.ts

diff --git a/packages/nodes-base/nodes/Ftp/Ftp.node.ts b/packages/nodes-base/nodes/Ftp/Ftp.node.ts
index b4dc2c6691d..1b0127ce40d 100644
--- a/packages/nodes-base/nodes/Ftp/Ftp.node.ts
+++ b/packages/nodes-base/nodes/Ftp/Ftp.node.ts
@@ -8,6 +8,7 @@ import type {
 	IExecuteFunctions,
 	INodeCredentialTestResult,
 	INodeExecutionData,
+	INodeProperties,
 	INodeType,
 	INodeTypeDescription,
 	JsonObject,
@@ -109,6 +110,17 @@ function normalizeFtpItem(input: ftpClient.ListingElement, path: string, recursi
 	item.date = undefined;
 }
 
+const timeoutOption: INodeProperties = {
+	displayName: 'Timeout',
+	name: 'timeout',
+	description: 'Connection timeout in milliseconds',
+	type: 'number',
+	typeOptions: {
+		minValue: 1,
+	},
+	default: 10000,
+};
+
 export class Ftp implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'FTP',
@@ -256,6 +268,7 @@ export class Ftp implements INodeType {
 						default: false,
 						description: 'Whether to remove all files and directories in target directory',
 					},
+					timeoutOption,
 				],
 			},
 
@@ -331,6 +344,7 @@ export class Ftp implements INodeType {
 							},
 						},
 					},
+					timeoutOption,
 				],
 			},
 			// ----------------------------------
@@ -382,6 +396,7 @@ export class Ftp implements INodeType {
 						description:
 							'Whether to recursively create destination directory when renaming an existing file or folder',
 					},
+					timeoutOption,
 				],
 			},
 
@@ -442,6 +457,19 @@ export class Ftp implements INodeType {
 				default: '',
 				description: 'The text content of the file to upload',
 			},
+			{
+				displayName: 'Options',
+				name: 'options',
+				type: 'collection',
+				placeholder: 'Add Field',
+				default: {},
+				displayOptions: {
+					show: {
+						operation: ['upload'],
+					},
+				},
+				options: [timeoutOption],
+			},
 
 			// ----------------------------------
 			//         list
@@ -474,6 +502,19 @@ export class Ftp implements INodeType {
 					'Whether to return object representing all directories / objects recursively found within SFTP server',
 				required: true,
 			},
+			{
+				displayName: 'Options',
+				name: 'options',
+				type: 'collection',
+				placeholder: 'Add Field',
+				default: {},
+				displayOptions: {
+					show: {
+						operation: ['list'],
+					},
+				},
+				options: [timeoutOption],
+			},
 		],
 	};
 
@@ -553,6 +594,8 @@ export class Ftp implements INodeType {
 		let credentials: ICredentialDataDecryptedObject | undefined = undefined;
 		const protocol = this.getNodeParameter('protocol', 0) as string;
 
+		const connectionTimeout = this.getNodeParameter('options.timeout', 0, 10000) as number;
+
 		if (protocol === 'sftp') {
 			credentials = await this.getCredentials<ICredentialDataDecryptedObject>('sftp');
 		} else {
@@ -573,7 +616,7 @@ export class Ftp implements INodeType {
 							password: (credentials.password as string) || undefined,
 							privateKey: formatPrivateKey(credentials.privateKey as string),
 							passphrase: credentials.passphrase as string | undefined,
-							readyTimeout: 10000,
+							readyTimeout: connectionTimeout,
 							algorithms: {
 								compress: ['zlib@openssh.com', 'zlib', 'none'],
 							},
@@ -584,7 +627,7 @@ export class Ftp implements INodeType {
 							port: credentials.port as number,
 							username: credentials.username as string,
 							password: credentials.password as string,
-							readyTimeout: 10000,
+							readyTimeout: connectionTimeout,
 							algorithms: {
 								compress: ['zlib@openssh.com', 'zlib', 'none'],
 							},
@@ -597,6 +640,7 @@ export class Ftp implements INodeType {
 						port: credentials.port as number,
 						user: credentials.username as string,
 						password: credentials.password as string,
+						connTimeout: connectionTimeout,
 					});
 				}
 			} catch (error) {
diff --git a/packages/nodes-base/nodes/Ftp/__test__/Ftp.node.test.ts b/packages/nodes-base/nodes/Ftp/__test__/Ftp.node.test.ts
new file mode 100644
index 00000000000..7ad0934e583
--- /dev/null
+++ b/packages/nodes-base/nodes/Ftp/__test__/Ftp.node.test.ts
@@ -0,0 +1,152 @@
+import { mockDeep } from 'jest-mock-extended';
+import type { IExecuteFunctions, NodeExecutionWithMetadata } from 'n8n-workflow';
+import type PromiseFtp from 'promise-ftp';
+import * as ftpModule from 'promise-ftp';
+import type sftp from 'ssh2-sftp-client';
+import * as sftpModule from 'ssh2-sftp-client';
+
+import { Ftp } from '../Ftp.node';
+
+jest.mock('promise-ftp');
+jest.mock('ssh2-sftp-client');
+
+describe('Ftp', () => {
+	const executeFunctions = mockDeep<IExecuteFunctions>();
+
+	beforeEach(() => {
+		jest.resetAllMocks();
+
+		executeFunctions.getInputData.mockReturnValue([{ json: {} }]);
+		executeFunctions.helpers.constructExecutionMetaData.mockImplementation(
+			(data) => data as NodeExecutionWithMetadata[],
+		);
+	});
+
+	it('should add timeout option with ftp', async () => {
+		const connect = jest.fn();
+		jest.spyOn(ftpModule, 'default').mockImplementation(
+			() =>
+				({
+					connect,
+					delete: jest.fn(),
+					end: jest.fn(),
+				}) as unknown as PromiseFtp,
+		);
+		executeFunctions.getCredentials.mockResolvedValue({
+			host: 'test.com',
+			port: 21,
+			user: 'test',
+			password: 'test',
+		});
+		executeFunctions.getNodeParameter.mockImplementation((parameterName, _idx, defaultValue) => {
+			switch (parameterName) {
+				case 'operation':
+					return 'delete';
+				case 'protocol':
+					return 'ftp';
+				case 'options.timeout':
+					return 12345;
+				case 'path':
+					return '/test/path';
+				case 'options':
+					return {};
+				default:
+					return defaultValue;
+			}
+		});
+
+		await new Ftp().execute.call(executeFunctions);
+
+		expect(connect).toHaveBeenCalledWith(
+			expect.objectContaining({
+				connTimeout: 12345,
+			}),
+		);
+	});
+
+	it('should add timeout option with sftp without private key', async () => {
+		const connect = jest.fn();
+		jest.spyOn(sftpModule, 'default').mockImplementation(
+			() =>
+				({
+					connect,
+					delete: jest.fn(),
+					end: jest.fn(),
+				}) as unknown as sftp,
+		);
+		executeFunctions.getCredentials.mockResolvedValue({
+			host: 'test.com',
+			port: 21,
+			user: 'test',
+			password: 'test',
+		});
+		executeFunctions.getNodeParameter.mockImplementation((parameterName, _idx, defaultValue) => {
+			switch (parameterName) {
+				case 'operation':
+					return 'delete';
+				case 'protocol':
+					return 'sftp';
+				case 'options.timeout':
+					return 12345;
+				case 'path':
+					return '/test/path';
+				case 'options':
+					return {};
+				default:
+					return defaultValue;
+			}
+		});
+
+		await new Ftp().execute.call(executeFunctions);
+
+		expect(connect).toHaveBeenCalledWith(
+			expect.objectContaining({
+				readyTimeout: 12345,
+			}),
+		);
+	});
+
+	it('should add timeout option with sftp with private key', async () => {
+		const connect = jest.fn();
+		jest.spyOn(sftpModule, 'default').mockImplementation(
+			() =>
+				({
+					connect,
+					delete: jest.fn(),
+					end: jest.fn(),
+				}) as unknown as sftp,
+		);
+		executeFunctions.getCredentials.mockResolvedValue({
+			host: 'test.com',
+			port: 21,
+			user: 'test',
+			password: 'test',
+			privateKey: 'test-private-key',
+			passphrase: 'test-passphrase',
+		});
+		executeFunctions.getNodeParameter.mockImplementation((parameterName, _idx, defaultValue) => {
+			switch (parameterName) {
+				case 'operation':
+					return 'delete';
+				case 'protocol':
+					return 'sftp';
+				case 'options.timeout':
+					return 12345;
+				case 'path':
+					return '/test/path';
+				case 'options':
+					return {};
+				default:
+					return defaultValue;
+			}
+		});
+
+		await new Ftp().execute.call(executeFunctions);
+
+		expect(connect).toHaveBeenCalledWith(
+			expect.objectContaining({
+				readyTimeout: 12345,
+			}),
+		);
+	});
+});

From a77cf97d4815e6effb0a0cb54e2d7077db015ff2 Mon Sep 17 00:00:00 2001
From: Jaakko Husso <jaakko@n8n.io>
Date: Mon, 8 Dec 2025 21:59:20 +0200
Subject: [PATCH 139/167] fix(core): Adjust chat hub system prompt to avoid
 claiming it can generate images (no-changelog) (#22932)

---
 .../src/modules/chat-hub/chat-hub-workflow.service.ts  | 10 ++++++++--
 packages/cli/src/modules/chat-hub/chat-hub.service.ts  |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/packages/cli/src/modules/chat-hub/chat-hub-workflow.service.ts b/packages/cli/src/modules/chat-hub/chat-hub-workflow.service.ts
index dc05fae2804..f3176f89dee 100644
--- a/packages/cli/src/modules/chat-hub/chat-hub-workflow.service.ts
+++ b/packages/cli/src/modules/chat-hub/chat-hub-workflow.service.ts
@@ -474,11 +474,17 @@ export class ChatHubWorkflowService {
 		});
 
 		return `The user's current local date and time is: ${now} (timezone: ${timeZone}).
-When you need to reference “now”, use this date and time.`;
+When you need to reference "now", use this date and time.
+
+You can only produce text responses.
+You cannot create, generate, edit, or display images, videos, or other non-text content.
+If the user asks you to generate or edit an image (or other media), explain that you are not able to do that and, if helpful, describe in words what the image could look like or how they could create it using external tools.`;
 	}
 
 	private getBaseSystemMessage(timeZone: string) {
-		return 'You are a helpful assistant.\n' + this.getSystemMessageMetadata(timeZone);
+		return `You are a helpful assistant.
+
+${this.getSystemMessageMetadata(timeZone)}`;
 	}
 
 	private buildToolsAgentNode(
diff --git a/packages/cli/src/modules/chat-hub/chat-hub.service.ts b/packages/cli/src/modules/chat-hub/chat-hub.service.ts
index 9ec36379e0d..ccccaf1f628 100644
--- a/packages/cli/src/modules/chat-hub/chat-hub.service.ts
+++ b/packages/cli/src/modules/chat-hub/chat-hub.service.ts
@@ -499,7 +499,7 @@ export class ChatHubService {
 		}
 
 		const systemMessage =
-			agent.systemPrompt + '\n' + this.chatHubWorkflowService.getSystemMessageMetadata(timeZone);
+			agent.systemPrompt + '\n\n' + this.chatHubWorkflowService.getSystemMessageMetadata(timeZone);
 
 		const model: ChatHubBaseLLMModel = {
 			provider: agent.provider,

From 10b52b18172ed70581e18dab568d626d7b115040 Mon Sep 17 00:00:00 2001
From: Charlie Kolb <charlie@n8n.io>
Date: Tue, 9 Dec 2025 09:10:56 +0100
Subject: [PATCH 140/167] test(core): Add withPublishHistory parameter to
 workflow test utils (#22902)

---
 .../backend-test-utils/src/db/workflows.ts    | 23 ++++++++++++++++---
 .../source-control-import.service.ee.ts       |  3 ++-
 .../active-workflow-manager.test.ts           |  7 +++++-
 .../repositories/workflow.repository.test.ts  |  7 +++++-
 .../folder/folder.controller.test.ts          | 11 ++++++++-
 .../test/integration/import.service.test.ts   |  9 +++++++-
 .../integration/public-api/workflows.test.ts  |  1 +
 .../credentials-risk-reporter.test.ts         |  8 ++++++-
 .../instance-risk-reporter.test.ts            |  2 +-
 .../workflow-history-manager.test.ts          |  2 +-
 ...er-with-active-workflow-manager.ee.test.ts |  7 +++++-
 .../workflows/workflows.controller.ee.test.ts |  8 ++++++-
 .../workflows/workflows.controller.test.ts    |  1 +
 13 files changed, 76 insertions(+), 13 deletions(-)

diff --git a/packages/@n8n/backend-test-utils/src/db/workflows.ts b/packages/@n8n/backend-test-utils/src/db/workflows.ts
index 0d8274f9ae6..a35fa5f159d 100644
--- a/packages/@n8n/backend-test-utils/src/db/workflows.ts
+++ b/packages/@n8n/backend-test-utils/src/db/workflows.ts
@@ -1,4 +1,4 @@
-import type { SharedWorkflow, IWorkflowDb } from '@n8n/db';
+import type { SharedWorkflow, IWorkflowDb, WorkflowPublishHistory } from '@n8n/db';
 import {
 	Project,
 	User,
@@ -6,6 +6,7 @@ import {
 	SharedWorkflowRepository,
 	WorkflowRepository,
 	WorkflowHistoryRepository,
+	WorkflowPublishHistoryRepository,
 } from '@n8n/db';
 import { Container } from '@n8n/di';
 import type { WorkflowSharingRole } from '@n8n/permissions';
@@ -196,12 +197,13 @@ export async function createWorkflowWithTrigger(
 export async function createWorkflowWithHistory(
 	attributes: Partial<IWorkflowDb> = {},
 	userOrProject?: User | Project,
+	withPublishHistory?: Partial<WorkflowPublishHistory>,
 ) {
 	const workflow = await createWorkflow(attributes, userOrProject);
 
 	// Create workflow history for the initial version
 	const user = userOrProject instanceof User ? userOrProject : undefined;
-	await createWorkflowHistory(workflow, user);
+	await createWorkflowHistory(workflow, user, withPublishHistory);
 
 	return workflow;
 }
@@ -214,11 +216,12 @@ export async function createWorkflowWithHistory(
 export async function createWorkflowWithTriggerAndHistory(
 	attributes: Partial<IWorkflowDb> = {},
 	userOrProject?: User | Project,
+	withPublishHistory?: Partial<WorkflowPublishHistory>,
 ) {
 	const workflow = await createWorkflowWithTrigger(attributes, userOrProject);
 
 	// Create workflow history for the initial version
-	await createWorkflowHistory(workflow, userOrProject);
+	await createWorkflowHistory(workflow, userOrProject, withPublishHistory);
 
 	return workflow;
 }
@@ -242,6 +245,7 @@ export const getWorkflowById = async (id: string) =>
 export async function createWorkflowHistory(
 	workflow: IWorkflowDb,
 	userOrProject?: User | Project,
+	withPublishHistory?: Partial<WorkflowPublishHistory>,
 ): Promise<void> {
 	await Container.get(WorkflowHistoryRepository).insert({
 		workflowId: workflow.id,
@@ -250,6 +254,18 @@ export async function createWorkflowHistory(
 		connections: workflow.connections,
 		authors: userOrProject instanceof User ? userOrProject.email : 'test@example.com',
 	});
+
+	if (withPublishHistory) {
+		// We wait a millisecond as createdAt order is often relevant for the publishing history
+		await new Promise((res) => setTimeout(res, 1));
+		await Container.get(WorkflowPublishHistoryRepository).insert({
+			workflowId: workflow.id,
+			versionId: workflow.versionId,
+			event: 'activated',
+			userId: userOrProject instanceof User ? userOrProject.id : undefined,
+			...withPublishHistory,
+		});
+	}
 }
 
 /**
@@ -279,6 +295,7 @@ export async function createActiveWorkflow(
 	const workflow = await createWorkflowWithTriggerAndHistory(
 		{ active: true, ...attributes },
 		userOrProject,
+		{},
 	);
 
 	await setActiveVersion(workflow.id, workflow.versionId);
diff --git a/packages/cli/src/environments.ee/source-control/source-control-import.service.ee.ts b/packages/cli/src/environments.ee/source-control/source-control-import.service.ee.ts
index 94c53739363..22ca39d5bcc 100644
--- a/packages/cli/src/environments.ee/source-control/source-control-import.service.ee.ts
+++ b/packages/cli/src/environments.ee/source-control/source-control-import.service.ee.ts
@@ -71,6 +71,7 @@ import type {
 } from './types/resource-owner';
 import type { SourceControlContext } from './types/source-control-context';
 import type { SourceControlWorkflowVersionId } from './types/source-control-workflow-version-id';
+import { QueryDeepPartialEntity } from '@n8n/typeorm/query-builder/QueryPartialEntity';
 
 const findOwnerProject = (
 	owner: RemoteResourceOwner,
@@ -893,7 +894,7 @@ export class SourceControlImportService {
 				}
 
 				const tagCopy = this.tagRepository.create(tag);
-				await this.tagRepository.upsert(tagCopy, {
+				await this.tagRepository.upsert(tagCopy as QueryDeepPartialEntity<TagEntity>, {
 					skipUpdateIfNoValuesChanged: true,
 					conflictPaths: { id: true },
 				});
diff --git a/packages/cli/test/integration/active-workflow-manager.test.ts b/packages/cli/test/integration/active-workflow-manager.test.ts
index 0e0c94a4754..0c995a590e4 100644
--- a/packages/cli/test/integration/active-workflow-manager.test.ts
+++ b/packages/cli/test/integration/active-workflow-manager.test.ts
@@ -84,7 +84,12 @@ beforeAll(async () => {
 
 afterEach(async () => {
 	await activeWorkflowManager.removeAll();
-	await testDb.truncate(['WorkflowEntity', 'WebhookEntity', 'WorkflowHistory']);
+	await testDb.truncate([
+		'WorkflowEntity',
+		'WebhookEntity',
+		'WorkflowHistory',
+		'WorkflowPublishHistory',
+	]);
 	jest.clearAllMocks();
 });
 
diff --git a/packages/cli/test/integration/database/repositories/workflow.repository.test.ts b/packages/cli/test/integration/database/repositories/workflow.repository.test.ts
index df52156cfe2..3274f5a6ef6 100644
--- a/packages/cli/test/integration/database/repositories/workflow.repository.test.ts
+++ b/packages/cli/test/integration/database/repositories/workflow.repository.test.ts
@@ -22,7 +22,12 @@ describe('WorkflowRepository', () => {
 	});
 
 	beforeEach(async () => {
-		await testDb.truncate(['WorkflowDependency', 'WorkflowEntity', 'WorkflowHistory']);
+		await testDb.truncate([
+			'WorkflowDependency',
+			'WorkflowEntity',
+			'WorkflowHistory',
+			'WorkflowPublishHistory',
+		]);
 	});
 
 	afterAll(async () => {
diff --git a/packages/cli/test/integration/folder/folder.controller.test.ts b/packages/cli/test/integration/folder/folder.controller.test.ts
index d64d15c5b79..920d7053960 100644
--- a/packages/cli/test/integration/folder/folder.controller.test.ts
+++ b/packages/cli/test/integration/folder/folder.controller.test.ts
@@ -54,7 +54,16 @@ const activeWorkflowManager = mockInstance(ActiveWorkflowManager);
 beforeEach(async () => {
 	testServer.license.enable('feat:folders');
 
-	await testDb.truncate(['Folder', 'SharedWorkflow', 'TagEntity', 'Project', 'ProjectRelation']);
+	await testDb.truncate([
+		'Folder',
+		'SharedWorkflow',
+		'TagEntity',
+		'Project',
+		'ProjectRelation',
+		'WorkflowEntity',
+		'WorkflowHistory',
+		'WorkflowPublishHistory',
+	]);
 
 	projectRepository = Container.get(ProjectRepository);
 	folderRepository = Container.get(FolderRepository);
diff --git a/packages/cli/test/integration/import.service.test.ts b/packages/cli/test/integration/import.service.test.ts
index 3bd0209904c..9017ec74d59 100644
--- a/packages/cli/test/integration/import.service.test.ts
+++ b/packages/cli/test/integration/import.service.test.ts
@@ -63,7 +63,14 @@ describe('ImportService', () => {
 	});
 
 	afterEach(async () => {
-		await testDb.truncate(['WorkflowEntity', 'SharedWorkflow', 'TagEntity', 'WorkflowTagMapping']);
+		await testDb.truncate([
+			'WorkflowEntity',
+			'SharedWorkflow',
+			'TagEntity',
+			'WorkflowTagMapping',
+			'WorkflowHistory',
+			'WorkflowPublishHistory',
+		]);
 	});
 
 	afterAll(async () => {
diff --git a/packages/cli/test/integration/public-api/workflows.test.ts b/packages/cli/test/integration/public-api/workflows.test.ts
index 67bad030ddc..af406948100 100644
--- a/packages/cli/test/integration/public-api/workflows.test.ts
+++ b/packages/cli/test/integration/public-api/workflows.test.ts
@@ -80,6 +80,7 @@ beforeEach(async () => {
 		'WorkflowEntity',
 		'CredentialsEntity',
 		'WorkflowHistory',
+		'WorkflowPublishHistory',
 	]);
 
 	authOwnerAgent = testServer.publicApiAgentFor(owner);
diff --git a/packages/cli/test/integration/security-audit/credentials-risk-reporter.test.ts b/packages/cli/test/integration/security-audit/credentials-risk-reporter.test.ts
index 7bbfd0eb094..f90598cb802 100644
--- a/packages/cli/test/integration/security-audit/credentials-risk-reporter.test.ts
+++ b/packages/cli/test/integration/security-audit/credentials-risk-reporter.test.ts
@@ -30,7 +30,13 @@ beforeAll(async () => {
 });
 
 beforeEach(async () => {
-	await testDb.truncate(['WorkflowEntity', 'CredentialsEntity', 'ExecutionEntity']);
+	await testDb.truncate([
+		'WorkflowEntity',
+		'CredentialsEntity',
+		'ExecutionEntity',
+		'WorkflowHistory',
+		'WorkflowPublishHistory',
+	]);
 });
 
 afterAll(async () => {
diff --git a/packages/cli/test/integration/security-audit/instance-risk-reporter.test.ts b/packages/cli/test/integration/security-audit/instance-risk-reporter.test.ts
index d46996dae33..de96cf731f7 100644
--- a/packages/cli/test/integration/security-audit/instance-risk-reporter.test.ts
+++ b/packages/cli/test/integration/security-audit/instance-risk-reporter.test.ts
@@ -29,7 +29,7 @@ beforeAll(async () => {
 });
 
 beforeEach(async () => {
-	await testDb.truncate(['WorkflowEntity']);
+	await testDb.truncate(['WorkflowEntity', 'WorkflowHistory', 'WorkflowPublishHistory']);
 });
 
 afterAll(async () => {
diff --git a/packages/cli/test/integration/workflow-history-manager.test.ts b/packages/cli/test/integration/workflow-history-manager.test.ts
index 79e48454d83..91224957946 100644
--- a/packages/cli/test/integration/workflow-history-manager.test.ts
+++ b/packages/cli/test/integration/workflow-history-manager.test.ts
@@ -29,7 +29,7 @@ describe('Workflow History Manager', () => {
 	});
 
 	beforeEach(async () => {
-		await testDb.truncate(['WorkflowEntity', 'WorkflowHistory']);
+		await testDb.truncate(['WorkflowEntity', 'WorkflowHistory', 'WorkflowPublishHistory']);
 		jest.clearAllMocks();
 
 		globalConfig.workflowHistory.pruneTime = -1;
diff --git a/packages/cli/test/integration/workflows/workflows.controller-with-active-workflow-manager.ee.test.ts b/packages/cli/test/integration/workflows/workflows.controller-with-active-workflow-manager.ee.test.ts
index 6b8e5bcc479..804fc8cb271 100644
--- a/packages/cli/test/integration/workflows/workflows.controller-with-active-workflow-manager.ee.test.ts
+++ b/packages/cli/test/integration/workflows/workflows.controller-with-active-workflow-manager.ee.test.ts
@@ -27,7 +27,12 @@ beforeAll(async () => {
 });
 
 beforeEach(async () => {
-	await testDb.truncate(['WorkflowEntity', 'SharedWorkflow']);
+	await testDb.truncate([
+		'WorkflowEntity',
+		'SharedWorkflow',
+		'WorkflowHistory',
+		'WorkflowPublishHistory',
+	]);
 });
 
 describe('PUT /:workflowId/transfer', () => {
diff --git a/packages/cli/test/integration/workflows/workflows.controller.ee.test.ts b/packages/cli/test/integration/workflows/workflows.controller.ee.test.ts
index 334d5c9346c..9c2bbfed25e 100644
--- a/packages/cli/test/integration/workflows/workflows.controller.ee.test.ts
+++ b/packages/cli/test/integration/workflows/workflows.controller.ee.test.ts
@@ -93,7 +93,13 @@ beforeEach(async () => {
 	activeWorkflowManager.add.mockReset();
 	activeWorkflowManager.remove.mockReset();
 
-	await testDb.truncate(['WorkflowEntity', 'SharedWorkflow', 'WorkflowHistory', 'TagEntity']);
+	await testDb.truncate([
+		'WorkflowEntity',
+		'SharedWorkflow',
+		'WorkflowHistory',
+		'WorkflowPublishHistory',
+		'TagEntity',
+	]);
 });
 
 afterEach(() => {
diff --git a/packages/cli/test/integration/workflows/workflows.controller.test.ts b/packages/cli/test/integration/workflows/workflows.controller.test.ts
index 66cd7271c68..bc8e0635f5c 100644
--- a/packages/cli/test/integration/workflows/workflows.controller.test.ts
+++ b/packages/cli/test/integration/workflows/workflows.controller.test.ts
@@ -81,6 +81,7 @@ beforeEach(async () => {
 		'Folder',
 		'WorkflowEntity',
 		'WorkflowHistory',
+		'WorkflowPublishHistory',
 		'TagEntity',
 		'Project',
 		'User',

From 00dfd3f7b8a1f57679637fab74d008a5e6f89887 Mon Sep 17 00:00:00 2001
From: Andreas Fitzek <andreas.fitzek@n8n.io>
Date: Tue, 9 Dec 2025 09:34:58 +0100
Subject: [PATCH 141/167] chore(core): Implement identifiers for resolvers
 (#22826)

---
 .../oauth2-introspection-identifier.test.ts   | 267 ++++++++++++++++
 .../identifiers/identifier-interface.ts       |  29 ++
 .../oauth2-introspection-identifier.ts        | 289 ++++++++++++++++++
 .../identifiers/oauth2-utils.ts               |  13 +
 .../oauth-credential-resolver.ts              |   0
 5 files changed, 598 insertions(+)
 create mode 100644 packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/identifiers/__tests__/oauth2-introspection-identifier.test.ts
 create mode 100644 packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/identifiers/identifier-interface.ts
 create mode 100644 packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/identifiers/oauth2-introspection-identifier.ts
 create mode 100644 packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/identifiers/oauth2-utils.ts
 create mode 100644 packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/oauth-credential-resolver.ts

diff --git a/packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/identifiers/__tests__/oauth2-introspection-identifier.test.ts b/packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/identifiers/__tests__/oauth2-introspection-identifier.test.ts
new file mode 100644
index 00000000000..d1681da054a
--- /dev/null
+++ b/packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/identifiers/__tests__/oauth2-introspection-identifier.test.ts
@@ -0,0 +1,267 @@
+import { mockLogger } from '@n8n/backend-test-utils';
+import { Time } from '@n8n/constants';
+import axios from 'axios';
+import { mock } from 'jest-mock-extended';
+
+import type { CacheService } from '@/services/cache/cache.service';
+
+import { IdentifierValidationError } from '../identifier-interface';
+import { OAuth2TokenIntrospectionIdentifier } from '../oauth2-introspection-identifier';
+
+jest.mock('axios');
+const mockedAxios = axios as jest.Mocked<typeof axios>;
+
+describe('OAuth2TokenIntrospectionIdentifier', () => {
+	const logger = mockLogger();
+	const cache = mock<CacheService>();
+	let identifier: OAuth2TokenIntrospectionIdentifier;
+
+	const validOptions = {
+		metadataUri: 'https://auth.example.com/.well-known/oauth-authorization-server',
+		clientId: 'test-client',
+		clientSecret: 'test-secret',
+		subjectClaim: 'sub',
+	};
+
+	const validMetadata = {
+		issuer: 'https://auth.example.com',
+		introspection_endpoint: 'https://auth.example.com/oauth/introspect',
+		introspection_endpoint_auth_methods_supported: ['client_secret_basic', 'client_secret_post'],
+	};
+
+	const validIntrospectionResponse = {
+		active: true,
+		sub: 'user-123',
+		exp: Math.floor(Date.now() / 1000) + 3600, // 1 hour from now
+		scope: 'read write',
+		client_id: 'test-client',
+	};
+
+	const mockContext = {
+		identity: 'mock-access-token',
+		version: 1 as const,
+	};
+
+	beforeEach(() => {
+		jest.clearAllMocks();
+		identifier = new OAuth2TokenIntrospectionIdentifier(logger, cache);
+		cache.get.mockResolvedValue(undefined);
+		cache.set.mockResolvedValue();
+	});
+
+	describe('Happy Path', () => {
+		test('should resolve subject successfully with client_secret_basic', async () => {
+			// Mock metadata endpoint
+			mockedAxios.get.mockResolvedValueOnce({
+				status: 200,
+				data: validMetadata,
+			});
+
+			// Mock introspection endpoint
+			mockedAxios.post.mockResolvedValueOnce({
+				status: 200,
+				data: validIntrospectionResponse,
+			});
+
+			const result = await identifier.resolve(mockContext, validOptions);
+
+			expect(result).toBe('user-123');
+			expect(cache.set).toHaveBeenCalledWith(
+				expect.stringContaining('oauth2-introspection-identifier:subject'),
+				'user-123',
+				expect.any(Number),
+			);
+			expect(mockedAxios.post).toHaveBeenCalledWith(
+				'https://auth.example.com/oauth/introspect',
+				expect.any(URLSearchParams),
+				expect.objectContaining({
+					headers: expect.objectContaining({
+						Authorization: expect.stringMatching(/^Basic /),
+					}),
+				}),
+			);
+		});
+
+		test('should return cached result on subsequent calls', async () => {
+			// First cache.get call is for metadata (returns undefined, so will fetch)
+			// Second cache.get call is for subject (returns cached value)
+			cache.get.mockResolvedValueOnce(undefined).mockResolvedValueOnce('cached-user-123');
+
+			mockedAxios.get.mockResolvedValueOnce({
+				status: 200,
+				data: validMetadata,
+			});
+
+			const result = await identifier.resolve(mockContext, validOptions);
+
+			expect(result).toBe('cached-user-123');
+			expect(mockedAxios.post).not.toHaveBeenCalled(); // Should not call introspection
+		});
+
+		test('should extract subject from custom claim', async () => {
+			const customOptions = { ...validOptions, subjectClaim: 'username' };
+			const customResponse = { ...validIntrospectionResponse, username: 'john.doe' };
+
+			mockedAxios.get.mockResolvedValueOnce({
+				status: 200,
+				data: validMetadata,
+			});
+
+			mockedAxios.post.mockResolvedValueOnce({
+				status: 200,
+				data: customResponse,
+			});
+
+			const result = await identifier.resolve(mockContext, customOptions);
+
+			expect(result).toBe('john.doe');
+		});
+	});
+
+	describe('Critical Errors', () => {
+		test('should throw IdentifierValidationError for invalid options', async () => {
+			const invalidOptions = { metadataUri: 'not-a-url' };
+
+			await expect(identifier.resolve(mockContext, invalidOptions)).rejects.toThrow(
+				IdentifierValidationError,
+			);
+		});
+
+		test('should throw IdentifierValidationError when token is not active', async () => {
+			mockedAxios.get.mockResolvedValue({
+				status: 200,
+				data: validMetadata,
+			});
+
+			mockedAxios.post.mockResolvedValue({
+				status: 200,
+				data: { ...validIntrospectionResponse, active: false },
+			});
+
+			await expect(identifier.resolve(mockContext, validOptions)).rejects.toThrow(
+				IdentifierValidationError,
+			);
+			await expect(identifier.resolve(mockContext, validOptions)).rejects.toThrow(
+				'Token is not active',
+			);
+		});
+
+		test('should throw IdentifierValidationError when metadata fetch fails', async () => {
+			mockedAxios.get.mockResolvedValue({
+				status: 404,
+				data: {},
+			});
+
+			await expect(identifier.resolve(mockContext, validOptions)).rejects.toThrow(
+				IdentifierValidationError,
+			);
+			await expect(identifier.resolve(mockContext, validOptions)).rejects.toThrow(
+				'Failed to fetch OAuth2 metadata',
+			);
+		});
+
+		test('should throw IdentifierValidationError when subject claim is missing', async () => {
+			mockedAxios.get.mockResolvedValue({
+				status: 200,
+				data: validMetadata,
+			});
+
+			const responseWithoutSub = { active: true, exp: validIntrospectionResponse.exp };
+			mockedAxios.post.mockResolvedValue({
+				status: 200,
+				data: responseWithoutSub,
+			});
+
+			await expect(identifier.resolve(mockContext, validOptions)).rejects.toThrow(
+				IdentifierValidationError,
+			);
+			await expect(identifier.resolve(mockContext, validOptions)).rejects.toThrow(
+				'missing subject claim',
+			);
+		});
+	});
+
+	describe('Edge Cases', () => {
+		test('should default to client_secret_basic when auth methods not specified', async () => {
+			const metadataWithoutAuthMethods = {
+				issuer: 'https://auth.example.com',
+				introspection_endpoint: 'https://auth.example.com/oauth/introspect',
+			};
+
+			mockedAxios.get.mockResolvedValueOnce({
+				status: 200,
+				data: metadataWithoutAuthMethods,
+			});
+
+			mockedAxios.post.mockResolvedValueOnce({
+				status: 200,
+				data: validIntrospectionResponse,
+			});
+
+			const result = await identifier.resolve(mockContext, validOptions);
+
+			expect(result).toBe('user-123');
+			expect(mockedAxios.post).toHaveBeenCalledWith(
+				expect.any(String),
+				expect.any(URLSearchParams),
+				expect.objectContaining({
+					headers: expect.objectContaining({
+						Authorization: expect.stringMatching(/^Basic /),
+					}),
+				}),
+			);
+		});
+
+		test('should cap TTL at MAX_TOKEN_CACHE_TIMEOUT for long-lived token', async () => {
+			const longLivedResponse = {
+				...validIntrospectionResponse,
+				exp: Math.floor(Date.now() / 1000) + 7200, // 2 hours from now
+			};
+
+			mockedAxios.get.mockResolvedValue({
+				status: 200,
+				data: validMetadata,
+			});
+
+			mockedAxios.post.mockResolvedValue({
+				status: 200,
+				data: longLivedResponse,
+			});
+
+			await identifier.resolve(mockContext, validOptions);
+
+			// Check that the subject cache was set with the max TTL
+			// Find the call that sets the subject (not metadata)
+			const subjectCacheCall = cache.set.mock.calls.find((call) => call[0].includes(':subject:'));
+
+			expect(subjectCacheCall).toBeDefined();
+			expect(subjectCacheCall![2]).toBe(5 * Time.minutes.toMilliseconds);
+		});
+
+		test('should use MIN_TOKEN_CACHE_TIMEOUT for expired but active token', async () => {
+			const expiredButActiveResponse = {
+				...validIntrospectionResponse,
+				exp: Math.floor(Date.now() / 1000) - 3600, // 1 hour ago
+			};
+
+			mockedAxios.get.mockResolvedValue({
+				status: 200,
+				data: validMetadata,
+			});
+
+			mockedAxios.post.mockResolvedValue({
+				status: 200,
+				data: expiredButActiveResponse,
+			});
+
+			await identifier.resolve(mockContext, validOptions);
+
+			// Check that the subject cache was set with the min TTL
+			// Find the call that sets the subject (not metadata)
+			const subjectCacheCall = cache.set.mock.calls.find((call) => call[0].includes(':subject:'));
+
+			expect(subjectCacheCall).toBeDefined();
+			expect(subjectCacheCall![2]).toBe(30 * Time.seconds.toMilliseconds);
+		});
+	});
+});
diff --git a/packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/identifiers/identifier-interface.ts b/packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/identifiers/identifier-interface.ts
new file mode 100644
index 00000000000..2f20665ded0
--- /dev/null
+++ b/packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/identifiers/identifier-interface.ts
@@ -0,0 +1,29 @@
+import type { ICredentialContext } from 'n8n-workflow';
+
+/**
+ * Error thrown when token identifier validation or resolution fails
+ */
+export class IdentifierValidationError extends Error {}
+
+/**
+ * Interface for resolving unique identifiers from credential contexts
+ */
+export interface ITokenIdentifier {
+	/**
+	 * Resolves a unique identifier for the entity in the given context
+	 *
+	 * @param context - Credential context with execution details
+	 * @param identifierOptions - Implementation-specific options
+	 * @returns Unique identifier string
+	 * @throws {IdentifierValidationError} When validation or resolution fails
+	 */
+	resolve(context: ICredentialContext, identifierOptions: Record<string, unknown>): Promise<string>;
+
+	/**
+	 * Validates identifier options before use
+	 *
+	 * @param identifierOptions - Implementation-specific options
+	 * @throws {IdentifierValidationError} When options are invalid
+	 */
+	validateOptions(identifierOptions: Record<string, unknown>): Promise<void>;
+}
diff --git a/packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/identifiers/oauth2-introspection-identifier.ts b/packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/identifiers/oauth2-introspection-identifier.ts
new file mode 100644
index 00000000000..4e63c6c626f
--- /dev/null
+++ b/packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/identifiers/oauth2-introspection-identifier.ts
@@ -0,0 +1,289 @@
+import { Logger } from '@n8n/backend-common';
+import { Time } from '@n8n/constants';
+import { Service } from '@n8n/di';
+import axios from 'axios';
+import type { ICredentialContext } from 'n8n-workflow';
+import { z } from 'zod';
+
+import { CacheService } from '@/services/cache/cache.service';
+
+import { IdentifierValidationError, ITokenIdentifier } from './identifier-interface';
+import { OAuth2OptionsSchema, sha256 } from './oauth2-utils';
+
+// Use minimum of 30 seconds to avoid cache thrashing
+// Cap at 5 minutes to ensure periodic revalidation
+const MIN_TOKEN_CACHE_TIMEOUT = 30 * Time.seconds.toMilliseconds;
+const MAX_TOKEN_CACHE_TIMEOUT = 5 * Time.minutes.toMilliseconds;
+const DEFAULT_CACHE_TIMEOUT = 60 * Time.seconds.toMilliseconds; // 60 seconds
+const METADATA_CACHE_TIMEOUT = 1 * Time.hours.toMilliseconds; // 1 hour
+
+export const OAuth2IntrospectionOptionsSchema = z.object({
+	...OAuth2OptionsSchema.shape,
+	clientId: z.string(),
+	clientSecret: z.string(),
+});
+
+type OAuth2IntrospectionOptions = z.infer<typeof OAuth2IntrospectionOptionsSchema>;
+
+const OAuth2MetadataSchema = z.object({
+	issuer: z.string().url(),
+	introspection_endpoint: z.string().url(),
+	// This could be an well defined enum, but to make sure we are not failing validation
+	// of unknown values, we keep it as string
+	introspection_endpoint_auth_methods_supported: z.array(z.string()).optional(),
+});
+
+type OAuth2Metadata = z.infer<typeof OAuth2MetadataSchema>;
+
+export const TokenIntrospectionResponseSchema = z
+	.object({
+		// Core fields
+		active: z.boolean(),
+
+		// Standard optional fields
+		scope: z.string().optional(),
+		client_id: z.string().optional(),
+		username: z.string().optional(),
+		token_type: z.string().optional(),
+		exp: z.number().int().optional(),
+		iat: z.number().int().optional(),
+		nbf: z.number().int().optional(),
+		sub: z.string().optional(),
+		aud: z.union([z.string(), z.array(z.string())]).optional(),
+		iss: z.string().optional(),
+		jti: z.string().optional(),
+	})
+	.passthrough(); // Allow additional custom claims
+
+export type TokenIntrospectionResponse = z.infer<typeof TokenIntrospectionResponseSchema>;
+
+const CACHE_PREFIX = 'oauth2-introspection-identifier';
+
+@Service()
+export class OAuth2TokenIntrospectionIdentifier implements ITokenIdentifier {
+	constructor(
+		private readonly logger: Logger,
+		private readonly cache: CacheService,
+	) {}
+
+	async validateOptions(identifierOptions: Record<string, unknown>): Promise<void> {
+		const options = this.parseOptions(identifierOptions);
+		const metadata = await this.fetchMetadata(options, true);
+		if (!metadata.introspection_endpoint) {
+			this.logger.error('Metadata does not contain an introspection endpoint');
+			throw new IdentifierValidationError('Metadata does not contain an introspection endpoint');
+		}
+		if (metadata.introspection_endpoint_auth_methods_supported) {
+			const supportedMethods = metadata.introspection_endpoint_auth_methods_supported;
+			if (
+				!supportedMethods.includes('client_secret_basic') &&
+				!supportedMethods.includes('client_secret_post')
+			) {
+				this.logger.error(
+					'No supported client authentication method for introspection endpoint, supported options are client_secret_basic and client_secret_post',
+				);
+				throw new IdentifierValidationError(
+					'No supported client authentication method for introspection endpoint, supported options are client_secret_basic and client_secret_post',
+				);
+			}
+		}
+	}
+
+	async resolve(
+		context: ICredentialContext,
+		identifierOptions: Record<string, unknown>,
+	): Promise<string> {
+		const options = this.parseOptions(identifierOptions);
+		const metadata = await this.fetchMetadata(options);
+
+		const hashedToken = sha256(context.identity);
+
+		const identifierCacheKey = `${CACHE_PREFIX}:subject:${metadata.issuer}:${hashedToken}`;
+		const cached = await this.cache.get<string>(identifierCacheKey);
+		if (cached) {
+			return cached;
+		}
+
+		let ttl = DEFAULT_CACHE_TIMEOUT;
+		const { subject, ttl: ttlOverwrite } = await this.resolveBasedOnTokenIntrospection(
+			metadata,
+			options,
+			context,
+		);
+		if (ttlOverwrite) {
+			ttl = ttlOverwrite;
+		}
+
+		await this.cache.set(identifierCacheKey, subject, ttl);
+		return subject;
+	}
+
+	// ------------------------ Private Methods ----------------------- //
+
+	private parseOptions(options: Record<string, unknown>): OAuth2IntrospectionOptions {
+		try {
+			return OAuth2IntrospectionOptionsSchema.parse(options);
+		} catch (error) {
+			this.logger.error('Invalid OAuth2 identifier options', { error });
+			throw new IdentifierValidationError('Invalid OAuth2 identifier options', {
+				cause: error,
+			});
+		}
+	}
+
+	private async fetchMetadata(
+		options: OAuth2IntrospectionOptions,
+		skipCache: boolean = false,
+	): Promise<OAuth2Metadata> {
+		const cacheKey = `${CACHE_PREFIX}:metadata:${options.metadataUri}`;
+		if (!skipCache) {
+			const cached = await this.cache.get<OAuth2Metadata>(cacheKey);
+			if (cached) {
+				return cached;
+			}
+		}
+
+		const response = await axios.get(options.metadataUri, {
+			validateStatus: () => true,
+			timeout: 10 * Time.seconds.toMilliseconds,
+		});
+
+		if (response.status !== 200) {
+			this.logger.error(
+				`Failed to fetch OAuth2 metadata from ${options.metadataUri}, status code: ${response.status}`,
+			);
+			throw new IdentifierValidationError(
+				`Failed to fetch OAuth2 metadata, status code: ${response.status}`,
+			);
+		}
+
+		try {
+			const metadata = OAuth2MetadataSchema.parse(response.data);
+			if (!skipCache) {
+				await this.cache.set(cacheKey, metadata, METADATA_CACHE_TIMEOUT);
+			}
+			return metadata;
+		} catch (error) {
+			this.logger.error('Invalid OAuth2 metadata format', { error });
+			throw new IdentifierValidationError('Invalid OAuth2 metadata format', { cause: error });
+		}
+	}
+
+	private buildClientBasicRequest(options: OAuth2IntrospectionOptions): {
+		headers: Record<string, string>;
+		params: Record<string, string>;
+	} {
+		const authHeaders: Record<string, string> = {};
+		const authParams: Record<string, string> = {};
+
+		const credentials = Buffer.from(
+			`${encodeURIComponent(options.clientId)}:${encodeURIComponent(options.clientSecret)}`,
+		).toString('base64');
+		authHeaders['Authorization'] = `Basic ${credentials}`;
+
+		return { headers: authHeaders, params: authParams };
+	}
+
+	private buildClientPostRequest(options: OAuth2IntrospectionOptions): {
+		headers: Record<string, string>;
+		params: Record<string, string>;
+	} {
+		const authHeaders: Record<string, string> = {};
+		const authParams: Record<string, string> = {};
+
+		authParams['client_id'] = options.clientId;
+		authParams['client_secret'] = options.clientSecret;
+
+		return { headers: authHeaders, params: authParams };
+	}
+
+	private parseIntrospectionResponse(data: unknown): TokenIntrospectionResponse {
+		try {
+			return TokenIntrospectionResponseSchema.parse(data);
+		} catch (error) {
+			this.logger.error('Invalid token introspection response format', { error });
+			throw new IdentifierValidationError('Invalid token introspection response format');
+		}
+	}
+
+	private async resolveBasedOnTokenIntrospection(
+		metadata: OAuth2Metadata,
+		options: OAuth2IntrospectionOptions,
+		context: ICredentialContext,
+	): Promise<{ subject: string; ttl?: number }> {
+		// Use token introspection to validate and get subject
+		const supportedMethods = metadata.introspection_endpoint_auth_methods_supported;
+		const useBasic = !supportedMethods || supportedMethods.includes('client_secret_basic');
+		const usePost = !useBasic && supportedMethods?.includes('client_secret_post');
+
+		let authHeaders: Record<string, string> = {};
+		let authParams: Record<string, string> = {};
+
+		if (useBasic) {
+			const result = this.buildClientBasicRequest(options);
+			authHeaders = result.headers;
+			authParams = result.params;
+		} else if (usePost) {
+			const result = this.buildClientPostRequest(options);
+			authHeaders = result.headers;
+			authParams = result.params;
+		} else {
+			this.logger.error('No supported client authentication method for introspection endpoint');
+			throw new IdentifierValidationError(
+				'No supported client authentication method for introspection endpoint',
+			);
+		}
+
+		const params = new URLSearchParams({
+			token: context.identity,
+			...authParams,
+		});
+
+		const response = await axios.post(metadata.introspection_endpoint, params, {
+			headers: { 'Content-Type': 'application/x-www-form-urlencoded', ...authHeaders },
+			validateStatus: () => true,
+			timeout: 10 * Time.seconds.toMilliseconds,
+		});
+
+		if (response.status !== 200) {
+			this.logger.debug('Token introspection failed', {
+				status: response.status,
+				data: response.data,
+			});
+			throw new IdentifierValidationError('Token introspection failed');
+		}
+
+		const introspectionData = this.parseIntrospectionResponse(response.data);
+
+		if (!introspectionData.active) {
+			this.logger.error('Token is not active according to introspection response');
+			throw new IdentifierValidationError('Token is not active');
+		}
+
+		const subject = introspectionData[options.subjectClaim];
+		if (!subject) {
+			this.logger.error(
+				`Token introspection response missing subject claim (${options.subjectClaim})`,
+			);
+			throw new IdentifierValidationError(
+				`Token introspection response missing subject claim (${options.subjectClaim})`,
+			);
+		}
+
+		const subjectStr = String(subject);
+
+		this.logger.debug('Token introspected successfully', { subject: subjectStr });
+
+		let ttl: number | undefined = undefined;
+		if (introspectionData.exp) {
+			const expiresIn = introspectionData.exp * 1000 - Date.now();
+			if (expiresIn > 0) {
+				ttl = Math.max(MIN_TOKEN_CACHE_TIMEOUT, Math.min(expiresIn, MAX_TOKEN_CACHE_TIMEOUT));
+			} else {
+				ttl = MIN_TOKEN_CACHE_TIMEOUT;
+			}
+		}
+
+		return { subject: subjectStr, ttl };
+	}
+}
diff --git a/packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/identifiers/oauth2-utils.ts b/packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/identifiers/oauth2-utils.ts
new file mode 100644
index 00000000000..187f2df40db
--- /dev/null
+++ b/packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/identifiers/oauth2-utils.ts
@@ -0,0 +1,13 @@
+import crypto from 'crypto';
+import z from 'zod';
+
+export const OAuth2OptionsSchema = z.object({
+	metadataUri: z.string().url(),
+	subjectClaim: z.string().optional().default('sub'),
+});
+
+export type OAuth2Options = z.infer<typeof OAuth2OptionsSchema>;
+
+export function sha256(token: string): string {
+	return crypto.createHash('sha256').update(token).digest('hex');
+}
diff --git a/packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/oauth-credential-resolver.ts b/packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/oauth-credential-resolver.ts
new file mode 100644
index 00000000000..e69de29bb2d

From 07e84c9d63278102d586f9e8ba8368bbebbc85c2 Mon Sep 17 00:00:00 2001
From: Konstantin Tieber <46342664+konstantintieber@users.noreply.github.com>
Date: Tue, 9 Dec 2025 09:48:33 +0100
Subject: [PATCH 142/167] refactor: Use paginated query to generate user access
 export csvs in SSO form (no-changelog) (#22930)

---
 .../useAccessSettingsCsvExport.test.ts        | 147 ++++++++++++++++++
 .../composables/useAccessSettingsCsvExport.ts | 120 ++++++++------
 2 files changed, 219 insertions(+), 48 deletions(-)
 create mode 100644 packages/frontend/editor-ui/src/features/settings/sso/provisioning/composables/useAccessSettingsCsvExport.test.ts

diff --git a/packages/frontend/editor-ui/src/features/settings/sso/provisioning/composables/useAccessSettingsCsvExport.test.ts b/packages/frontend/editor-ui/src/features/settings/sso/provisioning/composables/useAccessSettingsCsvExport.test.ts
new file mode 100644
index 00000000000..db446c936d6
--- /dev/null
+++ b/packages/frontend/editor-ui/src/features/settings/sso/provisioning/composables/useAccessSettingsCsvExport.test.ts
@@ -0,0 +1,147 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { useAccessSettingsCsvExport } from './useAccessSettingsCsvExport';
+import * as usersApi from '@n8n/rest-api-client/api/users';
+import type { UsersList, User } from '@n8n/api-types';
+
+const mockedRestApiContext = {};
+vi.mock('@n8n/rest-api-client/api/users');
+vi.mock('@n8n/stores/useRootStore', () => ({
+	useRootStore: () => ({
+		restApiContext: mockedRestApiContext,
+	}),
+}));
+
+describe('useAccessSettingsCsvExport', () => {
+	beforeEach(() => {
+		vi.clearAllMocks();
+
+		// Mock DOM APIs used to create csv files on the client
+		global.URL.createObjectURL = vi.fn(() => 'mock-url');
+		global.URL.revokeObjectURL = vi.fn();
+		global.document.createElement = vi.fn(() => ({
+			setAttribute: vi.fn(),
+			click: vi.fn(),
+			style: {},
+		})) as unknown as typeof document.createElement;
+		global.document.body.appendChild = vi.fn();
+		global.document.body.removeChild = vi.fn();
+	});
+
+	const createMockUser = (id: number, overrides?: Partial<User>): User => {
+		return {
+			id: id.toString(),
+			email: `user${id}@example.com`,
+			role: 'global:member',
+			projectRelations: [],
+			...overrides,
+		} as User;
+	};
+
+	const createMockUsersResponse = (totalCount: number, itemsCount: number): UsersList => {
+		const items: User[] = [];
+		for (let i = 0; i < itemsCount; i++) {
+			items.push(createMockUser(i + 1));
+		}
+		return {
+			count: totalCount,
+			items,
+		};
+	};
+
+	describe('users list query pagination and caching', () => {
+		it('fetches one page on instance that has less than 50 users', async () => {
+			const mockResponse = createMockUsersResponse(30, 30);
+			vi.mocked(usersApi.getUsers).mockResolvedValueOnce(mockResponse);
+
+			await useAccessSettingsCsvExport().downloadProjectRolesCsv();
+
+			expect(usersApi.getUsers).toHaveBeenCalledTimes(1);
+
+			expect(usersApi.getUsers).toHaveBeenCalledWith(
+				mockedRestApiContext,
+				expect.objectContaining({
+					sortBy: ['email:desc'],
+					take: 50,
+					skip: 0,
+					select: ['email', 'role'],
+					expand: ['projectRelations'],
+				}),
+			);
+		});
+
+		it('fetches three pages on instance that has 140 users', async () => {
+			// Mock getUsers with different responses for each call
+			const page1Response = createMockUsersResponse(140, 50);
+			const page2Response = createMockUsersResponse(140, 50);
+			const page3Response = createMockUsersResponse(140, 40);
+
+			vi.mocked(usersApi.getUsers)
+				.mockResolvedValueOnce(page1Response)
+				.mockResolvedValueOnce(page2Response)
+				.mockResolvedValueOnce(page3Response);
+
+			await useAccessSettingsCsvExport().downloadProjectRolesCsv();
+
+			// Assert getUsers was called exactly 3 times
+			expect(usersApi.getUsers).toHaveBeenCalledTimes(3);
+
+			// Verify each call had correct skip values
+			expect(usersApi.getUsers).toHaveBeenNthCalledWith(
+				1,
+				mockedRestApiContext,
+				expect.objectContaining({
+					skip: 0,
+					take: 50,
+				}),
+			);
+			expect(usersApi.getUsers).toHaveBeenNthCalledWith(
+				2,
+				mockedRestApiContext,
+				expect.objectContaining({
+					skip: 50,
+					take: 50,
+				}),
+			);
+			expect(usersApi.getUsers).toHaveBeenNthCalledWith(
+				3,
+				mockedRestApiContext,
+				expect.objectContaining({
+					skip: 100,
+					take: 50,
+				}),
+			);
+		});
+
+		it('reuses promise from first requested download in second csv download to avoid duplicated requests', async () => {
+			const mockResponse = createMockUsersResponse(30, 30);
+			vi.mocked(usersApi.getUsers).mockResolvedValueOnce(mockResponse);
+
+			const composable = useAccessSettingsCsvExport();
+
+			// Call both download functions without awaiting first
+			const promise1 = composable.downloadProjectRolesCsv();
+			const promise2 = composable.downloadInstanceRolesCsv();
+			await Promise.all([promise1, promise2]);
+
+			// Assert getUsers was called exactly once (not twice)
+			expect(usersApi.getUsers).toHaveBeenCalledTimes(1);
+		});
+
+		it('returns the cached users list without refetching it if defined', async () => {
+			// Mock getUsers to return some users (only once!)
+			const mockResponse = createMockUsersResponse(30, 30);
+			vi.mocked(usersApi.getUsers).mockResolvedValueOnce(mockResponse);
+
+			const composable = useAccessSettingsCsvExport();
+
+			// First call
+			await composable.downloadProjectRolesCsv();
+
+			// Second call (should use cache)
+			await composable.downloadProjectRolesCsv();
+
+			// Assert getUsers was called exactly once total
+			expect(usersApi.getUsers).toHaveBeenCalledTimes(1);
+		});
+	});
+});
diff --git a/packages/frontend/editor-ui/src/features/settings/sso/provisioning/composables/useAccessSettingsCsvExport.ts b/packages/frontend/editor-ui/src/features/settings/sso/provisioning/composables/useAccessSettingsCsvExport.ts
index 0d145248f82..086060789d3 100644
--- a/packages/frontend/editor-ui/src/features/settings/sso/provisioning/composables/useAccessSettingsCsvExport.ts
+++ b/packages/frontend/editor-ui/src/features/settings/sso/provisioning/composables/useAccessSettingsCsvExport.ts
@@ -1,46 +1,66 @@
-import { type UsersListFilterDto } from '@n8n/api-types';
+import { type UsersListFilterDto, type User } from '@n8n/api-types';
 import { ref } from 'vue';
 import * as usersApi from '@n8n/rest-api-client/api/users';
+import type { IRestApiContext } from '@n8n/rest-api-client';
 import { useRootStore } from '@n8n/stores/useRootStore';
 
-interface AccessSettingsUserData {
-	count: number;
-	items: Array<{
-		id: string;
-		email: string;
-		role: string;
-		projectRelations: Array<{
-			id: string;
-			role: string;
-			name: string;
-		}>;
-	}>;
-}
+/**
+ * Special type since we use the "select" and "expand" filter
+ * properties to change what is fetched in the users query.
+ */
+type AccessSettingsUser = Pick<User, 'id' | 'email' | 'role' | 'projectRelations'>;
 
-function isAccessSettingsUserData(response: unknown): response is AccessSettingsUserData {
-	const topLevelsPropertiesMatch =
-		typeof response === 'object' && response !== null && 'count' in response && 'items' in response;
-	if (!topLevelsPropertiesMatch) {
-		return false;
+type AccessSettingsUserData = {
+	count: number;
+	items: AccessSettingsUser[];
+};
+
+async function fetchUsers(context: IRestApiContext): Promise<AccessSettingsUserData> {
+	const allUsers: AccessSettingsUserData['items'] = [];
+	const fieldsNeededForAccessSettingExport: Partial<UsersListFilterDto> = {
+		select: ['email', 'role'],
+		expand: ['projectRelations'],
+	};
+
+	const PAGE_SIZE = 50;
+	let currentPage = 0;
+	let totalCount = 0;
+	let hasMorePages = true;
+
+	while (hasMorePages) {
+		const filter: UsersListFilterDto = {
+			...fieldsNeededForAccessSettingExport,
+			sortBy: ['email:desc'],
+			take: PAGE_SIZE,
+			skip: currentPage * PAGE_SIZE,
+		};
+
+		const response = await usersApi.getUsers(context, filter);
+
+		if (currentPage === 0) {
+			totalCount = response.count;
+		}
+
+		allUsers.push(...response.items);
+
+		hasMorePages = response.items.length === PAGE_SIZE && allUsers.length < totalCount;
+		currentPage++;
 	}
-	if (!Array.isArray(response.items)) {
-		return false;
-	}
-	// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-	const item: object = response.items.length ? response.items[0] : null;
-	if (!item) {
-		return true;
-	}
-	const isValidItem =
-		Object.hasOwn(item, 'id') &&
-		Object.hasOwn(item, 'email') &&
-		Object.hasOwn(item, 'role') &&
-		Object.hasOwn(item, 'projectRelations');
-	return isValidItem;
+
+	return {
+		count: totalCount,
+		items: allUsers,
+	};
 }
 
 export function useAccessSettingsCsvExport() {
 	const cachedUserData = ref<AccessSettingsUserData | undefined>();
+	/**
+	 * Since users can click the "download project roles" and "download instance roles"
+	 * buttons right after one another, we're tracking the active request here
+	 * to not have to fetch the users list twice.
+	 */
+	const pendingUserDataRequest = ref<Promise<AccessSettingsUserData> | undefined>();
 	const rootStore = useRootStore();
 
 	const formatDateForFilename = (): string => {
@@ -73,22 +93,25 @@ export function useAccessSettingsCsvExport() {
 		if (cachedUserData.value) {
 			return cachedUserData.value;
 		}
-		// TODO: add pagination
-		const filter: UsersListFilterDto = {
-			take: -1,
-			select: ['email', 'role'],
-			sortBy: ['email:desc'],
-			expand: ['projectRelations'],
-			skip: 0,
-		};
-		const getUsersResponse = await usersApi.getUsers(rootStore.restApiContext, filter);
-		if (isAccessSettingsUserData(getUsersResponse)) {
-			cachedUserData.value = getUsersResponse;
-			return cachedUserData.value;
+
+		// Return existing pending promise if one is in flight
+		if (pendingUserDataRequest.value) {
+			return await pendingUserDataRequest.value;
 		}
-		// This case should never happen (as that would mean a breaking backend change)
-		// eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-explicit-any
-		return getUsersResponse as any;
+
+		const userDataRequest = fetchUsers(rootStore.restApiContext)
+			.then((userData) => {
+				cachedUserData.value = userData;
+				pendingUserDataRequest.value = undefined; // reset pendingUserDataRequest
+				return userData;
+			})
+			.catch((error) => {
+				pendingUserDataRequest.value = undefined; // reset pendingUserDataRequest
+				throw error;
+			});
+
+		pendingUserDataRequest.value = userDataRequest;
+		return await userDataRequest;
 	};
 
 	const hasDownloadedProjectRoleCsv = ref(false);
@@ -145,6 +168,7 @@ export function useAccessSettingsCsvExport() {
 		hasDownloadedProjectRoleCsv.value = false;
 		// ensure user data is loaded freshly whenever dialog is opened the next time
 		cachedUserData.value = undefined;
+		pendingUserDataRequest.value = undefined;
 	};
 
 	return {

From fd08baf14159c50b5c3d8bf2df5cbcbc662f9919 Mon Sep 17 00:00:00 2001
From: yehorkardash <yehor.kardash@n8n.io>
Date: Tue, 9 Dec 2025 10:47:25 +0100
Subject: [PATCH 143/167] fix(core): Throw error when workflow is too big for
 webhook registration (#21860)

---
 packages/cli/src/services/cache/cache.service.ts  |  5 +++++
 .../test-webhook-registrations.service.test.ts    | 13 +++++++++++++
 .../test-webhook-registrations.service.ts         | 15 ++++++++++++++-
 3 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/packages/cli/src/services/cache/cache.service.ts b/packages/cli/src/services/cache/cache.service.ts
index 95fa1ace2b7..a61903075b9 100644
--- a/packages/cli/src/services/cache/cache.service.ts
+++ b/packages/cli/src/services/cache/cache.service.ts
@@ -87,6 +87,11 @@ export class CacheService extends TypedEmitter<CacheEvents> {
 		return this.cache.kind === 'memory';
 	}
 
+	async exists(key: string) {
+		const ttl = await this.cache?.store.ttl(key);
+		return !!ttl;
+	}
+
 	// ----------------------------------
 	//             storing
 	// ----------------------------------
diff --git a/packages/cli/src/webhooks/__tests__/test-webhook-registrations.service.test.ts b/packages/cli/src/webhooks/__tests__/test-webhook-registrations.service.test.ts
index dbc79aa7cdd..75352e11fa3 100644
--- a/packages/cli/src/webhooks/__tests__/test-webhook-registrations.service.test.ts
+++ b/packages/cli/src/webhooks/__tests__/test-webhook-registrations.service.test.ts
@@ -20,6 +20,11 @@ describe('TestWebhookRegistrationsService', () => {
 	const webhookKey = 'GET|hello';
 	const cacheKey = 'test-webhooks';
 
+	beforeEach(() => {
+		jest.resetAllMocks();
+		cacheService.exists.mockResolvedValue(true);
+	});
+
 	describe('register()', () => {
 		test('should register a test webhook registration', async () => {
 			await registrations.register(registration);
@@ -32,6 +37,14 @@ describe('TestWebhookRegistrationsService', () => {
 
 			expect(cacheService.expire).not.toHaveBeenCalled();
 		});
+
+		test('should throw an error if the registration fails', async () => {
+			cacheService.exists.mockResolvedValue(false);
+
+			await expect(registrations.register(registration)).rejects.toThrow(
+				'Test webhook registration failed: workflow is too big. Remove pinned data',
+			);
+		});
 	});
 
 	describe('deregister()', () => {
diff --git a/packages/cli/src/webhooks/test-webhook-registrations.service.ts b/packages/cli/src/webhooks/test-webhook-registrations.service.ts
index cfdbc1143b4..13815f07dd2 100644
--- a/packages/cli/src/webhooks/test-webhook-registrations.service.ts
+++ b/packages/cli/src/webhooks/test-webhook-registrations.service.ts
@@ -1,6 +1,11 @@
 import { Service } from '@n8n/di';
 import { InstanceSettings } from 'n8n-core';
-import type { IWebhookData, IWorkflowBase, IDestinationNode } from 'n8n-workflow';
+import {
+	type IWebhookData,
+	type IWorkflowBase,
+	type IDestinationNode,
+	UserError,
+} from 'n8n-workflow';
 
 import { TEST_WEBHOOK_TIMEOUT, TEST_WEBHOOK_TIMEOUT_BUFFER } from '@/constants';
 import { CacheService } from '@/services/cache/cache.service';
@@ -44,6 +49,14 @@ export class TestWebhookRegistrationsService {
 
 		await this.cacheService.setHash(this.cacheKey, { [hashKey]: registration });
 
+		const isCached = await this.cacheService.exists(this.cacheKey);
+
+		if (!isCached) {
+			throw new UserError(
+				'Test webhook registration failed: workflow is too big. Remove pinned data',
+			);
+		}
+
 		if (this.instanceSettings.isSingleMain) return;
 
 		/**

From 7e0895245547c4b6e5a726d4b91f9edee78a805a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Tue, 9 Dec 2025 11:14:25 +0100
Subject: [PATCH 144/167] fix(core): Add missing env vars to internal mode
 (#22965)

---
 packages/cli/src/task-runners/task-runner-process-py.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/cli/src/task-runners/task-runner-process-py.ts b/packages/cli/src/task-runners/task-runner-process-py.ts
index c43cb200996..f0324df42aa 100644
--- a/packages/cli/src/task-runners/task-runner-process-py.ts
+++ b/packages/cli/src/task-runners/task-runner-process-py.ts
@@ -49,6 +49,12 @@ export class PyTaskRunnerProcess extends TaskRunnerProcessBase {
 				N8N_RUNNERS_MAX_CONCURRENCY: this.runnerConfig.maxConcurrency.toString(),
 				N8N_RUNNERS_TASK_TIMEOUT: this.runnerConfig.taskTimeout.toString(),
 				N8N_RUNNERS_HEARTBEAT_INTERVAL: this.runnerConfig.heartbeatInterval.toString(),
+
+				// n8n
+				N8N_RUNNERS_STDLIB_ALLOW: process.env.N8N_RUNNERS_STDLIB_ALLOW,
+				N8N_RUNNERS_EXTERNAL_ALLOW: process.env.N8N_RUNNERS_EXTERNAL_ALLOW,
+				N8N_RUNNERS_BUILTINS_DENY: process.env.N8N_RUNNERS_BUILTINS_DENY,
+				N8N_BLOCK_RUNNER_ENV_ACCESS: process.env.N8N_BLOCK_RUNNER_ENV_ACCESS,
 			},
 		});
 	}

From c57052a1dabe4e2f4077dab5e5df025c3655b239 Mon Sep 17 00:00:00 2001
From: Stephen Wright <sjw948@gmail.com>
Date: Tue, 9 Dec 2025 10:29:11 +0000
Subject: [PATCH 145/167] feat: Enable time saved node for testing (#22650)

---
 .../frontend/@n8n/i18n/src/locales/en.json    |  2 +-
 .../WorkflowProductionChecklist.vue           |  7 --
 .../app/components/WorkflowSettings.test.ts   | 24 ++++--
 .../src/app/components/WorkflowSettings.vue   | 76 +++++--------------
 .../src/app/constants/experiments.ts          |  5 --
 .../nodes/TimeSaved/TimeSaved.node.ts         |  7 +-
 packages/nodes-base/package.json              |  1 +
 7 files changed, 43 insertions(+), 79 deletions(-)

diff --git a/packages/frontend/@n8n/i18n/src/locales/en.json b/packages/frontend/@n8n/i18n/src/locales/en.json
index 7ac659907ea..6fbe5872434 100644
--- a/packages/frontend/@n8n/i18n/src/locales/en.json
+++ b/packages/frontend/@n8n/i18n/src/locales/en.json
@@ -3180,7 +3180,7 @@
 	"workflowSettings.timeSavedPerExecution.nodesDetected": "Active - {count} time saved nodes currently setup",
 	"workflowSettings.timeSavedPerExecution.nodesDetected.hint": "Time saved is calculated dynamically based on each execution",
 	"workflowSettings.timeSavedPerExecution.nodesDetected.addMore": "Add more time saved nodes",
-	"workflowSettings.timeSavedPerExecution.fixedTabWarning": "There are one or more {link} calculating time saved on this workflows dynamically. While your workflow is configured for fix time saved values, these nodes will be ignored.",
+	"workflowSettings.timeSavedPerExecution.fixedTabWarning": "Time saved for this workflow is tracked using a fixed value. Any Time Saved nodes in this workflow are ignored with this setting.",
 	"workflowSettings.timeSavedPerExecution.fixedTabWarning.link": "time saved nodes",
 	"workflowSettings.availableInMCP": "Available in MCP",
 	"workflowSettings.availableInMCP.tooltip": "Make this workflow visible to AI Agents through n8n MCP",
diff --git a/packages/frontend/editor-ui/src/app/components/WorkflowProductionChecklist.vue b/packages/frontend/editor-ui/src/app/components/WorkflowProductionChecklist.vue
index 2438f4c901a..06eab37c0f6 100644
--- a/packages/frontend/editor-ui/src/app/components/WorkflowProductionChecklist.vue
+++ b/packages/frontend/editor-ui/src/app/components/WorkflowProductionChecklist.vue
@@ -16,7 +16,6 @@ import {
 	EVALUATIONS_DOCS_URL,
 	ERROR_WORKFLOW_DOCS_URL,
 	TIME_SAVED_DOCS_URL,
-	TIME_SAVED_NODE_EXPERIMENT,
 	TIME_SAVED_NODE_TYPE,
 } from '@/app/constants';
 import { useMessage } from '@/app/composables/useMessage';
@@ -28,7 +27,6 @@ import { useMcp } from '@/features/ai/mcpAccess/composables/useMcp';
 import { N8nSuggestedActions } from '@n8n/design-system';
 import { useSettingsStore } from '@/app/stores/settings.store';
 import { useUsersStore } from '@/features/settings/users/users.store';
-import { usePostHog } from '@/app/stores/posthog.store';
 
 const props = defineProps<{
 	workflow: IWorkflowDb;
@@ -46,7 +44,6 @@ const sourceControlStore = useSourceControlStore();
 const settingsStore = useSettingsStore();
 const { isEligibleForMcpAccess } = useMcp();
 const usersStore = useUsersStore();
-const posthogStore = usePostHog();
 
 const isPopoverOpen = ref(false);
 const cachedSettings = ref<WorkflowSettings | null>(null);
@@ -68,10 +65,6 @@ const hasErrorWorkflow = computed(() => {
 });
 
 const hasSavedTimeNodes = computed(() => {
-	if (!posthogStore.isFeatureEnabled(TIME_SAVED_NODE_EXPERIMENT.name)) {
-		return false;
-	}
-
 	if (!props.workflow?.nodes) return false;
 	return props.workflow.nodes.some(
 		(node) => node.type === TIME_SAVED_NODE_TYPE && node.disabled !== true,
diff --git a/packages/frontend/editor-ui/src/app/components/WorkflowSettings.test.ts b/packages/frontend/editor-ui/src/app/components/WorkflowSettings.test.ts
index 70309ff8738..de5501160f6 100644
--- a/packages/frontend/editor-ui/src/app/components/WorkflowSettings.test.ts
+++ b/packages/frontend/editor-ui/src/app/components/WorkflowSettings.test.ts
@@ -1,7 +1,7 @@
 import { nextTick, reactive } from 'vue';
 import { createTestingPinia } from '@pinia/testing';
 import type { MockInstance } from 'vitest';
-import { within, waitFor } from '@testing-library/vue';
+import { waitFor, within } from '@testing-library/vue';
 import userEvent from '@testing-library/user-event';
 import type { FrontendSettings } from '@n8n/api-types';
 import { createComponentRenderer } from '@/__tests__/render';
@@ -224,13 +224,15 @@ describe('WorkflowSettingsVue', () => {
 	);
 
 	it('should save time saved per execution correctly', async () => {
+		workflowsStore.workflowSettings.timeSavedMode = 'fixed';
 		const { getByTestId, getByRole } = createComponent({ pinia });
 		await nextTick();
+		await waitFor(() => {
+			expect(getByTestId('workflow-settings-time-saved-per-execution')).toBeVisible();
+		});
 
 		const timeSavedPerExecutionInput = getByTestId('workflow-settings-time-saved-per-execution');
 
-		expect(timeSavedPerExecutionInput).toBeVisible();
-
 		await userEvent.type(timeSavedPerExecutionInput as Element, '10');
 		expect(timeSavedPerExecutionInput).toHaveValue(10);
 
@@ -242,14 +244,16 @@ describe('WorkflowSettingsVue', () => {
 	});
 
 	it('should remove time saved per execution setting', async () => {
+		workflowsStore.workflowSettings.timeSavedMode = 'fixed';
 		workflowsStore.workflowSettings.timeSavedPerExecution = 10;
 
 		const { getByTestId, getByRole } = createComponent({ pinia });
 		await nextTick();
+		await waitFor(() => {
+			expect(getByTestId('workflow-settings-time-saved-per-execution')).toBeVisible();
+		});
 
 		const timeSavedPerExecutionInput = getByTestId('workflow-settings-time-saved-per-execution');
-
-		expect(timeSavedPerExecutionInput).toBeVisible();
 		await waitFor(() => expect(timeSavedPerExecutionInput).toHaveValue(10));
 
 		await userEvent.clear(timeSavedPerExecutionInput as Element);
@@ -265,18 +269,22 @@ describe('WorkflowSettingsVue', () => {
 	});
 
 	it('should disable save time saved per execution if env is read-only', async () => {
+		workflowsStore.workflowSettings.timeSavedMode = 'fixed';
 		sourceControlStore.preferences.branchReadOnly = true;
 
 		const { getByTestId } = createComponent({ pinia });
 		await nextTick();
+		await waitFor(() => {
+			expect(getByTestId('workflow-settings-time-saved-per-execution')).toBeVisible();
+		});
 
 		const timeSavedPerExecutionInput = getByTestId('workflow-settings-time-saved-per-execution');
 
-		expect(timeSavedPerExecutionInput).toBeVisible();
 		expect(timeSavedPerExecutionInput).toBeDisabled();
 	});
 
 	it('should disable save time saved per execution if user has no permission to update workflow', async () => {
+		workflowsStore.workflowSettings.timeSavedMode = 'fixed';
 		workflowsStore.getWorkflowById.mockImplementation(() => ({
 			id: '1',
 			name: 'Test Workflow',
@@ -293,10 +301,12 @@ describe('WorkflowSettingsVue', () => {
 
 		const { getByTestId } = createComponent({ pinia });
 		await nextTick();
+		await waitFor(() => {
+			expect(getByTestId('workflow-settings-time-saved-per-execution')).toBeVisible();
+		});
 
 		const timeSavedPerExecutionInput = getByTestId('workflow-settings-time-saved-per-execution');
 
-		expect(timeSavedPerExecutionInput).toBeVisible();
 		expect(timeSavedPerExecutionInput).toBeDisabled();
 	});
 });
diff --git a/packages/frontend/editor-ui/src/app/components/WorkflowSettings.vue b/packages/frontend/editor-ui/src/app/components/WorkflowSettings.vue
index 4d558fe9dca..8c35f719f0d 100644
--- a/packages/frontend/editor-ui/src/app/components/WorkflowSettings.vue
+++ b/packages/frontend/editor-ui/src/app/components/WorkflowSettings.vue
@@ -9,7 +9,6 @@ import {
 	EnterpriseEditionFeature,
 	PLACEHOLDER_EMPTY_WORKFLOW_ID,
 	WORKFLOW_SETTINGS_MODAL_KEY,
-	TIME_SAVED_NODE_EXPERIMENT,
 	NODE_CREATOR_OPEN_SOURCES,
 	TIME_SAVED_NODE_TYPE,
 } from '@/app/constants';
@@ -31,7 +30,6 @@ import { useDebounce } from '@/app/composables/useDebounce';
 import { injectWorkflowState } from '@/app/composables/useWorkflowState';
 import { useMcp } from '@/features/ai/mcpAccess/composables/useMcp';
 import { useGlobalLinkActions } from '@/app/composables/useGlobalLinkActions';
-import { usePostHog } from '@/app/stores/posthog.store';
 import { useNodeCreatorStore } from '@/features/shared/nodeCreator/nodeCreator.store';
 
 import { ElCol, ElRow, ElSwitch } from 'element-plus';
@@ -51,7 +49,6 @@ const sourceControlStore = useSourceControlStore();
 const workflowsStore = useWorkflowsStore();
 const workflowState = injectWorkflowState();
 const workflowsEEStore = useWorkflowsEEStore();
-const posthogStore = usePostHog();
 const nodeCreatorStore = useNodeCreatorStore();
 
 const isLoading = ref(true);
@@ -131,15 +128,7 @@ const isEligibleForMcp = computed(() => {
 	return isEligibleForMcpAccess(workflow.value);
 });
 
-const isTimeSavedNodeExperimentEnabled = computed(() => {
-	return posthogStore.isFeatureEnabled(TIME_SAVED_NODE_EXPERIMENT.name);
-});
-
 const savedTimeNodes = computed(() => {
-	if (!isTimeSavedNodeExperimentEnabled.value) {
-		return [];
-	}
-
 	if (!workflow?.value?.nodes) return [];
 	return workflow.value.nodes.filter(
 		(node) => node.type === TIME_SAVED_NODE_TYPE && node.disabled !== true,
@@ -147,10 +136,6 @@ const savedTimeNodes = computed(() => {
 });
 
 const hasSavedTimeNodes = computed(() => {
-	if (!isTimeSavedNodeExperimentEnabled.value) {
-		return false;
-	}
-
 	return savedTimeNodes.value.length > 0;
 });
 
@@ -160,7 +145,7 @@ const timeSavedModeOptions = computed(() => [
 		value: 'fixed' as const,
 	},
 	{
-		label: 'Dynamic (node based)',
+		label: 'Dynamic (uses time saved nodes)',
 		value: 'dynamic' as const,
 	},
 ]);
@@ -503,6 +488,7 @@ onMounted(async () => {
 
 	try {
 		await Promise.all([
+			workflowsStore.fetchWorkflow(workflowId.value),
 			loadWorkflows(),
 			loadSaveDataErrorExecutionOptions(),
 			loadSaveDataSuccessExecutionOptions(),
@@ -972,19 +958,7 @@ onBeforeUnmount(() => {
 						</label>
 					</ElCol>
 					<ElCol :span="14">
-						<div v-if="!isTimeSavedNodeExperimentEnabled" :class="$style['time-saved']">
-							<N8nInput
-								id="timeSavedPerExecution"
-								v-model="workflowSettings.timeSavedPerExecution"
-								:disabled="readOnlyEnv || !workflowPermissions.update"
-								data-test-id="workflow-settings-time-saved-per-execution"
-								type="number"
-								min="0"
-								@update:model-value="updateTimeSavedPerExecution"
-							/>
-							<span>{{ i18n.baseText('workflowSettings.timeSavedPerExecution.hint') }}</span>
-						</div>
-						<div v-else class="ignore-key-press-canvas">
+						<div class="ignore-key-press-canvas">
 							<N8nSelect
 								v-model="workflowSettings.timeSavedMode"
 								:disabled="readOnlyEnv || !workflowPermissions.update"
@@ -1003,12 +977,9 @@ onBeforeUnmount(() => {
 						</div>
 					</ElCol>
 				</ElRow>
-				<!-- Fixed mode warning section (only shown in fixed mode when nodes exist) -->
-				<ElRow
-					v-if="isTimeSavedNodeExperimentEnabled && workflowSettings.timeSavedMode === 'fixed'"
-				>
+				<ElRow v-if="workflowSettings.timeSavedMode === 'fixed'">
 					<ElCol :span="14" :offset="10">
-						<div :class="$style['time-saved']">
+						<div :class="$style['time-saved-input']">
 							<N8nInput
 								id="timeSavedPerExecution"
 								v-model="workflowSettings.timeSavedPerExecution"
@@ -1022,13 +993,7 @@ onBeforeUnmount(() => {
 						</div>
 					</ElCol>
 				</ElRow>
-				<ElRow
-					v-if="
-						isTimeSavedNodeExperimentEnabled &&
-						workflowSettings.timeSavedMode === 'fixed' &&
-						hasSavedTimeNodes
-					"
-				>
+				<ElRow v-if="workflowSettings.timeSavedMode === 'fixed' && hasSavedTimeNodes">
 					<ElCol :span="14" :offset="10">
 						<div :class="$style['time-saved-content']">
 							<div :class="$style['time-saved-warning']">
@@ -1047,13 +1012,7 @@ onBeforeUnmount(() => {
 				</ElRow>
 				<!-- Minutes saved section (only shown in fixed mode) -->
 				<!-- Active nodes section (only shown in dynamic mode when nodes exist) -->
-				<ElRow
-					v-if="
-						isTimeSavedNodeExperimentEnabled &&
-						workflowSettings.timeSavedMode === 'dynamic' &&
-						hasSavedTimeNodes
-					"
-				>
+				<ElRow v-if="workflowSettings.timeSavedMode === 'dynamic' && hasSavedTimeNodes">
 					<ElCol :span="14" :offset="10">
 						<div :class="$style['time-saved-content']">
 							<div :class="$style['time-saved-nodes-active']">
@@ -1084,13 +1043,7 @@ onBeforeUnmount(() => {
 					</ElCol>
 				</ElRow>
 				<!-- No nodes detected section (only shown in dynamic mode when no nodes) -->
-				<ElRow
-					v-if="
-						isTimeSavedNodeExperimentEnabled &&
-						workflowSettings.timeSavedMode === 'dynamic' &&
-						!hasSavedTimeNodes
-					"
-				>
+				<ElRow v-if="workflowSettings.timeSavedMode === 'dynamic' && !hasSavedTimeNodes">
 					<ElCol :span="14" :offset="10">
 						<div :class="$style['time-saved-content']">
 							<div :class="$style['time-saved-no-nodes']">
@@ -1175,6 +1128,19 @@ onBeforeUnmount(() => {
 	}
 }
 
+.time-saved-input {
+	display: flex;
+	align-items: center;
+
+	:global(.el-input) {
+		width: var(--spacing--3xl);
+	}
+
+	span {
+		margin-left: var(--spacing--2xs);
+	}
+}
+
 .time-saved-dropdown {
 	margin-bottom: var(--spacing--sm);
 }
diff --git a/packages/frontend/editor-ui/src/app/constants/experiments.ts b/packages/frontend/editor-ui/src/app/constants/experiments.ts
index 372824e31e5..ede73967a1c 100644
--- a/packages/frontend/editor-ui/src/app/constants/experiments.ts
+++ b/packages/frontend/editor-ui/src/app/constants/experiments.ts
@@ -89,10 +89,6 @@ export const PERSONALIZED_TEMPLATES_V3 = {
 	variant: 'variant',
 };
 
-export const TIME_SAVED_NODE_EXPERIMENT = {
-	name: '053_time_saved_node',
-};
-
 export const TEMPLATE_SETUP_EXPERIENCE = {
 	name: '055_template_setup_experience',
 	control: 'control',
@@ -123,6 +119,5 @@ export const EXPERIMENTS_TO_TRACK = [
 	UPGRADE_PLAN_CTA_EXPERIMENT.name,
 	AI_BUILDER_TEMPLATE_EXAMPLES_EXPERIMENT.name,
 	AI_BUILDER_MULTI_AGENT_EXPERIMENT.name,
-	TIME_SAVED_NODE_EXPERIMENT.name,
 	TEMPLATE_SETUP_EXPERIENCE.name,
 ];
diff --git a/packages/nodes-base/nodes/TimeSaved/TimeSaved.node.ts b/packages/nodes-base/nodes/TimeSaved/TimeSaved.node.ts
index 0a2629d12d2..e847c608917 100644
--- a/packages/nodes-base/nodes/TimeSaved/TimeSaved.node.ts
+++ b/packages/nodes-base/nodes/TimeSaved/TimeSaved.node.ts
@@ -13,7 +13,8 @@ export class TimeSaved implements INodeType {
 		icon: 'fa:timer',
 		group: ['organization'],
 		version: 1,
-		description: 'Track dynamic time savings for this workflow execution',
+		description:
+			'Dynamically track time saved based on the workflow’s execution path and the number of items processed',
 		defaults: {
 			name: 'Time Saved',
 			color: '#1E90FF',
@@ -23,7 +24,7 @@ export class TimeSaved implements INodeType {
 		properties: [
 			{
 				displayName:
-					'Calculate time saved dynamically based on execution data. This allows you to track variable time savings (e.g., 5 minutes per item processed) instead of using a fixed value in workflow settings.',
+					'For each run, time saved is the sum of all Time Saved nodes that execute. Use this when different execution paths or items save different amounts of time.',
 				name: 'notice',
 				type: 'notice',
 				default: '',
@@ -69,8 +70,6 @@ export class TimeSaved implements INodeType {
 				location: 'outputPane',
 			},
 		],
-		// TODO: see if we can use posthog here
-		hidden: true,
 	};
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index 822ca55ae71..208f6f7077f 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -797,6 +797,7 @@
       "dist/nodes/TravisCi/TravisCi.node.js",
       "dist/nodes/Trello/Trello.node.js",
       "dist/nodes/Trello/TrelloTrigger.node.js",
+      "dist/nodes/TimeSaved/TimeSaved.node.js",
       "dist/nodes/Twake/Twake.node.js",
       "dist/nodes/Twilio/Twilio.node.js",
       "dist/nodes/Twilio/TwilioTrigger.node.js",

From 756ea6ec788e6fec032114a8925608f16f9a8e3c Mon Sep 17 00:00:00 2001
From: yehorkardash <yehor.kardash@n8n.io>
Date: Tue, 9 Dec 2025 11:52:48 +0100
Subject: [PATCH 146/167] fix(Slack Node): Rate limit requests in RLC
 getChannels (#22149)

Co-authored-by: Shireen Missi <shireen@n8n.io>
---
 .../frontend/@n8n/i18n/src/locales/en.json    |   2 +-
 .../ResourceLocator/ResourceLocator.test.ts   | 179 +++++
 .../ResourceLocator/ResourceLocator.vue       |  36 +-
 .../ResourceLocatorDropdown.test.ts           |  65 ++
 .../ResourceLocatorDropdown.vue               |  35 +-
 .../InlineExpressionTip.vue                   |   4 +-
 .../nodes/Slack/V2/ChannelDescription.ts      | 659 +-----------------
 .../nodes/Slack/V2/GenericFunctions.ts        | 169 ++++-
 .../nodes/Slack/V2/MessageDescription.ts      | 142 +---
 .../nodes/Slack/V2/ReactionDescription.ts     |  48 +-
 .../nodes-base/nodes/Slack/V2/SlackV2.node.ts |  23 +-
 .../nodes/Slack/V2/StarDescription.ts         |  48 +-
 packages/nodes-base/nodes/Slack/V2/utils.ts   |  53 ++
 .../Slack/test/v2/GenericFunctions.test.ts    | 561 ++++++++++++++-
 packages/workflow/src/interfaces.ts           |   9 +
 15 files changed, 1116 insertions(+), 917 deletions(-)
 create mode 100644 packages/nodes-base/nodes/Slack/V2/utils.ts

diff --git a/packages/frontend/@n8n/i18n/src/locales/en.json b/packages/frontend/@n8n/i18n/src/locales/en.json
index 6fbe5872434..37f835d293a 100644
--- a/packages/frontend/@n8n/i18n/src/locales/en.json
+++ b/packages/frontend/@n8n/i18n/src/locales/en.json
@@ -144,6 +144,7 @@
 	"generic.search": "Search",
 	"generic.showMore": "Show more",
 	"generic.showLess": "Show less",
+	"generic.tip": "Tip",
 	"about.aboutN8n": "About n8n",
 	"about.close": "Close",
 	"about.license": "License",
@@ -1897,7 +1898,6 @@
 	"oauth.consentView.success.title": "Success",
 	"oauth.consentView.success.description": "You will soon be redirected back to the client.",
 	"parameterInput.expressionResult": "e.g. {result}",
-	"parameterInput.tip": "Tip",
 	"parameterInput.dragTipBeforePill": "Drag an",
 	"parameterInput.inputField": "input field",
 	"parameterInput.dragTipAfterPill": "from the left to use it here.",
diff --git a/packages/frontend/editor-ui/src/features/ndv/parameters/components/ResourceLocator/ResourceLocator.test.ts b/packages/frontend/editor-ui/src/features/ndv/parameters/components/ResourceLocator/ResourceLocator.test.ts
index 1aa8e0c3d41..e1f69f9f6c9 100644
--- a/packages/frontend/editor-ui/src/features/ndv/parameters/components/ResourceLocator/ResourceLocator.test.ts
+++ b/packages/frontend/editor-ui/src/features/ndv/parameters/components/ResourceLocator/ResourceLocator.test.ts
@@ -1,3 +1,4 @@
+import type { INodeListSearchResult } from 'n8n-workflow';
 import { createComponentRenderer } from '@/__tests__/render';
 import { useNodeTypesStore } from '@/app/stores/nodeTypes.store';
 import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
@@ -6,6 +7,7 @@ import { createTestingPinia } from '@pinia/testing';
 import userEvent from '@testing-library/user-event';
 import { screen, waitFor } from '@testing-library/vue';
 import { mockedStore } from '@/__tests__/utils';
+import { vi } from 'vitest';
 import {
 	TEST_MODEL_VALUE,
 	TEST_NODE_MULTI_MODE,
@@ -471,4 +473,181 @@ describe('ResourceLocator', () => {
 
 		expect(nodeTypesStore.getNodeParameterActionResult).not.toHaveBeenCalled();
 	});
+
+	describe('slow load notice', () => {
+		beforeEach(() => {
+			vi.useFakeTimers();
+		});
+		afterEach(() => {
+			vi.useRealTimers();
+		});
+		it('should pass slowLoadNotice configuration to dropdown component', async () => {
+			const SLOW_LOAD_PARAMETER = {
+				...TEST_PARAMETER_SINGLE_MODE,
+				modes: [
+					{
+						displayName: 'From List',
+						name: 'list',
+						type: 'list' as const,
+						typeOptions: {
+							searchListMethod: 'getItems',
+							slowLoadNotice: {
+								message: 'This is taking longer than expected',
+								timeout: 2000,
+							},
+						},
+					},
+				],
+			};
+
+			// Use a slow response to keep loading state
+			let resolvePromise: ((value: INodeListSearchResult) => void) | undefined;
+			nodeTypesStore.getResourceLocatorResults.mockReturnValue(
+				new Promise((resolve) => {
+					resolvePromise = resolve;
+				}),
+			);
+			const user = userEvent.setup({ delay: null });
+			const { getByTestId, findByText } = renderComponent({
+				props: {
+					modelValue: TEST_MODEL_VALUE,
+					parameter: SLOW_LOAD_PARAMETER,
+					path: `parameters.${SLOW_LOAD_PARAMETER.name}`,
+					node: TEST_NODE_SINGLE_MODE,
+					displayTitle: 'Test Resource Locator',
+					expressionComputedValue: '',
+				},
+			});
+
+			vi.advanceTimersByTime(200);
+			await user.click(getByTestId('rlc-input'));
+
+			vi.advanceTimersByTime(2000);
+			const noticeText = await findByText('This is taking longer than expected', undefined, {
+				timeout: 3000,
+			});
+			expect(noticeText).toBeInTheDocument();
+
+			if (resolvePromise) {
+				resolvePromise({ results: [], paginationToken: null });
+			}
+		}, 10000);
+
+		it('should not show notice when dropdown is not visible', async () => {
+			const SLOW_LOAD_PARAMETER = {
+				...TEST_PARAMETER_SINGLE_MODE,
+				modes: [
+					{
+						displayName: 'From List',
+						name: 'list',
+						type: 'list' as const,
+						typeOptions: {
+							searchListMethod: 'getItems',
+							slowLoadNotice: {
+								message: 'This is taking longer than expected',
+								timeout: 100,
+							},
+						},
+					},
+				],
+			};
+
+			nodeTypesStore.getResourceLocatorResults.mockResolvedValue({
+				results: [],
+				paginationToken: null,
+			});
+
+			const { queryByText } = renderComponent({
+				props: {
+					modelValue: TEST_MODEL_VALUE,
+					parameter: SLOW_LOAD_PARAMETER,
+					path: `parameters.${SLOW_LOAD_PARAMETER.name}`,
+					node: TEST_NODE_SINGLE_MODE,
+					displayTitle: 'Test Resource Locator',
+					expressionComputedValue: '',
+				},
+			});
+
+			vi.advanceTimersByTime(200);
+			expect(queryByText('This is taking longer than expected')).not.toBeInTheDocument();
+		});
+
+		it('should hide notice when loading completes', async () => {
+			const SLOW_LOAD_PARAMETER = {
+				...TEST_PARAMETER_SINGLE_MODE,
+				modes: [
+					{
+						displayName: 'From List',
+						name: 'list',
+						type: 'list' as const,
+						typeOptions: {
+							searchListMethod: 'getItems',
+							slowLoadNotice: {
+								message: 'This is taking longer than expected',
+								timeout: 100,
+							},
+						},
+					},
+				],
+			};
+
+			nodeTypesStore.getResourceLocatorResults.mockResolvedValue({
+				results: [{ name: 'Test Item', value: 'test-item' }],
+				paginationToken: null,
+			});
+
+			const user = userEvent.setup({ delay: null });
+			const { getByTestId, queryByText } = renderComponent({
+				props: {
+					modelValue: TEST_MODEL_VALUE,
+					parameter: SLOW_LOAD_PARAMETER,
+					path: `parameters.${SLOW_LOAD_PARAMETER.name}`,
+					node: TEST_NODE_SINGLE_MODE,
+					displayTitle: 'Test Resource Locator',
+					expressionComputedValue: '',
+				},
+			});
+
+			await user.click(getByTestId('rlc-input'));
+
+			vi.advanceTimersByTime(200);
+
+			await waitFor(() => {
+				expect(nodeTypesStore.getResourceLocatorResults).toHaveBeenCalled();
+			});
+			expect(queryByText('This is taking longer than expected')).not.toBeInTheDocument();
+		});
+
+		it('should not show notice when slowLoadNotice is not configured', async () => {
+			let resolvePromise: ((value: INodeListSearchResult) => void) | undefined;
+			nodeTypesStore.getResourceLocatorResults.mockReturnValue(
+				new Promise((resolve) => {
+					resolvePromise = resolve;
+				}),
+			);
+
+			const user = userEvent.setup({ delay: null });
+			const { getByTestId } = renderComponent({
+				props: {
+					modelValue: TEST_MODEL_VALUE,
+					parameter: TEST_PARAMETER_SINGLE_MODE,
+					path: `parameters.${TEST_PARAMETER_SINGLE_MODE.name}`,
+					node: TEST_NODE_SINGLE_MODE,
+					displayTitle: 'Test Resource Locator',
+					expressionComputedValue: '',
+				},
+			});
+
+			await user.click(getByTestId('rlc-input'));
+
+			vi.advanceTimersByTime(500);
+
+			const noticeContainer = document.querySelector('[class*="slowLoadNoticeContainer"]');
+			expect(noticeContainer).not.toBeInTheDocument();
+
+			if (resolvePromise) {
+				resolvePromise({ results: [], paginationToken: null });
+			}
+		});
+	});
 });
diff --git a/packages/frontend/editor-ui/src/features/ndv/parameters/components/ResourceLocator/ResourceLocator.vue b/packages/frontend/editor-ui/src/features/ndv/parameters/components/ResourceLocator/ResourceLocator.vue
index d831c06db3a..a834a9da703 100644
--- a/packages/frontend/editor-ui/src/features/ndv/parameters/components/ResourceLocator/ResourceLocator.vue
+++ b/packages/frontend/editor-ui/src/features/ndv/parameters/components/ResourceLocator/ResourceLocator.vue
@@ -150,6 +150,8 @@ const width = ref(0);
 const inputRef = ref<HTMLInputElement>();
 const containerRef = ref<HTMLDivElement>();
 const dropdownRef = ref<InstanceType<typeof ResourceLocatorDropdown>>();
+const showSlowLoadNotice = ref(false);
+const longLoadingTimer = ref<NodeJS.Timeout | null>(null);
 
 const nodeTypesStore = useNodeTypesStore();
 const ndvStore = useNDVStore();
@@ -329,6 +331,9 @@ const currentQueryError = computed(() => {
 });
 
 const isSearchable = computed(() => !!getPropertyArgument(currentMode.value, 'searchable'));
+const slowLoadNotice = computed(() => getPropertyArgument(currentMode.value, 'slowLoadNotice'));
+const slowLoadNoticeMessage = computed(() => slowLoadNotice.value?.message);
+const slowLoadNoticeTimeout = computed(() => slowLoadNotice.value?.timeout ?? 10_000);
 
 const skipCredentialsCheckInRLC = computed(
 	() => !!getPropertyArgument(currentMode.value, 'skipCredentialsCheckInRLC'),
@@ -481,6 +486,26 @@ watch(currentMode, (mode) => {
 	}
 });
 
+watch([currentQueryLoading, resourceDropdownVisible], (isLoading, isDropdownVisible) => {
+	if (!slowLoadNoticeMessage.value) return;
+
+	if (isLoading && isDropdownVisible) {
+		if (longLoadingTimer.value) {
+			clearTimeout(longLoadingTimer.value);
+		}
+		showSlowLoadNotice.value = false;
+		longLoadingTimer.value = setTimeout(() => {
+			showSlowLoadNotice.value = true;
+		}, slowLoadNoticeTimeout.value);
+	} else {
+		if (longLoadingTimer.value) {
+			clearTimeout(longLoadingTimer.value);
+			longLoadingTimer.value = null;
+		}
+		showSlowLoadNotice.value = false;
+	}
+});
+
 watch(
 	() => props.dependentParametersValues,
 	(currentValue, oldValue) => {
@@ -519,6 +544,9 @@ onMounted(() => {
 onBeforeUnmount(() => {
 	props.eventBus.off('refreshList', refreshList);
 	window.removeEventListener('resize', setWidth);
+	if (longLoadingTimer.value) {
+		clearTimeout(longLoadingTimer.value);
+	}
 });
 
 onClickOutside(dropdownRef as Ref<VueInstance>, hideResourceDropdown);
@@ -556,10 +584,10 @@ function openResource(url: string) {
 	trackEvent('User clicked resource locator link');
 }
 
-function getPropertyArgument(
+function getPropertyArgument<T extends keyof INodePropertyModeTypeOptions>(
 	parameter: INodePropertyMode,
-	argumentName: keyof INodePropertyModeTypeOptions,
-): string | number | boolean | INodePropertyModeTypeOptions['allowNewResource'] | undefined {
+	argumentName: T,
+): INodePropertyModeTypeOptions[T] | undefined {
 	return parameter.typeOptions?.[argumentName];
 }
 
@@ -962,6 +990,8 @@ function removeOverride() {
 			:width="width"
 			:event-bus="eventBus"
 			:allow-new-resources="allowNewResources"
+			:slow-load-notice="slowLoadNoticeMessage"
+			:show-slow-load-notice="showSlowLoadNotice"
 			@update:model-value="onListItemSelected"
 			@filter="onSearchFilter"
 			@load-more="loadResourcesDebounced"
diff --git a/packages/frontend/editor-ui/src/features/ndv/parameters/components/ResourceLocator/ResourceLocatorDropdown.test.ts b/packages/frontend/editor-ui/src/features/ndv/parameters/components/ResourceLocator/ResourceLocatorDropdown.test.ts
index 21ef1e710b1..20e79b2e118 100644
--- a/packages/frontend/editor-ui/src/features/ndv/parameters/components/ResourceLocator/ResourceLocatorDropdown.test.ts
+++ b/packages/frontend/editor-ui/src/features/ndv/parameters/components/ResourceLocator/ResourceLocatorDropdown.test.ts
@@ -39,6 +39,71 @@ describe('ResourceLocatorDropdown', () => {
 		vi.useRealTimers();
 	});
 
+	describe('slow loading hint', () => {
+		it('should show slow loading hint when loading and showSlowLoadNotice is true', () => {
+			const slowLoadNotice = 'This is taking longer than expected. Please wait...';
+
+			renderComponent({
+				props: {
+					show: true,
+					loading: true,
+					resources: [],
+					slowLoadNotice,
+					showSlowLoadNotice: true,
+				},
+			});
+
+			expect(screen.getByText(slowLoadNotice)).toBeInTheDocument();
+		});
+
+		it('should not show slow loading hint when loading but showSlowLoadNotice is false', () => {
+			const slowLoadNotice = 'This is taking longer than expected. Please wait...';
+
+			renderComponent({
+				props: {
+					show: true,
+					loading: true,
+					resources: [],
+					slowLoadNotice,
+					showSlowLoadNotice: false,
+				},
+			});
+
+			expect(screen.queryByText(slowLoadNotice)).not.toBeInTheDocument();
+		});
+
+		it('should not show slow loading hint when not loading', () => {
+			const slowLoadNotice = 'This is taking longer than expected. Please wait...';
+
+			renderComponent({
+				props: {
+					show: true,
+					loading: false,
+					resources: mockResources,
+					slowLoadNotice,
+					showSlowLoadNotice: true,
+				},
+			});
+
+			expect(screen.queryByText(slowLoadNotice)).not.toBeInTheDocument();
+		});
+
+		it('should not show slow loading hint when slowLoadNotice is not provided', () => {
+			renderComponent({
+				props: {
+					show: true,
+					loading: true,
+					resources: [],
+					showSlowLoadNotice: true,
+				},
+			});
+
+			// Just verify there's no hint text (we can't test for specific text since none is provided)
+			const hintContainer = document.querySelector('[class*="slowLoadNoticeContainer"]');
+			expect(hintContainer).not.toBeInTheDocument();
+		});
+	});
+
 	describe('cached result display', () => {
 		it('should show cached result when selected item is not in resources list', async () => {
 			vi.useFakeTimers();
diff --git a/packages/frontend/editor-ui/src/features/ndv/parameters/components/ResourceLocator/ResourceLocatorDropdown.vue b/packages/frontend/editor-ui/src/features/ndv/parameters/components/ResourceLocator/ResourceLocatorDropdown.vue
index 245b19ed033..aa71fb02e1a 100644
--- a/packages/frontend/editor-ui/src/features/ndv/parameters/components/ResourceLocator/ResourceLocatorDropdown.vue
+++ b/packages/frontend/editor-ui/src/features/ndv/parameters/components/ResourceLocator/ResourceLocatorDropdown.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { useDebounce } from '@/app/composables/useDebounce';
 import type { IResourceLocatorResultExpanded } from '@/Interface';
-import { N8nBadge, N8nIcon, N8nInput, N8nLoading, N8nPopover } from '@n8n/design-system';
+import { N8nBadge, N8nIcon, N8nInput, N8nLoading, N8nPopover, N8nText } from '@n8n/design-system';
 import { useI18n } from '@n8n/i18n';
 import type { EventBus } from '@n8n/utils/event-bus';
 import { createEventBus } from '@n8n/utils/event-bus';
@@ -24,6 +24,8 @@ type Props = {
 	width?: number;
 	allowNewResources?: { label?: string };
 	eventBus?: EventBus;
+	slowLoadNotice?: string;
+	showSlowLoadNotice?: boolean;
 };
 
 const props = withDefaults(defineProps<Props>(), {
@@ -39,6 +41,8 @@ const props = withDefaults(defineProps<Props>(), {
 	width: undefined,
 	allowNewResources: () => ({}),
 	eventBus: () => createEventBus(),
+	slowLoadNotice: undefined,
+	showSlowLoadNotice: false,
 });
 
 const emit = defineEmits<{
@@ -357,6 +361,16 @@ watch(
 				<div v-for="i in 3" :key="i" :class="$style.loadingItem">
 					<N8nLoading :class="$style.loader" variant="p" :rows="1" />
 				</div>
+				<div
+					v-if="props.showSlowLoadNotice && props.slowLoadNotice"
+					:class="$style.slowLoadNoticeContainer"
+				>
+					<N8nText size="small" :class="$style.tipText"
+						>{{ i18n.baseText('generic.tip') }}:
+					</N8nText>
+
+					<span :class="$style.hintText">{{ props.slowLoadNotice }}</span>
+				</div>
 			</div>
 		</div>
 		<template #reference>
@@ -490,4 +504,23 @@ watch(
 
 	margin-left: var(--spacing--2xs);
 }
+
+.tipText {
+	color: var(--color--text--shade-1);
+	font-weight: var(--font-weight--bold);
+	white-space: nowrap;
+	align-self: flex-start;
+}
+
+.slowLoadNoticeContainer {
+	display: flex;
+	align-items: center;
+	padding: var(--spacing--xs);
+	font-size: var(--font-size--2xs);
+	color: var(--color--text);
+	gap: var(--spacing--4xs);
+	line-height: var(--line-height--md);
+	word-break: break-word;
+	border-top: var(--border);
+}
 </style>
diff --git a/packages/frontend/editor-ui/src/features/shared/editors/components/InlineExpressionEditor/InlineExpressionTip.vue b/packages/frontend/editor-ui/src/features/shared/editors/components/InlineExpressionEditor/InlineExpressionTip.vue
index 0f6b4fd3ccd..ea7cf707204 100644
--- a/packages/frontend/editor-ui/src/features/shared/editors/components/InlineExpressionEditor/InlineExpressionTip.vue
+++ b/packages/frontend/editor-ui/src/features/shared/editors/components/InlineExpressionEditor/InlineExpressionTip.vue
@@ -107,9 +107,7 @@ watchDebounced(
 
 <template>
 	<div :class="[$style.tip, { [$style.drag]: tip === 'drag' }]">
-		<N8nText size="small" :class="$style.tipText"
-			>{{ i18n.baseText('parameterInput.tip') }}:
-		</N8nText>
+		<N8nText size="small" :class="$style.tipText">{{ i18n.baseText('generic.tip') }}: </N8nText>
 
 		<div v-if="tip === 'drag'" :class="$style.content">
 			<N8nText size="small" :class="$style.text">
diff --git a/packages/nodes-base/nodes/Slack/V2/ChannelDescription.ts b/packages/nodes-base/nodes/Slack/V2/ChannelDescription.ts
index 01f56a8cb7a..1094b6468b1 100644
--- a/packages/nodes-base/nodes/Slack/V2/ChannelDescription.ts
+++ b/packages/nodes-base/nodes/Slack/V2/ChannelDescription.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+import { slackChannelModes } from './utils';
 
 export const channelOperations: INodeProperties[] = [
 	{
@@ -136,52 +137,7 @@ export const channelFields: INodeProperties[] = [
 				resource: ['channel'],
 			},
 		},
-		modes: [
-			{
-				displayName: 'From List',
-				name: 'list',
-				type: 'list',
-				placeholder: 'Select a channel...',
-				typeOptions: {
-					searchListMethod: 'getChannels',
-					searchable: true,
-				},
-			},
-			{
-				displayName: 'By ID',
-				name: 'id',
-				type: 'string',
-				validation: [
-					{
-						type: 'regex',
-						properties: {
-							regex: '[a-zA-Z0-9]{2,}',
-							errorMessage: 'Not a valid Slack Channel ID',
-						},
-					},
-				],
-				placeholder: 'C0122KQ70S7E',
-			},
-			{
-				displayName: 'By URL',
-				name: 'url',
-				type: 'string',
-				placeholder: 'https://app.slack.com/client/TS9594PZK/B0556F47Z3A',
-				validation: [
-					{
-						type: 'regex',
-						properties: {
-							regex: 'http(s)?://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
-							errorMessage: 'Not a valid Slack Channel URL',
-						},
-					},
-				],
-				extractValue: {
-					type: 'regex',
-					regex: 'https://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
-				},
-			},
-		],
+		modes: slackChannelModes,
 	},
 	/* -------------------------------------------------------------------------- */
 	/*                                channel:close                               */
@@ -192,52 +148,7 @@ export const channelFields: INodeProperties[] = [
 		type: 'resourceLocator',
 		default: { mode: 'list', value: '' },
 		placeholder: 'Select a channel...',
-		modes: [
-			{
-				displayName: 'From List',
-				name: 'list',
-				type: 'list',
-				placeholder: 'Select a channel...',
-				typeOptions: {
-					searchListMethod: 'getChannels',
-					searchable: true,
-				},
-			},
-			{
-				displayName: 'By ID',
-				name: 'id',
-				type: 'string',
-				validation: [
-					{
-						type: 'regex',
-						properties: {
-							regex: '[a-zA-Z0-9]{2,}',
-							errorMessage: 'Not a valid Slack Channel ID',
-						},
-					},
-				],
-				placeholder: 'C0122KQ70S7E',
-			},
-			{
-				displayName: 'By URL',
-				name: 'url',
-				type: 'string',
-				placeholder: 'https://app.slack.com/client/TS9594PZK/B0556F47Z3A',
-				validation: [
-					{
-						type: 'regex',
-						properties: {
-							regex: 'http(s)?://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
-							errorMessage: 'Not a valid Slack Channel URL',
-						},
-					},
-				],
-				extractValue: {
-					type: 'regex',
-					regex: 'https://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
-				},
-			},
-		],
+		modes: slackChannelModes,
 		displayOptions: {
 			show: {
 				operation: ['close'],
@@ -300,52 +211,7 @@ export const channelFields: INodeProperties[] = [
 		type: 'resourceLocator',
 		default: { mode: 'list', value: '' },
 		placeholder: 'Select a channel...',
-		modes: [
-			{
-				displayName: 'From List',
-				name: 'list',
-				type: 'list',
-				placeholder: 'Select a channel...',
-				typeOptions: {
-					searchListMethod: 'getChannels',
-					searchable: true,
-				},
-			},
-			{
-				displayName: 'By ID',
-				name: 'id',
-				type: 'string',
-				validation: [
-					{
-						type: 'regex',
-						properties: {
-							regex: '[a-zA-Z0-9]{2,}',
-							errorMessage: 'Not a valid Slack Channel ID',
-						},
-					},
-				],
-				placeholder: 'C0122KQ70S7E',
-			},
-			{
-				displayName: 'By URL',
-				name: 'url',
-				type: 'string',
-				placeholder: 'https://app.slack.com/client/TS9594PZK/B0556F47Z3A',
-				validation: [
-					{
-						type: 'regex',
-						properties: {
-							regex: 'http(s)?://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
-							errorMessage: 'Not a valid Slack Channel URL',
-						},
-					},
-				],
-				extractValue: {
-					type: 'regex',
-					regex: 'https://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
-				},
-			},
-		],
+		modes: slackChannelModes,
 		displayOptions: {
 			show: {
 				operation: ['invite'],
@@ -383,52 +249,7 @@ export const channelFields: INodeProperties[] = [
 		type: 'resourceLocator',
 		default: { mode: 'list', value: '' },
 		placeholder: 'Select a channel...',
-		modes: [
-			{
-				displayName: 'From List',
-				name: 'list',
-				type: 'list',
-				placeholder: 'Select a channel...',
-				typeOptions: {
-					searchListMethod: 'getChannels',
-					searchable: true,
-				},
-			},
-			{
-				displayName: 'By ID',
-				name: 'id',
-				type: 'string',
-				validation: [
-					{
-						type: 'regex',
-						properties: {
-							regex: '[a-zA-Z0-9]{2,}',
-							errorMessage: 'Not a valid Slack Channel ID',
-						},
-					},
-				],
-				placeholder: 'C0122KQ70S7E',
-			},
-			{
-				displayName: 'By URL',
-				name: 'url',
-				type: 'string',
-				placeholder: 'https://app.slack.com/client/TS9594PZK/B0556F47Z3A',
-				validation: [
-					{
-						type: 'regex',
-						properties: {
-							regex: 'http(s)?://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
-							errorMessage: 'Not a valid Slack Channel URL',
-						},
-					},
-				],
-				extractValue: {
-					type: 'regex',
-					regex: 'https://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
-				},
-			},
-		],
+		modes: slackChannelModes,
 		required: true,
 		displayOptions: {
 			show: {
@@ -469,52 +290,7 @@ export const channelFields: INodeProperties[] = [
 		type: 'resourceLocator',
 		default: { mode: 'list', value: '' },
 		placeholder: 'Select a channel...',
-		modes: [
-			{
-				displayName: 'From List',
-				name: 'list',
-				type: 'list',
-				placeholder: 'Select a channel...',
-				typeOptions: {
-					searchListMethod: 'getChannels',
-					searchable: true,
-				},
-			},
-			{
-				displayName: 'By ID',
-				name: 'id',
-				type: 'string',
-				validation: [
-					{
-						type: 'regex',
-						properties: {
-							regex: '[a-zA-Z0-9]{2,}',
-							errorMessage: 'Not a valid Slack Channel ID',
-						},
-					},
-				],
-				placeholder: 'C0122KQ70S7E',
-			},
-			{
-				displayName: 'By URL',
-				name: 'url',
-				type: 'string',
-				placeholder: 'https://app.slack.com/client/TS9594PZK/B0556F47Z3A',
-				validation: [
-					{
-						type: 'regex',
-						properties: {
-							regex: 'http(s)?://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
-							errorMessage: 'Not a valid Slack Channel URL',
-						},
-					},
-				],
-				extractValue: {
-					type: 'regex',
-					regex: 'https://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
-				},
-			},
-		],
+		modes: slackChannelModes,
 		displayOptions: {
 			show: {
 				operation: ['kick'],
@@ -552,52 +328,7 @@ export const channelFields: INodeProperties[] = [
 		default: { mode: 'list', value: '' },
 		placeholder: 'Select a channel...',
 		description: 'The Slack channel to join',
-		modes: [
-			{
-				displayName: 'From List',
-				name: 'list',
-				type: 'list',
-				placeholder: 'Select a channel...',
-				typeOptions: {
-					searchListMethod: 'getChannels',
-					searchable: true,
-				},
-			},
-			{
-				displayName: 'By ID',
-				name: 'id',
-				type: 'string',
-				validation: [
-					{
-						type: 'regex',
-						properties: {
-							regex: '[a-zA-Z0-9]{2,}',
-							errorMessage: 'Not a valid Slack Channel ID',
-						},
-					},
-				],
-				placeholder: 'C0122KQ70S7E',
-			},
-			{
-				displayName: 'By URL',
-				name: 'url',
-				type: 'string',
-				placeholder: 'https://app.slack.com/client/TS9594PZK/B0556F47Z3A',
-				validation: [
-					{
-						type: 'regex',
-						properties: {
-							regex: 'http(s)?://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
-							errorMessage: 'Not a valid Slack Channel URL',
-						},
-					},
-				],
-				extractValue: {
-					type: 'regex',
-					regex: 'https://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
-				},
-			},
-		],
+		modes: slackChannelModes,
 		displayOptions: {
 			show: {
 				operation: ['join'],
@@ -700,52 +431,7 @@ export const channelFields: INodeProperties[] = [
 		type: 'resourceLocator',
 		default: { mode: 'list', value: '' },
 		placeholder: 'Select a channel...',
-		modes: [
-			{
-				displayName: 'From List',
-				name: 'list',
-				type: 'list',
-				placeholder: 'Select a channel...',
-				typeOptions: {
-					searchListMethod: 'getChannels',
-					searchable: true,
-				},
-			},
-			{
-				displayName: 'By ID',
-				name: 'id',
-				type: 'string',
-				validation: [
-					{
-						type: 'regex',
-						properties: {
-							regex: '[a-zA-Z0-9]{2,}',
-							errorMessage: 'Not a valid Slack Channel ID',
-						},
-					},
-				],
-				placeholder: 'C0122KQ70S7E',
-			},
-			{
-				displayName: 'By URL',
-				name: 'url',
-				type: 'string',
-				placeholder: 'https://app.slack.com/client/TS9594PZK/B0556F47Z3A',
-				validation: [
-					{
-						type: 'regex',
-						properties: {
-							regex: 'http(s)?://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
-							errorMessage: 'Not a valid Slack Channel URL',
-						},
-					},
-				],
-				extractValue: {
-					type: 'regex',
-					regex: 'https://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
-				},
-			},
-		],
+		modes: slackChannelModes,
 		displayOptions: {
 			show: {
 				operation: ['history'],
@@ -833,52 +519,7 @@ export const channelFields: INodeProperties[] = [
 		type: 'resourceLocator',
 		default: { mode: 'list', value: '' },
 		placeholder: 'Select a channel...',
-		modes: [
-			{
-				displayName: 'From List',
-				name: 'list',
-				type: 'list',
-				placeholder: 'Select a channel...',
-				typeOptions: {
-					searchListMethod: 'getChannels',
-					searchable: true,
-				},
-			},
-			{
-				displayName: 'By ID',
-				name: 'id',
-				type: 'string',
-				validation: [
-					{
-						type: 'regex',
-						properties: {
-							regex: '[a-zA-Z0-9]{2,}',
-							errorMessage: 'Not a valid Slack Channel ID',
-						},
-					},
-				],
-				placeholder: 'C0122KQ70S7E',
-			},
-			{
-				displayName: 'By URL',
-				name: 'url',
-				type: 'string',
-				placeholder: 'https://app.slack.com/client/TS9594PZK/B0556F47Z3A',
-				validation: [
-					{
-						type: 'regex',
-						properties: {
-							regex: 'http(s)?://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
-							errorMessage: 'Not a valid Slack Channel URL',
-						},
-					},
-				],
-				extractValue: {
-					type: 'regex',
-					regex: 'https://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
-				},
-			},
-		],
+		modes: slackChannelModes,
 		displayOptions: {
 			show: {
 				operation: ['leave'],
@@ -899,52 +540,7 @@ export const channelFields: INodeProperties[] = [
 		default: { mode: 'list', value: '' },
 		description: 'The Slack channel to get the members from',
 		placeholder: 'Select a channel...',
-		modes: [
-			{
-				displayName: 'From List',
-				name: 'list',
-				type: 'list',
-				placeholder: 'Select a channel...',
-				typeOptions: {
-					searchListMethod: 'getChannels',
-					searchable: true,
-				},
-			},
-			{
-				displayName: 'By ID',
-				name: 'id',
-				type: 'string',
-				validation: [
-					{
-						type: 'regex',
-						properties: {
-							regex: '[a-zA-Z0-9]{2,}',
-							errorMessage: 'Not a valid Slack Channel ID',
-						},
-					},
-				],
-				placeholder: 'C0122KQ70S7E',
-			},
-			{
-				displayName: 'By URL',
-				name: 'url',
-				type: 'string',
-				placeholder: 'https://app.slack.com/client/TS9594PZK/B0556F47Z3A',
-				validation: [
-					{
-						type: 'regex',
-						properties: {
-							regex: 'http(s)?://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
-							errorMessage: 'Not a valid Slack Channel URL',
-						},
-					},
-				],
-				extractValue: {
-					type: 'regex',
-					regex: 'https://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
-				},
-			},
-		],
+		modes: slackChannelModes,
 		displayOptions: {
 			show: {
 				operation: ['member'],
@@ -1053,52 +649,7 @@ export const channelFields: INodeProperties[] = [
 		type: 'resourceLocator',
 		default: { mode: 'list', value: '' },
 		placeholder: 'Select a channel...',
-		modes: [
-			{
-				displayName: 'From List',
-				name: 'list',
-				type: 'list',
-				placeholder: 'Select a channel...',
-				typeOptions: {
-					searchListMethod: 'getChannels',
-					searchable: true,
-				},
-			},
-			{
-				displayName: 'By ID',
-				name: 'id',
-				type: 'string',
-				validation: [
-					{
-						type: 'regex',
-						properties: {
-							regex: '[a-zA-Z0-9]{2,}',
-							errorMessage: 'Not a valid Slack Channel ID',
-						},
-					},
-				],
-				placeholder: 'C0122KQ70S7E',
-			},
-			{
-				displayName: 'By URL',
-				name: 'url',
-				type: 'string',
-				placeholder: 'https://app.slack.com/client/TS9594PZK/B0556F47Z3A',
-				validation: [
-					{
-						type: 'regex',
-						properties: {
-							regex: 'http(s)?://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
-							errorMessage: 'Not a valid Slack Channel URL',
-						},
-					},
-				],
-				extractValue: {
-					type: 'regex',
-					regex: 'https://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
-				},
-			},
-		],
+		modes: slackChannelModes,
 		displayOptions: {
 			show: {
 				operation: ['rename'],
@@ -1132,52 +683,7 @@ export const channelFields: INodeProperties[] = [
 		type: 'resourceLocator',
 		default: { mode: 'list', value: '' },
 		placeholder: 'Select a channel...',
-		modes: [
-			{
-				displayName: 'From List',
-				name: 'list',
-				type: 'list',
-				placeholder: 'Select a channel...',
-				typeOptions: {
-					searchListMethod: 'getChannels',
-					searchable: true,
-				},
-			},
-			{
-				displayName: 'By ID',
-				name: 'id',
-				type: 'string',
-				validation: [
-					{
-						type: 'regex',
-						properties: {
-							regex: '[a-zA-Z0-9]{2,}',
-							errorMessage: 'Not a valid Slack Channel ID',
-						},
-					},
-				],
-				placeholder: 'C0122KQ70S7E',
-			},
-			{
-				displayName: 'By URL',
-				name: 'url',
-				type: 'string',
-				placeholder: 'https://app.slack.com/client/TS9594PZK/B0556F47Z3A',
-				validation: [
-					{
-						type: 'regex',
-						properties: {
-							regex: 'http(s)?://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
-							errorMessage: 'Not a valid Slack Channel URL',
-						},
-					},
-				],
-				extractValue: {
-					type: 'regex',
-					regex: 'https://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
-				},
-			},
-		],
+		modes: slackChannelModes,
 		displayOptions: {
 			show: {
 				operation: ['replies'],
@@ -1280,52 +786,7 @@ export const channelFields: INodeProperties[] = [
 		type: 'resourceLocator',
 		default: { mode: 'list', value: '' },
 		placeholder: 'Select a channel...',
-		modes: [
-			{
-				displayName: 'From List',
-				name: 'list',
-				type: 'list',
-				placeholder: 'Select a channel...',
-				typeOptions: {
-					searchListMethod: 'getChannels',
-					searchable: true,
-				},
-			},
-			{
-				displayName: 'By ID',
-				name: 'id',
-				type: 'string',
-				validation: [
-					{
-						type: 'regex',
-						properties: {
-							regex: '[a-zA-Z0-9]{2,}',
-							errorMessage: 'Not a valid Slack Channel ID',
-						},
-					},
-				],
-				placeholder: 'C0122KQ70S7E',
-			},
-			{
-				displayName: 'By URL',
-				name: 'url',
-				type: 'string',
-				placeholder: 'https://app.slack.com/client/TS9594PZK/B0556F47Z3A',
-				validation: [
-					{
-						type: 'regex',
-						properties: {
-							regex: 'http(s)?://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
-							errorMessage: 'Not a valid Slack Channel URL',
-						},
-					},
-				],
-				extractValue: {
-					type: 'regex',
-					regex: 'https://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
-				},
-			},
-		],
+		modes: slackChannelModes,
 		displayOptions: {
 			show: {
 				operation: ['setPurpose'],
@@ -1359,52 +820,7 @@ export const channelFields: INodeProperties[] = [
 		type: 'resourceLocator',
 		default: { mode: 'list', value: '' },
 		placeholder: 'Select a channel...',
-		modes: [
-			{
-				displayName: 'From List',
-				name: 'list',
-				type: 'list',
-				placeholder: 'Select a channel...',
-				typeOptions: {
-					searchListMethod: 'getChannels',
-					searchable: true,
-				},
-			},
-			{
-				displayName: 'By ID',
-				name: 'id',
-				type: 'string',
-				validation: [
-					{
-						type: 'regex',
-						properties: {
-							regex: '[a-zA-Z0-9]{2,}',
-							errorMessage: 'Not a valid Slack Channel ID',
-						},
-					},
-				],
-				placeholder: 'C0122KQ70S7E',
-			},
-			{
-				displayName: 'By URL',
-				name: 'url',
-				type: 'string',
-				placeholder: 'https://app.slack.com/client/TS9594PZK/B0556F47Z3A',
-				validation: [
-					{
-						type: 'regex',
-						properties: {
-							regex: 'http(s)?://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
-							errorMessage: 'Not a valid Slack Channel URL',
-						},
-					},
-				],
-				extractValue: {
-					type: 'regex',
-					regex: 'https://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
-				},
-			},
-		],
+		modes: slackChannelModes,
 		displayOptions: {
 			show: {
 				operation: ['setTopic'],
@@ -1437,52 +853,7 @@ export const channelFields: INodeProperties[] = [
 		type: 'resourceLocator',
 		default: { mode: 'list', value: '' },
 		placeholder: 'Select a channel...',
-		modes: [
-			{
-				displayName: 'From List',
-				name: 'list',
-				type: 'list',
-				placeholder: 'Select a channel...',
-				typeOptions: {
-					searchListMethod: 'getChannels',
-					searchable: true,
-				},
-			},
-			{
-				displayName: 'By ID',
-				name: 'id',
-				type: 'string',
-				validation: [
-					{
-						type: 'regex',
-						properties: {
-							regex: '[a-zA-Z0-9]{2,}',
-							errorMessage: 'Not a valid Slack Channel ID',
-						},
-					},
-				],
-				placeholder: 'C0122KQ70S7E',
-			},
-			{
-				displayName: 'By URL',
-				name: 'url',
-				type: 'string',
-				placeholder: 'https://app.slack.com/client/TS9594PZK/B0556F47Z3A',
-				validation: [
-					{
-						type: 'regex',
-						properties: {
-							regex: 'http(s)?://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
-							errorMessage: 'Not a valid Slack Channel URL',
-						},
-					},
-				],
-				extractValue: {
-					type: 'regex',
-					regex: 'https://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
-				},
-			},
-		],
+		modes: slackChannelModes,
 		displayOptions: {
 			show: {
 				operation: ['unarchive'],
diff --git a/packages/nodes-base/nodes/Slack/V2/GenericFunctions.ts b/packages/nodes-base/nodes/Slack/V2/GenericFunctions.ts
index 5e2d542f9bb..a6151ef68d7 100644
--- a/packages/nodes-base/nodes/Slack/V2/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Slack/V2/GenericFunctions.ts
@@ -8,12 +8,33 @@ import type {
 	IRequestOptions,
 	IWebhookFunctions,
 } from 'n8n-workflow';
-import { NodeOperationError } from 'n8n-workflow';
+import { NodeOperationError, sleep } from 'n8n-workflow';
 
 import type { SendAndWaitMessageBody } from './MessageInterface';
 import { getSendAndWaitConfig } from '../../../utils/sendAndWait/utils';
 import { createUtmCampaignLink } from '../../../utils/utilities';
 
+interface RateLimitOptions {
+	/**
+	 * The maximum number of times to retry the request if a rate limit error occurs.
+	 */
+	maxRetries?: number;
+	/**
+	 * The delay in milliseconds to wait before retrying the request if 'retry-after' header is not present.
+	 */
+	fallbackDelay?: number;
+	/**
+	 * What to do when a rate limit error occurs and maxRetries is exceeded.
+	 * - 'throw' will throw an error
+	 * - 'stop' will return the data collected so far with cursor/page info
+	 */
+	onFail?: 'throw' | 'stop';
+}
+
+function isDefined<T>(value: T | undefined | null | ''): value is NonNullable<T> {
+	return value !== undefined && value !== null && value !== '';
+}
+
 export async function slackApiRequest(
 	this: IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
 	method: IHttpRequestMethods,
@@ -21,7 +42,7 @@ export async function slackApiRequest(
 	body: object = {},
 	query: IDataObject = {},
 	headers: {} | undefined = undefined,
-	option: {} = {},
+	option: Partial<IRequestOptions> = {},
 	// tslint:disable-next-line:no-any
 ): Promise<any> {
 	const authenticationMethod = this.getNodeParameter('authentication', 0, 'accessToken') as string;
@@ -58,8 +79,11 @@ export async function slackApiRequest(
 		},
 	);
 
-	if (response.ok === false) {
-		if (response.error === 'paid_teams_only') {
+	const responseData = options.resolveWithFullResponse ? response.body : response;
+
+	// don't try to handle errors if simple responses are disabled
+	if (responseData.ok === false && options.simple !== false) {
+		if (responseData.error === 'paid_teams_only') {
 			throw new NodeOperationError(
 				this.getNode(),
 				`Your current Slack plan does not include the resource '${
@@ -71,16 +95,16 @@ export async function slackApiRequest(
 					level: 'warning',
 				},
 			);
-		} else if (response.error === 'missing_scope') {
+		} else if (responseData.error === 'missing_scope') {
 			throw new NodeOperationError(
 				this.getNode(),
 				'Your Slack credential is missing required Oauth Scopes',
 				{
-					description: `Add the following scope(s) to your Slack App: ${response.needed}`,
+					description: `Add the following scope(s) to your Slack App: ${responseData.needed}`,
 					level: 'warning',
 				},
 			);
-		} else if (response.error === 'not_admin') {
+		} else if (responseData.error === 'not_admin') {
 			throw new NodeOperationError(
 				this.getNode(),
 				'Need higher Role Level for this Operation (e.g. Owner or Admin Rights)',
@@ -94,18 +118,129 @@ export async function slackApiRequest(
 
 		throw new NodeOperationError(
 			this.getNode(),
-			'Slack error response: ' + JSON.stringify(response.error),
+			'Slack error response: ' + JSON.stringify(responseData.error),
 		);
 	}
 
-	if (response.ts !== undefined) {
-		Object.assign(response, { message_timestamp: response.ts });
-		delete response.ts;
+	if (responseData.ts !== undefined) {
+		Object.assign(responseData, { message_timestamp: responseData.ts });
+		delete responseData.ts;
 	}
 
 	return response;
 }
 
+function hasNextPage(responseData: any, propertyName: string): boolean {
+	const nextCursorDefined = isDefined(responseData.response_metadata?.next_cursor);
+	const morePagesAvailable =
+		isDefined(responseData.paging?.pages) &&
+		isDefined(responseData.paging.page) &&
+		responseData.paging.page < responseData.paging.pages;
+	const morePropertyPagesAvailable =
+		isDefined(responseData[propertyName].paging?.pages) &&
+		isDefined(responseData[propertyName].paging.page) &&
+		responseData[propertyName].paging.page < responseData[propertyName].paging.pages;
+	return nextCursorDefined || morePagesAvailable || morePropertyPagesAvailable;
+}
+
+export async function slackApiRequestAllItemsWithRateLimit<TResponseData>(
+	context: IExecuteFunctions | ILoadOptionsFunctions,
+	propertyName: string,
+	method: IHttpRequestMethods,
+	endpoint: string,
+	body: any = {},
+	query: IDataObject = {},
+	options: RateLimitOptions = {},
+): Promise<{ data: TResponseData[]; cursor?: string; page?: string }> {
+	const { maxRetries = 3, fallbackDelay = 30_000, onFail = 'throw' } = options;
+
+	const returnData: TResponseData[] = [];
+	let responseData;
+	query.page = 1;
+	//if the endpoint uses legacy pagination use count
+	//https://api.slack.com/docs/pagination#classic
+	if (endpoint.includes('files.list')) {
+		query.count = 100;
+	} else {
+		query.limit = query.limit ?? 100;
+	}
+	do {
+		let retryCount = 0;
+		let requestSuccessful = false;
+
+		while (!requestSuccessful) {
+			const response = await slackApiRequest.call(
+				context,
+				method,
+				endpoint,
+				body as IDataObject,
+				query,
+				{},
+				{ resolveWithFullResponse: true, simple: false },
+			);
+
+			const getErrMsg = () =>
+				'Slack error response: ' +
+				JSON.stringify(response.body?.error ?? response.statusMessage ?? 'Unknown error');
+
+			if (response.statusCode === 200) {
+				retryCount = 0;
+				responseData = response.body;
+				requestSuccessful = true;
+			} else if (response.statusCode === 429) {
+				const shouldRetry = retryCount < maxRetries;
+				// if onFail='stop' we should wait, so that user don't hit rate limit when scrolling through results
+				if (shouldRetry || onFail === 'stop') {
+					// Extract Retry-After header (in seconds) and convert to milliseconds
+					const retryAfterHeader =
+						response.headers?.['retry-after'] ?? response.headers?.['Retry-After'];
+					const waitTime = retryAfterHeader ? parseInt(retryAfterHeader, 10) * 1000 : fallbackDelay;
+					await sleep(waitTime);
+					retryCount++;
+				}
+
+				if (shouldRetry) {
+					continue;
+				}
+
+				if (onFail === 'stop') {
+					// Return the data collected so far with cursor/page info
+					const result: { data: TResponseData[]; cursor?: string; page?: string } = {
+						data: returnData,
+					};
+
+					// Add cursor if available
+					if (query.cursor) {
+						result.cursor = query.cursor as string;
+					}
+					// Add nextPage if using legacy pagination
+					if (responseData?.paging?.page) {
+						result.page = String(responseData.paging.page);
+					} else if (responseData?.[propertyName]?.paging?.page) {
+						result.page = String(responseData[propertyName].paging.page);
+					} else if (query.page) {
+						result.page = String(query.page);
+					}
+
+					return result;
+				}
+				throw new NodeOperationError(context.getNode(), getErrMsg());
+			} else {
+				throw new NodeOperationError(context.getNode(), getErrMsg());
+			}
+		}
+
+		query.cursor = get(responseData, 'response_metadata.next_cursor');
+		query.page++;
+		returnData.push.apply(
+			returnData,
+			(responseData[propertyName].matches as TResponseData[]) ?? responseData[propertyName],
+		);
+	} while (hasNextPage(responseData, propertyName));
+
+	return { data: returnData };
+}
+
 export async function slackApiRequestAllItems(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
 	propertyName: string,
@@ -134,17 +269,7 @@ export async function slackApiRequestAllItems(
 			returnData,
 			(responseData[propertyName].matches as IDataObject[]) ?? responseData[propertyName],
 		);
-	} while (
-		(responseData.response_metadata?.next_cursor !== undefined &&
-			responseData.response_metadata.next_cursor !== '' &&
-			responseData.response_metadata.next_cursor !== null) ||
-		(responseData.paging?.pages !== undefined &&
-			responseData.paging.page !== undefined &&
-			responseData.paging.page < responseData.paging.pages) ||
-		(responseData[propertyName].paging?.pages !== undefined &&
-			responseData[propertyName].paging.page !== undefined &&
-			responseData[propertyName].paging.page < responseData[propertyName].paging.pages)
-	);
+	} while (hasNextPage(responseData, propertyName));
 	return returnData;
 }
 
diff --git a/packages/nodes-base/nodes/Slack/V2/MessageDescription.ts b/packages/nodes-base/nodes/Slack/V2/MessageDescription.ts
index 4bf7dd967aa..785b349bc5b 100644
--- a/packages/nodes-base/nodes/Slack/V2/MessageDescription.ts
+++ b/packages/nodes-base/nodes/Slack/V2/MessageDescription.ts
@@ -1,4 +1,5 @@
 import { SEND_AND_WAIT_OPERATION, type INodeProperties } from 'n8n-workflow';
+import { slackChannelModes } from './utils';
 
 export const messageOperations: INodeProperties[] = [
 	{
@@ -192,52 +193,7 @@ export const messageFields: INodeProperties[] = [
 				operation: ['getPermalink'],
 			},
 		},
-		modes: [
-			{
-				displayName: 'From List',
-				name: 'list',
-				type: 'list',
-				placeholder: 'Select a channel...',
-				typeOptions: {
-					searchListMethod: 'getChannels',
-					searchable: true,
-				},
-			},
-			{
-				displayName: 'By ID',
-				name: 'id',
-				type: 'string',
-				validation: [
-					{
-						type: 'regex',
-						properties: {
-							regex: '[a-zA-Z0-9]{2,}',
-							errorMessage: 'Not a valid Slack Channel ID',
-						},
-					},
-				],
-				placeholder: 'C0122KQ70S7E',
-			},
-			{
-				displayName: 'By URL',
-				name: 'url',
-				type: 'string',
-				placeholder: 'https://app.slack.com/client/TS9594PZK/B0556F47Z3A',
-				validation: [
-					{
-						type: 'regex',
-						properties: {
-							regex: 'http(s)?://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
-							errorMessage: 'Not a valid Slack Channel URL',
-						},
-					},
-				],
-				extractValue: {
-					type: 'regex',
-					regex: 'https://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
-				},
-			},
-		],
+		modes: slackChannelModes,
 	},
 	{
 		displayName: 'Message Timestamp',
@@ -804,52 +760,7 @@ export const messageFields: INodeProperties[] = [
 		type: 'resourceLocator',
 		default: { mode: 'list', value: '' },
 		placeholder: 'Select a channel...',
-		modes: [
-			{
-				displayName: 'From List',
-				name: 'list',
-				type: 'list',
-				placeholder: 'Select a channel...',
-				typeOptions: {
-					searchListMethod: 'getChannels',
-					searchable: true,
-				},
-			},
-			{
-				displayName: 'By ID',
-				name: 'id',
-				type: 'string',
-				validation: [
-					{
-						type: 'regex',
-						properties: {
-							regex: '[a-zA-Z0-9]{2,}',
-							errorMessage: 'Not a valid Slack Channel ID',
-						},
-					},
-				],
-				placeholder: 'C0122KQ70S7E',
-			},
-			{
-				displayName: 'By URL',
-				name: 'url',
-				type: 'string',
-				placeholder: 'https://app.slack.com/client/TS9594PZK/B0556F47Z3A',
-				validation: [
-					{
-						type: 'regex',
-						properties: {
-							regex: 'http(s)?://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
-							errorMessage: 'Not a valid Slack Channel URL',
-						},
-					},
-				],
-				extractValue: {
-					type: 'regex',
-					regex: 'https://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
-				},
-			},
-		],
+		modes: slackChannelModes,
 		required: true,
 		displayOptions: {
 			show: {
@@ -1055,52 +966,7 @@ export const messageFields: INodeProperties[] = [
 		type: 'resourceLocator',
 		default: { mode: 'list', value: '' },
 		placeholder: 'Select a channel...',
-		modes: [
-			{
-				displayName: 'From List',
-				name: 'list',
-				type: 'list',
-				placeholder: 'Select a channel...',
-				typeOptions: {
-					searchListMethod: 'getChannels',
-					searchable: true,
-				},
-			},
-			{
-				displayName: 'By ID',
-				name: 'id',
-				type: 'string',
-				validation: [
-					{
-						type: 'regex',
-						properties: {
-							regex: '[a-zA-Z0-9]{2,}',
-							errorMessage: 'Not a valid Slack Channel ID',
-						},
-					},
-				],
-				placeholder: 'C0122KQ70S7E',
-			},
-			{
-				displayName: 'By URL',
-				name: 'url',
-				type: 'string',
-				placeholder: 'https://app.slack.com/client/TS9594PZK/B0556F47Z3A',
-				validation: [
-					{
-						type: 'regex',
-						properties: {
-							regex: 'http(s)?://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
-							errorMessage: 'Not a valid Slack Channel URL',
-						},
-					},
-				],
-				extractValue: {
-					type: 'regex',
-					regex: 'https://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
-				},
-			},
-		],
+		modes: slackChannelModes,
 		displayOptions: {
 			show: {
 				operation: ['delete'],
diff --git a/packages/nodes-base/nodes/Slack/V2/ReactionDescription.ts b/packages/nodes-base/nodes/Slack/V2/ReactionDescription.ts
index 10d6823e720..a2745ad17e6 100644
--- a/packages/nodes-base/nodes/Slack/V2/ReactionDescription.ts
+++ b/packages/nodes-base/nodes/Slack/V2/ReactionDescription.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+import { slackChannelModes } from './utils';
 
 export const reactionOperations: INodeProperties[] = [
 	{
@@ -42,52 +43,7 @@ export const reactionFields: INodeProperties[] = [
 		type: 'resourceLocator',
 		default: { mode: 'list', value: '' },
 		placeholder: 'Select a channel...',
-		modes: [
-			{
-				displayName: 'From List',
-				name: 'list',
-				type: 'list',
-				placeholder: 'Select a channel...',
-				typeOptions: {
-					searchListMethod: 'getChannels',
-					searchable: true,
-				},
-			},
-			{
-				displayName: 'By ID',
-				name: 'id',
-				type: 'string',
-				validation: [
-					{
-						type: 'regex',
-						properties: {
-							regex: '[a-zA-Z0-9]{2,}',
-							errorMessage: 'Not a valid Slack Channel ID',
-						},
-					},
-				],
-				placeholder: 'C0122KQ70S7E',
-			},
-			{
-				displayName: 'By URL',
-				name: 'url',
-				type: 'string',
-				placeholder: 'https://app.slack.com/client/TS9594PZK/B0556F47Z3A',
-				validation: [
-					{
-						type: 'regex',
-						properties: {
-							regex: 'http(s)?://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
-							errorMessage: 'Not a valid Slack Channel URL',
-						},
-					},
-				],
-				extractValue: {
-					type: 'regex',
-					regex: 'https://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
-				},
-			},
-		],
+		modes: slackChannelModes,
 		required: true,
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/Slack/V2/SlackV2.node.ts b/packages/nodes-base/nodes/Slack/V2/SlackV2.node.ts
index 0a2b4855008..a4e09253e60 100644
--- a/packages/nodes-base/nodes/Slack/V2/SlackV2.node.ts
+++ b/packages/nodes-base/nodes/Slack/V2/SlackV2.node.ts
@@ -30,6 +30,7 @@ import {
 	getTarget,
 	createSendAndWaitMessageBody,
 	processThreadOptions,
+	slackApiRequestAllItemsWithRateLimit,
 } from './GenericFunctions';
 import {
 	channelRLC,
@@ -190,16 +191,15 @@ export class SlackV2 implements INodeType {
 					limit: 1000,
 					cursor: paginationToken,
 				};
-				const { channels, response_metadata } = (await slackApiRequest.call(
-					this,
-					'GET',
-					'/conversations.list',
-					{},
-					qs,
-				)) as {
-					channels: Array<{ id: string; name: string }>;
-					response_metadata?: { next_cursor?: string };
-				};
+				// in case of too many rate limit errors, return cursor and allow user to lazy load by scrolling
+				const { data: channels, cursor } = await slackApiRequestAllItemsWithRateLimit<{
+					id: string;
+					name: string;
+				}>(this, 'channels', 'GET', '/conversations.list', {}, qs, {
+					onFail: 'stop',
+					maxRetries: 2,
+					fallbackDelay: 30_000,
+				});
 				const results: INodeListSearchItems[] = channels
 					.map((c) => ({
 						name: c.name,
@@ -216,8 +216,7 @@ export class SlackV2 implements INodeType {
 						if (a.name.toLowerCase() > b.name.toLowerCase()) return 1;
 						return 0;
 					});
-				const nextPaginationToken = response_metadata?.next_cursor || undefined;
-				return { results, paginationToken: nextPaginationToken };
+				return { results, paginationToken: cursor };
 			},
 			async getUsers(this: ILoadOptionsFunctions, filter?: string): Promise<INodeListSearchResult> {
 				const users = (await slackApiRequestAllItems.call(
diff --git a/packages/nodes-base/nodes/Slack/V2/StarDescription.ts b/packages/nodes-base/nodes/Slack/V2/StarDescription.ts
index b4601c442c1..fe8acdc952c 100644
--- a/packages/nodes-base/nodes/Slack/V2/StarDescription.ts
+++ b/packages/nodes-base/nodes/Slack/V2/StarDescription.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+import { slackChannelModes } from './utils';
 
 export const starOperations: INodeProperties[] = [
 	{
@@ -78,52 +79,7 @@ export const starFields: INodeProperties[] = [
 				target: ['message', 'file'],
 			},
 		},
-		modes: [
-			{
-				displayName: 'From List',
-				name: 'list',
-				type: 'list',
-				placeholder: 'Select a channel...',
-				typeOptions: {
-					searchListMethod: 'getChannels',
-					searchable: true,
-				},
-			},
-			{
-				displayName: 'By ID',
-				name: 'id',
-				type: 'string',
-				validation: [
-					{
-						type: 'regex',
-						properties: {
-							regex: '[a-zA-Z0-9]{2,}',
-							errorMessage: 'Not a valid Slack Channel ID',
-						},
-					},
-				],
-				placeholder: 'C0122KQ70S7E',
-			},
-			{
-				displayName: 'By URL',
-				name: 'url',
-				type: 'string',
-				placeholder: 'https://app.slack.com/client/TS9594PZK/B0556F47Z3A',
-				validation: [
-					{
-						type: 'regex',
-						properties: {
-							regex: 'http(s)?://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
-							errorMessage: 'Not a valid Slack Channel URL',
-						},
-					},
-				],
-				extractValue: {
-					type: 'regex',
-					regex: 'https://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
-				},
-			},
-		],
+		modes: slackChannelModes,
 	},
 	{
 		displayName: 'File ID',
diff --git a/packages/nodes-base/nodes/Slack/V2/utils.ts b/packages/nodes-base/nodes/Slack/V2/utils.ts
new file mode 100644
index 00000000000..2aa68f3f9cd
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/V2/utils.ts
@@ -0,0 +1,53 @@
+/* eslint-disable n8n-nodes-base/node-param-default-missing */
+import type { INodePropertyMode } from 'n8n-workflow';
+
+export const slackChannelModes: INodePropertyMode[] = [
+	{
+		displayName: 'From List',
+		name: 'list',
+		type: 'list',
+		placeholder: 'Select a channel...',
+		typeOptions: {
+			searchListMethod: 'getChannels',
+			searchable: true,
+			slowLoadNotice: {
+				message: 'If loading is slow, try selecting a channel using "By ID" or "By URL"',
+				timeout: 15000,
+			},
+		},
+	},
+	{
+		displayName: 'By ID',
+		name: 'id',
+		type: 'string',
+		validation: [
+			{
+				type: 'regex',
+				properties: {
+					regex: '[a-zA-Z0-9]{2,}',
+					errorMessage: 'Not a valid Slack Channel ID',
+				},
+			},
+		],
+		placeholder: 'C0122KQ70S7E',
+	},
+	{
+		displayName: 'By URL',
+		name: 'url',
+		type: 'string',
+		placeholder: 'https://app.slack.com/client/TS9594PZK/B0556F47Z3A',
+		validation: [
+			{
+				type: 'regex',
+				properties: {
+					regex: 'http(s)?://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
+					errorMessage: 'Not a valid Slack Channel URL',
+				},
+			},
+		],
+		extractValue: {
+			type: 'regex',
+			regex: 'https://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
+		},
+	},
+];
diff --git a/packages/nodes-base/nodes/Slack/test/v2/GenericFunctions.test.ts b/packages/nodes-base/nodes/Slack/test/v2/GenericFunctions.test.ts
index 37008800fc4..ead898002b4 100644
--- a/packages/nodes-base/nodes/Slack/test/v2/GenericFunctions.test.ts
+++ b/packages/nodes-base/nodes/Slack/test/v2/GenericFunctions.test.ts
@@ -1,9 +1,10 @@
 import type { IExecuteFunctions } from 'n8n-workflow';
-import { NodeOperationError } from 'n8n-workflow';
+import { NodeOperationError, sleep } from 'n8n-workflow';
 
 import {
 	slackApiRequest,
 	slackApiRequestAllItems,
+	slackApiRequestAllItemsWithRateLimit,
 	processThreadOptions,
 	getMessageContent,
 } from '../../V2/GenericFunctions';
@@ -11,6 +12,7 @@ import {
 jest.mock('n8n-workflow', () => ({
 	...jest.requireActual('n8n-workflow'),
 	NodeApiError: jest.fn(),
+	sleep: jest.fn().mockResolvedValue(undefined),
 }));
 
 describe('Slack V2 > GenericFunctions', () => {
@@ -40,6 +42,17 @@ describe('Slack V2 > GenericFunctions', () => {
 			await expect(slackApiRequest.call(mockExecuteFunctions, 'GET', '/test')).rejects.toThrow();
 		});
 
+		it('should not handle paid_teams_only error if simple:false', async () => {
+			const mockResponse = { ok: false, error: 'paid_teams_only' };
+			mockExecuteFunctions.helpers.requestWithAuthentication = jest
+				.fn()
+				.mockResolvedValue(mockResponse);
+
+			await expect(
+				slackApiRequest.call(mockExecuteFunctions, 'GET', '/test', {}, {}, {}, { simple: false }),
+			).resolves.toEqual(mockResponse);
+		});
+
 		it('should handle missing_scope error with needed scopes', async () => {
 			const mockResponse = {
 				ok: false,
@@ -362,6 +375,552 @@ describe('Slack V2 > GenericFunctions', () => {
 		});
 	});
 
+	describe('slackApiRequestAllItemsWithRateLimit', () => {
+		beforeEach(() => {
+			jest.clearAllMocks();
+			(sleep as jest.Mock).mockResolvedValue(undefined);
+		});
+
+		it('should paginate successfully without rate limits', async () => {
+			const responses = [
+				{
+					statusCode: 200,
+					body: {
+						ok: true,
+						channels: [{ id: 'ch1' }],
+						response_metadata: { next_cursor: 'cursor1' },
+					},
+				},
+				{
+					statusCode: 200,
+					body: {
+						ok: true,
+						channels: [{ id: 'ch2' }],
+						response_metadata: { next_cursor: '' },
+					},
+				},
+			];
+
+			mockExecuteFunctions.helpers.requestWithAuthentication = jest
+				.fn()
+				.mockImplementationOnce(() => responses[0])
+				.mockImplementationOnce(() => responses[1]);
+
+			const result = await slackApiRequestAllItemsWithRateLimit(
+				mockExecuteFunctions,
+				'channels',
+				'GET',
+				'conversations.list',
+			);
+
+			expect(result.data).toEqual([{ id: 'ch1' }, { id: 'ch2' }]);
+			expect(sleep).not.toHaveBeenCalled();
+		});
+
+		it('should retry on 429 error with retry-after header', async () => {
+			const rateLimitError = {
+				statusCode: 429,
+				body: {
+					error: 'rate_limit_exceeded',
+				},
+				headers: {
+					'retry-after': '2',
+				},
+			};
+
+			const successResponse = {
+				statusCode: 200,
+				body: {
+					ok: true,
+					channels: [{ id: 'ch1' }],
+					response_metadata: { next_cursor: '' },
+				},
+			};
+
+			mockExecuteFunctions.helpers.requestWithAuthentication = jest
+				.fn()
+				.mockResolvedValueOnce(rateLimitError)
+				.mockResolvedValueOnce(successResponse);
+
+			const result = await slackApiRequestAllItemsWithRateLimit(
+				mockExecuteFunctions,
+				'channels',
+				'GET',
+				'conversations.list',
+			);
+
+			expect(result.data).toEqual([{ id: 'ch1' }]);
+			expect(sleep).toHaveBeenCalledTimes(1);
+			expect(sleep).toHaveBeenCalledWith(2000); // 2 seconds * 1000
+		});
+
+		it('should retry on 429 error with Retry-After header (capitalized)', async () => {
+			const rateLimitError = {
+				statusCode: 429,
+				body: {
+					error: 'rate_limit_exceeded',
+				},
+				headers: {
+					'Retry-After': '5',
+				},
+			};
+
+			const successResponse = {
+				statusCode: 200,
+				body: {
+					ok: true,
+					channels: [{ id: 'ch1' }],
+					response_metadata: { next_cursor: '' },
+				},
+			};
+
+			mockExecuteFunctions.helpers.requestWithAuthentication = jest
+				.fn()
+				.mockResolvedValueOnce(rateLimitError)
+				.mockResolvedValueOnce(successResponse);
+
+			const result = await slackApiRequestAllItemsWithRateLimit(
+				mockExecuteFunctions,
+				'channels',
+				'GET',
+				'conversations.list',
+			);
+
+			expect(result.data).toEqual([{ id: 'ch1' }]);
+			expect(sleep).toHaveBeenCalledWith(5000); // 5 seconds * 1000
+		});
+
+		it('should use fallbackDelay when Retry-After header is missing', async () => {
+			const rateLimitError = {
+				statusCode: 429,
+				body: {
+					error: 'rate_limit_exceeded',
+				},
+				headers: {},
+			};
+
+			const successResponse = {
+				statusCode: 200,
+				body: {
+					ok: true,
+					channels: [{ id: 'ch1' }],
+					response_metadata: { next_cursor: '' },
+				},
+			};
+
+			mockExecuteFunctions.helpers.requestWithAuthentication = jest
+				.fn()
+				.mockResolvedValueOnce(rateLimitError)
+				.mockResolvedValueOnce(successResponse);
+
+			const result = await slackApiRequestAllItemsWithRateLimit(
+				mockExecuteFunctions,
+				'channels',
+				'GET',
+				'conversations.list',
+				{},
+				{},
+				{ fallbackDelay: 10000 },
+			);
+
+			expect(result.data).toEqual([{ id: 'ch1' }]);
+			expect(sleep).toHaveBeenCalledWith(10000);
+		});
+
+		it('should retry multiple times on consecutive 429 errors', async () => {
+			const rateLimitError = {
+				statusCode: 429,
+				body: {
+					error: 'rate_limit_exceeded',
+				},
+				headers: {
+					'retry-after': '1',
+				},
+			};
+
+			const successResponse = {
+				statusCode: 200,
+				body: {
+					ok: true,
+					channels: [{ id: 'ch1' }],
+					response_metadata: { next_cursor: '' },
+				},
+			};
+
+			mockExecuteFunctions.helpers.requestWithAuthentication = jest
+				.fn()
+				.mockResolvedValueOnce(rateLimitError)
+				.mockResolvedValueOnce(rateLimitError)
+				.mockResolvedValueOnce(successResponse);
+
+			const result = await slackApiRequestAllItemsWithRateLimit(
+				mockExecuteFunctions,
+				'channels',
+				'GET',
+				'conversations.list',
+				{},
+				{},
+				{ maxRetries: 3 },
+			);
+
+			expect(result.data).toEqual([{ id: 'ch1' }]);
+			expect(sleep).toHaveBeenCalledTimes(2);
+			expect(sleep).toHaveBeenNthCalledWith(1, 1000);
+			expect(sleep).toHaveBeenNthCalledWith(2, 1000);
+		});
+
+		it('should throw error when maxRetries exceeded with onFail: throw (default)', async () => {
+			const rateLimitError = {
+				statusCode: 429,
+				headers: {
+					'retry-after': '1',
+				},
+				body: {
+					error: 'rate_limit_exceeded',
+				},
+			};
+
+			mockExecuteFunctions.helpers.requestWithAuthentication = jest
+				.fn()
+				.mockResolvedValue(rateLimitError);
+
+			await expect(
+				slackApiRequestAllItemsWithRateLimit(
+					mockExecuteFunctions,
+					'channels',
+					'GET',
+					'conversations.list',
+					{},
+					{},
+					{ maxRetries: 2 },
+				),
+			).rejects.toThrow(/Slack error response: "rate_limit_exceeded"/);
+
+			expect(sleep).toHaveBeenCalledTimes(2); // Should retry 2 times
+		});
+
+		it('should return partial data when maxRetries exceeded with onFail: stop', async () => {
+			const rateLimitError = {
+				statusCode: 429,
+				body: {
+					error: 'rate_limit_exceeded',
+				},
+				headers: {
+					'retry-after': '1',
+				},
+			};
+
+			const firstPageResponse = {
+				statusCode: 200,
+				body: {
+					ok: true,
+					channels: [{ id: 'ch1' }],
+					response_metadata: { next_cursor: 'cursor1' },
+				},
+			};
+
+			mockExecuteFunctions.helpers.requestWithAuthentication = jest
+				.fn()
+				.mockResolvedValue(rateLimitError)
+				.mockResolvedValueOnce(firstPageResponse);
+
+			const result = await slackApiRequestAllItemsWithRateLimit(
+				mockExecuteFunctions,
+				'channels',
+				'GET',
+				'conversations.list',
+				{},
+				{},
+				{ maxRetries: 2, onFail: 'stop' },
+			);
+
+			expect(result.data).toEqual([{ id: 'ch1' }]);
+			expect(result.cursor).toBe('cursor1');
+			expect(sleep).toHaveBeenCalledTimes(3);
+		});
+
+		it('should return nextPage when using legacy pagination with onFail: stop', async () => {
+			const rateLimitError = {
+				statusCode: 429,
+				body: {
+					error: 'rate_limit_exceeded',
+				},
+				headers: {
+					'retry-after': '1',
+				},
+			};
+
+			const firstPageResponse = {
+				statusCode: 200,
+				body: {
+					ok: true,
+					channels: [{ id: 'ch1' }],
+					paging: { pages: 3, page: 1 },
+				},
+			};
+
+			mockExecuteFunctions.helpers.requestWithAuthentication = jest
+				.fn()
+				.mockResolvedValue(rateLimitError)
+				.mockResolvedValueOnce(firstPageResponse);
+
+			const result = await slackApiRequestAllItemsWithRateLimit(
+				mockExecuteFunctions,
+				'channels',
+				'GET',
+				'conversations.list',
+				{},
+				{},
+				{ maxRetries: 1, onFail: 'stop' },
+			);
+
+			expect(result.data).toEqual([{ id: 'ch1' }]);
+			// Returns the page from the last successful response (responseData.paging.page)
+			expect(result.page).toBe('1');
+		});
+
+		it('should return nextPage from property paging when using onFail: stop', async () => {
+			const rateLimitError = {
+				statusCode: 429,
+				body: {
+					error: 'rate_limit_exceeded',
+				},
+				headers: {
+					'retry-after': '1',
+				},
+			};
+
+			const firstPageResponse = {
+				statusCode: 200,
+				body: {
+					ok: true,
+					messages: {
+						matches: [{ text: 'msg1' }],
+					},
+					paging: { pages: 2, page: 1 },
+				},
+			};
+
+			mockExecuteFunctions.helpers.requestWithAuthentication = jest
+				.fn()
+				.mockResolvedValue(rateLimitError)
+				.mockResolvedValueOnce(firstPageResponse);
+
+			const result = await slackApiRequestAllItemsWithRateLimit(
+				mockExecuteFunctions,
+				'messages',
+				'GET',
+				'search.messages',
+				{},
+				{},
+				{ maxRetries: 1, onFail: 'stop' },
+			);
+
+			expect(result.data).toEqual([{ text: 'msg1' }]);
+			// Returns the page from the last successful response (responseData[propertyName].paging.page)
+			expect(result.page).toBe('1');
+		});
+
+		it('should handle rate limit in middle of pagination', async () => {
+			const rateLimitError = {
+				statusCode: 429,
+				body: {
+					error: 'rate_limit_exceeded',
+				},
+				headers: {
+					'retry-after': '1',
+				},
+			};
+
+			const responses = [
+				{
+					statusCode: 200,
+					body: {
+						ok: true,
+						channels: [{ id: 'ch1' }],
+						response_metadata: { next_cursor: 'cursor1' },
+					},
+				},
+				rateLimitError,
+				{
+					statusCode: 200,
+					body: {
+						ok: true,
+						channels: [{ id: 'ch2' }],
+						response_metadata: { next_cursor: '' },
+					},
+				},
+			];
+
+			mockExecuteFunctions.helpers.requestWithAuthentication = jest
+				.fn()
+				.mockImplementationOnce(() => responses[0])
+				.mockResolvedValueOnce(responses[1])
+				.mockImplementationOnce(() => responses[2]);
+
+			const result = await slackApiRequestAllItemsWithRateLimit(
+				mockExecuteFunctions,
+				'channels',
+				'GET',
+				'conversations.list',
+			);
+
+			expect(result.data).toEqual([{ id: 'ch1' }, { id: 'ch2' }]);
+			expect(sleep).toHaveBeenCalledTimes(1);
+		});
+
+		it('should handle non-429 errors by throwing immediately', async () => {
+			const otherError = {
+				statusCode: 500,
+				body: {
+					error: 'Internal Server Error',
+				},
+			};
+
+			mockExecuteFunctions.helpers.requestWithAuthentication = jest
+				.fn()
+				.mockResolvedValue(otherError);
+
+			await expect(
+				slackApiRequestAllItemsWithRateLimit(
+					mockExecuteFunctions,
+					'channels',
+					'GET',
+					'conversations.list',
+				),
+			).rejects.toThrow(/Slack error response: "Internal Server Error"/);
+
+			expect(sleep).not.toHaveBeenCalled();
+		});
+
+		it('should use files.list endpoint with count parameter', async () => {
+			const response = {
+				statusCode: 200,
+				body: {
+					ok: true,
+					files: [{ id: 'file1' }],
+					response_metadata: { next_cursor: '' },
+				},
+			};
+
+			mockExecuteFunctions.helpers.requestWithAuthentication = jest
+				.fn()
+				.mockResolvedValue(response);
+
+			await slackApiRequestAllItemsWithRateLimit(
+				mockExecuteFunctions,
+				'files',
+				'GET',
+				'files.list',
+			);
+
+			expect(mockExecuteFunctions.helpers.requestWithAuthentication).toHaveBeenCalledWith(
+				'slackApi',
+				expect.objectContaining({
+					qs: expect.objectContaining({
+						count: 100,
+					}),
+				}),
+				expect.any(Object),
+			);
+		});
+
+		it('should handle pagination with paging info', async () => {
+			const responses = [
+				{
+					statusCode: 200,
+					body: {
+						ok: true,
+						channels: [{ id: 'ch1' }],
+						paging: { pages: 2, page: 1 },
+					},
+				},
+				{
+					statusCode: 200,
+					body: {
+						ok: true,
+						channels: [{ id: 'ch2' }],
+						paging: { pages: 2, page: 2 },
+					},
+				},
+			];
+
+			mockExecuteFunctions.helpers.requestWithAuthentication = jest
+				.fn()
+				.mockImplementationOnce(() => responses[0])
+				.mockImplementationOnce(() => responses[1]);
+
+			const result = await slackApiRequestAllItemsWithRateLimit(
+				mockExecuteFunctions,
+				'channels',
+				'GET',
+				'conversations.list',
+			);
+
+			expect(result.data).toEqual([{ id: 'ch1' }, { id: 'ch2' }]);
+		});
+
+		it('should handle matches in response', async () => {
+			const response = {
+				statusCode: 200,
+				body: {
+					ok: true,
+					messages: {
+						matches: [{ text: 'test' }],
+					},
+					response_metadata: { next_cursor: '' },
+				},
+			};
+
+			mockExecuteFunctions.helpers.requestWithAuthentication = jest
+				.fn()
+				.mockResolvedValue(response);
+
+			const result = await slackApiRequestAllItemsWithRateLimit(
+				mockExecuteFunctions,
+				'messages',
+				'GET',
+				'search.messages',
+			);
+
+			expect(result.data).toEqual([{ text: 'test' }]);
+		});
+
+		it('should use default options when not provided', async () => {
+			const rateLimitError = {
+				statusCode: 429,
+				body: {
+					error: 'rate_limit_exceeded',
+				},
+				headers: {},
+			};
+
+			const successResponse = {
+				statusCode: 200,
+				body: {
+					ok: true,
+					channels: [{ id: 'ch1' }],
+					response_metadata: { next_cursor: '' },
+				},
+			};
+
+			mockExecuteFunctions.helpers.requestWithAuthentication = jest
+				.fn()
+				.mockResolvedValueOnce(rateLimitError)
+				.mockResolvedValueOnce(successResponse);
+
+			await slackApiRequestAllItemsWithRateLimit(
+				mockExecuteFunctions,
+				'channels',
+				'GET',
+				'conversations.list',
+			);
+
+			// Should use default fallbackDelay of 30000
+			expect(sleep).toHaveBeenCalledWith(30000);
+		});
+	});
+
 	describe('processThreadOptions', () => {
 		it('should return empty object when threadOptions is undefined', () => {
 			const result = processThreadOptions(undefined);
diff --git a/packages/workflow/src/interfaces.ts b/packages/workflow/src/interfaces.ts
index 2292c2934b0..caadf99fb41 100644
--- a/packages/workflow/src/interfaces.ts
+++ b/packages/workflow/src/interfaces.ts
@@ -1606,6 +1606,15 @@ export interface INodePropertyModeTypeOptions {
 	searchListMethod?: string; // Supported by: options
 	searchFilterRequired?: boolean;
 	searchable?: boolean;
+	/**
+	 * If provided, a slow load notice will be shown to the user if the resource locator takes longer than the timeout to load.
+	 * @example
+	 * {
+	 *   message: 'If loading takes longer than expected, try selecting a resource using "By ID"',
+	 *   timeout: 10000,
+	 * }
+	 */
+	slowLoadNotice?: { message: string; timeout: number };
 	/**
 	 * If true, the resource locator will not show an error if the credentials are not selected
 	 */

From cf6f75b8dd5a091511a325a3c73435e3e464967f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dimitri=20Lavren=C3=BCk?=
 <20122620+dlavrenuek@users.noreply.github.com>
Date: Tue, 9 Dec 2025 11:59:43 +0100
Subject: [PATCH 147/167] fix: Allow negative numbers when parsing objects from
 string (#22937)

---
 packages/workflow/src/utils.ts       |  7 ++++
 packages/workflow/test/utils.test.ts | 48 ++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+)

diff --git a/packages/workflow/src/utils.ts b/packages/workflow/src/utils.ts
index 5890db24172..fceea0e742f 100644
--- a/packages/workflow/src/utils.ts
+++ b/packages/workflow/src/utils.ts
@@ -87,6 +87,13 @@ function syntaxNodeToValue(expression?: SyntaxNode | null): unknown {
 			return expression.value;
 		case Syntax.ArrayExpression:
 			return expression.elements.map((exp) => syntaxNodeToValue(exp));
+		case Syntax.UnaryExpression: {
+			const value = syntaxNodeToValue(expression.argument);
+			if (typeof value === 'number' && expression.operator === '-') {
+				return -value;
+			}
+			return value;
+		}
 		default:
 			return undefined;
 	}
diff --git a/packages/workflow/test/utils.test.ts b/packages/workflow/test/utils.test.ts
index 778d0d03f00..816fdd1a30c 100644
--- a/packages/workflow/test/utils.test.ts
+++ b/packages/workflow/test/utils.test.ts
@@ -110,6 +110,54 @@ describe('jsonParse', () => {
 		expect(jsonParse('', { fallbackValue: { foo: 'bar' } })).toEqual({ foo: 'bar' });
 	});
 
+	describe('acceptJSObject', () => {
+		const options: Parameters<typeof jsonParse>[1] = {
+			acceptJSObject: true,
+		};
+
+		it('should handle string values', () => {
+			const result = jsonParse('{name: \'John\', surname: "Doe"}', options);
+			expect(result).toEqual({ name: 'John', surname: 'Doe' });
+		});
+
+		it('should handle positive numbers', () => {
+			const result = jsonParse(
+				'{int: 12345, float1: 444.111, float2: .123, float3: +.12, oct: 0x10}',
+				options,
+			);
+			expect(result).toEqual({
+				int: 12345,
+				float1: 444.111,
+				float2: 0.123,
+				float3: 0.12,
+				oct: 16,
+			});
+		});
+
+		it('should handle negative numbers', () => {
+			const result = jsonParse(
+				'{int: -12345, float1: -444.111, float2: -.123, float3: -.12, oct: -0x10}',
+				options,
+			);
+			expect(result).toEqual({
+				int: -12345,
+				float1: -444.111,
+				float2: -0.123,
+				float3: -0.12,
+				oct: -16,
+			});
+		});
+
+		it('should handle mixed values', () => {
+			const result = jsonParse('{int: -12345, float: 12.35, text: "hello world"}', options);
+			expect(result).toEqual({
+				int: -12345,
+				float: 12.35,
+				text: 'hello world',
+			});
+		});
+	});
+
 	describe('JSON repair', () => {
 		describe('Recovery edge cases', () => {
 			it('should handle simple object with single quotes', () => {

From 98ea4c04aab808b66e74fb6917c12822bad31a35 Mon Sep 17 00:00:00 2001
From: Jaakko Husso <jaakko@n8n.io>
Date: Tue, 9 Dec 2025 13:25:18 +0200
Subject: [PATCH 148/167] feat(core): Make n8n workflows on Chat require
 streaming response mode (no-changelog) (#22947)

---
 .../trigger/ChatTrigger/ChatTrigger.node.ts   | 38 ++++++--
 .../__test__/ChatTrigger.node.test.ts         | 68 ++++++++++++++
 .../chat-hub/chat-hub-workflow.service.ts     | 26 +++---
 .../modules/chat-hub/chat-hub.constants.ts    | 11 ++-
 .../chat-hub/chat-hub.models.service.ts       | 35 ++++----
 .../src/modules/chat-hub/chat-hub.service.ts  | 88 +++++++++++++++----
 .../src/modules/chat-hub/chat-hub.types.ts    | 13 ++-
 .../src/features/ai/chatHub/chat.store.ts     | 40 ++++-----
 .../components/CollectionParameter.vue        | 45 +++++-----
 9 files changed, 264 insertions(+), 100 deletions(-)

diff --git a/packages/@n8n/nodes-langchain/nodes/trigger/ChatTrigger/ChatTrigger.node.ts b/packages/@n8n/nodes-langchain/nodes/trigger/ChatTrigger/ChatTrigger.node.ts
index 9efcbf1347f..58d08e39c9c 100644
--- a/packages/@n8n/nodes-langchain/nodes/trigger/ChatTrigger/ChatTrigger.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/trigger/ChatTrigger/ChatTrigger.node.ts
@@ -277,7 +277,8 @@ export class ChatTrigger extends Node {
 			{
 				name: 'default',
 				httpMethod: 'POST',
-				responseMode: '={{$parameter.options?.["responseMode"] || "lastNode" }}',
+				responseMode:
+					'={{$parameter.options?.["responseMode"] ?? ($parameter.availableInChat ? "streaming" : "lastNode") }}',
 				path: CHAT_TRIGGER_PATH_IDENTIFIER,
 				ndvHideMethod: true,
 				ndvHideUrl: '={{ !$parameter.public }}',
@@ -408,7 +409,7 @@ export class ChatTrigger extends Node {
 			},
 			{
 				displayName:
-					'Your n8n users will be able to use this agent in <a href="/home/chat/" target="_blank">Chat</a> once this workflow is published. Make sure to share this workflow with at least \'workflow:execute-chat\' access to all users who should use it. Currently, only streaming response mode is supported.',
+					'Your n8n users will be able to use this agent in <a href="/home/chat/" target="_blank">Chat</a> once this workflow is published. Make sure to share this workflow with at least Project Chat User access to all users who should use it. Currently, only streaming response mode is supported.',
 				name: 'availableInChatNotice',
 				type: 'notice',
 				displayOptions: {
@@ -424,7 +425,8 @@ export class ChatTrigger extends Node {
 				type: 'string',
 				default: '',
 				noDataExpression: true,
-				description: 'The name of the agent on n8n Chat',
+				description:
+					'The name of the agent on n8n Chat. Name of the workflow is used if left empty.',
 				displayOptions: {
 					show: {
 						availableInChat: [true],
@@ -532,9 +534,19 @@ export class ChatTrigger extends Node {
 						displayName: 'Response Mode',
 						name: 'responseMode',
 						type: 'options',
-						options: [lastNodeResponseMode, respondNodesResponseMode],
+						options: [lastNodeResponseMode, respondNodesResponseMode, streamingResponseMode],
 						default: 'lastNode',
 						description: 'When and how to respond to the chat',
+						displayOptions: { show: { '/availableInChat': [false] } },
+					},
+					{
+						displayName: 'Response Mode',
+						name: 'responseMode',
+						type: 'options',
+						options: [streamingResponseMode],
+						default: 'streaming',
+						description: 'When and how to respond to the webhook',
+						displayOptions: { show: { '/availableInChat': [true] } },
 					},
 				],
 			},
@@ -553,6 +565,15 @@ export class ChatTrigger extends Node {
 				default: {},
 				options: [
 					...commonOptionsFields,
+					{
+						displayName: 'Response Mode',
+						name: 'responseMode',
+						type: 'options',
+						options: [streamingResponseMode],
+						default: 'streaming',
+						description: 'When and how to respond to the webhook',
+						displayOptions: { show: { '/availableInChat': [true] } },
+					},
 					{
 						displayName: 'Response Mode',
 						name: 'responseMode',
@@ -560,7 +581,7 @@ export class ChatTrigger extends Node {
 						options: [lastNodeResponseMode, streamingResponseMode, respondToWebhookResponseMode],
 						default: 'lastNode',
 						description: 'When and how to respond to the chat',
-						displayOptions: { show: { '/mode': ['webhook'] } },
+						displayOptions: { show: { '/mode': ['webhook'], '/availableInChat': [false] } },
 					},
 					{
 						displayName: 'Response Mode',
@@ -569,7 +590,7 @@ export class ChatTrigger extends Node {
 						options: [lastNodeResponseMode, streamingResponseMode, respondNodesResponseMode],
 						default: 'lastNode',
 						description: 'When and how to respond to the webhook',
-						displayOptions: { show: { '/mode': ['hostedChat'] } },
+						displayOptions: { show: { '/mode': ['hostedChat'], '/availableInChat': [false] } },
 					},
 				],
 			},
@@ -655,6 +676,7 @@ export class ChatTrigger extends Node {
 			};
 		}
 
+		const availableInChat = ctx.getNodeParameter('availableInChat', false);
 		const options = ctx.getNodeParameter('options', {});
 		validateNodeParameters(
 			options,
@@ -676,7 +698,9 @@ export class ChatTrigger extends Node {
 		const loadPreviousSession = options.loadPreviousSession;
 		assertValidLoadPreviousSessionOption(loadPreviousSession, ctx.getNode());
 
-		const enableStreaming = options.responseMode === 'streaming';
+		const enableStreaming = availableInChat
+			? !options.responseMode || options.responseMode === 'streaming'
+			: options.responseMode === 'streaming';
 
 		const req = ctx.getRequestObject();
 		const webhookName = ctx.getWebhookName();
diff --git a/packages/@n8n/nodes-langchain/nodes/trigger/ChatTrigger/__test__/ChatTrigger.node.test.ts b/packages/@n8n/nodes-langchain/nodes/trigger/ChatTrigger/__test__/ChatTrigger.node.test.ts
index a9480c7fa91..140c3f66789 100644
--- a/packages/@n8n/nodes-langchain/nodes/trigger/ChatTrigger/__test__/ChatTrigger.node.test.ts
+++ b/packages/@n8n/nodes-langchain/nodes/trigger/ChatTrigger/__test__/ChatTrigger.node.test.ts
@@ -202,6 +202,74 @@ describe('ChatTrigger Node', () => {
 			});
 		});
 
+		it('should enable streaming when availableInChat is true and responseMode is not set', async () => {
+			// Mock options with availableInChat true and no responseMode
+			mockContext.getNodeParameter.mockImplementation(
+				(
+					paramName: string,
+					defaultValue?: boolean | string | object,
+				): boolean | string | object | undefined => {
+					if (paramName === 'public') return true;
+					if (paramName === 'mode') return 'hostedChat';
+					if (paramName === 'options') return {};
+					if (paramName === 'availableInChat') return true;
+					return defaultValue;
+				},
+			);
+
+			// Call the webhook method
+			const result = await chatTrigger.webhook(mockContext);
+
+			// Verify streaming headers are set
+			expect(mockResponse.writeHead).toHaveBeenCalledWith(200, {
+				'Content-Type': 'application/json; charset=utf-8',
+				'Transfer-Encoding': 'chunked',
+				'Cache-Control': 'no-cache',
+				Connection: 'keep-alive',
+			});
+			expect(mockResponse.flushHeaders).toHaveBeenCalled();
+
+			// Verify response structure for streaming
+			expect(result).toEqual({
+				workflowData: expect.any(Array),
+				noWebhookResponse: true,
+			});
+		});
+
+		it('should enable streaming when availableInChat is true and responseMode is "streaming"', async () => {
+			// Mock options with availableInChat true and streaming responseMode
+			mockContext.getNodeParameter.mockImplementation(
+				(
+					paramName: string,
+					defaultValue?: boolean | string | object,
+				): boolean | string | object | undefined => {
+					if (paramName === 'public') return true;
+					if (paramName === 'mode') return 'hostedChat';
+					if (paramName === 'options') return { responseMode: 'streaming' };
+					if (paramName === 'availableInChat') return true;
+					return defaultValue;
+				},
+			);
+
+			// Call the webhook method
+			const result = await chatTrigger.webhook(mockContext);
+
+			// Verify streaming headers are set
+			expect(mockResponse.writeHead).toHaveBeenCalledWith(200, {
+				'Content-Type': 'application/json; charset=utf-8',
+				'Transfer-Encoding': 'chunked',
+				'Cache-Control': 'no-cache',
+				Connection: 'keep-alive',
+			});
+			expect(mockResponse.flushHeaders).toHaveBeenCalled();
+
+			// Verify response structure for streaming
+			expect(result).toEqual({
+				workflowData: expect.any(Array),
+				noWebhookResponse: true,
+			});
+		});
+
 		it('should handle multipart form data with streaming enabled', async () => {
 			// Mock multipart form data request
 			mockRequest.contentType = 'multipart/form-data';
diff --git a/packages/cli/src/modules/chat-hub/chat-hub-workflow.service.ts b/packages/cli/src/modules/chat-hub/chat-hub-workflow.service.ts
index f3176f89dee..334df173816 100644
--- a/packages/cli/src/modules/chat-hub/chat-hub-workflow.service.ts
+++ b/packages/cli/src/modules/chat-hub/chat-hub-workflow.service.ts
@@ -31,7 +31,7 @@ import { v4 as uuidv4 } from 'uuid';
 
 import { ChatHubMessage } from './chat-hub-message.entity';
 import { NODE_NAMES, PROVIDER_NODE_TYPE_MAP } from './chat-hub.constants';
-import { MessageRecord } from './chat-hub.types';
+import { MessageRecord, type ChatTriggerResponseMode } from './chat-hub.types';
 import { getMaxContextWindowTokens } from './context-limits';
 
 @Service()
@@ -55,7 +55,11 @@ export class ChatHubWorkflowService {
 		tools: INode[],
 		timeZone: string,
 		trx?: EntityManager,
-	): Promise<{ workflowData: IWorkflowBase; executionData: IRunExecutionData }> {
+	): Promise<{
+		workflowData: IWorkflowBase;
+		executionData: IRunExecutionData;
+		responseMode: ChatTriggerResponseMode;
+	}> {
 		return await withTransaction(this.workflowRepository.manager, trx, async (em) => {
 			this.logger.debug(
 				`Creating chat workflow for user ${userId} and session ${sessionId}, provider ${model.provider}`,
@@ -69,9 +73,8 @@ export class ChatHubWorkflowService {
 				attachments,
 				credentials,
 				model,
-				systemMessage,
+				systemMessage: systemMessage ?? this.getBaseSystemMessage(timeZone),
 				tools,
-				timeZone,
 			});
 
 			const newWorkflow = new WorkflowEntity();
@@ -103,6 +106,7 @@ export class ChatHubWorkflowService {
 			return {
 				workflowData: workflow,
 				executionData,
+				responseMode: 'streaming',
 			};
 		});
 	}
@@ -261,7 +265,6 @@ export class ChatHubWorkflowService {
 		model,
 		systemMessage,
 		tools,
-		timeZone,
 	}: {
 		userId: string;
 		sessionId: ChatSessionId;
@@ -270,12 +273,11 @@ export class ChatHubWorkflowService {
 		attachments: IBinaryData[];
 		credentials: INodeCredentials;
 		model: ChatHubConversationModel;
-		systemMessage?: string;
+		systemMessage: string;
 		tools: INode[];
-		timeZone: string;
 	}) {
 		const chatTriggerNode = this.buildChatTriggerNode();
-		const toolsAgentNode = this.buildToolsAgentNode(model, timeZone, systemMessage);
+		const toolsAgentNode = this.buildToolsAgentNode(model, systemMessage);
 		const modelNode = this.buildModelNode(credentials, model);
 		const memoryNode = this.buildMemoryNode(20);
 		const restoreMemoryNode = this.buildRestoreMemoryNode(history);
@@ -489,20 +491,20 @@ ${this.getSystemMessageMetadata(timeZone)}`;
 
 	private buildToolsAgentNode(
 		model: ChatHubConversationModel,
-		timeZone: string,
-		systemMessage?: string,
+		systemMessage: string,
+		enableStreaming = true,
 	): INode {
 		return {
 			parameters: {
 				promptType: 'define',
 				text: `={{ $('${NODE_NAMES.CHAT_TRIGGER}').item.json.chatInput }}`,
 				options: {
-					enableStreaming: true,
+					enableStreaming,
 					maxTokensFromMemory:
 						model.provider !== 'n8n' && model.provider !== 'custom-agent'
 							? getMaxContextWindowTokens(model.provider, model.model)
 							: undefined,
-					systemMessage: systemMessage ?? this.getBaseSystemMessage(timeZone),
+					systemMessage,
 				},
 			},
 			type: AGENT_LANGCHAIN_NODE_TYPE,
diff --git a/packages/cli/src/modules/chat-hub/chat-hub.constants.ts b/packages/cli/src/modules/chat-hub/chat-hub.constants.ts
index 01a26b83730..42722af5f41 100644
--- a/packages/cli/src/modules/chat-hub/chat-hub.constants.ts
+++ b/packages/cli/src/modules/chat-hub/chat-hub.constants.ts
@@ -1,5 +1,14 @@
 import type { ChatHubLLMProvider, ChatModelMetadataDto } from '@n8n/api-types';
-import type { INodeTypeNameVersion } from 'n8n-workflow';
+import type { ExecutionStatus, INodeTypeNameVersion } from 'n8n-workflow';
+
+export const EXECUTION_POLL_INTERVAL = 1000;
+export const EXECUTION_FINISHED_STATUSES: ExecutionStatus[] = [
+	'canceled',
+	'crashed',
+	'error',
+	'success',
+];
+export const TOOLS_AGENT_NODE_MIN_VERSION = 2.2;
 
 export const PROVIDER_NODE_TYPE_MAP: Record<ChatHubLLMProvider, INodeTypeNameVersion> = {
 	openai: {
diff --git a/packages/cli/src/modules/chat-hub/chat-hub.models.service.ts b/packages/cli/src/modules/chat-hub/chat-hub.models.service.ts
index 8e917b6be2e..10c2aae227b 100644
--- a/packages/cli/src/modules/chat-hub/chat-hub.models.service.ts
+++ b/packages/cli/src/modules/chat-hub/chat-hub.models.service.ts
@@ -10,23 +10,22 @@ import {
 import { In, WorkflowRepository, type User } from '@n8n/db';
 import { Service } from '@n8n/di';
 import {
-	AGENT_LANGCHAIN_NODE_TYPE,
 	CHAT_TRIGGER_NODE_TYPE,
 	type INodeCredentials,
 	type INodePropertyOptions,
 	type IWorkflowExecuteAdditionalData,
 } from 'n8n-workflow';
 
+import { ChatHubAgentService } from './chat-hub-agent.service';
+import { ChatHubWorkflowService } from './chat-hub-workflow.service';
+import { getModelMetadata, PROVIDER_NODE_TYPE_MAP } from './chat-hub.constants';
+import { chatTriggerParamsShape } from './chat-hub.types';
+
 import { CredentialsFinderService } from '@/credentials/credentials-finder.service';
 import { DynamicNodeParametersService } from '@/services/dynamic-node-parameters.service';
 import { getBase } from '@/workflow-execute-additional-data';
 import { WorkflowService } from '@/workflows/workflow.service';
 
-import { ChatHubAgentService } from './chat-hub-agent.service';
-import { ChatHubWorkflowService } from './chat-hub-workflow.service';
-import { getModelMetadata, PROVIDER_NODE_TYPE_MAP } from './chat-hub.constants';
-import { validChatTriggerParamsShape } from './chat-hub.types';
-
 @Service()
 export class ChatHubModelsService {
 	constructor(
@@ -730,14 +729,14 @@ export class ChatHubModelsService {
 			.filter((workflow) => !!workflow.activeVersionId);
 
 		const workflows = await this.workflowRepository.find({
-			select: { id: true },
+			select: { id: true, name: true },
 			where: { id: In(activeWorkflows.map((workflow) => workflow.id)) },
 			relations: { activeVersion: true },
 		});
 
 		const models: ChatModelDto[] = [];
 
-		for (const { id, activeVersion } of workflows) {
+		for (const { id, name, activeVersion } of workflows) {
 			if (!activeVersion) {
 				continue;
 			}
@@ -747,17 +746,8 @@ export class ChatHubModelsService {
 				continue;
 			}
 
-			const chatTriggerParams = validChatTriggerParamsShape.safeParse(chatTrigger.parameters).data;
-			if (!chatTriggerParams) {
-				continue;
-			}
-
-			const agentNodes = activeVersion.nodes?.filter(
-				(node) => node.type === AGENT_LANGCHAIN_NODE_TYPE,
-			);
-
-			// Agents older than this can't do streaming
-			if (agentNodes.some((node) => node.typeVersion < 2.1)) {
+			const chatTriggerParams = chatTriggerParamsShape.safeParse(chatTrigger.parameters).data;
+			if (!chatTriggerParams?.availableInChat) {
 				continue;
 			}
 
@@ -765,8 +755,13 @@ export class ChatHubModelsService {
 				chatTriggerParams.options,
 			);
 
+			const agentName =
+				chatTriggerParams.agentName && chatTriggerParams.agentName.trim().length > 0
+					? chatTriggerParams.agentName
+					: name;
+
 			models.push({
-				name: chatTriggerParams.agentName ?? activeVersion.name ?? 'Unknown Agent',
+				name: agentName,
 				description: chatTriggerParams.agentDescription ?? null,
 				model: {
 					provider: 'n8n',
diff --git a/packages/cli/src/modules/chat-hub/chat-hub.service.ts b/packages/cli/src/modules/chat-hub/chat-hub.service.ts
index ccccaf1f628..b8cc6ff46e3 100644
--- a/packages/cli/src/modules/chat-hub/chat-hub.service.ts
+++ b/packages/cli/src/modules/chat-hub/chat-hub.service.ts
@@ -38,7 +38,7 @@ import {
 	type IBinaryData,
 	createRunExecutionData,
 	WorkflowExecuteMode,
-	ExecutionStatus,
+	AGENT_LANGCHAIN_NODE_TYPE,
 } from 'n8n-workflow';
 
 import { ChatHubAgentService } from './chat-hub-agent.service';
@@ -47,12 +47,21 @@ import type { ChatHubMessage } from './chat-hub-message.entity';
 import type { ChatHubSession } from './chat-hub-session.entity';
 import { ChatHubWorkflowService } from './chat-hub-workflow.service';
 import { ChatHubAttachmentService } from './chat-hub.attachment.service';
-import { JSONL_STREAM_HEADERS, NODE_NAMES, PROVIDER_NODE_TYPE_MAP } from './chat-hub.constants';
+import {
+	EXECUTION_FINISHED_STATUSES,
+	EXECUTION_POLL_INTERVAL,
+	JSONL_STREAM_HEADERS,
+	NODE_NAMES,
+	PROVIDER_NODE_TYPE_MAP,
+	TOOLS_AGENT_NODE_MIN_VERSION,
+} from './chat-hub.constants';
 import { ChatHubSettingsService } from './chat-hub.settings.service';
 import {
 	HumanMessagePayload,
 	RegenerateMessagePayload,
 	EditMessagePayload,
+	chatTriggerParamsShape,
+	ChatTriggerResponseMode,
 } from './chat-hub.types';
 import { ChatHubMessageRepository } from './chat-message.repository';
 import { ChatHubSessionRepository } from './chat-session.repository';
@@ -65,9 +74,6 @@ import { ExecutionService } from '@/executions/execution.service';
 import { WorkflowExecutionService } from '@/workflows/workflow-execution.service';
 import { WorkflowFinderService } from '@/workflows/workflow-finder.service';
 
-const EXECUTION_POLL_INTERVAL = 1000;
-const EXECUTION_FINISHED_STATUSES: ExecutionStatus[] = ['canceled', 'crashed', 'error', 'success'];
-
 @Service()
 export class ChatHubService {
 	constructor(
@@ -159,6 +165,7 @@ export class ChatHubService {
 
 		let executionData: IRunExecutionData;
 		let workflowData: IWorkflowBase;
+		let responseMode: ChatTriggerResponseMode;
 
 		try {
 			const result = await this.messageRepository.manager.transaction(async (trx) => {
@@ -203,6 +210,7 @@ export class ChatHubService {
 
 			executionData = result.executionData;
 			workflowData = result.workflowData;
+			responseMode = result.responseMode;
 		} catch (error) {
 			if (processedAttachments.length > 0) {
 				try {
@@ -224,6 +232,8 @@ export class ChatHubService {
 			sessionId,
 			messageId,
 			model,
+			null,
+			responseMode,
 		);
 
 		// Generate title for the session on receiving the first human message.
@@ -301,7 +311,7 @@ export class ChatHubService {
 			return;
 		}
 
-		const { workflowData, executionData } = workflow;
+		const { workflowData, executionData, responseMode } = workflow;
 
 		await this.executeChatWorkflowWithCleanup(
 			res,
@@ -311,6 +321,8 @@ export class ChatHubService {
 			sessionId,
 			messageId,
 			model,
+			null,
+			responseMode,
 		);
 	}
 
@@ -319,7 +331,7 @@ export class ChatHubService {
 		const tz = timeZone ?? this.globalConfig.generic.timezone;
 
 		const {
-			workflow: { workflowData, executionData },
+			workflow: { workflowData, executionData, responseMode },
 			retryOfMessageId,
 			previousMessageId,
 		} = await this.messageRepository.manager.transaction(async (trx) => {
@@ -383,6 +395,7 @@ export class ChatHubService {
 			previousMessageId,
 			model,
 			retryOfMessageId,
+			responseMode,
 		);
 	}
 
@@ -537,18 +550,18 @@ export class ChatHubService {
 		message: string,
 		attachments: IBinaryData[],
 	) {
-		const workflowEntity = await this.workflowFinderService.findWorkflowForUser(
+		const workflow = await this.workflowFinderService.findWorkflowForUser(
 			workflowId,
 			user,
 			['workflow:execute-chat'],
 			{ includeTags: false, includeParentFolder: false, includeActiveVersion: true },
 		);
 
-		if (!workflowEntity?.activeVersion) {
+		if (!workflow?.activeVersion) {
 			throw new BadRequestError('Workflow not found');
 		}
 
-		const chatTriggers = workflowEntity.activeVersion.nodes.filter(
+		const chatTriggers = workflow.activeVersion.nodes.filter(
 			(node) => node.type === CHAT_TRIGGER_NODE_TYPE,
 		);
 
@@ -556,9 +569,31 @@ export class ChatHubService {
 			throw new BadRequestError('Workflow must have exactly one chat trigger');
 		}
 
-		const chatTriggerNode = chatTriggers[0];
+		const chatTrigger = chatTriggers[0];
 
-		const chatResponseNodes = workflowEntity.activeVersion.nodes.filter(
+		if (chatTrigger.typeVersion < 1.4) {
+			throw new BadRequestError(
+				'Chat Trigger node version is too old to support Chat. Please update the node.',
+			);
+		}
+
+		const chatTriggerParams = chatTriggerParamsShape.safeParse(chatTrigger.parameters).data;
+		if (!chatTriggerParams) {
+			throw new BadRequestError('Chat Trigger node has invalid parameters');
+		}
+
+		if (!chatTriggerParams.availableInChat) {
+			throw new BadRequestError('Chat Trigger node must be made available in Chat');
+		}
+
+		const responseMode = chatTriggerParams.options?.responseMode ?? 'streaming';
+		if (responseMode !== 'streaming') {
+			throw new BadRequestError(
+				'Chat Trigger node response mode must be set to streaming to use the workflow on Chat',
+			);
+		}
+
+		const chatResponseNodes = workflow.activeVersion.nodes.filter(
 			(node) => node.type === RESPOND_TO_CHAT_NODE_TYPE,
 		);
 
@@ -568,8 +603,19 @@ export class ChatHubService {
 			);
 		}
 
+		const agentNodes = workflow.activeVersion.nodes?.filter(
+			(node) => node.type === AGENT_LANGCHAIN_NODE_TYPE,
+		);
+
+		// Agents older than this can't do streaming
+		if (agentNodes.some((node) => node.typeVersion < TOOLS_AGENT_NODE_MIN_VERSION)) {
+			throw new BadRequestError(
+				'Agent node version is too old to support streaming responses. Please update the node.',
+			);
+		}
+
 		const nodeExecutionStack = this.chatHubWorkflowService.prepareExecutionData(
-			chatTriggerNode,
+			chatTrigger,
 			sessionId,
 			message,
 			attachments,
@@ -585,14 +631,15 @@ export class ChatHubService {
 		});
 
 		const workflowData: IWorkflowBase = {
-			...workflowEntity,
-			nodes: workflowEntity.activeVersion.nodes,
-			connections: workflowEntity.activeVersion.connections,
+			...workflow,
+			nodes: workflow.activeVersion.nodes,
+			connections: workflow.activeVersion.connections,
 		};
 
 		return {
 			workflowData,
 			executionData,
+			responseMode,
 		};
 	}
 
@@ -653,11 +700,16 @@ export class ChatHubService {
 		model: ChatHubConversationModel,
 		retryOfMessageId: ChatMessageId | null = null,
 		executionMode: WorkflowExecuteMode = 'chat',
+		responseMode: ChatTriggerResponseMode,
 	) {
 		this.logger.debug(
 			`Starting execution of workflow "${workflowData.name}" with ID ${workflowData.id}`,
 		);
 
+		if (responseMode !== 'streaming') {
+			throw new BadRequestError(`Response mode "${responseMode}" is not supported yet.`);
+		}
+
 		// Capture the streaming response as it's being generated to save
 		// partial messages in the database when generation gets cancelled.
 		let executionId: string | undefined = undefined;
@@ -842,7 +894,8 @@ export class ChatHubService {
 		sessionId: ChatSessionId,
 		previousMessageId: ChatMessageId,
 		model: ChatHubConversationModel,
-		retryOfMessageId: ChatMessageId | null = null,
+		retryOfMessageId: ChatMessageId | null,
+		responseMode: ChatTriggerResponseMode,
 	) {
 		try {
 			// 'n8n' provider executions count towards execution limits and they are run with the usual 'webhook' mode.
@@ -859,6 +912,7 @@ export class ChatHubService {
 				model,
 				retryOfMessageId,
 				executionMode,
+				responseMode,
 			);
 		} finally {
 			if (model.provider !== 'n8n') {
diff --git a/packages/cli/src/modules/chat-hub/chat-hub.types.ts b/packages/cli/src/modules/chat-hub/chat-hub.types.ts
index afaee379b29..a88711b63bb 100644
--- a/packages/cli/src/modules/chat-hub/chat-hub.types.ts
+++ b/packages/cli/src/modules/chat-hub/chat-hub.types.ts
@@ -51,14 +51,23 @@ export interface MessageRecord {
 	hideFromUI: boolean;
 }
 
-export const validChatTriggerParamsShape = z.object({
-	availableInChat: z.literal(true),
+const ChatTriggerResponseModeSchema = z.enum([
+	'streaming',
+	'lastNode',
+	'responseNode',
+	'responseNodes',
+]);
+export type ChatTriggerResponseMode = z.infer<typeof ChatTriggerResponseModeSchema>;
+
+export const chatTriggerParamsShape = z.object({
+	availableInChat: z.boolean().optional().default(false),
 	agentName: z.string().min(1).optional(),
 	agentDescription: z.string().min(1).optional(),
 	options: z
 		.object({
 			allowFileUploads: z.boolean().optional(),
 			allowedFilesMimeTypes: z.string().optional(),
+			responseMode: ChatTriggerResponseModeSchema.optional(),
 		})
 		.optional(),
 });
diff --git a/packages/frontend/editor-ui/src/features/ai/chatHub/chat.store.ts b/packages/frontend/editor-ui/src/features/ai/chatHub/chat.store.ts
index a181c38306a..b9c9e2609fb 100644
--- a/packages/frontend/editor-ui/src/features/ai/chatHub/chat.store.ts
+++ b/packages/frontend/editor-ui/src/features/ai/chatHub/chat.store.ts
@@ -453,6 +453,26 @@ export const useChatStore = defineStore(CHAT_STORE, () => {
 		await fetchSessions(true);
 	}
 
+	function getErrorMessageByStatusCode(
+		statusCode: number | undefined,
+		message: string | undefined,
+	): string {
+		const errorMessages: Record<number, string> = {
+			[413]: i18n.baseText('chatHub.error.payloadTooLarge'),
+			[400]: message ?? i18n.baseText('chatHub.error.badRequest'),
+			[403]: i18n.baseText('chatHub.error.forbidden'),
+			[500]: message
+				? i18n.baseText('chatHub.error.serverErrorWithReason', {
+						interpolate: { error: message },
+					})
+				: i18n.baseText('chatHub.error.serverError'),
+		};
+
+		return (
+			(statusCode && errorMessages[statusCode]) || message || i18n.baseText('chatHub.error.unknown')
+		);
+	}
+
 	function onStreamError(error: Error) {
 		if (!streaming.value) {
 			return;
@@ -470,26 +490,6 @@ export const useChatStore = defineStore(CHAT_STORE, () => {
 		streaming.value = undefined;
 	}
 
-	function getErrorMessageByStatusCode(
-		statusCode: number | undefined,
-		message: string | undefined,
-	): string {
-		const errorMessages: Record<number, string> = {
-			[413]: i18n.baseText('chatHub.error.payloadTooLarge'),
-			[400]: i18n.baseText('chatHub.error.badRequest'),
-			[403]: i18n.baseText('chatHub.error.forbidden'),
-			[500]: message
-				? i18n.baseText('chatHub.error.serverErrorWithReason', {
-						interpolate: { error: message },
-					})
-				: i18n.baseText('chatHub.error.serverError'),
-		};
-
-		return (
-			(statusCode && errorMessages[statusCode]) || message || i18n.baseText('chatHub.error.unknown')
-		);
-	}
-
 	async function sendMessage(
 		sessionId: ChatSessionId,
 		message: string,
diff --git a/packages/frontend/editor-ui/src/features/ndv/parameters/components/CollectionParameter.vue b/packages/frontend/editor-ui/src/features/ndv/parameters/components/CollectionParameter.vue
index 89a30f01d2c..a88dd131bea 100644
--- a/packages/frontend/editor-ui/src/features/ndv/parameters/components/CollectionParameter.vue
+++ b/packages/frontend/editor-ui/src/features/ndv/parameters/components/CollectionParameter.vue
@@ -75,9 +75,29 @@ function displayNodeParameter(parameter: INodeProperties) {
 	return nodeHelpers.displayParameter(props.nodeValues, parameter, props.path, ndvStore.activeNode);
 }
 
-function getOptionProperties(optionName: string) {
+const filteredOptions = computed<Array<INodePropertyOptions | INodeProperties>>(() => {
+	return (props.parameter.options as Array<INodePropertyOptions | INodeProperties>).filter(
+		(option) => {
+			return displayNodeParameter(option as INodeProperties);
+		},
+	);
+});
+const propertyNames = computed<string[]>(() => {
+	if (props.values) {
+		return Object.keys(props.values);
+	}
+	return [];
+});
+const parameterOptions = computed(() => {
+	return filteredOptions.value.filter((option) => {
+		return !propertyNames.value.includes(option.name);
+	});
+});
+
+function getOptionProperties(optionName: string, filter: boolean = false) {
 	const properties = [];
-	for (const option of props.parameter.options ?? []) {
+	const options = filter ? parameterOptions.value : props.parameter.options;
+	for (const option of options ?? []) {
 		if (option.name === optionName) {
 			properties.push(option);
 		}
@@ -85,12 +105,7 @@ function getOptionProperties(optionName: string) {
 
 	return properties;
 }
-const propertyNames = computed<string[]>(() => {
-	if (props.values) {
-		return Object.keys(props.values);
-	}
-	return [];
-});
+
 const getProperties = computed(() => {
 	const returnProperties = [];
 	let tempProperties;
@@ -102,21 +117,9 @@ const getProperties = computed(() => {
 	}
 	return returnProperties;
 });
-const filteredOptions = computed<Array<INodePropertyOptions | INodeProperties>>(() => {
-	return (props.parameter.options as Array<INodePropertyOptions | INodeProperties>).filter(
-		(option) => {
-			return displayNodeParameter(option as INodeProperties);
-		},
-	);
-});
-const parameterOptions = computed(() => {
-	return filteredOptions.value.filter((option) => {
-		return !propertyNames.value.includes(option.name);
-	});
-});
 
 function optionSelected(optionName: string) {
-	const options = getOptionProperties(optionName);
+	const options = getOptionProperties(optionName, true);
 	if (options.length === 0) {
 		return;
 	}

From 5214afa686b35fd347a0b5a136026eb978233d48 Mon Sep 17 00:00:00 2001
From: Stephen Wright <sjw948@gmail.com>
Date: Tue, 9 Dec 2025 11:30:08 +0000
Subject: [PATCH 149/167] feat: Dynamic credentials authorization endpoint for
 oauth2 (#22944)

---
 .../oauth2-credential.controller.test.ts      | 107 +----
 .../oauth/oauth1-credential.controller.ts     |   2 -
 .../oauth/oauth2-credential.controller.ts     | 194 +--------
 .../credentials/credentials-finder.service.ts |   4 +
 .../src/credentials/credentials.controller.ts |   2 +-
 .../src/credentials/credentials.service.ee.ts |   6 +-
 .../dynamic-credentials.controller.test.ts    | 173 ++++++++
 .../dynamic-credentials.controller.ts         |  41 ++
 .../dynamic-credentials.module.ts             |   1 +
 .../src/oauth/__tests__/oauth.service.test.ts | 386 ++++++++++++++++++
 packages/cli/src/oauth/oauth.service.ts       | 220 ++++++++++
 11 files changed, 843 insertions(+), 293 deletions(-)
 create mode 100644 packages/cli/src/modules/dynamic-credentials.ee/__tests__/dynamic-credentials.controller.test.ts
 create mode 100644 packages/cli/src/modules/dynamic-credentials.ee/dynamic-credentials.controller.ts

diff --git a/packages/cli/src/controllers/oauth/__tests__/oauth2-credential.controller.test.ts b/packages/cli/src/controllers/oauth/__tests__/oauth2-credential.controller.test.ts
index 6e17f64efd9..a0a2ee2f426 100644
--- a/packages/cli/src/controllers/oauth/__tests__/oauth2-credential.controller.test.ts
+++ b/packages/cli/src/controllers/oauth/__tests__/oauth2-credential.controller.test.ts
@@ -47,7 +47,6 @@ describe('OAuth2CredentialController', () => {
 
 			const mockResolvedCredential = mock<CredentialsEntity>({ id: '1' });
 			oauthService.getCredential.mockResolvedValueOnce(mockResolvedCredential);
-			oauthService.createCsrfState.mockReturnValueOnce(['csrf-secret', 'state']);
 			oauthService.getOAuthCredentials.mockResolvedValueOnce({
 				clientId: 'client_id',
 				clientSecret: 'client_secret',
@@ -57,8 +56,7 @@ describe('OAuth2CredentialController', () => {
 				grantType: 'authorizationCode',
 				authentication: 'header',
 			});
-			oauthService.getBaseUrl.mockReturnValue('http://localhost:5678/rest/oauth2-credential');
-			externalHooks.run.mockResolvedValue(undefined);
+			oauthService.generateAOauth2AuthUri.mockResolvedValue('https://example.domain/oauth2/auth');
 
 			const req = mock<OAuthRequest.OAuth2Credential.Auth>({
 				user: mock<User>({ id: '123' }),
@@ -68,107 +66,18 @@ describe('OAuth2CredentialController', () => {
 			const authUri = await controller.getAuthUri(req);
 
 			expect(authUri).toContain('https://example.domain/oauth2/auth');
-			expect(oauthService.encryptAndSaveData).toHaveBeenCalledWith(
-				mockResolvedCredential,
-				expect.objectContaining({ csrfSecret: 'csrf-secret' }),
-			);
-			expect(externalHooks.run).toHaveBeenCalledWith('oauth2.authenticate', expect.any(Array));
-		});
-
-		it('should return a valid auth URI with PKCE', async () => {
-			const pkceChallenge = await import('pkce-challenge');
-			jest.mocked(pkceChallenge.default).mockResolvedValueOnce({
-				code_verifier: 'code_verifier',
-				code_challenge: 'code_challenge',
-			});
-
-			const { ClientOAuth2 } = await import('@n8n/client-oauth2');
-			const mockGetUri = jest.fn().mockReturnValue({
-				toString: () =>
-					'https://example.domain/oauth2/auth?client_id=client_id&redirect_uri=http://localhost:5678/rest/oauth2-credential/callback&response_type=code&state=state&scope=openid&code_challenge=code_challenge&code_challenge_method=S256',
-			});
-			jest.mocked(ClientOAuth2).mockImplementation(
-				() =>
-					({
-						code: {
-							getUri: mockGetUri,
-						},
-					}) as any,
-			);
-
-			const mockResolvedCredential = mock<CredentialsEntity>({ id: '1' });
-			oauthService.getCredential.mockResolvedValueOnce(mockResolvedCredential);
-			oauthService.createCsrfState.mockReturnValueOnce(['csrf-secret', 'state']);
-			oauthService.getOAuthCredentials.mockResolvedValueOnce({
-				clientId: 'client_id',
-				clientSecret: 'client_secret',
-				authUrl: 'https://example.domain/oauth2/auth',
-				accessTokenUrl: 'https://example.domain/oauth2/token',
-				scope: 'openid',
-				grantType: 'pkce',
-				authentication: 'header',
-			});
-			oauthService.getBaseUrl.mockReturnValue('http://localhost:5678/rest/oauth2-credential');
-			externalHooks.run.mockResolvedValue(undefined);
-
-			const req = mock<OAuthRequest.OAuth2Credential.Auth>({
-				user: mock<User>({ id: '123' }),
-				query: { id: '1' },
-			});
-
-			const authUri = await controller.getAuthUri(req);
-
-			expect(authUri).toContain('code_challenge=code_challenge');
-			expect(authUri).toContain('code_challenge_method=S256');
-			expect(oauthService.encryptAndSaveData).toHaveBeenCalledWith(
+			expect(oauthService.generateAOauth2AuthUri).toHaveBeenCalledWith(
 				mockResolvedCredential,
 				expect.objectContaining({
-					csrfSecret: 'csrf-secret',
-					codeVerifier: 'code_verifier',
+					clientId: 'client_id',
+					authUrl: 'https://example.domain/oauth2/auth',
 				}),
+				{
+					cid: '1',
+					userId: '123',
+				},
 			);
 		});
-
-		it('should return a valid auth URI with auth query parameters', async () => {
-			const { ClientOAuth2 } = await import('@n8n/client-oauth2');
-			const mockGetUri = jest.fn().mockReturnValue({
-				toString: () =>
-					'https://example.domain/oauth2/auth?client_id=client_id&redirect_uri=http://localhost:5678/rest/oauth2-credential/callback&response_type=code&state=state&scope=openid&access_type=offline',
-			});
-			jest.mocked(ClientOAuth2).mockImplementation(
-				() =>
-					({
-						code: {
-							getUri: mockGetUri,
-						},
-					}) as any,
-			);
-
-			const mockResolvedCredential = mock<CredentialsEntity>({ id: '1' });
-			oauthService.getCredential.mockResolvedValueOnce(mockResolvedCredential);
-			oauthService.createCsrfState.mockReturnValueOnce(['csrf-secret', 'state']);
-			oauthService.getOAuthCredentials.mockResolvedValueOnce({
-				clientId: 'client_id',
-				clientSecret: 'client_secret',
-				authUrl: 'https://example.domain/oauth2/auth',
-				accessTokenUrl: 'https://example.domain/oauth2/token',
-				scope: 'openid',
-				authQueryParameters: 'access_type=offline',
-				grantType: 'authorizationCode',
-				authentication: 'header',
-			});
-			oauthService.getBaseUrl.mockReturnValue('http://localhost:5678/rest/oauth2-credential');
-			externalHooks.run.mockResolvedValue(undefined);
-
-			const req = mock<OAuthRequest.OAuth2Credential.Auth>({
-				user: mock<User>({ id: '123' }),
-				query: { id: '1' },
-			});
-
-			const authUri = await controller.getAuthUri(req);
-
-			expect(authUri).toContain('access_type=offline');
-		});
 	});
 
 	describe('handleCallback', () => {
diff --git a/packages/cli/src/controllers/oauth/oauth1-credential.controller.ts b/packages/cli/src/controllers/oauth/oauth1-credential.controller.ts
index d762203693a..dca3b4b9594 100644
--- a/packages/cli/src/controllers/oauth/oauth1-credential.controller.ts
+++ b/packages/cli/src/controllers/oauth/oauth1-credential.controller.ts
@@ -133,8 +133,6 @@ export class OAuth1CredentialController {
 
 			const oauthTokenData = Object.fromEntries(paramParser.entries());
 
-			console.log('oauthTokenData', oauthTokenData);
-
 			await this.oauthService.encryptAndSaveData(credential, { oauthTokenData }, ['csrfSecret']);
 
 			this.logger.debug('OAuth1 callback successful for new credential', {
diff --git a/packages/cli/src/controllers/oauth/oauth2-credential.controller.ts b/packages/cli/src/controllers/oauth/oauth2-credential.controller.ts
index 3f708efa27e..ac1b9268711 100644
--- a/packages/cli/src/controllers/oauth/oauth2-credential.controller.ts
+++ b/packages/cli/src/controllers/oauth/oauth2-credential.controller.ts
@@ -1,31 +1,12 @@
-import type {
-	ClientOAuth2Options,
-	OAuth2AuthenticationMethod,
-	OAuth2CredentialData,
-	OAuth2GrantType,
-} from '@n8n/client-oauth2';
+import type { ClientOAuth2Options, OAuth2CredentialData } from '@n8n/client-oauth2';
 import { ClientOAuth2 } from '@n8n/client-oauth2';
 import { Get, RestController } from '@n8n/decorators';
-import axios from 'axios';
 import { Response } from 'express';
 import omit from 'lodash/omit';
 import set from 'lodash/set';
 import split from 'lodash/split';
-import {
-	ensureError,
-	type ICredentialDataDecryptedObject,
-	jsonParse,
-	jsonStringify,
-} from 'n8n-workflow';
-import pkceChallenge from 'pkce-challenge';
-import * as qs from 'querystring';
+import { ensureError, jsonParse, jsonStringify } from 'n8n-workflow';
 
-import {
-	oAuthAuthorizationServerMetadataSchema,
-	dynamicClientRegistrationResponseSchema,
-} from './oauth2-dynamic-client-registration.schema';
-
-import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 import { OAuthRequest } from '@/requests';
 import { OauthService, OauthVersion, skipAuthOnOAuthCallback } from '@/oauth/oauth.service';
 import { Logger } from '@n8n/backend-common';
@@ -46,120 +27,11 @@ export class OAuth2CredentialController {
 		const oauthCredentials: OAuth2CredentialData =
 			await this.oauthService.getOAuthCredentials<OAuth2CredentialData>(credential);
 
-		const toUpdate: ICredentialDataDecryptedObject = {};
-
-		if (oauthCredentials.useDynamicClientRegistration && oauthCredentials.serverUrl) {
-			const serverUrl = new URL(oauthCredentials.serverUrl);
-			const { data } = await axios.get<unknown>(
-				`${serverUrl.origin}/.well-known/oauth-authorization-server`,
-			);
-			const metadataValidation = oAuthAuthorizationServerMetadataSchema.safeParse(data);
-			if (!metadataValidation.success) {
-				throw new BadRequestError(
-					`Invalid OAuth2 server metadata: ${metadataValidation.error.issues.map((e) => e.message).join(', ')}`,
-				);
-			}
-
-			const { authorization_endpoint, token_endpoint, registration_endpoint, scopes_supported } =
-				metadataValidation.data;
-			oauthCredentials.authUrl = authorization_endpoint;
-			oauthCredentials.accessTokenUrl = token_endpoint;
-			toUpdate.authUrl = authorization_endpoint;
-			toUpdate.accessTokenUrl = token_endpoint;
-			const scope = scopes_supported ? scopes_supported.join(' ') : undefined;
-			if (scope) {
-				oauthCredentials.scope = scope;
-				toUpdate.scope = scope;
-			}
-
-			const { grantType, authentication } = this.selectGrantTypeAndAuthenticationMethod(
-				metadataValidation.data.grant_types_supported ?? ['authorization_code', 'implicit'],
-				metadataValidation.data.token_endpoint_auth_methods_supported ?? ['client_secret_basic'],
-				metadataValidation.data.code_challenge_methods_supported ?? [],
-			);
-			oauthCredentials.grantType = grantType;
-			toUpdate.grantType = grantType;
-			if (authentication) {
-				oauthCredentials.authentication = authentication;
-				toUpdate.authentication = authentication;
-			}
-
-			const { grant_types, token_endpoint_auth_method } = this.mapGrantTypeAndAuthenticationMethod(
-				grantType,
-				authentication,
-			);
-			const registerPayload = {
-				redirect_uris: [`${this.oauthService.getBaseUrl(OauthVersion.V2)}/callback`],
-				token_endpoint_auth_method,
-				grant_types,
-				response_types: ['code'],
-				client_name: 'n8n',
-				client_uri: 'https://n8n.io/',
-				scope,
-			};
-
-			await this.externalHooks.run('oauth2.dynamicClientRegistration', [registerPayload]);
-
-			const { data: registerResult } = await axios.post<unknown>(
-				registration_endpoint,
-				registerPayload,
-			);
-			const registrationValidation =
-				dynamicClientRegistrationResponseSchema.safeParse(registerResult);
-			if (!registrationValidation.success) {
-				throw new BadRequestError(
-					`Invalid client registration response: ${registrationValidation.error.issues.map((e) => e.message).join(', ')}`,
-				);
-			}
-
-			const { client_id, client_secret } = registrationValidation.data;
-			oauthCredentials.clientId = client_id;
-			toUpdate.clientId = client_id;
-			if (client_secret) {
-				oauthCredentials.clientSecret = client_secret;
-				toUpdate.clientSecret = client_secret;
-			}
-		}
-
-		// Generate a CSRF prevention token and send it as an OAuth2 state string
-		const [csrfSecret, state] = this.oauthService.createCsrfState({
+		const uri = await this.oauthService.generateAOauth2AuthUri(credential, oauthCredentials, {
 			cid: credential.id,
-			userId: skipAuthOnOAuthCallback ? undefined : req.user.id,
-		});
-
-		const oAuthOptions = {
-			...this.convertCredentialToOptions(oauthCredentials),
-			state,
-		};
-
-		if (oauthCredentials.authQueryParameters) {
-			oAuthOptions.query = qs.parse(oauthCredentials.authQueryParameters);
-		}
-
-		await this.externalHooks.run('oauth2.authenticate', [oAuthOptions]);
-
-		toUpdate.csrfSecret = csrfSecret;
-		if (oauthCredentials.grantType === 'pkce') {
-			const { code_verifier, code_challenge } = await pkceChallenge();
-			oAuthOptions.query = {
-				...oAuthOptions.query,
-				code_challenge,
-				code_challenge_method: 'S256',
-			};
-			toUpdate.codeVerifier = code_verifier;
-		}
-
-		await this.oauthService.encryptAndSaveData(credential, toUpdate);
-
-		const oAuthObj = new ClientOAuth2(oAuthOptions);
-		const returnUri = oAuthObj.code.getUri();
-
-		this.logger.debug('OAuth2 authorization url created for credential', {
 			userId: req.user.id,
-			credentialId: credential.id,
 		});
-
-		return returnUri.toString();
+		return uri;
 	}
 
 	/** Verify and store app code. Generate access tokens and store for respective credential */
@@ -263,62 +135,4 @@ export class OAuth2CredentialController {
 
 		return options;
 	}
-
-	private selectGrantTypeAndAuthenticationMethod(
-		grantTypes: string[],
-		tokenEndpointAuthMethods: string[],
-		codeChallengeMethods: string[],
-	): { grantType: OAuth2GrantType; authentication?: OAuth2AuthenticationMethod } {
-		if (grantTypes.includes('authorization_code') && grantTypes.includes('refresh_token')) {
-			if (codeChallengeMethods.includes('S256')) {
-				return { grantType: 'pkce' };
-			}
-
-			if (tokenEndpointAuthMethods.includes('client_secret_basic')) {
-				return { grantType: 'authorizationCode', authentication: 'header' };
-			}
-
-			if (tokenEndpointAuthMethods.includes('client_secret_post')) {
-				return { grantType: 'authorizationCode', authentication: 'body' };
-			}
-		}
-
-		if (grantTypes.includes('client_credentials')) {
-			if (tokenEndpointAuthMethods.includes('client_secret_basic')) {
-				return { grantType: 'clientCredentials', authentication: 'header' };
-			}
-
-			if (tokenEndpointAuthMethods.includes('client_secret_post')) {
-				return { grantType: 'clientCredentials', authentication: 'body' };
-			}
-		}
-
-		throw new BadRequestError('No supported grant type and authentication method found');
-	}
-
-	private mapGrantTypeAndAuthenticationMethod(
-		grantType: OAuth2GrantType,
-		authentication?: OAuth2AuthenticationMethod,
-	) {
-		if (grantType === 'pkce') {
-			return {
-				grant_types: ['authorization_code', 'refresh_token'],
-				token_endpoint_auth_method: 'none',
-			};
-		}
-
-		const tokenEndpointAuthMethod =
-			authentication === 'header' ? 'client_secret_basic' : 'client_secret_post';
-		if (grantType === 'authorizationCode') {
-			return {
-				grant_types: ['authorization_code', 'refresh_token'],
-				token_endpoint_auth_method: tokenEndpointAuthMethod,
-			};
-		}
-
-		return {
-			grant_types: ['client_credentials'],
-			token_endpoint_auth_method: tokenEndpointAuthMethod,
-		};
-	}
 }
diff --git a/packages/cli/src/credentials/credentials-finder.service.ts b/packages/cli/src/credentials/credentials-finder.service.ts
index b2f522b0a2b..be5ce0c1648 100644
--- a/packages/cli/src/credentials/credentials-finder.service.ts
+++ b/packages/cli/src/credentials/credentials-finder.service.ts
@@ -53,6 +53,10 @@ export class CredentialsFinderService {
 		});
 	}
 
+	async findCredentialById(credentialId: string): Promise<CredentialsEntity | null> {
+		return await this.credentialsRepository.findOne({ where: { id: credentialId } });
+	}
+
 	/**
 	 * Merges global credentials with the provided credentials list,
 	 * deduplicating based on credential ID.
diff --git a/packages/cli/src/credentials/credentials.controller.ts b/packages/cli/src/credentials/credentials.controller.ts
index 4b73f2da464..15290795822 100644
--- a/packages/cli/src/credentials/credentials.controller.ts
+++ b/packages/cli/src/credentials/credentials.controller.ts
@@ -114,7 +114,7 @@ export class CredentialsController {
 		@Query query: CredentialsGetOneRequestQuery,
 	) {
 		const { shared, ...credential } = this.licenseState.isSharingLicensed()
-			? await this.enterpriseCredentialsService.getOne(
+			? await this.enterpriseCredentialsService.getOneForUser(
 					req.user,
 					credentialId,
 					// TODO: editor-ui is always sending this, maybe we can just rely on the
diff --git a/packages/cli/src/credentials/credentials.service.ee.ts b/packages/cli/src/credentials/credentials.service.ee.ts
index e3452eccc13..7ee49cbe7fa 100644
--- a/packages/cli/src/credentials/credentials.service.ee.ts
+++ b/packages/cli/src/credentials/credentials.service.ee.ts
@@ -77,7 +77,11 @@ export class EnterpriseCredentialsService {
 		return await em.save(newSharedCredentials);
 	}
 
-	async getOne(user: User, credentialId: string, includeDecryptedData: boolean) {
+	async getOne(credentialId: string) {
+		return await this.credentialsFinderService.findCredentialById(credentialId);
+	}
+
+	async getOneForUser(user: User, credentialId: string, includeDecryptedData: boolean) {
 		let credential: CredentialsEntity | null = null;
 		let decryptedData: ICredentialDataDecryptedObject | null = null;
 
diff --git a/packages/cli/src/modules/dynamic-credentials.ee/__tests__/dynamic-credentials.controller.test.ts b/packages/cli/src/modules/dynamic-credentials.ee/__tests__/dynamic-credentials.controller.test.ts
new file mode 100644
index 00000000000..9b35e2f3359
--- /dev/null
+++ b/packages/cli/src/modules/dynamic-credentials.ee/__tests__/dynamic-credentials.controller.test.ts
@@ -0,0 +1,173 @@
+import { Logger } from '@n8n/backend-common';
+import { mockInstance } from '@n8n/backend-test-utils';
+import { type CredentialsEntity } from '@n8n/db';
+import { Container } from '@n8n/di';
+import { mock } from 'jest-mock-extended';
+import type { Request, Response } from 'express';
+import { DynamicCredentialsController } from '@/modules/dynamic-credentials.ee/dynamic-credentials.controller';
+import { EnterpriseCredentialsService } from '@/credentials/credentials.service.ee';
+import { OauthService } from '@/oauth/oauth.service';
+
+jest.mock('axios');
+
+describe('DynamicCredentialsController', () => {
+	const enterpriseCredentialsService = mockInstance(EnterpriseCredentialsService);
+	const oauthService = mockInstance(OauthService);
+
+	mockInstance(Logger);
+
+	const controller = Container.get(DynamicCredentialsController);
+
+	const timestamp = 1706750625678;
+	jest.useFakeTimers({ advanceTimers: true });
+
+	beforeEach(() => {
+		jest.setSystemTime(new Date(timestamp));
+		jest.clearAllMocks();
+	});
+
+	describe('authorizeCredential', () => {
+		it('should throw NotFoundError when credential is not found', async () => {
+			const req = mock<Request>({
+				params: { id: 'non-existent-id' },
+			});
+			const res = mock<Response>();
+
+			enterpriseCredentialsService.getOne.mockResolvedValue(null);
+
+			await expect(controller.authorizeCredential(req, res)).rejects.toThrow(
+				'Credential not found',
+			);
+			expect(enterpriseCredentialsService.getOne).toHaveBeenCalledWith('non-existent-id');
+		});
+
+		it('should throw BadRequestError when credential type is not OAuth2 or OAuth1', async () => {
+			const mockCredential = mock<CredentialsEntity>({
+				id: '1',
+				type: 'httpBasicAuth',
+			});
+			const req = mock<Request>({
+				params: { id: '1' },
+			});
+			const res = mock<Response>();
+
+			enterpriseCredentialsService.getOne.mockResolvedValue(mockCredential);
+
+			await expect(controller.authorizeCredential(req, res)).rejects.toThrow(
+				'Credential type not supported',
+			);
+			expect(enterpriseCredentialsService.getOne).toHaveBeenCalledWith('1');
+		});
+
+		it('should return auth URI for OAuth2 credential', async () => {
+			const mockCredential = mock<CredentialsEntity>({
+				id: '1',
+				type: 'googleOAuth2Api',
+			});
+			const req = mock<Request>({
+				params: { id: '1' },
+				headers: { authorization: 'Bearer token123' },
+			});
+			const res = mock<Response>();
+
+			enterpriseCredentialsService.getOne.mockResolvedValue(mockCredential);
+			oauthService.getOAuthCredentials.mockResolvedValueOnce({
+				clientId: 'client_id',
+				clientSecret: 'client_secret',
+				authUrl: 'https://example.domain/oauth2/auth',
+				accessTokenUrl: 'https://example.domain/oauth2/token',
+				scope: 'openid',
+				grantType: 'authorizationCode',
+				authentication: 'header',
+			});
+			oauthService.generateAOauth2AuthUri.mockResolvedValueOnce(
+				'https://example.domain/oauth2/auth?client_id=client_id&redirect_uri=http://localhost:5678/rest/oauth2-credential/callback&response_type=code&state=state&scope=openid',
+			);
+
+			const authUri = await controller.authorizeCredential(req, res);
+
+			expect(authUri).toContain('https://example.domain/oauth2/auth');
+			expect(enterpriseCredentialsService.getOne).toHaveBeenCalledWith('1');
+			expect(oauthService.getOAuthCredentials).toHaveBeenCalledWith(mockCredential);
+			expect(oauthService.generateAOauth2AuthUri).toHaveBeenCalledWith(
+				mockCredential,
+				expect.objectContaining({
+					clientId: 'client_id',
+					authUrl: 'https://example.domain/oauth2/auth',
+				}),
+				{
+					cid: '1',
+					authorizationHeader: 'Bearer token123',
+				},
+			);
+		});
+
+		it('should throw BadRequestError for OAuth1 credential (not yet supported)', async () => {
+			const mockCredential = mock<CredentialsEntity>({
+				id: '1',
+				type: 'twitterOAuth1Api',
+			});
+			const req = mock<Request>({
+				params: { id: '1' },
+				headers: {},
+			});
+			const res = mock<Response>();
+
+			enterpriseCredentialsService.getOne.mockResolvedValue(mockCredential);
+			oauthService.getOAuthCredentials.mockResolvedValueOnce({
+				clientId: 'client_id',
+				clientSecret: 'client_secret',
+				authUrl: 'https://example.domain/oauth1/auth',
+				accessTokenUrl: 'https://example.domain/oauth1/token',
+			});
+
+			await expect(controller.authorizeCredential(req, res)).rejects.toThrow(
+				'Credential type not supported',
+			);
+			expect(enterpriseCredentialsService.getOne).toHaveBeenCalledWith('1');
+			expect(oauthService.getOAuthCredentials).toHaveBeenCalledWith(mockCredential);
+			expect(oauthService.generateAOauth2AuthUri).not.toHaveBeenCalled();
+		});
+
+		it('should handle request without authorization header', async () => {
+			const mockCredential = mock<CredentialsEntity>({
+				id: '1',
+				type: 'googleOAuth2Api',
+			});
+			const req = mock<Request>({
+				params: { id: '1' },
+				headers: { authorization: undefined },
+			});
+			const res = mock<Response>();
+
+			enterpriseCredentialsService.getOne.mockResolvedValue(mockCredential);
+			oauthService.getOAuthCredentials.mockResolvedValueOnce({
+				clientId: 'client_id',
+				clientSecret: 'client_secret',
+				authUrl: 'https://example.domain/oauth2/auth',
+				accessTokenUrl: 'https://example.domain/oauth2/token',
+				scope: 'openid',
+				grantType: 'authorizationCode',
+				authentication: 'header',
+			});
+			oauthService.generateAOauth2AuthUri.mockResolvedValueOnce(
+				'https://example.domain/oauth2/auth?client_id=client_id&redirect_uri=http://localhost:5678/rest/oauth2-credential/callback&response_type=code&state=state&scope=openid',
+			);
+
+			const authUri = await controller.authorizeCredential(req, res);
+
+			expect(authUri).toContain('https://example.domain/oauth2/auth');
+			expect(oauthService.generateAOauth2AuthUri).toHaveBeenCalledWith(
+				mockCredential,
+				expect.objectContaining({
+					clientId: 'client_id',
+					authUrl: 'https://example.domain/oauth2/auth',
+				}),
+				{
+					cid: '1',
+					authorizationHeader: undefined,
+				},
+			);
+		});
+	});
+});
diff --git a/packages/cli/src/modules/dynamic-credentials.ee/dynamic-credentials.controller.ts b/packages/cli/src/modules/dynamic-credentials.ee/dynamic-credentials.controller.ts
new file mode 100644
index 00000000000..12fa4477c80
--- /dev/null
+++ b/packages/cli/src/modules/dynamic-credentials.ee/dynamic-credentials.controller.ts
@@ -0,0 +1,41 @@
+import { Post, RestController } from '@n8n/decorators';
+import { Request, Response } from 'express';
+
+import { EnterpriseCredentialsService } from '@/credentials/credentials.service.ee';
+import { NotFoundError } from '@/errors/response-errors/not-found.error';
+import { BadRequestError } from '@/errors/response-errors/bad-request.error';
+import { OauthService } from '@/oauth/oauth.service';
+import { OAuth2CredentialData } from '@n8n/client-oauth2';
+
+@RestController('/credentials')
+export class DynamicCredentialsController {
+	constructor(
+		private readonly enterpriseCredentialsService: EnterpriseCredentialsService,
+		private readonly oauthService: OauthService,
+	) {}
+
+	@Post('/:id/authorize', { skipAuth: true })
+	async authorizeCredential(req: Request, _res: Response): Promise<string> {
+		const credential = await this.enterpriseCredentialsService.getOne(req.params.id);
+
+		if (!credential) {
+			throw new NotFoundError('Credential not found');
+		}
+
+		if (!credential.type.includes('OAuth2') && !credential.type.includes('OAuth1')) {
+			throw new BadRequestError('Credential type not supported');
+		}
+
+		const oauthCredentials: OAuth2CredentialData =
+			await this.oauthService.getOAuthCredentials<OAuth2CredentialData>(credential);
+
+		if (credential.type.includes('OAuth2')) {
+			return await this.oauthService.generateAOauth2AuthUri(credential, oauthCredentials, {
+				cid: credential.id,
+				authorizationHeader: req.headers.authorization,
+			});
+		}
+
+		throw new BadRequestError('Credential type not supported');
+	}
+}
diff --git a/packages/cli/src/modules/dynamic-credentials.ee/dynamic-credentials.module.ts b/packages/cli/src/modules/dynamic-credentials.ee/dynamic-credentials.module.ts
index cf371bafefd..4155bf7381e 100644
--- a/packages/cli/src/modules/dynamic-credentials.ee/dynamic-credentials.module.ts
+++ b/packages/cli/src/modules/dynamic-credentials.ee/dynamic-credentials.module.ts
@@ -5,6 +5,7 @@ import { Container } from '@n8n/di';
 @BackendModule({ name: 'dynamic-credentials', licenseFlag: 'feat:externalSecrets' })
 export class DynamicCredentialsModule implements ModuleInterface {
 	async init() {
+		await import('./dynamic-credentials.controller');
 		await import('./credential-resolvers.controller');
 		await import('./context-establishment-hooks');
 		await import('./credential-resolvers');
diff --git a/packages/cli/src/oauth/__tests__/oauth.service.test.ts b/packages/cli/src/oauth/__tests__/oauth.service.test.ts
index 5539ca89a68..4712d770956 100644
--- a/packages/cli/src/oauth/__tests__/oauth.service.test.ts
+++ b/packages/cli/src/oauth/__tests__/oauth.service.test.ts
@@ -19,8 +19,13 @@ import { NotFoundError } from '@/errors/response-errors/not-found.error';
 import type { OAuthRequest } from '@/requests';
 import { UrlService } from '@/services/url.service';
 import * as WorkflowExecuteAdditionalData from '@/workflow-execute-additional-data';
+import { ExternalHooks } from '@/external-hooks';
+import type { OAuth2CredentialData } from '@n8n/client-oauth2';
 
 jest.mock('@/workflow-execute-additional-data');
+jest.mock('axios');
+jest.mock('@n8n/client-oauth2');
+jest.mock('pkce-challenge');
 
 describe('OauthService', () => {
 	const logger = mockInstance(Logger);
@@ -29,6 +34,7 @@ describe('OauthService', () => {
 	const credentialsFinderService = mockInstance(CredentialsFinderService);
 	const urlService = mockInstance(UrlService);
 	const globalConfig = mockInstance(GlobalConfig);
+	const externalHooks = mockInstance(ExternalHooks);
 
 	let service: OauthService;
 
@@ -44,6 +50,12 @@ describe('OauthService', () => {
 		jest
 			.mocked(WorkflowExecuteAdditionalData.getBase)
 			.mockResolvedValue(mock<IWorkflowExecuteAdditionalData>());
+		externalHooks.run.mockResolvedValue(undefined);
+
+		// Setup axios mock
+		const axios = require('axios');
+		axios.get = jest.fn();
+		axios.post = jest.fn();
 
 		service = new OauthService(
 			logger,
@@ -52,6 +64,7 @@ describe('OauthService', () => {
 			credentialsFinderService,
 			urlService,
 			globalConfig,
+			externalHooks,
 		);
 	});
 
@@ -690,4 +703,377 @@ describe('OauthService', () => {
 			);
 		});
 	});
+
+	describe('generateAOauth2AuthUri', () => {
+		it('should generate auth URI without dynamic client registration', async () => {
+			const { ClientOAuth2 } = await import('@n8n/client-oauth2');
+			const mockGetUri = jest.fn().mockReturnValue({
+				toString: () =>
+					'https://example.domain/oauth2/auth?client_id=client_id&redirect_uri=http://localhost:5678/rest/oauth2-credential/callback&response_type=code&state=state&scope=openid',
+			});
+			jest.mocked(ClientOAuth2).mockImplementation(
+				() =>
+					({
+						code: {
+							getUri: mockGetUri,
+						},
+					}) as any,
+			);
+
+			const credential = mock<CredentialsEntity>({ id: '1' });
+			const oauthCredentials: OAuth2CredentialData = {
+				clientId: 'client_id',
+				clientSecret: 'client_secret',
+				authUrl: 'https://example.domain/oauth2/auth',
+				accessTokenUrl: 'https://example.domain/oauth2/token',
+				scope: 'openid',
+				grantType: 'authorizationCode',
+				authentication: 'header',
+			};
+
+			jest.spyOn(service, 'encryptAndSaveData').mockResolvedValue(undefined);
+
+			const authUri = await service.generateAOauth2AuthUri(credential, oauthCredentials, {
+				cid: credential.id,
+				userId: 'user-id',
+			});
+
+			expect(authUri).toContain('https://example.domain/oauth2/auth');
+			expect(service.encryptAndSaveData).toHaveBeenCalled();
+			const callArgs = (service.encryptAndSaveData as jest.Mock).mock.calls[0];
+			expect(callArgs[0]).toBe(credential);
+			expect(callArgs[1]).toHaveProperty('csrfSecret');
+			expect(typeof callArgs[1].csrfSecret).toBe('string');
+			expect(callArgs[2] || []).toEqual([]);
+			expect(externalHooks.run).toHaveBeenCalledWith('oauth2.authenticate', expect.any(Array));
+		});
+
+		it('should generate auth URI with PKCE flow', async () => {
+			const { ClientOAuth2 } = await import('@n8n/client-oauth2');
+			const pkceChallenge = await import('pkce-challenge');
+			jest.mocked(pkceChallenge.default).mockResolvedValue({
+				code_verifier: 'code_verifier',
+				code_challenge: 'code_challenge',
+			});
+
+			const mockGetUri = jest.fn().mockReturnValue({
+				toString: () =>
+					'https://example.domain/oauth2/auth?client_id=client_id&redirect_uri=http://localhost:5678/rest/oauth2-credential/callback&response_type=code&state=state&scope=openid&code_challenge=code_challenge&code_challenge_method=S256',
+			});
+			jest.mocked(ClientOAuth2).mockImplementation(
+				() =>
+					({
+						code: {
+							getUri: mockGetUri,
+						},
+					}) as any,
+			);
+
+			const credential = mock<CredentialsEntity>({ id: '1' });
+			const oauthCredentials: OAuth2CredentialData = {
+				clientId: 'client_id',
+				clientSecret: 'client_secret',
+				authUrl: 'https://example.domain/oauth2/auth',
+				accessTokenUrl: 'https://example.domain/oauth2/token',
+				scope: 'openid',
+				grantType: 'pkce',
+				authentication: 'header',
+			};
+
+			jest.spyOn(service, 'encryptAndSaveData').mockResolvedValue(undefined);
+
+			const authUri = await service.generateAOauth2AuthUri(credential, oauthCredentials, {
+				cid: credential.id,
+				userId: 'user-id',
+			});
+
+			expect(authUri).toContain('code_challenge=code_challenge');
+			expect(service.encryptAndSaveData).toHaveBeenCalled();
+			const callArgs = (service.encryptAndSaveData as jest.Mock).mock.calls[0];
+			expect(callArgs[0]).toBe(credential);
+			expect(callArgs[1]).toHaveProperty('csrfSecret');
+			expect(callArgs[1]).toHaveProperty('codeVerifier', 'code_verifier');
+			expect(callArgs[2] || []).toEqual([]);
+		});
+
+		it('should generate auth URI with auth query parameters', async () => {
+			const { ClientOAuth2 } = await import('@n8n/client-oauth2');
+			const mockGetUri = jest.fn().mockReturnValue({
+				toString: () =>
+					'https://example.domain/oauth2/auth?client_id=client_id&redirect_uri=http://localhost:5678/rest/oauth2-credential/callback&response_type=code&state=state&scope=openid&custom_param=value',
+			});
+			jest.mocked(ClientOAuth2).mockImplementation(
+				() =>
+					({
+						code: {
+							getUri: mockGetUri,
+						},
+					}) as any,
+			);
+
+			const credential = mock<CredentialsEntity>({ id: '1' });
+			const oauthCredentials: OAuth2CredentialData = {
+				clientId: 'client_id',
+				clientSecret: 'client_secret',
+				authUrl: 'https://example.domain/oauth2/auth',
+				accessTokenUrl: 'https://example.domain/oauth2/token',
+				scope: 'openid',
+				grantType: 'authorizationCode',
+				authentication: 'header',
+				authQueryParameters: 'custom_param=value',
+			};
+
+			jest.spyOn(service, 'encryptAndSaveData').mockResolvedValue(undefined);
+
+			const authUri = await service.generateAOauth2AuthUri(credential, oauthCredentials, {
+				cid: credential.id,
+				userId: 'user-id',
+			});
+
+			expect(authUri).toContain('https://example.domain/oauth2/auth');
+			expect(mockGetUri).toHaveBeenCalled();
+		});
+
+		it('should handle dynamic client registration', async () => {
+			const axios = require('axios');
+			const { ClientOAuth2 } = await import('@n8n/client-oauth2');
+			const mockGetUri = jest.fn().mockReturnValue({
+				toString: () =>
+					'https://example.domain/oauth2/auth?client_id=registered_client_id&redirect_uri=http://localhost:5678/rest/oauth2-credential/callback&response_type=code&state=state&scope=openid profile',
+			});
+			jest.mocked(ClientOAuth2).mockImplementation(
+				() =>
+					({
+						code: {
+							getUri: mockGetUri,
+						},
+					}) as any,
+			);
+
+			const credential = mock<CredentialsEntity>({ id: '1' });
+			const oauthCredentials = {
+				serverUrl: 'https://example.domain',
+				useDynamicClientRegistration: true,
+			} as OAuth2CredentialData;
+
+			jest.mocked(axios.get).mockResolvedValue({
+				data: {
+					authorization_endpoint: 'https://example.domain/oauth2/auth',
+					token_endpoint: 'https://example.domain/oauth2/token',
+					registration_endpoint: 'https://example.domain/oauth2/register',
+					grant_types_supported: ['authorization_code', 'refresh_token'],
+					token_endpoint_auth_methods_supported: ['client_secret_basic'],
+					code_challenge_methods_supported: ['S256'],
+					scopes_supported: ['openid', 'profile'],
+				},
+			} as any);
+
+			jest.mocked(axios.post).mockResolvedValue({
+				data: {
+					client_id: 'registered_client_id',
+					client_secret: 'registered_client_secret',
+				},
+			} as any);
+
+			jest.spyOn(service, 'encryptAndSaveData').mockResolvedValue(undefined);
+
+			const authUri = await service.generateAOauth2AuthUri(credential, oauthCredentials, {
+				cid: credential.id,
+				userId: 'user-id',
+			});
+
+			expect(authUri).toContain('https://example.domain/oauth2/auth');
+			expect(axios.get).toHaveBeenCalledWith(
+				'https://example.domain/.well-known/oauth-authorization-server',
+			);
+			expect(axios.post).toHaveBeenCalledWith(
+				'https://example.domain/oauth2/register',
+				expect.objectContaining({
+					client_name: 'n8n',
+					grant_types: ['authorization_code', 'refresh_token'],
+				}),
+			);
+			expect(externalHooks.run).toHaveBeenCalledWith(
+				'oauth2.dynamicClientRegistration',
+				expect.any(Array),
+			);
+			expect(service.encryptAndSaveData).toHaveBeenCalled();
+			const callArgs = (service.encryptAndSaveData as jest.Mock).mock.calls[0];
+			expect(callArgs[0]).toBe(credential);
+			expect(callArgs[1]).toHaveProperty('authUrl', 'https://example.domain/oauth2/auth');
+			expect(callArgs[1]).toHaveProperty('accessTokenUrl', 'https://example.domain/oauth2/token');
+			expect(callArgs[1]).toHaveProperty('clientId', 'registered_client_id');
+			expect(callArgs[1]).toHaveProperty('clientSecret', 'registered_client_secret');
+			expect(callArgs[1]).toHaveProperty('scope', 'openid profile');
+			expect(callArgs[1]).toHaveProperty('grantType', 'pkce');
+			expect(callArgs[1]).toHaveProperty('csrfSecret');
+			expect(callArgs[1]).toHaveProperty('codeVerifier', 'code_verifier');
+			expect(callArgs[2] || []).toEqual([]);
+		});
+
+		it('should throw BadRequestError when OAuth2 server metadata is invalid', async () => {
+			const axios = require('axios');
+			const credential = mock<CredentialsEntity>({ id: '1' });
+			const oauthCredentials = {
+				serverUrl: 'https://example.domain',
+				useDynamicClientRegistration: true,
+			} as OAuth2CredentialData;
+
+			jest.mocked(axios.get).mockResolvedValue({
+				data: { invalid: 'metadata' },
+			} as any);
+
+			await expect(
+				service.generateAOauth2AuthUri(credential, oauthCredentials, {
+					cid: credential.id,
+					userId: 'user-id',
+				}),
+			).rejects.toThrow(BadRequestError);
+			await expect(
+				service.generateAOauth2AuthUri(credential, oauthCredentials, {
+					cid: credential.id,
+					userId: 'user-id',
+				}),
+			).rejects.toThrow('Invalid OAuth2 server metadata');
+		});
+
+		it('should throw BadRequestError when client registration response is invalid', async () => {
+			const axios = require('axios');
+			const { ClientOAuth2 } = await import('@n8n/client-oauth2');
+			jest.mocked(ClientOAuth2).mockImplementation(() => ({}) as any);
+
+			const credential = mock<CredentialsEntity>({ id: '1' });
+			const oauthCredentials = {
+				serverUrl: 'https://example.domain',
+				useDynamicClientRegistration: true,
+			} as OAuth2CredentialData;
+
+			jest.mocked(axios.get).mockResolvedValue({
+				data: {
+					authorization_endpoint: 'https://example.domain/oauth2/auth',
+					token_endpoint: 'https://example.domain/oauth2/token',
+					registration_endpoint: 'https://example.domain/oauth2/register',
+					grant_types_supported: ['authorization_code', 'refresh_token'],
+					token_endpoint_auth_methods_supported: ['client_secret_basic'],
+					code_challenge_methods_supported: ['S256'],
+				},
+			} as any);
+
+			jest.mocked(axios.post).mockResolvedValue({
+				data: { invalid: 'response' },
+			} as any);
+
+			await expect(
+				service.generateAOauth2AuthUri(credential, oauthCredentials, {
+					cid: credential.id,
+					userId: 'user-id',
+				}),
+			).rejects.toThrow(BadRequestError);
+			await expect(
+				service.generateAOauth2AuthUri(credential, oauthCredentials, {
+					cid: credential.id,
+					userId: 'user-id',
+				}),
+			).rejects.toThrow('Invalid client registration response');
+		});
+
+		it('should handle dynamic client registration with client_secret_post authentication', async () => {
+			const axios = require('axios');
+			const { ClientOAuth2 } = await import('@n8n/client-oauth2');
+			const mockGetUri = jest.fn().mockReturnValue({
+				toString: () =>
+					'https://example.domain/oauth2/auth?client_id=registered_client_id&redirect_uri=http://localhost:5678/rest/oauth2-credential/callback&response_type=code&state=state&scope=openid',
+			});
+			jest.mocked(ClientOAuth2).mockImplementation(
+				() =>
+					({
+						code: {
+							getUri: mockGetUri,
+						},
+					}) as any,
+			);
+
+			const credential = mock<CredentialsEntity>({ id: '1' });
+			const oauthCredentials = {
+				serverUrl: 'https://example.domain',
+				useDynamicClientRegistration: true,
+			} as OAuth2CredentialData;
+
+			jest.mocked(axios.get).mockResolvedValue({
+				data: {
+					authorization_endpoint: 'https://example.domain/oauth2/auth',
+					token_endpoint: 'https://example.domain/oauth2/token',
+					registration_endpoint: 'https://example.domain/oauth2/register',
+					grant_types_supported: ['authorization_code', 'refresh_token'],
+					token_endpoint_auth_methods_supported: ['client_secret_post'],
+					code_challenge_methods_supported: [],
+				},
+			} as any);
+
+			jest.mocked(axios.post).mockResolvedValue({
+				data: {
+					client_id: 'registered_client_id',
+					client_secret: 'registered_client_secret',
+				},
+			} as any);
+
+			jest.spyOn(service, 'encryptAndSaveData').mockResolvedValue(undefined);
+
+			const authUri = await service.generateAOauth2AuthUri(credential, oauthCredentials, {
+				cid: credential.id,
+				userId: 'user-id',
+			});
+
+			expect(authUri).toContain('https://example.domain/oauth2/auth');
+			expect(oauthCredentials.authentication).toBe('body');
+			expect(oauthCredentials.grantType).toBe('authorizationCode');
+		});
+
+		it('should skip userId in CSRF state when skipAuthOnOAuthCallback is true', async () => {
+			// This test verifies the behavior when skipAuthOnOAuthCallback is true
+			// Since the skipAuthOnOAuthCallback is evaluated at module load time,
+			// we need to check the actual behavior by verifying the CSRF state doesn't include userId
+			// when the env var is set. However, since it's evaluated at module load, we'll test
+			// that the function works correctly with or without userId
+			const { ClientOAuth2 } = await import('@n8n/client-oauth2');
+			const mockGetUri = jest.fn().mockReturnValue({
+				toString: () =>
+					'https://example.domain/oauth2/auth?client_id=client_id&redirect_uri=http://localhost:5678/rest/oauth2-credential/callback&response_type=code&state=state&scope=openid',
+			});
+			jest.mocked(ClientOAuth2).mockImplementation(
+				() =>
+					({
+						code: {
+							getUri: mockGetUri,
+						},
+					}) as any,
+			);
+
+			const credential = mock<CredentialsEntity>({ id: '1' });
+			const oauthCredentials: OAuth2CredentialData = {
+				clientId: 'client_id',
+				clientSecret: 'client_secret',
+				authUrl: 'https://example.domain/oauth2/auth',
+				accessTokenUrl: 'https://example.domain/oauth2/token',
+				scope: 'openid',
+				grantType: 'authorizationCode',
+				authentication: 'header',
+			};
+
+			jest.spyOn(service, 'encryptAndSaveData').mockResolvedValue(undefined);
+			jest.spyOn(service, 'createCsrfState').mockReturnValue(['csrf-secret', 'encoded-state']);
+
+			await service.generateAOauth2AuthUri(credential, oauthCredentials, {
+				cid: credential.id,
+				userId: 'user-id',
+			});
+
+			// Verify createCsrfState was called with cid
+			expect(service.createCsrfState).toHaveBeenCalledWith(
+				expect.objectContaining({
+					cid: '1',
+				}),
+			);
+		});
+	});
 });
diff --git a/packages/cli/src/oauth/oauth.service.ts b/packages/cli/src/oauth/oauth.service.ts
index 2874ff82ed3..91538e50b99 100644
--- a/packages/cli/src/oauth/oauth.service.ts
+++ b/packages/cli/src/oauth/oauth.service.ts
@@ -22,6 +22,22 @@ import { NotFoundError } from '@/errors/response-errors/not-found.error';
 import type { OAuthRequest } from '@/requests';
 import { UrlService } from '@/services/url.service';
 import * as WorkflowExecuteAdditionalData from '@/workflow-execute-additional-data';
+import {
+	ClientOAuth2,
+	type ClientOAuth2Options,
+	type OAuth2AuthenticationMethod,
+	type OAuth2CredentialData,
+	type OAuth2GrantType,
+} from '@n8n/client-oauth2';
+import axios from 'axios';
+import {
+	oAuthAuthorizationServerMetadataSchema,
+	dynamicClientRegistrationResponseSchema,
+} from '@/controllers/oauth/oauth2-dynamic-client-registration.schema';
+import pkceChallenge from 'pkce-challenge';
+import * as qs from 'querystring';
+import split from 'lodash/split';
+import { ExternalHooks } from '@/external-hooks';
 
 type CsrfStateRequired = {
 	/** Random CSRF token, used to verify the signature of the CSRF state */
@@ -60,6 +76,7 @@ export class OauthService {
 		private readonly credentialsFinderService: CredentialsFinderService,
 		private readonly urlService: UrlService,
 		private readonly globalConfig: GlobalConfig,
+		private readonly externalHooks: ExternalHooks,
 	) {}
 
 	getBaseUrl(oauthVersion: OauthVersion) {
@@ -261,4 +278,207 @@ export class OauthService {
 
 		return oauthCredentials;
 	}
+
+	async generateAOauth2AuthUri(
+		credential: CredentialsEntity,
+		oauthCredentials: OAuth2CredentialData,
+		csrfData: CreateCsrfStateData,
+	): Promise<string> {
+		const toUpdate: ICredentialDataDecryptedObject = {};
+
+		if (oauthCredentials.useDynamicClientRegistration && oauthCredentials.serverUrl) {
+			const serverUrl = new URL(oauthCredentials.serverUrl);
+			const { data } = await axios.get<unknown>(
+				`${serverUrl.origin}/.well-known/oauth-authorization-server`,
+			);
+			const metadataValidation = oAuthAuthorizationServerMetadataSchema.safeParse(data);
+			if (!metadataValidation.success) {
+				throw new BadRequestError(
+					`Invalid OAuth2 server metadata: ${metadataValidation.error.issues.map((e) => e.message).join(', ')}`,
+				);
+			}
+
+			const { authorization_endpoint, token_endpoint, registration_endpoint, scopes_supported } =
+				metadataValidation.data;
+			oauthCredentials.authUrl = authorization_endpoint;
+			oauthCredentials.accessTokenUrl = token_endpoint;
+			toUpdate.authUrl = authorization_endpoint;
+			toUpdate.accessTokenUrl = token_endpoint;
+			const scope = scopes_supported ? scopes_supported.join(' ') : undefined;
+			if (scope) {
+				oauthCredentials.scope = scope;
+				toUpdate.scope = scope;
+			}
+
+			const { grantType, authentication } = this.selectGrantTypeAndAuthenticationMethod(
+				metadataValidation.data.grant_types_supported ?? ['authorization_code', 'implicit'],
+				metadataValidation.data.token_endpoint_auth_methods_supported ?? ['client_secret_basic'],
+				metadataValidation.data.code_challenge_methods_supported ?? [],
+			);
+			oauthCredentials.grantType = grantType;
+			toUpdate.grantType = grantType;
+			if (authentication) {
+				oauthCredentials.authentication = authentication;
+				toUpdate.authentication = authentication;
+			}
+
+			const { grant_types, token_endpoint_auth_method } = this.mapGrantTypeAndAuthenticationMethod(
+				grantType,
+				authentication,
+			);
+			const registerPayload = {
+				redirect_uris: [`${this.getBaseUrl(OauthVersion.V2)}/callback`],
+				token_endpoint_auth_method,
+				grant_types,
+				response_types: ['code'],
+				client_name: 'n8n',
+				client_uri: 'https://n8n.io/',
+				scope,
+			};
+
+			await this.externalHooks.run('oauth2.dynamicClientRegistration', [registerPayload]);
+
+			const { data: registerResult } = await axios.post<unknown>(
+				registration_endpoint,
+				registerPayload,
+			);
+			const registrationValidation =
+				dynamicClientRegistrationResponseSchema.safeParse(registerResult);
+			if (!registrationValidation.success) {
+				throw new BadRequestError(
+					`Invalid client registration response: ${registrationValidation.error.issues.map((e) => e.message).join(', ')}`,
+				);
+			}
+
+			const { client_id, client_secret } = registrationValidation.data;
+			oauthCredentials.clientId = client_id;
+			toUpdate.clientId = client_id;
+			if (client_secret) {
+				oauthCredentials.clientSecret = client_secret;
+				toUpdate.clientSecret = client_secret;
+			}
+		}
+
+		// Generate a CSRF prevention token and send it as an OAuth2 state string
+		const [csrfSecret, state] = this.createCsrfState(csrfData);
+
+		const oAuthOptions = {
+			...this.convertCredentialToOptions(oauthCredentials),
+			state,
+		};
+
+		if (oauthCredentials.authQueryParameters) {
+			oAuthOptions.query = qs.parse(oauthCredentials.authQueryParameters);
+		}
+
+		await this.externalHooks.run('oauth2.authenticate', [oAuthOptions]);
+
+		toUpdate.csrfSecret = csrfSecret;
+		if (oauthCredentials.grantType === 'pkce') {
+			const { code_verifier, code_challenge } = await pkceChallenge();
+			oAuthOptions.query = {
+				...oAuthOptions.query,
+				code_challenge,
+				code_challenge_method: 'S256',
+			};
+			toUpdate.codeVerifier = code_verifier;
+		}
+
+		await this.encryptAndSaveData(credential, toUpdate);
+
+		const oAuthObj = new ClientOAuth2(oAuthOptions);
+		const returnUri = oAuthObj.code.getUri();
+
+		this.logger.debug('OAuth2 authorization url created for credential', {
+			csrfData,
+			credentialId: credential.id,
+		});
+
+		return returnUri.toString();
+	}
+
+	private convertCredentialToOptions(credential: OAuth2CredentialData): ClientOAuth2Options {
+		const options: ClientOAuth2Options = {
+			clientId: credential.clientId,
+			clientSecret: credential.clientSecret ?? '',
+			accessTokenUri: credential.accessTokenUrl ?? '',
+			authorizationUri: credential.authUrl ?? '',
+			authentication: credential.authentication ?? 'header',
+			redirectUri: `${this.getBaseUrl(OauthVersion.V2)}/callback`,
+			scopes: split(credential.scope ?? 'openid', ','),
+			scopesSeparator: credential.scope?.includes(',') ? ',' : ' ',
+			ignoreSSLIssues: credential.ignoreSSLIssues ?? false,
+		};
+
+		if (
+			credential.additionalBodyProperties &&
+			typeof credential.additionalBodyProperties === 'string'
+		) {
+			const parsedBody = jsonParse<Record<string, string>>(credential.additionalBodyProperties);
+
+			if (parsedBody) {
+				options.body = parsedBody;
+			}
+		}
+
+		return options;
+	}
+
+	private selectGrantTypeAndAuthenticationMethod(
+		grantTypes: string[],
+		tokenEndpointAuthMethods: string[],
+		codeChallengeMethods: string[],
+	): { grantType: OAuth2GrantType; authentication?: OAuth2AuthenticationMethod } {
+		if (grantTypes.includes('authorization_code') && grantTypes.includes('refresh_token')) {
+			if (codeChallengeMethods.includes('S256')) {
+				return { grantType: 'pkce' };
+			}
+
+			if (tokenEndpointAuthMethods.includes('client_secret_basic')) {
+				return { grantType: 'authorizationCode', authentication: 'header' };
+			}
+
+			if (tokenEndpointAuthMethods.includes('client_secret_post')) {
+				return { grantType: 'authorizationCode', authentication: 'body' };
+			}
+		}
+
+		if (grantTypes.includes('client_credentials')) {
+			if (tokenEndpointAuthMethods.includes('client_secret_basic')) {
+				return { grantType: 'clientCredentials', authentication: 'header' };
+			}
+
+			if (tokenEndpointAuthMethods.includes('client_secret_post')) {
+				return { grantType: 'clientCredentials', authentication: 'body' };
+			}
+		}
+
+		throw new BadRequestError('No supported grant type and authentication method found');
+	}
+
+	private mapGrantTypeAndAuthenticationMethod(
+		grantType: OAuth2GrantType,
+		authentication?: OAuth2AuthenticationMethod,
+	) {
+		if (grantType === 'pkce') {
+			return {
+				grant_types: ['authorization_code', 'refresh_token'],
+				token_endpoint_auth_method: 'none',
+			};
+		}
+
+		const tokenEndpointAuthMethod =
+			authentication === 'header' ? 'client_secret_basic' : 'client_secret_post';
+		if (grantType === 'authorizationCode') {
+			return {
+				grant_types: ['authorization_code', 'refresh_token'],
+				token_endpoint_auth_method: tokenEndpointAuthMethod,
+			};
+		}
+
+		return {
+			grant_types: ['client_credentials'],
+			token_endpoint_auth_method: tokenEndpointAuthMethod,
+		};
+	}
 }

From a08944835d9bf442ae3c70bf92e3030634f0e5fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dimitri=20Lavren=C3=BCk?=
 <20122620+dlavrenuek@users.noreply.github.com>
Date: Tue, 9 Dec 2025 12:32:41 +0100
Subject: [PATCH 150/167] feat(ai-builder): Add autofocus for input field
 (#22919)

---
 .../AskAssistantChat/AskAssistantChat.vue     |  2 ++
 .../AskAssistantChat.test.ts.snap             |  7 ++++++
 .../N8nPromptInput/N8nPromptInput.test.ts     | 24 +++++++++++++++++++
 .../N8nPromptInput/N8nPromptInput.vue         |  6 +++++
 4 files changed, 39 insertions(+)

diff --git a/packages/frontend/@n8n/design-system/src/components/AskAssistantChat/AskAssistantChat.vue b/packages/frontend/@n8n/design-system/src/components/AskAssistantChat/AskAssistantChat.vue
index 5300615fb15..b2d35f4c157 100644
--- a/packages/frontend/@n8n/design-system/src/components/AskAssistantChat/AskAssistantChat.vue
+++ b/packages/frontend/@n8n/design-system/src/components/AskAssistantChat/AskAssistantChat.vue
@@ -499,6 +499,7 @@ defineExpose({
 								:max-length="maxCharacterLength"
 								:min-lines="2"
 								data-test-id="chat-suggestions-input"
+								autofocus
 								@upgrade-click="emit('upgrade-click')"
 								@submit="onSendMessage"
 								@stop="emit('stop')"
@@ -549,6 +550,7 @@ defineExpose({
 				:max-length="maxCharacterLength"
 				:refocus-after-send="true"
 				data-test-id="chat-input"
+				autofocus
 				@upgrade-click="emit('upgrade-click')"
 				@submit="onSendMessage"
 				@stop="emit('stop')"
diff --git a/packages/frontend/@n8n/design-system/src/components/AskAssistantChat/__snapshots__/AskAssistantChat.test.ts.snap b/packages/frontend/@n8n/design-system/src/components/AskAssistantChat/__snapshots__/AskAssistantChat.test.ts.snap
index 8e65281bc53..08f8d6fb67a 100644
--- a/packages/frontend/@n8n/design-system/src/components/AskAssistantChat/__snapshots__/AskAssistantChat.test.ts.snap
+++ b/packages/frontend/@n8n/design-system/src/components/AskAssistantChat/__snapshots__/AskAssistantChat.test.ts.snap
@@ -86,6 +86,7 @@ exports[`AskAssistantChat > limits maximum input length when maxCharacterLength
       data-test-id="chat-input-wrapper"
     >
       <n8n-prompt-input-stub
+        autofocus="true"
         data-test-id="chat-input"
         disabled="false"
         maxlength="100"
@@ -340,6 +341,7 @@ exports[`AskAssistantChat > renders chat with messages correctly 1`] = `
       data-test-id="chat-input-wrapper"
     >
       <n8n-prompt-input-stub
+        autofocus="true"
         data-test-id="chat-input"
         disabled="false"
         maxlength="5000"
@@ -442,6 +444,7 @@ exports[`AskAssistantChat > renders default placeholder chat correctly 1`] = `
       data-test-id="chat-input-wrapper"
     >
       <n8n-prompt-input-stub
+        autofocus="true"
         data-test-id="chat-input"
         disabled="false"
         maxlength="5000"
@@ -595,6 +598,7 @@ exports[`AskAssistantChat > renders end of session chat correctly 1`] = `
       data-test-id="chat-input-wrapper"
     >
       <n8n-prompt-input-stub
+        autofocus="true"
         data-test-id="chat-input"
         disabled="true"
         maxlength="5000"
@@ -729,6 +733,7 @@ exports[`AskAssistantChat > renders error message correctly with retry button 1`
       data-test-id="chat-input-wrapper"
     >
       <n8n-prompt-input-stub
+        autofocus="true"
         data-test-id="chat-input"
         disabled="false"
         maxlength="5000"
@@ -863,6 +868,7 @@ exports[`AskAssistantChat > renders message with code snippet 1`] = `
       data-test-id="chat-input-wrapper"
     >
       <n8n-prompt-input-stub
+        autofocus="true"
         data-test-id="chat-input"
         disabled="false"
         maxlength="5000"
@@ -997,6 +1003,7 @@ exports[`AskAssistantChat > renders streaming chat correctly 1`] = `
       data-test-id="chat-input-wrapper"
     >
       <n8n-prompt-input-stub
+        autofocus="true"
         data-test-id="chat-input"
         disabled="false"
         maxlength="5000"
diff --git a/packages/frontend/@n8n/design-system/src/components/N8nPromptInput/N8nPromptInput.test.ts b/packages/frontend/@n8n/design-system/src/components/N8nPromptInput/N8nPromptInput.test.ts
index 41c34626f2a..9270242808f 100644
--- a/packages/frontend/@n8n/design-system/src/components/N8nPromptInput/N8nPromptInput.test.ts
+++ b/packages/frontend/@n8n/design-system/src/components/N8nPromptInput/N8nPromptInput.test.ts
@@ -1074,4 +1074,28 @@ describe('N8nPromptInput', () => {
 			wrapper.unmount();
 		});
 	});
+
+	describe('autofocus', () => {
+		it('should be focused if enabled', async () => {
+			const { emitted } = renderComponent({
+				props: {
+					autofocus: true,
+				},
+				global: {
+					stubs: ['N8nCallout', 'N8nScrollArea', 'N8nSendStopButton'],
+				},
+			});
+
+			expect(emitted('focus')).toBeTruthy();
+		});
+
+		it('should not be focused if disabled', () => {
+			const { emitted } = renderComponent({
+				global: {
+					stubs: ['N8nCallout', 'N8nScrollArea', 'N8nSendStopButton'],
+				},
+			});
+			expect(emitted('focus')).toBeFalsy();
+		});
+	});
 });
diff --git a/packages/frontend/@n8n/design-system/src/components/N8nPromptInput/N8nPromptInput.vue b/packages/frontend/@n8n/design-system/src/components/N8nPromptInput/N8nPromptInput.vue
index d965aef99f6..f5562d5a07f 100644
--- a/packages/frontend/@n8n/design-system/src/components/N8nPromptInput/N8nPromptInput.vue
+++ b/packages/frontend/@n8n/design-system/src/components/N8nPromptInput/N8nPromptInput.vue
@@ -22,6 +22,7 @@ export interface N8nPromptInputProps {
 	creditsRemaining?: number;
 	showAskOwnerTooltip?: boolean;
 	refocusAfterSend?: boolean;
+	autofocus?: boolean;
 }
 
 const INFINITE_CREDITS = -1;
@@ -38,6 +39,7 @@ const props = withDefaults(defineProps<N8nPromptInputProps>(), {
 	creditsRemaining: undefined,
 	showAskOwnerTooltip: false,
 	refocusAfterSend: false,
+	autofocus: false,
 });
 
 const emit = defineEmits<{
@@ -314,6 +316,10 @@ function focusInput() {
 onMounted(() => {
 	// Adjust height on mount to respect minLines or initial content
 	void nextTick(() => adjustHeight());
+
+	if (props.autofocus) {
+		focusInput();
+	}
 });
 
 defineExpose({

From ec8ed892739de0964892b92db190048ff9a8a43d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BAl=20G=C3=B3mez=20Morales?= <raul00gm@gmail.com>
Date: Tue, 9 Dec 2025 13:01:06 +0100
Subject: [PATCH 151/167] fix(editor): Propagate last successful execution to
 expression edit modal (#22666)

Co-authored-by: Shireen Missi <94372015+ShireenMissi@users.noreply.github.com>
---
 .../features/ndv/parameters/components/ExpressionEditModal.vue   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/frontend/editor-ui/src/features/ndv/parameters/components/ExpressionEditModal.vue b/packages/frontend/editor-ui/src/features/ndv/parameters/components/ExpressionEditModal.vue
index 4ba20b5b5e1..26e09cec16e 100644
--- a/packages/frontend/editor-ui/src/features/ndv/parameters/components/ExpressionEditModal.vue
+++ b/packages/frontend/editor-ui/src/features/ndv/parameters/components/ExpressionEditModal.vue
@@ -191,6 +191,7 @@ const onResizeThrottle = useThrottleFn(onResize, 10);
 						:nodes="parentNodes.length > 0 ? parentNodes : rootNodesParents"
 						:mapping-enabled="!isReadOnly"
 						:connection-type="NodeConnectionTypes.Main"
+						:preview-execution="workflowsStore.lastSuccessfulExecution"
 						pane-type="input"
 					/>
 				</div>

From f8304472f859dd24b278acb78ef600e344ee0772 Mon Sep 17 00:00:00 2001
From: Dawid Myslak <dawid.myslak@gmail.com>
Date: Tue, 9 Dec 2025 13:31:06 +0100
Subject: [PATCH 152/167] feat(Google Gemini Node): Introduce built-in Gemini
 tools (#22454)

Co-authored-by: yehorkardash <yehor.kardash@n8n.io>
---
 .../GoogleGemini/GoogleGemini.node.test.ts    | 816 ++++++++++++++++++
 .../actions/text/message.operation.ts         | 218 ++++-
 .../actions/versionDescription.ts             |   3 +-
 .../GoogleGemini/helpers/interfaces.ts        |  27 +
 4 files changed, 1054 insertions(+), 10 deletions(-)

diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/GoogleGemini/GoogleGemini.node.test.ts b/packages/@n8n/nodes-langchain/nodes/vendors/GoogleGemini/GoogleGemini.node.test.ts
index cb692153b14..4aac1a622e1 100644
--- a/packages/@n8n/nodes-langchain/nodes/vendors/GoogleGemini/GoogleGemini.node.test.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/GoogleGemini/GoogleGemini.node.test.ts
@@ -21,6 +21,7 @@ describe('GoogleGemini Node', () => {
 
 	beforeEach(() => {
 		jest.clearAllMocks();
+		executeFunctionsMock.getNode.mockReturnValue({ typeVersion: 1 } as INode);
 	});
 
 	describe('Text -> Message', () => {
@@ -180,6 +181,821 @@ describe('GoogleGemini Node', () => {
 				},
 			);
 		});
+
+		describe('Version 1.0', () => {
+			it('should use codeExecution from options for version 1.0', async () => {
+				executeFunctionsMock.getNodeParameter.mockImplementation((parameter: string) => {
+					switch (parameter) {
+						case 'modelId':
+							return 'models/gemini-2.5-flash';
+						case 'messages.values':
+							return [{ role: 'user', content: 'Hello, world!' }];
+						case 'simplify':
+							return true;
+						case 'jsonOutput':
+							return false;
+						case 'builtInTools':
+							return {};
+						case 'options':
+							return {
+								codeExecution: true,
+							};
+						default:
+							return undefined;
+					}
+				});
+				executeFunctionsMock.getNodeInputs.mockReturnValue([{ type: 'main' }]);
+				apiRequestMock.mockResolvedValue({
+					candidates: [
+						{
+							content: {
+								parts: [{ text: 'Hello, world!' }],
+								role: 'model',
+							},
+						},
+					],
+				});
+
+				await text.message.execute.call(executeFunctionsMock, 0);
+
+				expect(apiRequestMock).toHaveBeenCalledWith(
+					'POST',
+					'/v1beta/models/gemini-2.5-flash:generateContent',
+					expect.objectContaining({
+						body: expect.objectContaining({
+							tools: expect.arrayContaining([
+								{
+									codeExecution: {},
+								},
+							]),
+						}),
+					}),
+				);
+			});
+		});
+
+		describe('Version 1.1', () => {
+			beforeEach(() => {
+				executeFunctionsMock.getNode.mockReturnValue({ typeVersion: 1.1 } as INode);
+			});
+
+			it('should include Google Search tool when enabled', async () => {
+				executeFunctionsMock.getNodeParameter.mockImplementation((parameter: string) => {
+					switch (parameter) {
+						case 'modelId':
+							return 'models/gemini-2.5-flash';
+						case 'messages.values':
+							return [{ role: 'user', content: 'What is the weather today?' }];
+						case 'simplify':
+							return true;
+						case 'jsonOutput':
+							return false;
+						case 'builtInTools':
+							return {
+								googleSearch: true,
+							};
+						case 'options':
+							return {};
+						default:
+							return undefined;
+					}
+				});
+				executeFunctionsMock.getNodeInputs.mockReturnValue([{ type: 'main' }]);
+				apiRequestMock.mockResolvedValue({
+					candidates: [
+						{
+							content: {
+								parts: [{ text: 'The weather is sunny.' }],
+								role: 'model',
+							},
+						},
+					],
+				});
+
+				await text.message.execute.call(executeFunctionsMock, 0);
+
+				expect(apiRequestMock).toHaveBeenCalledWith(
+					'POST',
+					'/v1beta/models/gemini-2.5-flash:generateContent',
+					expect.objectContaining({
+						body: expect.objectContaining({
+							tools: expect.arrayContaining([
+								{
+									googleSearch: {},
+								},
+							]),
+						}),
+					}),
+				);
+			});
+
+			it('should include Google Maps tool when enabled', async () => {
+				executeFunctionsMock.getNodeParameter.mockImplementation((parameter: string) => {
+					switch (parameter) {
+						case 'modelId':
+							return 'models/gemini-2.5-flash';
+						case 'messages.values':
+							return [{ role: 'user', content: 'Find restaurants near me' }];
+						case 'simplify':
+							return true;
+						case 'jsonOutput':
+							return false;
+						case 'builtInTools':
+							return {
+								googleMaps: {},
+							};
+						case 'options':
+							return {};
+						default:
+							return undefined;
+					}
+				});
+				executeFunctionsMock.getNodeInputs.mockReturnValue([{ type: 'main' }]);
+				apiRequestMock.mockResolvedValue({
+					candidates: [
+						{
+							content: {
+								parts: [{ text: 'Here are some restaurants.' }],
+								role: 'model',
+							},
+						},
+					],
+				});
+
+				await text.message.execute.call(executeFunctionsMock, 0);
+
+				expect(apiRequestMock).toHaveBeenCalledWith(
+					'POST',
+					'/v1beta/models/gemini-2.5-flash:generateContent',
+					expect.objectContaining({
+						body: expect.objectContaining({
+							tools: expect.arrayContaining([
+								{
+									googleMaps: {},
+								},
+							]),
+						}),
+					}),
+				);
+			});
+
+			it('should include toolConfig with latLng when Google Maps has coordinates', async () => {
+				executeFunctionsMock.getNodeParameter.mockImplementation((parameter: string) => {
+					switch (parameter) {
+						case 'modelId':
+							return 'models/gemini-2.5-flash';
+						case 'messages.values':
+							return [{ role: 'user', content: 'Find restaurants near me' }];
+						case 'simplify':
+							return true;
+						case 'jsonOutput':
+							return false;
+						case 'builtInTools':
+							return {
+								googleMaps: {
+									latitude: 34.050481,
+									longitude: -118.248526,
+								},
+							};
+						case 'options':
+							return {};
+						default:
+							return undefined;
+					}
+				});
+				executeFunctionsMock.getNodeInputs.mockReturnValue([{ type: 'main' }]);
+				apiRequestMock.mockResolvedValue({
+					candidates: [
+						{
+							content: {
+								parts: [{ text: 'Here are some restaurants.' }],
+								role: 'model',
+							},
+						},
+					],
+				});
+
+				await text.message.execute.call(executeFunctionsMock, 0);
+
+				expect(apiRequestMock).toHaveBeenCalledWith(
+					'POST',
+					'/v1beta/models/gemini-2.5-flash:generateContent',
+					expect.objectContaining({
+						body: expect.objectContaining({
+							tools: expect.arrayContaining([
+								{
+									googleMaps: {},
+								},
+							]),
+							toolConfig: {
+								retrievalConfig: {
+									latLng: {
+										latitude: 34.050481,
+										longitude: -118.248526,
+									},
+								},
+							},
+						}),
+					}),
+				);
+			});
+
+			it('should include URL Context tool when enabled', async () => {
+				executeFunctionsMock.getNodeParameter.mockImplementation((parameter: string) => {
+					switch (parameter) {
+						case 'modelId':
+							return 'models/gemini-2.5-flash';
+						case 'messages.values':
+							return [{ role: 'user', content: 'Summarize this URL' }];
+						case 'simplify':
+							return true;
+						case 'jsonOutput':
+							return false;
+						case 'builtInTools':
+							return {
+								urlContext: true,
+							};
+						case 'options':
+							return {};
+						default:
+							return undefined;
+					}
+				});
+				executeFunctionsMock.getNodeInputs.mockReturnValue([{ type: 'main' }]);
+				apiRequestMock.mockResolvedValue({
+					candidates: [
+						{
+							content: {
+								parts: [{ text: 'URL summary.' }],
+								role: 'model',
+							},
+						},
+					],
+				});
+
+				await text.message.execute.call(executeFunctionsMock, 0);
+
+				expect(apiRequestMock).toHaveBeenCalledWith(
+					'POST',
+					'/v1beta/models/gemini-2.5-flash:generateContent',
+					expect.objectContaining({
+						body: expect.objectContaining({
+							tools: expect.arrayContaining([
+								{
+									urlContext: {},
+								},
+							]),
+						}),
+					}),
+				);
+			});
+
+			it('should include File Search tool with fileSearchStoreNames when enabled', async () => {
+				executeFunctionsMock.getNodeParameter.mockImplementation((parameter: string) => {
+					switch (parameter) {
+						case 'modelId':
+							return 'models/gemini-2.5-flash';
+						case 'messages.values':
+							return [{ role: 'user', content: 'Search my files' }];
+						case 'simplify':
+							return true;
+						case 'jsonOutput':
+							return false;
+						case 'builtInTools':
+							return {
+								fileSearch: {
+									fileSearchStoreNames: '["store1", "store2"]',
+								},
+							};
+						case 'options':
+							return {};
+						default:
+							return undefined;
+					}
+				});
+				executeFunctionsMock.getNodeInputs.mockReturnValue([{ type: 'main' }]);
+				apiRequestMock.mockResolvedValue({
+					candidates: [
+						{
+							content: {
+								parts: [{ text: 'File search results.' }],
+								role: 'model',
+							},
+						},
+					],
+				});
+
+				await text.message.execute.call(executeFunctionsMock, 0);
+
+				expect(apiRequestMock).toHaveBeenCalledWith(
+					'POST',
+					'/v1beta/models/gemini-2.5-flash:generateContent',
+					expect.objectContaining({
+						body: expect.objectContaining({
+							tools: expect.arrayContaining([
+								{
+									fileSearch: {
+										fileSearchStoreNames: ['store1', 'store2'],
+									},
+								},
+							]),
+						}),
+					}),
+				);
+			});
+
+			it('should include File Search tool with metadataFilter when provided', async () => {
+				executeFunctionsMock.getNodeParameter.mockImplementation((parameter: string) => {
+					switch (parameter) {
+						case 'modelId':
+							return 'models/gemini-2.5-flash';
+						case 'messages.values':
+							return [{ role: 'user', content: 'Tell me about the book' }];
+						case 'simplify':
+							return true;
+						case 'jsonOutput':
+							return false;
+						case 'builtInTools':
+							return {
+								fileSearch: {
+									fileSearchStoreNames: '["store1"]',
+									metadataFilter: 'author="Robert Graves"',
+								},
+							};
+						case 'options':
+							return {};
+						default:
+							return undefined;
+					}
+				});
+				executeFunctionsMock.getNodeInputs.mockReturnValue([{ type: 'main' }]);
+				apiRequestMock.mockResolvedValue({
+					candidates: [
+						{
+							content: {
+								parts: [{ text: 'Book information.' }],
+								role: 'model',
+							},
+						},
+					],
+				});
+
+				await text.message.execute.call(executeFunctionsMock, 0);
+
+				expect(apiRequestMock).toHaveBeenCalledWith(
+					'POST',
+					'/v1beta/models/gemini-2.5-flash:generateContent',
+					expect.objectContaining({
+						body: expect.objectContaining({
+							tools: expect.arrayContaining([
+								{
+									fileSearch: {
+										fileSearchStoreNames: ['store1'],
+										metadataFilter: 'author="Robert Graves"',
+									},
+								},
+							]),
+						}),
+					}),
+				);
+			});
+
+			it('should include Code Execution tool when enabled', async () => {
+				executeFunctionsMock.getNodeParameter.mockImplementation((parameter: string) => {
+					switch (parameter) {
+						case 'modelId':
+							return 'models/gemini-2.5-flash';
+						case 'messages.values':
+							return [{ role: 'user', content: 'Calculate 2+2' }];
+						case 'simplify':
+							return true;
+						case 'jsonOutput':
+							return false;
+						case 'builtInTools':
+							return {
+								codeExecution: true,
+							};
+						case 'options':
+							return {};
+						default:
+							return undefined;
+					}
+				});
+				executeFunctionsMock.getNodeInputs.mockReturnValue([{ type: 'main' }]);
+				apiRequestMock.mockResolvedValue({
+					candidates: [
+						{
+							content: {
+								parts: [{ text: 'The result is 4.' }],
+								role: 'model',
+							},
+						},
+					],
+				});
+
+				await text.message.execute.call(executeFunctionsMock, 0);
+
+				expect(apiRequestMock).toHaveBeenCalledWith(
+					'POST',
+					'/v1beta/models/gemini-2.5-flash:generateContent',
+					expect.objectContaining({
+						body: expect.objectContaining({
+							tools: expect.arrayContaining([
+								{
+									codeExecution: {},
+								},
+							]),
+						}),
+					}),
+				);
+			});
+
+			it('should include multiple built-in tools when enabled', async () => {
+				executeFunctionsMock.getNodeParameter.mockImplementation((parameter: string) => {
+					switch (parameter) {
+						case 'modelId':
+							return 'models/gemini-2.5-flash';
+						case 'messages.values':
+							return [{ role: 'user', content: 'Complex query' }];
+						case 'simplify':
+							return true;
+						case 'jsonOutput':
+							return false;
+						case 'builtInTools':
+							return {
+								googleSearch: true,
+								urlContext: true,
+								codeExecution: true,
+							};
+						case 'options':
+							return {};
+						default:
+							return undefined;
+					}
+				});
+				executeFunctionsMock.getNodeInputs.mockReturnValue([{ type: 'main' }]);
+				apiRequestMock.mockResolvedValue({
+					candidates: [
+						{
+							content: {
+								parts: [{ text: 'Response with multiple tools.' }],
+								role: 'model',
+							},
+						},
+					],
+				});
+
+				await text.message.execute.call(executeFunctionsMock, 0);
+
+				expect(apiRequestMock).toHaveBeenCalledWith(
+					'POST',
+					'/v1beta/models/gemini-2.5-flash:generateContent',
+					expect.objectContaining({
+						body: expect.objectContaining({
+							tools: expect.arrayContaining([
+								{
+									googleSearch: {},
+								},
+								{
+									urlContext: {},
+								},
+								{
+									codeExecution: {},
+								},
+							]),
+						}),
+					}),
+				);
+			});
+
+			it('should not include toolConfig when Google Maps coordinates are empty', async () => {
+				executeFunctionsMock.getNodeParameter.mockImplementation((parameter: string) => {
+					switch (parameter) {
+						case 'modelId':
+							return 'models/gemini-2.5-flash';
+						case 'messages.values':
+							return [{ role: 'user', content: 'Find restaurants' }];
+						case 'simplify':
+							return true;
+						case 'jsonOutput':
+							return false;
+						case 'builtInTools':
+							return {
+								googleMaps: {
+									latitude: '',
+									longitude: '',
+								},
+							};
+						case 'options':
+							return {};
+						default:
+							return undefined;
+					}
+				});
+				executeFunctionsMock.getNodeInputs.mockReturnValue([{ type: 'main' }]);
+				apiRequestMock.mockResolvedValue({
+					candidates: [
+						{
+							content: {
+								parts: [{ text: 'Restaurants found.' }],
+								role: 'model',
+							},
+						},
+					],
+				});
+
+				await text.message.execute.call(executeFunctionsMock, 0);
+
+				expect(apiRequestMock).toHaveBeenCalledWith(
+					'POST',
+					'/v1beta/models/gemini-2.5-flash:generateContent',
+					expect.objectContaining({
+						body: expect.not.objectContaining({
+							toolConfig: expect.anything(),
+						}),
+					}),
+				);
+				expect(apiRequestMock).toHaveBeenCalledWith(
+					'POST',
+					'/v1beta/models/gemini-2.5-flash:generateContent',
+					expect.objectContaining({
+						body: expect.objectContaining({
+							tools: expect.arrayContaining([
+								{
+									googleMaps: {},
+								},
+							]),
+						}),
+					}),
+				);
+			});
+
+			describe('includeMergedResponse', () => {
+				it('should include mergedResponse per candidate when enabled and simplify is true', async () => {
+					executeFunctionsMock.getNodeParameter.mockImplementation((parameter: string) => {
+						switch (parameter) {
+							case 'modelId':
+								return 'models/gemini-2.5-flash';
+							case 'messages.values':
+								return [{ role: 'user', content: 'Hello' }];
+							case 'simplify':
+								return true;
+							case 'jsonOutput':
+								return false;
+							case 'builtInTools':
+								return {};
+							case 'options':
+								return {
+									includeMergedResponse: true,
+								};
+							case 'options.maxToolsIterations':
+								return 15;
+							default:
+								return undefined;
+						}
+					});
+					executeFunctionsMock.getNodeInputs.mockReturnValue([{ type: 'main' }]);
+					apiRequestMock.mockResolvedValue({
+						candidates: [
+							{
+								content: {
+									parts: [{ text: 'Hello' }, { text: ' World' }],
+									role: 'model',
+								},
+							},
+						],
+					});
+
+					const result = await text.message.execute.call(executeFunctionsMock, 0);
+
+					expect(result).toEqual([
+						{
+							json: {
+								content: {
+									parts: [{ text: 'Hello' }, { text: ' World' }],
+									role: 'model',
+								},
+								mergedResponse: 'Hello World',
+							},
+							pairedItem: { item: 0 },
+						},
+					]);
+				});
+
+				it('should include mergedResponse per candidate when enabled and simplify is false', async () => {
+					executeFunctionsMock.getNodeParameter.mockImplementation((parameter: string) => {
+						switch (parameter) {
+							case 'modelId':
+								return 'models/gemini-2.5-flash';
+							case 'messages.values':
+								return [{ role: 'user', content: 'Hello' }];
+							case 'simplify':
+								return false;
+							case 'jsonOutput':
+								return false;
+							case 'builtInTools':
+								return {};
+							case 'options':
+								return {
+									includeMergedResponse: true,
+								};
+							case 'options.maxToolsIterations':
+								return 15;
+							default:
+								return undefined;
+						}
+					});
+					executeFunctionsMock.getNodeInputs.mockReturnValue([{ type: 'main' }]);
+					apiRequestMock.mockResolvedValue({
+						candidates: [
+							{
+								content: {
+									parts: [{ text: 'Response' }, { text: ' text' }],
+									role: 'model',
+								},
+							},
+						],
+					});
+
+					const result = await text.message.execute.call(executeFunctionsMock, 0);
+
+					expect(result).toEqual([
+						{
+							json: {
+								candidates: [
+									{
+										content: {
+											parts: [{ text: 'Response' }, { text: ' text' }],
+											role: 'model',
+										},
+										mergedResponse: 'Response text',
+									},
+								],
+							},
+							pairedItem: { item: 0 },
+						},
+					]);
+				});
+
+				it('should not include mergedResponse when disabled', async () => {
+					executeFunctionsMock.getNodeParameter.mockImplementation((parameter: string) => {
+						switch (parameter) {
+							case 'modelId':
+								return 'models/gemini-2.5-flash';
+							case 'messages.values':
+								return [{ role: 'user', content: 'Hello' }];
+							case 'simplify':
+								return true;
+							case 'jsonOutput':
+								return false;
+							case 'builtInTools':
+								return {};
+							case 'options':
+								return {
+									includeMergedResponse: false,
+								};
+							case 'options.maxToolsIterations':
+								return 15;
+							default:
+								return undefined;
+						}
+					});
+					executeFunctionsMock.getNodeInputs.mockReturnValue([{ type: 'main' }]);
+					apiRequestMock.mockResolvedValue({
+						candidates: [
+							{
+								content: {
+									parts: [{ text: 'Hello' }, { text: ' World' }],
+									role: 'model',
+								},
+							},
+						],
+					});
+
+					const result = await text.message.execute.call(executeFunctionsMock, 0);
+
+					expect(result).toEqual([
+						{
+							json: {
+								content: {
+									parts: [{ text: 'Hello' }, { text: ' World' }],
+									role: 'model',
+								},
+							},
+							pairedItem: { item: 0 },
+						},
+					]);
+					expect(result[0].json).not.toHaveProperty('mergedResponse');
+				});
+
+				it('should handle multiple candidates with different merged responses', async () => {
+					executeFunctionsMock.getNodeParameter.mockImplementation((parameter: string) => {
+						switch (parameter) {
+							case 'modelId':
+								return 'models/gemini-2.5-flash';
+							case 'messages.values':
+								return [{ role: 'user', content: 'Hello' }];
+							case 'simplify':
+								return true;
+							case 'jsonOutput':
+								return false;
+							case 'builtInTools':
+								return {};
+							case 'options':
+								return {
+									includeMergedResponse: true,
+									candidateCount: 2,
+								};
+							case 'options.maxToolsIterations':
+								return 15;
+							default:
+								return undefined;
+						}
+					});
+					executeFunctionsMock.getNodeInputs.mockReturnValue([{ type: 'main' }]);
+					apiRequestMock.mockResolvedValue({
+						candidates: [
+							{
+								content: {
+									parts: [{ text: 'First' }, { text: ' candidate' }],
+									role: 'model',
+								},
+							},
+							{
+								content: {
+									parts: [{ text: 'Second' }, { text: ' candidate' }],
+									role: 'model',
+								},
+							},
+						],
+					});
+
+					const result = await text.message.execute.call(executeFunctionsMock, 0);
+
+					expect(result).toHaveLength(2);
+					expect(result[0].json).toEqual({
+						content: {
+							parts: [{ text: 'First' }, { text: ' candidate' }],
+							role: 'model',
+						},
+						mergedResponse: 'First candidate',
+					});
+					expect(result[1].json).toEqual({
+						content: {
+							parts: [{ text: 'Second' }, { text: ' candidate' }],
+							role: 'model',
+						},
+						mergedResponse: 'Second candidate',
+					});
+				});
+
+				it('should only merge text parts and ignore non-text parts', async () => {
+					executeFunctionsMock.getNodeParameter.mockImplementation((parameter: string) => {
+						switch (parameter) {
+							case 'modelId':
+								return 'models/gemini-2.5-flash';
+							case 'messages.values':
+								return [{ role: 'user', content: 'Hello' }];
+							case 'simplify':
+								return true;
+							case 'jsonOutput':
+								return false;
+							case 'builtInTools':
+								return {};
+							case 'options':
+								return {
+									includeMergedResponse: true,
+								};
+							case 'options.maxToolsIterations':
+								return 15;
+							default:
+								return undefined;
+						}
+					});
+					executeFunctionsMock.getNodeInputs.mockReturnValue([{ type: 'main' }]);
+					apiRequestMock.mockResolvedValue({
+						candidates: [
+							{
+								content: {
+									parts: [{ text: 'Text' }, { executableCode: {} }, { text: ' more text' }],
+									role: 'model',
+								},
+							},
+						],
+					});
+
+					const result = await text.message.execute.call(executeFunctionsMock, 0);
+
+					expect(result[0].json).toEqual({
+						content: {
+							parts: [{ text: 'Text' }, { executableCode: {} }, { text: ' more text' }],
+							role: 'model',
+						},
+						mergedResponse: 'Text more text',
+					});
+				});
+			});
+		});
 	});
 
 	describe('Audio -> Analyze', () => {
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/GoogleGemini/actions/text/message.operation.ts b/packages/@n8n/nodes-langchain/nodes/vendors/GoogleGemini/actions/text/message.operation.ts
index ae5d14e89ee..35acce905ec 100644
--- a/packages/@n8n/nodes-langchain/nodes/vendors/GoogleGemini/actions/text/message.operation.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/GoogleGemini/actions/text/message.operation.ts
@@ -1,21 +1,22 @@
+import { getConnectedTools } from '@utils/helpers';
 import {
 	type IDataObject,
 	type IExecuteFunctions,
 	type INodeExecutionData,
 	type INodeProperties,
+	jsonParse,
+	updateDisplayOptions,
 	validateNodeParameters,
 } from 'n8n-workflow';
-import { updateDisplayOptions } from 'n8n-workflow';
 import zodToJsonSchema from 'zod-to-json-schema';
 
-import { getConnectedTools } from '@utils/helpers';
-
 import type {
 	GenerateContentRequest,
 	GenerateContentResponse,
 	Content,
 	Tool,
 	GenerateContentGenerationConfig,
+	BuiltInTools,
 } from '../../helpers/interfaces';
 import { apiRequest } from '../../transport';
 import { modelRLC } from '../descriptions';
@@ -86,6 +87,97 @@ const properties: INodeProperties[] = [
 		description: 'Whether to attempt to return the response in JSON format',
 		default: false,
 	},
+	{
+		displayName: 'Built-in Tools',
+		name: 'builtInTools',
+		placeholder: 'Add Built-in Tool',
+		type: 'collection',
+		default: {},
+		displayOptions: {
+			show: {
+				'@version': [{ _cnd: { gte: 1.1 } }],
+			},
+		},
+		options: [
+			{
+				displayName: 'Google Search',
+				name: 'googleSearch',
+				type: 'boolean',
+				default: true,
+				description:
+					'Whether to allow the model to search the web using Google Search to get real-time information',
+			},
+			{
+				displayName: 'Google Maps',
+				name: 'googleMaps',
+				type: 'collection',
+				default: { latitude: '', longitude: '' },
+				options: [
+					{
+						displayName: 'Latitude',
+						name: 'latitude',
+						type: 'number',
+						default: '',
+						description: 'The latitude coordinate for location-based queries',
+						typeOptions: {
+							numberPrecision: 6,
+						},
+					},
+					{
+						displayName: 'Longitude',
+						name: 'longitude',
+						type: 'number',
+						default: '',
+						description: 'The longitude coordinate for location-based queries',
+						typeOptions: {
+							numberPrecision: 6,
+						},
+					},
+				],
+			},
+			{
+				displayName: 'URL Context',
+				name: 'urlContext',
+				type: 'boolean',
+				default: true,
+				description: 'Whether to allow the model to read and analyze content from specific URLs',
+			},
+			{
+				displayName: 'File Search',
+				name: 'fileSearch',
+				type: 'collection',
+				default: { fileSearchStoreNames: '[]' },
+				options: [
+					{
+						displayName: 'File Search Store Names',
+						name: 'fileSearchStoreNames',
+						description:
+							'The file search store names to use for the file search. File search stores are managed via Google AI Studio.',
+						type: 'json',
+						default: '[]',
+						required: true,
+					},
+					{
+						displayName: 'Metadata Filter',
+						name: 'metadataFilter',
+						type: 'string',
+						default: '',
+						description:
+							'Use metadata filter to search within a subset of documents. Example: author="Robert Graves".',
+						placeholder: 'e.g. author="John Doe"',
+					},
+				],
+			},
+			{
+				displayName: 'Code Execution',
+				name: 'codeExecution',
+				type: 'boolean',
+				default: true,
+				description:
+					'Whether to allow the model to execute code it generates to produce a response. Supported only by certain models.',
+			},
+		],
+	},
 	{
 		displayName: 'Options',
 		name: 'options',
@@ -93,6 +185,19 @@ const properties: INodeProperties[] = [
 		type: 'collection',
 		default: {},
 		options: [
+			{
+				displayName: 'Include Merged Response',
+				name: 'includeMergedResponse',
+				type: 'boolean',
+				default: false,
+				description:
+					'Whether to include a single output string merging all text parts of the response',
+				displayOptions: {
+					show: {
+						'@version': [{ _cnd: { gte: 1.1 } }],
+					},
+				},
+			},
 			{
 				displayName: 'System Message',
 				name: 'systemMessage',
@@ -107,6 +212,11 @@ const properties: INodeProperties[] = [
 				default: false,
 				description:
 					'Whether to allow the model to execute code it generates to produce a response. Supported only by certain models.',
+				displayOptions: {
+					show: {
+						'@version': [{ _cnd: { eq: 1 } }],
+					},
+				},
 			},
 			{
 				displayName: 'Frequency Penalty',
@@ -243,9 +353,11 @@ export async function execute(this: IExecuteFunctions, i: number): Promise<INode
 	const simplify = this.getNodeParameter('simplify', i, true) as boolean;
 	const jsonOutput = this.getNodeParameter('jsonOutput', i, false) as boolean;
 	const options = this.getNodeParameter('options', i, {});
+	const builtInTools = this.getNodeParameter('builtInTools', i, {}) as BuiltInTools;
 	validateNodeParameters(
 		options,
 		{
+			includeMergedResponse: { type: 'boolean', required: false },
 			systemMessage: { type: 'string', required: false },
 			codeExecution: { type: 'boolean', required: false },
 			frequencyPenalty: { type: 'number', required: false },
@@ -300,10 +412,84 @@ export async function execute(this: IExecuteFunctions, i: number): Promise<INode
 		tools.pop();
 	}
 
-	if (options.codeExecution) {
-		tools.push({
-			codeExecution: {},
-		});
+	if (this.getNode().typeVersion === 1) {
+		if (options.codeExecution) {
+			tools.push({
+				codeExecution: {},
+			});
+		}
+	}
+
+	// Add built-in tools and build toolConfig
+	let toolConfig: GenerateContentRequest['toolConfig'];
+	if (this.getNode().typeVersion >= 1.1) {
+		if (builtInTools) {
+			if (builtInTools.googleSearch) {
+				tools.push({
+					googleSearch: {},
+				});
+			}
+
+			const googleMapsOptions = builtInTools.googleMaps;
+			if (googleMapsOptions) {
+				tools.push({
+					googleMaps: {},
+				});
+
+				// Build toolConfig with retrievalConfig if latitude/longitude are provided
+				const latitude = googleMapsOptions.latitude;
+				const longitude = googleMapsOptions.longitude;
+				if (
+					latitude !== undefined &&
+					latitude !== '' &&
+					longitude !== undefined &&
+					longitude !== ''
+				) {
+					toolConfig = {
+						retrievalConfig: {
+							latLng: {
+								latitude: Number(latitude),
+								longitude: Number(longitude),
+							},
+						},
+					};
+				}
+			}
+
+			if (builtInTools.urlContext) {
+				tools.push({
+					urlContext: {},
+				});
+			}
+
+			const fileSearchOptions = builtInTools.fileSearch;
+			if (fileSearchOptions) {
+				const fileSearchStoreNamesRaw = fileSearchOptions.fileSearchStoreNames;
+				const metadataFilter = fileSearchOptions.metadataFilter;
+				let fileSearchStoreNames: string[] | undefined;
+				if (fileSearchStoreNamesRaw) {
+					const parsed = jsonParse(fileSearchStoreNamesRaw, {
+						errorMessage: 'Failed to parse file search store names',
+					});
+					if (Array.isArray(parsed)) {
+						fileSearchStoreNames = parsed;
+					}
+				}
+
+				tools.push({
+					fileSearch: {
+						...(fileSearchStoreNames && { fileSearchStoreNames }),
+						...(metadataFilter && { metadataFilter }),
+					},
+				});
+			}
+
+			if (builtInTools.codeExecution) {
+				tools.push({
+					codeExecution: {},
+				});
+			}
+		}
 	}
 
 	const contents: Content[] = messages.map((m) => ({
@@ -317,6 +503,7 @@ export async function execute(this: IExecuteFunctions, i: number): Promise<INode
 		systemInstruction: options.systemMessage
 			? { parts: [{ text: options.systemMessage }] }
 			: undefined,
+		...(toolConfig && { toolConfig }),
 	};
 
 	let response = (await apiRequest.call(this, 'POST', `/v1beta/${model}:generateContent`, {
@@ -368,8 +555,18 @@ export async function execute(this: IExecuteFunctions, i: number): Promise<INode
 		currentIteration++;
 	}
 
+	const candidates = options.includeMergedResponse
+		? response.candidates.map((candidate) => ({
+				...candidate,
+				mergedResponse: candidate.content.parts
+					.filter((part) => 'text' in part)
+					.map((part) => (part as { text: string }).text)
+					.join(''),
+			}))
+		: response.candidates;
+
 	if (simplify) {
-		return response.candidates.map((candidate) => ({
+		return candidates.map((candidate) => ({
 			json: candidate,
 			pairedItem: { item: i },
 		}));
@@ -377,7 +574,10 @@ export async function execute(this: IExecuteFunctions, i: number): Promise<INode
 
 	return [
 		{
-			json: { ...response },
+			json: {
+				...response,
+				candidates,
+			},
 			pairedItem: { item: i },
 		},
 	];
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/GoogleGemini/actions/versionDescription.ts b/packages/@n8n/nodes-langchain/nodes/vendors/GoogleGemini/actions/versionDescription.ts
index 43575c1fda9..40eff91347c 100644
--- a/packages/@n8n/nodes-langchain/nodes/vendors/GoogleGemini/actions/versionDescription.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/GoogleGemini/actions/versionDescription.ts
@@ -13,7 +13,8 @@ export const versionDescription: INodeTypeDescription = {
 	name: 'googleGemini',
 	icon: 'file:gemini.svg',
 	group: ['transform'],
-	version: 1,
+	version: [1, 1.1],
+	defaultVersion: 1.1,
 	subtitle: '={{ $parameter["operation"] + ": " + $parameter["resource"] }}',
 	description: 'Interact with Google Gemini AI models',
 	defaults: {
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/GoogleGemini/helpers/interfaces.ts b/packages/@n8n/nodes-langchain/nodes/vendors/GoogleGemini/helpers/interfaces.ts
index 9cca4915664..541292e9985 100644
--- a/packages/@n8n/nodes-langchain/nodes/vendors/GoogleGemini/helpers/interfaces.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/GoogleGemini/helpers/interfaces.ts
@@ -104,11 +104,38 @@ export interface VeoResponse {
 	};
 }
 
+/**
+ * User configuration for built-in tools in the node parameters
+ */
+export interface BuiltInTools {
+	googleSearch?: boolean;
+	googleMaps?: {
+		latitude?: number | string;
+		longitude?: number | string;
+	};
+	urlContext?: boolean;
+	fileSearch?: {
+		fileSearchStoreNames?: string;
+		metadataFilter?: string;
+	};
+	codeExecution?: boolean;
+}
+
+/**
+ * Tool structure for the Google Gemini API request
+ */
 export interface Tool {
 	functionDeclarations?: Array<{
 		name: string;
 		description: string;
 		parameters: IDataObject;
 	}>;
+	googleSearch?: object;
+	googleMaps?: object;
+	urlContext?: object;
+	fileSearch?: {
+		fileSearchStoreNames?: string[];
+		metadataFilter?: string;
+	};
 	codeExecution?: object;
 }

From f9c149869aae643a5ef678ec1479275c7a60bfd4 Mon Sep 17 00:00:00 2001
From: Declan Carroll <declan@n8n.io>
Date: Tue, 9 Dec 2025 12:32:46 +0000
Subject: [PATCH 153/167] ci: Increase timeout for docker building (#22970)

---
 .github/workflows/docker-build-push.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml
index d03bd901c16..59749374713 100644
--- a/.github/workflows/docker-build-push.yml
+++ b/.github/workflows/docker-build-push.yml
@@ -71,7 +71,7 @@ jobs:
     name: Build App, then Build and Push Docker Image (${{ matrix.platform }})
     needs: determine-build-context
     runs-on: ${{ matrix.runner }}
-    timeout-minutes: 15
+    timeout-minutes: 25
     strategy:
       matrix: ${{ fromJSON(needs.determine-build-context.outputs.build_matrix) }}
     outputs:

From 51e4adf80b80fab45d632274f5dde9289d348dab Mon Sep 17 00:00:00 2001
From: Andreas Fitzek <andreas.fitzek@n8n.io>
Date: Tue, 9 Dec 2025 14:26:08 +0100
Subject: [PATCH 154/167] chore(core): Implement oauth introspection resolver
 and bearer token extractor (#22968)

---
 .../credential-resolver.ts                    |  12 +-
 .../__tests__/bearer-token-extractor.test.ts  | 153 ++++++++++
 .../__tests__/http-header-extractor.test.ts   |  18 +-
 .../__tests__/utils.ts                        |  17 ++
 .../bearer-token-extractor.ts                 |  50 ++++
 .../context-establishment-hooks/index.ts      |   1 +
 .../oauth-credential-resolver.test.ts         | 281 ++++++++++++++++++
 .../__tests__/resolver-contract-tests.ts      |  91 +++---
 .../stub-credential-resolver.test.ts          |  19 +-
 .../oauth2-introspection-identifier.ts        |   2 +-
 .../credential-resolvers/index.ts             |   1 +
 .../oauth-credential-resolver.ts              | 160 ++++++++++
 .../stub-credential-resolver.ts               |  15 +-
 13 files changed, 752 insertions(+), 68 deletions(-)
 create mode 100644 packages/cli/src/modules/dynamic-credentials.ee/context-establishment-hooks/__tests__/bearer-token-extractor.test.ts
 create mode 100644 packages/cli/src/modules/dynamic-credentials.ee/context-establishment-hooks/__tests__/utils.ts
 create mode 100644 packages/cli/src/modules/dynamic-credentials.ee/context-establishment-hooks/bearer-token-extractor.ts
 create mode 100644 packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/__tests__/oauth-credential-resolver.test.ts

diff --git a/packages/@n8n/decorators/src/credential-resolver/credential-resolver.ts b/packages/@n8n/decorators/src/credential-resolver/credential-resolver.ts
index 5da67969887..6a0779c3a0e 100644
--- a/packages/@n8n/decorators/src/credential-resolver/credential-resolver.ts
+++ b/packages/@n8n/decorators/src/credential-resolver/credential-resolver.ts
@@ -10,6 +10,12 @@ import type {
  */
 export type CredentialResolverConfiguration = Record<string, unknown>;
 
+export type CredentialResolverHandle = {
+	configuration: CredentialResolverConfiguration;
+	resolverName: string;
+	resolverId: string;
+};
+
 /**
  * Metadata describing a credential resolver type for UI integration and discovery.
  */
@@ -43,7 +49,7 @@ export interface ICredentialResolver {
 	getSecret(
 		credentialId: string,
 		context: ICredentialContext,
-		options: CredentialResolverConfiguration,
+		handle: CredentialResolverHandle,
 	): Promise<ICredentialDataDecryptedObject>;
 
 	/**
@@ -54,7 +60,7 @@ export interface ICredentialResolver {
 		credentialId: string,
 		context: ICredentialContext,
 		data: ICredentialDataDecryptedObject,
-		options: CredentialResolverConfiguration,
+		handle: CredentialResolverHandle,
 	): Promise<void>;
 
 	/**
@@ -65,7 +71,7 @@ export interface ICredentialResolver {
 	deleteSecret?(
 		credentialId: string,
 		context: ICredentialContext,
-		options: CredentialResolverConfiguration,
+		handle: CredentialResolverHandle,
 	): Promise<void>;
 
 	/**
diff --git a/packages/cli/src/modules/dynamic-credentials.ee/context-establishment-hooks/__tests__/bearer-token-extractor.test.ts b/packages/cli/src/modules/dynamic-credentials.ee/context-establishment-hooks/__tests__/bearer-token-extractor.test.ts
new file mode 100644
index 00000000000..1cd26259026
--- /dev/null
+++ b/packages/cli/src/modules/dynamic-credentials.ee/context-establishment-hooks/__tests__/bearer-token-extractor.test.ts
@@ -0,0 +1,153 @@
+import type { ContextEstablishmentResult } from '@n8n/decorators';
+
+import { BearerTokenExtractor } from '../bearer-token-extractor';
+import type { HttpHeaderExtractor } from '../http-header-extractor';
+import { createOptions, createTriggerItem } from './utils';
+
+describe('BearerTokenExtractor', () => {
+	let bearerTokenExtractor: BearerTokenExtractor;
+	let mockHttpHeaderExtractor: jest.Mocked<HttpHeaderExtractor>;
+
+	beforeEach(() => {
+		mockHttpHeaderExtractor = {
+			isApplicableToTriggerNode: jest.fn(),
+			execute: jest.fn(),
+		} as unknown as jest.Mocked<HttpHeaderExtractor>;
+
+		bearerTokenExtractor = new BearerTokenExtractor(mockHttpHeaderExtractor);
+	});
+
+	describe('hookDescription', () => {
+		it('should have correct metadata', () => {
+			expect(bearerTokenExtractor.hookDescription).toEqual({
+				name: 'BearerTokenExtractor',
+				displayName: 'Bearer Token Extractor',
+				options: [],
+			});
+		});
+	});
+
+	describe('isApplicableToTriggerNode', () => {
+		it('should delegate to HttpHeaderExtractor', () => {
+			mockHttpHeaderExtractor.isApplicableToTriggerNode.mockReturnValue(true);
+
+			const result = bearerTokenExtractor.isApplicableToTriggerNode('n8n-nodes-base.webhook');
+
+			expect(mockHttpHeaderExtractor.isApplicableToTriggerNode).toHaveBeenCalledWith(
+				'n8n-nodes-base.webhook',
+			);
+			expect(result).toBe(true);
+		});
+
+		it('should return false for non-webhook nodes', () => {
+			mockHttpHeaderExtractor.isApplicableToTriggerNode.mockReturnValue(false);
+
+			const result = bearerTokenExtractor.isApplicableToTriggerNode('n8n-nodes-base.httpRequest');
+
+			expect(result).toBe(false);
+		});
+	});
+
+	describe('execute', () => {
+		it('should extract bearer token from Authorization header', async () => {
+			const options = createOptions();
+
+			const expectedResult: ContextEstablishmentResult = {
+				contextUpdate: {
+					credentials: {
+						version: 1,
+						identity: 'test-token-123',
+						metadata: { source: 'http-header', headerName: 'authorization' },
+					},
+				},
+			};
+
+			mockHttpHeaderExtractor.execute.mockResolvedValue(expectedResult);
+
+			const result = await bearerTokenExtractor.execute(options);
+
+			expect(mockHttpHeaderExtractor.execute).toHaveBeenCalledWith({
+				...options,
+				options: {
+					headerName: 'authorization',
+					headerValue: '[Bb][Ee][Aa][Rr][Ee][Rr]\\s+(.+)',
+				},
+			});
+			expect(result).toEqual(expectedResult);
+		});
+
+		it('should pass through all options to HttpHeaderExtractor', async () => {
+			const options = createOptions({ customField: 'custom-value' } as any);
+
+			mockHttpHeaderExtractor.execute.mockResolvedValue({});
+
+			await bearerTokenExtractor.execute(options);
+
+			expect(mockHttpHeaderExtractor.execute).toHaveBeenCalledWith({
+				triggerItems: options.triggerItems,
+				customField: 'custom-value',
+				options: {
+					headerName: 'authorization',
+					headerValue: '[Bb][Ee][Aa][Rr][Ee][Rr]\\s+(.+)',
+				},
+			});
+		});
+
+		it('should handle case-insensitive bearer prefix', async () => {
+			const testCases = [
+				'Bearer token123',
+				'bearer token456',
+				'BEARER token789',
+				'BeArEr tokenABC',
+			];
+
+			for (const authHeader of testCases) {
+				const options = createOptions({
+					triggerItems: [createTriggerItem({ authorization: authHeader })],
+				});
+
+				mockHttpHeaderExtractor.execute.mockResolvedValue({
+					contextUpdate: {
+						credentials: {
+							version: 1,
+							identity: authHeader.split(' ')[1],
+							metadata: { source: 'http-header', headerName: 'authorization' },
+						},
+					},
+				});
+
+				await bearerTokenExtractor.execute(options);
+
+				expect(mockHttpHeaderExtractor.execute).toHaveBeenCalledWith({
+					...options,
+					options: {
+						headerName: 'authorization',
+						headerValue: '[Bb][Ee][Aa][Rr][Ee][Rr]\\s+(.+)',
+					},
+				});
+			}
+		});
+
+		it('should return empty result when no Authorization header present', async () => {
+			const options = createOptions({ triggerItems: [createTriggerItem({})] });
+
+			mockHttpHeaderExtractor.execute.mockResolvedValue({});
+
+			const result = await bearerTokenExtractor.execute(options);
+
+			expect(result).toEqual({});
+		});
+
+		it('should return empty result for malformed bearer token', async () => {
+			const options = createOptions({
+				triggerItems: [createTriggerItem({ authorization: 'NotBearer token123' })],
+			});
+
+			mockHttpHeaderExtractor.execute.mockResolvedValue({});
+
+			const result = await bearerTokenExtractor.execute(options);
+
+			expect(result).toEqual({});
+		});
+	});
+});
diff --git a/packages/cli/src/modules/dynamic-credentials.ee/context-establishment-hooks/__tests__/http-header-extractor.test.ts b/packages/cli/src/modules/dynamic-credentials.ee/context-establishment-hooks/__tests__/http-header-extractor.test.ts
index 2ab03b5bd07..690c500901d 100644
--- a/packages/cli/src/modules/dynamic-credentials.ee/context-establishment-hooks/__tests__/http-header-extractor.test.ts
+++ b/packages/cli/src/modules/dynamic-credentials.ee/context-establishment-hooks/__tests__/http-header-extractor.test.ts
@@ -1,28 +1,12 @@
 import type { Logger } from '@n8n/backend-common';
-import type { ContextEstablishmentOptions } from '@n8n/decorators';
-import type { INodeExecutionData } from 'n8n-workflow';
 
 import { HttpHeaderExtractor } from '../http-header-extractor';
+import { createOptions, createTriggerItem } from './utils';
 
 describe('HttpHeaderExtractor', () => {
 	let extractor: HttpHeaderExtractor;
 	let mockLogger: jest.Mocked<Logger>;
 
-	// Factory functions for test data
-	const createTriggerItem = (headers?: Record<string, unknown>): INodeExecutionData => ({
-		json: { headers },
-		pairedItem: { item: 0 },
-	});
-
-	const createOptions = (
-		overrides?: Partial<ContextEstablishmentOptions>,
-	): ContextEstablishmentOptions =>
-		({
-			triggerItems: [createTriggerItem({ authorization: 'Bearer test-token-123' })],
-			options: {},
-			...overrides,
-		}) as ContextEstablishmentOptions;
-
 	beforeAll(() => {
 		mockLogger = {
 			debug: jest.fn(),
diff --git a/packages/cli/src/modules/dynamic-credentials.ee/context-establishment-hooks/__tests__/utils.ts b/packages/cli/src/modules/dynamic-credentials.ee/context-establishment-hooks/__tests__/utils.ts
new file mode 100644
index 00000000000..ca94500267d
--- /dev/null
+++ b/packages/cli/src/modules/dynamic-credentials.ee/context-establishment-hooks/__tests__/utils.ts
@@ -0,0 +1,17 @@
+import type { ContextEstablishmentOptions } from '@n8n/decorators';
+import type { INodeExecutionData } from 'n8n-workflow';
+
+// Factory functions for test data
+export const createTriggerItem = (headers?: Record<string, unknown>): INodeExecutionData => ({
+	json: { headers },
+	pairedItem: { item: 0 },
+});
+
+export const createOptions = (
+	overrides?: Partial<ContextEstablishmentOptions>,
+): ContextEstablishmentOptions =>
+	({
+		triggerItems: [createTriggerItem({ authorization: 'Bearer test-token-123' })],
+		options: {},
+		...overrides,
+	}) as ContextEstablishmentOptions;
diff --git a/packages/cli/src/modules/dynamic-credentials.ee/context-establishment-hooks/bearer-token-extractor.ts b/packages/cli/src/modules/dynamic-credentials.ee/context-establishment-hooks/bearer-token-extractor.ts
new file mode 100644
index 00000000000..ed128bf4411
--- /dev/null
+++ b/packages/cli/src/modules/dynamic-credentials.ee/context-establishment-hooks/bearer-token-extractor.ts
@@ -0,0 +1,50 @@
+import {
+	ContextEstablishmentHook,
+	ContextEstablishmentOptions,
+	ContextEstablishmentResult,
+	HookDescription,
+	IContextEstablishmentHook,
+} from '@n8n/decorators';
+
+import { HttpHeaderExtractor } from './http-header-extractor';
+
+/**
+ * Extracts bearer tokens from the Authorization HTTP header.
+ *
+ * Automatically extracts tokens from headers in the format:
+ * - `Authorization: Bearer <token>`
+ * - Case-insensitive "Bearer" prefix
+ *
+ * The extracted token becomes the credential identity for OAuth2 introspection.
+ *
+ * @example
+ * // Request header:
+ * // Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9...
+ *
+ * // Result:
+ * // context.credentials.identity = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9..."
+ */
+@ContextEstablishmentHook()
+export class BearerTokenExtractor implements IContextEstablishmentHook {
+	constructor(private readonly httpHeaderExtractor: HttpHeaderExtractor) {}
+
+	hookDescription: HookDescription = {
+		name: 'BearerTokenExtractor',
+		displayName: 'Bearer Token Extractor',
+		options: [],
+	};
+
+	isApplicableToTriggerNode(nodeType: string): boolean {
+		return this.httpHeaderExtractor.isApplicableToTriggerNode(nodeType);
+	}
+
+	async execute(options: ContextEstablishmentOptions): Promise<ContextEstablishmentResult> {
+		return await this.httpHeaderExtractor.execute({
+			...options,
+			options: {
+				headerName: 'authorization',
+				headerValue: '[Bb][Ee][Aa][Rr][Ee][Rr]\\s+(.+)',
+			},
+		});
+	}
+}
diff --git a/packages/cli/src/modules/dynamic-credentials.ee/context-establishment-hooks/index.ts b/packages/cli/src/modules/dynamic-credentials.ee/context-establishment-hooks/index.ts
index 9988fb21e4b..c5fdf58090f 100644
--- a/packages/cli/src/modules/dynamic-credentials.ee/context-establishment-hooks/index.ts
+++ b/packages/cli/src/modules/dynamic-credentials.ee/context-establishment-hooks/index.ts
@@ -1 +1,2 @@
 import './http-header-extractor';
+import './bearer-token-extractor';
diff --git a/packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/__tests__/oauth-credential-resolver.test.ts b/packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/__tests__/oauth-credential-resolver.test.ts
new file mode 100644
index 00000000000..daeb4f19aca
--- /dev/null
+++ b/packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/__tests__/oauth-credential-resolver.test.ts
@@ -0,0 +1,281 @@
+import type { Logger } from '@n8n/backend-common';
+import type { Cipher } from 'n8n-core';
+
+import { testCredentialResolverContract, testHelpers } from './resolver-contract-tests';
+import type { OAuth2TokenIntrospectionIdentifier } from '../identifiers/oauth2-introspection-identifier';
+import { OAuthCredentialResolver } from '../oauth-credential-resolver';
+import type { DynamicCredentialEntryStorage } from '../storage/dynamic-credential-entry-storage';
+
+describe('OAuthCredentialResolver', () => {
+	let mockLogger: jest.Mocked<Logger>;
+	let mockIdentifier: jest.Mocked<OAuth2TokenIntrospectionIdentifier>;
+	let mockStorage: jest.Mocked<DynamicCredentialEntryStorage>;
+	let mockCipher: jest.Mocked<Cipher>;
+
+	const validOptions = {
+		metadataUri: 'https://auth.example.com/.well-known/openid-configuration',
+		clientId: 'test-client-id',
+		clientSecret: 'test-client-secret',
+		subjectClaim: 'sub',
+	};
+
+	beforeEach(() => {
+		mockLogger = {
+			debug: jest.fn(),
+			info: jest.fn(),
+			warn: jest.fn(),
+			error: jest.fn(),
+		} as unknown as jest.Mocked<Logger>;
+
+		mockIdentifier = {
+			resolve: jest.fn(),
+			validateOptions: jest.fn(),
+		} as unknown as jest.Mocked<OAuth2TokenIntrospectionIdentifier>;
+
+		mockStorage = {
+			getCredentialData: jest.fn(),
+			setCredentialData: jest.fn(),
+			deleteCredentialData: jest.fn(),
+		} as unknown as jest.Mocked<DynamicCredentialEntryStorage>;
+
+		mockCipher = {
+			encrypt: jest.fn(),
+			decrypt: jest.fn(),
+		} as unknown as jest.Mocked<Cipher>;
+	});
+
+	// Run the standard contract tests
+	testCredentialResolverContract({
+		createResolver: () => {
+			// Create an in-memory storage for contract tests
+			const storage = new Map<string, string>();
+
+			// Reset mocks with stateful implementations
+			// Make identifier return different subjects for different identities
+			mockIdentifier.resolve.mockImplementation(async (context) => {
+				return `subject-${context.identity}`;
+			});
+			mockIdentifier.validateOptions.mockResolvedValue(undefined);
+
+			mockStorage.getCredentialData.mockImplementation(
+				async (credentialId, subjectId, resolverId) => {
+					const key = `${credentialId}:${subjectId}:${resolverId}`;
+					return storage.get(key) ?? null;
+				},
+			);
+
+			mockStorage.setCredentialData.mockImplementation(
+				async (credentialId, subjectId, resolverId, data) => {
+					const key = `${credentialId}:${subjectId}:${resolverId}`;
+					storage.set(key, data);
+				},
+			);
+
+			mockStorage.deleteCredentialData.mockImplementation(
+				async (credentialId, subjectId, resolverId) => {
+					const key = `${credentialId}:${subjectId}:${resolverId}`;
+					storage.delete(key);
+				},
+			);
+
+			mockCipher.encrypt.mockImplementation((data) => JSON.stringify(data));
+			mockCipher.decrypt.mockImplementation((data) => data);
+
+			return new OAuthCredentialResolver(mockLogger, mockIdentifier, mockStorage, mockCipher);
+		},
+		validationTests: {
+			validOptions: [
+				['complete OAuth config', validOptions],
+				['with custom subject claim', { ...validOptions, subjectClaim: 'email' }],
+				[
+					'minimal config (subjectClaim defaults to "sub")',
+					{
+						metadataUri: validOptions.metadataUri,
+						clientId: validOptions.clientId,
+						clientSecret: validOptions.clientSecret,
+					},
+				],
+			],
+			invalidOptions: [
+				['missing metadataUri', { clientId: 'x', clientSecret: 'y' }],
+				['missing clientId', { metadataUri: validOptions.metadataUri, clientSecret: 'y' }],
+				['missing clientSecret', { metadataUri: validOptions.metadataUri, clientId: 'x' }],
+				[
+					'invalid metadataUri (not a URL)',
+					{ metadataUri: 'not-a-url', clientId: 'x', clientSecret: 'y' },
+				],
+			],
+		},
+	});
+
+	// OAuth-specific behavior tests
+	describe('OAuth-specific behavior', () => {
+		let resolver: OAuthCredentialResolver;
+
+		beforeEach(() => {
+			mockIdentifier.resolve.mockResolvedValue('oauth-subject-123');
+			mockIdentifier.validateOptions.mockResolvedValue(undefined);
+			resolver = new OAuthCredentialResolver(mockLogger, mockIdentifier, mockStorage, mockCipher);
+		});
+
+		describe('getSecret', () => {
+			it('should use identifier to resolve subject from token', async () => {
+				const credentialId = 'cred-123';
+				const context = testHelpers.createContext('access-token-xyz');
+				const handle = testHelpers.createHandle(validOptions);
+
+				mockStorage.getCredentialData.mockResolvedValue('encrypted-credential-data');
+				mockCipher.decrypt.mockReturnValue('{"apiKey":"decrypted-key"}');
+
+				await resolver.getSecret(credentialId, context, handle);
+
+				expect(mockIdentifier.resolve).toHaveBeenCalledWith(context, validOptions);
+			});
+
+			it('should decrypt data retrieved from storage', async () => {
+				const credentialId = 'cred-123';
+				const context = testHelpers.createContext('access-token-xyz');
+				const handle = testHelpers.createHandle(validOptions);
+
+				mockStorage.getCredentialData.mockResolvedValue('encrypted-data-from-db');
+				mockCipher.decrypt.mockReturnValue('{"apiKey":"secret-key-123"}');
+
+				const result = await resolver.getSecret(credentialId, context, handle);
+
+				expect(mockCipher.decrypt).toHaveBeenCalledWith('encrypted-data-from-db');
+				expect(result).toEqual({ apiKey: 'secret-key-123' });
+			});
+
+			it('should throw when decrypted data is not valid JSON', async () => {
+				const credentialId = 'cred-123';
+				const context = testHelpers.createContext('access-token-xyz');
+				const handle = testHelpers.createHandle(validOptions);
+
+				mockStorage.getCredentialData.mockResolvedValue('encrypted-data');
+				mockCipher.decrypt.mockReturnValue('invalid-json{{{');
+
+				await expect(resolver.getSecret(credentialId, context, handle)).rejects.toThrow();
+				expect(mockLogger.error).toHaveBeenCalledWith(
+					'Failed to parse decrypted credential data',
+					expect.any(Object),
+				);
+			});
+		});
+
+		describe('setSecret', () => {
+			it('should encrypt data before storing', async () => {
+				const credentialId = 'cred-123';
+				const context = testHelpers.createContext('access-token-xyz');
+				const data = testHelpers.createCredentialData({ apiKey: 'new-key' });
+				const handle = testHelpers.createHandle(validOptions);
+
+				mockCipher.encrypt.mockReturnValue('encrypted-new-data');
+
+				await resolver.setSecret(credentialId, context, data, handle);
+
+				expect(mockCipher.encrypt).toHaveBeenCalledWith(data);
+				expect(mockStorage.setCredentialData).toHaveBeenCalledWith(
+					credentialId,
+					'oauth-subject-123',
+					handle.resolverId,
+					'encrypted-new-data',
+					validOptions,
+				);
+			});
+
+			it('should use resolved subject as storage key', async () => {
+				const credentialId = 'cred-123';
+				const context = testHelpers.createContext('access-token-xyz');
+				const data = testHelpers.createCredentialData();
+				const handle = testHelpers.createHandle(validOptions);
+
+				mockIdentifier.resolve.mockResolvedValue('resolved-subject-456');
+				mockCipher.encrypt.mockReturnValue('encrypted-data');
+
+				await resolver.setSecret(credentialId, context, data, handle);
+
+				expect(mockStorage.setCredentialData).toHaveBeenCalledWith(
+					credentialId,
+					'resolved-subject-456',
+					handle.resolverId,
+					'encrypted-data',
+					validOptions,
+				);
+			});
+		});
+
+		describe('deleteSecret', () => {
+			it('should use resolved subject for deletion', async () => {
+				const credentialId = 'cred-123';
+				const context = testHelpers.createContext('access-token-xyz');
+				const handle = testHelpers.createHandle(validOptions);
+
+				mockIdentifier.resolve.mockResolvedValue('subject-to-delete');
+
+				await resolver.deleteSecret(credentialId, context, handle);
+
+				expect(mockIdentifier.resolve).toHaveBeenCalledWith(context, validOptions);
+				expect(mockStorage.deleteCredentialData).toHaveBeenCalledWith(
+					credentialId,
+					'subject-to-delete',
+					handle.resolverId,
+					validOptions,
+				);
+			});
+		});
+
+		describe('validateOptions', () => {
+			it('should delegate validation to identifier', async () => {
+				await resolver.validateOptions(validOptions);
+
+				expect(mockIdentifier.validateOptions).toHaveBeenCalledWith(validOptions);
+			});
+
+			it('should throw when identifier validation fails', async () => {
+				mockIdentifier.validateOptions.mockRejectedValue(new Error('Invalid metadata'));
+
+				await expect(resolver.validateOptions(validOptions)).rejects.toThrow('Invalid metadata');
+			});
+		});
+
+		describe('isolation with different tokens', () => {
+			it('should store credentials for different tokens separately', async () => {
+				const credentialId = 'cred-123';
+				const token1 = 'token-user-1';
+				const token2 = 'token-user-2';
+				const handle = testHelpers.createHandle(validOptions);
+
+				// Mock identifier to return different subjects for different tokens
+				mockIdentifier.resolve.mockImplementation(async (context) => {
+					if (context.identity === token1) return 'subject-1';
+					if (context.identity === token2) return 'subject-2';
+					return 'unknown';
+				});
+
+				const data1 = testHelpers.createCredentialData({ apiKey: 'key-1' });
+				const data2 = testHelpers.createCredentialData({ apiKey: 'key-2' });
+
+				mockCipher.encrypt.mockReturnValue('encrypted');
+
+				await resolver.setSecret(credentialId, testHelpers.createContext(token1), data1, handle);
+				await resolver.setSecret(credentialId, testHelpers.createContext(token2), data2, handle);
+
+				// Verify both were stored with different subjects
+				expect(mockStorage.setCredentialData).toHaveBeenCalledWith(
+					credentialId,
+					'subject-1',
+					handle.resolverId,
+					'encrypted',
+					validOptions,
+				);
+				expect(mockStorage.setCredentialData).toHaveBeenCalledWith(
+					credentialId,
+					'subject-2',
+					handle.resolverId,
+					'encrypted',
+					validOptions,
+				);
+			});
+		});
+	});
+});
diff --git a/packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/__tests__/resolver-contract-tests.ts b/packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/__tests__/resolver-contract-tests.ts
index 803e85ef93b..4290236ed34 100644
--- a/packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/__tests__/resolver-contract-tests.ts
+++ b/packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/__tests__/resolver-contract-tests.ts
@@ -1,4 +1,8 @@
-import type { CredentialResolverConfiguration, ICredentialResolver } from '@n8n/decorators';
+import type {
+	CredentialResolverConfiguration,
+	CredentialResolverHandle,
+	ICredentialResolver,
+} from '@n8n/decorators';
 import {
 	CredentialResolverDataNotFoundError,
 	CredentialResolverValidationError,
@@ -47,6 +51,13 @@ export const testHelpers = {
 		...data,
 	}),
 
+	/** Creates a credential resolver handle with the given configuration */
+	createHandle: (configuration: CredentialResolverConfiguration): CredentialResolverHandle => ({
+		configuration,
+		resolverName: 'test-resolver',
+		resolverId: 'test-resolver-id',
+	}),
+
 	/** Generates a random credential ID for isolation */
 	randomCredentialId: (): string => `cred-${Math.random().toString(36).substring(7)}`,
 
@@ -120,8 +131,9 @@ export function testCredentialResolverContract(config: ResolverContractTestConfi
 				const credentialId = testHelpers.randomCredentialId();
 				const context = testHelpers.createContext(testHelpers.randomIdentity());
 				const options = validationTests.validOptions[0][1];
+				const handle = testHelpers.createHandle(options);
 
-				await expect(resolver.getSecret(credentialId, context, options)).rejects.toThrow(
+				await expect(resolver.getSecret(credentialId, context, handle)).rejects.toThrow(
 					CredentialResolverDataNotFoundError,
 				);
 			});
@@ -131,9 +143,10 @@ export function testCredentialResolverContract(config: ResolverContractTestConfi
 				const context = testHelpers.createContext(testHelpers.randomIdentity());
 				const data = testHelpers.createCredentialData();
 				const options = validationTests.validOptions[0][1];
+				const handle = testHelpers.createHandle(options);
 
-				await resolver.setSecret(credentialId, context, data, options);
-				const retrieved = await resolver.getSecret(credentialId, context, options);
+				await resolver.setSecret(credentialId, context, data, handle);
+				const retrieved = await resolver.getSecret(credentialId, context, handle);
 
 				expect(retrieved).toEqual(data);
 			});
@@ -147,11 +160,12 @@ export function testCredentialResolverContract(config: ResolverContractTestConfi
 				const context = testHelpers.createContext(testHelpers.randomIdentity());
 				const data = testHelpers.createCredentialData();
 				const options = validationTests.validOptions[0][1];
+				const handle = testHelpers.createHandle(options);
 
-				await resolver.setSecret(credentialId, context, data, options);
-				await resolver.deleteSecret(credentialId, context, options);
+				await resolver.setSecret(credentialId, context, data, handle);
+				await resolver.deleteSecret(credentialId, context, handle);
 
-				await expect(resolver.getSecret(credentialId, context, options)).rejects.toThrow(
+				await expect(resolver.getSecret(credentialId, context, handle)).rejects.toThrow(
 					CredentialResolverDataNotFoundError,
 				);
 			});
@@ -163,9 +177,10 @@ export function testCredentialResolverContract(config: ResolverContractTestConfi
 				const context = testHelpers.createContext(testHelpers.randomIdentity());
 				const data = testHelpers.createCredentialData();
 				const options = validationTests.validOptions[0][1];
+				const handle = testHelpers.createHandle(options);
 
-				await resolver.setSecret(credentialId, context, data, options);
-				const retrieved = await resolver.getSecret(credentialId, context, options);
+				await resolver.setSecret(credentialId, context, data, handle);
+				const retrieved = await resolver.getSecret(credentialId, context, handle);
 
 				expect(retrieved).toEqual(data);
 			});
@@ -174,14 +189,15 @@ export function testCredentialResolverContract(config: ResolverContractTestConfi
 				const credentialId = testHelpers.randomCredentialId();
 				const context = testHelpers.createContext(testHelpers.randomIdentity());
 				const options = validationTests.validOptions[0][1];
+				const handle = testHelpers.createHandle(options);
 
 				const data1 = testHelpers.createCredentialData({ apiKey: 'key-1' });
 				const data2 = testHelpers.createCredentialData({ apiKey: 'key-2' });
 
-				await resolver.setSecret(credentialId, context, data1, options);
-				await resolver.setSecret(credentialId, context, data2, options);
+				await resolver.setSecret(credentialId, context, data1, handle);
+				await resolver.setSecret(credentialId, context, data2, handle);
 
-				const retrieved = await resolver.getSecret(credentialId, context, options);
+				const retrieved = await resolver.getSecret(credentialId, context, handle);
 				expect(retrieved).toEqual(data2);
 			});
 		});
@@ -196,11 +212,12 @@ export function testCredentialResolverContract(config: ResolverContractTestConfi
 				const context = testHelpers.createContext(testHelpers.randomIdentity());
 				const data = testHelpers.createCredentialData();
 				const options = validationTests.validOptions[0][1];
+				const handle = testHelpers.createHandle(options);
 
-				await resolver.setSecret(credentialId, context, data, options);
-				await resolver.deleteSecret(credentialId, context, options);
+				await resolver.setSecret(credentialId, context, data, handle);
+				await resolver.deleteSecret(credentialId, context, handle);
 
-				await expect(resolver.getSecret(credentialId, context, options)).rejects.toThrow(
+				await expect(resolver.getSecret(credentialId, context, handle)).rejects.toThrow(
 					CredentialResolverDataNotFoundError,
 				);
 			});
@@ -214,10 +231,11 @@ export function testCredentialResolverContract(config: ResolverContractTestConfi
 				const context = testHelpers.createContext(testHelpers.randomIdentity());
 				const data = testHelpers.createCredentialData();
 				const options = validationTests.validOptions[0][1];
+				const handle = testHelpers.createHandle(options);
 
-				await resolver.setSecret(credentialId, context, data, options);
-				await resolver.deleteSecret(credentialId, context, options);
-				await expect(resolver.deleteSecret(credentialId, context, options)).resolves.not.toThrow();
+				await resolver.setSecret(credentialId, context, data, handle);
+				await resolver.deleteSecret(credentialId, context, handle);
+				await expect(resolver.deleteSecret(credentialId, context, handle)).resolves.not.toThrow();
 			});
 
 			it('should not error when deleting non-existent data', async () => {
@@ -228,8 +246,9 @@ export function testCredentialResolverContract(config: ResolverContractTestConfi
 				const credentialId = testHelpers.randomCredentialId();
 				const context = testHelpers.createContext(testHelpers.randomIdentity());
 				const options = validationTests.validOptions[0][1];
+				const handle = testHelpers.createHandle(options);
 
-				await expect(resolver.deleteSecret(credentialId, context, options)).resolves.not.toThrow();
+				await expect(resolver.deleteSecret(credentialId, context, handle)).resolves.not.toThrow();
 			});
 		});
 
@@ -239,15 +258,16 @@ export function testCredentialResolverContract(config: ResolverContractTestConfi
 				const credentialId2 = testHelpers.randomCredentialId();
 				const context = testHelpers.createContext(testHelpers.randomIdentity());
 				const options = validationTests.validOptions[0][1];
+				const handle = testHelpers.createHandle(options);
 
 				const data1 = testHelpers.createCredentialData({ apiKey: 'key-1' });
 				const data2 = testHelpers.createCredentialData({ apiKey: 'key-2' });
 
-				await resolver.setSecret(credentialId1, context, data1, options);
-				await resolver.setSecret(credentialId2, context, data2, options);
+				await resolver.setSecret(credentialId1, context, data1, handle);
+				await resolver.setSecret(credentialId2, context, data2, handle);
 
-				const retrieved1 = await resolver.getSecret(credentialId1, context, options);
-				const retrieved2 = await resolver.getSecret(credentialId2, context, options);
+				const retrieved1 = await resolver.getSecret(credentialId1, context, handle);
+				const retrieved2 = await resolver.getSecret(credentialId2, context, handle);
 
 				expect(retrieved1).toEqual(data1);
 				expect(retrieved2).toEqual(data2);
@@ -258,6 +278,7 @@ export function testCredentialResolverContract(config: ResolverContractTestConfi
 				const identity1 = testHelpers.randomIdentity();
 				const identity2 = testHelpers.randomIdentity();
 				const options = validationTests.validOptions[0][1];
+				const handle = testHelpers.createHandle(options);
 
 				const context1 = testHelpers.createContext(identity1);
 				const context2 = testHelpers.createContext(identity2);
@@ -265,11 +286,11 @@ export function testCredentialResolverContract(config: ResolverContractTestConfi
 				const data1 = testHelpers.createCredentialData({ apiKey: 'key-1' });
 				const data2 = testHelpers.createCredentialData({ apiKey: 'key-2' });
 
-				await resolver.setSecret(credentialId, context1, data1, options);
-				await resolver.setSecret(credentialId, context2, data2, options);
+				await resolver.setSecret(credentialId, context1, data1, handle);
+				await resolver.setSecret(credentialId, context2, data2, handle);
 
-				const retrieved1 = await resolver.getSecret(credentialId, context1, options);
-				const retrieved2 = await resolver.getSecret(credentialId, context2, options);
+				const retrieved1 = await resolver.getSecret(credentialId, context1, handle);
+				const retrieved2 = await resolver.getSecret(credentialId, context2, handle);
 
 				expect(retrieved1).toEqual(data1);
 				expect(retrieved2).toEqual(data2);
@@ -280,14 +301,15 @@ export function testCredentialResolverContract(config: ResolverContractTestConfi
 				const identity = testHelpers.randomIdentity();
 				const context = testHelpers.createContext(identity);
 				const options = validationTests.validOptions[0][1];
+				const handle = testHelpers.createHandle(options);
 
 				const data = testHelpers.createCredentialData();
 
-				await resolver.setSecret(credentialId, context, data, options);
+				await resolver.setSecret(credentialId, context, data, handle);
 
 				// Create a new context with same identity
 				const sameContext = testHelpers.createContext(identity);
-				const retrieved = await resolver.getSecret(credentialId, sameContext, options);
+				const retrieved = await resolver.getSecret(credentialId, sameContext, handle);
 
 				expect(retrieved).toEqual(data);
 			});
@@ -301,6 +323,7 @@ export function testCredentialResolverContract(config: ResolverContractTestConfi
 				const identity1 = testHelpers.randomIdentity();
 				const identity2 = testHelpers.randomIdentity();
 				const options = validationTests.validOptions[0][1];
+				const handle = testHelpers.createHandle(options);
 
 				const context1 = testHelpers.createContext(identity1);
 				const context2 = testHelpers.createContext(identity2);
@@ -308,18 +331,18 @@ export function testCredentialResolverContract(config: ResolverContractTestConfi
 				const data1 = testHelpers.createCredentialData({ apiKey: 'key-1' });
 				const data2 = testHelpers.createCredentialData({ apiKey: 'key-2' });
 
-				await resolver.setSecret(credentialId, context1, data1, options);
-				await resolver.setSecret(credentialId, context2, data2, options);
+				await resolver.setSecret(credentialId, context1, data1, handle);
+				await resolver.setSecret(credentialId, context2, data2, handle);
 
-				await resolver.deleteSecret(credentialId, context1, options);
+				await resolver.deleteSecret(credentialId, context1, handle);
 
 				// Identity1 should be deleted
-				await expect(resolver.getSecret(credentialId, context1, options)).rejects.toThrow(
+				await expect(resolver.getSecret(credentialId, context1, handle)).rejects.toThrow(
 					CredentialResolverDataNotFoundError,
 				);
 
 				// Identity2 should still exist
-				const retrieved2 = await resolver.getSecret(credentialId, context2, options);
+				const retrieved2 = await resolver.getSecret(credentialId, context2, handle);
 				expect(retrieved2).toEqual(data2);
 			});
 		});
diff --git a/packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/__tests__/stub-credential-resolver.test.ts b/packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/__tests__/stub-credential-resolver.test.ts
index b7a201e0746..3344f603678 100644
--- a/packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/__tests__/stub-credential-resolver.test.ts
+++ b/packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/__tests__/stub-credential-resolver.test.ts
@@ -40,20 +40,26 @@ describe('StubCredentialResolver', () => {
 			const context = testHelpers.createContext('user-1');
 			const data = { apiKey: 'test-key' };
 
+			const handleWithPrefix = testHelpers.createHandle({ prefix: 'test' });
+			const handleWithOtherPrefix = testHelpers.createHandle({ prefix: 'other' });
+			const handleWithoutPrefix = testHelpers.createHandle({});
+
 			// Store with prefix
-			await resolver.setSecret(credentialId, context, data, { prefix: 'test' });
+			await resolver.setSecret(credentialId, context, data, handleWithPrefix);
 
 			// Should retrieve with same prefix
-			const retrieved = await resolver.getSecret(credentialId, context, { prefix: 'test' });
+			const retrieved = await resolver.getSecret(credentialId, context, handleWithPrefix);
 			expect(retrieved).toEqual(data);
 
 			// Should NOT retrieve with different prefix
 			await expect(
-				resolver.getSecret(credentialId, context, { prefix: 'other' }),
+				resolver.getSecret(credentialId, context, handleWithOtherPrefix),
 			).rejects.toThrow();
 
 			// Should NOT retrieve without prefix
-			await expect(resolver.getSecret(credentialId, context, {})).rejects.toThrow();
+			await expect(
+				resolver.getSecret(credentialId, context, handleWithoutPrefix),
+			).rejects.toThrow();
 		});
 
 		it('should store data in memory (lost on restart)', async () => {
@@ -63,12 +69,13 @@ describe('StubCredentialResolver', () => {
 			const credentialId = 'cred-123';
 			const context = testHelpers.createContext('user-1');
 			const data = { apiKey: 'test-key' };
+			const handle = testHelpers.createHandle({});
 
 			// Store in first instance
-			await resolver1.setSecret(credentialId, context, data, {});
+			await resolver1.setSecret(credentialId, context, data, handle);
 
 			// Should not be available in second instance (different memory)
-			await expect(resolver2.getSecret(credentialId, context, {})).rejects.toThrow();
+			await expect(resolver2.getSecret(credentialId, context, handle)).rejects.toThrow();
 		});
 	});
 });
diff --git a/packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/identifiers/oauth2-introspection-identifier.ts b/packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/identifiers/oauth2-introspection-identifier.ts
index 4e63c6c626f..08e92c5401d 100644
--- a/packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/identifiers/oauth2-introspection-identifier.ts
+++ b/packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/identifiers/oauth2-introspection-identifier.ts
@@ -246,7 +246,7 @@ export class OAuth2TokenIntrospectionIdentifier implements ITokenIdentifier {
 		});
 
 		if (response.status !== 200) {
-			this.logger.debug('Token introspection failed', {
+			this.logger.error('Token introspection failed', {
 				status: response.status,
 				data: response.data,
 			});
diff --git a/packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/index.ts b/packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/index.ts
index fc776bb5a11..52e8119533a 100644
--- a/packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/index.ts
+++ b/packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/index.ts
@@ -1 +1,2 @@
 import './stub-credential-resolver';
+import './oauth-credential-resolver';
diff --git a/packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/oauth-credential-resolver.ts b/packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/oauth-credential-resolver.ts
index e69de29bb2d..736cba94981 100644
--- a/packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/oauth-credential-resolver.ts
+++ b/packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/oauth-credential-resolver.ts
@@ -0,0 +1,160 @@
+import { Logger } from '@n8n/backend-common';
+import {
+	CredentialResolver,
+	CredentialResolverConfiguration,
+	CredentialResolverDataNotFoundError,
+	CredentialResolverHandle,
+	CredentialResolverValidationError,
+	ICredentialResolver,
+} from '@n8n/decorators';
+import { Cipher } from 'n8n-core';
+import { ICredentialContext, ICredentialDataDecryptedObject, jsonParse } from 'n8n-workflow';
+import z from 'zod';
+
+import {
+	OAuth2IntrospectionOptionsSchema,
+	OAuth2TokenIntrospectionIdentifier,
+} from './identifiers/oauth2-introspection-identifier';
+import { DynamicCredentialEntryStorage } from './storage/dynamic-credential-entry-storage';
+
+const OAuthCredentialResolverOptionsSchema = z.object({
+	...OAuth2IntrospectionOptionsSchema.shape,
+});
+
+/**
+ * OAuth2 token introspection-based credential resolver.
+ * Resolves user identity via OAuth2 token introspection and stores credentials
+ * encrypted in the database, keyed by the introspected subject.
+ */
+@CredentialResolver()
+export class OAuthCredentialResolver implements ICredentialResolver {
+	constructor(
+		private readonly logger: Logger,
+		private readonly oAuth2TokenIntrospectionIdentifier: OAuth2TokenIntrospectionIdentifier,
+		private readonly storage: DynamicCredentialEntryStorage,
+		private readonly cipher: Cipher,
+	) {}
+
+	metadata = {
+		name: 'credential-resolver.oauth2-1.0',
+		description: 'OAuth2 token introspection-based credential resolver',
+		displayName: 'OAuth2 Introspection',
+		options: [
+			{
+				displayName: 'Metadata URL',
+				name: 'metadataUri',
+				type: 'string' as const,
+				required: true,
+				default: '',
+				placeholder: 'https://auth.example.com/.well-known/openid-configuration',
+				description: 'OAuth2 server metadata endpoint URL',
+			},
+			{
+				displayName: 'Client ID',
+				name: 'clientId',
+				type: 'string' as const,
+				default: '',
+				required: true,
+				description: 'OAuth2 client ID for introspection',
+			},
+			{
+				displayName: 'Client Secret',
+				name: 'clientSecret',
+				type: 'string' as const,
+				default: '',
+				required: true,
+				typeOptions: { password: true },
+				description: 'OAuth2 client secret for introspection',
+			},
+			{
+				displayName: 'Subject Claim',
+				name: 'subjectClaim',
+				type: 'string' as const,
+				default: 'sub',
+				description: 'Token claim to use as subject identifier',
+			},
+		],
+	};
+
+	/**
+	 * Retrieves stored credential data for the given identity.
+	 * @throws {CredentialResolverDataNotFoundError} When no data exists for the key
+	 */
+	async getSecret(
+		credentialId: string,
+		context: ICredentialContext,
+		handle: CredentialResolverHandle,
+	): Promise<ICredentialDataDecryptedObject> {
+		const parsedOptions = await this.parseOptions(handle.configuration);
+		const key = await this.oAuth2TokenIntrospectionIdentifier.resolve(context, parsedOptions);
+
+		const data = await this.storage.getCredentialData(
+			credentialId,
+			key,
+			handle.resolverId,
+			parsedOptions,
+		);
+
+		if (!data) {
+			throw new CredentialResolverDataNotFoundError();
+		}
+		const plaintext = this.cipher.decrypt(data);
+		try {
+			const secret = jsonParse<ICredentialDataDecryptedObject>(plaintext);
+			return secret;
+		} catch (error) {
+			this.logger.error('Failed to parse decrypted credential data', { error });
+			throw new CredentialResolverDataNotFoundError();
+		}
+	}
+
+	/** Stores credential data for the given identity */
+	async setSecret(
+		credentialId: string,
+		context: ICredentialContext,
+		data: ICredentialDataDecryptedObject,
+		handle: CredentialResolverHandle,
+	): Promise<void> {
+		const parsedOptions = await this.parseOptions(handle.configuration);
+		const key = await this.oAuth2TokenIntrospectionIdentifier.resolve(context, parsedOptions);
+
+		const encryptedData = this.cipher.encrypt(data);
+
+		await this.storage.setCredentialData(
+			credentialId,
+			key,
+			handle.resolverId,
+			encryptedData,
+			parsedOptions,
+		);
+	}
+
+	/** Deletes credential data for the given identity. Succeeds silently if not found. */
+	async deleteSecret(
+		credentialId: string,
+		context: ICredentialContext,
+		handle: CredentialResolverHandle,
+	): Promise<void> {
+		const parsedOptions = await this.parseOptions(handle.configuration);
+		const key = await this.oAuth2TokenIntrospectionIdentifier.resolve(context, parsedOptions);
+		await this.storage.deleteCredentialData(credentialId, key, handle.resolverId, parsedOptions);
+	}
+
+	private async parseOptions(options: CredentialResolverConfiguration) {
+		const result = await OAuthCredentialResolverOptionsSchema.safeParseAsync(options);
+		if (result.error) {
+			this.logger.error('Invalid options provided to OAuthCredentialResolver', {
+				error: result.error,
+			});
+			throw new CredentialResolverValidationError(
+				`Invalid options for OAuthCredentialResolver: ${result.error.message}`,
+			);
+		}
+		return result.data;
+	}
+
+	async validateOptions(options: CredentialResolverConfiguration): Promise<void> {
+		const parsedOptions = await this.parseOptions(options);
+		await this.oAuth2TokenIntrospectionIdentifier.validateOptions(parsedOptions);
+	}
+}
diff --git a/packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/stub-credential-resolver.ts b/packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/stub-credential-resolver.ts
index 488b139c756..a64ee2f9f8d 100644
--- a/packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/stub-credential-resolver.ts
+++ b/packages/cli/src/modules/dynamic-credentials.ee/credential-resolvers/stub-credential-resolver.ts
@@ -3,11 +3,12 @@ import {
 	CredentialResolver,
 	CredentialResolverConfiguration,
 	CredentialResolverDataNotFoundError,
+	CredentialResolverHandle,
 	CredentialResolverValidationError,
 	ICredentialResolver,
 } from '@n8n/decorators';
 import { ICredentialContext, ICredentialDataDecryptedObject } from 'n8n-workflow';
-import z from 'zod/v4';
+import z from 'zod';
 
 const StubOptionsSchema = z.object({
 	prefix: z.string().default(''),
@@ -57,9 +58,9 @@ export class StubCredentialResolver implements ICredentialResolver {
 	async getSecret(
 		credentialId: string,
 		context: ICredentialContext,
-		options: CredentialResolverConfiguration,
+		handle: CredentialResolverHandle,
 	): Promise<ICredentialDataDecryptedObject> {
-		const parsedOptions = await this.parseOptions(options);
+		const parsedOptions = await this.parseOptions(handle.configuration);
 		const key = this.generateKey(credentialId, context, parsedOptions);
 		const secret = this.secretsStore.get(key);
 		if (!secret) {
@@ -73,9 +74,9 @@ export class StubCredentialResolver implements ICredentialResolver {
 		credentialId: string,
 		context: ICredentialContext,
 		data: ICredentialDataDecryptedObject,
-		options: CredentialResolverConfiguration,
+		handle: CredentialResolverHandle,
 	): Promise<void> {
-		const parsedOptions = await this.parseOptions(options);
+		const parsedOptions = await this.parseOptions(handle.configuration);
 		const key = this.generateKey(credentialId, context, parsedOptions);
 		this.secretsStore.set(key, data);
 	}
@@ -84,9 +85,9 @@ export class StubCredentialResolver implements ICredentialResolver {
 	async deleteSecret(
 		credentialId: string,
 		context: ICredentialContext,
-		options: CredentialResolverConfiguration,
+		handle: CredentialResolverHandle,
 	): Promise<void> {
-		const parsedOptions = await this.parseOptions(options);
+		const parsedOptions = await this.parseOptions(handle.configuration);
 		const key = this.generateKey(credentialId, context, parsedOptions);
 		this.secretsStore.delete(key);
 	}

From a7efa2f097288c0dcdc5d4e8783817dbf97d85f4 Mon Sep 17 00:00:00 2001
From: Andreas Fitzek <andreas.fitzek@n8n.io>
Date: Tue, 9 Dec 2025 14:27:48 +0100
Subject: [PATCH 155/167] chore(core): License flag for the dynamic credential
 module (#22971)

---
 packages/@n8n/backend-common/src/license-state.ts  |  4 ++++
 packages/@n8n/constants/src/index.ts               |  1 +
 packages/cli/src/controllers/e2e.controller.ts     |  1 +
 packages/cli/src/license.ts                        |  5 +++++
 .../dynamic-credentials.module.ts                  | 14 +++++++++++++-
 .../credential-resolvers.api.test.ts               |  6 ++++--
 .../dynamic-credential-entry-storage.test.ts       |  6 +++++-
 .../dynamic-credential-entry.repository.test.ts    |  8 ++++++--
 8 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/packages/@n8n/backend-common/src/license-state.ts b/packages/@n8n/backend-common/src/license-state.ts
index 8fcd3a9e64c..9a14dec874d 100644
--- a/packages/@n8n/backend-common/src/license-state.ts
+++ b/packages/@n8n/backend-common/src/license-state.ts
@@ -58,6 +58,10 @@ export class LicenseState {
 		return this.isLicensed(LICENSE_FEATURES.CUSTOM_ROLES);
 	}
 
+	isDynamicCredentialsLicensed() {
+		return this.isLicensed(LICENSE_FEATURES.DYNAMIC_CREDENTIALS);
+	}
+
 	isSharingLicensed() {
 		return this.isLicensed('feat:sharing');
 	}
diff --git a/packages/@n8n/constants/src/index.ts b/packages/@n8n/constants/src/index.ts
index 286c0ecb3ec..264fcf2a2b2 100644
--- a/packages/@n8n/constants/src/index.ts
+++ b/packages/@n8n/constants/src/index.ts
@@ -38,6 +38,7 @@ export const LICENSE_FEATURES = {
 	WORKFLOW_DIFFS: 'feat:workflowDiffs',
 	CUSTOM_ROLES: 'feat:customRoles',
 	AI_BUILDER: 'feat:aiBuilder',
+	DYNAMIC_CREDENTIALS: 'feat:dynamicCredentials',
 } as const;
 
 export const LICENSE_QUOTAS = {
diff --git a/packages/cli/src/controllers/e2e.controller.ts b/packages/cli/src/controllers/e2e.controller.ts
index 8faf4910330..4d57777969b 100644
--- a/packages/cli/src/controllers/e2e.controller.ts
+++ b/packages/cli/src/controllers/e2e.controller.ts
@@ -86,6 +86,7 @@ type PushRequest = Request<
 @RestController('/e2e')
 export class E2EController {
 	private enabledFeatures: Record<BooleanLicenseFeature, boolean> = {
+		[LICENSE_FEATURES.DYNAMIC_CREDENTIALS]: false,
 		[LICENSE_FEATURES.SHARING]: false,
 		[LICENSE_FEATURES.LDAP]: false,
 		[LICENSE_FEATURES.SAML]: false,
diff --git a/packages/cli/src/license.ts b/packages/cli/src/license.ts
index db7280f0b6c..d6cbc91aaff 100644
--- a/packages/cli/src/license.ts
+++ b/packages/cli/src/license.ts
@@ -221,6 +221,11 @@ export class License implements LicenseProvider {
 		return this.manager?.hasFeatureEnabled(feature) ?? false;
 	}
 
+	/** @deprecated Use `LicenseState.isDynamicCredentialsLicensed` instead. */
+	isDynamicCredentialsEnabled() {
+		return this.isLicensed(LICENSE_FEATURES.DYNAMIC_CREDENTIALS);
+	}
+
 	/** @deprecated Use `LicenseState.isSharingLicensed` instead. */
 	isSharingEnabled() {
 		return this.isLicensed(LICENSE_FEATURES.SHARING);
diff --git a/packages/cli/src/modules/dynamic-credentials.ee/dynamic-credentials.module.ts b/packages/cli/src/modules/dynamic-credentials.ee/dynamic-credentials.module.ts
index 4155bf7381e..d1f44323057 100644
--- a/packages/cli/src/modules/dynamic-credentials.ee/dynamic-credentials.module.ts
+++ b/packages/cli/src/modules/dynamic-credentials.ee/dynamic-credentials.module.ts
@@ -1,10 +1,19 @@
+import { LICENSE_FEATURES } from '@n8n/constants';
 import type { ModuleInterface } from '@n8n/decorators';
 import { BackendModule, OnShutdown } from '@n8n/decorators';
 import { Container } from '@n8n/di';
 
-@BackendModule({ name: 'dynamic-credentials', licenseFlag: 'feat:externalSecrets' })
+function isFeatureFlagEnabled(): boolean {
+	return process.env.N8N_ENV_FEAT_CONTEXT_ESTABLISHMENT_HOOKS === 'true';
+}
+
+// TODO: Remove LICENSE_FEATURES.EXTERNAL_SECRETS with dynamic credentials feature once it is in the license server
+@BackendModule({ name: 'dynamic-credentials', licenseFlag: LICENSE_FEATURES.EXTERNAL_SECRETS })
 export class DynamicCredentialsModule implements ModuleInterface {
 	async init() {
+		if (!isFeatureFlagEnabled()) {
+			return;
+		}
 		await import('./dynamic-credentials.controller');
 		await import('./credential-resolvers.controller');
 		await import('./context-establishment-hooks');
@@ -15,6 +24,9 @@ export class DynamicCredentialsModule implements ModuleInterface {
 	}
 
 	async entities() {
+		if (!isFeatureFlagEnabled()) {
+			return [];
+		}
 		const { DynamicCredentialResolver } = await import('./database/entities/credential-resolver');
 		const { DynamicCredentialEntry } = await import('./database/entities/dynamic-credential-entry');
 
diff --git a/packages/cli/test/integration/dynamic-credentials.ee/credential-resolvers.api.test.ts b/packages/cli/test/integration/dynamic-credentials.ee/credential-resolvers.api.test.ts
index af0368d5d1f..dbc47214cd5 100644
--- a/packages/cli/test/integration/dynamic-credentials.ee/credential-resolvers.api.test.ts
+++ b/packages/cli/test/integration/dynamic-credentials.ee/credential-resolvers.api.test.ts
@@ -5,9 +5,9 @@ import { GLOBAL_OWNER_ROLE, GLOBAL_MEMBER_ROLE } from '@n8n/db';
 import { Container } from '@n8n/di';
 import { mock } from 'jest-mock-extended';
 
-import { Telemetry } from '@/telemetry';
-import { DynamicCredentialResolverService } from '@/modules/dynamic-credentials.ee/services/credential-resolver.service';
 import { DynamicCredentialResolverRepository } from '@/modules/dynamic-credentials.ee/database/repositories/credential-resolver.repository';
+import { DynamicCredentialResolverService } from '@/modules/dynamic-credentials.ee/services/credential-resolver.service';
+import { Telemetry } from '@/telemetry';
 
 import { createUser } from '../shared/db/users';
 import type { SuperAgentTest } from '../shared/types';
@@ -19,6 +19,8 @@ const licenseMock = mock<LicenseState>();
 licenseMock.isLicensed.mockReturnValue(true);
 Container.set(LicenseState, licenseMock);
 
+process.env.N8N_ENV_FEAT_CONTEXT_ESTABLISHMENT_HOOKS = 'true';
+
 const testServer = utils.setupTestServer({
 	endpointGroups: ['credentials'],
 	enabledFeatures: ['feat:externalSecrets'],
diff --git a/packages/cli/test/integration/dynamic-credentials/dynamic-credential-entry-storage.test.ts b/packages/cli/test/integration/dynamic-credentials/dynamic-credential-entry-storage.test.ts
index 3c44ceae1a8..0f888d53d3e 100644
--- a/packages/cli/test/integration/dynamic-credentials/dynamic-credential-entry-storage.test.ts
+++ b/packages/cli/test/integration/dynamic-credentials/dynamic-credential-entry-storage.test.ts
@@ -3,19 +3,23 @@ import { Container } from '@n8n/di';
 
 import { DynamicCredentialEntryStorage } from '@/modules/dynamic-credentials.ee/credential-resolvers/storage/dynamic-credential-entry-storage';
 
-import { createCredentials } from '../shared/db/credentials';
 import { createDynamicCredentialResolver } from './shared/db-helpers';
+import { createCredentials } from '../shared/db/credentials';
 
 describe('DynamicCredentialEntryStorage', () => {
 	let storage: DynamicCredentialEntryStorage;
+	let previousEnvVar: string | undefined;
 
 	beforeAll(async () => {
+		previousEnvVar = process.env.N8N_ENV_FEAT_CONTEXT_ESTABLISHMENT_HOOKS;
+		process.env.N8N_ENV_FEAT_CONTEXT_ESTABLISHMENT_HOOKS = 'true';
 		await testModules.loadModules(['dynamic-credentials']);
 		await testDb.init();
 		storage = Container.get(DynamicCredentialEntryStorage);
 	});
 
 	afterAll(async () => {
+		process.env.N8N_ENV_FEAT_CONTEXT_ESTABLISHMENT_HOOKS = previousEnvVar;
 		await testDb.terminate();
 	});
 
diff --git a/packages/cli/test/integration/dynamic-credentials/dynamic-credential-entry.repository.test.ts b/packages/cli/test/integration/dynamic-credentials/dynamic-credential-entry.repository.test.ts
index 50384dd2990..b24d697510f 100644
--- a/packages/cli/test/integration/dynamic-credentials/dynamic-credential-entry.repository.test.ts
+++ b/packages/cli/test/integration/dynamic-credentials/dynamic-credential-entry.repository.test.ts
@@ -2,23 +2,27 @@ import { testDb, testModules } from '@n8n/backend-test-utils';
 import { CredentialsRepository } from '@n8n/db';
 import { Container } from '@n8n/di';
 
-import { DynamicCredentialEntryRepository } from '@/modules/dynamic-credentials.ee/database/repositories/dynamic-credential-entry.repository';
 import { DynamicCredentialEntry } from '@/modules/dynamic-credentials.ee/database/entities/dynamic-credential-entry';
 import { DynamicCredentialResolverRepository } from '@/modules/dynamic-credentials.ee/database/repositories/credential-resolver.repository';
+import { DynamicCredentialEntryRepository } from '@/modules/dynamic-credentials.ee/database/repositories/dynamic-credential-entry.repository';
 
-import { createCredentials } from '../shared/db/credentials';
 import { createDynamicCredentialResolver } from './shared/db-helpers';
+import { createCredentials } from '../shared/db/credentials';
 
 describe('DynamicCredentialEntryRepository', () => {
 	let repository: DynamicCredentialEntryRepository;
+	let previousEnvVar: string | undefined;
 
 	beforeAll(async () => {
+		previousEnvVar = process.env.N8N_ENV_FEAT_CONTEXT_ESTABLISHMENT_HOOKS;
+		process.env.N8N_ENV_FEAT_CONTEXT_ESTABLISHMENT_HOOKS = 'true';
 		await testModules.loadModules(['dynamic-credentials']);
 		await testDb.init();
 		repository = Container.get(DynamicCredentialEntryRepository);
 	});
 
 	afterAll(async () => {
+		process.env.N8N_ENV_FEAT_CONTEXT_ESTABLISHMENT_HOOKS = previousEnvVar;
 		await testDb.terminate();
 	});
 

From c6d74234c6c8f04691076bfdfea0fff1d0e6a77c Mon Sep 17 00:00:00 2001
From: Declan Carroll <declan@n8n.io>
Date: Tue, 9 Dec 2025 14:01:13 +0000
Subject: [PATCH 156/167] fix: Upgrade urllib3 in runners image  (#22975)

---
 packages/@n8n/task-runner-python/pyproject.toml | 3 +++
 packages/@n8n/task-runner-python/uv.lock        | 9 ++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/packages/@n8n/task-runner-python/pyproject.toml b/packages/@n8n/task-runner-python/pyproject.toml
index 40152418336..0c559fa877c 100644
--- a/packages/@n8n/task-runner-python/pyproject.toml
+++ b/packages/@n8n/task-runner-python/pyproject.toml
@@ -11,6 +11,9 @@ dependencies = [
 [project.optional-dependencies]
 sentry = ["sentry-sdk>=2.35.2"]
 
+[tool.uv]
+constraint-dependencies = ["urllib3>=2.6.0"]
+
 [dependency-groups]
 dev = [
     "ruff>=0.12.8",
diff --git a/packages/@n8n/task-runner-python/uv.lock b/packages/@n8n/task-runner-python/uv.lock
index 7944fe9cf1d..ddf126298e7 100644
--- a/packages/@n8n/task-runner-python/uv.lock
+++ b/packages/@n8n/task-runner-python/uv.lock
@@ -2,6 +2,9 @@ version = 1
 revision = 3
 requires-python = ">=3.13"
 
+[manifest]
+constraints = [{ name = "urllib3", specifier = ">=2.6.0" }]
+
 [[package]]
 name = "aiohappyeyeballs"
 version = "2.6.1"
@@ -458,11 +461,11 @@ wheels = [
 
 [[package]]
 name = "urllib3"
-version = "2.5.0"
+version = "2.6.1"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/15/22/9ee70a2574a4f4599c47dd506532914ce044817c7752a79b6a51286319bc/urllib3-2.5.0.tar.gz", hash = "sha256:3fc47733c7e419d4bc3f6b3dc2b4f890bb743906a30d56ba4a5bfa4bbff92760", size = 393185, upload-time = "2025-06-18T14:07:41.644Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/5e/1d/0f3a93cca1ac5e8287842ed4eebbd0f7a991315089b1a0b01c7788aa7b63/urllib3-2.6.1.tar.gz", hash = "sha256:5379eb6e1aba4088bae84f8242960017ec8d8e3decf30480b3a1abdaa9671a3f", size = 432678, upload-time = "2025-12-08T15:25:26.773Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/a7/c2/fe1e52489ae3122415c51f387e221dd0773709bad6c6cdaa599e8a2c5185/urllib3-2.5.0-py3-none-any.whl", hash = "sha256:e6b01673c0fa6a13e374b50871808eb3bf7046c4b125b216f6bf1cc604cff0dc", size = 129795, upload-time = "2025-06-18T14:07:40.39Z" },
+    { url = "https://files.pythonhosted.org/packages/bc/56/190ceb8cb10511b730b564fb1e0293fa468363dbad26145c34928a60cb0c/urllib3-2.6.1-py3-none-any.whl", hash = "sha256:e67d06fe947c36a7ca39f4994b08d73922d40e6cca949907be05efa6fd75110b", size = 131138, upload-time = "2025-12-08T15:25:25.51Z" },
 ]
 
 [[package]]

From e1e4c821a4e7d021ad537238d155ad6f8bd08fe3 Mon Sep 17 00:00:00 2001
From: Alex Grozav <alex@grozav.com>
Date: Tue, 9 Dec 2025 14:21:21 +0000
Subject: [PATCH 157/167] feat: Allow running Playwright e2e tests using Vite
 dev server (no-changelog) (#22742)

---
 package.json                                  |   2 +
 packages/testing/playwright/README.md         |  17 +++
 packages/testing/playwright/fixtures/base.ts  | 136 ++++++++++++++++--
 packages/testing/playwright/global-setup.ts   |   5 +-
 packages/testing/playwright/package.json      |   1 +
 packages/testing/playwright/pages/n8nPage.ts  |   4 +-
 .../testing/playwright/playwright-projects.ts |   8 +-
 .../testing/playwright/playwright.config.ts   |  24 ++--
 .../testing/playwright/utils/url-helper.ts    |  17 +++
 9 files changed, 184 insertions(+), 30 deletions(-)

diff --git a/package.json b/package.json
index 67e7c433312..1cd8914edfb 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,9 @@
     "dev:be": "turbo run dev --parallel --env-mode=loose --filter=!@n8n/design-system --filter=!@n8n/chat --filter=!@n8n/task-runner --filter=!n8n-editor-ui",
     "dev:ai": "turbo run dev --parallel --env-mode=loose --filter=@n8n/nodes-langchain --filter=n8n --filter=n8n-core",
     "dev:fe": "run-p start \"dev:fe:editor --filter=@n8n/design-system\"",
+    "dev:fe:e2e": "run-p start dev:fe:editor",
     "dev:fe:editor": "turbo run dev --parallel --env-mode=loose --filter=n8n-editor-ui",
+    "dev:e2e": "pnpm --filter=n8n-playwright dev --ui",
     "clean": "turbo run clean",
     "reset": "node scripts/ensure-zx.mjs && zx scripts/reset.mjs",
     "format": "turbo run format && node scripts/format.mjs",
diff --git a/packages/testing/playwright/README.md b/packages/testing/playwright/README.md
index ca21d14a08b..12c0c2b95e4 100644
--- a/packages/testing/playwright/README.md
+++ b/packages/testing/playwright/README.md
@@ -13,7 +13,24 @@ pnpm test:local           											# Starts a local server and runs the UI tes
 N8N_BASE_URL=localhost:5068 pnpm test:local			# Runs the UI tests against the instance running
 ```
 
+## Separate Backend and Frontend URLs
+
+When developing with separate backend and frontend servers (e.g., backend on port 5680, frontend on port 8080), you can use the following environment variables:
+
+- **`N8N_BASE_URL`**: Backend server URL (also used as frontend URL if `N8N_EDITOR_URL` is not set)
+- **`N8N_EDITOR_URL`**: Frontend server URL (when set, overrides frontend URL while backend uses `N8N_BASE_URL`)
+
+**How it works:**
+- **Backend URL** (for API calls): Always uses `N8N_BASE_URL`
+- **Frontend URL** (for browser navigation): Uses `N8N_EDITOR_URL` if set, otherwise falls back to `N8N_BASE_URL`
+
+This allows you to:
+- Test against a backend on port 5680 while the frontend dev server runs on port 8080
+- Use different URLs for API calls vs browser navigation
+- Maintain backward compatibility with single-URL setups
+
 ## Test Commands
+
 ```bash
 # By Mode
 pnpm test:container:standard    # Sqlite
diff --git a/packages/testing/playwright/fixtures/base.ts b/packages/testing/playwright/fixtures/base.ts
index 3cbe1866d19..aed7546d9f0 100644
--- a/packages/testing/playwright/fixtures/base.ts
+++ b/packages/testing/playwright/fixtures/base.ts
@@ -5,12 +5,14 @@ import type { N8NStack } from 'n8n-containers/n8n-test-container-creation';
 import { createN8NStack } from 'n8n-containers/n8n-test-container-creation';
 import { ContainerTestHelpers } from 'n8n-containers/n8n-test-container-helpers';
 
+import { N8N_AUTH_COOKIE } from '../config/constants';
 import { setupDefaultInterceptors } from '../config/intercepts';
 import { n8nPage } from '../pages/n8nPage';
 import { ApiHelpers } from '../services/api-helper';
 import { ProxyServer } from '../services/proxy-server';
 import { TestError, type TestRequirements } from '../Types';
 import { setupTestRequirements } from '../utils/requirements';
+import { getBackendUrl, getFrontendUrl } from '../utils/url-helper';
 
 type TestFixtures = {
 	n8n: n8nPage;
@@ -22,6 +24,8 @@ type TestFixtures = {
 
 type WorkerFixtures = {
 	n8nUrl: string;
+	backendUrl: string;
+	frontendUrl: string;
 	dbSetup: undefined;
 	chaos: ContainerTestHelpers;
 	n8nContainer: N8NStack;
@@ -90,10 +94,10 @@ export const test = base.extend<
 		{ scope: 'worker', box: true },
 	],
 
-	// Create a new n8n container if N8N_BASE_URL is not set, otherwise use the existing n8n instance
+	// Create a new n8n container if backend URL is not set, otherwise use the existing n8n instance
 	n8nContainer: [
 		async ({ containerConfig }, use, workerInfo) => {
-			const envBaseURL = process.env.N8N_BASE_URL;
+			const envBaseURL = getBackendUrl();
 
 			if (envBaseURL) {
 				await use(null as unknown as N8NStack);
@@ -132,12 +136,32 @@ export const test = base.extend<
 		{ scope: 'worker' },
 	],
 
+	// Backend URL - used for API calls
+	// When N8N_BASE_URL is set, use it; otherwise fall back to n8nUrl
+	backendUrl: [
+		async ({ n8nContainer }, use) => {
+			const envBackendURL = getBackendUrl() ?? n8nContainer?.baseUrl;
+			await use(envBackendURL);
+		},
+		{ scope: 'worker' },
+	],
+
+	// Frontend URL - used for browser navigation
+	// When N8N_EDITOR_URL is set (dev mode), use it; otherwise fall back to n8nUrl
+	frontendUrl: [
+		async ({ n8nContainer }, use) => {
+			const envFrontendURL = getFrontendUrl() ?? n8nContainer?.baseUrl;
+			await use(envFrontendURL);
+		},
+		{ scope: 'worker' },
+	],
+
 	// Reset the database for the new container
 	dbSetup: [
-		async ({ n8nUrl, n8nContainer }, use) => {
+		async ({ backendUrl, n8nContainer }, use) => {
 			if (n8nContainer) {
 				console.log('Resetting database for new container');
-				const apiContext = await request.newContext({ baseURL: n8nUrl });
+				const apiContext = await request.newContext({ baseURL: backendUrl });
 				const api = new ApiHelpers(apiContext);
 				await api.resetDatabase();
 				await apiContext.dispose();
@@ -150,7 +174,7 @@ export const test = base.extend<
 	// Create container test helpers for the n8n container.
 	chaos: [
 		async ({ n8nContainer }, use) => {
-			if (process.env.N8N_BASE_URL) {
+			if (getBackendUrl()) {
 				throw new TestError(
 					'Chaos testing is not supported when using N8N_BASE_URL environment variable. Remove N8N_BASE_URL to use containerized testing.',
 				);
@@ -161,26 +185,108 @@ export const test = base.extend<
 		{ scope: 'worker' },
 	],
 
-	baseURL: async ({ n8nUrl, dbSetup }, use) => {
+	baseURL: async ({ frontendUrl, dbSetup }, use) => {
 		void dbSetup; // Ensure dbSetup runs first
-		await use(n8nUrl);
+		await use(frontendUrl);
 	},
 
-	n8n: async ({ context }, use, testInfo) => {
+	n8n: async ({ context, backendUrl, frontendUrl }, use, testInfo) => {
 		await setupDefaultInterceptors(context);
 		const page = await context.newPage();
-		const n8nInstance = new n8nPage(page);
-		await n8nInstance.api.setupFromTags(testInfo.tags);
-		// Enable project features for the tests, this is used in several tests, but is never disabled in tests, so we can have it on by default
-		await n8nInstance.start.withProjectFeatures();
-		await use(n8nInstance);
+
+		// Only create a separate API context when backend and frontend URLs differ
+		const useSeparateApiContext = backendUrl !== frontendUrl;
+
+		if (useSeparateApiContext) {
+			// Create a separate API context with backend URL for API calls
+			const apiContext = await request.newContext({ baseURL: backendUrl });
+			const api = new ApiHelpers(apiContext);
+
+			const n8nInstance = new n8nPage(page, api);
+			await n8nInstance.api.setupFromTags(testInfo.tags);
+
+			// Authentication strategy:
+			// - No @auth: tag → Sign in as owner (default)
+			// - @auth:none → Stay unauthenticated (for testing sign in flows)
+			// - @auth:member, @auth:admin etc → Handled by setupFromTags above
+			const hasAuthTag = testInfo.tags.some((tag) => tag.startsWith('@auth:'));
+
+			// Check if already authenticated from setupFromTags
+			let apiCookies = await apiContext.storageState();
+			let authCookie = apiCookies.cookies.find((cookie) => cookie.name === N8N_AUTH_COOKIE);
+
+			// Default to owner authentication when no auth tag is specified
+			if (!hasAuthTag && !authCookie) {
+				await api.signin('owner');
+				apiCookies = await apiContext.storageState();
+				authCookie = apiCookies.cookies.find((cookie) => cookie.name === N8N_AUTH_COOKIE);
+			}
+
+			// Transfer authentication cookies from API context (backend) to browser context (frontend)
+			if (authCookie) {
+				const backendUrlParsed = new URL(backendUrl);
+				const frontendUrlParsed = new URL(frontendUrl);
+
+				if (backendUrlParsed.hostname === frontendUrlParsed.hostname) {
+					// Same host (e.g. localhost different ports) → use domain-based cookie
+					await context.addCookies([
+						{
+							...authCookie,
+							domain: frontendUrlParsed.hostname,
+							path: '/',
+							sameSite: 'Lax',
+						},
+					]);
+				} else {
+					// Different hosts → use URL-based cookie setting
+					await context.addCookies([
+						{
+							name: authCookie.name,
+							value: authCookie.value,
+							url: frontendUrl,
+							path: '/',
+							httpOnly: authCookie.httpOnly,
+							secure: authCookie.secure,
+							sameSite: 'Lax',
+						},
+					]);
+				}
+			}
+			// Enable project features for the tests, this is used in several tests, but is never disabled in tests, so we can have it on by default
+			await n8nInstance.start.withProjectFeatures();
+			await use(n8nInstance);
+			await apiContext.dispose();
+		} else {
+			const n8nInstance = new n8nPage(page);
+			await n8nInstance.api.setupFromTags(testInfo.tags);
+
+			// Enable project features for the tests, this is used in several tests, but is never disabled in tests, so we can have it on by default
+			await n8nInstance.start.withProjectFeatures();
+			await use(n8nInstance);
+		}
 	},
 
 	// This is a completely isolated API context for tests that don't need the browser
-	api: async ({ baseURL }, use, testInfo) => {
-		const context = await request.newContext({ baseURL });
+	api: async ({ backendUrl }, use, testInfo) => {
+		const context = await request.newContext({ baseURL: backendUrl });
 		const api = new ApiHelpers(context);
 		await api.setupFromTags(testInfo.tags);
+
+		// Authentication strategy:
+		// - No @auth: tag → Sign in as owner (default)
+		// - @auth:none → Stay unauthenticated (for testing sign in flows)
+		// - @auth:member, @auth:admin etc → Handled by setupFromTags above
+		const hasAuthTag = testInfo.tags.some((tag) => tag.startsWith('@auth:'));
+
+		// Check if already authenticated from setupFromTags
+		const apiCookies = await context.storageState();
+		const authCookie = apiCookies.cookies.find((cookie) => cookie.name === N8N_AUTH_COOKIE);
+
+		// Default to owner authentication when no auth tag is specified
+		if (!hasAuthTag && !authCookie) {
+			await api.signin('owner');
+		}
+
 		await use(api);
 		await context.dispose();
 	},
diff --git a/packages/testing/playwright/global-setup.ts b/packages/testing/playwright/global-setup.ts
index b97f3cee699..470087038d5 100644
--- a/packages/testing/playwright/global-setup.ts
+++ b/packages/testing/playwright/global-setup.ts
@@ -1,12 +1,13 @@
 import { request } from '@playwright/test';
 
 import { ApiHelpers } from './services/api-helper';
+import { getBackendUrl } from './utils/url-helper';
 
 async function globalSetup() {
 	console.log('🚀 Starting global setup...');
 
-	// Check if N8N_BASE_URL is set
-	const n8nBaseUrl = process.env.N8N_BASE_URL;
+	// Check if backend URL is set (N8N_BACKEND_URL or N8N_BASE_URL)
+	const n8nBaseUrl = getBackendUrl();
 	if (!n8nBaseUrl) {
 		console.log('⚠️  N8N_BASE_URL environment variable is not set, skipping database reset');
 		return;
diff --git a/packages/testing/playwright/package.json b/packages/testing/playwright/package.json
index 3bd5d1d6209..8b32bc83443 100644
--- a/packages/testing/playwright/package.json
+++ b/packages/testing/playwright/package.json
@@ -2,6 +2,7 @@
   "name": "n8n-playwright",
   "private": true,
   "scripts": {
+    "dev": "N8N_BASE_URL=http://localhost:5678 N8N_EDITOR_URL=http://localhost:8080 RESET_E2E_DB=true playwright test --project=ui --project=ui:isolated",
     "test:all": "playwright test",
     "test:local": "N8N_BASE_URL=http://localhost:5680 RESET_E2E_DB=true playwright test --project=ui --project=ui:isolated",
     "test:local:ui-only": "N8N_BASE_URL=http://localhost:5680 RESET_E2E_DB=true playwright test --project=ui",
diff --git a/packages/testing/playwright/pages/n8nPage.ts b/packages/testing/playwright/pages/n8nPage.ts
index b04fbc1d715..ba1c3dea510 100644
--- a/packages/testing/playwright/pages/n8nPage.ts
+++ b/packages/testing/playwright/pages/n8nPage.ts
@@ -120,9 +120,9 @@ export class n8nPage {
 	readonly breadcrumbs: Breadcrumbs;
 	readonly clipboard: ClipboardHelper;
 
-	constructor(page: Page) {
+	constructor(page: Page, api?: ApiHelpers) {
 		this.page = page;
-		this.api = new ApiHelpers(page.context().request);
+		this.api = api ?? new ApiHelpers(page.context().request);
 
 		// Pages
 		this.aiAssistant = new AIAssistantPage(page);
diff --git a/packages/testing/playwright/playwright-projects.ts b/packages/testing/playwright/playwright-projects.ts
index 7bb59db240e..9f21e64250d 100644
--- a/packages/testing/playwright/playwright-projects.ts
+++ b/packages/testing/playwright/playwright-projects.ts
@@ -1,6 +1,8 @@
 import type { Project } from '@playwright/test';
 import type { N8NConfig } from 'n8n-containers/n8n-test-container-creation';
 
+import { getBackendUrl, getFrontendUrl } from './utils/url-helper';
+
 // Tags that require test containers environment
 // These tests won't be run against local
 const CONTAINER_ONLY_TAGS = [
@@ -31,7 +33,7 @@ const CONTAINER_CONFIGS: Array<{ name: string; config: N8NConfig }> = [
 ];
 
 export function getProjects(): Project[] {
-	const isLocal = !!process.env.N8N_BASE_URL;
+	const isLocal = !!getBackendUrl();
 	const projects: Project[] = [];
 
 	if (isLocal) {
@@ -43,14 +45,14 @@ export function getProjects(): Project[] {
 					[CONTAINER_ONLY.source, SERIAL_EXECUTION.source, ISOLATED_ONLY.source].join('|'),
 				),
 				fullyParallel: true,
-				use: { baseURL: process.env.N8N_BASE_URL },
+				use: { baseURL: getFrontendUrl() },
 			},
 			{
 				name: 'ui:isolated',
 				testDir: './tests/e2e',
 				grep: new RegExp([SERIAL_EXECUTION.source, ISOLATED_ONLY.source].join('|')),
 				workers: 1,
-				use: { baseURL: process.env.N8N_BASE_URL },
+				use: { baseURL: getFrontendUrl() },
 			},
 		);
 	} else {
diff --git a/packages/testing/playwright/playwright.config.ts b/packages/testing/playwright/playwright.config.ts
index 88c2a2fa57d..2682d1b797d 100644
--- a/packages/testing/playwright/playwright.config.ts
+++ b/packages/testing/playwright/playwright.config.ts
@@ -7,9 +7,10 @@ import path from 'path';
 
 import currentsConfig from './currents.config';
 import { getProjects } from './playwright-projects';
-import { getPortFromUrl } from './utils/url-helper';
+import { getBackendUrl, getFrontendUrl, getPortFromUrl } from './utils/url-helper';
 
 const IS_CI = !!process.env.CI;
+const IS_DEV = !!process.env.N8N_EDITOR_URL;
 
 const MACBOOK_WINDOW_SIZE = { width: 1536, height: 960 };
 
@@ -34,7 +35,14 @@ const getTestEnv = () => {
 const CPU_COUNT = os.cpus().length;
 const LOCAL_WORKERS = Math.min(6, Math.floor(CPU_COUNT / 2));
 const CI_WORKERS = CPU_COUNT;
-const WORKERS = IS_CI ? CI_WORKERS : LOCAL_WORKERS;
+const WORKERS = IS_DEV ? 1 : IS_CI ? CI_WORKERS : LOCAL_WORKERS;
+
+const BACKEND_URL = getBackendUrl();
+const FRONTEND_URL = getFrontendUrl();
+const START_COMMAND = IS_DEV ? 'pnpm dev:fe:e2e' : 'pnpm start';
+const WEB_SERVER_URL = FRONTEND_URL ?? BACKEND_URL;
+
+const EXPECT_TIMEOUT = IS_DEV ? 20000 : 10000;
 
 export default defineConfig<CurrentsFixtures, CurrentsWorkerFixtures>({
 	globalSetup: './global-setup.ts',
@@ -43,21 +51,21 @@ export default defineConfig<CurrentsFixtures, CurrentsWorkerFixtures>({
 	workers: WORKERS,
 	timeout: 60000,
 	expect: {
-		timeout: 10000,
+		timeout: EXPECT_TIMEOUT,
 	},
 	projects: getProjects(),
 
 	// We use this if an n8n url is passed in. If the server is already running, we reuse it.
-	webServer: process.env.N8N_BASE_URL
+	webServer: BACKEND_URL
 		? {
-				command: 'cd .. && pnpm start',
-				url: `${process.env.N8N_BASE_URL}/favicon.ico`,
-				timeout: 20000,
+				command: `cd .. && ${START_COMMAND}`,
+				url: `${WEB_SERVER_URL}/favicon.ico`,
+				timeout: 30000,
 				reuseExistingServer: true,
 				env: {
 					DB_SQLITE_POOL_SIZE: '40',
 					E2E_TESTS: 'true',
-					N8N_PORT: getPortFromUrl(process.env.N8N_BASE_URL),
+					N8N_PORT: getPortFromUrl(BACKEND_URL),
 					N8N_USER_FOLDER: USER_FOLDER,
 					N8N_LOG_LEVEL: 'debug',
 					N8N_METRICS: 'true',
diff --git a/packages/testing/playwright/utils/url-helper.ts b/packages/testing/playwright/utils/url-helper.ts
index 501f2ac5594..010572cefec 100644
--- a/packages/testing/playwright/utils/url-helper.ts
+++ b/packages/testing/playwright/utils/url-helper.ts
@@ -5,3 +5,20 @@ export function getPortFromUrl(url: string): string {
 	const parsedUrl = new URL(url);
 	return parsedUrl.port || (parsedUrl.protocol === 'https:' ? '443' : '80');
 }
+
+/**
+ * Get the backend URL from environment variables
+ * Returns N8N_BASE_URL
+ */
+export function getBackendUrl(): string | undefined {
+	return process.env.N8N_BASE_URL;
+}
+
+/**
+ * Get the frontend URL from environment variables
+ * When N8N_EDITOR_URL is set (dev mode), use it for the frontend
+ * Otherwise, use the same URL as the backend
+ */
+export function getFrontendUrl(): string | undefined {
+	return process.env.N8N_EDITOR_URL ?? process.env.N8N_BASE_URL;
+}

From 0a56a56dc5adfced06623eecdded7c49ba40300f Mon Sep 17 00:00:00 2001
From: Stephen Wright <sjw948@gmail.com>
Date: Tue, 9 Dec 2025 14:42:11 +0000
Subject: [PATCH 158/167] feat: Support oauth1 authorization for dynamic
 credentials (#22972)

---
 .../oauth1-credential.controller.test.ts      |  19 +--
 .../oauth2-credential.controller.test.ts      |  15 +-
 .../oauth/oauth1-credential.controller.ts     |  81 +----------
 .../oauth/oauth2-credential.controller.ts     |   4 +-
 .../dynamic-credentials.controller.test.ts    |  74 +++-------
 .../dynamic-credentials.controller.ts         |  13 +-
 .../src/oauth/__tests__/oauth.service.test.ts | 135 +++++++++++++++---
 packages/cli/src/oauth/oauth.service.ts       | 120 +++++++++++++---
 packages/cli/src/oauth/types.ts               |  37 +++++
 9 files changed, 297 insertions(+), 201 deletions(-)
 create mode 100644 packages/cli/src/oauth/types.ts

diff --git a/packages/cli/src/controllers/oauth/__tests__/oauth1-credential.controller.test.ts b/packages/cli/src/controllers/oauth/__tests__/oauth1-credential.controller.test.ts
index 2f48de84687..ac18c6d5fe3 100644
--- a/packages/cli/src/controllers/oauth/__tests__/oauth1-credential.controller.test.ts
+++ b/packages/cli/src/controllers/oauth/__tests__/oauth1-credential.controller.test.ts
@@ -32,24 +32,19 @@ describe('OAuth1CredentialController', () => {
 		it('should return a valid auth URI', async () => {
 			const mockResolvedCredential = mock<CredentialsEntity>({ id: '1' });
 			oauthService.getCredential.mockResolvedValueOnce(mockResolvedCredential);
-			oauthService.createCsrfState.mockReturnValueOnce(['csrf-secret', 'state']);
-			oauthService.getOAuthCredentials.mockResolvedValueOnce({
-				requestTokenUrl: 'https://example.domain/oauth/request_token',
-				authUrl: 'https://example.domain/oauth/authorize',
-				accessTokenUrl: 'https://example.domain/oauth/access_token',
-				signatureMethod: 'HMAC-SHA1' as const,
-			});
-			jest.mocked(axios).request.mockResolvedValueOnce({ data: { oauth_token: 'random-token' } });
+			oauthService.generateAOauth1AuthUri.mockResolvedValueOnce(
+				'https://example.domain/oauth/authorize?oauth_token=random-token',
+			);
 			const req = mock<OAuthRequest.OAuth1Credential.Auth>({
 				user: mock<User>({ id: '123' }),
 				query: { id: '1' },
 			});
 			const authUri = await controller.getAuthUri(req);
 			expect(authUri).toEqual('https://example.domain/oauth/authorize?oauth_token=random-token');
-			expect(oauthService.encryptAndSaveData).toHaveBeenCalledWith(
-				mockResolvedCredential,
-				expect.objectContaining({ csrfSecret: 'csrf-secret' }),
-			);
+			expect(oauthService.generateAOauth1AuthUri).toHaveBeenCalledWith(mockResolvedCredential, {
+				cid: '1',
+				userId: '123',
+			});
 		});
 	});
 
diff --git a/packages/cli/src/controllers/oauth/__tests__/oauth2-credential.controller.test.ts b/packages/cli/src/controllers/oauth/__tests__/oauth2-credential.controller.test.ts
index a0a2ee2f426..f58c2f79ae7 100644
--- a/packages/cli/src/controllers/oauth/__tests__/oauth2-credential.controller.test.ts
+++ b/packages/cli/src/controllers/oauth/__tests__/oauth2-credential.controller.test.ts
@@ -66,17 +66,10 @@ describe('OAuth2CredentialController', () => {
 			const authUri = await controller.getAuthUri(req);
 
 			expect(authUri).toContain('https://example.domain/oauth2/auth');
-			expect(oauthService.generateAOauth2AuthUri).toHaveBeenCalledWith(
-				mockResolvedCredential,
-				expect.objectContaining({
-					clientId: 'client_id',
-					authUrl: 'https://example.domain/oauth2/auth',
-				}),
-				{
-					cid: '1',
-					userId: '123',
-				},
-			);
+			expect(oauthService.generateAOauth2AuthUri).toHaveBeenCalledWith(mockResolvedCredential, {
+				cid: '1',
+				userId: '123',
+			});
 		});
 	});
 
diff --git a/packages/cli/src/controllers/oauth/oauth1-credential.controller.ts b/packages/cli/src/controllers/oauth/oauth1-credential.controller.ts
index dca3b4b9594..65a5651367b 100644
--- a/packages/cli/src/controllers/oauth/oauth1-credential.controller.ts
+++ b/packages/cli/src/controllers/oauth/oauth1-credential.controller.ts
@@ -1,38 +1,21 @@
 import { Get, RestController } from '@n8n/decorators';
-import type { AxiosRequestConfig } from 'axios';
 import axios from 'axios';
-import { createHmac } from 'crypto';
 import { Response } from 'express';
 import { ensureError, jsonStringify } from 'n8n-workflow';
-import type { RequestOptions } from 'oauth-1.0a';
-import clientOAuth1 from 'oauth-1.0a';
 
 import { OAuthRequest } from '@/requests';
 
-import { OauthService, OauthVersion, skipAuthOnOAuthCallback } from '@/oauth/oauth.service';
+import {
+	OauthService,
+	skipAuthOnOAuthCallback,
+	type OAuth1CredentialData,
+} from '@/oauth/oauth.service';
 import { Logger } from '@n8n/backend-common';
-import { ExternalHooks } from '@/external-hooks';
-
-interface OAuth1CredentialData {
-	signatureMethod: 'HMAC-SHA256' | 'HMAC-SHA512' | 'HMAC-SHA1';
-	consumerKey: string;
-	consumerSecret: string;
-	authUrl: string;
-	accessTokenUrl: string;
-	requestTokenUrl: string;
-}
-
-const algorithmMap = {
-	'HMAC-SHA256': 'sha256',
-	'HMAC-SHA512': 'sha512',
-	'HMAC-SHA1': 'sha1',
-} as const;
 
 @RestController('/oauth1-credential')
 export class OAuth1CredentialController {
 	constructor(
 		private readonly oauthService: OauthService,
-		private readonly externalHooks: ExternalHooks,
 		private readonly logger: Logger,
 	) {}
 
@@ -40,67 +23,18 @@ export class OAuth1CredentialController {
 	@Get('/auth')
 	async getAuthUri(req: OAuthRequest.OAuth1Credential.Auth): Promise<string> {
 		const credential = await this.oauthService.getCredential(req);
-		const oauthCredentials =
-			await this.oauthService.getOAuthCredentials<OAuth1CredentialData>(credential);
 
-		const [csrfSecret, state] = this.oauthService.createCsrfState({
+		const uri = await this.oauthService.generateAOauth1AuthUri(credential, {
 			cid: credential.id,
 			userId: skipAuthOnOAuthCallback ? undefined : req.user.id,
 		});
 
-		const signatureMethod = oauthCredentials.signatureMethod;
-
-		const oAuthOptions: clientOAuth1.Options = {
-			consumer: {
-				key: oauthCredentials.consumerKey,
-				secret: oauthCredentials.consumerSecret,
-			},
-			signature_method: signatureMethod,
-
-			hash_function(base, key) {
-				const algorithm = algorithmMap[signatureMethod] ?? 'sha1';
-				return createHmac(algorithm, key).update(base).digest('base64');
-			},
-		};
-
-		const oauthRequestData = {
-			oauth_callback: `${this.oauthService.getBaseUrl(OauthVersion.V1)}/callback?state=${state}`,
-		};
-
-		await this.externalHooks.run('oauth1.authenticate', [oAuthOptions, oauthRequestData]);
-
-		const oauth = new clientOAuth1(oAuthOptions);
-
-		const options: RequestOptions = {
-			method: 'POST',
-			url: oauthCredentials.requestTokenUrl,
-			data: oauthRequestData,
-		};
-
-		const data = oauth.toHeader(oauth.authorize(options));
-
-		// @ts-ignore
-		options.headers = data;
-
-		// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-		const { data: response } = await axios.request(options as Partial<AxiosRequestConfig>);
-
-		// Response comes as x-www-form-urlencoded string so convert it to JSON
-
-		const paramsParser = new URLSearchParams(response as string);
-
-		const responseJson = Object.fromEntries(paramsParser.entries());
-
-		const returnUri = `${oauthCredentials.authUrl}?oauth_token=${responseJson.oauth_token}`;
-
-		await this.oauthService.encryptAndSaveData(credential, { csrfSecret });
-
 		this.logger.debug('OAuth1 authorization successful for new credential', {
 			userId: req.user.id,
 			credentialId: credential.id,
 		});
 
-		return returnUri;
+		return uri;
 	}
 
 	/** Verify and store app code. Generate access tokens and store for respective credential */
@@ -140,7 +74,6 @@ export class OAuth1CredentialController {
 			});
 			return res.render('oauth-callback');
 		} catch (e) {
-			console.log('error', e);
 			const error = ensureError(e);
 			return this.oauthService.renderCallbackError(
 				res,
diff --git a/packages/cli/src/controllers/oauth/oauth2-credential.controller.ts b/packages/cli/src/controllers/oauth/oauth2-credential.controller.ts
index ac1b9268711..df0d7bee919 100644
--- a/packages/cli/src/controllers/oauth/oauth2-credential.controller.ts
+++ b/packages/cli/src/controllers/oauth/oauth2-credential.controller.ts
@@ -24,10 +24,8 @@ export class OAuth2CredentialController {
 	@Get('/auth')
 	async getAuthUri(req: OAuthRequest.OAuth2Credential.Auth): Promise<string> {
 		const credential = await this.oauthService.getCredential(req);
-		const oauthCredentials: OAuth2CredentialData =
-			await this.oauthService.getOAuthCredentials<OAuth2CredentialData>(credential);
 
-		const uri = await this.oauthService.generateAOauth2AuthUri(credential, oauthCredentials, {
+		const uri = await this.oauthService.generateAOauth2AuthUri(credential, {
 			cid: credential.id,
 			userId: req.user.id,
 		});
diff --git a/packages/cli/src/modules/dynamic-credentials.ee/__tests__/dynamic-credentials.controller.test.ts b/packages/cli/src/modules/dynamic-credentials.ee/__tests__/dynamic-credentials.controller.test.ts
index 9b35e2f3359..e0143c259fa 100644
--- a/packages/cli/src/modules/dynamic-credentials.ee/__tests__/dynamic-credentials.controller.test.ts
+++ b/packages/cli/src/modules/dynamic-credentials.ee/__tests__/dynamic-credentials.controller.test.ts
@@ -71,15 +71,6 @@ describe('DynamicCredentialsController', () => {
 			const res = mock<Response>();
 
 			enterpriseCredentialsService.getOne.mockResolvedValue(mockCredential);
-			oauthService.getOAuthCredentials.mockResolvedValueOnce({
-				clientId: 'client_id',
-				clientSecret: 'client_secret',
-				authUrl: 'https://example.domain/oauth2/auth',
-				accessTokenUrl: 'https://example.domain/oauth2/token',
-				scope: 'openid',
-				grantType: 'authorizationCode',
-				authentication: 'header',
-			});
 			oauthService.generateAOauth2AuthUri.mockResolvedValueOnce(
 				'https://example.domain/oauth2/auth?client_id=client_id&redirect_uri=http://localhost:5678/rest/oauth2-credential/callback&response_type=code&state=state&scope=openid',
 			);
@@ -88,45 +79,36 @@ describe('DynamicCredentialsController', () => {
 
 			expect(authUri).toContain('https://example.domain/oauth2/auth');
 			expect(enterpriseCredentialsService.getOne).toHaveBeenCalledWith('1');
-			expect(oauthService.getOAuthCredentials).toHaveBeenCalledWith(mockCredential);
-			expect(oauthService.generateAOauth2AuthUri).toHaveBeenCalledWith(
-				mockCredential,
-				expect.objectContaining({
-					clientId: 'client_id',
-					authUrl: 'https://example.domain/oauth2/auth',
-				}),
-				{
-					cid: '1',
-					authorizationHeader: 'Bearer token123',
-				},
-			);
+			expect(oauthService.generateAOauth2AuthUri).toHaveBeenCalledWith(mockCredential, {
+				cid: '1',
+				authorizationHeader: 'Bearer token123',
+			});
 		});
 
-		it('should throw BadRequestError for OAuth1 credential (not yet supported)', async () => {
+		it('should return auth URI for OAuth1 credential', async () => {
 			const mockCredential = mock<CredentialsEntity>({
 				id: '1',
 				type: 'twitterOAuth1Api',
 			});
 			const req = mock<Request>({
 				params: { id: '1' },
-				headers: {},
+				headers: { authorization: 'Bearer token123' },
 			});
 			const res = mock<Response>();
 
 			enterpriseCredentialsService.getOne.mockResolvedValue(mockCredential);
-			oauthService.getOAuthCredentials.mockResolvedValueOnce({
-				clientId: 'client_id',
-				clientSecret: 'client_secret',
-				authUrl: 'https://example.domain/oauth1/auth',
-				accessTokenUrl: 'https://example.domain/oauth1/token',
-			});
-
-			await expect(controller.authorizeCredential(req, res)).rejects.toThrow(
-				'Credential type not supported',
+			oauthService.generateAOauth1AuthUri.mockResolvedValueOnce(
+				'https://example.domain/oauth/authorize?oauth_token=random-token',
 			);
+
+			const authUri = await controller.authorizeCredential(req, res);
+
+			expect(authUri).toContain('https://example.domain/oauth/authorize?oauth_token=random-token');
 			expect(enterpriseCredentialsService.getOne).toHaveBeenCalledWith('1');
-			expect(oauthService.getOAuthCredentials).toHaveBeenCalledWith(mockCredential);
-			expect(oauthService.generateAOauth2AuthUri).not.toHaveBeenCalled();
+			expect(oauthService.generateAOauth1AuthUri).toHaveBeenCalledWith(mockCredential, {
+				cid: '1',
+				authorizationHeader: 'Bearer token123',
+			});
 		});
 
 		it('should handle request without authorization header', async () => {
@@ -141,15 +123,6 @@ describe('DynamicCredentialsController', () => {
 			const res = mock<Response>();
 
 			enterpriseCredentialsService.getOne.mockResolvedValue(mockCredential);
-			oauthService.getOAuthCredentials.mockResolvedValueOnce({
-				clientId: 'client_id',
-				clientSecret: 'client_secret',
-				authUrl: 'https://example.domain/oauth2/auth',
-				accessTokenUrl: 'https://example.domain/oauth2/token',
-				scope: 'openid',
-				grantType: 'authorizationCode',
-				authentication: 'header',
-			});
 			oauthService.generateAOauth2AuthUri.mockResolvedValueOnce(
 				'https://example.domain/oauth2/auth?client_id=client_id&redirect_uri=http://localhost:5678/rest/oauth2-credential/callback&response_type=code&state=state&scope=openid',
 			);
@@ -157,17 +130,10 @@ describe('DynamicCredentialsController', () => {
 			const authUri = await controller.authorizeCredential(req, res);
 
 			expect(authUri).toContain('https://example.domain/oauth2/auth');
-			expect(oauthService.generateAOauth2AuthUri).toHaveBeenCalledWith(
-				mockCredential,
-				expect.objectContaining({
-					clientId: 'client_id',
-					authUrl: 'https://example.domain/oauth2/auth',
-				}),
-				{
-					cid: '1',
-					authorizationHeader: undefined,
-				},
-			);
+			expect(oauthService.generateAOauth2AuthUri).toHaveBeenCalledWith(mockCredential, {
+				cid: '1',
+				authorizationHeader: undefined,
+			});
 		});
 	});
 });
diff --git a/packages/cli/src/modules/dynamic-credentials.ee/dynamic-credentials.controller.ts b/packages/cli/src/modules/dynamic-credentials.ee/dynamic-credentials.controller.ts
index 12fa4477c80..fc0316f5f76 100644
--- a/packages/cli/src/modules/dynamic-credentials.ee/dynamic-credentials.controller.ts
+++ b/packages/cli/src/modules/dynamic-credentials.ee/dynamic-credentials.controller.ts
@@ -5,7 +5,6 @@ import { EnterpriseCredentialsService } from '@/credentials/credentials.service.
 import { NotFoundError } from '@/errors/response-errors/not-found.error';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 import { OauthService } from '@/oauth/oauth.service';
-import { OAuth2CredentialData } from '@n8n/client-oauth2';
 
 @RestController('/credentials')
 export class DynamicCredentialsController {
@@ -26,11 +25,15 @@ export class DynamicCredentialsController {
 			throw new BadRequestError('Credential type not supported');
 		}
 
-		const oauthCredentials: OAuth2CredentialData =
-			await this.oauthService.getOAuthCredentials<OAuth2CredentialData>(credential);
-
 		if (credential.type.includes('OAuth2')) {
-			return await this.oauthService.generateAOauth2AuthUri(credential, oauthCredentials, {
+			return await this.oauthService.generateAOauth2AuthUri(credential, {
+				cid: credential.id,
+				authorizationHeader: req.headers.authorization,
+			});
+		}
+
+		if (credential.type.includes('OAuth1')) {
+			return await this.oauthService.generateAOauth1AuthUri(credential, {
 				cid: credential.id,
 				authorizationHeader: req.headers.authorization,
 			});
diff --git a/packages/cli/src/oauth/__tests__/oauth.service.test.ts b/packages/cli/src/oauth/__tests__/oauth.service.test.ts
index 4712d770956..b9a18dd15de 100644
--- a/packages/cli/src/oauth/__tests__/oauth.service.test.ts
+++ b/packages/cli/src/oauth/__tests__/oauth.service.test.ts
@@ -10,7 +10,12 @@ import type { Response } from 'express';
 import type { IWorkflowExecuteAdditionalData } from 'n8n-workflow';
 import { UnexpectedError } from 'n8n-workflow';
 
-import { OauthService, OauthVersion, shouldSkipAuthOnOAuthCallback } from '@/oauth/oauth.service';
+import {
+	OauthService,
+	OauthVersion,
+	shouldSkipAuthOnOAuthCallback,
+	type OAuth1CredentialData,
+} from '@/oauth/oauth.service';
 import { CredentialsFinderService } from '@/credentials/credentials-finder.service';
 import { CredentialsHelper } from '@/credentials-helper';
 import { AuthError } from '@/errors/response-errors/auth.error';
@@ -720,7 +725,7 @@ describe('OauthService', () => {
 					}) as any,
 			);
 
-			const credential = mock<CredentialsEntity>({ id: '1' });
+			const credential = mock<CredentialsEntity>({ id: '1', type: 'googleOAuth2Api' });
 			const oauthCredentials: OAuth2CredentialData = {
 				clientId: 'client_id',
 				clientSecret: 'client_secret',
@@ -731,9 +736,10 @@ describe('OauthService', () => {
 				authentication: 'header',
 			};
 
+			jest.spyOn(service, 'getOAuthCredentials').mockResolvedValue(oauthCredentials);
 			jest.spyOn(service, 'encryptAndSaveData').mockResolvedValue(undefined);
 
-			const authUri = await service.generateAOauth2AuthUri(credential, oauthCredentials, {
+			const authUri = await service.generateAOauth2AuthUri(credential, {
 				cid: credential.id,
 				userId: 'user-id',
 			});
@@ -769,7 +775,7 @@ describe('OauthService', () => {
 					}) as any,
 			);
 
-			const credential = mock<CredentialsEntity>({ id: '1' });
+			const credential = mock<CredentialsEntity>({ id: '1', type: 'googleOAuth2Api' });
 			const oauthCredentials: OAuth2CredentialData = {
 				clientId: 'client_id',
 				clientSecret: 'client_secret',
@@ -780,9 +786,10 @@ describe('OauthService', () => {
 				authentication: 'header',
 			};
 
+			jest.spyOn(service, 'getOAuthCredentials').mockResolvedValue(oauthCredentials);
 			jest.spyOn(service, 'encryptAndSaveData').mockResolvedValue(undefined);
 
-			const authUri = await service.generateAOauth2AuthUri(credential, oauthCredentials, {
+			const authUri = await service.generateAOauth2AuthUri(credential, {
 				cid: credential.id,
 				userId: 'user-id',
 			});
@@ -811,7 +818,7 @@ describe('OauthService', () => {
 					}) as any,
 			);
 
-			const credential = mock<CredentialsEntity>({ id: '1' });
+			const credential = mock<CredentialsEntity>({ id: '1', type: 'googleOAuth2Api' });
 			const oauthCredentials: OAuth2CredentialData = {
 				clientId: 'client_id',
 				clientSecret: 'client_secret',
@@ -823,9 +830,10 @@ describe('OauthService', () => {
 				authQueryParameters: 'custom_param=value',
 			};
 
+			jest.spyOn(service, 'getOAuthCredentials').mockResolvedValue(oauthCredentials);
 			jest.spyOn(service, 'encryptAndSaveData').mockResolvedValue(undefined);
 
-			const authUri = await service.generateAOauth2AuthUri(credential, oauthCredentials, {
+			const authUri = await service.generateAOauth2AuthUri(credential, {
 				cid: credential.id,
 				userId: 'user-id',
 			});
@@ -850,12 +858,13 @@ describe('OauthService', () => {
 					}) as any,
 			);
 
-			const credential = mock<CredentialsEntity>({ id: '1' });
+			const credential = mock<CredentialsEntity>({ id: '1', type: 'googleOAuth2Api' });
 			const oauthCredentials = {
 				serverUrl: 'https://example.domain',
 				useDynamicClientRegistration: true,
 			} as OAuth2CredentialData;
 
+			jest.spyOn(service, 'getOAuthCredentials').mockResolvedValue(oauthCredentials);
 			jest.mocked(axios.get).mockResolvedValue({
 				data: {
 					authorization_endpoint: 'https://example.domain/oauth2/auth',
@@ -877,7 +886,7 @@ describe('OauthService', () => {
 
 			jest.spyOn(service, 'encryptAndSaveData').mockResolvedValue(undefined);
 
-			const authUri = await service.generateAOauth2AuthUri(credential, oauthCredentials, {
+			const authUri = await service.generateAOauth2AuthUri(credential, {
 				cid: credential.id,
 				userId: 'user-id',
 			});
@@ -913,24 +922,25 @@ describe('OauthService', () => {
 
 		it('should throw BadRequestError when OAuth2 server metadata is invalid', async () => {
 			const axios = require('axios');
-			const credential = mock<CredentialsEntity>({ id: '1' });
+			const credential = mock<CredentialsEntity>({ id: '1', type: 'googleOAuth2Api' });
 			const oauthCredentials = {
 				serverUrl: 'https://example.domain',
 				useDynamicClientRegistration: true,
 			} as OAuth2CredentialData;
 
+			jest.spyOn(service, 'getOAuthCredentials').mockResolvedValue(oauthCredentials);
 			jest.mocked(axios.get).mockResolvedValue({
 				data: { invalid: 'metadata' },
 			} as any);
 
 			await expect(
-				service.generateAOauth2AuthUri(credential, oauthCredentials, {
+				service.generateAOauth2AuthUri(credential, {
 					cid: credential.id,
 					userId: 'user-id',
 				}),
 			).rejects.toThrow(BadRequestError);
 			await expect(
-				service.generateAOauth2AuthUri(credential, oauthCredentials, {
+				service.generateAOauth2AuthUri(credential, {
 					cid: credential.id,
 					userId: 'user-id',
 				}),
@@ -942,12 +952,13 @@ describe('OauthService', () => {
 			const { ClientOAuth2 } = await import('@n8n/client-oauth2');
 			jest.mocked(ClientOAuth2).mockImplementation(() => ({}) as any);
 
-			const credential = mock<CredentialsEntity>({ id: '1' });
+			const credential = mock<CredentialsEntity>({ id: '1', type: 'googleOAuth2Api' });
 			const oauthCredentials = {
 				serverUrl: 'https://example.domain',
 				useDynamicClientRegistration: true,
 			} as OAuth2CredentialData;
 
+			jest.spyOn(service, 'getOAuthCredentials').mockResolvedValue(oauthCredentials);
 			jest.mocked(axios.get).mockResolvedValue({
 				data: {
 					authorization_endpoint: 'https://example.domain/oauth2/auth',
@@ -964,13 +975,13 @@ describe('OauthService', () => {
 			} as any);
 
 			await expect(
-				service.generateAOauth2AuthUri(credential, oauthCredentials, {
+				service.generateAOauth2AuthUri(credential, {
 					cid: credential.id,
 					userId: 'user-id',
 				}),
 			).rejects.toThrow(BadRequestError);
 			await expect(
-				service.generateAOauth2AuthUri(credential, oauthCredentials, {
+				service.generateAOauth2AuthUri(credential, {
 					cid: credential.id,
 					userId: 'user-id',
 				}),
@@ -993,12 +1004,13 @@ describe('OauthService', () => {
 					}) as any,
 			);
 
-			const credential = mock<CredentialsEntity>({ id: '1' });
+			const credential = mock<CredentialsEntity>({ id: '1', type: 'googleOAuth2Api' });
 			const oauthCredentials = {
 				serverUrl: 'https://example.domain',
 				useDynamicClientRegistration: true,
 			} as OAuth2CredentialData;
 
+			jest.spyOn(service, 'getOAuthCredentials').mockResolvedValue(oauthCredentials);
 			jest.mocked(axios.get).mockResolvedValue({
 				data: {
 					authorization_endpoint: 'https://example.domain/oauth2/auth',
@@ -1019,7 +1031,7 @@ describe('OauthService', () => {
 
 			jest.spyOn(service, 'encryptAndSaveData').mockResolvedValue(undefined);
 
-			const authUri = await service.generateAOauth2AuthUri(credential, oauthCredentials, {
+			const authUri = await service.generateAOauth2AuthUri(credential, {
 				cid: credential.id,
 				userId: 'user-id',
 			});
@@ -1049,7 +1061,7 @@ describe('OauthService', () => {
 					}) as any,
 			);
 
-			const credential = mock<CredentialsEntity>({ id: '1' });
+			const credential = mock<CredentialsEntity>({ id: '1', type: 'googleOAuth2Api' });
 			const oauthCredentials: OAuth2CredentialData = {
 				clientId: 'client_id',
 				clientSecret: 'client_secret',
@@ -1060,10 +1072,11 @@ describe('OauthService', () => {
 				authentication: 'header',
 			};
 
+			jest.spyOn(service, 'getOAuthCredentials').mockResolvedValue(oauthCredentials);
 			jest.spyOn(service, 'encryptAndSaveData').mockResolvedValue(undefined);
 			jest.spyOn(service, 'createCsrfState').mockReturnValue(['csrf-secret', 'encoded-state']);
 
-			await service.generateAOauth2AuthUri(credential, oauthCredentials, {
+			await service.generateAOauth2AuthUri(credential, {
 				cid: credential.id,
 				userId: 'user-id',
 			});
@@ -1076,4 +1089,88 @@ describe('OauthService', () => {
 			);
 		});
 	});
+
+	describe('generateAOauth1AuthUri', () => {
+		it('should generate auth URI for OAuth1 credential', async () => {
+			const axios = require('axios');
+			const credential = mock<CredentialsEntity>({ id: '1', type: 'twitterOAuth1Api' });
+			const oauthCredentials: OAuth1CredentialData = {
+				consumerKey: 'consumer_key',
+				consumerSecret: 'consumer_secret',
+				requestTokenUrl: 'https://example.domain/oauth/request_token',
+				authUrl: 'https://example.domain/oauth/authorize',
+				accessTokenUrl: 'https://example.domain/oauth/access_token',
+				signatureMethod: 'HMAC-SHA1',
+			};
+
+			jest.spyOn(service, 'getOAuthCredentials').mockResolvedValue(oauthCredentials);
+			jest.mocked(axios.request).mockResolvedValue({
+				data: 'oauth_token=random-token&oauth_token_secret=random-secret',
+			});
+			jest.spyOn(service, 'encryptAndSaveData').mockResolvedValue(undefined);
+
+			const authUri = await service.generateAOauth1AuthUri(credential, {
+				cid: credential.id,
+				userId: 'user-id',
+			});
+
+			expect(authUri).toContain('https://example.domain/oauth/authorize?oauth_token=random-token');
+			expect(service.encryptAndSaveData).toHaveBeenCalledWith(
+				credential,
+				expect.objectContaining({ csrfSecret: expect.any(String) }),
+				[],
+			);
+			expect(externalHooks.run).toHaveBeenCalledWith('oauth1.authenticate', expect.any(Array));
+		});
+
+		it('should generate auth URI with different signature methods', async () => {
+			const axios = require('axios');
+			const credential = mock<CredentialsEntity>({ id: '1', type: 'twitterOAuth1Api' });
+			const oauthCredentials: OAuth1CredentialData = {
+				consumerKey: 'consumer_key',
+				consumerSecret: 'consumer_secret',
+				requestTokenUrl: 'https://example.domain/oauth/request_token',
+				authUrl: 'https://example.domain/oauth/authorize',
+				accessTokenUrl: 'https://example.domain/oauth/access_token',
+				signatureMethod: 'HMAC-SHA256',
+			};
+
+			jest.spyOn(service, 'getOAuthCredentials').mockResolvedValue(oauthCredentials);
+			jest.mocked(axios.request).mockResolvedValue({
+				data: 'oauth_token=random-token&oauth_token_secret=random-secret',
+			});
+			jest.spyOn(service, 'encryptAndSaveData').mockResolvedValue(undefined);
+
+			const authUri = await service.generateAOauth1AuthUri(credential, {
+				cid: credential.id,
+				userId: 'user-id',
+			});
+
+			expect(authUri).toContain('https://example.domain/oauth/authorize?oauth_token=random-token');
+			expect(service.encryptAndSaveData).toHaveBeenCalled();
+		});
+
+		it('should handle request token URL errors', async () => {
+			const axios = require('axios');
+			const credential = mock<CredentialsEntity>({ id: '1', type: 'twitterOAuth1Api' });
+			const oauthCredentials: OAuth1CredentialData = {
+				consumerKey: 'consumer_key',
+				consumerSecret: 'consumer_secret',
+				requestTokenUrl: 'https://example.domain/oauth/request_token',
+				authUrl: 'https://example.domain/oauth/authorize',
+				accessTokenUrl: 'https://example.domain/oauth/access_token',
+				signatureMethod: 'HMAC-SHA1',
+			};
+
+			jest.spyOn(service, 'getOAuthCredentials').mockResolvedValue(oauthCredentials);
+			jest.mocked(axios.request).mockRejectedValue(new Error('Request token failed'));
+
+			await expect(
+				service.generateAOauth1AuthUri(credential, {
+					cid: credential.id,
+					userId: 'user-id',
+				}),
+			).rejects.toThrow('Request token failed');
+		});
+	});
 });
diff --git a/packages/cli/src/oauth/oauth.service.ts b/packages/cli/src/oauth/oauth.service.ts
index 91538e50b99..de88b654ab7 100644
--- a/packages/cli/src/oauth/oauth.service.ts
+++ b/packages/cli/src/oauth/oauth.service.ts
@@ -1,6 +1,5 @@
 import { Logger } from '@n8n/backend-common';
 import { GlobalConfig } from '@n8n/config';
-import { Time } from '@n8n/constants';
 import type { AuthenticatedRequest, CredentialsEntity, ICredentialsDb } from '@n8n/db';
 import { CredentialsRepository } from '@n8n/db';
 import { Service } from '@n8n/di';
@@ -38,22 +37,18 @@ import pkceChallenge from 'pkce-challenge';
 import * as qs from 'querystring';
 import split from 'lodash/split';
 import { ExternalHooks } from '@/external-hooks';
-
-type CsrfStateRequired = {
-	/** Random CSRF token, used to verify the signature of the CSRF state */
-	token: string;
-	/** Creation timestamp of the CSRF state. Used for expiration.  */
-	createdAt: number;
-};
-
-type CreateCsrfStateData = {
-	cid: string;
-	[key: string]: unknown;
-};
-
-type CsrfState = CsrfStateRequired & CreateCsrfStateData;
-
-const MAX_CSRF_AGE = 5 * Time.minutes.toMilliseconds;
+import type { AxiosRequestConfig } from 'axios';
+import { createHmac } from 'crypto';
+import type { RequestOptions } from 'oauth-1.0a';
+import clientOAuth1 from 'oauth-1.0a';
+import {
+	algorithmMap,
+	MAX_CSRF_AGE,
+	OauthVersion,
+	type CreateCsrfStateData,
+	type CsrfState,
+	type OAuth1CredentialData,
+} from './types';
 
 export function shouldSkipAuthOnOAuthCallback() {
 	const value = process.env.N8N_SKIP_AUTH_ON_OAUTH_CALLBACK?.toLowerCase() ?? 'false';
@@ -62,10 +57,7 @@ export function shouldSkipAuthOnOAuthCallback() {
 
 export const skipAuthOnOAuthCallback = shouldSkipAuthOnOAuthCallback();
 
-export const enum OauthVersion {
-	V1 = 1,
-	V2 = 2,
-}
+export { OauthVersion, type OAuth1CredentialData, type CreateCsrfStateData, type CsrfState };
 
 @Service()
 export class OauthService {
@@ -84,7 +76,9 @@ export class OauthService {
 		return `${restUrl}/oauth${oauthVersion}-credential`;
 	}
 
-	async getCredential(req: OAuthRequest.OAuth2Credential.Auth): Promise<CredentialsEntity> {
+	async getCredential(
+		req: OAuthRequest.OAuth1Credential.Auth | OAuthRequest.OAuth2Credential.Auth,
+	): Promise<CredentialsEntity> {
 		const { id: credentialId } = req.query;
 
 		if (!credentialId) {
@@ -281,9 +275,11 @@ export class OauthService {
 
 	async generateAOauth2AuthUri(
 		credential: CredentialsEntity,
-		oauthCredentials: OAuth2CredentialData,
 		csrfData: CreateCsrfStateData,
 	): Promise<string> {
+		const oauthCredentials: OAuth2CredentialData =
+			await this.getOAuthCredentials<OAuth2CredentialData>(credential);
+
 		const toUpdate: ICredentialDataDecryptedObject = {};
 
 		if (oauthCredentials.useDynamicClientRegistration && oauthCredentials.serverUrl) {
@@ -397,6 +393,84 @@ export class OauthService {
 		return returnUri.toString();
 	}
 
+	async generateAOauth1AuthUri(
+		credential: CredentialsEntity,
+		csrfData: CreateCsrfStateData,
+	): Promise<string> {
+		const oauthCredentials: OAuth1CredentialData =
+			await this.getOAuthCredentials<OAuth1CredentialData>(credential);
+
+		const [csrfSecret, state] = this.createCsrfState(csrfData);
+
+		const signatureMethod = oauthCredentials.signatureMethod;
+
+		const oAuthOptions: clientOAuth1.Options = {
+			consumer: {
+				key: oauthCredentials.consumerKey,
+				secret: oauthCredentials.consumerSecret,
+			},
+			signature_method: signatureMethod,
+
+			hash_function(base, key) {
+				const algorithm = algorithmMap[signatureMethod] ?? 'sha1';
+				return createHmac(algorithm, key).update(base).digest('base64');
+			},
+		};
+
+		const oauthRequestData = {
+			oauth_callback: `${this.getBaseUrl(OauthVersion.V1)}/callback?state=${state}`,
+		};
+
+		await this.externalHooks.run('oauth1.authenticate', [oAuthOptions, oauthRequestData]);
+
+		const oauth = new clientOAuth1(oAuthOptions);
+
+		const options: RequestOptions = {
+			method: 'POST',
+			url: oauthCredentials.requestTokenUrl,
+			data: oauthRequestData,
+		};
+
+		const data = oauth.toHeader(oauth.authorize(options));
+
+		const axiosConfig: AxiosRequestConfig = {
+			method: options.method,
+			url: options.url,
+			headers: {
+				...data,
+			},
+		};
+
+		const { data: response } = await axios.request(axiosConfig);
+
+		// Response comes as x-www-form-urlencoded string so convert it to JSON
+		if (typeof response !== 'string') {
+			throw new BadRequestError(
+				'Expected string response from OAuth1 request token endpoint, but received invalid response type',
+			);
+		}
+
+		const paramsParser = new URLSearchParams(response);
+		const responseJson = Object.fromEntries(paramsParser.entries());
+
+		if (!responseJson.oauth_token) {
+			throw new BadRequestError(
+				'OAuth1 request token response is missing required oauth_token parameter',
+			);
+		}
+
+		const returnUri = `${oauthCredentials.authUrl}?oauth_token=${responseJson.oauth_token}`;
+
+		await this.encryptAndSaveData(credential, { csrfSecret }, []);
+
+		this.logger.debug('OAuth1 authorization url created for credential', {
+			csrfData,
+			credentialId: credential.id,
+		});
+
+		return returnUri;
+	}
+
 	private convertCredentialToOptions(credential: OAuth2CredentialData): ClientOAuth2Options {
 		const options: ClientOAuth2Options = {
 			clientId: credential.clientId,
diff --git a/packages/cli/src/oauth/types.ts b/packages/cli/src/oauth/types.ts
new file mode 100644
index 00000000000..512ffe37b78
--- /dev/null
+++ b/packages/cli/src/oauth/types.ts
@@ -0,0 +1,37 @@
+import { Time } from '@n8n/constants';
+
+export type CsrfStateRequired = {
+	/** Random CSRF token, used to verify the signature of the CSRF state */
+	token: string;
+	/** Creation timestamp of the CSRF state. Used for expiration.  */
+	createdAt: number;
+};
+
+export type CreateCsrfStateData = {
+	cid: string;
+	[key: string]: unknown;
+};
+
+export type CsrfState = CsrfStateRequired & CreateCsrfStateData;
+
+export const MAX_CSRF_AGE = 5 * Time.minutes.toMilliseconds;
+
+export const enum OauthVersion {
+	V1 = 1,
+	V2 = 2,
+}
+
+export interface OAuth1CredentialData {
+	signatureMethod: 'HMAC-SHA256' | 'HMAC-SHA512' | 'HMAC-SHA1';
+	consumerKey: string;
+	consumerSecret: string;
+	authUrl: string;
+	accessTokenUrl: string;
+	requestTokenUrl: string;
+}
+
+export const algorithmMap = {
+	'HMAC-SHA256': 'sha256',
+	'HMAC-SHA512': 'sha512',
+	'HMAC-SHA1': 'sha1',
+} as const;

From 484f75e078e0d302567df72474267dbf3e80886d Mon Sep 17 00:00:00 2001
From: Declan Carroll <declan@n8n.io>
Date: Tue, 9 Dec 2025 15:10:57 +0000
Subject: [PATCH 159/167] ci: Add UI checks for community PR's (#22980)

---
 .github/workflows/playwright-test-ci.yml | 47 +++++++++++++-----------
 1 file changed, 25 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/playwright-test-ci.yml b/.github/workflows/playwright-test-ci.yml
index c5ccbe1c9d0..7141e315a03 100644
--- a/.github/workflows/playwright-test-ci.yml
+++ b/.github/workflows/playwright-test-ci.yml
@@ -5,8 +5,10 @@ on:
 
 jobs:
   # Multi-main: postgres + redis + caddy + 2 mains + 1 worker
+  # Only runs for internal PRs (not community/fork PRs)
   multi-main-ui:
     name: 'Multi-Main: UI'
+    if: ${{ !github.event.pull_request.head.repo.fork }}
     uses: ./.github/workflows/playwright-test-reusable.yml
     with:
       test-mode: docker-build
@@ -18,6 +20,7 @@ jobs:
 
   multi-main-isolated:
     name: 'Multi-Main: Isolated'
+    if: ${{ !github.event.pull_request.head.repo.fork }}
     uses: ./.github/workflows/playwright-test-reusable.yml
     with:
       test-mode: docker-build
@@ -27,26 +30,26 @@ jobs:
       workers: '1'
     secrets: inherit
 
-  # Standard: Single n8n instance with SQLite
-  # TODO: Enable after confirmed costs with currents/blacksmith
-  # standard-ui:
-  #   name: 'Standard: UI'
-  #   uses: ./.github/workflows/playwright-test-reusable.yml
-  #   with:
-  #     test-mode: docker-build
-  #     test-command: pnpm --filter=n8n-playwright test:container:standard:ui
-  #     shards: '[1, 2, 3, 4, 5]'
-  #     runner: blacksmith-2vcpu-ubuntu-2204
-  #     workers: '2'
-  #   secrets: inherit
+  # Community PR tests: Standard mode with SQLite (no secrets required)
+  # Runs on GitHub-hosted runners without Currents reporting
+  community-standard-ui:
+    name: 'Community: Standard UI'
+    if: ${{ github.event.pull_request.head.repo.fork }}
+    uses: ./.github/workflows/playwright-test-reusable.yml
+    with:
+      test-mode: docker-build
+      test-command: pnpm --filter=n8n-playwright test:container:standard:ui
+      shards: '[1, 2, 3, 4, 5]'
+      runner: ubuntu-latest
+      workers: '2'
 
-  # standard-isolated:
-  #   name: 'Standard: Isolated'
-  #   uses: ./.github/workflows/playwright-test-reusable.yml
-  #   with:
-  #     test-mode: docker-build
-  #     test-command: pnpm --filter=n8n-playwright test:container:standard:isolated
-  #     shards: '[1]'
-  #     runner: blacksmith-2vcpu-ubuntu-2204
-  #     workers: '1'
-  #   secrets: inherit
+  community-standard-isolated:
+    name: 'Community: Standard Isolated'
+    if: ${{ github.event.pull_request.head.repo.fork }}
+    uses: ./.github/workflows/playwright-test-reusable.yml
+    with:
+      test-mode: docker-build
+      test-command: pnpm --filter=n8n-playwright test:container:standard:isolated
+      shards: '[1]'
+      runner: ubuntu-latest
+      workers: '1'

From 87e7f60f454635cc783482a7b22588881e5c959a Mon Sep 17 00:00:00 2001
From: Andreas Fitzek <andreas.fitzek@n8n.io>
Date: Tue, 9 Dec 2025 16:24:43 +0100
Subject: [PATCH 160/167] chore(core): Use correct license flag for dynamic
 credentials (#22982)

---
 .../dynamic-credentials.ee/dynamic-credentials.module.ts       | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/cli/src/modules/dynamic-credentials.ee/dynamic-credentials.module.ts b/packages/cli/src/modules/dynamic-credentials.ee/dynamic-credentials.module.ts
index d1f44323057..e241df236b2 100644
--- a/packages/cli/src/modules/dynamic-credentials.ee/dynamic-credentials.module.ts
+++ b/packages/cli/src/modules/dynamic-credentials.ee/dynamic-credentials.module.ts
@@ -7,8 +7,7 @@ function isFeatureFlagEnabled(): boolean {
 	return process.env.N8N_ENV_FEAT_CONTEXT_ESTABLISHMENT_HOOKS === 'true';
 }
 
-// TODO: Remove LICENSE_FEATURES.EXTERNAL_SECRETS with dynamic credentials feature once it is in the license server
-@BackendModule({ name: 'dynamic-credentials', licenseFlag: LICENSE_FEATURES.EXTERNAL_SECRETS })
+@BackendModule({ name: 'dynamic-credentials', licenseFlag: LICENSE_FEATURES.DYNAMIC_CREDENTIALS })
 export class DynamicCredentialsModule implements ModuleInterface {
 	async init() {
 		if (!isFeatureFlagEnabled()) {

From 776152dbe368de0c4d84987c1db3cf8db36b24ff Mon Sep 17 00:00:00 2001
From: Mutasem Aldmour <4711238+mutdmour@users.noreply.github.com>
Date: Tue, 9 Dec 2025 16:51:45 +0100
Subject: [PATCH 161/167] fix(ai-builder): Refresh license in sdk when renewed
 (#22969)

---
 packages/cli/src/__tests__/license.test.ts    | 92 +++++++++++++++++++
 packages/cli/src/license.ts                   | 32 +++++++
 .../ai-workflow-builder.service.test.ts       | 86 +++++++++++++++++
 .../src/services/__tests__/ai.service.test.ts | 42 +++++++++
 .../services/ai-workflow-builder.service.ts   | 13 ++-
 packages/cli/src/services/ai.service.ts       |  5 +
 pnpm-lock.yaml                                | 24 ++---
 pnpm-workspace.yaml                           |  2 +-
 8 files changed, 279 insertions(+), 17 deletions(-)

diff --git a/packages/cli/src/__tests__/license.test.ts b/packages/cli/src/__tests__/license.test.ts
index 3404ac7b843..62687c81389 100644
--- a/packages/cli/src/__tests__/license.test.ts
+++ b/packages/cli/src/__tests__/license.test.ts
@@ -1,5 +1,6 @@
 import { mockLogger } from '@n8n/backend-test-utils';
 import type { GlobalConfig } from '@n8n/config';
+import type { SettingsRepository } from '@n8n/db';
 import { LicenseManager } from '@n8n_io/license-sdk';
 import { mock } from 'jest-mock-extended';
 import type { InstanceSettings } from 'n8n-core';
@@ -282,6 +283,97 @@ describe('License', () => {
 });
 
 describe('License', () => {
+	describe('onCertRefresh', () => {
+		let license: License;
+		const instanceSettings = mock<InstanceSettings>({
+			instanceId: 'test-instance',
+			instanceType: 'main',
+			isLeader: true,
+		});
+
+		beforeEach(async () => {
+			jest.restoreAllMocks();
+			const globalConfig = mock<GlobalConfig>({
+				license: licenseConfig,
+				multiMainSetup: { enabled: false },
+			});
+			license = new License(mockLogger(), instanceSettings, mock(), mock(), globalConfig);
+			await license.init();
+		});
+
+		it('should register callback and call it on license reload', async () => {
+			const callback = jest.fn();
+			license.onCertRefresh(callback);
+
+			await license.reload();
+
+			expect(callback).toHaveBeenCalledWith('');
+		});
+
+		it('should call multiple registered callbacks', async () => {
+			const callback1 = jest.fn();
+			const callback2 = jest.fn();
+
+			license.onCertRefresh(callback1);
+			license.onCertRefresh(callback2);
+
+			await license.reload();
+
+			expect(callback1).toHaveBeenCalledTimes(1);
+			expect(callback2).toHaveBeenCalledTimes(1);
+		});
+
+		it('should return unsubscribe function that removes callback', async () => {
+			const callback = jest.fn();
+			const unsubscribe = license.onCertRefresh(callback);
+
+			unsubscribe();
+			await license.reload();
+
+			expect(callback).not.toHaveBeenCalled();
+		});
+
+		it('should continue calling other callbacks if one throws', async () => {
+			const errorCallback = jest.fn().mockImplementation(() => {
+				throw new Error('Callback error');
+			});
+			const callback2 = jest.fn();
+
+			license.onCertRefresh(errorCallback);
+			license.onCertRefresh(callback2);
+
+			await license.reload();
+
+			expect(errorCallback).toHaveBeenCalled();
+			expect(callback2).toHaveBeenCalled();
+		});
+
+		it('should pass the loaded certificate to callbacks', async () => {
+			const settingsRepository = mock<SettingsRepository>();
+			settingsRepository.findOne.mockResolvedValue({ value: 'test-cert-value' } as any);
+
+			const globalConfig = mock<GlobalConfig>({
+				license: licenseConfig,
+				multiMainSetup: { enabled: false },
+			});
+			license = new License(
+				mockLogger(),
+				instanceSettings,
+				settingsRepository,
+				mock(),
+				globalConfig,
+			);
+			await license.init();
+
+			const callback = jest.fn();
+			license.onCertRefresh(callback);
+
+			await license.reload();
+
+			expect(callback).toHaveBeenCalledWith('test-cert-value');
+		});
+	});
+
 	describe('init', () => {
 		it('when leader main with N8N_LICENSE_AUTO_RENEW_ENABLED=true, should enable renewal', async () => {
 			const globalConfig = mock<GlobalConfig>({
diff --git a/packages/cli/src/license.ts b/packages/cli/src/license.ts
index d6cbc91aaff..caa9baf612d 100644
--- a/packages/cli/src/license.ts
+++ b/packages/cli/src/license.ts
@@ -30,12 +30,16 @@ export type FeatureReturnType = Partial<
 	} & { [K in NumericLicenseFeature]: number } & { [K in BooleanLicenseFeature]: boolean }
 >;
 
+type LicenseRefreshCallback = (cert: string) => void;
+
 @Service()
 export class License implements LicenseProvider {
 	private manager: LicenseManager | undefined;
 
 	private isShuttingDown = false;
 
+	private refreshCallbacks: LicenseRefreshCallback[] = [];
+
 	constructor(
 		private readonly logger: Logger,
 		private readonly instanceSettings: InstanceSettings,
@@ -141,10 +145,12 @@ export class License implements LicenseProvider {
 
 	private async onFeatureChange() {
 		void this.broadcastReloadLicenseCommand();
+		await this.notifyRefreshCallbacks();
 	}
 
 	private async onLicenseRenewed() {
 		void this.broadcastReloadLicenseCommand();
+		await this.notifyRefreshCallbacks();
 	}
 
 	private async broadcastReloadLicenseCommand() {
@@ -167,6 +173,31 @@ export class License implements LicenseProvider {
 		);
 	}
 
+	/**
+	 * Register a callback to be notified when license certificate is refreshed.
+	 * Returns an unsubscribe function.
+	 */
+	onCertRefresh(refreshCallback: LicenseRefreshCallback): () => void {
+		this.refreshCallbacks.push(refreshCallback);
+		return () => {
+			const index = this.refreshCallbacks.indexOf(refreshCallback);
+			if (index > -1) {
+				this.refreshCallbacks.splice(index, 1);
+			}
+		};
+	}
+
+	private async notifyRefreshCallbacks(): Promise<void> {
+		const cert = await this.loadCertStr();
+		for (const refreshCallback of this.refreshCallbacks) {
+			try {
+				refreshCallback(cert);
+			} catch (error) {
+				this.logger.error('Error in license refresh callback', { error });
+			}
+		}
+	}
+
 	async activate(activationKey: string, eulaUri?: string): Promise<void> {
 		if (!this.manager) {
 			return;
@@ -182,6 +213,7 @@ export class License implements LicenseProvider {
 			return;
 		}
 		await this.manager.reload();
+		await this.notifyRefreshCallbacks();
 		this.logger.debug('License reloaded');
 	}
 
diff --git a/packages/cli/src/services/__tests__/ai-workflow-builder.service.test.ts b/packages/cli/src/services/__tests__/ai-workflow-builder.service.test.ts
index c3e6824bf35..2d6680bde88 100644
--- a/packages/cli/src/services/__tests__/ai-workflow-builder.service.test.ts
+++ b/packages/cli/src/services/__tests__/ai-workflow-builder.service.test.ts
@@ -508,6 +508,92 @@ describe('WorkflowBuilderService', () => {
 		});
 	});
 
+	describe('license certificate refresh', () => {
+		it('should register for license certificate updates when client is created', async () => {
+			mockConfig.aiAssistant.baseUrl = 'https://ai-assistant.test.com';
+
+			const mockPayload = {
+				message: 'test message',
+				id: '12345',
+				workflowContext: {},
+			};
+
+			const mockChatGenerator = (async function* () {
+				yield { messages: ['response'] };
+			})();
+
+			const mockAiService = mock<AiWorkflowBuilderService>();
+			(mockAiService.chat as jest.Mock).mockReturnValue(mockChatGenerator);
+			MockedAiWorkflowBuilderService.mockImplementation(() => mockAiService);
+
+			const generator = service.chat(mockPayload, mockUser);
+			await generator.next();
+
+			expect(mockLicense.onCertRefresh).toHaveBeenCalledWith(expect.any(Function));
+		});
+
+		it('should update client license cert when callback is invoked', async () => {
+			mockConfig.aiAssistant.baseUrl = 'https://ai-assistant.test.com';
+
+			const mockPayload = {
+				message: 'test message',
+				id: '12345',
+				workflowContext: {},
+			};
+
+			const mockChatGenerator = (async function* () {
+				yield { messages: ['response'] };
+			})();
+
+			const mockAiService = mock<AiWorkflowBuilderService>();
+			(mockAiService.chat as jest.Mock).mockReturnValue(mockChatGenerator);
+			MockedAiWorkflowBuilderService.mockImplementation(() => mockAiService);
+
+			// Capture the callback passed to onCertRefresh
+			let capturedCallback: ((cert: string) => void) | undefined;
+			(mockLicense.onCertRefresh as jest.Mock).mockImplementation((cb: (cert: string) => void) => {
+				capturedCallback = cb;
+				return () => {};
+			});
+
+			const generator = service.chat(mockPayload, mockUser);
+			await generator.next();
+
+			expect(capturedCallback).toBeDefined();
+
+			// Get the mocked client instance
+			const mockClientInstance = MockedAiAssistantClient.mock.instances[0];
+
+			// Invoke the callback with a new cert
+			capturedCallback!('new-cert-value');
+
+			expect(mockClientInstance.updateLicenseCert).toHaveBeenCalledWith('new-cert-value');
+		});
+
+		it('should not register for license updates when no baseUrl is configured', async () => {
+			mockConfig.aiAssistant.baseUrl = '';
+
+			const mockPayload = {
+				message: 'test message',
+				id: '12345',
+				workflowContext: {},
+			};
+
+			const mockChatGenerator = (async function* () {
+				yield { messages: ['response'] };
+			})();
+
+			const mockAiService = mock<AiWorkflowBuilderService>();
+			(mockAiService.chat as jest.Mock).mockReturnValue(mockChatGenerator);
+			MockedAiWorkflowBuilderService.mockImplementation(() => mockAiService);
+
+			const generator = service.chat(mockPayload, mockUser);
+			await generator.next();
+
+			expect(mockLicense.onCertRefresh).not.toHaveBeenCalled();
+		});
+	});
+
 	describe('getBuilderInstanceCredits', () => {
 		it('should return builder instance credits', async () => {
 			const expectedCredits = {
diff --git a/packages/cli/src/services/__tests__/ai.service.test.ts b/packages/cli/src/services/__tests__/ai.service.test.ts
index dbdcaa3e718..45dafc8debb 100644
--- a/packages/cli/src/services/__tests__/ai.service.test.ts
+++ b/packages/cli/src/services/__tests__/ai.service.test.ts
@@ -109,6 +109,48 @@ describe('AiService', () => {
 		});
 	});
 
+	describe('license certificate refresh', () => {
+		it('should register for license certificate updates on init', async () => {
+			license.isAiAssistantEnabled.mockReturnValue(true);
+			license.loadCertStr.mockResolvedValue('mock-license-cert');
+			license.getConsumerId.mockReturnValue('mock-consumer-id');
+
+			await aiService.init();
+
+			expect(license.onCertRefresh).toHaveBeenCalledWith(expect.any(Function));
+		});
+
+		it('should update client license cert when callback is invoked', async () => {
+			license.isAiAssistantEnabled.mockReturnValue(true);
+			license.loadCertStr.mockResolvedValue('mock-license-cert');
+			license.getConsumerId.mockReturnValue('mock-consumer-id');
+
+			// Capture the callback passed to onCertRefresh
+			let capturedCallback: ((cert: string) => void) | undefined;
+			license.onCertRefresh.mockImplementation((cb: (cert: string) => void) => {
+				capturedCallback = cb;
+				return () => {};
+			});
+
+			await aiService.init();
+
+			expect(capturedCallback).toBeDefined();
+
+			// Invoke the callback with a new cert
+			capturedCallback!('new-cert-value');
+
+			expect(client.updateLicenseCert).toHaveBeenCalledWith('new-cert-value');
+		});
+
+		it('should not register for license updates when AI assistant is disabled', async () => {
+			license.isAiAssistantEnabled.mockReturnValue(false);
+
+			await aiService.init();
+
+			expect(license.onCertRefresh).not.toHaveBeenCalled();
+		});
+	});
+
 	describe('askAi', () => {
 		const payload = mock<AiAskRequestDto>();
 
diff --git a/packages/cli/src/services/ai-workflow-builder.service.ts b/packages/cli/src/services/ai-workflow-builder.service.ts
index 356b66c979b..1deff55e2e5 100644
--- a/packages/cli/src/services/ai-workflow-builder.service.ts
+++ b/packages/cli/src/services/ai-workflow-builder.service.ts
@@ -23,6 +23,8 @@ import { Telemetry } from '@/telemetry';
 export class WorkflowBuilderService {
 	private service: AiWorkflowBuilderService | undefined;
 
+	private client: AiAssistantClient | undefined;
+
 	constructor(
 		private readonly loadNodesAndCredentials: LoadNodesAndCredentials,
 		private readonly license: License,
@@ -36,20 +38,23 @@ export class WorkflowBuilderService {
 
 	private async getService(): Promise<AiWorkflowBuilderService> {
 		if (!this.service) {
-			let client: AiAssistantClient | undefined;
-
 			// Create AiAssistantClient if baseUrl is configured
 			const baseUrl = this.config.aiAssistant.baseUrl;
 			if (baseUrl) {
 				const licenseCert = await this.license.loadCertStr();
 				const consumerId = this.license.getConsumerId();
 
-				client = new AiAssistantClient({
+				this.client = new AiAssistantClient({
 					licenseCert,
 					consumerId,
 					baseUrl,
 					n8nVersion: N8N_VERSION,
 				});
+
+				// Register for license certificate updates
+				this.license.onCertRefresh((cert) => {
+					this.client?.updateLicenseCert(cert);
+				});
 			}
 
 			// Create callback that uses the push service
@@ -75,7 +80,7 @@ export class WorkflowBuilderService {
 
 			this.service = new AiWorkflowBuilderService(
 				nodeTypeDescriptions,
-				client,
+				this.client,
 				this.logger,
 				this.instanceSettings.instanceId,
 				this.urlService.getInstanceBaseUrl(),
diff --git a/packages/cli/src/services/ai.service.ts b/packages/cli/src/services/ai.service.ts
index 32c6c8b0f9f..b3d11cffaa0 100644
--- a/packages/cli/src/services/ai.service.ts
+++ b/packages/cli/src/services/ai.service.ts
@@ -39,6 +39,11 @@ export class AiService {
 			baseUrl,
 			logLevel,
 		});
+
+		// Register for license certificate updates
+		this.licenseService.onCertRefresh((cert) => {
+			this.client?.updateLicenseCert(cert);
+		});
 	}
 
 	async chat(payload: AiChatRequestDto, user: IUser) {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index af1898c3d36..77669f9878d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -22,8 +22,8 @@ catalogs:
       specifier: 0.3.20-15
       version: 0.3.20-15
     '@n8n_io/ai-assistant-sdk':
-      specifier: 1.18.0
-      version: 1.18.0
+      specifier: 1.19.1
+      version: 1.19.1
     '@sentry/node':
       specifier: ^9.42.1
       version: 9.42.1
@@ -396,7 +396,7 @@ importers:
         version: link:../utils
       '@n8n_io/ai-assistant-sdk':
         specifier: 'catalog:'
-        version: 1.18.0
+        version: 1.19.1
       csv-parse:
         specifier: 5.5.0
         version: 5.5.0
@@ -1534,7 +1534,7 @@ importers:
         version: link:../@n8n/utils
       '@n8n_io/ai-assistant-sdk':
         specifier: 'catalog:'
-        version: 1.18.0
+        version: 1.19.1
       '@n8n_io/license-sdk':
         specifier: 2.24.1
         version: 2.24.1
@@ -6339,8 +6339,8 @@ packages:
     engines: {node: '>=18.10', pnpm: '>=9.6'}
     hasBin: true
 
-  '@n8n_io/ai-assistant-sdk@1.18.0':
-    resolution: {integrity: sha512-lWsGJ5AniMd/s6FqtQuCS5YJ/iWIA53GjdLieQWgpjwmc52zOAIhfpPGbI5tmm0kpvExYpGDvVRH8UzOHlt9QA==}
+  '@n8n_io/ai-assistant-sdk@1.19.1':
+    resolution: {integrity: sha512-oZZlXxyDOOPuHztrHUfoigZrhEY/iwSr9dH23j8jdzNTPiexRQlUly1kTE6v5DNLv9EwBVZ4e5FalOVUMtGzHg==}
     engines: {node: '>=20.15', pnpm: '>=8.14'}
 
   '@n8n_io/license-sdk@2.24.1':
@@ -17915,8 +17915,8 @@ packages:
   vue-component-type-helpers@2.2.12:
     resolution: {integrity: sha512-YbGqHZ5/eW4SnkPNR44mKVc6ZKQoRs/Rux1sxC6rdwXb4qpbOSYfDr9DsTHolOTGmIKgM9j141mZbBeg05R1pw==}
 
-  vue-component-type-helpers@3.1.5:
-    resolution: {integrity: sha512-7V3yJuNWW7/1jxCcI1CswnpDsvs02Qcx/N43LkV+ZqhLj2PKj50slUflHAroNkN4UWiYfzMUUUXiNuv9khmSpQ==}
+  vue-component-type-helpers@3.1.6:
+    resolution: {integrity: sha512-lqPXjac98uz7zh8fxHxJPJDP4SKeaYn2Fx4kQLCBthMXm9VsmPdzUWOGWMcXN7reJ9IkcBiOFxsFS/Po7dARiw==}
 
   vue-demi@0.14.10:
     resolution: {integrity: sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==}
@@ -21101,7 +21101,7 @@ snapshots:
       sharp: 0.33.5
       ws: 8.18.3(bufferutil@4.0.9)(utf-8-validate@5.0.10)
       zod: 3.25.67
-      zod-to-json-schema: 3.24.6(zod@3.25.67)
+      zod-to-json-schema: 3.25.0(zod@3.25.67)
     transitivePeerDependencies:
       - bufferutil
       - encoding
@@ -22728,7 +22728,7 @@ snapshots:
       acorn: 8.12.1
       acorn-walk: 8.3.4
 
-  '@n8n_io/ai-assistant-sdk@1.18.0': {}
+  '@n8n_io/ai-assistant-sdk@1.19.1': {}
 
   '@n8n_io/license-sdk@2.24.1':
     dependencies:
@@ -24907,7 +24907,7 @@ snapshots:
       storybook: 9.1.7(@testing-library/dom@10.4.0)(bufferutil@4.0.9)(prettier@3.6.2)(utf-8-validate@5.0.10)(vite@7.0.0(@types/node@20.19.21)(jiti@2.6.1)(lightningcss@1.30.2)(sass@1.89.2)(terser@5.16.1)(tsx@4.19.3))
       type-fest: 2.19.0
       vue: 3.5.13(typescript@5.9.2)
-      vue-component-type-helpers: 3.1.5
+      vue-component-type-helpers: 3.1.6
 
   '@stylistic/eslint-plugin@5.0.0(eslint@9.29.0(jiti@2.6.1))':
     dependencies:
@@ -36924,7 +36924,7 @@ snapshots:
 
   vue-component-type-helpers@2.2.12: {}
 
-  vue-component-type-helpers@3.1.5: {}
+  vue-component-type-helpers@3.1.6: {}
 
   vue-demi@0.14.10(vue@3.5.13(typescript@5.9.2)):
     dependencies:
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 03a80a440e7..911d935926f 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -11,7 +11,7 @@ catalog:
   '@langchain/core': 1.1.0
   '@langchain/openai': 1.1.3
   '@n8n/typeorm': 0.3.20-15
-  '@n8n_io/ai-assistant-sdk': 1.18.0
+  '@n8n_io/ai-assistant-sdk': 1.19.1
   '@sentry/node': ^9.42.1
   '@types/basic-auth': ^1.1.3
   '@types/express': ^5.0.1

From 87f6b51de3bc8a35ba11167b64a1be0b2d47d5ea Mon Sep 17 00:00:00 2001
From: Stephen Wright <sjw948@gmail.com>
Date: Tue, 9 Dec 2025 15:56:43 +0000
Subject: [PATCH 162/167] fix: Duplicate selector in workflow settings (#22984)

---
 .../src/app/components/WorkflowSettings.vue         | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/packages/frontend/editor-ui/src/app/components/WorkflowSettings.vue b/packages/frontend/editor-ui/src/app/components/WorkflowSettings.vue
index 8c35f719f0d..b8e8ed40b3a 100644
--- a/packages/frontend/editor-ui/src/app/components/WorkflowSettings.vue
+++ b/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);

From 50e337f0ba2265f991abcef0e5237937e2a4a8cf Mon Sep 17 00:00:00 2001
From: Daria <daria.staferova@n8n.io>
Date: Tue, 9 Dec 2025 19:22:31 +0200
Subject: [PATCH 163/167] fix: Add version history records when importing
 workflows (#22974)

---
 .../backend-test-utils/src/db/workflows.ts    |  12 +-
 .../1763047800000-AddActiveVersionIdColumn.ts |  53 +++
 .../source-control-import.service.ee.test.ts  |   1 +
 .../source-control-import.service.ee.ts       |  82 ++++-
 .../workflow-history.service.ts               |  18 +-
 .../source-control-import.service.test.ts     | 302 +++++++++++++++---
 6 files changed, 414 insertions(+), 54 deletions(-)

diff --git a/packages/@n8n/backend-test-utils/src/db/workflows.ts b/packages/@n8n/backend-test-utils/src/db/workflows.ts
index a35fa5f159d..2d098c99a64 100644
--- a/packages/@n8n/backend-test-utils/src/db/workflows.ts
+++ b/packages/@n8n/backend-test-utils/src/db/workflows.ts
@@ -202,8 +202,7 @@ export async function createWorkflowWithHistory(
 	const workflow = await createWorkflow(attributes, userOrProject);
 
 	// Create workflow history for the initial version
-	const user = userOrProject instanceof User ? userOrProject : undefined;
-	await createWorkflowHistory(workflow, user, withPublishHistory);
+	await createWorkflowHistory(workflow, userOrProject, withPublishHistory);
 
 	return workflow;
 }
@@ -247,12 +246,19 @@ export async function createWorkflowHistory(
 	userOrProject?: User | Project,
 	withPublishHistory?: Partial<WorkflowPublishHistory>,
 ): Promise<void> {
+	const authors =
+		userOrProject instanceof User
+			? userOrProject.firstName && userOrProject.lastName
+				? `${userOrProject.firstName} ${userOrProject.lastName}`
+				: 'Test User'
+			: 'Test User';
+
 	await Container.get(WorkflowHistoryRepository).insert({
 		workflowId: workflow.id,
 		versionId: workflow.versionId,
 		nodes: workflow.nodes,
 		connections: workflow.connections,
-		authors: userOrProject instanceof User ? userOrProject.email : 'test@example.com',
+		authors,
 	});
 
 	if (withPublishHistory) {
diff --git a/packages/@n8n/db/src/migrations/common/1763047800000-AddActiveVersionIdColumn.ts b/packages/@n8n/db/src/migrations/common/1763047800000-AddActiveVersionIdColumn.ts
index c4c44513b61..89b4189ddc9 100644
--- a/packages/@n8n/db/src/migrations/common/1763047800000-AddActiveVersionIdColumn.ts
+++ b/packages/@n8n/db/src/migrations/common/1763047800000-AddActiveVersionIdColumn.ts
@@ -8,6 +8,7 @@ export class AddActiveVersionIdColumn1763047800000 implements ReversibleMigratio
 		schemaBuilder: { addColumns, column, addForeignKey },
 		queryRunner,
 		escape,
+		runQuery,
 	}: MigrationContext) {
 		const workflowsTableName = escape.tableName(WORKFLOWS_TABLE_NAME);
 
@@ -21,6 +22,10 @@ export class AddActiveVersionIdColumn1763047800000 implements ReversibleMigratio
 			'RESTRICT',
 		);
 
+		// Fix for ADO-4517: some users pulled workflows to prod instances and ended up having missing records
+		// Run AFTER adding column/FK to avoid CASCADE DELETE
+		await this.backFillHistoryRecords(runQuery, escape);
+
 		// For existing ACTIVE workflows, set activeVersionId = versionId
 		const versionIdColumn = escape.columnName('versionId');
 		const activeColumn = escape.columnName('active');
@@ -40,4 +45,52 @@ export class AddActiveVersionIdColumn1763047800000 implements ReversibleMigratio
 		]);
 		await dropColumns(WORKFLOWS_TABLE_NAME, ['activeVersionId']);
 	}
+
+	// Create workflow_history records for workflows missing them
+	async backFillHistoryRecords(
+		runQuery: MigrationContext['runQuery'],
+		escape: MigrationContext['escape'],
+	) {
+		const workflowTable = escape.tableName('workflow_entity');
+		const historyTable = escape.tableName('workflow_history');
+		const versionIdColumn = escape.columnName('versionId');
+		const idColumn = escape.columnName('id');
+		const workflowIdColumn = escape.columnName('workflowId');
+		const nodesColumn = escape.columnName('nodes');
+		const connectionsColumn = escape.columnName('connections');
+		const authorsColumn = escape.columnName('authors');
+		const createdAtColumn = escape.columnName('createdAt');
+		const updatedAtColumn = escape.columnName('updatedAt');
+
+		await runQuery(
+			`
+			INSERT INTO ${historyTable} (
+				${versionIdColumn},
+				${workflowIdColumn},
+				${authorsColumn},
+				${nodesColumn},
+				${connectionsColumn},
+				${createdAtColumn},
+				${updatedAtColumn}
+			)
+			SELECT
+				w.${versionIdColumn},
+				w.${idColumn},
+				:authors,
+				w.${nodesColumn},
+				w.${connectionsColumn},
+				:createdAt,
+				:updatedAt
+			FROM ${workflowTable} w
+	    	LEFT JOIN ${historyTable} wh
+				ON w.${versionIdColumn} = wh.${versionIdColumn}
+			WHERE wh.${versionIdColumn} IS NULL
+			`,
+			{
+				authors: 'system migration',
+				createdAt: new Date(),
+				updatedAt: new Date(),
+			},
+		);
+	}
 }
diff --git a/packages/cli/src/environments.ee/source-control/__tests__/source-control-import.service.ee.test.ts b/packages/cli/src/environments.ee/source-control/__tests__/source-control-import.service.ee.test.ts
index a7defa4d579..cbd258907ea 100644
--- a/packages/cli/src/environments.ee/source-control/__tests__/source-control-import.service.ee.test.ts
+++ b/packages/cli/src/environments.ee/source-control/__tests__/source-control-import.service.ee.test.ts
@@ -74,6 +74,7 @@ describe('SourceControlImportService', () => {
 		mock<InstanceSettings>({ n8nFolder: '/mock/n8n' }),
 		sourceControlScopedService,
 		mock(),
+		mock(),
 	);
 
 	const globMock = fastGlob.default as unknown as jest.Mock<Promise<string[]>, string[]>;
diff --git a/packages/cli/src/environments.ee/source-control/source-control-import.service.ee.ts b/packages/cli/src/environments.ee/source-control/source-control-import.service.ee.ts
index 22ca39d5bcc..f873fdb7d7c 100644
--- a/packages/cli/src/environments.ee/source-control/source-control-import.service.ee.ts
+++ b/packages/cli/src/environments.ee/source-control/source-control-import.service.ee.ts
@@ -26,11 +26,15 @@ import { Service } from '@n8n/di';
 import { PROJECT_OWNER_ROLE_SLUG } from '@n8n/permissions';
 // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
 import { In } from '@n8n/typeorm';
+import { QueryDeepPartialEntity } from '@n8n/typeorm/query-builder/QueryPartialEntity';
 import glob from 'fast-glob';
+import isEqual from 'lodash/isEqual';
 import { Credentials, ErrorReporter, InstanceSettings } from 'n8n-core';
+import type { IWorkflowBase } from 'n8n-workflow';
 import { ensureError, jsonParse, UnexpectedError, UserError } from 'n8n-workflow';
 import { readFile as fsReadFile } from 'node:fs/promises';
 import path from 'path';
+import { v4 as uuid } from 'uuid';
 
 import { ActiveWorkflowManager } from '@/active-workflow-manager';
 import { CredentialsService } from '@/credentials/credentials.service';
@@ -38,6 +42,7 @@ import type { IWorkflowToImport } from '@/interfaces';
 import { isUniqueConstraintError } from '@/response-helper';
 import { TagService } from '@/services/tag.service';
 import { assertNever } from '@/utils';
+import { WorkflowHistoryService } from '@/workflows/workflow-history/workflow-history.service';
 import { WorkflowService } from '@/workflows/workflow.service';
 
 import {
@@ -71,7 +76,6 @@ import type {
 } from './types/resource-owner';
 import type { SourceControlContext } from './types/source-control-context';
 import type { SourceControlWorkflowVersionId } from './types/source-control-workflow-version-id';
-import { QueryDeepPartialEntity } from '@n8n/typeorm/query-builder/QueryPartialEntity';
 
 const findOwnerProject = (
 	owner: RemoteResourceOwner,
@@ -154,6 +158,7 @@ export class SourceControlImportService {
 		instanceSettings: InstanceSettings,
 		private readonly sourceControlScopedService: SourceControlScopedService,
 		private readonly workflowPublishHistoryRepository: WorkflowPublishHistoryRepository,
+		private readonly workflowHistoryService: WorkflowHistoryService,
 	) {
 		this.gitFolder = path.join(instanceSettings.n8nFolder, SOURCE_CONTROL_GIT_FOLDER);
 		this.workflowExportFolder = path.join(this.gitFolder, SOURCE_CONTROL_WORKFLOW_EXPORT_FOLDER);
@@ -678,6 +683,7 @@ export class SourceControlImportService {
 			} else {
 				importedWorkflow.active = false;
 				importedWorkflow.activeVersionId = null;
+				importedWorkflow.versionId = importedWorkflow.versionId ?? uuid();
 			}
 
 			const parentFolderId = importedWorkflow.parentFolderId ?? '';
@@ -697,6 +703,8 @@ export class SourceControlImportService {
 				});
 			}
 
+			await this.saveOrUpdateWorkflowHistory(importedWorkflow, userId);
+
 			const localOwner = allSharedWorkflows.find(
 				(w) => w.workflowId === importedWorkflow.id && w.role === 'workflow:owner',
 			);
@@ -1263,4 +1271,76 @@ export class SourceControlImportService {
 
 		return teamProject;
 	}
+
+	/**
+	 * Saves or updates workflow version history during import.
+	 * - If versionId is new: Creates new history record
+	 * - If versionId exists with different nodes/connections: Updates existing record
+	 * - If versionId exists with same content: No action
+	 */
+	private async saveOrUpdateWorkflowHistory(
+		importedWorkflow: IWorkflowToImport,
+		userId: string,
+	): Promise<void> {
+		if (!importedWorkflow.versionId || !importedWorkflow.nodes || !importedWorkflow.connections) {
+			this.logger.debug('Skipping workflow history - missing versionId, nodes, or connections');
+			return;
+		}
+
+		// Fetch user for author info
+		const user = await this.userRepository.findOne({ where: { id: userId } });
+		const authors = user ? `${user.firstName} ${user.lastName}` : 'Unknown';
+
+		try {
+			const existingVersion = await this.workflowHistoryService.findVersion(
+				importedWorkflow.id,
+				importedWorkflow.versionId,
+			);
+
+			if (existingVersion) {
+				// Check if nodes or connections changed
+				const nodesChanged = !isEqual(existingVersion.nodes, importedWorkflow.nodes);
+				const connectionsChanged = !isEqual(
+					existingVersion.connections,
+					importedWorkflow.connections,
+				);
+
+				if (nodesChanged || connectionsChanged) {
+					this.logger.debug(
+						`Updating workflow history for versionId ${importedWorkflow.versionId}`,
+					);
+
+					await this.workflowHistoryService.updateVersion(
+						importedWorkflow.versionId,
+						importedWorkflow.id,
+						{
+							nodes: importedWorkflow.nodes,
+							connections: importedWorkflow.connections,
+							authors,
+						},
+					);
+				} else {
+					this.logger.debug(
+						`Workflow history unchanged for versionId ${importedWorkflow.versionId}`,
+					);
+				}
+			} else {
+				// Create new version history record
+				this.logger.debug(
+					`Creating new workflow history for versionId ${importedWorkflow.versionId}`,
+				);
+
+				await this.workflowHistoryService.saveVersion(
+					authors,
+					importedWorkflow as unknown as IWorkflowBase,
+					importedWorkflow.id,
+				);
+			}
+		} catch (error) {
+			this.logger.error(
+				`Failed to save/update workflow history for workflow ${importedWorkflow.id}`,
+				{ error: ensureError(error) },
+			);
+		}
+	}
 }
diff --git a/packages/cli/src/workflows/workflow-history/workflow-history.service.ts b/packages/cli/src/workflows/workflow-history/workflow-history.service.ts
index 6543633576b..0a957c5d801 100644
--- a/packages/cli/src/workflows/workflow-history/workflow-history.service.ts
+++ b/packages/cli/src/workflows/workflow-history/workflow-history.service.ts
@@ -84,8 +84,20 @@ export class WorkflowHistoryService {
 		return hist;
 	}
 
+	/**
+	 * Find a workflow history version without permission checks.
+	 */
+	async findVersion(workflowId: string, versionId: string): Promise<WorkflowHistory | null> {
+		return await this.workflowHistoryRepository.findOne({
+			where: {
+				workflowId,
+				versionId,
+			},
+		});
+	}
+
 	async saveVersion(
-		user: User,
+		user: User | string,
 		workflow: IWorkflowBase,
 		workflowId: string,
 		transactionManager?: EntityManager,
@@ -96,13 +108,15 @@ export class WorkflowHistoryService {
 			);
 		}
 
+		const authors = typeof user === 'string' ? user : `${user.firstName} ${user.lastName}`;
+
 		const repository = transactionManager
 			? transactionManager.getRepository(WorkflowHistory)
 			: this.workflowHistoryRepository;
 
 		try {
 			await repository.insert({
-				authors: user.firstName + ' ' + user.lastName,
+				authors,
 				connections: workflow.connections,
 				nodes: workflow.nodes,
 				versionId: workflow.versionId,
diff --git a/packages/cli/test/integration/environments/source-control-import.service.test.ts b/packages/cli/test/integration/environments/source-control-import.service.test.ts
index 781b43c83e2..fd4e39d20c9 100644
--- a/packages/cli/test/integration/environments/source-control-import.service.test.ts
+++ b/packages/cli/test/integration/environments/source-control-import.service.test.ts
@@ -3,7 +3,7 @@ import {
 	createTeamProject,
 	getPersonalProject,
 	linkUserToProject,
-	createWorkflow,
+	createWorkflowWithHistory,
 	randomCredentialPayload,
 	testDb,
 	mockInstance,
@@ -19,11 +19,13 @@ import {
 	type WorkflowEntity,
 	WorkflowRepository,
 	WorkflowTagMappingRepository,
+	WorkflowHistoryRepository,
 } from '@n8n/db';
 import {
 	FolderRepository,
 	ProjectRepository,
 	SharedCredentialsRepository,
+	SharedWorkflowRepository,
 	UserRepository,
 } from '@n8n/db';
 import { Container } from '@n8n/di';
@@ -40,6 +42,7 @@ import { SourceControlScopedService } from '@/environments.ee/source-control/sou
 import type { ExportableCredential } from '@/environments.ee/source-control/types/exportable-credential';
 import { SourceControlContext } from '@/environments.ee/source-control/types/source-control-context';
 import type { IWorkflowToImport } from '@/interfaces';
+import { WorkflowHistoryService } from '@/workflows/workflow-history/workflow-history.service';
 import { createFolder } from '@test-integration/db/folders';
 import { assignTagToWorkflow, createTag } from '@test-integration/db/tags';
 
@@ -52,15 +55,19 @@ describe('SourceControlImportService', () => {
 	let credentialsRepository: CredentialsRepository;
 	let projectRepository: ProjectRepository;
 	let sharedCredentialsRepository: SharedCredentialsRepository;
+	let sharedWorkflowRepository: SharedWorkflowRepository;
 	let userRepository: UserRepository;
 	let folderRepository: FolderRepository;
 	let service: SourceControlImportService;
 	let workflowRepository: WorkflowRepository;
 	let tagRepository: TagRepository;
 	let workflowTagMappingRepository: WorkflowTagMappingRepository;
+	let workflowHistoryRepository: WorkflowHistoryRepository;
+	let workflowHistoryService: WorkflowHistoryService;
 	let sourceControlScopedService: SourceControlScopedService;
 
 	const cipher = mockInstance(Cipher);
+	const mockFileData = new Map<string, string>();
 
 	beforeAll(async () => {
 		await testDb.init();
@@ -68,11 +75,14 @@ describe('SourceControlImportService', () => {
 		credentialsRepository = Container.get(CredentialsRepository);
 		projectRepository = Container.get(ProjectRepository);
 		sharedCredentialsRepository = Container.get(SharedCredentialsRepository);
+		sharedWorkflowRepository = Container.get(SharedWorkflowRepository);
 		userRepository = Container.get(UserRepository);
 		folderRepository = Container.get(FolderRepository);
 		workflowRepository = Container.get(WorkflowRepository);
 		tagRepository = Container.get(TagRepository);
 		workflowTagMappingRepository = Container.get(WorkflowTagMappingRepository);
+		workflowHistoryRepository = Container.get(WorkflowHistoryRepository);
+		workflowHistoryService = Container.get(WorkflowHistoryService);
 		sourceControlScopedService = Container.get(SourceControlScopedService);
 		service = new SourceControlImportService(
 			mock(),
@@ -82,7 +92,7 @@ describe('SourceControlImportService', () => {
 			credentialsRepository,
 			projectRepository,
 			tagRepository,
-			mock(),
+			sharedWorkflowRepository,
 			sharedCredentialsRepository,
 			userRepository,
 			mock(),
@@ -95,11 +105,21 @@ describe('SourceControlImportService', () => {
 			mock<InstanceSettings>({ n8nFolder: '/some-path' }),
 			sourceControlScopedService,
 			mock(),
+			workflowHistoryService,
 		);
 	});
 
 	afterEach(async () => {
-		await testDb.truncate(['CredentialsEntity', 'SharedCredentials']);
+		await testDb.truncate([
+			'WorkflowPublishHistory',
+			'WorkflowHistory',
+			'SharedWorkflow',
+			'WorkflowTagMapping',
+			'SharedCredentials',
+			'WorkflowEntity',
+			'CredentialsEntity',
+			'TagEntity',
+		]);
 
 		jest.restoreAllMocks();
 	});
@@ -173,7 +193,7 @@ describe('SourceControlImportService', () => {
 		let teamAdmin: User;
 		let team1: Project;
 
-		beforeAll(async () => {
+		beforeEach(async () => {
 			[globalAdmin, globalOwner, globalMember, teamAdmin] = await Promise.all([
 				createAdmin(),
 				createOwner(),
@@ -194,7 +214,14 @@ describe('SourceControlImportService', () => {
 			]);
 
 			fsReadFile.mockImplementation(async (path) => {
-				switch (path) {
+				// Check if this file has mock data in the map (used by some tests)
+				const pathStr = typeof path === 'string' ? path : path.toString();
+				if (mockFileData.has(pathStr)) {
+					return mockFileData.get(pathStr)!;
+				}
+
+				// Otherwise use the predefined mock data
+				switch (pathStr) {
 					case mockWorkflow1File:
 						return JSON.stringify({
 							...mockWorkflow1Data,
@@ -226,7 +253,7 @@ describe('SourceControlImportService', () => {
 							},
 						});
 				}
-				throw new Error(`Trying to access invalid file in test: ${path}`);
+				throw new Error(`Trying to access invalid file in test: ${pathStr}`);
 			});
 		});
 
@@ -297,7 +324,7 @@ describe('SourceControlImportService', () => {
 		let projectAdminWorkflows: WorkflowEntity[];
 		let projectMemberWorkflows: WorkflowEntity[];
 
-		beforeAll(async () => {
+		beforeEach(async () => {
 			[instanceOwner, projectAdmin, projectMember, teamProjectA, teamProjectB] = await Promise.all([
 				getGlobalOwner(),
 				createMember(),
@@ -312,33 +339,33 @@ describe('SourceControlImportService', () => {
 			await linkUserToProject(projectMember, teamProjectB, 'project:editor');
 
 			teamAWorkflows = await Promise.all([
-				await createWorkflow({}, teamProjectA),
-				await createWorkflow({}, teamProjectA),
-				await createWorkflow({}, teamProjectA),
+				await createWorkflowWithHistory({}, teamProjectA),
+				await createWorkflowWithHistory({}, teamProjectA),
+				await createWorkflowWithHistory({}, teamProjectA),
 			]);
 
 			teamBWorkflows = await Promise.all([
-				await createWorkflow({}, teamProjectB),
-				await createWorkflow({}, teamProjectB),
-				await createWorkflow({}, teamProjectB),
+				await createWorkflowWithHistory({}, teamProjectB),
+				await createWorkflowWithHistory({}, teamProjectB),
+				await createWorkflowWithHistory({}, teamProjectB),
 			]);
 
 			instanceOwnerWorkflows = await Promise.all([
-				await createWorkflow({}, instanceOwner),
-				await createWorkflow({}, instanceOwner),
-				await createWorkflow({}, instanceOwner),
+				await createWorkflowWithHistory({}, instanceOwner),
+				await createWorkflowWithHistory({}, instanceOwner),
+				await createWorkflowWithHistory({}, instanceOwner),
 			]);
 
 			projectAdminWorkflows = await Promise.all([
-				await createWorkflow({}, projectAdmin),
-				await createWorkflow({}, projectAdmin),
-				await createWorkflow({}, projectAdmin),
+				await createWorkflowWithHistory({}, projectAdmin),
+				await createWorkflowWithHistory({}, projectAdmin),
+				await createWorkflowWithHistory({}, projectAdmin),
 			]);
 
 			projectMemberWorkflows = await Promise.all([
-				await createWorkflow({}, projectMember),
-				await createWorkflow({}, projectMember),
-				await createWorkflow({}, projectMember),
+				await createWorkflowWithHistory({}, projectMember),
+				await createWorkflowWithHistory({}, projectMember),
+				await createWorkflowWithHistory({}, projectMember),
 			]);
 		});
 
@@ -443,7 +470,7 @@ describe('SourceControlImportService', () => {
 		let teamAdmin: User;
 		let team1: Project;
 
-		beforeAll(async () => {
+		beforeEach(async () => {
 			[globalAdmin, globalOwner, globalMember, teamAdmin] = await Promise.all([
 				createAdmin(),
 				createOwner(),
@@ -671,7 +698,7 @@ describe('SourceControlImportService', () => {
 		let foldersProjectA: Folder[];
 		let foldersProjectB: Folder[];
 
-		beforeAll(async () => {
+		beforeEach(async () => {
 			[instanceOwner, projectAdmin, projectMember, teamProjectA, teamProjectB] = await Promise.all([
 				getGlobalOwner(),
 				createMember(),
@@ -820,21 +847,21 @@ describe('SourceControlImportService', () => {
 			]);
 
 			workflowTeam1 = await Promise.all([
-				await createWorkflow(
+				await createWorkflowWithHistory(
 					{
 						id: 'wf1',
 						name: 'Workflow 1',
 					},
 					team1,
 				),
-				await createWorkflow(
+				await createWorkflowWithHistory(
 					{
 						id: 'wf2',
 						name: 'Workflow 2',
 					},
 					team1,
 				),
-				await createWorkflow(
+				await createWorkflowWithHistory(
 					{
 						id: 'wf3',
 						name: 'Workflow 3',
@@ -844,21 +871,21 @@ describe('SourceControlImportService', () => {
 			]);
 
 			await Promise.all([
-				await createWorkflow(
+				await createWorkflowWithHistory(
 					{
 						id: 'wf4',
 						name: 'Workflow 4',
 					},
 					team2,
 				),
-				await createWorkflow(
+				await createWorkflowWithHistory(
 					{
 						id: 'wf5',
 						name: 'Workflow 5',
 					},
 					team2,
 				),
-				await createWorkflow(
+				await createWorkflowWithHistory(
 					{
 						id: 'wf6',
 						name: 'Workflow 6',
@@ -868,8 +895,6 @@ describe('SourceControlImportService', () => {
 			]);
 		});
 
-		beforeEach(async () => {});
-
 		it('should show all remote tags and all remote mappings for instance admins', async () => {
 			const result = await service.getRemoteTagsAndMappingsFromFile(
 				new SourceControlContext(globalAdmin),
@@ -932,7 +957,7 @@ describe('SourceControlImportService', () => {
 		let workflowsProjectB: WorkflowEntity[];
 		let mappings: Array<[TagEntity, WorkflowEntity]>;
 
-		beforeAll(async () => {
+		beforeEach(async () => {
 			[instanceOwner, projectAdmin, projectMember, teamProjectA, teamProjectB] = await Promise.all([
 				getGlobalOwner(),
 				createMember(),
@@ -959,21 +984,21 @@ describe('SourceControlImportService', () => {
 			]);
 
 			workflowsProjectA = await Promise.all([
-				await createWorkflow(
+				await createWorkflowWithHistory(
 					{
 						id: 'workflow1',
 						name: 'Workflow 1',
 					},
 					teamProjectA,
 				),
-				await createWorkflow(
+				await createWorkflowWithHistory(
 					{
 						id: 'workflow2',
 						name: 'Workflow 2',
 					},
 					teamProjectA,
 				),
-				await createWorkflow(
+				await createWorkflowWithHistory(
 					{
 						id: 'workflow3',
 						name: 'Workflow 3',
@@ -983,21 +1008,21 @@ describe('SourceControlImportService', () => {
 			]);
 
 			workflowsProjectB = await Promise.all([
-				await createWorkflow(
+				await createWorkflowWithHistory(
 					{
 						id: 'workflow4',
 						name: 'Workflow 4',
 					},
 					teamProjectB,
 				),
-				await createWorkflow(
+				await createWorkflowWithHistory(
 					{
 						id: 'workflow5',
 						name: 'Workflow 5',
 					},
 					teamProjectB,
 				),
-				await createWorkflow(
+				await createWorkflowWithHistory(
 					{
 						id: 'workflow6',
 						name: 'Workflow 6',
@@ -1081,7 +1106,7 @@ describe('SourceControlImportService', () => {
 			it('should assign credential ownership to original user', async () => {
 				const [importingUser, member] = await Promise.all([getGlobalOwner(), createMember()]);
 
-				fsp.readFile = jest.fn().mockResolvedValue(Buffer.from('some-content'));
+				jest.spyOn(fsp, 'readFile').mockResolvedValue(Buffer.from('some-content'));
 
 				const CREDENTIAL_ID = nanoid();
 
@@ -1118,7 +1143,7 @@ describe('SourceControlImportService', () => {
 			it('should assign credential ownership to importing user', async () => {
 				const importingUser = await getGlobalOwner();
 
-				fsp.readFile = jest.fn().mockResolvedValue(Buffer.from('some-content'));
+				jest.spyOn(fsp, 'readFile').mockResolvedValue(Buffer.from('some-content'));
 
 				const CREDENTIAL_ID = nanoid();
 
@@ -1155,7 +1180,7 @@ describe('SourceControlImportService', () => {
 			it('should assign credential ownership to importing user', async () => {
 				const importingUser = await getGlobalOwner();
 
-				fsp.readFile = jest.fn().mockResolvedValue(Buffer.from('some-content'));
+				jest.spyOn(fsp, 'readFile').mockResolvedValue(Buffer.from('some-content'));
 
 				const CREDENTIAL_ID = nanoid();
 
@@ -1193,7 +1218,7 @@ describe('SourceControlImportService', () => {
 		it('should assign the credential ownership to the importing user if it was owned by a personal project in the source instance', async () => {
 			const importingUser = await getGlobalOwner();
 
-			fsp.readFile = jest.fn().mockResolvedValue(Buffer.from('some-content'));
+			jest.spyOn(fsp, 'readFile').mockResolvedValue(Buffer.from('some-content'));
 
 			const CREDENTIAL_ID = nanoid();
 
@@ -1231,7 +1256,7 @@ describe('SourceControlImportService', () => {
 		it('should create a new team project if the credential was owned by a team project in the source instance', async () => {
 			const importingUser = await getGlobalOwner();
 
-			fsp.readFile = jest.fn().mockResolvedValue(Buffer.from('some-content'));
+			jest.spyOn(fsp, 'readFile').mockResolvedValue(Buffer.from('some-content'));
 
 			const CREDENTIAL_ID = nanoid();
 
@@ -1290,7 +1315,7 @@ describe('SourceControlImportService', () => {
 		it('should use the existing team project if credential owning project is found', async () => {
 			const importingUser = await getGlobalOwner();
 
-			fsp.readFile = jest.fn().mockResolvedValue(Buffer.from('some-content'));
+			jest.spyOn(fsp, 'readFile').mockResolvedValue(Buffer.from('some-content'));
 
 			const CREDENTIAL_ID = nanoid();
 
@@ -1331,7 +1356,7 @@ describe('SourceControlImportService', () => {
 
 			const importingUser = await getGlobalOwner();
 
-			fsp.readFile = jest.fn().mockResolvedValue(Buffer.from('some-content'));
+			jest.spyOn(fsp, 'readFile').mockResolvedValue(Buffer.from('some-content'));
 
 			const targetProject = await createTeamProject('Marketing');
 			const credential = await saveCredential(randomCredentialPayload(), {
@@ -1395,7 +1420,7 @@ describe('SourceControlImportService', () => {
 		it('should import global credentials with isGlobal flag set to true', async () => {
 			const importingUser = await getGlobalOwner();
 
-			fsp.readFile = jest.fn().mockResolvedValue(Buffer.from('some-content'));
+			jest.spyOn(fsp, 'readFile').mockResolvedValue(Buffer.from('some-content'));
 
 			const CREDENTIAL_ID = nanoid();
 
@@ -1430,7 +1455,7 @@ describe('SourceControlImportService', () => {
 		it('should import non-global credentials with isGlobal flag set to false', async () => {
 			const importingUser = await getGlobalOwner();
 
-			fsp.readFile = jest.fn().mockResolvedValue(Buffer.from('some-content'));
+			jest.spyOn(fsp, 'readFile').mockResolvedValue(Buffer.from('some-content'));
 
 			const CREDENTIAL_ID = nanoid();
 
@@ -1462,4 +1487,185 @@ describe('SourceControlImportService', () => {
 			expect(importedCredential?.type).toBe('standardCredentialType');
 		});
 	});
+
+	describe('importWorkflowFromWorkFolder()', () => {
+		const globMock = fastGlob.default as unknown as jest.Mock<Promise<string[]>, string[]>;
+		const fsReadFile = jest.spyOn(fsp, 'readFile');
+
+		const putWorkflowFile = (workflowId: string, workflow: IWorkflowToImport) => {
+			const file = `/mock/${workflowId}.json`;
+			globMock.mockResolvedValue([file]);
+			mockFileData.set(file, JSON.stringify(workflow));
+			return file;
+		};
+
+		const makeWorkflowImport = (overrides: Partial<IWorkflowToImport> = {}): IWorkflowToImport => ({
+			id: overrides.id ?? nanoid(),
+			name: overrides.name ?? 'Test Workflow',
+			versionId: overrides.versionId ?? nanoid(),
+			nodes:
+				overrides.nodes ??
+				([
+					{
+						id: 'node-1',
+						name: 'Start',
+						type: 'n8n-nodes-base.start',
+						typeVersion: 1,
+						position: [250, 300] as [number, number],
+						parameters: {},
+					},
+				] as IWorkflowToImport['nodes']),
+			connections: overrides.connections ?? {},
+			settings: overrides.settings ?? {},
+			parentFolderId: overrides.parentFolderId ?? null,
+			active: overrides.active ?? false,
+			isArchived: overrides.isArchived ?? false,
+			activeVersionId: overrides.activeVersionId ?? null,
+		});
+
+		beforeEach(() => {
+			mockFileData.clear();
+
+			fsReadFile.mockImplementation(async (path) => {
+				const pathStr = typeof path === 'string' ? path : path.toString();
+				if (!mockFileData.has(pathStr)) {
+					throw new Error(`Trying to access invalid file in test: ${pathStr}`);
+				}
+				return mockFileData.get(pathStr)!;
+			});
+		});
+
+		describe('workflow history', () => {
+			it('should create workflow history for new workflow on import', async () => {
+				const importingUser = await getGlobalOwner();
+
+				const workflow = makeWorkflowImport();
+				const file = putWorkflowFile(workflow.id, workflow);
+
+				await service.importWorkflowFromWorkFolder(
+					[mock<SourceControlledFile>({ id: workflow.id, file })],
+					importingUser.id,
+				);
+
+				// Verify workflow history was created
+				const historyRecord = await workflowHistoryRepository.findOne({
+					where: { versionId: workflow.versionId, workflowId: workflow.id },
+				});
+
+				expect(historyRecord).toBeTruthy();
+				expect(historyRecord?.nodes).toEqual(workflow.nodes);
+				expect(historyRecord?.connections).toEqual(workflow.connections);
+				expect(historyRecord?.authors).toBe(`${importingUser.firstName} ${importingUser.lastName}`);
+			});
+
+			it('should update workflow history when versionId exists but nodes changed', async () => {
+				const importingUser = await getGlobalOwner();
+				const workflowId = nanoid();
+				const versionId = nanoid();
+
+				// Create initial workflow and history
+				const initialNodes = [
+					{
+						id: 'node-1',
+						name: 'Start',
+						type: 'n8n-nodes-base.start',
+						typeVersion: 1,
+						position: [250, 300] as [number, number],
+						parameters: {},
+					},
+				];
+
+				await createWorkflowWithHistory(
+					{
+						id: workflowId,
+						name: 'Test Workflow',
+						versionId,
+						nodes: initialNodes,
+						connections: {},
+					},
+					importingUser,
+				);
+
+				// Import with updated nodes
+				const updatedNodes = [
+					...initialNodes,
+					{
+						id: 'node-2',
+						name: 'Set',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 1,
+						position: [450, 300] as [number, number],
+						parameters: {},
+					},
+				];
+
+				const workflow = makeWorkflowImport({ id: workflowId, versionId, nodes: updatedNodes });
+				const file = putWorkflowFile(workflowId, workflow);
+
+				await service.importWorkflowFromWorkFolder(
+					[mock<SourceControlledFile>({ id: workflowId, file })],
+					importingUser.id,
+				);
+
+				// Verify workflow history was updated
+				const historyRecord = await workflowHistoryRepository.findOne({
+					where: { versionId, workflowId },
+				});
+
+				expect(historyRecord).toBeTruthy();
+				expect(historyRecord?.nodes).toEqual(updatedNodes);
+				expect(historyRecord?.authors).toBe(`${importingUser.firstName} ${importingUser.lastName}`);
+			});
+
+			it('should not update workflow history when versionId exists and content unchanged', async () => {
+				const importingUser = await getGlobalOwner();
+				const workflowId = nanoid();
+				const versionId = nanoid();
+
+				const nodes = [
+					{
+						id: 'node-1',
+						name: 'Start',
+						type: 'n8n-nodes-base.start',
+						typeVersion: 1,
+						position: [250, 300] as [number, number],
+						parameters: {},
+					},
+				];
+
+				// Create initial workflow and history
+				await createWorkflowWithHistory(
+					{
+						id: workflowId,
+						name: 'Test Workflow',
+						versionId,
+						nodes,
+						connections: {},
+					},
+					importingUser,
+				);
+
+				const historyBefore = await workflowHistoryRepository.findOne({
+					where: { versionId, workflowId },
+				});
+
+				const workflow = makeWorkflowImport({ id: workflowId, versionId, nodes });
+				const file = putWorkflowFile(workflowId, workflow);
+
+				await service.importWorkflowFromWorkFolder(
+					[mock<SourceControlledFile>({ id: workflowId, file })],
+					importingUser.id,
+				);
+
+				// Verify workflow history was NOT updated (authors should remain unchanged)
+				const historyAfter = await workflowHistoryRepository.findOne({
+					where: { versionId, workflowId },
+				});
+
+				expect(historyAfter).toBeTruthy();
+				expect(historyAfter?.authors).toBe(historyBefore?.authors); // Should not have changed
+				expect(historyAfter?.updatedAt?.getTime()).toBe(historyBefore?.updatedAt?.getTime());
+			});
+		});
+	});
 });

From 90cafaa33693e07d7bf7ee59516bfc8da0ce5531 Mon Sep 17 00:00:00 2001
From: Declan Carroll <declan@n8n.io>
Date: Tue, 9 Dec 2025 18:30:39 +0000
Subject: [PATCH 164/167] ci: Increase timer for e2e CI (#22991)

---
 .github/workflows/playwright-test-ci.yml       | 18 +++++++++---------
 .github/workflows/playwright-test-reusable.yml |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/playwright-test-ci.yml b/.github/workflows/playwright-test-ci.yml
index 7141e315a03..b438301908d 100644
--- a/.github/workflows/playwright-test-ci.yml
+++ b/.github/workflows/playwright-test-ci.yml
@@ -30,26 +30,26 @@ jobs:
       workers: '1'
     secrets: inherit
 
-  # Community PR tests: Standard mode with SQLite (no secrets required)
+  # Community PR tests: Local mode with SQLite (no container building, no secrets required)
   # Runs on GitHub-hosted runners without Currents reporting
-  community-standard-ui:
-    name: 'Community: Standard UI'
+  community-ui:
+    name: 'Community: UI'
     if: ${{ github.event.pull_request.head.repo.fork }}
     uses: ./.github/workflows/playwright-test-reusable.yml
     with:
-      test-mode: docker-build
-      test-command: pnpm --filter=n8n-playwright test:container:standard:ui
+      test-mode: local
+      test-command: pnpm --filter=n8n-playwright test:local
       shards: '[1, 2, 3, 4, 5]'
       runner: ubuntu-latest
       workers: '2'
 
-  community-standard-isolated:
-    name: 'Community: Standard Isolated'
+  community-isolated:
+    name: 'Community: Isolated'
     if: ${{ github.event.pull_request.head.repo.fork }}
     uses: ./.github/workflows/playwright-test-reusable.yml
     with:
-      test-mode: docker-build
-      test-command: pnpm --filter=n8n-playwright test:container:standard:isolated
+      test-mode: local
+      test-command: pnpm --filter=n8n-playwright test:local:isolated
       shards: '[1]'
       runner: ubuntu-latest
       workers: '1'
diff --git a/.github/workflows/playwright-test-reusable.yml b/.github/workflows/playwright-test-reusable.yml
index 4f85fcafb14..d51a4534b90 100644
--- a/.github/workflows/playwright-test-reusable.yml
+++ b/.github/workflows/playwright-test-reusable.yml
@@ -64,7 +64,7 @@ env:
 jobs:
   test:
     runs-on: ${{ inputs.runner }}
-    timeout-minutes: 20
+    timeout-minutes: 30
     strategy:
       fail-fast: false
       matrix:

From 3b898985d2d5637c482e8a6e798bb90bfbce1634 Mon Sep 17 00:00:00 2001
From: Declan Carroll <declan@n8n.io>
Date: Wed, 10 Dec 2025 07:03:06 +0000
Subject: [PATCH 165/167] ci: Add ui-e2e to codecov reports (#22996)

---
 .../workflows/playwright-test-coverage.yml    | 32 +++++++++++++++----
 codecov.yml                                   | 12 +++++--
 package.json                                  |  1 +
 .../scripts/generate-coverage-report.js       | 16 ++++++----
 turbo.json                                    |  2 +-
 5 files changed, 46 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/playwright-test-coverage.yml b/.github/workflows/playwright-test-coverage.yml
index d10cf8d664d..cdcadef6f5d 100644
--- a/.github/workflows/playwright-test-coverage.yml
+++ b/.github/workflows/playwright-test-coverage.yml
@@ -22,15 +22,21 @@ jobs:
 
       - name: Setup Environment
         uses: ./.github/actions/setup-nodejs-blacksmith
-        with:
-          build-command: pnpm turbo build:playwright
+        env:
+          INCLUDE_TEST_CONTROLLER: 'true'
 
-      - name: Build with Coverage
-        run: pnpm --filter n8n-editor-ui build:coverage
+      - name: Build Docker Image with Coverage
+        run: pnpm build:docker:coverage
+        env:
+          INCLUDE_TEST_CONTROLLER: 'true'
 
-      - name: Run Coverage Tests
+      - name: Install Browsers
+        run: pnpm turbo install-browsers:ci
+
+      - name: Run Container Coverage Tests
+        id: coverage-tests
         run: |
-          pnpm --filter n8n-playwright test:local \
+          pnpm --filter n8n-playwright test:container:standard \
             --workers=${{ env.PLAYWRIGHT_WORKERS }}
         env:
           BUILD_WITH_COVERAGE: 'true'
@@ -40,11 +46,23 @@ jobs:
           QA_PERFORMANCE_METRICS_WEBHOOK_PASSWORD: ${{ secrets.QA_PERFORMANCE_METRICS_WEBHOOK_PASSWORD }}
 
       - name: Generate Coverage Report
+        if: always() && steps.coverage-tests.outcome != 'skipped'
         run: pnpm --filter n8n-playwright coverage:report
 
-      - name: Upload Coverage Report
+      - name: Upload Coverage Report Artifact
+        if: always()
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: coverage-report
           path: packages/testing/playwright/coverage/
           retention-days: 14
+
+      - name: Upload E2E Coverage to Codecov
+        if: always()
+        uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          files: packages/testing/playwright/coverage/lcov.info
+          flags: frontend-e2e
+          name: playwright-e2e
+          fail_ci_if_error: false
diff --git a/codecov.yml b/codecov.yml
index 6d99dd68526..5114e8e9437 100644
--- a/codecov.yml
+++ b/codecov.yml
@@ -13,9 +13,15 @@ github_checks:
   annotations: false
 
 flags:
-  tests:
-    paths:
-      - '**'
+  backend-unit:
+    carryforward: true
+  backend-integration:
+    carryforward: true
+  nodes-unit:
+    carryforward: true
+  frontend:
+    carryforward: true
+  frontend-e2e:
     carryforward: true
 
 component_management:
diff --git a/package.json b/package.json
index 1cd8914edfb..b8b8411768a 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,7 @@
     "build:n8n": "node scripts/build-n8n.mjs",
     "build:deploy": "node scripts/build-n8n.mjs",
     "build:docker": "node scripts/build-n8n.mjs && node scripts/dockerize-n8n.mjs",
+    "build:docker:coverage": "BUILD_WITH_COVERAGE=true node scripts/build-n8n.mjs && node scripts/dockerize-n8n.mjs",
     "build:docker:scan": "node scripts/build-n8n.mjs && node scripts/dockerize-n8n.mjs && node scripts/scan-n8n-image.mjs",
     "build:docker:test": "node scripts/build-n8n.mjs && node scripts/dockerize-n8n.mjs && turbo run test:container:standard --filter=n8n-playwright",
     "typecheck": "turbo typecheck",
diff --git a/packages/testing/playwright/scripts/generate-coverage-report.js b/packages/testing/playwright/scripts/generate-coverage-report.js
index d1d58c49807..84e31d11822 100755
--- a/packages/testing/playwright/scripts/generate-coverage-report.js
+++ b/packages/testing/playwright/scripts/generate-coverage-report.js
@@ -34,18 +34,22 @@ function main() {
 		const mergedFile = path.join(NYC_OUTPUT_DIR, 'out.json');
 		execSync(`npx nyc merge ${UI_DIR} ${mergedFile}`, { stdio: 'inherit' });
 
-		// Generate HTML report
-		console.log('Generating HTML report...');
+		// Generate reports (HTML for viewing, LCOV for Codecov)
+		console.log('Generating coverage reports...');
 		execSync(
-			`npx nyc report --reporter=html --report-dir=${COVERAGE_DIR} --temp-dir=${NYC_OUTPUT_DIR} --config=${NYC_CONFIG} --exclude-after-remap=false`,
+			`npx nyc report --reporter=html --reporter=lcov --report-dir=${COVERAGE_DIR} --temp-dir=${NYC_OUTPUT_DIR} --config=${NYC_CONFIG} --exclude-after-remap=false`,
 			{ stdio: 'inherit' },
 		);
 
 		const htmlReportPath = path.join(COVERAGE_DIR, 'index.html');
+		const lcovPath = path.join(COVERAGE_DIR, 'lcov.info');
+
+		console.log(`\n✅ Coverage reports generated successfully!`);
 		if (fs.existsSync(htmlReportPath)) {
-			console.log(`\n✅ Coverage report generated successfully!`);
-			console.log(`📊 Report: ${htmlReportPath}`);
-			console.log(`🌐 Open: file://${htmlReportPath}`);
+			console.log(`📊 HTML Report: ${htmlReportPath}`);
+		}
+		if (fs.existsSync(lcovPath)) {
+			console.log(`📄 LCOV Report: ${lcovPath} (for Codecov)`);
 		}
 	} catch (error) {
 		console.error('❌ Failed to generate coverage report:', error.message);
diff --git a/turbo.json b/turbo.json
index 84db452bc5a..6085621b986 100644
--- a/turbo.json
+++ b/turbo.json
@@ -1,5 +1,5 @@
 {
-	"globalEnv": ["CI", "COVERAGE_ENABLED"],
+	"globalEnv": ["CI", "COVERAGE_ENABLED", "BUILD_WITH_COVERAGE"],
 	"tasks": {
 		"clean": { "cache": false },
 		"build": {

From c5a31a3be868d49eb29bb6eca87cbce9a62f75be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ra=C3=BAl=20G=C3=B3mez=20Morales?= <raul00gm@gmail.com>
Date: Wed, 10 Dec 2025 08:37:49 +0100
Subject: [PATCH 166/167] fix(editor): Fix project selector scroll (#22728)

---
 .../collaboration/projects/components/ProjectSharing.vue        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectSharing.vue b/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectSharing.vue
index 53a871cc5bd..19939173e2c 100644
--- a/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectSharing.vue
+++ b/packages/frontend/editor-ui/src/features/collaboration/projects/components/ProjectSharing.vue
@@ -265,7 +265,7 @@ watch(
 }
 
 .popper :global(.el-scrollbar__wrap) {
-	overflow: hidden;
+	scrollbar-width: none; // <-- hides scrollbar but maintains scrolling
 }
 
 .emoji {

From c7fd47d31fcc23bdcdae5cfa2aa385ccb3b031fc Mon Sep 17 00:00:00 2001
From: Suguru Inoue <suguru@n8n.io>
Date: Wed, 10 Dec 2025 08:38:29 +0100
Subject: [PATCH 167/167] fix(core): Files are not included in memory in chat
 (no-changelog) (#22922)

---
 .../chat-hub-workflow.service.test.ts         | 576 ++++++++++++++++++
 .../chat-hub/chat-hub-workflow.service.ts     | 155 ++++-
 .../chat-hub/chat-hub.attachment.service.ts   |  16 +
 .../src/modules/chat-hub/chat-hub.types.ts    |   7 +-
 .../src/features/ai/chatHub/chat.utils.ts     |  10 +-
 .../ai/chatHub/components/ChatPrompt.vue      |   7 +-
 6 files changed, 737 insertions(+), 34 deletions(-)
 create mode 100644 packages/cli/src/modules/chat-hub/__tests__/chat-hub-workflow.service.test.ts

diff --git a/packages/cli/src/modules/chat-hub/__tests__/chat-hub-workflow.service.test.ts b/packages/cli/src/modules/chat-hub/__tests__/chat-hub-workflow.service.test.ts
new file mode 100644
index 00000000000..f7f23da3823
--- /dev/null
+++ b/packages/cli/src/modules/chat-hub/__tests__/chat-hub-workflow.service.test.ts
@@ -0,0 +1,576 @@
+import type { WorkflowRepository, SharedWorkflowRepository } from '@n8n/db';
+import type { Logger } from '@n8n/backend-common';
+import { mock } from 'jest-mock-extended';
+import type { BinaryDataService } from 'n8n-core';
+import type { IBinaryData } from 'n8n-workflow';
+
+import { ChatHubWorkflowService } from '../chat-hub-workflow.service';
+import { ChatHubMessage } from '../chat-hub-message.entity';
+import { ChatHubSession } from '../chat-hub-session.entity';
+import { ChatHubAttachmentService } from '../chat-hub.attachment.service';
+import type { ChatHubMessageRepository } from '../chat-message.repository';
+
+describe('ChatHubWorkflowService', () => {
+	const logger = mock<Logger>();
+	const workflowRepository = mock<WorkflowRepository>();
+	const sharedWorkflowRepository = mock<SharedWorkflowRepository>();
+	const binaryDataService = mock<BinaryDataService>();
+	const messageRepository = mock<ChatHubMessageRepository>();
+
+	let chatHubAttachmentService: ChatHubAttachmentService;
+	let service: ChatHubWorkflowService;
+
+	beforeEach(() => {
+		jest.resetAllMocks();
+
+		// Create real ChatHubAttachmentService with mocked dependencies
+		chatHubAttachmentService = new ChatHubAttachmentService(binaryDataService, messageRepository);
+
+		service = new ChatHubWorkflowService(
+			logger,
+			workflowRepository,
+			sharedWorkflowRepository,
+			chatHubAttachmentService,
+		);
+
+		// Mock repository methods
+		const mockEntityManager = {
+			save: jest.fn().mockImplementation(async (entity) => {
+				// Return the entity with an ID added
+				return { ...entity, id: 'workflow-123' };
+			}),
+		} as any;
+
+		Object.defineProperty(workflowRepository, 'manager', {
+			value: {
+				transaction: jest.fn((cb) => cb(mockEntityManager)),
+			},
+			writable: true,
+		});
+
+		(sharedWorkflowRepository.create as jest.Mock) = jest.fn().mockReturnValue({});
+	});
+
+	describe('createChatWorkflow', () => {
+		describe('message history handling', () => {
+			it('should handle empty history', async () => {
+				const mockHistory: ChatHubMessage[] = [];
+
+				const result = await service.createChatWorkflow(
+					'user-123',
+					'session-456',
+					'project-789',
+					mockHistory,
+					'Hello',
+					[],
+					{ openAiApi: { id: 'cred-123', name: 'OpenAI' } },
+					{ provider: 'openai', model: 'gpt-4' },
+					undefined,
+					[],
+					'UTC',
+				);
+
+				const restoreMemoryNode = result.workflowData.nodes.find(
+					(node) => node.name === 'Restore Chat Memory',
+				);
+				expect(restoreMemoryNode?.parameters?.messages).toBeDefined();
+
+				const messageValues = (restoreMemoryNode?.parameters?.messages as any)?.messageValues;
+				expect(messageValues).toHaveLength(0);
+			});
+
+			it('should handle multiple messages', async () => {
+				const message1 = new ChatHubMessage();
+				message1.id = 'msg-1';
+				message1.content = 'First message';
+				message1.type = 'human';
+				message1.attachments = [];
+				message1.sessionId = 'session-456';
+				message1.session = new ChatHubSession();
+				message1.status = 'running';
+
+				const message2 = new ChatHubMessage();
+				message2.id = 'msg-2';
+				message2.content = 'Second message';
+				message2.type = 'ai';
+				message2.attachments = [];
+				message2.sessionId = 'session-456';
+				message2.session = new ChatHubSession();
+				message2.status = 'running';
+
+				const message3 = new ChatHubMessage();
+				message3.id = 'msg-3';
+				message3.content = 'Third message';
+				message3.type = 'human';
+				message3.attachments = [];
+				message3.sessionId = 'session-456';
+				message3.session = new ChatHubSession();
+				message3.status = 'running';
+
+				const mockHistory: ChatHubMessage[] = [message1, message2, message3];
+
+				const result = await service.createChatWorkflow(
+					'user-123',
+					'session-456',
+					'project-789',
+					mockHistory,
+					'Hello',
+					[],
+					{ openAiApi: { id: 'cred-123', name: 'OpenAI' } },
+					{ provider: 'openai', model: 'gpt-4' },
+					undefined,
+					[],
+					'UTC',
+				);
+
+				const restoreMemoryNode = result.workflowData.nodes.find(
+					(node) => node.name === 'Restore Chat Memory',
+				);
+				expect(restoreMemoryNode?.parameters?.messages).toBeDefined();
+
+				const messageValues = (restoreMemoryNode?.parameters?.messages as any)?.messageValues;
+				expect(messageValues).toHaveLength(3);
+				expect(messageValues[0]).toEqual({
+					type: 'user',
+					message: 'First message',
+					hideFromUI: false,
+				});
+				expect(messageValues[1]).toEqual({
+					type: 'ai',
+					message: 'Second message',
+					hideFromUI: false,
+				});
+				expect(messageValues[2]).toEqual({
+					type: 'user',
+					message: 'Third message',
+					hideFromUI: false,
+				});
+			});
+		});
+
+		describe('attachment files', () => {
+			it('should convert binary data to data URL when attachment has id', async () => {
+				const mockAttachment: IBinaryData = {
+					id: 'filesystem-v2:chat-hub/sessions/session-456/messages/msg-1/binary_data/bin-1',
+					data: 'filesystem-v2',
+					mimeType: 'image/png',
+					fileName: 'test.png',
+					fileSize: '100 kB',
+					fileExtension: 'png',
+				};
+
+				const mockMessage = new ChatHubMessage();
+				mockMessage.id = 'msg-1';
+				mockMessage.content = 'Check this image';
+				mockMessage.type = 'human';
+				mockMessage.attachments = [mockAttachment];
+				mockMessage.sessionId = 'session-456';
+				mockMessage.session = new ChatHubSession();
+				mockMessage.status = 'running';
+
+				const mockHistory: ChatHubMessage[] = [mockMessage];
+
+				const mockImageBuffer = Buffer.from('fake-image-data', 'base64');
+				binaryDataService.getAsBuffer.mockResolvedValue(mockImageBuffer);
+
+				const result = await service.createChatWorkflow(
+					'user-123',
+					'session-456',
+					'project-789',
+					mockHistory,
+					'Hello',
+					[],
+					{ openAiApi: { id: 'cred-123', name: 'OpenAI' } },
+					{ provider: 'openai', model: 'gpt-4' },
+					undefined,
+					[],
+					'UTC',
+				);
+
+				expect(binaryDataService.getAsBuffer).toHaveBeenCalledWith(mockAttachment);
+
+				const expectedDataUrl = `data:${mockAttachment.mimeType};base64,${mockImageBuffer.toString('base64')}`;
+				const restoreMemoryNode = result.workflowData.nodes.find(
+					(node) => node.name === 'Restore Chat Memory',
+				);
+				expect(restoreMemoryNode?.parameters?.messages).toBeDefined();
+				expect((restoreMemoryNode?.parameters?.messages as any)?.messageValues[0].message).toEqual([
+					{ type: 'text', text: 'Check this image' },
+					{ type: 'image_url', image_url: expectedDataUrl },
+				]);
+			});
+
+			it('should use data URL directly when attachment has data but no id', async () => {
+				const mockAttachment: IBinaryData = {
+					data: 'data:image/png;base64,iVBORw0KGgoAAAANS',
+					mimeType: 'image/png',
+					fileName: 'test.png',
+				};
+
+				const mockMessage = new ChatHubMessage();
+				mockMessage.id = 'msg-1';
+				mockMessage.content = 'Check this image';
+				mockMessage.type = 'human';
+				mockMessage.attachments = [mockAttachment];
+				mockMessage.sessionId = 'session-456';
+				mockMessage.session = new ChatHubSession();
+				mockMessage.status = 'running';
+
+				const mockHistory: ChatHubMessage[] = [mockMessage];
+
+				const result = await service.createChatWorkflow(
+					'user-123',
+					'session-456',
+					'project-789',
+					mockHistory,
+					'Hello',
+					[],
+					{ openAiApi: { id: 'cred-123', name: 'OpenAI' } },
+					{ provider: 'openai', model: 'gpt-4' },
+					undefined,
+					[],
+					'UTC',
+				);
+
+				const restoreMemoryNode = result.workflowData.nodes.find(
+					(node) => node.name === 'Restore Chat Memory',
+				);
+				expect(restoreMemoryNode?.parameters?.messages).toBeDefined();
+				expect((restoreMemoryNode?.parameters?.messages as any)?.messageValues[0].message).toEqual([
+					{ type: 'text', text: 'Check this image' },
+					{ type: 'image_url', image_url: mockAttachment.data },
+				]);
+			});
+
+			it('should handle multiple attachments correctly', async () => {
+				const mockAttachmentWithId: IBinaryData = {
+					id: 'filesystem-v2:chat-hub/sessions/session-456/messages/msg-1/binary_data/bin-2',
+					data: 'filesystem-v2',
+					mimeType: 'image/png',
+					fileName: 'test1.png',
+					fileSize: '150 kB',
+					fileExtension: 'png',
+				};
+
+				const mockAttachmentWithData: IBinaryData = {
+					data: 'data:image/jpeg;base64,/9j/4AAQ',
+					mimeType: 'image/jpeg',
+					fileName: 'test2.jpg',
+				};
+
+				const mockMessage = new ChatHubMessage();
+				mockMessage.id = 'msg-1';
+				mockMessage.content = 'Check these images';
+				mockMessage.type = 'human';
+				mockMessage.attachments = [mockAttachmentWithId, mockAttachmentWithData];
+				mockMessage.sessionId = 'session-456';
+				mockMessage.session = new ChatHubSession();
+				mockMessage.status = 'running';
+
+				const mockHistory: ChatHubMessage[] = [mockMessage];
+
+				const mockImageBuffer = Buffer.from('fake-image-data-1', 'base64');
+				binaryDataService.getAsBuffer.mockResolvedValue(mockImageBuffer);
+
+				const result = await service.createChatWorkflow(
+					'user-123',
+					'session-456',
+					'project-789',
+					mockHistory,
+					'Hello',
+					[],
+					{ openAiApi: { id: 'cred-123', name: 'OpenAI' } },
+					{ provider: 'openai', model: 'gpt-4' },
+					undefined,
+					[],
+					'UTC',
+				);
+
+				expect(binaryDataService.getAsBuffer).toHaveBeenCalledTimes(1);
+				expect(binaryDataService.getAsBuffer).toHaveBeenCalledWith(mockAttachmentWithId);
+				expect(binaryDataService.createSignedToken).not.toHaveBeenCalled();
+
+				const expectedDataUrl = `data:${mockAttachmentWithId.mimeType};base64,${mockImageBuffer.toString('base64')}`;
+				const restoreMemoryNode = result.workflowData.nodes.find(
+					(node) => node.name === 'Restore Chat Memory',
+				);
+				expect(restoreMemoryNode?.parameters?.messages).toBeDefined();
+				expect((restoreMemoryNode?.parameters?.messages as any)?.messageValues[0].message).toEqual([
+					{ type: 'text', text: 'Check these images' },
+					{ type: 'image_url', image_url: expectedDataUrl },
+					{ type: 'image_url', image_url: mockAttachmentWithData.data },
+				]);
+			});
+
+			it('should omit attachments that exceed maxTotalPayloadSize limit', async () => {
+				// Create a large data URL that, when added to another attachment, will exceed the 20MB limit (90% of 20MB = 18MB)
+				const largeDataUrl = 'data:image/png;base64,' + 'A'.repeat(10 * 1024 * 1024);
+				const smallDataUrl = 'data:image/png;base64,' + 'B'.repeat(9 * 1024 * 1024);
+
+				const mockAttachment1: IBinaryData = {
+					data: largeDataUrl,
+					mimeType: 'image/png',
+					fileName: 'large.png',
+				};
+
+				const mockAttachment2: IBinaryData = {
+					data: smallDataUrl,
+					mimeType: 'image/png',
+					fileName: 'small.png',
+				};
+
+				const mockMessage = new ChatHubMessage();
+				mockMessage.id = 'msg-1';
+				mockMessage.content = 'Check these images';
+				mockMessage.type = 'human';
+				mockMessage.attachments = [mockAttachment1, mockAttachment2];
+				mockMessage.sessionId = 'session-456';
+				mockMessage.session = new ChatHubSession();
+				mockMessage.status = 'running';
+
+				const mockHistory: ChatHubMessage[] = [mockMessage];
+
+				const result = await service.createChatWorkflow(
+					'user-123',
+					'session-456',
+					'project-789',
+					mockHistory,
+					'Hello',
+					[],
+					{ openAiApi: { id: 'cred-123', name: 'OpenAI' } },
+					{ provider: 'openai', model: 'gpt-4' },
+					undefined,
+					[],
+					'UTC',
+				);
+
+				const restoreMemoryNode = result.workflowData.nodes.find(
+					(node) => node.name === 'Restore Chat Memory',
+				);
+				expect(restoreMemoryNode?.parameters?.messages).toBeDefined();
+
+				const messageContent = (restoreMemoryNode?.parameters?.messages as any)?.messageValues[0]
+					.message;
+
+				// Should include text and only the first attachment since the second would exceed the limit
+				expect(messageContent).toEqual([
+					{ type: 'text', text: 'Check these images' },
+					{ type: 'image_url', image_url: largeDataUrl },
+					{ type: 'text', text: 'File: small.png\n(Content omitted due to size limit)' },
+				]);
+			});
+
+			it('should omit attachments across multiple messages when total size exceeds limit', async () => {
+				const attachment1DataUrl = 'data:image/png;base64,' + 'A'.repeat(5 * 1024 * 1024);
+				const mockAttachment1: IBinaryData = {
+					data: attachment1DataUrl,
+					mimeType: 'image/png',
+					fileName: 'first.png',
+				};
+
+				const message1 = new ChatHubMessage();
+				message1.id = 'msg-1';
+				message1.content = 'First message with attachment';
+				message1.type = 'human';
+				message1.attachments = [mockAttachment1];
+				message1.sessionId = 'session-456';
+				message1.session = new ChatHubSession();
+				message1.status = 'running';
+
+				const attachment2DataUrl = 'data:image/jpeg;base64,' + 'B'.repeat(8 * 1024 * 1024);
+				const mockAttachment2: IBinaryData = {
+					data: attachment2DataUrl,
+					mimeType: 'image/jpeg',
+					fileName: 'second.jpg',
+				};
+
+				const message2 = new ChatHubMessage();
+				message2.id = 'msg-2';
+				message2.content = 'Second message';
+				message2.type = 'ai';
+				message2.attachments = [mockAttachment2];
+				message2.sessionId = 'session-456';
+				message2.session = new ChatHubSession();
+				message2.status = 'running';
+
+				const attachment3DataUrl = 'data:image/png;base64,' + 'C'.repeat(6 * 1024 * 1024);
+				const mockAttachment3: IBinaryData = {
+					data: attachment3DataUrl,
+					mimeType: 'image/png',
+					fileName: 'third.png',
+				};
+
+				const message3 = new ChatHubMessage();
+				message3.id = 'msg-3';
+				message3.content = 'Third message';
+				message3.type = 'human';
+				message3.attachments = [mockAttachment3];
+				message3.sessionId = 'session-456';
+				message3.session = new ChatHubSession();
+				message3.status = 'running';
+
+				const mockHistory: ChatHubMessage[] = [message1, message2, message3];
+
+				const result = await service.createChatWorkflow(
+					'user-123',
+					'session-456',
+					'project-789',
+					mockHistory,
+					'Hello',
+					[],
+					{ openAiApi: { id: 'cred-123', name: 'OpenAI' } },
+					{ provider: 'openai', model: 'gpt-4' },
+					undefined,
+					[],
+					'UTC',
+				);
+
+				const restoreMemoryNode = result.workflowData.nodes.find(
+					(node) => node.name === 'Restore Chat Memory',
+				);
+				expect(restoreMemoryNode?.parameters?.messages).toBeDefined();
+
+				const messageValues = (restoreMemoryNode?.parameters?.messages as any)?.messageValues;
+				expect(messageValues).toHaveLength(3);
+
+				// First message attachment is skipped due to cumulative size limit (processed last, size limit reached)
+				expect(messageValues[0].message).toEqual([
+					{ type: 'text', text: 'First message with attachment' },
+					{ type: 'text', text: 'File: first.png\n(Content omitted due to size limit)' },
+				]);
+
+				// Second message includes attachment
+				expect(messageValues[1].message).toEqual([
+					{ type: 'text', text: 'Second message' },
+					{ type: 'image_url', image_url: attachment2DataUrl },
+				]);
+
+				// Third message includes attachment (processed first)
+				expect(messageValues[2].message).toEqual([
+					{ type: 'text', text: 'Third message' },
+					{ type: 'image_url', image_url: attachment3DataUrl },
+				]);
+			});
+
+			it('should include omitted content message when attachment exceeds size limit', async () => {
+				const largeDataUrl = 'data:image/png;base64,' + 'A'.repeat(17 * 1024 * 1024);
+
+				const mockAttachment: IBinaryData = {
+					data: largeDataUrl,
+					mimeType: 'image/png',
+					fileName: 'large-image.png',
+				};
+
+				const mockMessage = new ChatHubMessage();
+				mockMessage.id = 'msg-1';
+				mockMessage.content = 'Check this large image';
+				mockMessage.type = 'human';
+				mockMessage.attachments = [mockAttachment];
+				mockMessage.sessionId = 'session-456';
+				mockMessage.session = new ChatHubSession();
+				mockMessage.status = 'running';
+
+				const anotherAttachment: IBinaryData = {
+					data: 'data:image/jpeg;base64,' + 'B'.repeat(2 * 1024 * 1024),
+					mimeType: 'image/jpeg',
+					fileName: 'small-image.jpg',
+				};
+
+				const mockMessage2 = new ChatHubMessage();
+				mockMessage2.id = 'msg-2';
+				mockMessage2.content = 'And this small one';
+				mockMessage2.type = 'human';
+				mockMessage2.attachments = [anotherAttachment];
+				mockMessage2.sessionId = 'session-456';
+				mockMessage2.session = new ChatHubSession();
+				mockMessage2.status = 'running';
+
+				const mockHistory: ChatHubMessage[] = [mockMessage, mockMessage2];
+
+				const result = await service.createChatWorkflow(
+					'user-123',
+					'session-456',
+					'project-789',
+					mockHistory,
+					'Hello',
+					[],
+					{ openAiApi: { id: 'cred-123', name: 'OpenAI' } },
+					{ provider: 'openai', model: 'gpt-4' },
+					undefined,
+					[],
+					'UTC',
+				);
+
+				const restoreMemoryNode = result.workflowData.nodes.find(
+					(node) => node.name === 'Restore Chat Memory',
+				);
+				expect(restoreMemoryNode?.parameters?.messages).toBeDefined();
+
+				const messageValues = (restoreMemoryNode?.parameters?.messages as any)?.messageValues;
+
+				expect(messageValues[0].message).toEqual([
+					{ type: 'text', text: 'Check this large image' },
+					{ type: 'text', text: 'File: large-image.png\n(Content omitted due to size limit)' },
+				]);
+
+				expect(messageValues[1].message).toEqual([
+					{ type: 'text', text: 'And this small one' },
+					{ type: 'image_url', image_url: anotherAttachment.data },
+				]);
+			});
+
+			it('should handle text file attachments as text blocks', async () => {
+				const textContent = 'This is the content of the text file.\nIt has multiple lines.';
+				const mockAttachment: IBinaryData = {
+					id: 'filesystem-v2:chat-hub/sessions/session-456/messages/msg-1/binary_data/text-1',
+					data: 'filesystem-v2',
+					mimeType: 'text/plain',
+					fileName: 'document.txt',
+					fileSize: '60',
+					fileExtension: 'txt',
+				};
+
+				const mockMessage = new ChatHubMessage();
+				mockMessage.id = 'msg-1';
+				mockMessage.content = 'Here is a text file';
+				mockMessage.type = 'human';
+				mockMessage.attachments = [mockAttachment];
+				mockMessage.sessionId = 'session-456';
+				mockMessage.session = new ChatHubSession();
+				mockMessage.status = 'running';
+
+				const mockHistory: ChatHubMessage[] = [mockMessage];
+
+				// Mock getAsBuffer to return the text content
+				binaryDataService.getAsBuffer.mockResolvedValue(Buffer.from(textContent, 'utf-8'));
+
+				const result = await service.createChatWorkflow(
+					'user-123',
+					'session-456',
+					'project-789',
+					mockHistory,
+					'Hello',
+					[],
+					{ openAiApi: { id: 'cred-123', name: 'OpenAI' } },
+					{ provider: 'openai', model: 'gpt-4' },
+					undefined,
+					[],
+					'UTC',
+				);
+
+				expect(binaryDataService.getAsBuffer).toHaveBeenCalledWith(mockAttachment);
+
+				const restoreMemoryNode = result.workflowData.nodes.find(
+					(node) => node.name === 'Restore Chat Memory',
+				);
+				expect(restoreMemoryNode?.parameters?.messages).toBeDefined();
+
+				const messageValues = (restoreMemoryNode?.parameters?.messages as any)?.messageValues;
+				expect(messageValues[0].message).toEqual([
+					{ type: 'text', text: 'Here is a text file' },
+					{ type: 'text', text: `File: document.txt\nContent: \n${textContent}` },
+				]);
+			});
+		});
+	});
+});
diff --git a/packages/cli/src/modules/chat-hub/chat-hub-workflow.service.ts b/packages/cli/src/modules/chat-hub/chat-hub-workflow.service.ts
index 334df173816..baf699ed316 100644
--- a/packages/cli/src/modules/chat-hub/chat-hub-workflow.service.ts
+++ b/packages/cli/src/modules/chat-hub/chat-hub-workflow.service.ts
@@ -26,13 +26,15 @@ import {
 	NodeConnectionTypes,
 	OperationalError,
 	type IBinaryData,
+	type NodeParameterValueType,
 } from 'n8n-workflow';
 import { v4 as uuidv4 } from 'uuid';
 
 import { ChatHubMessage } from './chat-hub-message.entity';
 import { NODE_NAMES, PROVIDER_NODE_TYPE_MAP } from './chat-hub.constants';
-import { MessageRecord, type ChatTriggerResponseMode } from './chat-hub.types';
+import { MessageRecord, type ContentBlock, type ChatTriggerResponseMode } from './chat-hub.types';
 import { getMaxContextWindowTokens } from './context-limits';
+import { ChatHubAttachmentService } from './chat-hub.attachment.service';
 
 @Service()
 export class ChatHubWorkflowService {
@@ -40,6 +42,7 @@ export class ChatHubWorkflowService {
 		private readonly logger: Logger,
 		private readonly workflowRepository: WorkflowRepository,
 		private readonly sharedWorkflowRepository: SharedWorkflowRepository,
+		private readonly chatHubAttachmentService: ChatHubAttachmentService,
 	) {}
 
 	async createChatWorkflow(
@@ -65,7 +68,7 @@ export class ChatHubWorkflowService {
 				`Creating chat workflow for user ${userId} and session ${sessionId}, provider ${model.provider}`,
 			);
 
-			const { nodes, connections, executionData } = this.buildChatWorkflow({
+			const { nodes, connections, executionData } = await this.buildChatWorkflow({
 				userId,
 				sessionId,
 				history,
@@ -255,7 +258,7 @@ export class ChatHubWorkflowService {
 		return uniqueName;
 	}
 
-	private buildChatWorkflow({
+	private async buildChatWorkflow({
 		userId,
 		sessionId,
 		history,
@@ -280,7 +283,7 @@ export class ChatHubWorkflowService {
 		const toolsAgentNode = this.buildToolsAgentNode(model, systemMessage);
 		const modelNode = this.buildModelNode(credentials, model);
 		const memoryNode = this.buildMemoryNode(20);
-		const restoreMemoryNode = this.buildRestoreMemoryNode(history);
+		const restoreMemoryNode = await this.buildRestoreMemoryNode(history);
 		const clearMemoryNode = this.buildClearMemoryNode();
 		const mergeNode = this.buildMergeNode();
 
@@ -673,29 +676,15 @@ ${this.getSystemMessageMetadata(timeZone)}`;
 		};
 	}
 
-	private buildRestoreMemoryNode(history: ChatHubMessage[]): INode {
+	private async buildRestoreMemoryNode(history: ChatHubMessage[]): Promise<INode> {
+		const messageValues = await this.buildMessageValuesWithAttachments(history);
+
 		return {
 			parameters: {
 				mode: 'insert',
 				insertMode: 'override',
 				messages: {
-					messageValues: history
-						// Empty messages can't be restored by the memory manager
-						.filter((message) => message.content.length > 0)
-						.map((message) => {
-							const typeMap: Record<string, MessageRecord['type']> = {
-								human: 'user',
-								ai: 'ai',
-								system: 'system',
-							};
-
-							// TODO: Tool messages etc?
-							return {
-								type: typeMap[message.type] || 'system',
-								message: message.content,
-								hideFromUI: false,
-							};
-						}),
+					messageValues: messageValues as unknown as NodeParameterValueType,
 				},
 			},
 			type: MEMORY_MANAGER_NODE_TYPE,
@@ -706,6 +695,128 @@ ${this.getSystemMessageMetadata(timeZone)}`;
 		};
 	}
 
+	private async buildMessageValuesWithAttachments(
+		history: ChatHubMessage[],
+	): Promise<MessageRecord[]> {
+		// Gemini has 20MB limit, the value should also be what n8n instance can safely handle
+		const maxTotalPayloadSize = 20 * 1024 * 1024 * 0.9;
+
+		const typeMap: Record<string, MessageRecord['type']> = {
+			human: 'user',
+			ai: 'ai',
+			system: 'system',
+		};
+
+		const messageValues: MessageRecord[] = [];
+		let currentTotalSize = 0;
+
+		const messages = history.slice().reverse(); // Traversing messages from last to prioritize newer attachments
+
+		for (const message of messages) {
+			// Empty messages can't be restored by the memory manager
+			if (message.content.length === 0) {
+				continue;
+			}
+
+			const attachments = message.attachments ?? [];
+			const type = typeMap[message.type] || 'system';
+
+			// TODO: Tool messages etc?
+
+			const textSize = message.content.length;
+			currentTotalSize += textSize;
+
+			if (attachments.length === 0) {
+				messageValues.push({
+					type,
+					message: message.content,
+					hideFromUI: false,
+				});
+				continue;
+			}
+
+			const blocks: ContentBlock[] = [{ type: 'text', text: message.content }];
+
+			// Add attachments if within size limit
+			for (const attachment of attachments) {
+				const block = await this.buildContentBlockForAttachment(
+					attachment,
+					currentTotalSize,
+					maxTotalPayloadSize,
+				);
+				blocks.push(block);
+				currentTotalSize += block.type === 'text' ? block.text.length : block.image_url.length;
+			}
+
+			messageValues.push({
+				type,
+				message: blocks,
+				hideFromUI: false,
+			});
+		}
+
+		// Reverse to restore original order
+		messageValues.reverse();
+
+		return messageValues;
+	}
+
+	private async buildContentBlockForAttachment(
+		attachment: IBinaryData,
+		currentTotalSize: number,
+		maxTotalPayloadSize: number,
+	): Promise<ContentBlock> {
+		class TotalFileSizeExceededError extends Error {}
+
+		try {
+			if (currentTotalSize >= maxTotalPayloadSize) {
+				throw new TotalFileSizeExceededError();
+			}
+
+			if (this.isTextFile(attachment.mimeType)) {
+				const buffer = await this.chatHubAttachmentService.getAsBuffer(attachment);
+				const content = buffer.toString('utf-8');
+
+				if (currentTotalSize + content.length > maxTotalPayloadSize) {
+					throw new TotalFileSizeExceededError();
+				}
+
+				return {
+					type: 'text',
+					text: `File: ${attachment.fileName ?? 'attachment'}\nContent: \n${content}`,
+				};
+			}
+
+			const url = await this.chatHubAttachmentService.getDataUrl(attachment);
+
+			if (currentTotalSize + url.length > maxTotalPayloadSize) {
+				throw new TotalFileSizeExceededError();
+			}
+
+			return { type: 'image_url', image_url: url };
+		} catch (e) {
+			if (e instanceof TotalFileSizeExceededError) {
+				return {
+					type: 'text',
+					text: `File: ${attachment.fileName ?? 'attachment'}\n(Content omitted due to size limit)`,
+				};
+			}
+
+			throw e;
+		}
+	}
+
+	private isTextFile(mimeType: string): boolean {
+		return (
+			mimeType.startsWith('text/') ||
+			mimeType === 'application/json' ||
+			mimeType === 'application/xml' ||
+			mimeType === 'application/csv' ||
+			mimeType === 'application/x-yaml' ||
+			mimeType === 'application/yaml'
+		);
+	}
+
 	private buildClearMemoryNode(): INode {
 		return {
 			parameters: {
diff --git a/packages/cli/src/modules/chat-hub/chat-hub.attachment.service.ts b/packages/cli/src/modules/chat-hub/chat-hub.attachment.service.ts
index 7f73c759ef9..a7aeffd4d39 100644
--- a/packages/cli/src/modules/chat-hub/chat-hub.attachment.service.ts
+++ b/packages/cli/src/modules/chat-hub/chat-hub.attachment.service.ts
@@ -126,6 +126,22 @@ export class ChatHubAttachmentService {
 		);
 	}
 
+	async getDataUrl(binaryData: IBinaryData): Promise<string> {
+		if (binaryData.data.startsWith('data:')) {
+			return binaryData.data;
+		}
+
+		const buffer = await this.binaryDataService.getAsBuffer(binaryData);
+		const base64Data = buffer.toString(BINARY_ENCODING);
+		const mimeType = binaryData.mimeType || 'application/octet-stream';
+
+		return `data:${mimeType};base64,${base64Data}`;
+	}
+
+	async getAsBuffer(binaryData: IBinaryData): Promise<Buffer<ArrayBufferLike>> {
+		return await this.binaryDataService.getAsBuffer(binaryData);
+	}
+
 	/**
 	 * Processes a single attachment by populating metadata and storing it.
 	 */
diff --git a/packages/cli/src/modules/chat-hub/chat-hub.types.ts b/packages/cli/src/modules/chat-hub/chat-hub.types.ts
index a88711b63bb..f40b0ff9ec9 100644
--- a/packages/cli/src/modules/chat-hub/chat-hub.types.ts
+++ b/packages/cli/src/modules/chat-hub/chat-hub.types.ts
@@ -43,11 +43,16 @@ export interface EditMessagePayload extends BaseMessagePayload {
 	message: string;
 }
 
+// From @langchain/core
+export type ContentBlock =
+	| { type: 'text'; text: string }
+	| { type: 'image_url'; image_url: string };
+
 // From packages/@n8n/nodes-langchain/nodes/memory/MemoryManager/MemoryManager.node.ts
 export type MessageRole = 'ai' | 'system' | 'user';
 export interface MessageRecord {
 	type: MessageRole;
-	message: string;
+	message: string | ContentBlock[];
 	hideFromUI: boolean;
 }
 
diff --git a/packages/frontend/editor-ui/src/features/ai/chatHub/chat.utils.ts b/packages/frontend/editor-ui/src/features/ai/chatHub/chat.utils.ts
index 3f60576b2af..457d57e1c85 100644
--- a/packages/frontend/editor-ui/src/features/ai/chatHub/chat.utils.ts
+++ b/packages/frontend/editor-ui/src/features/ai/chatHub/chat.utils.ts
@@ -349,17 +349,13 @@ export function createSessionFromStreamingState(streaming: ChatStreamingState):
 	};
 }
 
-export function createMimeTypes(modalities: ChatHubInputModality[]): string | undefined {
-	if (modalities.length === 0) {
-		return undefined;
-	}
-
+export function createMimeTypes(modalities: ChatHubInputModality[]): string {
 	// If 'file' modality is present, accept all file types
 	if (modalities.includes('file')) {
 		return '*/*';
 	}
 
-	const mimeTypes: string[] = [];
+	const mimeTypes: string[] = ['text/*'];
 
 	for (const modality of modalities) {
 		if (modality === 'image') {
@@ -373,5 +369,5 @@ export function createMimeTypes(modalities: ChatHubInputModality[]): string | un
 		}
 	}
 
-	return mimeTypes.length > 0 ? mimeTypes.join(',') : undefined;
+	return mimeTypes.join(',');
 }
diff --git a/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatPrompt.vue b/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatPrompt.vue
index d8e93315089..6ed57061aa5 100644
--- a/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatPrompt.vue
+++ b/packages/frontend/editor-ui/src/features/ai/chatHub/components/ChatPrompt.vue
@@ -60,10 +60,9 @@ const llmProvider = computed<ChatHubLLMProvider | undefined>(() =>
 	isLlmProviderModel(selectedModel?.model) ? selectedModel?.model.provider : undefined,
 );
 
-const acceptedMimeTypes = computed(() => {
-	const modalities = selectedModel?.metadata.inputModalities;
-	return modalities ? createMimeTypes(modalities) : undefined;
-});
+const acceptedMimeTypes = computed(() =>
+	createMimeTypes(selectedModel?.metadata.inputModalities ?? []),
+);
 
 const canUploadFiles = computed(() => !!acceptedMimeTypes.value);