From a60d106ebb4fb71e80f90a17965d7fb79d7806c6 Mon Sep 17 00:00:00 2001
From: Jaakko Husso <jaakko@n8n.io>
Date: Wed, 26 Feb 2025 10:23:22 +0200
Subject: [PATCH 01/47] feat(core): Make Tools Agent the default Agent type,
 deprecate other agent types (#13459)

---
 .../nodes/agents/Agent/Agent.node.ts          | 39 +++++++++++++++++--
 .../Agent/agents/ReActAgent/description.ts    |  7 ++++
 .../agents/Agent/agents/ReActAgent/execute.ts |  2 +
 3 files changed, 44 insertions(+), 4 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 c5a46a1192..45c9d10e8c 100644
--- a/packages/@n8n/nodes-langchain/nodes/agents/Agent/Agent.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/Agent.node.ts
@@ -27,7 +27,13 @@ import { toolsAgentExecute } from './agents/ToolsAgent/execute';
 // Function used in the inputs expression to figure out which inputs to
 // display based on the agent type
 function getInputs(
-	agent: 'toolsAgent' | 'conversationalAgent' | 'openAiFunctionsAgent' | 'reActAgent' | 'sqlAgent',
+	agent:
+		| 'toolsAgent'
+		| 'conversationalAgent'
+		| 'openAiFunctionsAgent'
+		| 'planAndExecuteAgent'
+		| 'reActAgent'
+		| 'sqlAgent',
 	hasOutputParser?: boolean,
 ): Array<NodeConnectionType | INodeInputConfiguration> {
 	interface SpecialInput {
@@ -256,7 +262,7 @@ export class Agent implements INodeType {
 		icon: 'fa:robot',
 		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: 'Generates an action plan and executes it. Can use external tools.',
 		subtitle:
 			"={{ {	toolsAgent: 'Tools Agent', conversationalAgent: 'Conversational Agent', openAiFunctionsAgent: 'OpenAI Functions Agent', reActAgent: 'ReAct Agent', sqlAgent: 'SQL Agent', planAndExecuteAgent: 'Plan and Execute Agent' }[$parameter.agent] }}",
@@ -322,6 +328,24 @@ export class Agent implements INodeType {
 					},
 				},
 			},
+			{
+				displayName:
+					"This node is using Agent that has been deprecated. Please switch to using 'Tools Agent' instead.",
+				name: 'deprecated',
+				type: 'notice',
+				default: '',
+				displayOptions: {
+					show: {
+						agent: [
+							'conversationalAgent',
+							'openAiFunctionsAgent',
+							'planAndExecuteAgent',
+							'reActAgent',
+							'sqlAgent',
+						],
+					},
+				},
+			},
 			// Make Conversational Agent the default agent for versions 1.5 and below
 			{
 				...agentTypeProperty,
@@ -331,10 +355,17 @@ export class Agent implements INodeType {
 				displayOptions: { show: { '@version': [{ _cnd: { lte: 1.5 } }] } },
 				default: 'conversationalAgent',
 			},
-			// Make Tools Agent the default agent for versions 1.6 and above
+			// Make Tools Agent the default agent for versions 1.6 and 1.7
 			{
 				...agentTypeProperty,
-				displayOptions: { show: { '@version': [{ _cnd: { gte: 1.6 } }] } },
+				displayOptions: { show: { '@version': [{ _cnd: { between: { from: 1.6, to: 1.7 } } }] } },
+				default: 'toolsAgent',
+			},
+			// Make Tools Agent the only agent option for versions 1.8 and above
+			{
+				...agentTypeProperty,
+				type: 'hidden',
+				displayOptions: { show: { '@version': [{ _cnd: { gte: 1.8 } }] } },
 				default: 'toolsAgent',
 			},
 			{
diff --git a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ReActAgent/description.ts b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ReActAgent/description.ts
index 890d83dc4a..20e74b07c2 100644
--- a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ReActAgent/description.ts
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ReActAgent/description.ts
@@ -96,6 +96,13 @@ export const reActAgentAgentProperties: INodeProperties[] = [
 					rows: 6,
 				},
 			},
+			{
+				displayName: 'Max Iterations',
+				name: 'maxIterations',
+				type: 'number',
+				default: 10,
+				description: 'The maximum number of iterations the agent will run before stopping',
+			},
 			{
 				displayName: 'Return Intermediate Steps',
 				name: 'returnIntermediateSteps',
diff --git a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ReActAgent/execute.ts b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ReActAgent/execute.ts
index 4db35634d6..32676af5ee 100644
--- a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ReActAgent/execute.ts
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ReActAgent/execute.ts
@@ -38,6 +38,7 @@ export async function reActAgentAgentExecute(
 		prefix?: string;
 		suffix?: string;
 		suffixChat?: string;
+		maxIterations?: number;
 		humanMessageTemplate?: string;
 		returnIntermediateSteps?: boolean;
 	};
@@ -60,6 +61,7 @@ export async function reActAgentAgentExecute(
 		agent,
 		tools,
 		returnIntermediateSteps: options?.returnIntermediateSteps === true,
+		maxIterations: options.maxIterations ?? 10,
 	});
 
 	const returnData: INodeExecutionData[] = [];

From 819fc2da63ce7f06d4702bce698d382eb64c45a3 Mon Sep 17 00:00:00 2001
From: Jaakko Husso <jaakko@n8n.io>
Date: Wed, 26 Feb 2025 10:24:11 +0200
Subject: [PATCH 02/47] feat(editor): Rename 'Window Buffer Memory' to 'Simple
 Memory' (#13477)

---
 cypress/constants.ts                                          | 2 +-
 .../memory/MemoryBufferWindow/MemoryBufferWindow.node.ts      | 4 ++--
 packages/frontend/@n8n/chat/resources/workflow-manual.json    | 4 ++--
 packages/frontend/@n8n/chat/resources/workflow.json           | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/cypress/constants.ts b/cypress/constants.ts
index cbbf838530..8186b23db0 100644
--- a/cypress/constants.ts
+++ b/cypress/constants.ts
@@ -52,7 +52,7 @@ export const PIPEDRIVE_NODE_NAME = 'Pipedrive';
 export const HTTP_REQUEST_NODE_NAME = 'HTTP Request';
 export const AGENT_NODE_NAME = 'AI Agent';
 export const BASIC_LLM_CHAIN_NODE_NAME = 'Basic LLM Chain';
-export const AI_MEMORY_WINDOW_BUFFER_MEMORY_NODE_NAME = 'Window Buffer Memory';
+export const AI_MEMORY_WINDOW_BUFFER_MEMORY_NODE_NAME = 'Simple Memory';
 export const AI_TOOL_CALCULATOR_NODE_NAME = 'Calculator';
 export const AI_TOOL_CODE_NODE_NAME = 'Code Tool';
 export const AI_TOOL_WIKIPEDIA_NODE_NAME = 'Wikipedia';
diff --git a/packages/@n8n/nodes-langchain/nodes/memory/MemoryBufferWindow/MemoryBufferWindow.node.ts b/packages/@n8n/nodes-langchain/nodes/memory/MemoryBufferWindow/MemoryBufferWindow.node.ts
index ab02339816..91282ce144 100644
--- a/packages/@n8n/nodes-langchain/nodes/memory/MemoryBufferWindow/MemoryBufferWindow.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/memory/MemoryBufferWindow/MemoryBufferWindow.node.ts
@@ -75,7 +75,7 @@ class MemoryChatBufferSingleton {
 
 export class MemoryBufferWindow implements INodeType {
 	description: INodeTypeDescription = {
-		displayName: 'Window Buffer Memory (easiest)',
+		displayName: 'Simple Memory',
 		name: 'memoryBufferWindow',
 		icon: 'fa:database',
 		iconColor: 'black',
@@ -83,7 +83,7 @@ export class MemoryBufferWindow implements INodeType {
 		version: [1, 1.1, 1.2, 1.3],
 		description: 'Stores in n8n memory, so no credentials required',
 		defaults: {
-			name: 'Window Buffer Memory',
+			name: 'Simple Memory',
 		},
 		codex: {
 			categories: ['AI'],
diff --git a/packages/frontend/@n8n/chat/resources/workflow-manual.json b/packages/frontend/@n8n/chat/resources/workflow-manual.json
index 606927859e..7aa88a6831 100644
--- a/packages/frontend/@n8n/chat/resources/workflow-manual.json
+++ b/packages/frontend/@n8n/chat/resources/workflow-manual.json
@@ -22,7 +22,7 @@
 				"sessionKey": "={{ $json.sessionId }}"
 			},
 			"id": "0a68a59a-8ab6-4fa5-a1ea-b7f99a93109b",
-			"name": "Window Buffer Memory",
+			"name": "Simple Memory",
 			"type": "@n8n/n8n-nodes-langchain.memoryBufferWindow",
 			"typeVersion": 1,
 			"position": [640, 540]
@@ -122,7 +122,7 @@
 				]
 			]
 		},
-		"Window Buffer Memory": {
+		"Simple Memory": {
 			"ai_memory": [
 				[
 					{
diff --git a/packages/frontend/@n8n/chat/resources/workflow.json b/packages/frontend/@n8n/chat/resources/workflow.json
index 3b2efb4a12..83e1e81285 100644
--- a/packages/frontend/@n8n/chat/resources/workflow.json
+++ b/packages/frontend/@n8n/chat/resources/workflow.json
@@ -22,7 +22,7 @@
 				"sessionKey": "={{ $json.sessionId }}"
 			},
 			"id": "b416df7b-4802-462f-8f74-f0a71dc4c0be",
-			"name": "Window Buffer Memory",
+			"name": "Simple Memory",
 			"type": "@n8n/n8n-nodes-langchain.memoryBufferWindow",
 			"typeVersion": 1,
 			"position": [340, 540]
@@ -66,7 +66,7 @@
 				]
 			]
 		},
-		"Window Buffer Memory": {
+		"Simple Memory": {
 			"ai_memory": [
 				[
 					{

From ab41fc3fb5f15e9c7ce7279b46cec90a511d0e0d Mon Sep 17 00:00:00 2001
From: Alex Grozav <alex@grozav.com>
Date: Wed, 26 Feb 2025 12:42:49 +0200
Subject: [PATCH 03/47] fix(editor): Fix keyboard shortcuts no longer working
 after editing sticky note (#13502)

---
 .../src/components/canvas/Canvas.vue          | 20 ++++++---
 .../canvas/elements/nodes/CanvasNode.vue      |  8 +++-
 .../render-types/CanvasNodeDefault.test.ts    | 15 +++++++
 .../nodes/render-types/CanvasNodeDefault.vue  | 14 +++++-
 .../render-types/CanvasNodeStickyNote.test.ts | 44 +++++++++++++++++++
 .../render-types/CanvasNodeStickyNote.vue     | 27 +++++++-----
 .../src/composables/useCanvasOperations.ts    |  5 +++
 packages/editor-ui/src/types/canvas.ts        |  2 +-
 packages/editor-ui/src/views/NodeView.vue     | 10 ++++-
 9 files changed, 122 insertions(+), 23 deletions(-)

diff --git a/packages/editor-ui/src/components/canvas/Canvas.vue b/packages/editor-ui/src/components/canvas/Canvas.vue
index bc4eab4407..a13c95e2d3 100644
--- a/packages/editor-ui/src/components/canvas/Canvas.vue
+++ b/packages/editor-ui/src/components/canvas/Canvas.vue
@@ -44,7 +44,8 @@ const emit = defineEmits<{
 	'update:modelValue': [elements: CanvasNode[]];
 	'update:node:position': [id: string, position: XYPosition];
 	'update:nodes:position': [events: CanvasNodeMoveEvent[]];
-	'update:node:active': [id: string];
+	'update:node:activated': [id: string];
+	'update:node:deactivated': [id: string];
 	'update:node:enabled': [id: string];
 	'update:node:selected': [id?: string];
 	'update:node:name': [id: string];
@@ -246,7 +247,7 @@ function selectUpstreamNodes(id: string) {
 
 const keyMap = computed(() => ({
 	ctrl_c: emitWithSelectedNodes((ids) => emit('copy:nodes', ids)),
-	enter: emitWithLastSelectedNode((id) => onSetNodeActive(id)),
+	enter: emitWithLastSelectedNode((id) => onSetNodeActivated(id)),
 	ctrl_a: () => addSelectedNodes(graphNodes.value),
 	// Support both key and code for zooming in and out
 	'shift_+|+|=|shift_Equal|Equal': async () => await onZoomIn(),
@@ -337,9 +338,13 @@ function onSelectionDragStop(event: NodeDragEvent) {
 	onUpdateNodesPosition(event.nodes.map(({ id, position }) => ({ id, position })));
 }
 
-function onSetNodeActive(id: string) {
-	props.eventBus.emit('nodes:action', { ids: [id], action: 'update:node:active' });
-	emit('update:node:active', id);
+function onSetNodeActivated(id: string) {
+	props.eventBus.emit('nodes:action', { ids: [id], action: 'update:node:activated' });
+	emit('update:node:activated', id);
+}
+
+function onSetNodeDeactivated(id: string) {
+	emit('update:node:deactivated', id);
 }
 
 function clearSelectedNodes() {
@@ -607,7 +612,7 @@ function onContextMenuAction(action: ContextMenuAction, nodeIds: string[]) {
 		case 'toggle_activation':
 			return emit('update:nodes:enabled', nodeIds);
 		case 'open':
-			return onSetNodeActive(nodeIds[0]);
+			return onSetNodeActivated(nodeIds[0]);
 		case 'rename':
 			return emit('update:node:name', nodeIds[0]);
 		case 'change_color':
@@ -772,7 +777,8 @@ provide(CanvasKey, {
 				@run="onRunNode"
 				@select="onSelectNode"
 				@toggle="onToggleNodeEnabled"
-				@activate="onSetNodeActive"
+				@activate="onSetNodeActivated"
+				@deactivate="onSetNodeDeactivated"
 				@open:contextmenu="onOpenNodeContextMenu"
 				@update="onUpdateNodeParameters"
 				@update:inputs="onUpdateNodeInputs"
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNode.vue b/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNode.vue
index feaec44b3f..3dcbdf105b 100644
--- a/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNode.vue
+++ b/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNode.vue
@@ -59,6 +59,7 @@ const emit = defineEmits<{
 	select: [id: string, selected: boolean];
 	toggle: [id: string];
 	activate: [id: string];
+	deactivate: [id: string];
 	'open:contextmenu': [id: string, event: MouseEvent, source: 'node-button' | 'node-right-click'];
 	update: [id: string, parameters: Record<string, unknown>];
 	'update:inputs': [id: string];
@@ -258,6 +259,10 @@ function onActivate() {
 	emit('activate', props.id);
 }
 
+function onDeactivate() {
+	emit('deactivate', props.id);
+}
+
 function onOpenContextMenuFromToolbar(event: MouseEvent) {
 	emit('open:contextmenu', props.id, event, 'node-button');
 }
@@ -395,7 +400,8 @@ onBeforeUnmount(() => {
 		/>
 
 		<CanvasNodeRenderer
-			@dblclick.stop="onActivate"
+			@activate="onActivate"
+			@deactivate="onDeactivate"
 			@move="onMove"
 			@update="onUpdate"
 			@open:contextmenu="onOpenContextMenuFromNode"
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeDefault.test.ts b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeDefault.test.ts
index 256720c879..8cdfaea8d8 100644
--- a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeDefault.test.ts
+++ b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeDefault.test.ts
@@ -5,6 +5,7 @@ import { createCanvasNodeProvide, createCanvasProvide } from '@/__tests__/data';
 import { createTestingPinia } from '@pinia/testing';
 import { setActivePinia } from 'pinia';
 import { CanvasConnectionMode, CanvasNodeRenderType } from '@/types';
+import { fireEvent } from '@testing-library/vue';
 
 const renderComponent = createComponentRenderer(CanvasNodeDefault, {
 	global: {
@@ -333,4 +334,18 @@ describe('CanvasNodeDefault', () => {
 			expect(getByTestId('canvas-trigger-node')).toMatchSnapshot();
 		});
 	});
+
+	it('should emit "activate" on double click', async () => {
+		const { getByText, emitted } = renderComponent({
+			global: {
+				provide: {
+					...createCanvasNodeProvide(),
+				},
+			},
+		});
+
+		await fireEvent.dblClick(getByText('Test Node'));
+
+		expect(emitted()).toHaveProperty('activate');
+	});
 });
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeDefault.vue b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeDefault.vue
index 0514965008..c30786d28c 100644
--- a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeDefault.vue
+++ b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeDefault.vue
@@ -12,10 +12,12 @@ const i18n = useI18n();
 
 const emit = defineEmits<{
 	'open:contextmenu': [event: MouseEvent];
+	activate: [id: string];
 }>();
 
 const { initialized, viewport } = useCanvas();
 const {
+	id,
 	label,
 	subtitle,
 	inputs,
@@ -122,10 +124,20 @@ watch(viewport, () => {
 function openContextMenu(event: MouseEvent) {
 	emit('open:contextmenu', event);
 }
+
+function onActivate() {
+	emit('activate', id.value);
+}
 </script>
 
 <template>
-	<div :class="classes" :style="styles" :data-test-id="dataTestId" @contextmenu="openContextMenu">
+	<div
+		:class="classes"
+		:style="styles"
+		:data-test-id="dataTestId"
+		@contextmenu="openContextMenu"
+		@dblclick.stop="onActivate"
+	>
 		<CanvasNodeTooltip v-if="renderOptions.tooltip" :visible="showTooltip" />
 		<slot />
 		<CanvasNodeStatusIcons v-if="!isDisabled" :class="$style.statusIcons" />
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeStickyNote.test.ts b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeStickyNote.test.ts
index e9d48541ff..8bbd17c877 100644
--- a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeStickyNote.test.ts
+++ b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeStickyNote.test.ts
@@ -68,4 +68,48 @@ describe('CanvasNodeStickyNote', () => {
 
 		expect(getComputedStyle(stickyOptions).display).toBe('none');
 	});
+
+	it('should emit "activate" on double click', async () => {
+		const { container, emitted } = renderComponent({
+			global: {
+				provide: {
+					...createCanvasNodeProvide({
+						id: 'sticky',
+					}),
+				},
+			},
+		});
+
+		const sticky = container.querySelector('.sticky-textarea');
+		if (!sticky) throw new Error('Sticky not found');
+
+		await fireEvent.dblClick(sticky);
+
+		expect(emitted()).toHaveProperty('activate');
+	});
+
+	it('should emit "deactivate" on blur', async () => {
+		const { container, emitted } = renderComponent({
+			global: {
+				provide: {
+					...createCanvasNodeProvide({
+						id: 'sticky',
+					}),
+				},
+			},
+		});
+
+		const sticky = container.querySelector('.sticky-textarea');
+
+		if (!sticky) throw new Error('Sticky not found');
+
+		await fireEvent.dblClick(sticky);
+
+		const stickyTextarea = container.querySelector('.sticky-textarea textarea');
+		if (!stickyTextarea) throw new Error('Textarea not found');
+
+		await fireEvent.blur(stickyTextarea);
+
+		expect(emitted()).toHaveProperty('deactivate');
+	});
 });
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeStickyNote.vue b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeStickyNote.vue
index 969c97311f..20ab85e7ae 100644
--- a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeStickyNote.vue
+++ b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeStickyNote.vue
@@ -14,7 +14,8 @@ defineOptions({
 const emit = defineEmits<{
 	update: [parameters: Record<string, unknown>];
 	move: [position: XYPosition];
-	dblclick: [event: MouseEvent];
+	activate: [id: string];
+	deactivate: [id: string];
 	'open:contextmenu': [event: MouseEvent];
 }>();
 
@@ -58,16 +59,20 @@ function onInputChange(value: string) {
 	});
 }
 
-function onEdit(edit: boolean) {
-	isActive.value = edit;
-}
+function onSetActive(value: boolean) {
+	if (isActive.value === value) return;
 
-function onDoubleClick(event: MouseEvent) {
-	emit('dblclick', event);
+	isActive.value = value;
+
+	if (value) {
+		emit('activate', id.value);
+	} else {
+		emit('deactivate', id.value);
+	}
 }
 
 function onActivate() {
-	onEdit(true);
+	onSetActive(true);
 }
 
 /**
@@ -83,11 +88,11 @@ function openContextMenu(event: MouseEvent) {
  */
 
 onMounted(() => {
-	eventBus.value?.on('update:node:active', onActivate);
+	eventBus.value?.on('update:node:activated', onActivate);
 });
 
 onBeforeUnmount(() => {
-	eventBus.value?.off('update:node:active', onActivate);
+	eventBus.value?.off('update:node:activated', onActivate);
 });
 </script>
 <template>
@@ -110,8 +115,8 @@ onBeforeUnmount(() => {
 		:background-color="renderOptions.color"
 		:edit-mode="isActive"
 		:read-only="isReadOnly"
-		@edit="onEdit"
-		@dblclick="onDoubleClick"
+		@edit="onSetActive"
+		@dblclick.stop="onActivate"
 		@update:model-value="onInputChange"
 		@contextmenu="openContextMenu"
 	/>
diff --git a/packages/editor-ui/src/composables/useCanvasOperations.ts b/packages/editor-ui/src/composables/useCanvasOperations.ts
index 3f898b01ab..4dbae1f0b4 100644
--- a/packages/editor-ui/src/composables/useCanvasOperations.ts
+++ b/packages/editor-ui/src/composables/useCanvasOperations.ts
@@ -395,6 +395,10 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 		ndvStore.activeNodeName = name;
 	}
 
+	function clearNodeActive() {
+		ndvStore.activeNodeName = null;
+	}
+
 	function setNodeParameters(id: string, parameters: Record<string, unknown>) {
 		const node = workflowsStore.getNodeById(id);
 		if (!node) {
@@ -1988,6 +1992,7 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 		revertUpdateNodePosition,
 		setNodeActive,
 		setNodeActiveByName,
+		clearNodeActive,
 		setNodeSelected,
 		toggleNodesDisabled,
 		revertToggleNodeDisabled,
diff --git a/packages/editor-ui/src/types/canvas.ts b/packages/editor-ui/src/types/canvas.ts
index 3034232379..afc5c5d8da 100644
--- a/packages/editor-ui/src/types/canvas.ts
+++ b/packages/editor-ui/src/types/canvas.ts
@@ -143,7 +143,7 @@ export interface CanvasInjectionData {
 
 export type CanvasNodeEventBusEvents = {
 	'update:sticky:color': never;
-	'update:node:active': never;
+	'update:node:activated': never;
 	'update:node:class': { className: string; add?: boolean };
 };
 
diff --git a/packages/editor-ui/src/views/NodeView.vue b/packages/editor-ui/src/views/NodeView.vue
index cd973c5cef..86c89a6bbb 100644
--- a/packages/editor-ui/src/views/NodeView.vue
+++ b/packages/editor-ui/src/views/NodeView.vue
@@ -199,6 +199,7 @@ const {
 	revalidateNodeInputConnections,
 	revalidateNodeOutputConnections,
 	setNodeActiveByName,
+	clearNodeActive,
 	addConnections,
 	importWorkflowData,
 	fetchWorkflowDataFromUrl,
@@ -621,10 +622,14 @@ function onClickNode() {
 	closeNodeCreator();
 }
 
-function onSetNodeActive(id: string) {
+function onSetNodeActivated(id: string) {
 	setNodeActive(id);
 }
 
+function onSetNodeDeactivated() {
+	clearNodeActive();
+}
+
 function onSetNodeSelected(id?: string) {
 	closeNodeCreator();
 	setNodeSelected(id);
@@ -1728,7 +1733,8 @@ onBeforeUnmount(() => {
 		:key-bindings="keyBindingsEnabled"
 		@update:nodes:position="onUpdateNodesPosition"
 		@update:node:position="onUpdateNodePosition"
-		@update:node:active="onSetNodeActive"
+		@update:node:activated="onSetNodeActivated"
+		@update:node:deactivated="onSetNodeDeactivated"
 		@update:node:selected="onSetNodeSelected"
 		@update:node:enabled="onToggleNodeDisabled"
 		@update:node:name="onOpenRenameNodeModal"

From c021a7e4b2daccc59541bab25c1447339dd68c09 Mon Sep 17 00:00:00 2001
From: Csaba Tuncsik <csaba@n8n.io>
Date: Wed, 26 Feb 2025 11:53:37 +0100
Subject: [PATCH 04/47] fix(editor): Show scrollbar in Element UI popup
 (#13259)

---
 cypress/e2e/10-undo-redo.cy.ts                | 6 +++++-
 cypress/e2e/12-canvas.cy.ts                   | 6 +++++-
 cypress/pages/workflow.ts                     | 4 ++--
 packages/design-system/src/css/scrollbar.scss | 8 --------
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/cypress/e2e/10-undo-redo.cy.ts b/cypress/e2e/10-undo-redo.cy.ts
index 2931897f03..bad159b1cb 100644
--- a/cypress/e2e/10-undo-redo.cy.ts
+++ b/cypress/e2e/10-undo-redo.cy.ts
@@ -22,7 +22,11 @@ describe('Undo/Redo', () => {
 	it('should undo/redo deleting node using context menu', () => {
 		WorkflowPage.actions.addNodeToCanvas(SCHEDULE_TRIGGER_NODE_NAME);
 		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
-		WorkflowPage.actions.deleteNodeFromContextMenu(CODE_NODE_NAME);
+		WorkflowPage.actions.zoomToFit();
+		WorkflowPage.actions.deleteNodeFromContextMenu(CODE_NODE_NAME, {
+			method: 'right-click',
+			anchor: 'topLeft',
+		});
 		WorkflowPage.getters.canvasNodes().should('have.have.length', 1);
 		WorkflowPage.getters.nodeConnections().should('have.length', 0);
 		WorkflowPage.actions.hitUndo();
diff --git a/cypress/e2e/12-canvas.cy.ts b/cypress/e2e/12-canvas.cy.ts
index be423344fb..add58cfd5a 100644
--- a/cypress/e2e/12-canvas.cy.ts
+++ b/cypress/e2e/12-canvas.cy.ts
@@ -235,7 +235,11 @@ describe('Canvas Node Manipulation and Navigation', () => {
 	it('should delete node using context menu', () => {
 		WorkflowPage.actions.addNodeToCanvas(SCHEDULE_TRIGGER_NODE_NAME);
 		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
-		WorkflowPage.actions.deleteNodeFromContextMenu(CODE_NODE_NAME);
+		WorkflowPage.actions.zoomToFit();
+		WorkflowPage.actions.deleteNodeFromContextMenu(CODE_NODE_NAME, {
+			method: 'right-click',
+			anchor: 'topLeft',
+		});
 		WorkflowPage.getters.canvasNodes().should('have.length', 1);
 		WorkflowPage.getters.nodeConnections().should('have.length', 0);
 	});
diff --git a/cypress/pages/workflow.ts b/cypress/pages/workflow.ts
index 24fda156f6..d34109f1b2 100644
--- a/cypress/pages/workflow.ts
+++ b/cypress/pages/workflow.ts
@@ -306,8 +306,8 @@ export class WorkflowPage extends BasePage {
 			this.actions.openContextMenu(nodeTypeName);
 			clickContextMenuAction('duplicate');
 		},
-		deleteNodeFromContextMenu: (nodeTypeName: string) => {
-			this.actions.openContextMenu(nodeTypeName);
+		deleteNodeFromContextMenu: (nodeTypeName: string, options?: OpenContextMenuOptions) => {
+			this.actions.openContextMenu(nodeTypeName, options);
 			clickContextMenuAction('delete');
 		},
 		executeNode: (nodeTypeName: string, options?: OpenContextMenuOptions) => {
diff --git a/packages/design-system/src/css/scrollbar.scss b/packages/design-system/src/css/scrollbar.scss
index 72c3c2243d..9a78b201d6 100644
--- a/packages/design-system/src/css/scrollbar.scss
+++ b/packages/design-system/src/css/scrollbar.scss
@@ -17,14 +17,6 @@
 	@include mixins.e(wrap) {
 		overflow: scroll;
 		height: 100%;
-
-		@include mixins.m(hidden-default) {
-			scrollbar-width: none;
-			&::-webkit-scrollbar {
-				width: 0;
-				height: 0;
-			}
-		}
 	}
 
 	@include mixins.e(thumb) {

From b50658cbc64c0a6fc000b11dca0cca49cc707471 Mon Sep 17 00:00:00 2001
From: Jon <jonathan.bennetts@gmail.com>
Date: Wed, 26 Feb 2025 11:25:22 +0000
Subject: [PATCH 05/47] feat: Update AWS credential to support more regions
 (#13524)

---
 .../nodes-base/credentials/Aws.credentials.ts | 70 +++++++++++++++++++
 1 file changed, 70 insertions(+)

diff --git a/packages/nodes-base/credentials/Aws.credentials.ts b/packages/nodes-base/credentials/Aws.credentials.ts
index 3d5b37c6f2..78e05d7653 100644
--- a/packages/nodes-base/credentials/Aws.credentials.ts
+++ b/packages/nodes-base/credentials/Aws.credentials.ts
@@ -27,6 +27,11 @@ export const regions = [
 		displayName: 'Asia Pacific',
 		location: 'Mumbai',
 	},
+	{
+		name: 'ap-south-2',
+		displayName: 'Asia Pacific',
+		location: 'Hyderabad',
+	},
 	{
 		name: 'ap-southeast-1',
 		displayName: 'Asia Pacific',
@@ -42,6 +47,21 @@ export const regions = [
 		displayName: 'Asia Pacific',
 		location: 'Jakarta',
 	},
+	{
+		name: 'ap-southeast-4',
+		displayName: 'Asia Pacific',
+		location: 'Melbourne',
+	},
+	{
+		name: 'ap-southeast-5',
+		displayName: 'Asia Pacific',
+		location: 'Malaysia',
+	},
+	{
+		name: 'ap-southeast-7',
+		displayName: 'Asia Pacific',
+		location: 'Thailand',
+	},
 	{
 		name: 'ap-northeast-1',
 		displayName: 'Asia Pacific',
@@ -62,11 +82,31 @@ export const regions = [
 		displayName: 'Canada',
 		location: 'Central',
 	},
+	{
+		name: 'ca-west-1',
+		displayName: 'Canada West',
+		location: 'Calgary',
+	},
+	{
+		name: 'cn-north-1',
+		displayName: 'China',
+		location: 'Beijing',
+	},
+	{
+		name: 'cn-northwest-1',
+		displayName: 'China',
+		location: 'Ningxia',
+	},
 	{
 		name: 'eu-central-1',
 		displayName: 'Europe',
 		location: 'Frankfurt',
 	},
+	{
+		name: 'eu-central-2',
+		displayName: 'Europe',
+		location: 'Zurich',
+	},
 	{
 		name: 'eu-north-1',
 		displayName: 'Europe',
@@ -77,6 +117,11 @@ export const regions = [
 		displayName: 'Europe',
 		location: 'Milan',
 	},
+	{
+		name: 'eu-south-2',
+		displayName: 'Europe',
+		location: 'Spain',
+	},
 	{
 		name: 'eu-west-1',
 		displayName: 'Europe',
@@ -92,11 +137,26 @@ export const regions = [
 		displayName: 'Europe',
 		location: 'Paris',
 	},
+	{
+		name: 'il-central-1',
+		displayName: 'Israel',
+		location: 'Tel Aviv',
+	},
+	{
+		name: 'me-central-1',
+		displayName: 'Middle East',
+		location: 'UAE',
+	},
 	{
 		name: 'me-south-1',
 		displayName: 'Middle East',
 		location: 'Bahrain',
 	},
+	{
+		name: 'mx-central-1',
+		displayName: 'Mexico',
+		location: 'Central',
+	},
 	{
 		name: 'sa-east-1',
 		displayName: 'South America',
@@ -112,6 +172,11 @@ export const regions = [
 		displayName: 'US East',
 		location: 'Ohio',
 	},
+	{
+		name: 'us-gov-east-1',
+		displayName: 'US East',
+		location: 'GovCloud',
+	},
 	{
 		name: 'us-west-1',
 		displayName: 'US West',
@@ -122,6 +187,11 @@ export const regions = [
 		displayName: 'US West',
 		location: 'Oregon',
 	},
+	{
+		name: 'us-gov-west-1',
+		displayName: 'US West',
+		location: 'GovCloud',
+	},
 ] as const;
 
 export type AWSRegion = (typeof regions)[number]['name'];

From f7f5f5e95c474f2834fbb71a5906e7b3115e0e7a Mon Sep 17 00:00:00 2001
From: Ricardo Espinoza <ricardo@n8n.io>
Date: Wed, 26 Feb 2025 07:01:22 -0500
Subject: [PATCH 06/47] feat(core): Add endpoint PATCH
 `/projects/:projectId/folders/:folderId` (no-changelog) (#13454)

---
 .../update-folder.request.dto.test.ts         |  42 ++++++
 .../src/dto/folders/create-folder.dto.ts      |   4 +-
 .../src/dto/folders/update-folder.dto.ts      |   7 +
 packages/@n8n/api-types/src/dto/index.ts      |   1 +
 .../api-types/src/schemas/folder.schema.ts    |   3 +
 packages/@n8n/permissions/src/constants.ee.ts |   2 +-
 .../cli/src/controllers/folder.controller.ts  |  23 +++-
 .../cli/src/permissions.ee/project-roles.ts   |   3 +
 packages/cli/src/services/folder.service.ts   |   7 +-
 .../folder/folder.controller.test.ts          | 130 ++++++++++++++++++
 10 files changed, 217 insertions(+), 5 deletions(-)
 create mode 100644 packages/@n8n/api-types/src/dto/folders/__tests__/update-folder.request.dto.test.ts
 create mode 100644 packages/@n8n/api-types/src/dto/folders/update-folder.dto.ts
 create mode 100644 packages/@n8n/api-types/src/schemas/folder.schema.ts

diff --git a/packages/@n8n/api-types/src/dto/folders/__tests__/update-folder.request.dto.test.ts b/packages/@n8n/api-types/src/dto/folders/__tests__/update-folder.request.dto.test.ts
new file mode 100644
index 0000000000..23213ecbe9
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/folders/__tests__/update-folder.request.dto.test.ts
@@ -0,0 +1,42 @@
+import { UpdateFolderDto } from '../update-folder.dto';
+
+describe('UpdateFolderDto', () => {
+	describe('Valid requests', () => {
+		test.each([
+			{
+				name: 'name without parentId',
+				request: {
+					name: 'test',
+				},
+			},
+		])('should validate $name', ({ request }) => {
+			const result = UpdateFolderDto.safeParse(request);
+			expect(result.success).toBe(true);
+		});
+	});
+
+	describe('Invalid requests', () => {
+		test.each([
+			{
+				name: 'missing name',
+				request: {},
+				expectedErrorPath: ['name'],
+			},
+			{
+				name: 'empty name',
+				request: {
+					name: '',
+				},
+				expectedErrorPath: ['name'],
+			},
+		])('should fail validation for $name', ({ request, expectedErrorPath }) => {
+			const result = UpdateFolderDto.safeParse(request);
+
+			expect(result.success).toBe(false);
+
+			if (expectedErrorPath) {
+				expect(result.error?.issues[0].path).toEqual(expectedErrorPath);
+			}
+		});
+	});
+});
diff --git a/packages/@n8n/api-types/src/dto/folders/create-folder.dto.ts b/packages/@n8n/api-types/src/dto/folders/create-folder.dto.ts
index d0c59eaf54..098292045a 100644
--- a/packages/@n8n/api-types/src/dto/folders/create-folder.dto.ts
+++ b/packages/@n8n/api-types/src/dto/folders/create-folder.dto.ts
@@ -1,7 +1,9 @@
 import { z } from 'zod';
 import { Z } from 'zod-class';
 
+import { folderNameSchema } from '../../schemas/folder.schema';
+
 export class CreateFolderDto extends Z.class({
-	name: z.string().trim().min(1).max(128),
+	name: folderNameSchema,
 	parentFolderId: z.string().optional(),
 }) {}
diff --git a/packages/@n8n/api-types/src/dto/folders/update-folder.dto.ts b/packages/@n8n/api-types/src/dto/folders/update-folder.dto.ts
new file mode 100644
index 0000000000..13d6c03203
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/folders/update-folder.dto.ts
@@ -0,0 +1,7 @@
+import { Z } from 'zod-class';
+
+import { folderNameSchema } from '../../schemas/folder.schema';
+
+export class UpdateFolderDto extends Z.class({
+	name: folderNameSchema,
+}) {}
diff --git a/packages/@n8n/api-types/src/dto/index.ts b/packages/@n8n/api-types/src/dto/index.ts
index dd3fd20fac..a4467d65c6 100644
--- a/packages/@n8n/api-types/src/dto/index.ts
+++ b/packages/@n8n/api-types/src/dto/index.ts
@@ -56,3 +56,4 @@ export { UpdateApiKeyRequestDto } from './api-keys/update-api-key-request.dto';
 export { CreateApiKeyRequestDto } from './api-keys/create-api-key-request.dto';
 
 export { CreateFolderDto } from './folders/create-folder.dto';
+export { UpdateFolderDto } from './folders/update-folder.dto';
diff --git a/packages/@n8n/api-types/src/schemas/folder.schema.ts b/packages/@n8n/api-types/src/schemas/folder.schema.ts
new file mode 100644
index 0000000000..40b59d4faa
--- /dev/null
+++ b/packages/@n8n/api-types/src/schemas/folder.schema.ts
@@ -0,0 +1,3 @@
+import { z } from 'zod';
+
+export const folderNameSchema = z.string().trim().min(1).max(128);
diff --git a/packages/@n8n/permissions/src/constants.ee.ts b/packages/@n8n/permissions/src/constants.ee.ts
index eda49a605b..19b39df8fc 100644
--- a/packages/@n8n/permissions/src/constants.ee.ts
+++ b/packages/@n8n/permissions/src/constants.ee.ts
@@ -22,5 +22,5 @@ export const RESOURCES = {
 	variable: [...DEFAULT_OPERATIONS] as const,
 	workersView: ['manage'] as const,
 	workflow: ['share', 'execute', 'move', ...DEFAULT_OPERATIONS] as const,
-	folder: ['create', 'read'] as const,
+	folder: ['create', 'read', 'update'] as const,
 } as const;
diff --git a/packages/cli/src/controllers/folder.controller.ts b/packages/cli/src/controllers/folder.controller.ts
index 4ae355180a..17fb4ddb7e 100644
--- a/packages/cli/src/controllers/folder.controller.ts
+++ b/packages/cli/src/controllers/folder.controller.ts
@@ -1,7 +1,7 @@
-import { CreateFolderDto } from '@n8n/api-types';
+import { CreateFolderDto, UpdateFolderDto } from '@n8n/api-types';
 import { Response } from 'express';
 
-import { Post, RestController, ProjectScope, Body, Get } from '@/decorators';
+import { Post, RestController, ProjectScope, Body, Get, Patch } from '@/decorators';
 import { FolderNotFoundError } from '@/errors/folder-not-found.error';
 import { InternalServerError } from '@/errors/response-errors/internal-server.error';
 import { NotFoundError } from '@/errors/response-errors/not-found.error';
@@ -48,4 +48,23 @@ export class ProjectController {
 			throw new InternalServerError();
 		}
 	}
+
+	@Patch('/:folderId')
+	@ProjectScope('folder:update')
+	async updateFolder(
+		req: AuthenticatedRequest<{ projectId: string; folderId: string }>,
+		_res: Response,
+		@Body payload: UpdateFolderDto,
+	) {
+		const { projectId, folderId } = req.params;
+
+		try {
+			await this.folderService.updateFolder(folderId, projectId, payload);
+		} catch (e) {
+			if (e instanceof FolderNotFoundError) {
+				throw new NotFoundError(e.message);
+			}
+			throw new InternalServerError();
+		}
+	}
 }
diff --git a/packages/cli/src/permissions.ee/project-roles.ts b/packages/cli/src/permissions.ee/project-roles.ts
index 5e3c41ac46..cd5f285e2f 100644
--- a/packages/cli/src/permissions.ee/project-roles.ts
+++ b/packages/cli/src/permissions.ee/project-roles.ts
@@ -27,6 +27,7 @@ export const REGULAR_PROJECT_ADMIN_SCOPES: Scope[] = [
 	'project:delete',
 	'folder:create',
 	'folder:read',
+	'folder:update',
 ];
 
 export const PERSONAL_PROJECT_OWNER_SCOPES: Scope[] = [
@@ -49,6 +50,7 @@ export const PERSONAL_PROJECT_OWNER_SCOPES: Scope[] = [
 	'project:read',
 	'folder:create',
 	'folder:read',
+	'folder:update',
 ];
 
 export const PROJECT_EDITOR_SCOPES: Scope[] = [
@@ -67,6 +69,7 @@ export const PROJECT_EDITOR_SCOPES: Scope[] = [
 	'project:read',
 	'folder:create',
 	'folder:read',
+	'folder:update',
 ];
 
 export const PROJECT_VIEWER_SCOPES: Scope[] = [
diff --git a/packages/cli/src/services/folder.service.ts b/packages/cli/src/services/folder.service.ts
index 54ecbe04d9..0b135360a9 100644
--- a/packages/cli/src/services/folder.service.ts
+++ b/packages/cli/src/services/folder.service.ts
@@ -1,4 +1,4 @@
-import type { CreateFolderDto } from '@n8n/api-types';
+import type { CreateFolderDto, UpdateFolderDto } from '@n8n/api-types';
 import { Service } from '@n8n/di';
 // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
 import type { EntityManager } from '@n8n/typeorm';
@@ -39,6 +39,11 @@ export class FolderService {
 		return folder;
 	}
 
+	async updateFolder(folderId: string, projectId: string, { name }: UpdateFolderDto) {
+		await this.getFolderInProject(folderId, projectId);
+		return await this.folderRepository.update({ id: folderId }, { name });
+	}
+
 	async getFolderInProject(folderId: string, projectId: string, em?: EntityManager) {
 		try {
 			return await this.folderRepository.findOneOrFailFolderInProject(folderId, projectId, em);
diff --git a/packages/cli/test/integration/folder/folder.controller.test.ts b/packages/cli/test/integration/folder/folder.controller.test.ts
index 5981750659..bd7955d51f 100644
--- a/packages/cli/test/integration/folder/folder.controller.test.ts
+++ b/packages/cli/test/integration/folder/folder.controller.test.ts
@@ -279,3 +279,133 @@ describe('GET /projects/:projectId/folders/:folderId/tree', () => {
 		);
 	});
 });
+
+describe('PATCH /projects/:projectId/folders/:folderId', () => {
+	test('should not update folder when project does not exist', async () => {
+		const payload = {
+			name: 'Updated Folder Name',
+		};
+
+		await authOwnerAgent
+			.patch('/projects/non-existing-id/folders/some-folder-id')
+			.send(payload)
+			.expect(403);
+	});
+
+	test('should not update folder when folder does not exist', async () => {
+		const project = await createTeamProject('test project', owner);
+
+		const payload = {
+			name: 'Updated Folder Name',
+		};
+
+		await authOwnerAgent
+			.patch(`/projects/${project.id}/folders/non-existing-folder`)
+			.send(payload)
+			.expect(404);
+	});
+
+	test('should not update folder when name is empty', async () => {
+		const project = await createTeamProject(undefined, owner);
+		const folder = await createFolder(project, { name: 'Original Name' });
+
+		const payload = {
+			name: '',
+		};
+
+		await authOwnerAgent
+			.patch(`/projects/${project.id}/folders/${folder.id}`)
+			.send(payload)
+			.expect(400);
+
+		const folderInDb = await folderRepository.findOneBy({ id: folder.id });
+		expect(folderInDb?.name).toBe('Original Name');
+	});
+
+	test('should not update folder if user has project:viewer role in team project', async () => {
+		const project = await createTeamProject(undefined, owner);
+		const folder = await createFolder(project, { name: 'Original Name' });
+		await linkUserToProject(member, project, 'project:viewer');
+
+		const payload = {
+			name: 'Updated Folder Name',
+		};
+
+		await authMemberAgent
+			.patch(`/projects/${project.id}/folders/${folder.id}`)
+			.send(payload)
+			.expect(403);
+
+		const folderInDb = await folderRepository.findOneBy({ id: folder.id });
+		expect(folderInDb?.name).toBe('Original Name');
+	});
+
+	test("should not allow updating folder in another user's personal project", async () => {
+		const ownerPersonalProject = await projectRepository.getPersonalProjectForUserOrFail(owner.id);
+		const folder = await createFolder(ownerPersonalProject, { name: 'Original Name' });
+
+		const payload = {
+			name: 'Updated Folder Name',
+		};
+
+		await authMemberAgent
+			.patch(`/projects/${ownerPersonalProject.id}/folders/${folder.id}`)
+			.send(payload)
+			.expect(403);
+
+		const folderInDb = await folderRepository.findOneBy({ id: folder.id });
+		expect(folderInDb?.name).toBe('Original Name');
+	});
+
+	test('should update folder if user has project:editor role in team project', async () => {
+		const project = await createTeamProject(undefined, owner);
+		const folder = await createFolder(project, { name: 'Original Name' });
+		await linkUserToProject(member, project, 'project:editor');
+
+		const payload = {
+			name: 'Updated Folder Name',
+		};
+
+		await authMemberAgent
+			.patch(`/projects/${project.id}/folders/${folder.id}`)
+			.send(payload)
+			.expect(200);
+
+		const folderInDb = await folderRepository.findOneBy({ id: folder.id });
+		expect(folderInDb?.name).toBe('Updated Folder Name');
+	});
+
+	test('should update folder if user has project:admin role in team project', async () => {
+		const project = await createTeamProject(undefined, owner);
+		const folder = await createFolder(project, { name: 'Original Name' });
+
+		const payload = {
+			name: 'Updated Folder Name',
+		};
+
+		await authOwnerAgent
+			.patch(`/projects/${project.id}/folders/${folder.id}`)
+			.send(payload)
+			.expect(200);
+
+		const folderInDb = await folderRepository.findOneBy({ id: folder.id });
+		expect(folderInDb?.name).toBe('Updated Folder Name');
+	});
+
+	test('should update folder in personal project', async () => {
+		const personalProject = await projectRepository.getPersonalProjectForUserOrFail(owner.id);
+		const folder = await createFolder(personalProject, { name: 'Original Name' });
+
+		const payload = {
+			name: 'Updated Folder Name',
+		};
+
+		await authOwnerAgent
+			.patch(`/projects/${personalProject.id}/folders/${folder.id}`)
+			.send(payload)
+			.expect(200);
+
+		const folderInDb = await folderRepository.findOneBy({ id: folder.id });
+		expect(folderInDb?.name).toBe('Updated Folder Name');
+	});
+});

From 3aa679e4ac411d0d34e039fa6c43bc98f2e3670f Mon Sep 17 00:00:00 2001
From: Juuso Tapaninen <juuso@n8n.io>
Date: Wed, 26 Feb 2025 14:16:38 +0200
Subject: [PATCH 07/47] feat(core): Add metric for active workflow count
 (#13420)

---
 .../config/src/configs/endpoints.config.ts    |  4 +
 packages/@n8n/config/test/config.test.ts      |  1 +
 .../repositories/workflow.repository.ts       |  6 ++
 .../prometheus-metrics.service.test.ts        | 21 ++++-
 ...rometheus-metrics.service.unmocked.test.ts | 70 +++++++++++++++
 .../src/metrics/prometheus-metrics.service.ts | 40 ++++++++-
 .../integration/prometheus-metrics.test.ts    | 87 +++++++++++++++++++
 7 files changed, 226 insertions(+), 3 deletions(-)

diff --git a/packages/@n8n/config/src/configs/endpoints.config.ts b/packages/@n8n/config/src/configs/endpoints.config.ts
index 4ec58ccf0d..994343c650 100644
--- a/packages/@n8n/config/src/configs/endpoints.config.ts
+++ b/packages/@n8n/config/src/configs/endpoints.config.ts
@@ -57,6 +57,10 @@ class PrometheusMetricsConfig {
 	/** How often (in seconds) to update queue metrics. */
 	@Env('N8N_METRICS_QUEUE_METRICS_INTERVAL')
 	queueMetricsInterval: number = 20;
+
+	/** How often (in seconds) to update active workflow metric */
+	@Env('N8N_METRICS_ACTIVE_WORKFLOW_METRIC_INTERVAL')
+	activeWorkflowCountInterval: number = 60;
 }
 
 @Config
diff --git a/packages/@n8n/config/test/config.test.ts b/packages/@n8n/config/test/config.test.ts
index 735cb4bfcf..626c5f4d62 100644
--- a/packages/@n8n/config/test/config.test.ts
+++ b/packages/@n8n/config/test/config.test.ts
@@ -173,6 +173,7 @@ describe('GlobalConfig', () => {
 				includeApiStatusCodeLabel: false,
 				includeQueueMetrics: false,
 				queueMetricsInterval: 20,
+				activeWorkflowCountInterval: 60,
 			},
 			additionalNonUIRoutes: '',
 			disableProductionWebhooksOnMainProcess: false,
diff --git a/packages/cli/src/databases/repositories/workflow.repository.ts b/packages/cli/src/databases/repositories/workflow.repository.ts
index 8b229840c8..69bf66d955 100644
--- a/packages/cli/src/databases/repositories/workflow.repository.ts
+++ b/packages/cli/src/databases/repositories/workflow.repository.ts
@@ -79,6 +79,12 @@ export class WorkflowRepository extends Repository<WorkflowEntity> {
 		return activeWorkflows.map((workflow) => workflow.id);
 	}
 
+	async getActiveCount() {
+		return await this.count({
+			where: { active: true },
+		});
+	}
+
 	async findById(workflowId: string) {
 		return await this.findOne({
 			where: { id: workflowId },
diff --git a/packages/cli/src/metrics/__tests__/prometheus-metrics.service.test.ts b/packages/cli/src/metrics/__tests__/prometheus-metrics.service.test.ts
index cbdd09f643..d47cdb2737 100644
--- a/packages/cli/src/metrics/__tests__/prometheus-metrics.service.test.ts
+++ b/packages/cli/src/metrics/__tests__/prometheus-metrics.service.test.ts
@@ -6,6 +6,7 @@ import type { InstanceSettings } from 'n8n-core';
 import promClient from 'prom-client';
 
 import config from '@/config';
+import type { WorkflowRepository } from '@/databases/repositories/workflow.repository';
 import type { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus';
 import type { EventService } from '@/events/event.service';
 import { mockInstance } from '@test/mocking';
@@ -52,12 +53,14 @@ describe('PrometheusMetricsService', () => {
 	const eventBus = mock<MessageEventBus>();
 	const eventService = mock<EventService>();
 	const instanceSettings = mock<InstanceSettings>({ instanceType: 'main' });
+	const workflowRepository = mock<WorkflowRepository>();
 	const prometheusMetricsService = new PrometheusMetricsService(
 		mock(),
 		eventBus,
 		globalConfig,
 		eventService,
 		instanceSettings,
+		workflowRepository,
 	);
 
 	afterEach(() => {
@@ -75,6 +78,7 @@ describe('PrometheusMetricsService', () => {
 				customGlobalConfig,
 				mock(),
 				instanceSettings,
+				mock(),
 			);
 
 			await customPrometheusMetricsService.init(app);
@@ -217,7 +221,7 @@ describe('PrometheusMetricsService', () => {
 
 			await prometheusMetricsService.init(app);
 
-			expect(promClient.Gauge).toHaveBeenCalledTimes(1); // version metric
+			expect(promClient.Gauge).toHaveBeenCalledTimes(2); // version metric + active workflow count metric
 			expect(promClient.Counter).toHaveBeenCalledTimes(0); // cache metrics
 			expect(eventService.on).not.toHaveBeenCalled();
 		});
@@ -230,9 +234,22 @@ describe('PrometheusMetricsService', () => {
 
 			await prometheusMetricsService.init(app);
 
-			expect(promClient.Gauge).toHaveBeenCalledTimes(1); // version metric
+			expect(promClient.Gauge).toHaveBeenCalledTimes(2); // version metric + active workflow count metric
 			expect(promClient.Counter).toHaveBeenCalledTimes(0); // cache metrics
 			expect(eventService.on).not.toHaveBeenCalled();
 		});
+
+		it('should setup active workflow count metric', async () => {
+			await prometheusMetricsService.init(app);
+
+			// First call is n8n version metric
+			expect(promClient.Gauge).toHaveBeenCalledTimes(2);
+
+			expect(promClient.Gauge).toHaveBeenNthCalledWith(2, {
+				name: 'n8n_active_workflow_count',
+				help: 'Total number of active workflows.',
+				collect: expect.any(Function),
+			});
+		});
 	});
 });
diff --git a/packages/cli/src/metrics/__tests__/prometheus-metrics.service.unmocked.test.ts b/packages/cli/src/metrics/__tests__/prometheus-metrics.service.unmocked.test.ts
index e485bbe435..2dde75086d 100644
--- a/packages/cli/src/metrics/__tests__/prometheus-metrics.service.unmocked.test.ts
+++ b/packages/cli/src/metrics/__tests__/prometheus-metrics.service.unmocked.test.ts
@@ -4,8 +4,10 @@ import { mock } from 'jest-mock-extended';
 import type { InstanceSettings } from 'n8n-core';
 import promClient from 'prom-client';
 
+import type { WorkflowRepository } from '@/databases/repositories/workflow.repository';
 import { EventMessageWorkflow } from '@/eventbus/event-message-classes/event-message-workflow';
 import type { EventService } from '@/events/event.service';
+import type { CacheService } from '@/services/cache/cache.service';
 import { mockInstance } from '@test/mocking';
 
 import { MessageEventBus } from '../../eventbus/message-event-bus/message-event-bus';
@@ -15,8 +17,10 @@ jest.unmock('@/eventbus/message-event-bus/message-event-bus');
 
 const customPrefix = 'custom_';
 
+const cacheService = mock<CacheService>();
 const eventService = mock<EventService>();
 const instanceSettings = mock<InstanceSettings>({ instanceType: 'main' });
+const workflowRepository = mock<WorkflowRepository>();
 const app = mock<express.Application>();
 const eventBus = new MessageEventBus(
 	mock(),
@@ -48,6 +52,7 @@ describe('workflow_success_total', () => {
 			globalConfig,
 			eventService,
 			instanceSettings,
+			workflowRepository,
 		);
 
 		await prometheusMetricsService.init(app);
@@ -87,6 +92,7 @@ workflow_success_total{workflow_id="1234"} 1"
 			globalConfig,
 			eventService,
 			instanceSettings,
+			workflowRepository,
 		);
 
 		await prometheusMetricsService.init(app);
@@ -107,3 +113,67 @@ workflow_success_total{workflow_id="1234"} 1"
 		}
 	});
 });
+
+describe('Active workflow count', () => {
+	const globalConfig = mockInstance(GlobalConfig, {
+		endpoints: {
+			metrics: {
+				prefix: '',
+				activeWorkflowCountInterval: 30,
+			},
+		},
+	});
+
+	const prometheusMetricsService = new PrometheusMetricsService(
+		cacheService,
+		eventBus,
+		globalConfig,
+		eventService,
+		instanceSettings,
+		workflowRepository,
+	);
+
+	afterEach(() => {
+		jest.clearAllMocks();
+		prometheusMetricsService.disableAllMetrics();
+	});
+
+	it('should prioritize cached value', async () => {
+		await prometheusMetricsService.init(app);
+
+		cacheService.get.mockReturnValueOnce(Promise.resolve('1'));
+		workflowRepository.getActiveCount.mockReturnValueOnce(Promise.resolve(2));
+
+		const activeWorkflowCount =
+			await promClient.register.getSingleMetricAsString('active_workflow_count');
+
+		expect(cacheService.get).toHaveBeenCalledWith('metrics:active-workflow-count');
+		expect(workflowRepository.getActiveCount).not.toHaveBeenCalled();
+
+		expect(activeWorkflowCount).toMatchInlineSnapshot(`
+"# HELP active_workflow_count Total number of active workflows.
+# TYPE active_workflow_count gauge
+active_workflow_count 1"
+`);
+	});
+
+	it('should query value from database if cache misses', async () => {
+		await prometheusMetricsService.init(app);
+
+		cacheService.get.mockReturnValueOnce(Promise.resolve(undefined));
+		workflowRepository.getActiveCount.mockReturnValueOnce(Promise.resolve(2));
+
+		const activeWorkflowCount =
+			await promClient.register.getSingleMetricAsString('active_workflow_count');
+
+		expect(cacheService.get).toHaveBeenCalledWith('metrics:active-workflow-count');
+		expect(workflowRepository.getActiveCount).toHaveBeenCalled();
+		expect(cacheService.set).toHaveBeenCalledWith('metrics:active-workflow-count', '2', 30_000);
+
+		expect(activeWorkflowCount).toMatchInlineSnapshot(`
+"# HELP active_workflow_count Total number of active workflows.
+# TYPE active_workflow_count gauge
+active_workflow_count 2"
+`);
+	});
+});
diff --git a/packages/cli/src/metrics/prometheus-metrics.service.ts b/packages/cli/src/metrics/prometheus-metrics.service.ts
index ec66dd9a70..a646c00efd 100644
--- a/packages/cli/src/metrics/prometheus-metrics.service.ts
+++ b/packages/cli/src/metrics/prometheus-metrics.service.ts
@@ -8,7 +8,8 @@ import promClient, { type Counter, type Gauge } from 'prom-client';
 import semverParse from 'semver/functions/parse';
 
 import config from '@/config';
-import { N8N_VERSION } from '@/constants';
+import { N8N_VERSION, Time } from '@/constants';
+import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
 import type { EventMessageTypes } from '@/eventbus';
 import { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus';
 import { EventService } from '@/events/event.service';
@@ -24,6 +25,7 @@ export class PrometheusMetricsService {
 		private readonly globalConfig: GlobalConfig,
 		private readonly eventService: EventService,
 		private readonly instanceSettings: InstanceSettings,
+		private readonly workflowRepository: WorkflowRepository,
 	) {}
 
 	private readonly counters: { [key: string]: Counter<string> | null } = {};
@@ -58,6 +60,7 @@ export class PrometheusMetricsService {
 		this.initEventBusMetrics();
 		this.initRouteMetrics(app);
 		this.initQueueMetrics();
+		this.initActiveWorkflowCountMetric();
 		this.mountMetricsEndpoint(app);
 	}
 
@@ -285,6 +288,41 @@ export class PrometheusMetricsService {
 		});
 	}
 
+	/**
+	 * Setup active workflow count metric
+	 *
+	 * This metric is updated every time metrics are collected.
+	 * We also cache the value of active workflow counts so we
+	 * don't hit the database on every metrics query. Both the
+	 * metric being enabled and the TTL of the cached value is
+	 * configurable.
+	 */
+	private initActiveWorkflowCountMetric() {
+		const workflowRepository = this.workflowRepository;
+		const cacheService = this.cacheService;
+		const cacheKey = 'metrics:active-workflow-count';
+		const cacheTtl =
+			this.globalConfig.endpoints.metrics.activeWorkflowCountInterval * Time.seconds.toMilliseconds;
+
+		new promClient.Gauge({
+			name: this.prefix + 'active_workflow_count',
+			help: 'Total number of active workflows.',
+			async collect() {
+				const value = await cacheService.get<string>(cacheKey);
+				const numericValue = value !== undefined ? parseInt(value, 10) : undefined;
+
+				if (numericValue !== undefined && Number.isFinite(numericValue)) {
+					this.set(numericValue);
+				} else {
+					const activeWorkflowCount = await workflowRepository.getActiveCount();
+					await cacheService.set(cacheKey, activeWorkflowCount.toString(), cacheTtl);
+
+					this.set(activeWorkflowCount);
+				}
+			},
+		});
+	}
+
 	private toLabels(event: EventMessageTypes): Record<string, string> {
 		const { __type, eventName, payload } = event;
 
diff --git a/packages/cli/test/integration/prometheus-metrics.test.ts b/packages/cli/test/integration/prometheus-metrics.test.ts
index c5accedbc6..792f978bfa 100644
--- a/packages/cli/test/integration/prometheus-metrics.test.ts
+++ b/packages/cli/test/integration/prometheus-metrics.test.ts
@@ -5,8 +5,11 @@ import request, { type Response } from 'supertest';
 
 import config from '@/config';
 import { N8N_VERSION } from '@/constants';
+import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
 import { EventService } from '@/events/event.service';
 import { PrometheusMetricsService } from '@/metrics/prometheus-metrics.service';
+import { CacheService } from '@/services/cache/cache.service';
+import { createWorkflow, newWorkflow } from '@test-integration/db/workflows';
 
 import { setupTestServer } from './shared/utils';
 
@@ -16,6 +19,7 @@ const toLines = (response: Response) => response.text.trim().split('\n');
 
 const eventService = Container.get(EventService);
 const globalConfig = Container.get(GlobalConfig);
+globalConfig.cache.backend = 'memory';
 globalConfig.endpoints.metrics = {
 	enable: true,
 	prefix: 'n8n_test_',
@@ -31,6 +35,7 @@ globalConfig.endpoints.metrics = {
 	includeApiStatusCodeLabel: true,
 	includeQueueMetrics: true,
 	queueMetricsInterval: 20,
+	activeWorkflowCountInterval: 60,
 };
 
 const server = setupTestServer({ endpointGroups: ['metrics'] });
@@ -202,6 +207,51 @@ describe('PrometheusMetricsService', () => {
 		);
 	});
 
+	it('should include last activity metric with route metrics', async () => {
+		/**
+		 * Arrange
+		 */
+		prometheusService.enableMetric('routes');
+		await prometheusService.init(server.app);
+		await agent.get('/api/v1/workflows');
+
+		/**
+		 * Act
+		 */
+		let response = await agent.get('/metrics');
+
+		/**
+		 * Assert
+		 */
+		expect(response.status).toEqual(200);
+		expect(response.type).toEqual('text/plain');
+
+		const lines = toLines(response);
+
+		expect(lines).toContainEqual(expect.stringContaining('n8n_test_last_activity'));
+
+		const lastActivityLine = lines.find((line) =>
+			line.startsWith('n8n_test_last_activity{timestamp='),
+		);
+
+		expect(lastActivityLine).toBeDefined();
+		expect(lastActivityLine?.endsWith('1')).toBe(true);
+
+		// Update last activity
+		await agent.get('/api/v1/workflows');
+
+		response = await agent.get('/metrics');
+		const updatedLines = toLines(response);
+
+		const newLastActivityLine = updatedLines.find((line) =>
+			line.startsWith('n8n_test_last_activity{timestamp='),
+		);
+
+		expect(newLastActivityLine).toBeDefined();
+		// Timestamp label should be different
+		expect(newLastActivityLine).not.toBe(lastActivityLine);
+	});
+
 	it('should return labels in route metrics if enabled', async () => {
 		/**
 		 * ARrange
@@ -284,4 +334,41 @@ describe('PrometheusMetricsService', () => {
 		expect(lines).toContain('n8n_test_scaling_mode_queue_jobs_completed 0');
 		expect(lines).toContain('n8n_test_scaling_mode_queue_jobs_failed 0');
 	});
+
+	it('should return active workflow count', async () => {
+		await prometheusService.init(server.app);
+
+		let response = await agent.get('/metrics');
+
+		expect(response.status).toEqual(200);
+		expect(response.type).toEqual('text/plain');
+
+		let lines = toLines(response);
+
+		expect(lines).toContain('n8n_test_active_workflow_count 0');
+
+		const workflow = newWorkflow({ active: true });
+		await createWorkflow(workflow);
+
+		const workflowRepository = Container.get(WorkflowRepository);
+		const activeWorkflowCount = await workflowRepository.getActiveCount();
+
+		expect(activeWorkflowCount).toBe(1);
+
+		response = await agent.get('/metrics');
+
+		lines = toLines(response);
+
+		// Should return cached value
+		expect(lines).toContain('n8n_test_active_workflow_count 0');
+
+		const cacheService = Container.get(CacheService);
+		await cacheService.delete('metrics:active-workflow-count');
+
+		response = await agent.get('/metrics');
+
+		lines = toLines(response);
+
+		expect(lines).toContain('n8n_test_active_workflow_count 1');
+	});
 });

From 27852e35ede05f0a6dc3fe24c88318fe7d704902 Mon Sep 17 00:00:00 2001
From: Ricardo Espinoza <ricardo@n8n.io>
Date: Wed, 26 Feb 2025 07:30:59 -0500
Subject: [PATCH 08/47] feat(core): Update PATCH
 `/projects/:projectId/folders/:folderId` to support tags (no-changelog)
 (#13456)

---
 .../update-folder.request.dto.test.ts         | 35 +++++++++---
 .../src/dto/folders/update-folder.dto.ts      |  5 +-
 .../folder-tag-mapping.repository.ts          | 21 ++++++++
 packages/cli/src/services/folder.service.ts   | 15 ++++--
 .../folder/folder.controller.test.ts          | 54 +++++++++++++++++++
 5 files changed, 118 insertions(+), 12 deletions(-)
 create mode 100644 packages/cli/src/databases/repositories/folder-tag-mapping.repository.ts

diff --git a/packages/@n8n/api-types/src/dto/folders/__tests__/update-folder.request.dto.test.ts b/packages/@n8n/api-types/src/dto/folders/__tests__/update-folder.request.dto.test.ts
index 23213ecbe9..28067c1a25 100644
--- a/packages/@n8n/api-types/src/dto/folders/__tests__/update-folder.request.dto.test.ts
+++ b/packages/@n8n/api-types/src/dto/folders/__tests__/update-folder.request.dto.test.ts
@@ -4,11 +4,23 @@ describe('UpdateFolderDto', () => {
 	describe('Valid requests', () => {
 		test.each([
 			{
-				name: 'name without parentId',
+				name: 'name',
 				request: {
 					name: 'test',
 				},
 			},
+			{
+				name: 'tagIds',
+				request: {
+					tagIds: ['1', '2'],
+				},
+			},
+			{
+				name: 'empty tagIds',
+				request: {
+					tagIds: [],
+				},
+			},
 		])('should validate $name', ({ request }) => {
 			const result = UpdateFolderDto.safeParse(request);
 			expect(result.success).toBe(true);
@@ -17,11 +29,6 @@ describe('UpdateFolderDto', () => {
 
 	describe('Invalid requests', () => {
 		test.each([
-			{
-				name: 'missing name',
-				request: {},
-				expectedErrorPath: ['name'],
-			},
 			{
 				name: 'empty name',
 				request: {
@@ -29,13 +36,27 @@ describe('UpdateFolderDto', () => {
 				},
 				expectedErrorPath: ['name'],
 			},
+			{
+				name: 'non string tagIds',
+				request: {
+					tagIds: [0],
+				},
+				expectedErrorPath: ['tagIds'],
+			},
+			{
+				name: 'non array tagIds',
+				request: {
+					tagIds: 0,
+				},
+				expectedErrorPath: ['tagIds'],
+			},
 		])('should fail validation for $name', ({ request, expectedErrorPath }) => {
 			const result = UpdateFolderDto.safeParse(request);
 
 			expect(result.success).toBe(false);
 
 			if (expectedErrorPath) {
-				expect(result.error?.issues[0].path).toEqual(expectedErrorPath);
+				expect(result.error?.issues[0].path[0]).toEqual(expectedErrorPath[0]);
 			}
 		});
 	});
diff --git a/packages/@n8n/api-types/src/dto/folders/update-folder.dto.ts b/packages/@n8n/api-types/src/dto/folders/update-folder.dto.ts
index 13d6c03203..f002f6aa00 100644
--- a/packages/@n8n/api-types/src/dto/folders/update-folder.dto.ts
+++ b/packages/@n8n/api-types/src/dto/folders/update-folder.dto.ts
@@ -1,7 +1,8 @@
+import { z } from 'zod';
 import { Z } from 'zod-class';
 
 import { folderNameSchema } from '../../schemas/folder.schema';
-
 export class UpdateFolderDto extends Z.class({
-	name: folderNameSchema,
+	name: folderNameSchema.optional(),
+	tagIds: z.array(z.string().max(24)).optional(),
 }) {}
diff --git a/packages/cli/src/databases/repositories/folder-tag-mapping.repository.ts b/packages/cli/src/databases/repositories/folder-tag-mapping.repository.ts
new file mode 100644
index 0000000000..360ea93362
--- /dev/null
+++ b/packages/cli/src/databases/repositories/folder-tag-mapping.repository.ts
@@ -0,0 +1,21 @@
+import { Service } from '@n8n/di';
+import { DataSource, Repository } from '@n8n/typeorm';
+
+import { FolderTagMapping } from '../entities/folder-tag-mapping';
+
+@Service()
+export class FolderTagMappingRepository extends Repository<FolderTagMapping> {
+	constructor(dataSource: DataSource) {
+		super(FolderTagMapping, dataSource.manager);
+	}
+
+	async overwriteTags(folderId: string, tagIds: string[]) {
+		return await this.manager.transaction(async (tx) => {
+			await tx.delete(FolderTagMapping, { folderId });
+
+			const tags = tagIds.map((tagId) => this.create({ folderId, tagId }));
+
+			return await tx.insert(FolderTagMapping, tags);
+		});
+	}
+}
diff --git a/packages/cli/src/services/folder.service.ts b/packages/cli/src/services/folder.service.ts
index 0b135360a9..f3caacdd92 100644
--- a/packages/cli/src/services/folder.service.ts
+++ b/packages/cli/src/services/folder.service.ts
@@ -3,6 +3,7 @@ import { Service } from '@n8n/di';
 // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
 import type { EntityManager } from '@n8n/typeorm';
 
+import { FolderTagMappingRepository } from '@/databases/repositories/folder-tag-mapping.repository';
 import { FolderRepository } from '@/databases/repositories/folder.repository';
 import { FolderNotFoundError } from '@/errors/folder-not-found.error';
 
@@ -20,7 +21,10 @@ interface FolderPathRow {
 
 @Service()
 export class FolderService {
-	constructor(private readonly folderRepository: FolderRepository) {}
+	constructor(
+		private readonly folderRepository: FolderRepository,
+		private readonly folderTagMappingRepository: FolderTagMappingRepository,
+	) {}
 
 	async createFolder({ parentFolderId, name }: CreateFolderDto, projectId: string) {
 		let parentFolder = null;
@@ -39,9 +43,14 @@ export class FolderService {
 		return folder;
 	}
 
-	async updateFolder(folderId: string, projectId: string, { name }: UpdateFolderDto) {
+	async updateFolder(folderId: string, projectId: string, { name, tagIds }: UpdateFolderDto) {
 		await this.getFolderInProject(folderId, projectId);
-		return await this.folderRepository.update({ id: folderId }, { name });
+		if (name) {
+			await this.folderRepository.update({ id: folderId }, { name });
+		}
+		if (tagIds) {
+			await this.folderTagMappingRepository.overwriteTags(folderId, tagIds);
+		}
 	}
 
 	async getFolderInProject(folderId: string, projectId: string, em?: EntityManager) {
diff --git a/packages/cli/test/integration/folder/folder.controller.test.ts b/packages/cli/test/integration/folder/folder.controller.test.ts
index bd7955d51f..8f0454ac38 100644
--- a/packages/cli/test/integration/folder/folder.controller.test.ts
+++ b/packages/cli/test/integration/folder/folder.controller.test.ts
@@ -4,6 +4,7 @@ import type { User } from '@/databases/entities/user';
 import { FolderRepository } from '@/databases/repositories/folder.repository';
 import { ProjectRepository } from '@/databases/repositories/project.repository';
 import { createFolder } from '@test-integration/db/folders';
+import { createTag } from '@test-integration/db/tags';
 
 import { createTeamProject, linkUserToProject } from '../shared/db/projects';
 import { createOwner, createMember } from '../shared/db/users';
@@ -408,4 +409,57 @@ describe('PATCH /projects/:projectId/folders/:folderId', () => {
 		const folderInDb = await folderRepository.findOneBy({ id: folder.id });
 		expect(folderInDb?.name).toBe('Updated Folder Name');
 	});
+
+	test('should update folder tags', async () => {
+		const project = await createTeamProject('test project', owner);
+		const folder = await createFolder(project, { name: 'Test Folder' });
+		const tag1 = await createTag({ name: 'Tag 1' });
+		const tag2 = await createTag({ name: 'Tag 2' });
+
+		const payload = {
+			tagIds: [tag1.id, tag2.id],
+		};
+
+		await authOwnerAgent
+			.patch(`/projects/${project.id}/folders/${folder.id}`)
+			.send(payload)
+			.expect(200);
+
+		const folderWithTags = await folderRepository.findOne({
+			where: { id: folder.id },
+			relations: ['tags'],
+		});
+
+		expect(folderWithTags?.tags).toHaveLength(2);
+		expect(folderWithTags?.tags.map((t) => t.id).sort()).toEqual([tag1.id, tag2.id].sort());
+	});
+
+	test('should replace existing folder tags with new ones', async () => {
+		const project = await createTeamProject(undefined, owner);
+		const tag1 = await createTag({ name: 'Tag 1' });
+		const tag2 = await createTag({ name: 'Tag 2' });
+		const tag3 = await createTag({ name: 'Tag 3' });
+
+		const folder = await createFolder(project, {
+			name: 'Test Folder',
+			tags: [tag1, tag2],
+		});
+
+		const payload = {
+			tagIds: [tag3.id],
+		};
+
+		await authOwnerAgent
+			.patch(`/projects/${project.id}/folders/${folder.id}`)
+			.send(payload)
+			.expect(200);
+
+		const folderWithTags = await folderRepository.findOne({
+			where: { id: folder.id },
+			relations: ['tags'],
+		});
+
+		expect(folderWithTags?.tags).toHaveLength(1);
+		expect(folderWithTags?.tags[0].id).toBe(tag3.id);
+	});
 });

From 6ba0128b5c103e46f72e0c9a3be033de2cebf003 Mon Sep 17 00:00:00 2001
From: Alex Grozav <alex@grozav.com>
Date: Wed, 26 Feb 2025 14:45:35 +0200
Subject: [PATCH 09/47] refactor: Move `vitest-config` and `eslint-config`
 packages to `@n8n` (#13530)

---
 cypress/.eslintrc.js                          |   4 +-
 package.json                                  |   5 +-
 packages/@n8n/api-types/.eslintrc.js          |   4 +-
 packages/@n8n/benchmark/.eslintrc.js          |   4 +-
 packages/@n8n/client-oauth2/.eslintrc.js      |   4 +-
 packages/@n8n/codemirror-lang/.eslintrc.cjs   |   4 +-
 packages/@n8n/config/.eslintrc.js             |   4 +-
 packages/@n8n/di/.eslintrc.js                 |   4 +-
 .../{@n8n_io => @n8n}/eslint-config/base.js   |   0
 .../eslint-config/frontend.js                 |   0
 .../eslint-config/jest.config.js              |   0
 .../eslint-config/local-rules.js              |   0
 .../eslint-config/local-rules.test.js         |   0
 .../{@n8n_io => @n8n}/eslint-config/node.js   |   0
 .../eslint-config/package.json                |   9 +-
 .../{@n8n_io => @n8n}/eslint-config/shared.js |   0
 packages/@n8n/imap/.eslintrc.js               |   4 +-
 packages/@n8n/json-schema-to-zod/.eslintrc.js |   4 +-
 packages/@n8n/nodes-langchain/.eslintrc.js    |   4 +-
 packages/@n8n/permissions/.eslintrc.js        |   4 +-
 packages/@n8n/task-runner/.eslintrc.js        |   4 +-
 .../vitest-config/frontend.d.ts}              |   0
 .../vitest-config/frontend.mjs}               |   0
 .../vitest-config/package.json                |  14 +-
 packages/cli/.eslintrc.js                     |   4 +-
 packages/core/.eslintrc.js                    |   4 +-
 packages/design-system/.eslintrc.js           |  10 +-
 packages/design-system/package.json           |   4 +-
 packages/design-system/vite.config.mts        |   2 +-
 packages/editor-ui/.eslintrc.js               |  10 +-
 packages/editor-ui/package.json               |   4 +-
 packages/editor-ui/vite.config.mts            |   2 +-
 packages/frontend/@n8n/chat/.eslintrc.cjs     |   4 +-
 packages/frontend/@n8n/chat/package.json      |   2 +
 packages/frontend/@n8n/chat/vite.config.mts   |  88 ++++----
 packages/frontend/@n8n/chat/vitest.config.mts |  30 ---
 .../frontend/@n8n/composables/.eslintrc.cjs   |  11 +-
 .../frontend/@n8n/composables/package.json    |   4 +-
 .../frontend/@n8n/composables/vite.config.ts  |   2 +-
 .../frontend/tooling/eslint-config/index.cjs  |  14 --
 .../frontend/tooling/eslint-config/index.d.ts |   3 -
 .../tooling/eslint-config/package.json        |  23 --
 packages/node-dev/.eslintrc.js                |   4 +-
 packages/nodes-base/.eslintrc.js              |   4 +-
 packages/workflow/.eslintrc.js                |   4 +-
 patches/eslint-plugin-n8n-local-rules.patch   |  13 ++
 pnpm-lock.yaml                                | 200 ++++++++----------
 pnpm-workspace.yaml                           |   1 -
 48 files changed, 240 insertions(+), 283 deletions(-)
 rename packages/{@n8n_io => @n8n}/eslint-config/base.js (100%)
 rename packages/{@n8n_io => @n8n}/eslint-config/frontend.js (100%)
 rename packages/{@n8n_io => @n8n}/eslint-config/jest.config.js (100%)
 rename packages/{@n8n_io => @n8n}/eslint-config/local-rules.js (100%)
 rename packages/{@n8n_io => @n8n}/eslint-config/local-rules.test.js (100%)
 rename packages/{@n8n_io => @n8n}/eslint-config/node.js (100%)
 rename packages/{@n8n_io => @n8n}/eslint-config/package.json (78%)
 rename packages/{@n8n_io => @n8n}/eslint-config/shared.js (100%)
 rename packages/{frontend/tooling/vitest-config/index.d.ts => @n8n/vitest-config/frontend.d.ts} (100%)
 rename packages/{frontend/tooling/vitest-config/index.mjs => @n8n/vitest-config/frontend.mjs} (100%)
 rename packages/{frontend/tooling => @n8n}/vitest-config/package.json (62%)
 delete mode 100644 packages/frontend/@n8n/chat/vitest.config.mts
 delete mode 100644 packages/frontend/tooling/eslint-config/index.cjs
 delete mode 100644 packages/frontend/tooling/eslint-config/index.d.ts
 delete mode 100644 packages/frontend/tooling/eslint-config/package.json
 create mode 100644 patches/eslint-plugin-n8n-local-rules.patch

diff --git a/cypress/.eslintrc.js b/cypress/.eslintrc.js
index 36fc0af7e2..4d42f23154 100644
--- a/cypress/.eslintrc.js
+++ b/cypress/.eslintrc.js
@@ -1,10 +1,10 @@
-const sharedOptions = require('@n8n_io/eslint-config/shared');
+const sharedOptions = require('@n8n/eslint-config/shared');
 
 /**
  * @type {import('@types/eslint').ESLint.ConfigData}
  */
 module.exports = {
-	extends: ['@n8n_io/eslint-config/base', 'plugin:cypress/recommended'],
+	extends: ['@n8n/eslint-config/base', 'plugin:cypress/recommended'],
 
 	...sharedOptions(__dirname),
 
diff --git a/package.json b/package.json
index 200ada1b88..0c4e802a40 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
   },
   "devDependencies": {
     "@biomejs/biome": "^1.9.0",
-    "@n8n_io/eslint-config": "workspace:*",
+    "@n8n/eslint-config": "workspace:*",
     "@types/jest": "^29.5.3",
     "@types/node": "*",
     "@types/supertest": "^6.0.2",
@@ -96,7 +96,8 @@
       "@types/express-serve-static-core@4.17.43": "patches/@types__express-serve-static-core@4.17.43.patch",
       "@types/ws@8.5.4": "patches/@types__ws@8.5.4.patch",
       "@types/uuencode@0.0.3": "patches/@types__uuencode@0.0.3.patch",
-      "vue-tsc@2.1.10": "patches/vue-tsc@2.1.10.patch"
+      "vue-tsc@2.1.10": "patches/vue-tsc@2.1.10.patch",
+      "eslint-plugin-n8n-local-rules": "patches/eslint-plugin-n8n-local-rules.patch"
     }
   }
 }
diff --git a/packages/@n8n/api-types/.eslintrc.js b/packages/@n8n/api-types/.eslintrc.js
index 1c42fddcdc..8c5b78c5da 100644
--- a/packages/@n8n/api-types/.eslintrc.js
+++ b/packages/@n8n/api-types/.eslintrc.js
@@ -1,7 +1,7 @@
-const sharedOptions = require('@n8n_io/eslint-config/shared');
+const sharedOptions = require('@n8n/eslint-config/shared');
 
 /** @type {import('@types/eslint').ESLint.ConfigData} */
 module.exports = {
-	extends: ['@n8n_io/eslint-config/base'],
+	extends: ['@n8n/eslint-config/base'],
 	...sharedOptions(__dirname),
 };
diff --git a/packages/@n8n/benchmark/.eslintrc.js b/packages/@n8n/benchmark/.eslintrc.js
index 4d740c55b3..83698e4feb 100644
--- a/packages/@n8n/benchmark/.eslintrc.js
+++ b/packages/@n8n/benchmark/.eslintrc.js
@@ -1,10 +1,10 @@
-const sharedOptions = require('@n8n_io/eslint-config/shared');
+const sharedOptions = require('@n8n/eslint-config/shared');
 
 /**
  * @type {import('@types/eslint').ESLint.ConfigData}
  */
 module.exports = {
-	extends: ['@n8n_io/eslint-config/node'],
+	extends: ['@n8n/eslint-config/node'],
 
 	...sharedOptions(__dirname),
 
diff --git a/packages/@n8n/client-oauth2/.eslintrc.js b/packages/@n8n/client-oauth2/.eslintrc.js
index be8ebd21d1..c6e71ea4d0 100644
--- a/packages/@n8n/client-oauth2/.eslintrc.js
+++ b/packages/@n8n/client-oauth2/.eslintrc.js
@@ -1,10 +1,10 @@
-const sharedOptions = require('@n8n_io/eslint-config/shared');
+const sharedOptions = require('@n8n/eslint-config/shared');
 
 /**
  * @type {import('@types/eslint').ESLint.ConfigData}
  */
 module.exports = {
-	extends: ['@n8n_io/eslint-config/base'],
+	extends: ['@n8n/eslint-config/base'],
 
 	...sharedOptions(__dirname),
 
diff --git a/packages/@n8n/codemirror-lang/.eslintrc.cjs b/packages/@n8n/codemirror-lang/.eslintrc.cjs
index d07f6ff6fa..8d407e73db 100644
--- a/packages/@n8n/codemirror-lang/.eslintrc.cjs
+++ b/packages/@n8n/codemirror-lang/.eslintrc.cjs
@@ -1,10 +1,10 @@
-const sharedOptions = require('@n8n_io/eslint-config/shared');
+const sharedOptions = require('@n8n/eslint-config/shared');
 
 /**
  * @type {import('@types/eslint').ESLint.ConfigData}
  */
 module.exports = {
-	extends: ['@n8n_io/eslint-config/base'],
+	extends: ['@n8n/eslint-config/base'],
 
 	...sharedOptions(__dirname),
 
diff --git a/packages/@n8n/config/.eslintrc.js b/packages/@n8n/config/.eslintrc.js
index e5a8f3f0f9..0c43755bd0 100644
--- a/packages/@n8n/config/.eslintrc.js
+++ b/packages/@n8n/config/.eslintrc.js
@@ -1,10 +1,10 @@
-const sharedOptions = require('@n8n_io/eslint-config/shared');
+const sharedOptions = require('@n8n/eslint-config/shared');
 
 /**
  * @type {import('@types/eslint').ESLint.ConfigData}
  */
 module.exports = {
-	extends: ['@n8n_io/eslint-config/node'],
+	extends: ['@n8n/eslint-config/node'],
 
 	...sharedOptions(__dirname),
 
diff --git a/packages/@n8n/di/.eslintrc.js b/packages/@n8n/di/.eslintrc.js
index 1c42fddcdc..8c5b78c5da 100644
--- a/packages/@n8n/di/.eslintrc.js
+++ b/packages/@n8n/di/.eslintrc.js
@@ -1,7 +1,7 @@
-const sharedOptions = require('@n8n_io/eslint-config/shared');
+const sharedOptions = require('@n8n/eslint-config/shared');
 
 /** @type {import('@types/eslint').ESLint.ConfigData} */
 module.exports = {
-	extends: ['@n8n_io/eslint-config/base'],
+	extends: ['@n8n/eslint-config/base'],
 	...sharedOptions(__dirname),
 };
diff --git a/packages/@n8n_io/eslint-config/base.js b/packages/@n8n/eslint-config/base.js
similarity index 100%
rename from packages/@n8n_io/eslint-config/base.js
rename to packages/@n8n/eslint-config/base.js
diff --git a/packages/@n8n_io/eslint-config/frontend.js b/packages/@n8n/eslint-config/frontend.js
similarity index 100%
rename from packages/@n8n_io/eslint-config/frontend.js
rename to packages/@n8n/eslint-config/frontend.js
diff --git a/packages/@n8n_io/eslint-config/jest.config.js b/packages/@n8n/eslint-config/jest.config.js
similarity index 100%
rename from packages/@n8n_io/eslint-config/jest.config.js
rename to packages/@n8n/eslint-config/jest.config.js
diff --git a/packages/@n8n_io/eslint-config/local-rules.js b/packages/@n8n/eslint-config/local-rules.js
similarity index 100%
rename from packages/@n8n_io/eslint-config/local-rules.js
rename to packages/@n8n/eslint-config/local-rules.js
diff --git a/packages/@n8n_io/eslint-config/local-rules.test.js b/packages/@n8n/eslint-config/local-rules.test.js
similarity index 100%
rename from packages/@n8n_io/eslint-config/local-rules.test.js
rename to packages/@n8n/eslint-config/local-rules.test.js
diff --git a/packages/@n8n_io/eslint-config/node.js b/packages/@n8n/eslint-config/node.js
similarity index 100%
rename from packages/@n8n_io/eslint-config/node.js
rename to packages/@n8n/eslint-config/node.js
diff --git a/packages/@n8n_io/eslint-config/package.json b/packages/@n8n/eslint-config/package.json
similarity index 78%
rename from packages/@n8n_io/eslint-config/package.json
rename to packages/@n8n/eslint-config/package.json
index aac4ea2e32..84b2e24633 100644
--- a/packages/@n8n_io/eslint-config/package.json
+++ b/packages/@n8n/eslint-config/package.json
@@ -1,7 +1,14 @@
 {
-  "name": "@n8n_io/eslint-config",
+  "name": "@n8n/eslint-config",
   "private": true,
   "version": "0.0.1",
+  "exports": {
+    "./base": "./base.js",
+    "./frontend": "./frontend.js",
+    "./local-rules": "./local-rules.js",
+    "./node": "./node.js",
+    "./shared": "./shared.js"
+  },
   "devDependencies": {
     "@types/eslint": "^8.56.5",
     "@typescript-eslint/eslint-plugin": "^7.2.0",
diff --git a/packages/@n8n_io/eslint-config/shared.js b/packages/@n8n/eslint-config/shared.js
similarity index 100%
rename from packages/@n8n_io/eslint-config/shared.js
rename to packages/@n8n/eslint-config/shared.js
diff --git a/packages/@n8n/imap/.eslintrc.js b/packages/@n8n/imap/.eslintrc.js
index c3fe283453..1cc57e8288 100644
--- a/packages/@n8n/imap/.eslintrc.js
+++ b/packages/@n8n/imap/.eslintrc.js
@@ -1,10 +1,10 @@
-const sharedOptions = require('@n8n_io/eslint-config/shared');
+const sharedOptions = require('@n8n/eslint-config/shared');
 
 /**
  * @type {import('@types/eslint').ESLint.ConfigData}
  */
 module.exports = {
-	extends: ['@n8n_io/eslint-config/base'],
+	extends: ['@n8n/eslint-config/base'],
 
 	...sharedOptions(__dirname),
 
diff --git a/packages/@n8n/json-schema-to-zod/.eslintrc.js b/packages/@n8n/json-schema-to-zod/.eslintrc.js
index 03caaf4930..039086a8bc 100644
--- a/packages/@n8n/json-schema-to-zod/.eslintrc.js
+++ b/packages/@n8n/json-schema-to-zod/.eslintrc.js
@@ -1,10 +1,10 @@
-const sharedOptions = require('@n8n_io/eslint-config/shared');
+const sharedOptions = require('@n8n/eslint-config/shared');
 
 /**
  * @type {import('@types/eslint').ESLint.ConfigData}
  */
 module.exports = {
-	extends: ['@n8n_io/eslint-config/node'],
+	extends: ['@n8n/eslint-config/node'],
 
 	...sharedOptions(__dirname),
 
diff --git a/packages/@n8n/nodes-langchain/.eslintrc.js b/packages/@n8n/nodes-langchain/.eslintrc.js
index 510b970755..b08c88ce40 100644
--- a/packages/@n8n/nodes-langchain/.eslintrc.js
+++ b/packages/@n8n/nodes-langchain/.eslintrc.js
@@ -1,10 +1,10 @@
-const sharedOptions = require('@n8n_io/eslint-config/shared');
+const sharedOptions = require('@n8n/eslint-config/shared');
 
 /**
  * @type {import('@types/eslint').ESLint.ConfigData}
  */
 module.exports = {
-	extends: ['@n8n_io/eslint-config/node'],
+	extends: ['@n8n/eslint-config/node'],
 
 	...sharedOptions(__dirname),
 
diff --git a/packages/@n8n/permissions/.eslintrc.js b/packages/@n8n/permissions/.eslintrc.js
index f60180296c..1c81d4ae7a 100644
--- a/packages/@n8n/permissions/.eslintrc.js
+++ b/packages/@n8n/permissions/.eslintrc.js
@@ -1,10 +1,10 @@
-const sharedOptions = require('@n8n_io/eslint-config/shared');
+const sharedOptions = require('@n8n/eslint-config/shared');
 
 /**
  * @type {import('@types/eslint').ESLint.ConfigData}
  */
 module.exports = {
-	extends: ['@n8n_io/eslint-config/base'],
+	extends: ['@n8n/eslint-config/base'],
 
 	...sharedOptions(__dirname),
 };
diff --git a/packages/@n8n/task-runner/.eslintrc.js b/packages/@n8n/task-runner/.eslintrc.js
index dd79f2157e..c0dfa859c8 100644
--- a/packages/@n8n/task-runner/.eslintrc.js
+++ b/packages/@n8n/task-runner/.eslintrc.js
@@ -1,10 +1,10 @@
-const sharedOptions = require('@n8n_io/eslint-config/shared');
+const sharedOptions = require('@n8n/eslint-config/shared');
 
 /**
  * @type {import('@types/eslint').ESLint.ConfigData}
  */
 module.exports = {
-	extends: ['@n8n_io/eslint-config/node'],
+	extends: ['@n8n/eslint-config/node'],
 
 	...sharedOptions(__dirname),
 
diff --git a/packages/frontend/tooling/vitest-config/index.d.ts b/packages/@n8n/vitest-config/frontend.d.ts
similarity index 100%
rename from packages/frontend/tooling/vitest-config/index.d.ts
rename to packages/@n8n/vitest-config/frontend.d.ts
diff --git a/packages/frontend/tooling/vitest-config/index.mjs b/packages/@n8n/vitest-config/frontend.mjs
similarity index 100%
rename from packages/frontend/tooling/vitest-config/index.mjs
rename to packages/@n8n/vitest-config/frontend.mjs
diff --git a/packages/frontend/tooling/vitest-config/package.json b/packages/@n8n/vitest-config/package.json
similarity index 62%
rename from packages/frontend/tooling/vitest-config/package.json
rename to packages/@n8n/vitest-config/package.json
index 5c2423f334..0830e53b02 100644
--- a/packages/frontend/tooling/vitest-config/package.json
+++ b/packages/@n8n/vitest-config/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@n8n/frontend-vitest-config",
+  "name": "@n8n/vitest-config",
   "version": "1.1.0",
   "type": "module",
   "peerDependencies": {
@@ -11,15 +11,13 @@
     "vitest": "catalog:frontend"
   },
   "files": [
-    "index.mjs"
+    "frontend.mjs"
   ],
-  "main": "./index.mjs",
-  "module": "./index.mjs",
   "exports": {
-    ".": {
-      "import": "./index.mjs",
-      "require": "./index.mjs",
-      "types": "./index.d.ts"
+    "./frontend": {
+      "import": "./frontend.mjs",
+      "require": "./frontend.mjs",
+      "types": "./frontend.d.ts"
     },
     "./*": "./*"
   },
diff --git a/packages/cli/.eslintrc.js b/packages/cli/.eslintrc.js
index 6002da5caa..8a62ade42c 100644
--- a/packages/cli/.eslintrc.js
+++ b/packages/cli/.eslintrc.js
@@ -1,10 +1,10 @@
-const sharedOptions = require('@n8n_io/eslint-config/shared');
+const sharedOptions = require('@n8n/eslint-config/shared');
 
 /**
  * @type {import('@types/eslint').ESLint.ConfigData}
  */
 module.exports = {
-	extends: ['@n8n_io/eslint-config/node'],
+	extends: ['@n8n/eslint-config/node'],
 
 	...sharedOptions(__dirname),
 
diff --git a/packages/core/.eslintrc.js b/packages/core/.eslintrc.js
index ceb431ce40..a69b1abddb 100644
--- a/packages/core/.eslintrc.js
+++ b/packages/core/.eslintrc.js
@@ -1,10 +1,10 @@
-const sharedOptions = require('@n8n_io/eslint-config/shared');
+const sharedOptions = require('@n8n/eslint-config/shared');
 
 /**
  * @type {import('@types/eslint').ESLint.ConfigData}
  */
 module.exports = {
-	extends: ['@n8n_io/eslint-config/node'],
+	extends: ['@n8n/eslint-config/node'],
 
 	...sharedOptions(__dirname),
 
diff --git a/packages/design-system/.eslintrc.js b/packages/design-system/.eslintrc.js
index 99d5ff4c6e..ad1f1884d3 100644
--- a/packages/design-system/.eslintrc.js
+++ b/packages/design-system/.eslintrc.js
@@ -1,9 +1,13 @@
-const { createFrontendEslintConfig } = require('@n8n/frontend-eslint-config');
+const sharedOptions = require('@n8n/eslint-config/shared');
 
 /**
  * @type {import('@types/eslint').ESLint.ConfigData}
  */
-module.exports = createFrontendEslintConfig(__dirname, {
+module.exports = {
+	extends: ['@n8n/eslint-config/frontend'],
+
+	...sharedOptions(__dirname, 'frontend'),
+
 	rules: {
 		// TODO: Remove these
 		'import/no-default-export': 'warn',
@@ -40,4 +44,4 @@ module.exports = createFrontendEslintConfig(__dirname, {
 			},
 		},
 	],
-});
+};
diff --git a/packages/design-system/package.json b/packages/design-system/package.json
index 2862f1e28b..6df36b3518 100644
--- a/packages/design-system/package.json
+++ b/packages/design-system/package.json
@@ -19,9 +19,9 @@
     "lintfix": "eslint src --ext .js,.ts,.vue --fix"
   },
   "devDependencies": {
-    "@n8n/frontend-eslint-config": "workspace:*",
-    "@n8n/frontend-vitest-config": "workspace:*",
+    "@n8n/eslint-config": "workspace:*",
     "@n8n/typescript-config": "workspace:*",
+    "@n8n/vitest-config": "workspace:*",
     "@n8n/storybook": "workspace:*",
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/user-event": "^14.6.0",
diff --git a/packages/design-system/vite.config.mts b/packages/design-system/vite.config.mts
index 1a6c504c02..4422e98dd3 100644
--- a/packages/design-system/vite.config.mts
+++ b/packages/design-system/vite.config.mts
@@ -4,7 +4,7 @@ import { defineConfig, mergeConfig } from 'vite';
 import components from 'unplugin-vue-components/vite';
 import icons from 'unplugin-icons/vite';
 import iconsResolver from 'unplugin-icons/resolver';
-import { vitestConfig } from '@n8n/frontend-vitest-config';
+import { vitestConfig } from '@n8n/vitest-config/frontend';
 
 const frontendDir = resolve(__dirname, '..', 'frontend');
 
diff --git a/packages/editor-ui/.eslintrc.js b/packages/editor-ui/.eslintrc.js
index a32d3a3d62..af5a102284 100644
--- a/packages/editor-ui/.eslintrc.js
+++ b/packages/editor-ui/.eslintrc.js
@@ -1,9 +1,13 @@
-const { createFrontendEslintConfig } = require('@n8n/frontend-eslint-config');
+const sharedOptions = require('@n8n/eslint-config/shared');
 
 /**
  * @type {import('@types/eslint').ESLint.ConfigData}
  */
-module.exports = createFrontendEslintConfig(__dirname, {
+module.exports = {
+	extends: ['@n8n/eslint-config/frontend'],
+
+	...sharedOptions(__dirname, 'frontend'),
+
 	rules: {
 		'n8n-local-rules/dangerously-use-html-string-missing': 'error',
 
@@ -37,4 +41,4 @@ module.exports = createFrontendEslintConfig(__dirname, {
 		'@typescript-eslint/no-redundant-type-constituents': 'warn',
 		'@typescript-eslint/no-unsafe-enum-comparison': 'warn',
 	},
-});
+};
diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json
index 76c24a9d03..476c9ddd8e 100644
--- a/packages/editor-ui/package.json
+++ b/packages/editor-ui/package.json
@@ -91,9 +91,9 @@
     "xss": "catalog:"
   },
   "devDependencies": {
-    "@n8n/frontend-eslint-config": "workspace:*",
-    "@n8n/frontend-vitest-config": "workspace:*",
+    "@n8n/eslint-config": "workspace:*",
     "@n8n/typescript-config": "workspace:*",
+    "@n8n/vitest-config": "workspace:*",
     "@faker-js/faker": "^8.0.2",
     "@iconify/json": "^2.2.228",
     "@pinia/testing": "^0.1.6",
diff --git a/packages/editor-ui/vite.config.mts b/packages/editor-ui/vite.config.mts
index 1d7514ca09..ca58f5d980 100644
--- a/packages/editor-ui/vite.config.mts
+++ b/packages/editor-ui/vite.config.mts
@@ -4,7 +4,7 @@ import { defineConfig, mergeConfig } from 'vite';
 import { viteStaticCopy } from 'vite-plugin-static-copy';
 import svgLoader from 'vite-svg-loader';
 
-import { vitestConfig } from '@n8n/frontend-vitest-config';
+import { vitestConfig } from '@n8n/vitest-config/frontend';
 import icons from 'unplugin-icons/vite';
 import iconsResolver from 'unplugin-icons/resolver';
 import components from 'unplugin-vue-components/vite';
diff --git a/packages/frontend/@n8n/chat/.eslintrc.cjs b/packages/frontend/@n8n/chat/.eslintrc.cjs
index a1ad467ea3..3f9a316c08 100644
--- a/packages/frontend/@n8n/chat/.eslintrc.cjs
+++ b/packages/frontend/@n8n/chat/.eslintrc.cjs
@@ -1,10 +1,10 @@
-const sharedOptions = require('@n8n_io/eslint-config/shared');
+const sharedOptions = require('@n8n/eslint-config/shared');
 
 /**
  * @type {import('@types/eslint').ESLint.ConfigData}
  */
 module.exports = {
-	extends: ['@n8n_io/eslint-config/frontend'],
+	extends: ['@n8n/eslint-config/frontend'],
 
 	...sharedOptions(__dirname, 'frontend'),
 };
diff --git a/packages/frontend/@n8n/chat/package.json b/packages/frontend/@n8n/chat/package.json
index a21255782a..ed93c63430 100644
--- a/packages/frontend/@n8n/chat/package.json
+++ b/packages/frontend/@n8n/chat/package.json
@@ -46,7 +46,9 @@
   "devDependencies": {
     "@iconify-json/mdi": "^1.1.54",
     "@n8n/storybook": "workspace:*",
+    "@n8n/eslint-config": "workspace:*",
     "@n8n/typescript-config": "workspace:*",
+    "@n8n/vitest-config": "workspace:*",
     "@vitejs/plugin-vue": "catalog:frontend",
     "@vitest/coverage-v8": "catalog:frontend",
     "unplugin-icons": "^0.19.0",
diff --git a/packages/frontend/@n8n/chat/vite.config.mts b/packages/frontend/@n8n/chat/vite.config.mts
index 75fc314ab4..38722cbea7 100644
--- a/packages/frontend/@n8n/chat/vite.config.mts
+++ b/packages/frontend/@n8n/chat/vite.config.mts
@@ -1,53 +1,57 @@
-import { defineConfig } from 'vite';
+import { defineConfig, mergeConfig } from 'vite';
 import { resolve } from 'path';
 import vue from '@vitejs/plugin-vue';
 import icons from 'unplugin-icons/vite';
 import dts from 'vite-plugin-dts';
+import { vitestConfig } from '@n8n/vitest-config/frontend';
 
 const includeVue = process.env.INCLUDE_VUE === 'true';
 const srcPath = resolve(__dirname, 'src');
 
 // https://vitejs.dev/config/
-export default defineConfig({
-	plugins: [
-		vue(),
-		icons({
-			compiler: 'vue3',
-			autoInstall: true,
-		}),
-		dts(),
-	],
-	resolve: {
-		alias: {
-			'@': srcPath,
-			'@n8n/chat': srcPath,
-			lodash: 'lodash-es',
-		},
-	},
-	define: {
-		'process.env.NODE_ENV': process.env.NODE_ENV ? `"${process.env.NODE_ENV}"` : '"development"',
-	},
-	build: {
-		emptyOutDir: !includeVue,
-		lib: {
-			entry: resolve(__dirname, 'src', 'index.ts'),
-			name: 'N8nChat',
-			fileName: (format) => (includeVue ? `chat.bundle.${format}.js` : `chat.${format}.js`),
-		},
-		rollupOptions: {
-			// make sure to externalize deps that shouldn't be bundled
-			// into your library
-			external: includeVue ? [] : ['vue'],
-			output: {
-				exports: 'named',
-				// Provide global variables to use in the UMD build
-				// for externalized deps
-				globals: includeVue
-					? {}
-					: {
-							vue: 'Vue',
-						},
+export default mergeConfig(
+	defineConfig({
+		plugins: [
+			vue(),
+			icons({
+				compiler: 'vue3',
+				autoInstall: true,
+			}),
+			dts(),
+		],
+		resolve: {
+			alias: {
+				'@': srcPath,
+				'@n8n/chat': srcPath,
+				lodash: 'lodash-es',
 			},
 		},
-	},
-});
+		define: {
+			'process.env.NODE_ENV': process.env.NODE_ENV ? `"${process.env.NODE_ENV}"` : '"development"',
+		},
+		build: {
+			emptyOutDir: !includeVue,
+			lib: {
+				entry: resolve(__dirname, 'src', 'index.ts'),
+				name: 'N8nChat',
+				fileName: (format) => (includeVue ? `chat.bundle.${format}.js` : `chat.${format}.js`),
+			},
+			rollupOptions: {
+				// make sure to externalize deps that shouldn't be bundled
+				// into your library
+				external: includeVue ? [] : ['vue'],
+				output: {
+					exports: 'named',
+					// Provide global variables to use in the UMD build
+					// for externalized deps
+					globals: includeVue
+						? {}
+						: {
+								vue: 'Vue',
+							},
+				},
+			},
+		},
+	}),
+	vitestConfig,
+);
diff --git a/packages/frontend/@n8n/chat/vitest.config.mts b/packages/frontend/@n8n/chat/vitest.config.mts
deleted file mode 100644
index a14986457c..0000000000
--- a/packages/frontend/@n8n/chat/vitest.config.mts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { resolve } from 'path';
-import { mergeConfig } from 'vite';
-import { type UserConfig } from 'vitest';
-import { defineConfig } from 'vitest/config';
-import viteConfig from './vite.config.mts';
-
-const srcPath = resolve(__dirname, 'src');
-const vitestConfig = defineConfig({
-	test: {
-		globals: true,
-		environment: 'jsdom',
-		root: srcPath,
-		setupFiles: ['./src/__tests__/setup.ts'],
-		...(process.env.COVERAGE_ENABLED === 'true'
-			? {
-					coverage: {
-						enabled: true,
-						provider: 'v8',
-						reporter: process.env.CI === 'true' ? 'cobertura' : 'text-summary',
-						all: true,
-					},
-			  }
-			: {}),
-	},
-}) as UserConfig;
-
-export default mergeConfig(
-	viteConfig,
-	vitestConfig,
-);
diff --git a/packages/frontend/@n8n/composables/.eslintrc.cjs b/packages/frontend/@n8n/composables/.eslintrc.cjs
index 94152c01f7..3f9a316c08 100644
--- a/packages/frontend/@n8n/composables/.eslintrc.cjs
+++ b/packages/frontend/@n8n/composables/.eslintrc.cjs
@@ -1,3 +1,10 @@
-const { createFrontendEslintConfig } = require('@n8n/frontend-eslint-config');
+const sharedOptions = require('@n8n/eslint-config/shared');
 
-module.exports = createFrontendEslintConfig(__dirname);
+/**
+ * @type {import('@types/eslint').ESLint.ConfigData}
+ */
+module.exports = {
+	extends: ['@n8n/eslint-config/frontend'],
+
+	...sharedOptions(__dirname, 'frontend'),
+};
diff --git a/packages/frontend/@n8n/composables/package.json b/packages/frontend/@n8n/composables/package.json
index a69c430016..55c7a0a8cb 100644
--- a/packages/frontend/@n8n/composables/package.json
+++ b/packages/frontend/@n8n/composables/package.json
@@ -25,9 +25,9 @@
     "format:check": "biome ci . && prettier --check . --ignore-path ../../../../.prettierignore"
   },
   "devDependencies": {
-    "@n8n/frontend-eslint-config": "workspace:*",
-    "@n8n/frontend-vitest-config": "workspace:*",
+    "@n8n/eslint-config": "workspace:*",
     "@n8n/typescript-config": "workspace:*",
+    "@n8n/vitest-config": "workspace:*",
     "@testing-library/jest-dom": "catalog:frontend",
     "@testing-library/user-event": "catalog:frontend",
     "@testing-library/vue": "catalog:frontend",
diff --git a/packages/frontend/@n8n/composables/vite.config.ts b/packages/frontend/@n8n/composables/vite.config.ts
index 68833e7059..784f3fb497 100644
--- a/packages/frontend/@n8n/composables/vite.config.ts
+++ b/packages/frontend/@n8n/composables/vite.config.ts
@@ -1,4 +1,4 @@
 import { defineConfig, mergeConfig } from 'vite';
-import { vitestConfig } from '@n8n/frontend-vitest-config';
+import { vitestConfig } from '@n8n/vitest-config/frontend';
 
 export default mergeConfig(defineConfig({}), vitestConfig);
diff --git a/packages/frontend/tooling/eslint-config/index.cjs b/packages/frontend/tooling/eslint-config/index.cjs
deleted file mode 100644
index c50ec4f16c..0000000000
--- a/packages/frontend/tooling/eslint-config/index.cjs
+++ /dev/null
@@ -1,14 +0,0 @@
-const sharedOptions = require('@n8n_io/eslint-config/shared');
-
-/**
- * @param {string} path
- * @param {import('@types/eslint').ESLint.ConfigData} config
- * @returns {import('@types/eslint').ESLint.ConfigData}
- */
-module.exports.createFrontendEslintConfig = function (path, config = {}) {
-	return {
-		extends: ['@n8n_io/eslint-config/frontend'],
-		...sharedOptions(path, 'frontend'),
-		...config,
-	};
-};
diff --git a/packages/frontend/tooling/eslint-config/index.d.ts b/packages/frontend/tooling/eslint-config/index.d.ts
deleted file mode 100644
index ff0f8a329b..0000000000
--- a/packages/frontend/tooling/eslint-config/index.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import type { ESLint } from '@types/eslint';
-
-export function createFrontendEslintConfig(path: string): ESLint.ConfigData;
diff --git a/packages/frontend/tooling/eslint-config/package.json b/packages/frontend/tooling/eslint-config/package.json
deleted file mode 100644
index af67c1680d..0000000000
--- a/packages/frontend/tooling/eslint-config/package.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "name": "@n8n/frontend-eslint-config",
-  "version": "1.1.0",
-  "type": "module",
-  "dependencies": {
-    "@n8n_io/eslint-config": "workspace:*",
-    "eslint-plugin-n8n-local-rules": "^1.0.0"
-  },
-  "files": [
-    "index.cjs"
-  ],
-  "main": "./index.cjs",
-  "module": "./index.cjs",
-  "exports": {
-    ".": {
-      "import": "./index.cjs",
-      "require": "./index.cjs",
-      "types": "./index.d.ts"
-    },
-    "./*": "./*"
-  },
-  "license": "See LICENSE.md file in the root of the repository"
-}
diff --git a/packages/node-dev/.eslintrc.js b/packages/node-dev/.eslintrc.js
index cda3ce866a..060130fa16 100644
--- a/packages/node-dev/.eslintrc.js
+++ b/packages/node-dev/.eslintrc.js
@@ -1,10 +1,10 @@
-const sharedOptions = require('@n8n_io/eslint-config/shared');
+const sharedOptions = require('@n8n/eslint-config/shared');
 
 /**
  * @type {import('@types/eslint').ESLint.ConfigData}
  */
 module.exports = {
-	extends: ['@n8n_io/eslint-config/base'],
+	extends: ['@n8n/eslint-config/base'],
 	...sharedOptions(__dirname),
 	ignorePatterns: [
 		'templates/**', // TODO: remove this
diff --git a/packages/nodes-base/.eslintrc.js b/packages/nodes-base/.eslintrc.js
index e99abcf38f..2352429a5e 100644
--- a/packages/nodes-base/.eslintrc.js
+++ b/packages/nodes-base/.eslintrc.js
@@ -1,10 +1,10 @@
-const sharedOptions = require('@n8n_io/eslint-config/shared');
+const sharedOptions = require('@n8n/eslint-config/shared');
 
 /**
  * @type {import('@types/eslint').ESLint.ConfigData}
  */
 module.exports = {
-	extends: ['@n8n_io/eslint-config/node'],
+	extends: ['@n8n/eslint-config/node'],
 
 	...sharedOptions(__dirname),
 
diff --git a/packages/workflow/.eslintrc.js b/packages/workflow/.eslintrc.js
index fa81226338..25bf8670d2 100644
--- a/packages/workflow/.eslintrc.js
+++ b/packages/workflow/.eslintrc.js
@@ -1,10 +1,10 @@
-const sharedOptions = require('@n8n_io/eslint-config/shared');
+const sharedOptions = require('@n8n/eslint-config/shared');
 
 /**
  * @type {import('@types/eslint').ESLint.ConfigData}
  */
 module.exports = {
-	extends: ['@n8n_io/eslint-config/base'],
+	extends: ['@n8n/eslint-config/base'],
 
 	...sharedOptions(__dirname),
 
diff --git a/patches/eslint-plugin-n8n-local-rules.patch b/patches/eslint-plugin-n8n-local-rules.patch
new file mode 100644
index 0000000000..49a4e732ba
--- /dev/null
+++ b/patches/eslint-plugin-n8n-local-rules.patch
@@ -0,0 +1,13 @@
+diff --git a/index.js b/index.js
+index b054bc7cbe742e8948e62dc3fdbaba9080e4aee1..7327ad02b48b3746cba93e0317ed190e61886888 100644
+--- a/index.js
++++ b/index.js
+@@ -7,7 +7,7 @@ const { findUp } = require('./findUp');
+ const found = findUp('.npmrc', __dirname);
+ const rootDir = path.dirname(found);
+ 
+-const localRulesPath = path.resolve(rootDir, 'packages', '@n8n_io', 'eslint-config', 'local-rules.js')
++const localRulesPath = path.resolve(rootDir, 'packages', '@n8n', 'eslint-config', 'local-rules.js')
+ const rules = require(localRulesPath);
+ 
+ if (!rules) {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d711644562..e029bacfd4 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -154,6 +154,9 @@ patchedDependencies:
   bull@4.12.1:
     hash: 4b8aae78debc54697a9106a44b1a949089d4facfeee057883e32116ab8c80f68
     path: patches/bull@4.12.1.patch
+  eslint-plugin-n8n-local-rules:
+    hash: e0fd59254ab02473c6940fa25fcc8102ebc7d371c015ec53333a43f48af33cc2
+    path: patches/eslint-plugin-n8n-local-rules.patch
   pkce-challenge@3.0.0:
     hash: 4fa087c659ab74f146b6e9ff6ecee9f497d1d8a57d5a2bbb9c0c7a0356b3c33b
     path: patches/pkce-challenge@3.0.0.patch
@@ -171,9 +174,9 @@ importers:
       '@biomejs/biome':
         specifier: ^1.9.0
         version: 1.9.0
-      '@n8n_io/eslint-config':
+      '@n8n/eslint-config':
         specifier: workspace:*
-        version: link:packages/@n8n_io/eslint-config
+        version: link:packages/@n8n/eslint-config
       '@types/jest':
         specifier: ^29.5.3
         version: 29.5.3
@@ -389,6 +392,54 @@ importers:
         specifier: workspace:*
         version: link:../typescript-config
 
+  packages/@n8n/eslint-config:
+    devDependencies:
+      '@types/eslint':
+        specifier: ^8.56.5
+        version: 8.56.5
+      '@typescript-eslint/eslint-plugin':
+        specifier: ^7.2.0
+        version: 7.2.0(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.7.2))(eslint@8.57.0)(typescript@5.7.2)
+      '@typescript-eslint/parser':
+        specifier: ^7.2.0
+        version: 7.2.0(eslint@8.57.0)(typescript@5.7.2)
+      '@vue/eslint-config-typescript':
+        specifier: ^13.0.0
+        version: 13.0.0(eslint-plugin-vue@9.23.0(eslint@8.57.0))(eslint@8.57.0)(typescript@5.7.2)
+      eslint:
+        specifier: ^8.57.0
+        version: 8.57.0
+      eslint-config-airbnb-typescript:
+        specifier: ^18.0.0
+        version: 18.0.0(@typescript-eslint/eslint-plugin@7.2.0(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.7.2))(eslint@8.57.0)(typescript@5.7.2))(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.7.2))(eslint-plugin-import@2.29.1)(eslint@8.57.0)
+      eslint-config-prettier:
+        specifier: ^9.1.0
+        version: 9.1.0(eslint@8.57.0)
+      eslint-import-resolver-typescript:
+        specifier: ^3.6.1
+        version: 3.6.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.7.2))(eslint-plugin-import@2.29.1)(eslint@8.57.0)
+      eslint-plugin-import:
+        specifier: ^2.29.1
+        version: 2.29.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.7.2))(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0)
+      eslint-plugin-lodash:
+        specifier: ^7.4.0
+        version: 7.4.0(eslint@8.57.0)
+      eslint-plugin-n8n-local-rules:
+        specifier: ^1.0.0
+        version: 1.0.0(patch_hash=e0fd59254ab02473c6940fa25fcc8102ebc7d371c015ec53333a43f48af33cc2)
+      eslint-plugin-unicorn:
+        specifier: ^51.0.1
+        version: 51.0.1(eslint@8.57.0)
+      eslint-plugin-unused-imports:
+        specifier: ^3.1.0
+        version: 3.1.0(@typescript-eslint/eslint-plugin@7.2.0(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.7.2))(eslint@8.57.0)(typescript@5.7.2))(eslint@8.57.0)
+      eslint-plugin-vue:
+        specifier: ^9.23.0
+        version: 9.23.0(eslint@8.57.0)
+      vue-eslint-parser:
+        specifier: ^9.4.2
+        version: 9.4.2(eslint@8.57.0)
+
   packages/@n8n/imap:
     dependencies:
       iconv-lite:
@@ -442,7 +493,7 @@ importers:
         version: 3.666.0(@aws-sdk/client-sts@3.666.0)
       '@getzep/zep-cloud':
         specifier: 1.0.12
-        version: 1.0.12(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13)(langchain@0.3.11(77263c3fabb2ad4a7bd89ea0922555eb))
+        version: 1.0.12(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13)(langchain@0.3.11(d2c70e6e899e44bb5377ca6198a97c6c))
       '@getzep/zep-js':
         specifier: 0.9.0
         version: 0.9.0
@@ -469,7 +520,7 @@ importers:
         version: 0.3.2(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13)
       '@langchain/community':
         specifier: 0.3.24
-        version: 0.3.24(61593ec037542bd45cb8735ad3bb3805)
+        version: 0.3.24(8549324d4d39cb6e91ae9ff5fc6970d3)
       '@langchain/core':
         specifier: 'catalog:'
         version: 0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1))
@@ -559,7 +610,7 @@ importers:
         version: 23.0.1
       langchain:
         specifier: 0.3.11
-        version: 0.3.11(77263c3fabb2ad4a7bd89ea0922555eb)
+        version: 0.3.11(d2c70e6e899e44bb5377ca6198a97c6c)
       lodash:
         specifier: 'catalog:'
         version: 4.17.21
@@ -724,53 +775,14 @@ importers:
 
   packages/@n8n/typescript-config: {}
 
-  packages/@n8n_io/eslint-config:
+  packages/@n8n/vitest-config:
     devDependencies:
-      '@types/eslint':
-        specifier: ^8.56.5
-        version: 8.56.5
-      '@typescript-eslint/eslint-plugin':
-        specifier: ^7.2.0
-        version: 7.2.0(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.7.2))(eslint@8.57.0)(typescript@5.7.2)
-      '@typescript-eslint/parser':
-        specifier: ^7.2.0
-        version: 7.2.0(eslint@8.57.0)(typescript@5.7.2)
-      '@vue/eslint-config-typescript':
-        specifier: ^13.0.0
-        version: 13.0.0(eslint-plugin-vue@9.23.0(eslint@8.57.0))(eslint@8.57.0)(typescript@5.7.2)
-      eslint:
-        specifier: ^8.57.0
-        version: 8.57.0
-      eslint-config-airbnb-typescript:
-        specifier: ^18.0.0
-        version: 18.0.0(@typescript-eslint/eslint-plugin@7.2.0(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.7.2))(eslint@8.57.0)(typescript@5.7.2))(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.7.2))(eslint-plugin-import@2.29.1)(eslint@8.57.0)
-      eslint-config-prettier:
-        specifier: ^9.1.0
-        version: 9.1.0(eslint@8.57.0)
-      eslint-import-resolver-typescript:
-        specifier: ^3.6.1
-        version: 3.6.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.7.2))(eslint-plugin-import@2.29.1)(eslint@8.57.0)
-      eslint-plugin-import:
-        specifier: ^2.29.1
-        version: 2.29.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.7.2))(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0)
-      eslint-plugin-lodash:
-        specifier: ^7.4.0
-        version: 7.4.0(eslint@8.57.0)
-      eslint-plugin-n8n-local-rules:
-        specifier: ^1.0.0
-        version: 1.0.0
-      eslint-plugin-unicorn:
-        specifier: ^51.0.1
-        version: 51.0.1(eslint@8.57.0)
-      eslint-plugin-unused-imports:
-        specifier: ^3.1.0
-        version: 3.1.0(@typescript-eslint/eslint-plugin@7.2.0(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.7.2))(eslint@8.57.0)(typescript@5.7.2))(eslint@8.57.0)
-      eslint-plugin-vue:
-        specifier: ^9.23.0
-        version: 9.23.0(eslint@8.57.0)
-      vue-eslint-parser:
-        specifier: ^9.4.2
-        version: 9.4.2(eslint@8.57.0)
+      vite:
+        specifier: catalog:frontend
+        version: 6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1)
+      vitest:
+        specifier: catalog:frontend
+        version: 3.0.5(@types/debug@4.1.12)(@types/node@18.16.16)(jiti@1.21.0)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1)
 
   packages/cli:
     dependencies:
@@ -1308,18 +1320,18 @@ importers:
         specifier: 'catalog:'
         version: 1.0.15
     devDependencies:
-      '@n8n/frontend-eslint-config':
+      '@n8n/eslint-config':
         specifier: workspace:*
-        version: link:../frontend/tooling/eslint-config
-      '@n8n/frontend-vitest-config':
-        specifier: workspace:*
-        version: link:../frontend/tooling/vitest-config
+        version: link:../@n8n/eslint-config
       '@n8n/storybook':
         specifier: workspace:*
         version: link:../@n8n/storybook
       '@n8n/typescript-config':
         specifier: workspace:*
         version: link:../@n8n/typescript-config
+      '@n8n/vitest-config':
+        specifier: workspace:*
+        version: link:../@n8n/vitest-config
       '@testing-library/jest-dom':
         specifier: ^6.6.3
         version: 6.6.3
@@ -1612,15 +1624,15 @@ importers:
       '@iconify/json':
         specifier: ^2.2.228
         version: 2.2.230
-      '@n8n/frontend-eslint-config':
+      '@n8n/eslint-config':
         specifier: workspace:*
-        version: link:../frontend/tooling/eslint-config
-      '@n8n/frontend-vitest-config':
-        specifier: workspace:*
-        version: link:../frontend/tooling/vitest-config
+        version: link:../@n8n/eslint-config
       '@n8n/typescript-config':
         specifier: workspace:*
         version: link:../@n8n/typescript-config
+      '@n8n/vitest-config':
+        specifier: workspace:*
+        version: link:../@n8n/vitest-config
       '@pinia/testing':
         specifier: ^0.1.6
         version: 0.1.6(pinia@2.2.4(typescript@5.7.2)(vue@3.5.13(typescript@5.7.2)))(vue@3.5.13(typescript@5.7.2))
@@ -1712,12 +1724,18 @@ importers:
       '@iconify-json/mdi':
         specifier: ^1.1.54
         version: 1.1.63
+      '@n8n/eslint-config':
+        specifier: workspace:*
+        version: link:../../../@n8n/eslint-config
       '@n8n/storybook':
         specifier: workspace:*
         version: link:../../../@n8n/storybook
       '@n8n/typescript-config':
         specifier: workspace:*
         version: link:../../../@n8n/typescript-config
+      '@n8n/vitest-config':
+        specifier: workspace:*
+        version: link:../../../@n8n/vitest-config
       '@vitejs/plugin-vue':
         specifier: catalog:frontend
         version: 5.2.1(vite@6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1))(vue@3.5.13(typescript@5.7.2))
@@ -1742,15 +1760,15 @@ importers:
 
   packages/frontend/@n8n/composables:
     devDependencies:
-      '@n8n/frontend-eslint-config':
+      '@n8n/eslint-config':
         specifier: workspace:*
-        version: link:../../tooling/eslint-config
-      '@n8n/frontend-vitest-config':
-        specifier: workspace:*
-        version: link:../../tooling/vitest-config
+        version: link:../../../@n8n/eslint-config
       '@n8n/typescript-config':
         specifier: workspace:*
         version: link:../../../@n8n/typescript-config
+      '@n8n/vitest-config':
+        specifier: workspace:*
+        version: link:../../../@n8n/vitest-config
       '@testing-library/jest-dom':
         specifier: catalog:frontend
         version: 6.6.3
@@ -1791,24 +1809,6 @@ importers:
         specifier: ^2.1.10
         version: 2.1.10(patch_hash=e2aee939ccac8a57fe449bfd92bedd8117841579526217bc39aca26c6b8c317f)(typescript@5.7.2)
 
-  packages/frontend/tooling/eslint-config:
-    dependencies:
-      '@n8n_io/eslint-config':
-        specifier: workspace:*
-        version: link:../../../@n8n_io/eslint-config
-      eslint-plugin-n8n-local-rules:
-        specifier: ^1.0.0
-        version: 1.0.0
-
-  packages/frontend/tooling/vitest-config:
-    devDependencies:
-      vite:
-        specifier: catalog:frontend
-        version: 6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1)
-      vitest:
-        specifier: catalog:frontend
-        version: 3.0.5(@types/debug@4.1.12)(@types/node@18.16.16)(jiti@1.21.0)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1)
-
   packages/node-dev:
     dependencies:
       '@n8n/di':
@@ -16086,7 +16086,7 @@ snapshots:
   '@gar/promisify@1.1.3':
     optional: true
 
-  '@getzep/zep-cloud@1.0.12(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13)(langchain@0.3.11(77263c3fabb2ad4a7bd89ea0922555eb))':
+  '@getzep/zep-cloud@1.0.12(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13)(langchain@0.3.11(d2c70e6e899e44bb5377ca6198a97c6c))':
     dependencies:
       form-data: 4.0.0
       node-fetch: 2.7.0(encoding@0.1.13)
@@ -16095,7 +16095,7 @@ snapshots:
       zod: 3.24.1
     optionalDependencies:
       '@langchain/core': 0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1))
-      langchain: 0.3.11(77263c3fabb2ad4a7bd89ea0922555eb)
+      langchain: 0.3.11(d2c70e6e899e44bb5377ca6198a97c6c)
     transitivePeerDependencies:
       - encoding
 
@@ -16614,7 +16614,7 @@ snapshots:
       - aws-crt
       - encoding
 
-  '@langchain/community@0.3.24(61593ec037542bd45cb8735ad3bb3805)':
+  '@langchain/community@0.3.24(8549324d4d39cb6e91ae9ff5fc6970d3)':
     dependencies:
       '@browserbasehq/stagehand': 1.9.0(@playwright/test@1.49.1)(deepmerge@4.3.1)(dotenv@16.4.5)(encoding@0.1.13)(openai@4.78.1(encoding@0.1.13)(zod@3.24.1))(zod@3.24.1)
       '@ibm-cloud/watsonx-ai': 1.1.2
@@ -16625,7 +16625,7 @@ snapshots:
       flat: 5.0.2
       ibm-cloud-sdk-core: 5.1.0
       js-yaml: 4.1.0
-      langchain: 0.3.11(77263c3fabb2ad4a7bd89ea0922555eb)
+      langchain: 0.3.11(d2c70e6e899e44bb5377ca6198a97c6c)
       langsmith: 0.2.15(openai@4.78.1(encoding@0.1.13)(zod@3.24.1))
       openai: 4.78.1(encoding@0.1.13)(zod@3.24.1)
       uuid: 10.0.0
@@ -16640,7 +16640,7 @@ snapshots:
       '@aws-sdk/credential-provider-node': 3.666.0(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(@aws-sdk/client-sts@3.666.0)
       '@azure/storage-blob': 12.18.0(encoding@0.1.13)
       '@browserbasehq/sdk': 2.0.0(encoding@0.1.13)
-      '@getzep/zep-cloud': 1.0.12(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13)(langchain@0.3.11(77263c3fabb2ad4a7bd89ea0922555eb))
+      '@getzep/zep-cloud': 1.0.12(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13)(langchain@0.3.11(d2c70e6e899e44bb5377ca6198a97c6c))
       '@getzep/zep-js': 0.9.0
       '@google-ai/generativelanguage': 2.6.0(encoding@0.1.13)
       '@google-cloud/storage': 7.12.1(encoding@0.1.13)
@@ -19959,14 +19959,6 @@ snapshots:
     transitivePeerDependencies:
       - debug
 
-  axios@1.7.4(debug@4.4.0):
-    dependencies:
-      follow-redirects: 1.15.6(debug@4.4.0)
-      form-data: 4.0.0
-      proxy-from-env: 1.1.0
-    transitivePeerDependencies:
-      - debug
-
   axios@1.7.7:
     dependencies:
       follow-redirects: 1.15.6(debug@4.3.6)
@@ -21724,7 +21716,7 @@ snapshots:
       eslint: 8.57.0
       lodash: 4.17.21
 
-  eslint-plugin-n8n-local-rules@1.0.0: {}
+  eslint-plugin-n8n-local-rules@1.0.0(patch_hash=e0fd59254ab02473c6940fa25fcc8102ebc7d371c015ec53333a43f48af33cc2): {}
 
   eslint-plugin-n8n-nodes-base@1.16.3(eslint@8.57.0)(typescript@5.7.2):
     dependencies:
@@ -22187,10 +22179,6 @@ snapshots:
     optionalDependencies:
       debug: 4.3.7
 
-  follow-redirects@1.15.6(debug@4.4.0):
-    optionalDependencies:
-      debug: 4.4.0
-
   for-each@0.3.3:
     dependencies:
       is-callable: 1.2.7
@@ -22782,7 +22770,7 @@ snapshots:
       '@types/debug': 4.1.12
       '@types/node': 18.16.16
       '@types/tough-cookie': 4.0.2
-      axios: 1.7.4(debug@4.4.0)
+      axios: 1.7.4
       camelcase: 6.3.0
       debug: 4.4.0
       dotenv: 16.4.5
@@ -22792,7 +22780,7 @@ snapshots:
       isstream: 0.1.2
       jsonwebtoken: 9.0.2
       mime-types: 2.1.35
-      retry-axios: 2.6.0(axios@1.7.4)
+      retry-axios: 2.6.0(axios@1.7.4(debug@4.4.0))
       tough-cookie: 4.1.3
     transitivePeerDependencies:
       - supports-color
@@ -23781,7 +23769,7 @@ snapshots:
 
   kuler@2.0.0: {}
 
-  langchain@0.3.11(77263c3fabb2ad4a7bd89ea0922555eb):
+  langchain@0.3.11(d2c70e6e899e44bb5377ca6198a97c6c):
     dependencies:
       '@langchain/core': 0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1))
       '@langchain/openai': 0.3.17(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13)
@@ -26165,7 +26153,7 @@ snapshots:
 
   ret@0.1.15: {}
 
-  retry-axios@2.6.0(axios@1.7.4):
+  retry-axios@2.6.0(axios@1.7.4(debug@4.4.0)):
     dependencies:
       axios: 1.7.4
 
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index a719f95177..418858956b 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -1,7 +1,6 @@
 packages:
   - packages/*
   - packages/@n8n/*
-  - packages/@n8n_io/*
   - packages/frontend/**
   - cypress
 

From 6e8c401ff11bb3de747472928c611a345c0525b7 Mon Sep 17 00:00:00 2001
From: Ricardo Espinoza <ricardo@n8n.io>
Date: Wed, 26 Feb 2025 07:57:30 -0500
Subject: [PATCH 10/47] refactor(core): Rename `workflowsCount` to
 `workflowCount` (no-changelog) (#13470)

---
 packages/cli/src/databases/entities/folder.ts |  4 +-
 .../__tests__/folder.repository.test.ts       | 10 ++---
 .../repositories/folder.repository.ts         | 38 +++++++++----------
 .../repositories/workflow.repository.ts       |  4 +-
 .../workflows/workflows.controller.test.ts    |  2 +-
 5 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/packages/cli/src/databases/entities/folder.ts b/packages/cli/src/databases/entities/folder.ts
index c1af39ae66..4e4eb94539 100644
--- a/packages/cli/src/databases/entities/folder.ts
+++ b/packages/cli/src/databases/entities/folder.ts
@@ -13,8 +13,8 @@ import { Project } from './project';
 import { TagEntity } from './tag-entity';
 import { type WorkflowEntity } from './workflow-entity';
 
-export type FolderWithWorkflowsCount = Folder & {
-	workflowsCount: boolean;
+export type FolderWithWorkflowCount = Folder & {
+	workflowCount: boolean;
 };
 
 @Entity()
diff --git a/packages/cli/src/databases/repositories/__tests__/folder.repository.test.ts b/packages/cli/src/databases/repositories/__tests__/folder.repository.test.ts
index 770d7559d6..033c74b742 100644
--- a/packages/cli/src/databases/repositories/__tests__/folder.repository.test.ts
+++ b/packages/cli/src/databases/repositories/__tests__/folder.repository.test.ts
@@ -348,21 +348,21 @@ describe('FolderRepository', () => {
 				});
 			});
 
-			it('should return id, name and workflowsCount when specified', async () => {
+			it('should return id, name and workflowCount when specified', async () => {
 				const [folders] = await folderRepository.getManyAndCount({
 					select: {
 						id: true,
 						name: true,
-						workflowsCount: true,
+						workflowCount: true,
 					},
 				});
 
 				expect(folders).toHaveLength(2);
 				folders.forEach((folder) => {
-					expect(Object.keys(folder).sort()).toEqual(['id', 'name', 'workflowsCount']);
+					expect(Object.keys(folder).sort()).toEqual(['id', 'name', 'workflowCount']);
 					expect(folder.id).toBeDefined();
 					expect(folder.name).toBeDefined();
-					expect(folder.workflowsCount).toBeDefined();
+					expect(folder.workflowCount).toBeDefined();
 				});
 			});
 
@@ -399,7 +399,7 @@ describe('FolderRepository', () => {
 							type: expect.any(String),
 							icon: null,
 						},
-						workflowsCount: expect.any(Number),
+						workflowCount: expect.any(Number),
 						tags: expect.any(Array),
 					});
 				});
diff --git a/packages/cli/src/databases/repositories/folder.repository.ts b/packages/cli/src/databases/repositories/folder.repository.ts
index e730048d4c..bc210ac4d8 100644
--- a/packages/cli/src/databases/repositories/folder.repository.ts
+++ b/packages/cli/src/databases/repositories/folder.repository.ts
@@ -4,30 +4,30 @@ import { DataSource, Repository } from '@n8n/typeorm';
 
 import type { ListQuery } from '@/requests';
 
-import type { FolderWithWorkflowsCount } from '../entities/folder';
+import type { FolderWithWorkflowCount } from '../entities/folder';
 import { Folder } from '../entities/folder';
 import { FolderTagMapping } from '../entities/folder-tag-mapping';
 import { TagEntity } from '../entities/tag-entity';
 
 @Service()
-export class FolderRepository extends Repository<FolderWithWorkflowsCount> {
+export class FolderRepository extends Repository<FolderWithWorkflowCount> {
 	constructor(dataSource: DataSource) {
 		super(Folder, dataSource.manager);
 	}
 
 	async getManyAndCount(
 		options: ListQuery.Options = {},
-	): Promise<[FolderWithWorkflowsCount[], number]> {
+	): Promise<[FolderWithWorkflowCount[], number]> {
 		const query = this.getManyQuery(options);
 		return await query.getManyAndCount();
 	}
 
-	async getMany(options: ListQuery.Options = {}): Promise<FolderWithWorkflowsCount[]> {
+	async getMany(options: ListQuery.Options = {}): Promise<FolderWithWorkflowCount[]> {
 		const query = this.getManyQuery(options);
 		return await query.getMany();
 	}
 
-	getManyQuery(options: ListQuery.Options = {}): SelectQueryBuilder<FolderWithWorkflowsCount> {
+	getManyQuery(options: ListQuery.Options = {}): SelectQueryBuilder<FolderWithWorkflowCount> {
 		const query = this.createQueryBuilder('folder');
 
 		this.applySelections(query, options.select);
@@ -39,7 +39,7 @@ export class FolderRepository extends Repository<FolderWithWorkflowsCount> {
 	}
 
 	private applySelections(
-		query: SelectQueryBuilder<FolderWithWorkflowsCount>,
+		query: SelectQueryBuilder<FolderWithWorkflowCount>,
 		select?: Record<string, boolean>,
 	): void {
 		if (select) {
@@ -49,12 +49,12 @@ export class FolderRepository extends Repository<FolderWithWorkflowsCount> {
 		}
 	}
 
-	private applyDefaultSelect(query: SelectQueryBuilder<FolderWithWorkflowsCount>): void {
+	private applyDefaultSelect(query: SelectQueryBuilder<FolderWithWorkflowCount>): void {
 		query
 			.leftJoinAndSelect('folder.homeProject', 'homeProject')
 			.leftJoinAndSelect('folder.parentFolder', 'parentFolder')
 			.leftJoinAndSelect('folder.tags', 'tags')
-			.loadRelationCountAndMap('folder.workflowsCount', 'folder.workflows')
+			.loadRelationCountAndMap('folder.workflowCount', 'folder.workflows')
 			.select([
 				'folder',
 				...this.getProjectFields('homeProject'),
@@ -64,7 +64,7 @@ export class FolderRepository extends Repository<FolderWithWorkflowsCount> {
 	}
 
 	private applyCustomSelect(
-		query: SelectQueryBuilder<FolderWithWorkflowsCount>,
+		query: SelectQueryBuilder<FolderWithWorkflowCount>,
 		select?: Record<string, boolean>,
 	): void {
 		const selections = ['folder.id'];
@@ -82,7 +82,7 @@ export class FolderRepository extends Repository<FolderWithWorkflowsCount> {
 	}
 
 	private addRelationFields(
-		query: SelectQueryBuilder<FolderWithWorkflowsCount>,
+		query: SelectQueryBuilder<FolderWithWorkflowCount>,
 		selections: string[],
 		select?: Record<string, boolean>,
 	): void {
@@ -101,8 +101,8 @@ export class FolderRepository extends Repository<FolderWithWorkflowsCount> {
 			selections.push(...this.getParentFolderFields('parentFolder'));
 		}
 
-		if (select?.workflowsCount) {
-			query.loadRelationCountAndMap('folder.workflowsCount', 'folder.workflows');
+		if (select?.workflowCount) {
+			query.loadRelationCountAndMap('folder.workflowCount', 'folder.workflows');
 		}
 	}
 
@@ -119,7 +119,7 @@ export class FolderRepository extends Repository<FolderWithWorkflowsCount> {
 	}
 
 	private applyFilters(
-		query: SelectQueryBuilder<FolderWithWorkflowsCount>,
+		query: SelectQueryBuilder<FolderWithWorkflowCount>,
 		filter?: ListQuery.Options['filter'],
 	): void {
 		if (!filter) return;
@@ -129,7 +129,7 @@ export class FolderRepository extends Repository<FolderWithWorkflowsCount> {
 	}
 
 	private applyBasicFilters(
-		query: SelectQueryBuilder<FolderWithWorkflowsCount>,
+		query: SelectQueryBuilder<FolderWithWorkflowCount>,
 		filter: ListQuery.Options['filter'],
 	): void {
 		if (filter?.folderIds && Array.isArray(filter.folderIds)) {
@@ -162,7 +162,7 @@ export class FolderRepository extends Repository<FolderWithWorkflowsCount> {
 	}
 
 	private applyTagsFilter(
-		query: SelectQueryBuilder<FolderWithWorkflowsCount>,
+		query: SelectQueryBuilder<FolderWithWorkflowCount>,
 		tags?: string[],
 	): void {
 		if (!Array.isArray(tags) || tags.length === 0) return;
@@ -176,7 +176,7 @@ export class FolderRepository extends Repository<FolderWithWorkflowsCount> {
 	}
 
 	private createTagsSubQuery(
-		query: SelectQueryBuilder<FolderWithWorkflowsCount>,
+		query: SelectQueryBuilder<FolderWithWorkflowCount>,
 		tags: string[],
 	): SelectQueryBuilder<FolderTagMapping> {
 		return query
@@ -191,7 +191,7 @@ export class FolderRepository extends Repository<FolderWithWorkflowsCount> {
 			});
 	}
 
-	private applySorting(query: SelectQueryBuilder<FolderWithWorkflowsCount>, sortBy?: string): void {
+	private applySorting(query: SelectQueryBuilder<FolderWithWorkflowCount>, sortBy?: string): void {
 		if (!sortBy) {
 			query.orderBy('folder.updatedAt', 'DESC');
 			return;
@@ -207,7 +207,7 @@ export class FolderRepository extends Repository<FolderWithWorkflowsCount> {
 	}
 
 	private applySortingByField(
-		query: SelectQueryBuilder<FolderWithWorkflowsCount>,
+		query: SelectQueryBuilder<FolderWithWorkflowCount>,
 		field: string,
 		direction: 'DESC' | 'ASC',
 	): void {
@@ -219,7 +219,7 @@ export class FolderRepository extends Repository<FolderWithWorkflowsCount> {
 	}
 
 	private applyPagination(
-		query: SelectQueryBuilder<FolderWithWorkflowsCount>,
+		query: SelectQueryBuilder<FolderWithWorkflowCount>,
 		options: ListQuery.Options,
 	): void {
 		if (options?.take) {
diff --git a/packages/cli/src/databases/repositories/workflow.repository.ts b/packages/cli/src/databases/repositories/workflow.repository.ts
index 69bf66d955..e046ce21ba 100644
--- a/packages/cli/src/databases/repositories/workflow.repository.ts
+++ b/packages/cli/src/databases/repositories/workflow.repository.ts
@@ -14,7 +14,7 @@ import type { ListQuery } from '@/requests';
 import { isStringArray } from '@/utils';
 
 import { FolderRepository } from './folder.repository';
-import type { Folder, FolderWithWorkflowsCount } from '../entities/folder';
+import type { Folder, FolderWithWorkflowCount } from '../entities/folder';
 import { TagEntity } from '../entities/tag-entity';
 import { WebhookEntity } from '../entities/webhook-entity';
 import { WorkflowEntity } from '../entities/workflow-entity';
@@ -34,7 +34,7 @@ type WorkflowFolderUnionRow = {
 export type WorkflowFolderUnionFull = (
 	| ListQuery.Workflow.Plain
 	| ListQuery.Workflow.WithSharing
-	| FolderWithWorkflowsCount
+	| FolderWithWorkflowCount
 ) & {
 	resource: ResourceType;
 };
diff --git a/packages/cli/test/integration/workflows/workflows.controller.test.ts b/packages/cli/test/integration/workflows/workflows.controller.test.ts
index a9f948d21f..51fa617e6f 100644
--- a/packages/cli/test/integration/workflows/workflows.controller.test.ts
+++ b/packages/cli/test/integration/workflows/workflows.controller.test.ts
@@ -1320,7 +1320,7 @@ describe('GET /workflows?includeFolders=true', () => {
 						type: ownerPersonalProject.type,
 					},
 					parentFolder: null,
-					workflowsCount: 0,
+					workflowCount: 0,
 				}),
 			]),
 		});

From 24a38b99a1c7d0b13bc51b5b1164fc31b829630e Mon Sep 17 00:00:00 2001
From: Alex Grozav <alex@grozav.com>
Date: Wed, 26 Feb 2025 15:20:48 +0200
Subject: [PATCH 11/47] test(editor): Wait for workflow to execute before
 navigating away in e2e test (no-changelog) (#13527)

---
 cypress/e2e/12-canvas.cy.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/cypress/e2e/12-canvas.cy.ts b/cypress/e2e/12-canvas.cy.ts
index add58cfd5a..c4fc11c237 100644
--- a/cypress/e2e/12-canvas.cy.ts
+++ b/cypress/e2e/12-canvas.cy.ts
@@ -17,6 +17,7 @@ import {
 	openContextMenu,
 } from '../composables/workflow';
 import { NDV, WorkflowExecutionsTab } from '../pages';
+import { clearNotifications, successToast } from '../pages/notifications';
 import { WorkflowPage as WorkflowPageClass } from '../pages/workflow';
 
 const WorkflowPage = new WorkflowPageClass();
@@ -489,6 +490,9 @@ describe('Canvas Node Manipulation and Navigation', () => {
 		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
 		WorkflowPage.actions.executeWorkflow();
 
+		successToast().should('contain.text', 'Workflow executed successfully');
+		clearNotifications();
+
 		ExecutionsTab.actions.switchToExecutionsTab();
 		ExecutionsTab.getters.successfulExecutionListItems().should('have.length', 1);
 

From 5334661b76909f48aa4e45af889e6180c025eed6 Mon Sep 17 00:00:00 2001
From: Charlie Kolb <charlie@n8n.io>
Date: Wed, 26 Feb 2025 16:23:31 +0100
Subject: [PATCH 12/47] fix(Call n8n Workflow Tool Node): Support concurrent
 invocations of the tool (#13526)

Co-authored-by: Oleg Ivaniv <me@olegivaniv.com>
---
 .../agents/Agent/agents/ToolsAgent/execute.ts |  7 +-
 .../test/OutputParserAutofixing.node.test.ts  |  6 +-
 .../test/OutputParserItemList.node.test.ts    |  4 +-
 .../test/OutputParserStructured.node.test.ts  |  4 +-
 .../test/ToolHttpRequest.node.test.ts         |  6 +-
 .../ToolWorkflow/v2/ToolWorkflowV2.test.ts    | 53 +++++++---
 .../v2/utils/WorkflowToolService.ts           | 99 +++++++++++--------
 .../shared/createVectorStoreNode.ts           |  4 +-
 .../nodes-langchain/utils/N8nTool.test.ts     | 16 +--
 .../utils/tests/helpers.test.ts               |  4 +-
 .../__tests__/supply-data-context.test.ts     | 12 ++-
 .../supply-data-context.ts                    | 25 ++++-
 packages/nodes-base/test/nodes/Helpers.ts     |  4 +-
 .../GenericFunctions.ts                       |  9 +-
 packages/workflow/src/Interfaces.ts           |  4 +
 15 files changed, 171 insertions(+), 86 deletions(-)

diff --git a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ToolsAgent/execute.ts b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ToolsAgent/execute.ts
index f81ab9526c..543b6da49a 100644
--- a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ToolsAgent/execute.ts
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ToolsAgent/execute.ts
@@ -392,13 +392,14 @@ export async function toolsAgentExecute(this: IExecuteFunctions): Promise<INodeE
 
 	const returnData: INodeExecutionData[] = [];
 	const items = this.getInputData();
+	const outputParsers = await getOptionalOutputParsers(this);
+	const outputParser = outputParsers?.[0];
+	const tools = await getTools(this, outputParser);
+
 	for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
 		try {
 			const model = await getChatModel(this);
 			const memory = await getOptionalMemory(this);
-			const outputParsers = await getOptionalOutputParsers(this);
-			const outputParser = outputParsers?.[0];
-			const tools = await getTools(this, outputParser);
 
 			const input = getPromptInputByType({
 				ctx: this,
diff --git a/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserAutofixing/test/OutputParserAutofixing.node.test.ts b/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserAutofixing/test/OutputParserAutofixing.node.test.ts
index 45f054a34b..8c8e723c37 100644
--- a/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserAutofixing/test/OutputParserAutofixing.node.test.ts
+++ b/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserAutofixing/test/OutputParserAutofixing.node.test.ts
@@ -5,7 +5,7 @@ import { OutputParserException } from '@langchain/core/output_parsers';
 import type { MockProxy } from 'jest-mock-extended';
 import { mock } from 'jest-mock-extended';
 import { normalizeItems } from 'n8n-core';
-import type { IExecuteFunctions, IWorkflowDataProxyData } from 'n8n-workflow';
+import type { ISupplyDataFunctions, IWorkflowDataProxyData } from 'n8n-workflow';
 import { ApplicationError, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
 import type {
@@ -18,13 +18,13 @@ import { NAIVE_FIX_PROMPT } from '../prompt';
 
 describe('OutputParserAutofixing', () => {
 	let outputParser: OutputParserAutofixing;
-	let thisArg: MockProxy<IExecuteFunctions>;
+	let thisArg: MockProxy<ISupplyDataFunctions>;
 	let mockModel: MockProxy<BaseLanguageModel>;
 	let mockStructuredOutputParser: MockProxy<N8nStructuredOutputParser>;
 
 	beforeEach(() => {
 		outputParser = new OutputParserAutofixing();
-		thisArg = mock<IExecuteFunctions>({
+		thisArg = mock<ISupplyDataFunctions>({
 			helpers: { normalizeItems },
 		});
 		mockModel = mock<BaseLanguageModel>();
diff --git a/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserItemList/test/OutputParserItemList.node.test.ts b/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserItemList/test/OutputParserItemList.node.test.ts
index ae31e88353..fe2fcbbf47 100644
--- a/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserItemList/test/OutputParserItemList.node.test.ts
+++ b/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserItemList/test/OutputParserItemList.node.test.ts
@@ -2,7 +2,7 @@ import { mock } from 'jest-mock-extended';
 import { normalizeItems } from 'n8n-core';
 import {
 	ApplicationError,
-	type IExecuteFunctions,
+	type ISupplyDataFunctions,
 	type IWorkflowDataProxyData,
 } from 'n8n-workflow';
 
@@ -12,7 +12,7 @@ import { OutputParserItemList } from '../OutputParserItemList.node';
 
 describe('OutputParserItemList', () => {
 	let outputParser: OutputParserItemList;
-	const thisArg = mock<IExecuteFunctions>({
+	const thisArg = mock<ISupplyDataFunctions>({
 		helpers: { normalizeItems },
 	});
 	const workflowDataProxy = mock<IWorkflowDataProxyData>({ $input: mock() });
diff --git a/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserStructured/test/OutputParserStructured.node.test.ts b/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserStructured/test/OutputParserStructured.node.test.ts
index e07b012ec6..67e5d63cdc 100644
--- a/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserStructured/test/OutputParserStructured.node.test.ts
+++ b/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserStructured/test/OutputParserStructured.node.test.ts
@@ -2,8 +2,8 @@ import { mock } from 'jest-mock-extended';
 import { normalizeItems } from 'n8n-core';
 import {
 	jsonParse,
-	type IExecuteFunctions,
 	type INode,
+	type ISupplyDataFunctions,
 	type IWorkflowDataProxyData,
 } from 'n8n-workflow';
 
@@ -13,7 +13,7 @@ import { OutputParserStructured } from '../OutputParserStructured.node';
 
 describe('OutputParserStructured', () => {
 	let outputParser: OutputParserStructured;
-	const thisArg = mock<IExecuteFunctions>({
+	const thisArg = mock<ISupplyDataFunctions>({
 		helpers: { normalizeItems },
 	});
 	const workflowDataProxy = mock<IWorkflowDataProxyData>({ $input: mock() });
diff --git a/packages/@n8n/nodes-langchain/nodes/tools/ToolHttpRequest/test/ToolHttpRequest.node.test.ts b/packages/@n8n/nodes-langchain/nodes/tools/ToolHttpRequest/test/ToolHttpRequest.node.test.ts
index 346234c8d3..7a25435dc7 100644
--- a/packages/@n8n/nodes-langchain/nodes/tools/ToolHttpRequest/test/ToolHttpRequest.node.test.ts
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolHttpRequest/test/ToolHttpRequest.node.test.ts
@@ -1,5 +1,5 @@
 import { mock } from 'jest-mock-extended';
-import type { IExecuteFunctions, INode } from 'n8n-workflow';
+import type { INode, ISupplyDataFunctions } from 'n8n-workflow';
 import { jsonParse } from 'n8n-workflow';
 
 import type { N8nTool } from '@utils/N8nTool';
@@ -8,8 +8,8 @@ import { ToolHttpRequest } from '../ToolHttpRequest.node';
 
 describe('ToolHttpRequest', () => {
 	const httpTool = new ToolHttpRequest();
-	const helpers = mock<IExecuteFunctions['helpers']>();
-	const executeFunctions = mock<IExecuteFunctions>({ helpers });
+	const helpers = mock<ISupplyDataFunctions['helpers']>();
+	const executeFunctions = mock<ISupplyDataFunctions>({ helpers });
 
 	beforeEach(() => {
 		jest.resetAllMocks();
diff --git a/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/ToolWorkflowV2.test.ts b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/ToolWorkflowV2.test.ts
index a5aa4e41bc..688000b1ec 100644
--- a/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/ToolWorkflowV2.test.ts
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/ToolWorkflowV2.test.ts
@@ -11,12 +11,8 @@ import type {
 
 import { WorkflowToolService } from './utils/WorkflowToolService';
 
-type ISupplyDataFunctionsWithRunIndex = ISupplyDataFunctions & { runIndex: number };
-
 // Mock ISupplyDataFunctions interface
-function createMockContext(
-	overrides?: Partial<ISupplyDataFunctions>,
-): ISupplyDataFunctionsWithRunIndex {
+function createMockContext(overrides?: Partial<ISupplyDataFunctions>): ISupplyDataFunctions {
 	return {
 		runIndex: 0,
 		getNodeParameter: jest.fn(),
@@ -33,6 +29,7 @@ function createMockContext(
 		getTimezone: jest.fn(),
 		getWorkflow: jest.fn(),
 		getWorkflowStaticData: jest.fn(),
+		cloneWith: jest.fn(),
 		logger: {
 			debug: jest.fn(),
 			error: jest.fn(),
@@ -40,11 +37,11 @@ function createMockContext(
 			warn: jest.fn(),
 		},
 		...overrides,
-	} as ISupplyDataFunctionsWithRunIndex;
+	} as ISupplyDataFunctions;
 }
 
 describe('WorkflowTool::WorkflowToolService', () => {
-	let context: ISupplyDataFunctionsWithRunIndex;
+	let context: ISupplyDataFunctions;
 	let service: WorkflowToolService;
 
 	beforeEach(() => {
@@ -92,13 +89,25 @@ describe('WorkflowTool::WorkflowToolService', () => {
 				$execution: { id: 'exec-id' },
 				$workflow: { id: 'workflow-id' },
 			} as unknown as IWorkflowDataProxyData);
+			jest.spyOn(context, 'cloneWith').mockReturnValue(context);
 
 			const tool = await service.createTool(toolParams);
 			const result = await tool.func('test query');
 
 			expect(result).toBe(JSON.stringify(TEST_RESPONSE, null, 2));
 			expect(context.addOutputData).toHaveBeenCalled();
-			expect(context.runIndex).toBe(1);
+
+			// Here we validate that the runIndex is correctly updated
+			expect(context.cloneWith).toHaveBeenCalledWith({
+				runIndex: 0,
+				inputData: [[{ json: { query: 'test query' } }]],
+			});
+
+			await tool.func('another query');
+			expect(context.cloneWith).toHaveBeenCalledWith({
+				runIndex: 1,
+				inputData: [[{ json: { query: 'another query' } }]],
+			});
 		});
 
 		it('should handle errors during tool execution', async () => {
@@ -113,6 +122,7 @@ describe('WorkflowTool::WorkflowToolService', () => {
 				.mockRejectedValueOnce(new Error('Workflow execution failed'));
 			jest.spyOn(context, 'addInputData').mockReturnValue({ index: 0 });
 			jest.spyOn(context, 'getNodeParameter').mockReturnValue('database');
+			jest.spyOn(context, 'cloneWith').mockReturnValue(context);
 
 			const tool = await service.createTool(toolParams);
 			const result = await tool.func('test query');
@@ -166,7 +176,12 @@ describe('WorkflowTool::WorkflowToolService', () => {
 
 			jest.spyOn(context, 'executeWorkflow').mockResolvedValueOnce(mockResponse);
 
-			const result = await service['executeSubWorkflow'](workflowInfo, items, workflowProxyMock);
+			const result = await service['executeSubWorkflow'](
+				context,
+				workflowInfo,
+				items,
+				workflowProxyMock,
+			);
 
 			expect(result.response).toBe(TEST_RESPONSE);
 			expect(result.subExecutionId).toBe('test-execution');
@@ -175,7 +190,7 @@ describe('WorkflowTool::WorkflowToolService', () => {
 		it('should throw error when workflow execution fails', async () => {
 			jest.spyOn(context, 'executeWorkflow').mockRejectedValueOnce(new Error('Execution failed'));
 
-			await expect(service['executeSubWorkflow']({}, [], {} as never)).rejects.toThrow(
+			await expect(service['executeSubWorkflow'](context, {}, [], {} as never)).rejects.toThrow(
 				NodeOperationError,
 			);
 		});
@@ -188,7 +203,7 @@ describe('WorkflowTool::WorkflowToolService', () => {
 
 			jest.spyOn(context, 'executeWorkflow').mockResolvedValueOnce(mockResponse);
 
-			await expect(service['executeSubWorkflow']({}, [], {} as never)).rejects.toThrow();
+			await expect(service['executeSubWorkflow'](context, {}, [], {} as never)).rejects.toThrow();
 		});
 	});
 
@@ -202,7 +217,12 @@ describe('WorkflowTool::WorkflowToolService', () => {
 
 			jest.spyOn(context, 'getNodeParameter').mockReturnValueOnce({ value: 'workflow-id' });
 
-			const result = await service['getSubWorkflowInfo'](source, itemIndex, workflowProxyMock);
+			const result = await service['getSubWorkflowInfo'](
+				context,
+				source,
+				itemIndex,
+				workflowProxyMock,
+			);
 
 			expect(result.workflowInfo).toHaveProperty('id', 'workflow-id');
 			expect(result.subWorkflowId).toBe('workflow-id');
@@ -218,7 +238,12 @@ describe('WorkflowTool::WorkflowToolService', () => {
 
 			jest.spyOn(context, 'getNodeParameter').mockReturnValueOnce(JSON.stringify(mockWorkflow));
 
-			const result = await service['getSubWorkflowInfo'](source, itemIndex, workflowProxyMock);
+			const result = await service['getSubWorkflowInfo'](
+				context,
+				source,
+				itemIndex,
+				workflowProxyMock,
+			);
 
 			expect(result.workflowInfo.code).toEqual(mockWorkflow);
 			expect(result.subWorkflowId).toBe('proxy-id');
@@ -234,7 +259,7 @@ describe('WorkflowTool::WorkflowToolService', () => {
 			jest.spyOn(context, 'getNodeParameter').mockReturnValueOnce('invalid json');
 
 			await expect(
-				service['getSubWorkflowInfo'](source, itemIndex, workflowProxyMock),
+				service['getSubWorkflowInfo'](context, source, itemIndex, workflowProxyMock),
 			).rejects.toThrow(NodeOperationError);
 		});
 	});
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 f3089239fe..8fc366084e 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
@@ -43,8 +43,8 @@ export class WorkflowToolService {
 	// Sub-workflow execution id, will be set after the sub-workflow is executed
 	private subExecutionId: string | undefined;
 
-	constructor(private context: ISupplyDataFunctions) {
-		const subWorkflowInputs = this.context.getNode().parameters
+	constructor(private baseContext: ISupplyDataFunctions) {
+		const subWorkflowInputs = this.baseContext.getNode().parameters
 			.workflowInputs as ResourceMapperValue;
 		this.useSchema = (subWorkflowInputs?.schema ?? []).length > 0;
 	}
@@ -59,18 +59,23 @@ export class WorkflowToolService {
 		description: string;
 		itemIndex: number;
 	}): Promise<DynamicTool | DynamicStructuredTool> {
+		let runIndex = 0;
 		// Handler for the tool execution, will be called when the tool is executed
 		// This function will execute the sub-workflow and return the response
 		const toolHandler = async (
 			query: string | IDataObject,
 			runManager?: CallbackManagerForToolRun,
 		): Promise<string> => {
-			const { index } = this.context.addInputData(NodeConnectionType.AiTool, [
-				[{ json: { query } }],
-			]);
-
+			const localRunIndex = runIndex++;
+			// We need to clone the context here to handle runIndex correctly
+			// Otherwise the runIndex will be shared between different executions
+			// Causing incorrect data to be passed to the sub-workflow and via $fromAI
+			const context = this.baseContext.cloneWith({
+				runIndex: localRunIndex,
+				inputData: [[{ json: { query } }]],
+			});
 			try {
-				const response = await this.runFunction(query, itemIndex, runManager);
+				const response = await this.runFunction(context, query, itemIndex, runManager);
 				const processedResponse = this.handleToolResponse(response);
 
 				// Once the sub-workflow is executed, add the output data to the context
@@ -87,7 +92,12 @@ export class WorkflowToolService {
 				const json = jsonParse<IDataObject>(processedResponse, {
 					fallbackValue: { response: processedResponse },
 				});
-				void this.context.addOutputData(NodeConnectionType.AiTool, index, [[{ json }]], metadata);
+				void context.addOutputData(
+					NodeConnectionType.AiTool,
+					localRunIndex,
+					[[{ json }]],
+					metadata,
+				);
 
 				return processedResponse;
 			} catch (error) {
@@ -95,11 +105,13 @@ export class WorkflowToolService {
 				const errorResponse = `There was an error: "${executionError.message}"`;
 
 				const metadata = parseErrorMetadata(error);
-				void this.context.addOutputData(NodeConnectionType.AiTool, index, executionError, metadata);
+				void context.addOutputData(
+					NodeConnectionType.AiTool,
+					localRunIndex,
+					executionError,
+					metadata,
+				);
 				return errorResponse;
-			} finally {
-				// @ts-expect-error this accesses a private member on the actual implementation to fix https://linear.app/n8n/issue/ADO-3186/bug-workflowtool-v2-always-uses-first-row-of-input-data
-				this.context.runIndex++;
 			}
 		};
 
@@ -119,7 +131,7 @@ export class WorkflowToolService {
 		}
 
 		if (typeof response !== 'string') {
-			throw new NodeOperationError(this.context.getNode(), 'Wrong output type returned', {
+			throw new NodeOperationError(this.baseContext.getNode(), 'Wrong output type returned', {
 				description: `The response property should be a string, but it is an ${typeof response}`,
 			});
 		}
@@ -131,6 +143,7 @@ export class WorkflowToolService {
 	 * Executes specified sub-workflow with provided inputs
 	 */
 	private async executeSubWorkflow(
+		context: ISupplyDataFunctions,
 		workflowInfo: IExecuteWorkflowInfo,
 		items: INodeExecutionData[],
 		workflowProxy: IWorkflowDataProxyData,
@@ -138,27 +151,22 @@ export class WorkflowToolService {
 	): Promise<{ response: string; subExecutionId: string }> {
 		let receivedData: ExecuteWorkflowData;
 		try {
-			receivedData = await this.context.executeWorkflow(
-				workflowInfo,
-				items,
-				runManager?.getChild(),
-				{
-					parentExecution: {
-						executionId: workflowProxy.$execution.id,
-						workflowId: workflowProxy.$workflow.id,
-					},
+			receivedData = await context.executeWorkflow(workflowInfo, items, runManager?.getChild(), {
+				parentExecution: {
+					executionId: workflowProxy.$execution.id,
+					workflowId: workflowProxy.$workflow.id,
 				},
-			);
+			});
 			// Set sub-workflow execution id so it can be used in other places
 			this.subExecutionId = receivedData.executionId;
 		} catch (error) {
-			throw new NodeOperationError(this.context.getNode(), error as Error);
+			throw new NodeOperationError(context.getNode(), error as Error);
 		}
 
 		const response: string | undefined = get(receivedData, 'data[0][0].json') as string | undefined;
 		if (response === undefined) {
 			throw new NodeOperationError(
-				this.context.getNode(),
+				context.getNode(),
 				'There was an error: "The workflow did not return a response"',
 			);
 		}
@@ -171,20 +179,27 @@ export class WorkflowToolService {
 	 * This function will be called as part of the tool execution (from the toolHandler)
 	 */
 	private async runFunction(
+		context: ISupplyDataFunctions,
 		query: string | IDataObject,
 		itemIndex: number,
 		runManager?: CallbackManagerForToolRun,
 	): Promise<string> {
-		const source = this.context.getNodeParameter('source', itemIndex) as string;
-		const workflowProxy = this.context.getWorkflowDataProxy(0);
+		const source = context.getNodeParameter('source', itemIndex) as string;
+		const workflowProxy = context.getWorkflowDataProxy(0);
 
-		const { workflowInfo } = await this.getSubWorkflowInfo(source, itemIndex, workflowProxy);
-		const rawData = this.prepareRawData(query, itemIndex);
-		const items = await this.prepareWorkflowItems(query, itemIndex, rawData);
+		const { workflowInfo } = await this.getSubWorkflowInfo(
+			context,
+			source,
+			itemIndex,
+			workflowProxy,
+		);
+		const rawData = this.prepareRawData(context, query, itemIndex);
+		const items = await this.prepareWorkflowItems(context, query, itemIndex, rawData);
 
 		this.subWorkflowId = workflowInfo.id;
 
 		const { response } = await this.executeSubWorkflow(
+			context,
 			workflowInfo,
 			items,
 			workflowProxy,
@@ -197,6 +212,7 @@ export class WorkflowToolService {
 	 * Gets the sub-workflow info based on the source (database or parameter)
 	 */
 	private async getSubWorkflowInfo(
+		context: ISupplyDataFunctions,
 		source: string,
 		itemIndex: number,
 		workflowProxy: IWorkflowDataProxyData,
@@ -208,7 +224,7 @@ export class WorkflowToolService {
 		let subWorkflowId: string;
 
 		if (source === 'database') {
-			const { value } = this.context.getNodeParameter(
+			const { value } = context.getNodeParameter(
 				'workflowId',
 				itemIndex,
 				{},
@@ -216,14 +232,14 @@ export class WorkflowToolService {
 			workflowInfo.id = value as string;
 			subWorkflowId = workflowInfo.id;
 		} else if (source === 'parameter') {
-			const workflowJson = this.context.getNodeParameter('workflowJson', itemIndex) as string;
+			const workflowJson = context.getNodeParameter('workflowJson', itemIndex) as string;
 			try {
 				workflowInfo.code = JSON.parse(workflowJson) as IWorkflowBase;
 				// subworkflow is same as parent workflow
 				subWorkflowId = workflowProxy.$workflow.id;
 			} catch (error) {
 				throw new NodeOperationError(
-					this.context.getNode(),
+					context.getNode(),
 					`The provided workflow is not valid JSON: "${(error as Error).message}"`,
 					{ itemIndex },
 				);
@@ -233,9 +249,13 @@ export class WorkflowToolService {
 		return { workflowInfo, subWorkflowId: subWorkflowId! };
 	}
 
-	private prepareRawData(query: string | IDataObject, itemIndex: number): IDataObject {
+	private prepareRawData(
+		context: ISupplyDataFunctions,
+		query: string | IDataObject,
+		itemIndex: number,
+	): IDataObject {
 		const rawData: IDataObject = { query };
-		const workflowFieldsJson = this.context.getNodeParameter('fields.values', itemIndex, [], {
+		const workflowFieldsJson = context.getNodeParameter('fields.values', itemIndex, [], {
 			rawExpressions: true,
 		}) as SetField[];
 
@@ -253,6 +273,7 @@ export class WorkflowToolService {
 	 * Prepares the sub-workflow items for execution
 	 */
 	private async prepareWorkflowItems(
+		context: ISupplyDataFunctions,
 		query: string | IDataObject,
 		itemIndex: number,
 		rawData: IDataObject,
@@ -261,17 +282,17 @@ export class WorkflowToolService {
 		let jsonData = typeof query === 'object' ? query : { query };
 
 		if (this.useSchema) {
-			const currentWorkflowInputs = getCurrentWorkflowInputData.call(this.context);
+			const currentWorkflowInputs = getCurrentWorkflowInputData.call(context);
 			jsonData = currentWorkflowInputs[itemIndex].json;
 		}
 
 		const newItem = await manual.execute.call(
-			this.context,
+			context,
 			{ json: jsonData },
 			itemIndex,
 			options,
 			rawData,
-			this.context.getNode(),
+			context.getNode(),
 		);
 
 		return [newItem] as INodeExecutionData[];
@@ -299,7 +320,7 @@ export class WorkflowToolService {
 
 	private async extractFromAIParameters(): Promise<FromAIArgument[]> {
 		const collectedArguments: FromAIArgument[] = [];
-		traverseNodeParameters(this.context.getNode().parameters, collectedArguments);
+		traverseNodeParameters(this.baseContext.getNode().parameters, collectedArguments);
 
 		const uniqueArgsMap = new Map<string, FromAIArgument>();
 		for (const arg of collectedArguments) {
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/shared/createVectorStoreNode.ts b/packages/@n8n/nodes-langchain/nodes/vector_store/shared/createVectorStoreNode.ts
index ecf2e64a81..4bb1d47250 100644
--- a/packages/@n8n/nodes-langchain/nodes/vector_store/shared/createVectorStoreNode.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/shared/createVectorStoreNode.ts
@@ -67,13 +67,13 @@ export interface VectorStoreNodeConstructorArgs<T extends VectorStore = VectorSt
 	retrieveFields?: INodeProperties[];
 	updateFields?: INodeProperties[];
 	populateVectorStore: (
-		context: ISupplyDataFunctions,
+		context: IExecuteFunctions | ISupplyDataFunctions,
 		embeddings: Embeddings,
 		documents: Array<Document<Record<string, unknown>>>,
 		itemIndex: number,
 	) => Promise<void>;
 	getVectorStoreClient: (
-		context: ISupplyDataFunctions,
+		context: IExecuteFunctions | ISupplyDataFunctions,
 		filter: Record<string, never> | undefined,
 		embeddings: Embeddings,
 		itemIndex: number,
diff --git a/packages/@n8n/nodes-langchain/utils/N8nTool.test.ts b/packages/@n8n/nodes-langchain/utils/N8nTool.test.ts
index 40a1ca70d3..459ba0bcca 100644
--- a/packages/@n8n/nodes-langchain/utils/N8nTool.test.ts
+++ b/packages/@n8n/nodes-langchain/utils/N8nTool.test.ts
@@ -1,6 +1,6 @@
 import { DynamicStructuredTool, DynamicTool } from '@langchain/core/tools';
 import { createMockExecuteFunction } from 'n8n-nodes-base/test/nodes/Helpers';
-import type { INode } from 'n8n-workflow';
+import type { INode, ISupplyDataFunctions } from 'n8n-workflow';
 import { z } from 'zod';
 
 import { N8nTool } from './N8nTool';
@@ -20,7 +20,7 @@ describe('Test N8nTool wrapper as DynamicStructuredTool', () => {
 	it('should wrap a tool', () => {
 		const func = jest.fn();
 
-		const ctx = createMockExecuteFunction({}, mockNode);
+		const ctx = createMockExecuteFunction<ISupplyDataFunctions>({}, mockNode);
 
 		const tool = new N8nTool(ctx, {
 			name: 'Dummy Tool',
@@ -39,7 +39,7 @@ describe('Test N8nTool wrapper - DynamicTool fallback', () => {
 	it('should convert the tool to a dynamic tool', () => {
 		const func = jest.fn();
 
-		const ctx = createMockExecuteFunction({}, mockNode);
+		const ctx = createMockExecuteFunction<ISupplyDataFunctions>({}, mockNode);
 
 		const tool = new N8nTool(ctx, {
 			name: 'Dummy Tool',
@@ -58,7 +58,7 @@ describe('Test N8nTool wrapper - DynamicTool fallback', () => {
 	it('should format fallback description correctly', () => {
 		const func = jest.fn();
 
-		const ctx = createMockExecuteFunction({}, mockNode);
+		const ctx = createMockExecuteFunction<ISupplyDataFunctions>({}, mockNode);
 
 		const tool = new N8nTool(ctx, {
 			name: 'Dummy Tool',
@@ -86,7 +86,7 @@ describe('Test N8nTool wrapper - DynamicTool fallback', () => {
 	it('should handle empty parameter list correctly', () => {
 		const func = jest.fn();
 
-		const ctx = createMockExecuteFunction({}, mockNode);
+		const ctx = createMockExecuteFunction<ISupplyDataFunctions>({}, mockNode);
 
 		const tool = new N8nTool(ctx, {
 			name: 'Dummy Tool',
@@ -103,7 +103,7 @@ describe('Test N8nTool wrapper - DynamicTool fallback', () => {
 	it('should parse correct parameters', async () => {
 		const func = jest.fn();
 
-		const ctx = createMockExecuteFunction({}, mockNode);
+		const ctx = createMockExecuteFunction<ISupplyDataFunctions>({}, mockNode);
 
 		const tool = new N8nTool(ctx, {
 			name: 'Dummy Tool',
@@ -127,7 +127,7 @@ describe('Test N8nTool wrapper - DynamicTool fallback', () => {
 	it('should recover when 1 parameter is passed directly', async () => {
 		const func = jest.fn();
 
-		const ctx = createMockExecuteFunction({}, mockNode);
+		const ctx = createMockExecuteFunction<ISupplyDataFunctions>({}, mockNode);
 
 		const tool = new N8nTool(ctx, {
 			name: 'Dummy Tool',
@@ -150,7 +150,7 @@ describe('Test N8nTool wrapper - DynamicTool fallback', () => {
 	it('should recover when JS object is passed instead of JSON', async () => {
 		const func = jest.fn();
 
-		const ctx = createMockExecuteFunction({}, mockNode);
+		const ctx = createMockExecuteFunction<ISupplyDataFunctions>({}, mockNode);
 
 		const tool = new N8nTool(ctx, {
 			name: 'Dummy Tool',
diff --git a/packages/@n8n/nodes-langchain/utils/tests/helpers.test.ts b/packages/@n8n/nodes-langchain/utils/tests/helpers.test.ts
index d63ccbb81e..37b7488f42 100644
--- a/packages/@n8n/nodes-langchain/utils/tests/helpers.test.ts
+++ b/packages/@n8n/nodes-langchain/utils/tests/helpers.test.ts
@@ -1,7 +1,7 @@
 import { DynamicTool, type Tool } from '@langchain/core/tools';
 import { createMockExecuteFunction } from 'n8n-nodes-base/test/nodes/Helpers';
 import { NodeOperationError } from 'n8n-workflow';
-import type { IExecuteFunctions, INode } from 'n8n-workflow';
+import type { ISupplyDataFunctions, IExecuteFunctions, INode } from 'n8n-workflow';
 import { z } from 'zod';
 
 import { escapeSingleCurlyBrackets, getConnectedTools } from '../helpers';
@@ -171,7 +171,7 @@ describe('getConnectedTools', () => {
 
 		mockExecuteFunctions = createMockExecuteFunction({}, mockNode);
 
-		mockN8nTool = new N8nTool(mockExecuteFunctions, {
+		mockN8nTool = new N8nTool(mockExecuteFunctions as unknown as ISupplyDataFunctions, {
 			name: 'Dummy Tool',
 			description: 'A dummy tool for testing',
 			func: jest.fn(),
diff --git a/packages/core/src/execution-engine/node-execution-context/__tests__/supply-data-context.test.ts b/packages/core/src/execution-engine/node-execution-context/__tests__/supply-data-context.test.ts
index 99ee41c6fd..54edbb3df9 100644
--- a/packages/core/src/execution-engine/node-execution-context/__tests__/supply-data-context.test.ts
+++ b/packages/core/src/execution-engine/node-execution-context/__tests__/supply-data-context.test.ts
@@ -54,7 +54,9 @@ describe('SupplyDataContext', () => {
 	const credentialsHelper = mock<ICredentialsHelper>();
 	const additionalData = mock<IWorkflowExecuteAdditionalData>({ credentialsHelper });
 	const mode: WorkflowExecuteMode = 'manual';
-	const runExecutionData = mock<IRunExecutionData>();
+	const runExecutionData = mock<IRunExecutionData>({
+		resultData: { runData: {} },
+	});
 	const connectionInputData: INodeExecutionData[] = [];
 	const connectionType = NodeConnectionType.Main;
 	const inputData: ITaskDataConnections = { [connectionType]: [[{ json: { test: 'data' } }]] };
@@ -175,4 +177,12 @@ describe('SupplyDataContext', () => {
 			]);
 		});
 	});
+
+	describe('cloneWith', () => {
+		it('should return a new copy', () => {
+			const clone = supplyDataContext.cloneWith({ runIndex: 12, inputData: [[{ json: {} }]] });
+			expect(clone.runIndex).toBe(12);
+			expect(clone).not.toBe(supplyDataContext);
+		});
+	});
 });
diff --git a/packages/core/src/execution-engine/node-execution-context/supply-data-context.ts b/packages/core/src/execution-engine/node-execution-context/supply-data-context.ts
index 40d098bedd..8484b1128d 100644
--- a/packages/core/src/execution-engine/node-execution-context/supply-data-context.ts
+++ b/packages/core/src/execution-engine/node-execution-context/supply-data-context.ts
@@ -13,11 +13,10 @@ import type {
 	ITaskDataConnections,
 	ITaskMetadata,
 	IWorkflowExecuteAdditionalData,
-	NodeConnectionType,
 	Workflow,
 	WorkflowExecuteMode,
 } from 'n8n-workflow';
-import { createDeferredPromise } from 'n8n-workflow';
+import { createDeferredPromise, NodeConnectionType } from 'n8n-workflow';
 
 import { BaseExecuteContext } from './base-execute-context';
 import {
@@ -109,6 +108,28 @@ export class SupplyDataContext extends BaseExecuteContext implements ISupplyData
 			)) as ISupplyDataFunctions['getNodeParameter'];
 	}
 
+	cloneWith(replacements: {
+		runIndex: number;
+		inputData: INodeExecutionData[][];
+	}): SupplyDataContext {
+		const context = new SupplyDataContext(
+			this.workflow,
+			this.node,
+			this.additionalData,
+			this.mode,
+			this.runExecutionData,
+			replacements.runIndex,
+			this.connectionInputData,
+			{},
+			this.connectionType,
+			this.executeData,
+			this.closeFunctions,
+			this.abortSignal,
+		);
+		context.addInputData(NodeConnectionType.AiTool, replacements.inputData);
+		return context;
+	}
+
 	async getInputConnectionData(
 		connectionType: AINodeConnectionType,
 		itemIndex: number,
diff --git a/packages/nodes-base/test/nodes/Helpers.ts b/packages/nodes-base/test/nodes/Helpers.ts
index 13ffe88de5..99fd2fcde3 100644
--- a/packages/nodes-base/test/nodes/Helpers.ts
+++ b/packages/nodes-base/test/nodes/Helpers.ts
@@ -386,7 +386,7 @@ export const getWorkflowFilenames = (dirname: string) => {
 	return workflows;
 };
 
-export const createMockExecuteFunction = (
+export const createMockExecuteFunction = <T = IExecuteFunctions>(
 	nodeParameters: IDataObject,
 	nodeMock: INode,
 	continueBool = false,
@@ -410,6 +410,6 @@ export const createMockExecuteFunction = (
 		helpers: {
 			constructExecutionMetaData,
 		},
-	} as unknown as IExecuteFunctions;
+	} as unknown as T;
 	return fakeExecuteFunction;
 };
diff --git a/packages/nodes-base/utils/workflowInputsResourceMapping/GenericFunctions.ts b/packages/nodes-base/utils/workflowInputsResourceMapping/GenericFunctions.ts
index 006d1bb091..1ca9e7034e 100644
--- a/packages/nodes-base/utils/workflowInputsResourceMapping/GenericFunctions.ts
+++ b/packages/nodes-base/utils/workflowInputsResourceMapping/GenericFunctions.ts
@@ -9,8 +9,9 @@ import type {
 	IDataObject,
 	ResourceMapperField,
 	ILocalLoadOptionsFunctions,
-	ISupplyDataFunctions,
 	WorkflowInputsData,
+	IExecuteFunctions,
+	ISupplyDataFunctions,
 } from 'n8n-workflow';
 import { jsonParse, NodeOperationError, EXECUTE_WORKFLOW_TRIGGER_NODE_TYPE } from 'n8n-workflow';
 
@@ -100,7 +101,9 @@ export function getFieldEntries(context: IWorkflowNodeContext): {
 	throw new NodeOperationError(context.getNode(), result);
 }
 
-export function getWorkflowInputValues(this: ISupplyDataFunctions): INodeExecutionData[] {
+export function getWorkflowInputValues(
+	this: IExecuteFunctions | ISupplyDataFunctions,
+): INodeExecutionData[] {
 	const inputData = this.getInputData();
 
 	return inputData.map(({ json, binary }, itemIndex) => {
@@ -124,7 +127,7 @@ export function getWorkflowInputValues(this: ISupplyDataFunctions): INodeExecuti
 	});
 }
 
-export function getCurrentWorkflowInputData(this: ISupplyDataFunctions) {
+export function getCurrentWorkflowInputData(this: IExecuteFunctions | ISupplyDataFunctions) {
 	const inputData: INodeExecutionData[] = getWorkflowInputValues.call(this);
 
 	const schema = this.getNodeParameter('workflowInputs.schema', 0, []) as ResourceMapperField[];
diff --git a/packages/workflow/src/Interfaces.ts b/packages/workflow/src/Interfaces.ts
index a99aa8de35..d9203af8d1 100644
--- a/packages/workflow/src/Interfaces.ts
+++ b/packages/workflow/src/Interfaces.ts
@@ -985,6 +985,10 @@ export type ISupplyDataFunctions = ExecuteFunctions.GetNodeParameterFn &
 		getExecutionCancelSignal(): AbortSignal | undefined;
 		onExecutionCancellation(handler: () => unknown): void;
 		logAiEvent(eventName: AiEvent, msg?: string | undefined): void;
+		cloneWith(replacements: {
+			runIndex: number;
+			inputData: INodeExecutionData[][];
+		}): ISupplyDataFunctions;
 	};
 
 export interface IExecutePaginationFunctions extends IExecuteSingleFunctions {

From acdd2da492a90d6266d901a99d32ef57182c334b Mon Sep 17 00:00:00 2001
From: Jon <jonathan.bennetts@gmail.com>
Date: Wed, 26 Feb 2025 15:25:14 +0000
Subject: [PATCH 13/47] fix(Google Slides Node): Change wording to make the
 replace easier to use (no-changelog) (#13522)

---
 .../nodes/Google/Slides/GoogleSlides.node.ts  | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/nodes-base/nodes/Google/Slides/GoogleSlides.node.ts b/packages/nodes-base/nodes/Google/Slides/GoogleSlides.node.ts
index 4e58864900..f3111fac45 100644
--- a/packages/nodes-base/nodes/Google/Slides/GoogleSlides.node.ts
+++ b/packages/nodes-base/nodes/Google/Slides/GoogleSlides.node.ts
@@ -275,7 +275,7 @@ export class GoogleSlides implements INodeType {
 									'Whether the search should respect case. True : the search is case sensitive. False : the search is case insensitive.',
 							},
 							{
-								displayName: 'Page Names or IDs',
+								displayName: 'Slide Names or IDs',
 								name: 'pageObjectIds',
 								type: 'multiOptions',
 								default: [],
@@ -284,22 +284,22 @@ export class GoogleSlides implements INodeType {
 									loadOptionsDependsOn: ['presentationId'],
 								},
 								description:
-									'If non-empty, limits the matches to page elements only on the given pages. Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code/expressions/">expression</a>.',
+									'If non-empty, limits the matches to slide elements only on the given slides. Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code/expressions/">expression</a>.',
 							},
 							{
-								displayName: 'Replace Text',
+								displayName: 'Search For',
+								name: 'text',
+								type: 'string',
+								default: '',
+								description: 'The text to search for in the slide',
+							},
+							{
+								displayName: 'Replace With',
 								name: 'replaceText',
 								type: 'string',
 								default: '',
 								description: 'The text that will replace the matched text',
 							},
-							{
-								displayName: 'Text',
-								name: 'text',
-								type: 'string',
-								default: '',
-								description: 'The text to search for in the shape or table',
-							},
 						],
 					},
 				],

From 75493ef6ef4ee47d0ccf217cd5c2e58754f60c12 Mon Sep 17 00:00:00 2001
From: autologie <suguru@n8n.io>
Date: Wed, 26 Feb 2025 16:35:17 +0100
Subject: [PATCH 14/47] feat(editor): Indicate dirty nodes with yellow
 borders/connectors on canvas (#13040)

---
 cypress/composables/ndv.ts                    |   4 +
 cypress/e2e/40-manual-partial-execution.cy.ts |  62 +++
 .../Test_workflow_partial_execution_v2.json   |  74 +++
 .../src/components/N8nInfoTip/InfoTip.vue     |  18 +-
 packages/editor-ui/src/Interface.ts           |   2 +
 .../editor-ui/src/components/InputPanel.vue   |  13 +-
 .../editor-ui/src/components/NodeSettings.vue |   2 +-
 .../editor-ui/src/components/OutputPanel.vue  |  16 +-
 .../ResourceMapper/ResourceMapper.vue         |  11 +-
 packages/editor-ui/src/components/RunInfo.vue |  13 +-
 .../canvas/elements/edges/CanvasEdge.vue      |   2 +-
 .../render-types/CanvasHandleMainOutput.vue   |   2 +-
 .../nodes/render-types/CanvasNodeDefault.vue  |   5 +
 .../parts/CanvasNodeDisabledStrikeThrough.vue |  10 +-
 .../parts/CanvasNodeStatusIcons.test.ts       |  19 +
 .../parts/CanvasNodeStatusIcons.vue           |  29 +-
 .../src/composables/useCanvasMapping.ts       |   3 +
 .../composables/useCanvasOperations.test.ts   |   4 +-
 .../src/composables/useCanvasOperations.ts    |  40 +-
 .../src/composables/useHistoryHelper.ts       |  14 +-
 .../src/composables/useNodeDirtiness.test.ts  | 464 ++++++++++++++++++
 .../src/composables/useNodeDirtiness.ts       | 309 ++++++++++++
 .../src/composables/useNodeHelpers.ts         |   9 +-
 .../src/composables/useRunWorkflow.test.ts    |  22 +
 .../src/composables/useRunWorkflow.ts         |  38 +-
 packages/editor-ui/src/models/history.ts      |  80 +--
 .../src/plugins/i18n/locales/en.json          |   5 +-
 .../editor-ui/src/plugins/icons/custom.ts     |  12 +
 packages/editor-ui/src/plugins/icons/index.ts |   3 +-
 .../editor-ui/src/stores/settings.store.ts    |   4 +-
 .../editor-ui/src/stores/workflows.store.ts   |  49 +-
 packages/editor-ui/src/types/canvas.ts        |  11 +
 packages/workflow/src/Workflow.ts             |   8 +-
 packages/workflow/test/Workflow.test.ts       |  56 +--
 34 files changed, 1247 insertions(+), 166 deletions(-)
 create mode 100644 cypress/fixtures/Test_workflow_partial_execution_v2.json
 create mode 100644 packages/editor-ui/src/composables/useNodeDirtiness.test.ts
 create mode 100644 packages/editor-ui/src/composables/useNodeDirtiness.ts

diff --git a/cypress/composables/ndv.ts b/cypress/composables/ndv.ts
index c70e0b20e8..36ae10669b 100644
--- a/cypress/composables/ndv.ts
+++ b/cypress/composables/ndv.ts
@@ -206,6 +206,10 @@ export function clickWorkflowCardContent(workflowName: string) {
 	getWorkflowCardContent(workflowName).click();
 }
 
+export function clickAssignmentCollectionAdd() {
+	cy.getByTestId('assignment-collection-drop-area').click();
+}
+
 export function assertNodeOutputHintExists() {
 	getNodeOutputHint().should('exist');
 }
diff --git a/cypress/e2e/40-manual-partial-execution.cy.ts b/cypress/e2e/40-manual-partial-execution.cy.ts
index 28a1539252..29c8f13e38 100644
--- a/cypress/e2e/40-manual-partial-execution.cy.ts
+++ b/cypress/e2e/40-manual-partial-execution.cy.ts
@@ -1,3 +1,16 @@
+import {
+	clickAssignmentCollectionAdd,
+	clickGetBackToCanvas,
+	getNodeRunInfoStale,
+	getOutputTbodyCell,
+} from '../composables/ndv';
+import {
+	clickExecuteWorkflowButton,
+	getNodeByName,
+	getZoomToFitButton,
+	navigateToNewWorkflowPage,
+	openNode,
+} from '../composables/workflow';
 import { NDV, WorkflowPage } from '../pages';
 
 const canvas = new WorkflowPage();
@@ -26,4 +39,53 @@ describe('Manual partial execution', () => {
 		ndv.getters.nodeRunTooltipIndicator().should('not.exist');
 		ndv.getters.outputRunSelector().should('not.exist');
 	});
+
+	describe('partial execution v2', () => {
+		beforeEach(() => {
+			cy.window().then((win) => {
+				win.localStorage.setItem('PartialExecution.version', '2');
+			});
+			navigateToNewWorkflowPage();
+		});
+
+		it('should execute from the first dirty node up to the current node', () => {
+			cy.createFixtureWorkflow('Test_workflow_partial_execution_v2.json');
+
+			getZoomToFitButton().click();
+
+			// First, execute the whole workflow
+			clickExecuteWorkflowButton();
+
+			getNodeByName('A').findChildByTestId('canvas-node-status-success').should('be.visible');
+			getNodeByName('B').findChildByTestId('canvas-node-status-success').should('be.visible');
+			getNodeByName('C').findChildByTestId('canvas-node-status-success').should('be.visible');
+			openNode('A');
+			getOutputTbodyCell(1, 0).invoke('text').as('before', { type: 'static' });
+			clickGetBackToCanvas();
+
+			// Change parameter of the node in the middle
+			openNode('B');
+			clickAssignmentCollectionAdd();
+			getNodeRunInfoStale().should('be.visible');
+			clickGetBackToCanvas();
+
+			getNodeByName('A').findChildByTestId('canvas-node-status-success').should('be.visible');
+			getNodeByName('B').findChildByTestId('canvas-node-status-warning').should('be.visible');
+			getNodeByName('C').findChildByTestId('canvas-node-status-success').should('be.visible');
+
+			// Partial execution
+			getNodeByName('C').findChildByTestId('execute-node-button').click();
+
+			getNodeByName('A').findChildByTestId('canvas-node-status-success').should('be.visible');
+			getNodeByName('B').findChildByTestId('canvas-node-status-success').should('be.visible');
+			getNodeByName('C').findChildByTestId('canvas-node-status-success').should('be.visible');
+			openNode('A');
+			getOutputTbodyCell(1, 0).invoke('text').as('after', { type: 'static' });
+
+			// Assert that 'A' ran only once by comparing its output
+			cy.get('@before').then((before) =>
+				cy.get('@after').then((after) => expect(before).to.equal(after)),
+			);
+		});
+	});
 });
diff --git a/cypress/fixtures/Test_workflow_partial_execution_v2.json b/cypress/fixtures/Test_workflow_partial_execution_v2.json
new file mode 100644
index 0000000000..c3c8ecc7ae
--- /dev/null
+++ b/cypress/fixtures/Test_workflow_partial_execution_v2.json
@@ -0,0 +1,74 @@
+{
+	"nodes": [
+		{
+			"parameters": {
+				"rule": {
+					"interval": [{}]
+				}
+			},
+			"type": "n8n-nodes-base.scheduleTrigger",
+			"typeVersion": 1.2,
+			"position": [0, 0],
+			"id": "dcc1c5e1-c6c1-45f8-80d5-65c88d66d56e",
+			"name": "A"
+		},
+		{
+			"parameters": {
+				"assignments": {
+					"assignments": [
+						{
+							"id": "3d8f0810-84f0-41ce-a81b-0e7f04fd88cb",
+							"name": "",
+							"value": "",
+							"type": "string"
+						}
+					]
+				},
+				"options": {}
+			},
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3.4,
+			"position": [220, 0],
+			"id": "097ffa30-d37b-4de6-bd5c-ccd945f31df1",
+			"name": "B"
+		},
+		{
+			"parameters": {
+				"options": {}
+			},
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3.4,
+			"position": [440, 0],
+			"id": "dc44e635-916f-4f76-a745-1add5762f730",
+			"name": "C"
+		}
+	],
+	"connections": {
+		"A": {
+			"main": [
+				[
+					{
+						"node": "B",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"B": {
+			"main": [
+				[
+					{
+						"node": "C",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"pinData": {},
+	"meta": {
+		"instanceId": "b0d9447cff9c96796e4ac4f00fcd899b03cfac3ab3d4f748ae686d34881eae0c"
+	}
+}
diff --git a/packages/design-system/src/components/N8nInfoTip/InfoTip.vue b/packages/design-system/src/components/N8nInfoTip/InfoTip.vue
index 097babef37..8ea89d8f8b 100644
--- a/packages/design-system/src/components/N8nInfoTip/InfoTip.vue
+++ b/packages/design-system/src/components/N8nInfoTip/InfoTip.vue
@@ -7,7 +7,7 @@ import type { IconColor } from 'n8n-design-system/types/icon';
 import N8nIcon from '../N8nIcon';
 import N8nTooltip from '../N8nTooltip';
 
-const THEME = ['info', 'info-light', 'warning', 'danger', 'success'] as const;
+const THEME = ['info', 'info-light', 'warning', 'warning-light', 'danger', 'success'] as const;
 const TYPE = ['note', 'tooltip'] as const;
 
 const ICON_MAP = {
@@ -15,9 +15,23 @@ const ICON_MAP = {
 	// eslint-disable-next-line @typescript-eslint/naming-convention
 	'info-light': 'info-circle',
 	warning: 'exclamation-triangle',
+	// eslint-disable-next-line @typescript-eslint/naming-convention
+	'warning-light': 'triangle', // NOTE: This requires a custom icon
 	danger: 'exclamation-triangle',
 	success: 'check-circle',
 } as const;
+
+const COLOR_MAP: Record<keyof IconMap, IconColor> = {
+	info: 'text-base',
+	// eslint-disable-next-line @typescript-eslint/naming-convention
+	'info-light': 'text-base',
+	warning: 'warning',
+	// eslint-disable-next-line @typescript-eslint/naming-convention
+	'warning-light': 'warning',
+	danger: 'danger',
+	success: 'success',
+};
+
 type IconMap = typeof ICON_MAP;
 
 interface InfoTipProps {
@@ -40,7 +54,7 @@ const props = withDefaults(defineProps<InfoTipProps>(), {
 const iconData = computed<{ icon: IconMap[keyof IconMap]; color: IconColor }>(() => {
 	return {
 		icon: ICON_MAP[props.theme],
-		color: props.theme === 'info' || props.theme === 'info-light' ? 'text-base' : props.theme,
+		color: COLOR_MAP[props.theme],
 	} as const;
 });
 </script>
diff --git a/packages/editor-ui/src/Interface.ts b/packages/editor-ui/src/Interface.ts
index 8f238bab7c..8edee2fa37 100644
--- a/packages/editor-ui/src/Interface.ts
+++ b/packages/editor-ui/src/Interface.ts
@@ -884,6 +884,8 @@ export interface ITemplatesNode extends IVersionNode {
 
 export interface INodeMetadata {
 	parametersLastUpdatedAt?: number;
+	pinnedDataLastUpdatedAt?: number;
+	pinnedDataLastRemovedAt?: number;
 	pristine: boolean;
 }
 
diff --git a/packages/editor-ui/src/components/InputPanel.vue b/packages/editor-ui/src/components/InputPanel.vue
index 41b85e3389..d1af1ae98d 100644
--- a/packages/editor-ui/src/components/InputPanel.vue
+++ b/packages/editor-ui/src/components/InputPanel.vue
@@ -12,7 +12,7 @@ import { useUIStore } from '@/stores/ui.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { waitingNodeTooltip } from '@/utils/executionUtils';
 import { uniqBy } from 'lodash-es';
-import { N8nRadioButtons, N8nText, N8nTooltip } from 'n8n-design-system';
+import { N8nIcon, N8nRadioButtons, N8nText, N8nTooltip } from 'n8n-design-system';
 import type { INodeInputConfiguration, INodeOutputConfiguration, Workflow } from 'n8n-workflow';
 import { NodeConnectionType, NodeHelpers } from 'n8n-workflow';
 import { storeToRefs } from 'pinia';
@@ -464,7 +464,16 @@ function activatePane() {
 					/>
 				</N8nTooltip>
 				<N8nText v-if="!readOnly" tag="div" size="small">
-					{{ i18n.baseText('ndv.input.noOutputData.hint') }}
+					<i18n-t keypath="ndv.input.noOutputData.hint">
+						<template #info>
+							<N8nTooltip placement="bottom">
+								<template #content>
+									{{ i18n.baseText('ndv.input.noOutputData.hint.tooltip') }}
+								</template>
+								<N8nIcon icon="question-circle" />
+							</N8nTooltip>
+						</template>
+					</i18n-t>
 				</N8nText>
 			</div>
 			<div v-else :class="$style.notConnected">
diff --git a/packages/editor-ui/src/components/NodeSettings.vue b/packages/editor-ui/src/components/NodeSettings.vue
index 49cb19ca71..43ee007edb 100644
--- a/packages/editor-ui/src/components/NodeSettings.vue
+++ b/packages/editor-ui/src/components/NodeSettings.vue
@@ -765,7 +765,7 @@ const credentialSelected = (updateInformation: INodeUpdatePropertiesInformation)
 
 const nameChanged = (name: string) => {
 	if (node.value) {
-		historyStore.pushCommandToUndo(new RenameNodeCommand(node.value.name, name));
+		historyStore.pushCommandToUndo(new RenameNodeCommand(node.value.name, name, Date.now()));
 	}
 	valueChanged({
 		value: name,
diff --git a/packages/editor-ui/src/components/OutputPanel.vue b/packages/editor-ui/src/components/OutputPanel.vue
index ac13a67c95..c537f120bc 100644
--- a/packages/editor-ui/src/components/OutputPanel.vue
+++ b/packages/editor-ui/src/components/OutputPanel.vue
@@ -21,6 +21,9 @@ import { useTelemetry } from '@/composables/useTelemetry';
 import { useI18n } from '@/composables/useI18n';
 import { waitingNodeTooltip } from '@/utils/executionUtils';
 import { N8nRadioButtons, N8nText } from 'n8n-design-system';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useNodeDirtiness } from '@/composables/useNodeDirtiness';
+import { CanvasNodeDirtiness } from '@/types';
 
 // Types
 
@@ -75,6 +78,8 @@ const uiStore = useUIStore();
 const telemetry = useTelemetry();
 const i18n = useI18n();
 const { activeNode } = storeToRefs(ndvStore);
+const settings = useSettingsStore();
+const { dirtinessByName } = useNodeDirtiness();
 
 // Composables
 
@@ -201,6 +206,11 @@ const staleData = computed(() => {
 	if (!node.value) {
 		return false;
 	}
+
+	if (settings.partialExecutionVersion === 2) {
+		return dirtinessByName.value[node.value.name] === CanvasNodeDirtiness.PARAMETERS_UPDATED;
+	}
+
 	const updatedAt = workflowsStore.getParametersLastUpdate(node.value.name);
 	if (!updatedAt || !runTaskData.value) {
 		return false;
@@ -352,7 +362,11 @@ const activatePane = () => {
 					{{ i18n.baseText(outputPanelEditMode.enabled ? 'ndv.output.edit' : 'ndv.output') }}
 				</span>
 				<RunInfo
-					v-if="hasNodeRun && !pinnedData.hasData.value && runsCount === 1"
+					v-if="
+						hasNodeRun &&
+						!pinnedData.hasData.value &&
+						(runsCount === 1 || (runsCount > 0 && staleData))
+					"
 					v-show="!outputPanelEditMode.enabled"
 					:task-data="runTaskData"
 					:has-stale-data="staleData"
diff --git a/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.vue b/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.vue
index c67b288be9..b95841a656 100644
--- a/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.vue
+++ b/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.vue
@@ -29,6 +29,7 @@ import { useNDVStore } from '@/stores/ndv.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useDocumentVisibility } from '@/composables/useDocumentVisibility';
 import { N8nButton, N8nCallout, N8nNotice } from 'n8n-design-system';
+import { isEqual } from 'lodash-es';
 
 type Props = {
 	parameter: INodeProperties;
@@ -354,11 +355,11 @@ async function loadAndSetFieldsToMap(): Promise<void> {
 			}
 			return field;
 		});
-		state.paramValue = {
-			...state.paramValue,
-			schema: newSchema,
-		};
-		emitValueChanged();
+
+		if (!isEqual(newSchema, state.paramValue.schema)) {
+			state.paramValue.schema = newSchema;
+			emitValueChanged();
+		}
 	}
 }
 
diff --git a/packages/editor-ui/src/components/RunInfo.vue b/packages/editor-ui/src/components/RunInfo.vue
index f4e68657e5..0f9329be36 100644
--- a/packages/editor-ui/src/components/RunInfo.vue
+++ b/packages/editor-ui/src/components/RunInfo.vue
@@ -3,6 +3,7 @@ import type { ITaskData } from 'n8n-workflow';
 import { convertToDisplayDateComponents } from '@/utils/formatters/dateFormatter';
 import { computed } from 'vue';
 import { useI18n } from '@/composables/useI18n';
+import { N8nInfoTip } from 'n8n-design-system';
 
 const i18n = useI18n();
 
@@ -33,9 +34,9 @@ const runMetadata = computed(() => {
 </script>
 
 <template>
-	<n8n-info-tip
+	<N8nInfoTip
 		v-if="hasStaleData"
-		theme="warning"
+		theme="warning-light"
 		type="tooltip"
 		tooltip-placement="right"
 		data-test-id="node-run-info-stale"
@@ -49,10 +50,10 @@ const runMetadata = computed(() => {
 				)
 			"
 		></span>
-	</n8n-info-tip>
+	</N8nInfoTip>
 	<div v-else-if="runMetadata" :class="$style.tooltipRow">
-		<n8n-info-tip type="note" :theme="theme" :data-test-id="`node-run-status-${theme}`" />
-		<n8n-info-tip
+		<N8nInfoTip type="note" :theme="theme" :data-test-id="`node-run-status-${theme}`" />
+		<N8nInfoTip
 			type="tooltip"
 			theme="info"
 			:data-test-id="`node-run-info`"
@@ -75,7 +76,7 @@ const runMetadata = computed(() => {
 				}}</n8n-text>
 				{{ runMetadata.executionTime }} {{ i18n.baseText('runData.ms') }}
 			</div>
-		</n8n-info-tip>
+		</N8nInfoTip>
 	</div>
 </template>
 
diff --git a/packages/editor-ui/src/components/canvas/elements/edges/CanvasEdge.vue b/packages/editor-ui/src/components/canvas/elements/edges/CanvasEdge.vue
index 385ef7f834..591abf02e0 100644
--- a/packages/editor-ui/src/components/canvas/elements/edges/CanvasEdge.vue
+++ b/packages/editor-ui/src/components/canvas/elements/edges/CanvasEdge.vue
@@ -87,7 +87,7 @@ const edgeClasses = computed(() => ({
 
 const edgeLabelStyle = computed(() => ({
 	transform: `translate(0, ${isConnectorStraight.value ? '-100%' : '0%'})`,
-	color: edgeColor.value,
+	color: 'var(--color-text-base)',
 }));
 
 const isConnectorStraight = computed(() => renderData.value.isConnectorStraight);
diff --git a/packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleMainOutput.vue b/packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleMainOutput.vue
index 89c83b4887..457a869c6e 100644
--- a/packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleMainOutput.vue
+++ b/packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleMainOutput.vue
@@ -136,7 +136,7 @@ function onClickAdd() {
 	left: 50%;
 	transform: translate(-50%, -150%);
 	font-size: var(--font-size-xs);
-	color: var(--color-success);
+	color: var(--color-text-base);
 }
 </style>
 
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeDefault.vue b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeDefault.vue
index c30786d28c..e5cd84b3ce 100644
--- a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeDefault.vue
+++ b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeDefault.vue
@@ -61,6 +61,7 @@ const classes = computed(() => {
 		[$style.configurable]: renderOptions.value.configurable,
 		[$style.configuration]: renderOptions.value.configuration,
 		[$style.trigger]: renderOptions.value.trigger,
+		[$style.warning]: renderOptions.value.dirtiness !== undefined,
 	};
 });
 
@@ -264,6 +265,10 @@ function onActivate() {
 		border-color: var(--color-canvas-node-success-border-color, var(--color-success));
 	}
 
+	&.warning {
+		border-color: var(--color-warning);
+	}
+
 	&.error {
 		border-color: var(--color-canvas-node-error-border-color, var(--color-danger));
 	}
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeDisabledStrikeThrough.vue b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeDisabledStrikeThrough.vue
index d292e8f951..89684afd2f 100644
--- a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeDisabledStrikeThrough.vue
+++ b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeDisabledStrikeThrough.vue
@@ -1,15 +1,19 @@
 <script setup lang="ts">
 import { computed, useCssModule } from 'vue';
 import { useCanvasNode } from '@/composables/useCanvasNode';
+import { CanvasNodeRenderType } from '@/types';
 
 const $style = useCssModule();
 
-const { hasRunData } = useCanvasNode();
+const { hasRunData, render } = useCanvasNode();
 
 const classes = computed(() => {
 	return {
 		[$style.disabledStrikeThrough]: true,
 		[$style.success]: hasRunData.value,
+		[$style.warning]:
+			render.value.type === CanvasNodeRenderType.Default &&
+			render.value.options.dirtiness !== undefined,
 	};
 });
 </script>
@@ -31,4 +35,8 @@ const classes = computed(() => {
 .success {
 	border-color: var(--color-success-light);
 }
+
+.warning {
+	border-color: var(--color-warning-tint-1);
+}
 </style>
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeStatusIcons.test.ts b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeStatusIcons.test.ts
index 55baf76462..7a6aba39f3 100644
--- a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeStatusIcons.test.ts
+++ b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeStatusIcons.test.ts
@@ -2,6 +2,7 @@ import CanvasNodeStatusIcons from './CanvasNodeStatusIcons.vue';
 import { createComponentRenderer } from '@/__tests__/render';
 import { createCanvasNodeProvide } from '@/__tests__/data';
 import { createTestingPinia } from '@pinia/testing';
+import { CanvasNodeDirtiness, CanvasNodeRenderType } from '@/types';
 
 const renderComponent = createComponentRenderer(CanvasNodeStatusIcons, {
 	pinia: createTestingPinia(),
@@ -51,4 +52,22 @@ describe('CanvasNodeStatusIcons', () => {
 
 		expect(getByTestId('canvas-node-status-success')).toHaveTextContent('15');
 	});
+
+	it('should render correctly for a dirty node that has run successfully', () => {
+		const { getByTestId } = renderComponent({
+			global: {
+				provide: createCanvasNodeProvide({
+					data: {
+						runData: { outputMap: {}, iterations: 15, visible: true },
+						render: {
+							type: CanvasNodeRenderType.Default,
+							options: { dirtiness: CanvasNodeDirtiness.PARAMETERS_UPDATED },
+						},
+					},
+				}),
+			},
+		});
+
+		expect(getByTestId('canvas-node-status-warning')).toBeInTheDocument();
+	});
 });
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeStatusIcons.vue b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeStatusIcons.vue
index aa80598baa..32a23cc42b 100644
--- a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeStatusIcons.vue
+++ b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeStatusIcons.vue
@@ -4,6 +4,8 @@ import TitledList from '@/components/TitledList.vue';
 import { useNodeHelpers } from '@/composables/useNodeHelpers';
 import { useCanvasNode } from '@/composables/useCanvasNode';
 import { useI18n } from '@/composables/useI18n';
+import { CanvasNodeDirtiness, CanvasNodeRenderType } from '@/types';
+import { N8nTooltip } from 'n8n-design-system';
 
 const nodeHelpers = useNodeHelpers();
 const i18n = useI18n();
@@ -18,9 +20,13 @@ const {
 	hasRunData,
 	runDataIterations,
 	isDisabled,
+	render,
 } = useCanvasNode();
 
 const hideNodeIssues = computed(() => false); // @TODO Implement this
+const dirtiness = computed(() =>
+	render.value.type === CanvasNodeRenderType.Default ? render.value.options.dirtiness : undefined,
+);
 </script>
 
 <template>
@@ -66,6 +72,23 @@ const hideNodeIssues = computed(() => false); // @TODO Implement this
 	>
 		<FontAwesomeIcon icon="sync-alt" spin />
 	</div>
+	<div v-else-if="dirtiness !== undefined">
+		<N8nTooltip :show-after="500" placement="bottom">
+			<template #content>
+				{{
+					i18n.baseText(
+						dirtiness === CanvasNodeDirtiness.PARAMETERS_UPDATED
+							? 'node.dirty'
+							: 'node.subjectToChange',
+					)
+				}}
+			</template>
+			<div data-test-id="canvas-node-status-warning" :class="[$style.status, $style.warning]">
+				<FontAwesomeIcon icon="triangle" />
+				<span v-if="runDataIterations > 1" :class="$style.count"> {{ runDataIterations }}</span>
+			</div>
+		</N8nTooltip>
+	</div>
 	<div
 		v-else-if="hasRunData"
 		data-test-id="canvas-node-status-success"
@@ -81,10 +104,10 @@ const hideNodeIssues = computed(() => false); // @TODO Implement this
 	display: flex;
 	align-items: center;
 	gap: var(--spacing-5xs);
+	font-weight: 600;
 }
 
 .runData {
-	font-weight: 600;
 	color: var(--color-success);
 }
 
@@ -126,4 +149,8 @@ const hideNodeIssues = computed(() => false); // @TODO Implement this
 .count {
 	font-size: var(--font-size-s);
 }
+
+.warning {
+	color: var(--color-warning);
+}
 </style>
diff --git a/packages/editor-ui/src/composables/useCanvasMapping.ts b/packages/editor-ui/src/composables/useCanvasMapping.ts
index dbdcc31ed0..d35340cc20 100644
--- a/packages/editor-ui/src/composables/useCanvasMapping.ts
+++ b/packages/editor-ui/src/composables/useCanvasMapping.ts
@@ -49,6 +49,7 @@ import { sanitizeHtml } from '@/utils/htmlUtils';
 import { MarkerType } from '@vue-flow/core';
 import { useNodeHelpers } from './useNodeHelpers';
 import { getTriggerNodeServiceName } from '@/utils/nodeTypesUtils';
+import { useNodeDirtiness } from '@/composables/useNodeDirtiness';
 
 export function useCanvasMapping({
 	nodes,
@@ -63,6 +64,7 @@ export function useCanvasMapping({
 	const workflowsStore = useWorkflowsStore();
 	const nodeTypesStore = useNodeTypesStore();
 	const nodeHelpers = useNodeHelpers();
+	const { dirtinessByName } = useNodeDirtiness();
 
 	function createStickyNoteRenderType(node: INodeUi): CanvasNodeStickyNoteRender {
 		return {
@@ -97,6 +99,7 @@ export function useCanvasMapping({
 					labelSize: nodeOutputLabelSizeById.value[node.id],
 				},
 				tooltip: nodeTooltipById.value[node.id],
+				dirtiness: dirtinessByName.value[node.name],
 			},
 		};
 	}
diff --git a/packages/editor-ui/src/composables/useCanvasOperations.test.ts b/packages/editor-ui/src/composables/useCanvasOperations.test.ts
index a93d14d7cb..196a45a83a 100644
--- a/packages/editor-ui/src/composables/useCanvasOperations.test.ts
+++ b/packages/editor-ui/src/composables/useCanvasOperations.test.ts
@@ -714,7 +714,9 @@ describe('useCanvasOperations', () => {
 
 			expect(workflowsStore.removeNodeById).toHaveBeenCalledWith(id);
 			expect(workflowsStore.removeNodeExecutionDataById).toHaveBeenCalledWith(id);
-			expect(historyStore.pushCommandToUndo).toHaveBeenCalledWith(new RemoveNodeCommand(node));
+			expect(historyStore.pushCommandToUndo).toHaveBeenCalledWith(
+				new RemoveNodeCommand(node, expect.any(Number)),
+			);
 		});
 
 		it('should delete node without tracking history', () => {
diff --git a/packages/editor-ui/src/composables/useCanvasOperations.ts b/packages/editor-ui/src/composables/useCanvasOperations.ts
index 4dbae1f0b4..6785f7245b 100644
--- a/packages/editor-ui/src/composables/useCanvasOperations.ts
+++ b/packages/editor-ui/src/composables/useCanvasOperations.ts
@@ -197,7 +197,9 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 		workflowsStore.setNodePositionById(id, newPosition);
 
 		if (trackHistory) {
-			historyStore.pushCommandToUndo(new MoveNodeCommand(node.name, oldPosition, newPosition));
+			historyStore.pushCommandToUndo(
+				new MoveNodeCommand(node.name, oldPosition, newPosition, Date.now()),
+			);
 		}
 	}
 
@@ -230,7 +232,7 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 		workflow.renameNode(currentName, newName);
 
 		if (trackHistory) {
-			historyStore.pushCommandToUndo(new RenameNodeCommand(currentName, newName));
+			historyStore.pushCommandToUndo(new RenameNodeCommand(currentName, newName, Date.now()));
 		}
 
 		// Update also last selected node and execution data
@@ -281,18 +283,21 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 
 					if (trackHistory) {
 						historyStore.pushCommandToUndo(
-							new AddConnectionCommand([
-								{
-									node: incomingConnection.node,
-									type,
-									index: incomingConnection.index,
-								},
-								{
-									node: outgoingConnection.node,
-									type,
-									index: outgoingConnection.index,
-								},
-							]),
+							new AddConnectionCommand(
+								[
+									{
+										node: incomingConnection.node,
+										type,
+										index: incomingConnection.index,
+									},
+									{
+										node: outgoingConnection.node,
+										type,
+										index: outgoingConnection.index,
+									},
+								],
+								Date.now(),
+							),
 						);
 					}
 
@@ -336,7 +341,7 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 		workflowsStore.removeNodeById(id);
 
 		if (trackHistory) {
-			historyStore.pushCommandToUndo(new RemoveNodeCommand(node));
+			historyStore.pushCommandToUndo(new RemoveNodeCommand(node, Date.now()));
 
 			if (trackBulk) {
 				historyStore.stopRecordingUndo();
@@ -614,7 +619,7 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 		workflowsStore.addNode(nodeData);
 
 		if (options.trackHistory) {
-			historyStore.pushCommandToUndo(new AddNodeCommand(nodeData));
+			historyStore.pushCommandToUndo(new AddNodeCommand(nodeData, Date.now()));
 		}
 
 		if (!options.isAutoAdd) {
@@ -1099,6 +1104,7 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 			historyStore.pushCommandToUndo(
 				new AddConnectionCommand(
 					mapCanvasConnectionToLegacyConnection(sourceNode, targetNode, connection),
+					Date.now(),
 				),
 			);
 		}
@@ -1229,7 +1235,7 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 		});
 
 		if (trackHistory) {
-			historyStore.pushCommandToUndo(new RemoveConnectionCommand(mappedConnection));
+			historyStore.pushCommandToUndo(new RemoveConnectionCommand(mappedConnection, Date.now()));
 
 			if (trackBulk) {
 				historyStore.stopRecordingUndo();
diff --git a/packages/editor-ui/src/composables/useHistoryHelper.ts b/packages/editor-ui/src/composables/useHistoryHelper.ts
index 9a952e1e24..170cd1bb16 100644
--- a/packages/editor-ui/src/composables/useHistoryHelper.ts
+++ b/packages/editor-ui/src/composables/useHistoryHelper.ts
@@ -32,13 +32,16 @@ export function useHistoryHelper(activeRoute: RouteLocationNormalizedLoaded) {
 				if (!command) {
 					return;
 				}
+
+				const timestamp = Date.now();
+
 				if (command instanceof BulkCommand) {
 					historyStore.bulkInProgress = true;
 					const commands = command.commands;
 					const reverseCommands: Command[] = [];
 					for (let i = commands.length - 1; i >= 0; i--) {
 						await commands[i].revert();
-						reverseCommands.push(commands[i].getReverseCommand());
+						reverseCommands.push(commands[i].getReverseCommand(timestamp));
 					}
 					historyStore.pushUndoableToRedo(new BulkCommand(reverseCommands));
 					await nextTick();
@@ -46,7 +49,7 @@ export function useHistoryHelper(activeRoute: RouteLocationNormalizedLoaded) {
 				}
 				if (command instanceof Command) {
 					await command.revert();
-					historyStore.pushUndoableToRedo(command.getReverseCommand());
+					historyStore.pushUndoableToRedo(command.getReverseCommand(timestamp));
 					uiStore.stateIsDirty = true;
 				}
 				trackCommand(command, 'undo');
@@ -61,13 +64,16 @@ export function useHistoryHelper(activeRoute: RouteLocationNormalizedLoaded) {
 				if (!command) {
 					return;
 				}
+
+				const timestamp = Date.now();
+
 				if (command instanceof BulkCommand) {
 					historyStore.bulkInProgress = true;
 					const commands = command.commands;
 					const reverseCommands = [];
 					for (let i = commands.length - 1; i >= 0; i--) {
 						await commands[i].revert();
-						reverseCommands.push(commands[i].getReverseCommand());
+						reverseCommands.push(commands[i].getReverseCommand(timestamp));
 					}
 					historyStore.pushBulkCommandToUndo(new BulkCommand(reverseCommands), false);
 					await nextTick();
@@ -75,7 +81,7 @@ export function useHistoryHelper(activeRoute: RouteLocationNormalizedLoaded) {
 				}
 				if (command instanceof Command) {
 					await command.revert();
-					historyStore.pushCommandToUndo(command.getReverseCommand(), false);
+					historyStore.pushCommandToUndo(command.getReverseCommand(timestamp), false);
 					uiStore.stateIsDirty = true;
 				}
 				trackCommand(command, 'redo');
diff --git a/packages/editor-ui/src/composables/useNodeDirtiness.test.ts b/packages/editor-ui/src/composables/useNodeDirtiness.test.ts
new file mode 100644
index 0000000000..7810e971c3
--- /dev/null
+++ b/packages/editor-ui/src/composables/useNodeDirtiness.test.ts
@@ -0,0 +1,464 @@
+/* eslint-disable n8n-local-rules/no-unneeded-backticks */
+import { createTestNode, createTestWorkflow, defaultNodeDescriptions } from '@/__tests__/mocks';
+import { createComponentRenderer } from '@/__tests__/render';
+import { useCanvasOperations } from '@/composables/useCanvasOperations';
+import { useHistoryHelper } from '@/composables/useHistoryHelper';
+import { useNodeDirtiness } from '@/composables/useNodeDirtiness';
+import { MANUAL_TRIGGER_NODE_TYPE, SET_NODE_TYPE } from '@/constants';
+import { type INodeUi } from '@/Interface';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useUIStore } from '@/stores/ui.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { CanvasNodeDirtiness } from '@/types';
+import { type FrontendSettings } from '@n8n/api-types';
+import { createTestingPinia } from '@pinia/testing';
+import { NodeConnectionType, type IConnections, type IRunData } from 'n8n-workflow';
+import { defineComponent } from 'vue';
+import {
+	createRouter,
+	createWebHistory,
+	useRouter,
+	type RouteLocationNormalizedLoaded,
+} from 'vue-router';
+
+describe(useNodeDirtiness, () => {
+	let nodeTypeStore: ReturnType<typeof useNodeTypesStore>;
+	let workflowsStore: ReturnType<typeof useWorkflowsStore>;
+	let settingsStore: ReturnType<typeof useSettingsStore>;
+	let historyHelper: ReturnType<typeof useHistoryHelper>;
+	let canvasOperations: ReturnType<typeof useCanvasOperations>;
+	let uiStore: ReturnType<typeof useUIStore>;
+
+	const NODE_RUN_AT = new Date('2025-01-01T00:00:01');
+	const WORKFLOW_UPDATED_AT = new Date('2025-01-01T00:00:10');
+
+	beforeEach(() => {
+		vi.useFakeTimers();
+
+		const TestComponent = defineComponent({
+			setup() {
+				nodeTypeStore = useNodeTypesStore();
+				workflowsStore = useWorkflowsStore();
+				settingsStore = useSettingsStore();
+				historyHelper = useHistoryHelper({} as RouteLocationNormalizedLoaded);
+				canvasOperations = useCanvasOperations({ router: useRouter() });
+				uiStore = useUIStore();
+
+				nodeTypeStore.setNodeTypes(defaultNodeDescriptions);
+
+				// Enable new partial execution
+				settingsStore.settings = {
+					partialExecution: { version: 2 },
+				} as FrontendSettings;
+			},
+			template: '<div />',
+		});
+
+		createComponentRenderer(TestComponent, {
+			global: {
+				plugins: [
+					createTestingPinia({ stubActions: false, fakeApp: true }),
+					createRouter({
+						history: createWebHistory(),
+						routes: [{ path: '/', component: TestComponent }],
+					}),
+				],
+			},
+		})();
+	});
+
+	it('should be an empty object if no change has been made to the workflow', () => {
+		setupTestWorkflow('a🚨✅, b✅, c✅');
+
+		expect(useNodeDirtiness().dirtinessByName.value).toEqual({});
+	});
+
+	describe('injecting a node', () => {
+		it('should mark a node as dirty if a new node is injected as its parent', async () => {
+			useNodeTypesStore().setNodeTypes(defaultNodeDescriptions);
+
+			setupTestWorkflow('a🚨✅ -> b✅');
+
+			uiStore.lastInteractedWithNodeConnection = {
+				source: workflowsStore.nodesByName.a.id,
+				target: workflowsStore.nodesByName.b.id,
+			};
+			uiStore.lastInteractedWithNodeId = workflowsStore.nodesByName.a.id;
+			uiStore.lastInteractedWithNodeHandle = 'outputs/main/0';
+
+			await canvasOperations.addNodes([createTestNode({ name: 'c' })], { trackHistory: true });
+
+			expect(useNodeDirtiness().dirtinessByName.value).toEqual({
+				b: CanvasNodeDirtiness.INCOMING_CONNECTIONS_UPDATED,
+			});
+		});
+	});
+
+	describe('deleting a node', () => {
+		it('should mark a node as dirty if a parent node is replaced by removing a node', async () => {
+			useNodeTypesStore().setNodeTypes(defaultNodeDescriptions);
+
+			setupTestWorkflow('a🚨✅ -> b✅ -> c✅');
+
+			canvasOperations.deleteNodes([workflowsStore.nodesByName.b.id], { trackHistory: true }); // 'a' becomes new parent of 'c'
+
+			expect(useNodeDirtiness().dirtinessByName.value).toEqual({
+				c: CanvasNodeDirtiness.INCOMING_CONNECTIONS_UPDATED,
+			});
+		});
+
+		it('should mark a node as dirty if a parent node get removed', async () => {
+			useNodeTypesStore().setNodeTypes(defaultNodeDescriptions);
+
+			setupTestWorkflow('a🚨✅ -> b✅ -> c✅');
+
+			canvasOperations.deleteNodes([workflowsStore.nodesByName.a.id], { trackHistory: true }); // 'b' has no parent node anymore
+
+			expect(useNodeDirtiness().dirtinessByName.value).toEqual({
+				b: CanvasNodeDirtiness.INCOMING_CONNECTIONS_UPDATED,
+			});
+		});
+	});
+
+	describe('updating node parameters', () => {
+		it('should mark a node as dirty if its parameter has changed', () => {
+			setupTestWorkflow('a🚨✅, b✅, c✅');
+
+			canvasOperations.setNodeParameters(workflowsStore.nodesByName.b.id, { foo: 1 });
+
+			expect(useNodeDirtiness().dirtinessByName.value).toEqual({
+				b: CanvasNodeDirtiness.PARAMETERS_UPDATED,
+			});
+		});
+
+		it('should clear dirtiness if a dirty node gets new run data', () => {
+			useNodeTypesStore().setNodeTypes(defaultNodeDescriptions);
+
+			setupTestWorkflow('a🚨✅ -> b✅ -> c✅');
+
+			canvasOperations.setNodeParameters(workflowsStore.nodesByName.b.id, { foo: 1 });
+
+			const runAt = new Date(+WORKFLOW_UPDATED_AT + 1000);
+
+			workflowsStore.setWorkflowExecutionData({
+				id: workflowsStore.workflow.id,
+				finished: true,
+				mode: 'manual',
+				status: 'success',
+				workflowData: workflowsStore.workflow,
+				startedAt: runAt,
+				createdAt: runAt,
+				data: {
+					resultData: {
+						runData: {
+							b: [
+								{
+									startTime: +runAt,
+									executionTime: 0,
+									executionStatus: 'success',
+									source: [],
+								},
+							],
+						},
+					},
+				},
+			});
+
+			expect(useNodeDirtiness().dirtinessByName.value).toEqual({});
+		});
+
+		it("should not update dirtiness if the node hasn't run yet", () => {
+			setupTestWorkflow('a🚨✅, b, c✅');
+
+			canvasOperations.setNodeParameters(workflowsStore.nodesByName.b.id, { foo: 1 });
+
+			expect(useNodeDirtiness().dirtinessByName.value).toEqual({});
+		});
+
+		it('should not update dirtiness when the notes field is updated', () => {
+			setupTestWorkflow('a🚨✅ -> b✅ -> c✅');
+
+			workflowsStore.setNodeValue({ key: 'notes', name: 'b', value: 'test' });
+
+			expect(useNodeDirtiness().dirtinessByName.value).toEqual({});
+		});
+	});
+
+	describe('adding a connection', () => {
+		it('should mark a node as dirty if a new incoming connection is added', () => {
+			useNodeTypesStore().setNodeTypes(defaultNodeDescriptions);
+
+			setupTestWorkflow('a🚨✅ -> b✅ -> c✅');
+
+			canvasOperations.createConnection(
+				{ source: workflowsStore.nodesByName.a.id, target: workflowsStore.nodesByName.c.id },
+				{ trackHistory: true },
+			);
+
+			expect(useNodeDirtiness().dirtinessByName.value).toEqual({
+				c: CanvasNodeDirtiness.INCOMING_CONNECTIONS_UPDATED,
+			});
+		});
+	});
+
+	describe('removing a connection', () => {
+		it('should not change dirtiness', () => {
+			useNodeTypesStore().setNodeTypes(defaultNodeDescriptions);
+
+			setupTestWorkflow('a🚨✅ -> b✅ -> c✅');
+
+			canvasOperations.deleteConnection(
+				{ source: workflowsStore.nodesByName.a.id, target: workflowsStore.nodesByName.b.id },
+				{ trackHistory: true },
+			);
+
+			expect(useNodeDirtiness().dirtinessByName.value).toEqual({});
+		});
+	});
+
+	describe('enabling/disabling nodes', () => {
+		it('should mark downstream nodes dirty if the node is set to disabled', () => {
+			setupTestWorkflow('a🚨✅ -> b✅ -> c✅ -> d✅');
+
+			canvasOperations.toggleNodesDisabled([workflowsStore.nodesByName.b.id], {
+				trackHistory: true,
+			});
+
+			expect(useNodeDirtiness().dirtinessByName.value).toEqual({
+				c: CanvasNodeDirtiness.INCOMING_CONNECTIONS_UPDATED,
+			});
+		});
+
+		it('should not mark anything dirty if a disabled node is set to enabled', () => {
+			setupTestWorkflow('a🚨✅ -> b🚫 -> c✅ -> d✅');
+
+			canvasOperations.toggleNodesDisabled([workflowsStore.nodesByName.b.id], {
+				trackHistory: true,
+			});
+
+			expect(useNodeDirtiness().dirtinessByName.value).toEqual({});
+		});
+
+		it('should restore original dirtiness after undoing a command', async () => {
+			setupTestWorkflow('a🚨✅ -> b✅ -> c✅ -> d✅');
+
+			canvasOperations.toggleNodesDisabled([workflowsStore.nodesByName.b.id], {
+				trackHistory: true,
+			});
+
+			expect(useNodeDirtiness().dirtinessByName.value).toEqual({
+				c: CanvasNodeDirtiness.INCOMING_CONNECTIONS_UPDATED,
+			});
+
+			await historyHelper.undo();
+
+			expect(useNodeDirtiness().dirtinessByName.value).toEqual({});
+		});
+	});
+
+	describe('pinned data', () => {
+		it('should not change dirtiness when data is pinned', async () => {
+			setupTestWorkflow('a🚨✅ -> b✅ -> c✅');
+
+			canvasOperations.toggleNodesPinned([workflowsStore.nodesByName.b.id], 'pin-icon-click', {
+				trackHistory: true,
+			});
+
+			expect(useNodeDirtiness().dirtinessByName.value).toEqual({});
+		});
+
+		it('should update dirtiness when pinned data is removed from a node with run data', async () => {
+			setupTestWorkflow('a🚨✅ -> b✅📌 -> c✅, b -> d, b -> e✅ -> f✅');
+
+			canvasOperations.toggleNodesPinned([workflowsStore.nodesByName.b.id], 'pin-icon-click', {
+				trackHistory: true,
+			});
+
+			expect(useNodeDirtiness().dirtinessByName.value).toEqual({
+				b: CanvasNodeDirtiness.PINNED_DATA_UPDATED,
+			});
+		});
+
+		it('should update dirtiness when an existing pinned data of an incoming node is updated', async () => {
+			setupTestWorkflow('a🚨✅ -> b✅📌 -> c✅, b -> d, b -> e✅ -> f✅');
+
+			workflowsStore.pinData({ node: workflowsStore.nodesByName.b, data: [{ json: {} }] });
+
+			expect(useNodeDirtiness().dirtinessByName.value).toEqual({
+				// 'd' is not marked as pinned-data-updated because it has no run data.
+				c: CanvasNodeDirtiness.PINNED_DATA_UPDATED,
+				e: CanvasNodeDirtiness.PINNED_DATA_UPDATED,
+			});
+		});
+	});
+
+	describe('sub-nodes', () => {
+		it('should mark its parent nodes with run data as dirty when parameters of a sub node has changed', () => {
+			setupTestWorkflow('a🚨✅ -> b✅ -> c✅, d🧠 -> b, e🧠 -> f✅🧠 -> b');
+
+			canvasOperations.setNodeParameters(workflowsStore.nodesByName.e.id, { foo: 1 });
+
+			expect(useNodeDirtiness().dirtinessByName.value).toEqual({
+				// 'e' itself is not marked as parameters-updated, because it has no run data.
+				f: CanvasNodeDirtiness.UPSTREAM_DIRTY,
+				b: CanvasNodeDirtiness.UPSTREAM_DIRTY,
+			});
+		});
+
+		it('should change dirtiness if a disabled sub node is set to enabled', () => {
+			setupTestWorkflow('a🚨✅ -> b✅ -> c✅, d🧠🚫 -> b');
+
+			canvasOperations.toggleNodesDisabled([workflowsStore.nodesByName.d.id], {
+				trackHistory: true,
+			});
+
+			expect(useNodeDirtiness().dirtinessByName.value).toEqual({
+				b: CanvasNodeDirtiness.INCOMING_CONNECTIONS_UPDATED,
+			});
+		});
+
+		it('should change dirtiness if a sub node is removed', () => {
+			setupTestWorkflow('a🚨✅ -> b✅ -> c✅, d🧠 -> b');
+
+			canvasOperations.deleteNodes([workflowsStore.nodesByName.d.id], { trackHistory: true });
+
+			expect(useNodeDirtiness().dirtinessByName.value).toEqual({
+				b: CanvasNodeDirtiness.INCOMING_CONNECTIONS_UPDATED,
+			});
+		});
+	});
+
+	describe('workflow with a loop', () => {
+		it('should change the dirtiness of the first node in a loop when one of nodes in the loop becomes dirty', () => {
+			setupTestWorkflow('a🚨✅ -> b✅ -> c✅ -> d✅ -> e✅ -> f✅ -> c✅');
+
+			canvasOperations.setNodeParameters(workflowsStore.nodesByName.e.id, { foo: 1 });
+
+			expect(useNodeDirtiness().dirtinessByName.value).toEqual({
+				c: CanvasNodeDirtiness.UPSTREAM_DIRTY,
+				e: CanvasNodeDirtiness.PARAMETERS_UPDATED,
+			});
+		});
+
+		it('should not choose a node as the first node in a loop if all nodes in the loop have incoming connections', () => {
+			setupTestWorkflow('a🚨✅ -> b✅ -> c✅, d✅ -> e✅ -> d✅, d -> b');
+
+			canvasOperations.setNodeParameters(workflowsStore.nodesByName.c.id, { foo: 1 });
+
+			expect(useNodeDirtiness().dirtinessByName.value).toEqual({
+				c: CanvasNodeDirtiness.PARAMETERS_UPDATED,
+			});
+		});
+	});
+
+	describe('renaming a node', () => {
+		it.todo('should preserve the dirtiness', async () => {
+			useNodeTypesStore().setNodeTypes(defaultNodeDescriptions);
+
+			setupTestWorkflow('a🚨✅ -> b✅ -> c✅');
+
+			canvasOperations.deleteNodes([workflowsStore.nodesByName.b.id], { trackHistory: true }); // 'a' becomes new parent of 'c'
+
+			expect(useNodeDirtiness().dirtinessByName.value).toEqual({
+				c: CanvasNodeDirtiness.INCOMING_CONNECTIONS_UPDATED,
+			});
+
+			await canvasOperations.renameNode('c', 'd', { trackHistory: true });
+
+			expect(useNodeDirtiness().dirtinessByName.value).toEqual({
+				d: CanvasNodeDirtiness.INCOMING_CONNECTIONS_UPDATED,
+			});
+		});
+	});
+
+	/**
+	 * Setup test data in the workflow store using given diagram.
+	 *
+	 * [Symbols]
+	 * - 🚨: Trigger node
+	 * - ✅: Node with run data
+	 * - 🚫: Disabled node
+	 * - 📌: Node with pinned data
+	 * - 🧠: A sub node
+	 */
+	function setupTestWorkflow(diagram: string) {
+		const nodeNamesWithPinnedData = new Set<string>();
+		const nodes: Record<string, INodeUi> = {};
+		const connections: IConnections = {};
+		const runData: IRunData = {};
+
+		for (const subGraph of diagram.split(/\n|,/).filter((line) => line.trim() !== '')) {
+			const elements = subGraph.split(/(->)/).map((s) => s.trim());
+
+			elements.forEach((element, i, arr) => {
+				if (element === '->') {
+					const from = arr[i - 1].slice(0, 1);
+					const to = arr[i + 1].slice(0, 1);
+					const type = arr[i - 1].includes('🧠')
+						? NodeConnectionType.AiAgent
+						: NodeConnectionType.Main;
+					const conns = connections[from]?.[type] ?? [];
+					const conn = conns[0] ?? [];
+
+					connections[from] = {
+						...connections[from],
+						[type]: [[...conn, { node: to, type, index: conn.length }], ...conns.slice(1)],
+					};
+					return;
+				}
+
+				const [name, ...attributes] = element.trim();
+
+				nodes[name] =
+					nodes[name] ??
+					createTestNode({
+						name,
+						disabled: attributes.includes('🚫'),
+						type: attributes.includes('🚨') ? MANUAL_TRIGGER_NODE_TYPE : SET_NODE_TYPE,
+					});
+
+				if (attributes.includes('✅')) {
+					runData[name] = [
+						{
+							startTime: +NODE_RUN_AT,
+							executionTime: 0,
+							executionStatus: 'success',
+							source: [],
+						},
+					];
+				}
+
+				if (attributes.includes('📌')) {
+					nodeNamesWithPinnedData.add(name);
+				}
+			});
+		}
+
+		const workflow = createTestWorkflow({ nodes: Object.values(nodes), connections });
+
+		workflowsStore.setNodes(workflow.nodes);
+		workflowsStore.setConnections(workflow.connections);
+
+		for (const name of nodeNamesWithPinnedData) {
+			workflowsStore.pinData({
+				node: workflowsStore.nodesByName[name],
+				data: [{ json: {} }],
+			});
+		}
+
+		workflowsStore.setWorkflowExecutionData({
+			id: workflow.id,
+			finished: true,
+			mode: 'manual',
+			status: 'success',
+			workflowData: workflow,
+			startedAt: NODE_RUN_AT,
+			createdAt: NODE_RUN_AT,
+			data: { resultData: { runData } },
+		});
+
+		// prepare for making changes to the workflow
+		vi.setSystemTime(WORKFLOW_UPDATED_AT);
+	}
+});
diff --git a/packages/editor-ui/src/composables/useNodeDirtiness.ts b/packages/editor-ui/src/composables/useNodeDirtiness.ts
new file mode 100644
index 0000000000..e96c723930
--- /dev/null
+++ b/packages/editor-ui/src/composables/useNodeDirtiness.ts
@@ -0,0 +1,309 @@
+import {
+	AddConnectionCommand,
+	AddNodeCommand,
+	BulkCommand,
+	EnableNodeToggleCommand,
+	RemoveConnectionCommand,
+	RemoveNodeCommand,
+	type Undoable,
+} from '@/models/history';
+import { useHistoryStore } from '@/stores/history.store';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { CanvasNodeDirtiness, type CanvasNodeDirtinessType } from '@/types';
+import { type INodeConnections, NodeConnectionType } from 'n8n-workflow';
+import { computed } from 'vue';
+
+/**
+ * Does the command make the given node dirty?
+ */
+function shouldCommandMarkDirty(
+	command: Undoable,
+	nodeName: string,
+	siblingCommands: Undoable[],
+	getIncomingConnections: (nodeName: string) => INodeConnections,
+	getOutgoingConnectors: (nodeName: string) => INodeConnections,
+): boolean {
+	if (command instanceof BulkCommand) {
+		return command.commands.some((cmd) =>
+			shouldCommandMarkDirty(
+				cmd,
+				nodeName,
+				command.commands,
+				getIncomingConnections,
+				getOutgoingConnectors,
+			),
+		);
+	}
+
+	if (command instanceof AddConnectionCommand) {
+		return command.connectionData[1]?.node === nodeName;
+	}
+
+	if (command instanceof RemoveConnectionCommand) {
+		const [from, to] = command.connectionData;
+
+		if (to.node !== nodeName) {
+			return false;
+		}
+
+		// the connection was removed along with its source node
+		return siblingCommands.some(
+			(sibling) => sibling instanceof RemoveNodeCommand && sibling.node.name === from.node,
+		);
+	}
+
+	const incomingNodes = Object.values(getIncomingConnections(nodeName))
+		.flat()
+		.flat()
+		.filter((connection) => connection !== null)
+		.map((connection) => connection.node);
+
+	if (command instanceof AddNodeCommand) {
+		return incomingNodes.includes(command.node.name);
+	}
+
+	if (command instanceof EnableNodeToggleCommand) {
+		return (
+			incomingNodes.includes(command.nodeName) &&
+			(command.newState ||
+				Object.keys(getOutgoingConnectors(command.nodeName)).some(
+					(type) => (type as NodeConnectionType) !== NodeConnectionType.Main,
+				))
+		);
+	}
+
+	return false;
+}
+
+/**
+ * If given node is part of a loop, returns the set of nodes that forms the loop, otherwise returns undefined.
+ */
+function findLoop(
+	nodeName: string,
+	visited: string[],
+	getIncomingConnections: (nodeName: string) => INodeConnections,
+): string[] | undefined {
+	const index = visited.indexOf(nodeName);
+
+	if (index >= 0) {
+		return visited.slice(index);
+	}
+
+	const newVisited = [...visited, nodeName];
+
+	for (const [type, typeConnections] of Object.entries(getIncomingConnections(nodeName))) {
+		if ((type as NodeConnectionType) !== NodeConnectionType.Main) {
+			continue;
+		}
+
+		for (const connections of typeConnections) {
+			for (const { node } of connections ?? []) {
+				const loop = findLoop(node, newVisited, getIncomingConnections);
+
+				if (loop) {
+					return loop;
+				}
+			}
+		}
+	}
+
+	return undefined;
+}
+
+/**
+ * Determines the subgraph that is affected by changes made after the last (partial) execution
+ */
+export function useNodeDirtiness() {
+	const historyStore = useHistoryStore();
+	const workflowsStore = useWorkflowsStore();
+	const settingsStore = useSettingsStore();
+
+	function getParentSubNodes(nodeName: string) {
+		return Object.entries(workflowsStore.incomingConnectionsByNodeName(nodeName))
+			.filter(([type]) => (type as NodeConnectionType) !== NodeConnectionType.Main)
+			.flatMap(([, typeConnections]) => typeConnections.flat().filter((conn) => conn !== null));
+	}
+
+	function getDirtinessByParametersUpdate(
+		nodeName: string,
+		after: number,
+	): CanvasNodeDirtinessType | undefined {
+		if ((workflowsStore.getParametersLastUpdate(nodeName) ?? 0) > after) {
+			return CanvasNodeDirtiness.PARAMETERS_UPDATED;
+		}
+
+		for (const connection of getParentSubNodes(nodeName)) {
+			if (getDirtinessByParametersUpdate(connection.node, after) !== undefined) {
+				return CanvasNodeDirtiness.UPSTREAM_DIRTY;
+			}
+		}
+
+		return undefined;
+	}
+
+	function getDirtinessByConnectionsUpdate(
+		nodeName: string,
+		after: number,
+	): CanvasNodeDirtinessType | undefined {
+		for (let i = historyStore.undoStack.length - 1; i >= 0; i--) {
+			const command = historyStore.undoStack[i];
+
+			if (command.getTimestamp() < after) {
+				break;
+			}
+
+			if (
+				shouldCommandMarkDirty(
+					command,
+					nodeName,
+					[],
+					workflowsStore.incomingConnectionsByNodeName,
+					workflowsStore.outgoingConnectionsByNodeName,
+				)
+			) {
+				return CanvasNodeDirtiness.INCOMING_CONNECTIONS_UPDATED;
+			}
+		}
+
+		for (const connection of getParentSubNodes(nodeName)) {
+			if (getDirtinessByConnectionsUpdate(connection.node, after) !== undefined) {
+				return CanvasNodeDirtiness.UPSTREAM_DIRTY;
+			}
+		}
+
+		return undefined;
+	}
+
+	/**
+	 * Depth of node is defined as the minimum distance (number of connections) from the trigger node
+	 */
+	const depthByName = computed(() => {
+		const depth: Record<string, number> = {};
+
+		function setDepthRecursively(nodeName: string, current: number, visited: Set<string>) {
+			if (visited.has(nodeName)) {
+				return;
+			}
+
+			const myVisited = new Set<string>(visited);
+
+			myVisited.add(nodeName);
+
+			for (const [type, typeConnections] of Object.entries(
+				workflowsStore.outgoingConnectionsByNodeName(nodeName),
+			)) {
+				if ((type as NodeConnectionType) !== NodeConnectionType.Main) {
+					continue;
+				}
+
+				for (const connections of typeConnections) {
+					for (const { node } of connections ?? []) {
+						if (!depth[node] || depth[node] > current) {
+							depth[node] = current;
+						}
+
+						setDepthRecursively(node, current + 1, myVisited);
+					}
+				}
+			}
+		}
+
+		for (const startNode of workflowsStore.allNodes) {
+			const hasIncomingNode =
+				Object.keys(workflowsStore.incomingConnectionsByNodeName(startNode.name)).length > 0;
+
+			if (hasIncomingNode) {
+				continue;
+			}
+
+			depth[startNode.name] = 0;
+			setDepthRecursively(startNode.name, 1, new Set());
+		}
+
+		return depth;
+	});
+
+	const dirtinessByName = computed(() => {
+		// Do not highlight dirtiness if new partial execution is not enabled
+		if (settingsStore.partialExecutionVersion === 1) {
+			return {};
+		}
+
+		const dirtiness: Record<string, CanvasNodeDirtinessType | undefined> = {};
+		const runDataByNode = workflowsStore.getWorkflowRunData ?? {};
+
+		function setDirtiness(nodeName: string, value: CanvasNodeDirtinessType) {
+			dirtiness[nodeName] = dirtiness[nodeName] ?? value;
+
+			const loop = findLoop(nodeName, [], workflowsStore.incomingConnectionsByNodeName);
+
+			if (!loop) {
+				return;
+			}
+
+			const loopEntryNodeName = [...loop].sort(
+				(a, b) =>
+					(depthByName.value[a] ?? Number.MAX_SAFE_INTEGER) -
+					(depthByName.value[b] ?? Number.MAX_SAFE_INTEGER),
+			)?.[0];
+
+			if (loopEntryNodeName && depthByName.value[loopEntryNodeName]) {
+				// If a node in a loop becomes dirty, the first node in the loop should also be dirty
+				dirtiness[loopEntryNodeName] =
+					dirtiness[loopEntryNodeName] ?? CanvasNodeDirtiness.UPSTREAM_DIRTY;
+			}
+		}
+
+		for (const [nodeName, runData] of Object.entries(runDataByNode)) {
+			const runAt = runData[0]?.startTime ?? 0;
+
+			if (!runAt) {
+				continue;
+			}
+
+			const parameterUpdate = getDirtinessByParametersUpdate(nodeName, runAt);
+
+			if (parameterUpdate) {
+				setDirtiness(nodeName, parameterUpdate);
+				continue;
+			}
+
+			const connectionUpdate = getDirtinessByConnectionsUpdate(nodeName, runAt);
+
+			if (connectionUpdate) {
+				setDirtiness(nodeName, connectionUpdate);
+				continue;
+			}
+
+			const hasInputPinnedDataChanged = Object.values(
+				workflowsStore.incomingConnectionsByNodeName(nodeName),
+			)
+				.flat()
+				.flat()
+				.filter((connection) => connection !== null)
+				.some((connection) => {
+					const pinnedDataLastUpdatedAt =
+						workflowsStore.getPinnedDataLastUpdate(connection.node) ?? 0;
+
+					return pinnedDataLastUpdatedAt > runAt;
+				});
+
+			if (hasInputPinnedDataChanged) {
+				setDirtiness(nodeName, CanvasNodeDirtiness.PINNED_DATA_UPDATED);
+				continue;
+			}
+
+			const pinnedDataLastRemovedAt = workflowsStore.getPinnedDataLastRemovedAt(nodeName) ?? 0;
+
+			if (pinnedDataLastRemovedAt > runAt) {
+				setDirtiness(nodeName, CanvasNodeDirtiness.PINNED_DATA_UPDATED);
+				continue;
+			}
+		}
+
+		return dirtiness;
+	});
+
+	return { dirtinessByName };
+}
diff --git a/packages/editor-ui/src/composables/useNodeHelpers.ts b/packages/editor-ui/src/composables/useNodeHelpers.ts
index 15491aced6..cb51989958 100644
--- a/packages/editor-ui/src/composables/useNodeHelpers.ts
+++ b/packages/editor-ui/src/composables/useNodeHelpers.ts
@@ -642,7 +642,7 @@ export function useNodeHelpers() {
 			}
 
 			// Toggle disabled flag
-			const updateInformation = {
+			const updateInformation: INodeUpdatePropertiesInformation = {
 				name: node.name,
 				properties: {
 					disabled: newDisabledState,
@@ -662,7 +662,12 @@ export function useNodeHelpers() {
 			updateNodesInputIssues();
 			if (trackHistory) {
 				historyStore.pushCommandToUndo(
-					new EnableNodeToggleCommand(node.name, node.disabled === true, newDisabledState),
+					new EnableNodeToggleCommand(
+						node.name,
+						node.disabled === true,
+						newDisabledState,
+						Date.now(),
+					),
 				);
 			}
 		}
diff --git a/packages/editor-ui/src/composables/useRunWorkflow.test.ts b/packages/editor-ui/src/composables/useRunWorkflow.test.ts
index 662ea8d44f..34990271a7 100644
--- a/packages/editor-ui/src/composables/useRunWorkflow.test.ts
+++ b/packages/editor-ui/src/composables/useRunWorkflow.test.ts
@@ -9,6 +9,8 @@ import {
 	type Workflow,
 	type IExecuteData,
 	type ITaskData,
+	NodeConnectionType,
+	type INodeConnections,
 } from 'n8n-workflow';
 
 import { useRunWorkflow } from '@/composables/useRunWorkflow';
@@ -21,9 +23,11 @@ import { useI18n } from '@/composables/useI18n';
 import { captor, mock } from 'vitest-mock-extended';
 import { useSettingsStore } from '@/stores/settings.store';
 import { usePushConnectionStore } from '@/stores/pushConnection.store';
+import { createTestNode } from '@/__tests__/mocks';
 
 vi.mock('@/stores/workflows.store', () => ({
 	useWorkflowsStore: vi.fn().mockReturnValue({
+		allNodes: [],
 		runWorkflow: vi.fn(),
 		subWorkflowExecutionError: null,
 		getWorkflowRunData: null,
@@ -37,6 +41,10 @@ vi.mock('@/stores/workflows.store', () => ({
 		nodeIssuesExit: vi.fn(),
 		checkIfNodeHasChatParent: vi.fn(),
 		getParametersLastUpdate: vi.fn(),
+		getPinnedDataLastUpdate: vi.fn(),
+		getPinnedDataLastRemovedAt: vi.fn(),
+		incomingConnectionsByNodeName: vi.fn(),
+		outgoingConnectionsByNodeName: vi.fn(),
 	}),
 }));
 
@@ -326,6 +334,20 @@ describe('useRunWorkflow({ router })', () => {
 			const composable = useRunWorkflow({ router });
 			const parentName = 'When clicking';
 			const executeName = 'Code';
+			vi.mocked(workflowsStore).allNodes = [
+				createTestNode({ name: parentName }),
+				createTestNode({ name: executeName }),
+			];
+			vi.mocked(workflowsStore).outgoingConnectionsByNodeName.mockImplementation((nodeName) =>
+				nodeName === parentName
+					? { main: [[{ node: executeName, type: NodeConnectionType.Main, index: 0 }]] }
+					: ({} as INodeConnections),
+			);
+			vi.mocked(workflowsStore).incomingConnectionsByNodeName.mockImplementation((nodeName) =>
+				nodeName === executeName
+					? { main: [[{ node: parentName, type: NodeConnectionType.Main, index: 0 }]] }
+					: ({} as INodeConnections),
+			);
 			vi.mocked(workflowsStore).getWorkflowRunData = {
 				[parentName]: [
 					{
diff --git a/packages/editor-ui/src/composables/useRunWorkflow.ts b/packages/editor-ui/src/composables/useRunWorkflow.ts
index dffe7bebba..489716bed9 100644
--- a/packages/editor-ui/src/composables/useRunWorkflow.ts
+++ b/packages/editor-ui/src/composables/useRunWorkflow.ts
@@ -39,25 +39,7 @@ import { useExecutionsStore } from '@/stores/executions.store';
 import { useTelemetry } from './useTelemetry';
 import { useSettingsStore } from '@/stores/settings.store';
 import { usePushConnectionStore } from '@/stores/pushConnection.store';
-
-const getDirtyNodeNames = (
-	runData: IRunData,
-	getParametersLastUpdate: (nodeName: string) => number | undefined,
-): string[] | undefined => {
-	const dirtyNodeNames = Object.entries(runData).reduce<string[]>((acc, [nodeName, tasks]) => {
-		if (!tasks.length) return acc;
-
-		const updatedAt = getParametersLastUpdate(nodeName) ?? 0;
-
-		if (updatedAt > tasks[0].startTime) {
-			acc.push(nodeName);
-		}
-
-		return acc;
-	}, []);
-
-	return dirtyNodeNames.length ? dirtyNodeNames : undefined;
-};
+import { useNodeDirtiness } from '@/composables/useNodeDirtiness';
 
 export function useRunWorkflow(useRunWorkflowOpts: { router: ReturnType<typeof useRouter> }) {
 	const nodeHelpers = useNodeHelpers();
@@ -73,6 +55,8 @@ export function useRunWorkflow(useRunWorkflowOpts: { router: ReturnType<typeof u
 	const uiStore = useUIStore();
 	const workflowsStore = useWorkflowsStore();
 	const executionsStore = useExecutionsStore();
+	const { dirtinessByName } = useNodeDirtiness();
+
 	// Starts to execute a workflow on server
 	async function runWorkflowApi(runData: IStartRunData): Promise<IExecutionPushResponse> {
 		if (!pushConnectionStore.isConnected) {
@@ -229,6 +213,11 @@ export function useRunWorkflow(useRunWorkflowOpts: { router: ReturnType<typeof u
 				}
 			}
 
+			// partial executions must have a destination node
+			const isPartialExecution = options.destinationNode !== undefined;
+			const version = settingsStore.partialExecutionVersion;
+
+			// TODO: this will be redundant once we cleanup the partial execution v1
 			const startNodes: StartNodeData[] = startNodeNames.map((name) => {
 				// Find for each start node the source data
 				let sourceData = get(runData, [name, 0, 'source', 0], null);
@@ -267,10 +256,6 @@ export function useRunWorkflow(useRunWorkflowOpts: { router: ReturnType<typeof u
 				return undefined;
 			}
 
-			// partial executions must have a destination node
-			const isPartialExecution = options.destinationNode !== undefined;
-			const settingsStore = useSettingsStore();
-			const version = settingsStore.partialExecutionVersion;
 			const startRunData: IStartRunData = {
 				workflowData,
 				// With the new partial execution version the backend decides what run
@@ -293,10 +278,11 @@ export function useRunWorkflow(useRunWorkflowOpts: { router: ReturnType<typeof u
 			}
 
 			if (startRunData.runData) {
-				startRunData.dirtyNodeNames = getDirtyNodeNames(
-					startRunData.runData,
-					workflowsStore.getParametersLastUpdate,
+				const nodeNames = Object.entries(dirtinessByName.value).flatMap(([nodeName, dirtiness]) =>
+					dirtiness ? [nodeName] : [],
 				);
+
+				startRunData.dirtyNodeNames = nodeNames.length > 0 ? nodeNames : undefined;
 			}
 
 			// Init the execution data to represent the start of the execution
diff --git a/packages/editor-ui/src/models/history.ts b/packages/editor-ui/src/models/history.ts
index f0c90a8856..2a2d8495ba 100644
--- a/packages/editor-ui/src/models/history.ts
+++ b/packages/editor-ui/src/models/history.ts
@@ -22,18 +22,27 @@ export const enum COMMANDS {
 const CANVAS_ACTION_TIMEOUT = 10;
 export const historyBus = createEventBus();
 
-export abstract class Undoable {}
+export abstract class Undoable {
+	abstract getTimestamp(): number;
+}
 
 export abstract class Command extends Undoable {
 	readonly name: string;
 
-	constructor(name: string) {
+	readonly timestamp: number;
+
+	constructor(name: string, timestamp: number) {
 		super();
 		this.name = name;
+		this.timestamp = timestamp;
 	}
-	abstract getReverseCommand(): Command;
+	abstract getReverseCommand(timestamp: number): Command;
 	abstract isEqualTo(anotherCommand: Command): boolean;
 	abstract revert(): Promise<void>;
+
+	getTimestamp(): number {
+		return this.timestamp;
+	}
 }
 
 export class BulkCommand extends Undoable {
@@ -43,6 +52,10 @@ export class BulkCommand extends Undoable {
 		super();
 		this.commands = commands;
 	}
+
+	getTimestamp(): number {
+		return Math.max(0, ...this.commands.map((command) => command.timestamp));
+	}
 }
 
 export class MoveNodeCommand extends Command {
@@ -52,15 +65,20 @@ export class MoveNodeCommand extends Command {
 
 	newPosition: XYPosition;
 
-	constructor(nodeName: string, oldPosition: XYPosition, newPosition: XYPosition) {
-		super(COMMANDS.MOVE_NODE);
+	constructor(
+		nodeName: string,
+		oldPosition: XYPosition,
+		newPosition: XYPosition,
+		timestamp: number,
+	) {
+		super(COMMANDS.MOVE_NODE, timestamp);
 		this.nodeName = nodeName;
 		this.newPosition = newPosition;
 		this.oldPosition = oldPosition;
 	}
 
-	getReverseCommand(): Command {
-		return new MoveNodeCommand(this.nodeName, this.newPosition, this.oldPosition);
+	getReverseCommand(timestamp: number): Command {
+		return new MoveNodeCommand(this.nodeName, this.newPosition, this.oldPosition, timestamp);
 	}
 
 	isEqualTo(anotherCommand: Command): boolean {
@@ -88,13 +106,13 @@ export class MoveNodeCommand extends Command {
 export class AddNodeCommand extends Command {
 	node: INodeUi;
 
-	constructor(node: INodeUi) {
-		super(COMMANDS.ADD_NODE);
+	constructor(node: INodeUi, timestamp: number) {
+		super(COMMANDS.ADD_NODE, timestamp);
 		this.node = node;
 	}
 
-	getReverseCommand(): Command {
-		return new RemoveNodeCommand(this.node);
+	getReverseCommand(timestamp: number): Command {
+		return new RemoveNodeCommand(this.node, timestamp);
 	}
 
 	isEqualTo(anotherCommand: Command): boolean {
@@ -112,13 +130,13 @@ export class AddNodeCommand extends Command {
 export class RemoveNodeCommand extends Command {
 	node: INodeUi;
 
-	constructor(node: INodeUi) {
-		super(COMMANDS.REMOVE_NODE);
+	constructor(node: INodeUi, timestamp: number) {
+		super(COMMANDS.REMOVE_NODE, timestamp);
 		this.node = node;
 	}
 
-	getReverseCommand(): Command {
-		return new AddNodeCommand(this.node);
+	getReverseCommand(timestamp: number): Command {
+		return new AddNodeCommand(this.node, timestamp);
 	}
 
 	isEqualTo(anotherCommand: Command): boolean {
@@ -136,13 +154,13 @@ export class RemoveNodeCommand extends Command {
 export class AddConnectionCommand extends Command {
 	connectionData: [IConnection, IConnection];
 
-	constructor(connectionData: [IConnection, IConnection]) {
-		super(COMMANDS.ADD_CONNECTION);
+	constructor(connectionData: [IConnection, IConnection], timestamp: number) {
+		super(COMMANDS.ADD_CONNECTION, timestamp);
 		this.connectionData = connectionData;
 	}
 
-	getReverseCommand(): Command {
-		return new RemoveConnectionCommand(this.connectionData);
+	getReverseCommand(timestamp: number): Command {
+		return new RemoveConnectionCommand(this.connectionData, timestamp);
 	}
 
 	isEqualTo(anotherCommand: Command): boolean {
@@ -166,13 +184,13 @@ export class AddConnectionCommand extends Command {
 export class RemoveConnectionCommand extends Command {
 	connectionData: [IConnection, IConnection];
 
-	constructor(connectionData: [IConnection, IConnection]) {
-		super(COMMANDS.REMOVE_CONNECTION);
+	constructor(connectionData: [IConnection, IConnection], timestamp: number) {
+		super(COMMANDS.REMOVE_CONNECTION, timestamp);
 		this.connectionData = connectionData;
 	}
 
-	getReverseCommand(): Command {
-		return new AddConnectionCommand(this.connectionData);
+	getReverseCommand(timestamp: number): Command {
+		return new AddConnectionCommand(this.connectionData, timestamp);
 	}
 
 	isEqualTo(anotherCommand: Command): boolean {
@@ -202,15 +220,15 @@ export class EnableNodeToggleCommand extends Command {
 
 	newState: boolean;
 
-	constructor(nodeName: string, oldState: boolean, newState: boolean) {
-		super(COMMANDS.ENABLE_NODE_TOGGLE);
+	constructor(nodeName: string, oldState: boolean, newState: boolean, timestamp: number) {
+		super(COMMANDS.ENABLE_NODE_TOGGLE, timestamp);
 		this.nodeName = nodeName;
 		this.newState = newState;
 		this.oldState = oldState;
 	}
 
-	getReverseCommand(): Command {
-		return new EnableNodeToggleCommand(this.nodeName, this.newState, this.oldState);
+	getReverseCommand(timestamp: number): Command {
+		return new EnableNodeToggleCommand(this.nodeName, this.newState, this.oldState, timestamp);
 	}
 
 	isEqualTo(anotherCommand: Command): boolean {
@@ -235,14 +253,14 @@ export class RenameNodeCommand extends Command {
 
 	newName: string;
 
-	constructor(currentName: string, newName: string) {
-		super(COMMANDS.RENAME_NODE);
+	constructor(currentName: string, newName: string, timestamp: number) {
+		super(COMMANDS.RENAME_NODE, timestamp);
 		this.currentName = currentName;
 		this.newName = newName;
 	}
 
-	getReverseCommand(): Command {
-		return new RenameNodeCommand(this.newName, this.currentName);
+	getReverseCommand(timestamp: number): Command {
+		return new RenameNodeCommand(this.newName, this.currentName, timestamp);
 	}
 
 	isEqualTo(anotherCommand: Command): boolean {
diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json
index bd8b4d01c2..6d67060348 100644
--- a/packages/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/editor-ui/src/plugins/i18n/locales/en.json
@@ -982,7 +982,8 @@
 	"ndv.input.noOutputData": "No data",
 	"ndv.input.noOutputData.executePrevious": "Execute previous nodes",
 	"ndv.input.noOutputData.title": "No input data yet",
-	"ndv.input.noOutputData.hint": "(From the earliest node that has no output data yet)",
+	"ndv.input.noOutputData.hint": "(From the earliest node that needs it {info} )",
+	"ndv.input.noOutputData.hint.tooltip": "From the earliest node which is unexecuted, or is executed but has since been changed",
 	"ndv.input.noOutputData.schemaPreviewHint": "switch to {schema} to use the schema preview",
 	"ndv.input.noOutputData.or": "or",
 	"ndv.input.executingPrevious": "Executing previous nodes...",
@@ -1063,6 +1064,8 @@
 	"node.delete": "Delete",
 	"node.add": "Add",
 	"node.issues": "Issues",
+	"node.dirty": "Node configuration changed. Output data may change when this node is run again",
+	"node.subjectToChange": "Because of changes in the workflow, output data may change when this node is run again",
 	"node.nodeIsExecuting": "Node is executing",
 	"node.nodeIsWaitingTill": "Node is waiting until {date} {time}",
 	"node.theNodeIsWaitingIndefinitelyForAnIncomingWebhookCall": "The node is waiting for an incoming webhook call (indefinitely)",
diff --git a/packages/editor-ui/src/plugins/icons/custom.ts b/packages/editor-ui/src/plugins/icons/custom.ts
index 63a247459d..e503f4a342 100644
--- a/packages/editor-ui/src/plugins/icons/custom.ts
+++ b/packages/editor-ui/src/plugins/icons/custom.ts
@@ -48,3 +48,15 @@ export const faRefresh: IconDefinition = {
 		'M8.67188 3.64062C7.94531 2.96094 6.98438 2.5625 5.97656 2.5625C4.17188 2.58594 2.60156 3.82812 2.17969 5.53906C2.13281 5.67969 2.01562 5.75 1.89844 5.75H0.5625C0.375 5.75 0.234375 5.60938 0.28125 5.42188C0.773438 2.72656 3.14062 0.6875 6 0.6875C7.54688 0.6875 8.95312 1.32031 10.0078 2.30469L10.8516 1.46094C11.2031 1.10938 11.8125 1.36719 11.8125 1.85938V5C11.8125 5.32812 11.5547 5.5625 11.25 5.5625H8.08594C7.59375 5.5625 7.33594 4.97656 7.6875 4.625L8.67188 3.64062ZM0.75 7.4375H3.89062C4.38281 7.4375 4.64062 8.04688 4.28906 8.39844L3.30469 9.38281C4.03125 10.0625 4.99219 10.4609 6 10.4609C7.80469 10.4375 9.375 9.19531 9.79688 7.48438C9.84375 7.34375 9.96094 7.27344 10.0781 7.27344H11.4141C11.6016 7.27344 11.7422 7.41406 11.6953 7.60156C11.2031 10.2969 8.83594 12.3125 6 12.3125C4.42969 12.3125 3.02344 11.7031 1.96875 10.7188L1.125 11.5625C0.773438 11.9141 0.1875 11.6562 0.1875 11.1641V8C0.1875 7.69531 0.421875 7.4375 0.75 7.4375Z',
 	],
 };
+
+export const faTriangle: IconDefinition = {
+	prefix: 'fas',
+	iconName: 'triangle',
+	icon: [
+		512,
+		512,
+		[],
+		'',
+		'M214.433 56C232.908 23.9999 279.096 24.0001 297.571 56L477.704 368C496.18 400 473.085 440 436.135 440H75.8685C38.918 440 15.8241 400 34.2993 368L214.433 56ZM256.002 144L131.294 360H380.709L256.002 144Z',
+	],
+};
diff --git a/packages/editor-ui/src/plugins/icons/index.ts b/packages/editor-ui/src/plugins/icons/index.ts
index b0f983a992..2fc86a0fa1 100644
--- a/packages/editor-ui/src/plugins/icons/index.ts
+++ b/packages/editor-ui/src/plugins/icons/index.ts
@@ -171,7 +171,7 @@ import {
 	faMinusCircle,
 	faAdjust,
 } from '@fortawesome/free-solid-svg-icons';
-import { faVariable, faXmark, faVault, faRefresh } from './custom';
+import { faVariable, faXmark, faVault, faRefresh, faTriangle } from './custom';
 import { faStickyNote } from '@fortawesome/free-regular-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome';
 
@@ -334,6 +334,7 @@ export const FontAwesomePlugin: Plugin = {
 		addIcon(faToolbox);
 		addIcon(faTools);
 		addIcon(faTrash);
+		addIcon(faTriangle);
 		addIcon(faUndo);
 		addIcon(faUnlink);
 		addIcon(faUser);
diff --git a/packages/editor-ui/src/stores/settings.store.ts b/packages/editor-ui/src/stores/settings.store.ts
index dc0c6463a8..601d22a5c6 100644
--- a/packages/editor-ui/src/stores/settings.store.ts
+++ b/packages/editor-ui/src/stores/settings.store.ts
@@ -101,7 +101,7 @@ export const useSettingsStore = defineStore(STORES.SETTINGS, () => {
 
 	const isCloudDeployment = computed(() => settings.value.deployment?.type === 'cloud');
 
-	const partialExecutionVersion = computed(() => {
+	const partialExecutionVersion = computed<1 | 2>(() => {
 		const defaultVersion = settings.value.partialExecution?.version ?? 1;
 		// -1 means we pick the defaultVersion
 		//  1 is the old flow
@@ -115,7 +115,7 @@ export const useSettingsStore = defineStore(STORES.SETTINGS, () => {
 			return 1;
 		}
 
-		return version;
+		return version as 1 | 2;
 	});
 
 	const isAiCreditsEnabled = computed(() => settings.value.aiCredits?.enabled);
diff --git a/packages/editor-ui/src/stores/workflows.store.ts b/packages/editor-ui/src/stores/workflows.store.ts
index 39753532b2..4327efb305 100644
--- a/packages/editor-ui/src/stores/workflows.store.ts
+++ b/packages/editor-ui/src/stores/workflows.store.ts
@@ -277,6 +277,10 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 
 	const getPastChatMessages = computed(() => Array.from(new Set(chatMessages.value)));
 
+	const connectionsByDestinationNode = computed(() =>
+		Workflow.getConnectionsByDestination(workflow.value.connections),
+	);
+
 	function getWorkflowResultDataByNodeName(nodeName: string): ITaskData[] | null {
 		if (getWorkflowRunData.value === null) {
 			return null;
@@ -295,7 +299,10 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 	}
 
 	function incomingConnectionsByNodeName(nodeName: string): INodeConnections {
-		return getCurrentWorkflow().connectionsByDestinationNode[nodeName] ?? {};
+		if (connectionsByDestinationNode.value.hasOwnProperty(nodeName)) {
+			return connectionsByDestinationNode.value[nodeName] as unknown as INodeConnections;
+		}
+		return {};
 	}
 
 	function nodeHasOutputConnection(nodeName: string): boolean {
@@ -332,6 +339,14 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 		return nodeMetadata.value[nodeName]?.parametersLastUpdatedAt;
 	}
 
+	function getPinnedDataLastUpdate(nodeName: string): number | undefined {
+		return nodeMetadata.value[nodeName]?.pinnedDataLastUpdatedAt;
+	}
+
+	function getPinnedDataLastRemovedAt(nodeName: string): number | undefined {
+		return nodeMetadata.value[nodeName]?.pinnedDataLastRemovedAt;
+	}
+
 	function isNodePristine(nodeName: string): boolean {
 		return nodeMetadata.value[nodeName] === undefined || nodeMetadata.value[nodeName].pristine;
 	}
@@ -819,6 +834,8 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 	}
 
 	function pinData(payload: { node: INodeUi; data: INodeExecutionData[] }): void {
+		const nodeName = payload.node.name;
+
 		if (!workflow.value.pinData) {
 			workflow.value = { ...workflow.value, pinData: {} };
 		}
@@ -827,6 +844,11 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 			payload.data = [payload.data];
 		}
 
+		if ((workflow.value.pinData?.[nodeName] ?? []).length > 0 && nodeMetadata.value[nodeName]) {
+			// Updating existing pinned data
+			nodeMetadata.value[nodeName].pinnedDataLastUpdatedAt = Date.now();
+		}
+
 		const storedPinData = payload.data.map((item) =>
 			isJsonKeyObject(item) ? { json: item.json } : { json: item },
 		);
@@ -835,7 +857,7 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 			...workflow.value,
 			pinData: {
 				...workflow.value.pinData,
-				[payload.node.name]: storedPinData,
+				[nodeName]: storedPinData,
 			},
 		};
 
@@ -846,21 +868,27 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 	}
 
 	function unpinData(payload: { node: INodeUi }): void {
+		const nodeName = payload.node.name;
+
 		if (!workflow.value.pinData) {
 			workflow.value = { ...workflow.value, pinData: {} };
 		}
 
-		const { [payload.node.name]: _, ...pinData } = workflow.value.pinData as IPinData;
+		const { [nodeName]: _, ...pinData } = workflow.value.pinData as IPinData;
 		workflow.value = {
 			...workflow.value,
 			pinData,
 		};
 
+		if (nodeMetadata.value[nodeName]) {
+			nodeMetadata.value[nodeName].pinnedDataLastRemovedAt = Date.now();
+		}
+
 		uiStore.stateIsDirty = true;
 		updateCachedWorkflow();
 
 		dataPinningEventBus.emit('unpin-data', {
-			nodeNames: [payload.node.name],
+			nodeNames: [nodeName],
 		});
 	}
 
@@ -1205,9 +1233,10 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 			for (const key of Object.keys(updateInformation.properties)) {
 				uiStore.stateIsDirty = true;
 
-				updateNodeAtIndex(nodeIndex, {
-					[key]: updateInformation.properties[key],
-				});
+				const typedKey = key as keyof INodeUpdatePropertiesInformation['properties'];
+				const property = updateInformation.properties[typedKey];
+
+				updateNodeAtIndex(nodeIndex, { [key]: property });
 			}
 		}
 	}
@@ -1230,7 +1259,9 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 			[updateInformation.key]: updateInformation.value,
 		});
 
-		if (updateInformation.key !== 'position') {
+		const excludeKeys = ['position', 'notes', 'notesInFlow'];
+
+		if (!excludeKeys.includes(updateInformation.key)) {
 			nodeMetadata.value[workflow.value.nodes[nodeIndex].name].parametersLastUpdatedAt = Date.now();
 		}
 	}
@@ -1693,6 +1724,8 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 		getNodeById,
 		getNodesByIds,
 		getParametersLastUpdate,
+		getPinnedDataLastUpdate,
+		getPinnedDataLastRemovedAt,
 		isNodePristine,
 		isNodeExecuting,
 		getExecutionDataById,
diff --git a/packages/editor-ui/src/types/canvas.ts b/packages/editor-ui/src/types/canvas.ts
index afc5c5d8da..f6aee0f02b 100644
--- a/packages/editor-ui/src/types/canvas.ts
+++ b/packages/editor-ui/src/types/canvas.ts
@@ -47,6 +47,16 @@ export const enum CanvasNodeRenderType {
 
 export type CanvasNodeDefaultRenderLabelSize = 'small' | 'medium' | 'large';
 
+export const CanvasNodeDirtiness = {
+	PARAMETERS_UPDATED: 'parameters-updated',
+	INCOMING_CONNECTIONS_UPDATED: 'incoming-connections-updated',
+	PINNED_DATA_UPDATED: 'pinned-data-updated',
+	UPSTREAM_DIRTY: 'upstream-dirty',
+} as const;
+
+export type CanvasNodeDirtinessType =
+	(typeof CanvasNodeDirtiness)[keyof typeof CanvasNodeDirtiness];
+
 export type CanvasNodeDefaultRender = {
 	type: CanvasNodeRenderType.Default;
 	options: Partial<{
@@ -60,6 +70,7 @@ export type CanvasNodeDefaultRender = {
 			labelSize: CanvasNodeDefaultRenderLabelSize;
 		};
 		tooltip?: string;
+		dirtiness?: CanvasNodeDirtinessType;
 	}>;
 };
 
diff --git a/packages/workflow/src/Workflow.ts b/packages/workflow/src/Workflow.ts
index f9b70bb29b..ff7403c1ae 100644
--- a/packages/workflow/src/Workflow.ts
+++ b/packages/workflow/src/Workflow.ts
@@ -117,7 +117,9 @@ export class Workflow {
 		this.connectionsBySourceNode = parameters.connections;
 
 		// Save also the connections by the destination nodes
-		this.connectionsByDestinationNode = this.__getConnectionsByDestination(parameters.connections);
+		this.connectionsByDestinationNode = Workflow.getConnectionsByDestination(
+			parameters.connections,
+		);
 
 		this.active = parameters.active || false;
 
@@ -143,7 +145,7 @@ export class Workflow {
 	 * to easily find parent nodes.
 	 *
 	 */
-	__getConnectionsByDestination(connections: IConnections): IConnections {
+	static getConnectionsByDestination(connections: IConnections): IConnections {
 		const returnConnection: IConnections = {};
 
 		let connectionInfo;
@@ -446,7 +448,7 @@ export class Workflow {
 		}
 
 		// Use the updated connections to create updated connections by destination nodes
-		this.connectionsByDestinationNode = this.__getConnectionsByDestination(
+		this.connectionsByDestinationNode = Workflow.getConnectionsByDestination(
 			this.connectionsBySourceNode,
 		);
 	}
diff --git a/packages/workflow/test/Workflow.test.ts b/packages/workflow/test/Workflow.test.ts
index a87d3479ae..1a4c0639cb 100644
--- a/packages/workflow/test/Workflow.test.ts
+++ b/packages/workflow/test/Workflow.test.ts
@@ -9,7 +9,6 @@ import type {
 	INode,
 	INodeExecutionData,
 	INodeParameters,
-	INodeTypes,
 	IRunExecutionData,
 	NodeParameterValueType,
 } from '@/Interfaces';
@@ -1871,16 +1870,9 @@ describe('Workflow', () => {
 		});
 	});
 
-	describe('__getConnectionsByDestination', () => {
+	describe('getConnectionsByDestination', () => {
 		it('should return empty object when there are no connections', () => {
-			const workflow = new Workflow({
-				nodes: [],
-				connections: {},
-				active: false,
-				nodeTypes: mock<INodeTypes>(),
-			});
-
-			const result = workflow.__getConnectionsByDestination({});
+			const result = Workflow.getConnectionsByDestination({});
 
 			expect(result).toEqual({});
 		});
@@ -1896,13 +1888,7 @@ describe('Workflow', () => {
 					],
 				},
 			};
-			const workflow = new Workflow({
-				nodes: [],
-				connections,
-				active: false,
-				nodeTypes: mock<INodeTypes>(),
-			});
-			const result = workflow.__getConnectionsByDestination(connections);
+			const result = Workflow.getConnectionsByDestination(connections);
 			expect(result).toEqual({
 				Node2: {
 					[NodeConnectionType.Main]: [[{ node: 'Node1', type: NodeConnectionType.Main, index: 0 }]],
@@ -1926,14 +1912,7 @@ describe('Workflow', () => {
 				},
 			};
 
-			const workflow = new Workflow({
-				nodes: [],
-				connections,
-				active: false,
-				nodeTypes: mock<INodeTypes>(),
-			});
-
-			const result = workflow.__getConnectionsByDestination(connections);
+			const result = Workflow.getConnectionsByDestination(connections);
 			expect(result).toEqual({
 				Node2: {
 					[NodeConnectionType.Main]: [[{ node: 'Node1', type: NodeConnectionType.Main, index: 0 }]],
@@ -1953,14 +1932,7 @@ describe('Workflow', () => {
 				},
 			};
 
-			const workflow = new Workflow({
-				nodes: [],
-				connections,
-				active: false,
-				nodeTypes: mock<INodeTypes>(),
-			});
-
-			const result = workflow.__getConnectionsByDestination(connections);
+			const result = Workflow.getConnectionsByDestination(connections);
 			expect(result).toEqual({});
 		});
 
@@ -1975,14 +1947,7 @@ describe('Workflow', () => {
 				},
 			};
 
-			const workflow = new Workflow({
-				nodes: [],
-				connections,
-				active: false,
-				nodeTypes: mock<INodeTypes>(),
-			});
-
-			const result = workflow.__getConnectionsByDestination(connections);
+			const result = Workflow.getConnectionsByDestination(connections);
 			expect(result).toEqual({
 				Node2: {
 					[NodeConnectionType.Main]: [[{ node: 'Node1', type: NodeConnectionType.Main, index: 1 }]],
@@ -2000,14 +1965,7 @@ describe('Workflow', () => {
 				},
 			};
 
-			const workflow = new Workflow({
-				nodes: [],
-				connections,
-				active: false,
-				nodeTypes: mock<INodeTypes>(),
-			});
-
-			const result = workflow.__getConnectionsByDestination(connections);
+			const result = Workflow.getConnectionsByDestination(connections);
 			expect(result).toEqual({
 				Node2: {
 					[NodeConnectionType.Main]: [

From d3fe3dea32207dfdb2a43db0def96466a31daa66 Mon Sep 17 00:00:00 2001
From: AdinaTotorean <64439268+adina-hub@users.noreply.github.com>
Date: Wed, 26 Feb 2025 18:37:09 +0200
Subject: [PATCH 15/47] feat(n8n Vertica credentials only Node): New node
 (#12256)

---
 .../credentials/VerticaApi.credentials.ts     | 88 +++++++++++++++++++
 packages/nodes-base/package.json              |  1 +
 2 files changed, 89 insertions(+)
 create mode 100644 packages/nodes-base/credentials/VerticaApi.credentials.ts

diff --git a/packages/nodes-base/credentials/VerticaApi.credentials.ts b/packages/nodes-base/credentials/VerticaApi.credentials.ts
new file mode 100644
index 0000000000..38e5a516e6
--- /dev/null
+++ b/packages/nodes-base/credentials/VerticaApi.credentials.ts
@@ -0,0 +1,88 @@
+import type {
+	IAuthenticateGeneric,
+	ICredentialTestRequest,
+	ICredentialType,
+	INodeProperties,
+} from 'n8n-workflow';
+
+export class VerticaApi implements ICredentialType {
+	name = 'verticaApi';
+
+	displayName = 'Vertica API';
+
+	documentationUrl = 'vertica';
+
+	httpRequestNode = {
+		name: 'Vertica',
+		docsUrl: 'vertica',
+		apiBaseUrlPlaceholder: 'http://<server>:<port>/v1/',
+	};
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'URL',
+			name: 'url',
+			required: true,
+			type: 'string',
+			default: 'https://localhost:8443',
+			placeholder: 'https://<server>:<port>',
+		},
+		{
+			displayName: 'Username',
+			name: 'username',
+			type: 'string',
+			default: '',
+			description: 'The username for accessing the Vertica database.',
+		},
+		{
+			displayName: 'Password',
+			name: 'password',
+			type: 'string',
+			typeOptions: { password: true },
+			default: '',
+			description: 'The password for accessing the Vertica database.',
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			auth: {
+				username: '={{$credentials.username}}',
+				password: '={{$credentials.password}}',
+			},
+		},
+	};
+
+	test: ICredentialTestRequest = {
+		request: {
+			baseURL: '={{$credentials.url}}'.replace(/\/$/, ''),
+			url: '/v1/health',
+			method: 'GET',
+			skipSslCertificateValidation: true,
+		},
+		rules: [
+			{
+				type: 'responseCode',
+				properties: {
+					value: 403,
+					message: 'Connection failed: Invalid credentials or insufficient permissions',
+				},
+			},
+			{
+				type: 'responseCode',
+				properties: {
+					value: 503,
+					message: 'Service unavailable: Server is overloaded or under maintenance',
+				},
+			},
+			{
+				type: 'responseCode',
+				properties: {
+					value: 504,
+					message: 'Gateway timeout: Upstream server took too long to respond',
+				},
+			},
+		],
+	};
+}
diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index 06f9a1c434..fad1697e80 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -370,6 +370,7 @@
       "dist/credentials/UptimeRobotApi.credentials.js",
       "dist/credentials/UrlScanIoApi.credentials.js",
       "dist/credentials/VeroApi.credentials.js",
+      "dist/credentials/VerticaApi.credentials.js",
       "dist/credentials/VirusTotalApi.credentials.js",
       "dist/credentials/VonageApi.credentials.js",
       "dist/credentials/VenafiTlsProtectCloudApi.credentials.js",

From 83d03d53eb4d5f388996163c3c5a4d89e943dcee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Wed, 26 Feb 2025 20:37:11 +0100
Subject: [PATCH 16/47] refactor(core): Deprecate running manual executions in
 main in scaling mode (#13493)

---
 .../__tests__/deprecation.service.test.ts     | 74 +++++++++++++++++++
 .../src/deprecation/deprecation.service.ts    | 22 +++++-
 2 files changed, 93 insertions(+), 3 deletions(-)

diff --git a/packages/cli/src/deprecation/__tests__/deprecation.service.test.ts b/packages/cli/src/deprecation/__tests__/deprecation.service.test.ts
index d9d00f6893..cf52d2f225 100644
--- a/packages/cli/src/deprecation/__tests__/deprecation.service.test.ts
+++ b/packages/cli/src/deprecation/__tests__/deprecation.service.test.ts
@@ -1,6 +1,8 @@
 import { captor, mock } from 'jest-mock-extended';
 import type { Logger } from 'n8n-core';
 
+import config from '@/config';
+
 import { DeprecationService } from '../deprecation.service';
 
 describe('DeprecationService', () => {
@@ -108,4 +110,76 @@ describe('DeprecationService', () => {
 			toTest(envVar, value, mustWarn);
 		});
 	});
+
+	describe('OFFLOAD_MANUAL_EXECUTIONS_TO_WORKERS', () => {
+		const envVar = 'OFFLOAD_MANUAL_EXECUTIONS_TO_WORKERS';
+
+		beforeEach(() => {
+			process.env = { N8N_RUNNERS_ENABLED: 'true' };
+
+			jest.spyOn(config, 'getEnv').mockImplementation((key) => {
+				if (key === 'executions.mode') return 'queue';
+				return undefined;
+			});
+		});
+
+		describe('when executions.mode is queue', () => {
+			test('should warn when OFFLOAD_MANUAL_EXECUTIONS_TO_WORKERS is false', () => {
+				process.env[envVar] = 'false';
+
+				const service = new DeprecationService(logger);
+				service.warn();
+
+				expect(logger.warn).toHaveBeenCalledTimes(1);
+				const warningMessage = logger.warn.mock.calls[0][0];
+				expect(warningMessage).toContain(envVar);
+			});
+
+			test('should warn when OFFLOAD_MANUAL_EXECUTIONS_TO_WORKERS is empty', () => {
+				process.env[envVar] = '';
+
+				const service = new DeprecationService(logger);
+				service.warn();
+
+				expect(logger.warn).toHaveBeenCalledTimes(1);
+				const warningMessage = logger.warn.mock.calls[0][0];
+				expect(warningMessage).toContain(envVar);
+			});
+
+			test('should not warn when OFFLOAD_MANUAL_EXECUTIONS_TO_WORKERS is true', () => {
+				process.env[envVar] = 'true';
+
+				const service = new DeprecationService(logger);
+				service.warn();
+
+				expect(logger.warn).not.toHaveBeenCalled();
+			});
+
+			test('should warn when OFFLOAD_MANUAL_EXECUTIONS_TO_WORKERS is undefined', () => {
+				delete process.env[envVar];
+
+				const service = new DeprecationService(logger);
+				service.warn();
+
+				expect(logger.warn).toHaveBeenCalledTimes(1);
+				const warningMessage = logger.warn.mock.calls[0][0];
+				expect(warningMessage).toContain(envVar);
+			});
+		});
+
+		describe('when executions.mode is not queue', () => {
+			test('should not warn', () => {
+				jest.spyOn(config, 'getEnv').mockImplementation((key) => {
+					if (key === 'executions.mode') return 'regular';
+					return;
+				});
+				process.env[envVar] = 'false';
+
+				const service = new DeprecationService(logger);
+				service.warn();
+
+				expect(logger.warn).not.toHaveBeenCalled();
+			});
+		});
+	});
 });
diff --git a/packages/cli/src/deprecation/deprecation.service.ts b/packages/cli/src/deprecation/deprecation.service.ts
index a367331815..a71c9e9985 100644
--- a/packages/cli/src/deprecation/deprecation.service.ts
+++ b/packages/cli/src/deprecation/deprecation.service.ts
@@ -1,6 +1,8 @@
 import { Service } from '@n8n/di';
 import { Logger } from 'n8n-core';
 
+import config from '@/config';
+
 type EnvVarName = string;
 
 type Deprecation = {
@@ -15,6 +17,9 @@ type Deprecation = {
 
 	/** Whether to show a deprecation warning if the env var is missing. */
 	warnIfMissing?: boolean;
+
+	/** Whether a config value is required to trigger a deprecation warning. */
+	matchConfig?: boolean;
 };
 
 const SAFE_TO_REMOVE = 'Remove this environment variable; it is no longer needed.';
@@ -48,6 +53,14 @@ export class DeprecationService {
 			checkValue: (value?: string) => value?.toLowerCase() !== 'true' && value !== '1',
 			warnIfMissing: true,
 		},
+		{
+			envVar: 'OFFLOAD_MANUAL_EXECUTIONS_TO_WORKERS',
+			message:
+				'Running manual executions in the main instance in scaling mode is deprecated. Manual executions will be routed to workers in a future version. Please set `OFFLOAD_MANUAL_EXECUTIONS_TO_WORKERS=true` to offload manual executions to workers and avoid potential issues in the future. Consider increasing memory available to workers and reducing memory available to main.',
+			checkValue: (value?: string) => value?.toLowerCase() !== 'true' && value !== '1',
+			warnIfMissing: true,
+			matchConfig: config.getEnv('executions.mode') === 'queue',
+		},
 		{
 			envVar: 'N8N_PARTIAL_EXECUTION_VERSION_DEFAULT',
 			checkValue: (value: string) => value === '1',
@@ -68,10 +81,13 @@ export class DeprecationService {
 	warn() {
 		this.deprecations.forEach((d) => {
 			const envValue = process.env[d.envVar];
+
+			const matchConfig = d.matchConfig === true || d.matchConfig === undefined;
+			const warnIfMissing = d.warnIfMissing !== undefined && envValue === undefined;
+			const checkValue = d.checkValue ? d.checkValue(envValue) : envValue !== undefined;
+
 			this.state.set(d, {
-				mustWarn:
-					(d.warnIfMissing !== undefined && envValue === undefined) ||
-					(d.checkValue ? d.checkValue(envValue) : envValue !== undefined),
+				mustWarn: matchConfig && (warnIfMissing || checkValue),
 			});
 		});
 

From 97defb3a833bb269a4a3fc573a8e250a0d0e0deb Mon Sep 17 00:00:00 2001
From: Michael Kret <88898367+michael-radency@users.noreply.github.com>
Date: Thu, 27 Feb 2025 07:20:37 +0200
Subject: [PATCH 17/47] feat: WhatsApp Business Cloud Node - new operation
 sendAndWait (#12941)

Co-authored-by: Tomi Turtiainen <10324676+tomi@users.noreply.github.com>
---
 .../__tests__/workflow-execute.test.ts        | 87 +++++++++++++++++
 .../src/execution-engine/workflow-execute.ts  | 54 +++++++++--
 .../nodes/WhatsApp/GenericFunctions.ts        | 26 +++++
 .../nodes/WhatsApp/MessageFunctions.ts        |  5 +-
 .../nodes/WhatsApp/MessagesDescription.ts     |  7 +-
 .../nodes/WhatsApp/WhatsApp.node.json         |  5 +-
 .../nodes/WhatsApp/WhatsApp.node.ts           | 56 ++++++++++-
 .../nodes/WhatsApp/WhatsAppTrigger.node.ts    | 54 ++++++++++-
 .../nodes/WhatsApp/WhatsappDescription.ts     | 53 ----------
 .../WhatsApp/tests/node/sendAndWait.test.ts   | 68 +++++++++++++
 .../nodes/WhatsApp/tests/utils.test.ts        | 96 +++++++++++++++++++
 .../nodes-base/utils/sendAndWait/utils.ts     |  2 +-
 packages/workflow/src/Interfaces.ts           | 18 +++-
 13 files changed, 457 insertions(+), 74 deletions(-)
 delete mode 100644 packages/nodes-base/nodes/WhatsApp/WhatsappDescription.ts
 create mode 100644 packages/nodes-base/nodes/WhatsApp/tests/node/sendAndWait.test.ts
 create mode 100644 packages/nodes-base/nodes/WhatsApp/tests/utils.test.ts

diff --git a/packages/core/src/execution-engine/__tests__/workflow-execute.test.ts b/packages/core/src/execution-engine/__tests__/workflow-execute.test.ts
index 432cc6e621..202cbc854d 100644
--- a/packages/core/src/execution-engine/__tests__/workflow-execute.test.ts
+++ b/packages/core/src/execution-engine/__tests__/workflow-execute.test.ts
@@ -31,6 +31,7 @@ import type {
 	IWorkflowExecuteAdditionalData,
 	WorkflowTestData,
 	RelatedExecution,
+	IExecuteFunctions,
 } from 'n8n-workflow';
 import {
 	ApplicationError,
@@ -1462,4 +1463,90 @@ describe('WorkflowExecute', () => {
 			expect(runExecutionData.executionData?.nodeExecutionStack).toContain(executionData);
 		});
 	});
+
+	describe('customOperations', () => {
+		const nodeTypes = mock<INodeTypes>();
+		const testNode = mock<INode>();
+
+		const workflow = new Workflow({
+			nodeTypes,
+			nodes: [testNode],
+			connections: {},
+			active: false,
+		});
+
+		const executionData = mock<IExecuteData>({
+			node: { parameters: { resource: 'test', operation: 'test' } },
+			data: { main: [[{ json: {} }]] },
+		});
+		const runExecutionData = mock<IRunExecutionData>();
+		const additionalData = mock<IWorkflowExecuteAdditionalData>();
+		const workflowExecute = new WorkflowExecute(additionalData, 'manual');
+
+		test('should execute customOperations', async () => {
+			const nodeType = mock<INodeType>({
+				description: {
+					properties: [],
+				},
+				execute: undefined,
+				customOperations: {
+					test: {
+						async test(this: IExecuteFunctions) {
+							return [[{ json: { customOperationsRun: true } }]];
+						},
+					},
+				},
+			});
+
+			nodeTypes.getByNameAndVersion.mockReturnValue(nodeType);
+
+			const runPromise = workflowExecute.runNode(
+				workflow,
+				executionData,
+				runExecutionData,
+				0,
+				additionalData,
+				'manual',
+			);
+
+			const result = await runPromise;
+
+			expect(result).toEqual({ data: [[{ json: { customOperationsRun: true } }]], hints: [] });
+		});
+
+		test('should throw error if customOperation and execute both defined', async () => {
+			const nodeType = mock<INodeType>({
+				description: {
+					properties: [],
+				},
+				async execute(this: IExecuteFunctions) {
+					return [];
+				},
+				customOperations: {
+					test: {
+						async test(this: IExecuteFunctions) {
+							return [];
+						},
+					},
+				},
+			});
+
+			nodeTypes.getByNameAndVersion.mockReturnValue(nodeType);
+
+			try {
+				await workflowExecute.runNode(
+					workflow,
+					executionData,
+					runExecutionData,
+					0,
+					additionalData,
+					'manual',
+				);
+			} catch (error) {
+				expect(error.message).toBe(
+					'Node type cannot have both customOperations and execute defined',
+				);
+			}
+		});
+	});
 });
diff --git a/packages/core/src/execution-engine/workflow-execute.ts b/packages/core/src/execution-engine/workflow-execute.ts
index 9f777b68ae..c224530379 100644
--- a/packages/core/src/execution-engine/workflow-execute.ts
+++ b/packages/core/src/execution-engine/workflow-execute.ts
@@ -40,6 +40,7 @@ import type {
 	IRunNodeResponse,
 	IWorkflowIssues,
 	INodeIssues,
+	INodeType,
 } from 'n8n-workflow';
 import {
 	LoggerProxy as Logger,
@@ -49,6 +50,7 @@ import {
 	sleep,
 	ExecutionCancelledError,
 	Node,
+	UnexpectedError,
 } from 'n8n-workflow';
 import PCancelable from 'p-cancelable';
 
@@ -971,6 +973,26 @@ export class WorkflowExecute {
 		return workflowIssues;
 	}
 
+	private getCustomOperation(node: INode, type: INodeType) {
+		if (!type.customOperations) return undefined;
+
+		if (type.execute) {
+			throw new UnexpectedError('Node type cannot have both customOperations and execute defined');
+		}
+
+		if (!node.parameters) return undefined;
+
+		const { customOperations } = type;
+		const { resource, operation } = node.parameters;
+
+		if (typeof resource !== 'string' || typeof operation !== 'string') return undefined;
+		if (!customOperations[resource] || !customOperations[resource][operation]) return undefined;
+
+		const customOperation = customOperations[resource][operation];
+
+		return customOperation;
+	}
+
 	/** Executes the given node */
 	// eslint-disable-next-line complexity
 	async runNode(
@@ -1000,8 +1022,16 @@ export class WorkflowExecute {
 
 		const nodeType = workflow.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
 
+		const isDeclarativeNode = nodeType.description.requestDefaults !== undefined;
+
+		const customOperation = this.getCustomOperation(node, nodeType);
+
 		let connectionInputData: INodeExecutionData[] = [];
-		if (nodeType.execute || (!nodeType.poll && !nodeType.trigger && !nodeType.webhook)) {
+		if (
+			nodeType.execute ||
+			customOperation ||
+			(!nodeType.poll && !nodeType.trigger && !nodeType.webhook)
+		) {
 			// Only stop if first input is empty for execute runs. For all others run anyways
 			// because then it is a trigger node. As they only pass data through and so the input-data
 			// becomes output-data it has to be possible.
@@ -1060,7 +1090,7 @@ export class WorkflowExecute {
 			inputData = newInputData;
 		}
 
-		if (nodeType.execute) {
+		if (nodeType.execute || customOperation) {
 			const closeFunctions: CloseFunction[] = [];
 			const context = new ExecuteContext(
 				workflow,
@@ -1076,10 +1106,16 @@ export class WorkflowExecute {
 				abortSignal,
 			);
 
-			const data =
-				nodeType instanceof Node
-					? await nodeType.execute(context)
-					: await nodeType.execute.call(context);
+			let data;
+
+			if (customOperation) {
+				data = await customOperation.call(context);
+			} else if (nodeType.execute) {
+				data =
+					nodeType instanceof Node
+						? await nodeType.execute(context)
+						: await nodeType.execute.call(context);
+			}
 
 			const closeFunctionsResults = await Promise.allSettled(
 				closeFunctions.map(async (fn) => await fn()),
@@ -1152,8 +1188,10 @@ export class WorkflowExecute {
 			}
 			// For trigger nodes in any mode except "manual" do we simply pass the data through
 			return { data: inputData.main as INodeExecutionData[][] };
-		} else if (nodeType.webhook) {
-			// For webhook nodes always simply pass the data through
+		} else if (nodeType.webhook && !isDeclarativeNode) {
+			// Check if the node have requestDefaults(Declarative Node),
+			// else for webhook nodes always simply pass the data through
+			// as webhook method would be called by WebhookService
 			return { data: inputData.main as INodeExecutionData[][] };
 		} else {
 			// NOTE: This block is only called by nodes tests.
diff --git a/packages/nodes-base/nodes/WhatsApp/GenericFunctions.ts b/packages/nodes-base/nodes/WhatsApp/GenericFunctions.ts
index 6f027ccd8e..db677d1bf8 100644
--- a/packages/nodes-base/nodes/WhatsApp/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/WhatsApp/GenericFunctions.ts
@@ -14,6 +14,8 @@ import type {
 	WhatsAppAppWebhookSubscriptionsResponse,
 	WhatsAppAppWebhookSubscription,
 } from './types';
+import type { SendAndWaitConfig } from '../../utils/sendAndWait/utils';
+export const WHATSAPP_BASE_URL = 'https://graph.facebook.com/v13.0/';
 
 async function appAccessTokenRead(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
@@ -102,3 +104,27 @@ export async function appWebhookSubscriptionDelete(
 		payload: { object },
 	});
 }
+
+export const createMessage = (
+	sendAndWaitConfig: SendAndWaitConfig,
+	phoneNumberId: string,
+	recipientPhoneNumber: string,
+): IHttpRequestOptions => {
+	const buttons = sendAndWaitConfig.options.map((option) => {
+		return `*${option.label}:*\n_${sendAndWaitConfig.url}?approved=${option.value}_\n\n`;
+	});
+
+	return {
+		baseURL: WHATSAPP_BASE_URL,
+		method: 'POST',
+		url: `${phoneNumberId}/messages`,
+		body: {
+			messaging_product: 'whatsapp',
+			text: {
+				body: `${sendAndWaitConfig.message}\n\n${buttons.join('')}`,
+			},
+			type: 'text',
+			to: recipientPhoneNumber,
+		},
+	};
+};
diff --git a/packages/nodes-base/nodes/WhatsApp/MessageFunctions.ts b/packages/nodes-base/nodes/WhatsApp/MessageFunctions.ts
index 3cecb0811e..c1602ee620 100644
--- a/packages/nodes-base/nodes/WhatsApp/MessageFunctions.ts
+++ b/packages/nodes-base/nodes/WhatsApp/MessageFunctions.ts
@@ -169,12 +169,13 @@ export async function componentsRequest(
 	return requestOptions;
 }
 
+export const sanitizePhoneNumber = (phoneNumber: string) => phoneNumber.replace(/[\-\(\)\+]/g, '');
+
 export async function cleanPhoneNumber(
 	this: IExecuteSingleFunctions,
 	requestOptions: IHttpRequestOptions,
 ): Promise<IHttpRequestOptions> {
-	let phoneNumber = this.getNodeParameter('recipientPhoneNumber') as string;
-	phoneNumber = phoneNumber.replace(/[\-\(\)\+]/g, '');
+	const phoneNumber = sanitizePhoneNumber(this.getNodeParameter('recipientPhoneNumber') as string);
 
 	if (!requestOptions.body) {
 		requestOptions.body = {};
diff --git a/packages/nodes-base/nodes/WhatsApp/MessagesDescription.ts b/packages/nodes-base/nodes/WhatsApp/MessagesDescription.ts
index 10fdc64d3d..787868b41a 100644
--- a/packages/nodes-base/nodes/WhatsApp/MessagesDescription.ts
+++ b/packages/nodes-base/nodes/WhatsApp/MessagesDescription.ts
@@ -1,5 +1,5 @@
 import countryCodes from 'currency-codes';
-import type { INodeProperties } from 'n8n-workflow';
+import { SEND_AND_WAIT_OPERATION, type INodeProperties } from 'n8n-workflow';
 
 import {
 	cleanPhoneNumber,
@@ -32,6 +32,11 @@ export const messageFields: INodeProperties[] = [
 				value: 'send',
 				action: 'Send message',
 			},
+			{
+				name: 'Send and Wait for Response',
+				value: SEND_AND_WAIT_OPERATION,
+				action: 'Send message and wait for response',
+			},
 			{
 				name: 'Send Template',
 				value: 'sendTemplate',
diff --git a/packages/nodes-base/nodes/WhatsApp/WhatsApp.node.json b/packages/nodes-base/nodes/WhatsApp/WhatsApp.node.json
index d495137617..e073a679a3 100644
--- a/packages/nodes-base/nodes/WhatsApp/WhatsApp.node.json
+++ b/packages/nodes-base/nodes/WhatsApp/WhatsApp.node.json
@@ -2,7 +2,10 @@
 	"node": "n8n-nodes-base.whatsApp",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": ["Communication"],
+	"categories": ["Communication", "HITL"],
+	"subcategories": {
+		"HITL": ["Human in the Loop"]
+	},
 	"resources": {
 		"credentialDocumentation": [
 			{
diff --git a/packages/nodes-base/nodes/WhatsApp/WhatsApp.node.ts b/packages/nodes-base/nodes/WhatsApp/WhatsApp.node.ts
index a89b22184b..ecfae62334 100644
--- a/packages/nodes-base/nodes/WhatsApp/WhatsApp.node.ts
+++ b/packages/nodes-base/nodes/WhatsApp/WhatsApp.node.ts
@@ -1,8 +1,19 @@
-import type { INodeType, INodeTypeDescription } from 'n8n-workflow';
-import { NodeConnectionType } from 'n8n-workflow';
+import type { IExecuteFunctions, INodeType, INodeTypeDescription } from 'n8n-workflow';
+import { NodeConnectionType, NodeOperationError, SEND_AND_WAIT_OPERATION } from 'n8n-workflow';
 
+import { createMessage, WHATSAPP_BASE_URL } from './GenericFunctions';
 import { mediaFields, mediaTypeFields } from './MediaDescription';
+import { sanitizePhoneNumber } from './MessageFunctions';
 import { messageFields, messageTypeFields } from './MessagesDescription';
+import { configureWaitTillDate } from '../../utils/sendAndWait/configureWaitTillDate.util';
+import { sendAndWaitWebhooksDescription } from '../../utils/sendAndWait/descriptions';
+import {
+	getSendAndWaitConfig,
+	getSendAndWaitProperties,
+	sendAndWaitWebhook,
+} from '../../utils/sendAndWait/utils';
+
+const WHATSAPP_CREDENTIALS_TYPE = 'whatsAppApi';
 
 export class WhatsApp implements INodeType {
 	description: INodeTypeDescription = {
@@ -19,14 +30,15 @@ export class WhatsApp implements INodeType {
 		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
+		webhooks: sendAndWaitWebhooksDescription,
 		credentials: [
 			{
-				name: 'whatsAppApi',
+				name: WHATSAPP_CREDENTIALS_TYPE,
 				required: true,
 			},
 		],
 		requestDefaults: {
-			baseURL: 'https://graph.facebook.com/v13.0/',
+			baseURL: WHATSAPP_BASE_URL,
 		},
 		properties: [
 			{
@@ -50,6 +62,42 @@ export class WhatsApp implements INodeType {
 			...mediaFields,
 			...messageTypeFields,
 			...mediaTypeFields,
+			...getSendAndWaitProperties([], 'message', undefined, {
+				noButtonStyle: true,
+				defaultApproveLabel: '✓ Approve',
+				defaultDisapproveLabel: '✗ Decline',
+			}).filter((p) => p.name !== 'subject'),
 		],
 	};
+
+	webhook = sendAndWaitWebhook;
+
+	customOperations = {
+		message: {
+			async [SEND_AND_WAIT_OPERATION](this: IExecuteFunctions) {
+				try {
+					const phoneNumberId = this.getNodeParameter('phoneNumberId', 0) as string;
+
+					const recipientPhoneNumber = sanitizePhoneNumber(
+						this.getNodeParameter('recipientPhoneNumber', 0) as string,
+					);
+
+					const config = getSendAndWaitConfig(this);
+
+					await this.helpers.httpRequestWithAuthentication.call(
+						this,
+						WHATSAPP_CREDENTIALS_TYPE,
+						createMessage(config, phoneNumberId, recipientPhoneNumber),
+					);
+
+					const waitTill = configureWaitTillDate(this);
+
+					await this.putExecutionToWait(waitTill);
+					return [this.getInputData()];
+				} catch (error) {
+					throw new NodeOperationError(this.getNode(), error);
+				}
+			},
+		},
+	};
 }
diff --git a/packages/nodes-base/nodes/WhatsApp/WhatsAppTrigger.node.ts b/packages/nodes-base/nodes/WhatsApp/WhatsAppTrigger.node.ts
index a9603fb25f..adeb6b4901 100644
--- a/packages/nodes-base/nodes/WhatsApp/WhatsAppTrigger.node.ts
+++ b/packages/nodes-base/nodes/WhatsApp/WhatsAppTrigger.node.ts
@@ -8,6 +8,7 @@ import {
 	type IWebhookFunctions,
 	type IWebhookResponseData,
 	NodeConnectionType,
+	type INodeProperties,
 } from 'n8n-workflow';
 
 import {
@@ -16,7 +17,58 @@ import {
 	appWebhookSubscriptionList,
 } from './GenericFunctions';
 import type { WhatsAppPageEvent } from './types';
-import { whatsappTriggerDescription } from './WhatsappDescription';
+
+const whatsappTriggerDescription: INodeProperties[] = [
+	{
+		displayName: 'Trigger On',
+		name: 'updates',
+		type: 'multiOptions',
+		required: true,
+		default: [],
+		options: [
+			{
+				name: 'Account Review Update',
+				value: 'account_review_update',
+			},
+			{
+				name: 'Account Update',
+				value: 'account_update',
+			},
+			{
+				name: 'Business Capability Update',
+				value: 'business_capability_update',
+			},
+			{
+				name: 'Message Template Quality Update',
+				value: 'message_template_quality_update',
+			},
+			{
+				name: 'Message Template Status Update',
+				value: 'message_template_status_update',
+			},
+			{
+				name: 'Messages',
+				value: 'messages',
+			},
+			{
+				name: 'Phone Number Name Update',
+				value: 'phone_number_name_update',
+			},
+			{
+				name: 'Phone Number Quality Update',
+				value: 'phone_number_quality_update',
+			},
+			{
+				name: 'Security',
+				value: 'security',
+			},
+			{
+				name: 'Template Category Update',
+				value: 'template_category_update',
+			},
+		],
+	},
+];
 
 export class WhatsAppTrigger implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/WhatsApp/WhatsappDescription.ts b/packages/nodes-base/nodes/WhatsApp/WhatsappDescription.ts
deleted file mode 100644
index 564cb3bc7f..0000000000
--- a/packages/nodes-base/nodes/WhatsApp/WhatsappDescription.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import type { INodeProperties } from 'n8n-workflow';
-
-export const whatsappTriggerDescription: INodeProperties[] = [
-	{
-		displayName: 'Trigger On',
-		name: 'updates',
-		type: 'multiOptions',
-		required: true,
-		default: [],
-		options: [
-			{
-				name: 'Account Review Update',
-				value: 'account_review_update',
-			},
-			{
-				name: 'Account Update',
-				value: 'account_update',
-			},
-			{
-				name: 'Business Capability Update',
-				value: 'business_capability_update',
-			},
-			{
-				name: 'Message Template Quality Update',
-				value: 'message_template_quality_update',
-			},
-			{
-				name: 'Message Template Status Update',
-				value: 'message_template_status_update',
-			},
-			{
-				name: 'Messages',
-				value: 'messages',
-			},
-			{
-				name: 'Phone Number Name Update',
-				value: 'phone_number_name_update',
-			},
-			{
-				name: 'Phone Number Quality Update',
-				value: 'phone_number_quality_update',
-			},
-			{
-				name: 'Security',
-				value: 'security',
-			},
-			{
-				name: 'Template Category Update',
-				value: 'template_category_update',
-			},
-		],
-	},
-];
diff --git a/packages/nodes-base/nodes/WhatsApp/tests/node/sendAndWait.test.ts b/packages/nodes-base/nodes/WhatsApp/tests/node/sendAndWait.test.ts
new file mode 100644
index 0000000000..f3f46ca021
--- /dev/null
+++ b/packages/nodes-base/nodes/WhatsApp/tests/node/sendAndWait.test.ts
@@ -0,0 +1,68 @@
+import type { MockProxy } from 'jest-mock-extended';
+import { mock } from 'jest-mock-extended';
+import { type IExecuteFunctions } from 'n8n-workflow';
+
+import { WhatsApp } from '../../WhatsApp.node';
+
+describe('Test WhatsApp Business Cloud, sendAndWait operation', () => {
+	let whatsApp: WhatsApp;
+	let mockExecuteFunctions: MockProxy<IExecuteFunctions>;
+
+	beforeEach(() => {
+		whatsApp = new WhatsApp();
+		mockExecuteFunctions = mock<IExecuteFunctions>();
+
+		mockExecuteFunctions.helpers = {
+			httpRequestWithAuthentication: jest.fn().mockResolvedValue({}),
+		} as any;
+	});
+
+	afterEach(() => {
+		jest.clearAllMocks();
+	});
+
+	it('should send message and put execution to wait', async () => {
+		const items = [{ json: { data: 'test' } }];
+		mockExecuteFunctions.getNodeParameter.mockImplementation((key: string) => {
+			if (key === 'phoneNumberId') return '11111';
+			if (key === 'recipientPhoneNumber') return '22222';
+			if (key === 'message') return 'my message';
+			if (key === 'subject') return '';
+			if (key === 'approvalOptions.values') return {};
+			if (key === 'responseType') return 'approval';
+			if (key === 'sendTo') return 'channel';
+			if (key === 'channelId') return 'channelID';
+			if (key === 'options.limitWaitTime.values') return {};
+		});
+
+		mockExecuteFunctions.putExecutionToWait.mockImplementation();
+		mockExecuteFunctions.getInputData.mockReturnValue(items);
+		mockExecuteFunctions.getInstanceId.mockReturnValue('instanceId');
+
+		mockExecuteFunctions.evaluateExpression.mockReturnValueOnce('http://localhost/waiting-webhook');
+		mockExecuteFunctions.evaluateExpression.mockReturnValueOnce('nodeID');
+
+		const result = await whatsApp.customOperations.message.sendAndWait.call(mockExecuteFunctions);
+
+		expect(result).toEqual([items]);
+
+		expect(mockExecuteFunctions.putExecutionToWait).toHaveBeenCalledTimes(1);
+
+		expect(mockExecuteFunctions.helpers.httpRequestWithAuthentication).toHaveBeenCalledWith(
+			'whatsAppApi',
+			{
+				baseURL: 'https://graph.facebook.com/v13.0/',
+				body: {
+					messaging_product: 'whatsapp',
+					text: {
+						body: 'my message\n\n*Approve:*\n_http://localhost/waiting-webhook/nodeID?approved=true_\n\n',
+					},
+					to: '22222',
+					type: 'text',
+				},
+				method: 'POST',
+				url: '11111/messages',
+			},
+		);
+	});
+});
diff --git a/packages/nodes-base/nodes/WhatsApp/tests/utils.test.ts b/packages/nodes-base/nodes/WhatsApp/tests/utils.test.ts
new file mode 100644
index 0000000000..e881a18669
--- /dev/null
+++ b/packages/nodes-base/nodes/WhatsApp/tests/utils.test.ts
@@ -0,0 +1,96 @@
+import type { IHttpRequestOptions } from 'n8n-workflow';
+
+import type { SendAndWaitConfig } from '../../../utils/sendAndWait/utils';
+import { createMessage, WHATSAPP_BASE_URL } from '../GenericFunctions';
+import { sanitizePhoneNumber } from '../MessageFunctions';
+
+describe('sanitizePhoneNumber', () => {
+	const testNumber = '+99-(000)-111-2222';
+
+	it('should remove hyphens, parentheses, and plus signs from the phone number', () => {
+		expect(sanitizePhoneNumber(testNumber)).toBe('990001112222');
+	});
+
+	it('should return an empty string if input is empty', () => {
+		expect(sanitizePhoneNumber('')).toBe('');
+	});
+
+	it('should return the same number if no special characters are present', () => {
+		expect(sanitizePhoneNumber('990001112222')).toBe('990001112222');
+	});
+
+	it('should handle numbers with spaces correctly (not removing them)', () => {
+		expect(sanitizePhoneNumber('+99 000 111 2222')).toBe('99 000 111 2222');
+	});
+});
+
+describe('createMessage', () => {
+	const mockSendAndWaitConfig: SendAndWaitConfig = {
+		title: '',
+		message: 'Please approve an option:',
+		url: 'https://example.com/approve',
+		options: [
+			{ label: 'Yes', value: 'yes', style: 'primary' },
+			{ label: 'No', value: 'no', style: 'secondary' },
+		],
+	};
+
+	const phoneID = '123456789';
+	const recipientPhone = '990001112222';
+
+	it('should return a valid HTTP request object', () => {
+		const request: IHttpRequestOptions = createMessage(
+			mockSendAndWaitConfig,
+			phoneID,
+			recipientPhone,
+		);
+
+		expect(request).toEqual({
+			baseURL: WHATSAPP_BASE_URL,
+			method: 'POST',
+			url: `${phoneID}/messages`,
+			body: {
+				messaging_product: 'whatsapp',
+				text: {
+					body:
+						'Please approve an option:\n\n' +
+						'*Yes:*\n_https://example.com/approve?approved=yes_\n\n' +
+						'*No:*\n_https://example.com/approve?approved=no_\n\n',
+				},
+				type: 'text',
+				to: recipientPhone,
+			},
+		});
+	});
+
+	it('should handle a single option correctly', () => {
+		const singleOptionConfig: SendAndWaitConfig = {
+			title: '',
+			message: 'Choose an option:',
+			url: 'https://example.com/approve',
+			options: [
+				{
+					label: 'Confirm',
+					value: 'confirm',
+					style: '',
+				},
+			],
+		};
+
+		const request: IHttpRequestOptions = createMessage(singleOptionConfig, phoneID, recipientPhone);
+
+		expect(request).toEqual({
+			baseURL: WHATSAPP_BASE_URL,
+			method: 'POST',
+			url: `${phoneID}/messages`,
+			body: {
+				messaging_product: 'whatsapp',
+				text: {
+					body: 'Choose an option:\n\n*Confirm:*\n_https://example.com/approve?approved=confirm_\n\n',
+				},
+				type: 'text',
+				to: recipientPhone,
+			},
+		});
+	});
+});
diff --git a/packages/nodes-base/utils/sendAndWait/utils.ts b/packages/nodes-base/utils/sendAndWait/utils.ts
index 96a4114d63..6fe569825f 100644
--- a/packages/nodes-base/utils/sendAndWait/utils.ts
+++ b/packages/nodes-base/utils/sendAndWait/utils.ts
@@ -24,7 +24,7 @@ import { formFieldsProperties } from '../../nodes/Form/Form.node';
 import { prepareFormData, prepareFormReturnItem, resolveRawData } from '../../nodes/Form/utils';
 import { escapeHtml } from '../utilities';
 
-type SendAndWaitConfig = {
+export type SendAndWaitConfig = {
 	title: string;
 	message: string;
 	url: string;
diff --git a/packages/workflow/src/Interfaces.ts b/packages/workflow/src/Interfaces.ts
index d9203af8d1..46a4713491 100644
--- a/packages/workflow/src/Interfaces.ts
+++ b/packages/workflow/src/Interfaces.ts
@@ -1560,12 +1560,12 @@ export interface SupplyData {
 	closeFunction?: CloseFunction;
 }
 
+type NodeOutput = INodeExecutionData[][] | NodeExecutionWithMetadata[][] | null;
+
 export interface INodeType {
 	description: INodeTypeDescription;
 	supplyData?(this: ISupplyDataFunctions, itemIndex: number): Promise<SupplyData>;
-	execute?(
-		this: IExecuteFunctions,
-	): Promise<INodeExecutionData[][] | NodeExecutionWithMetadata[][] | null>;
+	execute?(this: IExecuteFunctions): Promise<NodeOutput>;
 	poll?(this: IPollFunctions): Promise<INodeExecutionData[][] | null>;
 	trigger?(this: ITriggerFunctions): Promise<ITriggerResponse | undefined>;
 	webhook?(this: IWebhookFunctions): Promise<IWebhookResponseData>;
@@ -1602,6 +1602,18 @@ export interface INodeType {
 			[method in WebhookSetupMethodNames]: (this: IHookFunctions) => Promise<boolean>;
 		};
 	};
+	/**
+	 * Defines custom operations for nodes that do not implement an `execute` method, such as declarative nodes.
+	 * This function will be invoked instead of `execute` for a specific resource and operation.
+	 * Should be either `execute` or `customOperations` defined for a node, but not both.
+	 *
+	 * @property customOperations - Maps specific resource and operation to a custom function
+	 */
+	customOperations?: {
+		[resource: string]: {
+			[operation: string]: (this: IExecuteFunctions) => Promise<NodeOutput>;
+		};
+	};
 }
 
 /**

From 719e3c2cf7172f0e09d5a0a33d3be9a4d1e90966 Mon Sep 17 00:00:00 2001
From: Tomi Turtiainen <10324676+tomi@users.noreply.github.com>
Date: Thu, 27 Feb 2025 09:02:06 +0200
Subject: [PATCH 18/47] build: Fix benchmark docker image build (#13545)

---
 packages/@n8n/benchmark/Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/@n8n/benchmark/Dockerfile b/packages/@n8n/benchmark/Dockerfile
index 8275bbe415..8c759cbab6 100644
--- a/packages/@n8n/benchmark/Dockerfile
+++ b/packages/@n8n/benchmark/Dockerfile
@@ -37,9 +37,9 @@ ENV DOCKER_BUILD=true
 RUN pnpm install --frozen-lockfile
 
 # TS config files
-COPY --chown=node:node ./tsconfig.json /app/tsconfig.json
-COPY --chown=node:node ./tsconfig.build.json /app/tsconfig.build.json
-COPY --chown=node:node ./tsconfig.backend.json /app/tsconfig.backend.json
+COPY --chown=node:node ./packages/@n8n/typescript-config/tsconfig.common.json /app/packages/@n8n/typescript-config/tsconfig.common.json
+COPY --chown=node:node ./packages/@n8n/typescript-config/tsconfig.build.json /app/packages/@n8n/typescript-config/tsconfig.build.json
+COPY --chown=node:node ./packages/@n8n/typescript-config/tsconfig.backend.json /app/packages/@n8n/typescript-config/tsconfig.backend.json
 COPY --chown=node:node ./packages/@n8n/benchmark/tsconfig.json /app/packages/@n8n/benchmark/tsconfig.json
 COPY --chown=node:node ./packages/@n8n/benchmark/tsconfig.build.json /app/packages/@n8n/benchmark/tsconfig.build.json
 

From 3ca99194c6b052588231dcbbb6408dd281c9fb6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Thu, 27 Feb 2025 08:30:55 +0100
Subject: [PATCH 19/47] refactor(core): Migrate all errors in cli package to
 new hierarchy (#13478)

Co-authored-by: Tomi Turtiainen <10324676+tomi@users.noreply.github.com>
---
 .../cli/src/__tests__/external-hooks.test.ts  | 15 ++++---
 packages/cli/src/active-workflow-manager.ts   |  4 +-
 .../collaboration/collaboration.service.ts    |  4 +-
 packages/cli/src/commands/audit.ts            |  4 +-
 packages/cli/src/commands/base-command.ts     |  4 +-
 packages/cli/src/commands/execute-batch.ts    |  4 +-
 packages/cli/src/commands/execute.ts          |  8 ++--
 .../cli/src/commands/export/credentials.ts    |  4 +-
 packages/cli/src/commands/export/workflow.ts  |  4 +-
 .../cli/src/commands/import/credentials.ts    | 10 ++---
 packages/cli/src/commands/import/workflow.ts  | 12 +++---
 packages/cli/src/commands/ldap/reset.ts       | 16 +++----
 packages/cli/src/commands/webhook.ts          |  6 +--
 packages/cli/src/config/index.ts              |  4 +-
 packages/cli/src/config/utils.ts              |  4 +-
 .../oauth/abstract-oauth.controller.ts        |  8 ++--
 packages/cli/src/credentials-helper.ts        |  8 ++--
 .../src/credentials/credentials.service.ts    |  4 +-
 packages/cli/src/databases/config.ts          |  4 +-
 packages/cli/src/databases/dsl/table.ts       |  4 +-
 .../1700571993961-AddGlobalAdminRole.ts       |  4 +-
 .../common/1714133768519-CreateProject.ts     |  4 +-
 .../repositories/execution.repository.ts      |  8 ++--
 .../databases/subscribers/user-subscriber.ts  |  6 +--
 .../src/databases/utils/migration-helpers.ts  | 10 ++---
 .../cli/src/decorators/controller.registry.ts |  4 +-
 packages/cli/src/decorators/on-shutdown.ts    |  4 +-
 .../source-control-export.service.ee.ts       | 18 ++++----
 .../source-control-git.service.ee.ts          | 42 +++++++++----------
 .../source-control-helper.ee.ts               |  6 +--
 .../source-control-import.service.ee.ts       |  8 ++--
 .../source-control-preferences.service.ee.ts  | 12 +++---
 .../source-control.service.ee.ts              | 10 ++---
 .../errors/aborted-execution-retry.error.ts   |  8 ++--
 .../malformed-refresh-value.error.ts          |  4 +-
 .../cache-errors/uncacheable-value.error.ts   |  4 +-
 .../src/errors/credential-not-found.error.ts  |  5 +--
 ...redentials-overwrites-already-set.error.ts |  4 +-
 .../cli/src/errors/deduplication.error.ts     |  4 +-
 .../src/errors/execution-not-found-error.ts   |  4 +-
 ...ternal-secrets-provider-not-found.error.ts |  4 +-
 .../src/errors/feature-not-licensed.error.ts  |  4 +-
 .../errors/invalid-concurrency-limit.error.ts |  6 +--
 packages/cli/src/errors/invalid-role.error.ts |  4 +-
 .../cli/src/errors/max-stalled-count.error.ts |  4 +-
 .../errors/missing-execution-stop.error.ts    |  4 +-
 .../cli/src/errors/non-json-body.error.ts     |  4 +-
 .../cli/src/errors/not-string-array.error.ts  |  4 +-
 .../postgres-live-rows-retrieval.error.ts     |  4 +-
 .../errors/queued-execution-retry.error.ts    |  8 ++--
 packages/cli/src/errors/redactable.error.ts   |  4 +-
 .../abstract/response.error.ts                | 12 +++++-
 .../errors/shared-workflow-not-found.error.ts |  4 +-
 .../cli/src/errors/unknown-auth-type.error.ts |  4 +-
 .../errors/unknown-execution-mode.error.ts    |  4 +-
 .../variable-count-limit-reached.error.ts     |  4 +-
 .../src/errors/variable-validation.error.ts   |  4 +-
 .../worker-missing-encryption-key.error.ts    |  5 +--
 ...orkflow-history-version-not-found.error.ts |  4 +-
 .../src/errors/workflow-missing-id.error.ts   |  4 +-
 .../evaluation.ee/test-runner/errors.ee.ts    |  6 +--
 .../cli/src/executions/execution.service.ts   |  9 ++--
 .../parse-range-query.middleware.ts           |  4 +-
 packages/cli/src/external-hooks.ts            |  6 +--
 .../external-secrets-manager.ee.ts            |  4 +-
 .../providers/infisical.ts                    |  8 ++--
 packages/cli/src/ldap.ee/ldap.service.ee.ts   |  8 ++--
 .../cli/src/load-nodes-and-credentials.ts     |  6 +--
 .../list-query/dtos/base.filter.dto.ts        |  6 +--
 .../list-query/dtos/base.select.dto.ts        |  4 +-
 .../list-query/dtos/pagination.dto.ts         |  6 +--
 .../src/middlewares/list-query/pagination.ts  |  4 +-
 .../cli/src/middlewares/list-query/sort-by.ts |  4 +-
 packages/cli/src/node-types.ts                |  6 +--
 .../cli/src/permissions.ee/check-access.ts    |  4 +-
 packages/cli/src/push/websocket.push.ts       |  4 +-
 packages/cli/src/scaling/job-processor.ts     |  8 ++--
 packages/cli/src/scaling/scaling.service.ts   |  8 ++--
 .../cli/src/services/cache/cache.service.ts   |  6 +--
 .../src/services/cache/redis.cache-manager.ts |  4 +-
 .../services/community-packages.service.ts    | 20 ++++-----
 .../services/credentials-tester.service.ts    |  4 +-
 .../dynamic-node-parameters.service.ts        |  8 ++--
 .../cli/src/services/project.service.ee.ts    |  6 +--
 packages/cli/src/services/role.service.ts     |  4 +-
 packages/cli/src/services/user.service.ts     |  4 +-
 .../src/services/workflow-loader.service.ts   |  4 +-
 .../__tests__/shutdown.service.test.ts        |  6 +--
 packages/cli/src/shutdown/shutdown.service.ts | 15 ++++---
 .../errors/invalid-saml-metadata.error.ts     |  6 +--
 .../cli/src/sso.ee/saml/saml.service.ee.ts    |  6 +--
 .../errors/task-runner-disconnected-error.ts  |  4 +-
 .../task-runner-failed-heartbeat.error.ts     |  4 +-
 .../errors/task-runner-oom-error.ts           |  6 +--
 .../errors/task-runner-restart-loop-error.ts  |  8 ++--
 .../task-broker/errors/task-deferred.error.ts |  6 +--
 .../task-broker/errors/task-reject.error.ts   |  6 +--
 .../errors/task-runner-timeout.error.ts       |  4 +-
 .../task-broker/task-broker-ws-server.ts      |  4 +-
 .../task-broker/task-broker.service.ts        | 13 ++----
 packages/cli/src/wait-tracker.ts              |  8 ++--
 packages/cli/src/webhooks/webhook.service.ts  |  4 +-
 .../src/workflow-execute-additional-data.ts   |  6 +--
 .../cli/src/workflows/workflow.service.ee.ts  |  6 +--
 .../cli/src/workflows/workflows.controller.ts | 12 ++----
 packages/core/src/errors/error-reporter.ts    |  8 ++--
 .../workflow/src/errors/base/base.error.ts    |  2 +-
 107 files changed, 340 insertions(+), 354 deletions(-)

diff --git a/packages/cli/src/__tests__/external-hooks.test.ts b/packages/cli/src/__tests__/external-hooks.test.ts
index aa42b7e9d9..a6688fbd1f 100644
--- a/packages/cli/src/__tests__/external-hooks.test.ts
+++ b/packages/cli/src/__tests__/external-hooks.test.ts
@@ -2,7 +2,7 @@ import type { GlobalConfig } from '@n8n/config';
 import { mock } from 'jest-mock-extended';
 import type { ErrorReporter, Logger } from 'n8n-core';
 import type { IWorkflowBase } from 'n8n-workflow';
-import { ApplicationError } from 'n8n-workflow';
+import { UnexpectedError } from 'n8n-workflow';
 
 import type { CredentialsRepository } from '@/databases/repositories/credentials.repository';
 import type { SettingsRepository } from '@/databases/repositories/settings.repository';
@@ -57,7 +57,7 @@ describe('ExternalHooks', () => {
 				{ virtual: true },
 			);
 
-			await expect(externalHooks.init()).rejects.toThrow(ApplicationError);
+			await expect(externalHooks.init()).rejects.toThrow(UnexpectedError);
 		});
 
 		it('should successfully load hooks from valid hook file', async () => {
@@ -112,10 +112,13 @@ describe('ExternalHooks', () => {
 			externalHooks['registered']['workflow.create'] = [hookFn];
 
 			await expect(externalHooks.run('workflow.create', [workflowData])).rejects.toThrow(error);
-
-			expect(errorReporter.error).toHaveBeenCalledWith(expect.any(ApplicationError), {
-				level: 'fatal',
-			});
+			expect(errorReporter.error).toHaveBeenCalledWith(
+				expect.objectContaining({
+					message: 'External hook "workflow.create" failed',
+					cause: error,
+				}),
+				{ level: 'fatal' },
+			);
 			expect(logger.error).toHaveBeenCalledWith(
 				'There was a problem running hook "workflow.create"',
 			);
diff --git a/packages/cli/src/active-workflow-manager.ts b/packages/cli/src/active-workflow-manager.ts
index 16500e6355..305ad170c7 100644
--- a/packages/cli/src/active-workflow-manager.ts
+++ b/packages/cli/src/active-workflow-manager.ts
@@ -30,7 +30,7 @@ import {
 	Workflow,
 	WorkflowActivationError,
 	WebhookPathTakenError,
-	ApplicationError,
+	UnexpectedError,
 } from 'n8n-workflow';
 
 import { ActivationErrorsService } from '@/activation-errors.service';
@@ -238,7 +238,7 @@ export class ActiveWorkflowManager {
 		});
 
 		if (workflowData === null) {
-			throw new ApplicationError('Could not find workflow', { extra: { workflowId } });
+			throw new UnexpectedError('Could not find workflow', { extra: { workflowId } });
 		}
 
 		const workflow = new Workflow({
diff --git a/packages/cli/src/collaboration/collaboration.service.ts b/packages/cli/src/collaboration/collaboration.service.ts
index 9b2f3dec8e..34575de4cd 100644
--- a/packages/cli/src/collaboration/collaboration.service.ts
+++ b/packages/cli/src/collaboration/collaboration.service.ts
@@ -2,7 +2,7 @@ import type { PushPayload } from '@n8n/api-types';
 import { Service } from '@n8n/di';
 import { ErrorReporter } from 'n8n-core';
 import type { Workflow } from 'n8n-workflow';
-import { ApplicationError } from 'n8n-workflow';
+import { UnexpectedError } from 'n8n-workflow';
 
 import { CollaborationState } from '@/collaboration/collaboration.state';
 import type { User } from '@/databases/entities/user';
@@ -34,7 +34,7 @@ export class CollaborationService {
 				await this.handleUserMessage(event.userId, event.msg);
 			} catch (error) {
 				this.errorReporter.error(
-					new ApplicationError('Error handling CollaborationService push message', {
+					new UnexpectedError('Error handling CollaborationService push message', {
 						extra: {
 							msg: event.msg,
 							userId: event.userId,
diff --git a/packages/cli/src/commands/audit.ts b/packages/cli/src/commands/audit.ts
index 1bd76bc4ed..03069ac9d9 100644
--- a/packages/cli/src/commands/audit.ts
+++ b/packages/cli/src/commands/audit.ts
@@ -1,7 +1,7 @@
 import { SecurityConfig } from '@n8n/config';
 import { Container } from '@n8n/di';
 import { Flags } from '@oclif/core';
-import { ApplicationError } from 'n8n-workflow';
+import { UserError } from 'n8n-workflow';
 
 import { RISK_CATEGORIES } from '@/security-audit/constants';
 import { SecurityAuditService } from '@/security-audit/security-audit.service';
@@ -48,7 +48,7 @@ export class SecurityAudit extends BaseCommand {
 
 			const hint = `Valid categories are: ${RISK_CATEGORIES.join(', ')}`;
 
-			throw new ApplicationError([message, hint].join('. '));
+			throw new UserError([message, hint].join('. '));
 		}
 
 		const result = await Container.get(SecurityAuditService).run(
diff --git a/packages/cli/src/commands/base-command.ts b/packages/cli/src/commands/base-command.ts
index d9bc8dd296..d9e3356ac8 100644
--- a/packages/cli/src/commands/base-command.ts
+++ b/packages/cli/src/commands/base-command.ts
@@ -10,7 +10,7 @@ import {
 	DataDeduplicationService,
 	ErrorReporter,
 } from 'n8n-core';
-import { ApplicationError, ensureError, sleep } from 'n8n-workflow';
+import { ensureError, sleep, UserError } from 'n8n-workflow';
 
 import type { AbstractServer } from '@/abstract-server';
 import config from '@/config';
@@ -151,7 +151,7 @@ export abstract class BaseCommand extends Command {
 		if (!isSelected && !isAvailable) return;
 
 		if (isSelected && !isAvailable) {
-			throw new ApplicationError(
+			throw new UserError(
 				'External storage selected but unavailable. Please make external storage available by adding "s3" to `N8N_AVAILABLE_BINARY_DATA_MODES`.',
 			);
 		}
diff --git a/packages/cli/src/commands/execute-batch.ts b/packages/cli/src/commands/execute-batch.ts
index 3116186025..9d3b31f846 100644
--- a/packages/cli/src/commands/execute-batch.ts
+++ b/packages/cli/src/commands/execute-batch.ts
@@ -5,7 +5,7 @@ import fs from 'fs';
 import { diff } from 'json-diff';
 import pick from 'lodash/pick';
 import type { IRun, ITaskData, IWorkflowBase, IWorkflowExecutionDataProcess } from 'n8n-workflow';
-import { ApplicationError, jsonParse } from 'n8n-workflow';
+import { jsonParse, UnexpectedError } from 'n8n-workflow';
 import os from 'os';
 import { sep } from 'path';
 
@@ -472,7 +472,7 @@ export class ExecuteBatch extends BaseCommand {
 									this.updateStatus();
 								}
 							} else {
-								throw new ApplicationError('Wrong execution status - cannot proceed');
+								throw new UnexpectedError('Wrong execution status - cannot proceed');
 							}
 						});
 					}
diff --git a/packages/cli/src/commands/execute.ts b/packages/cli/src/commands/execute.ts
index 786b91f7fc..122169c901 100644
--- a/packages/cli/src/commands/execute.ts
+++ b/packages/cli/src/commands/execute.ts
@@ -1,7 +1,7 @@
 import { Container } from '@n8n/di';
 import { Flags } from '@oclif/core';
 import type { IWorkflowBase, IWorkflowExecutionDataProcess } from 'n8n-workflow';
-import { ApplicationError, ExecutionBaseError } from 'n8n-workflow';
+import { ExecutionBaseError, UnexpectedError, UserError } from 'n8n-workflow';
 
 import { ActiveExecutions } from '@/active-executions';
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
@@ -44,7 +44,7 @@ export class Execute extends BaseCommand {
 		}
 
 		if (flags.file) {
-			throw new ApplicationError(
+			throw new UserError(
 				'The --file flag is no longer supported. Please first import the workflow and then execute it using the --id flag.',
 				{ level: 'warning' },
 			);
@@ -64,7 +64,7 @@ export class Execute extends BaseCommand {
 		}
 
 		if (!workflowData) {
-			throw new ApplicationError('Failed to retrieve workflow data for requested workflow');
+			throw new UnexpectedError('Failed to retrieve workflow data for requested workflow');
 		}
 
 		if (!isWorkflowIdValid(workflowId)) {
@@ -87,7 +87,7 @@ export class Execute extends BaseCommand {
 		const data = await activeExecutions.getPostExecutePromise(executionId);
 
 		if (data === undefined) {
-			throw new ApplicationError('Workflow did not return any data');
+			throw new UnexpectedError('Workflow did not return any data');
 		}
 
 		if (data.data.resultData.error) {
diff --git a/packages/cli/src/commands/export/credentials.ts b/packages/cli/src/commands/export/credentials.ts
index ad0b5784c1..9ab38daf0f 100644
--- a/packages/cli/src/commands/export/credentials.ts
+++ b/packages/cli/src/commands/export/credentials.ts
@@ -2,7 +2,7 @@ import { Container } from '@n8n/di';
 import { Flags } from '@oclif/core';
 import fs from 'fs';
 import { Credentials } from 'n8n-core';
-import { ApplicationError } from 'n8n-workflow';
+import { UserError } from 'n8n-workflow';
 import path from 'path';
 
 import { CredentialsRepository } from '@/databases/repositories/credentials.repository';
@@ -123,7 +123,7 @@ export class ExportCredentialsCommand extends BaseCommand {
 		}
 
 		if (credentials.length === 0) {
-			throw new ApplicationError('No credentials found with specified filters');
+			throw new UserError('No credentials found with specified filters');
 		}
 
 		if (flags.separate) {
diff --git a/packages/cli/src/commands/export/workflow.ts b/packages/cli/src/commands/export/workflow.ts
index 3fa0f1e046..15e6bcd2e4 100644
--- a/packages/cli/src/commands/export/workflow.ts
+++ b/packages/cli/src/commands/export/workflow.ts
@@ -1,7 +1,7 @@
 import { Container } from '@n8n/di';
 import { Flags } from '@oclif/core';
 import fs from 'fs';
-import { ApplicationError } from 'n8n-workflow';
+import { UserError } from 'n8n-workflow';
 import path from 'path';
 
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
@@ -107,7 +107,7 @@ export class ExportWorkflowsCommand extends BaseCommand {
 		});
 
 		if (workflows.length === 0) {
-			throw new ApplicationError('No workflows found with specified filters');
+			throw new UserError('No workflows found with specified filters');
 		}
 
 		if (flags.separate) {
diff --git a/packages/cli/src/commands/import/credentials.ts b/packages/cli/src/commands/import/credentials.ts
index aae6c7d23e..0108a994fd 100644
--- a/packages/cli/src/commands/import/credentials.ts
+++ b/packages/cli/src/commands/import/credentials.ts
@@ -6,7 +6,7 @@ import glob from 'fast-glob';
 import fs from 'fs';
 import { Cipher } from 'n8n-core';
 import type { ICredentialsEncrypted } from 'n8n-workflow';
-import { ApplicationError, jsonParse } from 'n8n-workflow';
+import { jsonParse, UserError } from 'n8n-workflow';
 
 import { UM_FIX_INSTRUCTION } from '@/constants';
 import { CredentialsEntity } from '@/databases/entities/credentials-entity';
@@ -66,7 +66,7 @@ export class ImportCredentialsCommand extends BaseCommand {
 		}
 
 		if (flags.projectId && flags.userId) {
-			throw new ApplicationError(
+			throw new UserError(
 				'You cannot use `--userId` and `--projectId` together. Use one or the other.',
 			);
 		}
@@ -81,7 +81,7 @@ export class ImportCredentialsCommand extends BaseCommand {
 			const result = await this.checkRelations(credentials, flags.projectId, flags.userId);
 
 			if (!result.success) {
-				throw new ApplicationError(result.message);
+				throw new UserError(result.message);
 			}
 
 			for (const credential of credentials) {
@@ -202,7 +202,7 @@ export class ImportCredentialsCommand extends BaseCommand {
 			);
 
 			if (!Array.isArray(credentialsUnchecked)) {
-				throw new ApplicationError(
+				throw new UserError(
 					'File does not seem to contain credentials. Make sure the credentials are contained in an array.',
 				);
 			}
@@ -252,7 +252,7 @@ export class ImportCredentialsCommand extends BaseCommand {
 		if (!userId) {
 			const owner = await this.transactionManager.findOneBy(User, { role: 'global:owner' });
 			if (!owner) {
-				throw new ApplicationError(`Failed to find owner. ${UM_FIX_INSTRUCTION}`);
+				throw new UserError(`Failed to find owner. ${UM_FIX_INSTRUCTION}`);
 			}
 			userId = owner.id;
 		}
diff --git a/packages/cli/src/commands/import/workflow.ts b/packages/cli/src/commands/import/workflow.ts
index 6d33df6c02..0c6292c93b 100644
--- a/packages/cli/src/commands/import/workflow.ts
+++ b/packages/cli/src/commands/import/workflow.ts
@@ -3,7 +3,7 @@ import { Flags } from '@oclif/core';
 import glob from 'fast-glob';
 import fs from 'fs';
 import type { IWorkflowBase, WorkflowId } from 'n8n-workflow';
-import { ApplicationError, jsonParse } from 'n8n-workflow';
+import { jsonParse, UserError } from 'n8n-workflow';
 
 import { UM_FIX_INSTRUCTION } from '@/constants';
 import type { WorkflowEntity } from '@/databases/entities/workflow-entity';
@@ -19,7 +19,7 @@ import { BaseCommand } from '../base-command';
 
 function assertHasWorkflowsToImport(workflows: unknown): asserts workflows is IWorkflowToImport[] {
 	if (!Array.isArray(workflows)) {
-		throw new ApplicationError(
+		throw new UserError(
 			'File does not seem to contain workflows. Make sure the workflows are contained in an array.',
 		);
 	}
@@ -30,7 +30,7 @@ function assertHasWorkflowsToImport(workflows: unknown): asserts workflows is IW
 			!Object.prototype.hasOwnProperty.call(workflow, 'nodes') ||
 			!Object.prototype.hasOwnProperty.call(workflow, 'connections')
 		) {
-			throw new ApplicationError('File does not seem to contain valid workflows.');
+			throw new UserError('File does not seem to contain valid workflows.');
 		}
 	}
 }
@@ -81,7 +81,7 @@ export class ImportWorkflowsCommand extends BaseCommand {
 		}
 
 		if (flags.projectId && flags.userId) {
-			throw new ApplicationError(
+			throw new UserError(
 				'You cannot use `--userId` and `--projectId` together. Use one or the other.',
 			);
 		}
@@ -93,7 +93,7 @@ export class ImportWorkflowsCommand extends BaseCommand {
 		const result = await this.checkRelations(workflows, flags.projectId, flags.userId);
 
 		if (!result.success) {
-			throw new ApplicationError(result.message);
+			throw new UserError(result.message);
 		}
 
 		this.logger.info(`Importing ${workflows.length} workflows...`);
@@ -220,7 +220,7 @@ export class ImportWorkflowsCommand extends BaseCommand {
 		if (!userId) {
 			const owner = await Container.get(UserRepository).findOneBy({ role: 'global:owner' });
 			if (!owner) {
-				throw new ApplicationError(`Failed to find owner. ${UM_FIX_INSTRUCTION}`);
+				throw new UserError(`Failed to find owner. ${UM_FIX_INSTRUCTION}`);
 			}
 			userId = owner.id;
 		}
diff --git a/packages/cli/src/commands/ldap/reset.ts b/packages/cli/src/commands/ldap/reset.ts
index 8d3eb8da94..3a9d377fd5 100644
--- a/packages/cli/src/commands/ldap/reset.ts
+++ b/packages/cli/src/commands/ldap/reset.ts
@@ -2,7 +2,7 @@ import { Container } from '@n8n/di';
 // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
 import { In } from '@n8n/typeorm';
 import { Flags } from '@oclif/core';
-import { ApplicationError } from 'n8n-workflow';
+import { UserError } from 'n8n-workflow';
 
 import { UM_FIX_INSTRUCTION } from '@/constants';
 import { CredentialsService } from '@/credentials/credentials.service';
@@ -56,7 +56,7 @@ export class Reset extends BaseCommand {
 			Number(!!flags.deleteWorkflowsAndCredentials);
 
 		if (numberOfOptions !== 1) {
-			throw new ApplicationError(wrongFlagsError);
+			throw new UserError(wrongFlagsError);
 		}
 
 		const owner = await this.getOwner();
@@ -71,13 +71,13 @@ export class Reset extends BaseCommand {
 		// Migrate all workflows and credentials to another project.
 		if (flags.projectId ?? flags.userId) {
 			if (flags.userId && ldapIdentities.some((i) => i.userId === flags.userId)) {
-				throw new ApplicationError(
+				throw new UserError(
 					`Can't migrate workflows and credentials to the user with the ID ${flags.userId}. That user was created via LDAP and will be deleted as well.`,
 				);
 			}
 
 			if (flags.projectId && personalProjectIds.includes(flags.projectId)) {
-				throw new ApplicationError(
+				throw new UserError(
 					`Can't migrate workflows and credentials to the project with the ID ${flags.projectId}. That project is a personal project belonging to a user that was created via LDAP and will be deleted as well.`,
 				);
 			}
@@ -132,7 +132,7 @@ export class Reset extends BaseCommand {
 			const project = await Container.get(ProjectRepository).findOneBy({ id: projectId });
 
 			if (project === null) {
-				throw new ApplicationError(`Could not find the project with the ID ${projectId}.`);
+				throw new UserError(`Could not find the project with the ID ${projectId}.`);
 			}
 
 			return project;
@@ -142,7 +142,7 @@ export class Reset extends BaseCommand {
 			const project = await Container.get(ProjectRepository).getPersonalProjectForUser(userId);
 
 			if (project === null) {
-				throw new ApplicationError(
+				throw new UserError(
 					`Could not find the user with the ID ${userId} or their personalProject.`,
 				);
 			}
@@ -150,7 +150,7 @@ export class Reset extends BaseCommand {
 			return project;
 		}
 
-		throw new ApplicationError(wrongFlagsError);
+		throw new UserError(wrongFlagsError);
 	}
 
 	async catch(error: Error): Promise<void> {
@@ -161,7 +161,7 @@ export class Reset extends BaseCommand {
 	private async getOwner() {
 		const owner = await Container.get(UserRepository).findOneBy({ role: 'global:owner' });
 		if (!owner) {
-			throw new ApplicationError(`Failed to find owner. ${UM_FIX_INSTRUCTION}`);
+			throw new UserError(`Failed to find owner. ${UM_FIX_INSTRUCTION}`);
 		}
 
 		return owner;
diff --git a/packages/cli/src/commands/webhook.ts b/packages/cli/src/commands/webhook.ts
index fd1e961b59..570db352fe 100644
--- a/packages/cli/src/commands/webhook.ts
+++ b/packages/cli/src/commands/webhook.ts
@@ -1,6 +1,6 @@
 import { Container } from '@n8n/di';
 import { Flags } from '@oclif/core';
-import { ApplicationError } from 'n8n-workflow';
+import { UserError } from 'n8n-workflow';
 
 import { ActiveExecutions } from '@/active-executions';
 import config from '@/config';
@@ -84,9 +84,7 @@ export class Webhook extends BaseCommand {
 
 	async run() {
 		if (this.globalConfig.multiMainSetup.enabled) {
-			throw new ApplicationError(
-				'Webhook process cannot be started when multi-main setup is enabled.',
-			);
+			throw new UserError('Webhook process cannot be started when multi-main setup is enabled.');
 		}
 
 		const { ScalingService } = await import('@/scaling/scaling.service');
diff --git a/packages/cli/src/config/index.ts b/packages/cli/src/config/index.ts
index d11fa795db..3d32ce9931 100644
--- a/packages/cli/src/config/index.ts
+++ b/packages/cli/src/config/index.ts
@@ -5,7 +5,7 @@ import { flatten } from 'flat';
 import { readFileSync } from 'fs';
 import merge from 'lodash/merge';
 import { Logger } from 'n8n-core';
-import { ApplicationError, setGlobalState } from 'n8n-workflow';
+import { setGlobalState, UserError } from 'n8n-workflow';
 import assert from 'node:assert';
 import colors from 'picocolors';
 
@@ -84,7 +84,7 @@ if (!inE2ETests && !inTest) {
 				} catch (error) {
 					// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
 					if (error.code === 'ENOENT') {
-						throw new ApplicationError('File not found', { extra: { fileName } });
+						throw new UserError('File not found', { extra: { fileName } });
 					}
 					throw error;
 				}
diff --git a/packages/cli/src/config/utils.ts b/packages/cli/src/config/utils.ts
index ad2c8300c3..decc1be5e8 100644
--- a/packages/cli/src/config/utils.ts
+++ b/packages/cli/src/config/utils.ts
@@ -1,10 +1,10 @@
 import type { SchemaObj } from 'convict';
-import { ApplicationError } from 'n8n-workflow';
+import { UserError } from 'n8n-workflow';
 
 import { NotStringArrayError } from '@/errors/not-string-array.error';
 
 export const ensureStringArray = (values: string[], { env }: SchemaObj<string>) => {
-	if (!env) throw new ApplicationError('Missing env', { extra: { env } });
+	if (!env) throw new UserError('Missing env', { extra: { env } });
 
 	if (!Array.isArray(values)) throw new NotStringArrayError(env);
 
diff --git a/packages/cli/src/controllers/oauth/abstract-oauth.controller.ts b/packages/cli/src/controllers/oauth/abstract-oauth.controller.ts
index 2964437b49..ed23b050f9 100644
--- a/packages/cli/src/controllers/oauth/abstract-oauth.controller.ts
+++ b/packages/cli/src/controllers/oauth/abstract-oauth.controller.ts
@@ -4,7 +4,7 @@ import Csrf from 'csrf';
 import type { Response } from 'express';
 import { Credentials, Logger } from 'n8n-core';
 import type { ICredentialDataDecryptedObject, IWorkflowExecuteAdditionalData } from 'n8n-workflow';
-import { jsonParse, ApplicationError } from 'n8n-workflow';
+import { jsonParse, UnexpectedError } from 'n8n-workflow';
 
 import { RESPONSE_ERROR_MESSAGES, Time } from '@/constants';
 import { CredentialsHelper } from '@/credentials-helper';
@@ -171,7 +171,7 @@ export abstract class AbstractOAuthController {
 		});
 
 		if (typeof decoded.cid !== 'string' || typeof decoded.token !== 'string') {
-			throw new ApplicationError(errorMessage);
+			throw new UnexpectedError(errorMessage);
 		}
 
 		if (decoded.userId !== req.user?.id) {
@@ -201,7 +201,7 @@ export abstract class AbstractOAuthController {
 		const state = this.decodeCsrfState(encodedState, req);
 		const credential = await this.getCredentialWithoutUser(state.cid);
 		if (!credential) {
-			throw new ApplicationError('OAuth callback failed because of insufficient permissions');
+			throw new UnexpectedError('OAuth callback failed because of insufficient permissions');
 		}
 
 		const additionalData = await this.getAdditionalData();
@@ -216,7 +216,7 @@ export abstract class AbstractOAuthController {
 		);
 
 		if (!this.verifyCsrfState(decryptedDataOriginal, state)) {
-			throw new ApplicationError('The OAuth callback state is invalid!');
+			throw new UnexpectedError('The OAuth callback state is invalid!');
 		}
 
 		return [credential, decryptedDataOriginal, oauthCredentials];
diff --git a/packages/cli/src/credentials-helper.ts b/packages/cli/src/credentials-helper.ts
index 2f9e6bfbd3..a4aaaae25a 100644
--- a/packages/cli/src/credentials-helper.ts
+++ b/packages/cli/src/credentials-helper.ts
@@ -26,7 +26,7 @@ import type {
 	IExecuteData,
 	IDataObject,
 } from 'n8n-workflow';
-import { ICredentialsHelper, NodeHelpers, Workflow, ApplicationError } from 'n8n-workflow';
+import { ICredentialsHelper, NodeHelpers, Workflow, UnexpectedError } from 'n8n-workflow';
 
 import { CredentialTypes } from '@/credential-types';
 import { CredentialsOverwrites } from '@/credentials-overwrites';
@@ -65,7 +65,7 @@ const mockNodeTypes: INodeTypes = {
 	},
 	getByNameAndVersion(nodeType: string, version?: number): INodeType {
 		if (!mockNodesData[nodeType]) {
-			throw new ApplicationError(RESPONSE_ERROR_MESSAGES.NO_NODE, {
+			throw new UnexpectedError(RESPONSE_ERROR_MESSAGES.NO_NODE, {
 				tags: { nodeType },
 			});
 		}
@@ -245,7 +245,7 @@ export class CredentialsHelper extends ICredentialsHelper {
 		type: string,
 	): Promise<Credentials> {
 		if (!nodeCredential.id) {
-			throw new ApplicationError('Found credential with no ID.', {
+			throw new UnexpectedError('Found credential with no ID.', {
 				extra: { credentialName: nodeCredential.name },
 				tags: { credentialType: type },
 			});
@@ -276,7 +276,7 @@ export class CredentialsHelper extends ICredentialsHelper {
 		const credentialTypeData = this.credentialTypes.getByName(type);
 
 		if (credentialTypeData === undefined) {
-			throw new ApplicationError('Unknown credential type', { tags: { credentialType: type } });
+			throw new UnexpectedError('Unknown credential type', { tags: { credentialType: type } });
 		}
 
 		if (credentialTypeData.extends === undefined) {
diff --git a/packages/cli/src/credentials/credentials.service.ts b/packages/cli/src/credentials/credentials.service.ts
index 8564a6528c..bed039279a 100644
--- a/packages/cli/src/credentials/credentials.service.ts
+++ b/packages/cli/src/credentials/credentials.service.ts
@@ -15,7 +15,7 @@ import type {
 	ICredentialType,
 	INodeProperties,
 } from 'n8n-workflow';
-import { ApplicationError, CREDENTIAL_EMPTY_VALUE, deepCopy, NodeHelpers } from 'n8n-workflow';
+import { CREDENTIAL_EMPTY_VALUE, deepCopy, NodeHelpers, UnexpectedError } from 'n8n-workflow';
 
 import { CREDENTIAL_BLANKING_VALUE } from '@/constants';
 import { CredentialTypes } from '@/credential-types';
@@ -405,7 +405,7 @@ export class CredentialsService {
 
 			// Safe guard in case the personal project does not exist for whatever reason.
 			if (project === null) {
-				throw new ApplicationError('No personal project found');
+				throw new UnexpectedError('No personal project found');
 			}
 
 			const newSharedCredential = this.sharedCredentialsRepository.create({
diff --git a/packages/cli/src/databases/config.ts b/packages/cli/src/databases/config.ts
index 45348e0079..46398df5ca 100644
--- a/packages/cli/src/databases/config.ts
+++ b/packages/cli/src/databases/config.ts
@@ -6,7 +6,7 @@ import type { PostgresConnectionOptions } from '@n8n/typeorm/driver/postgres/Pos
 import type { SqliteConnectionOptions } from '@n8n/typeorm/driver/sqlite/SqliteConnectionOptions';
 import type { SqlitePooledConnectionOptions } from '@n8n/typeorm/driver/sqlite-pooled/SqlitePooledConnectionOptions';
 import { InstanceSettings } from 'n8n-core';
-import { ApplicationError } from 'n8n-workflow';
+import { UserError } from 'n8n-workflow';
 import path from 'path';
 import type { TlsOptions } from 'tls';
 
@@ -129,7 +129,7 @@ export function getConnectionOptions(): DataSourceOptions {
 		case 'mysqldb':
 			return getMysqlConnectionOptions(dbType);
 		default:
-			throw new ApplicationError('Database type currently not supported', { extra: { dbType } });
+			throw new UserError('Database type currently not supported', { extra: { dbType } });
 	}
 }
 
diff --git a/packages/cli/src/databases/dsl/table.ts b/packages/cli/src/databases/dsl/table.ts
index f598b674d7..76df89a33c 100644
--- a/packages/cli/src/databases/dsl/table.ts
+++ b/packages/cli/src/databases/dsl/table.ts
@@ -1,6 +1,6 @@
 import type { TableForeignKeyOptions, TableIndexOptions, QueryRunner } from '@n8n/typeorm';
 import { Table, TableColumn, TableForeignKey } from '@n8n/typeorm';
-import { ApplicationError } from 'n8n-workflow';
+import { UnexpectedError } from 'n8n-workflow';
 import LazyPromise from 'p-lazy';
 
 import { Column } from './column';
@@ -176,7 +176,7 @@ class ModifyNotNull extends TableOperation {
 	async execute(queryRunner: QueryRunner) {
 		const { tableName, prefix, columnName, isNullable } = this;
 		const table = await queryRunner.getTable(`${prefix}${tableName}`);
-		if (!table) throw new ApplicationError('No table found', { extra: { tableName } });
+		if (!table) throw new UnexpectedError('No table found', { extra: { tableName } });
 		const oldColumn = table.findColumnByName(columnName)!;
 		const newColumn = oldColumn.clone();
 		newColumn.isNullable = isNullable;
diff --git a/packages/cli/src/databases/migrations/common/1700571993961-AddGlobalAdminRole.ts b/packages/cli/src/databases/migrations/common/1700571993961-AddGlobalAdminRole.ts
index b2bd406622..29469a3738 100644
--- a/packages/cli/src/databases/migrations/common/1700571993961-AddGlobalAdminRole.ts
+++ b/packages/cli/src/databases/migrations/common/1700571993961-AddGlobalAdminRole.ts
@@ -1,4 +1,4 @@
-import { ApplicationError } from 'n8n-workflow';
+import { UnexpectedError } from 'n8n-workflow';
 
 import type { MigrationContext, ReversibleMigration } from '@/databases/types';
 
@@ -41,7 +41,7 @@ export class AddGlobalAdminRole1700571993961 implements ReversibleMigration {
 
 		const memberRoleId = memberRoleIdResult[0]?.id;
 		if (!memberRoleId) {
-			throw new ApplicationError('Could not find global member role!');
+			throw new UnexpectedError('Could not find global member role!');
 		}
 
 		await runQuery(
diff --git a/packages/cli/src/databases/migrations/common/1714133768519-CreateProject.ts b/packages/cli/src/databases/migrations/common/1714133768519-CreateProject.ts
index d7b8a2d47c..32498fcf44 100644
--- a/packages/cli/src/databases/migrations/common/1714133768519-CreateProject.ts
+++ b/packages/cli/src/databases/migrations/common/1714133768519-CreateProject.ts
@@ -1,5 +1,5 @@
 import type { ProjectRole } from '@n8n/api-types';
-import { ApplicationError } from 'n8n-workflow';
+import { UserError } from 'n8n-workflow';
 import { nanoid } from 'nanoid';
 
 import type { User } from '@/databases/entities/user';
@@ -249,7 +249,7 @@ export class CreateProject1714133768519 implements ReversibleMigration {
 			const message =
 				'Down migration only possible when there are no projects. Please delete all projects that were created via the UI first.';
 			logger.error(message);
-			throw new ApplicationError(message);
+			throw new UserError(message);
 		}
 
 		// 1. create temp table for shared workflows
diff --git a/packages/cli/src/databases/repositories/execution.repository.ts b/packages/cli/src/databases/repositories/execution.repository.ts
index 9c24cea5c2..2c2dba656c 100644
--- a/packages/cli/src/databases/repositories/execution.repository.ts
+++ b/packages/cli/src/databases/repositories/execution.repository.ts
@@ -23,7 +23,7 @@ import { DateUtils } from '@n8n/typeorm/util/DateUtils';
 import { parse, stringify } from 'flatted';
 import pick from 'lodash/pick';
 import { BinaryDataService, ErrorReporter, Logger } from 'n8n-core';
-import { ExecutionCancelledError, ApplicationError } from 'n8n-workflow';
+import { ExecutionCancelledError, UnexpectedError } from 'n8n-workflow';
 import type {
 	AnnotationVote,
 	ExecutionStatus,
@@ -206,7 +206,7 @@ export class ExecutionRepository extends Repository<ExecutionEntity> {
 		if (executions.length === 0) return;
 
 		this.errorReporter.error(
-			new ApplicationError('Found executions without executionData', {
+			new UnexpectedError('Found executions without executionData', {
 				extra: { executionIds: executions.map(({ id }) => id) },
 			}),
 		);
@@ -434,7 +434,7 @@ export class ExecutionRepository extends Repository<ExecutionEntity> {
 		},
 	) {
 		if (!deleteConditions?.deleteBefore && !deleteConditions?.ids) {
-			throw new ApplicationError(
+			throw new UnexpectedError(
 				'Either "deleteBefore" or "ids" must be present in the request body',
 			);
 		}
@@ -836,7 +836,7 @@ export class ExecutionRepository extends Repository<ExecutionEntity> {
 
 	async findManyByRangeQuery(query: ExecutionSummaries.RangeQuery): Promise<ExecutionSummary[]> {
 		if (query?.accessibleWorkflowIds?.length === 0) {
-			throw new ApplicationError('Expected accessible workflow IDs');
+			throw new UnexpectedError('Expected accessible workflow IDs');
 		}
 
 		// Due to performance reasons, we use custom query builder with raw SQL.
diff --git a/packages/cli/src/databases/subscribers/user-subscriber.ts b/packages/cli/src/databases/subscribers/user-subscriber.ts
index 485eeb6fc5..b579423424 100644
--- a/packages/cli/src/databases/subscribers/user-subscriber.ts
+++ b/packages/cli/src/databases/subscribers/user-subscriber.ts
@@ -2,7 +2,7 @@ import { Container } from '@n8n/di';
 import type { EntitySubscriberInterface, UpdateEvent } from '@n8n/typeorm';
 import { EventSubscriber } from '@n8n/typeorm';
 import { ErrorReporter, Logger } from 'n8n-core';
-import { ApplicationError } from 'n8n-workflow';
+import { UnexpectedError } from 'n8n-workflow';
 
 import { Project } from '../entities/project';
 import { User } from '../entities/user';
@@ -47,7 +47,7 @@ export class UserSubscriber implements EntitySubscriberInterface<User> {
 						// that this could cause further data inconsistencies.
 						const message = "Could not update the personal project's name";
 						Container.get(Logger).warn(message, event.entity);
-						const exception = new ApplicationError(message);
+						const exception = new UnexpectedError(message);
 						this.eventReporter.warn(exception, event.entity);
 						return;
 					}
@@ -69,7 +69,7 @@ export class UserSubscriber implements EntitySubscriberInterface<User> {
 					// that this could cause further data inconsistencies.
 					const message = "Could not update the personal project's name";
 					Container.get(Logger).warn(message, event.entity);
-					const exception = new ApplicationError(message);
+					const exception = new UnexpectedError(message);
 					this.eventReporter.warn(exception, event.entity);
 				}
 			}
diff --git a/packages/cli/src/databases/utils/migration-helpers.ts b/packages/cli/src/databases/utils/migration-helpers.ts
index e248f19c83..81e32b9eed 100644
--- a/packages/cli/src/databases/utils/migration-helpers.ts
+++ b/packages/cli/src/databases/utils/migration-helpers.ts
@@ -4,7 +4,7 @@ import type { ObjectLiteral } from '@n8n/typeorm';
 import type { QueryRunner } from '@n8n/typeorm/query-runner/QueryRunner';
 import { readFileSync, rmSync } from 'fs';
 import { InstanceSettings, Logger } from 'n8n-core';
-import { ApplicationError, jsonParse } from 'n8n-workflow';
+import { jsonParse, UnexpectedError } from 'n8n-workflow';
 
 import { inTest } from '@/constants';
 import { createSchemaBuilder } from '@/databases/dsl';
@@ -23,7 +23,7 @@ function loadSurveyFromDisk(): string | null {
 		const personalizationSurvey = JSON.parse(surveyFile) as object;
 		const kvPairs = Object.entries(personalizationSurvey);
 		if (!kvPairs.length) {
-			throw new ApplicationError('personalizationSurvey is empty');
+			throw new UnexpectedError('personalizationSurvey is empty');
 		} else {
 			const emptyKeys = kvPairs.reduce((acc, [, value]) => {
 				if (!value || (Array.isArray(value) && !value.length)) {
@@ -32,7 +32,7 @@ function loadSurveyFromDisk(): string | null {
 				return acc;
 			}, 0);
 			if (emptyKeys === kvPairs.length) {
-				throw new ApplicationError('incomplete personalizationSurvey');
+				throw new UnexpectedError('incomplete personalizationSurvey');
 			}
 		}
 		return surveyFile;
@@ -69,7 +69,7 @@ const runDisablingForeignKeys = async (
 ) => {
 	const { dbType, queryRunner } = context;
 	if (dbType !== 'sqlite')
-		throw new ApplicationError('Disabling transactions only available in sqlite');
+		throw new UnexpectedError('Disabling transactions only available in sqlite');
 	await queryRunner.query('PRAGMA foreign_keys=OFF');
 	await queryRunner.startTransaction();
 	try {
@@ -195,7 +195,7 @@ export const wrapMigration = (migration: Migration) => {
 			},
 		});
 	} else {
-		throw new ApplicationError(`Migration "${migration.name}" is missing the method \`up\`.`);
+		throw new UnexpectedError(`Migration "${migration.name}" is missing the method \`up\`.`);
 	}
 	if (down) {
 		Object.assign(migration.prototype, {
diff --git a/packages/cli/src/decorators/controller.registry.ts b/packages/cli/src/decorators/controller.registry.ts
index 645a675011..a1295cdc0d 100644
--- a/packages/cli/src/decorators/controller.registry.ts
+++ b/packages/cli/src/decorators/controller.registry.ts
@@ -3,7 +3,7 @@ import { Container, Service } from '@n8n/di';
 import { Router } from 'express';
 import type { Application, Request, Response, RequestHandler } from 'express';
 import { rateLimit as expressRateLimit } from 'express-rate-limit';
-import { ApplicationError } from 'n8n-workflow';
+import { UnexpectedError } from 'n8n-workflow';
 import type { ZodClass } from 'zod-class';
 
 import { AuthService } from '@/auth/auth.service';
@@ -100,7 +100,7 @@ export class ControllerRegistry {
 								return res.status(400).json(output.error.errors[0]);
 							}
 						}
-					} else throw new ApplicationError('Unknown arg type: ' + arg.type);
+					} else throw new UnexpectedError('Unknown arg type: ' + arg.type);
 				}
 				return await controller[handlerName](...args);
 			};
diff --git a/packages/cli/src/decorators/on-shutdown.ts b/packages/cli/src/decorators/on-shutdown.ts
index 3d17002105..08601e583e 100644
--- a/packages/cli/src/decorators/on-shutdown.ts
+++ b/packages/cli/src/decorators/on-shutdown.ts
@@ -1,5 +1,5 @@
 import { Container } from '@n8n/di';
-import { ApplicationError } from 'n8n-workflow';
+import { UnexpectedError } from 'n8n-workflow';
 
 import { DEFAULT_SHUTDOWN_PRIORITY } from '@/constants';
 import { type ServiceClass, ShutdownService } from '@/shutdown/shutdown.service';
@@ -33,7 +33,7 @@ export const OnShutdown =
 			Container.get(ShutdownService).register(priority, { serviceClass, methodName });
 		} else {
 			const name = `${serviceClass.name}.${methodName}()`;
-			throw new ApplicationError(
+			throw new UnexpectedError(
 				`${name} must be a method on ${serviceClass.name} to use "OnShutdown"`,
 			);
 		}
diff --git a/packages/cli/src/environments.ee/source-control/source-control-export.service.ee.ts b/packages/cli/src/environments.ee/source-control/source-control-export.service.ee.ts
index 9505f738a4..a46135d59e 100644
--- a/packages/cli/src/environments.ee/source-control/source-control-export.service.ee.ts
+++ b/packages/cli/src/environments.ee/source-control/source-control-export.service.ee.ts
@@ -2,7 +2,7 @@ import type { SourceControlledFile } from '@n8n/api-types';
 import { Service } from '@n8n/di';
 import { rmSync } from 'fs';
 import { Credentials, InstanceSettings, Logger } from 'n8n-core';
-import { ApplicationError, type ICredentialDataDecryptedObject } from 'n8n-workflow';
+import { UnexpectedError, type ICredentialDataDecryptedObject } from 'n8n-workflow';
 import { writeFile as fsWriteFile, rm as fsRm } from 'node:fs/promises';
 import path from 'path';
 
@@ -120,7 +120,7 @@ export class SourceControlExportService {
 				const project = sharedWorkflow.project;
 
 				if (!project) {
-					throw new ApplicationError(
+					throw new UnexpectedError(
 						`Workflow ${formatWorkflow(sharedWorkflow.workflow)} has no owner`,
 					);
 				}
@@ -130,7 +130,7 @@ export class SourceControlExportService {
 						(pr) => pr.role === 'project:personalOwner',
 					);
 					if (!ownerRelation) {
-						throw new ApplicationError(
+						throw new UnexpectedError(
 							`Workflow ${formatWorkflow(sharedWorkflow.workflow)} has no owner`,
 						);
 					}
@@ -145,7 +145,7 @@ export class SourceControlExportService {
 						teamName: project.name,
 					};
 				} else {
-					throw new ApplicationError(
+					throw new UnexpectedError(
 						`Workflow belongs to unknown project type: ${project.type as string}`,
 					);
 				}
@@ -164,8 +164,8 @@ export class SourceControlExportService {
 				})),
 			};
 		} catch (error) {
-			if (error instanceof ApplicationError) throw error;
-			throw new ApplicationError('Failed to export workflows to work folder', { cause: error });
+			if (error instanceof UnexpectedError) throw error;
+			throw new UnexpectedError('Failed to export workflows to work folder', { cause: error });
 		}
 	}
 
@@ -195,7 +195,7 @@ export class SourceControlExportService {
 				],
 			};
 		} catch (error) {
-			throw new ApplicationError('Failed to export variables to work folder', {
+			throw new UnexpectedError('Failed to export variables to work folder', {
 				cause: error,
 			});
 		}
@@ -237,7 +237,7 @@ export class SourceControlExportService {
 				],
 			};
 		} catch (error) {
-			throw new ApplicationError('Failed to export variables to work folder', { cause: error });
+			throw new UnexpectedError('Failed to export variables to work folder', { cause: error });
 		}
 	}
 
@@ -336,7 +336,7 @@ export class SourceControlExportService {
 				missingIds,
 			};
 		} catch (error) {
-			throw new ApplicationError('Failed to export credentials to work folder', { cause: error });
+			throw new UnexpectedError('Failed to export credentials to work folder', { cause: error });
 		}
 	}
 }
diff --git a/packages/cli/src/environments.ee/source-control/source-control-git.service.ee.ts b/packages/cli/src/environments.ee/source-control/source-control-git.service.ee.ts
index 01aaf78c68..892cd9c425 100644
--- a/packages/cli/src/environments.ee/source-control/source-control-git.service.ee.ts
+++ b/packages/cli/src/environments.ee/source-control/source-control-git.service.ee.ts
@@ -1,7 +1,7 @@
 import { Service } from '@n8n/di';
 import { execSync } from 'child_process';
 import { Logger } from 'n8n-core';
-import { ApplicationError } from 'n8n-workflow';
+import { UnexpectedError } from 'n8n-workflow';
 import path from 'path';
 import type {
 	CommitResult,
@@ -51,7 +51,7 @@ export class SourceControlGitService {
 			});
 			this.logger.debug(`Git binary found: ${gitResult.toString()}`);
 		} catch (error) {
-			throw new ApplicationError('Git binary not found', { cause: error });
+			throw new UnexpectedError('Git binary not found', { cause: error });
 		}
 		try {
 			const sshResult = execSync('ssh -V', {
@@ -59,7 +59,7 @@ export class SourceControlGitService {
 			});
 			this.logger.debug(`SSH binary found: ${sshResult.toString()}`);
 		} catch (error) {
-			throw new ApplicationError('SSH binary not found', { cause: error });
+			throw new UnexpectedError('SSH binary not found', { cause: error });
 		}
 		return true;
 	}
@@ -126,7 +126,7 @@ export class SourceControlGitService {
 
 	private async checkRepositorySetup(): Promise<boolean> {
 		if (!this.git) {
-			throw new ApplicationError('Git is not initialized (async)');
+			throw new UnexpectedError('Git is not initialized (async)');
 		}
 		if (!(await this.git.checkIsRepo())) {
 			return false;
@@ -141,7 +141,7 @@ export class SourceControlGitService {
 
 	private async hasRemote(remote: string): Promise<boolean> {
 		if (!this.git) {
-			throw new ApplicationError('Git is not initialized (async)');
+			throw new UnexpectedError('Git is not initialized (async)');
 		}
 		try {
 			const remotes = await this.git.getRemotes(true);
@@ -153,7 +153,7 @@ export class SourceControlGitService {
 				return true;
 			}
 		} catch (error) {
-			throw new ApplicationError('Git is not initialized', { cause: error });
+			throw new UnexpectedError('Git is not initialized', { cause: error });
 		}
 		this.logger.debug(`Git remote not found: ${remote}`);
 		return false;
@@ -167,7 +167,7 @@ export class SourceControlGitService {
 		user: User,
 	): Promise<void> {
 		if (!this.git) {
-			throw new ApplicationError('Git is not initialized (Promise)');
+			throw new UnexpectedError('Git is not initialized (Promise)');
 		}
 		if (sourceControlPreferences.initRepo) {
 			try {
@@ -231,7 +231,7 @@ export class SourceControlGitService {
 
 	async setGitUserDetails(name: string, email: string): Promise<void> {
 		if (!this.git) {
-			throw new ApplicationError('Git is not initialized (setGitUserDetails)');
+			throw new UnexpectedError('Git is not initialized (setGitUserDetails)');
 		}
 		await this.git.addConfig('user.email', email);
 		await this.git.addConfig('user.name', name);
@@ -239,7 +239,7 @@ export class SourceControlGitService {
 
 	async getBranches(): Promise<{ branches: string[]; currentBranch: string }> {
 		if (!this.git) {
-			throw new ApplicationError('Git is not initialized (getBranches)');
+			throw new UnexpectedError('Git is not initialized (getBranches)');
 		}
 
 		try {
@@ -256,13 +256,13 @@ export class SourceControlGitService {
 				currentBranch: current,
 			};
 		} catch (error) {
-			throw new ApplicationError('Could not get remote branches from repository', { cause: error });
+			throw new UnexpectedError('Could not get remote branches from repository', { cause: error });
 		}
 	}
 
 	async setBranch(branch: string): Promise<{ branches: string[]; currentBranch: string }> {
 		if (!this.git) {
-			throw new ApplicationError('Git is not initialized (setBranch)');
+			throw new UnexpectedError('Git is not initialized (setBranch)');
 		}
 		await this.git.checkout(branch);
 		await this.git.branch([`--set-upstream-to=${SOURCE_CONTROL_ORIGIN}/${branch}`, branch]);
@@ -271,7 +271,7 @@ export class SourceControlGitService {
 
 	async getCurrentBranch(): Promise<{ current: string; remote: string }> {
 		if (!this.git) {
-			throw new ApplicationError('Git is not initialized (getCurrentBranch)');
+			throw new UnexpectedError('Git is not initialized (getCurrentBranch)');
 		}
 		const currentBranch = (await this.git.branch()).current;
 		return {
@@ -282,7 +282,7 @@ export class SourceControlGitService {
 
 	async diffRemote(): Promise<DiffResult | undefined> {
 		if (!this.git) {
-			throw new ApplicationError('Git is not initialized (diffRemote)');
+			throw new UnexpectedError('Git is not initialized (diffRemote)');
 		}
 		const currentBranch = await this.getCurrentBranch();
 		if (currentBranch.remote) {
@@ -294,7 +294,7 @@ export class SourceControlGitService {
 
 	async diffLocal(): Promise<DiffResult | undefined> {
 		if (!this.git) {
-			throw new ApplicationError('Git is not initialized (diffLocal)');
+			throw new UnexpectedError('Git is not initialized (diffLocal)');
 		}
 		const currentBranch = await this.getCurrentBranch();
 		if (currentBranch.remote) {
@@ -306,7 +306,7 @@ export class SourceControlGitService {
 
 	async fetch(): Promise<FetchResult> {
 		if (!this.git) {
-			throw new ApplicationError('Git is not initialized (fetch)');
+			throw new UnexpectedError('Git is not initialized (fetch)');
 		}
 		await this.setGitSshCommand();
 		return await this.git.fetch();
@@ -314,7 +314,7 @@ export class SourceControlGitService {
 
 	async pull(options: { ffOnly: boolean } = { ffOnly: true }): Promise<PullResult> {
 		if (!this.git) {
-			throw new ApplicationError('Git is not initialized (pull)');
+			throw new UnexpectedError('Git is not initialized (pull)');
 		}
 		await this.setGitSshCommand();
 		const params = {};
@@ -332,7 +332,7 @@ export class SourceControlGitService {
 	): Promise<PushResult> {
 		const { force, branch } = options;
 		if (!this.git) {
-			throw new ApplicationError('Git is not initialized ({)');
+			throw new UnexpectedError('Git is not initialized ({)');
 		}
 		await this.setGitSshCommand();
 		if (force) {
@@ -343,7 +343,7 @@ export class SourceControlGitService {
 
 	async stage(files: Set<string>, deletedFiles?: Set<string>): Promise<string> {
 		if (!this.git) {
-			throw new ApplicationError('Git is not initialized (stage)');
+			throw new UnexpectedError('Git is not initialized (stage)');
 		}
 		if (deletedFiles?.size) {
 			try {
@@ -359,7 +359,7 @@ export class SourceControlGitService {
 		options: { hard: boolean; target: string } = { hard: true, target: 'HEAD' },
 	): Promise<string> {
 		if (!this.git) {
-			throw new ApplicationError('Git is not initialized (Promise)');
+			throw new UnexpectedError('Git is not initialized (Promise)');
 		}
 		if (options?.hard) {
 			return await this.git.raw(['reset', '--hard', options.target]);
@@ -371,14 +371,14 @@ export class SourceControlGitService {
 
 	async commit(message: string): Promise<CommitResult> {
 		if (!this.git) {
-			throw new ApplicationError('Git is not initialized (commit)');
+			throw new UnexpectedError('Git is not initialized (commit)');
 		}
 		return await this.git.commit(message);
 	}
 
 	async status(): Promise<StatusResult> {
 		if (!this.git) {
-			throw new ApplicationError('Git is not initialized (status)');
+			throw new UnexpectedError('Git is not initialized (status)');
 		}
 		const statusResult = await this.git.status();
 		return statusResult;
diff --git a/packages/cli/src/environments.ee/source-control/source-control-helper.ee.ts b/packages/cli/src/environments.ee/source-control/source-control-helper.ee.ts
index 45ca38ed96..8e98fbdc8e 100644
--- a/packages/cli/src/environments.ee/source-control/source-control-helper.ee.ts
+++ b/packages/cli/src/environments.ee/source-control/source-control-helper.ee.ts
@@ -3,7 +3,7 @@ import { Container } from '@n8n/di';
 import { generateKeyPairSync } from 'crypto';
 import { constants as fsConstants, mkdirSync, accessSync } from 'fs';
 import { Logger } from 'n8n-core';
-import { ApplicationError } from 'n8n-workflow';
+import { UserError } from 'n8n-workflow';
 import { ok } from 'node:assert/strict';
 import path from 'path';
 
@@ -171,7 +171,7 @@ export function getTrackingInformationFromPostPushResult(result: SourceControlle
  * Normalizes and validates the given source controlled file path. Ensures
  * the path is absolute and contained within the git folder.
  *
- * @throws {ApplicationError} If the path is not within the git folder
+ * @throws {UserError} If the path is not within the git folder
  */
 export function normalizeAndValidateSourceControlledFilePath(
 	gitFolderPath: string,
@@ -182,7 +182,7 @@ export function normalizeAndValidateSourceControlledFilePath(
 	const normalizedPath = path.isAbsolute(filePath) ? filePath : path.join(gitFolderPath, filePath);
 
 	if (!isContainedWithin(gitFolderPath, filePath)) {
-		throw new ApplicationError(`File path ${filePath} is invalid`);
+		throw new UserError(`File path ${filePath} is invalid`);
 	}
 
 	return normalizedPath;
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 3c416c0b4c..aba8d16eaa 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
@@ -4,7 +4,7 @@ import { Service } from '@n8n/di';
 import { In } from '@n8n/typeorm';
 import glob from 'fast-glob';
 import { Credentials, ErrorReporter, InstanceSettings, Logger } from 'n8n-core';
-import { ApplicationError, jsonParse, ensureError } from 'n8n-workflow';
+import { jsonParse, ensureError, UserError, UnexpectedError } from 'n8n-workflow';
 import { readFile as fsReadFile } from 'node:fs/promises';
 import path from 'path';
 
@@ -250,7 +250,7 @@ export class SourceControlImportService {
 			this.logger.debug(`Updating workflow id ${importedWorkflow.id ?? 'new'}`);
 			const upsertResult = await this.workflowRepository.upsert({ ...importedWorkflow }, ['id']);
 			if (upsertResult?.identifiers?.length !== 1) {
-				throw new ApplicationError('Failed to upsert workflow', {
+				throw new UnexpectedError('Failed to upsert workflow', {
 					extra: { workflowId: importedWorkflow.id ?? 'new' },
 				});
 			}
@@ -411,7 +411,7 @@ export class SourceControlImportService {
 					select: ['id'],
 				});
 				if (findByName && findByName.id !== tag.id) {
-					throw new ApplicationError(
+					throw new UserError(
 						`A tag with the name <strong>${tag.name}</strong> already exists locally.<br />Please either rename the local tag, or the remote one with the id <strong>${tag.id}</strong> in the tags.json file.`,
 					);
 				}
@@ -570,7 +570,7 @@ export class SourceControlImportService {
 		assertNever(owner);
 
 		const errorOwner = owner as ResourceOwner;
-		throw new ApplicationError(
+		throw new UnexpectedError(
 			`Unknown resource owner type "${
 				typeof errorOwner !== 'string' ? errorOwner.type : 'UNKNOWN'
 			}" found when importing from source controller`,
diff --git a/packages/cli/src/environments.ee/source-control/source-control-preferences.service.ee.ts b/packages/cli/src/environments.ee/source-control/source-control-preferences.service.ee.ts
index d424a844b2..5ae7068a5e 100644
--- a/packages/cli/src/environments.ee/source-control/source-control-preferences.service.ee.ts
+++ b/packages/cli/src/environments.ee/source-control/source-control-preferences.service.ee.ts
@@ -3,7 +3,7 @@ import type { ValidationError } from 'class-validator';
 import { validate } from 'class-validator';
 import { rm as fsRm } from 'fs/promises';
 import { Cipher, InstanceSettings, Logger } from 'n8n-core';
-import { ApplicationError, jsonParse } from 'n8n-workflow';
+import { jsonParse, UnexpectedError } from 'n8n-workflow';
 import { writeFile, chmod, readFile } from 'node:fs/promises';
 import path from 'path';
 
@@ -78,7 +78,7 @@ export class SourceControlPreferencesService {
 	private async getPrivateKeyFromDatabase() {
 		const dbKeyPair = await this.getKeyPairFromDatabase();
 
-		if (!dbKeyPair) throw new ApplicationError('Failed to find key pair in database');
+		if (!dbKeyPair) throw new UnexpectedError('Failed to find key pair in database');
 
 		return this.cipher.decrypt(dbKeyPair.encryptedPrivateKey);
 	}
@@ -86,7 +86,7 @@ export class SourceControlPreferencesService {
 	private async getPublicKeyFromDatabase() {
 		const dbKeyPair = await this.getKeyPairFromDatabase();
 
-		if (!dbKeyPair) throw new ApplicationError('Failed to find key pair in database');
+		if (!dbKeyPair) throw new UnexpectedError('Failed to find key pair in database');
 
 		return dbKeyPair.publicKey;
 	}
@@ -147,7 +147,7 @@ export class SourceControlPreferencesService {
 				loadOnStartup: true,
 			});
 		} catch (error) {
-			throw new ApplicationError('Failed to write key pair to database', { cause: error });
+			throw new UnexpectedError('Failed to write key pair to database', { cause: error });
 		}
 
 		// update preferences only after generating key pair to prevent endless loop
@@ -190,7 +190,7 @@ export class SourceControlPreferencesService {
 			validationError: { target: false },
 		});
 		if (validationResult.length > 0) {
-			throw new ApplicationError('Invalid source control preferences', {
+			throw new UnexpectedError('Invalid source control preferences', {
 				extra: { preferences: validationResult },
 			});
 		}
@@ -218,7 +218,7 @@ export class SourceControlPreferencesService {
 					{ transaction: false },
 				);
 			} catch (error) {
-				throw new ApplicationError('Failed to save source control preferences', { cause: error });
+				throw new UnexpectedError('Failed to save source control preferences', { cause: error });
 			}
 		}
 		return this.sourceControlPreferences;
diff --git a/packages/cli/src/environments.ee/source-control/source-control.service.ee.ts b/packages/cli/src/environments.ee/source-control/source-control.service.ee.ts
index 2bd040ee3a..2a04a58353 100644
--- a/packages/cli/src/environments.ee/source-control/source-control.service.ee.ts
+++ b/packages/cli/src/environments.ee/source-control/source-control.service.ee.ts
@@ -6,7 +6,7 @@ import type {
 import { Service } from '@n8n/di';
 import { writeFileSync } from 'fs';
 import { Logger } from 'n8n-core';
-import { ApplicationError } from 'n8n-workflow';
+import { UnexpectedError, UserError } from 'n8n-workflow';
 import path from 'path';
 import type { PushResult } from 'simple-git';
 
@@ -90,7 +90,7 @@ export class SourceControlService {
 				false,
 			);
 			if (!foldersExisted) {
-				throw new ApplicationError('No folders exist');
+				throw new UserError('No folders exist');
 			}
 			if (!this.gitService.git) {
 				await this.initGitService();
@@ -101,7 +101,7 @@ export class SourceControlService {
 				branches.current !==
 					this.sourceControlPreferencesService.sourceControlPreferences.branchName
 			) {
-				throw new ApplicationError('Branch is not set up correctly');
+				throw new UserError('Branch is not set up correctly');
 			}
 		} catch (error) {
 			throw new BadRequestError(
@@ -123,7 +123,7 @@ export class SourceControlService {
 			this.gitService.resetService();
 			return this.sourceControlPreferencesService.sourceControlPreferences;
 		} catch (error) {
-			throw new ApplicationError('Failed to disconnect from source control', { cause: error });
+			throw new UnexpectedError('Failed to disconnect from source control', { cause: error });
 		}
 	}
 
@@ -202,7 +202,7 @@ export class SourceControlService {
 			await this.gitService.pull();
 		} catch (error) {
 			this.logger.error(`Failed to reset workfolder: ${(error as Error).message}`);
-			throw new ApplicationError(
+			throw new UserError(
 				'Unable to fetch updates from git - your folder might be out of sync. Try reconnecting from the Source Control settings page.',
 			);
 		}
diff --git a/packages/cli/src/errors/aborted-execution-retry.error.ts b/packages/cli/src/errors/aborted-execution-retry.error.ts
index 20d8b57e14..88ba834ee0 100644
--- a/packages/cli/src/errors/aborted-execution-retry.error.ts
+++ b/packages/cli/src/errors/aborted-execution-retry.error.ts
@@ -1,9 +1,7 @@
-import { ApplicationError } from 'n8n-workflow';
+import { UnexpectedError } from 'n8n-workflow';
 
-export class AbortedExecutionRetryError extends ApplicationError {
+export class AbortedExecutionRetryError extends UnexpectedError {
 	constructor() {
-		super('The execution was aborted before starting, so it cannot be retried', {
-			level: 'warning',
-		});
+		super('The execution was aborted before starting, so it cannot be retried');
 	}
 }
diff --git a/packages/cli/src/errors/cache-errors/malformed-refresh-value.error.ts b/packages/cli/src/errors/cache-errors/malformed-refresh-value.error.ts
index 178cbc8582..e008bce831 100644
--- a/packages/cli/src/errors/cache-errors/malformed-refresh-value.error.ts
+++ b/packages/cli/src/errors/cache-errors/malformed-refresh-value.error.ts
@@ -1,6 +1,6 @@
-import { ApplicationError } from 'n8n-workflow';
+import { UnexpectedError } from 'n8n-workflow';
 
-export class MalformedRefreshValueError extends ApplicationError {
+export class MalformedRefreshValueError extends UnexpectedError {
 	constructor() {
 		super('Refresh value must have the same number of values as keys');
 	}
diff --git a/packages/cli/src/errors/cache-errors/uncacheable-value.error.ts b/packages/cli/src/errors/cache-errors/uncacheable-value.error.ts
index 7888ee97b2..83f859e99d 100644
--- a/packages/cli/src/errors/cache-errors/uncacheable-value.error.ts
+++ b/packages/cli/src/errors/cache-errors/uncacheable-value.error.ts
@@ -1,6 +1,6 @@
-import { ApplicationError } from 'n8n-workflow';
+import { UnexpectedError } from 'n8n-workflow';
 
-export class UncacheableValueError extends ApplicationError {
+export class UncacheableValueError extends UnexpectedError {
 	constructor(key: string) {
 		super('Value cannot be cached in Redis', {
 			extra: { key, hint: 'Does the value contain circular references?' },
diff --git a/packages/cli/src/errors/credential-not-found.error.ts b/packages/cli/src/errors/credential-not-found.error.ts
index ac47a0eaea..28829a397d 100644
--- a/packages/cli/src/errors/credential-not-found.error.ts
+++ b/packages/cli/src/errors/credential-not-found.error.ts
@@ -1,8 +1,7 @@
-import { ApplicationError } from 'n8n-workflow';
+import { UserError } from 'n8n-workflow';
 
-export class CredentialNotFoundError extends ApplicationError {
+export class CredentialNotFoundError extends UserError {
 	constructor(credentialId: string, credentialType: string) {
 		super(`Credential with ID "${credentialId}" does not exist for type "${credentialType}".`);
-		this.level = 'warning';
 	}
 }
diff --git a/packages/cli/src/errors/credentials-overwrites-already-set.error.ts b/packages/cli/src/errors/credentials-overwrites-already-set.error.ts
index 4c7534c4c1..84480d641a 100644
--- a/packages/cli/src/errors/credentials-overwrites-already-set.error.ts
+++ b/packages/cli/src/errors/credentials-overwrites-already-set.error.ts
@@ -1,6 +1,6 @@
-import { ApplicationError } from 'n8n-workflow';
+import { UserError } from 'n8n-workflow';
 
-export class CredentialsOverwritesAlreadySetError extends ApplicationError {
+export class CredentialsOverwritesAlreadySetError extends UserError {
 	constructor() {
 		super('Credentials overwrites may not be set more than once.');
 	}
diff --git a/packages/cli/src/errors/deduplication.error.ts b/packages/cli/src/errors/deduplication.error.ts
index 8e9173abb9..996a41fc36 100644
--- a/packages/cli/src/errors/deduplication.error.ts
+++ b/packages/cli/src/errors/deduplication.error.ts
@@ -1,6 +1,6 @@
-import { ApplicationError } from 'n8n-workflow';
+import { UnexpectedError } from 'n8n-workflow';
 
-export class DeduplicationError extends ApplicationError {
+export class DeduplicationError extends UnexpectedError {
 	constructor(message: string) {
 		super(`Deduplication Failed: ${message}`);
 	}
diff --git a/packages/cli/src/errors/execution-not-found-error.ts b/packages/cli/src/errors/execution-not-found-error.ts
index 45e0f02033..f6e6f3a7c4 100644
--- a/packages/cli/src/errors/execution-not-found-error.ts
+++ b/packages/cli/src/errors/execution-not-found-error.ts
@@ -1,6 +1,6 @@
-import { ApplicationError } from 'n8n-workflow';
+import { UnexpectedError } from 'n8n-workflow';
 
-export class ExecutionNotFoundError extends ApplicationError {
+export class ExecutionNotFoundError extends UnexpectedError {
 	constructor(executionId: string) {
 		super('No active execution found', { extra: { executionId } });
 	}
diff --git a/packages/cli/src/errors/external-secrets-provider-not-found.error.ts b/packages/cli/src/errors/external-secrets-provider-not-found.error.ts
index 422236d148..92fd1384a4 100644
--- a/packages/cli/src/errors/external-secrets-provider-not-found.error.ts
+++ b/packages/cli/src/errors/external-secrets-provider-not-found.error.ts
@@ -1,6 +1,6 @@
-import { ApplicationError } from 'n8n-workflow';
+import { UnexpectedError } from 'n8n-workflow';
 
-export class ExternalSecretsProviderNotFoundError extends ApplicationError {
+export class ExternalSecretsProviderNotFoundError extends UnexpectedError {
 	constructor(public providerName: string) {
 		super(`External secrets provider not found: ${providerName}`);
 	}
diff --git a/packages/cli/src/errors/feature-not-licensed.error.ts b/packages/cli/src/errors/feature-not-licensed.error.ts
index aa53655154..0c264777e5 100644
--- a/packages/cli/src/errors/feature-not-licensed.error.ts
+++ b/packages/cli/src/errors/feature-not-licensed.error.ts
@@ -1,8 +1,8 @@
-import { ApplicationError } from 'n8n-workflow';
+import { UserError } from 'n8n-workflow';
 
 import type { LICENSE_FEATURES } from '@/constants';
 
-export class FeatureNotLicensedError extends ApplicationError {
+export class FeatureNotLicensedError extends UserError {
 	constructor(feature: (typeof LICENSE_FEATURES)[keyof typeof LICENSE_FEATURES]) {
 		super(
 			`Your license does not allow for ${feature}. To enable ${feature}, please upgrade to a license that supports this feature.`,
diff --git a/packages/cli/src/errors/invalid-concurrency-limit.error.ts b/packages/cli/src/errors/invalid-concurrency-limit.error.ts
index 3f59373525..48c584b8b0 100644
--- a/packages/cli/src/errors/invalid-concurrency-limit.error.ts
+++ b/packages/cli/src/errors/invalid-concurrency-limit.error.ts
@@ -1,7 +1,7 @@
-import { ApplicationError } from 'n8n-workflow';
+import { UserError } from 'n8n-workflow';
 
-export class InvalidConcurrencyLimitError extends ApplicationError {
+export class InvalidConcurrencyLimitError extends UserError {
 	constructor(value: number) {
-		super('Concurrency limit set to invalid value', { level: 'warning', extra: { value } });
+		super('Concurrency limit set to invalid value', { extra: { value } });
 	}
 }
diff --git a/packages/cli/src/errors/invalid-role.error.ts b/packages/cli/src/errors/invalid-role.error.ts
index fc5ebb8aa9..7e14bdc2e1 100644
--- a/packages/cli/src/errors/invalid-role.error.ts
+++ b/packages/cli/src/errors/invalid-role.error.ts
@@ -1,3 +1,3 @@
-import { ApplicationError } from 'n8n-workflow';
+import { UnexpectedError } from 'n8n-workflow';
 
-export class InvalidRoleError extends ApplicationError {}
+export class InvalidRoleError extends UnexpectedError {}
diff --git a/packages/cli/src/errors/max-stalled-count.error.ts b/packages/cli/src/errors/max-stalled-count.error.ts
index 38f73023a7..4e92fad405 100644
--- a/packages/cli/src/errors/max-stalled-count.error.ts
+++ b/packages/cli/src/errors/max-stalled-count.error.ts
@@ -1,9 +1,9 @@
-import { ApplicationError } from 'n8n-workflow';
+import { OperationalError } from 'n8n-workflow';
 
 /**
  * @docs https://docs.bullmq.io/guide/workers/stalled-jobs
  */
-export class MaxStalledCountError extends ApplicationError {
+export class MaxStalledCountError extends OperationalError {
 	constructor(cause: Error) {
 		super(
 			'This execution failed to be processed too many times and will no longer retry. To allow this execution to complete, please break down your workflow or scale up your workers or adjust your worker settings.',
diff --git a/packages/cli/src/errors/missing-execution-stop.error.ts b/packages/cli/src/errors/missing-execution-stop.error.ts
index 3662cc4a72..be8dea8302 100644
--- a/packages/cli/src/errors/missing-execution-stop.error.ts
+++ b/packages/cli/src/errors/missing-execution-stop.error.ts
@@ -1,6 +1,6 @@
-import { ApplicationError } from 'n8n-workflow';
+import { UserError } from 'n8n-workflow';
 
-export class MissingExecutionStopError extends ApplicationError {
+export class MissingExecutionStopError extends UserError {
 	constructor(executionId: string) {
 		super('Failed to find execution to stop', { extra: { executionId } });
 	}
diff --git a/packages/cli/src/errors/non-json-body.error.ts b/packages/cli/src/errors/non-json-body.error.ts
index cd2086dbf5..b6da36aead 100644
--- a/packages/cli/src/errors/non-json-body.error.ts
+++ b/packages/cli/src/errors/non-json-body.error.ts
@@ -1,6 +1,6 @@
-import { ApplicationError } from 'n8n-workflow';
+import { UserError } from 'n8n-workflow';
 
-export class NonJsonBodyError extends ApplicationError {
+export class NonJsonBodyError extends UserError {
 	constructor() {
 		super('Body must be valid JSON. Please make sure `content-type` is `application/json`.');
 	}
diff --git a/packages/cli/src/errors/not-string-array.error.ts b/packages/cli/src/errors/not-string-array.error.ts
index 22e9fae902..7a9c2f1bc6 100644
--- a/packages/cli/src/errors/not-string-array.error.ts
+++ b/packages/cli/src/errors/not-string-array.error.ts
@@ -1,6 +1,6 @@
-import { ApplicationError } from 'n8n-workflow';
+import { UserError } from 'n8n-workflow';
 
-export class NotStringArrayError extends ApplicationError {
+export class NotStringArrayError extends UserError {
 	constructor(env: string) {
 		super(`${env} is not a string array.`);
 	}
diff --git a/packages/cli/src/errors/postgres-live-rows-retrieval.error.ts b/packages/cli/src/errors/postgres-live-rows-retrieval.error.ts
index ea97f80684..0bd59000cb 100644
--- a/packages/cli/src/errors/postgres-live-rows-retrieval.error.ts
+++ b/packages/cli/src/errors/postgres-live-rows-retrieval.error.ts
@@ -1,6 +1,6 @@
-import { ApplicationError } from 'n8n-workflow';
+import { UnexpectedError } from 'n8n-workflow';
 
-export class PostgresLiveRowsRetrievalError extends ApplicationError {
+export class PostgresLiveRowsRetrievalError extends UnexpectedError {
 	constructor(rows: unknown) {
 		super('Failed to retrieve live execution rows in Postgres', { extra: { rows } });
 	}
diff --git a/packages/cli/src/errors/queued-execution-retry.error.ts b/packages/cli/src/errors/queued-execution-retry.error.ts
index a3c0bcb588..9ccd17732c 100644
--- a/packages/cli/src/errors/queued-execution-retry.error.ts
+++ b/packages/cli/src/errors/queued-execution-retry.error.ts
@@ -1,9 +1,7 @@
-import { ApplicationError } from 'n8n-workflow';
+import { UnexpectedError } from 'n8n-workflow';
 
-export class QueuedExecutionRetryError extends ApplicationError {
+export class QueuedExecutionRetryError extends UnexpectedError {
 	constructor() {
-		super('Execution is queued to run (not yet started) so it cannot be retried', {
-			level: 'warning',
-		});
+		super('Execution is queued to run (not yet started) so it cannot be retried');
 	}
 }
diff --git a/packages/cli/src/errors/redactable.error.ts b/packages/cli/src/errors/redactable.error.ts
index 0d5b07ac50..ecc492d22b 100644
--- a/packages/cli/src/errors/redactable.error.ts
+++ b/packages/cli/src/errors/redactable.error.ts
@@ -1,6 +1,6 @@
-import { ApplicationError } from 'n8n-workflow';
+import { UnexpectedError } from 'n8n-workflow';
 
-export class RedactableError extends ApplicationError {
+export class RedactableError extends UnexpectedError {
 	constructor(fieldName: string, args: string) {
 		super(
 			`Failed to find "${fieldName}" property in argument "${args.toString()}". Please set the decorator \`@Redactable()\` only on \`LogStreamingEventRelay\` methods where the argument contains a "${fieldName}" property.`,
diff --git a/packages/cli/src/errors/response-errors/abstract/response.error.ts b/packages/cli/src/errors/response-errors/abstract/response.error.ts
index fa7d4a8b06..3d96ff1f62 100644
--- a/packages/cli/src/errors/response-errors/abstract/response.error.ts
+++ b/packages/cli/src/errors/response-errors/abstract/response.error.ts
@@ -1,9 +1,9 @@
-import { ApplicationError } from 'n8n-workflow';
+import { BaseError } from 'n8n-workflow';
 
 /**
  * Special Error which allows to return also an error code and http status code
  */
-export abstract class ResponseError extends ApplicationError {
+export abstract class ResponseError extends BaseError {
 	/**
 	 * Creates an instance of ResponseError.
 	 * Must be used inside a block with `ResponseHelper.send()`.
@@ -20,5 +20,13 @@ export abstract class ResponseError extends ApplicationError {
 	) {
 		super(message, { cause });
 		this.name = 'ResponseError';
+
+		if (httpStatusCode >= 400 && httpStatusCode < 500) {
+			this.level = 'warning'; // client errors (4xx)
+		} else if (httpStatusCode >= 502 && httpStatusCode <= 504) {
+			this.level = 'info'; // transient errors (502, 503, 504)
+		} else {
+			this.level = 'error'; // other 5xx
+		}
 	}
 }
diff --git a/packages/cli/src/errors/shared-workflow-not-found.error.ts b/packages/cli/src/errors/shared-workflow-not-found.error.ts
index ae4c99f3f3..f9b9d6564e 100644
--- a/packages/cli/src/errors/shared-workflow-not-found.error.ts
+++ b/packages/cli/src/errors/shared-workflow-not-found.error.ts
@@ -1,3 +1,3 @@
-import { ApplicationError } from 'n8n-workflow';
+import { UserError } from 'n8n-workflow';
 
-export class SharedWorkflowNotFoundError extends ApplicationError {}
+export class SharedWorkflowNotFoundError extends UserError {}
diff --git a/packages/cli/src/errors/unknown-auth-type.error.ts b/packages/cli/src/errors/unknown-auth-type.error.ts
index b8ac45bf8e..0c40ff135d 100644
--- a/packages/cli/src/errors/unknown-auth-type.error.ts
+++ b/packages/cli/src/errors/unknown-auth-type.error.ts
@@ -1,6 +1,6 @@
-import { ApplicationError } from 'n8n-workflow';
+import { UnexpectedError } from 'n8n-workflow';
 
-export class UnknownAuthTypeError extends ApplicationError {
+export class UnknownAuthTypeError extends UnexpectedError {
 	constructor(authType: string) {
 		super('Unknown auth type', { extra: { authType } });
 	}
diff --git a/packages/cli/src/errors/unknown-execution-mode.error.ts b/packages/cli/src/errors/unknown-execution-mode.error.ts
index 8350bfa4af..8b30b4fec8 100644
--- a/packages/cli/src/errors/unknown-execution-mode.error.ts
+++ b/packages/cli/src/errors/unknown-execution-mode.error.ts
@@ -1,6 +1,6 @@
-import { ApplicationError } from 'n8n-workflow';
+import { UnexpectedError } from 'n8n-workflow';
 
-export class UnknownExecutionModeError extends ApplicationError {
+export class UnknownExecutionModeError extends UnexpectedError {
 	constructor(mode: string) {
 		super('Unknown execution mode', { extra: { mode } });
 	}
diff --git a/packages/cli/src/errors/variable-count-limit-reached.error.ts b/packages/cli/src/errors/variable-count-limit-reached.error.ts
index 67d14efebf..ac1bdc0059 100644
--- a/packages/cli/src/errors/variable-count-limit-reached.error.ts
+++ b/packages/cli/src/errors/variable-count-limit-reached.error.ts
@@ -1,3 +1,3 @@
-import { ApplicationError } from 'n8n-workflow';
+import { UserError } from 'n8n-workflow';
 
-export class VariableCountLimitReachedError extends ApplicationError {}
+export class VariableCountLimitReachedError extends UserError {}
diff --git a/packages/cli/src/errors/variable-validation.error.ts b/packages/cli/src/errors/variable-validation.error.ts
index bd2026e7ef..4e5a97407e 100644
--- a/packages/cli/src/errors/variable-validation.error.ts
+++ b/packages/cli/src/errors/variable-validation.error.ts
@@ -1,3 +1,3 @@
-import { ApplicationError } from 'n8n-workflow';
+import { UnexpectedError } from 'n8n-workflow';
 
-export class VariableValidationError extends ApplicationError {}
+export class VariableValidationError extends UnexpectedError {}
diff --git a/packages/cli/src/errors/worker-missing-encryption-key.error.ts b/packages/cli/src/errors/worker-missing-encryption-key.error.ts
index 29b8dad929..788b982baf 100644
--- a/packages/cli/src/errors/worker-missing-encryption-key.error.ts
+++ b/packages/cli/src/errors/worker-missing-encryption-key.error.ts
@@ -1,6 +1,6 @@
-import { ApplicationError } from 'n8n-workflow';
+import { UserError } from 'n8n-workflow';
 
-export class WorkerMissingEncryptionKey extends ApplicationError {
+export class WorkerMissingEncryptionKey extends UserError {
 	constructor() {
 		super(
 			[
@@ -8,7 +8,6 @@ export class WorkerMissingEncryptionKey extends ApplicationError {
 				'Please set the `N8N_ENCRYPTION_KEY` env var when starting the worker.',
 				'See: https://docs.n8n.io/hosting/configuration/configuration-examples/encryption-key/',
 			].join(' '),
-			{ level: 'warning' },
 		);
 	}
 }
diff --git a/packages/cli/src/errors/workflow-history-version-not-found.error.ts b/packages/cli/src/errors/workflow-history-version-not-found.error.ts
index 104385672f..177ee22d9a 100644
--- a/packages/cli/src/errors/workflow-history-version-not-found.error.ts
+++ b/packages/cli/src/errors/workflow-history-version-not-found.error.ts
@@ -1,3 +1,3 @@
-import { ApplicationError } from 'n8n-workflow';
+import { UnexpectedError } from 'n8n-workflow';
 
-export class WorkflowHistoryVersionNotFoundError extends ApplicationError {}
+export class WorkflowHistoryVersionNotFoundError extends UnexpectedError {}
diff --git a/packages/cli/src/errors/workflow-missing-id.error.ts b/packages/cli/src/errors/workflow-missing-id.error.ts
index fe9db748a6..c709b75356 100644
--- a/packages/cli/src/errors/workflow-missing-id.error.ts
+++ b/packages/cli/src/errors/workflow-missing-id.error.ts
@@ -1,7 +1,7 @@
 import type { Workflow, IWorkflowBase } from 'n8n-workflow';
-import { ApplicationError } from 'n8n-workflow';
+import { UnexpectedError } from 'n8n-workflow';
 
-export class WorkflowMissingIdError extends ApplicationError {
+export class WorkflowMissingIdError extends UnexpectedError {
 	constructor(workflow: Workflow | IWorkflowBase) {
 		super('Detected ID-less worklfow', { extra: { workflow } });
 	}
diff --git a/packages/cli/src/evaluation.ee/test-runner/errors.ee.ts b/packages/cli/src/evaluation.ee/test-runner/errors.ee.ts
index 05b88903fb..0b2df294b2 100644
--- a/packages/cli/src/evaluation.ee/test-runner/errors.ee.ts
+++ b/packages/cli/src/evaluation.ee/test-runner/errors.ee.ts
@@ -1,4 +1,4 @@
-import { ApplicationError } from 'n8n-workflow';
+import { UnexpectedError } from 'n8n-workflow';
 
 export type TestCaseExecutionErrorCode =
 	| 'MOCKED_NODE_DOES_NOT_EXIST'
@@ -12,7 +12,7 @@ export type TestCaseExecutionErrorCode =
 	| 'PAYLOAD_LIMIT_EXCEEDED'
 	| 'UNKNOWN_ERROR';
 
-export class TestCaseExecutionError extends ApplicationError {
+export class TestCaseExecutionError extends UnexpectedError {
 	readonly code: TestCaseExecutionErrorCode;
 
 	constructor(code: TestCaseExecutionErrorCode, extra: Record<string, unknown> = {}) {
@@ -28,7 +28,7 @@ export type TestRunErrorCode =
 	| 'INTERRUPTED'
 	| 'UNKNOWN_ERROR';
 
-export class TestRunError extends ApplicationError {
+export class TestRunError extends UnexpectedError {
 	readonly code: TestRunErrorCode;
 
 	constructor(code: TestRunErrorCode, extra: Record<string, unknown> = {}) {
diff --git a/packages/cli/src/executions/execution.service.ts b/packages/cli/src/executions/execution.service.ts
index 84090bcb0a..c4a8188f0e 100644
--- a/packages/cli/src/executions/execution.service.ts
+++ b/packages/cli/src/executions/execution.service.ts
@@ -12,8 +12,9 @@ import type {
 	IWorkflowExecutionDataProcess,
 } from 'n8n-workflow';
 import {
-	ApplicationError,
 	ExecutionStatusList,
+	UnexpectedError,
+	UserError,
 	Workflow,
 	WorkflowOperationError,
 } from 'n8n-workflow';
@@ -146,7 +147,7 @@ export class ExecutionService {
 		if (!execution.data.executionData) throw new AbortedExecutionRetryError();
 
 		if (execution.finished) {
-			throw new ApplicationError('The execution succeeded, so it cannot be retried.');
+			throw new UnexpectedError('The execution succeeded, so it cannot be retried.');
 		}
 
 		const executionMode = 'retry';
@@ -188,7 +189,7 @@ export class ExecutionService {
 			})) as IWorkflowBase;
 
 			if (workflowData === undefined) {
-				throw new ApplicationError(
+				throw new UserError(
 					'Workflow could not be found and so the data not be loaded for the retry.',
 					{ extra: { workflowId } },
 				);
@@ -232,7 +233,7 @@ export class ExecutionService {
 		const executionData = await this.activeExecutions.getPostExecutePromise(retriedExecutionId);
 
 		if (!executionData) {
-			throw new ApplicationError('The retry did not start for an unknown reason.');
+			throw new UnexpectedError('The retry did not start for an unknown reason.');
 		}
 
 		return !!executionData.finished;
diff --git a/packages/cli/src/executions/parse-range-query.middleware.ts b/packages/cli/src/executions/parse-range-query.middleware.ts
index 608fb1056f..762e4a679a 100644
--- a/packages/cli/src/executions/parse-range-query.middleware.ts
+++ b/packages/cli/src/executions/parse-range-query.middleware.ts
@@ -1,7 +1,7 @@
 import type { NextFunction, Response } from 'express';
 import { validate } from 'jsonschema';
 import type { JsonObject } from 'n8n-workflow';
-import { ApplicationError, jsonParse } from 'n8n-workflow';
+import { jsonParse, UnexpectedError } from 'n8n-workflow';
 
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 import * as ResponseHelper from '@/response-helper';
@@ -44,7 +44,7 @@ export const parseRangeQuery = (
 
 			if (jsonFilter.waitTill) jsonFilter.waitTill = Boolean(jsonFilter.waitTill);
 
-			if (!isValid(jsonFilter)) throw new ApplicationError('Query does not match schema');
+			if (!isValid(jsonFilter)) throw new UnexpectedError('Query does not match schema');
 
 			req.rangeQuery = { ...req.rangeQuery, ...jsonFilter };
 		}
diff --git a/packages/cli/src/external-hooks.ts b/packages/cli/src/external-hooks.ts
index d369fae05f..6f2990c0e9 100644
--- a/packages/cli/src/external-hooks.ts
+++ b/packages/cli/src/external-hooks.ts
@@ -4,7 +4,7 @@ import { GlobalConfig } from '@n8n/config';
 import { Service } from '@n8n/di';
 import { ErrorReporter, Logger } from 'n8n-core';
 import type { IRun, IWorkflowBase, Workflow, WorkflowExecuteMode } from 'n8n-workflow';
-import { ApplicationError } from 'n8n-workflow';
+import { UnexpectedError } from 'n8n-workflow';
 import type clientOAuth1 from 'oauth-1.0a';
 
 import type { AbstractServer } from '@/abstract-server';
@@ -125,7 +125,7 @@ export class ExternalHooks {
 			} catch (e) {
 				const error = e instanceof Error ? e : new Error(`${e}`);
 
-				throw new ApplicationError('Problem loading external hook file', {
+				throw new UnexpectedError('Problem loading external hook file', {
 					extra: { errorMessage: error.message, hookFilePath },
 					cause: error,
 				});
@@ -160,7 +160,7 @@ export class ExternalHooks {
 			} catch (cause) {
 				this.logger.error(`There was a problem running hook "${hookName}"`);
 				// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-				const error = new ApplicationError(`External hook "${hookName}" failed`, { cause });
+				const error = new UnexpectedError(`External hook "${hookName}" failed`, { cause });
 				this.errorReporter.error(error, { level: 'fatal' });
 
 				// Throw original error, so that hooks control the error returned to use
diff --git a/packages/cli/src/external-secrets.ee/external-secrets-manager.ee.ts b/packages/cli/src/external-secrets.ee/external-secrets-manager.ee.ts
index 83579c3e8e..1edaff1373 100644
--- a/packages/cli/src/external-secrets.ee/external-secrets-manager.ee.ts
+++ b/packages/cli/src/external-secrets.ee/external-secrets-manager.ee.ts
@@ -1,6 +1,6 @@
 import { Service } from '@n8n/di';
 import { Cipher, Logger } from 'n8n-core';
-import { jsonParse, type IDataObject, ApplicationError, ensureError } from 'n8n-workflow';
+import { jsonParse, type IDataObject, ensureError, UnexpectedError } from 'n8n-workflow';
 
 import { SettingsRepository } from '@/databases/repositories/settings.repository';
 import { EventService } from '@/events/event.service';
@@ -95,7 +95,7 @@ export class ExternalSecretsManager {
 		try {
 			return jsonParse(decryptedData);
 		} catch (e) {
-			throw new ApplicationError(
+			throw new UnexpectedError(
 				'External Secrets Settings could not be decrypted. The likely reason is that a different "encryptionKey" was used to encrypt the data.',
 			);
 		}
diff --git a/packages/cli/src/external-secrets.ee/providers/infisical.ts b/packages/cli/src/external-secrets.ee/providers/infisical.ts
index e74ef921b7..17888182fe 100644
--- a/packages/cli/src/external-secrets.ee/providers/infisical.ts
+++ b/packages/cli/src/external-secrets.ee/providers/infisical.ts
@@ -1,7 +1,7 @@
 import InfisicalClient from 'infisical-node';
 import { getServiceTokenData } from 'infisical-node/lib/api/serviceTokenData';
 import { populateClientWorkspaceConfigsHelper } from 'infisical-node/lib/helpers/key';
-import { ApplicationError, type IDataObject, type INodeProperties } from 'n8n-workflow';
+import { UnexpectedError, type IDataObject, type INodeProperties } from 'n8n-workflow';
 
 import type { SecretsProvider, SecretsProviderSettings, SecretsProviderState } from '@/interfaces';
 
@@ -77,10 +77,10 @@ export class InfisicalProvider implements SecretsProvider {
 
 	async update(): Promise<void> {
 		if (!this.client) {
-			throw new ApplicationError('Updated attempted on Infisical when initialization failed');
+			throw new UnexpectedError('Updated attempted on Infisical when initialization failed');
 		}
 		if (!(await this.test())[0]) {
-			throw new ApplicationError('Infisical provider test failed during update');
+			throw new UnexpectedError('Infisical provider test failed during update');
 		}
 		const secrets = (await this.client.getAllSecrets({
 			environment: this.environment,
@@ -123,7 +123,7 @@ export class InfisicalProvider implements SecretsProvider {
 		if (serviceTokenData.scopes) {
 			return serviceTokenData.scopes[0].environment;
 		}
-		throw new ApplicationError("Couldn't find environment for Infisical");
+		throw new UnexpectedError("Couldn't find environment for Infisical");
 	}
 
 	async test(): Promise<[boolean] | [boolean, string]> {
diff --git a/packages/cli/src/ldap.ee/ldap.service.ee.ts b/packages/cli/src/ldap.ee/ldap.service.ee.ts
index a4d9cbc97d..99c622b962 100644
--- a/packages/cli/src/ldap.ee/ldap.service.ee.ts
+++ b/packages/cli/src/ldap.ee/ldap.service.ee.ts
@@ -4,7 +4,7 @@ import { QueryFailedError } from '@n8n/typeorm';
 import type { Entry as LdapUser, ClientOptions } from 'ldapts';
 import { Client } from 'ldapts';
 import { Cipher, Logger } from 'n8n-core';
-import { ApplicationError, jsonParse } from 'n8n-workflow';
+import { jsonParse, UnexpectedError } from 'n8n-workflow';
 import type { ConnectionOptions } from 'tls';
 
 import config from '@/config';
@@ -89,7 +89,7 @@ export class LdapService {
 		const { valid, message } = validateLdapConfigurationSchema(ldapConfig);
 
 		if (!valid) {
-			throw new ApplicationError(message);
+			throw new UnexpectedError(message);
 		}
 
 		if (ldapConfig.loginEnabled && getCurrentAuthenticationMethod() === 'saml') {
@@ -165,7 +165,7 @@ export class LdapService {
 	 */
 	private async getClient() {
 		if (this.config === undefined) {
-			throw new ApplicationError('Service cannot be used without setting the property config');
+			throw new UnexpectedError('Service cannot be used without setting the property config');
 		}
 		if (this.client === undefined) {
 			const url = formatUrl(
@@ -304,7 +304,7 @@ export class LdapService {
 	/** Schedule a synchronization job based on the interval set in the LDAP config */
 	private scheduleSync(): void {
 		if (!this.config.synchronizationInterval) {
-			throw new ApplicationError('Interval variable has to be defined');
+			throw new UnexpectedError('Interval variable has to be defined');
 		}
 		this.syncTimer = setInterval(async () => {
 			await this.runSync('live');
diff --git a/packages/cli/src/load-nodes-and-credentials.ts b/packages/cli/src/load-nodes-and-credentials.ts
index dadf44c7ab..947a03a25d 100644
--- a/packages/cli/src/load-nodes-and-credentials.ts
+++ b/packages/cli/src/load-nodes-and-credentials.ts
@@ -26,7 +26,7 @@ import type {
 	IVersionedNodeType,
 	INodeProperties,
 } from 'n8n-workflow';
-import { ApplicationError, NodeConnectionType } from 'n8n-workflow';
+import { NodeConnectionType, UnexpectedError, UserError } from 'n8n-workflow';
 import path from 'path';
 import picocolors from 'picocolors';
 
@@ -71,7 +71,7 @@ export class LoadNodesAndCredentials {
 	) {}
 
 	async init() {
-		if (inTest) throw new ApplicationError('Not available in tests');
+		if (inTest) throw new UnexpectedError('Not available in tests');
 
 		// Make sure the imported modules can resolve dependencies fine.
 		const delimiter = process.platform === 'win32' ? ';' : ':';
@@ -293,7 +293,7 @@ export class LoadNodesAndCredentials {
 	) {
 		const loader = new constructor(dir, this.excludeNodes, this.includeNodes);
 		if (loader instanceof PackageDirectoryLoader && loader.packageName in this.loaders) {
-			throw new ApplicationError(
+			throw new UserError(
 				picocolors.red(
 					`nodes package ${loader.packageName} is already loaded.\n Please delete this second copy at path ${dir}`,
 				),
diff --git a/packages/cli/src/middlewares/list-query/dtos/base.filter.dto.ts b/packages/cli/src/middlewares/list-query/dtos/base.filter.dto.ts
index 9fa5c21677..e5c852c246 100644
--- a/packages/cli/src/middlewares/list-query/dtos/base.filter.dto.ts
+++ b/packages/cli/src/middlewares/list-query/dtos/base.filter.dto.ts
@@ -1,13 +1,13 @@
 import { plainToInstance, instanceToPlain } from 'class-transformer';
 import { validate } from 'class-validator';
 import { isObjectLiteral } from 'n8n-core';
-import { ApplicationError, jsonParse } from 'n8n-workflow';
+import { jsonParse, UnexpectedError } from 'n8n-workflow';
 
 export class BaseFilter {
 	protected static async toFilter(rawFilter: string, Filter: typeof BaseFilter) {
 		const dto = jsonParse(rawFilter, { errorMessage: 'Failed to parse filter JSON' });
 
-		if (!isObjectLiteral(dto)) throw new ApplicationError('Filter must be an object literal');
+		if (!isObjectLiteral(dto)) throw new UnexpectedError('Filter must be an object literal');
 
 		const instance = plainToInstance(Filter, dto, {
 			excludeExtraneousValues: true, // remove fields not in class
@@ -23,6 +23,6 @@ export class BaseFilter {
 	private async validate() {
 		const result = await validate(this);
 
-		if (result.length > 0) throw new ApplicationError('Parsed filter does not fit the schema');
+		if (result.length > 0) throw new UnexpectedError('Parsed filter does not fit the schema');
 	}
 }
diff --git a/packages/cli/src/middlewares/list-query/dtos/base.select.dto.ts b/packages/cli/src/middlewares/list-query/dtos/base.select.dto.ts
index 9a8cb395f0..7a186c47ea 100644
--- a/packages/cli/src/middlewares/list-query/dtos/base.select.dto.ts
+++ b/packages/cli/src/middlewares/list-query/dtos/base.select.dto.ts
@@ -1,4 +1,4 @@
-import { ApplicationError, jsonParse } from 'n8n-workflow';
+import { jsonParse, UnexpectedError } from 'n8n-workflow';
 
 import { isStringArray } from '@/utils';
 
@@ -8,7 +8,7 @@ export class BaseSelect {
 	protected static toSelect(rawFilter: string, Select: typeof BaseSelect) {
 		const dto = jsonParse(rawFilter, { errorMessage: 'Failed to parse filter JSON' });
 
-		if (!isStringArray(dto)) throw new ApplicationError('Parsed select is not a string array');
+		if (!isStringArray(dto)) throw new UnexpectedError('Parsed select is not a string array');
 
 		return dto.reduce<Record<string, true>>((acc, field) => {
 			if (!Select.selectableFields.has(field)) return acc;
diff --git a/packages/cli/src/middlewares/list-query/dtos/pagination.dto.ts b/packages/cli/src/middlewares/list-query/dtos/pagination.dto.ts
index a48a79e31d..3b408deddd 100644
--- a/packages/cli/src/middlewares/list-query/dtos/pagination.dto.ts
+++ b/packages/cli/src/middlewares/list-query/dtos/pagination.dto.ts
@@ -1,15 +1,15 @@
-import { ApplicationError } from 'n8n-workflow';
+import { UnexpectedError } from 'n8n-workflow';
 
 import { isIntegerString } from '@/utils';
 
 export class Pagination {
 	static fromString(rawTake: string, rawSkip: string) {
 		if (!isIntegerString(rawTake)) {
-			throw new ApplicationError('Parameter take is not an integer string');
+			throw new UnexpectedError('Parameter take is not an integer string');
 		}
 
 		if (!isIntegerString(rawSkip)) {
-			throw new ApplicationError('Parameter skip is not an integer string');
+			throw new UnexpectedError('Parameter skip is not an integer string');
 		}
 
 		const [take, skip] = [rawTake, rawSkip].map((o) => parseInt(o, 10));
diff --git a/packages/cli/src/middlewares/list-query/pagination.ts b/packages/cli/src/middlewares/list-query/pagination.ts
index 8823cf8572..da24db6d5c 100644
--- a/packages/cli/src/middlewares/list-query/pagination.ts
+++ b/packages/cli/src/middlewares/list-query/pagination.ts
@@ -1,5 +1,5 @@
 import type { RequestHandler } from 'express';
-import { ApplicationError } from 'n8n-workflow';
+import { UnexpectedError } from 'n8n-workflow';
 
 import type { ListQuery } from '@/requests';
 import * as ResponseHelper from '@/response-helper';
@@ -16,7 +16,7 @@ export const paginationListQueryMiddleware: RequestHandler = (
 
 	try {
 		if (!rawTake && req.query.skip) {
-			throw new ApplicationError('Please specify `take` when using `skip`');
+			throw new UnexpectedError('Please specify `take` when using `skip`');
 		}
 
 		if (!rawTake) return next();
diff --git a/packages/cli/src/middlewares/list-query/sort-by.ts b/packages/cli/src/middlewares/list-query/sort-by.ts
index 01aca505af..f600b1fdca 100644
--- a/packages/cli/src/middlewares/list-query/sort-by.ts
+++ b/packages/cli/src/middlewares/list-query/sort-by.ts
@@ -1,7 +1,7 @@
 import { plainToInstance } from 'class-transformer';
 import { validateSync } from 'class-validator';
 import type { RequestHandler } from 'express';
-import { ApplicationError } from 'n8n-workflow';
+import { UnexpectedError } from 'n8n-workflow';
 
 import type { ListQuery } from '@/requests';
 import * as ResponseHelper from '@/response-helper';
@@ -27,7 +27,7 @@ export const sortByQueryMiddleware: RequestHandler = (req: ListQuery.Request, re
 
 		if (validationResponse.length) {
 			const validationError = validationResponse[0];
-			throw new ApplicationError(validationError.constraints?.workflowSortBy ?? '');
+			throw new UnexpectedError(validationError.constraints?.workflowSortBy ?? '');
 		}
 
 		req.listQueryOptions = { ...req.listQueryOptions, sortBy };
diff --git a/packages/cli/src/node-types.ts b/packages/cli/src/node-types.ts
index bb0a5fbbc7..2572b93e4d 100644
--- a/packages/cli/src/node-types.ts
+++ b/packages/cli/src/node-types.ts
@@ -6,7 +6,7 @@ import { readdir } from 'fs/promises';
 import { RoutingNode } from 'n8n-core';
 import type { ExecuteContext } from 'n8n-core';
 import type { INodeType, INodeTypeDescription, INodeTypes, IVersionedNodeType } from 'n8n-workflow';
-import { ApplicationError, NodeHelpers } from 'n8n-workflow';
+import { NodeHelpers, UnexpectedError, UserError } from 'n8n-workflow';
 import { join, dirname } from 'path';
 
 import { LoadNodesAndCredentials } from './load-nodes-and-credentials';
@@ -52,7 +52,7 @@ export class NodeTypes implements INodeTypes {
 		const node = this.loadNodesAndCredentials.getNode(nodeType);
 		const versionedNodeType = NodeHelpers.getVersionedNodeType(node.type, version);
 		if (toolRequested && typeof versionedNodeType.supplyData === 'function') {
-			throw new ApplicationError('Node already has a `supplyData` method', { extra: { nodeType } });
+			throw new UnexpectedError('Node already has a `supplyData` method', { extra: { nodeType } });
 		}
 
 		if (
@@ -72,7 +72,7 @@ export class NodeTypes implements INodeTypes {
 		if (!toolRequested) return versionedNodeType;
 
 		if (!versionedNodeType.description.usableAsTool)
-			throw new ApplicationError('Node cannot be used as a tool', { extra: { nodeType } });
+			throw new UserError('Node cannot be used as a tool', { extra: { nodeType } });
 
 		const { loadedNodes } = this.loadNodesAndCredentials;
 		if (origType in loadedNodes) {
diff --git a/packages/cli/src/permissions.ee/check-access.ts b/packages/cli/src/permissions.ee/check-access.ts
index 062e3c1865..6d45ddfe65 100644
--- a/packages/cli/src/permissions.ee/check-access.ts
+++ b/packages/cli/src/permissions.ee/check-access.ts
@@ -2,7 +2,7 @@ import { Container } from '@n8n/di';
 import type { Scope } from '@n8n/permissions';
 // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
 import { In } from '@n8n/typeorm';
-import { ApplicationError } from 'n8n-workflow';
+import { UnexpectedError } from 'n8n-workflow';
 
 import type { User } from '@/databases/entities/user';
 import { ProjectRepository } from '@/databases/repositories/project.repository';
@@ -71,7 +71,7 @@ export async function userHasScopes(
 
 	if (projectId) return userProjectIds.includes(projectId);
 
-	throw new ApplicationError(
+	throw new UnexpectedError(
 		"`@ProjectScope` decorator was used but does not have a `credentialId`, `workflowId`, or `projectId` in its URL parameters. This is likely an implementation error. If you're a developer, please check your URL is correct or that this should be using `@GlobalScope`.",
 	);
 }
diff --git a/packages/cli/src/push/websocket.push.ts b/packages/cli/src/push/websocket.push.ts
index 16e28f2453..6178d0cdee 100644
--- a/packages/cli/src/push/websocket.push.ts
+++ b/packages/cli/src/push/websocket.push.ts
@@ -1,6 +1,6 @@
 import { heartbeatMessageSchema } from '@n8n/api-types';
 import { Service } from '@n8n/di';
-import { ApplicationError } from 'n8n-workflow';
+import { UnexpectedError } from 'n8n-workflow';
 import type WebSocket from 'ws';
 
 import type { User } from '@/databases/entities/user';
@@ -34,7 +34,7 @@ export class WebSocketPush extends AbstractPush<WebSocket> {
 				this.onMessageReceived(pushRef, msg);
 			} catch (error) {
 				this.errorReporter.error(
-					new ApplicationError('Error parsing push message', {
+					new UnexpectedError('Error parsing push message', {
 						extra: {
 							userId,
 							data,
diff --git a/packages/cli/src/scaling/job-processor.ts b/packages/cli/src/scaling/job-processor.ts
index 91d051b240..2fa9288a79 100644
--- a/packages/cli/src/scaling/job-processor.ts
+++ b/packages/cli/src/scaling/job-processor.ts
@@ -13,7 +13,7 @@ import type {
 	IRun,
 	IWorkflowExecutionDataProcess,
 } from 'n8n-workflow';
-import { BINARY_ENCODING, ApplicationError, Workflow } from 'n8n-workflow';
+import { BINARY_ENCODING, Workflow, UnexpectedError } from 'n8n-workflow';
 import type PCancelable from 'p-cancelable';
 
 import config from '@/config';
@@ -61,9 +61,8 @@ export class JobProcessor {
 		});
 
 		if (!execution) {
-			throw new ApplicationError(
+			throw new UnexpectedError(
 				`Worker failed to find data for execution ${executionId} (job ${job.id})`,
-				{ level: 'warning' },
 			);
 		}
 
@@ -92,9 +91,8 @@ export class JobProcessor {
 			});
 
 			if (workflowData === null) {
-				throw new ApplicationError(
+				throw new UnexpectedError(
 					`Worker failed to find workflow ${workflowId} to run execution ${executionId} (job ${job.id})`,
-					{ level: 'warning' },
 				);
 			}
 
diff --git a/packages/cli/src/scaling/scaling.service.ts b/packages/cli/src/scaling/scaling.service.ts
index 7c48ce57e2..231d607acd 100644
--- a/packages/cli/src/scaling/scaling.service.ts
+++ b/packages/cli/src/scaling/scaling.service.ts
@@ -2,12 +2,12 @@ import { GlobalConfig } from '@n8n/config';
 import { Container, Service } from '@n8n/di';
 import { ErrorReporter, InstanceSettings, isObjectLiteral, Logger } from 'n8n-core';
 import {
-	ApplicationError,
 	BINARY_ENCODING,
 	sleep,
 	jsonStringify,
 	ensureError,
 	ExecutionCancelledError,
+	UnexpectedError,
 } from 'n8n-workflow';
 import type { IExecuteResponsePromiseData } from 'n8n-workflow';
 import assert, { strict } from 'node:assert';
@@ -93,7 +93,7 @@ export class ScalingService {
 		void this.queue.process(JOB_TYPE_NAME, concurrency, async (job: Job) => {
 			try {
 				if (!this.hasValidJobData(job)) {
-					throw new ApplicationError('Worker received invalid job', {
+					throw new UnexpectedError('Worker received invalid job', {
 						extra: { jobData: jsonStringify(job, { replaceCircularRefs: true }) },
 					});
 				}
@@ -369,13 +369,13 @@ export class ScalingService {
 	private assertQueue() {
 		if (this.queue) return;
 
-		throw new ApplicationError('This method must be called after `setupQueue`');
+		throw new UnexpectedError('This method must be called after `setupQueue`');
 	}
 
 	private assertWorker() {
 		if (this.instanceSettings.instanceType === 'worker') return;
 
-		throw new ApplicationError('This method must be called on a `worker` instance');
+		throw new UnexpectedError('This method must be called on a `worker` instance');
 	}
 
 	// #region Queue metrics
diff --git a/packages/cli/src/services/cache/cache.service.ts b/packages/cli/src/services/cache/cache.service.ts
index ab681d3e5b..16721e7e4f 100644
--- a/packages/cli/src/services/cache/cache.service.ts
+++ b/packages/cli/src/services/cache/cache.service.ts
@@ -1,7 +1,7 @@
 import { GlobalConfig } from '@n8n/config';
 import { Container, Service } from '@n8n/di';
 import { caching } from 'cache-manager';
-import { ApplicationError, jsonStringify } from 'n8n-workflow';
+import { jsonStringify, UserError } from 'n8n-workflow';
 
 import config from '@/config';
 import { Time } from '@/constants';
@@ -155,9 +155,7 @@ export class CacheService extends TypedEmitter<CacheEvents> {
 		if (!key?.length) return;
 
 		if (this.cache.kind === 'memory') {
-			throw new ApplicationError('Method `expire` not yet implemented for in-memory cache', {
-				level: 'warning',
-			});
+			throw new UserError('Method `expire` not yet implemented for in-memory cache');
 		}
 
 		await this.cache.store.expire(key, ttlMs * Time.milliseconds.toSeconds);
diff --git a/packages/cli/src/services/cache/redis.cache-manager.ts b/packages/cli/src/services/cache/redis.cache-manager.ts
index 4014f051c0..6116b49757 100644
--- a/packages/cli/src/services/cache/redis.cache-manager.ts
+++ b/packages/cli/src/services/cache/redis.cache-manager.ts
@@ -5,7 +5,7 @@
 import type { Cache, Store, Config } from 'cache-manager';
 import Redis from 'ioredis';
 import type { Cluster, ClusterNode, ClusterOptions, RedisOptions } from 'ioredis';
-import { ApplicationError, jsonParse } from 'n8n-workflow';
+import { jsonParse, UnexpectedError } from 'n8n-workflow';
 
 export class NoCacheableError implements Error {
 	name = 'NoCacheableError';
@@ -82,7 +82,7 @@ function builder(
 				await redisCache.mset(
 					args.flatMap(([key, value]) => {
 						if (!isCacheable(value))
-							throw new ApplicationError(`"${getVal(value)}" is not a cacheable value`);
+							throw new UnexpectedError(`"${getVal(value)}" is not a cacheable value`);
 						return [key, getVal(value)] as [string, string];
 					}),
 				);
diff --git a/packages/cli/src/services/community-packages.service.ts b/packages/cli/src/services/community-packages.service.ts
index c85872c5e2..10fe04f80c 100644
--- a/packages/cli/src/services/community-packages.service.ts
+++ b/packages/cli/src/services/community-packages.service.ts
@@ -5,7 +5,7 @@ import { exec } from 'child_process';
 import { access as fsAccess, mkdir as fsMkdir } from 'fs/promises';
 import type { PackageDirectoryLoader } from 'n8n-core';
 import { InstanceSettings, Logger } from 'n8n-core';
-import { ApplicationError, type PublicInstalledPackage } from 'n8n-workflow';
+import { UnexpectedError, UserError, type PublicInstalledPackage } from 'n8n-workflow';
 import { promisify } from 'util';
 
 import {
@@ -102,10 +102,10 @@ export class CommunityPackagesService {
 	}
 
 	parseNpmPackageName(rawString?: string): CommunityPackages.ParsedPackageName {
-		if (!rawString) throw new ApplicationError(PACKAGE_NAME_NOT_PROVIDED);
+		if (!rawString) throw new UnexpectedError(PACKAGE_NAME_NOT_PROVIDED);
 
 		if (INVALID_OR_SUSPICIOUS_PACKAGE_NAME.test(rawString)) {
-			throw new ApplicationError('Package name must be a single word');
+			throw new UnexpectedError('Package name must be a single word');
 		}
 
 		const scope = rawString.includes('/') ? rawString.split('/')[0] : undefined;
@@ -113,7 +113,7 @@ export class CommunityPackagesService {
 		const packageNameWithoutScope = scope ? rawString.replace(`${scope}/`, '') : rawString;
 
 		if (!packageNameWithoutScope.startsWith(NODE_PACKAGE_PREFIX)) {
-			throw new ApplicationError(`Package name must start with ${NODE_PACKAGE_PREFIX}`);
+			throw new UnexpectedError(`Package name must start with ${NODE_PACKAGE_PREFIX}`);
 		}
 
 		const version = packageNameWithoutScope.includes('@')
@@ -164,12 +164,12 @@ export class CommunityPackagesService {
 			};
 
 			Object.entries(map).forEach(([npmMessage, n8nMessage]) => {
-				if (errorMessage.includes(npmMessage)) throw new ApplicationError(n8nMessage);
+				if (errorMessage.includes(npmMessage)) throw new UnexpectedError(n8nMessage);
 			});
 
 			this.logger.warn('npm command failed', { errorMessage });
 
-			throw new ApplicationError(PACKAGE_FAILED_TO_INSTALL);
+			throw new UnexpectedError(PACKAGE_FAILED_TO_INSTALL);
 		}
 	}
 
@@ -346,7 +346,7 @@ export class CommunityPackagesService {
 			await this.executeNpmCommand(command);
 		} catch (error) {
 			if (error instanceof Error && error.message === RESPONSE_ERROR_MESSAGES.PACKAGE_NOT_FOUND) {
-				throw new ApplicationError('npm package not found', { extra: { packageName } });
+				throw new UserError('npm package not found', { extra: { packageName } });
 			}
 			throw error;
 		}
@@ -360,7 +360,7 @@ export class CommunityPackagesService {
 			try {
 				await this.executeNpmCommand(`npm remove ${packageName}`);
 			} catch {}
-			throw new ApplicationError(RESPONSE_ERROR_MESSAGES.PACKAGE_LOADING_FAILED, { cause: error });
+			throw new UnexpectedError(RESPONSE_ERROR_MESSAGES.PACKAGE_LOADING_FAILED, { cause: error });
 		}
 
 		if (loader.loadedNodes.length > 0) {
@@ -378,7 +378,7 @@ export class CommunityPackagesService {
 				this.logger.info(`Community package installed: ${packageName}`);
 				return installedPackage;
 			} catch (error) {
-				throw new ApplicationError('Failed to save installed package', {
+				throw new UnexpectedError('Failed to save installed package', {
 					extra: { packageName },
 					cause: error,
 				});
@@ -388,7 +388,7 @@ export class CommunityPackagesService {
 			try {
 				await this.executeNpmCommand(`npm remove ${packageName}`);
 			} catch {}
-			throw new ApplicationError(RESPONSE_ERROR_MESSAGES.PACKAGE_DOES_NOT_CONTAIN_NODES);
+			throw new UnexpectedError(RESPONSE_ERROR_MESSAGES.PACKAGE_DOES_NOT_CONTAIN_NODES);
 		}
 	}
 
diff --git a/packages/cli/src/services/credentials-tester.service.ts b/packages/cli/src/services/credentials-tester.service.ts
index 46d4456403..c0a3fbb575 100644
--- a/packages/cli/src/services/credentials-tester.service.ts
+++ b/packages/cli/src/services/credentials-tester.service.ts
@@ -32,7 +32,7 @@ import type {
 	IDataObject,
 	IExecuteData,
 } from 'n8n-workflow';
-import { VersionedNodeType, NodeHelpers, Workflow, ApplicationError } from 'n8n-workflow';
+import { VersionedNodeType, NodeHelpers, Workflow, UnexpectedError } from 'n8n-workflow';
 
 import { CredentialTypes } from '@/credential-types';
 import type { User } from '@/databases/entities/user';
@@ -62,7 +62,7 @@ const mockNodeTypes: INodeTypes = {
 	},
 	getByNameAndVersion(nodeType: string, version?: number): INodeType {
 		if (!mockNodesData[nodeType]) {
-			throw new ApplicationError(RESPONSE_ERROR_MESSAGES.NO_NODE, {
+			throw new UnexpectedError(RESPONSE_ERROR_MESSAGES.NO_NODE, {
 				tags: { nodeType },
 			});
 		}
diff --git a/packages/cli/src/services/dynamic-node-parameters.service.ts b/packages/cli/src/services/dynamic-node-parameters.service.ts
index 1cbaf42363..a060d09ffc 100644
--- a/packages/cli/src/services/dynamic-node-parameters.service.ts
+++ b/packages/cli/src/services/dynamic-node-parameters.service.ts
@@ -21,7 +21,7 @@ import type {
 	ILocalLoadOptionsFunctions,
 	IExecuteData,
 } from 'n8n-workflow';
-import { Workflow, ApplicationError } from 'n8n-workflow';
+import { Workflow, UnexpectedError } from 'n8n-workflow';
 
 import { NodeTypes } from '@/node-types';
 
@@ -91,7 +91,7 @@ export class DynamicNodeParametersService {
 			// requiring a baseURL to be defined can at least not a random server be called.
 			// In the future this code has to get improved that it does not use the request information from
 			// the request rather resolves it via the parameter-path and nodeType data.
-			throw new ApplicationError(
+			throw new UnexpectedError(
 				'Node type does not exist or does not have "requestDefaults.baseURL" defined!',
 				{ tags: { nodeType: nodeType.description.name } },
 			);
@@ -152,7 +152,7 @@ export class DynamicNodeParametersService {
 		}
 
 		if (!Array.isArray(optionsData)) {
-			throw new ApplicationError('The returned data is not an array');
+			throw new UnexpectedError('The returned data is not an array');
 		}
 
 		return optionsData[0].map((item) => item.json) as unknown as INodePropertyOptions[];
@@ -258,7 +258,7 @@ export class DynamicNodeParametersService {
 	): NodeMethod {
 		const method = nodeType.methods?.[type]?.[methodName] as NodeMethod;
 		if (typeof method !== 'function') {
-			throw new ApplicationError('Node type does not have method defined', {
+			throw new UnexpectedError('Node type does not have method defined', {
 				tags: { nodeType: nodeType.description.name },
 				extra: { methodName },
 			});
diff --git a/packages/cli/src/services/project.service.ee.ts b/packages/cli/src/services/project.service.ee.ts
index 9eb3f8efa1..95306bddf7 100644
--- a/packages/cli/src/services/project.service.ee.ts
+++ b/packages/cli/src/services/project.service.ee.ts
@@ -5,7 +5,7 @@ import { type Scope } from '@n8n/permissions';
 import type { FindOptionsWhere, EntityManager } from '@n8n/typeorm';
 // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
 import { In, Not } from '@n8n/typeorm';
-import { ApplicationError } from 'n8n-workflow';
+import { UserError } from 'n8n-workflow';
 
 import { UNLIMITED_LICENSE_QUOTA } from '@/constants';
 import { Project } from '@/databases/entities/project';
@@ -23,7 +23,7 @@ import { License } from '@/license';
 import { CacheService } from './cache/cache.service';
 import { RoleService } from './role.service';
 
-export class TeamProjectOverQuotaError extends ApplicationError {
+export class TeamProjectOverQuotaError extends UserError {
 	constructor(limit: number) {
 		super(
 			`Attempted to create a new project but quota is already exhausted. You may have a maximum of ${limit} team projects.`,
@@ -31,7 +31,7 @@ export class TeamProjectOverQuotaError extends ApplicationError {
 	}
 }
 
-export class UnlicensedProjectRoleError extends ApplicationError {
+export class UnlicensedProjectRoleError extends UserError {
 	constructor(role: ProjectRole) {
 		super(`Your instance is not licensed to use role "${role}".`);
 	}
diff --git a/packages/cli/src/services/role.service.ts b/packages/cli/src/services/role.service.ts
index e060c0dd81..1b210a62b7 100644
--- a/packages/cli/src/services/role.service.ts
+++ b/packages/cli/src/services/role.service.ts
@@ -1,7 +1,7 @@
 import type { ProjectRole } from '@n8n/api-types';
 import { Service } from '@n8n/di';
 import { combineScopes, type Resource, type Scope } from '@n8n/permissions';
-import { ApplicationError } from 'n8n-workflow';
+import { UnexpectedError } from 'n8n-workflow';
 
 import type { CredentialsEntity } from '@/databases/entities/credentials-entity';
 import type { ProjectRelation } from '@/databases/entities/project-relation';
@@ -199,7 +199,7 @@ export class RoleService {
 		}
 
 		if (!('active' in entity) && !('type' in entity)) {
-			throw new ApplicationError('Cannot detect if entity is a workflow or credential.');
+			throw new UnexpectedError('Cannot detect if entity is a workflow or credential.');
 		}
 
 		entity.scopes = this.combineResourceScopes(
diff --git a/packages/cli/src/services/user.service.ts b/packages/cli/src/services/user.service.ts
index ab188fc972..4eae487eb5 100644
--- a/packages/cli/src/services/user.service.ts
+++ b/packages/cli/src/services/user.service.ts
@@ -1,7 +1,7 @@
 import { Service } from '@n8n/di';
 import { Logger } from 'n8n-core';
 import type { IUserSettings } from 'n8n-workflow';
-import { ApplicationError } from 'n8n-workflow';
+import { UnexpectedError } from 'n8n-workflow';
 
 import type { User, AssignableRole } from '@/databases/entities/user';
 import { UserRepository } from '@/databases/repositories/user.repository';
@@ -68,7 +68,7 @@ export class UserService {
 		};
 
 		if (options?.withInviteUrl && !options?.inviterId) {
-			throw new ApplicationError('Inviter ID is required to generate invite URL');
+			throw new UnexpectedError('Inviter ID is required to generate invite URL');
 		}
 
 		if (options?.withInviteUrl && options?.inviterId && publicUser.isPending) {
diff --git a/packages/cli/src/services/workflow-loader.service.ts b/packages/cli/src/services/workflow-loader.service.ts
index 5d5e08c1fe..fdb91e2cb6 100644
--- a/packages/cli/src/services/workflow-loader.service.ts
+++ b/packages/cli/src/services/workflow-loader.service.ts
@@ -1,5 +1,5 @@
 import { Service } from '@n8n/di';
-import { ApplicationError, type IWorkflowBase, type IWorkflowLoader } from 'n8n-workflow';
+import { UnexpectedError, type IWorkflowBase, type IWorkflowLoader } from 'n8n-workflow';
 
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
 
@@ -11,7 +11,7 @@ export class WorkflowLoaderService implements IWorkflowLoader {
 		const workflow = await this.workflowRepository.findById(workflowId);
 
 		if (!workflow) {
-			throw new ApplicationError(`Failed to find workflow with ID "${workflowId}"`);
+			throw new UnexpectedError(`Failed to find workflow with ID "${workflowId}"`);
 		}
 
 		return workflow;
diff --git a/packages/cli/src/shutdown/__tests__/shutdown.service.test.ts b/packages/cli/src/shutdown/__tests__/shutdown.service.test.ts
index 41afed9398..40f727183a 100644
--- a/packages/cli/src/shutdown/__tests__/shutdown.service.test.ts
+++ b/packages/cli/src/shutdown/__tests__/shutdown.service.test.ts
@@ -1,7 +1,7 @@
 import { Container } from '@n8n/di';
 import { mock } from 'jest-mock-extended';
 import type { ErrorReporter } from 'n8n-core';
-import { ApplicationError } from 'n8n-workflow';
+import { UnexpectedError } from 'n8n-workflow';
 
 import type { ServiceClass } from '@/shutdown/shutdown.service';
 import { ShutdownService } from '@/shutdown/shutdown.service';
@@ -84,8 +84,8 @@ describe('ShutdownService', () => {
 			await shutdownService.waitForShutdown();
 
 			expect(errorReporter.error).toHaveBeenCalledTimes(1);
-			const error = errorReporter.error.mock.calls[0][0] as ApplicationError;
-			expect(error).toBeInstanceOf(ApplicationError);
+			const error = errorReporter.error.mock.calls[0][0] as UnexpectedError;
+			expect(error).toBeInstanceOf(UnexpectedError);
 			expect(error.message).toBe('Failed to shutdown gracefully');
 			expect(error.extra).toEqual({
 				component: 'MockComponent.onShutdown()',
diff --git a/packages/cli/src/shutdown/shutdown.service.ts b/packages/cli/src/shutdown/shutdown.service.ts
index d31ca9b154..aff01b0875 100644
--- a/packages/cli/src/shutdown/shutdown.service.ts
+++ b/packages/cli/src/shutdown/shutdown.service.ts
@@ -1,7 +1,7 @@
 import { Container, Service } from '@n8n/di';
 import { type Class, ErrorReporter } from 'n8n-core';
 import { Logger } from 'n8n-core';
-import { ApplicationError, assert } from 'n8n-workflow';
+import { assert, UnexpectedError, UserError } from 'n8n-workflow';
 
 import { LOWEST_SHUTDOWN_PRIORITY, HIGHEST_SHUTDOWN_PRIORITY } from '@/constants';
 
@@ -14,10 +14,9 @@ export interface ShutdownHandler {
 }
 
 /** Error reported when a listener fails to shutdown gracefully */
-export class ComponentShutdownError extends ApplicationError {
+export class ComponentShutdownError extends UnexpectedError {
 	constructor(componentName: string, cause: Error) {
 		super('Failed to shutdown gracefully', {
-			level: 'error',
 			cause,
 			extra: { component: componentName },
 		});
@@ -39,7 +38,7 @@ export class ShutdownService {
 	/** Registers given listener to be notified when the application is shutting down */
 	register(priority: number, handler: ShutdownHandler) {
 		if (priority < LOWEST_SHUTDOWN_PRIORITY || priority > HIGHEST_SHUTDOWN_PRIORITY) {
-			throw new ApplicationError(
+			throw new UserError(
 				`Invalid shutdown priority. Please set it between ${LOWEST_SHUTDOWN_PRIORITY} and ${HIGHEST_SHUTDOWN_PRIORITY}.`,
 				{ extra: { priority } },
 			);
@@ -57,14 +56,14 @@ export class ShutdownService {
 
 		for (const { serviceClass, methodName } of handlers) {
 			if (!Container.has(serviceClass)) {
-				throw new ApplicationError(
+				throw new UserError(
 					`Component "${serviceClass.name}" is not registered with the DI container. Any component using @OnShutdown() must be decorated with @Service()`,
 				);
 			}
 
 			const service = Container.get(serviceClass);
 			if (!service[methodName]) {
-				throw new ApplicationError(
+				throw new UserError(
 					`Component "${serviceClass.name}" does not have a "${methodName}" method`,
 				);
 			}
@@ -74,7 +73,7 @@ export class ShutdownService {
 	/** Signals all registered listeners that the application is shutting down */
 	shutdown() {
 		if (this.shutdownPromise) {
-			throw new ApplicationError('App is already shutting down');
+			throw new UnexpectedError('App is already shutting down');
 		}
 
 		this.shutdownPromise = this.startShutdown();
@@ -83,7 +82,7 @@ export class ShutdownService {
 	/** Returns a promise that resolves when all the registered listeners have shut down */
 	async waitForShutdown(): Promise<void> {
 		if (!this.shutdownPromise) {
-			throw new ApplicationError('App is not shutting down');
+			throw new UnexpectedError('App is not shutting down');
 		}
 
 		await this.shutdownPromise;
diff --git a/packages/cli/src/sso.ee/saml/errors/invalid-saml-metadata.error.ts b/packages/cli/src/sso.ee/saml/errors/invalid-saml-metadata.error.ts
index 3d2ceaddb6..7c228a71c6 100644
--- a/packages/cli/src/sso.ee/saml/errors/invalid-saml-metadata.error.ts
+++ b/packages/cli/src/sso.ee/saml/errors/invalid-saml-metadata.error.ts
@@ -1,7 +1,7 @@
-import { ApplicationError } from 'n8n-workflow';
+import { UserError } from 'n8n-workflow';
 
-export class InvalidSamlMetadataError extends ApplicationError {
+export class InvalidSamlMetadataError extends UserError {
 	constructor() {
-		super('Invalid SAML metadata', { level: 'warning' });
+		super('Invalid SAML metadata');
 	}
 }
diff --git a/packages/cli/src/sso.ee/saml/saml.service.ee.ts b/packages/cli/src/sso.ee/saml/saml.service.ee.ts
index a0d20e4102..d01b4f5cc2 100644
--- a/packages/cli/src/sso.ee/saml/saml.service.ee.ts
+++ b/packages/cli/src/sso.ee/saml/saml.service.ee.ts
@@ -4,7 +4,7 @@ import axios from 'axios';
 import type express from 'express';
 import https from 'https';
 import { Logger } from 'n8n-core';
-import { ApplicationError, jsonParse } from 'n8n-workflow';
+import { jsonParse, UnexpectedError } from 'n8n-workflow';
 import type { IdentityProviderInstance, ServiceProviderInstance } from 'samlify';
 import type { BindingContext, PostBindingContext } from 'samlify/types/src/entity';
 
@@ -124,7 +124,7 @@ export class SamlService {
 
 	getIdentityProviderInstance(forceRecreate = false): IdentityProviderInstance {
 		if (this.samlify === undefined) {
-			throw new ApplicationError('Samlify is not initialized');
+			throw new UnexpectedError('Samlify is not initialized');
 		}
 		if (this.identityProviderInstance === undefined || forceRecreate) {
 			this.identityProviderInstance = this.samlify.IdentityProvider({
@@ -137,7 +137,7 @@ export class SamlService {
 
 	getServiceProviderInstance(): ServiceProviderInstance {
 		if (this.samlify === undefined) {
-			throw new ApplicationError('Samlify is not initialized');
+			throw new UnexpectedError('Samlify is not initialized');
 		}
 		return getServiceProviderInstance(this._samlPreferences, this.samlify);
 	}
diff --git a/packages/cli/src/task-runners/errors/task-runner-disconnected-error.ts b/packages/cli/src/task-runners/errors/task-runner-disconnected-error.ts
index e29958adfb..ac1f9bb28b 100644
--- a/packages/cli/src/task-runners/errors/task-runner-disconnected-error.ts
+++ b/packages/cli/src/task-runners/errors/task-runner-disconnected-error.ts
@@ -1,7 +1,7 @@
 import type { TaskRunner } from '@n8n/task-runner';
-import { ApplicationError } from 'n8n-workflow';
+import { UnexpectedError } from 'n8n-workflow';
 
-export class TaskRunnerDisconnectedError extends ApplicationError {
+export class TaskRunnerDisconnectedError extends UnexpectedError {
 	description: string;
 
 	constructor(
diff --git a/packages/cli/src/task-runners/errors/task-runner-failed-heartbeat.error.ts b/packages/cli/src/task-runners/errors/task-runner-failed-heartbeat.error.ts
index 55b9448574..3fded78d41 100644
--- a/packages/cli/src/task-runners/errors/task-runner-failed-heartbeat.error.ts
+++ b/packages/cli/src/task-runners/errors/task-runner-failed-heartbeat.error.ts
@@ -1,6 +1,6 @@
-import { ApplicationError } from 'n8n-workflow';
+import { UserError } from 'n8n-workflow';
 
-export class TaskRunnerFailedHeartbeatError extends ApplicationError {
+export class TaskRunnerFailedHeartbeatError extends UserError {
 	description: string;
 
 	constructor(heartbeatInterval: number, isSelfHosted: boolean) {
diff --git a/packages/cli/src/task-runners/errors/task-runner-oom-error.ts b/packages/cli/src/task-runners/errors/task-runner-oom-error.ts
index 412cf6e626..fab8b5e3e9 100644
--- a/packages/cli/src/task-runners/errors/task-runner-oom-error.ts
+++ b/packages/cli/src/task-runners/errors/task-runner-oom-error.ts
@@ -1,15 +1,15 @@
-import { ApplicationError } from 'n8n-workflow';
+import { UserError } from 'n8n-workflow';
 
 import type { TaskRunner } from '@/task-runners/task-broker/task-broker.service';
 
-export class TaskRunnerOomError extends ApplicationError {
+export class TaskRunnerOomError extends UserError {
 	description: string;
 
 	constructor(
 		readonly runnerId: TaskRunner['id'],
 		isCloudDeployment: boolean,
 	) {
-		super('Node ran out of memory.', { level: 'error' });
+		super('Node ran out of memory');
 
 		const fixSuggestions = {
 			reduceItems:
diff --git a/packages/cli/src/task-runners/errors/task-runner-restart-loop-error.ts b/packages/cli/src/task-runners/errors/task-runner-restart-loop-error.ts
index fa02430ade..5727ff69a6 100644
--- a/packages/cli/src/task-runners/errors/task-runner-restart-loop-error.ts
+++ b/packages/cli/src/task-runners/errors/task-runner-restart-loop-error.ts
@@ -1,14 +1,12 @@
-import { ApplicationError } from 'n8n-workflow';
+import { UnexpectedError } from 'n8n-workflow';
 
-export class TaskRunnerRestartLoopError extends ApplicationError {
+export class TaskRunnerRestartLoopError extends UnexpectedError {
 	constructor(
 		readonly howManyTimes: number,
 		readonly timePeriodMs: number,
 	) {
 		const message = `Task runner has restarted ${howManyTimes} times within ${timePeriodMs / 1000} seconds. This is an abnormally high restart rate that suggests a bug or other issue is preventing your runner process from starting up. If this issues persists, please file a report at: https://github.com/n8n-io/n8n/issues`;
 
-		super(message, {
-			level: 'fatal',
-		});
+		super(message);
 	}
 }
diff --git a/packages/cli/src/task-runners/task-broker/errors/task-deferred.error.ts b/packages/cli/src/task-runners/task-broker/errors/task-deferred.error.ts
index 34f365af5f..5c6629c701 100644
--- a/packages/cli/src/task-runners/task-broker/errors/task-deferred.error.ts
+++ b/packages/cli/src/task-runners/task-broker/errors/task-deferred.error.ts
@@ -1,7 +1,7 @@
-import { ApplicationError } from 'n8n-workflow';
+import { UserError } from 'n8n-workflow';
 
-export class TaskDeferredError extends ApplicationError {
+export class TaskDeferredError extends UserError {
 	constructor() {
-		super('Task deferred until runner is ready', { level: 'info' });
+		super('Task deferred until runner is ready');
 	}
 }
diff --git a/packages/cli/src/task-runners/task-broker/errors/task-reject.error.ts b/packages/cli/src/task-runners/task-broker/errors/task-reject.error.ts
index 4e3f903dd8..f5615469e2 100644
--- a/packages/cli/src/task-runners/task-broker/errors/task-reject.error.ts
+++ b/packages/cli/src/task-runners/task-broker/errors/task-reject.error.ts
@@ -1,7 +1,7 @@
-import { ApplicationError } from 'n8n-workflow';
+import { UserError } from 'n8n-workflow';
 
-export class TaskRejectError extends ApplicationError {
+export class TaskRejectError extends UserError {
 	constructor(public reason: string) {
-		super(`Task rejected with reason: ${reason}`, { level: 'info' });
+		super(`Task rejected with reason: ${reason}`);
 	}
 }
diff --git a/packages/cli/src/task-runners/task-broker/errors/task-runner-timeout.error.ts b/packages/cli/src/task-runners/task-broker/errors/task-runner-timeout.error.ts
index 1d9d463e3a..ce5b53d875 100644
--- a/packages/cli/src/task-runners/task-broker/errors/task-runner-timeout.error.ts
+++ b/packages/cli/src/task-runners/task-broker/errors/task-runner-timeout.error.ts
@@ -1,7 +1,7 @@
 import type { TaskRunnerMode } from '@n8n/config/src/configs/runners.config';
-import { ApplicationError } from 'n8n-workflow';
+import { OperationalError } from 'n8n-workflow';
 
-export class TaskRunnerTimeoutError extends ApplicationError {
+export class TaskRunnerTimeoutError extends OperationalError {
 	description: string;
 
 	constructor({
diff --git a/packages/cli/src/task-runners/task-broker/task-broker-ws-server.ts b/packages/cli/src/task-runners/task-broker/task-broker-ws-server.ts
index 7b65140717..6a5e1ab429 100644
--- a/packages/cli/src/task-runners/task-broker/task-broker-ws-server.ts
+++ b/packages/cli/src/task-runners/task-broker/task-broker-ws-server.ts
@@ -2,7 +2,7 @@ import { TaskRunnersConfig } from '@n8n/config';
 import { Service } from '@n8n/di';
 import type { BrokerMessage, RunnerMessage } from '@n8n/task-runner';
 import { Logger } from 'n8n-core';
-import { ApplicationError, jsonStringify } from 'n8n-workflow';
+import { jsonStringify, UserError } from 'n8n-workflow';
 import type WebSocket from 'ws';
 
 import { Time, WsStatusCodes } from '@/constants';
@@ -49,7 +49,7 @@ export class TaskBrokerWsServer {
 		const { heartbeatInterval } = this.taskTunnersConfig;
 
 		if (heartbeatInterval <= 0) {
-			throw new ApplicationError('Heartbeat interval must be greater than 0');
+			throw new UserError('Heartbeat interval must be greater than 0');
 		}
 
 		this.heartbeatTimer = setInterval(() => {
diff --git a/packages/cli/src/task-runners/task-broker/task-broker.service.ts b/packages/cli/src/task-runners/task-broker/task-broker.service.ts
index 3afd182914..2d702994ca 100644
--- a/packages/cli/src/task-runners/task-broker/task-broker.service.ts
+++ b/packages/cli/src/task-runners/task-broker/task-broker.service.ts
@@ -7,7 +7,7 @@ import type {
 	TaskResultData,
 } from '@n8n/task-runner';
 import { Logger } from 'n8n-core';
-import { ApplicationError } from 'n8n-workflow';
+import { UnexpectedError, UserError } from 'n8n-workflow';
 import { nanoid } from 'nanoid';
 
 import config from '@/config';
@@ -92,7 +92,7 @@ export class TaskBroker {
 		private readonly taskRunnerLifecycleEvents: TaskRunnerLifecycleEvents,
 	) {
 		if (this.taskRunnersConfig.taskTimeout <= 0) {
-			throw new ApplicationError('Task timeout must be greater than 0');
+			throw new UserError('Task timeout must be greater than 0');
 		}
 	}
 
@@ -420,17 +420,12 @@ export class TaskBroker {
 	private async getRunnerOrFailTask(taskId: Task['id']): Promise<TaskRunner> {
 		const task = this.tasks.get(taskId);
 		if (!task) {
-			throw new ApplicationError(`Cannot find runner, failed to find task (${taskId})`, {
-				level: 'error',
-			});
+			throw new UnexpectedError(`Cannot find runner, failed to find task (${taskId})`);
 		}
 		const runner = this.knownRunners.get(task.runnerId);
 		if (!runner) {
-			const error = new ApplicationError(
+			const error = new UnexpectedError(
 				`Cannot find runner, failed to find runner (${task.runnerId})`,
-				{
-					level: 'error',
-				},
 			);
 			await this.failTask(taskId, error);
 			throw error;
diff --git a/packages/cli/src/wait-tracker.ts b/packages/cli/src/wait-tracker.ts
index d3c9d54c3a..cca69548bd 100644
--- a/packages/cli/src/wait-tracker.ts
+++ b/packages/cli/src/wait-tracker.ts
@@ -1,6 +1,6 @@
 import { Service } from '@n8n/di';
 import { InstanceSettings, Logger } from 'n8n-core';
-import { ApplicationError, type IWorkflowExecutionDataProcess } from 'n8n-workflow';
+import { UnexpectedError, type IWorkflowExecutionDataProcess } from 'n8n-workflow';
 
 import { ActiveExecutions } from '@/active-executions';
 import { ExecutionRepository } from '@/databases/repositories/execution.repository';
@@ -110,14 +110,14 @@ export class WaitTracker {
 		});
 
 		if (!fullExecutionData) {
-			throw new ApplicationError('Execution does not exist.', { extra: { executionId } });
+			throw new UnexpectedError('Execution does not exist.', { extra: { executionId } });
 		}
 		if (fullExecutionData.finished) {
-			throw new ApplicationError('The execution did succeed and can so not be started again.');
+			throw new UnexpectedError('The execution did succeed and can so not be started again.');
 		}
 
 		if (!fullExecutionData.workflowData.id) {
-			throw new ApplicationError('Only saved workflows can be resumed.');
+			throw new UnexpectedError('Only saved workflows can be resumed.');
 		}
 
 		const workflowId = fullExecutionData.workflowData.id;
diff --git a/packages/cli/src/webhooks/webhook.service.ts b/packages/cli/src/webhooks/webhook.service.ts
index 1a3dbf37cb..feacb6412c 100644
--- a/packages/cli/src/webhooks/webhook.service.ts
+++ b/packages/cli/src/webhooks/webhook.service.ts
@@ -1,6 +1,6 @@
 import { Service } from '@n8n/di';
 import { HookContext, WebhookContext, Logger } from 'n8n-core';
-import { ApplicationError, Node, NodeHelpers } from 'n8n-workflow';
+import { Node, NodeHelpers, UnexpectedError } from 'n8n-workflow';
 import type {
 	IHttpRequestMethods,
 	INode,
@@ -321,7 +321,7 @@ export class WebhookService {
 	): Promise<IWebhookResponseData> {
 		const nodeType = this.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
 		if (nodeType.webhook === undefined) {
-			throw new ApplicationError('Node does not have any webhooks defined', {
+			throw new UnexpectedError('Node does not have any webhooks defined', {
 				extra: { nodeName: node.name },
 			});
 		}
diff --git a/packages/cli/src/workflow-execute-additional-data.ts b/packages/cli/src/workflow-execute-additional-data.ts
index a83ee5b263..43b478703e 100644
--- a/packages/cli/src/workflow-execute-additional-data.ts
+++ b/packages/cli/src/workflow-execute-additional-data.ts
@@ -6,7 +6,7 @@ import type { PushMessage, PushType } from '@n8n/api-types';
 import { GlobalConfig } from '@n8n/config';
 import { Container } from '@n8n/di';
 import { Logger, WorkflowExecute } from 'n8n-core';
-import { ApplicationError, Workflow } from 'n8n-workflow';
+import { UnexpectedError, Workflow } from 'n8n-workflow';
 import type {
 	IDataObject,
 	IExecuteData,
@@ -105,7 +105,7 @@ export async function getWorkflowData(
 	parentWorkflowSettings?: IWorkflowSettings,
 ): Promise<IWorkflowBase> {
 	if (workflowInfo.id === undefined && workflowInfo.code === undefined) {
-		throw new ApplicationError(
+		throw new UnexpectedError(
 			'No information about the workflow to execute found. Please provide either the "id" or "code"!',
 		);
 	}
@@ -120,7 +120,7 @@ export async function getWorkflowData(
 		);
 
 		if (workflowData === undefined || workflowData === null) {
-			throw new ApplicationError('Workflow does not exist.', {
+			throw new UnexpectedError('Workflow does not exist.', {
 				extra: { workflowId: workflowInfo.id },
 			});
 		}
diff --git a/packages/cli/src/workflows/workflow.service.ee.ts b/packages/cli/src/workflows/workflow.service.ee.ts
index 4ff8bbc469..b2ce3630a6 100644
--- a/packages/cli/src/workflows/workflow.service.ee.ts
+++ b/packages/cli/src/workflows/workflow.service.ee.ts
@@ -4,7 +4,7 @@ import { In, type EntityManager } from '@n8n/typeorm';
 import omit from 'lodash/omit';
 import { Logger } from 'n8n-core';
 import type { IWorkflowBase, WorkflowId } from 'n8n-workflow';
-import { ApplicationError, NodeOperationError, WorkflowActivationError } from 'n8n-workflow';
+import { NodeOperationError, UserError, WorkflowActivationError } from 'n8n-workflow';
 
 import { ActiveWorkflowManager } from '@/active-workflow-manager';
 import { CredentialsService } from '@/credentials/credentials.service';
@@ -142,9 +142,7 @@ export class EnterpriseWorkflowService {
 				if (credentialId === undefined) return;
 				const matchedCredential = allowedCredentials.find(({ id }) => id === credentialId);
 				if (!matchedCredential) {
-					throw new ApplicationError(
-						'The workflow contains credentials that you do not have access to',
-					);
+					throw new UserError('The workflow contains credentials that you do not have access to');
 				}
 			});
 		});
diff --git a/packages/cli/src/workflows/workflows.controller.ts b/packages/cli/src/workflows/workflows.controller.ts
index cf3eee51d1..79cdef3409 100644
--- a/packages/cli/src/workflows/workflows.controller.ts
+++ b/packages/cli/src/workflows/workflows.controller.ts
@@ -9,7 +9,7 @@ import { In, type FindOptionsRelations } from '@n8n/typeorm';
 import axios from 'axios';
 import express from 'express';
 import { Logger } from 'n8n-core';
-import { ApplicationError } from 'n8n-workflow';
+import { UnexpectedError } from 'n8n-workflow';
 import { v4 as uuid } from 'uuid';
 
 import type { Project } from '@/databases/entities/project';
@@ -154,7 +154,7 @@ export class WorkflowsController {
 
 			// Safe guard in case the personal project does not exist for whatever reason.
 			if (project === null) {
-				throw new ApplicationError('No personal project found');
+				throw new UnexpectedError('No personal project found');
 			}
 
 			if (parentFolderId) {
@@ -401,15 +401,11 @@ export class WorkflowsController {
 		@Query query: ManualRunQueryDto,
 	) {
 		if (!req.body.workflowData.id) {
-			throw new ApplicationError('You cannot execute a workflow without an ID', {
-				level: 'warning',
-			});
+			throw new UnexpectedError('You cannot execute a workflow without an ID');
 		}
 
 		if (req.params.workflowId !== req.body.workflowData.id) {
-			throw new ApplicationError('Workflow ID in body does not match workflow ID in URL', {
-				level: 'warning',
-			});
+			throw new UnexpectedError('Workflow ID in body does not match workflow ID in URL');
 		}
 
 		if (this.license.isSharingEnabled()) {
diff --git a/packages/core/src/errors/error-reporter.ts b/packages/core/src/errors/error-reporter.ts
index cdcf58ea2f..f2c99bffbc 100644
--- a/packages/core/src/errors/error-reporter.ts
+++ b/packages/core/src/errors/error-reporter.ts
@@ -172,8 +172,8 @@ export class ErrorReporter {
 		}
 
 		if (this.isIgnoredSqliteError(originalException)) return null;
-		if (originalException instanceof ApplicationError) {
-			if (this.isIgnoredApplicationError(originalException)) return null;
+		if (originalException instanceof ApplicationError || originalException instanceof BaseError) {
+			if (this.isIgnoredN8nError(originalException)) return null;
 
 			this.extractEventDetailsFromN8nError(event, originalException);
 		}
@@ -227,8 +227,8 @@ export class ErrorReporter {
 		);
 	}
 
-	private isIgnoredApplicationError(error: ApplicationError) {
-		return error.level === 'warning';
+	private isIgnoredN8nError(error: ApplicationError | BaseError) {
+		return error.level === 'warning' || error.level === 'info';
 	}
 
 	private extractEventDetailsFromN8nError(
diff --git a/packages/workflow/src/errors/base/base.error.ts b/packages/workflow/src/errors/base/base.error.ts
index 15d1d4dacb..50f61ba1e6 100644
--- a/packages/workflow/src/errors/base/base.error.ts
+++ b/packages/workflow/src/errors/base/base.error.ts
@@ -13,7 +13,7 @@ export abstract class BaseError extends Error {
 	 * Error level. Defines which level the error should be logged/reported
 	 * @default 'error'
 	 */
-	readonly level: ErrorLevel;
+	level: ErrorLevel;
 
 	/**
 	 * Whether the error should be reported to Sentry.

From ebaaf0e3d9602052f76f61b90fb073e390896cea Mon Sep 17 00:00:00 2001
From: Csaba Tuncsik <csaba@n8n.io>
Date: Thu, 27 Feb 2025 08:57:29 +0100
Subject: [PATCH 20/47] fix(editor): Fix icon spacing in accordion title
 (#13539)

---
 .../components/N8nInfoAccordion/InfoAccordion.vue  | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/packages/design-system/src/components/N8nInfoAccordion/InfoAccordion.vue b/packages/design-system/src/components/N8nInfoAccordion/InfoAccordion.vue
index dc669a0984..ff2b5f2c8a 100644
--- a/packages/design-system/src/components/N8nInfoAccordion/InfoAccordion.vue
+++ b/packages/design-system/src/components/N8nInfoAccordion/InfoAccordion.vue
@@ -55,13 +55,7 @@ const onTooltipClick = (item: string, event: MouseEvent) => emit('tooltipClick',
 <template>
 	<div :class="['accordion', $style.container]">
 		<div :class="{ [$style.header]: true, [$style.expanded]: expanded }" @click="toggle">
-			<N8nIcon
-				v-if="headerIcon"
-				:icon="headerIcon.icon"
-				:color="headerIcon.color"
-				size="small"
-				class="mr-2xs"
-			/>
+			<N8nIcon v-if="headerIcon" :icon="headerIcon.icon" :color="headerIcon.color" size="small" />
 			<N8nText :class="$style.headerText" color="text-base" size="small" align="left" bold>{{
 				title
 			}}</N8nText>
@@ -102,10 +96,8 @@ const onTooltipClick = (item: string, event: MouseEvent) => emit('tooltipClick',
 	display: flex;
 	padding: var(--spacing-s);
 	align-items: center;
-
-	.headerText {
-		flex-grow: 1;
-	}
+	justify-content: flex-start;
+	gap: var(--spacing-3xs);
 }
 
 .expanded {

From 7fb88e623f3c3203cd8f81ca521760e6e082a645 Mon Sep 17 00:00:00 2001
From: Alex Grozav <alex@grozav.com>
Date: Thu, 27 Feb 2025 09:58:31 +0200
Subject: [PATCH 21/47] feat: Add new `@n8n/utils` package (no-changelog)
 (#13536)

---
 packages/@n8n/utils/.eslintrc.cjs             | 10 +++
 packages/@n8n/utils/.gitignore                | 24 ++++++
 packages/@n8n/utils/README.md                 | 25 ++++++
 packages/@n8n/utils/biome.jsonc               |  4 +
 packages/@n8n/utils/package.json              | 40 +++++++++
 packages/@n8n/utils/src/__tests__/setup.ts    |  1 +
 .../src/utils => @n8n/utils/src}/assert.ts    |  1 +
 .../utils/src}/event-bus.test.ts              |  0
 .../src/utils => @n8n/utils/src}/event-bus.ts |  6 +-
 .../utils/src/search/sublimeSearch.ts}        | 85 ++++++++-----------
 packages/@n8n/utils/src/shims.d.ts            |  1 +
 .../utils/src/sort/sortByProperty.test.ts}    | 12 +--
 .../@n8n/utils/src/sort/sortByProperty.ts     | 12 +++
 .../@n8n/utils/src/string/truncate.test.ts    | 15 ++++
 .../utils/src/string/truncate.ts}             |  0
 packages/@n8n/utils/tsconfig.json             | 11 +++
 packages/@n8n/utils/tsup.config.ts            | 11 +++
 packages/@n8n/utils/vite.config.ts            |  4 +
 packages/design-system/package.json           |  1 +
 .../N8nInfoAccordion/InfoAccordion.vue        |  2 +-
 .../src/directives/n8n-truncate.ts            |  3 +-
 .../design-system/src/utils/form-event-bus.ts |  2 +-
 packages/design-system/src/utils/index.ts     |  2 -
 .../design-system/src/utils/string.test.ts    | 17 ----
 packages/design-system/tsconfig.json          |  3 +-
 packages/design-system/vite.config.mts        |  2 +
 packages/editor-ui/package.json               |  1 +
 .../editor-ui/src/__tests__/data/canvas.ts    |  4 +-
 .../editor-ui/src/components/AboutModal.vue   |  2 +-
 .../components/AnnotationTagsDropdown.ee.vue  |  2 +-
 .../components/ApiKeyCreateOrEditModal.vue    |  2 +-
 .../src/components/ChangePasswordModal.vue    |  3 +-
 .../src/components/ChatEmbedModal.vue         |  4 +-
 .../CommunityPackageInstallModal.vue          |  2 +-
 .../CommunityPackageManageConfirmModal.vue    |  2 +-
 .../CommunityPlusEnrollmentModal.vue          |  2 +-
 .../src/components/ContactPromptModal.vue     |  2 +-
 .../CredentialEdit/CredentialEdit.vue         |  4 +-
 .../CredentialEdit/CredentialSharing.ee.vue   |  2 +-
 .../CredentialPicker/CredentialPicker.vue     |  2 +-
 .../src/components/CredentialsSelectModal.vue |  2 +-
 .../src/components/DeleteUserModal.vue        |  2 +-
 .../components/DuplicateWorkflowDialog.vue    |  2 +-
 .../ExpandableInput/ExpandableInputEdit.vue   |  2 +-
 .../components/ExpressionParameterInput.vue   |  2 +-
 ...rnalSecretsProviderConnectionSwitch.ee.vue |  2 +-
 .../ExternalSecretsProviderModal.ee.vue       |  4 +-
 .../src/components/ImportCurlModal.vue        |  2 +-
 .../src/components/InlineTextEdit.vue         |  2 +-
 .../src/components/InputNodeSelect.vue        |  2 +-
 .../src/components/IntersectionObserved.vue   |  4 +-
 .../src/components/IntersectionObserver.vue   |  4 +-
 .../src/components/InviteUsersModal.vue       |  3 +-
 .../components/MainHeader/WorkflowDetails.vue |  2 +-
 .../components/MainSidebarSourceControl.vue   |  2 +-
 packages/editor-ui/src/components/Modal.vue   |  2 +-
 .../editor-ui/src/components/ModalDrawer.vue  |  2 +-
 packages/editor-ui/src/components/Modals.vue  |  2 +-
 .../src/components/Node/NodeCreator/utils.ts  |  2 +-
 .../src/components/NodeCredentials.vue        |  2 +-
 .../src/components/NodeDetailsView.vue        |  2 +-
 .../editor-ui/src/components/NodeSettings.vue |  2 +-
 .../editor-ui/src/components/NpsSurvey.vue    |  2 +-
 .../src/components/ParameterInput.test.ts     |  2 +-
 .../src/components/ParameterInput.vue         |  4 +-
 .../src/components/ParameterInputExpanded.vue |  2 +-
 .../src/components/ParameterInputFull.vue     |  2 +-
 .../src/components/ParameterInputWrapper.vue  |  4 +-
 .../src/components/PersonalizationModal.vue   |  3 +-
 .../Projects/ProjectCardBadge.test.ts         |  2 +-
 .../Projects/ProjectMoveResourceModal.vue     |  6 +-
 .../ProjectMoveSuccessToastMessage.vue        |  2 +-
 .../components/Projects/ProjectSharing.vue    |  2 +-
 .../PromptMfaCodeModal/PromptMfaCodeModal.vue |  2 +-
 .../ResourceLocator/ResourceLocator.vue       |  4 +-
 .../ResourceLocatorDropdown.vue               |  4 +-
 .../EventDestinationCard.ee.vue               |  4 +-
 .../EventDestinationSettingsModal.ee.vue      |  4 +-
 .../SourceControlPullModal.ee.test.ts         |  2 +-
 .../components/SourceControlPullModal.ee.vue  |  2 +-
 .../SourceControlPushModal.ee.test.ts         |  2 +-
 .../components/SourceControlPushModal.ee.vue  |  2 +-
 .../src/components/TagsContainer.vue          |  2 +-
 .../editor-ui/src/components/TagsDropdown.vue |  2 +-
 .../components/TagsManager/TagsManager.vue    |  2 +-
 .../EditDefinition/NodesPinning.vue           |  3 +-
 .../EditDefinition/TagsInput.vue              |  2 +-
 .../editor-ui/src/components/TriggerPanel.vue |  2 +-
 .../src/components/Workers/WorkerCard.ee.vue  |  2 +-
 .../editor-ui/src/components/WorkflowCard.vue |  2 +-
 .../WorkflowSelectorParameterInput.vue        |  4 +-
 .../src/components/WorkflowSettings.vue       |  2 +-
 .../src/components/WorkflowShareModal.ee.vue  |  2 +-
 .../src/components/WorkflowTagsDropdown.vue   |  2 +-
 .../src/components/canvas/Canvas.vue          |  4 +-
 .../components/canvas/WorkflowCanvas.test.ts  |  2 +-
 .../src/components/canvas/WorkflowCanvas.vue  |  4 +-
 .../canvas/elements/nodes/CanvasNode.vue      |  4 +-
 .../WorkflowExecutionAnnotationPanel.ee.vue   |  2 +-
 .../composables/useGlobalEntityCreation.ts    |  2 +-
 .../src/composables/useImportCurlCommand.ts   |  2 +-
 .../src/event-bus/code-node-editor.ts         |  2 +-
 .../editor-ui/src/event-bus/data-pinning.ts   |  2 +-
 .../src/event-bus/global-link-actions.ts      |  2 +-
 .../editor-ui/src/event-bus/html-editor.ts    |  2 +-
 .../editor-ui/src/event-bus/import-curl.ts    |  2 +-
 packages/editor-ui/src/event-bus/mfa.ts       |  2 +-
 packages/editor-ui/src/event-bus/ndv.ts       |  2 +-
 packages/editor-ui/src/event-bus/node-view.ts |  2 +-
 .../editor-ui/src/event-bus/source-control.ts |  2 +-
 packages/editor-ui/src/models/history.ts      |  2 +-
 .../editor-ui/src/stores/assistant.store.ts   |  2 +-
 .../editor-ui/src/stores/npsSurvey.store.ts   |  2 +-
 packages/editor-ui/src/types/canvas.ts        |  2 +-
 packages/editor-ui/src/types/externalHooks.ts |  2 +-
 packages/editor-ui/src/utils/apiUtils.ts      |  2 +-
 .../src/utils/templates/templateActions.ts    |  2 +-
 packages/editor-ui/src/views/NodeView.vue     |  3 +-
 .../src/views/SettingsLogStreamingView.vue    |  2 +-
 .../editor-ui/src/views/WorkflowsView.vue     |  2 +-
 packages/editor-ui/tsconfig.json              |  3 +-
 packages/editor-ui/vite.config.mts            | 12 +--
 .../frontend/@n8n/composables/tsconfig.json   |  3 +-
 .../frontend/@n8n/composables/tsup.config.ts  |  2 +-
 pnpm-lock.yaml                                | 39 +++++++++
 125 files changed, 379 insertions(+), 202 deletions(-)
 create mode 100644 packages/@n8n/utils/.eslintrc.cjs
 create mode 100644 packages/@n8n/utils/.gitignore
 create mode 100644 packages/@n8n/utils/README.md
 create mode 100644 packages/@n8n/utils/biome.jsonc
 create mode 100644 packages/@n8n/utils/package.json
 create mode 100644 packages/@n8n/utils/src/__tests__/setup.ts
 rename packages/{editor-ui/src/utils => @n8n/utils/src}/assert.ts (75%)
 rename packages/{design-system/src/utils => @n8n/utils/src}/event-bus.test.ts (100%)
 rename packages/{design-system/src/utils => @n8n/utils/src}/event-bus.ts (90%)
 rename packages/{editor-ui/src/utils/sortUtils.ts => @n8n/utils/src/search/sublimeSearch.ts} (91%)
 create mode 100644 packages/@n8n/utils/src/shims.d.ts
 rename packages/{editor-ui/src/utils/sortUtils.test.ts => @n8n/utils/src/sort/sortByProperty.test.ts} (70%)
 create mode 100644 packages/@n8n/utils/src/sort/sortByProperty.ts
 create mode 100644 packages/@n8n/utils/src/string/truncate.test.ts
 rename packages/{design-system/src/utils/string.ts => @n8n/utils/src/string/truncate.ts} (100%)
 create mode 100644 packages/@n8n/utils/tsconfig.json
 create mode 100644 packages/@n8n/utils/tsup.config.ts
 create mode 100644 packages/@n8n/utils/vite.config.ts
 delete mode 100644 packages/design-system/src/utils/string.test.ts

diff --git a/packages/@n8n/utils/.eslintrc.cjs b/packages/@n8n/utils/.eslintrc.cjs
new file mode 100644
index 0000000000..8050caa04e
--- /dev/null
+++ b/packages/@n8n/utils/.eslintrc.cjs
@@ -0,0 +1,10 @@
+const sharedOptions = require('@n8n/eslint-config/shared');
+
+/**
+ * @type {import('@types/eslint').ESLint.ConfigData}
+ */
+module.exports = {
+	extends: ['@n8n/eslint-config/node'],
+
+	...sharedOptions(__dirname),
+};
diff --git a/packages/@n8n/utils/.gitignore b/packages/@n8n/utils/.gitignore
new file mode 100644
index 0000000000..a547bf36d8
--- /dev/null
+++ b/packages/@n8n/utils/.gitignore
@@ -0,0 +1,24 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+dist
+dist-ssr
+*.local
+
+# Editor directories and files
+.vscode/*
+!.vscode/extensions.json
+.idea
+.DS_Store
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
diff --git a/packages/@n8n/utils/README.md b/packages/@n8n/utils/README.md
new file mode 100644
index 0000000000..4bcf167a3e
--- /dev/null
+++ b/packages/@n8n/utils/README.md
@@ -0,0 +1,25 @@
+# @n8n/utils
+
+A collection of utility functions that provide common functionality for both Front-End and Back-End packages.
+
+## Table of Contents
+
+- [Features](#features)
+- [Contributing](#contributing)
+- [License](#license)
+
+## Features
+
+- **Reusable Logic**: Build complex, stateful functionality using modular composable functions that you can easily reuse.
+- **Consistent Patterns**: Enjoy a unified approach across n8n packages, making integration and maintenance a breeze.
+- **Type-Safe & Reliable**: Benefit from TypeScript support, which improves the developer experience and code robustness.
+- **Universal Functionality**: Designed to work seamlessly on both the front-end and back-end.
+- **Easily Testable**: A modular design that simplifies testing, maintenance, and rapid development.
+
+## Contributing
+
+For more details, please read our [CONTRIBUTING.md](CONTRIBUTING.md).
+
+## License
+
+For more details, please read our [LICENSE.md](LICENSE.md).
diff --git a/packages/@n8n/utils/biome.jsonc b/packages/@n8n/utils/biome.jsonc
new file mode 100644
index 0000000000..0c0bdac000
--- /dev/null
+++ b/packages/@n8n/utils/biome.jsonc
@@ -0,0 +1,4 @@
+{
+	"$schema": "../../../node_modules/@biomejs/biome/configuration_schema.json",
+	"extends": ["../../../biome.jsonc"]
+}
diff --git a/packages/@n8n/utils/package.json b/packages/@n8n/utils/package.json
new file mode 100644
index 0000000000..08c7bbe2da
--- /dev/null
+++ b/packages/@n8n/utils/package.json
@@ -0,0 +1,40 @@
+{
+  "name": "@n8n/utils",
+  "type": "module",
+  "version": "1.2.0",
+  "files": [
+    "dist"
+  ],
+  "exports": {
+    "./*": {
+      "types": "./dist/*.d.ts",
+      "import": "./dist/*.js",
+      "require": "./dist/*.cjs"
+    }
+  },
+  "scripts": {
+    "dev": "vite",
+    "build": "pnpm run typecheck && tsup",
+    "preview": "vite preview",
+    "typecheck": "tsc --noEmit",
+    "test": "vitest run",
+    "test:dev": "vitest --silent=false",
+    "lint": "eslint src --ext .js,.ts,.vue --quiet",
+    "lintfix": "eslint src --ext .js,.ts,.vue --fix",
+    "format": "biome format --write . && prettier --write . --ignore-path ../../../.prettierignore",
+    "format:check": "biome ci . && prettier --check . --ignore-path ../../../.prettierignore"
+  },
+  "devDependencies": {
+    "@n8n/eslint-config": "workspace:*",
+    "@n8n/typescript-config": "workspace:*",
+    "@n8n/vitest-config": "workspace:*",
+    "@testing-library/jest-dom": "catalog:frontend",
+    "@testing-library/user-event": "catalog:frontend",
+    "tsup": "catalog:frontend",
+    "typescript": "catalog:frontend",
+    "vite": "catalog:frontend",
+    "vite-plugin-dts": "catalog:frontend",
+    "vitest": "catalog:frontend"
+  },
+  "license": "See LICENSE.md file in the root of the repository"
+}
diff --git a/packages/@n8n/utils/src/__tests__/setup.ts b/packages/@n8n/utils/src/__tests__/setup.ts
new file mode 100644
index 0000000000..7b0828bfa8
--- /dev/null
+++ b/packages/@n8n/utils/src/__tests__/setup.ts
@@ -0,0 +1 @@
+import '@testing-library/jest-dom';
diff --git a/packages/editor-ui/src/utils/assert.ts b/packages/@n8n/utils/src/assert.ts
similarity index 75%
rename from packages/editor-ui/src/utils/assert.ts
rename to packages/@n8n/utils/src/assert.ts
index 4366324141..6038ccce6e 100644
--- a/packages/editor-ui/src/utils/assert.ts
+++ b/packages/@n8n/utils/src/assert.ts
@@ -3,6 +3,7 @@
  */
 export function assert(condition: unknown, message?: string): asserts condition {
 	if (!condition) {
+		// eslint-disable-next-line n8n-local-rules/no-plain-errors
 		throw new Error(message ?? 'Assertion failed');
 	}
 }
diff --git a/packages/design-system/src/utils/event-bus.test.ts b/packages/@n8n/utils/src/event-bus.test.ts
similarity index 100%
rename from packages/design-system/src/utils/event-bus.test.ts
rename to packages/@n8n/utils/src/event-bus.test.ts
diff --git a/packages/design-system/src/utils/event-bus.ts b/packages/@n8n/utils/src/event-bus.ts
similarity index 90%
rename from packages/design-system/src/utils/event-bus.ts
rename to packages/@n8n/utils/src/event-bus.ts
index eb08228b47..b25358fec8 100644
--- a/packages/design-system/src/utils/event-bus.ts
+++ b/packages/@n8n/utils/src/event-bus.ts
@@ -7,7 +7,6 @@ type Payloads<ListenerMap> = {
 
 type Listener<Payload> = (payload: Payload) => void;
 
-// TODO: Fix all usages of `createEventBus` and convert `any` to `unknown`
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export interface EventBus<ListenerMap extends Payloads<ListenerMap> = Record<string, any>> {
 	on<EventName extends keyof ListenerMap & string>(
@@ -42,7 +41,6 @@ export interface EventBus<ListenerMap extends Payloads<ListenerMap> = Record<str
  * }>();
  */
 export function createEventBus<
-	// TODO: Fix all usages of `createEventBus` and convert `any` to `unknown`
 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	ListenerMap extends Payloads<ListenerMap> = Record<string, any>,
 >(): EventBus<ListenerMap> {
@@ -77,7 +75,9 @@ export function createEventBus<
 		emit(eventName, event) {
 			const eventFns = handlers.get(eventName);
 			if (eventFns) {
-				eventFns.slice().forEach((handler) => handler(event));
+				eventFns.slice().forEach((handler) => {
+					handler(event);
+				});
 			}
 		},
 	};
diff --git a/packages/editor-ui/src/utils/sortUtils.ts b/packages/@n8n/utils/src/search/sublimeSearch.ts
similarity index 91%
rename from packages/editor-ui/src/utils/sortUtils.ts
rename to packages/@n8n/utils/src/search/sublimeSearch.ts
index 5e5534cdda..e358352a67 100644
--- a/packages/editor-ui/src/utils/sortUtils.ts
+++ b/packages/@n8n/utils/src/search/sublimeSearch.ts
@@ -1,8 +1,7 @@
 /*
-	Constants and utility functions used for searching for node types in node creator component
-*/
-
-// based on https://github.com/forrestthewoods/lib_fts/blob/master/code/fts_fuzzy_match.js
+ * Constants and utility functions used for searching for node types in node creator component
+ * based on https://github.com/forrestthewoods/lib_fts/blob/master/code/fts_fuzzy_match.js
+ */
 
 const SEQUENTIAL_BONUS = 60; // bonus for adjacent matches
 const SEPARATOR_BONUS = 30; // bonus if match occurs after a separator
@@ -34,33 +33,6 @@ function fuzzyMatchSimple(pattern: string, target: string): boolean {
 	return pattern.length !== 0 && target.length !== 0 && patternIdx === pattern.length;
 }
 
-/**
- * Does a fuzzy search to find pattern inside a string.
- * @param {*} pattern string        pattern to search for
- * @param {*} target     string        string which is being searched
- * @returns [boolean, number]       a boolean which tells if pattern was
- *                                  found or not and a search score
- */
-function fuzzyMatch(pattern: string, target: string): { matched: boolean; outScore: number } {
-	const recursionCount = 0;
-	const recursionLimit = 5;
-	const matches: number[] = [];
-	const maxMatches = 256;
-
-	return fuzzyMatchRecursive(
-		pattern,
-		target,
-		0 /* patternCurIndex */,
-		0 /* strCurrIndex */,
-		null /* srcMatces */,
-		matches,
-		maxMatches,
-		0 /* nextMatch */,
-		recursionCount,
-		recursionLimit,
-	);
-}
-
 function fuzzyMatchRecursive(
 	pattern: string,
 	target: string,
@@ -195,6 +167,33 @@ function fuzzyMatchRecursive(
 	return { matched: false, outScore };
 }
 
+/**
+ * Does a fuzzy search to find pattern inside a string.
+ * @param {*} pattern string        pattern to search for
+ * @param {*} target     string        string which is being searched
+ * @returns [boolean, number]       a boolean which tells if pattern was
+ *                                  found or not and a search score
+ */
+function fuzzyMatch(pattern: string, target: string): { matched: boolean; outScore: number } {
+	const recursionCount = 0;
+	const recursionLimit = 5;
+	const matches: number[] = [];
+	const maxMatches = 256;
+
+	return fuzzyMatchRecursive(
+		pattern,
+		target,
+		0 /* patternCurIndex */,
+		0 /* strCurrIndex */,
+		null /* srcMatces */,
+		matches,
+		maxMatches,
+		0 /* nextMatch */,
+		recursionCount,
+		recursionLimit,
+	);
+}
+
 // prop = 'key'
 // prop = 'key1.key2'
 // prop = ['key1', 'key2']
@@ -225,6 +224,7 @@ export function sublimeSearch<T extends object>(
 		keys.forEach(({ key, weight }) => {
 			const value = getValue(item, key);
 			if (Array.isArray(value)) {
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
 				values = values.concat(value.map((v) => ({ value: v, weight })));
 			} else if (typeof value === 'string') {
 				values.push({
@@ -237,24 +237,24 @@ export function sublimeSearch<T extends object>(
 		// for each item, check every key and get maximum score
 		const itemMatch = values.reduce(
 			(
-				accu: null | { matched: boolean; outScore: number },
+				result: null | { matched: boolean; outScore: number },
 				{ value, weight }: { value: string; weight: number },
 			) => {
 				if (!fuzzyMatchSimple(filter, value)) {
-					return accu;
+					return result;
 				}
 
 				const match = fuzzyMatch(filter, value);
 				match.outScore *= weight;
 
 				const { matched, outScore } = match;
-				if (!accu && matched) {
+				if (!result && matched) {
 					return match;
 				}
-				if (matched && accu && outScore > accu.outScore) {
+				if (matched && result && outScore > result.outScore) {
 					return match;
 				}
-				return accu;
+				return result;
 			},
 			null,
 		);
@@ -275,16 +275,3 @@ export function sublimeSearch<T extends object>(
 
 	return results;
 }
-
-export const sortByProperty = <T>(
-	property: keyof T,
-	arr: T[],
-	order: 'asc' | 'desc' = 'asc',
-): T[] =>
-	arr.sort((a, b) => {
-		const result = String(a[property]).localeCompare(String(b[property]), undefined, {
-			numeric: true,
-			sensitivity: 'base',
-		});
-		return order === 'asc' ? result : -result;
-	});
diff --git a/packages/@n8n/utils/src/shims.d.ts b/packages/@n8n/utils/src/shims.d.ts
new file mode 100644
index 0000000000..11f02fe2a0
--- /dev/null
+++ b/packages/@n8n/utils/src/shims.d.ts
@@ -0,0 +1 @@
+/// <reference types="vite/client" />
diff --git a/packages/editor-ui/src/utils/sortUtils.test.ts b/packages/@n8n/utils/src/sort/sortByProperty.test.ts
similarity index 70%
rename from packages/editor-ui/src/utils/sortUtils.test.ts
rename to packages/@n8n/utils/src/sort/sortByProperty.test.ts
index 45a657df07..97c903b053 100644
--- a/packages/editor-ui/src/utils/sortUtils.test.ts
+++ b/packages/@n8n/utils/src/sort/sortByProperty.test.ts
@@ -1,4 +1,4 @@
-import { sortByProperty } from '@/utils/sortUtils';
+import { sortByProperty } from './sortByProperty';
 
 const arrayOfObjects = [
 	{ name: 'Álvaro', age: 30 },
@@ -7,8 +7,8 @@ const arrayOfObjects = [
 	{ name: 'Bob', age: 35 },
 ];
 
-describe('sortUtils', () => {
-	it('"sortByProperty" should sort an array of objects by a property', () => {
+describe('sortByProperty', () => {
+	it('should sort an array of objects by a property', () => {
 		const sortedArray = sortByProperty('name', arrayOfObjects);
 		expect(sortedArray).toEqual([
 			{ name: 'Álvaro', age: 30 },
@@ -18,7 +18,7 @@ describe('sortUtils', () => {
 		]);
 	});
 
-	it('"sortByProperty" should sort an array of objects by a property in descending order', () => {
+	it('should sort an array of objects by a property in descending order', () => {
 		const sortedArray = sortByProperty('name', arrayOfObjects, 'desc');
 		expect(sortedArray).toEqual([
 			{ name: 'Željko', age: 25 },
@@ -28,7 +28,7 @@ describe('sortUtils', () => {
 		]);
 	});
 
-	it('"sortByProperty" should sort an array of objects by a property if its number', () => {
+	it('should sort an array of objects by a property if its number', () => {
 		const sortedArray = sortByProperty('age', arrayOfObjects);
 		expect(sortedArray).toEqual([
 			{ name: 'Željko', age: 25 },
@@ -38,7 +38,7 @@ describe('sortUtils', () => {
 		]);
 	});
 
-	it('"sortByProperty" should sort an array of objects by a property in descending order if its number', () => {
+	it('should sort an array of objects by a property in descending order if its number', () => {
 		const sortedArray = sortByProperty('age', arrayOfObjects, 'desc');
 		expect(sortedArray).toEqual([
 			{ name: 'Bob', age: 35 },
diff --git a/packages/@n8n/utils/src/sort/sortByProperty.ts b/packages/@n8n/utils/src/sort/sortByProperty.ts
new file mode 100644
index 0000000000..228cc04332
--- /dev/null
+++ b/packages/@n8n/utils/src/sort/sortByProperty.ts
@@ -0,0 +1,12 @@
+export const sortByProperty = <T>(
+	property: keyof T,
+	arr: T[],
+	order: 'asc' | 'desc' = 'asc',
+): T[] =>
+	arr.sort((a, b) => {
+		const result = String(a[property]).localeCompare(String(b[property]), undefined, {
+			numeric: true,
+			sensitivity: 'base',
+		});
+		return order === 'asc' ? result : -result;
+	});
diff --git a/packages/@n8n/utils/src/string/truncate.test.ts b/packages/@n8n/utils/src/string/truncate.test.ts
new file mode 100644
index 0000000000..4684fb2bb8
--- /dev/null
+++ b/packages/@n8n/utils/src/string/truncate.test.ts
@@ -0,0 +1,15 @@
+import { truncate } from './truncate';
+
+describe('truncate', () => {
+	it('should truncate text to 30 chars by default', () => {
+		expect(truncate('This is a very long text that should be truncated')).toBe(
+			'This is a very long text that ...',
+		);
+	});
+
+	it('should truncate text to given length', () => {
+		expect(truncate('This is a very long text that should be truncated', 25)).toBe(
+			'This is a very long text ...',
+		);
+	});
+});
diff --git a/packages/design-system/src/utils/string.ts b/packages/@n8n/utils/src/string/truncate.ts
similarity index 100%
rename from packages/design-system/src/utils/string.ts
rename to packages/@n8n/utils/src/string/truncate.ts
diff --git a/packages/@n8n/utils/tsconfig.json b/packages/@n8n/utils/tsconfig.json
new file mode 100644
index 0000000000..10f9ee1b73
--- /dev/null
+++ b/packages/@n8n/utils/tsconfig.json
@@ -0,0 +1,11 @@
+{
+	"extends": "@n8n/typescript-config/tsconfig.frontend.json",
+	"compilerOptions": {
+		"baseUrl": ".",
+		"rootDir": ".",
+		"outDir": "dist",
+		"types": ["vite/client", "vitest/globals"],
+		"isolatedModules": true
+	},
+	"include": ["src/**/*.ts", "src/**/*.vue", "vite.config.ts", "tsup.config.ts"]
+}
diff --git a/packages/@n8n/utils/tsup.config.ts b/packages/@n8n/utils/tsup.config.ts
new file mode 100644
index 0000000000..0d555b1ab0
--- /dev/null
+++ b/packages/@n8n/utils/tsup.config.ts
@@ -0,0 +1,11 @@
+import { defineConfig } from 'tsup';
+
+export default defineConfig({
+	entry: ['src/**/*.ts', '!src/**/*.test.ts', '!src/**/*.d.ts', '!src/__tests__**/*'],
+	format: ['cjs', 'esm'],
+	clean: true,
+	dts: true,
+	cjsInterop: true,
+	splitting: true,
+	sourcemap: true,
+});
diff --git a/packages/@n8n/utils/vite.config.ts b/packages/@n8n/utils/vite.config.ts
new file mode 100644
index 0000000000..784f3fb497
--- /dev/null
+++ b/packages/@n8n/utils/vite.config.ts
@@ -0,0 +1,4 @@
+import { defineConfig, mergeConfig } from 'vite';
+import { vitestConfig } from '@n8n/vitest-config/frontend';
+
+export default mergeConfig(defineConfig({}), vitestConfig);
diff --git a/packages/design-system/package.json b/packages/design-system/package.json
index 6df36b3518..fab4c8f986 100644
--- a/packages/design-system/package.json
+++ b/packages/design-system/package.json
@@ -45,6 +45,7 @@
   },
   "dependencies": {
     "@n8n/composables": "workspace:*",
+    "@n8n/utils": "workspace:*",
     "@fortawesome/fontawesome-svg-core": "^1.2.36",
     "@fortawesome/free-solid-svg-icons": "^5.15.4",
     "@fortawesome/vue-fontawesome": "^3.0.3",
diff --git a/packages/design-system/src/components/N8nInfoAccordion/InfoAccordion.vue b/packages/design-system/src/components/N8nInfoAccordion/InfoAccordion.vue
index ff2b5f2c8a..e84c18cc4c 100644
--- a/packages/design-system/src/components/N8nInfoAccordion/InfoAccordion.vue
+++ b/packages/design-system/src/components/N8nInfoAccordion/InfoAccordion.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup>
+import { createEventBus, type EventBus } from '@n8n/utils/event-bus';
 import { onMounted, ref } from 'vue';
 
 import type { IconColor } from 'n8n-design-system/types/icon';
 
-import { createEventBus, type EventBus } from '../../utils';
 import N8nIcon from '../N8nIcon';
 import N8nText from '../N8nText';
 
diff --git a/packages/design-system/src/directives/n8n-truncate.ts b/packages/design-system/src/directives/n8n-truncate.ts
index 27e678f4d5..b4b932aaec 100644
--- a/packages/design-system/src/directives/n8n-truncate.ts
+++ b/packages/design-system/src/directives/n8n-truncate.ts
@@ -1,7 +1,6 @@
+import { truncate } from '@n8n/utils/string/truncate';
 import type { DirectiveBinding, ObjectDirective } from 'vue';
 
-import { truncate } from '../utils/string';
-
 /**
  * Custom directive `n8nTruncate` to truncate text content of an HTML element.
  *
diff --git a/packages/design-system/src/utils/form-event-bus.ts b/packages/design-system/src/utils/form-event-bus.ts
index 5b518c8a42..b975130b8c 100644
--- a/packages/design-system/src/utils/form-event-bus.ts
+++ b/packages/design-system/src/utils/form-event-bus.ts
@@ -1,4 +1,4 @@
-import { createEventBus } from './event-bus';
+import { createEventBus } from '@n8n/utils/event-bus';
 
 export interface FormEventBusEvents {
 	submit: never;
diff --git a/packages/design-system/src/utils/index.ts b/packages/design-system/src/utils/index.ts
index d029baaa26..38cafd8472 100644
--- a/packages/design-system/src/utils/index.ts
+++ b/packages/design-system/src/utils/index.ts
@@ -1,8 +1,6 @@
-export * from './event-bus';
 export * from './form-event-bus';
 export * from './markdown';
 export * from './typeguards';
 export * from './uid';
 export * from './valueByPath';
 export * from './testUtils';
-export * from './string';
diff --git a/packages/design-system/src/utils/string.test.ts b/packages/design-system/src/utils/string.test.ts
deleted file mode 100644
index 0517d260d4..0000000000
--- a/packages/design-system/src/utils/string.test.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { truncate } from './string';
-
-describe('Utils string', () => {
-	describe('truncate', () => {
-		it('should truncate text to 30 chars by default', () => {
-			expect(truncate('This is a very long text that should be truncated')).toBe(
-				'This is a very long text that ...',
-			);
-		});
-
-		it('should truncate text to given length', () => {
-			expect(truncate('This is a very long text that should be truncated', 25)).toBe(
-				'This is a very long text ...',
-			);
-		});
-	});
-});
diff --git a/packages/design-system/tsconfig.json b/packages/design-system/tsconfig.json
index 6d924aafd1..32876cc14a 100644
--- a/packages/design-system/tsconfig.json
+++ b/packages/design-system/tsconfig.json
@@ -13,7 +13,8 @@
 		],
 		"paths": {
 			"n8n-design-system*": ["./src*"],
-			"@n8n/composables*": ["../frontend/@n8n/composables/src*"]
+			"@n8n/composables*": ["../frontend/@n8n/composables/src*"],
+			"@n8n/utils*": ["../@n8n/utils/src*"]
 		}
 	},
 	"include": ["src/**/*.ts", "src/**/*.vue"]
diff --git a/packages/design-system/vite.config.mts b/packages/design-system/vite.config.mts
index 4422e98dd3..ed626b2842 100644
--- a/packages/design-system/vite.config.mts
+++ b/packages/design-system/vite.config.mts
@@ -6,6 +6,7 @@ import icons from 'unplugin-icons/vite';
 import iconsResolver from 'unplugin-icons/resolver';
 import { vitestConfig } from '@n8n/vitest-config/frontend';
 
+const n8nDir = resolve(__dirname, '..', '@n8n');
 const frontendDir = resolve(__dirname, '..', 'frontend');
 
 export default mergeConfig(
@@ -31,6 +32,7 @@ export default mergeConfig(
 				'@': resolve(__dirname, 'src'),
 				'n8n-design-system': resolve(__dirname, 'src'),
 				'@n8n/composables(.*)': resolve(frontendDir, '@n8n', 'composables', 'src$1'),
+				'@n8n/utils(.*)': resolve(n8nDir, '@n8n', 'utils', 'src$1'),
 				lodash: 'lodash-es',
 			},
 		},
diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json
index 476c9ddd8e..06f2e01ab4 100644
--- a/packages/editor-ui/package.json
+++ b/packages/editor-ui/package.json
@@ -36,6 +36,7 @@
     "@n8n/codemirror-lang-sql": "^1.0.2",
     "@n8n/composables": "workspace:*",
     "@n8n/permissions": "workspace:*",
+    "@n8n/utils": "workspace:*",
     "@replit/codemirror-indentation-markers": "^6.5.3",
     "@sentry/vue": "catalog:frontend",
     "@typescript/vfs": "^1.6.0",
diff --git a/packages/editor-ui/src/__tests__/data/canvas.ts b/packages/editor-ui/src/__tests__/data/canvas.ts
index 780693ca46..fbbbb8b0aa 100644
--- a/packages/editor-ui/src/__tests__/data/canvas.ts
+++ b/packages/editor-ui/src/__tests__/data/canvas.ts
@@ -12,8 +12,8 @@ import type {
 } from '@/types';
 import { CanvasConnectionMode, CanvasNodeRenderType } from '@/types';
 import { NodeConnectionType } from 'n8n-workflow';
-import type { EventBus } from 'n8n-design-system';
-import { createEventBus } from 'n8n-design-system';
+import type { EventBus } from '@n8n/utils/event-bus';
+import { createEventBus } from '@n8n/utils/event-bus';
 import type { ViewportTransform } from '@vue-flow/core';
 
 export function createCanvasNodeData({
diff --git a/packages/editor-ui/src/components/AboutModal.vue b/packages/editor-ui/src/components/AboutModal.vue
index e6f426baef..0a9d88ce50 100644
--- a/packages/editor-ui/src/components/AboutModal.vue
+++ b/packages/editor-ui/src/components/AboutModal.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { createEventBus } from 'n8n-design-system/utils';
+import { createEventBus } from '@n8n/utils/event-bus';
 import Modal from './Modal.vue';
 import { ABOUT_MODAL_KEY } from '../constants';
 import { useRootStore } from '@/stores/root.store';
diff --git a/packages/editor-ui/src/components/AnnotationTagsDropdown.ee.vue b/packages/editor-ui/src/components/AnnotationTagsDropdown.ee.vue
index d98bda7627..f34d3df76d 100644
--- a/packages/editor-ui/src/components/AnnotationTagsDropdown.ee.vue
+++ b/packages/editor-ui/src/components/AnnotationTagsDropdown.ee.vue
@@ -3,7 +3,7 @@ import { computed } from 'vue';
 import { useUIStore } from '@/stores/ui.store';
 import { useAnnotationTagsStore } from '@/stores/tags.store';
 import { ANNOTATION_TAGS_MANAGER_MODAL_KEY } from '@/constants';
-import type { EventBus } from 'n8n-design-system';
+import type { EventBus } from '@n8n/utils/event-bus';
 
 interface TagsDropdownWrapperProps {
 	placeholder?: string;
diff --git a/packages/editor-ui/src/components/ApiKeyCreateOrEditModal.vue b/packages/editor-ui/src/components/ApiKeyCreateOrEditModal.vue
index 2ce3eb050a..5bdb217fa3 100644
--- a/packages/editor-ui/src/components/ApiKeyCreateOrEditModal.vue
+++ b/packages/editor-ui/src/components/ApiKeyCreateOrEditModal.vue
@@ -3,7 +3,7 @@ import Modal from '@/components/Modal.vue';
 import { API_KEY_CREATE_OR_EDIT_MODAL_KEY, DOCS_DOMAIN } from '@/constants';
 import { computed, onMounted, ref } from 'vue';
 import { useUIStore } from '@/stores/ui.store';
-import { createEventBus } from 'n8n-design-system/utils';
+import { createEventBus } from '@n8n/utils/event-bus';
 import { useI18n } from '@/composables/useI18n';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useRootStore } from '@/stores/root.store';
diff --git a/packages/editor-ui/src/components/ChangePasswordModal.vue b/packages/editor-ui/src/components/ChangePasswordModal.vue
index 755738d854..776d9d131a 100644
--- a/packages/editor-ui/src/components/ChangePasswordModal.vue
+++ b/packages/editor-ui/src/components/ChangePasswordModal.vue
@@ -4,7 +4,8 @@ import { useToast } from '@/composables/useToast';
 import { CHANGE_PASSWORD_MODAL_KEY } from '../constants';
 import Modal from '@/components/Modal.vue';
 import { useUsersStore } from '@/stores/users.store';
-import { createFormEventBus, createEventBus } from 'n8n-design-system/utils';
+import { createFormEventBus } from 'n8n-design-system/utils';
+import { createEventBus } from '@n8n/utils/event-bus';
 import type { IFormInputs, IFormInput } from '@/Interface';
 import { useI18n } from '@/composables/useI18n';
 
diff --git a/packages/editor-ui/src/components/ChatEmbedModal.vue b/packages/editor-ui/src/components/ChatEmbedModal.vue
index 048cdb6abb..2f24141297 100644
--- a/packages/editor-ui/src/components/ChatEmbedModal.vue
+++ b/packages/editor-ui/src/components/ChatEmbedModal.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import { computed, ref } from 'vue';
-import type { EventBus } from 'n8n-design-system/utils';
-import { createEventBus } from 'n8n-design-system/utils';
+import type { EventBus } from '@n8n/utils/event-bus';
+import { createEventBus } from '@n8n/utils/event-bus';
 import Modal from './Modal.vue';
 import { CHAT_EMBED_MODAL_KEY, CHAT_TRIGGER_NODE_TYPE, WEBHOOK_NODE_TYPE } from '../constants';
 import { useRootStore } from '@/stores/root.store';
diff --git a/packages/editor-ui/src/components/CommunityPackageInstallModal.vue b/packages/editor-ui/src/components/CommunityPackageInstallModal.vue
index b501ccfa74..068548b856 100644
--- a/packages/editor-ui/src/components/CommunityPackageInstallModal.vue
+++ b/packages/editor-ui/src/components/CommunityPackageInstallModal.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { createEventBus } from 'n8n-design-system/utils';
+import { createEventBus } from '@n8n/utils/event-bus';
 import Modal from '@/components/Modal.vue';
 import {
 	COMMUNITY_PACKAGE_INSTALL_MODAL_KEY,
diff --git a/packages/editor-ui/src/components/CommunityPackageManageConfirmModal.vue b/packages/editor-ui/src/components/CommunityPackageManageConfirmModal.vue
index 60505ee7a0..fc893fe5f3 100644
--- a/packages/editor-ui/src/components/CommunityPackageManageConfirmModal.vue
+++ b/packages/editor-ui/src/components/CommunityPackageManageConfirmModal.vue
@@ -3,7 +3,7 @@ import Modal from '@/components/Modal.vue';
 import { COMMUNITY_PACKAGE_CONFIRM_MODAL_KEY, COMMUNITY_PACKAGE_MANAGE_ACTIONS } from '@/constants';
 import { useToast } from '@/composables/useToast';
 import { useCommunityNodesStore } from '@/stores/communityNodes.store';
-import { createEventBus } from 'n8n-design-system/utils';
+import { createEventBus } from '@n8n/utils/event-bus';
 import { useI18n } from '@/composables/useI18n';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { computed, ref } from 'vue';
diff --git a/packages/editor-ui/src/components/CommunityPlusEnrollmentModal.vue b/packages/editor-ui/src/components/CommunityPlusEnrollmentModal.vue
index bb4dd0bd4b..b25d958173 100644
--- a/packages/editor-ui/src/components/CommunityPlusEnrollmentModal.vue
+++ b/packages/editor-ui/src/components/CommunityPlusEnrollmentModal.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup="">
 import { ref } from 'vue';
-import { createEventBus } from 'n8n-design-system/utils';
+import { createEventBus } from '@n8n/utils/event-bus';
 import type { Validatable, IValidator } from 'n8n-design-system';
 import { N8nFormInput } from 'n8n-design-system';
 import { VALID_EMAIL_REGEX } from '@/constants';
diff --git a/packages/editor-ui/src/components/ContactPromptModal.vue b/packages/editor-ui/src/components/ContactPromptModal.vue
index 25bb8c8eba..c0757e53cd 100644
--- a/packages/editor-ui/src/components/ContactPromptModal.vue
+++ b/packages/editor-ui/src/components/ContactPromptModal.vue
@@ -5,7 +5,7 @@ import { VALID_EMAIL_REGEX } from '@/constants';
 import Modal from '@/components/Modal.vue';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useRootStore } from '@/stores/root.store';
-import { createEventBus } from 'n8n-design-system/utils';
+import { createEventBus } from '@n8n/utils/event-bus';
 import { useToast } from '@/composables/useToast';
 import { useNpsSurveyStore } from '@/stores/npsSurvey.store';
 import { useTelemetry } from '@/composables/useTelemetry';
diff --git a/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue b/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue
index 0e2abb675a..0b65f7a0b6 100644
--- a/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue
+++ b/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue
@@ -37,9 +37,9 @@ import { useSettingsStore } from '@/stores/settings.store';
 import { useUIStore } from '@/stores/ui.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import type { Project, ProjectSharingData } from '@/types/projects.types';
-import { assert } from '@/utils/assert';
+import { assert } from '@n8n/utils/assert';
 import type { IMenuItem } from 'n8n-design-system';
-import { createEventBus } from 'n8n-design-system/utils';
+import { createEventBus } from '@n8n/utils/event-bus';
 
 import { useExternalHooks } from '@/composables/useExternalHooks';
 import { useI18n } from '@/composables/useI18n';
diff --git a/packages/editor-ui/src/components/CredentialEdit/CredentialSharing.ee.vue b/packages/editor-ui/src/components/CredentialEdit/CredentialSharing.ee.vue
index e54f247cea..8308322135 100644
--- a/packages/editor-ui/src/components/CredentialEdit/CredentialSharing.ee.vue
+++ b/packages/editor-ui/src/components/CredentialEdit/CredentialSharing.ee.vue
@@ -14,7 +14,7 @@ import type { ProjectListItem, ProjectSharingData } from '@/types/projects.types
 import { ProjectTypes } from '@/types/projects.types';
 import type { RoleMap } from '@/types/roles.types';
 import { splitName } from '@/utils/projects.utils';
-import type { EventBus } from 'n8n-design-system/utils';
+import type { EventBus } from '@n8n/utils/event-bus';
 import type { ICredentialDataDecryptedObject } from 'n8n-workflow';
 import { computed, onMounted, ref, watch } from 'vue';
 
diff --git a/packages/editor-ui/src/components/CredentialPicker/CredentialPicker.vue b/packages/editor-ui/src/components/CredentialPicker/CredentialPicker.vue
index 8bddeddd85..90f7d00b22 100644
--- a/packages/editor-ui/src/components/CredentialPicker/CredentialPicker.vue
+++ b/packages/editor-ui/src/components/CredentialPicker/CredentialPicker.vue
@@ -2,7 +2,7 @@
 import { computed, ref } from 'vue';
 import { listenForModalChanges, useUIStore } from '@/stores/ui.store';
 import { listenForCredentialChanges, useCredentialsStore } from '@/stores/credentials.store';
-import { assert } from '@/utils/assert';
+import { assert } from '@n8n/utils/assert';
 import CredentialsDropdown from './CredentialsDropdown.vue';
 import { useI18n } from '@/composables/useI18n';
 import { CREDENTIAL_EDIT_MODAL_KEY } from '@/constants';
diff --git a/packages/editor-ui/src/components/CredentialsSelectModal.vue b/packages/editor-ui/src/components/CredentialsSelectModal.vue
index 80a1f9576d..e2392ada65 100644
--- a/packages/editor-ui/src/components/CredentialsSelectModal.vue
+++ b/packages/editor-ui/src/components/CredentialsSelectModal.vue
@@ -5,7 +5,7 @@ import { useCredentialsStore } from '@/stores/credentials.store';
 import { useUIStore } from '@/stores/ui.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { N8nButton, N8nSelect } from 'n8n-design-system';
-import { createEventBus } from 'n8n-design-system/utils';
+import { createEventBus } from '@n8n/utils/event-bus';
 import { onMounted, ref } from 'vue';
 import { CREDENTIAL_SELECT_MODAL_KEY } from '../constants';
 import Modal from './Modal.vue';
diff --git a/packages/editor-ui/src/components/DeleteUserModal.vue b/packages/editor-ui/src/components/DeleteUserModal.vue
index db9bb671c4..68bc63a496 100644
--- a/packages/editor-ui/src/components/DeleteUserModal.vue
+++ b/packages/editor-ui/src/components/DeleteUserModal.vue
@@ -5,7 +5,7 @@ import Modal from '@/components/Modal.vue';
 import ProjectSharing from '@/components/Projects/ProjectSharing.vue';
 import { useUsersStore } from '@/stores/users.store';
 import { useProjectsStore } from '@/stores/projects.store';
-import { createEventBus } from 'n8n-design-system/utils';
+import { createEventBus } from '@n8n/utils/event-bus';
 import type { ProjectSharingData } from '@/types/projects.types';
 import { useI18n } from '@/composables/useI18n';
 
diff --git a/packages/editor-ui/src/components/DuplicateWorkflowDialog.vue b/packages/editor-ui/src/components/DuplicateWorkflowDialog.vue
index 62753180a2..724d46eb0e 100644
--- a/packages/editor-ui/src/components/DuplicateWorkflowDialog.vue
+++ b/packages/editor-ui/src/components/DuplicateWorkflowDialog.vue
@@ -7,7 +7,7 @@ import Modal from '@/components/Modal.vue';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import type { IWorkflowDataUpdate } from '@/Interface';
-import { createEventBus, type EventBus } from 'n8n-design-system/utils';
+import { createEventBus, type EventBus } from '@n8n/utils/event-bus';
 import { useCredentialsStore } from '@/stores/credentials.store';
 import { useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
 import { useRouter } from 'vue-router';
diff --git a/packages/editor-ui/src/components/ExpandableInput/ExpandableInputEdit.vue b/packages/editor-ui/src/components/ExpandableInput/ExpandableInputEdit.vue
index 88f45b7374..c334e7091d 100644
--- a/packages/editor-ui/src/components/ExpandableInput/ExpandableInputEdit.vue
+++ b/packages/editor-ui/src/components/ExpandableInput/ExpandableInputEdit.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import type { EventBus } from 'n8n-design-system';
+import type { EventBus } from '@n8n/utils/event-bus';
 import { onBeforeUnmount, onMounted, ref } from 'vue';
 import ExpandableInputBase from './ExpandableInputBase.vue';
 import { onClickOutside } from '@vueuse/core';
diff --git a/packages/editor-ui/src/components/ExpressionParameterInput.vue b/packages/editor-ui/src/components/ExpressionParameterInput.vue
index 4217bc12ee..8621eddff7 100644
--- a/packages/editor-ui/src/components/ExpressionParameterInput.vue
+++ b/packages/editor-ui/src/components/ExpressionParameterInput.vue
@@ -15,7 +15,7 @@ import type { Segment } from '@/types/expressions';
 import { startCompletion } from '@codemirror/autocomplete';
 import type { EditorState, SelectionRange } from '@codemirror/state';
 import type { IDataObject } from 'n8n-workflow';
-import { createEventBus, type EventBus } from 'n8n-design-system';
+import { createEventBus, type EventBus } from '@n8n/utils/event-bus';
 
 const isFocused = ref(false);
 const segments = ref<Segment[]>([]);
diff --git a/packages/editor-ui/src/components/ExternalSecretsProviderConnectionSwitch.ee.vue b/packages/editor-ui/src/components/ExternalSecretsProviderConnectionSwitch.ee.vue
index 446f3fe86f..4c1b85f1e5 100644
--- a/packages/editor-ui/src/components/ExternalSecretsProviderConnectionSwitch.ee.vue
+++ b/packages/editor-ui/src/components/ExternalSecretsProviderConnectionSwitch.ee.vue
@@ -4,7 +4,7 @@ import { useExternalSecretsStore } from '@/stores/externalSecrets.ee.store';
 import { useToast } from '@/composables/useToast';
 import { useI18n } from '@/composables/useI18n';
 import { computed, onMounted, ref } from 'vue';
-import type { EventBus } from 'n8n-design-system/utils';
+import type { EventBus } from '@n8n/utils/event-bus';
 
 const emit = defineEmits<{
 	change: [value: boolean];
diff --git a/packages/editor-ui/src/components/ExternalSecretsProviderModal.ee.vue b/packages/editor-ui/src/components/ExternalSecretsProviderModal.ee.vue
index 30aec51f62..73a048a372 100644
--- a/packages/editor-ui/src/components/ExternalSecretsProviderModal.ee.vue
+++ b/packages/editor-ui/src/components/ExternalSecretsProviderModal.ee.vue
@@ -2,7 +2,7 @@
 import Modal from './Modal.vue';
 import { EXTERNAL_SECRETS_PROVIDER_MODAL_KEY, MODAL_CONFIRM } from '@/constants';
 import { computed, onMounted, ref } from 'vue';
-import type { EventBus } from 'n8n-design-system/utils';
+import type { EventBus } from '@n8n/utils/event-bus';
 import { useExternalSecretsProvider } from '@/composables/useExternalSecretsProvider';
 import { useI18n } from '@/composables/useI18n';
 import { useMessage } from '@/composables/useMessage';
@@ -17,7 +17,7 @@ import type {
 import type { IParameterLabel } from 'n8n-workflow';
 import ExternalSecretsProviderImage from '@/components/ExternalSecretsProviderImage.ee.vue';
 import ExternalSecretsProviderConnectionSwitch from '@/components/ExternalSecretsProviderConnectionSwitch.ee.vue';
-import { createEventBus } from 'n8n-design-system/utils';
+import { createEventBus } from '@n8n/utils/event-bus';
 
 const props = defineProps<{
 	data: { eventBus: EventBus; name: string };
diff --git a/packages/editor-ui/src/components/ImportCurlModal.vue b/packages/editor-ui/src/components/ImportCurlModal.vue
index c9b20a74a9..c7616dcabe 100644
--- a/packages/editor-ui/src/components/ImportCurlModal.vue
+++ b/packages/editor-ui/src/components/ImportCurlModal.vue
@@ -3,7 +3,7 @@ import Modal from '@/components/Modal.vue';
 import { IMPORT_CURL_MODAL_KEY } from '@/constants';
 import { onMounted, ref } from 'vue';
 import { useUIStore } from '@/stores/ui.store';
-import { createEventBus } from 'n8n-design-system/utils';
+import { createEventBus } from '@n8n/utils/event-bus';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { useI18n } from '@/composables/useI18n';
 
diff --git a/packages/editor-ui/src/components/InlineTextEdit.vue b/packages/editor-ui/src/components/InlineTextEdit.vue
index 2a2ab61484..8fb4657d71 100644
--- a/packages/editor-ui/src/components/InlineTextEdit.vue
+++ b/packages/editor-ui/src/components/InlineTextEdit.vue
@@ -2,7 +2,7 @@
 import { ref, watch } from 'vue';
 import ExpandableInputEdit from '@/components/ExpandableInput/ExpandableInputEdit.vue';
 import ExpandableInputPreview from '@/components/ExpandableInput/ExpandableInputPreview.vue';
-import { createEventBus } from 'n8n-design-system/utils';
+import { createEventBus } from '@n8n/utils/event-bus';
 
 const props = withDefaults(
 	defineProps<{
diff --git a/packages/editor-ui/src/components/InputNodeSelect.vue b/packages/editor-ui/src/components/InputNodeSelect.vue
index c219043ab9..438eb0dbd6 100644
--- a/packages/editor-ui/src/components/InputNodeSelect.vue
+++ b/packages/editor-ui/src/components/InputNodeSelect.vue
@@ -7,7 +7,7 @@ import { isPresent } from '@/utils/typesUtils';
 import type { IConnectedNode, Workflow } from 'n8n-workflow';
 import { computed } from 'vue';
 import NodeIcon from './NodeIcon.vue';
-import { truncate } from 'n8n-design-system';
+import { truncate } from '@n8n/utils/string/truncate';
 
 type Props = {
 	nodes: IConnectedNode[];
diff --git a/packages/editor-ui/src/components/IntersectionObserved.vue b/packages/editor-ui/src/components/IntersectionObserved.vue
index c68a8cd25f..1cafc1a32f 100644
--- a/packages/editor-ui/src/components/IntersectionObserved.vue
+++ b/packages/editor-ui/src/components/IntersectionObserved.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import { nextTick } from 'vue';
 import { onBeforeUnmount, onMounted, ref } from 'vue';
-import type { EventBus } from 'n8n-design-system/utils';
-import { createEventBus } from 'n8n-design-system/utils';
+import type { EventBus } from '@n8n/utils/event-bus';
+import { createEventBus } from '@n8n/utils/event-bus';
 
 const props = withDefaults(
 	defineProps<{
diff --git a/packages/editor-ui/src/components/IntersectionObserver.vue b/packages/editor-ui/src/components/IntersectionObserver.vue
index bb3607dd64..c26ca64a2d 100644
--- a/packages/editor-ui/src/components/IntersectionObserver.vue
+++ b/packages/editor-ui/src/components/IntersectionObserver.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { onBeforeUnmount, onMounted, ref } from 'vue';
-import type { EventBus } from 'n8n-design-system/utils';
-import { createEventBus } from 'n8n-design-system/utils';
+import type { EventBus } from '@n8n/utils/event-bus';
+import { createEventBus } from '@n8n/utils/event-bus';
 
 const props = withDefaults(
 	defineProps<{
diff --git a/packages/editor-ui/src/components/InviteUsersModal.vue b/packages/editor-ui/src/components/InviteUsersModal.vue
index c10c6c759f..e06c65b02d 100644
--- a/packages/editor-ui/src/components/InviteUsersModal.vue
+++ b/packages/editor-ui/src/components/InviteUsersModal.vue
@@ -11,7 +11,8 @@ import {
 } from '@/constants';
 import { useUsersStore } from '@/stores/users.store';
 import { useSettingsStore } from '@/stores/settings.store';
-import { createFormEventBus, createEventBus } from 'n8n-design-system/utils';
+import { createFormEventBus } from 'n8n-design-system/utils';
+import { createEventBus } from '@n8n/utils/event-bus';
 import { useClipboard } from '@/composables/useClipboard';
 import { useI18n } from '@/composables/useI18n';
 import { usePageRedirectionHelper } from '@/composables/usePageRedirectionHelper';
diff --git a/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue b/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue
index ba357b1a8d..d27d4708de 100644
--- a/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue
+++ b/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue
@@ -37,7 +37,7 @@ import { useDocumentTitle } from '@/composables/useDocumentTitle';
 import { useMessage } from '@/composables/useMessage';
 import { useToast } from '@/composables/useToast';
 import { getResourcePermissions } from '@/permissions';
-import { createEventBus } from 'n8n-design-system/utils';
+import { createEventBus } from '@n8n/utils/event-bus';
 import { nodeViewEventBus } from '@/event-bus';
 import { hasPermission } from '@/utils/rbac/permissions';
 import { useCanvasStore } from '@/stores/canvas.store';
diff --git a/packages/editor-ui/src/components/MainSidebarSourceControl.vue b/packages/editor-ui/src/components/MainSidebarSourceControl.vue
index 32c1638f96..a6dff37742 100644
--- a/packages/editor-ui/src/components/MainSidebarSourceControl.vue
+++ b/packages/editor-ui/src/components/MainSidebarSourceControl.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { computed, ref } from 'vue';
-import { createEventBus } from 'n8n-design-system/utils';
+import { createEventBus } from '@n8n/utils/event-bus';
 import { useI18n } from '@/composables/useI18n';
 import { hasPermission } from '@/utils/rbac/permissions';
 import { useToast } from '@/composables/useToast';
diff --git a/packages/editor-ui/src/components/Modal.vue b/packages/editor-ui/src/components/Modal.vue
index 6fa9bf3994..af58297b90 100644
--- a/packages/editor-ui/src/components/Modal.vue
+++ b/packages/editor-ui/src/components/Modal.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { ElDialog } from 'element-plus';
 import { computed, onMounted, onBeforeUnmount } from 'vue';
-import type { EventBus } from 'n8n-design-system';
+import type { EventBus } from '@n8n/utils/event-bus';
 import { useUIStore } from '@/stores/ui.store';
 import type { ModalKey } from '@/Interface';
 import { APP_MODALS_ELEMENT_ID } from '@/constants';
diff --git a/packages/editor-ui/src/components/ModalDrawer.vue b/packages/editor-ui/src/components/ModalDrawer.vue
index e7b113e991..280ae36bdf 100644
--- a/packages/editor-ui/src/components/ModalDrawer.vue
+++ b/packages/editor-ui/src/components/ModalDrawer.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { useUIStore } from '@/stores/ui.store';
 import { onBeforeUnmount, onMounted } from 'vue';
-import type { EventBus } from 'n8n-design-system';
+import type { EventBus } from '@n8n/utils/event-bus';
 import { ElDrawer } from 'element-plus';
 
 const props = withDefaults(
diff --git a/packages/editor-ui/src/components/Modals.vue b/packages/editor-ui/src/components/Modals.vue
index 10e54b141c..41b41466b8 100644
--- a/packages/editor-ui/src/components/Modals.vue
+++ b/packages/editor-ui/src/components/Modals.vue
@@ -69,7 +69,7 @@ import ProjectMoveResourceModal from '@/components/Projects/ProjectMoveResourceM
 import NewAssistantSessionModal from '@/components/AskAssistant/NewAssistantSessionModal.vue';
 import PromptMfaCodeModal from './PromptMfaCodeModal/PromptMfaCodeModal.vue';
 import CommunityPlusEnrollmentModal from '@/components/CommunityPlusEnrollmentModal.vue';
-import type { EventBus } from 'n8n-design-system';
+import type { EventBus } from '@n8n/utils/event-bus';
 </script>
 
 <template>
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/utils.ts b/packages/editor-ui/src/components/Node/NodeCreator/utils.ts
index ffac7aac90..f829c56344 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/utils.ts
+++ b/packages/editor-ui/src/components/Node/NodeCreator/utils.ts
@@ -17,7 +17,7 @@ import {
 } from '@/constants';
 import { v4 as uuidv4 } from 'uuid';
 
-import { sublimeSearch } from '@/utils/sortUtils';
+import { sublimeSearch } from '@n8n/utils/search/sublimeSearch';
 import type { NodeViewItemSection } from './viewsData';
 import { i18n } from '@/plugins/i18n';
 import { sortBy } from 'lodash-es';
diff --git a/packages/editor-ui/src/components/NodeCredentials.vue b/packages/editor-ui/src/components/NodeCredentials.vue
index 22e4c908af..1cc4b965bb 100644
--- a/packages/editor-ui/src/components/NodeCredentials.vue
+++ b/packages/editor-ui/src/components/NodeCredentials.vue
@@ -22,7 +22,7 @@ import { useNDVStore } from '@/stores/ndv.store';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { useUIStore } from '@/stores/ui.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
-import { assert } from '@/utils/assert';
+import { assert } from '@n8n/utils/assert';
 import {
 	getAllNodeCredentialForAuthType,
 	getAuthTypeForNodeCredential,
diff --git a/packages/editor-ui/src/components/NodeDetailsView.vue b/packages/editor-ui/src/components/NodeDetailsView.vue
index 55807cbcf0..064d52ed7c 100644
--- a/packages/editor-ui/src/components/NodeDetailsView.vue
+++ b/packages/editor-ui/src/components/NodeDetailsView.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { ref, onMounted, onBeforeUnmount, computed, watch } from 'vue';
-import { createEventBus } from 'n8n-design-system/utils';
+import { createEventBus } from '@n8n/utils/event-bus';
 import type { IRunData, Workflow } from 'n8n-workflow';
 import { jsonParse, NodeHelpers, NodeConnectionType } from 'n8n-workflow';
 import type { IUpdateInformation, TargetItem } from '@/Interface';
diff --git a/packages/editor-ui/src/components/NodeSettings.vue b/packages/editor-ui/src/components/NodeSettings.vue
index 43ee007edb..63e0fcb8e9 100644
--- a/packages/editor-ui/src/components/NodeSettings.vue
+++ b/packages/editor-ui/src/components/NodeSettings.vue
@@ -40,7 +40,7 @@ import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { useHistoryStore } from '@/stores/history.store';
 import { RenameNodeCommand } from '@/models/history';
 import { useCredentialsStore } from '@/stores/credentials.store';
-import type { EventBus } from 'n8n-design-system';
+import type { EventBus } from '@n8n/utils/event-bus';
 import { useExternalHooks } from '@/composables/useExternalHooks';
 import { useNodeHelpers } from '@/composables/useNodeHelpers';
 import { useI18n } from '@/composables/useI18n';
diff --git a/packages/editor-ui/src/components/NpsSurvey.vue b/packages/editor-ui/src/components/NpsSurvey.vue
index ce792ba20d..380a090acb 100644
--- a/packages/editor-ui/src/components/NpsSurvey.vue
+++ b/packages/editor-ui/src/components/NpsSurvey.vue
@@ -5,7 +5,7 @@ import ModalDrawer from '@/components/ModalDrawer.vue';
 import { useToast } from '@/composables/useToast';
 import { useI18n } from '@/composables/useI18n';
 import { ref, computed, watch } from 'vue';
-import { createEventBus } from 'n8n-design-system/utils';
+import { createEventBus } from '@n8n/utils/event-bus';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { useNpsSurveyStore } from '@/stores/npsSurvey.store';
 import { useStyles } from '@/composables/useStyles';
diff --git a/packages/editor-ui/src/components/ParameterInput.test.ts b/packages/editor-ui/src/components/ParameterInput.test.ts
index 316622508f..a8ae450e92 100644
--- a/packages/editor-ui/src/components/ParameterInput.test.ts
+++ b/packages/editor-ui/src/components/ParameterInput.test.ts
@@ -8,7 +8,7 @@ import { waitFor } from '@testing-library/vue';
 import userEvent from '@testing-library/user-event';
 import type { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { cleanupAppModals, createAppModals } from '@/__tests__/utils';
-import { createEventBus } from 'n8n-design-system';
+import { createEventBus } from '@n8n/utils/event-bus';
 
 let mockNdvState: Partial<ReturnType<typeof useNDVStore>>;
 let mockNodeTypesState: Partial<ReturnType<typeof useNodeTypesStore>>;
diff --git a/packages/editor-ui/src/components/ParameterInput.vue b/packages/editor-ui/src/components/ParameterInput.vue
index 20625a5374..c610185903 100644
--- a/packages/editor-ui/src/components/ParameterInput.vue
+++ b/packages/editor-ui/src/components/ParameterInput.vue
@@ -62,8 +62,8 @@ import { useSettingsStore } from '@/stores/settings.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { isCredentialOnlyNodeType } from '@/utils/credentialOnlyNodes';
 import { N8nIcon, N8nInput, N8nInputNumber, N8nOption, N8nSelect } from 'n8n-design-system';
-import type { EventBus } from 'n8n-design-system/utils';
-import { createEventBus } from 'n8n-design-system/utils';
+import type { EventBus } from '@n8n/utils/event-bus';
+import { createEventBus } from '@n8n/utils/event-bus';
 import { useRouter } from 'vue-router';
 import { useElementSize } from '@vueuse/core';
 import { completeExpressionSyntax, isStringWithExpressionSyntax } from '@/utils/expressions';
diff --git a/packages/editor-ui/src/components/ParameterInputExpanded.vue b/packages/editor-ui/src/components/ParameterInputExpanded.vue
index 67e2e867f1..2fe0423ba7 100644
--- a/packages/editor-ui/src/components/ParameterInputExpanded.vue
+++ b/packages/editor-ui/src/components/ParameterInputExpanded.vue
@@ -4,7 +4,7 @@ import { useI18n } from '@/composables/useI18n';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { isValueExpression as isValueExpressionUtil } from '@/utils/nodeTypesUtils';
-import { createEventBus } from 'n8n-design-system/utils';
+import { createEventBus } from '@n8n/utils/event-bus';
 import type {
 	INodeParameterResourceLocator,
 	INodeProperties,
diff --git a/packages/editor-ui/src/components/ParameterInputFull.vue b/packages/editor-ui/src/components/ParameterInputFull.vue
index 8e2453becf..024abe3f33 100644
--- a/packages/editor-ui/src/components/ParameterInputFull.vue
+++ b/packages/editor-ui/src/components/ParameterInputFull.vue
@@ -13,7 +13,7 @@ import { useNDVStore } from '@/stores/ndv.store';
 import { getMappedResult } from '@/utils/mappingUtils';
 import { hasExpressionMapping, hasOnlyListMode, isValueExpression } from '@/utils/nodeTypesUtils';
 import { isResourceLocatorValue } from '@/utils/typeGuards';
-import { createEventBus } from 'n8n-design-system/utils';
+import { createEventBus } from '@n8n/utils/event-bus';
 import {
 	type INodeProperties,
 	type IParameterLabel,
diff --git a/packages/editor-ui/src/components/ParameterInputWrapper.vue b/packages/editor-ui/src/components/ParameterInputWrapper.vue
index d49c2855ed..cd60adaed7 100644
--- a/packages/editor-ui/src/components/ParameterInputWrapper.vue
+++ b/packages/editor-ui/src/components/ParameterInputWrapper.vue
@@ -16,8 +16,8 @@ import useEnvironmentsStore from '@/stores/environments.ee.store';
 import { useExternalSecretsStore } from '@/stores/externalSecrets.ee.store';
 import { useNDVStore } from '@/stores/ndv.store';
 import { isValueExpression, parseResourceMapperFieldName } from '@/utils/nodeTypesUtils';
-import type { EventBus } from 'n8n-design-system/utils';
-import { createEventBus } from 'n8n-design-system/utils';
+import type { EventBus } from '@n8n/utils/event-bus';
+import { createEventBus } from '@n8n/utils/event-bus';
 import { computed, useTemplateRef } from 'vue';
 
 type Props = {
diff --git a/packages/editor-ui/src/components/PersonalizationModal.vue b/packages/editor-ui/src/components/PersonalizationModal.vue
index a4ff73147a..0f09830039 100644
--- a/packages/editor-ui/src/components/PersonalizationModal.vue
+++ b/packages/editor-ui/src/components/PersonalizationModal.vue
@@ -86,7 +86,8 @@ import Modal from '@/components/Modal.vue';
 import type { IFormInputs, IPersonalizationLatestVersion } from '@/Interface';
 import { useRootStore } from '@/stores/root.store';
 import { useUsersStore } from '@/stores/users.store';
-import { createEventBus, createFormEventBus } from 'n8n-design-system/utils';
+import { createFormEventBus } from 'n8n-design-system/utils';
+import { createEventBus } from '@n8n/utils/event-bus';
 import { usePostHog } from '@/stores/posthog.store';
 import { useExternalHooks } from '@/composables/useExternalHooks';
 import { useI18n } from '@/composables/useI18n';
diff --git a/packages/editor-ui/src/components/Projects/ProjectCardBadge.test.ts b/packages/editor-ui/src/components/Projects/ProjectCardBadge.test.ts
index 3ac8e3d5a8..e1189a2a9a 100644
--- a/packages/editor-ui/src/components/Projects/ProjectCardBadge.test.ts
+++ b/packages/editor-ui/src/components/Projects/ProjectCardBadge.test.ts
@@ -1,6 +1,6 @@
 import { createComponentRenderer } from '@/__tests__/render';
 import ProjectCardBadge from '@/components/Projects/ProjectCardBadge.vue';
-import { truncate } from 'n8n-design-system';
+import { truncate } from '@n8n/utils/string/truncate';
 
 const renderComponent = createComponentRenderer(ProjectCardBadge);
 
diff --git a/packages/editor-ui/src/components/Projects/ProjectMoveResourceModal.vue b/packages/editor-ui/src/components/Projects/ProjectMoveResourceModal.vue
index a06adbe6c8..70fa69313d 100644
--- a/packages/editor-ui/src/components/Projects/ProjectMoveResourceModal.vue
+++ b/packages/editor-ui/src/components/Projects/ProjectMoveResourceModal.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { ref, computed, onMounted, h } from 'vue';
-import { truncate } from 'n8n-design-system';
+import { truncate } from '@n8n/utils/string/truncate';
 import type { ICredentialsResponse, IUsedCredential, IWorkflowDb } from '@/Interface';
 import { useI18n } from '@/composables/useI18n';
 import { useUIStore } from '@/stores/ui.store';
@@ -14,8 +14,8 @@ import ProjectMoveSuccessToastMessage from '@/components/Projects/ProjectMoveSuc
 import ProjectMoveResourceModalCredentialsList from '@/components/Projects/ProjectMoveResourceModalCredentialsList.vue';
 import { useToast } from '@/composables/useToast';
 import { getResourcePermissions } from '@/permissions';
-import { sortByProperty } from '@/utils/sortUtils';
-import type { EventBus } from 'n8n-design-system/utils';
+import { sortByProperty } from '@n8n/utils/sort/sortByProperty';
+import type { EventBus } from '@n8n/utils/event-bus';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useCredentialsStore } from '@/stores/credentials.store';
 
diff --git a/packages/editor-ui/src/components/Projects/ProjectMoveSuccessToastMessage.vue b/packages/editor-ui/src/components/Projects/ProjectMoveSuccessToastMessage.vue
index e8f3c45d33..450884c5ea 100644
--- a/packages/editor-ui/src/components/Projects/ProjectMoveSuccessToastMessage.vue
+++ b/packages/editor-ui/src/components/Projects/ProjectMoveSuccessToastMessage.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { computed } from 'vue';
-import { truncate } from 'n8n-design-system';
+import { truncate } from '@n8n/utils/string/truncate';
 import { ResourceType, splitName } from '@/utils/projects.utils';
 import type { ProjectListItem } from '@/types/projects.types';
 import { ProjectTypes } from '@/types/projects.types';
diff --git a/packages/editor-ui/src/components/Projects/ProjectSharing.vue b/packages/editor-ui/src/components/Projects/ProjectSharing.vue
index 600d55892d..be34a2a8ae 100644
--- a/packages/editor-ui/src/components/Projects/ProjectSharing.vue
+++ b/packages/editor-ui/src/components/Projects/ProjectSharing.vue
@@ -4,7 +4,7 @@ import { useI18n } from '@/composables/useI18n';
 import type { ProjectListItem, ProjectSharingData } from '@/types/projects.types';
 import ProjectSharingInfo from '@/components/Projects/ProjectSharingInfo.vue';
 import type { RoleMap } from '@/types/roles.types';
-import { sortByProperty } from '@/utils/sortUtils';
+import { sortByProperty } from '@n8n/utils/sort/sortByProperty';
 
 const locale = useI18n();
 
diff --git a/packages/editor-ui/src/components/PromptMfaCodeModal/PromptMfaCodeModal.vue b/packages/editor-ui/src/components/PromptMfaCodeModal/PromptMfaCodeModal.vue
index fb15cee54a..65092c9d84 100644
--- a/packages/editor-ui/src/components/PromptMfaCodeModal/PromptMfaCodeModal.vue
+++ b/packages/editor-ui/src/components/PromptMfaCodeModal/PromptMfaCodeModal.vue
@@ -5,7 +5,7 @@ import { PROMPT_MFA_CODE_MODAL_KEY } from '@/constants';
 import { useI18n } from '@/composables/useI18n';
 import { promptMfaCodeBus } from '@/event-bus';
 import type { IFormInputs } from '@/Interface';
-import { createFormEventBus } from 'n8n-design-system';
+import { createFormEventBus } from 'n8n-design-system/utils';
 import { validate as validateUuid } from 'uuid';
 
 const i18n = useI18n();
diff --git a/packages/editor-ui/src/components/ResourceLocator/ResourceLocator.vue b/packages/editor-ui/src/components/ResourceLocator/ResourceLocator.vue
index 37615acd0e..f287a26c84 100644
--- a/packages/editor-ui/src/components/ResourceLocator/ResourceLocator.vue
+++ b/packages/editor-ui/src/components/ResourceLocator/ResourceLocator.vue
@@ -20,8 +20,8 @@ import {
 } from '@/utils/nodeTypesUtils';
 import { isResourceLocatorValue } from '@/utils/typeGuards';
 import stringify from 'fast-json-stable-stringify';
-import type { EventBus } from 'n8n-design-system/utils';
-import { createEventBus } from 'n8n-design-system/utils';
+import type { EventBus } from '@n8n/utils/event-bus';
+import { createEventBus } from '@n8n/utils/event-bus';
 import type {
 	INode,
 	INodeListSearchItems,
diff --git a/packages/editor-ui/src/components/ResourceLocator/ResourceLocatorDropdown.vue b/packages/editor-ui/src/components/ResourceLocator/ResourceLocatorDropdown.vue
index 518d760e80..1378f45b3e 100644
--- a/packages/editor-ui/src/components/ResourceLocator/ResourceLocatorDropdown.vue
+++ b/packages/editor-ui/src/components/ResourceLocator/ResourceLocatorDropdown.vue
@@ -2,8 +2,8 @@
 import { useI18n } from '@/composables/useI18n';
 import type { IResourceLocatorResultExpanded } from '@/Interface';
 import { N8nLoading } from 'n8n-design-system';
-import type { EventBus } from 'n8n-design-system/utils';
-import { createEventBus } from 'n8n-design-system/utils';
+import type { EventBus } from '@n8n/utils/event-bus';
+import { createEventBus } from '@n8n/utils/event-bus';
 import type { NodeParameterValue } from 'n8n-workflow';
 import { computed, onBeforeUnmount, onMounted, ref, useCssModule, watch } from 'vue';
 
diff --git a/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationCard.ee.vue b/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationCard.ee.vue
index d5465c7fc6..d53af36647 100644
--- a/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationCard.ee.vue
+++ b/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationCard.ee.vue
@@ -6,9 +6,9 @@ import { useLogStreamingStore } from '@/stores/logStreaming.store';
 import type { MessageEventBusDestinationOptions } from 'n8n-workflow';
 import { deepCopy, defaultMessageEventBusDestinationOptions } from 'n8n-workflow';
 import type { BaseTextKey } from '@/plugins/i18n';
-import type { EventBus } from 'n8n-design-system';
+import type { EventBus } from '@n8n/utils/event-bus';
 import { useI18n } from '@/composables/useI18n';
-import { assert } from '@/utils/assert';
+import { assert } from '@n8n/utils/assert';
 
 const DESTINATION_LIST_ITEM_ACTIONS = {
 	OPEN: 'open',
diff --git a/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationSettingsModal.ee.vue b/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationSettingsModal.ee.vue
index 8955090674..da4f86d022 100644
--- a/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationSettingsModal.ee.vue
+++ b/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationSettingsModal.ee.vue
@@ -20,8 +20,8 @@ import {
 	defaultMessageEventBusDestinationSyslogOptions,
 	defaultMessageEventBusDestinationSentryOptions,
 } from 'n8n-workflow';
-import type { EventBus } from 'n8n-design-system';
-import { createEventBus } from 'n8n-design-system/utils';
+import type { EventBus } from '@n8n/utils/event-bus';
+import { createEventBus } from '@n8n/utils/event-bus';
 
 import { useLogStreamingStore } from '@/stores/logStreaming.store';
 import { useNDVStore } from '@/stores/ndv.store';
diff --git a/packages/editor-ui/src/components/SourceControlPullModal.ee.test.ts b/packages/editor-ui/src/components/SourceControlPullModal.ee.test.ts
index 13333b864c..c24ef96ed3 100644
--- a/packages/editor-ui/src/components/SourceControlPullModal.ee.test.ts
+++ b/packages/editor-ui/src/components/SourceControlPullModal.ee.test.ts
@@ -1,7 +1,7 @@
 import SourceControlPullModalEe from './SourceControlPullModal.ee.vue';
 import { createComponentRenderer } from '@/__tests__/render';
 import { createTestingPinia } from '@pinia/testing';
-import { createEventBus } from 'n8n-design-system';
+import { createEventBus } from '@n8n/utils/event-bus';
 import userEvent from '@testing-library/user-event';
 import { useSourceControlStore } from '@/stores/sourceControl.store';
 import { mockedStore } from '@/__tests__/utils';
diff --git a/packages/editor-ui/src/components/SourceControlPullModal.ee.vue b/packages/editor-ui/src/components/SourceControlPullModal.ee.vue
index 0607efb4df..b89f487933 100644
--- a/packages/editor-ui/src/components/SourceControlPullModal.ee.vue
+++ b/packages/editor-ui/src/components/SourceControlPullModal.ee.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import Modal from './Modal.vue';
 import { SOURCE_CONTROL_PULL_MODAL_KEY, VIEWS } from '@/constants';
-import type { EventBus } from 'n8n-design-system/utils';
+import type { EventBus } from '@n8n/utils/event-bus';
 import { useI18n } from '@/composables/useI18n';
 import { useLoadingService } from '@/composables/useLoadingService';
 import { useToast } from '@/composables/useToast';
diff --git a/packages/editor-ui/src/components/SourceControlPushModal.ee.test.ts b/packages/editor-ui/src/components/SourceControlPushModal.ee.test.ts
index f3ce0760cb..42803eadf5 100644
--- a/packages/editor-ui/src/components/SourceControlPushModal.ee.test.ts
+++ b/packages/editor-ui/src/components/SourceControlPushModal.ee.test.ts
@@ -4,7 +4,7 @@ import { useRoute } from 'vue-router';
 import { createComponentRenderer } from '@/__tests__/render';
 import SourceControlPushModal from '@/components/SourceControlPushModal.ee.vue';
 import { createTestingPinia } from '@pinia/testing';
-import { createEventBus } from 'n8n-design-system';
+import { createEventBus } from '@n8n/utils/event-bus';
 import type { SourceControlledFile } from '@n8n/api-types';
 import { useSourceControlStore } from '@/stores/sourceControl.store';
 import { mockedStore } from '@/__tests__/utils';
diff --git a/packages/editor-ui/src/components/SourceControlPushModal.ee.vue b/packages/editor-ui/src/components/SourceControlPushModal.ee.vue
index 54565b8e82..1898cb2f03 100644
--- a/packages/editor-ui/src/components/SourceControlPushModal.ee.vue
+++ b/packages/editor-ui/src/components/SourceControlPushModal.ee.vue
@@ -2,7 +2,7 @@
 import Modal from './Modal.vue';
 import { SOURCE_CONTROL_PUSH_MODAL_KEY, VIEWS } from '@/constants';
 import { computed, onMounted, ref, toRaw, watch } from 'vue';
-import type { EventBus } from 'n8n-design-system/utils';
+import type { EventBus } from '@n8n/utils/event-bus';
 import { useI18n } from '@/composables/useI18n';
 import { useLoadingService } from '@/composables/useLoadingService';
 import { useToast } from '@/composables/useToast';
diff --git a/packages/editor-ui/src/components/TagsContainer.vue b/packages/editor-ui/src/components/TagsContainer.vue
index 93e211bdc3..96b9d5c93d 100644
--- a/packages/editor-ui/src/components/TagsContainer.vue
+++ b/packages/editor-ui/src/components/TagsContainer.vue
@@ -4,7 +4,7 @@ import type { ComponentInstance } from 'vue';
 import type { ITag } from '@/Interface';
 import IntersectionObserver from './IntersectionObserver.vue';
 import IntersectionObserved from './IntersectionObserved.vue';
-import { createEventBus } from 'n8n-design-system/utils';
+import { createEventBus } from '@n8n/utils/event-bus';
 import { debounce } from 'lodash-es';
 
 interface TagsContainerProps {
diff --git a/packages/editor-ui/src/components/TagsDropdown.vue b/packages/editor-ui/src/components/TagsDropdown.vue
index 0a1b342b5c..0037fb25fa 100644
--- a/packages/editor-ui/src/components/TagsDropdown.vue
+++ b/packages/editor-ui/src/components/TagsDropdown.vue
@@ -4,7 +4,7 @@ import { onClickOutside } from '@vueuse/core';
 import type { ITag } from '@/Interface';
 import { MAX_TAG_NAME_LENGTH } from '@/constants';
 import { N8nOption, N8nSelect } from 'n8n-design-system';
-import type { EventBus } from 'n8n-design-system';
+import type { EventBus } from '@n8n/utils/event-bus';
 import { useI18n } from '@/composables/useI18n';
 import { v4 as uuid } from 'uuid';
 import { useToast } from '@/composables/useToast';
diff --git a/packages/editor-ui/src/components/TagsManager/TagsManager.vue b/packages/editor-ui/src/components/TagsManager/TagsManager.vue
index 6583c592cf..b4ad9348f9 100644
--- a/packages/editor-ui/src/components/TagsManager/TagsManager.vue
+++ b/packages/editor-ui/src/components/TagsManager/TagsManager.vue
@@ -4,7 +4,7 @@ import type { ITag } from '@/Interface';
 import TagsView from '@/components/TagsManager/TagsView/TagsView.vue';
 import NoTagsView from '@/components/TagsManager/NoTagsView.vue';
 import Modal from '@/components/Modal.vue';
-import { createEventBus } from 'n8n-design-system/utils';
+import { createEventBus } from '@n8n/utils/event-bus';
 import { useI18n } from '@/composables/useI18n';
 import type { BaseTextKey } from '@/plugins/i18n';
 
diff --git a/packages/editor-ui/src/components/TestDefinition/EditDefinition/NodesPinning.vue b/packages/editor-ui/src/components/TestDefinition/EditDefinition/NodesPinning.vue
index b3ba681699..9e21523f73 100644
--- a/packages/editor-ui/src/components/TestDefinition/EditDefinition/NodesPinning.vue
+++ b/packages/editor-ui/src/components/TestDefinition/EditDefinition/NodesPinning.vue
@@ -7,7 +7,8 @@ import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import type { CanvasConnectionPort, CanvasEventBusEvents, CanvasNodeData } from '@/types';
 import { useVueFlow } from '@vue-flow/core';
-import { createEventBus, N8nTooltip } from 'n8n-design-system';
+import { N8nTooltip } from 'n8n-design-system';
+import { createEventBus } from '@n8n/utils/event-bus';
 import { computed, onMounted, ref, useCssModule } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 
diff --git a/packages/editor-ui/src/components/TestDefinition/EditDefinition/TagsInput.vue b/packages/editor-ui/src/components/TestDefinition/EditDefinition/TagsInput.vue
index 9bd4a77ce0..8b5295d0fd 100644
--- a/packages/editor-ui/src/components/TestDefinition/EditDefinition/TagsInput.vue
+++ b/packages/editor-ui/src/components/TestDefinition/EditDefinition/TagsInput.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { useI18n } from '@/composables/useI18n';
 import type { ITag } from '@/Interface';
-import { createEventBus } from 'n8n-design-system';
+import { createEventBus } from '@n8n/utils/event-bus';
 import { computed } from 'vue';
 import type { EditableField } from '../types';
 
diff --git a/packages/editor-ui/src/components/TriggerPanel.vue b/packages/editor-ui/src/components/TriggerPanel.vue
index ea998de9ef..e209abce19 100644
--- a/packages/editor-ui/src/components/TriggerPanel.vue
+++ b/packages/editor-ui/src/components/TriggerPanel.vue
@@ -17,7 +17,7 @@ import { useUIStore } from '@/stores/ui.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useNDVStore } from '@/stores/ndv.store';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
-import { createEventBus } from 'n8n-design-system/utils';
+import { createEventBus } from '@n8n/utils/event-bus';
 import { useRouter } from 'vue-router';
 import { useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
 import { isTriggerPanelObject } from '@/utils/typeGuards';
diff --git a/packages/editor-ui/src/components/Workers/WorkerCard.ee.vue b/packages/editor-ui/src/components/Workers/WorkerCard.ee.vue
index 1ead01caa8..e15a9f5191 100644
--- a/packages/editor-ui/src/components/Workers/WorkerCard.ee.vue
+++ b/packages/editor-ui/src/components/Workers/WorkerCard.ee.vue
@@ -7,7 +7,7 @@ import { averageWorkerLoadFromLoadsAsString, memAsGb } from '../../utils/workerU
 import WorkerJobAccordion from './WorkerJobAccordion.ee.vue';
 import WorkerNetAccordion from './WorkerNetAccordion.ee.vue';
 import WorkerChartsAccordion from './WorkerChartsAccordion.ee.vue';
-import { sortByProperty } from '@/utils/sortUtils';
+import { sortByProperty } from '@n8n/utils/sort/sortByProperty';
 import { useI18n } from '@/composables/useI18n';
 
 let interval: NodeJS.Timer;
diff --git a/packages/editor-ui/src/components/WorkflowCard.vue b/packages/editor-ui/src/components/WorkflowCard.vue
index 7eaaa099d0..ed5721ae36 100644
--- a/packages/editor-ui/src/components/WorkflowCard.vue
+++ b/packages/editor-ui/src/components/WorkflowCard.vue
@@ -24,7 +24,7 @@ import { useI18n } from '@/composables/useI18n';
 import { useRouter } from 'vue-router';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { ResourceType } from '@/utils/projects.utils';
-import type { EventBus } from 'n8n-design-system/utils';
+import type { EventBus } from '@n8n/utils/event-bus';
 import type { WorkflowResource } from './layouts/ResourcesListLayout.vue';
 import { type ProjectIcon as CardProjectIcon, ProjectTypes } from '@/types/projects.types';
 
diff --git a/packages/editor-ui/src/components/WorkflowSelectorParameterInput/WorkflowSelectorParameterInput.vue b/packages/editor-ui/src/components/WorkflowSelectorParameterInput/WorkflowSelectorParameterInput.vue
index 332c02429f..ee91a2c4ba 100644
--- a/packages/editor-ui/src/components/WorkflowSelectorParameterInput/WorkflowSelectorParameterInput.vue
+++ b/packages/editor-ui/src/components/WorkflowSelectorParameterInput/WorkflowSelectorParameterInput.vue
@@ -2,8 +2,8 @@
 import type { ComponentInstance } from 'vue';
 import { computed, ref, onMounted, onUnmounted, watch } from 'vue';
 import { useWorkflowsStore } from '@/stores/workflows.store';
-import type { EventBus } from 'n8n-design-system/utils';
-import { createEventBus } from 'n8n-design-system/utils';
+import type { EventBus } from '@n8n/utils/event-bus';
+import { createEventBus } from '@n8n/utils/event-bus';
 import type {
 	INodeParameterResourceLocator,
 	INodeProperties,
diff --git a/packages/editor-ui/src/components/WorkflowSettings.vue b/packages/editor-ui/src/components/WorkflowSettings.vue
index c6571769e2..447a0a2506 100644
--- a/packages/editor-ui/src/components/WorkflowSettings.vue
+++ b/packages/editor-ui/src/components/WorkflowSettings.vue
@@ -20,7 +20,7 @@ import { useSettingsStore } from '@/stores/settings.store';
 import { useRootStore } from '@/stores/root.store';
 import { useWorkflowsEEStore } from '@/stores/workflows.ee.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
-import { createEventBus } from 'n8n-design-system/utils';
+import { createEventBus } from '@n8n/utils/event-bus';
 import { useExternalHooks } from '@/composables/useExternalHooks';
 import { useSourceControlStore } from '@/stores/sourceControl.store';
 import { ProjectTypes } from '@/types/projects.types';
diff --git a/packages/editor-ui/src/components/WorkflowShareModal.ee.vue b/packages/editor-ui/src/components/WorkflowShareModal.ee.vue
index 7f234b690e..6468caec72 100644
--- a/packages/editor-ui/src/components/WorkflowShareModal.ee.vue
+++ b/packages/editor-ui/src/components/WorkflowShareModal.ee.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { computed, watch, onMounted, ref } from 'vue';
-import { createEventBus } from 'n8n-design-system/utils';
+import { createEventBus } from '@n8n/utils/event-bus';
 
 import Modal from './Modal.vue';
 import {
diff --git a/packages/editor-ui/src/components/WorkflowTagsDropdown.vue b/packages/editor-ui/src/components/WorkflowTagsDropdown.vue
index 553de58fe6..3f0f0cad01 100644
--- a/packages/editor-ui/src/components/WorkflowTagsDropdown.vue
+++ b/packages/editor-ui/src/components/WorkflowTagsDropdown.vue
@@ -3,7 +3,7 @@ import { computed } from 'vue';
 import { useUIStore } from '@/stores/ui.store';
 import { useTagsStore } from '@/stores/tags.store';
 import { TAGS_MANAGER_MODAL_KEY } from '@/constants';
-import type { EventBus } from 'n8n-design-system';
+import type { EventBus } from '@n8n/utils/event-bus';
 
 interface TagsDropdownWrapperProps {
 	placeholder?: string;
diff --git a/packages/editor-ui/src/components/canvas/Canvas.vue b/packages/editor-ui/src/components/canvas/Canvas.vue
index a13c95e2d3..a9d1056a01 100644
--- a/packages/editor-ui/src/components/canvas/Canvas.vue
+++ b/packages/editor-ui/src/components/canvas/Canvas.vue
@@ -19,8 +19,8 @@ import { MiniMap } from '@vue-flow/minimap';
 import Node from './elements/nodes/CanvasNode.vue';
 import Edge from './elements/edges/CanvasEdge.vue';
 import { computed, onMounted, onUnmounted, provide, ref, toRef, useCssModule, watch } from 'vue';
-import type { EventBus } from 'n8n-design-system';
-import { createEventBus } from 'n8n-design-system';
+import type { EventBus } from '@n8n/utils/event-bus';
+import { createEventBus } from '@n8n/utils/event-bus';
 import { useDeviceSupport } from '@n8n/composables/useDeviceSupport';
 import { useShortKeyPress } from '@n8n/composables/useShortKeyPress';
 import { useContextMenu, type ContextMenuAction } from '@/composables/useContextMenu';
diff --git a/packages/editor-ui/src/components/canvas/WorkflowCanvas.test.ts b/packages/editor-ui/src/components/canvas/WorkflowCanvas.test.ts
index d5d5e83125..bbc62da555 100644
--- a/packages/editor-ui/src/components/canvas/WorkflowCanvas.test.ts
+++ b/packages/editor-ui/src/components/canvas/WorkflowCanvas.test.ts
@@ -1,7 +1,7 @@
 import { waitFor } from '@testing-library/vue';
 import { createPinia, setActivePinia } from 'pinia';
 import WorkflowCanvas from '@/components/canvas/WorkflowCanvas.vue';
-import { createEventBus } from 'n8n-design-system';
+import { createEventBus } from '@n8n/utils/event-bus';
 import { createCanvasNodeElement, createCanvasConnection } from '@/__tests__/data';
 import type { Workflow } from 'n8n-workflow';
 import { createComponentRenderer } from '@/__tests__/render';
diff --git a/packages/editor-ui/src/components/canvas/WorkflowCanvas.vue b/packages/editor-ui/src/components/canvas/WorkflowCanvas.vue
index 1e6ee9972b..b91c6dba37 100644
--- a/packages/editor-ui/src/components/canvas/WorkflowCanvas.vue
+++ b/packages/editor-ui/src/components/canvas/WorkflowCanvas.vue
@@ -4,8 +4,8 @@ import { computed, ref, toRef, useCssModule } from 'vue';
 import type { Workflow } from 'n8n-workflow';
 import type { IWorkflowDb } from '@/Interface';
 import { useCanvasMapping } from '@/composables/useCanvasMapping';
-import type { EventBus } from 'n8n-design-system';
-import { createEventBus } from 'n8n-design-system';
+import type { EventBus } from '@n8n/utils/event-bus';
+import { createEventBus } from '@n8n/utils/event-bus';
 import type { CanvasEventBusEvents } from '@/types';
 import { useVueFlow } from '@vue-flow/core';
 
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNode.vue b/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNode.vue
index 3dcbdf105b..f0ac39c9f7 100644
--- a/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNode.vue
+++ b/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNode.vue
@@ -32,8 +32,8 @@ import {
 	createCanvasConnectionHandleString,
 	insertSpacersBetweenEndpoints,
 } from '@/utils/canvasUtils';
-import type { EventBus } from 'n8n-design-system';
-import { createEventBus } from 'n8n-design-system';
+import type { EventBus } from '@n8n/utils/event-bus';
+import { createEventBus } from '@n8n/utils/event-bus';
 import { isEqual } from 'lodash-es';
 import CanvasNodeTrigger from '@/components/canvas/elements/nodes/render-types/parts/CanvasNodeTrigger.vue';
 
diff --git a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionAnnotationPanel.ee.vue b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionAnnotationPanel.ee.vue
index acc45bc5d3..4251e64679 100644
--- a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionAnnotationPanel.ee.vue
+++ b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionAnnotationPanel.ee.vue
@@ -3,7 +3,7 @@ import { ref, computed } from 'vue';
 import type { AnnotationVote, ExecutionSummary } from 'n8n-workflow';
 import { useExecutionsStore } from '@/stores/executions.store';
 import AnnotationTagsDropdown from '@/components/AnnotationTagsDropdown.ee.vue';
-import { createEventBus } from 'n8n-design-system';
+import { createEventBus } from '@n8n/utils/event-bus';
 import VoteButtons from '@/components/executions/workflow/VoteButtons.vue';
 import { useToast } from '@/composables/useToast';
 import { useI18n } from '@/composables/useI18n';
diff --git a/packages/editor-ui/src/composables/useGlobalEntityCreation.ts b/packages/editor-ui/src/composables/useGlobalEntityCreation.ts
index abecefd2d6..31d967199c 100644
--- a/packages/editor-ui/src/composables/useGlobalEntityCreation.ts
+++ b/packages/editor-ui/src/composables/useGlobalEntityCreation.ts
@@ -2,7 +2,7 @@ import { computed, ref } from 'vue';
 import { VIEWS } from '@/constants';
 import { useRouter } from 'vue-router';
 import { useI18n } from '@/composables/useI18n';
-import { sortByProperty } from '@/utils/sortUtils';
+import { sortByProperty } from '@n8n/utils/sort/sortByProperty';
 import { useToast } from '@/composables/useToast';
 import { useProjectsStore } from '@/stores/projects.store';
 import { useSettingsStore } from '@/stores/settings.store';
diff --git a/packages/editor-ui/src/composables/useImportCurlCommand.ts b/packages/editor-ui/src/composables/useImportCurlCommand.ts
index 35bbecce91..3396c44756 100644
--- a/packages/editor-ui/src/composables/useImportCurlCommand.ts
+++ b/packages/editor-ui/src/composables/useImportCurlCommand.ts
@@ -8,7 +8,7 @@ import { useToast } from '@/composables/useToast';
 import { useI18n } from '@/composables/useI18n';
 import { importCurlEventBus } from '@/event-bus';
 import type { BaseTextKey } from '@/plugins/i18n';
-import { assert } from '@/utils/assert';
+import { assert } from '@n8n/utils/assert';
 import type { CurlToJSONResponse } from '@/Interface';
 
 interface Parameter {
diff --git a/packages/editor-ui/src/event-bus/code-node-editor.ts b/packages/editor-ui/src/event-bus/code-node-editor.ts
index 92bd35bd3a..caf82c996c 100644
--- a/packages/editor-ui/src/event-bus/code-node-editor.ts
+++ b/packages/editor-ui/src/event-bus/code-node-editor.ts
@@ -1,4 +1,4 @@
-import { createEventBus } from 'n8n-design-system/utils';
+import { createEventBus } from '@n8n/utils/event-bus';
 
 export type HighlightLineEvent = number | 'last';
 
diff --git a/packages/editor-ui/src/event-bus/data-pinning.ts b/packages/editor-ui/src/event-bus/data-pinning.ts
index 4f29fdc772..b64ddbe141 100644
--- a/packages/editor-ui/src/event-bus/data-pinning.ts
+++ b/packages/editor-ui/src/event-bus/data-pinning.ts
@@ -1,4 +1,4 @@
-import { createEventBus } from 'n8n-design-system/utils';
+import { createEventBus } from '@n8n/utils/event-bus';
 import type { IPinData } from 'n8n-workflow';
 
 export type DataPinningDiscoveryEvent = {
diff --git a/packages/editor-ui/src/event-bus/global-link-actions.ts b/packages/editor-ui/src/event-bus/global-link-actions.ts
index 11e482ffe7..2bc8b2b035 100644
--- a/packages/editor-ui/src/event-bus/global-link-actions.ts
+++ b/packages/editor-ui/src/event-bus/global-link-actions.ts
@@ -1,4 +1,4 @@
-import { createEventBus } from 'n8n-design-system/utils';
+import { createEventBus } from '@n8n/utils/event-bus';
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export type LinkActionFn = (...args: any[]) => void;
diff --git a/packages/editor-ui/src/event-bus/html-editor.ts b/packages/editor-ui/src/event-bus/html-editor.ts
index e40e7dd16c..6be35b2883 100644
--- a/packages/editor-ui/src/event-bus/html-editor.ts
+++ b/packages/editor-ui/src/event-bus/html-editor.ts
@@ -1,4 +1,4 @@
-import { createEventBus } from 'n8n-design-system/utils';
+import { createEventBus } from '@n8n/utils/event-bus';
 
 export interface HtmlEditorEventBusEvents {
 	/** Command to format the content in the HtmlEditor */
diff --git a/packages/editor-ui/src/event-bus/import-curl.ts b/packages/editor-ui/src/event-bus/import-curl.ts
index 3ff4df697b..2b4a4186bb 100644
--- a/packages/editor-ui/src/event-bus/import-curl.ts
+++ b/packages/editor-ui/src/event-bus/import-curl.ts
@@ -1,5 +1,5 @@
 import type { CurlToJSONResponse } from '@/Interface';
-import { createEventBus } from 'n8n-design-system/utils';
+import { createEventBus } from '@n8n/utils/event-bus';
 
 export interface ImportCurlEventBusEvents {
 	/** Command to set the HTTP node parameters based on the curl to JSON response */
diff --git a/packages/editor-ui/src/event-bus/mfa.ts b/packages/editor-ui/src/event-bus/mfa.ts
index b455ab9c12..eb012eafbd 100644
--- a/packages/editor-ui/src/event-bus/mfa.ts
+++ b/packages/editor-ui/src/event-bus/mfa.ts
@@ -1,4 +1,4 @@
-import { createEventBus } from 'n8n-design-system/utils';
+import { createEventBus } from '@n8n/utils/event-bus';
 
 export const mfaEventBus = createEventBus();
 
diff --git a/packages/editor-ui/src/event-bus/ndv.ts b/packages/editor-ui/src/event-bus/ndv.ts
index e8c9233c39..e018938c37 100644
--- a/packages/editor-ui/src/event-bus/ndv.ts
+++ b/packages/editor-ui/src/event-bus/ndv.ts
@@ -1,5 +1,5 @@
 import type { IUpdateInformation } from '@/Interface';
-import { createEventBus } from 'n8n-design-system/utils';
+import { createEventBus } from '@n8n/utils/event-bus';
 
 export type Position = 'minLeft' | 'maxRight' | 'initial';
 
diff --git a/packages/editor-ui/src/event-bus/node-view.ts b/packages/editor-ui/src/event-bus/node-view.ts
index 9ed68a63e1..d1a49b9fd9 100644
--- a/packages/editor-ui/src/event-bus/node-view.ts
+++ b/packages/editor-ui/src/event-bus/node-view.ts
@@ -1,4 +1,4 @@
-import { createEventBus } from 'n8n-design-system/utils';
+import { createEventBus } from '@n8n/utils/event-bus';
 import type { IDataObject } from 'n8n-workflow';
 
 /** Callback function called after workflow has been save */
diff --git a/packages/editor-ui/src/event-bus/source-control.ts b/packages/editor-ui/src/event-bus/source-control.ts
index 17dae99952..0ccbd6e7a0 100644
--- a/packages/editor-ui/src/event-bus/source-control.ts
+++ b/packages/editor-ui/src/event-bus/source-control.ts
@@ -1,4 +1,4 @@
-import { createEventBus } from 'n8n-design-system/utils';
+import { createEventBus } from '@n8n/utils/event-bus';
 
 export interface SourceControlEventBusEvents {
 	/** Event when latest changes were pulled from the source control */
diff --git a/packages/editor-ui/src/models/history.ts b/packages/editor-ui/src/models/history.ts
index 2a2d8495ba..8fa521ce38 100644
--- a/packages/editor-ui/src/models/history.ts
+++ b/packages/editor-ui/src/models/history.ts
@@ -1,6 +1,6 @@
 import type { INodeUi, XYPosition } from '@/Interface';
 import type { IConnection } from 'n8n-workflow';
-import { createEventBus } from 'n8n-design-system/utils';
+import { createEventBus } from '@n8n/utils/event-bus';
 
 // Command names don't serve any particular purpose in the app
 // but they make it easier to identify each command on stack
diff --git a/packages/editor-ui/src/stores/assistant.store.ts b/packages/editor-ui/src/stores/assistant.store.ts
index 0837376934..ad0197bee8 100644
--- a/packages/editor-ui/src/stores/assistant.store.ts
+++ b/packages/editor-ui/src/stores/assistant.store.ts
@@ -16,7 +16,7 @@ import { useRootStore } from './root.store';
 import { useUsersStore } from './users.store';
 import { useRoute } from 'vue-router';
 import { useSettingsStore } from './settings.store';
-import { assert } from '@/utils/assert';
+import { assert } from '@n8n/utils/assert';
 import { useWorkflowsStore } from './workflows.store';
 import type { ICredentialType, INodeParameters, NodeError, INode } from 'n8n-workflow';
 import { deepCopy } from 'n8n-workflow';
diff --git a/packages/editor-ui/src/stores/npsSurvey.store.ts b/packages/editor-ui/src/stores/npsSurvey.store.ts
index d5b12e8e3f..b0016ab27e 100644
--- a/packages/editor-ui/src/stores/npsSurvey.store.ts
+++ b/packages/editor-ui/src/stores/npsSurvey.store.ts
@@ -14,7 +14,7 @@ import { useSettingsStore } from './settings.store';
 import { updateNpsSurveyState } from '@/api/npsSurvey';
 import type { IN8nPrompts } from '@/Interface';
 import { getPromptsData } from '@/api/settings';
-import { assert } from '@/utils/assert';
+import { assert } from '@n8n/utils/assert';
 
 export const MAXIMUM_TIMES_TO_SHOW_SURVEY_IF_IGNORED = 3;
 
diff --git a/packages/editor-ui/src/types/canvas.ts b/packages/editor-ui/src/types/canvas.ts
index f6aee0f02b..c1c05e4966 100644
--- a/packages/editor-ui/src/types/canvas.ts
+++ b/packages/editor-ui/src/types/canvas.ts
@@ -10,7 +10,7 @@ import type {
 } from '@vue-flow/core';
 import type { IExecutionResponse, INodeUi } from '@/Interface';
 import type { ComputedRef, Ref } from 'vue';
-import type { EventBus } from 'n8n-design-system';
+import type { EventBus } from '@n8n/utils/event-bus';
 
 export const enum CanvasConnectionMode {
 	Input = 'inputs',
diff --git a/packages/editor-ui/src/types/externalHooks.ts b/packages/editor-ui/src/types/externalHooks.ts
index d2c8b01821..8e5b19a73f 100644
--- a/packages/editor-ui/src/types/externalHooks.ts
+++ b/packages/editor-ui/src/types/externalHooks.ts
@@ -19,7 +19,7 @@ import type {
 	IWorkflowTemplateNode,
 	NodeFilterType,
 } from '@/Interface';
-import type { ComponentPublicInstance } from 'vue/dist/vue';
+import type { ComponentPublicInstance } from 'vue';
 import type { useWebhooksStore } from '@/stores/webhooks.store';
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
diff --git a/packages/editor-ui/src/utils/apiUtils.ts b/packages/editor-ui/src/utils/apiUtils.ts
index 1fe006be42..be343aefea 100644
--- a/packages/editor-ui/src/utils/apiUtils.ts
+++ b/packages/editor-ui/src/utils/apiUtils.ts
@@ -2,7 +2,7 @@ import type { AxiosRequestConfig, Method, RawAxiosRequestHeaders } from 'axios';
 import axios from 'axios';
 import { ApplicationError, jsonParse, type GenericValue, type IDataObject } from 'n8n-workflow';
 import { parse } from 'flatted';
-import { assert } from '@/utils/assert';
+import { assert } from '@n8n/utils/assert';
 
 import { BROWSER_ID_STORAGE_KEY } from '@/constants';
 import type { IExecutionFlattedResponse, IExecutionResponse, IRestApiContext } from '@/Interface';
diff --git a/packages/editor-ui/src/utils/templates/templateActions.ts b/packages/editor-ui/src/utils/templates/templateActions.ts
index c2c5c0e057..fa55ea28d4 100644
--- a/packages/editor-ui/src/utils/templates/templateActions.ts
+++ b/packages/editor-ui/src/utils/templates/templateActions.ts
@@ -19,7 +19,7 @@ import type { TemplatesStore } from '@/stores/templates.store';
 import type { NodeTypesStore } from '@/stores/nodeTypes.store';
 import type { Telemetry } from '@/plugins/telemetry';
 import type { useExternalHooks } from '@/composables/useExternalHooks';
-import { assert } from '@/utils/assert';
+import { assert } from '@n8n/utils/assert';
 import { doesNodeHaveCredentialsToFill } from '@/utils/nodes/nodeTransforms';
 import { tryToParseNumber } from '@/utils/typesUtils';
 
diff --git a/packages/editor-ui/src/views/NodeView.vue b/packages/editor-ui/src/views/NodeView.vue
index 86c89a6bbb..c91b6ce5df 100644
--- a/packages/editor-ui/src/views/NodeView.vue
+++ b/packages/editor-ui/src/views/NodeView.vue
@@ -102,7 +102,8 @@ import CanvasClearExecutionDataButton from '@/components/canvas/elements/buttons
 import { nodeViewEventBus } from '@/event-bus';
 import { tryToParseNumber } from '@/utils/typesUtils';
 import { useTemplatesStore } from '@/stores/templates.store';
-import { createEventBus, N8nCallout } from 'n8n-design-system';
+import { N8nCallout } from 'n8n-design-system';
+import { createEventBus } from '@n8n/utils/event-bus';
 import type { PinDataSource } from '@/composables/usePinnedData';
 import { useClipboard } from '@/composables/useClipboard';
 import { useBeforeUnload } from '@/composables/useBeforeUnload';
diff --git a/packages/editor-ui/src/views/SettingsLogStreamingView.vue b/packages/editor-ui/src/views/SettingsLogStreamingView.vue
index 9ff1409d78..125f74fce4 100644
--- a/packages/editor-ui/src/views/SettingsLogStreamingView.vue
+++ b/packages/editor-ui/src/views/SettingsLogStreamingView.vue
@@ -11,7 +11,7 @@ import { LOG_STREAM_MODAL_KEY, EnterpriseEditionFeature } from '@/constants';
 import type { MessageEventBusDestinationOptions } from 'n8n-workflow';
 import { deepCopy, defaultMessageEventBusDestinationOptions } from 'n8n-workflow';
 import EventDestinationCard from '@/components/SettingsLogStreaming/EventDestinationCard.ee.vue';
-import { createEventBus } from 'n8n-design-system/utils';
+import { createEventBus } from '@n8n/utils/event-bus';
 import { useDocumentTitle } from '@/composables/useDocumentTitle';
 import { ref, getCurrentInstance } from 'vue';
 import { useI18n } from '@/composables/useI18n';
diff --git a/packages/editor-ui/src/views/WorkflowsView.vue b/packages/editor-ui/src/views/WorkflowsView.vue
index 060a321516..a1ddddc963 100644
--- a/packages/editor-ui/src/views/WorkflowsView.vue
+++ b/packages/editor-ui/src/views/WorkflowsView.vue
@@ -42,7 +42,7 @@ import {
 import ProjectHeader from '@/components/Projects/ProjectHeader.vue';
 import { getEasyAiWorkflowJson } from '@/utils/easyAiWorkflowUtils';
 import { useDebounce } from '@/composables/useDebounce';
-import { createEventBus } from 'n8n-design-system/utils';
+import { createEventBus } from '@n8n/utils/event-bus';
 import type { PathItem } from 'n8n-design-system/components/N8nBreadcrumbs/Breadcrumbs.vue';
 import { ProjectTypes } from '@/types/projects.types';
 import { FOLDER_LIST_ITEM_ACTIONS } from '@/components/Folders/constants';
diff --git a/packages/editor-ui/tsconfig.json b/packages/editor-ui/tsconfig.json
index 43fb73f7e7..ff3d627bab 100644
--- a/packages/editor-ui/tsconfig.json
+++ b/packages/editor-ui/tsconfig.json
@@ -19,7 +19,8 @@
 			"n8n-design-system*": ["../design-system/src*"],
 			"@n8n/composables*": ["../frontend/@n8n/composables/src*"],
 			"@n8n/chat*": ["../frontend/@n8n/chat/src*"],
-			"@n8n/api-types*": ["../@n8n/api-types/src*"]
+			"@n8n/api-types*": ["../@n8n/api-types/src*"],
+			"@n8n/utils*": ["../@n8n/utils/src*"]
 		},
 		// TODO: remove all options below this line
 		"useUnknownInCatchVariables": false
diff --git a/packages/editor-ui/vite.config.mts b/packages/editor-ui/vite.config.mts
index ca58f5d980..b2eddbb37a 100644
--- a/packages/editor-ui/vite.config.mts
+++ b/packages/editor-ui/vite.config.mts
@@ -30,17 +30,17 @@ const alias = [
 		replacement: resolve(__dirname, '..', 'design-system', 'src') + '/',
 	},
 	{
-		find: /^@n8n\/chat$/,
-		replacement: resolve(__dirname, '..', 'frontend', '@n8n', 'chat', 'src', 'index.ts'),
-	},
-	{
-		find: /^@n8n\/chat\//,
-		replacement: resolve(__dirname, '..', 'frontend', '@n8n', 'chat', 'src') + '/',
+		find: /^@n8n\/chat(.+)$/,
+		replacement: resolve(__dirname, '..', 'frontend', '@n8n', 'chat', 'src$1'),
 	},
 	{
 		find: /^@n8n\/composables(.+)$/,
 		replacement: resolve(__dirname, '..', 'frontend', '@n8n', 'composables', 'src$1'),
 	},
+	{
+		find: /^@n8n\/utils(.+)$/,
+		replacement: resolve(__dirname, '..', '@n8n', 'utils', 'src$1'),
+	},
 	...['orderBy', 'camelCase', 'cloneDeep', 'startCase'].map((name) => ({
 		find: new RegExp(`^lodash.${name}$`, 'i'),
 		replacement: `lodash-es/${name}`,
diff --git a/packages/frontend/@n8n/composables/tsconfig.json b/packages/frontend/@n8n/composables/tsconfig.json
index 3b2e100fce..10f9ee1b73 100644
--- a/packages/frontend/@n8n/composables/tsconfig.json
+++ b/packages/frontend/@n8n/composables/tsconfig.json
@@ -4,7 +4,8 @@
 		"baseUrl": ".",
 		"rootDir": ".",
 		"outDir": "dist",
-		"types": ["vite/client", "vitest/globals"]
+		"types": ["vite/client", "vitest/globals"],
+		"isolatedModules": true
 	},
 	"include": ["src/**/*.ts", "src/**/*.vue", "vite.config.ts", "tsup.config.ts"]
 }
diff --git a/packages/frontend/@n8n/composables/tsup.config.ts b/packages/frontend/@n8n/composables/tsup.config.ts
index a9dc991b43..0d555b1ab0 100644
--- a/packages/frontend/@n8n/composables/tsup.config.ts
+++ b/packages/frontend/@n8n/composables/tsup.config.ts
@@ -1,7 +1,7 @@
 import { defineConfig } from 'tsup';
 
 export default defineConfig({
-	entry: ['src/useDeviceSupport.ts'],
+	entry: ['src/**/*.ts', '!src/**/*.test.ts', '!src/**/*.d.ts', '!src/__tests__**/*'],
 	format: ['cjs', 'esm'],
 	clean: true,
 	dts: true,
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index e029bacfd4..1af8ef695b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -775,6 +775,39 @@ importers:
 
   packages/@n8n/typescript-config: {}
 
+  packages/@n8n/utils:
+    devDependencies:
+      '@n8n/eslint-config':
+        specifier: workspace:*
+        version: link:../eslint-config
+      '@n8n/typescript-config':
+        specifier: workspace:*
+        version: link:../typescript-config
+      '@n8n/vitest-config':
+        specifier: workspace:*
+        version: link:../vitest-config
+      '@testing-library/jest-dom':
+        specifier: catalog:frontend
+        version: 6.6.3
+      '@testing-library/user-event':
+        specifier: catalog:frontend
+        version: 14.6.0(@testing-library/dom@10.4.0)
+      tsup:
+        specifier: catalog:frontend
+        version: 8.3.6(@microsoft/api-extractor@7.48.0(@types/node@18.16.16))(jiti@1.21.0)(postcss@8.4.49)(typescript@5.7.2)
+      typescript:
+        specifier: ^5.7.2
+        version: 5.7.2
+      vite:
+        specifier: catalog:frontend
+        version: 6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1)
+      vite-plugin-dts:
+        specifier: catalog:frontend
+        version: 4.3.0(@types/node@18.16.16)(rollup@4.24.0)(typescript@5.7.2)(vite@6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1))
+      vitest:
+        specifier: catalog:frontend
+        version: 3.0.5(@types/debug@4.1.12)(@types/node@18.16.16)(jiti@1.21.0)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1)
+
   packages/@n8n/vitest-config:
     devDependencies:
       vite:
@@ -1280,6 +1313,9 @@ importers:
       '@n8n/composables':
         specifier: workspace:*
         version: link:../frontend/@n8n/composables
+      '@n8n/utils':
+        specifier: workspace:*
+        version: link:../@n8n/utils
       '@vueuse/core':
         specifier: '*'
         version: 10.11.0(vue@3.5.13(typescript@5.7.2))
@@ -1458,6 +1494,9 @@ importers:
       '@n8n/permissions':
         specifier: workspace:*
         version: link:../@n8n/permissions
+      '@n8n/utils':
+        specifier: workspace:*
+        version: link:../@n8n/utils
       '@replit/codemirror-indentation-markers':
         specifier: ^6.5.3
         version: 6.5.3(@codemirror/language@6.10.1)(@codemirror/state@6.4.1)(@codemirror/view@6.26.3)

From 223ec2d9c99c7633f7fc99b53af0471d41d21892 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Thu, 27 Feb 2025 09:21:45 +0100
Subject: [PATCH 22/47] refactor(core): Prevent a server from starting if it's
 configured to use S3, but the license does not allow it (#13532)

---
 packages/cli/src/commands/base-command.ts     | 46 +++----------------
 packages/cli/src/license.ts                   | 21 +--------
 .../__tests__/object-store.service.test.ts    | 18 --------
 .../object-store/object-store.service.ee.ts   | 26 +----------
 .../src/binary-data/object-store/utils.ts     |  4 --
 5 files changed, 10 insertions(+), 105 deletions(-)

diff --git a/packages/cli/src/commands/base-command.ts b/packages/cli/src/commands/base-command.ts
index d9e3356ac8..d5b9427ed2 100644
--- a/packages/cli/src/commands/base-command.ts
+++ b/packages/cli/src/commands/base-command.ts
@@ -148,7 +148,7 @@ export abstract class BaseCommand extends Command {
 		const isSelected = config.getEnv('binaryDataManager.mode') === 's3';
 		const isAvailable = config.getEnv('binaryDataManager.availableModes').includes('s3');
 
-		if (!isSelected && !isAvailable) return;
+		if (!isSelected) return;
 
 		if (isSelected && !isAvailable) {
 			throw new UserError(
@@ -157,51 +157,19 @@ export abstract class BaseCommand extends Command {
 		}
 
 		const isLicensed = Container.get(License).isFeatureEnabled(LICENSE_FEATURES.BINARY_DATA_S3);
-
-		if (isSelected && isAvailable && isLicensed) {
-			this.logger.debug(
-				'License found for external storage - object store to init in read-write mode',
+		if (!isLicensed) {
+			this.logger.error(
+				'No license found for S3 storage. \n Either set `N8N_DEFAULT_BINARY_DATA_MODE` to something else, or upgrade to a license that supports this feature.',
 			);
-
-			await this._initObjectStoreService();
-
-			return;
+			return this.exit(1);
 		}
 
-		if (isSelected && isAvailable && !isLicensed) {
-			this.logger.debug(
-				'No license found for external storage - object store to init with writes blocked. To enable writes, please upgrade to a license that supports this feature.',
-			);
-
-			await this._initObjectStoreService({ isReadOnly: true });
-
-			return;
-		}
-
-		if (!isSelected && isAvailable) {
-			this.logger.debug(
-				'External storage unselected but available - object store to init with writes unused',
-			);
-
-			await this._initObjectStoreService();
-
-			return;
-		}
-	}
-
-	private async _initObjectStoreService(options = { isReadOnly: false }) {
-		const objectStoreService = Container.get(ObjectStoreService);
-
-		this.logger.debug('Initializing object store service');
-
+		this.logger.debug('License found for external storage - Initializing object store service');
 		try {
-			await objectStoreService.init();
-			objectStoreService.setReadonly(options.isReadOnly);
-
+			await Container.get(ObjectStoreService).init();
 			this.logger.debug('Object store init completed');
 		} catch (e) {
 			const error = e instanceof Error ? e : new Error(`${e}`);
-
 			this.logger.debug('Object store init failed', { error });
 		}
 	}
diff --git a/packages/cli/src/license.ts b/packages/cli/src/license.ts
index 3ae36e9a3c..694433000d 100644
--- a/packages/cli/src/license.ts
+++ b/packages/cli/src/license.ts
@@ -2,7 +2,7 @@ import { GlobalConfig } from '@n8n/config';
 import { Container, Service } from '@n8n/di';
 import type { TEntitlement, TFeatures, TLicenseBlock } from '@n8n_io/license-sdk';
 import { LicenseManager } from '@n8n_io/license-sdk';
-import { InstanceSettings, ObjectStoreService, Logger } from 'n8n-core';
+import { InstanceSettings, Logger } from 'n8n-core';
 
 import config from '@/config';
 import { SettingsRepository } from '@/databases/repositories/settings.repository';
@@ -106,7 +106,6 @@ export class License {
 
 			const features = this.manager.getFeatures();
 			this.checkIsLicensedForMultiMain(features);
-			this.checkIsLicensedForBinaryDataS3(features);
 
 			this.logger.debug('License initialized');
 		} catch (error: unknown) {
@@ -135,7 +134,6 @@ export class License {
 		this.logger.debug('License feature change detected', _features);
 
 		this.checkIsLicensedForMultiMain(_features);
-		this.checkIsLicensedForBinaryDataS3(_features);
 
 		if (this.instanceSettings.isMultiMain && !this.instanceSettings.isLeader) {
 			this.logger
@@ -405,23 +403,6 @@ export class License {
 		}
 	}
 
-	/**
-	 * Ensures that the instance is licensed for binary data S3 if S3 is selected and available
-	 */
-	private checkIsLicensedForBinaryDataS3(features: TFeatures) {
-		const isS3Selected = config.getEnv('binaryDataManager.mode') === 's3';
-		const isS3Available = config.getEnv('binaryDataManager.availableModes').includes('s3');
-		const isS3Licensed = features['feat:binaryDataS3'];
-
-		if (isS3Selected && isS3Available && !isS3Licensed) {
-			this.logger.debug(
-				'License changed with no support for external storage - blocking writes on object store. To restore writes, please upgrade to a license that supports this feature.',
-			);
-
-			Container.get(ObjectStoreService).setReadonly(true);
-		}
-	}
-
 	enableAutoRenewals() {
 		this.manager?.enableAutoRenewals();
 	}
diff --git a/packages/core/src/binary-data/object-store/__tests__/object-store.service.test.ts b/packages/core/src/binary-data/object-store/__tests__/object-store.service.test.ts
index ca8f4c0c94..03cfc5b979 100644
--- a/packages/core/src/binary-data/object-store/__tests__/object-store.service.test.ts
+++ b/packages/core/src/binary-data/object-store/__tests__/object-store.service.test.ts
@@ -4,7 +4,6 @@ import { mock } from 'jest-mock-extended';
 import { Readable } from 'stream';
 
 import { ObjectStoreService } from '@/binary-data/object-store/object-store.service.ee';
-import { writeBlockedMessage } from '@/binary-data/object-store/utils';
 
 jest.mock('axios');
 
@@ -128,23 +127,6 @@ describe('put()', () => {
 		});
 	});
 
-	it('should block if read-only', async () => {
-		objectStoreService.setReadonly(true);
-
-		const metadata = { fileName: 'file.txt', mimeType: 'text/plain' };
-
-		const promise = objectStoreService.put(fileId, mockBuffer, metadata);
-
-		await expect(promise).resolves.not.toThrow();
-
-		const result = await promise;
-
-		expect(result.status).toBe(403);
-		expect(result.statusText).toBe('Forbidden');
-
-		expect(result.data).toBe(writeBlockedMessage(fileId));
-	});
-
 	it('should throw an error on request failure', async () => {
 		const metadata = { fileName: 'file.txt', mimeType: 'text/plain' };
 
diff --git a/packages/core/src/binary-data/object-store/object-store.service.ee.ts b/packages/core/src/binary-data/object-store/object-store.service.ee.ts
index 5561bd61db..b557146872 100644
--- a/packages/core/src/binary-data/object-store/object-store.service.ee.ts
+++ b/packages/core/src/binary-data/object-store/object-store.service.ee.ts
@@ -3,7 +3,7 @@ import { Service } from '@n8n/di';
 import { sign } from 'aws4';
 import type { Request as Aws4Options } from 'aws4';
 import axios from 'axios';
-import type { AxiosRequestConfig, AxiosResponse, InternalAxiosRequestConfig, Method } from 'axios';
+import type { AxiosRequestConfig, Method } from 'axios';
 import { ApplicationError } from 'n8n-workflow';
 import { createHash } from 'node:crypto';
 import type { Readable } from 'stream';
@@ -11,7 +11,7 @@ import type { Readable } from 'stream';
 import { Logger } from '@/logging/logger';
 
 import type { ListPage, MetadataResponseHeaders, RawListPage, RequestOptions } from './types';
-import { isStream, parseXml, writeBlockedMessage } from './utils';
+import { isStream, parseXml } from './utils';
 import type { BinaryData } from '../types';
 
 @Service()
@@ -20,8 +20,6 @@ export class ObjectStoreService {
 
 	private isReady = false;
 
-	private isReadOnly = false;
-
 	constructor(
 		private readonly logger: Logger,
 		private readonly s3Config: S3Config,
@@ -48,10 +46,6 @@ export class ObjectStoreService {
 		this.setReady(true);
 	}
 
-	setReadonly(newState: boolean) {
-		this.isReadOnly = newState;
-	}
-
 	setReady(newState: boolean) {
 		this.isReady = newState;
 	}
@@ -73,8 +67,6 @@ export class ObjectStoreService {
 	 * @doc https://docs.aws.amazon.com/AmazonS3/latest/API/API_PutObject.html
 	 */
 	async put(filename: string, buffer: Buffer, metadata: BinaryData.PreWriteMetadata = {}) {
-		if (this.isReadOnly) return await this.blockWrite(filename);
-
 		const headers: Record<string, string | number> = {
 			'Content-Length': buffer.length,
 			'Content-MD5': createHash('md5').update(buffer).digest('base64'),
@@ -204,20 +196,6 @@ export class ObjectStoreService {
 		return page as ListPage;
 	}
 
-	private async blockWrite(filename: string): Promise<AxiosResponse> {
-		const logMessage = writeBlockedMessage(filename);
-
-		this.logger.warn(logMessage);
-
-		return {
-			status: 403,
-			statusText: 'Forbidden',
-			data: logMessage,
-			headers: {},
-			config: {} as InternalAxiosRequestConfig,
-		};
-	}
-
 	private async request<T>(
 		method: Method,
 		rawPath = '',
diff --git a/packages/core/src/binary-data/object-store/utils.ts b/packages/core/src/binary-data/object-store/utils.ts
index 6dc1e4df77..16ed264eb3 100644
--- a/packages/core/src/binary-data/object-store/utils.ts
+++ b/packages/core/src/binary-data/object-store/utils.ts
@@ -14,7 +14,3 @@ export async function parseXml<T>(xml: string): Promise<T> {
 		valueProcessors: [parseNumbers, parseBooleans],
 	}) as Promise<T>);
 }
-
-export function writeBlockedMessage(filename: string) {
-	return `Request to write file "${filename}" to object storage was blocked because S3 storage is not available with your current license. Please upgrade to a license that supports this feature, or set N8N_DEFAULT_BINARY_DATA_MODE to an option other than "s3".`;
-}

From 8a34f027c531f0d37fc8088c13d7e289cd8897ce Mon Sep 17 00:00:00 2001
From: Danny Martini <danny@n8n.io>
Date: Thu, 27 Feb 2025 09:35:52 +0100
Subject: [PATCH 23/47] feat(core): Support executing single nodes not part of
 a graph as a partial execution (#13529)

---
 .../__tests__/workflow-execute.test.ts        | 77 ++++++++++++++++---
 .../__tests__/find-subgraph.test.ts           | 21 +++++
 .../partial-execution-utils/find-subgraph.ts  |  6 ++
 .../src/execution-engine/workflow-execute.ts  | 46 +++++++++--
 4 files changed, 135 insertions(+), 15 deletions(-)

diff --git a/packages/core/src/execution-engine/__tests__/workflow-execute.test.ts b/packages/core/src/execution-engine/__tests__/workflow-execute.test.ts
index 202cbc854d..57b9cfb62d 100644
--- a/packages/core/src/execution-engine/__tests__/workflow-execute.test.ts
+++ b/packages/core/src/execution-engine/__tests__/workflow-execute.test.ts
@@ -52,6 +52,10 @@ import { WorkflowExecute } from '../workflow-execute';
 
 const nodeTypes = Helpers.NodeTypes();
 
+beforeEach(() => {
+	jest.resetAllMocks();
+});
+
 describe('WorkflowExecute', () => {
 	describe('v0 execution order', () => {
 		const tests: WorkflowTestData[] = legacyWorkflowExecuteTests;
@@ -455,6 +459,56 @@ describe('WorkflowExecute', () => {
 				new Set([node1]),
 			);
 		});
+
+		//                 ►►
+		//                ┌──────┐
+		//                │orphan│
+		//                └──────┘
+		//  ┌───────┐     ┌───────────┐
+		//  │trigger├────►│destination│
+		//  └───────┘     └───────────┘
+		test('works with a single node', async () => {
+			// ARRANGE
+			const waitPromise = createDeferredPromise<IRun>();
+			const nodeExecutionOrder: string[] = [];
+			const additionalData = Helpers.WorkflowExecuteAdditionalData(waitPromise, nodeExecutionOrder);
+			const workflowExecute = new WorkflowExecute(additionalData, 'manual');
+
+			const trigger = createNodeData({ name: 'trigger' });
+			const destination = createNodeData({ name: 'destination' });
+			const orphan = createNodeData({ name: 'orphan' });
+
+			const workflow = new DirectedGraph()
+				.addNodes(trigger, destination, orphan)
+				.addConnections({ from: trigger, to: destination })
+				.toWorkflow({ name: '', active: false, nodeTypes });
+
+			const pinData: IPinData = {};
+			const runData: IRunData = {
+				[trigger.name]: [toITaskData([{ data: { value: 1 } }])],
+				[destination.name]: [toITaskData([{ data: { nodeName: destination.name } }])],
+			};
+			const dirtyNodeNames: string[] = [];
+
+			const processRunExecutionDataSpy = jest
+				.spyOn(workflowExecute, 'processRunExecutionData')
+				.mockImplementationOnce(jest.fn());
+
+			// ACT
+			await workflowExecute.runPartialWorkflow2(
+				workflow,
+				runData,
+				pinData,
+				dirtyNodeNames,
+				orphan.name,
+			);
+
+			// ASSERT
+			expect(processRunExecutionDataSpy).toHaveBeenCalledTimes(1);
+			expect(processRunExecutionDataSpy).toHaveBeenCalledWith(
+				new DirectedGraph().addNode(orphan).toWorkflow({ ...workflow }),
+			);
+		});
 	});
 
 	describe('checkReadyForExecution', () => {
@@ -465,19 +519,20 @@ describe('WorkflowExecute', () => {
 		const nodeParamIssuesSpy = jest.spyOn(NodeHelpers, 'getNodeParametersIssues');
 
 		const nodeTypes = mock<INodeTypes>();
-		nodeTypes.getByNameAndVersion.mockImplementation((type) => {
-			// TODO: getByNameAndVersion signature needs to be updated to allow returning undefined
-			if (type === 'unknownNode') return undefined as unknown as INodeType;
-			return mock<INodeType>({
-				description: {
-					properties: [],
-				},
+
+		beforeEach(() => {
+			nodeTypes.getByNameAndVersion.mockImplementation((type) => {
+				// TODO: getByNameAndVersion signature needs to be updated to allow returning undefined
+				if (type === 'unknownNode') return undefined as unknown as INodeType;
+				return mock<INodeType>({
+					description: {
+						properties: [],
+					},
+				});
 			});
 		});
 		const workflowExecute = new WorkflowExecute(mock(), 'manual');
 
-		beforeEach(() => jest.clearAllMocks());
-
 		it('should return null if there are no nodes', () => {
 			const workflow = new Workflow({
 				nodes: [],
@@ -562,7 +617,9 @@ describe('WorkflowExecute', () => {
 			},
 		});
 
-		nodeTypes.getByNameAndVersion.mockReturnValue(triggerNodeType);
+		beforeEach(() => {
+			nodeTypes.getByNameAndVersion.mockReturnValue(triggerNodeType);
+		});
 
 		const workflow = new Workflow({
 			nodeTypes,
diff --git a/packages/core/src/execution-engine/partial-execution-utils/__tests__/find-subgraph.test.ts b/packages/core/src/execution-engine/partial-execution-utils/__tests__/find-subgraph.test.ts
index 1a6382017a..429f8b7c4f 100644
--- a/packages/core/src/execution-engine/partial-execution-utils/__tests__/find-subgraph.test.ts
+++ b/packages/core/src/execution-engine/partial-execution-utils/__tests__/find-subgraph.test.ts
@@ -33,6 +33,27 @@ describe('findSubgraph', () => {
 		expect(subgraph).toEqual(graph);
 	});
 
+	//                 ►►
+	//                ┌──────┐
+	//                │orphan│
+	//                └──────┘
+	//  ┌───────┐     ┌───────────┐
+	//  │trigger├────►│destination│
+	//  └───────┘     └───────────┘
+	test('works with a single node', () => {
+		const trigger = createNodeData({ name: 'trigger' });
+		const destination = createNodeData({ name: 'destination' });
+		const orphan = createNodeData({ name: 'orphan' });
+
+		const graph = new DirectedGraph()
+			.addNodes(trigger, destination, orphan)
+			.addConnections({ from: trigger, to: destination });
+
+		const subgraph = findSubgraph({ graph, destination: orphan, trigger: orphan });
+
+		expect(subgraph).toEqual(new DirectedGraph().addNode(orphan));
+	});
+
 	//                     ►►
 	//  ┌───────┐         ┌───────────┐
 	//  │       ├────────►│           │
diff --git a/packages/core/src/execution-engine/partial-execution-utils/find-subgraph.ts b/packages/core/src/execution-engine/partial-execution-utils/find-subgraph.ts
index f333f4764e..bbf5cd1e46 100644
--- a/packages/core/src/execution-engine/partial-execution-utils/find-subgraph.ts
+++ b/packages/core/src/execution-engine/partial-execution-utils/find-subgraph.ts
@@ -13,6 +13,12 @@ function findSubgraphRecursive(
 ) {
 	// If the current node is the chosen trigger keep this branch.
 	if (current === trigger) {
+		// If this graph consists of only one node there won't be any connections
+		// and the loop below won't add anything.
+		// We're adding the trigger here so that graphs with one node and no
+		// connections are handled correctly.
+		newGraph.addNode(trigger);
+
 		for (const connection of currentBranch) {
 			newGraph.addNodes(connection.from, connection.to);
 			newGraph.addConnection(connection);
diff --git a/packages/core/src/execution-engine/workflow-execute.ts b/packages/core/src/execution-engine/workflow-execute.ts
index c224530379..a5cea5cd11 100644
--- a/packages/core/src/execution-engine/workflow-execute.ts
+++ b/packages/core/src/execution-engine/workflow-execute.ts
@@ -354,16 +354,52 @@ export class WorkflowExecute {
 			`Could not find a node with the name ${destinationNodeName} in the workflow.`,
 		);
 
+		let graph = DirectedGraph.fromWorkflow(workflow);
+
+		// Edge Case 1:
+		// Support executing a single node that is not connected to a trigger
+		const destinationHasNoParents = graph.getDirectParentConnections(destination).length === 0;
+		if (destinationHasNoParents) {
+			// short cut here, only create a subgraph and the stacks
+			graph = findSubgraph({
+				graph: filterDisabledNodes(graph),
+				destination,
+				trigger: destination,
+			});
+			const filteredNodes = graph.getNodes();
+			runData = cleanRunData(runData, graph, new Set([destination]));
+			const { nodeExecutionStack, waitingExecution, waitingExecutionSource } =
+				recreateNodeExecutionStack(graph, new Set([destination]), runData, pinData ?? {});
+
+			this.status = 'running';
+			this.runExecutionData = {
+				startData: {
+					destinationNode: destinationNodeName,
+					runNodeFilter: Array.from(filteredNodes.values()).map((node) => node.name),
+				},
+				resultData: {
+					runData,
+					pinData,
+				},
+				executionData: {
+					contextData: {},
+					nodeExecutionStack,
+					metadata: {},
+					waitingExecution,
+					waitingExecutionSource,
+				},
+			};
+
+			return this.processRunExecutionData(graph.toWorkflow({ ...workflow }));
+		}
+
 		// 1. Find the Trigger
 		const trigger = findTriggerForPartialExecution(workflow, destinationNodeName);
 		if (trigger === undefined) {
-			throw new ApplicationError(
-				'The destination node is not connected to any trigger. Partial executions need a trigger.',
-			);
+			throw new ApplicationError('Connect a trigger to run this node');
 		}
 
 		// 2. Find the Subgraph
-		let graph = DirectedGraph.fromWorkflow(workflow);
 		graph = findSubgraph({ graph: filterDisabledNodes(graph), destination, trigger });
 		const filteredNodes = graph.getNodes();
 
@@ -380,7 +416,7 @@ export class WorkflowExecute {
 
 		// 7. Recreate Execution Stack
 		const { nodeExecutionStack, waitingExecution, waitingExecutionSource } =
-			recreateNodeExecutionStack(graph, new Set(startNodes), runData, pinData ?? {});
+			recreateNodeExecutionStack(graph, startNodes, runData, pinData ?? {});
 
 		// 8. Execute
 		this.status = 'running';

From d02c8b0d7dbd4144c954a66aa0e78e43122b6e9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9?= <matthiez@gmail.com>
Date: Thu, 27 Feb 2025 09:44:29 +0100
Subject: [PATCH 24/47] fix(seven Node): Remove obsolete options and fix typos
 (#13122)

Co-authored-by: Shireen Missi <94372015+ShireenMissi@users.noreply.github.com>
---
 .../nodes/Sms77/GenericFunctions.ts           |  1 -
 packages/nodes-base/nodes/Sms77/Sms77.node.ts | 32 ++-----------------
 2 files changed, 2 insertions(+), 31 deletions(-)

diff --git a/packages/nodes-base/nodes/Sms77/GenericFunctions.ts b/packages/nodes-base/nodes/Sms77/GenericFunctions.ts
index 90f92939c1..657b4e79d2 100644
--- a/packages/nodes-base/nodes/Sms77/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Sms77/GenericFunctions.ts
@@ -33,7 +33,6 @@ export async function sms77ApiRequest(
 
 	if (Object.keys(body).length) {
 		options.form = body;
-		body.json = 1;
 	}
 
 	const response = await this.helpers.requestWithAuthentication.call(this, 'sms77Api', options);
diff --git a/packages/nodes-base/nodes/Sms77/Sms77.node.ts b/packages/nodes-base/nodes/Sms77/Sms77.node.ts
index a98e4ccdc6..b7553a27ec 100644
--- a/packages/nodes-base/nodes/Sms77/Sms77.node.ts
+++ b/packages/nodes-base/nodes/Sms77/Sms77.node.ts
@@ -139,7 +139,7 @@ export class Sms77 implements INodeType {
 				displayName: 'Options',
 				name: 'options',
 				type: 'collection',
-				placeholder: 'Add Opton',
+				placeholder: 'Add Option',
 				default: {},
 				displayOptions: {
 					show: {
@@ -148,13 +148,6 @@ export class Sms77 implements INodeType {
 					},
 				},
 				options: [
-					{
-						displayName: 'Debug',
-						name: 'debug',
-						type: 'boolean',
-						default: false,
-						description: 'Whether the API returns fake responses like in a sandbox',
-					},
 					{
 						displayName: 'Delay',
 						name: 'delay',
@@ -186,13 +179,6 @@ export class Sms77 implements INodeType {
 						placeholder: 'MyCustomLabel',
 						description: 'Custom label used to group analytics',
 					},
-					{
-						displayName: 'No Reload',
-						name: 'no_reload',
-						type: 'boolean',
-						default: false,
-						description: 'Whether to disable reload lock to allow sending duplicate messages',
-					},
 					{
 						displayName: 'Performance Tracking',
 						name: 'performance_tracking',
@@ -218,7 +204,7 @@ export class Sms77 implements INodeType {
 				displayName: 'Options',
 				name: 'options',
 				type: 'collection',
-				placeholder: 'Add Opton',
+				placeholder: 'Add Option',
 				default: {},
 				displayOptions: {
 					show: {
@@ -227,13 +213,6 @@ export class Sms77 implements INodeType {
 					},
 				},
 				options: [
-					{
-						displayName: 'Debug',
-						name: 'debug',
-						type: 'boolean',
-						default: false,
-						description: 'Whether the API returns fake responses like in a sandbox',
-					},
 					{
 						displayName: 'From',
 						name: 'from',
@@ -243,13 +222,6 @@ export class Sms77 implements INodeType {
 						description:
 							'The caller ID. Please use only verified sender IDs, one of your virtual inbound numbers or one of our shared virtual numbers.',
 					},
-					{
-						displayName: 'XML',
-						name: 'xml',
-						type: 'boolean',
-						default: false,
-						description: 'Whether the text is in XML format',
-					},
 				],
 			},
 		],

From ac3b388d18fe672459bd2aa549c446dcd4a10eaf Mon Sep 17 00:00:00 2001
From: Tomi Turtiainen <10324676+tomi@users.noreply.github.com>
Date: Thu, 27 Feb 2025 12:58:54 +0200
Subject: [PATCH 25/47] ci: Add `stable` and `beta` release channels (#13498)

---
 .github/workflows/release-push-to-channel.yml | 41 +++++++++++++++----
 1 file changed, 33 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/release-push-to-channel.yml b/.github/workflows/release-push-to-channel.yml
index 74219e51c4..2f4a9170a7 100644
--- a/.github/workflows/release-push-to-channel.yml
+++ b/.github/workflows/release-push-to-channel.yml
@@ -11,10 +11,10 @@ on:
         description: 'Release channel'
         required: true
         type: choice
-        default: 'next'
+        default: 'beta'
         options:
-          - next
-          - latest
+          - beta
+          - stable
 
 jobs:
   release-to-npm:
@@ -25,9 +25,18 @@ jobs:
       - uses: actions/setup-node@v4.2.0
         with:
           node-version: 20.x
-      - run: |
-          echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc
-          npm dist-tag add n8n@${{ github.event.inputs.version }} ${{ github.event.inputs.release-channel }}
+
+      - run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc
+
+      - if: github.event.inputs.release-channel == 'beta'
+        run: |
+          npm dist-tag add n8n@${{ github.event.inputs.version }} next
+          npm dist-tag add n8n@${{ github.event.inputs.version }} beta
+
+      - if: github.event.inputs.release-channel == 'stable'
+        run: |
+          npm dist-tag add n8n@${{ github.event.inputs.version }} latest
+          npm dist-tag add n8n@${{ github.event.inputs.version }} stable
 
   release-to-docker-hub:
     name: Release to DockerHub
@@ -39,7 +48,15 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
-      - run: docker buildx imagetools create -t ${{ secrets.DOCKER_USERNAME }}/n8n:${{ github.event.inputs.release-channel }} ${{ secrets.DOCKER_USERNAME }}/n8n:${{ github.event.inputs.version }}
+      - if: github.event.inputs.release-channel == 'stable'
+        run: |
+          docker buildx imagetools create -t ${{ secrets.DOCKER_USERNAME }}/n8n:stable ${{ secrets.DOCKER_USERNAME }}/n8n:${{ github.event.inputs.version }}
+          docker buildx imagetools create -t ${{ secrets.DOCKER_USERNAME }}/n8n:latest ${{ secrets.DOCKER_USERNAME }}/n8n:${{ github.event.inputs.version }}
+
+      - if: github.event.inputs.release-channel == 'beta'
+        run: |
+          docker buildx imagetools create -t ${{ secrets.DOCKER_USERNAME }}/n8n:beta ${{ secrets.DOCKER_USERNAME }}/n8n:${{ github.event.inputs.version }}
+          docker buildx imagetools create -t ${{ secrets.DOCKER_USERNAME }}/n8n:next ${{ secrets.DOCKER_USERNAME }}/n8n:${{ github.event.inputs.version }}
 
   release-to-github-container-registry:
     name: Release to GitHub Container Registry
@@ -52,7 +69,15 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - run: docker buildx imagetools create -t ghcr.io/${{ github.repository_owner }}/n8n:${{ github.event.inputs.release-channel }} ghcr.io/${{ github.repository_owner }}/n8n:${{ github.event.inputs.version }}
+      - if: github.event.inputs.release-channel == 'stable'
+        run: |
+          docker buildx imagetools create -t ghcr.io/${{ github.repository_owner }}/n8n:stable ghcr.io/${{ github.repository_owner }}/n8n:${{ github.event.inputs.version }}
+          docker buildx imagetools create -t ghcr.io/${{ github.repository_owner }}/n8n:latest ghcr.io/${{ github.repository_owner }}/n8n:${{ github.event.inputs.version }}
+
+      - if: github.event.inputs.release-channel == 'beta'
+        run: |
+          docker buildx imagetools create -t ghcr.io/${{ github.repository_owner }}/n8n:beta ghcr.io/${{ github.repository_owner }}/n8n:${{ github.event.inputs.version }}
+          docker buildx imagetools create -t ghcr.io/${{ github.repository_owner }}/n8n:next ghcr.io/${{ github.repository_owner }}/n8n:${{ github.event.inputs.version }}
 
   update-docs:
     name: Update latest and next in the docs

From 9029dace5c682e4b5df4f18f2f51098dce6436e5 Mon Sep 17 00:00:00 2001
From: oleg <me@olegivaniv.com>
Date: Thu, 27 Feb 2025 12:11:32 +0100
Subject: [PATCH 26/47] feat(core): Fix partial workflow execution with
 specific trigger data (#13505)

Co-authored-by: Danny Martini <danny@n8n.io>
---
 .../manual-execution.service.test.ts          | 379 +++++++++++++++++-
 packages/cli/src/manual-execution.service.ts  |   7 +-
 2 files changed, 384 insertions(+), 2 deletions(-)

diff --git a/packages/cli/src/__tests__/manual-execution.service.test.ts b/packages/cli/src/__tests__/manual-execution.service.test.ts
index 23f69ab821..e9b74172e3 100644
--- a/packages/cli/src/__tests__/manual-execution.service.test.ts
+++ b/packages/cli/src/__tests__/manual-execution.service.test.ts
@@ -1,8 +1,24 @@
 import { mock } from 'jest-mock-extended';
-import type { Workflow, IWorkflowExecutionDataProcess } from 'n8n-workflow';
+import * as core from 'n8n-core';
+import { DirectedGraph, recreateNodeExecutionStack, WorkflowExecute } from 'n8n-core';
+import type {
+	Workflow,
+	IWorkflowExecutionDataProcess,
+	IWorkflowExecuteAdditionalData,
+	IPinData,
+	ITaskData,
+	INode,
+	IRun,
+	IExecuteData,
+	IWaitingForExecution,
+	IWaitingForExecutionSource,
+} from 'n8n-workflow';
+import type PCancelable from 'p-cancelable';
 
 import { ManualExecutionService } from '@/manual-execution.service';
 
+jest.mock('n8n-core');
+
 describe('ManualExecutionService', () => {
 	const manualExecutionService = new ManualExecutionService(mock());
 
@@ -68,4 +84,365 @@ describe('ManualExecutionService', () => {
 			});
 		});
 	});
+
+	describe('runManually', () => {
+		const nodeExecutionStack = mock<IExecuteData[]>();
+		const waitingExecution = mock<IWaitingForExecution>();
+		const waitingExecutionSource = mock<IWaitingForExecutionSource>();
+		const mockFilteredGraph = mock<DirectedGraph>();
+
+		beforeEach(() => {
+			jest.spyOn(DirectedGraph, 'fromWorkflow').mockReturnValue(mock<DirectedGraph>());
+			jest.spyOn(core, 'WorkflowExecute').mockReturnValue(
+				mock<WorkflowExecute>({
+					processRunExecutionData: jest.fn().mockReturnValue(mock<PCancelable<IRun>>()),
+				}),
+			);
+			jest.spyOn(core, 'recreateNodeExecutionStack').mockReturnValue({
+				nodeExecutionStack,
+				waitingExecution,
+				waitingExecutionSource,
+			});
+			jest.spyOn(core, 'filterDisabledNodes').mockReturnValue(mockFilteredGraph);
+		});
+
+		afterEach(() => {
+			jest.resetAllMocks();
+		});
+
+		it('should correctly process triggerToStartFrom data when data.triggerToStartFrom.data is present', async () => {
+			const mockTriggerData = mock<ITaskData>();
+			const startNodeName = 'startNode';
+			const triggerNodeName = 'triggerNode';
+			const data = mock<IWorkflowExecutionDataProcess>({
+				triggerToStartFrom: {
+					name: triggerNodeName,
+					data: mockTriggerData,
+				},
+				startNodes: [{ name: startNodeName }],
+				executionMode: 'manual',
+				pinData: undefined,
+			});
+
+			const startNode = mock<INode>({ name: startNodeName });
+			const workflow = mock<Workflow>({
+				getNode: jest.fn((name) => {
+					if (name === startNodeName) return startNode;
+					return null;
+				}),
+			});
+
+			const additionalData = mock<IWorkflowExecuteAdditionalData>();
+			const executionId = 'test-execution-id';
+			const pinData: IPinData = {};
+
+			await manualExecutionService.runManually(
+				data,
+				workflow,
+				additionalData,
+				executionId,
+				pinData,
+			);
+
+			expect(DirectedGraph.fromWorkflow).toHaveBeenCalledWith(workflow);
+
+			expect(recreateNodeExecutionStack).toHaveBeenCalledWith(
+				mockFilteredGraph,
+				new Set([startNode]),
+				{ [triggerNodeName]: [mockTriggerData] },
+				{},
+			);
+
+			expect(WorkflowExecute).toHaveBeenCalledWith(
+				additionalData,
+				data.executionMode,
+				expect.objectContaining({
+					resultData: {
+						runData: { [triggerNodeName]: [mockTriggerData] },
+						pinData,
+					},
+					executionData: {
+						contextData: {},
+						metadata: {},
+						nodeExecutionStack,
+						waitingExecution,
+						waitingExecutionSource,
+					},
+				}),
+			);
+		});
+
+		it('should correctly include destinationNode in executionData when provided', async () => {
+			const mockTriggerData = mock<ITaskData>();
+			const startNodeName = 'startNode';
+			const triggerNodeName = 'triggerNode';
+			const destinationNodeName = 'destinationNode';
+
+			const data = mock<IWorkflowExecutionDataProcess>({
+				triggerToStartFrom: {
+					name: triggerNodeName,
+					data: mockTriggerData,
+				},
+				startNodes: [{ name: startNodeName }],
+				executionMode: 'manual',
+				destinationNode: destinationNodeName,
+			});
+
+			const startNode = mock<INode>({ name: startNodeName });
+			const workflow = mock<Workflow>({
+				getNode: jest.fn((name) => {
+					if (name === startNodeName) return startNode;
+					return null;
+				}),
+			});
+
+			const additionalData = mock<IWorkflowExecuteAdditionalData>();
+			const executionId = 'test-execution-id';
+			const pinData: IPinData = {};
+
+			await manualExecutionService.runManually(
+				data,
+				workflow,
+				additionalData,
+				executionId,
+				pinData,
+			);
+
+			expect(WorkflowExecute).toHaveBeenCalledWith(
+				additionalData,
+				data.executionMode,
+				expect.objectContaining({
+					startData: {
+						destinationNode: destinationNodeName,
+					},
+					resultData: expect.any(Object),
+					executionData: expect.any(Object),
+				}),
+			);
+		});
+
+		it('should call workflowExecute.run for full execution when no runData or startNodes', async () => {
+			const data = mock<IWorkflowExecutionDataProcess>({
+				executionMode: 'manual',
+				destinationNode: undefined,
+				pinData: undefined,
+			});
+
+			const workflow = mock<Workflow>({
+				getNode: jest.fn().mockReturnValue(null),
+			});
+
+			const additionalData = mock<IWorkflowExecuteAdditionalData>();
+			const executionId = 'test-execution-id';
+
+			const mockRun = jest.fn().mockReturnValue('mockRunReturn');
+			require('n8n-core').WorkflowExecute.mockImplementationOnce(() => ({
+				run: mockRun,
+				processRunExecutionData: jest.fn(),
+			}));
+
+			await manualExecutionService.runManually(data, workflow, additionalData, executionId);
+
+			expect(mockRun).toHaveBeenCalledWith(
+				workflow,
+				undefined, // startNode
+				undefined, // destinationNode
+				undefined, // pinData
+			);
+		});
+
+		it('should use execution start node when available for full execution', async () => {
+			const data = mock<IWorkflowExecutionDataProcess>({
+				executionMode: 'manual',
+				pinData: {},
+				startNodes: [],
+				destinationNode: undefined,
+			});
+
+			const startNode = mock<INode>({ name: 'startNode' });
+			const workflow = mock<Workflow>({
+				getNode: jest.fn().mockReturnValue(startNode),
+			});
+
+			const additionalData = mock<IWorkflowExecuteAdditionalData>();
+			const executionId = 'test-execution-id';
+			const emptyPinData = {};
+
+			jest.spyOn(manualExecutionService, 'getExecutionStartNode').mockReturnValue(startNode);
+
+			const mockRun = jest.fn().mockReturnValue('mockRunReturn');
+			require('n8n-core').WorkflowExecute.mockImplementationOnce(() => ({
+				run: mockRun,
+				processRunExecutionData: jest.fn(),
+			}));
+
+			await manualExecutionService.runManually(
+				data,
+				workflow,
+				additionalData,
+				executionId,
+				emptyPinData,
+			);
+
+			expect(manualExecutionService.getExecutionStartNode).toHaveBeenCalledWith(data, workflow);
+
+			expect(mockRun).toHaveBeenCalledWith(
+				workflow,
+				startNode, // startNode
+				undefined, // destinationNode
+				data.pinData, // pinData
+			);
+		});
+
+		it('should handle partial execution with provided runData, startNodes and no destinationNode', async () => {
+			const mockRunData = { node1: [{ data: { main: [[{ json: {} }]] } }] };
+			const startNodeName = 'node1';
+			const data = mock<IWorkflowExecutionDataProcess>({
+				executionMode: 'manual',
+				runData: mockRunData,
+				startNodes: [{ name: startNodeName }],
+				destinationNode: undefined,
+				pinData: undefined,
+			});
+
+			const workflow = mock<Workflow>({
+				getNode: jest.fn((name) => {
+					if (name === startNodeName) return mock<INode>({ name: startNodeName });
+					return null;
+				}),
+			});
+
+			const additionalData = mock<IWorkflowExecuteAdditionalData>();
+			const executionId = 'test-execution-id';
+
+			const mockRunPartialWorkflow = jest.fn().mockReturnValue('mockPartialReturn');
+			require('n8n-core').WorkflowExecute.mockImplementationOnce(() => ({
+				runPartialWorkflow: mockRunPartialWorkflow,
+				processRunExecutionData: jest.fn(),
+			}));
+
+			await manualExecutionService.runManually(data, workflow, additionalData, executionId);
+
+			expect(mockRunPartialWorkflow).toHaveBeenCalledWith(
+				workflow,
+				mockRunData,
+				data.startNodes,
+				undefined, // destinationNode
+				undefined, // pinData
+			);
+		});
+
+		it('should handle partial execution with partialExecutionVersion=2', async () => {
+			const mockRunData = { node1: [{ data: { main: [[{ json: {} }]] } }] };
+			const dirtyNodeNames = ['node2', 'node3'];
+			const destinationNodeName = 'destinationNode';
+			const data = mock<IWorkflowExecutionDataProcess>({
+				executionMode: 'manual',
+				runData: mockRunData,
+				startNodes: [{ name: 'node1' }],
+				partialExecutionVersion: 2,
+				dirtyNodeNames,
+				destinationNode: destinationNodeName,
+			});
+
+			const workflow = mock<Workflow>({
+				getNode: jest.fn((name) => mock<INode>({ name })),
+			});
+
+			const additionalData = mock<IWorkflowExecuteAdditionalData>();
+			const executionId = 'test-execution-id';
+			const pinData: IPinData = { node1: [{ json: { pinned: true } }] };
+
+			const mockRunPartialWorkflow2 = jest.fn().mockReturnValue('mockPartial2Return');
+			require('n8n-core').WorkflowExecute.mockImplementationOnce(() => ({
+				runPartialWorkflow2: mockRunPartialWorkflow2,
+				processRunExecutionData: jest.fn(),
+			}));
+
+			await manualExecutionService.runManually(
+				data,
+				workflow,
+				additionalData,
+				executionId,
+				pinData,
+			);
+
+			expect(mockRunPartialWorkflow2).toHaveBeenCalled();
+			expect(mockRunPartialWorkflow2.mock.calls[0][0]).toBe(workflow);
+			expect(mockRunPartialWorkflow2.mock.calls[0][4]).toBe(destinationNodeName);
+		});
+
+		it('should validate nodes exist before execution', async () => {
+			const startNodeName = 'existingNode';
+			const data = mock<IWorkflowExecutionDataProcess>({
+				triggerToStartFrom: {
+					name: 'triggerNode',
+					data: mock<ITaskData>(),
+				},
+				startNodes: [{ name: startNodeName }],
+				executionMode: 'manual',
+			});
+
+			const workflow = mock<Workflow>({
+				getNode: jest.fn((name) => {
+					if (name === startNodeName) return mock<INode>({ name: startNodeName });
+					return null;
+				}),
+			});
+
+			const additionalData = mock<IWorkflowExecuteAdditionalData>();
+			const executionId = 'test-execution-id';
+
+			await manualExecutionService.runManually(data, workflow, additionalData, executionId);
+
+			expect(workflow.getNode).toHaveBeenCalledWith(startNodeName);
+		});
+
+		it('should handle pinData correctly when provided', async () => {
+			const startNodeName = 'startNode';
+			const triggerNodeName = 'triggerNode';
+			const mockTriggerData = mock<ITaskData>();
+			const mockPinData: IPinData = {
+				[startNodeName]: [{ json: { pinned: true } }],
+			};
+
+			const data = mock<IWorkflowExecutionDataProcess>({
+				triggerToStartFrom: {
+					name: triggerNodeName,
+					data: mockTriggerData,
+				},
+				startNodes: [{ name: startNodeName }],
+				executionMode: 'manual',
+			});
+
+			const startNode = mock<INode>({ name: startNodeName });
+			const workflow = mock<Workflow>({
+				getNode: jest.fn((name) => {
+					if (name === startNodeName) return startNode;
+					return null;
+				}),
+			});
+
+			const additionalData = mock<IWorkflowExecuteAdditionalData>();
+			const executionId = 'test-execution-id';
+
+			await manualExecutionService.runManually(
+				data,
+				workflow,
+				additionalData,
+				executionId,
+				mockPinData,
+			);
+
+			expect(WorkflowExecute).toHaveBeenCalledWith(
+				additionalData,
+				data.executionMode,
+				expect.objectContaining({
+					resultData: expect.objectContaining({
+						pinData: mockPinData,
+					}),
+				}),
+			);
+		});
+	});
 });
diff --git a/packages/cli/src/manual-execution.service.ts b/packages/cli/src/manual-execution.service.ts
index 4d6754ff4e..78b7e1723f 100644
--- a/packages/cli/src/manual-execution.service.ts
+++ b/packages/cli/src/manual-execution.service.ts
@@ -48,7 +48,7 @@ export class ManualExecutionService {
 		executionId: string,
 		pinData?: IPinData,
 	): PCancelable<IRun> {
-		if (data.triggerToStartFrom?.data && data.startNodes && !data.destinationNode) {
+		if (data.triggerToStartFrom?.data && data.startNodes) {
 			this.logger.debug(
 				`Execution ID ${executionId} had triggerToStartFrom. Starting from that trigger.`,
 				{ executionId },
@@ -78,6 +78,10 @@ export class ManualExecutionService {
 				},
 			};
 
+			if (data.destinationNode) {
+				executionData.startData = { destinationNode: data.destinationNode };
+			}
+
 			const workflowExecute = new WorkflowExecute(
 				additionalData,
 				data.executionMode,
@@ -105,6 +109,7 @@ export class ManualExecutionService {
 
 			// Can execute without webhook so go on
 			const workflowExecute = new WorkflowExecute(additionalData, data.executionMode);
+
 			return workflowExecute.run(workflow, startNode, data.destinationNode, data.pinData);
 		} else {
 			// Partial Execution

From 6ddcc1f8c93f86b0d111cae1b24518d621d8fe84 Mon Sep 17 00:00:00 2001
From: Alex Grozav <alex@grozav.com>
Date: Thu, 27 Feb 2025 13:42:18 +0200
Subject: [PATCH 27/47] fix(editor): Undo keybinding changes related to window
 focus/blur events (#13559)

---
 .../src/composables/useKeybindings.test.ts    | 26 -------------------
 .../src/composables/useKeybindings.ts         | 16 ++----------
 2 files changed, 2 insertions(+), 40 deletions(-)

diff --git a/packages/editor-ui/src/composables/useKeybindings.test.ts b/packages/editor-ui/src/composables/useKeybindings.test.ts
index 15acb1d9ac..9a3965412c 100644
--- a/packages/editor-ui/src/composables/useKeybindings.test.ts
+++ b/packages/editor-ui/src/composables/useKeybindings.test.ts
@@ -163,30 +163,4 @@ describe('useKeybindings', () => {
 		document.dispatchEvent(event);
 		expect(handler).toHaveBeenCalled();
 	});
-
-	it('should not call handler when window is blurred, until it is focused back', async () => {
-		const handler = vi.fn();
-		const keymap = ref({ a: handler });
-
-		useKeybindings(keymap);
-
-		const event = new KeyboardEvent('keydown', { key: 'a' });
-		document.dispatchEvent(event);
-
-		expect(handler).toHaveBeenCalled();
-
-		const blurEvent = new Event('blur');
-		window.dispatchEvent(blurEvent);
-
-		document.dispatchEvent(event);
-
-		expect(handler).toHaveBeenCalledTimes(1);
-
-		const focusEvent = new Event('focus');
-		window.dispatchEvent(focusEvent);
-
-		document.dispatchEvent(event);
-
-		expect(handler).toHaveBeenCalledTimes(2);
-	});
 });
diff --git a/packages/editor-ui/src/composables/useKeybindings.ts b/packages/editor-ui/src/composables/useKeybindings.ts
index 11c8dc8ff7..3de381fd6c 100644
--- a/packages/editor-ui/src/composables/useKeybindings.ts
+++ b/packages/editor-ui/src/composables/useKeybindings.ts
@@ -1,7 +1,7 @@
 import { useActiveElement, useEventListener } from '@vueuse/core';
 import { useDeviceSupport } from '@n8n/composables/useDeviceSupport';
 import type { MaybeRef, Ref } from 'vue';
-import { computed, ref, unref } from 'vue';
+import { computed, unref } from 'vue';
 
 type KeyMap = Record<string, (event: KeyboardEvent) => void>;
 
@@ -142,17 +142,5 @@ export const useKeybindings = (
 		}
 	}
 
-	const unregister = ref<ReturnType<typeof useEventListener> | undefined>();
-
-	function registerKeybindings() {
-		unregister.value = useEventListener(document, 'keydown', onKeyDown);
-	}
-
-	function unregisterKeybindings() {
-		unregister.value?.();
-	}
-
-	registerKeybindings();
-	useEventListener(window, 'blur', unregisterKeybindings);
-	useEventListener(window, 'focus', registerKeybindings);
+	useEventListener(document, 'keydown', onKeyDown);
 };

From ec57ac4ea28b0d094a0b52228ec448ab0a1229bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Thu, 27 Feb 2025 12:54:45 +0100
Subject: [PATCH 28/47] ci: Update release workflow (no-changelog) (#13561)

---
 .github/workflows/release-publish.yml |  12 ++-
 jest.config.js                        |   6 +-
 packages/cli/README.md                | 150 --------------------------
 3 files changed, 13 insertions(+), 155 deletions(-)
 delete mode 100644 packages/cli/README.md

diff --git a/.github/workflows/release-publish.yml b/.github/workflows/release-publish.yml
index 5054e76c79..32063d2fe5 100644
--- a/.github/workflows/release-publish.yml
+++ b/.github/workflows/release-publish.yml
@@ -51,14 +51,20 @@ jobs:
       - name: Dry-run publishing
         run: pnpm publish -r --no-git-checks --dry-run
 
-      - name: Publish to NPM
+      - name: Pre publishing changes
         run: |
           echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc
           node .github/scripts/trim-fe-packageJson.js
           node .github/scripts/ensure-provenance-fields.mjs
+          cp README.md packages/cli/README.md
           sed -i "s/default: 'dev'/default: 'stable'/g" packages/cli/dist/config/schema.js
-          pnpm publish -r --publish-branch ${{github.event.pull_request.base.ref}} --access public --tag rc --no-git-checks
-          npm dist-tag rm n8n rc
+
+      - name: Publish to NPM
+        run: pnpm publish -r --publish-branch ${{github.event.pull_request.base.ref}} --access public --tag rc --no-git-checks
+
+      - name: Cleanup rc tag
+        run: npm dist-tag rm n8n rc
+        continue-on-error: true
 
       - id: set-release
         run: echo "release=${{ env.RELEASE }}" >> $GITHUB_OUTPUT
diff --git a/jest.config.js b/jest.config.js
index 3caac38ef9..d1d8f95e12 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -12,6 +12,8 @@ const tsJestOptions = {
 
 const { baseUrl, paths } = require('get-tsconfig').getTsconfig().config?.compilerOptions;
 
+const isCoverageEnabled = process.env.COVERAGE_ENABLED === 'true';
+
 /** @type {import('jest').Config} */
 const config = {
 	verbose: true,
@@ -32,8 +34,8 @@ const config = {
 		return acc;
 	}, {}),
 	setupFilesAfterEnv: ['jest-expect-message'],
-	collectCoverage: process.env.COVERAGE_ENABLED === 'true',
-	coverageReporters: ['text-summary'],
+	collectCoverage: isCoverageEnabled,
+	coverageReporters: ['text-summary', 'lcov', 'html-spa'],
 	collectCoverageFrom: ['src/**/*.ts'],
 };
 
diff --git a/packages/cli/README.md b/packages/cli/README.md
deleted file mode 100644
index 0235c694da..0000000000
--- a/packages/cli/README.md
+++ /dev/null
@@ -1,150 +0,0 @@
-![n8n.io - Workflow Automation](https://user-images.githubusercontent.com/65276001/173571060-9f2f6d7b-bac0-43b6-bdb2-001da9694058.png)
-
-# n8n - Workflow Automation Tool
-
-n8n is a free and open [fair-code](https://faircode.io) distributed node-based Workflow Automation Tool. You can self-host n8n, easily extend it, and even use it with internal tools.
-
-<a href="https://raw.githubusercontent.com/n8n-io/n8n/master/assets/n8n-screenshot.png"><img src="https://raw.githubusercontent.com/n8n-io/n8n/master/assets/n8n-screenshot.png" alt="n8n.io - Screenshot"></a>
-
-## Contents
-
-<!-- TOC -->
-
-- [Demo](#demo)
-- [Getting Started](#getting-started)
-  - [Use npx](#use-npx)
-  - [Run with Docker](#run-with-docker)
-  - [Install with npm](#install-with-npm)
-  - [Sign-up on n8n.cloud](#sign-up-on-n8n.cloud)
-- [Available integrations](#available-integrations)
-- [Documentation](#documentation)
-- [Create Custom Nodes](#create-custom-nodes)
-- [Contributing](#contributing)
-- [What does n8n mean and how do you pronounce it](#what-does-n8n-mean-and-how-do-you-pronounce-it)
-- [Support](#support)
-- [Jobs](#jobs)
-- [Upgrading](#upgrading)
-- [License](#license)
-<!-- /TOC -->
-
-## Demo
-
-📺 Here's a [:tv: short video (< 4 min)](https://www.youtube.com/watch?v=RpjQTGKm-ok) that goes over key concepts of creating workflows in n8n.
-
-## Getting Started
-
-There are a couple of ways to get started with n8n.
-
-### Use npx
-
-To spin up n8n using npx, you can run:
-
-```bash
-npx n8n
-```
-
-It will download everything that is needed to start n8n.
-
-You can then access n8n by opening:
-[http://localhost:5678](http://localhost:5678)
-
-**Note:** The minimum required version for Node.js is v18. Make sure to update Node.js to v18 or above.
-
-### Run with Docker
-
-To play around with n8n, you can also start it using Docker:
-
-```bash
-docker run -it --rm \
-  --name n8n \
-  -p 5678:5678 \
-  docker.n8n.io/n8nio/n8n
-```
-
-Be aware that all the data will be lost once the Docker container gets removed. To persist the data mount the `~/.n8n` folder:
-
-```bash
-docker run -it --rm \
-  --name n8n \
-  -p 5678:5678 \
-  -v ~/.n8n:/home/node/.n8n \
-  docker.n8n.io/n8nio/n8n
-```
-
-Refer to the [documentation](https://github.com/n8n-io/n8n/blob/master/docker/images/n8n/README.md) for more information on the Docker setup.
-
-### Install with npm
-
-To install n8n globally using npm:
-
-```bash
-npm install n8n -g
-```
-
-After the installation, start n8n running the following command:
-
-```bash
-n8n
-# or
-n8n start
-```
-
-### Sign-up on n8n.cloud
-
-Sign-up for an [n8n.cloud](https://www.n8n.cloud/) account.
-
-While n8n.cloud and n8n are the same in terms of features, n8n.cloud provides certain conveniences such as:
-
-- Not having to set up and maintain your n8n instance
-- Managed OAuth for authentication
-- Easily upgrading to the newer n8n versions
-
-## Available integrations
-
-n8n has 280+ different nodes that allow you to connect various services and build your automation workflows. You can find the list of all the integrations at [https://n8n.io/integrations](https://n8n.io/integrations)
-
-## Documentation
-
-To learn more about n8n, refer to the official documentation here: [https://docs.n8n.io](https://docs.n8n.io)
-
-You can find additional information and example workflows on the [n8n.io](https://n8n.io) website.
-
-## Create Custom Nodes
-
-You can create custom nodes for n8n. Follow the instructions mentioned in the documentation to create your node: [Creating nodes](https://docs.n8n.io/integrations/creating-nodes/build/)
-
-## Contributing
-
-🐛 Did you find a bug?
-
-✨ Do you want to contribute a feature?
-
-The [CONTRIBUTING guide](https://github.com/n8n-io/n8n/blob/master/CONTRIBUTING.md) will help you set up your development environment.
-
-You can find more information on how you can contribute to the project on our documentation: [How can I contribute?](https://docs.n8n.io/reference/contributing.html)
-
-## What does n8n mean, and how do you pronounce it?
-
-**Short answer:** n8n is an abbreviation for "nodemation", and it is pronounced as n-eight-n.
-
-**Long answer:** In n8n, you build your automation ("-mation") workflows by connecting different nodes in the Editor UI. The project is also built using Node.js. As a consequence, the project was named nodemation.
-
-However, the name was long, and it wouldn't be a good idea to use such a long name in the CLI. Hence, nodemation got abbreviated as "n8n" (there are eight characters between the first and the last n!).
-
-## Support
-
-If you run into issues or have any questions reach out to us via our community forum: [https://community.n8n.io](https://community.n8n.io).
-
-## Jobs
-
-If you are interested in working at n8n and building the project, check out the [job openings](https://apply.workable.com/n8n/).
-
-## Upgrading
-
-Before you upgrade to the latest version, make sure to check the changelogs: [Changelog](https://docs.n8n.io/reference/changelog.html)
-
-You can also find breaking changes here: [Breaking Changes](./BREAKING-CHANGES.md)
-
-## License
-
-You can find the license information [here](https://github.com/n8n-io/n8n/blob/master/README.md#license)

From afba8f9ff89054d54e1cf70070ae5710bc9ddd37 Mon Sep 17 00:00:00 2001
From: Alex Grozav <alex@grozav.com>
Date: Thu, 27 Feb 2025 14:07:41 +0200
Subject: [PATCH 29/47] fix(core): Remove `index.html` caching entirely
 (#13563)

---
 packages/cli/src/server.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/cli/src/server.ts b/packages/cli/src/server.ts
index 352f582091..f6330ff8ad 100644
--- a/packages/cli/src/server.ts
+++ b/packages/cli/src/server.ts
@@ -395,9 +395,9 @@ export class Server extends AbstractServer {
 					!req.path.endsWith('.wasm') &&
 					!nonUIRoutesRegex.test(req.path)
 				) {
-					res.setHeader('Cache-Control', 'no-cache, no-store, must-revalidate');
+					res.setHeader('Cache-Control', 'no-cache, no-store, must-revalidate, proxy-revalidate');
 					securityHeadersMiddleware(req, res, () => {
-						res.sendFile('index.html', { root: staticCacheDir, maxAge, lastModified: true });
+						res.sendFile('index.html', { root: staticCacheDir, maxAge: 0, lastModified: false });
 					});
 				} else {
 					next();

From a1fee65713b5e6e5c3a6416fa60d384b0e255631 Mon Sep 17 00:00:00 2001
From: Eugene <eugene@n8n.io>
Date: Thu, 27 Feb 2025 15:13:07 +0300
Subject: [PATCH 30/47] fix(core): Fix test runner in queue mode (no-changelog)
 (#13479)

Co-authored-by: Danny Martini <danny@n8n.io>
---
 .../__tests__/test-runner.service.ee.test.ts  | 115 ++++++++++++++++++
 .../test-runner/test-runner.service.ee.ts     |  30 ++++-
 .../__tests__/job-processor.service.test.ts   |  56 ++++++++-
 packages/cli/src/scaling/job-processor.ts     |   2 +-
 4 files changed, 200 insertions(+), 3 deletions(-)

diff --git a/packages/cli/src/evaluation.ee/test-runner/__tests__/test-runner.service.ee.test.ts b/packages/cli/src/evaluation.ee/test-runner/__tests__/test-runner.service.ee.test.ts
index caf176d01f..d91a2d0ee7 100644
--- a/packages/cli/src/evaluation.ee/test-runner/__tests__/test-runner.service.ee.test.ts
+++ b/packages/cli/src/evaluation.ee/test-runner/__tests__/test-runner.service.ee.test.ts
@@ -8,6 +8,7 @@ import type { ITaskData } from 'n8n-workflow';
 import path from 'path';
 
 import type { ActiveExecutions } from '@/active-executions';
+import config from '@/config';
 import type { ExecutionEntity } from '@/databases/entities/execution-entity';
 import type { TestDefinition } from '@/databases/entities/test-definition.ee';
 import type { TestMetric } from '@/databases/entities/test-metric.ee';
@@ -753,6 +754,120 @@ describe('TestRunnerService', () => {
 		});
 	});
 
+	test('should create proper execution data for queue mode in runTestCase', async () => {
+		config.set('executions.mode', 'queue');
+
+		const testRunnerService = new TestRunnerService(
+			logger,
+			telemetry,
+			workflowRepository,
+			workflowRunner,
+			executionRepository,
+			activeExecutions,
+			testRunRepository,
+			testCaseExecutionRepository,
+			testMetricRepository,
+			mockNodeTypes,
+			errorReporter,
+		);
+
+		// Spy on workflowRunner.run to capture the data passed to it
+		jest.spyOn(workflowRunner, 'run').mockImplementation(async (data) => {
+			// Verify the data structure is correct for queue mode
+			expect(data.executionMode).toBe('evaluation');
+
+			// Check that executionData field is properly defined
+			expect(data.executionData).toBeDefined();
+			expect(data.executionData!.startData).toBeDefined();
+			expect(data.executionData!.startData!.startNodes).toBeDefined();
+			expect(data.executionData!.resultData.pinData).toBeDefined();
+			expect(data.executionData!.resultData.runData).toBeDefined();
+			expect(data.executionData!.manualData!.userId).toBeDefined();
+			expect(data.executionData!.manualData!.partialExecutionVersion).toBe(2);
+			expect(data.executionData!.manualData!.triggerToStartFrom).toBeDefined();
+
+			return 'mock-execution-id';
+		});
+
+		// Mock activeExecutions.getPostExecutePromise to return a successful execution
+		activeExecutions.getPostExecutePromise.mockResolvedValue(mockExecutionData());
+
+		// Create an AbortController for the test
+		const abortController = new AbortController();
+
+		// Setup test metadata
+		const metadata: any = {
+			testRunId: 'test-run-id',
+			userId: 'user-id',
+			pastExecutionId: 'past-execution-id',
+		};
+
+		// Call runTestCase directly to test the executionData construction
+		await (testRunnerService as any).runTestCase(
+			wfUnderTestJson,
+			executionDataJson,
+			wfUnderTestJson,
+			[{ id: '72256d90-3a67-4e29-b032-47df4e5768af' }],
+			metadata,
+			abortController.signal,
+		);
+
+		expect(workflowRunner.run).toHaveBeenCalledTimes(1);
+	});
+
+	test('should create proper execution data for regular mode in runTestCase', async () => {
+		config.set('executions.mode', 'regular');
+
+		const testRunnerService = new TestRunnerService(
+			logger,
+			telemetry,
+			workflowRepository,
+			workflowRunner,
+			executionRepository,
+			activeExecutions,
+			testRunRepository,
+			testCaseExecutionRepository,
+			testMetricRepository,
+			mockNodeTypes,
+			errorReporter,
+		);
+
+		// Spy on workflowRunner.run to capture the data passed to it
+		jest.spyOn(workflowRunner, 'run').mockImplementation(async (data) => {
+			expect(data.executionMode).toBe('evaluation');
+
+			// Check that executionData field is NOT defined
+			expect(data.executionData).not.toBeDefined();
+
+			return 'mock-execution-id';
+		});
+
+		// Mock activeExecutions.getPostExecutePromise to return a successful execution
+		activeExecutions.getPostExecutePromise.mockResolvedValue(mockExecutionData());
+
+		// Create an AbortController for the test
+		const abortController = new AbortController();
+
+		// Setup test metadata
+		const metadata: any = {
+			testRunId: 'test-run-id',
+			userId: 'user-id',
+			pastExecutionId: 'past-execution-id',
+		};
+
+		// Call runTestCase directly to test the executionData construction
+		await (testRunnerService as any).runTestCase(
+			wfUnderTestJson,
+			executionDataJson,
+			wfUnderTestJson,
+			[{ id: '72256d90-3a67-4e29-b032-47df4e5768af' }],
+			metadata,
+			abortController.signal,
+		);
+
+		expect(workflowRunner.run).toHaveBeenCalledTimes(1);
+	});
+
 	describe('Test Run cancellation', () => {
 		beforeAll(() => {
 			jest.useFakeTimers();
diff --git a/packages/cli/src/evaluation.ee/test-runner/test-runner.service.ee.ts b/packages/cli/src/evaluation.ee/test-runner/test-runner.service.ee.ts
index 433c86cbcf..38e38c9803 100644
--- a/packages/cli/src/evaluation.ee/test-runner/test-runner.service.ee.ts
+++ b/packages/cli/src/evaluation.ee/test-runner/test-runner.service.ee.ts
@@ -12,6 +12,7 @@ import type {
 import assert from 'node:assert';
 
 import { ActiveExecutions } from '@/active-executions';
+import config from '@/config';
 import type { ExecutionEntity } from '@/databases/entities/execution-entity';
 import type { MockedNodeItem, TestDefinition } from '@/databases/entities/test-definition.ee';
 import type { TestRun } from '@/databases/entities/test-run.ee';
@@ -164,9 +165,17 @@ export class TestRunnerService {
 			pastExecutionWorkflowData,
 		);
 
+		const startNodesData = this.getStartNodesData(
+			workflow,
+			pastExecutionData,
+			pastExecutionWorkflowData,
+		);
+
 		// Prepare the data to run the workflow
+		// Evaluation executions should run the same way as manual,
+		// because they need pinned data and partial execution logic
 		const data: IWorkflowExecutionDataProcess = {
-			...this.getStartNodesData(workflow, pastExecutionData, pastExecutionWorkflowData),
+			...startNodesData,
 			executionMode: 'evaluation',
 			runData: {},
 			pinData,
@@ -175,6 +184,25 @@ export class TestRunnerService {
 			partialExecutionVersion: 2,
 		};
 
+		// When in queue mode, we need to pass additional data to the execution
+		// the same way as it would be passed in manual mode
+		if (config.getEnv('executions.mode') === 'queue') {
+			data.executionData = {
+				startData: {
+					startNodes: startNodesData.startNodes,
+				},
+				resultData: {
+					pinData,
+					runData: {},
+				},
+				manualData: {
+					userId: metadata.userId,
+					partialExecutionVersion: 2,
+					triggerToStartFrom: startNodesData.triggerToStartFrom,
+				},
+			};
+		}
+
 		// Trigger the workflow under test with mocked data
 		const executionId = await this.workflowRunner.run(data);
 		assert(executionId);
diff --git a/packages/cli/src/scaling/__tests__/job-processor.service.test.ts b/packages/cli/src/scaling/__tests__/job-processor.service.test.ts
index 897986c915..b3236268b5 100644
--- a/packages/cli/src/scaling/__tests__/job-processor.service.test.ts
+++ b/packages/cli/src/scaling/__tests__/job-processor.service.test.ts
@@ -1,11 +1,34 @@
 import { mock } from 'jest-mock-extended';
+import type { Logger } from 'n8n-core';
+import { mockInstance } from 'n8n-core/test/utils';
+import type { IRunExecutionData, WorkflowExecuteMode } from 'n8n-workflow/src';
 
+import { CredentialsHelper } from '@/credentials-helper';
 import type { ExecutionRepository } from '@/databases/repositories/execution.repository';
+import { VariablesService } from '@/environments.ee/variables/variables.service.ee';
+import { ExternalHooks } from '@/external-hooks';
 import type { IExecutionResponse } from '@/interfaces';
+import type { ManualExecutionService } from '@/manual-execution.service';
+import { SecretsHelper } from '@/secrets-helpers.ee';
+import { WorkflowStatisticsService } from '@/services/workflow-statistics.service';
+import { WorkflowStaticDataService } from '@/workflows/workflow-static-data.service';
 
 import { JobProcessor } from '../job-processor';
 import type { Job } from '../scaling.types';
 
+mockInstance(VariablesService, {
+	getAllCached: jest.fn().mockResolvedValue([]),
+});
+mockInstance(CredentialsHelper);
+mockInstance(SecretsHelper);
+mockInstance(WorkflowStaticDataService);
+mockInstance(WorkflowStatisticsService);
+mockInstance(ExternalHooks);
+
+const logger = mock<Logger>({
+	scoped: jest.fn().mockImplementation(() => logger),
+});
+
 describe('JobProcessor', () => {
 	it('should refrain from processing a crashed execution', async () => {
 		const executionRepository = mock<ExecutionRepository>();
@@ -13,7 +36,7 @@ describe('JobProcessor', () => {
 			mock<IExecutionResponse>({ status: 'crashed' }),
 		);
 		const jobProcessor = new JobProcessor(
-			mock(),
+			logger,
 			mock(),
 			executionRepository,
 			mock(),
@@ -26,4 +49,35 @@ describe('JobProcessor', () => {
 
 		expect(result).toEqual({ success: false });
 	});
+
+	it.each(['manual', 'evaluation'] satisfies WorkflowExecuteMode[])(
+		'should use manualExecutionService to process a job in %p mode',
+		async (mode) => {
+			const executionRepository = mock<ExecutionRepository>();
+			executionRepository.findSingleExecution.mockResolvedValue(
+				mock<IExecutionResponse>({
+					mode,
+					workflowData: { nodes: [] },
+					data: mock<IRunExecutionData>({
+						isTestWebhook: false,
+					}),
+				}),
+			);
+
+			const manualExecutionService = mock<ManualExecutionService>();
+			const jobProcessor = new JobProcessor(
+				logger,
+				mock(),
+				executionRepository,
+				mock(),
+				mock(),
+				mock(),
+				manualExecutionService,
+			);
+
+			await jobProcessor.processJob(mock<Job>());
+
+			expect(manualExecutionService.runManually).toHaveBeenCalledTimes(1);
+		},
+	);
 });
diff --git a/packages/cli/src/scaling/job-processor.ts b/packages/cli/src/scaling/job-processor.ts
index 2fa9288a79..1c54f0dbc4 100644
--- a/packages/cli/src/scaling/job-processor.ts
+++ b/packages/cli/src/scaling/job-processor.ts
@@ -170,7 +170,7 @@ export class JobProcessor {
 
 		const { startData, resultData, manualData, isTestWebhook } = execution.data;
 
-		if (execution.mode === 'manual' && !isTestWebhook) {
+		if (['manual', 'evaluation'].includes(execution.mode) && !isTestWebhook) {
 			const data: IWorkflowExecutionDataProcess = {
 				executionMode: execution.mode,
 				workflowData: execution.workflowData,

From 615a42afd52d0d95dd30ed9aa231b9921e0708fe Mon Sep 17 00:00:00 2001
From: Csaba Tuncsik <csaba@n8n.io>
Date: Thu, 27 Feb 2025 13:42:44 +0100
Subject: [PATCH 31/47] fix(editor): Show dropdown scrollbars only when
 appropriate (#13562)

---
 packages/design-system/src/css/scrollbar.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/design-system/src/css/scrollbar.scss b/packages/design-system/src/css/scrollbar.scss
index 9a78b201d6..e79fccee58 100644
--- a/packages/design-system/src/css/scrollbar.scss
+++ b/packages/design-system/src/css/scrollbar.scss
@@ -15,7 +15,7 @@
 	}
 
 	@include mixins.e(wrap) {
-		overflow: scroll;
+		overflow: auto;
 		height: 100%;
 	}
 

From 461df371f76b9dee9916a985a2bd2197facbcf6b Mon Sep 17 00:00:00 2001
From: oleg <me@olegivaniv.com>
Date: Thu, 27 Feb 2025 15:40:58 +0100
Subject: [PATCH 32/47] feat(Anthropic Chat Model Node): Fetch models
 dynamically & support thinking (#13543)

---
 .../LMChatAnthropic/LmChatAnthropic.node.ts   | 123 +++++++++++++++++-
 .../methods/__tests__/searchModels.test.ts    | 105 +++++++++++++++
 .../LMChatAnthropic/methods/searchModels.ts   |  60 +++++++++
 packages/@n8n/nodes-langchain/package.json    |   2 +-
 pnpm-lock.yaml                                |  56 ++++----
 5 files changed, 316 insertions(+), 30 deletions(-)
 create mode 100644 packages/@n8n/nodes-langchain/nodes/llms/LMChatAnthropic/methods/__tests__/searchModels.test.ts
 create mode 100644 packages/@n8n/nodes-langchain/nodes/llms/LMChatAnthropic/methods/searchModels.ts

diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LMChatAnthropic/LmChatAnthropic.node.ts b/packages/@n8n/nodes-langchain/nodes/llms/LMChatAnthropic/LmChatAnthropic.node.ts
index 3a38ce3a31..7bf2e28bba 100644
--- a/packages/@n8n/nodes-langchain/nodes/llms/LMChatAnthropic/LmChatAnthropic.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LMChatAnthropic/LmChatAnthropic.node.ts
@@ -14,6 +14,7 @@ import {
 
 import { getConnectionHintNoticeField } from '@utils/sharedFields';
 
+import { searchModels } from './methods/searchModels';
 import { makeN8nLlmFailedAttemptHandler } from '../n8nLlmFailedAttemptHandler';
 import { N8nLlmTracing } from '../N8nLlmTracing';
 
@@ -69,15 +70,23 @@ const modelField: INodeProperties = {
 	default: 'claude-2',
 };
 
+const MIN_THINKING_BUDGET = 1024;
+const DEFAULT_MAX_TOKENS = 4096;
 export class LmChatAnthropic implements INodeType {
+	methods = {
+		listSearch: {
+			searchModels,
+		},
+	};
+
 	description: INodeTypeDescription = {
 		displayName: 'Anthropic Chat Model',
 		// eslint-disable-next-line n8n-nodes-base/node-class-description-name-miscased
 		name: 'lmChatAnthropic',
 		icon: 'file:anthropic.svg',
 		group: ['transform'],
-		version: [1, 1.1, 1.2],
-		defaultVersion: 1.2,
+		version: [1, 1.1, 1.2, 1.3],
+		defaultVersion: 1.3,
 		description: 'Language Model Anthropic',
 		defaults: {
 			name: 'Anthropic Chat Model',
@@ -135,7 +144,43 @@ export class LmChatAnthropic implements INodeType {
 				),
 				displayOptions: {
 					show: {
-						'@version': [{ _cnd: { gte: 1.2 } }],
+						'@version': [{ _cnd: { lte: 1.2 } }],
+					},
+				},
+			},
+			{
+				displayName: 'Model',
+				name: 'model',
+				type: 'resourceLocator',
+				default: {
+					mode: 'list',
+					value: 'claude-3-7-sonnet-20250219',
+					cachedResultName: 'Claude 3.7 Sonnet',
+				},
+				required: true,
+				modes: [
+					{
+						displayName: 'From List',
+						name: 'list',
+						type: 'list',
+						placeholder: 'Select a model...',
+						typeOptions: {
+							searchListMethod: 'searchModels',
+							searchable: true,
+						},
+					},
+					{
+						displayName: 'ID',
+						name: 'id',
+						type: 'string',
+						placeholder: 'Claude Sonnet',
+					},
+				],
+				description:
+					'The model. Choose from the list, or specify an ID. <a href="https://docs.anthropic.com/claude/docs/models-overview">Learn more</a>.',
+				displayOptions: {
+					show: {
+						'@version': [{ _cnd: { gte: 1.3 } }],
 					},
 				},
 			},
@@ -150,7 +195,7 @@ export class LmChatAnthropic implements INodeType {
 					{
 						displayName: 'Maximum Number of Tokens',
 						name: 'maxTokensToSample',
-						default: 4096,
+						default: DEFAULT_MAX_TOKENS,
 						description: 'The maximum number of tokens to generate in the completion',
 						type: 'number',
 					},
@@ -162,6 +207,11 @@ export class LmChatAnthropic implements INodeType {
 						description:
 							'Controls randomness: Lowering results in less random completions. As the temperature approaches zero, the model will become deterministic and repetitive.',
 						type: 'number',
+						displayOptions: {
+							hide: {
+								thinking: [true],
+							},
+						},
 					},
 					{
 						displayName: 'Top K',
@@ -171,6 +221,11 @@ export class LmChatAnthropic implements INodeType {
 						description:
 							'Used to remove "long tail" low probability responses. Defaults to -1, which disables it.',
 						type: 'number',
+						displayOptions: {
+							hide: {
+								thinking: [true],
+							},
+						},
 					},
 					{
 						displayName: 'Top P',
@@ -180,6 +235,30 @@ export class LmChatAnthropic implements INodeType {
 						description:
 							'Controls diversity via nucleus sampling: 0.5 means half of all likelihood-weighted options are considered. We generally recommend altering this or temperature but not both.',
 						type: 'number',
+						displayOptions: {
+							hide: {
+								thinking: [true],
+							},
+						},
+					},
+					{
+						displayName: 'Enable Thinking',
+						name: 'thinking',
+						type: 'boolean',
+						default: false,
+						description: 'Whether to enable thinking mode for the model',
+					},
+					{
+						displayName: 'Thinking Budget (Tokens)',
+						name: 'thinkingBudget',
+						type: 'number',
+						default: MIN_THINKING_BUDGET,
+						description: 'The maximum number of tokens to use for thinking',
+						displayOptions: {
+							show: {
+								thinking: [true],
+							},
+						},
 					},
 				],
 			},
@@ -189,13 +268,21 @@ export class LmChatAnthropic implements INodeType {
 	async supplyData(this: ISupplyDataFunctions, itemIndex: number): Promise<SupplyData> {
 		const credentials = await this.getCredentials('anthropicApi');
 
-		const modelName = this.getNodeParameter('model', itemIndex) as string;
+		const version = this.getNode().typeVersion;
+		const modelName =
+			version >= 1.3
+				? (this.getNodeParameter('model.value', itemIndex) as string)
+				: (this.getNodeParameter('model', itemIndex) as string);
+
 		const options = this.getNodeParameter('options', itemIndex, {}) as {
 			maxTokensToSample?: number;
 			temperature: number;
-			topK: number;
-			topP: number;
+			topK?: number;
+			topP?: number;
+			thinking?: boolean;
+			thinkingBudget?: number;
 		};
+		let invocationKwargs = {};
 
 		const tokensUsageParser = (llmOutput: LLMResult['llmOutput']) => {
 			const usage = (llmOutput?.usage as { input_tokens: number; output_tokens: number }) ?? {
@@ -208,6 +295,27 @@ export class LmChatAnthropic implements INodeType {
 				totalTokens: usage.input_tokens + usage.output_tokens,
 			};
 		};
+
+		if (options.thinking) {
+			invocationKwargs = {
+				thinking: {
+					type: 'enabled',
+					// If thinking is enabled, we need to set a budget.
+					// We fallback to 1024 as that is the minimum
+					budget_tokens: options.thinkingBudget ?? MIN_THINKING_BUDGET,
+				},
+				// The default Langchain max_tokens is -1 (no limit) but Anthropic requires a number
+				// higher than budget_tokens
+				max_tokens: options.maxTokensToSample ?? DEFAULT_MAX_TOKENS,
+				// These need to be unset when thinking is enabled.
+				// Because the invocationKwargs will override the model options
+				// we can pass options to the model and then override them here
+				top_k: undefined,
+				top_p: undefined,
+				temperature: undefined,
+			};
+		}
+
 		const model = new ChatAnthropic({
 			anthropicApiKey: credentials.apiKey as string,
 			modelName,
@@ -217,6 +325,7 @@ export class LmChatAnthropic implements INodeType {
 			topP: options.topP,
 			callbacks: [new N8nLlmTracing(this, { tokensUsageParser })],
 			onFailedAttempt: makeN8nLlmFailedAttemptHandler(this),
+			invocationKwargs,
 		});
 
 		return {
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LMChatAnthropic/methods/__tests__/searchModels.test.ts b/packages/@n8n/nodes-langchain/nodes/llms/LMChatAnthropic/methods/__tests__/searchModels.test.ts
new file mode 100644
index 0000000000..e1cc8e75a3
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LMChatAnthropic/methods/__tests__/searchModels.test.ts
@@ -0,0 +1,105 @@
+import type { ILoadOptionsFunctions } from 'n8n-workflow';
+
+import { searchModels, type AnthropicModel } from '../searchModels';
+
+describe('searchModels', () => {
+	let mockContext: jest.Mocked<ILoadOptionsFunctions>;
+
+	const mockModels: AnthropicModel[] = [
+		{
+			id: 'claude-3-opus-20240229',
+			display_name: 'Claude 3 Opus',
+			type: 'model',
+			created_at: '2024-02-29T00:00:00Z',
+		},
+		{
+			id: 'claude-3-sonnet-20240229',
+			display_name: 'Claude 3 Sonnet',
+			type: 'model',
+			created_at: '2024-02-29T00:00:00Z',
+		},
+		{
+			id: 'claude-3-haiku-20240307',
+			display_name: 'Claude 3 Haiku',
+			type: 'model',
+			created_at: '2024-03-07T00:00:00Z',
+		},
+		{
+			id: 'claude-2.1',
+			display_name: 'Claude 2.1',
+			type: 'model',
+			created_at: '2023-11-21T00:00:00Z',
+		},
+		{
+			id: 'claude-2.0',
+			display_name: 'Claude 2.0',
+			type: 'model',
+			created_at: '2023-07-11T00:00:00Z',
+		},
+	];
+
+	beforeEach(() => {
+		mockContext = {
+			helpers: {
+				httpRequestWithAuthentication: jest.fn().mockResolvedValue({
+					data: mockModels,
+				}),
+			},
+		} as unknown as jest.Mocked<ILoadOptionsFunctions>;
+	});
+
+	afterEach(() => {
+		jest.clearAllMocks();
+	});
+
+	it('should fetch models from Anthropic API', async () => {
+		const result = await searchModels.call(mockContext);
+
+		expect(mockContext.helpers.httpRequestWithAuthentication).toHaveBeenCalledWith('anthropicApi', {
+			url: 'https://api.anthropic.com/v1/models',
+			headers: {
+				'anthropic-version': '2023-06-01',
+			},
+		});
+		expect(result.results).toHaveLength(5);
+	});
+
+	it('should sort models by created_at date, most recent first', async () => {
+		const result = await searchModels.call(mockContext);
+		const sortedResults = result.results;
+
+		expect(sortedResults[0].value).toBe('claude-3-haiku-20240307');
+		expect(sortedResults[1].value).toBe('claude-3-opus-20240229');
+		expect(sortedResults[2].value).toBe('claude-3-sonnet-20240229');
+		expect(sortedResults[3].value).toBe('claude-2.1');
+		expect(sortedResults[4].value).toBe('claude-2.0');
+	});
+
+	it('should filter models based on search term', async () => {
+		const result = await searchModels.call(mockContext, 'claude-3');
+
+		expect(result.results).toHaveLength(3);
+		expect(result.results).toEqual([
+			{ name: 'Claude 3 Haiku', value: 'claude-3-haiku-20240307' },
+			{ name: 'Claude 3 Opus', value: 'claude-3-opus-20240229' },
+			{ name: 'Claude 3 Sonnet', value: 'claude-3-sonnet-20240229' },
+		]);
+	});
+
+	it('should handle case-insensitive search', async () => {
+		const result = await searchModels.call(mockContext, 'CLAUDE-3');
+
+		expect(result.results).toHaveLength(3);
+		expect(result.results).toEqual([
+			{ name: 'Claude 3 Haiku', value: 'claude-3-haiku-20240307' },
+			{ name: 'Claude 3 Opus', value: 'claude-3-opus-20240229' },
+			{ name: 'Claude 3 Sonnet', value: 'claude-3-sonnet-20240229' },
+		]);
+	});
+
+	it('should handle when no models match the filter', async () => {
+		const result = await searchModels.call(mockContext, 'nonexistent-model');
+
+		expect(result.results).toHaveLength(0);
+	});
+});
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LMChatAnthropic/methods/searchModels.ts b/packages/@n8n/nodes-langchain/nodes/llms/LMChatAnthropic/methods/searchModels.ts
new file mode 100644
index 0000000000..8b6c7f469f
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LMChatAnthropic/methods/searchModels.ts
@@ -0,0 +1,60 @@
+import type {
+	ILoadOptionsFunctions,
+	INodeListSearchItems,
+	INodeListSearchResult,
+} from 'n8n-workflow';
+
+export interface AnthropicModel {
+	id: string;
+	display_name: string;
+	type: string;
+	created_at: string;
+}
+
+export async function searchModels(
+	this: ILoadOptionsFunctions,
+	filter?: string,
+): Promise<INodeListSearchResult> {
+	const response = (await this.helpers.httpRequestWithAuthentication.call(this, 'anthropicApi', {
+		url: 'https://api.anthropic.com/v1/models',
+		headers: {
+			'anthropic-version': '2023-06-01',
+		},
+	})) as { data: AnthropicModel[] };
+
+	const models = response.data || [];
+	let results: INodeListSearchItems[] = [];
+
+	if (filter) {
+		for (const model of models) {
+			if (model.id.toLowerCase().includes(filter.toLowerCase())) {
+				results.push({
+					name: model.display_name,
+					value: model.id,
+				});
+			}
+		}
+	} else {
+		results = models.map((model) => ({
+			name: model.display_name,
+			value: model.id,
+		}));
+	}
+
+	// Sort models with more recent ones first (claude-3 before claude-2)
+	results = results.sort((a, b) => {
+		const modelA = models.find((m) => m.id === a.value);
+		const modelB = models.find((m) => m.id === b.value);
+
+		if (!modelA || !modelB) return 0;
+
+		// Sort by created_at date, most recent first
+		const dateA = new Date(modelA.created_at);
+		const dateB = new Date(modelB.created_at);
+		return dateB.getTime() - dateA.getTime();
+	});
+
+	return {
+		results,
+	};
+}
diff --git a/packages/@n8n/nodes-langchain/package.json b/packages/@n8n/nodes-langchain/package.json
index 49e77d4348..4fa65208b0 100644
--- a/packages/@n8n/nodes-langchain/package.json
+++ b/packages/@n8n/nodes-langchain/package.json
@@ -140,7 +140,7 @@
     "@google-cloud/resource-manager": "5.3.0",
     "@google/generative-ai": "0.21.0",
     "@huggingface/inference": "2.8.0",
-    "@langchain/anthropic": "0.3.11",
+    "@langchain/anthropic": "0.3.14",
     "@langchain/aws": "0.1.3",
     "@langchain/cohere": "0.3.2",
     "@langchain/community": "0.3.24",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 1af8ef695b..b247ee1f0f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -493,7 +493,7 @@ importers:
         version: 3.666.0(@aws-sdk/client-sts@3.666.0)
       '@getzep/zep-cloud':
         specifier: 1.0.12
-        version: 1.0.12(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13)(langchain@0.3.11(d2c70e6e899e44bb5377ca6198a97c6c))
+        version: 1.0.12(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13)(langchain@0.3.11(c10b80e38f5a8711ccad1e2174de91e6))
       '@getzep/zep-js':
         specifier: 0.9.0
         version: 0.9.0
@@ -510,8 +510,8 @@ importers:
         specifier: 2.8.0
         version: 2.8.0
       '@langchain/anthropic':
-        specifier: 0.3.11
-        version: 0.3.11(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13)
+        specifier: 0.3.14
+        version: 0.3.14(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13)
       '@langchain/aws':
         specifier: 0.1.3
         version: 0.1.3(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(@aws-sdk/client-sts@3.666.0)(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))
@@ -520,7 +520,7 @@ importers:
         version: 0.3.2(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13)
       '@langchain/community':
         specifier: 0.3.24
-        version: 0.3.24(8549324d4d39cb6e91ae9ff5fc6970d3)
+        version: 0.3.24(1ea346ff95b1be1e3f1f4333b25e2811)
       '@langchain/core':
         specifier: 'catalog:'
         version: 0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1))
@@ -610,7 +610,7 @@ importers:
         version: 23.0.1
       langchain:
         specifier: 0.3.11
-        version: 0.3.11(d2c70e6e899e44bb5377ca6198a97c6c)
+        version: 0.3.11(c10b80e38f5a8711ccad1e2174de91e6)
       lodash:
         specifier: 'catalog:'
         version: 4.17.21
@@ -2295,8 +2295,8 @@ packages:
   '@anthropic-ai/sdk@0.27.3':
     resolution: {integrity: sha512-IjLt0gd3L4jlOfilxVXTifn42FnVffMgDC04RJK1KDZpmkBWLv0XC92MVVmkxrFZNS/7l3xWgP/I3nqtX1sQHw==}
 
-  '@anthropic-ai/sdk@0.32.1':
-    resolution: {integrity: sha512-U9JwTrDvdQ9iWuABVsMLj8nJVwAyQz6QXvgLsVhryhCEPkLsbcP/MXxm+jYcAwLoV8ESbaTTjnD4kuAFa+Hyjg==}
+  '@anthropic-ai/sdk@0.37.0':
+    resolution: {integrity: sha512-tHjX2YbkUBwEgg0JZU3EFSSAQPoK4qQR/NFYa8Vtzd5UAyXzZksCw2In69Rml4R/TyHPBfRYaLK35XiOe33pjw==}
 
   '@apidevtools/json-schema-ref-parser@11.7.0':
     resolution: {integrity: sha512-pRrmXMCwnmrkS3MLgAIW5dXRzeTv6GLjkjb4HmxNnvAKXN1Nfzp4KmGADBQvlVUcqi+a5D+hfGDLLnd5NnYxog==}
@@ -4006,8 +4006,8 @@ packages:
   '@kwsites/promise-deferred@1.1.1':
     resolution: {integrity: sha512-GaHYm+c0O9MjZRu0ongGBRbinu8gVAMd2UZjji6jVmqKtZluZnptXGWhz1E8j8D2HJ3f/yMxKAUC0b+57wncIw==}
 
-  '@langchain/anthropic@0.3.11':
-    resolution: {integrity: sha512-rYjDZjMwVQ+cYeJd9IoSESdkkG8fc0m3siGRYKNy6qgYMnqCz8sUPKBanXwbZAs6wvspPCGgNK9WONfaCeX97A==}
+  '@langchain/anthropic@0.3.14':
+    resolution: {integrity: sha512-zfix+qo/coIkgjTYpadp71IAWGXriIfImYLwMr1HnFsit4/RN9DU+aEOdm0nTwycbaneUpwWs5yfje8IKWHfsA==}
     engines: {node: '>=18'}
     peerDependencies:
       '@langchain/core': '>=0.2.21 <0.4.0'
@@ -13879,7 +13879,7 @@ snapshots:
       - encoding
       - supports-color
 
-  '@anthropic-ai/sdk@0.32.1(encoding@0.1.13)':
+  '@anthropic-ai/sdk@0.37.0(encoding@0.1.13)':
     dependencies:
       '@types/node': 18.16.16
       '@types/node-fetch': 2.6.4
@@ -16125,7 +16125,7 @@ snapshots:
   '@gar/promisify@1.1.3':
     optional: true
 
-  '@getzep/zep-cloud@1.0.12(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13)(langchain@0.3.11(d2c70e6e899e44bb5377ca6198a97c6c))':
+  '@getzep/zep-cloud@1.0.12(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13)(langchain@0.3.11(c10b80e38f5a8711ccad1e2174de91e6))':
     dependencies:
       form-data: 4.0.0
       node-fetch: 2.7.0(encoding@0.1.13)
@@ -16134,7 +16134,7 @@ snapshots:
       zod: 3.24.1
     optionalDependencies:
       '@langchain/core': 0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1))
-      langchain: 0.3.11(d2c70e6e899e44bb5377ca6198a97c6c)
+      langchain: 0.3.11(c10b80e38f5a8711ccad1e2174de91e6)
     transitivePeerDependencies:
       - encoding
 
@@ -16616,9 +16616,9 @@ snapshots:
 
   '@kwsites/promise-deferred@1.1.1': {}
 
-  '@langchain/anthropic@0.3.11(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13)':
+  '@langchain/anthropic@0.3.14(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13)':
     dependencies:
-      '@anthropic-ai/sdk': 0.32.1(encoding@0.1.13)
+      '@anthropic-ai/sdk': 0.37.0(encoding@0.1.13)
       '@langchain/core': 0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1))
       fast-xml-parser: 4.4.1
       zod: 3.24.1
@@ -16653,7 +16653,7 @@ snapshots:
       - aws-crt
       - encoding
 
-  '@langchain/community@0.3.24(8549324d4d39cb6e91ae9ff5fc6970d3)':
+  '@langchain/community@0.3.24(1ea346ff95b1be1e3f1f4333b25e2811)':
     dependencies:
       '@browserbasehq/stagehand': 1.9.0(@playwright/test@1.49.1)(deepmerge@4.3.1)(dotenv@16.4.5)(encoding@0.1.13)(openai@4.78.1(encoding@0.1.13)(zod@3.24.1))(zod@3.24.1)
       '@ibm-cloud/watsonx-ai': 1.1.2
@@ -16664,7 +16664,7 @@ snapshots:
       flat: 5.0.2
       ibm-cloud-sdk-core: 5.1.0
       js-yaml: 4.1.0
-      langchain: 0.3.11(d2c70e6e899e44bb5377ca6198a97c6c)
+      langchain: 0.3.11(c10b80e38f5a8711ccad1e2174de91e6)
       langsmith: 0.2.15(openai@4.78.1(encoding@0.1.13)(zod@3.24.1))
       openai: 4.78.1(encoding@0.1.13)(zod@3.24.1)
       uuid: 10.0.0
@@ -16679,7 +16679,7 @@ snapshots:
       '@aws-sdk/credential-provider-node': 3.666.0(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(@aws-sdk/client-sts@3.666.0)
       '@azure/storage-blob': 12.18.0(encoding@0.1.13)
       '@browserbasehq/sdk': 2.0.0(encoding@0.1.13)
-      '@getzep/zep-cloud': 1.0.12(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13)(langchain@0.3.11(d2c70e6e899e44bb5377ca6198a97c6c))
+      '@getzep/zep-cloud': 1.0.12(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13)(langchain@0.3.11(c10b80e38f5a8711ccad1e2174de91e6))
       '@getzep/zep-js': 0.9.0
       '@google-ai/generativelanguage': 2.6.0(encoding@0.1.13)
       '@google-cloud/storage': 7.12.1(encoding@0.1.13)
@@ -19998,6 +19998,14 @@ snapshots:
     transitivePeerDependencies:
       - debug
 
+  axios@1.7.4(debug@4.4.0):
+    dependencies:
+      follow-redirects: 1.15.6(debug@4.4.0)
+      form-data: 4.0.0
+      proxy-from-env: 1.1.0
+    transitivePeerDependencies:
+      - debug
+
   axios@1.7.7:
     dependencies:
       follow-redirects: 1.15.6(debug@4.3.6)
@@ -22218,6 +22226,10 @@ snapshots:
     optionalDependencies:
       debug: 4.3.7
 
+  follow-redirects@1.15.6(debug@4.4.0):
+    optionalDependencies:
+      debug: 4.4.0
+
   for-each@0.3.3:
     dependencies:
       is-callable: 1.2.7
@@ -22809,7 +22821,7 @@ snapshots:
       '@types/debug': 4.1.12
       '@types/node': 18.16.16
       '@types/tough-cookie': 4.0.2
-      axios: 1.7.4
+      axios: 1.7.4(debug@4.4.0)
       camelcase: 6.3.0
       debug: 4.4.0
       dotenv: 16.4.5
@@ -22819,7 +22831,7 @@ snapshots:
       isstream: 0.1.2
       jsonwebtoken: 9.0.2
       mime-types: 2.1.35
-      retry-axios: 2.6.0(axios@1.7.4(debug@4.4.0))
+      retry-axios: 2.6.0(axios@1.7.4)
       tough-cookie: 4.1.3
     transitivePeerDependencies:
       - supports-color
@@ -23808,7 +23820,7 @@ snapshots:
 
   kuler@2.0.0: {}
 
-  langchain@0.3.11(d2c70e6e899e44bb5377ca6198a97c6c):
+  langchain@0.3.11(c10b80e38f5a8711ccad1e2174de91e6):
     dependencies:
       '@langchain/core': 0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1))
       '@langchain/openai': 0.3.17(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13)
@@ -23824,7 +23836,7 @@ snapshots:
       zod: 3.24.1
       zod-to-json-schema: 3.23.3(zod@3.24.1)
     optionalDependencies:
-      '@langchain/anthropic': 0.3.11(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13)
+      '@langchain/anthropic': 0.3.14(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13)
       '@langchain/aws': 0.1.3(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(@aws-sdk/client-sts@3.666.0)(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))
       '@langchain/cohere': 0.3.2(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13)
       '@langchain/google-genai': 0.1.6(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(zod@3.24.1)
@@ -26192,7 +26204,7 @@ snapshots:
 
   ret@0.1.15: {}
 
-  retry-axios@2.6.0(axios@1.7.4(debug@4.4.0)):
+  retry-axios@2.6.0(axios@1.7.4):
     dependencies:
       axios: 1.7.4
 

From 0fb66076ba6120a7cb2401102ff8d1d6220ae106 Mon Sep 17 00:00:00 2001
From: Shireen Missi <94372015+ShireenMissi@users.noreply.github.com>
Date: Thu, 27 Feb 2025 15:34:50 +0000
Subject: [PATCH 33/47] fix(Switch Node): Fix an issue in ordering rules in
 Switch Node (#13476)

---
 .../src/utils/nodeSettingsUtils.test.ts       | 39 ++++++++++++++++++-
 .../editor-ui/src/utils/nodeSettingsUtils.ts  |  4 +-
 2 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/packages/editor-ui/src/utils/nodeSettingsUtils.test.ts b/packages/editor-ui/src/utils/nodeSettingsUtils.test.ts
index 9968bc6984..09bf72a082 100644
--- a/packages/editor-ui/src/utils/nodeSettingsUtils.test.ts
+++ b/packages/editor-ui/src/utils/nodeSettingsUtils.test.ts
@@ -1,6 +1,6 @@
 import { describe, it, expect, afterAll } from 'vitest';
 import { mock } from 'vitest-mock-extended';
-import type { IConnections, NodeParameterValueType } from 'n8n-workflow';
+import type { IConnections, NodeParameterValueType, IDataObject } from 'n8n-workflow';
 import { updateDynamicConnections } from './nodeSettingsUtils';
 import { SWITCH_NODE_TYPE } from '@/constants';
 import type { INodeUi, IUpdateInformation } from '@/Interface';
@@ -140,6 +140,43 @@ describe('updateDynamicConnections', () => {
 		expect(updatedConnections?.TestNode.main[3]?.[0].node).toEqual('Node3');
 	});
 
+	it('should maintain correct connections after rules are reordered', () => {
+		const node = mock<INodeUi>({
+			name: 'TestNode',
+			type: SWITCH_NODE_TYPE,
+			parameters: {
+				rules: { values: [{ id: 'rule1' }, { id: 'rule2' }, { id: 'rule3' }] },
+				options: { fallbackOutput: 'extra' },
+			},
+		});
+
+		const connections = mock<IConnections>({
+			TestNode: {
+				main: [
+					[{ node: 'Node1' }],
+					[{ node: 'Node2' }],
+					[{ node: 'Node3' }],
+					[{ node: 'Fallback' }],
+				],
+			},
+		});
+
+		const currentRules = (node.parameters.rules as { values?: IDataObject[] })?.values;
+		const reorderedRules = [currentRules?.[2], currentRules?.[0], currentRules?.[1]];
+
+		const parameterData = mock<IUpdateInformation<NodeParameterValueType>>({
+			name: 'parameters.rules.values',
+			value: reorderedRules,
+		});
+
+		const updatedConnections = updateDynamicConnections(node, connections, parameterData);
+
+		expect(updatedConnections?.TestNode.main).toHaveLength(4);
+		expect(updatedConnections?.TestNode.main[0]?.[0].node).toEqual('Node3');
+		expect(updatedConnections?.TestNode.main[1]?.[0].node).toEqual('Node1');
+		expect(updatedConnections?.TestNode.main[2]?.[0].node).toEqual('Node2');
+		expect(updatedConnections?.TestNode.main[3]?.[0].node).toEqual('Fallback');
+	});
 	it('should return null if no conditions are met', () => {
 		const node = mock<INodeUi>({
 			name: 'TestNode',
diff --git a/packages/editor-ui/src/utils/nodeSettingsUtils.ts b/packages/editor-ui/src/utils/nodeSettingsUtils.ts
index 09f1c4f2db..3e232c548b 100644
--- a/packages/editor-ui/src/utils/nodeSettingsUtils.ts
+++ b/packages/editor-ui/src/utils/nodeSettingsUtils.ts
@@ -103,8 +103,8 @@ export function updateDynamicConnections(
 					const newRulesvalues = parameterData.value as IDataObject[];
 					const updatedConnectionsIndex: number[] = [];
 
-					for (const rule of curentRulesvalues) {
-						const index = newRulesvalues.findIndex((newRule) => isEqual(rule, newRule));
+					for (const newRule of newRulesvalues) {
+						const index = curentRulesvalues.findIndex((rule) => isEqual(rule, newRule));
 						if (index !== -1) {
 							updatedConnectionsIndex.push(index);
 						}

From 6c266acced95500148532b4fc015fe5d9587db76 Mon Sep 17 00:00:00 2001
From: Dana <152518854+dana-gill@users.noreply.github.com>
Date: Thu, 27 Feb 2025 16:39:08 +0100
Subject: [PATCH 34/47] fix(Postgres Node): Accommodate null values in query
 parameters for expressions (#13544)

---
 .../nodes/Postgres/test/v2/operations.test.ts | 20 +++++++++++++++++++
 .../nodes/Postgres/test/v2/utils.test.ts      | 20 +++++++++++++++++++
 .../database/executeQuery.operation.ts        | 12 ++++++++---
 .../nodes/Postgres/v2/helpers/utils.ts        | 10 ++++++++++
 4 files changed, 59 insertions(+), 3 deletions(-)

diff --git a/packages/nodes-base/nodes/Postgres/test/v2/operations.test.ts b/packages/nodes-base/nodes/Postgres/test/v2/operations.test.ts
index a2c0055590..cc7906fbd5 100644
--- a/packages/nodes-base/nodes/Postgres/test/v2/operations.test.ts
+++ b/packages/nodes-base/nodes/Postgres/test/v2/operations.test.ts
@@ -363,6 +363,26 @@ describe('Test PostgresV2, executeQuery operation', () => {
 		);
 	});
 
+	it('should execute queries with null key/value pairs', async () => {
+		const nodeParameters: IDataObject = {
+			operation: 'executeQuery',
+			query: 'SELECT *\nFROM users\nWHERE username IN ($1, $2)',
+			options: {
+				queryReplacement: '"={{ betty }}, {{ null }}"',
+			},
+		};
+		const nodeOptions = nodeParameters.options as IDataObject;
+
+		expect(async () => {
+			await executeQuery.execute.call(
+				createMockExecuteFunction(nodeParameters),
+				runQueries,
+				items,
+				nodeOptions,
+			);
+		}).not.toThrow();
+	});
+
 	it('should execute queries with multiple json key/value pairs', async () => {
 		const nodeParameters: IDataObject = {
 			operation: 'executeQuery',
diff --git a/packages/nodes-base/nodes/Postgres/test/v2/utils.test.ts b/packages/nodes-base/nodes/Postgres/test/v2/utils.test.ts
index 60cd74e085..c24d5627de 100644
--- a/packages/nodes-base/nodes/Postgres/test/v2/utils.test.ts
+++ b/packages/nodes-base/nodes/Postgres/test/v2/utils.test.ts
@@ -17,6 +17,7 @@ import {
 	isJSON,
 	convertValuesToJsonWithPgp,
 	hasJsonDataTypeInSchema,
+	evaluateExpression,
 } from '../../v2/helpers/utils';
 
 const node: INode = {
@@ -39,6 +40,25 @@ describe('Test PostgresV2, isJSON', () => {
 	});
 });
 
+describe('Test PostgresV2, evaluateExpression', () => {
+	it('should evaluate undefined to an empty string', () => {
+		expect(evaluateExpression(undefined)).toEqual('');
+	});
+	it('should evaluate null to a string with value null', () => {
+		expect(evaluateExpression(null)).toEqual('null');
+	});
+	it('should evaluate object to a string', () => {
+		expect(evaluateExpression({ key: '' })).toEqual('{"key":""}');
+		expect(evaluateExpression([])).toEqual('[]');
+		expect(evaluateExpression([1, 2, 4])).toEqual('[1,2,4]');
+	});
+	it('should evaluate everything else to a string', () => {
+		expect(evaluateExpression(1)).toEqual('1');
+		expect(evaluateExpression('string')).toEqual('string');
+		expect(evaluateExpression(true)).toEqual('true');
+	});
+});
+
 describe('Test PostgresV2, wrapData', () => {
 	it('should wrap object in json', () => {
 		const data = {
diff --git a/packages/nodes-base/nodes/Postgres/v2/actions/database/executeQuery.operation.ts b/packages/nodes-base/nodes/Postgres/v2/actions/database/executeQuery.operation.ts
index 75e0c78587..9794f308a6 100644
--- a/packages/nodes-base/nodes/Postgres/v2/actions/database/executeQuery.operation.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/actions/database/executeQuery.operation.ts
@@ -14,7 +14,12 @@ import type {
 	QueriesRunner,
 	QueryWithValues,
 } from '../../helpers/interfaces';
-import { isJSON, replaceEmptyStringsByNulls, stringToArray } from '../../helpers/utils';
+import {
+	evaluateExpression,
+	isJSON,
+	replaceEmptyStringsByNulls,
+	stringToArray,
+} from '../../helpers/utils';
 import { optionsCollection } from '../common.descriptions';
 
 const properties: INodeProperties[] = [
@@ -84,8 +89,9 @@ export async function execute(
 					const resolvables = getResolvables(rawValues);
 					if (resolvables.length) {
 						for (const resolvable of resolvables) {
-							const evaluatedExpression =
-								this.evaluateExpression(`${resolvable}`, index)?.toString() ?? '';
+							const evaluatedExpression = evaluateExpression(
+								this.evaluateExpression(`${resolvable}`, index),
+							);
 							const evaluatedValues = isJSON(evaluatedExpression)
 								? [evaluatedExpression]
 								: stringToArray(evaluatedExpression);
diff --git a/packages/nodes-base/nodes/Postgres/v2/helpers/utils.ts b/packages/nodes-base/nodes/Postgres/v2/helpers/utils.ts
index 289c8fe351..a8caf39c18 100644
--- a/packages/nodes-base/nodes/Postgres/v2/helpers/utils.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/helpers/utils.ts
@@ -30,6 +30,16 @@ export function isJSON(str: string) {
 	}
 }
 
+export function evaluateExpression(expression: NodeParameterValueType) {
+	if (expression === undefined) {
+		return '';
+	} else if (expression === null) {
+		return 'null';
+	} else {
+		return typeof expression === 'object' ? JSON.stringify(expression) : expression.toString();
+	}
+}
+
 export function stringToArray(str: NodeParameterValueType | undefined) {
 	if (str === undefined) return [];
 	return String(str)

From 0c266b3060fe844b700d3b167bddbce6b9008fa4 Mon Sep 17 00:00:00 2001
From: Ricardo Espinoza <ricardo@n8n.io>
Date: Thu, 27 Feb 2025 16:47:07 -0500
Subject: [PATCH 35/47] feat(core): Add endpoint DELETE
 `/projects/:projectId/folders/:folderId` (no-changelog) (#13516)

---
 .../src/dto/folders/create-folder.dto.ts      |   5 +-
 .../src/dto/folders/delete-folder.dto.ts      |   7 +
 packages/@n8n/api-types/src/dto/index.ts      |   1 +
 .../api-types/src/schemas/folder.schema.ts    |   1 +
 packages/@n8n/permissions/src/constants.ee.ts |   2 +-
 .../cli/src/controllers/folder.controller.ts  |  29 ++-
 packages/cli/src/databases/entities/folder.ts |   2 +-
 .../src/databases/entities/workflow-entity.ts |   2 +-
 ...740445074052-UpdateParentFolderIdColumn.ts |  14 ++
 .../src/databases/migrations/mysqldb/index.ts |   2 +
 ...740445074052-UpdateParentFolderIdColumn.ts |  36 +++
 .../databases/migrations/postgresdb/index.ts  |   2 +
 ...740445074052-UpdateParentFolderIdColumn.ts |  61 ++++++
 .../src/databases/migrations/sqlite/index.ts  |   2 +
 .../repositories/folder.repository.ts         |  22 +-
 .../repositories/workflow.repository.ts       |  16 +-
 .../cli/src/permissions.ee/project-roles.ts   |   3 +
 packages/cli/src/services/folder.service.ts   |  31 ++-
 .../cli/src/workflows/workflows.controller.ts |   2 +-
 .../folder/folder.controller.test.ts          | 206 ++++++++++++++++++
 packages/workflow/src/Constants.ts            |   2 +
 21 files changed, 429 insertions(+), 19 deletions(-)
 create mode 100644 packages/@n8n/api-types/src/dto/folders/delete-folder.dto.ts
 create mode 100644 packages/cli/src/databases/migrations/mysqldb/1740445074052-UpdateParentFolderIdColumn.ts
 create mode 100644 packages/cli/src/databases/migrations/postgresdb/1740445074052-UpdateParentFolderIdColumn.ts
 create mode 100644 packages/cli/src/databases/migrations/sqlite/1740445074052-UpdateParentFolderIdColumn.ts

diff --git a/packages/@n8n/api-types/src/dto/folders/create-folder.dto.ts b/packages/@n8n/api-types/src/dto/folders/create-folder.dto.ts
index 098292045a..a673284f51 100644
--- a/packages/@n8n/api-types/src/dto/folders/create-folder.dto.ts
+++ b/packages/@n8n/api-types/src/dto/folders/create-folder.dto.ts
@@ -1,9 +1,8 @@
-import { z } from 'zod';
 import { Z } from 'zod-class';
 
-import { folderNameSchema } from '../../schemas/folder.schema';
+import { folderNameSchema, folderId } from '../../schemas/folder.schema';
 
 export class CreateFolderDto extends Z.class({
 	name: folderNameSchema,
-	parentFolderId: z.string().optional(),
+	parentFolderId: folderId.optional(),
 }) {}
diff --git a/packages/@n8n/api-types/src/dto/folders/delete-folder.dto.ts b/packages/@n8n/api-types/src/dto/folders/delete-folder.dto.ts
new file mode 100644
index 0000000000..c03659ad18
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/folders/delete-folder.dto.ts
@@ -0,0 +1,7 @@
+import { Z } from 'zod-class';
+
+import { folderId } from '../../schemas/folder.schema';
+
+export class DeleteFolderDto extends Z.class({
+	transferToFolderId: folderId.optional(),
+}) {}
diff --git a/packages/@n8n/api-types/src/dto/index.ts b/packages/@n8n/api-types/src/dto/index.ts
index a4467d65c6..f2dd481ee2 100644
--- a/packages/@n8n/api-types/src/dto/index.ts
+++ b/packages/@n8n/api-types/src/dto/index.ts
@@ -57,3 +57,4 @@ export { CreateApiKeyRequestDto } from './api-keys/create-api-key-request.dto';
 
 export { CreateFolderDto } from './folders/create-folder.dto';
 export { UpdateFolderDto } from './folders/update-folder.dto';
+export { DeleteFolderDto } from './folders/delete-folder.dto';
diff --git a/packages/@n8n/api-types/src/schemas/folder.schema.ts b/packages/@n8n/api-types/src/schemas/folder.schema.ts
index 40b59d4faa..4544a1b58c 100644
--- a/packages/@n8n/api-types/src/schemas/folder.schema.ts
+++ b/packages/@n8n/api-types/src/schemas/folder.schema.ts
@@ -1,3 +1,4 @@
 import { z } from 'zod';
 
 export const folderNameSchema = z.string().trim().min(1).max(128);
+export const folderId = z.string().max(36);
diff --git a/packages/@n8n/permissions/src/constants.ee.ts b/packages/@n8n/permissions/src/constants.ee.ts
index 19b39df8fc..f1fbfbf0f4 100644
--- a/packages/@n8n/permissions/src/constants.ee.ts
+++ b/packages/@n8n/permissions/src/constants.ee.ts
@@ -22,5 +22,5 @@ export const RESOURCES = {
 	variable: [...DEFAULT_OPERATIONS] as const,
 	workersView: ['manage'] as const,
 	workflow: ['share', 'execute', 'move', ...DEFAULT_OPERATIONS] as const,
-	folder: ['create', 'read', 'update'] as const,
+	folder: ['create', 'read', 'update', 'delete'] as const,
 } as const;
diff --git a/packages/cli/src/controllers/folder.controller.ts b/packages/cli/src/controllers/folder.controller.ts
index 17fb4ddb7e..774369768d 100644
--- a/packages/cli/src/controllers/folder.controller.ts
+++ b/packages/cli/src/controllers/folder.controller.ts
@@ -1,7 +1,7 @@
-import { CreateFolderDto, UpdateFolderDto } from '@n8n/api-types';
+import { CreateFolderDto, DeleteFolderDto, UpdateFolderDto } from '@n8n/api-types';
 import { Response } from 'express';
 
-import { Post, RestController, ProjectScope, Body, Get, Patch } from '@/decorators';
+import { Post, RestController, ProjectScope, Body, Get, Patch, Delete } from '@/decorators';
 import { FolderNotFoundError } from '@/errors/folder-not-found.error';
 import { InternalServerError } from '@/errors/response-errors/internal-server.error';
 import { NotFoundError } from '@/errors/response-errors/not-found.error';
@@ -26,7 +26,7 @@ export class ProjectController {
 			if (e instanceof FolderNotFoundError) {
 				throw new NotFoundError(e.message);
 			}
-			throw new InternalServerError();
+			throw new InternalServerError(undefined, e);
 		}
 	}
 
@@ -45,7 +45,7 @@ export class ProjectController {
 			if (e instanceof FolderNotFoundError) {
 				throw new NotFoundError(e.message);
 			}
-			throw new InternalServerError();
+			throw new InternalServerError(undefined, e);
 		}
 	}
 
@@ -64,7 +64,26 @@ export class ProjectController {
 			if (e instanceof FolderNotFoundError) {
 				throw new NotFoundError(e.message);
 			}
-			throw new InternalServerError();
+			throw new InternalServerError(undefined, e);
+		}
+	}
+
+	@Delete('/:folderId')
+	@ProjectScope('folder:delete')
+	async deleteFolder(
+		req: AuthenticatedRequest<{ projectId: string; folderId: string }>,
+		_res: Response,
+		@Body payload: DeleteFolderDto,
+	) {
+		const { projectId, folderId } = req.params;
+
+		try {
+			await this.folderService.deleteFolder(folderId, projectId, payload);
+		} catch (e) {
+			if (e instanceof FolderNotFoundError) {
+				throw new NotFoundError(e.message);
+			}
+			throw new InternalServerError(undefined, e);
 		}
 	}
 }
diff --git a/packages/cli/src/databases/entities/folder.ts b/packages/cli/src/databases/entities/folder.ts
index 4e4eb94539..78e07a237e 100644
--- a/packages/cli/src/databases/entities/folder.ts
+++ b/packages/cli/src/databases/entities/folder.ts
@@ -22,7 +22,7 @@ export class Folder extends WithTimestampsAndStringId {
 	@Column()
 	name: string;
 
-	@ManyToOne(() => Folder, { nullable: true })
+	@ManyToOne(() => Folder, { nullable: true, onDelete: 'CASCADE' })
 	@JoinColumn({ name: 'parentFolderId' })
 	parentFolder: Folder | null;
 
diff --git a/packages/cli/src/databases/entities/workflow-entity.ts b/packages/cli/src/databases/entities/workflow-entity.ts
index 177fa4771c..d008159175 100644
--- a/packages/cli/src/databases/entities/workflow-entity.ts
+++ b/packages/cli/src/databases/entities/workflow-entity.ts
@@ -100,7 +100,7 @@ export class WorkflowEntity extends WithTimestampsAndStringId implements IWorkfl
 
 	@ManyToOne('Folder', 'workflows', {
 		nullable: true,
-		onDelete: 'SET NULL',
+		onDelete: 'CASCADE',
 	})
 	@JoinColumn({ name: 'parentFolderId' })
 	parentFolder: Folder | null;
diff --git a/packages/cli/src/databases/migrations/mysqldb/1740445074052-UpdateParentFolderIdColumn.ts b/packages/cli/src/databases/migrations/mysqldb/1740445074052-UpdateParentFolderIdColumn.ts
new file mode 100644
index 0000000000..31c5cf86f3
--- /dev/null
+++ b/packages/cli/src/databases/migrations/mysqldb/1740445074052-UpdateParentFolderIdColumn.ts
@@ -0,0 +1,14 @@
+import type { BaseMigration, MigrationContext } from '@/databases/types';
+
+export class UpdateParentFolderIdColumn1740445074052 implements BaseMigration {
+	async up({ escape, queryRunner }: MigrationContext) {
+		const workflowTableName = escape.tableName('workflow_entity');
+		const folderTableName = escape.tableName('folder');
+		const parentFolderIdColumn = escape.columnName('parentFolderId');
+		const idColumn = escape.columnName('id');
+
+		await queryRunner.query(
+			`ALTER TABLE ${workflowTableName} ADD CONSTRAINT fk_workflow_parent_folder FOREIGN KEY (${parentFolderIdColumn}) REFERENCES ${folderTableName}(${idColumn}) ON DELETE CASCADE`,
+		);
+	}
+}
diff --git a/packages/cli/src/databases/migrations/mysqldb/index.ts b/packages/cli/src/databases/migrations/mysqldb/index.ts
index 5e727487dd..01cda1ef2e 100644
--- a/packages/cli/src/databases/migrations/mysqldb/index.ts
+++ b/packages/cli/src/databases/migrations/mysqldb/index.ts
@@ -82,6 +82,7 @@ import { CreateTestCaseExecutionTable1736947513045 } from '../common/17369475130
 import { AddErrorColumnsToTestRuns1737715421462 } from '../common/1737715421462-AddErrorColumnsToTestRuns';
 import { CreateFolderTable1738709609940 } from '../common/1738709609940-CreateFolderTable';
 import { CreateAnalyticsTables1739549398681 } from '../common/1739549398681-CreateAnalyticsTables';
+import { UpdateParentFolderIdColumn1740445074052 } from '../mysqldb/1740445074052-UpdateParentFolderIdColumn';
 
 export const mysqlMigrations: Migration[] = [
 	InitialMigration1588157391238,
@@ -166,4 +167,5 @@ export const mysqlMigrations: Migration[] = [
 	CreateFolderTable1738709609940,
 	FixTestDefinitionPrimaryKey1739873751194,
 	CreateAnalyticsTables1739549398681,
+	UpdateParentFolderIdColumn1740445074052,
 ];
diff --git a/packages/cli/src/databases/migrations/postgresdb/1740445074052-UpdateParentFolderIdColumn.ts b/packages/cli/src/databases/migrations/postgresdb/1740445074052-UpdateParentFolderIdColumn.ts
new file mode 100644
index 0000000000..30088a3229
--- /dev/null
+++ b/packages/cli/src/databases/migrations/postgresdb/1740445074052-UpdateParentFolderIdColumn.ts
@@ -0,0 +1,36 @@
+import { UnexpectedError } from 'n8n-workflow';
+
+import type { BaseMigration, MigrationContext } from '@/databases/types';
+
+export class UpdateParentFolderIdColumn1740445074052 implements BaseMigration {
+	async up({
+		escape,
+		queryRunner,
+		schemaBuilder: { dropForeignKey },
+		tablePrefix,
+	}: MigrationContext) {
+		const workflowTableName = escape.tableName('workflow_entity');
+		const folderTableName = escape.tableName('folder');
+		const parentFolderIdColumn = escape.columnName('parentFolderId');
+		const idColumn = escape.columnName('id');
+
+		const workflowTable = await queryRunner.getTable(`${tablePrefix}workflow_entity`);
+
+		if (!workflowTable) throw new UnexpectedError('Table workflow_entity not found');
+
+		const foreignKey = workflowTable.foreignKeys.find(
+			(fk) =>
+				fk.columnNames.includes('parentFolderId') &&
+				fk.referencedTableName === `${tablePrefix}folder`,
+		);
+
+		if (!foreignKey)
+			throw new UnexpectedError('Foreign key in column parentFolderId was not found');
+
+		await dropForeignKey('workflow_entity', 'parentFolderId', ['folder', 'id'], foreignKey.name);
+
+		await queryRunner.query(
+			`ALTER TABLE ${workflowTableName} ADD CONSTRAINT fk_workflow_parent_folder FOREIGN KEY (${parentFolderIdColumn}) REFERENCES ${folderTableName}(${idColumn}) ON DELETE CASCADE`,
+		);
+	}
+}
diff --git a/packages/cli/src/databases/migrations/postgresdb/index.ts b/packages/cli/src/databases/migrations/postgresdb/index.ts
index 0d5d7d72bd..03d1368072 100644
--- a/packages/cli/src/databases/migrations/postgresdb/index.ts
+++ b/packages/cli/src/databases/migrations/postgresdb/index.ts
@@ -44,6 +44,7 @@ import { MigrateToTimestampTz1694091729095 } from './1694091729095-MigrateToTime
 import { AddActivatedAtUserSetting1717498465931 } from './1717498465931-AddActivatedAtUserSetting';
 import { FixExecutionMetadataSequence1721377157740 } from './1721377157740-FixExecutionMetadataSequence';
 import { MigrateTestDefinitionKeyToString1731582748663 } from './1731582748663-MigrateTestDefinitionKeyToString';
+import { UpdateParentFolderIdColumn1740445074052 } from './1740445074052-UpdateParentFolderIdColumn';
 import { CreateLdapEntities1674509946020 } from '../common/1674509946020-CreateLdapEntities';
 import { PurgeInvalidWorkflowConnections1675940580449 } from '../common/1675940580449-PurgeInvalidWorkflowConnections';
 import { RemoveResetPasswordColumns1690000000030 } from '../common/1690000000030-RemoveResetPasswordColumns';
@@ -164,4 +165,5 @@ export const postgresMigrations: Migration[] = [
 	AddErrorColumnsToTestRuns1737715421462,
 	CreateFolderTable1738709609940,
 	CreateAnalyticsTables1739549398681,
+	UpdateParentFolderIdColumn1740445074052,
 ];
diff --git a/packages/cli/src/databases/migrations/sqlite/1740445074052-UpdateParentFolderIdColumn.ts b/packages/cli/src/databases/migrations/sqlite/1740445074052-UpdateParentFolderIdColumn.ts
new file mode 100644
index 0000000000..634e6cac8a
--- /dev/null
+++ b/packages/cli/src/databases/migrations/sqlite/1740445074052-UpdateParentFolderIdColumn.ts
@@ -0,0 +1,61 @@
+import type { MigrationContext } from '@/databases/types';
+
+import type { UpdateParentFolderIdColumn1740445074052 as BaseMigration } from './1740445074052-UpdateParentFolderIdColumn';
+
+export class UpdateParentFolderIdColumn1740445074052 implements BaseMigration {
+	transaction = false as const;
+
+	async up({
+		queryRunner,
+		copyTable,
+		schemaBuilder: { createTable, column },
+		tablePrefix,
+	}: MigrationContext) {
+		await createTable('temp_workflow_entity')
+			.withColumns(
+				column('id').varchar(36).primary.notNull,
+				column('name').varchar(128).notNull,
+				column('active').bool.notNull,
+				column('nodes').json,
+				column('connections').json,
+				column('settings').json,
+				column('staticData').json,
+				column('pinData').json,
+				column('versionId').varchar(36),
+				column('triggerCount').int.default(0),
+				column('meta').json,
+				column('parentFolderId').varchar(36).default(null),
+			)
+			.withForeignKey('parentFolderId', {
+				tableName: 'folder',
+				columnName: 'id',
+				onDelete: 'CASCADE',
+			})
+			.withIndexOn(['name'], false).withTimestamps;
+
+		const columns = [
+			'id',
+			'name',
+			'active',
+			'nodes',
+			'connections',
+			'settings',
+			'staticData',
+			'pinData',
+			'versionId',
+			'triggerCount',
+			'meta',
+			'parentFolderId',
+			'createdAt',
+			'updatedAt',
+		];
+
+		await copyTable(`${tablePrefix}workflow_entity`, 'temp_workflow_entity', columns);
+
+		await queryRunner.query(`DROP TABLE "${tablePrefix}workflow_entity";`);
+
+		await queryRunner.query(
+			`ALTER TABLE "temp_workflow_entity" RENAME TO "${tablePrefix}workflow_entity";`,
+		);
+	}
+}
diff --git a/packages/cli/src/databases/migrations/sqlite/index.ts b/packages/cli/src/databases/migrations/sqlite/index.ts
index 73e1bc180c..c175d214c7 100644
--- a/packages/cli/src/databases/migrations/sqlite/index.ts
+++ b/packages/cli/src/databases/migrations/sqlite/index.ts
@@ -43,6 +43,7 @@ import { AddProjectIcons1729607673469 } from './1729607673469-AddProjectIcons';
 import { AddDescriptionToTestDefinition1731404028106 } from './1731404028106-AddDescriptionToTestDefinition';
 import { MigrateTestDefinitionKeyToString1731582748663 } from './1731582748663-MigrateTestDefinitionKeyToString';
 import { CreateFolderTable1738709609940 } from './1738709609940-CreateFolderTable';
+import { UpdateParentFolderIdColumn1740445074052 } from './1740445074052-UpdateParentFolderIdColumn';
 import { UniqueWorkflowNames1620821879465 } from '../common/1620821879465-UniqueWorkflowNames';
 import { UpdateWorkflowCredentials1630330987096 } from '../common/1630330987096-UpdateWorkflowCredentials';
 import { AddNodeIds1658930531669 } from '../common/1658930531669-AddNodeIds';
@@ -158,6 +159,7 @@ const sqliteMigrations: Migration[] = [
 	AddErrorColumnsToTestRuns1737715421462,
 	CreateFolderTable1738709609940,
 	CreateAnalyticsTables1739549398681,
+	UpdateParentFolderIdColumn1740445074052,
 ];
 
 export { sqliteMigrations };
diff --git a/packages/cli/src/databases/repositories/folder.repository.ts b/packages/cli/src/databases/repositories/folder.repository.ts
index bc210ac4d8..d0e3cb0c63 100644
--- a/packages/cli/src/databases/repositories/folder.repository.ts
+++ b/packages/cli/src/databases/repositories/folder.repository.ts
@@ -1,6 +1,7 @@
 import { Service } from '@n8n/di';
 import type { EntityManager, SelectQueryBuilder } from '@n8n/typeorm';
 import { DataSource, Repository } from '@n8n/typeorm';
+import { PROJECT_ROOT } from 'n8n-workflow';
 
 import type { ListQuery } from '@/requests';
 
@@ -152,7 +153,7 @@ export class FolderRepository extends Repository<FolderWithWorkflowCount> {
 			});
 		}
 
-		if (filter?.parentFolderId === '0') {
+		if (filter?.parentFolderId === PROJECT_ROOT) {
 			query.andWhere('folder.parentFolderId IS NULL');
 		} else if (filter?.parentFolderId) {
 			query.andWhere('folder.parentFolderId = :parentFolderId', {
@@ -242,4 +243,23 @@ export class FolderRepository extends Repository<FolderWithWorkflowCount> {
 			},
 		});
 	}
+
+	async moveAllToFolder(
+		fromFolderId: string,
+		toFolderId: string,
+		tx: EntityManager,
+	): Promise<void> {
+		await tx.update(
+			Folder,
+			{ parentFolder: { id: fromFolderId } },
+			{
+				parentFolder:
+					toFolderId === PROJECT_ROOT
+						? null
+						: {
+								id: toFolderId,
+							},
+			},
+		);
+	}
 }
diff --git a/packages/cli/src/databases/repositories/workflow.repository.ts b/packages/cli/src/databases/repositories/workflow.repository.ts
index e046ce21ba..b865aab28b 100644
--- a/packages/cli/src/databases/repositories/workflow.repository.ts
+++ b/packages/cli/src/databases/repositories/workflow.repository.ts
@@ -8,7 +8,9 @@ import type {
 	FindOptionsSelect,
 	FindManyOptions,
 	FindOptionsRelations,
+	EntityManager,
 } from '@n8n/typeorm';
+import { PROJECT_ROOT } from 'n8n-workflow';
 
 import type { ListQuery } from '@/requests';
 import { isStringArray } from '@/utils';
@@ -394,7 +396,7 @@ export class WorkflowRepository extends Repository<WorkflowEntity> {
 		qb: SelectQueryBuilder<WorkflowEntity>,
 		filter: ListQuery.Options['filter'],
 	): void {
-		if (filter?.parentFolderId === '0') {
+		if (filter?.parentFolderId === PROJECT_ROOT) {
 			qb.andWhere('workflow.parentFolderId IS NULL');
 		} else if (filter?.parentFolderId) {
 			qb.andWhere('workflow.parentFolderId = :parentFolderId', {
@@ -611,4 +613,16 @@ export class WorkflowRepository extends Repository<WorkflowEntity> {
 	async findByActiveState(activeState: boolean) {
 		return await this.findBy({ active: activeState });
 	}
+
+	async moveAllToFolder(fromFolderId: string, toFolderId: string, tx: EntityManager) {
+		await tx.update(
+			WorkflowEntity,
+			{ parentFolder: { id: fromFolderId } },
+			{
+				parentFolder: {
+					id: toFolderId,
+				},
+			},
+		);
+	}
 }
diff --git a/packages/cli/src/permissions.ee/project-roles.ts b/packages/cli/src/permissions.ee/project-roles.ts
index cd5f285e2f..f642d4b252 100644
--- a/packages/cli/src/permissions.ee/project-roles.ts
+++ b/packages/cli/src/permissions.ee/project-roles.ts
@@ -28,6 +28,7 @@ export const REGULAR_PROJECT_ADMIN_SCOPES: Scope[] = [
 	'folder:create',
 	'folder:read',
 	'folder:update',
+	'folder:delete',
 ];
 
 export const PERSONAL_PROJECT_OWNER_SCOPES: Scope[] = [
@@ -51,6 +52,7 @@ export const PERSONAL_PROJECT_OWNER_SCOPES: Scope[] = [
 	'folder:create',
 	'folder:read',
 	'folder:update',
+	'folder:delete',
 ];
 
 export const PROJECT_EDITOR_SCOPES: Scope[] = [
@@ -70,6 +72,7 @@ export const PROJECT_EDITOR_SCOPES: Scope[] = [
 	'folder:create',
 	'folder:read',
 	'folder:update',
+	'folder:delete',
 ];
 
 export const PROJECT_VIEWER_SCOPES: Scope[] = [
diff --git a/packages/cli/src/services/folder.service.ts b/packages/cli/src/services/folder.service.ts
index f3caacdd92..2a7512f9bc 100644
--- a/packages/cli/src/services/folder.service.ts
+++ b/packages/cli/src/services/folder.service.ts
@@ -1,10 +1,12 @@
-import type { CreateFolderDto, UpdateFolderDto } from '@n8n/api-types';
+import type { CreateFolderDto, DeleteFolderDto, UpdateFolderDto } from '@n8n/api-types';
 import { Service } from '@n8n/di';
 // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
 import type { EntityManager } from '@n8n/typeorm';
 
+import { Folder } from '@/databases/entities/folder';
 import { FolderTagMappingRepository } from '@/databases/repositories/folder-tag-mapping.repository';
 import { FolderRepository } from '@/databases/repositories/folder.repository';
+import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
 import { FolderNotFoundError } from '@/errors/folder-not-found.error';
 
 export interface SimpleFolderNode {
@@ -24,12 +26,13 @@ export class FolderService {
 	constructor(
 		private readonly folderRepository: FolderRepository,
 		private readonly folderTagMappingRepository: FolderTagMappingRepository,
+		private readonly workflowRepository: WorkflowRepository,
 	) {}
 
 	async createFolder({ parentFolderId, name }: CreateFolderDto, projectId: string) {
 		let parentFolder = null;
 		if (parentFolderId) {
-			parentFolder = await this.getFolderInProject(parentFolderId, projectId);
+			parentFolder = await this.findFolderInProjectOrFail(parentFolderId, projectId);
 		}
 
 		const folderEntity = this.folderRepository.create({
@@ -44,7 +47,7 @@ export class FolderService {
 	}
 
 	async updateFolder(folderId: string, projectId: string, { name, tagIds }: UpdateFolderDto) {
-		await this.getFolderInProject(folderId, projectId);
+		await this.findFolderInProjectOrFail(folderId, projectId);
 		if (name) {
 			await this.folderRepository.update({ id: folderId }, { name });
 		}
@@ -53,7 +56,7 @@ export class FolderService {
 		}
 	}
 
-	async getFolderInProject(folderId: string, projectId: string, em?: EntityManager) {
+	async findFolderInProjectOrFail(folderId: string, projectId: string, em?: EntityManager) {
 		try {
 			return await this.folderRepository.findOneOrFailFolderInProject(folderId, projectId, em);
 		} catch {
@@ -62,7 +65,7 @@ export class FolderService {
 	}
 
 	async getFolderTree(folderId: string, projectId: string): Promise<SimpleFolderNode[]> {
-		await this.getFolderInProject(folderId, projectId);
+		await this.findFolderInProjectOrFail(folderId, projectId);
 
 		const escapedParentFolderId = this.folderRepository
 			.createQueryBuilder()
@@ -103,6 +106,24 @@ export class FolderService {
 		return this.transformFolderPathToTree(result);
 	}
 
+	async deleteFolder(folderId: string, projectId: string, { transferToFolderId }: DeleteFolderDto) {
+		await this.findFolderInProjectOrFail(folderId, projectId);
+
+		if (!transferToFolderId) {
+			await this.folderRepository.delete({ id: folderId });
+			return;
+		}
+
+		await this.findFolderInProjectOrFail(transferToFolderId, projectId);
+
+		return await this.folderRepository.manager.transaction(async (tx) => {
+			await this.folderRepository.moveAllToFolder(folderId, transferToFolderId, tx);
+			await this.workflowRepository.moveAllToFolder(folderId, transferToFolderId, tx);
+			await tx.delete(Folder, { id: folderId });
+			return;
+		});
+	}
+
 	private transformFolderPathToTree(flatPath: FolderPathRow[]): SimpleFolderNode[] {
 		if (!flatPath || flatPath.length === 0) {
 			return [];
diff --git a/packages/cli/src/workflows/workflows.controller.ts b/packages/cli/src/workflows/workflows.controller.ts
index 79cdef3409..0744f3c5c4 100644
--- a/packages/cli/src/workflows/workflows.controller.ts
+++ b/packages/cli/src/workflows/workflows.controller.ts
@@ -159,7 +159,7 @@ export class WorkflowsController {
 
 			if (parentFolderId) {
 				try {
-					const parentFolder = await this.folderService.getFolderInProject(
+					const parentFolder = await this.folderService.findFolderInProjectOrFail(
 						parentFolderId,
 						project.id,
 						transactionManager,
diff --git a/packages/cli/test/integration/folder/folder.controller.test.ts b/packages/cli/test/integration/folder/folder.controller.test.ts
index 8f0454ac38..9935f4ec2d 100644
--- a/packages/cli/test/integration/folder/folder.controller.test.ts
+++ b/packages/cli/test/integration/folder/folder.controller.test.ts
@@ -3,8 +3,10 @@ import { Container } from '@n8n/di';
 import type { User } from '@/databases/entities/user';
 import { FolderRepository } from '@/databases/repositories/folder.repository';
 import { ProjectRepository } from '@/databases/repositories/project.repository';
+import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
 import { createFolder } from '@test-integration/db/folders';
 import { createTag } from '@test-integration/db/tags';
+import { createWorkflow } from '@test-integration/db/workflows';
 
 import { createTeamProject, linkUserToProject } from '../shared/db/projects';
 import { createOwner, createMember } from '../shared/db/users';
@@ -23,12 +25,14 @@ const testServer = utils.setupTestServer({
 
 let projectRepository: ProjectRepository;
 let folderRepository: FolderRepository;
+let workflowRepository: WorkflowRepository;
 
 beforeEach(async () => {
 	await testDb.truncate(['Folder', 'SharedWorkflow', 'Tag', 'Project', 'ProjectRelation']);
 
 	projectRepository = Container.get(ProjectRepository);
 	folderRepository = Container.get(FolderRepository);
+	workflowRepository = Container.get(WorkflowRepository);
 
 	owner = await createOwner();
 	member = await createMember();
@@ -463,3 +467,205 @@ describe('PATCH /projects/:projectId/folders/:folderId', () => {
 		expect(folderWithTags?.tags[0].id).toBe(tag3.id);
 	});
 });
+
+describe('DELETE /projects/:projectId/folders/:folderId', () => {
+	test('should not delete folder when project does not exist', async () => {
+		await authOwnerAgent
+			.delete('/projects/non-existing-id/folders/some-folder-id')
+			.send({})
+			.expect(403);
+	});
+
+	test('should not delete folder when folder does not exist', async () => {
+		const project = await createTeamProject('test project', owner);
+
+		await authOwnerAgent
+			.delete(`/projects/${project.id}/folders/non-existing-folder`)
+			.send({})
+			.expect(404);
+	});
+
+	test('should not delete folder if user has project:viewer role in team project', async () => {
+		const project = await createTeamProject(undefined, owner);
+		const folder = await createFolder(project);
+		await linkUserToProject(member, project, 'project:viewer');
+
+		await authMemberAgent
+			.delete(`/projects/${project.id}/folders/${folder.id}`)
+			.send({})
+			.expect(403);
+
+		const folderInDb = await folderRepository.findOneBy({ id: folder.id });
+		expect(folderInDb).toBeDefined();
+	});
+
+	test("should not allow deleting folder in another user's personal project", async () => {
+		const ownerPersonalProject = await projectRepository.getPersonalProjectForUserOrFail(owner.id);
+		const folder = await createFolder(ownerPersonalProject);
+
+		await authMemberAgent
+			.delete(`/projects/${ownerPersonalProject.id}/folders/${folder.id}`)
+			.send({})
+			.expect(403);
+
+		const folderInDb = await folderRepository.findOneBy({ id: folder.id });
+		expect(folderInDb).toBeDefined();
+	});
+
+	test('should delete folder if user has project:editor role in team project', async () => {
+		const project = await createTeamProject(undefined, owner);
+		const folder = await createFolder(project);
+		await linkUserToProject(member, project, 'project:editor');
+
+		await authMemberAgent
+			.delete(`/projects/${project.id}/folders/${folder.id}`)
+			.send({})
+			.expect(200);
+
+		const folderInDb = await folderRepository.findOneBy({ id: folder.id });
+		expect(folderInDb).toBeNull();
+	});
+
+	test('should delete folder if user has project:admin role in team project', async () => {
+		const project = await createTeamProject(undefined, owner);
+		const folder = await createFolder(project);
+
+		await authOwnerAgent
+			.delete(`/projects/${project.id}/folders/${folder.id}`)
+			.send({})
+			.expect(200);
+
+		const folderInDb = await folderRepository.findOneBy({ id: folder.id });
+		expect(folderInDb).toBeNull();
+	});
+
+	test('should delete folder in personal project', async () => {
+		const personalProject = await projectRepository.getPersonalProjectForUserOrFail(owner.id);
+		const folder = await createFolder(personalProject);
+
+		await authOwnerAgent
+			.delete(`/projects/${personalProject.id}/folders/${folder.id}`)
+			.send({})
+			.expect(200);
+
+		const folderInDb = await folderRepository.findOneBy({ id: folder.id });
+		expect(folderInDb).toBeNull();
+	});
+
+	test('should delete folder, all child folders, and contained workflows when no transfer folder is specified', async () => {
+		const project = await createTeamProject('test', owner);
+		const rootFolder = await createFolder(project, { name: 'Root' });
+		const childFolder = await createFolder(project, {
+			name: 'Child',
+			parentFolder: rootFolder,
+		});
+
+		// Create workflows in the folders
+		const workflow1 = await createWorkflow({ parentFolder: rootFolder }, owner);
+
+		const workflow2 = await createWorkflow({ parentFolder: childFolder }, owner);
+
+		await authOwnerAgent.delete(`/projects/${project.id}/folders/${rootFolder.id}`);
+
+		// Check folders
+		const rootFolderInDb = await folderRepository.findOneBy({ id: rootFolder.id });
+		const childFolderInDb = await folderRepository.findOneBy({ id: childFolder.id });
+
+		expect(rootFolderInDb).toBeNull();
+		expect(childFolderInDb).toBeNull();
+
+		// Check workflows
+		const workflow1InDb = await workflowRepository.findOneBy({ id: workflow1.id });
+		const workflow2InDb = await workflowRepository.findOneBy({ id: workflow2.id });
+		expect(workflow1InDb).toBeNull();
+		expect(workflow2InDb).toBeNull();
+	});
+
+	test('should transfer folder contents when transferToFolderId is specified', async () => {
+		const project = await createTeamProject('test', owner);
+		const sourceFolder = await createFolder(project, { name: 'Source' });
+		const targetFolder = await createFolder(project, { name: 'Target' });
+		const childFolder = await createFolder(project, {
+			name: 'Child',
+			parentFolder: sourceFolder,
+		});
+
+		const workflow1 = await createWorkflow({ parentFolder: sourceFolder }, owner);
+
+		const workflow2 = await createWorkflow({ parentFolder: childFolder }, owner);
+
+		const payload = {
+			transferToFolderId: targetFolder.id,
+		};
+
+		await authOwnerAgent
+			.delete(`/projects/${project.id}/folders/${sourceFolder.id}`)
+			.send(payload)
+			.expect(200);
+
+		const sourceFolderInDb = await folderRepository.findOne({
+			where: { id: sourceFolder.id },
+			relations: ['parentFolder'],
+		});
+		const childFolderInDb = await folderRepository.findOne({
+			where: { id: childFolder.id },
+			relations: ['parentFolder'],
+		});
+
+		// Check folders
+		expect(sourceFolderInDb).toBeNull();
+		expect(childFolderInDb).toBeDefined();
+		expect(childFolderInDb?.parentFolder?.id).toBe(targetFolder.id);
+
+		// Check workflows
+		const workflow1InDb = await workflowRepository.findOne({
+			where: { id: workflow1.id },
+			relations: ['parentFolder'],
+		});
+		expect(workflow1InDb).toBeDefined();
+		expect(workflow1InDb?.parentFolder?.id).toBe(targetFolder.id);
+
+		const workflow2InDb = await workflowRepository.findOne({
+			where: { id: workflow2.id },
+			relations: ['parentFolder'],
+		});
+		expect(workflow2InDb).toBeDefined();
+		expect(workflow2InDb?.parentFolder?.id).toBe(childFolder.id);
+	});
+
+	test('should not transfer folder contents when transfer folder does not exist', async () => {
+		const project = await createTeamProject('test', owner);
+		const folder = await createFolder(project);
+
+		const payload = {
+			transferToFolderId: 'non-existing-folder',
+		};
+
+		await authOwnerAgent
+			.delete(`/projects/${project.id}/folders/${folder.id}`)
+			.send(payload)
+			.expect(404);
+
+		const folderInDb = await folderRepository.findOneBy({ id: folder.id });
+		expect(folderInDb).toBeDefined();
+	});
+
+	test('should not transfer folder contents when transfer folder is in another project', async () => {
+		const project1 = await createTeamProject('Project 1', owner);
+		const project2 = await createTeamProject('Project 2', owner);
+		const sourceFolder = await createFolder(project1);
+		const targetFolder = await createFolder(project2);
+
+		const payload = {
+			transferToFolderId: targetFolder.id,
+		};
+
+		await authOwnerAgent
+			.delete(`/projects/${project1.id}/folders/${sourceFolder.id}`)
+			.send(payload)
+			.expect(404);
+
+		const folderInDb = await folderRepository.findOneBy({ id: sourceFolder.id });
+		expect(folderInDb).toBeDefined();
+	});
+});
diff --git a/packages/workflow/src/Constants.ts b/packages/workflow/src/Constants.ts
index 59e3c47d47..0dec1b5838 100644
--- a/packages/workflow/src/Constants.ts
+++ b/packages/workflow/src/Constants.ts
@@ -101,3 +101,5 @@ export const FREE_AI_CREDITS_ERROR_TYPE = 'free_ai_credits_request_error';
 export const FREE_AI_CREDITS_USED_ALL_CREDITS_ERROR_CODE = 400;
 
 export const FROM_AI_AUTO_GENERATED_MARKER = '/*n8n-auto-generated-fromAI-override*/';
+
+export const PROJECT_ROOT = '0';

From 1c5f1cab37972da60e7f304c7667b04a0d5f0024 Mon Sep 17 00:00:00 2001
From: Csaba Tuncsik <csaba@n8n.io>
Date: Fri, 28 Feb 2025 07:10:09 +0100
Subject: [PATCH 36/47] fix(editor): Fix and re-enable e2e test (no-changelog)
 (#13535)

---
 cypress/e2e/39-projects.cy.ts                 | 27 +++++++++----------
 cypress/pages/notifications.ts                |  8 +++---
 .../editor-ui/src/stores/projects.store.ts    |  3 ---
 3 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/cypress/e2e/39-projects.cy.ts b/cypress/e2e/39-projects.cy.ts
index 09b9c2bb65..d8c618539f 100644
--- a/cypress/e2e/39-projects.cy.ts
+++ b/cypress/e2e/39-projects.cy.ts
@@ -54,11 +54,7 @@ describe('Projects', { disableAutoLogin: true }, () => {
 			cy.changeQuota('maxTeamProjects', -1);
 		});
 
-		/**
-		 * @TODO: New Canvas - Fix this test
-		 */
-		// eslint-disable-next-line n8n-local-rules/no-skipped-tests
-		it.skip('should filter credentials by project ID when creating new workflow or hard reloading an opened workflow', () => {
+		it('should filter credentials by project ID when creating new workflow or hard reloading an opened workflow', () => {
 			cy.signinAsOwner();
 			cy.visit(workflowsPage.url);
 
@@ -453,6 +449,8 @@ describe('Projects', { disableAutoLogin: true }, () => {
 		});
 
 		it('should allow to change inaccessible credential when the workflow was moved to a team project', () => {
+			cy.intercept('GET', /\/rest\/(workflows|credentials).*/).as('getResources');
+
 			cy.signinAsOwner();
 			cy.visit(workflowsPage.url);
 
@@ -474,15 +472,14 @@ describe('Projects', { disableAutoLogin: true }, () => {
 			// Create a project and add a user to it
 			projects.createProject('Project 1');
 			projects.addProjectMember(INSTANCE_MEMBERS[0].email);
+
+			clearNotifications();
 			projects.getProjectSettingsSaveButton().click();
 
 			// Move the workflow from Home to Project 1
 			projects.getHomeButton().click();
-			workflowsPage.getters
-				.workflowCards()
-				.should('have.length', 1)
-				.filter(':contains("Personal")')
-				.should('exist');
+			workflowsPage.getters.workflowCards().should('have.length', 1);
+			workflowsPage.getters.workflowCards().filter(':contains("Personal")').should('exist');
 			workflowsPage.getters.workflowCardActions('My workflow').click();
 			workflowsPage.getters.workflowMoveButton().click();
 
@@ -492,13 +489,13 @@ describe('Projects', { disableAutoLogin: true }, () => {
 				.contains('button', 'Move workflow')
 				.should('be.disabled');
 			projects.getProjectMoveSelect().click();
-			getVisibleSelect()
-				.find('li')
-				.should('have.length', 4)
-				.filter(':contains("Project 1")')
-				.click();
+			getVisibleSelect().find('li').should('have.length', 4);
+			getVisibleSelect().find('li').filter(':contains("Project 1")').click();
 			projects.getResourceMoveModal().contains('button', 'Move workflow').click();
 
+			clearNotifications();
+			cy.wait('@getResources');
+
 			workflowsPage.getters
 				.workflowCards()
 				.should('have.length', 1)
diff --git a/cypress/pages/notifications.ts b/cypress/pages/notifications.ts
index 46db264633..2c3648355a 100644
--- a/cypress/pages/notifications.ts
+++ b/cypress/pages/notifications.ts
@@ -16,9 +16,11 @@ export const clearNotifications = () => {
 	const notificationSelector = '.el-notification:has(.el-notification--success)';
 	cy.get('body').then(($body) => {
 		if ($body.find(notificationSelector).length) {
-			cy.get(notificationSelector)
-				.find('.el-notification__closeBtn')
-				.click({ multiple: true, force: true });
+			cy.get(notificationSelector).each(($el) => {
+				if ($el.find('.el-notification__closeBtn').length) {
+					cy.wrap($el).find('.el-notification__closeBtn').click({ force: true });
+				}
+			});
 		}
 	});
 };
diff --git a/packages/editor-ui/src/stores/projects.store.ts b/packages/editor-ui/src/stores/projects.store.ts
index 0183236517..ee882e1dff 100644
--- a/packages/editor-ui/src/stores/projects.store.ts
+++ b/packages/editor-ui/src/stores/projects.store.ts
@@ -10,7 +10,6 @@ import { ProjectTypes } from '@/types/projects.types';
 import { useSettingsStore } from '@/stores/settings.store';
 import { hasPermission } from '@/utils/rbac/permissions';
 import type { IWorkflowDb } from '@/Interface';
-import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useCredentialsStore } from '@/stores/credentials.store';
 import { STORES } from '@/constants';
 import { useUsersStore } from '@/stores/users.store';
@@ -21,7 +20,6 @@ export const useProjectsStore = defineStore(STORES.PROJECTS, () => {
 	const route = useRoute();
 	const rootStore = useRootStore();
 	const settingsStore = useSettingsStore();
-	const workflowsStore = useWorkflowsStore();
 	const credentialsStore = useCredentialsStore();
 	const usersStore = useUsersStore();
 
@@ -168,7 +166,6 @@ export const useProjectsStore = defineStore(STORES.PROJECTS, () => {
 				destinationProjectId: projectId,
 				shareCredentials,
 			});
-			await workflowsStore.fetchAllWorkflows(currentProjectId.value);
 		} else {
 			await credentialsEEApi.moveCredentialToProject(
 				rootStore.restApiContext,

From 90d09431af97570a3a6adfb0470a18681af28001 Mon Sep 17 00:00:00 2001
From: Jaakko Husso <jaakko@n8n.io>
Date: Fri, 28 Feb 2025 09:07:07 +0200
Subject: [PATCH 37/47] fix(editor): Fix icon color on 'Call n8n Workflow Tool'
 node (#13568)

---
 .../nodes/tools/ToolWorkflow/ToolWorkflow.node.ts               | 1 +
 .../nodes/tools/ToolWorkflow/v1/versionDescription.ts           | 2 --
 .../nodes/tools/ToolWorkflow/v2/versionDescription.ts           | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/ToolWorkflow.node.ts b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/ToolWorkflow.node.ts
index de7abf6a8b..109a090259 100644
--- a/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/ToolWorkflow.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/ToolWorkflow.node.ts
@@ -10,6 +10,7 @@ export class ToolWorkflow extends VersionedNodeType {
 			displayName: 'Call n8n Sub-Workflow Tool',
 			name: 'toolWorkflow',
 			icon: 'fa:network-wired',
+			iconColor: 'black',
 			group: ['transform'],
 			description:
 				'Uses another n8n workflow as a tool. Allows packaging any n8n node(s) as a tool.',
diff --git a/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v1/versionDescription.ts b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v1/versionDescription.ts
index da7a0e9815..f46ef05c0d 100644
--- a/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v1/versionDescription.ts
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v1/versionDescription.ts
@@ -13,8 +13,6 @@ import { getConnectionHintNoticeField } from '../../../../utils/sharedFields';
 export const versionDescription: INodeTypeDescription = {
 	displayName: 'Call n8n Workflow Tool',
 	name: 'toolWorkflow',
-	icon: 'fa:network-wired',
-	iconColor: 'black',
 	group: ['transform'],
 	version: [1, 1.1, 1.2, 1.3],
 	description: 'Uses another n8n workflow as a tool. Allows packaging any n8n node(s) as a tool.',
diff --git a/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/versionDescription.ts b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/versionDescription.ts
index 6d4275b449..46fb3d1677 100644
--- a/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/versionDescription.ts
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/versionDescription.ts
@@ -7,7 +7,6 @@ import { getConnectionHintNoticeField } from '../../../../utils/sharedFields';
 export const versionDescription: INodeTypeDescription = {
 	displayName: 'Call n8n Workflow Tool',
 	name: 'toolWorkflow',
-	icon: 'fa:network-wired',
 	group: ['transform'],
 	description: 'Uses another n8n workflow as a tool. Allows packaging any n8n node(s) as a tool.',
 	defaults: {

From d550382a4a43c54cae47e9071236aa18efe38a5d Mon Sep 17 00:00:00 2001
From: autologie <suguru@n8n.io>
Date: Fri, 28 Feb 2025 09:21:44 +0100
Subject: [PATCH 38/47] fix(editor): Don't show duplicate logs when tree is
 deeply nested (#13537)

---
 .../src/components/RunDataAi/RunDataAi.vue    | 142 ++--------------
 .../src/components/RunDataAi/utils.test.ts    |  95 +++++++++++
 .../src/components/RunDataAi/utils.ts         | 160 ++++++++++++++++++
 3 files changed, 270 insertions(+), 127 deletions(-)
 create mode 100644 packages/editor-ui/src/components/RunDataAi/utils.test.ts
 create mode 100644 packages/editor-ui/src/components/RunDataAi/utils.ts

diff --git a/packages/editor-ui/src/components/RunDataAi/RunDataAi.vue b/packages/editor-ui/src/components/RunDataAi/RunDataAi.vue
index 2f90ca0faa..2094586c16 100644
--- a/packages/editor-ui/src/components/RunDataAi/RunDataAi.vue
+++ b/packages/editor-ui/src/components/RunDataAi/RunDataAi.vue
@@ -1,28 +1,22 @@
 <script lang="ts" setup>
 import type { Ref } from 'vue';
 import { computed, ref, watch } from 'vue';
-import type { ITaskDataConnections, NodeConnectionType, Workflow, ITaskData } from 'n8n-workflow';
-import type { IAiData, IAiDataContent, INodeUi } from '@/Interface';
+import {
+	type AIResult,
+	createAiData,
+	getReferencedData,
+	getTreeNodeData,
+	type TreeNode,
+} from '@/components/RunDataAi/utils';
+import type { IAiData, INodeUi } from '@/Interface';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import NodeIcon from '@/components/NodeIcon.vue';
 import RunDataAiContent from './RunDataAiContent.vue';
 import { ElTree } from 'element-plus';
 import { useI18n } from '@/composables/useI18n';
+import type { Workflow } from 'n8n-workflow';
 
-interface AIResult {
-	node: string;
-	runIndex: number;
-	data: IAiDataContent | undefined;
-}
-interface TreeNode {
-	node: string;
-	id: string;
-	children: TreeNode[];
-	depth: number;
-	startTime: number;
-	runIndex: number;
-}
 export interface Props {
 	node: INodeUi;
 	runIndex?: number;
@@ -40,46 +34,6 @@ function isTreeNodeSelected(node: TreeNode) {
 	return selectedRun.value.some((run) => run.node === node.node && run.runIndex === node.runIndex);
 }
 
-function getReferencedData(
-	taskData: ITaskData,
-	withInput: boolean,
-	withOutput: boolean,
-): IAiDataContent[] {
-	if (!taskData) {
-		return [];
-	}
-
-	const returnData: IAiDataContent[] = [];
-
-	function addFunction(data: ITaskDataConnections | undefined, inOut: 'input' | 'output') {
-		if (!data) {
-			return;
-		}
-
-		Object.keys(data).map((type) => {
-			returnData.push({
-				data: data[type][0],
-				inOut,
-				type: type as NodeConnectionType,
-				metadata: {
-					executionTime: taskData.executionTime,
-					startTime: taskData.startTime,
-					subExecution: taskData.metadata?.subExecution,
-				},
-			});
-		});
-	}
-
-	if (withInput) {
-		addFunction(taskData.inputOverride, 'input');
-	}
-	if (withOutput) {
-		addFunction(taskData.data, 'output');
-	}
-
-	return returnData;
-}
-
 function toggleTreeItem(node: { expanded: boolean }) {
 	node.expanded = !node.expanded;
 }
@@ -125,79 +79,13 @@ function selectFirst() {
 	}
 }
 
-const createNode = (
-	nodeName: string,
-	currentDepth: number,
-	r?: AIResult,
-	children: TreeNode[] = [],
-): TreeNode => ({
-	node: nodeName,
-	id: nodeName,
-	depth: currentDepth,
-	startTime: r?.data?.metadata?.startTime ?? 0,
-	runIndex: r?.runIndex ?? 0,
-	children,
-});
+const aiData = computed<AIResult[]>(() =>
+	createAiData(props.node.name, props.workflow, workflowsStore.getWorkflowResultDataByNodeName),
+);
 
-function getTreeNodeData(nodeName: string, currentDepth: number): TreeNode[] {
-	const connections = props.workflow.connectionsByDestinationNode[nodeName];
-	const resultData = aiData.value?.filter((data) => data.node === nodeName) ?? [];
-
-	if (!connections) {
-		return resultData.map((d) => createNode(nodeName, currentDepth, d));
-	}
-
-	// Get the first level of children
-	const connectedSubNodes = props.workflow.getParentNodes(nodeName, 'ALL_NON_MAIN', 1);
-
-	const children = connectedSubNodes
-		// Only include sub-nodes which have data
-		.filter((name) => aiData.value?.find((data) => data.node === name))
-		.flatMap((name) => getTreeNodeData(name, currentDepth + 1));
-
-	children.sort((a, b) => a.startTime - b.startTime);
-
-	if (resultData.length) {
-		return resultData.map((r) => createNode(nodeName, currentDepth, r, children));
-	}
-
-	return [createNode(nodeName, currentDepth, undefined, children)];
-}
-
-const aiData = computed<AIResult[]>(() => {
-	const result: AIResult[] = [];
-	const connectedSubNodes = props.workflow.getParentNodes(props.node.name, 'ALL_NON_MAIN');
-
-	connectedSubNodes.forEach((nodeName) => {
-		const nodeRunData = workflowsStore.getWorkflowResultDataByNodeName(nodeName) ?? [];
-
-		nodeRunData.forEach((run, runIndex) => {
-			const referenceData = {
-				data: getReferencedData(run, false, true)[0],
-				node: nodeName,
-				runIndex,
-			};
-
-			result.push(referenceData);
-		});
-	});
-
-	// Sort the data by start time
-	result.sort((a, b) => {
-		const aTime = a.data?.metadata?.startTime ?? 0;
-		const bTime = b.data?.metadata?.startTime ?? 0;
-		return aTime - bTime;
-	});
-
-	return result;
-});
-
-const executionTree = computed<TreeNode[]>(() => {
-	const rootNode = props.node;
-
-	const tree = getTreeNodeData(rootNode.name, 0);
-	return tree || [];
-});
+const executionTree = computed<TreeNode[]>(() =>
+	getTreeNodeData(props.node.name, props.workflow, aiData.value),
+);
 
 watch(() => props.runIndex, selectFirst, { immediate: true });
 </script>
diff --git a/packages/editor-ui/src/components/RunDataAi/utils.test.ts b/packages/editor-ui/src/components/RunDataAi/utils.test.ts
new file mode 100644
index 0000000000..17573fc019
--- /dev/null
+++ b/packages/editor-ui/src/components/RunDataAi/utils.test.ts
@@ -0,0 +1,95 @@
+import { createTestNode, createTestWorkflowObject } from '@/__tests__/mocks';
+import { createAiData, getTreeNodeData } from '@/components/RunDataAi/utils';
+import { type ITaskData, NodeConnectionType } from 'n8n-workflow';
+
+describe(getTreeNodeData, () => {
+	function createTaskData(partialData: Partial<ITaskData>): ITaskData {
+		return {
+			startTime: 0,
+			executionTime: 1,
+			source: [],
+			executionStatus: 'success',
+			data: { main: [[{ json: {} }]] },
+			...partialData,
+		};
+	}
+
+	it('should generate one node per execution', () => {
+		const workflow = createTestWorkflowObject({
+			nodes: [
+				createTestNode({ name: 'A' }),
+				createTestNode({ name: 'B' }),
+				createTestNode({ name: 'C' }),
+			],
+			connections: {
+				B: { ai_tool: [[{ node: 'A', type: NodeConnectionType.AiTool, index: 0 }]] },
+				C: {
+					ai_languageModel: [[{ node: 'B', type: NodeConnectionType.AiLanguageModel, index: 0 }]],
+				},
+			},
+		});
+		const taskDataByNodeName: Record<string, ITaskData[]> = {
+			A: [createTaskData({ startTime: +new Date('2025-02-26T00:00:00.000Z') })],
+			B: [
+				createTaskData({ startTime: +new Date('2025-02-26T00:00:01.000Z') }),
+				createTaskData({ startTime: +new Date('2025-02-26T00:00:03.000Z') }),
+			],
+			C: [
+				createTaskData({ startTime: +new Date('2025-02-26T00:00:02.000Z') }),
+				createTaskData({ startTime: +new Date('2025-02-26T00:00:04.000Z') }),
+			],
+		};
+
+		expect(
+			getTreeNodeData(
+				'A',
+				workflow,
+				createAiData('A', workflow, (name) => taskDataByNodeName[name] ?? null),
+			),
+		).toEqual([
+			{
+				depth: 0,
+				id: 'A',
+				node: 'A',
+				runIndex: 0,
+				startTime: 0,
+				children: [
+					{
+						depth: 1,
+						id: 'B',
+						node: 'B',
+						runIndex: 0,
+						startTime: +new Date('2025-02-26T00:00:01.000Z'),
+						children: [
+							{
+								children: [],
+								depth: 2,
+								id: 'C',
+								node: 'C',
+								runIndex: 0,
+								startTime: +new Date('2025-02-26T00:00:02.000Z'),
+							},
+						],
+					},
+					{
+						depth: 1,
+						id: 'B',
+						node: 'B',
+						runIndex: 1,
+						startTime: +new Date('2025-02-26T00:00:03.000Z'),
+						children: [
+							{
+								children: [],
+								depth: 2,
+								id: 'C',
+								node: 'C',
+								runIndex: 1,
+								startTime: +new Date('2025-02-26T00:00:04.000Z'),
+							},
+						],
+					},
+				],
+			},
+		]);
+	});
+});
diff --git a/packages/editor-ui/src/components/RunDataAi/utils.ts b/packages/editor-ui/src/components/RunDataAi/utils.ts
new file mode 100644
index 0000000000..9c8dbb43db
--- /dev/null
+++ b/packages/editor-ui/src/components/RunDataAi/utils.ts
@@ -0,0 +1,160 @@
+import { type IAiDataContent } from '@/Interface';
+import {
+	type ITaskData,
+	type ITaskDataConnections,
+	type NodeConnectionType,
+	type Workflow,
+} from 'n8n-workflow';
+
+export interface AIResult {
+	node: string;
+	runIndex: number;
+	data: IAiDataContent | undefined;
+}
+
+export interface TreeNode {
+	node: string;
+	id: string;
+	children: TreeNode[];
+	depth: number;
+	startTime: number;
+	runIndex: number;
+}
+
+function createNode(
+	nodeName: string,
+	currentDepth: number,
+	r?: AIResult,
+	children: TreeNode[] = [],
+): TreeNode {
+	return {
+		node: nodeName,
+		id: nodeName,
+		depth: currentDepth,
+		startTime: r?.data?.metadata?.startTime ?? 0,
+		runIndex: r?.runIndex ?? 0,
+		children,
+	};
+}
+
+export function getTreeNodeData(
+	nodeName: string,
+	workflow: Workflow,
+	aiData: AIResult[] | undefined,
+): TreeNode[] {
+	return getTreeNodeDataRec(nodeName, 0, workflow, aiData, undefined);
+}
+
+function getTreeNodeDataRec(
+	nodeName: string,
+	currentDepth: number,
+	workflow: Workflow,
+	aiData: AIResult[] | undefined,
+	runIndex: number | undefined,
+): TreeNode[] {
+	const connections = workflow.connectionsByDestinationNode[nodeName];
+	const resultData =
+		aiData?.filter(
+			(data) => data.node === nodeName && (runIndex === undefined || runIndex === data.runIndex),
+		) ?? [];
+
+	if (!connections) {
+		return resultData.map((d) => createNode(nodeName, currentDepth, d));
+	}
+
+	// Get the first level of children
+	const connectedSubNodes = workflow.getParentNodes(nodeName, 'ALL_NON_MAIN', 1);
+
+	const children = connectedSubNodes.flatMap((name) => {
+		// Only include sub-nodes which have data
+		return (
+			aiData
+				?.filter(
+					(data) => data.node === name && (runIndex === undefined || data.runIndex === runIndex),
+				)
+				.flatMap((data) =>
+					getTreeNodeDataRec(name, currentDepth + 1, workflow, aiData, data.runIndex),
+				) ?? []
+		);
+	});
+
+	children.sort((a, b) => a.startTime - b.startTime);
+
+	if (resultData.length) {
+		return resultData.map((r) => createNode(nodeName, currentDepth, r, children));
+	}
+
+	return [createNode(nodeName, currentDepth, undefined, children)];
+}
+
+export function createAiData(
+	nodeName: string,
+	workflow: Workflow,
+	getWorkflowResultDataByNodeName: (nodeName: string) => ITaskData[] | null,
+): AIResult[] {
+	const result: AIResult[] = [];
+	const connectedSubNodes = workflow.getParentNodes(nodeName, 'ALL_NON_MAIN');
+
+	connectedSubNodes.forEach((node) => {
+		const nodeRunData = getWorkflowResultDataByNodeName(node) ?? [];
+
+		nodeRunData.forEach((run, runIndex) => {
+			const referenceData = {
+				data: getReferencedData(run, false, true)[0],
+				node,
+				runIndex,
+			};
+
+			result.push(referenceData);
+		});
+	});
+
+	// Sort the data by start time
+	result.sort((a, b) => {
+		const aTime = a.data?.metadata?.startTime ?? 0;
+		const bTime = b.data?.metadata?.startTime ?? 0;
+		return aTime - bTime;
+	});
+
+	return result;
+}
+
+export function getReferencedData(
+	taskData: ITaskData,
+	withInput: boolean,
+	withOutput: boolean,
+): IAiDataContent[] {
+	if (!taskData) {
+		return [];
+	}
+
+	const returnData: IAiDataContent[] = [];
+
+	function addFunction(data: ITaskDataConnections | undefined, inOut: 'input' | 'output') {
+		if (!data) {
+			return;
+		}
+
+		Object.keys(data).map((type) => {
+			returnData.push({
+				data: data[type][0],
+				inOut,
+				type: type as NodeConnectionType,
+				metadata: {
+					executionTime: taskData.executionTime,
+					startTime: taskData.startTime,
+					subExecution: taskData.metadata?.subExecution,
+				},
+			});
+		});
+	}
+
+	if (withInput) {
+		addFunction(taskData.inputOverride, 'input');
+	}
+	if (withOutput) {
+		addFunction(taskData.data, 'output');
+	}
+
+	return returnData;
+}

From 727f6f3c0e5cef2d0cd4cd1ef1c6fa8f4d3f69ec Mon Sep 17 00:00:00 2001
From: feelgood-interface
 <78543720+feelgood-interface@users.noreply.github.com>
Date: Fri, 28 Feb 2025 11:17:56 +0100
Subject: [PATCH 39/47] feat(Azure Storage Node): New node (#12536)

---
 .../AzureStorageOAuth2Api.credentials.ts      |   32 +
 .../AzureStorageSharedKeyApi.credentials.ts   |   96 ++
 .../Entra/test/GroupDescription.test.ts       |    2 +-
 .../Entra/test/MicrosoftEntra.node.test.ts    |    2 +-
 .../Entra/test/UserDescription.test.ts        |    2 +-
 .../Microsoft/Storage/AzureStorage.node.json  |   18 +
 .../Microsoft/Storage/AzureStorage.node.ts    |   97 ++
 .../Microsoft/Storage/GenericFunctions.ts     |  582 +++++++
 .../Microsoft/Storage/azureStorage.dark.svg   |   14 +
 .../nodes/Microsoft/Storage/azureStorage.svg  |   14 +
 .../nodes/Microsoft/Storage/compare-header.ts |   72 +
 .../Storage/descriptions/BlobDescription.ts   | 1390 +++++++++++++++++
 .../descriptions/ContainerDescription.ts      |  600 +++++++
 .../Microsoft/Storage/descriptions/index.ts   |    2 +
 .../Storage/test/blob/create.test.ts          |   72 +
 .../Storage/test/blob/delete.test.ts          |   41 +
 .../Microsoft/Storage/test/blob/get.test.ts   |   93 ++
 .../Storage/test/blob/getAll.test.ts          |   42 +
 .../test/blob/getAllLimitOptions.test.ts      |   37 +
 .../Storage/test/container/create.test.ts     |   44 +
 .../Storage/test/container/delete.test.ts     |   41 +
 .../Storage/test/container/get.test.ts        |   50 +
 .../Storage/test/container/getAll.test.ts     |   42 +
 .../test/container/getAllLimitOptions.test.ts |   37 +
 .../Storage/test/credentials/oauth2.test.ts   |   86 +
 .../test/credentials/sharedKey.test.ts        |  158 ++
 .../test/listSearch/listSearch.test.ts        |  123 ++
 .../test/workflows/blob_create.workflow.json  |  109 ++
 .../test/workflows/blob_delete.workflow.json  |   51 +
 .../test/workflows/blob_get.workflow.json     |  114 ++
 .../test/workflows/blob_getAll.workflow.json  |   82 +
 .../blob_getAllLimitOptions.workflow.json     |   76 +
 .../workflows/container_create.workflow.json  |   54 +
 .../workflows/container_delete.workflow.json  |   48 +
 .../workflows/container_get.workflow.json     |   61 +
 .../workflows/container_getAll.workflow.json  |   73 +
 ...container_getAllLimitOptions.workflow.json |   59 +
 .../credentials_oauth2.workflow.json          |   65 +
 .../credentials_sharedKey.workflow.json       |   62 +
 packages/nodes-base/package.json              |    3 +
 .../nodes-base/test/nodes/ExecuteWorkflow.ts  |   25 +-
 .../test/nodes/FakeCredentialsMap.ts          |   27 +
 packages/workflow/src/Interfaces.ts           |    4 +-
 43 files changed, 4696 insertions(+), 6 deletions(-)
 create mode 100644 packages/nodes-base/credentials/AzureStorageOAuth2Api.credentials.ts
 create mode 100644 packages/nodes-base/credentials/AzureStorageSharedKeyApi.credentials.ts
 create mode 100644 packages/nodes-base/nodes/Microsoft/Storage/AzureStorage.node.json
 create mode 100644 packages/nodes-base/nodes/Microsoft/Storage/AzureStorage.node.ts
 create mode 100644 packages/nodes-base/nodes/Microsoft/Storage/GenericFunctions.ts
 create mode 100644 packages/nodes-base/nodes/Microsoft/Storage/azureStorage.dark.svg
 create mode 100644 packages/nodes-base/nodes/Microsoft/Storage/azureStorage.svg
 create mode 100644 packages/nodes-base/nodes/Microsoft/Storage/compare-header.ts
 create mode 100644 packages/nodes-base/nodes/Microsoft/Storage/descriptions/BlobDescription.ts
 create mode 100644 packages/nodes-base/nodes/Microsoft/Storage/descriptions/ContainerDescription.ts
 create mode 100644 packages/nodes-base/nodes/Microsoft/Storage/descriptions/index.ts
 create mode 100644 packages/nodes-base/nodes/Microsoft/Storage/test/blob/create.test.ts
 create mode 100644 packages/nodes-base/nodes/Microsoft/Storage/test/blob/delete.test.ts
 create mode 100644 packages/nodes-base/nodes/Microsoft/Storage/test/blob/get.test.ts
 create mode 100644 packages/nodes-base/nodes/Microsoft/Storage/test/blob/getAll.test.ts
 create mode 100644 packages/nodes-base/nodes/Microsoft/Storage/test/blob/getAllLimitOptions.test.ts
 create mode 100644 packages/nodes-base/nodes/Microsoft/Storage/test/container/create.test.ts
 create mode 100644 packages/nodes-base/nodes/Microsoft/Storage/test/container/delete.test.ts
 create mode 100644 packages/nodes-base/nodes/Microsoft/Storage/test/container/get.test.ts
 create mode 100644 packages/nodes-base/nodes/Microsoft/Storage/test/container/getAll.test.ts
 create mode 100644 packages/nodes-base/nodes/Microsoft/Storage/test/container/getAllLimitOptions.test.ts
 create mode 100644 packages/nodes-base/nodes/Microsoft/Storage/test/credentials/oauth2.test.ts
 create mode 100644 packages/nodes-base/nodes/Microsoft/Storage/test/credentials/sharedKey.test.ts
 create mode 100644 packages/nodes-base/nodes/Microsoft/Storage/test/listSearch/listSearch.test.ts
 create mode 100644 packages/nodes-base/nodes/Microsoft/Storage/test/workflows/blob_create.workflow.json
 create mode 100644 packages/nodes-base/nodes/Microsoft/Storage/test/workflows/blob_delete.workflow.json
 create mode 100644 packages/nodes-base/nodes/Microsoft/Storage/test/workflows/blob_get.workflow.json
 create mode 100644 packages/nodes-base/nodes/Microsoft/Storage/test/workflows/blob_getAll.workflow.json
 create mode 100644 packages/nodes-base/nodes/Microsoft/Storage/test/workflows/blob_getAllLimitOptions.workflow.json
 create mode 100644 packages/nodes-base/nodes/Microsoft/Storage/test/workflows/container_create.workflow.json
 create mode 100644 packages/nodes-base/nodes/Microsoft/Storage/test/workflows/container_delete.workflow.json
 create mode 100644 packages/nodes-base/nodes/Microsoft/Storage/test/workflows/container_get.workflow.json
 create mode 100644 packages/nodes-base/nodes/Microsoft/Storage/test/workflows/container_getAll.workflow.json
 create mode 100644 packages/nodes-base/nodes/Microsoft/Storage/test/workflows/container_getAllLimitOptions.workflow.json
 create mode 100644 packages/nodes-base/nodes/Microsoft/Storage/test/workflows/credentials_oauth2.workflow.json
 create mode 100644 packages/nodes-base/nodes/Microsoft/Storage/test/workflows/credentials_sharedKey.workflow.json

diff --git a/packages/nodes-base/credentials/AzureStorageOAuth2Api.credentials.ts b/packages/nodes-base/credentials/AzureStorageOAuth2Api.credentials.ts
new file mode 100644
index 0000000000..cfb7d7a752
--- /dev/null
+++ b/packages/nodes-base/credentials/AzureStorageOAuth2Api.credentials.ts
@@ -0,0 +1,32 @@
+import type { ICredentialType, INodeProperties } from 'n8n-workflow';
+
+export class AzureStorageOAuth2Api implements ICredentialType {
+	name = 'azureStorageOAuth2Api';
+
+	displayName = 'Azure Storage OAuth2 API';
+
+	extends = ['microsoftOAuth2Api'];
+
+	documentationUrl = 'azurestorage';
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'Account',
+			name: 'account',
+			type: 'string',
+			default: '',
+		},
+		{
+			displayName: 'Base URL',
+			name: 'baseUrl',
+			type: 'hidden',
+			default: '=https://{{ $self["account"] }}.blob.core.windows.net',
+		},
+		{
+			displayName: 'Scope',
+			name: 'scope',
+			type: 'hidden',
+			default: 'https://storage.azure.com/.default',
+		},
+	];
+}
diff --git a/packages/nodes-base/credentials/AzureStorageSharedKeyApi.credentials.ts b/packages/nodes-base/credentials/AzureStorageSharedKeyApi.credentials.ts
new file mode 100644
index 0000000000..f5e0f7a14c
--- /dev/null
+++ b/packages/nodes-base/credentials/AzureStorageSharedKeyApi.credentials.ts
@@ -0,0 +1,96 @@
+import type {
+	ICredentialDataDecryptedObject,
+	ICredentialType,
+	IHttpRequestOptions,
+	INodeProperties,
+} from 'n8n-workflow';
+import { createHmac } from 'node:crypto';
+
+import {
+	getCanonicalizedHeadersString,
+	getCanonicalizedResourceString,
+	HeaderConstants,
+} from '../nodes/Microsoft/Storage/GenericFunctions';
+
+export class AzureStorageSharedKeyApi implements ICredentialType {
+	name = 'azureStorageSharedKeyApi';
+
+	displayName = 'Azure Storage Shared Key API';
+
+	documentationUrl = 'azurestorage';
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'Account',
+			name: 'account',
+			description: 'Account name',
+			type: 'string',
+			default: '',
+		},
+		{
+			displayName: 'Key',
+			name: 'key',
+			description: 'Account key',
+			type: 'string',
+			typeOptions: {
+				password: true,
+			},
+			default: '',
+		},
+		{
+			displayName: 'Base URL',
+			name: 'baseUrl',
+			type: 'hidden',
+			default: '=https://{{ $self["account"] }}.blob.core.windows.net',
+		},
+	];
+
+	async authenticate(
+		credentials: ICredentialDataDecryptedObject,
+		requestOptions: IHttpRequestOptions,
+	): Promise<IHttpRequestOptions> {
+		if (requestOptions.qs) {
+			for (const [key, value] of Object.entries(requestOptions.qs)) {
+				if (value === undefined) {
+					delete requestOptions.qs[key];
+				}
+			}
+		}
+		if (requestOptions.headers) {
+			for (const [key, value] of Object.entries(requestOptions.headers)) {
+				if (value === undefined) {
+					delete requestOptions.headers[key];
+				}
+			}
+		}
+
+		requestOptions.method ??= 'GET';
+		requestOptions.headers ??= {};
+
+		const stringToSign: string = [
+			requestOptions.method.toUpperCase(),
+			requestOptions.headers[HeaderConstants.CONTENT_LANGUAGE] ?? '',
+			requestOptions.headers[HeaderConstants.CONTENT_ENCODING] ?? '',
+			requestOptions.headers[HeaderConstants.CONTENT_LENGTH] ?? '',
+			requestOptions.headers[HeaderConstants.CONTENT_MD5] ?? '',
+			requestOptions.headers[HeaderConstants.CONTENT_TYPE] ?? '',
+			requestOptions.headers[HeaderConstants.DATE] ?? '',
+			requestOptions.headers[HeaderConstants.IF_MODIFIED_SINCE] ?? '',
+			requestOptions.headers[HeaderConstants.IF_MATCH] ?? '',
+			requestOptions.headers[HeaderConstants.IF_NONE_MATCH] ?? '',
+			requestOptions.headers[HeaderConstants.IF_UNMODIFIED_SINCE] ?? '',
+			requestOptions.headers[HeaderConstants.RANGE] ?? '',
+			getCanonicalizedHeadersString(requestOptions) +
+				getCanonicalizedResourceString(requestOptions, credentials),
+		].join('\n');
+
+		const signature: string = createHmac('sha256', Buffer.from(credentials.key as string, 'base64'))
+			.update(stringToSign, 'utf8')
+			.digest('base64');
+
+		requestOptions.headers[HeaderConstants.AUTHORIZATION] =
+			`SharedKey ${credentials.account as string}:${signature}`;
+
+		return requestOptions;
+	}
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Entra/test/GroupDescription.test.ts b/packages/nodes-base/nodes/Microsoft/Entra/test/GroupDescription.test.ts
index 632792ea96..26e0eb242d 100644
--- a/packages/nodes-base/nodes/Microsoft/Entra/test/GroupDescription.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Entra/test/GroupDescription.test.ts
@@ -7,7 +7,7 @@ import type { WorkflowTestData } from '@test/nodes/types';
 
 import { microsoftEntraApiResponse, microsoftEntraNodeResponse } from './mocks';
 
-describe('Gong Node', () => {
+describe('Microsoft Entra Node', () => {
 	const baseUrl = 'https://graph.microsoft.com/v1.0';
 
 	beforeEach(() => {
diff --git a/packages/nodes-base/nodes/Microsoft/Entra/test/MicrosoftEntra.node.test.ts b/packages/nodes-base/nodes/Microsoft/Entra/test/MicrosoftEntra.node.test.ts
index 428e64d94b..84f7f7169c 100644
--- a/packages/nodes-base/nodes/Microsoft/Entra/test/MicrosoftEntra.node.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Entra/test/MicrosoftEntra.node.test.ts
@@ -15,7 +15,7 @@ import { microsoftEntraApiResponse, microsoftEntraNodeResponse } from './mocks';
 import { FAKE_CREDENTIALS_DATA } from '../../../../test/nodes/FakeCredentialsMap';
 import { MicrosoftEntra } from '../MicrosoftEntra.node';
 
-describe('Gong Node', () => {
+describe('Microsoft Entra Node', () => {
 	const baseUrl = 'https://graph.microsoft.com/v1.0';
 
 	beforeEach(() => {
diff --git a/packages/nodes-base/nodes/Microsoft/Entra/test/UserDescription.test.ts b/packages/nodes-base/nodes/Microsoft/Entra/test/UserDescription.test.ts
index b245e12f70..5a281a1bdc 100644
--- a/packages/nodes-base/nodes/Microsoft/Entra/test/UserDescription.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Entra/test/UserDescription.test.ts
@@ -7,7 +7,7 @@ import type { WorkflowTestData } from '@test/nodes/types';
 
 import { microsoftEntraApiResponse, microsoftEntraNodeResponse } from './mocks';
 
-describe('Gong Node', () => {
+describe('Microsoft Entra Node', () => {
 	const baseUrl = 'https://graph.microsoft.com/v1.0';
 
 	beforeEach(() => {
diff --git a/packages/nodes-base/nodes/Microsoft/Storage/AzureStorage.node.json b/packages/nodes-base/nodes/Microsoft/Storage/AzureStorage.node.json
new file mode 100644
index 0000000000..abe51cd6e8
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Storage/AzureStorage.node.json
@@ -0,0 +1,18 @@
+{
+	"node": "n8n-nodes-base.azureStorage",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
+	"categories": ["Data & Storage"],
+	"resources": {
+		"credentialDocumentation": [
+			{
+				"url": "https://docs.n8n.io/integrations/builtin/credentials/microsoft/"
+			}
+		],
+		"primaryDocumentation": [
+			{
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.azurestorage/"
+			}
+		]
+	}
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Storage/AzureStorage.node.ts b/packages/nodes-base/nodes/Microsoft/Storage/AzureStorage.node.ts
new file mode 100644
index 0000000000..81940b2f45
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Storage/AzureStorage.node.ts
@@ -0,0 +1,97 @@
+import type { INodeType, INodeTypeDescription } from 'n8n-workflow';
+import { NodeConnectionType } from 'n8n-workflow';
+
+import { blobFields, blobOperations, containerFields, containerOperations } from './descriptions';
+import { getBlobs, getContainers } from './GenericFunctions';
+
+export class AzureStorage implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Azure Storage',
+		name: 'azureStorage',
+		icon: {
+			light: 'file:azureStorage.svg',
+			dark: 'file:azureStorage.dark.svg',
+		},
+		group: ['transform'],
+		version: 1,
+		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
+		description: 'Interact with Azure Storage API',
+		defaults: {
+			name: 'Azure Storage',
+		},
+		inputs: [NodeConnectionType.Main],
+		outputs: [NodeConnectionType.Main],
+		credentials: [
+			{
+				name: 'azureStorageOAuth2Api',
+				required: true,
+				displayOptions: {
+					show: {
+						authentication: ['oAuth2'],
+					},
+				},
+			},
+			{
+				name: 'azureStorageSharedKeyApi',
+				required: true,
+				displayOptions: {
+					show: {
+						authentication: ['sharedKey'],
+					},
+				},
+			},
+		],
+		requestDefaults: {
+			baseURL: '={{ $credentials.baseUrl }}',
+		},
+		properties: [
+			{
+				displayName: 'Authentication',
+				name: 'authentication',
+				type: 'options',
+				options: [
+					{
+						name: 'OAuth2',
+						value: 'oAuth2',
+					},
+					{
+						name: 'Shared Key',
+						value: 'sharedKey',
+					},
+				],
+				default: 'sharedKey',
+			},
+			{
+				displayName: 'Resource',
+				name: 'resource',
+				type: 'options',
+				noDataExpression: true,
+				options: [
+					{
+						name: 'Blob',
+						value: 'blob',
+					},
+					{
+						name: 'Container',
+						value: 'container',
+					},
+				],
+				default: 'container',
+			},
+
+			...blobOperations,
+			...blobFields,
+			...containerOperations,
+			...containerFields,
+		],
+	};
+
+	methods = {
+		loadOptions: {},
+
+		listSearch: {
+			getBlobs,
+			getContainers,
+		},
+	};
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Storage/GenericFunctions.ts b/packages/nodes-base/nodes/Microsoft/Storage/GenericFunctions.ts
new file mode 100644
index 0000000000..835dbf7012
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Storage/GenericFunctions.ts
@@ -0,0 +1,582 @@
+import { camelCase } from 'change-case';
+import type {
+	JsonObject,
+	IDataObject,
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	IHttpRequestMethods,
+	IHttpRequestOptions,
+	ILoadOptionsFunctions,
+	INodeExecutionData,
+	IN8nHttpFullResponse,
+	INodeListSearchResult,
+	INodeListSearchItems,
+	INodeParameterResourceLocator,
+	ICredentialDataDecryptedObject,
+} from 'n8n-workflow';
+import { NodeApiError } from 'n8n-workflow';
+import { Parser } from 'xml2js';
+import { firstCharLowerCase, parseBooleans, parseNumbers } from 'xml2js/lib/processors';
+
+import { compareHeader } from './compare-header';
+
+export const XMsVersion = '2021-12-02';
+
+export const HeaderConstants = {
+	AUTHORIZATION: 'authorization',
+	CONTENT_ENCODING: 'content-encoding',
+	CONTENT_LANGUAGE: 'content-language',
+	CONTENT_LENGTH: 'content-length',
+	CONTENT_MD5: 'content-md5',
+	CONTENT_TYPE: 'content-Type',
+	DATE: 'date',
+	ETAG: 'etag',
+	IF_MATCH: 'if-match',
+	IF_MODIFIED_SINCE: 'if-Modified-since',
+	IF_NONE_MATCH: 'if-none-match',
+	IF_UNMODIFIED_SINCE: 'if-unmodified-since',
+	ORIGIN: 'origin',
+	RANGE: 'range',
+	X_MS_COPY_SOURCE: 'x-ms-copy-source',
+	X_MS_DATE: 'x-ms-date',
+	X_MS_VERSION: 'x-ms-version',
+	X_MS_BLOB_TYPE: 'x-ms-blob-type',
+	X_MS_BLOB_CONTENT_DISPOSITION: 'x-ms-blob-content-disposition',
+	X_MS_BLOB_PUBLIC_ACCESS: 'x-ms-blob-public-access',
+	X_MS_HAS_IMMUTABILITY_POLICY: 'x-ms-has-immutability-policy',
+	X_MS_HAS_LEGAL_HOLD: 'x-ms-has-legal-hold',
+	X_MS_CONTENT_CRC64: 'x-ms-content-crc64',
+	X_MS_REQUEST_SERVER_ENCRYPTED: 'x-ms-request-server-encrypted',
+	X_MS_ENCRYPTION_SCOPE: 'x-ms-encryption-scope',
+	X_MS_VERSION_ID: 'x-ms-version-id',
+	X_MS_TAG_COUNT: 'x-ms-tag-count',
+	X_MS_COPY_PROGRESS: 'x-ms-copy-progress',
+	X_MS_INCREMENTAL_COPY: 'x-ms-incremental-copy',
+	X_MS_BLOB_SEQUENCE_NUMBER: 'x-ms-blob-sequence-number',
+	X_MS_BLOB_COMMITTED_BLOCK_COUNT: 'x-ms-blob-committed-block-count',
+	X_MS_SERVER_ENCRYPTED: 'x-ms-server-encrypted',
+	X_MS_ENCRYPTION_CONTEXT: 'x-ms-encryption-context',
+	X_MS_BLOB_CONTENT_MD5: 'x-ms-blob-content-md5',
+	X_MS_BLOB_SEALED: 'x-ms-blob-sealed',
+	X_MS_IMMUTABILITY_POLICY_UNTIL_DATE: 'x-ms-immutability-policy-until-date',
+	X_MS_IMMUTABILITY_POLICY_MODE: 'x-ms-immutability-policy-mode',
+	X_MS_LEGAL_HOLD: 'x-ms-legal-hold',
+	X_MS_DELETE_TYPE_PERMANENT: 'x-ms-delete-type-permanent',
+	X_MS_ACCESS_TIER: 'x-ms-access-tier',
+	X_MS_BLOB_CACHE_CONTROL: 'x-ms-blob-cache-control',
+	X_MS_LEASE_ID: 'x-ms-lease-id',
+	X_MS_BLOB_CONTENT_ENCODING: 'x-ms-blob-content-encoding',
+	X_MS_BLOB_CONTENT_LANGUAGE: 'x-ms-blob-content-language',
+	X_MS_BLOB_CONTENT_TYPE: 'x-ms-blob-content-type',
+	X_MS_EXPIRY_OPTION: 'x-ms-expiry-option',
+	X_MS_EXPIRY_TIME: 'x-ms-expiry-time',
+	X_MS_TAGS: 'x-ms-tags',
+	X_MS_UPN: 'x-ms-upn',
+	PREFIX_X_MS: 'x-ms-',
+	PREFIX_X_MS_META: 'x-ms-meta-',
+};
+
+export async function azureStorageApiRequest(
+	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
+	endpoint: string,
+	body: IDataObject = {},
+	qs?: IDataObject,
+	headers?: IDataObject,
+	url?: string,
+): Promise<string> {
+	const authentication = this.getNodeParameter('authentication', 0) as 'oAuth2' | 'sharedKey';
+	const credentialsType =
+		authentication === 'oAuth2' ? 'azureStorageOAuth2Api' : 'azureStorageSharedKeyApi';
+	const credentials = await this.getCredentials<{
+		baseUrl: string;
+	}>(credentialsType);
+
+	const options: IHttpRequestOptions = {
+		method,
+		url: url ?? `${credentials.baseUrl}${endpoint}`,
+		headers,
+		body,
+		qs,
+	};
+
+	options.headers ??= {};
+	options.headers[HeaderConstants.X_MS_DATE] = new Date().toUTCString();
+	options.headers[HeaderConstants.X_MS_VERSION] = XMsVersion;
+
+	// XML response
+	const response = (await this.helpers.requestWithAuthentication.call(
+		this,
+		credentialsType,
+		options,
+	)) as string;
+
+	return response;
+}
+
+export async function handleErrorPostReceive(
+	this: IExecuteSingleFunctions,
+	data: INodeExecutionData[],
+	response: IN8nHttpFullResponse,
+): Promise<INodeExecutionData[]> {
+	if (String(response.statusCode).startsWith('4') || String(response.statusCode).startsWith('5')) {
+		const resource = this.getNodeParameter('resource') as string;
+		const operation = this.getNodeParameter('operation') as string;
+
+		const parser = new Parser({
+			explicitArray: false,
+			tagNameProcessors: [firstCharLowerCase],
+		});
+		const { error } =
+			((await parser.parseStringPromise(data[0].json as unknown as string)) as {
+				error: {
+					code: string;
+					message: string;
+					headerName?: string;
+					headerValue?: string;
+				};
+			}) ?? {};
+
+		if (
+			error?.code === 'InvalidAuthenticationInfo' &&
+			((error as IDataObject)?.authenticationErrorDetail as string) ===
+				'Lifetime validation failed. The token is expired.'
+		) {
+			throw new NodeApiError(this.getNode(), error as JsonObject, {
+				message: 'Lifetime validation failed. The token is expired.',
+				description: 'Please check your credentials and try again',
+			});
+		}
+
+		if (resource === 'blob') {
+			if (error?.code === 'ContainerNotFound') {
+				throw new NodeApiError(this.getNode(), error as JsonObject, {
+					message: "The required container doesn't match any existing one",
+					description: "Double-check the value in the parameter 'Container Name' and try again",
+				});
+			}
+
+			if (operation === 'create') {
+				if (
+					this.getNodeParameter('from') === 'url' &&
+					((error?.code === 'InvalidHeaderValue' &&
+						error?.headerName === HeaderConstants.X_MS_COPY_SOURCE) ||
+						error?.code === 'CannotVerifyCopySource')
+				) {
+					throw new NodeApiError(this.getNode(), error as JsonObject, {
+						message: 'The provided URL is invalid',
+						description: "Double-check the value in the parameter 'URL' and try again",
+					});
+				}
+			} else if (operation === 'delete') {
+				if (error?.code === 'BlobNotFound') {
+					throw new NodeApiError(this.getNode(), error as JsonObject, {
+						message: "The required blob doesn't match any existing one",
+						description: "Double-check the value in the parameter 'Blob to Delete' and try again",
+					});
+				}
+			} else if (operation === 'get') {
+				if (error?.code === 'BlobNotFound') {
+					throw new NodeApiError(this.getNode(), error as JsonObject, {
+						message: "The required blob doesn't match any existing one",
+						description: "Double-check the value in the parameter 'Blob to Get' and try again",
+					});
+				}
+			} else if (operation === 'getAll') {
+				if (
+					error?.code === 'InvalidQueryParameterValue' &&
+					(this.getNodeParameter('fields', []) as string[]).includes('permissions')
+				) {
+					throw new NodeApiError(this.getNode(), error as JsonObject, {
+						message:
+							'Permissions field is only supported for accounts with a hierarchical namespace enabled',
+						description: "Exclude 'Permissions' from 'Fields' and try again",
+					});
+				}
+				if (
+					error?.code === 'UnsupportedQueryParameter' &&
+					(this.getNodeParameter('fields', []) as string[]).includes('deleted') &&
+					(this.getNodeParameter('filter', []) as string[]).includes('deleted')
+				) {
+					throw new NodeApiError(this.getNode(), error as JsonObject, {
+						message: "Including 'Deleted' field and filter is not supported",
+						description: "Exclude 'Deleted' from 'Fields' or 'Filter' and try again",
+					});
+				}
+			}
+		} else if (resource === 'container') {
+			if (operation === 'create') {
+				if (error?.code === 'ContainerAlreadyExists') {
+					throw new NodeApiError(this.getNode(), error as JsonObject, {
+						message: 'The specified container already exists',
+						description: "Use a unique value for 'Container Name' and try again",
+					});
+				}
+				if (error?.code === 'PublicAccessNotPermitted') {
+					throw new NodeApiError(this.getNode(), error as JsonObject, {
+						message: 'Public access is not permitted on this storage account',
+						description: "Check the 'Access Level' and try again",
+					});
+				}
+			} else if (operation === 'delete') {
+				if (error?.code === 'ContainerNotFound') {
+					throw new NodeApiError(this.getNode(), error as JsonObject, {
+						message: "The required container doesn't match any existing one",
+						description:
+							"Double-check the value in the parameter 'Container to Delete' and try again",
+					});
+				}
+			} else if (operation === 'get') {
+				if (error?.code === 'ContainerNotFound') {
+					throw new NodeApiError(this.getNode(), error as JsonObject, {
+						message: "The required container doesn't match any existing one",
+						description: "Double-check the value in the parameter 'Container to Get' and try again",
+					});
+				}
+			} else if (operation === 'getAll') {
+			}
+		}
+
+		if (error) {
+			throw new NodeApiError(this.getNode(), response as unknown as JsonObject, {
+				message: error.code,
+				description: error.message,
+			});
+		} else {
+			throw new NodeApiError(this.getNode(), response as unknown as JsonObject, {
+				parseXml: true,
+			});
+		}
+	}
+
+	return data;
+}
+
+export function getCanonicalizedHeadersString(requestOptions: IHttpRequestOptions): string {
+	let headersArray: Array<{ name: string; value: string }> = [];
+	// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+	for (const [name, value] of Object.entries(requestOptions.headers!) as unknown as [
+		string,
+		string,
+	]) {
+		if (name.toLowerCase().startsWith(HeaderConstants.PREFIX_X_MS)) {
+			headersArray.push({ name, value });
+		}
+	}
+
+	headersArray.sort((a, b): number => {
+		return compareHeader(a.name.toLowerCase(), b.name.toLowerCase());
+	});
+
+	// Remove duplicate headers
+	headersArray = headersArray.filter((value, index, array) => {
+		if (index > 0 && value.name.toLowerCase() === array[index - 1].name.toLowerCase()) {
+			return false;
+		}
+		return true;
+	});
+
+	let canonicalizedHeadersStringToSign: string = '';
+	headersArray.forEach((header) => {
+		canonicalizedHeadersStringToSign += `${header.name
+			.toLowerCase()
+			.trimEnd()}:${header.value.trimStart()}\n`;
+	});
+
+	return canonicalizedHeadersStringToSign;
+}
+
+export function getCanonicalizedResourceString(
+	requestOptions: IHttpRequestOptions,
+	credentials: ICredentialDataDecryptedObject,
+): string {
+	const path: string = new URL(requestOptions.baseURL + requestOptions.url).pathname || '/';
+	let canonicalizedResourceString = `/${credentials.account as string}${path}`;
+	if (requestOptions.qs && Object.keys(requestOptions.qs).length > 0) {
+		canonicalizedResourceString +=
+			'\n' +
+			Object.keys(requestOptions.qs)
+				.sort()
+				.map(
+					// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+					(key) => `${key.toLowerCase()}:${decodeURIComponent(requestOptions.qs![key] as string)}`,
+				)
+				.join('\n');
+	}
+
+	return canonicalizedResourceString;
+}
+
+export function parseHeaders(headers: IDataObject) {
+	const parseBooleanHeaders = [
+		HeaderConstants.X_MS_DELETE_TYPE_PERMANENT,
+		HeaderConstants.X_MS_INCREMENTAL_COPY,
+		HeaderConstants.X_MS_SERVER_ENCRYPTED,
+		HeaderConstants.X_MS_BLOB_SEALED,
+		HeaderConstants.X_MS_REQUEST_SERVER_ENCRYPTED,
+		HeaderConstants.X_MS_HAS_IMMUTABILITY_POLICY,
+		HeaderConstants.X_MS_HAS_LEGAL_HOLD,
+	];
+	const parseNumberHeaders = [
+		HeaderConstants.X_MS_TAG_COUNT,
+		HeaderConstants.CONTENT_LENGTH,
+		HeaderConstants.X_MS_BLOB_SEQUENCE_NUMBER,
+		HeaderConstants.X_MS_COPY_PROGRESS,
+		HeaderConstants.X_MS_BLOB_COMMITTED_BLOCK_COUNT,
+	];
+
+	const result: IDataObject = {};
+
+	const metadataKeys = Object.keys(headers).filter((x) =>
+		x.startsWith(HeaderConstants.PREFIX_X_MS_META),
+	);
+
+	for (const key in headers) {
+		if (metadataKeys.includes(key)) {
+			continue;
+		}
+
+		let newKey = key.startsWith(HeaderConstants.PREFIX_X_MS)
+			? camelCase(key.replace(HeaderConstants.PREFIX_X_MS, ''))
+			: camelCase(key);
+		newKey = newKey.replace('-', '');
+
+		const newValue = parseBooleanHeaders.includes(key)
+			? parseBooleans(headers[key] as string)
+			: parseNumberHeaders.includes(key)
+				? parseNumbers(headers[key] as string)
+				: headers[key];
+
+		result[newKey] = newValue;
+	}
+
+	if (metadataKeys.length > 0) {
+		result.metadata = {};
+		for (const key of metadataKeys) {
+			(result.metadata as IDataObject)[key.replace(HeaderConstants.PREFIX_X_MS_META, '')] =
+				headers[key];
+		}
+	}
+
+	return result;
+}
+
+export async function parseBlobList(
+	xml: string,
+): Promise<{ blobs: IDataObject[]; maxResults?: number; nextMarker?: string }> {
+	const parser = new Parser({
+		explicitArray: false,
+		tagNameProcessors: [firstCharLowerCase, (name) => name.replace('-', '')],
+		valueProcessors: [
+			function (value, name) {
+				if (
+					[
+						'deleted',
+						'isCurrentVersion',
+						'serverEncrypted',
+						'incrementalCopy',
+						'accessTierInferred',
+						'isSealed',
+						'legalHold',
+					].includes(name)
+				) {
+					return parseBooleans(value);
+				} else if (
+					[
+						'maxResults',
+						'contentLength',
+						'blobSequenceNumber',
+						'remainingRetentionDays',
+						'tagCount',
+						'content-Length',
+					].includes(name)
+				) {
+					return parseNumbers(value);
+				}
+				return value;
+			},
+		],
+	});
+	const data = (await parser.parseStringPromise(xml)) as {
+		enumerationResults: {
+			blobs: { blob: IDataObject | IDataObject[] };
+			maxResults: number;
+			nextMarker: string;
+			prefix: string;
+		};
+	};
+
+	if (typeof data.enumerationResults.blobs !== 'object') {
+		// No items
+		return { blobs: [] };
+	}
+
+	if (!Array.isArray(data.enumerationResults.blobs.blob)) {
+		// Single item
+		data.enumerationResults.blobs.blob = [data.enumerationResults.blobs.blob];
+	}
+
+	for (const blob of data.enumerationResults.blobs.blob) {
+		if (blob.tags) {
+			if (!Array.isArray(((blob.tags as IDataObject).tagSet as IDataObject).tag)) {
+				((blob.tags as IDataObject).tagSet as IDataObject).tag = [
+					((blob.tags as IDataObject).tagSet as IDataObject).tag,
+				];
+			}
+			blob.tags = ((blob.tags as IDataObject).tagSet as IDataObject).tag;
+		}
+	}
+
+	for (const container of data.enumerationResults.blobs.blob) {
+		if (container.metadata === '') {
+			delete container.metadata;
+		}
+		if (container.orMetadata === '') {
+			delete container.orMetadata;
+		}
+	}
+
+	return {
+		blobs: data.enumerationResults.blobs.blob,
+		maxResults: data.enumerationResults.maxResults,
+		nextMarker: data.enumerationResults.nextMarker,
+	};
+}
+
+export async function parseContainerList(
+	xml: string,
+): Promise<{ containers: IDataObject[]; maxResults?: number; nextMarker?: string }> {
+	const parser = new Parser({
+		explicitArray: false,
+		tagNameProcessors: [firstCharLowerCase, (name) => name.replace('-', '')],
+		valueProcessors: [
+			function (value, name) {
+				if (
+					[
+						'deleted',
+						'hasImmutabilityPolicy',
+						'hasLegalHold',
+						'preventEncryptionScopeOverride',
+						'isImmutableStorageWithVersioningEnabled',
+					].includes(name)
+				) {
+					return parseBooleans(value);
+				} else if (['maxResults', 'remainingRetentionDays'].includes(name)) {
+					return parseNumbers(value);
+				}
+				return value;
+			},
+		],
+	});
+	const data = (await parser.parseStringPromise(xml)) as {
+		enumerationResults: {
+			containers: { container: IDataObject | IDataObject[] };
+			maxResults: number;
+			nextMarker: string;
+			prefix: string;
+		};
+	};
+
+	if (typeof data.enumerationResults.containers !== 'object') {
+		// No items
+		return { containers: [] };
+	}
+
+	if (!Array.isArray(data.enumerationResults.containers.container)) {
+		// Single item
+		data.enumerationResults.containers.container = [data.enumerationResults.containers.container];
+	}
+
+	for (const container of data.enumerationResults.containers.container) {
+		if (container.metadata === '') {
+			delete container.metadata;
+		}
+	}
+
+	return {
+		containers: data.enumerationResults.containers.container,
+		maxResults: data.enumerationResults.maxResults,
+		nextMarker: data.enumerationResults.nextMarker,
+	};
+}
+
+export async function getBlobs(
+	this: ILoadOptionsFunctions,
+	filter?: string,
+	paginationToken?: string,
+): Promise<INodeListSearchResult> {
+	const container = this.getNodeParameter('container') as INodeParameterResourceLocator;
+
+	let response: string;
+
+	const qs: IDataObject = {
+		restype: 'container',
+		comp: 'list',
+	};
+
+	if (paginationToken) {
+		qs.marker = paginationToken;
+		response = await azureStorageApiRequest.call(this, 'GET', `/${container.value}`, {}, qs);
+	} else {
+		qs.maxresults = 5000;
+		if (filter) {
+			qs.prefix = filter;
+		}
+		response = await azureStorageApiRequest.call(this, 'GET', `/${container.value}`, {}, qs);
+	}
+
+	const data = await parseBlobList(response);
+
+	const results: INodeListSearchItems[] = data.blobs
+		.map((c) => ({
+			name: c.name as string,
+			value: c.name as string,
+		}))
+		.sort((a, b) =>
+			a.name.localeCompare(b.name, undefined, { numeric: true, sensitivity: 'base' }),
+		);
+
+	return {
+		results,
+		paginationToken: data.nextMarker,
+	};
+}
+
+export async function getContainers(
+	this: ILoadOptionsFunctions,
+	filter?: string,
+	paginationToken?: string,
+): Promise<INodeListSearchResult> {
+	let response: string;
+
+	const qs: IDataObject = {
+		comp: 'list',
+	};
+
+	if (paginationToken) {
+		qs.marker = paginationToken;
+		response = await azureStorageApiRequest.call(this, 'GET', '/', {}, qs);
+	} else {
+		qs.maxresults = 5000;
+		if (filter) {
+			qs.prefix = filter;
+		}
+		response = await azureStorageApiRequest.call(this, 'GET', '/', {}, qs);
+	}
+
+	const data = await parseContainerList(response);
+
+	const results: INodeListSearchItems[] = data.containers
+		.map((c) => ({
+			name: c.name as string,
+			value: c.name as string,
+		}))
+		.sort((a, b) =>
+			a.name.localeCompare(b.name, undefined, { numeric: true, sensitivity: 'base' }),
+		);
+
+	return {
+		results,
+		paginationToken: data.nextMarker,
+	};
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Storage/azureStorage.dark.svg b/packages/nodes-base/nodes/Microsoft/Storage/azureStorage.dark.svg
new file mode 100644
index 0000000000..5bb05463a6
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Storage/azureStorage.dark.svg
@@ -0,0 +1,14 @@
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 18" width="200"  height="200" >
+  <defs>
+    <linearGradient id="a" x1="9" y1="15.83" x2="9" y2="5.79" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#b3b3b3"/>
+      <stop offset=".26" stop-color="#c1c1c1"/>
+      <stop offset="1" stop-color="#e6e6e6"/>
+    </linearGradient>
+  </defs>
+  <path d="M.5 5.79h17v9.48a.57.57 0 01-.57.57H1.07a.57.57 0 01-.57-.57V5.79z" fill="url(#a)"/>
+  <path d="M1.07 2.17h15.86a.57.57 0 01.57.57v3.05H.5V2.73a.57.57 0 01.57-.56z" fill="#37c2b1"/>
+  <path d="M2.81 6.89h12.37a.27.27 0 01.26.27v1.4a.27.27 0 01-.26.27H2.81a.27.27 0 01-.26-.27v-1.4a.27.27 0 01.26-.27z" fill="#fff"/>
+  <path d="M2.82 9.68h12.37a.27.27 0 01.26.27v1.41a.27.27 0 01-.26.27H2.82a.27.27 0 01-.26-.27V10a.27.27 0 01.26-.32z" fill="#37c2b1"/>
+  <path d="M2.82 12.5h12.37a.27.27 0 01.26.27v1.41a.27.27 0 01-.26.27H2.82a.27.27 0 01-.26-.27v-1.41a.27.27 0 01.26-.27z" fill="#258277"/>
+</svg>
diff --git a/packages/nodes-base/nodes/Microsoft/Storage/azureStorage.svg b/packages/nodes-base/nodes/Microsoft/Storage/azureStorage.svg
new file mode 100644
index 0000000000..5bb05463a6
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Storage/azureStorage.svg
@@ -0,0 +1,14 @@
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 18" width="200"  height="200" >
+  <defs>
+    <linearGradient id="a" x1="9" y1="15.83" x2="9" y2="5.79" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#b3b3b3"/>
+      <stop offset=".26" stop-color="#c1c1c1"/>
+      <stop offset="1" stop-color="#e6e6e6"/>
+    </linearGradient>
+  </defs>
+  <path d="M.5 5.79h17v9.48a.57.57 0 01-.57.57H1.07a.57.57 0 01-.57-.57V5.79z" fill="url(#a)"/>
+  <path d="M1.07 2.17h15.86a.57.57 0 01.57.57v3.05H.5V2.73a.57.57 0 01.57-.56z" fill="#37c2b1"/>
+  <path d="M2.81 6.89h12.37a.27.27 0 01.26.27v1.4a.27.27 0 01-.26.27H2.81a.27.27 0 01-.26-.27v-1.4a.27.27 0 01.26-.27z" fill="#fff"/>
+  <path d="M2.82 9.68h12.37a.27.27 0 01.26.27v1.41a.27.27 0 01-.26.27H2.82a.27.27 0 01-.26-.27V10a.27.27 0 01.26-.32z" fill="#37c2b1"/>
+  <path d="M2.82 12.5h12.37a.27.27 0 01.26.27v1.41a.27.27 0 01-.26.27H2.82a.27.27 0 01-.26-.27v-1.41a.27.27 0 01.26-.27z" fill="#258277"/>
+</svg>
diff --git a/packages/nodes-base/nodes/Microsoft/Storage/compare-header.ts b/packages/nodes-base/nodes/Microsoft/Storage/compare-header.ts
new file mode 100644
index 0000000000..4bcfb00a1f
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Storage/compare-header.ts
@@ -0,0 +1,72 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+/*
+ * We need to imitate .Net culture-aware sorting, which is used in storage service.
+ * Below tables contain sort-keys for en-US culture.
+ */
+
+const table_lv0 = new Uint32Array([
+	0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+	0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x71c, 0x0, 0x71f, 0x721,
+	0x723, 0x725, 0x0, 0x0, 0x0, 0x72d, 0x803, 0x0, 0x0, 0x733, 0x0, 0xd03, 0xd1a, 0xd1c, 0xd1e,
+	0xd20, 0xd22, 0xd24, 0xd26, 0xd28, 0xd2a, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xe02, 0xe09, 0xe0a,
+	0xe1a, 0xe21, 0xe23, 0xe25, 0xe2c, 0xe32, 0xe35, 0xe36, 0xe48, 0xe51, 0xe70, 0xe7c, 0xe7e, 0xe89,
+	0xe8a, 0xe91, 0xe99, 0xe9f, 0xea2, 0xea4, 0xea6, 0xea7, 0xea9, 0x0, 0x0, 0x0, 0x743, 0x744, 0x748,
+	0xe02, 0xe09, 0xe0a, 0xe1a, 0xe21, 0xe23, 0xe25, 0xe2c, 0xe32, 0xe35, 0xe36, 0xe48, 0xe51, 0xe70,
+	0xe7c, 0xe7e, 0xe89, 0xe8a, 0xe91, 0xe99, 0xe9f, 0xea2, 0xea4, 0xea6, 0xea7, 0xea9, 0x0, 0x74c,
+	0x0, 0x750, 0x0,
+]);
+const table_lv2 = new Uint32Array([
+	0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+	0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+	0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+	0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12,
+	0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12,
+	0x12, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+	0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+]);
+const table_lv4 = new Uint32Array([
+	0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+	0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+	0x0, 0x8012, 0x0, 0x0, 0x0, 0x0, 0x0, 0x8212, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+	0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+	0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+	0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+	0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+]);
+
+function isLessThan(lhs: string, rhs: string): boolean {
+	const tables = [table_lv0, table_lv2, table_lv4];
+	let curr_level = 0;
+	let i = 0;
+	let j = 0;
+	while (curr_level < tables.length) {
+		if (curr_level === tables.length - 1 && i !== j) {
+			return i > j;
+		}
+		const weight1 = i < lhs.length ? tables[curr_level][lhs[i].charCodeAt(0)] : 0x1;
+		const weight2 = j < rhs.length ? tables[curr_level][rhs[j].charCodeAt(0)] : 0x1;
+		if (weight1 === 0x1 && weight2 === 0x1) {
+			i = 0;
+			j = 0;
+			++curr_level;
+		} else if (weight1 === weight2) {
+			++i;
+			++j;
+		} else if (weight1 === 0) {
+			++i;
+		} else if (weight2 === 0) {
+			++j;
+		} else {
+			return weight1 < weight2;
+		}
+	}
+	return false;
+}
+
+export function compareHeader(lhs: string, rhs: string): number {
+	if (isLessThan(lhs, rhs)) return -1;
+
+	return 1;
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Storage/descriptions/BlobDescription.ts b/packages/nodes-base/nodes/Microsoft/Storage/descriptions/BlobDescription.ts
new file mode 100644
index 0000000000..0b09bb3ef3
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Storage/descriptions/BlobDescription.ts
@@ -0,0 +1,1390 @@
+import type {
+	DeclarativeRestApiSettings,
+	IDataObject,
+	IExecutePaginationFunctions,
+	IExecuteSingleFunctions,
+	IHttpRequestOptions,
+	IN8nHttpFullResponse,
+	INodeExecutionData,
+	INodeParameterResourceLocator,
+	INodeProperties,
+} from 'n8n-workflow';
+
+import {
+	handleErrorPostReceive,
+	HeaderConstants,
+	parseBlobList,
+	parseHeaders,
+	XMsVersion,
+} from '../GenericFunctions';
+
+export const blobOperations: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		displayOptions: {
+			show: {
+				resource: ['blob'],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a new blob or replace an existing one',
+				routing: {
+					request: {
+						ignoreHttpStatusErrors: true,
+						method: 'PUT',
+						url: '=/{{ $parameter["container"] }}/{{ $parameter["blobCreate"] }}',
+						headers: {
+							[HeaderConstants.X_MS_DATE]: '={{ new Date().toUTCString() }}',
+							[HeaderConstants.X_MS_VERSION]: XMsVersion,
+						},
+					},
+					output: {
+						postReceive: [
+							handleErrorPostReceive,
+							async function (
+								this: IExecuteSingleFunctions,
+								_data: INodeExecutionData[],
+								response: IN8nHttpFullResponse,
+							): Promise<INodeExecutionData[]> {
+								return [
+									{
+										json: parseHeaders(response.headers),
+									},
+								];
+							},
+						],
+					},
+				},
+				action: 'Create blob',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a blob',
+				routing: {
+					request: {
+						ignoreHttpStatusErrors: true,
+						method: 'DELETE',
+						url: '=/{{ $parameter["container"] }}/{{ $parameter["blob"] }}',
+						headers: {
+							[HeaderConstants.X_MS_DATE]: '={{ new Date().toUTCString() }}',
+							[HeaderConstants.X_MS_VERSION]: XMsVersion,
+						},
+					},
+					output: {
+						postReceive: [
+							handleErrorPostReceive,
+							async function (
+								this: IExecuteSingleFunctions,
+								_data: INodeExecutionData[],
+								response: IN8nHttpFullResponse,
+							): Promise<INodeExecutionData[]> {
+								return [
+									{
+										json: parseHeaders(response.headers),
+									},
+								];
+							},
+						],
+					},
+				},
+				action: 'Delete blob',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Retrieve data for a specific blob',
+				routing: {
+					request: {
+						ignoreHttpStatusErrors: true,
+						method: 'GET',
+						url: '=/{{ $parameter["container"] }}/{{ $parameter["blob"] }}',
+						headers: {
+							[HeaderConstants.X_MS_DATE]: '={{ new Date().toUTCString() }}',
+							[HeaderConstants.X_MS_VERSION]: XMsVersion,
+						},
+						encoding: 'arraybuffer',
+					},
+					output: {
+						postReceive: [
+							handleErrorPostReceive,
+							async function (
+								this: IExecuteSingleFunctions,
+								_data: INodeExecutionData[],
+								response: IN8nHttpFullResponse,
+							): Promise<INodeExecutionData[]> {
+								const headerData = parseHeaders(response.headers);
+								const simplify = this.getNodeParameter('options.simplify', true) as boolean;
+								if (simplify) {
+									delete headerData.acceptRanges;
+									delete headerData.server;
+									delete headerData.requestId;
+									delete headerData.version;
+									delete headerData.date;
+									delete headerData.connection;
+								}
+
+								const { metadata, ...properties } = headerData;
+
+								const newItem: INodeExecutionData = {
+									json: {
+										name: (this.getNodeParameter('blob') as INodeParameterResourceLocator).value,
+										properties,
+										...(metadata ? { metadata: metadata as IDataObject } : {}),
+									},
+									binary: {},
+								};
+
+								let fileName: string | undefined;
+								if (headerData.contentDisposition) {
+									let fileNameMatch =
+										/filename\*=(?:(\\?['"])(.*?)\1|(?:[^\s]+'.*?')?([^;\n]*))/g.exec(
+											headerData.contentDisposition as string,
+										);
+									fileName =
+										fileNameMatch && fileNameMatch.length > 1
+											? fileNameMatch[3] || fileNameMatch[2]
+											: undefined;
+									if (fileName) {
+										fileName = decodeURIComponent(fileName);
+									} else {
+										fileNameMatch = /filename="?([^"]*?)"?(;|$)/g.exec(
+											headerData.contentDisposition as string,
+										);
+										fileName =
+											fileNameMatch && fileNameMatch.length > 1 ? fileNameMatch[1] : undefined;
+									}
+								}
+
+								// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+								newItem.binary!.data = await this.helpers.prepareBinaryData(
+									response.body as Buffer,
+									fileName,
+									headerData.contentType as string,
+								);
+
+								return [newItem];
+							},
+						],
+					},
+				},
+				action: 'Get blob',
+			},
+			{
+				name: 'Get Many',
+				value: 'getAll',
+				description: 'Retrieve a list of blobs',
+				routing: {
+					request: {
+						ignoreHttpStatusErrors: true,
+						method: 'GET',
+						qs: {
+							restype: 'container',
+							comp: 'list',
+						},
+						url: '=/{{ $parameter["container"] }}',
+						headers: {
+							[HeaderConstants.X_MS_DATE]: '={{ new Date().toUTCString() }}',
+							[HeaderConstants.X_MS_VERSION]: XMsVersion,
+						},
+					},
+					output: {
+						postReceive: [
+							handleErrorPostReceive,
+							async function (
+								this: IExecuteSingleFunctions,
+								data: INodeExecutionData[],
+								_response: IN8nHttpFullResponse,
+							): Promise<INodeExecutionData[]> {
+								const bodyData = await parseBlobList(data[0].json as unknown as string);
+								if (this.getNodeParameter('options.simplify', true)) {
+									for (const blob of bodyData.blobs) {
+										const properties = blob.properties as IDataObject;
+										if (!properties.cacheControl) delete properties.cacheControl;
+										if (!properties.contentCRC64) delete properties.contentCRC64;
+										if (!properties.contentEncoding) delete properties.contentEncoding;
+										if (!properties.contentLanguage) delete properties.contentLanguage;
+										if (!properties.contentDisposition) delete properties.contentDisposition;
+										delete properties.accessTier;
+										delete properties.accessTierChangeTime;
+										delete properties.accessTierInferred;
+									}
+								}
+								return [
+									{
+										json: bodyData,
+									},
+								];
+							},
+						],
+					},
+				},
+				action: 'Get many blobs',
+			},
+		],
+		default: 'getAll',
+	},
+];
+
+const createFields: INodeProperties[] = [
+	{
+		displayName: 'Container',
+		name: 'container',
+		default: {
+			mode: 'list',
+			value: '',
+		},
+		description: 'Container to create or replace a blob in',
+		displayOptions: {
+			show: {
+				resource: ['blob'],
+				operation: ['create'],
+			},
+		},
+		modes: [
+			{
+				displayName: 'From List',
+				name: 'list',
+				type: 'list',
+				typeOptions: {
+					searchListMethod: 'getContainers',
+					searchable: true,
+				},
+			},
+			{
+				displayName: 'By Name',
+				name: 'id',
+				placeholder: 'e.g. mycontainer',
+				type: 'string',
+			},
+		],
+		required: true,
+		type: 'resourceLocator',
+	},
+	{
+		displayName: 'Blob Name',
+		name: 'blobCreate',
+		default: '',
+		description: 'The name of the new or existing blob',
+		displayOptions: {
+			show: {
+				resource: ['blob'],
+				operation: ['create'],
+			},
+		},
+		placeholder: 'e.g. myblob',
+		required: true,
+		type: 'string',
+		validateType: 'string',
+	},
+	{
+		displayName: 'From',
+		name: 'from',
+		default: 'binary',
+		displayOptions: {
+			show: {
+				resource: ['blob'],
+				operation: ['create'],
+			},
+		},
+		options: [
+			{
+				name: 'Binary',
+				value: 'binary',
+			},
+			{
+				name: 'URL',
+				value: 'url',
+			},
+		],
+		required: true,
+		type: 'options',
+	},
+	{
+		displayName: 'Binary Contents',
+		name: 'binaryPropertyName',
+		default: 'data',
+		description: 'The name of the input binary field containing the file to be written',
+		displayOptions: {
+			show: {
+				resource: ['blob'],
+				operation: ['create'],
+				from: ['binary'],
+			},
+		},
+		required: true,
+		routing: {
+			send: {
+				preSend: [
+					async function (
+						this: IExecuteSingleFunctions,
+						requestOptions: IHttpRequestOptions,
+					): Promise<IHttpRequestOptions> {
+						const binaryPropertyName = this.getNodeParameter('binaryPropertyName') as string;
+
+						const binaryData = this.helpers.assertBinaryData(binaryPropertyName);
+						const binaryDataBuffer = await this.helpers.getBinaryDataBuffer(binaryPropertyName);
+
+						requestOptions.headers ??= {};
+						requestOptions.headers[HeaderConstants.CONTENT_LENGTH] = binaryDataBuffer.length;
+						requestOptions.headers[HeaderConstants.X_MS_BLOB_TYPE] = 'BlockBlob';
+						if (binaryData.mimeType) {
+							requestOptions.headers[HeaderConstants.CONTENT_TYPE] = binaryData.mimeType;
+						}
+						if (binaryData.fileName) {
+							requestOptions.headers[HeaderConstants.X_MS_BLOB_CONTENT_DISPOSITION] =
+								`attachment; filename="${binaryData.fileName}"`;
+						}
+
+						requestOptions.body = binaryDataBuffer;
+
+						return requestOptions;
+					},
+				],
+			},
+		},
+		type: 'string',
+	},
+	{
+		displayName: 'URL',
+		name: 'url',
+		default: '',
+		description: 'URL where to read of the blob contents from',
+		displayOptions: {
+			show: {
+				resource: ['blob'],
+				operation: ['create'],
+				from: ['url'],
+			},
+		},
+		required: true,
+		routing: {
+			send: {
+				preSend: [
+					async function (
+						this: IExecuteSingleFunctions,
+						requestOptions: IHttpRequestOptions,
+					): Promise<IHttpRequestOptions> {
+						const url = this.getNodeParameter('url') as string;
+
+						requestOptions.headers ??= {};
+
+						// Documentation specifies Content-Length: 0, but this causes invalid signature for SharedKey:
+						// Required. Specifies the number of bytes being transmitted in the request body. The value of this header must be set to 0. When the length isn't 0, the operation fails with the status code 400 (Bad Request).
+						// requestOptions.headers[HeaderConstants.CONTENT_LENGTH] = 0;
+
+						requestOptions.headers[HeaderConstants.X_MS_BLOB_TYPE] = 'BlockBlob';
+						requestOptions.headers[HeaderConstants.X_MS_COPY_SOURCE] = url;
+
+						return requestOptions;
+					},
+				],
+			},
+		},
+		placeholder: 'e.g. https://example.com/image.jpg',
+		type: 'string',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['blob'],
+				operation: ['create'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Access Tier',
+				name: 'accessTier',
+				description:
+					'The tier to be set on the blob. For detailed information about block blob tiering, see <a href="https://learn.microsoft.com/en-us/azure/storage/blobs/access-tiers-overview">Hot, cool, and archive storage tiers</a>.',
+				default: 'Hot',
+				options: [
+					{
+						name: 'Archive',
+						value: 'Archive',
+					},
+					{
+						name: 'Cold',
+						value: 'Cold',
+					},
+					{
+						name: 'Cool',
+						value: 'Cool',
+					},
+					{
+						name: 'Hot',
+						value: 'Hot',
+					},
+				],
+				routing: {
+					request: {
+						headers: {
+							[HeaderConstants.X_MS_ACCESS_TIER]: '={{ $value || undefined }}',
+						},
+					},
+				},
+				type: 'options',
+				validateType: 'options',
+			},
+			{
+				displayName: 'Blob Type',
+				name: 'blobType',
+				description: 'Specifies the type of blob to create: block, page, or append blob',
+				default: 'BlockBlob',
+				displayOptions: {
+					show: {
+						'/from': ['binary'],
+					},
+				},
+				routing: {
+					request: {
+						headers: {
+							[HeaderConstants.X_MS_BLOB_TYPE]: '={{ $value || undefined }}',
+						},
+					},
+				},
+				type: 'options',
+				options: [
+					{
+						name: 'Block Blob',
+						value: 'BlockBlob',
+					},
+					{
+						name: 'Page Blob',
+						value: 'PageBlob',
+					},
+					{
+						name: 'Append Blob',
+						value: 'AppendBlob',
+					},
+				],
+				validateType: 'string',
+			},
+			{
+				displayName: 'Cache Control',
+				name: 'cacheControl',
+				description: "Sets the blob's cache control value",
+				default: '',
+				routing: {
+					request: {
+						headers: {
+							[HeaderConstants.X_MS_BLOB_CACHE_CONTROL]: '={{ $value || undefined }}',
+						},
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Content CRC64',
+				name: 'contentCrc64',
+				description: 'CRC64 hash of the blob content to verify its integrity during transport',
+				default: '',
+				routing: {
+					request: {
+						headers: {
+							[HeaderConstants.X_MS_CONTENT_CRC64]: '={{ $value || undefined }}',
+						},
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Content Encoding',
+				name: 'contentEncoding',
+				description: "Sets the blob's content encoding",
+				default: '',
+				routing: {
+					request: {
+						headers: {
+							[HeaderConstants.X_MS_BLOB_CONTENT_ENCODING]: '={{ $value || undefined }}',
+						},
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Content Language',
+				name: 'contentLanguage',
+				description: "Sets the blob's content language",
+				default: '',
+				routing: {
+					request: {
+						headers: {
+							[HeaderConstants.X_MS_BLOB_CONTENT_LANGUAGE]: '={{ $value || undefined }}',
+						},
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Content MD5',
+				name: 'contentMd5',
+				description: "Sets the blob's MD5 hash for integrity verification",
+				default: '',
+				routing: {
+					request: {
+						headers: {
+							[HeaderConstants.X_MS_BLOB_CONTENT_MD5]: '={{ $value || undefined }}',
+						},
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Content Type',
+				name: 'contentType',
+				description: "Sets the blob's content type",
+				default: '',
+				routing: {
+					request: {
+						headers: {
+							[HeaderConstants.X_MS_BLOB_CONTENT_TYPE]: '={{ $value || undefined }}',
+						},
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Encryption Context',
+				name: 'encryptionContext',
+				description:
+					'If the value is set it will set blob system metadata. Max length-1024. Valid only when Hierarchical Namespace is enabled for the account.',
+				default: '',
+				displayOptions: {
+					show: {
+						'/from': ['binary'],
+					},
+				},
+				routing: {
+					request: {
+						headers: {
+							[HeaderConstants.X_MS_ENCRYPTION_CONTEXT]: '={{ $value || undefined }}',
+						},
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Encryption Scope',
+				name: 'encryptionScope',
+				description: 'Indicates the encryption scope for encrypting the request contents',
+				default: '',
+				routing: {
+					request: {
+						headers: {
+							[HeaderConstants.X_MS_ENCRYPTION_SCOPE]: '={{ $value || undefined }}',
+						},
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Expiry Option',
+				name: 'expiryOption',
+				description:
+					'Specifies the expiration date option for the request. This header is valid for accounts with hierarchical namespace enabled.',
+				default: 'Absolute',
+				options: [
+					{
+						name: 'Expire',
+						value: 'Absolute',
+						description: 'Expiry Time must be specified',
+					},
+					{
+						name: 'Never Expire',
+						value: 'NeverExpire',
+						description: 'Sets the blob to never expire or removes the current expiration date',
+					},
+				],
+				routing: {
+					request: {
+						headers: {
+							[HeaderConstants.X_MS_EXPIRY_OPTION]: '={{ $value || undefined }}',
+						},
+					},
+				},
+				type: 'options',
+				validateType: 'options',
+			},
+			{
+				displayName: 'Expiry Time',
+				name: 'expiryTime',
+				description: 'Specifies the time when the blob is set to expire as an absolute time',
+				default: '',
+				displayOptions: {
+					hide: {
+						'/options.expiryOption': ['NeverExpire'],
+					},
+				},
+				routing: {
+					request: {
+						headers: {
+							[HeaderConstants.X_MS_EXPIRY_TIME]:
+								'={{ $value ? DateTime.fromISO($value).format("EEE, dd MMM yyyy HH:mm:ss ZZZ") : undefined }}',
+						},
+					},
+				},
+				type: 'dateTime',
+				validateType: 'dateTime',
+			},
+			{
+				displayName: 'Filename',
+				name: 'filename',
+				default: '',
+				routing: {
+					request: {
+						headers: {
+							[HeaderConstants.X_MS_BLOB_CONTENT_DISPOSITION]:
+								"={{ $value ? 'attachment; filename=\"' + $value + '\"' : undefined }}",
+						},
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Immutability Policy Date',
+				name: 'immutabilityPolicyUntilDate',
+				description:
+					'Specifies the retention-until date to be set on the blob. This is the date until which the blob can be protected from being modified or deleted.',
+				default: '',
+				displayOptions: {
+					show: {
+						'/from': ['binary'],
+					},
+				},
+				routing: {
+					request: {
+						headers: {
+							[HeaderConstants.X_MS_IMMUTABILITY_POLICY_UNTIL_DATE]:
+								'={{ $value ? DateTime.fromISO($value).format("EEE, dd MMM yyyy HH:mm:ss ZZZ") : undefined }}',
+						},
+					},
+				},
+				type: 'dateTime',
+				validateType: 'dateTime',
+			},
+			{
+				displayName: 'Immutability Policy Mode',
+				name: 'immutabilityPolicyMode',
+				description: 'Specifies the immutability policy mode to be set on the blob',
+				default: 'unlocked',
+				displayOptions: {
+					show: {
+						'/from': ['binary'],
+					},
+				},
+				options: [
+					{
+						name: 'Locked',
+						value: 'locked',
+						description: 'Users are prohibited from modifying the policy',
+					},
+					{
+						name: 'Unlocked',
+						value: 'unlocked',
+						description:
+							'Users can change the policy by increasing or decreasing the retention-until date',
+					},
+				],
+				routing: {
+					request: {
+						headers: {
+							[HeaderConstants.X_MS_IMMUTABILITY_POLICY_MODE]: '={{ $value || undefined }}',
+						},
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Lease ID',
+				name: 'leaseId',
+				description: 'Required if the blob has an active lease',
+				default: '',
+				routing: {
+					request: {
+						headers: {
+							[HeaderConstants.X_MS_LEASE_ID]: '={{ $value || undefined }}',
+						},
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Legal Hold',
+				name: 'legalHold',
+				description: 'Whether to set a legal hold on the blob',
+				default: false,
+				displayOptions: {
+					show: {
+						'/from': ['binary'],
+					},
+				},
+				routing: {
+					request: {
+						headers: {
+							[HeaderConstants.X_MS_LEGAL_HOLD]: '={{ $value?.toString() || undefined }}',
+						},
+					},
+				},
+				type: 'boolean',
+				validateType: 'boolean',
+			},
+			{
+				displayName: 'Metadata',
+				name: 'metadata',
+				default: [],
+				description: 'A name-value pair to associate with the blob as metadata',
+				options: [
+					{
+						name: 'metadataValues',
+						displayName: 'Metadata',
+						values: [
+							{
+								displayName: 'Field Name',
+								name: 'fieldName',
+								default: '',
+								description:
+									'Names must adhere to the naming rules for <a href="https://learn.microsoft.com/en-us/dotnet/csharp/language-reference/">C# identifiers</a>',
+								type: 'string',
+							},
+							{
+								displayName: 'Field Value',
+								name: 'fieldValue',
+								default: '',
+								type: 'string',
+							},
+						],
+					},
+				],
+				placeholder: 'Add metadata',
+				routing: {
+					send: {
+						preSend: [
+							async function (
+								this: IExecuteSingleFunctions,
+								requestOptions: IHttpRequestOptions,
+							): Promise<IHttpRequestOptions> {
+								requestOptions.headers ??= {};
+								const metadata = this.getNodeParameter('options.metadata') as IDataObject;
+								for (const data of metadata.metadataValues as IDataObject[]) {
+									requestOptions.headers[
+										`${HeaderConstants.PREFIX_X_MS_META}${data.fieldName as string}`
+									] = data.fieldValue as string;
+								}
+								return requestOptions;
+							},
+						],
+					},
+				},
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: true,
+				},
+			},
+			{
+				displayName: 'Origin',
+				name: 'origin',
+				description:
+					'Specifies the origin from which the request is issued. The presence of this header results in cross-origin resource sharing (CORS) headers on the response. For more information, see <a href="https://learn.microsoft.com/en-us/rest/api/storageservices/cross-origin-resource-sharing--cors--support-for-the-azure-storage-services">CORS support for the Azure Storage services</a>.',
+				default: '',
+				routing: {
+					request: {
+						headers: {
+							[HeaderConstants.ORIGIN]: '={{ $value || undefined }}',
+						},
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Tags',
+				name: 'tags',
+				description: 'Sets the given tags on the blob',
+				default: [],
+				options: [
+					{
+						name: 'tagValues',
+						displayName: 'Tag',
+						values: [
+							{
+								displayName: 'Tag Name',
+								name: 'tagName',
+								default: '',
+								type: 'string',
+							},
+							{
+								displayName: 'Tag Value',
+								name: 'tagValue',
+								default: '',
+								type: 'string',
+							},
+						],
+					},
+				],
+				placeholder: 'Add tag',
+				routing: {
+					send: {
+						preSend: [
+							async function (
+								this: IExecuteSingleFunctions,
+								requestOptions: IHttpRequestOptions,
+							): Promise<IHttpRequestOptions> {
+								requestOptions.headers ??= {};
+								const tags = this.getNodeParameter('options.tags') as IDataObject;
+								requestOptions.headers[HeaderConstants.X_MS_TAGS] = (
+									tags.tagValues as IDataObject[]
+								)
+									.map(
+										(tag) =>
+											`${encodeURIComponent(tag.tagName as string)}=${encodeURIComponent(tag.tagValue as string)}`,
+									)
+									.join('&');
+								return requestOptions;
+							},
+						],
+					},
+				},
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: true,
+				},
+			},
+		],
+		placeholder: 'Add option',
+		type: 'collection',
+	},
+];
+
+const deleteFields: INodeProperties[] = [
+	{
+		displayName: 'Container',
+		name: 'container',
+		default: {
+			mode: 'list',
+			value: '',
+		},
+		description: 'Container to delete a blob from',
+		displayOptions: {
+			show: {
+				resource: ['blob'],
+				operation: ['delete'],
+			},
+		},
+		modes: [
+			{
+				displayName: 'From List',
+				name: 'list',
+				type: 'list',
+				typeOptions: {
+					searchListMethod: 'getContainers',
+					searchable: true,
+				},
+			},
+			{
+				displayName: 'By Name',
+				name: 'id',
+				placeholder: 'e.g. mycontainer',
+				type: 'string',
+			},
+		],
+		required: true,
+		type: 'resourceLocator',
+	},
+	{
+		displayName: 'Blob',
+		name: 'blob',
+		default: {
+			mode: 'list',
+			value: '',
+		},
+		description: 'Blob to be deleted',
+		displayOptions: {
+			show: {
+				resource: ['blob'],
+				operation: ['delete'],
+			},
+		},
+		modes: [
+			{
+				displayName: 'From List',
+				name: 'list',
+				type: 'list',
+				typeOptions: {
+					searchListMethod: 'getBlobs',
+					searchable: true,
+				},
+			},
+			{
+				displayName: 'By Name',
+				name: 'id',
+				placeholder: 'e.g. myblob',
+				type: 'string',
+			},
+		],
+		required: true,
+		type: 'resourceLocator',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['blob'],
+				operation: ['delete'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Lease ID',
+				name: 'leaseId',
+				description: 'Required if the blob has an active lease',
+				default: '',
+				routing: {
+					request: {
+						headers: {
+							[HeaderConstants.X_MS_LEASE_ID]: '={{ $value || undefined }}',
+						},
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+		],
+		placeholder: 'Add option',
+		type: 'collection',
+	},
+];
+
+const getFields: INodeProperties[] = [
+	{
+		displayName: 'Container',
+		name: 'container',
+		default: {
+			mode: 'list',
+			value: '',
+		},
+		description: 'Container to get a blob from',
+		displayOptions: {
+			show: {
+				resource: ['blob'],
+				operation: ['get'],
+			},
+		},
+		modes: [
+			{
+				displayName: 'From List',
+				name: 'list',
+				type: 'list',
+				typeOptions: {
+					searchListMethod: 'getContainers',
+					searchable: true,
+				},
+			},
+			{
+				displayName: 'By Name',
+				name: 'id',
+				placeholder: 'e.g. mycontainer',
+				type: 'string',
+			},
+		],
+		required: true,
+		type: 'resourceLocator',
+	},
+	{
+		displayName: 'Blob',
+		name: 'blob',
+		default: {
+			mode: 'list',
+			value: '',
+		},
+		description: 'Blob to get',
+		displayOptions: {
+			show: {
+				resource: ['blob'],
+				operation: ['get'],
+			},
+		},
+		modes: [
+			{
+				displayName: 'From List',
+				name: 'list',
+				type: 'list',
+				typeOptions: {
+					searchListMethod: 'getBlobs',
+					searchable: true,
+				},
+			},
+			{
+				displayName: 'By Name',
+				name: 'id',
+				placeholder: 'e.g. myblob',
+				type: 'string',
+			},
+		],
+		required: true,
+		type: 'resourceLocator',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['blob'],
+				operation: ['get'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Lease ID',
+				name: 'leaseId',
+				description:
+					"If this header is specified, the operation is performed only if both of the following conditions are met: <ul><li>The blob's lease is currently active.</li><li>The lease ID that's specified in the request matches the lease ID of the blob.</li></ul>",
+				default: '',
+				routing: {
+					request: {
+						headers: {
+							[HeaderConstants.X_MS_LEASE_ID]: '={{ $value || undefined }}',
+						},
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Origin',
+				name: 'origin',
+				description:
+					'Specifies the origin from which the request is issued. The presence of this header results in cross-origin resource sharing (CORS) headers on the response.',
+				default: '',
+				routing: {
+					request: {
+						headers: {
+							[HeaderConstants.ORIGIN]: '={{ $value || undefined }}',
+						},
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Simplify',
+				name: 'simplify',
+				type: 'boolean',
+				default: true,
+				description:
+					'Whether to return a simplified version of the response instead of the raw data',
+			},
+			{
+				displayName: 'UPN',
+				name: 'upn',
+				description:
+					"Whether the user identity values that are returned in the response will be transformed from Microsoft Entra object IDs to User Principal Names. If the value is false, they're returned as Microsoft Entra object IDs. Valid for accounts with hierarchical namespace enabled.",
+				default: false,
+				routing: {
+					request: {
+						headers: {
+							[HeaderConstants.X_MS_UPN]: '={{ $value?.toString() || undefined }}',
+						},
+					},
+				},
+				type: 'boolean',
+				validateType: 'boolean',
+			},
+		],
+		placeholder: 'Add option',
+		type: 'collection',
+	},
+];
+
+const getAllFields: INodeProperties[] = [
+	{
+		displayName: 'Container',
+		name: 'container',
+		default: {
+			mode: 'list',
+			value: '',
+		},
+		description: 'Container to get blobs from',
+		displayOptions: {
+			show: {
+				resource: ['blob'],
+				operation: ['getAll'],
+			},
+		},
+		modes: [
+			{
+				displayName: 'From List',
+				name: 'list',
+				type: 'list',
+				typeOptions: {
+					searchListMethod: 'getContainers',
+					searchable: true,
+				},
+			},
+			{
+				displayName: 'By Name',
+				name: 'id',
+				placeholder: 'e.g. mycontainer',
+				type: 'string',
+			},
+		],
+		required: true,
+		type: 'resourceLocator',
+	},
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		default: false,
+		description: 'Whether to return all results or only up to a given limit',
+		displayOptions: {
+			show: {
+				resource: ['blob'],
+				operation: ['getAll'],
+			},
+		},
+		routing: {
+			send: {
+				paginate: '={{ $value }}',
+			},
+			operations: {
+				async pagination(
+					this: IExecutePaginationFunctions,
+					requestOptions: DeclarativeRestApiSettings.ResultOptions,
+				): Promise<INodeExecutionData[]> {
+					let executions: INodeExecutionData[] = [];
+					let marker: string | undefined = undefined;
+					requestOptions.options.qs ??= {};
+
+					do {
+						requestOptions.options.qs.marker = marker;
+						const responseData = await this.makeRoutingRequest(requestOptions);
+						marker = responseData[0].json.nextMarker as string | undefined;
+						executions = executions.concat(
+							(responseData[0].json.blobs as IDataObject[]).map((item) => ({ json: item })),
+						);
+					} while (marker);
+
+					return executions;
+				},
+			},
+		},
+		type: 'boolean',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		default: 50,
+		description: 'Max number of results to return',
+		displayOptions: {
+			show: {
+				resource: ['blob'],
+				operation: ['getAll'],
+				returnAll: [false],
+			},
+		},
+		routing: {
+			send: {
+				property: 'maxresults',
+				type: 'query',
+				value: '={{ $value }}',
+			},
+			output: {
+				postReceive: [
+					async function (
+						this: IExecuteSingleFunctions,
+						data: INodeExecutionData[],
+						_response: IN8nHttpFullResponse,
+					): Promise<INodeExecutionData[]> {
+						return (data[0].json.blobs as IDataObject[]).map((item) => ({ json: item }));
+					},
+				],
+			},
+		},
+		type: 'number',
+		typeOptions: {
+			minValue: 1,
+		},
+		validateType: 'number',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['blob'],
+				operation: ['getAll'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Fields',
+				name: 'fields',
+				default: [],
+				description: 'The fields to add to the output',
+				options: [
+					{
+						name: 'Copy',
+						value: 'copy',
+						description:
+							'Specifies that metadata related to any current or previous Copy Blob operation should be included in the response',
+					},
+					{
+						name: 'Deleted',
+						value: 'deleted',
+						description: 'Specifies that soft-deleted blobs should be included in the response',
+					},
+					{
+						name: 'Deleted with Versions',
+						value: 'deletedwithversions',
+						description:
+							'Specifies that deleted blobs with any versions (active or deleted) should be included in the response. Items permanently deleted appear until processed by garbage collection.',
+					},
+					{
+						name: 'Immutability Policy',
+						value: 'immutabilitypolicy',
+						description:
+							'Specifies that the enumeration should include the immutability policy until date, and the immutability policy mode of the blobs',
+					},
+					{
+						name: 'Legal Hold',
+						value: 'legalhold',
+						description: 'Specifies that the enumeration should include the legal hold of blobs',
+					},
+					{
+						name: 'Metadata',
+						value: 'metadata',
+						description: 'Specifies that blob metadata be returned in the response',
+					},
+					{
+						name: 'Permissions',
+						value: 'permissions',
+						description:
+							'Includes the owner, group, permissions, and access control list for the listed blobs or directories. Supported only for accounts with a hierarchical namespace enabled.',
+					},
+					{
+						name: 'Snapshots',
+						value: 'snapshots',
+						description:
+							'Specifies that snapshots should be included in the enumeration. Snapshots are listed from oldest to newest in the response.',
+					},
+					{
+						name: 'Tags',
+						value: 'tags',
+						description:
+							'Specifies that user-defined, blob index tags should be included in the response',
+					},
+					{
+						name: 'Uncommitted Blobs',
+						value: 'uncommittedblobs',
+						description:
+							"Specifies that blobs for which blocks have been uploaded, but which haven't been committed",
+					},
+					{
+						name: 'Versions',
+						value: 'versions',
+						description: 'Specifies that versions of blobs should be included in the enumeration',
+					},
+				],
+				routing: {
+					send: {
+						property: 'include',
+						type: 'query',
+						value: '={{ $value.join(",") || undefined }}',
+					},
+				},
+				type: 'multiOptions',
+			},
+			{
+				displayName: 'Filter',
+				name: 'filter',
+				default: [],
+				description: 'The type of datasets to be returned',
+				options: [
+					{
+						name: 'Deleted',
+						value: 'deleted',
+						description:
+							'Only for accounts enabled with hierarchical namespace. When included, the list only contains soft-deleted blobs. POSIX ACL authorization fallback is not supported for listing soft-deleted blobs.',
+					},
+					{
+						name: 'Files',
+						value: 'files',
+						description:
+							'Only for accounts enabled with hierarchical namespace. When included, the list only contains files.',
+					},
+					{
+						name: 'Directories',
+						value: 'directories',
+						description:
+							'Only for accounts enabled with hierarchical namespace. When included, the list only contains directories.',
+					},
+				],
+				routing: {
+					send: {
+						property: 'showonly',
+						type: 'query',
+						value: '={{ $value.join(",") || undefined }}',
+					},
+				},
+				type: 'multiOptions',
+			},
+			{
+				displayName: 'Simplify',
+				name: 'simplify',
+				type: 'boolean',
+				default: true,
+				description:
+					'Whether to return a simplified version of the response instead of the raw data',
+			},
+			{
+				displayName: 'UPN',
+				name: 'upn',
+				description:
+					"Whether the user identity values that are returned in the response will be transformed from Microsoft Entra object IDs to User Principal Names. If the value is false, they're returned as Microsoft Entra object IDs. Valid for accounts with hierarchical namespace enabled.",
+				default: false,
+				routing: {
+					request: {
+						headers: {
+							[HeaderConstants.X_MS_UPN]: '={{ $value?.toString() || undefined }}',
+						},
+					},
+				},
+				type: 'boolean',
+				validateType: 'boolean',
+			},
+		],
+		placeholder: 'Add option',
+		type: 'collection',
+	},
+];
+
+export const blobFields: INodeProperties[] = [
+	...createFields,
+	...deleteFields,
+	...getFields,
+	...getAllFields,
+];
diff --git a/packages/nodes-base/nodes/Microsoft/Storage/descriptions/ContainerDescription.ts b/packages/nodes-base/nodes/Microsoft/Storage/descriptions/ContainerDescription.ts
new file mode 100644
index 0000000000..eff1902ce7
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Storage/descriptions/ContainerDescription.ts
@@ -0,0 +1,600 @@
+import type {
+	DeclarativeRestApiSettings,
+	IDataObject,
+	IExecutePaginationFunctions,
+	IExecuteSingleFunctions,
+	IHttpRequestOptions,
+	IN8nHttpFullResponse,
+	INodeExecutionData,
+	INodeProperties,
+	ResourceMapperValue,
+} from 'n8n-workflow';
+import { NodeOperationError } from 'n8n-workflow';
+
+import {
+	handleErrorPostReceive,
+	HeaderConstants,
+	parseContainerList,
+	parseHeaders,
+	XMsVersion,
+} from '../GenericFunctions';
+
+export const containerOperations: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		displayOptions: {
+			show: {
+				resource: ['container'],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a container',
+				routing: {
+					request: {
+						ignoreHttpStatusErrors: true,
+						method: 'PUT',
+						qs: {
+							restype: 'container',
+						},
+						url: '=/{{ $parameter["containerCreate"] }}',
+						headers: {
+							[HeaderConstants.X_MS_DATE]: '={{ new Date().toUTCString() }}',
+							[HeaderConstants.X_MS_VERSION]: XMsVersion,
+						},
+					},
+					output: {
+						postReceive: [
+							handleErrorPostReceive,
+							async function (
+								this: IExecuteSingleFunctions,
+								_data: INodeExecutionData[],
+								response: IN8nHttpFullResponse,
+							): Promise<INodeExecutionData[]> {
+								return [
+									{
+										json: parseHeaders(response.headers),
+									},
+								];
+							},
+						],
+					},
+				},
+				action: 'Create container',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a container',
+				routing: {
+					request: {
+						ignoreHttpStatusErrors: true,
+						method: 'DELETE',
+						qs: {
+							restype: 'container',
+						},
+						url: '=/{{ $parameter["container"] }}',
+						headers: {
+							[HeaderConstants.X_MS_DATE]: '={{ new Date().toUTCString() }}',
+							[HeaderConstants.X_MS_VERSION]: XMsVersion,
+						},
+					},
+					output: {
+						postReceive: [
+							handleErrorPostReceive,
+							async function (
+								this: IExecuteSingleFunctions,
+								_data: INodeExecutionData[],
+								response: IN8nHttpFullResponse,
+							): Promise<INodeExecutionData[]> {
+								return [
+									{
+										json: parseHeaders(response.headers),
+									},
+								];
+							},
+						],
+					},
+				},
+				action: 'Delete container',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Retrieve data for a specific container',
+				routing: {
+					request: {
+						ignoreHttpStatusErrors: true,
+						method: 'GET',
+						qs: {
+							restype: 'container',
+						},
+						url: '=/{{ $parameter["container"] }}',
+						headers: {
+							[HeaderConstants.X_MS_DATE]: '={{ new Date().toUTCString() }}',
+							[HeaderConstants.X_MS_VERSION]: XMsVersion,
+						},
+					},
+					output: {
+						postReceive: [
+							handleErrorPostReceive,
+							async function (
+								this: IExecuteSingleFunctions,
+								_data: INodeExecutionData[],
+								response: IN8nHttpFullResponse,
+							): Promise<INodeExecutionData[]> {
+								const { metadata, ...properties } = parseHeaders(response.headers);
+								const simplify = this.getNodeParameter('options.simplify', true) as boolean;
+								if (simplify) {
+									delete properties.contentLength;
+									delete properties.server;
+									delete properties.requestId;
+									delete properties.version;
+									delete properties.date;
+									delete properties.connection;
+								}
+								return [
+									{
+										json: {
+											name: (this.getNodeParameter('container') as ResourceMapperValue).value,
+											properties,
+											...(metadata ? { metadata: metadata as IDataObject } : {}),
+										},
+									},
+								];
+							},
+						],
+					},
+				},
+				action: 'Get container',
+			},
+			{
+				name: 'Get Many',
+				value: 'getAll',
+				description: 'Retrieve a list of containers',
+				routing: {
+					request: {
+						ignoreHttpStatusErrors: true,
+						method: 'GET',
+						qs: {
+							comp: 'list',
+						},
+						url: '/',
+						headers: {
+							[HeaderConstants.X_MS_DATE]: '={{ new Date().toUTCString() }}',
+							[HeaderConstants.X_MS_VERSION]: XMsVersion,
+						},
+					},
+					output: {
+						postReceive: [
+							handleErrorPostReceive,
+							async function (
+								this: IExecuteSingleFunctions,
+								data: INodeExecutionData[],
+								_response: IN8nHttpFullResponse,
+							): Promise<INodeExecutionData[]> {
+								return [
+									{
+										json: await parseContainerList(data[0].json as unknown as string),
+									},
+								];
+							},
+						],
+					},
+				},
+				action: 'Get many container',
+			},
+		],
+		default: 'getAll',
+	},
+];
+
+const createFields: INodeProperties[] = [
+	{
+		displayName: 'Container Name',
+		name: 'containerCreate',
+		default: '',
+		description: 'The name of the new container',
+		displayOptions: {
+			show: {
+				resource: ['container'],
+				operation: ['create'],
+			},
+		},
+		placeholder: 'e.g. mycontainer',
+		required: true,
+		routing: {
+			send: {
+				preSend: [
+					async function (
+						this: IExecuteSingleFunctions,
+						requestOptions: IHttpRequestOptions,
+					): Promise<IHttpRequestOptions> {
+						const container = this.getNodeParameter('containerCreate') as string;
+						if (container.length < 3 || container.length > 63) {
+							throw new NodeOperationError(
+								this.getNode(),
+								"'Container Name' must be from 3 through 63 characters long",
+							);
+						}
+						if (/[A-Z]/.test(container)) {
+							throw new NodeOperationError(
+								this.getNode(),
+								"All letters  in 'Container Name' must be lowercase",
+							);
+						}
+						if (!/^[a-z0-9-]+$/.test(container)) {
+							throw new NodeOperationError(
+								this.getNode(),
+								"'Container Name' can contain only letters, numbers, and the hyphen/minus (-) character",
+							);
+						}
+						if (!/^[a-z0-9].*[a-z0-9]$/.test(container)) {
+							throw new NodeOperationError(
+								this.getNode(),
+								"'Container Name' must start or end with a letter or number",
+							);
+						}
+						if (/--/.test(container)) {
+							throw new NodeOperationError(
+								this.getNode(),
+								"Consecutive hyphens are not permitted in 'Container Name'",
+							);
+						}
+
+						return requestOptions;
+					},
+				],
+			},
+		},
+		type: 'string',
+		validateType: 'string',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['container'],
+				operation: ['create'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Access Level',
+				name: 'accessLevel',
+				default: '',
+				options: [
+					{
+						name: 'Blob',
+						value: 'blob',
+						description:
+							"Specifies public read access for blobs. Blob data within this container can be read via anonymous request, but container data isn't available. Clients can't enumerate blobs within the container via anonymous request.",
+					},
+					{
+						name: 'Container',
+						value: 'container',
+						description:
+							"Specifies full public read access for container and blob data. Clients can enumerate blobs within the container via anonymous request, but they can't enumerate containers within the storage account.",
+					},
+					{
+						name: 'Private',
+						value: '',
+						description: 'Container data is private to the account owner',
+					},
+				],
+				routing: {
+					request: {
+						headers: {
+							[HeaderConstants.X_MS_BLOB_PUBLIC_ACCESS]: '={{ $value || undefined }}',
+						},
+					},
+				},
+				type: 'options',
+				validateType: 'options',
+			},
+			{
+				displayName: 'Metadata',
+				name: 'metadata',
+				default: [],
+				description: 'A name-value pair to associate with the container as metadata',
+				options: [
+					{
+						name: 'metadataValues',
+						displayName: 'Metadata',
+						values: [
+							{
+								displayName: 'Field Name',
+								name: 'fieldName',
+								default: '',
+								description:
+									'Names must adhere to the naming rules for <a href="https://learn.microsoft.com/en-us/dotnet/csharp/language-reference/">C# identifiers</a>',
+								type: 'string',
+							},
+							{
+								displayName: 'Field Value',
+								name: 'fieldValue',
+								default: '',
+								type: 'string',
+							},
+						],
+					},
+				],
+				placeholder: 'Add metadata',
+				routing: {
+					send: {
+						preSend: [
+							async function (
+								this: IExecuteSingleFunctions,
+								requestOptions: IHttpRequestOptions,
+							): Promise<IHttpRequestOptions> {
+								requestOptions.headers ??= {};
+								const metadata = this.getNodeParameter('options.metadata') as IDataObject;
+								for (const data of metadata.metadataValues as IDataObject[]) {
+									requestOptions.headers[
+										`${HeaderConstants.PREFIX_X_MS_META}${data.fieldName as string}`
+									] = data.fieldValue as string;
+								}
+								return requestOptions;
+							},
+						],
+					},
+				},
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: true,
+				},
+			},
+		],
+		placeholder: 'Add option',
+		type: 'collection',
+	},
+];
+
+const deleteFields: INodeProperties[] = [
+	{
+		displayName: 'Container',
+		name: 'container',
+		default: {
+			mode: 'list',
+			value: '',
+		},
+		description: 'Select the container to delete',
+		displayOptions: {
+			show: {
+				resource: ['container'],
+				operation: ['delete'],
+			},
+		},
+		modes: [
+			{
+				displayName: 'From List',
+				name: 'list',
+				type: 'list',
+				typeOptions: {
+					searchListMethod: 'getContainers',
+					searchable: true,
+				},
+			},
+			{
+				displayName: 'By Name',
+				name: 'id',
+				placeholder: 'e.g. mycontainer',
+				type: 'string',
+			},
+		],
+		required: true,
+		type: 'resourceLocator',
+	},
+];
+
+const getFields: INodeProperties[] = [
+	{
+		displayName: 'Container',
+		name: 'container',
+		default: {
+			mode: 'list',
+			value: '',
+		},
+		description: 'Select the container to get',
+		displayOptions: {
+			show: {
+				resource: ['container'],
+				operation: ['get'],
+			},
+		},
+		modes: [
+			{
+				displayName: 'From List',
+				name: 'list',
+				type: 'list',
+				typeOptions: {
+					searchListMethod: 'getContainers',
+					searchable: true,
+				},
+			},
+			{
+				displayName: 'By Name',
+				name: 'id',
+				placeholder: 'e.g. mycontainer',
+				type: 'string',
+			},
+		],
+		required: true,
+		type: 'resourceLocator',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['container'],
+				operation: ['get'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Simplify',
+				name: 'simplify',
+				type: 'boolean',
+				default: true,
+				description:
+					'Whether to return a simplified version of the response instead of the raw data',
+			},
+		],
+		placeholder: 'Add option',
+		type: 'collection',
+	},
+];
+
+const getAllFields: INodeProperties[] = [
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		default: false,
+		description: 'Whether to return all results or only up to a given limit',
+		displayOptions: {
+			show: {
+				resource: ['container'],
+				operation: ['getAll'],
+			},
+		},
+		routing: {
+			send: {
+				paginate: '={{ $value }}',
+			},
+			operations: {
+				async pagination(
+					this: IExecutePaginationFunctions,
+					requestOptions: DeclarativeRestApiSettings.ResultOptions,
+				): Promise<INodeExecutionData[]> {
+					let executions: INodeExecutionData[] = [];
+					let marker: string | undefined = undefined;
+					requestOptions.options.qs ??= {};
+
+					do {
+						requestOptions.options.qs.marker = marker;
+						const responseData = await this.makeRoutingRequest(requestOptions);
+						marker = responseData[0].json.nextMarker as string | undefined;
+						executions = executions.concat(
+							(responseData[0].json.containers as IDataObject[]).map((item) => ({ json: item })),
+						);
+					} while (marker);
+
+					return executions;
+				},
+			},
+		},
+		type: 'boolean',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		default: 50,
+		description: 'Max number of results to return',
+		displayOptions: {
+			show: {
+				resource: ['container'],
+				operation: ['getAll'],
+				returnAll: [false],
+			},
+		},
+		routing: {
+			send: {
+				property: 'maxresults',
+				type: 'query',
+				value: '={{ $value }}',
+			},
+			output: {
+				postReceive: [
+					async function (
+						this: IExecuteSingleFunctions,
+						data: INodeExecutionData[],
+						_response: IN8nHttpFullResponse,
+					): Promise<INodeExecutionData[]> {
+						return (data[0].json.containers as IDataObject[]).map((item) => ({ json: item }));
+					},
+				],
+			},
+		},
+		type: 'number',
+		typeOptions: {
+			minValue: 1,
+		},
+		validateType: 'number',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['container'],
+				operation: ['getAll'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Fields',
+				name: 'fields',
+				default: [],
+				description: 'The fields to add to the output',
+				options: [
+					{
+						name: 'Metadata',
+						value: 'metadata',
+					},
+					{
+						name: 'Deleted',
+						value: 'deleted',
+					},
+					{
+						name: 'System',
+						value: 'system',
+					},
+				],
+				routing: {
+					send: {
+						property: 'include',
+						type: 'query',
+						value: '={{ $value.join(",") || undefined }}',
+					},
+				},
+				type: 'multiOptions',
+			},
+			{
+				displayName: 'Filter',
+				name: 'filter',
+				default: '',
+				description:
+					'Filters the results to return only containers with a name that begins with the specified prefix',
+				placeholder: 'e.g. mycontainer',
+				routing: {
+					send: {
+						property: 'prefix',
+						type: 'query',
+						value: '={{ $value ? $value : undefined }}',
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+		],
+		placeholder: 'Add option',
+		type: 'collection',
+	},
+];
+
+export const containerFields: INodeProperties[] = [
+	...createFields,
+	...deleteFields,
+	...getFields,
+	...getAllFields,
+];
diff --git a/packages/nodes-base/nodes/Microsoft/Storage/descriptions/index.ts b/packages/nodes-base/nodes/Microsoft/Storage/descriptions/index.ts
new file mode 100644
index 0000000000..d21ede5252
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Storage/descriptions/index.ts
@@ -0,0 +1,2 @@
+export * from './BlobDescription';
+export * from './ContainerDescription';
diff --git a/packages/nodes-base/nodes/Microsoft/Storage/test/blob/create.test.ts b/packages/nodes-base/nodes/Microsoft/Storage/test/blob/create.test.ts
new file mode 100644
index 0000000000..1475749e52
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Storage/test/blob/create.test.ts
@@ -0,0 +1,72 @@
+import nock from 'nock';
+
+import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
+
+describe('Azure Storage Node', () => {
+	const workflows = ['nodes/Microsoft/Storage/test/workflows/blob_create.workflow.json'];
+	const workflowTests = workflowToTests(workflows);
+
+	beforeEach(() => {
+		// https://github.com/nock/nock/issues/2057#issuecomment-663665683
+		if (!nock.isActive()) {
+			nock.activate();
+		}
+	});
+
+	describe('should create blob', () => {
+		const nodeTypes = setup(workflowTests);
+
+		for (const workflow of workflowTests) {
+			workflow.nock = {
+				baseUrl: 'https://myaccount.blob.core.windows.net',
+				mocks: [
+					{
+						method: 'put',
+						path: '/mycontainer/myblob',
+						statusCode: 201,
+						requestHeaders: {
+							'x-ms-access-tier': 'Hot',
+							'x-ms-blob-type': 'BlockBlob',
+							'x-ms-blob-cache-control': 'no-cache',
+							'x-ms-content-crc64': '3EDB64E77CB16A4C',
+							'x-ms-blob-content-encoding': 'utf8',
+							'x-ms-blob-content-language': 'en-US',
+							'x-ms-blob-content-md5': 'b97f46db5f3be7709d942eefe30e5b45',
+							'x-ms-blob-content-type': 'application/json',
+							'x-ms-encryption-context': 'context',
+							'x-ms-encryption-scope': 'encryptionScope',
+							'x-ms-expiry-option': 'Absolute',
+							'x-ms-blob-content-disposition': 'attachment; filename="file.json"',
+							'x-ms-immutability-policy-until-date': 'Wed, 01 Jan 2025 00:00:00 -0500',
+							'x-ms-immutability-policy-mode': 'unlocked',
+							'x-ms-lease-id': 'leaseId123',
+							'x-ms-legal-hold': 'true',
+							'x-ms-meta-key1': 'value1',
+						},
+						responseBody: '',
+						responseHeaders: {
+							server: 'Azurite-Blob/3.33.0',
+							etag: '"0x22769D26D3F3740"',
+							'last-modified': 'Thu, 23 Jan 2025 17:53:23 GMT',
+							'content-md5': 'aWQGHD8kGQd5ZtEN/S1/aw==',
+							'x-ms-request-id': '75b87ee3-a7f7-468d-b7d1-e7e7b3173dab',
+							'x-ms-version': '2025-01-05',
+							date: 'Thu, 23 Jan 2025 17:53:23 GMT',
+							'x-ms-request-server-encrypted': 'true',
+							'keep-alive': 'timeout=5',
+							'content-length': '0',
+							'x-ms-version-id': 'Thu, 23 Jan 2025 17:53:23 GMT',
+							'access-control-allow-credentials': 'access-control-allow-credentials',
+							'access-control-allow-origin': 'access-control-allow-origin',
+							'access-control-expose-headers': 'access-control-expose-headers',
+							'x-ms-content-crc64': 'x-ms-content-crc64',
+							'x-ms-encryption-key-sha256': 'x-ms-encryption-key-sha256',
+							'x-ms-encryption-scope': 'x-ms-encryption-scope',
+						},
+					},
+				],
+			};
+			test(workflow.description, async () => await equalityTest(workflow, nodeTypes));
+		}
+	});
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Storage/test/blob/delete.test.ts b/packages/nodes-base/nodes/Microsoft/Storage/test/blob/delete.test.ts
new file mode 100644
index 0000000000..05f79edbb9
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Storage/test/blob/delete.test.ts
@@ -0,0 +1,41 @@
+import nock from 'nock';
+
+import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
+
+describe('Azure Storage Node', () => {
+	const workflows = ['nodes/Microsoft/Storage/test/workflows/blob_delete.workflow.json'];
+	const workflowTests = workflowToTests(workflows);
+
+	beforeEach(() => {
+		// https://github.com/nock/nock/issues/2057#issuecomment-663665683
+		if (!nock.isActive()) {
+			nock.activate();
+		}
+	});
+
+	describe('should delete blob', () => {
+		const nodeTypes = setup(workflowTests);
+
+		for (const workflow of workflowTests) {
+			workflow.nock = {
+				baseUrl: 'https://myaccount.blob.core.windows.net',
+				mocks: [
+					{
+						method: 'delete',
+						path: '/mycontainer/myblob',
+						statusCode: 202,
+						responseBody: '',
+						responseHeaders: {
+							'x-ms-request-id': '75b87ee3-a7f7-468d-b7d1-e7e7b3173dab',
+							'x-ms-version': '2025-01-05',
+							date: 'Thu, 23 Jan 2025 17:53:23 GMT',
+							'x-ms-delete-type-permanent': 'true',
+							'x-ms-client-request-id': 'x-ms-client-request-id',
+						},
+					},
+				],
+			};
+			test(workflow.description, async () => await equalityTest(workflow, nodeTypes));
+		}
+	});
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Storage/test/blob/get.test.ts b/packages/nodes-base/nodes/Microsoft/Storage/test/blob/get.test.ts
new file mode 100644
index 0000000000..d4e8f09b07
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Storage/test/blob/get.test.ts
@@ -0,0 +1,93 @@
+import nock from 'nock';
+
+import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
+
+describe('Azure Storage Node', () => {
+	const workflows = ['nodes/Microsoft/Storage/test/workflows/blob_get.workflow.json'];
+	const workflowTests = workflowToTests(workflows);
+
+	beforeEach(() => {
+		// https://github.com/nock/nock/issues/2057#issuecomment-663665683
+		if (!nock.isActive()) {
+			nock.activate();
+		}
+	});
+
+	describe('should get blob', () => {
+		const nodeTypes = setup(workflowTests);
+
+		for (const workflow of workflowTests) {
+			workflow.nock = {
+				baseUrl: 'https://myaccount.blob.core.windows.net',
+				mocks: [
+					{
+						method: 'get',
+						path: '/mycontainer/myblob',
+						statusCode: 200,
+						responseBody: {
+							type: 'Buffer',
+							data: [
+								123, 10, 34, 100, 97, 116, 97, 34, 58, 123, 10, 34, 109, 121, 95, 102, 105, 101,
+								108, 100, 95, 49, 34, 58, 34, 118, 97, 108, 117, 101, 34, 44, 10, 34, 109, 121, 95,
+								102, 105, 101, 108, 100, 95, 50, 34, 58, 49, 10, 125, 10, 125,
+							],
+						},
+						responseHeaders: {
+							'x-ms-request-id': '75b87ee3-a7f7-468d-b7d1-e7e7b3173dab',
+							'x-ms-version': '2025-01-05',
+							date: 'Thu, 23 Jan 2025 17:53:23 GMT',
+							'x-ms-client-request-id': 'x-ms-client-request-id',
+							'last-modified': 'last-modified',
+							'x-ms-creation-time': 'x-ms-creation-time',
+							'x-ms-tag-count': 'x-ms-tag-count',
+							'content-type': 'application/json',
+							'content-range': 'content-range',
+							etag: '"0x22769D26D3F3740"',
+							'content-md5': 'content-md5',
+							'x-ms-content-crc64': 'x-ms-content-crc64',
+							'content-encoding': 'content-encoding',
+							'content-language': 'content-language',
+							'cache-control': 'cache-control',
+							'content-disposition': 'attachment; filename="file.json"',
+							'x-ms-blob-sequence-number': 'x-ms-blob-sequence-number',
+							'x-ms-blob-type': 'x-ms-blob-type',
+							'x-ms-copy-completion-time': 'x-ms-copy-completion-time',
+							'x-ms-copy-status-description': 'x-ms-copy-status-description',
+							'x-ms-copy-id': 'x-ms-copy-id',
+							'x-ms-copy-progress': 'x-ms-copy-progress',
+							'x-ms-copy-source': 'x-ms-copy-source',
+							'x-ms-copy-status': 'x-ms-copy-status',
+							'x-ms-incremental-copy': 'x-ms-incremental-copy',
+							'x-ms-lease-duration': 'x-ms-lease-duration',
+							'x-ms-lease-state': 'x-ms-lease-state',
+							'x-ms-lease-status': 'x-ms-lease-status',
+							'accept-ranges': 'accept-ranges',
+							'access-control-allow-origin': 'access-control-allow-origin',
+							'access-control-expose-headers': 'access-control-expose-headers',
+							vary: 'vary',
+							'access-control-allow-credentials': 'access-control-allow-credentials',
+							'x-ms-blob-committed-block-count': 'x-ms-blob-committed-block-count',
+							'x-ms-server-encrypted': 'x-ms-server-encrypted',
+							'x-ms-encryption-key-sha256': 'x-ms-encryption-key-sha256',
+							'x-ms-encryption-context': 'x-ms-encryption-context',
+							'x-ms-encryption-scope': 'x-ms-encryption-scope',
+							'x-ms-blob-content-md5': 'x-ms-blob-content-md5',
+							'x-ms-last-access-time': 'x-ms-last-access-time',
+							'x-ms-blob-sealed': 'x-ms-blob-sealed',
+							'x-ms-immutability-policy-until-date': 'x-ms-immutability-policy-until-date',
+							'x-ms-immutability-policy-mode': 'x-ms-immutability-policy-mode',
+							'x-ms-legal-hold': 'x-ms-legal-hold',
+							'x-ms-owner': 'x-ms-owner',
+							'x-ms-group': 'x-ms-group',
+							'x-ms-permissions': 'x-ms-permissions',
+							'x-ms-acl': 'x-ms-acl',
+							'x-ms-resource-type': 'x-ms-resource-type',
+							'x-ms-meta-key1': 'value1',
+						},
+					},
+				],
+			};
+			test(workflow.description, async () => await equalityTest(workflow, nodeTypes));
+		}
+	});
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Storage/test/blob/getAll.test.ts b/packages/nodes-base/nodes/Microsoft/Storage/test/blob/getAll.test.ts
new file mode 100644
index 0000000000..9825dc79cf
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Storage/test/blob/getAll.test.ts
@@ -0,0 +1,42 @@
+import nock from 'nock';
+
+import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
+
+describe('Azure Storage Node', () => {
+	const workflows = ['nodes/Microsoft/Storage/test/workflows/blob_getAll.workflow.json'];
+	const workflowTests = workflowToTests(workflows);
+
+	beforeEach(() => {
+		// https://github.com/nock/nock/issues/2057#issuecomment-663665683
+		if (!nock.isActive()) {
+			nock.activate();
+		}
+	});
+
+	describe('should get all blobs', () => {
+		const nodeTypes = setup(workflowTests);
+
+		for (const workflow of workflowTests) {
+			workflow.nock = {
+				baseUrl: 'https://myaccount.blob.core.windows.net',
+				mocks: [
+					{
+						method: 'get',
+						path: '/mycontainer?restype=container&comp=list',
+						statusCode: 200,
+						responseBody:
+							'<?xml version="1.0" encoding="UTF-8" standalone="yes"?><EnumerationResults ServiceEndpoint="https://myaccount.blob.core.windows.net" ContainerName="item1"><Prefix/><Marker/><MaxResults>1</MaxResults><Blobs><Blob><Name>myblob1</Name><Properties><Creation-Time>Wed, 22 Jan 2025 18:53:15 GMT</Creation-Time><Last-Modified>Wed, 22 Jan 2025 18:53:15 GMT</Last-Modified><Etag>0x1F8268B228AA730</Etag><Content-Length>37</Content-Length><Content-Type>application/json</Content-Type><Content-MD5>aWQGHD8kGQd5ZtEN/S1/aw==</Content-MD5><BlobType>BlockBlob</BlobType><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><ServerEncrypted>true</ServerEncrypted><AccessTier>Hot</AccessTier><AccessTierInferred>true</AccessTierInferred><AccessTierChangeTime>Wed, 22 Jan 2025 18:53:15 GMT</AccessTierChangeTime></Properties></Blob></Blobs><NextMarker>myblob2</NextMarker></EnumerationResults>',
+					},
+					{
+						method: 'get',
+						path: '/mycontainer?restype=container&comp=list&marker=myblob2',
+						statusCode: 200,
+						responseBody:
+							'<?xml version="1.0" encoding="UTF-8" standalone="yes"?><EnumerationResults ServiceEndpoint="https://myaccount.blob.core.windows.net" ContainerName="item1"><Prefix/><Marker/><MaxResults>1</MaxResults><Blobs><Blob><Name>myblob1</Name><Properties><Creation-Time>Wed, 22 Jan 2025 18:53:15 GMT</Creation-Time><Last-Modified>Wed, 22 Jan 2025 18:53:15 GMT</Last-Modified><Etag>0x1F8268B228AA730</Etag><Content-Length>37</Content-Length><Content-Type>application/json</Content-Type><Content-MD5>aWQGHD8kGQd5ZtEN/S1/aw==</Content-MD5><BlobType>BlockBlob</BlobType><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><ServerEncrypted>true</ServerEncrypted><AccessTier>Hot</AccessTier><AccessTierInferred>true</AccessTierInferred><AccessTierChangeTime>Wed, 22 Jan 2025 18:53:15 GMT</AccessTierChangeTime></Properties></Blob></Blobs><NextMarker></NextMarker></EnumerationResults>',
+					},
+				],
+			};
+			test(workflow.description, async () => await equalityTest(workflow, nodeTypes));
+		}
+	});
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Storage/test/blob/getAllLimitOptions.test.ts b/packages/nodes-base/nodes/Microsoft/Storage/test/blob/getAllLimitOptions.test.ts
new file mode 100644
index 0000000000..a151a04285
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Storage/test/blob/getAllLimitOptions.test.ts
@@ -0,0 +1,37 @@
+import nock from 'nock';
+
+import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
+
+describe('Azure Storage Node', () => {
+	const workflows = [
+		'nodes/Microsoft/Storage/test/workflows/blob_getAllLimitOptions.workflow.json',
+	];
+	const workflowTests = workflowToTests(workflows);
+
+	beforeEach(() => {
+		// https://github.com/nock/nock/issues/2057#issuecomment-663665683
+		if (!nock.isActive()) {
+			nock.activate();
+		}
+	});
+
+	describe('should get all blobs with limit and options', () => {
+		const nodeTypes = setup(workflowTests);
+
+		for (const workflow of workflowTests) {
+			workflow.nock = {
+				baseUrl: 'https://myaccount.blob.core.windows.net',
+				mocks: [
+					{
+						method: 'get',
+						path: '/mycontainer?restype=container&comp=list&maxresults=1&include=copy%2Cdeleted%2Cdeletedwithversions%2Cimmutabilitypolicy%2Cmetadata%2Clegalhold%2Cversions%2Cuncommittedblobs%2Ctags%2Csnapshots%2Cpermissions&showonly=deleted%2Cfiles%2Cdirectories',
+						statusCode: 200,
+						responseBody:
+							'<?xml version="1.0" encoding="UTF-8" standalone="yes"?><EnumerationResults ServiceEndpoint="https://myaccount.blob.core.windows.net" ContainerName="item1"><Prefix/><Marker/><MaxResults>1</MaxResults><Blobs><Blob><Name>myblob1</Name><Properties><Creation-Time>Wed, 22 Jan 2025 18:53:15 GMT</Creation-Time><Last-Modified>Wed, 22 Jan 2025 18:53:15 GMT</Last-Modified><Etag>0x1F8268B228AA730</Etag><Content-Length>37</Content-Length><Content-Type>application/json</Content-Type><Content-MD5>aWQGHD8kGQd5ZtEN/S1/aw==</Content-MD5><BlobType>BlockBlob</BlobType><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><ServerEncrypted>true</ServerEncrypted><AccessTier>Hot</AccessTier><AccessTierInferred>true</AccessTierInferred><AccessTierChangeTime>Wed, 22 Jan 2025 18:53:15 GMT</AccessTierChangeTime></Properties></Blob></Blobs><NextMarker>myblob2</NextMarker></EnumerationResults>',
+					},
+				],
+			};
+			test(workflow.description, async () => await equalityTest(workflow, nodeTypes));
+		}
+	});
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Storage/test/container/create.test.ts b/packages/nodes-base/nodes/Microsoft/Storage/test/container/create.test.ts
new file mode 100644
index 0000000000..5cbca9859d
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Storage/test/container/create.test.ts
@@ -0,0 +1,44 @@
+import nock from 'nock';
+
+import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
+
+describe('Azure Storage Node', () => {
+	const workflows = ['nodes/Microsoft/Storage/test/workflows/container_create.workflow.json'];
+	const workflowTests = workflowToTests(workflows);
+
+	beforeEach(() => {
+		// https://github.com/nock/nock/issues/2057#issuecomment-663665683
+		if (!nock.isActive()) {
+			nock.activate();
+		}
+	});
+
+	describe('should create container', () => {
+		const nodeTypes = setup(workflowTests);
+
+		for (const workflow of workflowTests) {
+			workflow.nock = {
+				baseUrl: 'https://myaccount.blob.core.windows.net',
+				mocks: [
+					{
+						method: 'put',
+						path: '/mycontainer?restype=container',
+						statusCode: 201,
+						requestHeaders: { 'x-ms-blob-public-access': 'blob', 'x-ms-meta-key1': 'value1' },
+						responseBody: '',
+						responseHeaders: {
+							etag: '"0x22769D26D3F3740"',
+							'last-modified': 'Thu, 23 Jan 2025 17:53:23 GMT',
+							'x-ms-request-id': '75b87ee3-a7f7-468d-b7d1-e7e7b3173dab',
+							'x-ms-version': '2025-01-05',
+							date: 'Thu, 23 Jan 2025 17:53:23 GMT',
+							'x-ms-request-server-encrypted': 'true',
+							'x-ms-client-request-id': 'client-request-id-123',
+						},
+					},
+				],
+			};
+			test(workflow.description, async () => await equalityTest(workflow, nodeTypes));
+		}
+	});
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Storage/test/container/delete.test.ts b/packages/nodes-base/nodes/Microsoft/Storage/test/container/delete.test.ts
new file mode 100644
index 0000000000..3c24f07480
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Storage/test/container/delete.test.ts
@@ -0,0 +1,41 @@
+import nock from 'nock';
+
+import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
+
+describe('Azure Storage Node', () => {
+	const workflows = ['nodes/Microsoft/Storage/test/workflows/container_delete.workflow.json'];
+	const workflowTests = workflowToTests(workflows);
+
+	beforeEach(() => {
+		// https://github.com/nock/nock/issues/2057#issuecomment-663665683
+		if (!nock.isActive()) {
+			nock.activate();
+		}
+	});
+
+	describe('should delete container', () => {
+		const nodeTypes = setup(workflowTests);
+
+		for (const workflow of workflowTests) {
+			workflow.nock = {
+				baseUrl: 'https://myaccount.blob.core.windows.net',
+				mocks: [
+					{
+						method: 'delete',
+						path: '/mycontainer?restype=container',
+						statusCode: 202,
+						responseBody: '',
+						responseHeaders: {
+							'content-length': '0',
+							server: 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0',
+							'x-ms-request-id': 'ca3a8907-601e-0050-1929-723410000000',
+							'x-ms-version': '2020-10-02',
+							date: 'Wed, 29 Jan 2025 08:38:21 GMT',
+						},
+					},
+				],
+			};
+			test(workflow.description, async () => await equalityTest(workflow, nodeTypes));
+		}
+	});
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Storage/test/container/get.test.ts b/packages/nodes-base/nodes/Microsoft/Storage/test/container/get.test.ts
new file mode 100644
index 0000000000..50248d8fc2
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Storage/test/container/get.test.ts
@@ -0,0 +1,50 @@
+import nock from 'nock';
+
+import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
+
+describe('Azure Storage Node', () => {
+	const workflows = ['nodes/Microsoft/Storage/test/workflows/container_get.workflow.json'];
+	const workflowTests = workflowToTests(workflows);
+
+	beforeEach(() => {
+		// https://github.com/nock/nock/issues/2057#issuecomment-663665683
+		if (!nock.isActive()) {
+			nock.activate();
+		}
+	});
+
+	describe('should get container', () => {
+		const nodeTypes = setup(workflowTests);
+
+		for (const workflow of workflowTests) {
+			workflow.nock = {
+				baseUrl: 'https://myaccount.blob.core.windows.net',
+				mocks: [
+					{
+						method: 'get',
+						path: '/mycontainer?restype=container',
+						statusCode: 200,
+						responseBody: '',
+						responseHeaders: {
+							'content-length': '0',
+							'last-modified': 'Tue, 28 Jan 2025 16:40:21 GMT',
+							etag: '"0x8DD3FBA74CF3620"',
+							server: 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0',
+							'x-ms-request-id': '49edb268-b01e-0053-6e29-72d574000000',
+							'x-ms-version': '2020-10-02',
+							'x-ms-lease-status': 'unlocked',
+							'x-ms-lease-state': 'available',
+							'x-ms-has-immutability-policy': 'false',
+							'x-ms-has-legal-hold': 'false',
+							date: 'Wed, 29 Jan 2025 08:43:08 GMT',
+							'x-ms-meta-key1': 'field1',
+							'x-ms-blob-public-access': 'blob',
+							'x-ms-lease-duration': 'infinite',
+						},
+					},
+				],
+			};
+			test(workflow.description, async () => await equalityTest(workflow, nodeTypes));
+		}
+	});
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Storage/test/container/getAll.test.ts b/packages/nodes-base/nodes/Microsoft/Storage/test/container/getAll.test.ts
new file mode 100644
index 0000000000..3b6ea5ceaf
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Storage/test/container/getAll.test.ts
@@ -0,0 +1,42 @@
+import nock from 'nock';
+
+import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
+
+describe('Azure Storage Node', () => {
+	const workflows = ['nodes/Microsoft/Storage/test/workflows/container_getAll.workflow.json'];
+	const workflowTests = workflowToTests(workflows);
+
+	beforeEach(() => {
+		// https://github.com/nock/nock/issues/2057#issuecomment-663665683
+		if (!nock.isActive()) {
+			nock.activate();
+		}
+	});
+
+	describe('should get all containers', () => {
+		const nodeTypes = setup(workflowTests);
+
+		for (const workflow of workflowTests) {
+			workflow.nock = {
+				baseUrl: 'https://myaccount.blob.core.windows.net',
+				mocks: [
+					{
+						method: 'get',
+						path: '/?comp=list',
+						statusCode: 200,
+						responseBody:
+							'<?xml version="1.0" encoding="utf-8"?><EnumerationResults ServiceEndpoint="https://myaccount.blob.core.windows.net/"><Prefix>mycontainer</Prefix><MaxResults>1</MaxResults><Containers><Container><Name>mycontainer1</Name><Deleted>true</Deleted><Version>01DB7228F6BEE6E7</Version><Properties><Last-Modified>Wed, 29 Jan 2025 08:37:00 GMT</Last-Modified><Etag>"0x8DD40401935032C"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>expired</LeaseState><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold><ImmutableStorageWithVersioningEnabled>false</ImmutableStorageWithVersioningEnabled><DeletedTime>Wed, 29 Jan 2025 08:38:21 GMT</DeletedTime><RemainingRetentionDays>7</RemainingRetentionDays></Properties><Metadata><key1>value1</key1></Metadata></Container></Containers><NextMarker>mycontainer2</NextMarker></EnumerationResults>',
+					},
+					{
+						method: 'get',
+						path: '/?comp=list&marker=mycontainer2',
+						statusCode: 200,
+						responseBody:
+							'<?xml version="1.0" encoding="utf-8"?><EnumerationResults ServiceEndpoint="https://myaccount.blob.core.windows.net/"><Prefix>mycontainer</Prefix><MaxResults>1</MaxResults><Containers><Container><Name>mycontainer1</Name><Deleted>true</Deleted><Version>01DB7228F6BEE6E7</Version><Properties><Last-Modified>Wed, 29 Jan 2025 08:37:00 GMT</Last-Modified><Etag>"0x8DD40401935032C"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>expired</LeaseState><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold><ImmutableStorageWithVersioningEnabled>false</ImmutableStorageWithVersioningEnabled><DeletedTime>Wed, 29 Jan 2025 08:38:21 GMT</DeletedTime><RemainingRetentionDays>7</RemainingRetentionDays></Properties><Metadata><key1>value1</key1></Metadata></Container></Containers><NextMarker></NextMarker></EnumerationResults>',
+					},
+				],
+			};
+			test(workflow.description, async () => await equalityTest(workflow, nodeTypes));
+		}
+	});
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Storage/test/container/getAllLimitOptions.test.ts b/packages/nodes-base/nodes/Microsoft/Storage/test/container/getAllLimitOptions.test.ts
new file mode 100644
index 0000000000..d859f16cc7
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Storage/test/container/getAllLimitOptions.test.ts
@@ -0,0 +1,37 @@
+import nock from 'nock';
+
+import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
+
+describe('Azure Storage Node', () => {
+	const workflows = [
+		'nodes/Microsoft/Storage/test/workflows/container_getAllLimitOptions.workflow.json',
+	];
+	const workflowTests = workflowToTests(workflows);
+
+	beforeEach(() => {
+		// https://github.com/nock/nock/issues/2057#issuecomment-663665683
+		if (!nock.isActive()) {
+			nock.activate();
+		}
+	});
+
+	describe('should get all containers with limit and options', () => {
+		const nodeTypes = setup(workflowTests);
+
+		for (const workflow of workflowTests) {
+			workflow.nock = {
+				baseUrl: 'https://myaccount.blob.core.windows.net',
+				mocks: [
+					{
+						method: 'get',
+						path: '/?comp=list&maxresults=1&include=metadata%2Cdeleted%2Csystem&prefix=mycontainer',
+						statusCode: 200,
+						responseBody:
+							'<?xml version="1.0" encoding="utf-8"?><EnumerationResults ServiceEndpoint="https://myaccount.blob.core.windows.net/"><Prefix>mycontainer</Prefix><MaxResults>1</MaxResults><Containers><Container><Name>mycontainer1</Name><Deleted>true</Deleted><Version>01DB7228F6BEE6E7</Version><Properties><Last-Modified>Wed, 29 Jan 2025 08:37:00 GMT</Last-Modified><Etag>"0x8DD40401935032C"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>expired</LeaseState><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold><ImmutableStorageWithVersioningEnabled>false</ImmutableStorageWithVersioningEnabled><DeletedTime>Wed, 29 Jan 2025 08:38:21 GMT</DeletedTime><RemainingRetentionDays>7</RemainingRetentionDays></Properties><Metadata><key1>value1</key1></Metadata></Container></Containers><NextMarker>mycontainer2</NextMarker></EnumerationResults>',
+					},
+				],
+			};
+			test(workflow.description, async () => await equalityTest(workflow, nodeTypes));
+		}
+	});
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Storage/test/credentials/oauth2.test.ts b/packages/nodes-base/nodes/Microsoft/Storage/test/credentials/oauth2.test.ts
new file mode 100644
index 0000000000..2e78af10fd
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Storage/test/credentials/oauth2.test.ts
@@ -0,0 +1,86 @@
+import type {
+	ICredentialDataDecryptedObject,
+	IDataObject,
+	IHttpRequestOptions,
+} from 'n8n-workflow';
+import nock from 'nock';
+
+import { CredentialsHelper, equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
+
+describe('Azure Storage Node', () => {
+	const workflows = ['nodes/Microsoft/Storage/test/workflows/credentials_oauth2.workflow.json'];
+	const workflowTests = workflowToTests(workflows);
+
+	beforeEach(() => {
+		// https://github.com/nock/nock/issues/2057#issuecomment-663665683
+		if (!nock.isActive()) {
+			nock.activate();
+		}
+	});
+
+	describe('should use correct oauth2 credentials', () => {
+		beforeAll(() => {
+			nock.disableNetConnect();
+
+			jest
+				.spyOn(CredentialsHelper.prototype, 'authenticate')
+				.mockImplementation(
+					async (
+						credentials: ICredentialDataDecryptedObject,
+						typeName: string,
+						requestParams: IHttpRequestOptions,
+					): Promise<IHttpRequestOptions> => {
+						if (typeName === 'azureStorageOAuth2Api') {
+							return {
+								...requestParams,
+								headers: {
+									authorization: `bearer ${(credentials.oauthTokenData as IDataObject).access_token as string}`,
+								},
+							};
+						} else {
+							return requestParams;
+						}
+					},
+				);
+		});
+
+		afterAll(() => {
+			nock.restore();
+			jest.restoreAllMocks();
+		});
+
+		const nodeTypes = setup(workflowTests);
+
+		for (const workflow of workflowTests) {
+			workflow.nock = {
+				baseUrl: 'https://myaccount.blob.core.windows.net',
+				mocks: [
+					{
+						method: 'get',
+						path: '/mycontainer?restype=container',
+						statusCode: 200,
+						requestHeaders: { authorization: 'bearer ACCESSTOKEN' },
+						responseBody: '',
+						responseHeaders: {
+							'content-length': '0',
+							'last-modified': 'Tue, 28 Jan 2025 16:40:21 GMT',
+							etag: '"0x8DD3FBA74CF3620"',
+							server: 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0',
+							'x-ms-request-id': '49edb268-b01e-0053-6e29-72d574000000',
+							'x-ms-version': '2020-10-02',
+							'x-ms-lease-status': 'unlocked',
+							'x-ms-lease-state': 'available',
+							'x-ms-has-immutability-policy': 'false',
+							'x-ms-has-legal-hold': 'false',
+							date: 'Wed, 29 Jan 2025 08:43:08 GMT',
+							'x-ms-meta-key1': 'field1',
+							'x-ms-blob-public-access': 'blob',
+							'x-ms-lease-duration': 'infinite',
+						},
+					},
+				],
+			};
+			test(workflow.description, async () => await equalityTest(workflow, nodeTypes));
+		}
+	});
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Storage/test/credentials/sharedKey.test.ts b/packages/nodes-base/nodes/Microsoft/Storage/test/credentials/sharedKey.test.ts
new file mode 100644
index 0000000000..7804c226de
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Storage/test/credentials/sharedKey.test.ts
@@ -0,0 +1,158 @@
+import type { ICredentialDataDecryptedObject, IHttpRequestOptions } from 'n8n-workflow';
+import nock from 'nock';
+
+import { CredentialsHelper, equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
+
+import { AzureStorageSharedKeyApi } from '../../../../../credentials/AzureStorageSharedKeyApi.credentials';
+import { FAKE_CREDENTIALS_DATA } from '../../../../../test/nodes/FakeCredentialsMap';
+
+describe('Azure Storage Node', () => {
+	const workflows = ['nodes/Microsoft/Storage/test/workflows/credentials_sharedKey.workflow.json'];
+	const workflowTests = workflowToTests(workflows);
+
+	beforeEach(() => {
+		// https://github.com/nock/nock/issues/2057#issuecomment-663665683
+		if (!nock.isActive()) {
+			nock.activate();
+		}
+	});
+
+	describe('should use correct shared key credentials', () => {
+		beforeAll(() => {
+			nock.disableNetConnect();
+
+			jest
+				.spyOn(CredentialsHelper.prototype, 'authenticate')
+				.mockImplementation(
+					async (
+						_credentials: ICredentialDataDecryptedObject,
+						typeName: string,
+						requestParams: IHttpRequestOptions,
+					): Promise<IHttpRequestOptions> => {
+						if (typeName === 'azureStorageSharedKeyApi') {
+							return {
+								...requestParams,
+								headers: {
+									authorization:
+										'SharedKey Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==',
+								},
+							};
+						} else {
+							return requestParams;
+						}
+					},
+				);
+		});
+
+		afterAll(() => {
+			nock.restore();
+			jest.restoreAllMocks();
+		});
+
+		const nodeTypes = setup(workflowTests);
+
+		for (const workflow of workflowTests) {
+			workflow.nock = {
+				baseUrl: 'https://myaccount.blob.core.windows.net',
+				mocks: [
+					{
+						method: 'get',
+						path: '/mycontainer?restype=container',
+						statusCode: 200,
+						requestHeaders: {
+							authorization:
+								'SharedKey Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==',
+						},
+						responseBody: '',
+						responseHeaders: {
+							'content-length': '0',
+							'last-modified': 'Tue, 28 Jan 2025 16:40:21 GMT',
+							etag: '"0x8DD3FBA74CF3620"',
+							server: 'Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0',
+							'x-ms-request-id': '49edb268-b01e-0053-6e29-72d574000000',
+							'x-ms-version': '2020-10-02',
+							'x-ms-lease-status': 'unlocked',
+							'x-ms-lease-state': 'available',
+							'x-ms-has-immutability-policy': 'false',
+							'x-ms-has-legal-hold': 'false',
+							date: 'Wed, 29 Jan 2025 08:43:08 GMT',
+							'x-ms-meta-key1': 'field1',
+							'x-ms-blob-public-access': 'blob',
+							'x-ms-lease-duration': 'infinite',
+						},
+					},
+				],
+			};
+			test(workflow.description, async () => await equalityTest(workflow, nodeTypes));
+		}
+	});
+
+	describe('authenticate', () => {
+		const azureStorageSharedKeyApi = new AzureStorageSharedKeyApi();
+
+		it('should remove undefined query parameters and headers', async () => {
+			const credentials: ICredentialDataDecryptedObject = {
+				account: FAKE_CREDENTIALS_DATA.azureStorageSharedKeyApi.account,
+				key: FAKE_CREDENTIALS_DATA.azureStorageSharedKeyApi.key,
+			};
+			const requestOptions: IHttpRequestOptions = {
+				url: `${FAKE_CREDENTIALS_DATA.azureStorageSharedKeyApi.baseUrl}/mycontainer`,
+				qs: { restype: 'container', query1: undefined },
+				headers: {
+					'Content-Length': undefined,
+				},
+				method: 'GET',
+			};
+
+			const result = await azureStorageSharedKeyApi.authenticate(credentials, requestOptions);
+
+			expect(result.qs).toEqual({ restype: 'container' });
+			expect(result.headers).not.toHaveProperty('Content-Length');
+		});
+
+		it('should default method to GET if not provided', async () => {
+			const credentials: ICredentialDataDecryptedObject = {
+				account: FAKE_CREDENTIALS_DATA.azureStorageSharedKeyApi.account,
+				key: FAKE_CREDENTIALS_DATA.azureStorageSharedKeyApi.key,
+			};
+			const requestOptions: IHttpRequestOptions = {
+				url: `${FAKE_CREDENTIALS_DATA.azureStorageSharedKeyApi.baseUrl}/mycontainer`,
+				qs: { restype: 'container' },
+				headers: {
+					'Content-Length': undefined,
+				},
+			};
+
+			const result = await azureStorageSharedKeyApi.authenticate(credentials, requestOptions);
+			expect(result.method).toBe('GET');
+		});
+
+		it('should generate a valid authorization header', async () => {
+			const credentials: ICredentialDataDecryptedObject = {
+				account: FAKE_CREDENTIALS_DATA.azureStorageSharedKeyApi.account,
+				key: FAKE_CREDENTIALS_DATA.azureStorageSharedKeyApi.key,
+			};
+			const requestOptions: IHttpRequestOptions = {
+				url: `${FAKE_CREDENTIALS_DATA.azureStorageSharedKeyApi.baseUrl}/mycontainer/myblob`,
+				qs: { param1: 'value1' },
+				headers: {
+					'x-ms-date': 'Thu, 27 Feb 2025 11:05:49 GMT',
+					'x-ms-version': '2021-12-02',
+					'x-ms-blob-content-language': 'en-EN',
+					'x-ms-blob-content-type': 'image/jpeg',
+					'x-ms-expiry-option': 'Absolute',
+					'x-ms-blob-type': 'BlockBlob',
+					'x-ms-blob-content-disposition': 'attachment; filename="image.jpg"',
+					'x-ms-meta-key1': 'value1',
+					'x-ms-tags': 'tag1=value1',
+				},
+				method: 'PUT',
+			};
+			const result = await azureStorageSharedKeyApi.authenticate(credentials, requestOptions);
+
+			expect(result.headers?.authorization).toBe(
+				'SharedKey devstoreaccount1:6sSQ3N4yNFQynBs/iLptIRPS5DQeaFBocW+dyYbAdOI=',
+			);
+		});
+	});
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Storage/test/listSearch/listSearch.test.ts b/packages/nodes-base/nodes/Microsoft/Storage/test/listSearch/listSearch.test.ts
new file mode 100644
index 0000000000..8e4688d00f
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Storage/test/listSearch/listSearch.test.ts
@@ -0,0 +1,123 @@
+import type { ILoadOptionsFunctions, INodeParameterResourceLocator } from 'n8n-workflow';
+import nock from 'nock';
+
+import { FAKE_CREDENTIALS_DATA } from '../../../../../test/nodes/FakeCredentialsMap';
+import { AzureStorage } from '../../AzureStorage.node';
+import { XMsVersion } from '../../GenericFunctions';
+
+describe('Azure Storage Node', () => {
+	beforeEach(() => {
+		// https://github.com/nock/nock/issues/2057#issuecomment-663665683
+		if (!nock.isActive()) {
+			nock.activate();
+		}
+	});
+
+	describe('List search', () => {
+		it('should list search blobs', async () => {
+			const mockResponse =
+				'<?xml version="1.0" encoding="UTF-8" standalone="yes"?><EnumerationResults ServiceEndpoint="https://myaccount.blob.core.windows.net" ContainerName="item1"><Prefix/><Marker/><MaxResults>1</MaxResults><Blobs><Blob><Name>myblob1</Name><Properties><Creation-Time>Wed, 22 Jan 2025 18:53:15 GMT</Creation-Time><Last-Modified>Wed, 22 Jan 2025 18:53:15 GMT</Last-Modified><Etag>0x1F8268B228AA730</Etag><Content-Length>37</Content-Length><Content-Type>application/json</Content-Type><Content-MD5>aWQGHD8kGQd5ZtEN/S1/aw==</Content-MD5><BlobType>BlockBlob</BlobType><LeaseStatus>unlocked</LeaseStatus><LeaseState>available</LeaseState><ServerEncrypted>true</ServerEncrypted><AccessTier>Hot</AccessTier><AccessTierInferred>true</AccessTierInferred><AccessTierChangeTime>Wed, 22 Jan 2025 18:53:15 GMT</AccessTierChangeTime></Properties></Blob></Blobs><NextMarker>myblob2</NextMarker></EnumerationResults>';
+			const mockRequestWithAuthentication = jest.fn().mockReturnValue(mockResponse);
+			const mockGetNodeParameter = jest.fn((parameterName, _fallbackValue, _options) => {
+				if (parameterName === 'authentication') {
+					return 'sharedKey';
+				}
+				if (parameterName === 'container') {
+					return {
+						value: 'mycontainer',
+					} as INodeParameterResourceLocator;
+				}
+				// eslint-disable-next-line n8n-local-rules/no-plain-errors
+				throw new Error('Unknown parameter');
+			});
+			const mockGetCredentials = jest.fn(async (type: string, _itemIndex?: number) => {
+				if (type === 'azureStorageSharedKeyApi') {
+					return FAKE_CREDENTIALS_DATA.azureStorageSharedKeyApi;
+				}
+				// eslint-disable-next-line n8n-local-rules/no-plain-errors
+				throw new Error('Unknown credentials');
+			});
+			const mockContext = {
+				getCredentials: mockGetCredentials,
+				getNodeParameter: mockGetNodeParameter,
+				helpers: {
+					requestWithAuthentication: mockRequestWithAuthentication,
+				},
+			} as unknown as ILoadOptionsFunctions;
+			jest.useFakeTimers().setSystemTime(new Date('2025-01-01T00:00:00Z'));
+			const node = new AzureStorage();
+
+			const listSearchResult = await node.methods.listSearch.getBlobs.call(mockContext);
+
+			expect(mockRequestWithAuthentication).toHaveBeenCalledWith('azureStorageSharedKeyApi', {
+				method: 'GET',
+				url: 'https://myaccount.blob.core.windows.net/mycontainer',
+				headers: {
+					'x-ms-date': 'Wed, 01 Jan 2025 00:00:00 GMT',
+					'x-ms-version': XMsVersion,
+				},
+				qs: {
+					comp: 'list',
+					maxresults: 5000,
+					restype: 'container',
+				},
+				body: {},
+			});
+			expect(listSearchResult).toEqual({
+				// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+				results: [{ name: 'myblob1', value: 'myblob1' }],
+				paginationToken: 'myblob2',
+			});
+		});
+
+		it('should list search containers', async () => {
+			const mockResponse =
+				'<?xml version="1.0" encoding="utf-8"?><EnumerationResults ServiceEndpoint="https://myaccount.blob.core.windows.net/"><Prefix>mycontainer</Prefix><MaxResults>1</MaxResults><Containers><Container><Name>mycontainer1</Name><Deleted>true</Deleted><Version>01DB7228F6BEE6E7</Version><Properties><Last-Modified>Wed, 29 Jan 2025 08:37:00 GMT</Last-Modified><Etag>"0x8DD40401935032C"</Etag><LeaseStatus>unlocked</LeaseStatus><LeaseState>expired</LeaseState><HasImmutabilityPolicy>false</HasImmutabilityPolicy><HasLegalHold>false</HasLegalHold><ImmutableStorageWithVersioningEnabled>false</ImmutableStorageWithVersioningEnabled><DeletedTime>Wed, 29 Jan 2025 08:38:21 GMT</DeletedTime><RemainingRetentionDays>7</RemainingRetentionDays></Properties><Metadata><key1>value1</key1></Metadata></Container></Containers><NextMarker>mycontainer2</NextMarker></EnumerationResults>';
+			const mockRequestWithAuthentication = jest.fn().mockReturnValue(mockResponse);
+			const mockGetNodeParameter = jest.fn((parameterName, _fallbackValue, _options) => {
+				if (parameterName === 'authentication') {
+					return 'sharedKey';
+				}
+				// eslint-disable-next-line n8n-local-rules/no-plain-errors
+				throw new Error('Unknown parameter');
+			});
+			const mockGetCredentials = jest.fn(async (type: string, _itemIndex?: number) => {
+				if (type === 'azureStorageSharedKeyApi') {
+					return FAKE_CREDENTIALS_DATA.azureStorageSharedKeyApi;
+				}
+				// eslint-disable-next-line n8n-local-rules/no-plain-errors
+				throw new Error('Unknown credentials');
+			});
+			const mockContext = {
+				getCredentials: mockGetCredentials,
+				getNodeParameter: mockGetNodeParameter,
+				helpers: {
+					requestWithAuthentication: mockRequestWithAuthentication,
+				},
+			} as unknown as ILoadOptionsFunctions;
+			jest.useFakeTimers().setSystemTime(new Date('2025-01-01T00:00:00Z'));
+			const node = new AzureStorage();
+
+			const listSearchResult = await node.methods.listSearch.getContainers.call(mockContext);
+
+			expect(mockRequestWithAuthentication).toHaveBeenCalledWith('azureStorageSharedKeyApi', {
+				method: 'GET',
+				url: 'https://myaccount.blob.core.windows.net/',
+				headers: {
+					'x-ms-date': 'Wed, 01 Jan 2025 00:00:00 GMT',
+					'x-ms-version': XMsVersion,
+				},
+				qs: {
+					comp: 'list',
+					maxresults: 5000,
+				},
+				body: {},
+			});
+			expect(listSearchResult).toEqual({
+				// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+				results: [{ name: 'mycontainer1', value: 'mycontainer1' }],
+				paginationToken: 'mycontainer2',
+			});
+		});
+	});
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Storage/test/workflows/blob_create.workflow.json b/packages/nodes-base/nodes/Microsoft/Storage/test/workflows/blob_create.workflow.json
new file mode 100644
index 0000000000..3e6605dd21
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Storage/test/workflows/blob_create.workflow.json
@@ -0,0 +1,109 @@
+{
+	"nodes": [
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [0, 0],
+			"id": "99f866fa-f63c-477d-a0d0-48fbdb8a344a",
+			"name": "When clicking ‘Test workflow’"
+		},
+		{
+			"parameters": {
+				"resource": "blob",
+				"operation": "create",
+				"container": { "__rl": true, "value": "mycontainer", "mode": "list" },
+				"blobCreate": "myblob",
+				"options": {
+					"accessTier": "Hot",
+					"blobType": "BlockBlob",
+					"cacheControl": "no-cache",
+					"contentCrc64": "3EDB64E77CB16A4C",
+					"contentEncoding": "utf8",
+					"contentLanguage": "en-US",
+					"contentMd5": "b97f46db5f3be7709d942eefe30e5b45",
+					"contentType": "application/json",
+					"encryptionContext": "context",
+					"encryptionScope": "encryptionScope",
+					"expiryOption": "Absolute",
+					"filename": "file.json",
+					"immutabilityPolicyUntilDate": "2025-01-01T00:00:00",
+					"immutabilityPolicyMode": "unlocked",
+					"leaseId": "leaseId123",
+					"legalHold": true,
+					"metadata": { "metadataValues": [{ "fieldName": "key1", "fieldValue": "value1" }] },
+					"origin": "http://contoso.com",
+					"tags": { "tagValues": [{ "tagName": "tag1", "tagValue": "value1" }] }
+				},
+				"requestOptions": {}
+			},
+			"type": "n8n-nodes-base.azureStorage",
+			"typeVersion": 1,
+			"position": [660, 0],
+			"id": "ab1b6258-5c75-4893-90bf-ef591264420c",
+			"name": "Azure Storage",
+			"credentials": {
+				"azureStorageSharedKeyApi": {
+					"id": "VPmcFM58eDDexWQL",
+					"name": "Azure Storage Shared Key account"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"mode": "jsonToBinary",
+				"convertAllData": false,
+				"options": { "useRawData": true }
+			},
+			"name": "Move Binary Data",
+			"type": "n8n-nodes-base.moveBinaryData",
+			"typeVersion": 1,
+			"position": [440, 0],
+			"id": "221e00ed-8c9b-4313-a4d6-b87c64b09d80"
+		},
+		{
+			"parameters": {
+				"mode": "raw",
+				"jsonOutput": "{\n  \"data\": {\n    \"my_field_1\": \"value\",\n    \"my_field_2\": 1\n  }\n}\n",
+				"options": {}
+			},
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3.4,
+			"position": [220, 0],
+			"id": "6c03903b-0177-4e94-b1ad-4f6ad9e84f62",
+			"name": "Edit Fields"
+		}
+	],
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [[{ "node": "Edit Fields", "type": "main", "index": 0 }]]
+		},
+		"Move Binary Data": { "main": [[{ "node": "Azure Storage", "type": "main", "index": 0 }]] },
+		"Edit Fields": { "main": [[{ "node": "Move Binary Data", "type": "main", "index": 0 }]] }
+	},
+	"pinData": {
+		"Azure Storage": [
+			{
+				"json": {
+					"etag": "\"0x22769D26D3F3740\"",
+					"lastModified": "Thu, 23 Jan 2025 17:53:23 GMT",
+					"contentMd5": "aWQGHD8kGQd5ZtEN/S1/aw==",
+					"requestId": "75b87ee3-a7f7-468d-b7d1-e7e7b3173dab",
+					"version": "2025-01-05",
+					"date": "Thu, 23 Jan 2025 17:53:23 GMT",
+					"requestServerEncrypted": true,
+					"accessControlAllowCredentials": "access-control-allow-credentials",
+					"accessControlAllowOrigin": "access-control-allow-origin",
+					"accessControlExposeHeaders": "access-control-expose-headers",
+					"contentCrc64": "x-ms-content-crc64",
+					"contentLength": 0,
+					"encryptionKeySha256": "x-ms-encryption-key-sha256",
+					"encryptionScope": "x-ms-encryption-scope",
+					"versionId": "Thu, 23 Jan 2025 17:53:23 GMT",
+					"keepAlive": "timeout=5",
+					"server": "Azurite-Blob/3.33.0"
+				}
+			}
+		]
+	}
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Storage/test/workflows/blob_delete.workflow.json b/packages/nodes-base/nodes/Microsoft/Storage/test/workflows/blob_delete.workflow.json
new file mode 100644
index 0000000000..2263898085
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Storage/test/workflows/blob_delete.workflow.json
@@ -0,0 +1,51 @@
+{
+	"nodes": [
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [0, 0],
+			"id": "99f866fa-f63c-477d-a0d0-48fbdb8a344a",
+			"name": "When clicking ‘Test workflow’"
+		},
+		{
+			"parameters": {
+				"resource": "blob",
+				"operation": "delete",
+				"container": { "__rl": true, "mode": "id", "value": "mycontainer" },
+				"blob": { "__rl": true, "mode": "id", "value": "myblob" },
+				"options": { "leaseId": "leaseId123" },
+				"requestOptions": {}
+			},
+			"type": "n8n-nodes-base.azureStorage",
+			"typeVersion": 1,
+			"position": [660, 0],
+			"id": "ab1b6258-5c75-4893-90bf-ef591264420c",
+			"name": "Azure Storage",
+			"credentials": {
+				"azureStorageSharedKeyApi": {
+					"id": "VPmcFM58eDDexWQL",
+					"name": "Azure Storage Shared Key account"
+				}
+			}
+		}
+	],
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [[{ "node": "Azure Storage", "type": "main", "index": 0 }]]
+		}
+	},
+	"pinData": {
+		"Azure Storage": [
+			{
+				"json": {
+					"requestId": "75b87ee3-a7f7-468d-b7d1-e7e7b3173dab",
+					"version": "2025-01-05",
+					"date": "Thu, 23 Jan 2025 17:53:23 GMT",
+					"deleteTypePermanent": true,
+					"clientRequestId": "x-ms-client-request-id"
+				}
+			}
+		]
+	}
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Storage/test/workflows/blob_get.workflow.json b/packages/nodes-base/nodes/Microsoft/Storage/test/workflows/blob_get.workflow.json
new file mode 100644
index 0000000000..54b2800566
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Storage/test/workflows/blob_get.workflow.json
@@ -0,0 +1,114 @@
+{
+	"nodes": [
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [0, 0],
+			"id": "99f866fa-f63c-477d-a0d0-48fbdb8a344a",
+			"name": "When clicking ‘Test workflow’"
+		},
+		{
+			"parameters": {
+				"resource": "blob",
+				"operation": "get",
+				"container": { "__rl": true, "value": "mycontainer", "mode": "list" },
+				"blob": { "__rl": true, "value": "myblob", "mode": "list" },
+				"options": {
+					"leaseId": "leaseId123",
+					"origin": "origin123",
+					"simplify": false,
+					"upn": true
+				},
+				"requestOptions": {}
+			},
+			"type": "n8n-nodes-base.azureStorage",
+			"typeVersion": 1,
+			"position": [660, 0],
+			"id": "ab1b6258-5c75-4893-90bf-ef591264420c",
+			"name": "Azure Storage",
+			"credentials": {
+				"azureStorageSharedKeyApi": {
+					"id": "VPmcFM58eDDexWQL",
+					"name": "Azure Storage Shared Key account"
+				}
+			}
+		}
+	],
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [[{ "node": "Azure Storage", "type": "main", "index": 0 }]]
+		}
+	},
+
+	"pinData": {
+		"Azure Storage": [
+			{
+				"binary": {
+					"data": {
+						"fileExtension": "json",
+						"fileName": "file.json",
+						"fileSize": "51 B",
+						"fileType": "json",
+						"mimeType": "application/json"
+					}
+				},
+				"json": {
+					"name": "myblob",
+					"properties": {
+						"clientRequestId": "x-ms-client-request-id",
+						"lastModified": "last-modified",
+						"creationTime": "x-ms-creation-time",
+						"tagCount": "x-ms-tag-count",
+						"contentType": "application/json",
+						"contentRange": "content-range",
+						"etag": "\"0x22769D26D3F3740\"",
+						"contentMd5": "content-md5",
+						"contentCrc64": "x-ms-content-crc64",
+						"contentEncoding": "content-encoding",
+						"contentLanguage": "content-language",
+						"cacheControl": "cache-control",
+						"contentDisposition": "attachment; filename=\"file.json\"",
+						"blobSequenceNumber": "x-ms-blob-sequence-number",
+						"blobType": "x-ms-blob-type",
+						"copyCompletionTime": "x-ms-copy-completion-time",
+						"copyStatusDescription": "x-ms-copy-status-description",
+						"copyId": "x-ms-copy-id",
+						"copyProgress": "x-ms-copy-progress",
+						"copySource": "x-ms-copy-source",
+						"copyStatus": "x-ms-copy-status",
+						"incrementalCopy": "x-ms-incremental-copy",
+						"leaseDuration": "x-ms-lease-duration",
+						"leaseState": "x-ms-lease-state",
+						"leaseStatus": "x-ms-lease-status",
+						"accessControlAllowOrigin": "access-control-allow-origin",
+						"accessControlExposeHeaders": "access-control-expose-headers",
+						"vary": "vary",
+						"accessControlAllowCredentials": "access-control-allow-credentials",
+						"blobCommittedBlockCount": "x-ms-blob-committed-block-count",
+						"serverEncrypted": "x-ms-server-encrypted",
+						"encryptionKeySha256": "x-ms-encryption-key-sha256",
+						"encryptionContext": "x-ms-encryption-context",
+						"encryptionScope": "x-ms-encryption-scope",
+						"blobContentMd5": "x-ms-blob-content-md5",
+						"lastAccessTime": "x-ms-last-access-time",
+						"blobSealed": "x-ms-blob-sealed",
+						"immutabilityPolicyUntilDate": "x-ms-immutability-policy-until-date",
+						"immutabilityPolicyMode": "x-ms-immutability-policy-mode",
+						"legalHold": "x-ms-legal-hold",
+						"owner": "x-ms-owner",
+						"group": "x-ms-group",
+						"permissions": "x-ms-permissions",
+						"acl": "x-ms-acl",
+						"resourceType": "x-ms-resource-type",
+						"acceptRanges": "accept-ranges",
+						"date": "Thu, 23 Jan 2025 17:53:23 GMT",
+						"requestId": "75b87ee3-a7f7-468d-b7d1-e7e7b3173dab",
+						"version": "2025-01-05"
+					},
+					"metadata": { "key1": "value1" }
+				}
+			}
+		]
+	}
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Storage/test/workflows/blob_getAll.workflow.json b/packages/nodes-base/nodes/Microsoft/Storage/test/workflows/blob_getAll.workflow.json
new file mode 100644
index 0000000000..03d0a4cea3
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Storage/test/workflows/blob_getAll.workflow.json
@@ -0,0 +1,82 @@
+{
+	"nodes": [
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [0, 0],
+			"id": "99f866fa-f63c-477d-a0d0-48fbdb8a344a",
+			"name": "When clicking ‘Test workflow’"
+		},
+		{
+			"parameters": {
+				"resource": "blob",
+				"operation": "getAll",
+				"container": { "__rl": true, "value": "mycontainer", "mode": "list" },
+				"returnAll": true,
+				"options": { "simplify": false },
+				"requestOptions": {}
+			},
+			"type": "n8n-nodes-base.azureStorage",
+			"typeVersion": 1,
+			"position": [660, 0],
+			"id": "ab1b6258-5c75-4893-90bf-ef591264420c",
+			"name": "Azure Storage",
+			"credentials": {
+				"azureStorageSharedKeyApi": {
+					"id": "VPmcFM58eDDexWQL",
+					"name": "Azure Storage Shared Key account"
+				}
+			}
+		}
+	],
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [[{ "node": "Azure Storage", "type": "main", "index": 0 }]]
+		}
+	},
+	"pinData": {
+		"Azure Storage": [
+			{
+				"json": {
+					"name": "myblob1",
+					"properties": {
+						"creationTime": "Wed, 22 Jan 2025 18:53:15 GMT",
+						"lastModified": "Wed, 22 Jan 2025 18:53:15 GMT",
+						"etag": "0x1F8268B228AA730",
+						"contentLength": 37,
+						"contentType": "application/json",
+						"contentMD5": "aWQGHD8kGQd5ZtEN/S1/aw==",
+						"blobType": "BlockBlob",
+						"leaseStatus": "unlocked",
+						"leaseState": "available",
+						"serverEncrypted": true,
+						"accessTier": "Hot",
+						"accessTierInferred": true,
+						"accessTierChangeTime": "Wed, 22 Jan 2025 18:53:15 GMT"
+					}
+				}
+			},
+			{
+				"json": {
+					"name": "myblob1",
+					"properties": {
+						"creationTime": "Wed, 22 Jan 2025 18:53:15 GMT",
+						"lastModified": "Wed, 22 Jan 2025 18:53:15 GMT",
+						"etag": "0x1F8268B228AA730",
+						"contentLength": 37,
+						"contentType": "application/json",
+						"contentMD5": "aWQGHD8kGQd5ZtEN/S1/aw==",
+						"blobType": "BlockBlob",
+						"leaseStatus": "unlocked",
+						"leaseState": "available",
+						"serverEncrypted": true,
+						"accessTier": "Hot",
+						"accessTierInferred": true,
+						"accessTierChangeTime": "Wed, 22 Jan 2025 18:53:15 GMT"
+					}
+				}
+			}
+		]
+	}
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Storage/test/workflows/blob_getAllLimitOptions.workflow.json b/packages/nodes-base/nodes/Microsoft/Storage/test/workflows/blob_getAllLimitOptions.workflow.json
new file mode 100644
index 0000000000..a8c33499f4
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Storage/test/workflows/blob_getAllLimitOptions.workflow.json
@@ -0,0 +1,76 @@
+{
+	"nodes": [
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [0, 0],
+			"id": "99f866fa-f63c-477d-a0d0-48fbdb8a344a",
+			"name": "When clicking ‘Test workflow’"
+		},
+		{
+			"parameters": {
+				"resource": "blob",
+				"operation": "getAll",
+				"container": { "__rl": true, "value": "mycontainer", "mode": "list" },
+				"limit": 1,
+				"options": {
+					"fields": [
+						"copy",
+						"deleted",
+						"deletedwithversions",
+						"immutabilitypolicy",
+						"metadata",
+						"legalhold",
+						"versions",
+						"uncommittedblobs",
+						"tags",
+						"snapshots",
+						"permissions"
+					],
+					"filter": ["deleted", "files", "directories"],
+					"simplify": true,
+					"upn": true
+				},
+				"requestOptions": {}
+			},
+			"type": "n8n-nodes-base.azureStorage",
+			"typeVersion": 1,
+			"position": [660, 0],
+			"id": "ab1b6258-5c75-4893-90bf-ef591264420c",
+			"name": "Azure Storage",
+			"credentials": {
+				"azureStorageSharedKeyApi": {
+					"id": "VPmcFM58eDDexWQL",
+					"name": "Azure Storage account"
+				}
+			}
+		}
+	],
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [[{ "node": "Azure Storage", "type": "main", "index": 0 }]]
+		}
+	},
+	"pinData": {
+		"Azure Storage": [
+			{
+				"json": {
+					"name": "myblob1",
+					"properties": {
+						"creationTime": "Wed, 22 Jan 2025 18:53:15 GMT",
+						"lastModified": "Wed, 22 Jan 2025 18:53:15 GMT",
+						"etag": "0x1F8268B228AA730",
+						"contentLength": 37,
+						"contentType": "application/json",
+						"contentMD5": "aWQGHD8kGQd5ZtEN/S1/aw==",
+						"blobType": "BlockBlob",
+						"leaseStatus": "unlocked",
+						"leaseState": "available",
+						"serverEncrypted": true
+					}
+				}
+			}
+		]
+	}
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Storage/test/workflows/container_create.workflow.json b/packages/nodes-base/nodes/Microsoft/Storage/test/workflows/container_create.workflow.json
new file mode 100644
index 0000000000..774ac143f2
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Storage/test/workflows/container_create.workflow.json
@@ -0,0 +1,54 @@
+{
+	"nodes": [
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [0, 0],
+			"id": "99f866fa-f63c-477d-a0d0-48fbdb8a344a",
+			"name": "When clicking ‘Test workflow’"
+		},
+		{
+			"parameters": {
+				"operation": "create",
+				"containerCreate": "mycontainer",
+				"options": {
+					"accessLevel": "blob",
+					"metadata": { "metadataValues": [{ "fieldName": "key1", "fieldValue": "value1" }] }
+				},
+				"requestOptions": {}
+			},
+			"type": "n8n-nodes-base.azureStorage",
+			"typeVersion": 1,
+			"position": [220, 0],
+			"id": "ab1b6258-5c75-4893-90bf-ef591264420c",
+			"name": "Azure Storage",
+			"credentials": {
+				"azureStorageSharedKeyApi": {
+					"id": "VPmcFM58eDDexWQL",
+					"name": "Azure Storage Shared Key account"
+				}
+			}
+		}
+	],
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [[{ "node": "Azure Storage", "type": "main", "index": 0 }]]
+		}
+	},
+	"pinData": {
+		"Azure Storage": [
+			{
+				"json": {
+					"etag": "\"0x22769D26D3F3740\"",
+					"lastModified": "Thu, 23 Jan 2025 17:53:23 GMT",
+					"requestId": "75b87ee3-a7f7-468d-b7d1-e7e7b3173dab",
+					"version": "2025-01-05",
+					"date": "Thu, 23 Jan 2025 17:53:23 GMT",
+					"clientRequestId": "client-request-id-123",
+					"requestServerEncrypted": true
+				}
+			}
+		]
+	}
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Storage/test/workflows/container_delete.workflow.json b/packages/nodes-base/nodes/Microsoft/Storage/test/workflows/container_delete.workflow.json
new file mode 100644
index 0000000000..579ceb974d
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Storage/test/workflows/container_delete.workflow.json
@@ -0,0 +1,48 @@
+{
+	"nodes": [
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [0, 0],
+			"id": "99f866fa-f63c-477d-a0d0-48fbdb8a344a",
+			"name": "When clicking ‘Test workflow’"
+		},
+		{
+			"parameters": {
+				"operation": "delete",
+				"container": { "__rl": true, "mode": "list", "value": "mycontainer" },
+				"requestOptions": {}
+			},
+			"type": "n8n-nodes-base.azureStorage",
+			"typeVersion": 1,
+			"position": [220, 0],
+			"id": "ab1b6258-5c75-4893-90bf-ef591264420c",
+			"name": "Azure Storage",
+			"credentials": {
+				"azureStorageSharedKeyApi": {
+					"id": "VPmcFM58eDDexWQL",
+					"name": "Azure Storage Shared Key account"
+				}
+			}
+		}
+	],
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [[{ "node": "Azure Storage", "type": "main", "index": 0 }]]
+		}
+	},
+	"pinData": {
+		"Azure Storage": [
+			{
+				"json": {
+					"contentLength": 0,
+					"requestId": "ca3a8907-601e-0050-1929-723410000000",
+					"server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+					"version": "2020-10-02",
+					"date": "Wed, 29 Jan 2025 08:38:21 GMT"
+				}
+			}
+		]
+	}
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Storage/test/workflows/container_get.workflow.json b/packages/nodes-base/nodes/Microsoft/Storage/test/workflows/container_get.workflow.json
new file mode 100644
index 0000000000..39c78154ca
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Storage/test/workflows/container_get.workflow.json
@@ -0,0 +1,61 @@
+{
+	"nodes": [
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [0, 0],
+			"id": "99f866fa-f63c-477d-a0d0-48fbdb8a344a",
+			"name": "When clicking ‘Test workflow’"
+		},
+		{
+			"parameters": {
+				"operation": "get",
+				"container": { "__rl": true, "mode": "list", "value": "mycontainer" },
+				"options": { "simplify": false },
+				"requestOptions": {}
+			},
+			"type": "n8n-nodes-base.azureStorage",
+			"typeVersion": 1,
+			"position": [220, 0],
+			"id": "ab1b6258-5c75-4893-90bf-ef591264420c",
+			"name": "Azure Storage",
+			"credentials": {
+				"azureStorageSharedKeyApi": {
+					"id": "VPmcFM58eDDexWQL",
+					"name": "Azure Storage Shared Key account"
+				}
+			}
+		}
+	],
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [[{ "node": "Azure Storage", "type": "main", "index": 0 }]]
+		}
+	},
+	"pinData": {
+		"Azure Storage": [
+			{
+				"json": {
+					"name": "mycontainer",
+					"properties": {
+						"lastModified": "Tue, 28 Jan 2025 16:40:21 GMT",
+						"etag": "\"0x8DD3FBA74CF3620\"",
+						"leaseStatus": "unlocked",
+						"leaseState": "available",
+						"hasImmutabilityPolicy": false,
+						"hasLegalHold": false,
+						"leaseDuration": "infinite",
+						"blobPublicAccess": "blob",
+						"contentLength": 0,
+						"date": "Wed, 29 Jan 2025 08:43:08 GMT",
+						"requestId": "49edb268-b01e-0053-6e29-72d574000000",
+						"server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+						"version": "2020-10-02"
+					},
+					"metadata": { "key1": "field1" }
+				}
+			}
+		]
+	}
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Storage/test/workflows/container_getAll.workflow.json b/packages/nodes-base/nodes/Microsoft/Storage/test/workflows/container_getAll.workflow.json
new file mode 100644
index 0000000000..1639a5f673
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Storage/test/workflows/container_getAll.workflow.json
@@ -0,0 +1,73 @@
+{
+	"nodes": [
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [0, 0],
+			"id": "99f866fa-f63c-477d-a0d0-48fbdb8a344a",
+			"name": "When clicking ‘Test workflow’"
+		},
+		{
+			"parameters": { "operation": "getAll", "returnAll": true, "requestOptions": {} },
+			"type": "n8n-nodes-base.azureStorage",
+			"typeVersion": 1,
+			"position": [220, 0],
+			"id": "ab1b6258-5c75-4893-90bf-ef591264420c",
+			"name": "Azure Storage",
+			"credentials": {
+				"azureStorageSharedKeyApi": {
+					"id": "VPmcFM58eDDexWQL",
+					"name": "Azure Storage Shared Key account"
+				}
+			}
+		}
+	],
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [[{ "node": "Azure Storage", "type": "main", "index": 0 }]]
+		}
+	},
+	"pinData": {
+		"Azure Storage": [
+			{
+				"json": {
+					"name": "mycontainer1",
+					"deleted": true,
+					"version": "01DB7228F6BEE6E7",
+					"properties": {
+						"lastModified": "Wed, 29 Jan 2025 08:37:00 GMT",
+						"etag": "\"0x8DD40401935032C\"",
+						"leaseStatus": "unlocked",
+						"leaseState": "expired",
+						"hasImmutabilityPolicy": false,
+						"hasLegalHold": false,
+						"immutableStorageWithVersioningEnabled": "false",
+						"deletedTime": "Wed, 29 Jan 2025 08:38:21 GMT",
+						"remainingRetentionDays": 7
+					},
+					"metadata": { "key1": "value1" }
+				}
+			},
+			{
+				"json": {
+					"name": "mycontainer1",
+					"deleted": true,
+					"version": "01DB7228F6BEE6E7",
+					"properties": {
+						"lastModified": "Wed, 29 Jan 2025 08:37:00 GMT",
+						"etag": "\"0x8DD40401935032C\"",
+						"leaseStatus": "unlocked",
+						"leaseState": "expired",
+						"hasImmutabilityPolicy": false,
+						"hasLegalHold": false,
+						"immutableStorageWithVersioningEnabled": "false",
+						"deletedTime": "Wed, 29 Jan 2025 08:38:21 GMT",
+						"remainingRetentionDays": 7
+					},
+					"metadata": { "key1": "value1" }
+				}
+			}
+		]
+	}
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Storage/test/workflows/container_getAllLimitOptions.workflow.json b/packages/nodes-base/nodes/Microsoft/Storage/test/workflows/container_getAllLimitOptions.workflow.json
new file mode 100644
index 0000000000..1b48f9b486
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Storage/test/workflows/container_getAllLimitOptions.workflow.json
@@ -0,0 +1,59 @@
+{
+	"nodes": [
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [0, 0],
+			"id": "99f866fa-f63c-477d-a0d0-48fbdb8a344a",
+			"name": "When clicking ‘Test workflow’"
+		},
+		{
+			"parameters": {
+				"operation": "getAll",
+				"limit": 1,
+				"options": { "fields": ["metadata", "deleted", "system"], "filter": "mycontainer" },
+				"requestOptions": {}
+			},
+			"type": "n8n-nodes-base.azureStorage",
+			"typeVersion": 1,
+			"position": [220, 0],
+			"id": "ab1b6258-5c75-4893-90bf-ef591264420c",
+			"name": "Azure Storage",
+			"credentials": {
+				"azureStorageSharedKeyApi": {
+					"id": "VPmcFM58eDDexWQL",
+					"name": "Azure Storage Shared Key account"
+				}
+			}
+		}
+	],
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [[{ "node": "Azure Storage", "type": "main", "index": 0 }]]
+		}
+	},
+	"pinData": {
+		"Azure Storage": [
+			{
+				"json": {
+					"name": "mycontainer1",
+					"deleted": true,
+					"version": "01DB7228F6BEE6E7",
+					"properties": {
+						"lastModified": "Wed, 29 Jan 2025 08:37:00 GMT",
+						"etag": "\"0x8DD40401935032C\"",
+						"leaseStatus": "unlocked",
+						"leaseState": "expired",
+						"hasImmutabilityPolicy": false,
+						"hasLegalHold": false,
+						"immutableStorageWithVersioningEnabled": "false",
+						"deletedTime": "Wed, 29 Jan 2025 08:38:21 GMT",
+						"remainingRetentionDays": 7
+					},
+					"metadata": { "key1": "value1" }
+				}
+			}
+		]
+	}
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Storage/test/workflows/credentials_oauth2.workflow.json b/packages/nodes-base/nodes/Microsoft/Storage/test/workflows/credentials_oauth2.workflow.json
new file mode 100644
index 0000000000..e5e5c0829d
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Storage/test/workflows/credentials_oauth2.workflow.json
@@ -0,0 +1,65 @@
+{
+	"nodes": [
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [0, 0],
+			"id": "1307e408-a8a5-464e-b858-494953e2f43b",
+			"name": "When clicking 'Test workflow'"
+		},
+		{
+			"parameters": {
+				"authentication": "oAuth2",
+				"resource": "container",
+				"operation": "get",
+				"container": { "__rl": true, "value": "mycontainer", "mode": "id" },
+				"options": { "simplify": false },
+				"requestOptions": {}
+			},
+			"type": "n8n-nodes-base.azureStorage",
+			"typeVersion": 1,
+			"position": [220, 0],
+			"id": "3429f7f2-dfca-4b72-8913-43a582e96e66",
+			"name": "Azure Storage",
+			"credentials": {
+				"azureStorageOAuth2Api": {
+					"id": "VPmcFM58eDDexWQL",
+					"name": "Azure Storage OAuth2 account"
+				}
+			}
+		}
+	],
+	"connections": {
+		"When clicking 'Test workflow'": {
+			"main": [[{ "node": "Azure Storage", "type": "main", "index": 0 }]]
+		}
+	},
+	"pinData": {
+		"Azure Storage": [
+			{
+				"json": {
+					"name": "mycontainer",
+					"properties": {
+						"lastModified": "Tue, 28 Jan 2025 16:40:21 GMT",
+						"etag": "\"0x8DD3FBA74CF3620\"",
+						"leaseStatus": "unlocked",
+						"leaseState": "available",
+						"hasImmutabilityPolicy": false,
+						"hasLegalHold": false,
+						"leaseDuration": "infinite",
+						"blobPublicAccess": "blob",
+						"contentLength": 0,
+						"date": "Wed, 29 Jan 2025 08:43:08 GMT",
+						"requestId": "49edb268-b01e-0053-6e29-72d574000000",
+						"server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+						"version": "2020-10-02"
+					},
+					"metadata": {
+						"key1": "field1"
+					}
+				}
+			}
+		]
+	}
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Storage/test/workflows/credentials_sharedKey.workflow.json b/packages/nodes-base/nodes/Microsoft/Storage/test/workflows/credentials_sharedKey.workflow.json
new file mode 100644
index 0000000000..025e61f735
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Storage/test/workflows/credentials_sharedKey.workflow.json
@@ -0,0 +1,62 @@
+{
+	"nodes": [
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [0, 0],
+			"id": "1307e408-a8a5-464e-b858-494953e2f43b",
+			"name": "When clicking 'Test workflow'"
+		},
+		{
+			"parameters": {
+				"resource": "container",
+				"operation": "get",
+				"container": { "__rl": true, "value": "mycontainer", "mode": "id" },
+				"options": { "simplify": false },
+				"requestOptions": {}
+			},
+			"type": "n8n-nodes-base.azureStorage",
+			"typeVersion": 1,
+			"position": [220, 0],
+			"id": "3429f7f2-dfca-4b72-8913-43a582e96e66",
+			"name": "Azure Storage",
+			"credentials": {
+				"azureStorageSharedKeyApi": {
+					"id": "VPmcFM58eDDexWQL",
+					"name": "Azure Storage Shared Key account"
+				}
+			}
+		}
+	],
+	"connections": {
+		"When clicking 'Test workflow'": {
+			"main": [[{ "node": "Azure Storage", "type": "main", "index": 0 }]]
+		}
+	},
+	"pinData": {
+		"Azure Storage": [
+			{
+				"json": {
+					"name": "mycontainer",
+					"properties": {
+						"lastModified": "Tue, 28 Jan 2025 16:40:21 GMT",
+						"etag": "\"0x8DD3FBA74CF3620\"",
+						"leaseStatus": "unlocked",
+						"leaseState": "available",
+						"hasImmutabilityPolicy": false,
+						"hasLegalHold": false,
+						"leaseDuration": "infinite",
+						"blobPublicAccess": "blob",
+						"contentLength": 0,
+						"date": "Wed, 29 Jan 2025 08:43:08 GMT",
+						"requestId": "49edb268-b01e-0053-6e29-72d574000000",
+						"server": "Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0",
+						"version": "2020-10-02"
+					},
+					"metadata": { "key1": "field1" }
+				}
+			}
+		]
+	}
+}
diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index fad1697e80..5367fb2094 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -39,6 +39,8 @@
       "dist/credentials/AutomizyApi.credentials.js",
       "dist/credentials/AutopilotApi.credentials.js",
       "dist/credentials/Aws.credentials.js",
+      "dist/credentials/AzureStorageOAuth2Api.credentials.js",
+      "dist/credentials/AzureStorageSharedKeyApi.credentials.js",
       "dist/credentials/BambooHrApi.credentials.js",
       "dist/credentials/BannerbearApi.credentials.js",
       "dist/credentials/BaserowApi.credentials.js",
@@ -640,6 +642,7 @@
       "dist/nodes/Microsoft/Outlook/MicrosoftOutlook.node.js",
       "dist/nodes/Microsoft/Outlook/MicrosoftOutlookTrigger.node.js",
       "dist/nodes/Microsoft/Sql/MicrosoftSql.node.js",
+      "dist/nodes/Microsoft/Storage/AzureStorage.node.js",
       "dist/nodes/Microsoft/Teams/MicrosoftTeams.node.js",
       "dist/nodes/Microsoft/ToDo/MicrosoftToDo.node.js",
       "dist/nodes/Mindee/Mindee.node.js",
diff --git a/packages/nodes-base/test/nodes/ExecuteWorkflow.ts b/packages/nodes-base/test/nodes/ExecuteWorkflow.ts
index 969001e619..2b114798bf 100644
--- a/packages/nodes-base/test/nodes/ExecuteWorkflow.ts
+++ b/packages/nodes-base/test/nodes/ExecuteWorkflow.ts
@@ -10,8 +10,29 @@ export async function executeWorkflow(testData: WorkflowTestData, nodeTypes: INo
 	if (testData.nock) {
 		const { baseUrl, mocks } = testData.nock;
 		const agent = nock(baseUrl);
-		mocks.forEach(({ method, path, statusCode, requestBody, responseBody }) =>
-			agent[method](path, requestBody).reply(statusCode, responseBody),
+		mocks.forEach(
+			({
+				method,
+				path,
+				statusCode,
+				requestBody,
+				requestHeaders,
+				responseBody,
+				responseHeaders,
+			}) => {
+				let mock = agent[method](path, requestBody);
+
+				// nock interceptor reqheaders option is ignored, so we chain matchHeader()
+				// agent[method](path, requestBody, { reqheaders: requestHeaders }).reply(statusCode, responseBody, responseHeaders)
+				// https://github.com/nock/nock/issues/2545
+				if (requestHeaders && Object.keys(requestHeaders).length > 0) {
+					Object.entries(requestHeaders).forEach(([key, value]) => {
+						mock = mock.matchHeader(key, value);
+					});
+				}
+
+				mock.reply(statusCode, responseBody, responseHeaders);
+			},
 		);
 	}
 	const executionMode = testData.trigger?.mode ?? 'manual';
diff --git a/packages/nodes-base/test/nodes/FakeCredentialsMap.ts b/packages/nodes-base/test/nodes/FakeCredentialsMap.ts
index e7fee750f8..48ee376218 100644
--- a/packages/nodes-base/test/nodes/FakeCredentialsMap.ts
+++ b/packages/nodes-base/test/nodes/FakeCredentialsMap.ts
@@ -54,6 +54,33 @@ BQIDAQAB
 	airtableApi: {
 		apiKey: 'key123',
 	},
+	azureStorageOAuth2Api: {
+		grantType: 'authorizationCode',
+		authUrl: 'https://login.microsoftonline.com/common/oauth2/v2.0/authorize',
+		accessTokenUrl: 'https://login.microsoftonline.com/common/oauth2/v2.0/token',
+		clientId: 'CLIENTID',
+		clientSecret: 'CLIENTSECRET',
+		scope: 'https://storage.azure.com/user_impersonation',
+		authQueryParameters: 'response_mode=query',
+		authentication: 'body',
+		oauthTokenData: {
+			token_type: 'Bearer',
+			scope: 'https://storage.azure.com/user_impersonation',
+			expires_in: 4730,
+			ext_expires_in: 4730,
+			access_token: 'ACCESSTOKEN',
+			callbackQueryString: {
+				session_state: 'SESSIONSTATE',
+			},
+		},
+		account: 'myaccount',
+		baseUrl: 'https://myaccount.blob.core.windows.net',
+	},
+	azureStorageSharedKeyApi: {
+		account: 'devstoreaccount1',
+		key: 'Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==',
+		baseUrl: 'https://myaccount.blob.core.windows.net',
+	},
 	gongApi: {
 		baseUrl: 'https://api.gong.io',
 		accessKey: 'accessKey123',
diff --git a/packages/workflow/src/Interfaces.ts b/packages/workflow/src/Interfaces.ts
index 46a4713491..fba34bc0a0 100644
--- a/packages/workflow/src/Interfaces.ts
+++ b/packages/workflow/src/Interfaces.ts
@@ -6,7 +6,7 @@ import type * as express from 'express';
 import type FormData from 'form-data';
 import type { PathLike } from 'fs';
 import type { IncomingHttpHeaders } from 'http';
-import type { RequestBodyMatcher } from 'nock';
+import type { ReplyHeaders, RequestBodyMatcher, RequestHeaderMatcher } from 'nock';
 import type { Client as SSHClient } from 'ssh2';
 import type { Readable } from 'stream';
 import type { SecureContextOptions } from 'tls';
@@ -2412,8 +2412,10 @@ export interface WorkflowTestData {
 			method: 'delete' | 'get' | 'patch' | 'post' | 'put';
 			path: string;
 			requestBody?: RequestBodyMatcher;
+			requestHeaders?: Record<string, RequestHeaderMatcher>;
 			statusCode: number;
 			responseBody: string | object;
+			responseHeaders?: ReplyHeaders;
 		}>;
 	};
 	trigger?: {

From c4f329377828d80a54b71f5733ea7d9b4ee91f48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milorad=20FIlipovi=C4=87?= <milorad@n8n.io>
Date: Fri, 28 Feb 2025 11:53:42 +0100
Subject: [PATCH 40/47] fix(editor): Add workflows to the store when fetching
 current page (#13583)

---
 cypress/e2e/1-workflows.cy.ts                    |  8 ++++++++
 cypress/pages/workflows.ts                       |  1 +
 packages/editor-ui/src/stores/workflows.store.ts | 13 +++++++++++++
 3 files changed, 22 insertions(+)

diff --git a/cypress/e2e/1-workflows.cy.ts b/cypress/e2e/1-workflows.cy.ts
index 82d1b9b90b..a972a21403 100644
--- a/cypress/e2e/1-workflows.cy.ts
+++ b/cypress/e2e/1-workflows.cy.ts
@@ -1,9 +1,11 @@
+import { WorkflowSharingModal } from '../pages';
 import { WorkflowPage as WorkflowPageClass } from '../pages/workflow';
 import { WorkflowsPage as WorkflowsPageClass } from '../pages/workflows';
 import { getUniqueWorkflowName } from '../utils/workflowUtils';
 
 const WorkflowsPage = new WorkflowsPageClass();
 const WorkflowPage = new WorkflowPageClass();
+const workflowSharingModal = new WorkflowSharingModal();
 
 const multipleWorkflowsCount = 5;
 
@@ -138,4 +140,10 @@ describe('Workflows', () => {
 		cy.url().should('include', 'sort=lastCreated');
 		cy.url().should('include', 'pageSize=25');
 	});
+
+	it('should be able to share workflows from workflows list', () => {
+		WorkflowsPage.getters.workflowCardActions('Empty State Card Workflow').click();
+		WorkflowsPage.getters.workflowActionItem('share').click();
+		workflowSharingModal.getters.modal().should('be.visible');
+	});
 });
diff --git a/cypress/pages/workflows.ts b/cypress/pages/workflows.ts
index 87507c80a1..f93e3e0103 100644
--- a/cypress/pages/workflows.ts
+++ b/cypress/pages/workflows.ts
@@ -35,6 +35,7 @@ export class WorkflowsPage extends BasePage {
 			this.getters.workflowActivator(workflowName).findChildByTestId('workflow-activator-status'),
 		workflowCardActions: (workflowName: string) =>
 			this.getters.workflowCard(workflowName).findChildByTestId('workflow-card-actions'),
+		workflowActionItem: (action: string) => cy.getByTestId(`action-${action}`).filter(':visible'),
 		workflowDeleteButton: () =>
 			cy.getByTestId('action-toggle-dropdown').filter(':visible').contains('Delete'),
 		workflowMoveButton: () =>
diff --git a/packages/editor-ui/src/stores/workflows.store.ts b/packages/editor-ui/src/stores/workflows.store.ts
index 4327efb305..701914081f 100644
--- a/packages/editor-ui/src/stores/workflows.store.ts
+++ b/packages/editor-ui/src/stores/workflows.store.ts
@@ -517,6 +517,19 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 		);
 
 		totalWorkflowCount.value = count;
+		// Also set fetched workflows to store
+		// When fetching workflows from overview page, they don't have resource property
+		// so in order to filter out folders, we need to check if resource is not folder
+		data
+			.filter((item) => item.resource !== 'folder')
+			.forEach((item) => {
+				addWorkflow({
+					...item,
+					nodes: [],
+					connections: {},
+					versionId: '',
+				});
+			});
 		return data;
 	}
 

From 289041e997eedb660356cdbd259660b7c3117194 Mon Sep 17 00:00:00 2001
From: oleg <me@olegivaniv.com>
Date: Fri, 28 Feb 2025 12:27:49 +0100
Subject: [PATCH 41/47] feat(n8n Form Trigger Node, Chat Trigger Node): Allow
 to customize form and chat css (#13506)

---
 .../trigger/ChatTrigger/ChatTrigger.node.ts   |  26 ++
 .../nodes/trigger/ChatTrigger/constants.ts    | 122 +++++++
 .../nodes/trigger/ChatTrigger/templates.ts    |  11 +-
 packages/@n8n/nodes-langchain/package.json    |   2 +
 .../cli/templates/form-trigger-404.handlebars | 219 ++++++++-----
 .../cli/templates/form-trigger-409.handlebars | 194 +++++++----
 .../form-trigger-completion.handlebars        | 118 +++++--
 .../cli/templates/form-trigger.handlebars     | 310 ++++++++++--------
 packages/editor-ui/package.json               |   5 +-
 .../src/components/CssEditor/CssEditor.vue    | 145 ++++++++
 .../src/components/ParameterInput.vue         |  30 +-
 .../@n8n/chat/src/components/Button.vue       |  12 +-
 .../@n8n/chat/src/components/ChatWindow.vue   |  10 +-
 .../@n8n/chat/src/components/Input.vue        |  25 +-
 .../@n8n/chat/src/components/Layout.vue       |  43 +--
 .../@n8n/chat/src/components/Message.vue      |  14 +-
 .../@n8n/chat/src/components/MessagesList.vue |   2 +-
 .../frontend/@n8n/chat/src/css/_tokens.scss   |  87 ++++-
 packages/nodes-base/nodes/Form/Form.node.ts   |  27 +-
 .../nodes-base/nodes/Form/cssVariables.ts     |  70 ++++
 .../nodes/Form/formCompletionUtils.ts         |   8 +-
 .../nodes-base/nodes/Form/formNodeUtils.ts    |   2 +
 packages/nodes-base/nodes/Form/interfaces.ts  |   1 +
 .../nodes/Form/test/Form.node.test.ts         |  84 +++++
 .../Form/test/FormTriggerV2.node.test.ts      |  27 ++
 packages/nodes-base/nodes/Form/utils.ts       |  20 ++
 .../nodes/Form/v2/FormTriggerV2.node.ts       |  17 +
 packages/workflow/src/Interfaces.ts           |   2 +-
 pnpm-lock.yaml                                |  22 +-
 29 files changed, 1278 insertions(+), 377 deletions(-)
 create mode 100644 packages/@n8n/nodes-langchain/nodes/trigger/ChatTrigger/constants.ts
 create mode 100644 packages/editor-ui/src/components/CssEditor/CssEditor.vue
 create mode 100644 packages/nodes-base/nodes/Form/cssVariables.ts

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 27fb1bcd35..fab05be8ec 100644
--- a/packages/@n8n/nodes-langchain/nodes/trigger/ChatTrigger/ChatTrigger.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/trigger/ChatTrigger/ChatTrigger.node.ts
@@ -12,6 +12,7 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
+import { cssVariables } from './constants';
 import { validateAuth } from './GenericFunctions';
 import { createPage } from './templates';
 import type { LoadPreviousSessionChatOption } from './types';
@@ -378,6 +379,29 @@ export class ChatTrigger extends Node {
 						placeholder: 'e.g. Welcome',
 						description: 'Shown at the top of the chat',
 					},
+					{
+						displayName: 'Custom Chat Styling',
+						name: 'customCss',
+						type: 'string',
+						typeOptions: {
+							rows: 10,
+							editor: 'cssEditor',
+						},
+						displayOptions: {
+							show: {
+								'/mode': ['hostedChat'],
+							},
+						},
+						default: `
+${cssVariables}
+
+/* You can override any class styles, too. Right-click inspect in Chat UI to find class to override. */
+.chat-message {
+	max-width: 50%;
+}
+`.trim(),
+						description: 'Override default styling of the public chat interface with CSS',
+					},
 				],
 			},
 		],
@@ -466,6 +490,7 @@ export class ChatTrigger extends Node {
 			title?: string;
 			allowFileUploads?: boolean;
 			allowedFilesMimeTypes?: string;
+			customCss?: string;
 		};
 
 		const req = ctx.getRequestObject();
@@ -517,6 +542,7 @@ export class ChatTrigger extends Node {
 					authentication,
 					allowFileUploads: options.allowFileUploads,
 					allowedFilesMimeTypes: options.allowedFilesMimeTypes,
+					customCss: options.customCss,
 				});
 
 				res.status(200).send(page).end();
diff --git a/packages/@n8n/nodes-langchain/nodes/trigger/ChatTrigger/constants.ts b/packages/@n8n/nodes-langchain/nodes/trigger/ChatTrigger/constants.ts
new file mode 100644
index 0000000000..379629a896
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/trigger/ChatTrigger/constants.ts
@@ -0,0 +1,122 @@
+// CSS Variables are defined in `@n8n/chat/src/css/_tokens.scss`
+export const cssVariables = `
+:root {
+  /* Colors */
+  --chat--color-primary: #e74266;
+  --chat--color-primary-shade-50: #db4061;
+  --chat--color-primary-shade-100: #cf3c5c;
+  --chat--color-secondary: #20b69e;
+  --chat--color-secondary-shade-50: #1ca08a;
+  --chat--color-white: #ffffff;
+  --chat--color-light: #f2f4f8;
+  --chat--color-light-shade-50: #e6e9f1;
+  --chat--color-light-shade-100: #c2c5cc;
+  --chat--color-medium: #d2d4d9;
+  --chat--color-dark: #101330;
+  --chat--color-disabled: #777980;
+  --chat--color-typing: #404040;
+
+  /* Base Layout */
+  --chat--spacing: 1rem;
+  --chat--border-radius: 0.25rem;
+  --chat--transition-duration: 0.15s;
+  --chat--font-family: (
+    -apple-system,
+    BlinkMacSystemFont,
+    'Segoe UI',
+    Roboto,
+    Oxygen-Sans,
+    Ubuntu,
+    Cantarell,
+    'Helvetica Neue',
+    sans-serif
+  );
+
+  /* Window Dimensions */
+  --chat--window--width: 400px;
+  --chat--window--height: 600px;
+  --chat--window--bottom: var(--chat--spacing);
+  --chat--window--right: var(--chat--spacing);
+  --chat--window--z-index: 9999;
+  --chat--window--border: 1px solid var(--chat--color-light-shade-50);
+  --chat--window--border-radius: var(--chat--border-radius);
+  --chat--window--margin-bottom: var(--chat--spacing);
+
+  /* Header Styles */
+  --chat--header-height: auto;
+  --chat--header--padding: var(--chat--spacing);
+  --chat--header--background: var(--chat--color-dark);
+  --chat--header--color: var(--chat--color-light);
+  --chat--header--border-top: none;
+  --chat--header--border-bottom: none;
+  --chat--header--border-left: none;
+  --chat--header--border-right: none;
+  --chat--heading--font-size: 2em;
+  --chat--subtitle--font-size: inherit;
+  --chat--subtitle--line-height: 1.8;
+
+  /* Message Styles */
+  --chat--message--font-size: 1rem;
+  --chat--message--padding: var(--chat--spacing);
+  --chat--message--border-radius: var(--chat--border-radius);
+  --chat--message-line-height: 1.5;
+  --chat--message--margin-bottom: calc(var(--chat--spacing) * 1);
+  --chat--message--bot--background: var(--chat--color-white);
+  --chat--message--bot--color: var(--chat--color-dark);
+  --chat--message--bot--border: none;
+  --chat--message--user--background: var(--chat--color-secondary);
+  --chat--message--user--color: var(--chat--color-white);
+  --chat--message--user--border: none;
+  --chat--message--pre--background: rgba(0, 0, 0, 0.05);
+  --chat--messages-list--padding: var(--chat--spacing);
+
+  /* Toggle Button */
+  --chat--toggle--size: 64px;
+  --chat--toggle--width: var(--chat--toggle--size);
+  --chat--toggle--height: var(--chat--toggle--size);
+  --chat--toggle--border-radius: 50%;
+  --chat--toggle--background: var(--chat--color-primary);
+  --chat--toggle--hover--background: var(--chat--color-primary-shade-50);
+  --chat--toggle--active--background: var(--chat--color-primary-shade-100);
+  --chat--toggle--color: var(--chat--color-white);
+
+  /* Input Area */
+  --chat--textarea--height: 50px;
+  --chat--textarea--max-height: 30rem;
+  --chat--input--font-size: inherit;
+  --chat--input--border: 0;
+  --chat--input--border-radius: 0;
+  --chat--input--padding: 0.8rem;
+  --chat--input--background: var(--chat--color-white);
+  --chat--input--text-color: initial;
+  --chat--input--line-height: 1.5;
+  --chat--input--placeholder--font-size: var(--chat--input--font-size);
+  --chat--input--border-active: 0;
+  --chat--input--left--panel--width: 2rem;
+
+  /* Button Styles */
+  --chat--button--color: var(--chat--color-light);
+  --chat--button--background: var(--chat--color-primary);
+  --chat--button--padding: calc(var(--chat--spacing) * 1 / 2) var(--chat--spacing);
+  --chat--button--border-radius: var(--chat--border-radius);
+  --chat--button--hover--color: var(--chat--color-light);
+  --chat--button--hover--background: var(--chat--color-primary-shade-50);
+  --chat--close--button--color-hover: var(--chat--color-primary);
+
+  /* Send and File Buttons */
+  --chat--input--send--button--background: var(--chat--color-white);
+  --chat--input--send--button--color: var(--chat--color-light);
+  --chat--input--send--button--background-hover: var(--chat--color-primary-shade-50);
+  --chat--input--send--button--color-hover: var(--chat--color-secondary-shade-50);
+  --chat--input--file--button--background: var(--chat--color-white);
+  --chat--input--file--button--color: var(--chat--color-secondary);
+  --chat--input--file--button--background-hover: var(--chat--input--file--button--background);
+  --chat--input--file--button--color-hover: var(--chat--color-secondary-shade-50);
+  --chat--files-spacing: 0.25rem;
+
+  /* Body and Footer */
+  --chat--body--background: var(--chat--color-light);
+  --chat--footer--background: var(--chat--color-light);
+  --chat--footer--color: var(--chat--color-dark);
+}
+`;
diff --git a/packages/@n8n/nodes-langchain/nodes/trigger/ChatTrigger/templates.ts b/packages/@n8n/nodes-langchain/nodes/trigger/ChatTrigger/templates.ts
index 0435df59e8..d224a89361 100644
--- a/packages/@n8n/nodes-langchain/nodes/trigger/ChatTrigger/templates.ts
+++ b/packages/@n8n/nodes-langchain/nodes/trigger/ChatTrigger/templates.ts
@@ -1,5 +1,6 @@
-import type { AuthenticationChatOption, LoadPreviousSessionChatOption } from './types';
+import sanitizeHtml from 'sanitize-html';
 
+import type { AuthenticationChatOption, LoadPreviousSessionChatOption } from './types';
 export function createPage({
 	instanceId,
 	webhookUrl,
@@ -10,6 +11,7 @@ export function createPage({
 	authentication,
 	allowFileUploads,
 	allowedFilesMimeTypes,
+	customCss,
 }: {
 	instanceId: string;
 	webhookUrl?: string;
@@ -23,6 +25,7 @@ export function createPage({
 	authentication: AuthenticationChatOption;
 	allowFileUploads?: boolean;
 	allowedFilesMimeTypes?: string;
+	customCss?: string;
 }) {
 	const validAuthenticationOptions: AuthenticationChatOption[] = [
 		'none',
@@ -41,6 +44,11 @@ export function createPage({
 	const sanitizedShowWelcomeScreen = !!showWelcomeScreen;
 	const sanitizedAllowFileUploads = !!allowFileUploads;
 	const sanitizedAllowedFilesMimeTypes = allowedFilesMimeTypes?.toString() ?? '';
+	const sanitizedCustomCss = sanitizeHtml(`<style>${customCss?.toString() ?? ''}</style>`, {
+		allowedTags: ['style'],
+		allowedAttributes: false,
+	});
+
 	const sanitizedLoadPreviousSession = validLoadPreviousSessionOptions.includes(
 		loadPreviousSession as LoadPreviousSessionChatOption,
 	)
@@ -63,6 +71,7 @@ export function createPage({
 					height: 100%;
 				}
 			</style>
+			${sanitizedCustomCss}
 		</head>
 		<body>
 			<script type="module">
diff --git a/packages/@n8n/nodes-langchain/package.json b/packages/@n8n/nodes-langchain/package.json
index 4fa65208b0..b069dc39e5 100644
--- a/packages/@n8n/nodes-langchain/package.json
+++ b/packages/@n8n/nodes-langchain/package.json
@@ -130,6 +130,7 @@
     "@types/mime-types": "^2.1.0",
     "@types/pg": "^8.11.6",
     "@types/temp": "^0.9.1",
+    "@types/sanitize-html": "^2.11.0",
     "n8n-core": "workspace:*"
   },
   "dependencies": {
@@ -183,6 +184,7 @@
     "pdf-parse": "1.1.1",
     "pg": "8.12.0",
     "redis": "4.6.12",
+    "sanitize-html": "2.12.1",
     "sqlite3": "5.1.7",
     "temp": "0.9.4",
     "tmp-promise": "3.0.3",
diff --git a/packages/cli/templates/form-trigger-404.handlebars b/packages/cli/templates/form-trigger-404.handlebars
index db6a9da13b..553739a8ee 100644
--- a/packages/cli/templates/form-trigger-404.handlebars
+++ b/packages/cli/templates/form-trigger-404.handlebars
@@ -1,86 +1,147 @@
 <html lang='en'>
 
-	<head>
-		<meta charset='UTF-8' />
-		<meta name='viewport' content='width=device-width, initial-scale=1.0' />
-		<link rel='icon' type='image/png' href='https://n8n.io/favicon.ico' />
-		<link
-			href='https://fonts.googleapis.com/css?family=Open+Sans'
-			rel='stylesheet'
-			type='text/css'
-		/>
-		{{#if isTestWebhook}}
-			<title>Form Trigger isn't listening yet</title>
-		{{else}}
-			<title>Problem loading form</title>
-		{{/if}}
+<head>
+  <meta charset='UTF-8' />
+  <meta name='viewport' content='width=device-width, initial-scale=1.0' />
+  <link rel='icon' type='image/png' href='https://n8n.io/favicon.ico' />
+  <link href='https://fonts.googleapis.com/css?family=Open+Sans' rel='stylesheet' type='text/css' />
+  {{#if isTestWebhook}}
+    <title>Form Trigger isn't listening yet</title>
+  {{else}}
+    <title>Problem loading form</title>
+  {{/if}}
+  <style>
+    :root {
+      /* Fonts */
+      --font-family: 'Open Sans', sans-serif;
+      --font-weight-normal: 400;
+      --font-weight-bold: 600;
+      --font-size-body: 12px;
+      --font-size-link: 12px;
+      --font-size-header: 20px;
+      --font-size-subheader: 14px;
+
+      /* Colors */
+      --color-background: #FBFCFE;
+      --color-card-bg: white;
+      --color-card-border: #DBDFE7;
+      --color-card-shadow: #634DFF0F;
+      --color-link: #7E8186;
+      --color-header: #525356;
+      --color-header-subtext: #7E8186;
+
+      /* Spacing & dimensions */
+      --padding-container-top: 24px;
+      --container-width: 448px;
+      --card-padding: 24px;
+      --card-border-radius: 8px;
+      --card-margin-bottom: 16px;
+    }
+
+    *,
+    ::after,
+    ::before {
+      box-sizing: border-box;
+      margin: 0;
+      padding: 0;
+    }
+
+    body {
+      font-family: var(--font-family);
+      font-weight: var(--font-weight-normal);
+      font-size: var(--font-size-body);
+      display: flex;
+      flex-direction: column;
+      justify-content: start;
+      background-color: var(--color-background);
+    }
+
+    .container {
+      margin: auto;
+      text-align: center;
+      padding-top: var(--padding-container-top);
+      width: var(--container-width);
+    }
+
+    .card {
+      padding: var(--card-padding);
+      background-color: var(--color-card-bg);
+      border: 1px solid var(--color-card-border);
+      border-radius: var(--card-border-radius);
+      box-shadow: 0px 4px 16px 0px var(--color-card-shadow);
+      margin-bottom: var(--card-margin-bottom);
+    }
+
+    .n8n-link a {
+      color: var(--color-link);
+      font-weight: var(--font-weight-bold);
+      font-size: var(--font-size-link);
+      text-decoration: none;
+    }
+
+    .n8n-link svg {
+      display: inline-block;
+      vertical-align: middle;
+    }
+
+    .header h1 {
+      color: var(--color-header);
+      font-size: var(--font-size-header);
+      font-weight: var(--font-weight-normal);
+      padding-bottom: 8px;
+    }
+
+    .header p {
+      color: var(--color-header-subtext);
+      font-size: var(--font-size-subheader);
+      font-weight: var(--font-weight-normal);
+    }
+  </style>
+
+	{{#if dangerousCustomCss}}
 		<style>
-			*, ::after, ::before { box-sizing: border-box; margin: 0; padding: 0; } body { font-family:
-			Open Sans, sans-serif; font-weight: 400; font-size: 12px; display: flex; flex-direction:
-			column; justify-content: start; background-color: #FBFCFE; } .container { margin: auto;
-			text-align: center; padding-top: 24px; width: 448px; } .card { padding: 24px;
-			background-color: white; border: 1px solid #DBDFE7; border-radius: 8px; box-shadow: 0px 4px
-			16px 0px #634DFF0F; margin-bottom: 16px; } .n8n-link a { color: #7E8186; font-weight: 600;
-			font-size: 12px; text-decoration: none; } .n8n-link svg { display: inline-block;
-			vertical-align: middle; } .header h1 { color: #525356; font-size: 20px; font-weight: 400;
-			padding-bottom: 8px; } .header p { color: #7E8186; font-size: 14px; font-weight: 400; }
+			{{{ dangerousCustomCss }}}
 		</style>
-	</head>
+	{{/if}}
+</head>
 
-	<body>
-		<div class='container'>
-			<section>
-				<div class='card'>
-					{{#if isTestWebhook}}
-						<div class='header'>
-							<h1>Form Trigger isn't listening yet</h1>
-							<p>Click the <strong>"Test step"</strong> button in your form trigger</p>
-						</div>
-					{{else}}
-						<div class='header'>
-							<h1>Problem loading form</h1>
-							<p>This usually occurs if the n8n workflow serving this form is deactivated or no
-								longer exist</p>
-						</div>
-					{{/if}}
-				</div>
-				<div class='n8n-link'>
-					<a
-						href='https://n8n.io/?utm_source=n8n-internal&amp;utm_medium=form-trigger&amp'
-						target='_blank'
-					>
-						Form automated with
-						<svg
-							width='73'
-							height='20'
-							viewBox='0 0 73 20'
-							fill='none'
-							xmlns='http://www.w3.org/2000/svg'
-						>
-							<path
-								fill-rule='evenodd'
-								clip-rule='evenodd'
-								d='M40.2373 4C40.2373 6.20915 38.4464 8 36.2373 8C34.3735 8 32.8074 6.72525 32.3633 5H26.7787C25.801 5 24.9666 5.70685 24.8059 6.6712L24.6415 7.6576C24.4854 8.59415 24.0116 9.40925 23.3417 10C24.0116 10.5907 24.4854 11.4058 24.6415 12.3424L24.8059 13.3288C24.9666 14.2931 25.801 15 26.7787 15H28.3633C28.8074 13.2747 30.3735 12 32.2373 12C34.4464 12 36.2373 13.7908 36.2373 16C36.2373 18.2092 34.4464 20 32.2373 20C30.3735 20 28.8074 18.7253 28.3633 17H26.7787C24.8233 17 23.1546 15.5864 22.8331 13.6576L22.6687 12.6712C22.508 11.7069 21.6736 11 20.6959 11H19.0645C18.5652 12.64 17.0406 13.8334 15.2373 13.8334C13.434 13.8334 11.9094 12.64 11.4101 11H9.06449C8.56519 12.64 7.04059 13.8334 5.2373 13.8334C3.02817 13.8334 1.2373 12.0424 1.2373 9.83335C1.2373 7.6242 3.02817 5.83335 5.2373 5.83335C7.16069 5.83335 8.76699 7.19085 9.15039 9H11.3242C11.7076 7.19085 13.3139 5.83335 15.2373 5.83335C17.1607 5.83335 18.767 7.19085 19.1504 9H20.6959C21.6736 9 22.508 8.29315 22.6687 7.3288L22.8331 6.3424C23.1546 4.41365 24.8233 3 26.7787 3H32.3633C32.8074 1.27478 34.3735 0 36.2373 0C38.4464 0 40.2373 1.79086 40.2373 4ZM38.2373 4C38.2373 5.10455 37.3419 6 36.2373 6C35.1327 6 34.2373 5.10455 34.2373 4C34.2373 2.89543 35.1327 2 36.2373 2C37.3419 2 38.2373 2.89543 38.2373 4ZM5.2373 11.8334C6.34189 11.8334 7.23729 10.9379 7.23729 9.83335C7.23729 8.72875 6.34189 7.83335 5.2373 7.83335C4.13273 7.83335 3.2373 8.72875 3.2373 9.83335C3.2373 10.9379 4.13273 11.8334 5.2373 11.8334ZM15.2373 11.8334C16.3419 11.8334 17.2373 10.9379 17.2373 9.83335C17.2373 8.72875 16.3419 7.83335 15.2373 7.83335C14.1327 7.83335 13.2373 8.72875 13.2373 9.83335C13.2373 10.9379 14.1327 11.8334 15.2373 11.8334ZM32.2373 18C33.3419 18 34.2373 17.1045 34.2373 16C34.2373 14.8954 33.3419 14 32.2373 14C31.1327 14 30.2373 14.8954 30.2373 16C30.2373 17.1045 31.1327 18 32.2373 18Z'
-								fill='#EA4B71'
-							></path>
-							<path
-								d='M44.2393 15.0007H46.3277V10.5791C46.3277 9.12704 47.2088 8.49074 48.204 8.49074C49.183 8.49074 49.9498 9.14334 49.9498 10.4812V15.0007H52.038V10.057C52.038 7.91969 50.798 6.67969 48.8567 6.67969C47.633 6.67969 46.9477 7.16914 46.4582 7.80544H46.3277L46.1482 6.84284H44.2393V15.0007Z'
-								fill='#101330'
-							></path>
-							<path
-								d='M60.0318 9.50205V9.40415C60.7498 9.0452 61.4678 8.4252 61.4678 7.20155C61.4678 5.43945 60.0153 4.37891 58.0088 4.37891C55.9528 4.37891 54.4843 5.5047 54.4843 7.23415C54.4843 8.4089 55.1698 9.0452 55.9203 9.40415V9.50205C55.0883 9.79575 54.0928 10.6768 54.0928 12.1452C54.0928 13.9237 55.5613 15.1637 57.9923 15.1637C60.4233 15.1637 61.8428 13.9237 61.8428 12.1452C61.8428 10.6768 60.8638 9.81205 60.0318 9.50205ZM57.9923 5.87995C58.8083 5.87995 59.4118 6.40205 59.4118 7.2831C59.4118 8.16415 58.7918 8.6863 57.9923 8.6863C57.1928 8.6863 56.5238 8.16415 56.5238 7.2831C56.5238 6.38575 57.1603 5.87995 57.9923 5.87995ZM57.9923 13.5974C57.0458 13.5974 56.2793 12.9937 56.2793 11.9658C56.2793 11.0358 56.9153 10.3342 57.9758 10.3342C59.0203 10.3342 59.6568 11.0195 59.6568 11.9984C59.6568 12.9937 58.9223 13.5974 57.9923 13.5974Z'
-								fill='#101330'
-							></path>
-							<path
-								d='M63.9639 15.0007H66.0524V10.5791C66.0524 9.12704 66.9334 8.49074 67.9289 8.49074C68.9079 8.49074 69.6744 9.14334 69.6744 10.4812V15.0007H71.7629V10.057C71.7629 7.91969 70.5229 6.67969 68.5814 6.67969C67.3579 6.67969 66.6724 7.16914 66.1829 7.80544H66.0524L65.8729 6.84284H63.9639V15.0007Z'
-								fill='#101330'
-							></path>
-						</svg>
-
-					</a>
-				</div>
-			</section>
-		</div>
-	</body>
+<body>
+  <div class='container'>
+    <section>
+      <div class='card'>
+        {{#if isTestWebhook}}
+          <div class='header'>
+            <h1>Form Trigger isn't listening yet</h1>
+            <p>Click the <strong>"Test step"</strong> button in your form trigger</p>
+          </div>
+        {{else}}
+          <div class='header'>
+            <h1>Problem loading form</h1>
+            <p>This usually occurs if the n8n workflow serving this form is deactivated or no longer exist</p>
+          </div>
+        {{/if}}
+      </div>
+      <div class='n8n-link'>
+        <a href='https://n8n.io/?utm_source=n8n-internal&amp;utm_medium=form-trigger&amp' target='_blank'>
+          Form automated with
+          <svg width='73' height='20' viewBox='0 0 73 20' fill='none' xmlns='http://www.w3.org/2000/svg'>
+            <path fill-rule='evenodd' clip-rule='evenodd'
+              d='M40.2373 4C40.2373 6.20915 38.4464 8 36.2373 8C34.3735 8 32.8074 6.72525 32.3633 5H26.7787C25.801 5 24.9666 5.70685 24.8059 6.6712L24.6415 7.6576C24.4854 8.59415 24.0116 9.40925 23.3417 10C24.0116 10.5907 24.4854 11.4058 24.6415 12.3424L24.8059 13.3288C24.9666 14.2931 25.801 15 26.7787 15H28.3633C28.8074 13.2747 30.3735 12 32.2373 12C34.4464 12 36.2373 13.7908 36.2373 16C36.2373 18.2092 34.4464 20 32.2373 20C30.3735 20 28.8074 18.7253 28.3633 17H26.7787C24.8233 17 23.1546 15.5864 22.8331 13.6576L22.6687 12.6712C22.508 11.7069 21.6736 11 20.6959 11H19.0645C18.5652 12.64 17.0406 13.8334 15.2373 13.8334C13.434 13.8334 11.9094 12.64 11.4101 11H9.06449C8.56519 12.64 7.04059 13.8334 5.2373 13.8334C3.02817 13.8334 1.2373 12.0424 1.2373 9.83335C1.2373 7.6242 3.02817 5.83335 5.2373 5.83335C7.16069 5.83335 8.76699 7.19085 9.15039 9H11.3242C11.7076 7.19085 13.3139 5.83335 15.2373 5.83335C17.1607 5.83335 18.767 7.19085 19.1504 9H20.6959C21.6736 9 22.508 8.29315 22.6687 7.3288L22.8331 6.3424C23.1546 4.41365 24.8233 3 26.7787 3H32.3633C32.8074 1.27478 34.3735 0 36.2373 0C38.4464 0 40.2373 1.79086 40.2373 4ZM38.2373 4C38.2373 5.10455 37.3419 6 36.2373 6C35.1327 6 34.2373 5.10455 34.2373 4C34.2373 2.89543 35.1327 2 36.2373 2C37.3419 2 38.2373 2.89543 38.2373 4ZM5.2373 11.8334C6.34189 11.8334 7.23729 10.9379 7.23729 9.83335C7.23729 8.72875 6.34189 7.83335 5.2373 7.83335C4.13273 7.83335 3.2373 8.72875 3.2373 9.83335C3.2373 10.9379 4.13273 11.8334 5.2373 11.8334ZM15.2373 11.8334C16.3419 11.8334 17.2373 10.9379 17.2373 9.83335C17.2373 8.72875 16.3419 7.83335 15.2373 7.83335C14.1327 7.83335 13.2373 8.72875 13.2373 9.83335C13.2373 10.9379 14.1327 11.8334 15.2373 11.8334ZM32.2373 18C33.3419 18 34.2373 17.1045 34.2373 16C34.2373 14.8954 33.3419 14 32.2373 14C31.1327 14 30.2373 14.8954 30.2373 16C30.2373 17.1045 31.1327 18 32.2373 18Z'
+              fill='#EA4B71'></path>
+            <path
+              d='M44.2393 15.0007H46.3277V10.5791C46.3277 9.12704 47.2088 8.49074 48.204 8.49074C49.183 8.49074 49.9498 9.14334 49.9498 10.4812V15.0007H52.038V10.057C52.038 7.91969 50.798 6.67969 48.8567 6.67969C47.633 6.67969 46.9477 7.16914 46.4582 7.80544H46.3277L46.1482 6.84284H44.2393V15.0007Z'
+              fill='#101330'></path>
+            <path
+              d='M60.0318 9.50205V9.40415C60.7498 9.0452 61.4678 8.4252 61.4678 7.20155C61.4678 5.43945 60.0153 4.37891 58.0088 4.37891C55.9528 4.37891 54.4843 5.5047 54.4843 7.23415C54.4843 8.4089 55.1698 9.0452 55.9203 9.40415V9.50205C55.0883 9.79575 54.0928 10.6768 54.0928 12.1452C54.0928 13.9237 55.5613 15.1637 57.9923 15.1637C60.4233 15.1637 61.8428 13.9237 61.8428 12.1452C61.8428 10.6768 60.8638 9.81205 60.0318 9.50205ZM57.9923 5.87995C58.8083 5.87995 59.4118 6.40205 59.4118 7.2831C59.4118 8.16415 58.7918 8.6863 57.9923 8.6863C57.1928 8.6863 56.5238 8.16415 56.5238 7.2831C56.5238 6.38575 57.1603 5.87995 57.9923 5.87995ZM57.9923 13.5974C57.0458 13.5974 56.2793 12.9937 56.2793 11.9658C56.2793 11.0358 56.9153 10.3342 57.9758 10.3342C59.0203 10.3342 59.6568 11.0195 59.6568 11.9984C59.6568 12.9937 58.9223 13.5974 57.9923 13.5974Z'
+              fill='#101330'></path>
+            <path
+              d='M63.9639 15.0007H66.0524V10.5791C66.0524 9.12704 66.9334 8.49074 67.9289 8.49074C68.9079 8.49074 69.6744 9.14334 69.6744 10.4812V15.0007H71.7629V10.057C71.7629 7.91969 70.5229 6.67969 68.5814 6.67969C67.3579 6.67969 66.6724 7.16914 66.1829 7.80544H66.0524L65.8729 6.84284H63.9639V15.0007Z'
+              fill='#101330'></path>
+          </svg>
+        </a>
+      </div>
+    </section>
+  </div>
+</body>
 
 </html>
diff --git a/packages/cli/templates/form-trigger-409.handlebars b/packages/cli/templates/form-trigger-409.handlebars
index 95c14105d7..b4c671a4e0 100644
--- a/packages/cli/templates/form-trigger-409.handlebars
+++ b/packages/cli/templates/form-trigger-409.handlebars
@@ -1,74 +1,136 @@
 <html lang='en'>
 
-	<head>
-		<meta charset='UTF-8' />
-		<meta name='viewport' content='width=device-width, initial-scale=1.0' />
-		<link rel='icon' type='image/png' href='https://n8n.io/favicon.ico' />
-		<link
-			href='https://fonts.googleapis.com/css?family=Open+Sans'
-			rel='stylesheet'
-			type='text/css'
-		/>
-		<title>Problem loading form</title>
+<head>
+	<meta charset='UTF-8' />
+	<meta name='viewport' content='width=device-width, initial-scale=1.0' />
+	<link rel='icon' type='image/png' href='https://n8n.io/favicon.ico' />
+	<link href='https://fonts.googleapis.com/css?family=Open+Sans' rel='stylesheet' type='text/css' />
+	<title>Problem loading form</title>
+	<style>
+		:root {
+			/* Fonts */
+			--font-family: 'Open Sans', sans-serif;
+			--font-weight-normal: 400;
+			--font-weight-bold: 600;
+			--font-size-body: 12px;
+			--font-size-link: 12px;
+			--font-size-header: 20px;
+			--font-size-subheader: 14px;
+
+			/* Colors */
+			--color-background: #FBFCFE;
+			--color-card-bg: white;
+			--color-card-border: #DBDFE7;
+			--color-card-shadow: #634DFF0F;
+			--color-link: #7E8186;
+			--color-header: #525356;
+			--color-header-subtext: #7E8186;
+
+			/* Spacing and dimensions */
+			--padding-container-top: 24px;
+			--container-width: 448px;
+			--card-padding: 24px;
+			--card-border-radius: 8px;
+			--card-margin-bottom: 16px;
+		}
+
+		*,
+		::after,
+		::before {
+			box-sizing: border-box;
+			margin: 0;
+			padding: 0;
+		}
+
+		body {
+			font-family: var(--font-family);
+			font-weight: var(--font-weight-normal);
+			font-size: var(--font-size-body);
+			display: flex;
+			flex-direction: column;
+			justify-content: start;
+			background-color: var(--color-background);
+		}
+
+		.container {
+			margin: auto;
+			text-align: center;
+			padding-top: var(--padding-container-top);
+			width: var(--container-width);
+		}
+
+		.card {
+			padding: var(--card-padding);
+			background-color: var(--color-card-bg);
+			border: 1px solid var(--color-card-border);
+			border-radius: var(--card-border-radius);
+			box-shadow: 0px 4px 16px 0px var(--color-card-shadow);
+			margin-bottom: var(--card-margin-bottom);
+		}
+
+		.n8n-link a {
+			color: var(--color-link);
+			font-weight: var(--font-weight-bold);
+			font-size: var(--font-size-link);
+			text-decoration: none;
+		}
+
+		.n8n-link svg {
+			display: inline-block;
+			vertical-align: middle;
+		}
+
+		.header h1 {
+			color: var(--color-header);
+			font-size: var(--font-size-header);
+			font-weight: var(--font-weight-normal);
+			padding-bottom: 8px;
+		}
+
+		.header p {
+			color: var(--color-header-subtext);
+			font-size: var(--font-size-subheader);
+			font-weight: var(--font-weight-normal);
+		}
+	</style>
+
+	{{#if dangerousCustomCss}}
 		<style>
-			*, ::after, ::before { box-sizing: border-box; margin: 0; padding: 0; } body { font-family:
-			Open Sans, sans-serif; font-weight: 400; font-size: 12px; display: flex; flex-direction:
-			column; justify-content: start; background-color: #FBFCFE; } .container { margin: auto;
-			text-align: center; padding-top: 24px; width: 448px; } .card { padding: 24px;
-			background-color: white; border: 1px solid #DBDFE7; border-radius: 8px; box-shadow: 0px 4px
-			16px 0px #634DFF0F; margin-bottom: 16px; } .n8n-link a { color: #7E8186; font-weight: 600;
-			font-size: 12px; text-decoration: none; } .n8n-link svg { display: inline-block;
-			vertical-align: middle; } .header h1 { color: #525356; font-size: 20px; font-weight: 400;
-			padding-bottom: 8px; } .header p { color: #7E8186; font-size: 14px; font-weight: 400; }
+			{{{ dangerousCustomCss }}}
 		</style>
-	</head>
+	{{/if}}
+</head>
 
-	<body>
-		<div class='container'>
-			<section>
-				<div class='card'>
-					<div class='header'>
-						<h1>Problem loading form</h1>
-						<p>{{message}}</p>
-					</div>
+<body>
+	<div class='container'>
+		<section>
+			<div class='card'>
+				<div class='header'>
+					<h1>Problem loading form</h1>
+					<p>{{message}}</p>
 				</div>
-				<div class='n8n-link'>
-					<a
-						href='https://n8n.io/?utm_source=n8n-internal&amp;utm_medium=form-trigger&amp'
-						target='_blank'
-					>
-						Form automated with
-						<svg
-							width='73'
-							height='20'
-							viewBox='0 0 73 20'
-							fill='none'
-							xmlns='http://www.w3.org/2000/svg'
-						>
-							<path
-								fill-rule='evenodd'
-								clip-rule='evenodd'
-								d='M40.2373 4C40.2373 6.20915 38.4464 8 36.2373 8C34.3735 8 32.8074 6.72525 32.3633 5H26.7787C25.801 5 24.9666 5.70685 24.8059 6.6712L24.6415 7.6576C24.4854 8.59415 24.0116 9.40925 23.3417 10C24.0116 10.5907 24.4854 11.4058 24.6415 12.3424L24.8059 13.3288C24.9666 14.2931 25.801 15 26.7787 15H28.3633C28.8074 13.2747 30.3735 12 32.2373 12C34.4464 12 36.2373 13.7908 36.2373 16C36.2373 18.2092 34.4464 20 32.2373 20C30.3735 20 28.8074 18.7253 28.3633 17H26.7787C24.8233 17 23.1546 15.5864 22.8331 13.6576L22.6687 12.6712C22.508 11.7069 21.6736 11 20.6959 11H19.0645C18.5652 12.64 17.0406 13.8334 15.2373 13.8334C13.434 13.8334 11.9094 12.64 11.4101 11H9.06449C8.56519 12.64 7.04059 13.8334 5.2373 13.8334C3.02817 13.8334 1.2373 12.0424 1.2373 9.83335C1.2373 7.6242 3.02817 5.83335 5.2373 5.83335C7.16069 5.83335 8.76699 7.19085 9.15039 9H11.3242C11.7076 7.19085 13.3139 5.83335 15.2373 5.83335C17.1607 5.83335 18.767 7.19085 19.1504 9H20.6959C21.6736 9 22.508 8.29315 22.6687 7.3288L22.8331 6.3424C23.1546 4.41365 24.8233 3 26.7787 3H32.3633C32.8074 1.27478 34.3735 0 36.2373 0C38.4464 0 40.2373 1.79086 40.2373 4ZM38.2373 4C38.2373 5.10455 37.3419 6 36.2373 6C35.1327 6 34.2373 5.10455 34.2373 4C34.2373 2.89543 35.1327 2 36.2373 2C37.3419 2 38.2373 2.89543 38.2373 4ZM5.2373 11.8334C6.34189 11.8334 7.23729 10.9379 7.23729 9.83335C7.23729 8.72875 6.34189 7.83335 5.2373 7.83335C4.13273 7.83335 3.2373 8.72875 3.2373 9.83335C3.2373 10.9379 4.13273 11.8334 5.2373 11.8334ZM15.2373 11.8334C16.3419 11.8334 17.2373 10.9379 17.2373 9.83335C17.2373 8.72875 16.3419 7.83335 15.2373 7.83335C14.1327 7.83335 13.2373 8.72875 13.2373 9.83335C13.2373 10.9379 14.1327 11.8334 15.2373 11.8334ZM32.2373 18C33.3419 18 34.2373 17.1045 34.2373 16C34.2373 14.8954 33.3419 14 32.2373 14C31.1327 14 30.2373 14.8954 30.2373 16C30.2373 17.1045 31.1327 18 32.2373 18Z'
-								fill='#EA4B71'
-							></path>
-							<path
-								d='M44.2393 15.0007H46.3277V10.5791C46.3277 9.12704 47.2088 8.49074 48.204 8.49074C49.183 8.49074 49.9498 9.14334 49.9498 10.4812V15.0007H52.038V10.057C52.038 7.91969 50.798 6.67969 48.8567 6.67969C47.633 6.67969 46.9477 7.16914 46.4582 7.80544H46.3277L46.1482 6.84284H44.2393V15.0007Z'
-								fill='#101330'
-							></path>
-							<path
-								d='M60.0318 9.50205V9.40415C60.7498 9.0452 61.4678 8.4252 61.4678 7.20155C61.4678 5.43945 60.0153 4.37891 58.0088 4.37891C55.9528 4.37891 54.4843 5.5047 54.4843 7.23415C54.4843 8.4089 55.1698 9.0452 55.9203 9.40415V9.50205C55.0883 9.79575 54.0928 10.6768 54.0928 12.1452C54.0928 13.9237 55.5613 15.1637 57.9923 15.1637C60.4233 15.1637 61.8428 13.9237 61.8428 12.1452C61.8428 10.6768 60.8638 9.81205 60.0318 9.50205ZM57.9923 5.87995C58.8083 5.87995 59.4118 6.40205 59.4118 7.2831C59.4118 8.16415 58.7918 8.6863 57.9923 8.6863C57.1928 8.6863 56.5238 8.16415 56.5238 7.2831C56.5238 6.38575 57.1603 5.87995 57.9923 5.87995ZM57.9923 13.5974C57.0458 13.5974 56.2793 12.9937 56.2793 11.9658C56.2793 11.0358 56.9153 10.3342 57.9758 10.3342C59.0203 10.3342 59.6568 11.0195 59.6568 11.9984C59.6568 12.9937 58.9223 13.5974 57.9923 13.5974Z'
-								fill='#101330'
-							></path>
-							<path
-								d='M63.9639 15.0007H66.0524V10.5791C66.0524 9.12704 66.9334 8.49074 67.9289 8.49074C68.9079 8.49074 69.6744 9.14334 69.6744 10.4812V15.0007H71.7629V10.057C71.7629 7.91969 70.5229 6.67969 68.5814 6.67969C67.3579 6.67969 66.6724 7.16914 66.1829 7.80544H66.0524L65.8729 6.84284H63.9639V15.0007Z'
-								fill='#101330'
-							></path>
-						</svg>
-
-					</a>
-				</div>
-			</section>
-		</div>
-	</body>
+			</div>
+			<div class='n8n-link'>
+				<a href='https://n8n.io/?utm_source=n8n-internal&amp;utm_medium=form-trigger&amp' target='_blank'>
+					Form automated with
+					<svg width='73' height='20' viewBox='0 0 73 20' fill='none' xmlns='http://www.w3.org/2000/svg'>
+						<path fill-rule='evenodd' clip-rule='evenodd'
+							d='M40.2373 4C40.2373 6.20915 38.4464 8 36.2373 8C34.3735 8 32.8074 6.72525 32.3633 5H26.7787C25.801 5 24.9666 5.70685 24.8059 6.6712L24.6415 7.6576C24.4854 8.59415 24.0116 9.40925 23.3417 10C24.0116 10.5907 24.4854 11.4058 24.6415 12.3424L24.8059 13.3288C24.9666 14.2931 25.801 15 26.7787 15H28.3633C28.8074 13.2747 30.3735 12 32.2373 12C34.4464 12 36.2373 13.7908 36.2373 16C36.2373 18.2092 34.4464 20 32.2373 20C30.3735 20 28.8074 18.7253 28.3633 17H26.7787C24.8233 17 23.1546 15.5864 22.8331 13.6576L22.6687 12.6712C22.508 11.7069 21.6736 11 20.6959 11H19.0645C18.5652 12.64 17.0406 13.8334 15.2373 13.8334C13.434 13.8334 11.9094 12.64 11.4101 11H9.06449C8.56519 12.64 7.04059 13.8334 5.2373 13.8334C3.02817 13.8334 1.2373 12.0424 1.2373 9.83335C1.2373 7.6242 3.02817 5.83335 5.2373 5.83335C7.16069 5.83335 8.76699 7.19085 9.15039 9H11.3242C11.7076 7.19085 13.3139 5.83335 15.2373 5.83335C17.1607 5.83335 18.767 7.19085 19.1504 9H20.6959C21.6736 9 22.508 8.29315 22.6687 7.3288L22.8331 6.3424C23.1546 4.41365 24.8233 3 26.7787 3H32.3633C32.8074 1.27478 34.3735 0 36.2373 0C38.4464 0 40.2373 1.79086 40.2373 4ZM38.2373 4C38.2373 5.10455 37.3419 6 36.2373 6C35.1327 6 34.2373 5.10455 34.2373 4C34.2373 2.89543 35.1327 2 36.2373 2C37.3419 2 38.2373 2.89543 38.2373 4ZM5.2373 11.8334C6.34189 11.8334 7.23729 10.9379 7.23729 9.83335C7.23729 8.72875 6.34189 7.83335 5.2373 7.83335C4.13273 7.83335 3.2373 8.72875 3.2373 9.83335C3.2373 10.9379 4.13273 11.8334 5.2373 11.8334ZM15.2373 11.8334C16.3419 11.8334 17.2373 10.9379 17.2373 9.83335C17.2373 8.72875 16.3419 7.83335 15.2373 7.83335C14.1327 7.83335 13.2373 8.72875 13.2373 9.83335C13.2373 10.9379 14.1327 11.8334 15.2373 11.8334ZM32.2373 18C33.3419 18 34.2373 17.1045 34.2373 16C34.2373 14.8954 33.3419 14 32.2373 14C31.1327 14 30.2373 14.8954 30.2373 16C30.2373 17.1045 31.1327 18 32.2373 18Z'
+							fill='#EA4B71'></path>
+						<path
+							d='M44.2393 15.0007H46.3277V10.5791C46.3277 9.12704 47.2088 8.49074 48.204 8.49074C49.183 8.49074 49.9498 9.14334 49.9498 10.4812V15.0007H52.038V10.057C52.038 7.91969 50.798 6.67969 48.8567 6.67969C47.633 6.67969 46.9477 7.16914 46.4582 7.80544H46.3277L46.1482 6.84284H44.2393V15.0007Z'
+							fill='#101330'></path>
+						<path
+							d='M60.0318 9.50205V9.40415C60.7498 9.0452 61.4678 8.4252 61.4678 7.20155C61.4678 5.43945 60.0153 4.37891 58.0088 4.37891C55.9528 4.37891 54.4843 5.5047 54.4843 7.23415C54.4843 8.4089 55.1698 9.0452 55.9203 9.40415V9.50205C55.0883 9.79575 54.0928 10.6768 54.0928 12.1452C54.0928 13.9237 55.5613 15.1637 57.9923 15.1637C60.4233 15.1637 61.8428 13.9237 61.8428 12.1452C61.8428 10.6768 60.8638 9.81205 60.0318 9.50205ZM57.9923 5.87995C58.8083 5.87995 59.4118 6.40205 59.4118 7.2831C59.4118 8.16415 58.7918 8.6863 57.9923 8.6863C57.1928 8.6863 56.5238 8.16415 56.5238 7.2831C56.5238 6.38575 57.1603 5.87995 57.9923 5.87995ZM57.9923 13.5974C57.0458 13.5974 56.2793 12.9937 56.2793 11.9658C56.2793 11.0358 56.9153 10.3342 57.9758 10.3342C59.0203 10.3342 59.6568 11.0195 59.6568 11.9984C59.6568 12.9937 58.9223 13.5974 57.9923 13.5974Z'
+							fill='#101330'></path>
+						<path
+							d='M63.9639 15.0007H66.0524V10.5791C66.0524 9.12704 66.9334 8.49074 67.9289 8.49074C68.9079 8.49074 69.6744 9.14334 69.6744 10.4812V15.0007H71.7629V10.057C71.7629 7.91969 70.5229 6.67969 68.5814 6.67969C67.3579 6.67969 66.6724 7.16914 66.1829 7.80544H66.0524L65.8729 6.84284H63.9639V15.0007Z'
+							fill='#101330'></path>
+					</svg>
+				</a>
+			</div>
+		</section>
+	</div>
+</body>
 
 </html>
diff --git a/packages/cli/templates/form-trigger-completion.handlebars b/packages/cli/templates/form-trigger-completion.handlebars
index 6895dd6736..55f43fa990 100644
--- a/packages/cli/templates/form-trigger-completion.handlebars
+++ b/packages/cli/templates/form-trigger-completion.handlebars
@@ -1,29 +1,107 @@
 <html lang='en'>
 
-	<head>
-		<meta charset='UTF-8' />
-		<meta name='viewport' content='width=device-width, initial-scale=1.0' />
-		<link rel='icon' type='image/png' href='https://n8n.io/favicon.ico' />
-		<link
-			href='https://fonts.googleapis.com/css?family=Open+Sans'
-			rel='stylesheet'
-			type='text/css'
-		/>
+<head>
+	<meta charset='UTF-8' />
+	<meta name='viewport' content='width=device-width, initial-scale=1.0' />
+	<link rel='icon' type='image/png' href='https://n8n.io/favicon.ico' />
+	<link href='https://fonts.googleapis.com/css?family=Open+Sans' rel='stylesheet' type='text/css' />
 
-		<title>{{formTitle}}</title>
+	<title>{{formTitle}}</title>
 
+	<style>
+		:root {
+			/* Fonts */
+			--font-family: 'Open Sans', sans-serif;
+			--font-weight-normal: 400;
+			--font-weight-bold: 600;
+			--font-size-body: 12px;
+			--font-size-link: 12px;
+			--font-size-header: 20px;
+			--font-size-subheader: 14px;
+
+			/* Colors */
+			--color-background: #FBFCFE;
+			--color-card-bg: white;
+			--color-card-border: #DBDFE7;
+			--color-card-shadow: #634DFF0F;
+			--color-link: #7E8186;
+			--color-header: #525356;
+			--color-header-subtext: #7E8186;
+
+			/* Spacing and dimensions */
+			--padding-container-top: 24px;
+			--container-width: 448px;
+			--card-padding: 24px;
+			--card-margin-bottom: 16px;
+			--card-border-radius: 8px;
+		}
+
+		*,
+		::after,
+		::before {
+			box-sizing: border-box;
+			margin: 0;
+			padding: 0;
+		}
+
+		body {
+			font-family: var(--font-family);
+			font-weight: var(--font-weight-normal);
+			font-size: var(--font-size-body);
+			display: flex;
+			flex-direction: column;
+			justify-content: start;
+			background-color: var(--color-background);
+		}
+
+		.container {
+			margin: auto;
+			text-align: center;
+			padding-top: var(--padding-container-top);
+			width: var(--container-width);
+		}
+
+		.card {
+			padding: var(--card-padding);
+			background-color: var(--color-card-bg);
+			border: 1px solid var(--color-card-border);
+			border-radius: var(--card-border-radius);
+			box-shadow: 0px 4px 16px 0px var(--color-card-shadow);
+			margin-bottom: var(--card-margin-bottom);
+		}
+
+		.n8n-link a {
+			color: var(--color-link);
+			font-weight: var(--font-weight-bold);
+			font-size: var(--font-size-link);
+			text-decoration: none;
+		}
+
+		.n8n-link svg {
+			display: inline-block;
+			vertical-align: middle;
+		}
+
+		.header h1 {
+			color: var(--color-header);
+			font-size: var(--font-size-header);
+			font-weight: var(--font-weight-normal);
+			padding-bottom: 8px;
+		}
+
+		.header p {
+			color: var(--color-header-subtext);
+			font-size: var(--font-size-subheader);
+			font-weight: var(--font-weight-normal);
+		}
+	</style>
+
+	{{#if dangerousCustomCss}}
 		<style>
-			*, ::after, ::before { box-sizing: border-box; margin: 0; padding: 0; } body { font-family:
-			Open Sans, sans-serif; font-weight: 400; font-size: 12px; display: flex; flex-direction:
-			column; justify-content: start; background-color: #FBFCFE; } .container { margin: auto;
-			text-align: center; padding-top: 24px; width: 448px; } .card { padding: 24px;
-			background-color: white; border: 1px solid #DBDFE7; border-radius: 8px; box-shadow: 0px 4px
-			16px 0px #634DFF0F; margin-bottom: 16px; } .n8n-link a { color: #7E8186; font-weight: 600;
-			font-size: 12px; text-decoration: none; } .n8n-link svg { display: inline-block;
-			vertical-align: middle; } .header h1 { color: #525356; font-size: 20px; font-weight: 400;
-			padding-bottom: 8px; } .header p { color: #7E8186; font-size: 14px; font-weight: 400; }
+			{{{ dangerousCustomCss }}}
 		</style>
-	</head>
+	{{/if}}
+</head>
 
 	<body>
 		{{#if responseText}}
diff --git a/packages/cli/templates/form-trigger.handlebars b/packages/cli/templates/form-trigger.handlebars
index 133ed0cd63..4b85be7ab6 100644
--- a/packages/cli/templates/form-trigger.handlebars
+++ b/packages/cli/templates/form-trigger.handlebars
@@ -11,6 +11,69 @@
 		<link href="https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,300..800;1,300..800&display=swap" rel="stylesheet">
 		<title>{{formTitle}}</title>
 		<style>
+			:root {
+				/* Fonts */
+				--font-family: "Open Sans", sans-serif;
+				--font-size-body: 12px;
+				--font-size-label: 14px;
+				--font-size-test-notice: 12px;
+				--font-size-input: 14px;
+				--font-size-header: 20px;
+				--font-size-paragraph: 14px;
+				--font-size-link: 12px;
+				--font-size-error: 12px;
+				--font-size-html-h1: 28px;
+				--font-size-html-h2: 20px;
+				--font-size-html-h3: 16px;
+				--font-size-html-h4: 14px;
+				--font-size-html-h5: 12px;
+				--font-size-html-h6: 10px;
+
+				/* Colors */
+				--color-background: #fbfcfe;
+				--color-test-notice-text: #e6a23d;
+				--color-test-notice-bg: #fefaf6;
+				--color-test-notice-border: #f6dcb7;
+				--color-card-bg: #ffffff;
+				--color-card-border: #dbdfe7;
+				--color-card-shadow: rgba(99, 77, 255, 0.06);
+				--color-link: #7e8186;
+				--color-header: #525356;
+				--color-label: #555555;
+				--color-input-border: #dbdfe7;
+				--color-input-text: #71747A;
+				--color-focus-border: rgb(90, 76, 194);
+				--color-submit-btn-bg: #ff6d5a;
+				--color-submit-btn-text: #ffffff;
+				--color-error: #ea1f30;
+				--color-required: #ff6d5a;
+				--color-clear-button-bg: #7e8186;
+				--color-html-text: #555;
+				--color-html-link: #FF6D5A;
+
+				/* Border Radii */
+				--border-radius-card: 8px;
+				--border-radius-input: 6px;
+				--border-radius-clear-btn: 50%;
+
+				/* Spacing */
+				--padding-container-top: 24px;
+				--padding-card: 24px;
+				--padding-test-notice-vertical: 12px;
+				--padding-test-notice-horizontal: 24px;
+				--margin-bottom-card: 16px;
+				--padding-form-input: 12px;
+
+				/* Dimensions */
+				--container-width: 448px;
+				--submit-btn-height: 48px;
+				--checkbox-size: 18px;
+
+				/* Others */
+				--box-shadow-card: 0px 4px 16px 0px var(--color-card-shadow);
+				--opacity-placeholder: 0.5;
+			}
+
 			*,
 			::after,
 			::before {
@@ -20,53 +83,51 @@
 			}
 
 			body {
-				font-family:
-					"Open Sans",
-					sans-serif;
+				font-family: var(--font-family);
 				font-weight: 400;
-				font-size: 12px;
+				font-size: var(--font-size-body);
 				display: flex;
 				flex-direction: column;
 				justify-content: start;
-				background-color: #fbfcfe;
+				background-color: var(--color-background);
 			}
 
 			.container {
 				margin: auto;
 				text-align: center;
-				padding-top: 24px;
-				width: 448px;
+				padding-top: var(--padding-container-top);
+				width: var(--container-width);
 			}
 
 			.test-notice {
-				padding: 12px 24px;
-				color: #e6a23d;
-				background-color: #fefaf6;
-				border-radius: 8px;
-				border: 1px solid #f6dcb7;
-				font-size: 12px;
+				padding: var(--padding-test-notice-vertical) var(--padding-test-notice-horizontal);
+				color: var(--color-test-notice-text);
+				background-color: var(--color-test-notice-bg);
+				border-radius: var(--border-radius-card);
+				border: 1px solid var(--color-test-notice-border);
+				font-size: var(--font-size-test-notice);
 				font-weight: 400;
 				line-height: 16px;
 				text-align: left;
-				margin-bottom: 16px;
+				margin-bottom: var(--margin-bottom-card);
 			}
 
 			.card {
-				padding: 24px;
-				background-color: white;
-				border: 1px solid #dbdfe7;
-				border-radius: 8px;
-				box-shadow: 0px 4px 16px 0px #634dff0f;
-				margin-bottom: 16px;
+				padding: var(--padding-card);
+				background-color: var(--color-card-bg);
+				border: 1px solid var(--color-card-border);
+				border-radius: var(--border-radius-card);
+				box-shadow: var(--box-shadow-card);
+				margin-bottom: var(--margin-bottom-card);
 			}
 
 			.n8n-link {
-				padding-bottom: 24px;
+				padding-bottom: var(--padding-container-top);
 			}
 			.n8n-link a {
-				color: #7e8186;
+				color: var(--color-link);
 				font-weight: 600;
-				font-size: 12px;
+				font-size: var(--font-size-link);
 				text-decoration: none;
 			}
 
@@ -76,93 +137,89 @@
 			}
 
 			.form-header h1 {
-				color: #525356;
-				font-size: 20px;
+				color: var(--color-header);
+				font-size: var(--font-size-header);
 				font-weight: 400;
 			}
 
 			.form-header p {
 				padding-top: 8px;
-				color: #7e8186;
-				font-size: 14px;
+				color: var(--color-link);
+				font-size: var(--font-size-paragraph);
 				font-weight: 400;
 			}
 
 			.inputs-wrapper {
-				padding-top: 24px;
-				padding-bottom: 24px;
+				padding-top: var(--padding-container-top);
+				padding-bottom: var(--padding-container-top);
 			}
 
 			form label {
 				display: block;
 				text-align: left;
-				font-size: 14px;
+				font-size: var(--font-size-label);
 				font-weight: 600;
-				color: #555555;
+				color: var(--color-label);
 				padding-bottom: 6px;
 			}
 
 			form .form-input {
-				border: 1px solid #dbdfe7;
-				border-radius: 6px;
+				border: 1px solid var(--color-input-border);
+				border-radius: var(--border-radius-input);
 				width: 100%;
-				font-size: 14px;
-				color: #71747A;
+				font-size: var(--font-size-input);
+				color: var(--color-input-text);
 				font-weight: 400;
-				padding: 12px;
+				padding: var(--padding-form-input);
 			}
 
 			form textarea:focus,
 			form input:focus {
 				outline: none;
-				border-color: rgb(90, 76, 194);
+				border-color: var(--color-focus-border);
 			}
 
 			.select-input {
-				border: 1px solid #dbdfe7;
-				border-radius: 6px;
+				border: 1px solid var(--color-input-border);
+				border-radius: var(--border-radius-input);
 			}
 
 			.select-input:focus-within {
-				border: 1px solid rgb(90, 76, 194);
+				border: 1px solid var(--color-focus-border);
 			}
 
 			form select {
 				outline: transparent;
 				border: none;
-				border-radius: 6px;
+				border-radius: var(--border-radius-input);
 				width: 100%;
-				font-size: 14px;
-				color: #71747A;
+				font-size: var(--font-size-input);
+				color: var(--color-input-text);
 				font-weight: 400;
-				background-color: white;
-				padding: 12px;
+				background-color: var(--color-card-bg);
+				padding: var(--padding-form-input);
 				border-right: 12px solid transparent;
 			}
 
 			input[type='date'] {
-				font-family:
-					Open Sans,
-					sans-serif;
+				font-family: var(--font-family);
 			}
 
 			::placeholder {
-				opacity: 0.5;
+				opacity: var(--opacity-placeholder);
 			}
 
 			#submit-btn {
 				width: 100%;
-				height: 48px;
-				padding: 12px;
-				border-radius: 6px;
+				height: var(--submit-btn-height);
+				padding: var(--padding-form-input);
+				border-radius: var(--border-radius-input);
 				border: 0;
-				font-size: 14px;
+				font-size: var(--font-size-input);
 				font-weight: 600;
-				font-family:
-					Open Sans,
-					sans-serif;
-				background-color: #ff6d5a;
-				color: #ffffff;
+				font-family: var(--font-family);
+				background-color: var(--color-submit-btn-bg);
+				color: var(--color-submit-btn-text);
 				cursor: pointer;
 			}
 
@@ -174,7 +231,7 @@
 			#submit-btn span svg {
 				display: inline-block;
 				vertical-align: middle;
-				fill: #ffffff;
+				fill: var(--color-submit-btn-text);
 				animation: lds-ring 1.2s cubic-bezier(0.5, 0, 0.5, 1) infinite;
 			}
 
@@ -194,9 +251,9 @@
 			.error-hidden {
 				display: block;
 				position: relative;
-				color: #ea1f30;
+				color: var(--color-error);
 				text-align: left;
-				font-size: 12px;
+				font-size: var(--font-size-error);
 				font-weight: 400;
 				visibility: hidden;
 				padding-top: 6px;
@@ -220,33 +277,33 @@
 
 			.multiselect-option label {
 				padding-left: 12px;
-				color: #7e8186;
+				color: var(--color-link);
 				font-weight: 400;
 				cursor: pointer;
 			}
 
 			.multiselect-checkbox {
 				vertical-align: middle;
-				min-width: 18px;
+				min-width: var(--checkbox-size);
 			}
 
 			input[type='checkbox'] {
-				width: 18px;
-				height: 18px;
+				width: var(--checkbox-size);
+				height: var(--checkbox-size);
 				cursor: pointer;
 			}
 			/* required field ----------------------------- */
 			.form-required {
 			}
 			label.form-required::after {
-					content: ' *';
-					color: #ff6d5a;
+				content: ' *';
+				color: var(--color-required);
 			}
 
 			hr {
 				border: 0;
 				height: 1px;
-				border-top: 1px solid #dbdfe7;
+				border-top: 1px solid var(--color-input-border);
 				margin-top: 24px;
 				margin-bottom: 24px;
 				display: none;
@@ -264,14 +321,12 @@
 				right: 5px;
 				top: 50%;
 				transform: translateY(-65%);
-				background-color: #7e8186;
+				background-color: var(--color-clear-button-bg);
 				border: none;
-				border-radius: 50%;
+				border-radius: var(--border-radius-clear-btn);
 				font-size: 14px;
 				font-weight: 600;
-				font-family:
-					Open Sans,
-					sans-serif;
+				font-family: var(--font-family);
 				color: white;
 				width: 20px;
 				height: 20px;
@@ -281,66 +336,66 @@
 				display: none;
 			}
 			input[type="file"]:not(:empty) + .clear-button {
-					display: inline-block;
+				display: inline-block;
 			}
 
 			div.html {
-					text-align: left;
-					color: #555;
-					font-size: 14px;
+				text-align: left;
+				color: var(--color-html-text);
+				font-size: var(--font-size-input);
 			}
 			div.html h1, div.html h2, div.html h3, div.html h4, div.html h5, div.html h6, div.html p, div.html ul, div.html ol, div.html a {
-					font-weight: 400;
-					font-style: normal;
-					margin-bottom: 8px;
+				font-weight: 400;
+				font-style: normal;
+				margin-bottom: 8px;
 			}
 			div.html li {
-					margin-bottom: 8px;
-					margin-left: 24px;
+				margin-bottom: 8px;
+				margin-left: 24px;
 			}
 			div.html ul, div.html ol {
-					font-size: 14px;
-					display: flex;
-					flex-direction: column;
-					align-self: stretch;
-					line-height: normal;
+				font-size: var(--font-size-input);
+				display: flex;
+				flex-direction: column;
+				align-self: stretch;
+				line-height: normal;
 			}
 			div.html b {
-					font-weight: 600;
+				font-weight: 600;
 			}
 			div.html h1 {
-					font-size: 28px;
-					line-height: 35px;
+				font-size: var(--font-size-html-h1);
+				line-height: 35px;
 			}
 			div.html h2 {
-					font-size: 20px;
-					line-height: 26px;
+				font-size: var(--font-size-html-h2);
+				line-height: 26px;
 			}
 			div.html h3 {
-					font-size: 16px;
-					line-height: 24px;
+				font-size: var(--font-size-html-h3);
+				line-height: 24px;
 			}
 			div.html h4 {
-					font-size: 14px;
-					line-height: 18px;
+				font-size: var(--font-size-html-h4);
+				line-height: 18px;
 			}
 			div.html h5 {
-					font-size: 12px;
+				font-size: var(--font-size-html-h5);
 			}
 			div.html h6 {
-					font-size: 10px;
+				font-size: var(--font-size-html-h6);
 			}
 			div.html p {
-					margin-bottom: 8px;
+				margin-bottom: 8px;
 			}
 			div.html a {
-					color:  #FF6D5A;
-					font-size: 14px;
+				color: var(--color-html-link);
+				font-size: var(--font-size-input);
 			}
 
 			@media only screen and (max-width: 500px) {
 				body {
-					background-color: white;
+					background-color: #ffffff;
 				}
 				hr {
 					display: block;
@@ -349,21 +404,27 @@
 					width: 95%;
 					min-height: 100vh;
 					padding: 24px;
-					background-color: white;
-					border: 0px solid #dbdfe7;
+					background-color: #ffffff;
+					border: 0px solid var(--color-input-border);
 					border-radius: 0px;
-					box-shadow: 0px 0px 0px 0px white;
+					box-shadow: 0px 0px 0px 0px #ffffff;
 				}
 				.card {
 					padding: 0px;
-					background-color: white;
-					border: 0px solid #dbdfe7;
+					background-color: #ffffff;
+					border: 0px solid var(--color-input-border);
 					border-radius: 0px;
-					box-shadow: 0px 0px 0px 0px white;
+					box-shadow: 0px 0px 0px 0px #ffffff;
 					margin-bottom: 0px;
 				}
 			}
 		</style>
+
+		{{#if dangerousCustomCss}}
+			<style>
+				{{{ dangerousCustomCss }}}
+			</style>
+		{{/if}}
 	</head>
 
 	<body>
@@ -376,8 +437,6 @@
 					<hr>
 				{{/if}}
 
-
-
 				{{#if validForm}}
 					<form class='card' action='#' method='POST' name='n8n-form' id='n8n-form' novalidate>
 						<div class='form-header'>
@@ -490,7 +549,7 @@
 									xmlns='http://www.w3.org/2000/svg'
 									height='18px'
 									viewBox='0 0 512 512'
-								><!--! Font Awesome Free 6.4.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2023 Fonticons, Inc. -->
+								>
 									<path
 										d='M304 48a48 48 0 1 0 -96 0 48 48 0 1 0 96 0zm0 416a48 48 0 1 0 -96 0 48 48 0 1 0 96 0zM48 304a48 48 0 1 0 0-96 48 48 0 1 0 0 96zm464-48a48 48 0 1 0 -96 0 48 48 0 1 0 96 0zM142.9 437A48 48 0 1 0 75 369.1 48 48 0 1 0 142.9 437zm0-294.2A48 48 0 1 0 75 75a48 48 0 1 0 67.9 67.9zM369.1 437A48 48 0 1 0 437 369.1 48 48 0 1 0 369.1 437z'
 									/>
@@ -564,8 +623,6 @@
 					</div>
 				{{/if}}
 
-
-
 				{{#if redirectUrl}}
 					<a id='redirectUrl' href='{{redirectUrl}}' style='display: none;'></a>
 				{{/if}}
@@ -642,12 +699,12 @@
 			const form = document.querySelector('#n8n-form');
 
 			document.querySelectorAll("input[type=number]").forEach(function (element) {
-        element.addEventListener("wheel", function(event) {
-            if (document.activeElement === event.target) {
-                event.preventDefault();
-            }
-        });
-    	});
+				element.addEventListener("wheel", function(event) {
+					if (document.activeElement === event.target) {
+						event.preventDefault();
+					}
+				});
+			});
 
 			document.querySelectorAll('input[type="file"]').forEach(fileInput => {
 				const clearButton = fileInput.nextElementSibling;
@@ -657,8 +714,8 @@
 					const files = fileInput.files;
 
 					if (files.length > 0) {
-							previousFiles = Array.from(files);
-							clearButton.style.display = 'inline-block';
+						previousFiles = Array.from(files);
+						clearButton.style.display = 'inline-block';
 					} else {
 						if (previousFiles.length > 0) {
 							const dataTransfer = new DataTransfer();
@@ -702,15 +759,15 @@
 				const errorSelector = `.error-${input.id}`;
 				const error = document.querySelector(errorSelector);
 
-        input.addEventListener("input", function(event) {
+				input.addEventListener("input", function(event) {
 					const value = input.value.trim();
 					if (value === "") {
 						error.classList.remove('error-show');
 					} else {
 						validateEmailInput(value, error);
 					}
-        });
-    	});
+				});
+			});
 
 			form.addEventListener('submit', (e) => {
 				const valid = [];
@@ -753,11 +810,6 @@
 						}
 					}
 
-					document.querySelectorAll('.multiselect').forEach((multiselect) => {
-						const selectedValues = getSelectedValues(multiselect);
-						formData.append(multiselect.id, JSON.stringify(selectedValues));
-					});
-
 					document.querySelector('#submit-btn').disabled = true;
 					document.querySelector('#submit-btn').style.cursor = 'not-allowed';
 					document.querySelector('#submit-btn span').style.display = 'inline-block';
diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json
index 06f2e01ab4..39492b7071 100644
--- a/packages/editor-ui/package.json
+++ b/packages/editor-ui/package.json
@@ -20,6 +20,7 @@
   "dependencies": {
     "@codemirror/autocomplete": "^6.16.0",
     "@codemirror/commands": "^6.5.0",
+    "@codemirror/lang-css": "^6.0.1",
     "@codemirror/lang-javascript": "^6.2.2",
     "@codemirror/lang-json": "^6.0.1",
     "@codemirror/lang-python": "^6.1.6",
@@ -53,9 +54,9 @@
     "change-case": "^5.4.4",
     "chart.js": "^4.4.0",
     "codemirror-lang-html-n8n": "^1.0.0",
-    "curlconverter": "^4.12.0",
     "comlink": "^4.4.1",
     "core-js": "^3.40.0",
+    "curlconverter": "^4.12.0",
     "dateformat": "^3.0.3",
     "email-providers": "^2.0.1",
     "esprima-next": "5.8.4",
@@ -87,8 +88,8 @@
     "vue-router": "catalog:frontend",
     "vue-virtual-scroller": "2.0.0-beta.8",
     "vue3-touch-events": "^4.1.3",
-    "web-tree-sitter": "0.24.3",
     "vuedraggable": "4.1.0",
+    "web-tree-sitter": "0.24.3",
     "xss": "catalog:"
   },
   "devDependencies": {
diff --git a/packages/editor-ui/src/components/CssEditor/CssEditor.vue b/packages/editor-ui/src/components/CssEditor/CssEditor.vue
new file mode 100644
index 0000000000..a6ef3ffbb3
--- /dev/null
+++ b/packages/editor-ui/src/components/CssEditor/CssEditor.vue
@@ -0,0 +1,145 @@
+<script setup lang="ts">
+import { history } from '@codemirror/commands';
+import { cssLanguage } from '@codemirror/lang-css';
+import { LanguageSupport, bracketMatching, foldGutter, indentOnInput } from '@codemirror/language';
+import { Prec } from '@codemirror/state';
+import {
+	dropCursor,
+	highlightActiveLine,
+	highlightActiveLineGutter,
+	keymap,
+	lineNumbers,
+} from '@codemirror/view';
+import { computed, onMounted, ref, toRaw, watch } from 'vue';
+
+import { useExpressionEditor } from '@/composables/useExpressionEditor';
+import { n8nCompletionSources } from '@/plugins/codemirror/completions/addCompletions';
+import { editorKeymap } from '@/plugins/codemirror/keymap';
+import { n8nAutocompletion } from '@/plugins/codemirror/n8nLang';
+import { codeEditorTheme } from '../CodeNodeEditor/theme';
+import { dropInExpressionEditor, mappingDropCursor } from '@/plugins/codemirror/dragAndDrop';
+import {
+	expressionCloseBrackets,
+	expressionCloseBracketsConfig,
+} from '@/plugins/codemirror/expressionCloseBrackets';
+
+type Props = {
+	modelValue: string;
+	rows?: number;
+	isReadOnly?: boolean;
+	fullscreen?: boolean;
+};
+
+const props = withDefaults(defineProps<Props>(), {
+	rows: 4,
+	isReadOnly: false,
+	fullscreen: false,
+});
+
+const emit = defineEmits<{
+	'update:model-value': [value: string];
+}>();
+
+const cssEditor = ref<HTMLElement>();
+const editorValue = ref<string>(props.modelValue);
+
+const extensions = computed(() => [
+	bracketMatching(),
+	n8nAutocompletion(),
+	new LanguageSupport(cssLanguage, [
+		cssLanguage.data.of({ closeBrackets: expressionCloseBracketsConfig }),
+		n8nCompletionSources().map((source) => cssLanguage.data.of(source)),
+	]),
+	expressionCloseBrackets(),
+	Prec.highest(keymap.of(editorKeymap)),
+	indentOnInput(),
+	codeEditorTheme({
+		isReadOnly: props.isReadOnly,
+		maxHeight: props.fullscreen ? '100%' : '40vh',
+		minHeight: '20vh',
+		rows: props.rows,
+	}),
+	lineNumbers(),
+	highlightActiveLineGutter(),
+	history(),
+	foldGutter(),
+	dropCursor(),
+	indentOnInput(),
+	highlightActiveLine(),
+	mappingDropCursor(),
+]);
+
+const {
+	editor: editorRef,
+	segments,
+	readEditorValue,
+	isDirty,
+} = useExpressionEditor({
+	editorRef: cssEditor,
+	editorValue,
+	extensions,
+});
+
+watch(segments.display, () => {
+	emit('update:model-value', readEditorValue());
+});
+
+onMounted(() => {
+	if (isDirty.value) emit('update:model-value', readEditorValue());
+});
+
+async function onDrop(value: string, event: MouseEvent) {
+	if (!editorRef.value) return;
+
+	await dropInExpressionEditor(toRaw(editorRef.value), event, value);
+}
+</script>
+
+<template>
+	<div :class="$style.editor">
+		<DraggableTarget type="mapping" :disabled="isReadOnly" @drop="onDrop">
+			<template #default="{ activeDrop, droppable }">
+				<div
+					ref="cssEditor"
+					:class="[
+						$style.fillHeight,
+						{ [$style.activeDrop]: activeDrop, [$style.droppable]: droppable },
+					]"
+					data-test-id="css-editor-container"
+				></div
+			></template>
+		</DraggableTarget>
+		<slot name="suffix" />
+	</div>
+</template>
+
+<style lang="scss" module>
+.editor {
+	height: 100%;
+
+	& > div {
+		height: 100%;
+	}
+}
+
+.fillHeight {
+	height: 100%;
+}
+
+.droppable {
+	:global(.cm-editor) {
+		border-color: var(--color-ndv-droppable-parameter);
+		border-style: dashed;
+		border-width: 1.5px;
+	}
+}
+
+.activeDrop {
+	:global(.cm-editor) {
+		border-color: var(--color-success);
+		border-style: solid;
+		cursor: grabbing;
+		border-width: 1px;
+	}
+}
+</style>
diff --git a/packages/editor-ui/src/components/ParameterInput.vue b/packages/editor-ui/src/components/ParameterInput.vue
index c610185903..6c672ffe1d 100644
--- a/packages/editor-ui/src/components/ParameterInput.vue
+++ b/packages/editor-ui/src/components/ParameterInput.vue
@@ -67,6 +67,7 @@ import { createEventBus } from '@n8n/utils/event-bus';
 import { useRouter } from 'vue-router';
 import { useElementSize } from '@vueuse/core';
 import { completeExpressionSyntax, isStringWithExpressionSyntax } from '@/utils/expressions';
+import CssEditor from './CssEditor/CssEditor.vue';
 
 type Picker = { $emit: (arg0: string, arg1: Date) => void };
 
@@ -408,7 +409,7 @@ const displayIssues = computed(
 		getIssues.value.length > 0,
 );
 
-const editorType = computed<EditorType | 'json' | 'code'>(() => {
+const editorType = computed<EditorType | 'json' | 'code' | 'cssEditor'>(() => {
 	return getArgument<EditorType>('editor');
 });
 const editorIsReadOnly = computed<boolean>(() => {
@@ -1225,6 +1226,14 @@ onUpdated(async () => {
 							fullscreen
 							@update:model-value="valueChangedDebounced"
 						/>
+						<CssEditor
+							v-else-if="editorType === 'cssEditor' && codeEditDialogVisible"
+							:model-value="modelValueString"
+							:is-read-only="isReadOnly"
+							:rows="editorRows"
+							fullscreen
+							@update:model-value="valueChangedDebounced"
+						/>
 						<SqlEditor
 							v-else-if="editorType === 'sqlEditor' && codeEditDialogVisible"
 							:model-value="modelValueString"
@@ -1312,6 +1321,25 @@ onUpdated(async () => {
 					</template>
 				</HtmlEditor>
 
+				<CssEditor
+					v-else-if="editorType === 'cssEditor' && !codeEditDialogVisible"
+					:model-value="modelValueString"
+					:is-read-only="isReadOnly"
+					:rows="editorRows"
+					@update:model-value="valueChangedDebounced"
+				>
+					<template #suffix>
+						<N8nIcon
+							data-test-id="code-editor-fullscreen-button"
+							icon="external-link-alt"
+							size="xsmall"
+							class="textarea-modal-opener"
+							:title="i18n.baseText('parameterInput.openEditWindow')"
+							@click="displayEditDialog()"
+						/>
+					</template>
+				</CssEditor>
+
 				<SqlEditor
 					v-else-if="editorType === 'sqlEditor'"
 					:model-value="modelValueString"
diff --git a/packages/frontend/@n8n/chat/src/components/Button.vue b/packages/frontend/@n8n/chat/src/components/Button.vue
index ca35153fc6..fe590facad 100644
--- a/packages/frontend/@n8n/chat/src/components/Button.vue
+++ b/packages/frontend/@n8n/chat/src/components/Button.vue
@@ -9,13 +9,13 @@
 	text-align: center;
 	vertical-align: middle;
 	user-select: none;
-	color: var(--chat--button--color, var(--chat--color-light));
-	background-color: var(--chat--button--background, var(--chat--color-primary));
+	color: var(--chat--button--color);
+	background-color: var(--chat--button--background);
 	border: 1px solid transparent;
-	padding: var(--chat--button--padding, calc(var(--chat--spacing) * 1 / 2) var(--chat--spacing));
+	padding: var(--chat--button--padding);
 	font-size: 1rem;
 	line-height: 1.5;
-	border-radius: var(--chat--button--border-radius, var(--chat--border-radius));
+	border-radius: var(--chat--button--border-radius);
 	transition:
 		color var(--chat--transition-duration) ease-in-out,
 		background-color var(--chat--transition-duration) ease-in-out,
@@ -24,8 +24,8 @@
 	cursor: pointer;
 
 	&:hover {
-		color: var(--chat--button--hover--color, var(--chat--color-light));
-		background-color: var(--chat--button--hover--background, var(--chat--color-primary-shade-50));
+		color: var(--chat--button--hover--color);
+		background-color: var(--chat--button--hover--background);
 		text-decoration: none;
 	}
 
diff --git a/packages/frontend/@n8n/chat/src/components/ChatWindow.vue b/packages/frontend/@n8n/chat/src/components/ChatWindow.vue
index bd5ddbbb5b..39a3a092d4 100644
--- a/packages/frontend/@n8n/chat/src/components/ChatWindow.vue
+++ b/packages/frontend/@n8n/chat/src/components/ChatWindow.vue
@@ -40,9 +40,9 @@ function toggle() {
 	position: fixed;
 	display: flex;
 	flex-direction: column;
-	bottom: var(--chat--window--bottom, var(--chat--spacing));
-	right: var(--chat--window--right, var(--chat--spacing));
-	z-index: var(--chat--window--z-index, 9999);
+	bottom: var(--chat--window--bottom);
+	right: var(--chat--window--right);
+	z-index: var(--chat--window--z-index);
 
 	max-width: calc(100% - var(--chat--window--right, var(--chat--spacing)) * 2);
 	max-height: calc(100% - var(--chat--window--bottom, var(--chat--spacing)) * 2);
@@ -71,8 +71,8 @@ function toggle() {
 		background: var(--chat--toggle--background);
 		color: var(--chat--toggle--color);
 		cursor: pointer;
-		width: var(--chat--toggle--width, var(--chat--toggle--size));
-		height: var(--chat--toggle--height, var(--chat--toggle--size));
+		width: var(--chat--toggle--width);
+		height: var(--chat--toggle--height);
 		border-radius: var(--chat--toggle--border-radius, 50%);
 		display: inline-flex;
 		align-items: center;
diff --git a/packages/frontend/@n8n/chat/src/components/Input.vue b/packages/frontend/@n8n/chat/src/components/Input.vue
index 1b9e0b9608..428787950c 100644
--- a/packages/frontend/@n8n/chat/src/components/Input.vue
+++ b/packages/frontend/@n8n/chat/src/components/Input.vue
@@ -258,13 +258,13 @@ function adjustHeight(event: Event) {
 
 	textarea {
 		font-family: inherit;
-		font-size: var(--chat--input--font-size, inherit);
+		font-size: var(--chat--input--font-size);
 		width: 100%;
 		border: var(--chat--input--border, 0);
-		border-radius: var(--chat--input--border-radius, 0);
-		padding: var(--chat--input--padding, 0.8rem);
+		border-radius: var(--chat--input--border-radius);
+		padding: var(--chat--input--padding);
 		min-height: var(--chat--textarea--height, 2.5rem); // Set a smaller initial height
-		max-height: var(--chat--textarea--max-height, 30rem);
+		max-height: var(--chat--textarea--max-height);
 		height: var(--chat--textarea--height, 2.5rem); // Set initial height same as min-height
 		resize: none;
 		overflow-y: auto;
@@ -274,7 +274,7 @@ function adjustHeight(event: Event) {
 		line-height: var(--chat--input--line-height, 1.5);
 
 		&::placeholder {
-			font-size: var(--chat--input--placeholder--font-size, var(--chat--input--font-size, inherit));
+			font-size: var(--chat--input--placeholder--font-size, var(--chat--input--font-size));
 		}
 		&:focus,
 		&:hover {
@@ -315,20 +315,17 @@ function adjustHeight(event: Event) {
 				--chat--input--send--button--background-hover,
 				var(--chat--input--send--button--background)
 			);
-			color: var(--chat--input--send--button--color-hover, var(--chat--color-secondary-shade-50));
+			color: var(--chat--input--send--button--color-hover);
 		}
 	}
 }
 .chat-input-file-button {
 	background: var(--chat--input--file--button--background, white);
-	color: var(--chat--input--file--button--color, var(--chat--color-secondary));
+	color: var(--chat--input--file--button--color);
 
 	&:hover {
-		background: var(
-			--chat--input--file--button--background-hover,
-			var(--chat--input--file--button--background)
-		);
-		color: var(--chat--input--file--button--color-hover, var(--chat--color-secondary-shade-50));
+		background: var(--chat--input--file--button--background-hover);
+		color: var(--chat--input--file--button--color-hover);
 	}
 }
 
@@ -340,11 +337,11 @@ function adjustHeight(event: Event) {
 	flex-direction: row;
 	flex-wrap: wrap;
 	gap: 0.5rem;
-	padding: var(--chat--files-spacing, 0.25rem);
+	padding: var(--chat--files-spacing);
 }
 
 .chat-input-left-panel {
-	width: var(--chat--input--left--panel--width, 2rem);
+	width: var(--chat--input--left--panel--width);
 	margin-left: 0.4rem;
 }
 </style>
diff --git a/packages/frontend/@n8n/chat/src/components/Layout.vue b/packages/frontend/@n8n/chat/src/components/Layout.vue
index 3c1546e8d4..d1226146c2 100644
--- a/packages/frontend/@n8n/chat/src/components/Layout.vue
+++ b/packages/frontend/@n8n/chat/src/components/Layout.vue
@@ -43,46 +43,33 @@ onBeforeUnmount(() => {
 	display: flex;
 	overflow-y: auto;
 	flex-direction: column;
-	font-family: var(
-		--chat--font-family,
-		(
-			-apple-system,
-			BlinkMacSystemFont,
-			'Segoe UI',
-			Roboto,
-			Oxygen-Sans,
-			Ubuntu,
-			Cantarell,
-			'Helvetica Neue',
-			sans-serif
-		)
-	);
+	font-family: var(--chat--font-family);
 
 	.chat-header {
 		display: flex;
 		flex-direction: column;
 		justify-content: center;
 		gap: 1em;
-		height: var(--chat--header-height, auto);
-		padding: var(--chat--header--padding, var(--chat--spacing));
-		background: var(--chat--header--background, var(--chat--color-dark));
-		color: var(--chat--header--color, var(--chat--color-light));
-		border-top: var(--chat--header--border-top, none);
-		border-bottom: var(--chat--header--border-bottom, none);
-		border-left: var(--chat--header--border-left, none);
-		border-right: var(--chat--header--border-right, none);
+		height: var(--chat--header-height);
+		padding: var(--chat--header--padding);
+		background: var(--chat--header--background);
+		color: var(--chat--header--color);
+		border-top: var(--chat--header--border-top);
+		border-bottom: var(--chat--header--border-bottom);
+		border-left: var(--chat--header--border-left);
+		border-right: var(--chat--header--border-right);
 		h1 {
 			font-size: var(--chat--heading--font-size);
-			color: var(--chat--header--color, var(--chat--color-light));
+			color: var(--chat--header--color);
 		}
 		p {
-			font-size: var(--chat--subtitle--font-size, inherit);
-			line-height: var(--chat--subtitle--line-height, 1.8);
+			font-size: var(--chat--subtitle--font-size);
+			line-height: var(--chat--subtitle--line-height);
 		}
 	}
 
 	.chat-body {
-		background: var(--chat--body--background, var(--chat--color-light));
+		background: var(--chat--body--background);
 		flex: 1;
 		display: flex;
 		flex-direction: column;
@@ -93,8 +80,8 @@ onBeforeUnmount(() => {
 
 	.chat-footer {
 		border-top: 1px solid var(--chat--color-light-shade-100);
-		background: var(--chat--footer--background, var(--chat--color-light));
-		color: var(--chat--footer--color, var(--chat--color-dark));
+		background: var(--chat--footer--background);
+		color: var(--chat--footer--color);
 	}
 }
 </style>
diff --git a/packages/frontend/@n8n/chat/src/components/Message.vue b/packages/frontend/@n8n/chat/src/components/Message.vue
index 4ee4514632..0cecd78cfc 100644
--- a/packages/frontend/@n8n/chat/src/components/Message.vue
+++ b/packages/frontend/@n8n/chat/src/components/Message.vue
@@ -133,9 +133,9 @@ onMounted(async () => {
 	display: block;
 	position: relative;
 	max-width: fit-content;
-	font-size: var(--chat--message--font-size, 1rem);
-	padding: var(--chat--message--padding, var(--chat--spacing));
-	border-radius: var(--chat--message--border-radius, var(--chat--border-radius));
+	font-size: var(--chat--message--font-size);
+	padding: var(--chat--message--padding);
+	border-radius: var(--chat--message--border-radius);
 	scroll-margin: 3rem;
 
 	.chat-message-actions {
@@ -160,13 +160,13 @@ onMounted(async () => {
 	}
 
 	p {
-		line-height: var(--chat--message-line-height, 1.5);
+		line-height: var(--chat--message-line-height);
 		word-wrap: break-word;
 	}
 
 	// Default message gap is half of the spacing
 	+ .chat-message {
-		margin-top: var(--chat--message--margin-bottom, calc(var(--chat--spacing) * 1));
+		margin-top: var(--chat--message--margin-bottom);
 	}
 
 	// Spacing between messages from different senders is double the individual message gap
@@ -178,7 +178,7 @@ onMounted(async () => {
 	&.chat-message-from-bot {
 		&:not(.chat-message-transparent) {
 			background-color: var(--chat--message--bot--background);
-			border: var(--chat--message--bot--border, none);
+			border: var(--chat--message--bot--border);
 		}
 		color: var(--chat--message--bot--color);
 		border-bottom-left-radius: 0;
@@ -187,7 +187,7 @@ onMounted(async () => {
 	&.chat-message-from-user {
 		&:not(.chat-message-transparent) {
 			background-color: var(--chat--message--user--background);
-			border: var(--chat--message--user--border, none);
+			border: var(--chat--message--user--border);
 		}
 		color: var(--chat--message--user--color);
 		margin-left: auto;
diff --git a/packages/frontend/@n8n/chat/src/components/MessagesList.vue b/packages/frontend/@n8n/chat/src/components/MessagesList.vue
index 1a0cc31874..215e1baffe 100644
--- a/packages/frontend/@n8n/chat/src/components/MessagesList.vue
+++ b/packages/frontend/@n8n/chat/src/components/MessagesList.vue
@@ -51,6 +51,6 @@ watch(
 .chat-messages-list {
 	margin-top: auto;
 	display: block;
-	padding: var(--chat--messages-list--padding, var(--chat--spacing));
+	padding: var(--chat--messages-list--padding);
 }
 </style>
diff --git a/packages/frontend/@n8n/chat/src/css/_tokens.scss b/packages/frontend/@n8n/chat/src/css/_tokens.scss
index 872dfb99b2..d5357ee863 100644
--- a/packages/frontend/@n8n/chat/src/css/_tokens.scss
+++ b/packages/frontend/@n8n/chat/src/css/_tokens.scss
@@ -1,4 +1,5 @@
 :root {
+	/* Colors */
 	--chat--color-primary: #e74266;
 	--chat--color-primary-shade-50: #db4061;
 	--chat--color-primary-shade-100: #cf3c5c;
@@ -13,26 +14,106 @@
 	--chat--color-disabled: #777980;
 	--chat--color-typing: #404040;
 
+	/* Base Layout */
 	--chat--spacing: 1rem;
 	--chat--border-radius: 0.25rem;
 	--chat--transition-duration: 0.15s;
+	--chat--font-family: (
+		-apple-system,
+		BlinkMacSystemFont,
+		'Segoe UI',
+		Roboto,
+		Oxygen-Sans,
+		Ubuntu,
+		Cantarell,
+		'Helvetica Neue',
+		sans-serif
+	);
 
+	/* Window Dimensions */
 	--chat--window--width: 400px;
 	--chat--window--height: 600px;
+	--chat--window--bottom: var(--chat--spacing);
+	--chat--window--right: var(--chat--spacing);
+	--chat--window--z-index: 9999;
+	--chat--window--border: 1px solid var(--chat--color-light-shade-50);
+	--chat--window--border-radius: var(--chat--border-radius);
+	--chat--window--margin-bottom: var(--chat--spacing);
 
-	--chat--textarea--height: 50px;
+	/* Header Styles */
+	--chat--header-height: auto;
+	--chat--header--padding: var(--chat--spacing);
+	--chat--header--background: var(--chat--color-dark);
+	--chat--header--color: var(--chat--color-light);
+	--chat--header--border-top: none;
+	--chat--header--border-bottom: none;
+	--chat--header--border-left: none;
+	--chat--header--border-right: none;
+	--chat--heading--font-size: 2em;
+	--chat--subtitle--font-size: inherit;
+	--chat--subtitle--line-height: 1.8;
 
+	/* Message Styles */
+	--chat--message--font-size: 1rem;
+	--chat--message--padding: var(--chat--spacing);
+	--chat--message--border-radius: var(--chat--border-radius);
+	--chat--message-line-height: 1.5;
+	--chat--message--margin-bottom: calc(var(--chat--spacing) * 1);
 	--chat--message--bot--background: var(--chat--color-white);
 	--chat--message--bot--color: var(--chat--color-dark);
+	--chat--message--bot--border: none;
 	--chat--message--user--background: var(--chat--color-secondary);
 	--chat--message--user--color: var(--chat--color-white);
+	--chat--message--user--border: none;
 	--chat--message--pre--background: rgba(0, 0, 0, 0.05);
+	--chat--messages-list--padding: var(--chat--spacing);
 
+	/* Toggle Button */
+	--chat--toggle--size: 64px;
+	--chat--toggle--width: var(--chat--toggle--size);
+	--chat--toggle--height: var(--chat--toggle--size);
+	--chat--toggle--border-radius: 50%;
 	--chat--toggle--background: var(--chat--color-primary);
 	--chat--toggle--hover--background: var(--chat--color-primary-shade-50);
 	--chat--toggle--active--background: var(--chat--color-primary-shade-100);
 	--chat--toggle--color: var(--chat--color-white);
-	--chat--toggle--size: 64px;
 
-	--chat--heading--font-size: 2em;
+	/* Input Area */
+	--chat--textarea--height: 50px;
+	--chat--textarea--max-height: 30rem;
+	--chat--input--font-size: inherit;
+	--chat--input--border: 0;
+	--chat--input--border-radius: 0;
+	--chat--input--padding: 0.8rem;
+	--chat--input--background: var(--chat--color-white);
+	--chat--input--text-color: initial;
+	--chat--input--line-height: 1.5;
+	--chat--input--placeholder--font-size: var(--chat--input--font-size);
+	--chat--input--border-active: 0;
+	--chat--input--left--panel--width: 2rem;
+
+	/* Button Styles */
+	--chat--button--color: var(--chat--color-light);
+	--chat--button--background: var(--chat--color-primary);
+	--chat--button--padding: calc(var(--chat--spacing) * 1 / 2) var(--chat--spacing);
+	--chat--button--border-radius: var(--chat--border-radius);
+	--chat--button--hover--color: var(--chat--color-light);
+	--chat--button--hover--background: var(--chat--color-primary-shade-50);
+	--chat--close--button--color-hover: var(--chat--color-primary);
+
+	/* Send and File Buttons */
+	--chat--input--send--button--background: var(--chat--color-white);
+	--chat--input--send--button--color: var(--chat--color-light);
+	--chat--input--send--button--background-hover: var(--chat--color-primary-shade-50);
+	--chat--input--send--button--color-hover: var(--chat--color-secondary-shade-50);
+	--chat--input--file--button--background: var(--chat--color-white);
+	--chat--input--file--button--color: var(--chat--color-secondary);
+	--chat--input--file--button--background-hover: var(--chat--input--file--button--background);
+	--chat--input--file--button--color-hover: var(--chat--color-secondary-shade-50);
+	--chat--files-spacing: 0.25rem;
+
+	/* Body and Footer */
+	--chat--body--background: var(--chat--color-light);
+	--chat--footer--background: var(--chat--color-light);
+	--chat--footer--color: var(--chat--color-dark);
 }
diff --git a/packages/nodes-base/nodes/Form/Form.node.ts b/packages/nodes-base/nodes/Form/Form.node.ts
index 7d7578a971..f060e3f815 100644
--- a/packages/nodes-base/nodes/Form/Form.node.ts
+++ b/packages/nodes-base/nodes/Form/Form.node.ts
@@ -18,6 +18,7 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
+import { cssVariables } from './cssVariables';
 import { renderFormCompletion } from './formCompletionUtils';
 import { renderFormNode } from './formNodeUtils';
 import { configureWaitTillDate } from '../../utils/sendAndWait/configureWaitTillDate.util';
@@ -107,6 +108,17 @@ const pageProperties = updateDisplayOptions(
 					type: 'string',
 					default: 'Submit',
 				},
+				{
+					displayName: 'Custom Form Styling',
+					name: 'customCss',
+					type: 'string',
+					typeOptions: {
+						rows: 10,
+						editor: 'cssEditor',
+					},
+					default: cssVariables.trim(),
+					description: 'Override default styling of the public form interface with CSS',
+				},
 			],
 		},
 	],
@@ -205,7 +217,20 @@ const completionProperties = updateDisplayOptions(
 			type: 'collection',
 			placeholder: 'Add option',
 			default: {},
-			options: [{ ...formTitle, required: false, displayName: 'Completion Page Title' }],
+			options: [
+				{ ...formTitle, required: false, displayName: 'Completion Page Title' },
+				{
+					displayName: 'Custom Form Styling',
+					name: 'customCss',
+					type: 'string',
+					typeOptions: {
+						rows: 10,
+						editor: 'cssEditor',
+					},
+					default: cssVariables.trim(),
+					description: 'Override default styling of the public form interface with CSS',
+				},
+			],
 			displayOptions: {
 				show: {
 					respondWith: ['text'],
diff --git a/packages/nodes-base/nodes/Form/cssVariables.ts b/packages/nodes-base/nodes/Form/cssVariables.ts
new file mode 100644
index 0000000000..2cd06dc01a
--- /dev/null
+++ b/packages/nodes-base/nodes/Form/cssVariables.ts
@@ -0,0 +1,70 @@
+export const cssVariables = `
+:root {
+	--font-family: 'Open Sans', sans-serif;
+	--font-weight-normal: 400;
+	--font-weight-bold: 600;
+	--font-size-body: 12px;
+	--font-size-label: 14px;
+	--font-size-test-notice: 12px;
+	--font-size-input: 14px;
+	--font-size-header: 20px;
+	--font-size-paragraph: 14px;
+	--font-size-link: 12px;
+	--font-size-error: 12px;
+	--font-size-html-h1: 28px;
+	--font-size-html-h2: 20px;
+	--font-size-html-h3: 16px;
+	--font-size-html-h4: 14px;
+	--font-size-html-h5: 12px;
+	--font-size-html-h6: 10px;
+	--font-size-subheader: 14px;
+
+	/* Colors */
+	--color-background: #fbfcfe;
+	--color-test-notice-text: #e6a23d;
+	--color-test-notice-bg: #fefaf6;
+	--color-test-notice-border: #f6dcb7;
+	--color-card-bg: #ffffff;
+	--color-card-border: #dbdfe7;
+	--color-card-shadow: rgba(99, 77, 255, 0.06);
+	--color-link: #7e8186;
+	--color-header: #525356;
+	--color-label: #555555;
+	--color-input-border: #dbdfe7;
+	--color-input-text: #71747A;
+	--color-focus-border: rgb(90, 76, 194);
+	--color-submit-btn-bg: #ff6d5a;
+	--color-submit-btn-text: #ffffff;
+	--color-error: #ea1f30;
+	--color-required: #ff6d5a;
+	--color-clear-button-bg: #7e8186;
+	--color-html-text: #555;
+	--color-html-link: #ff6d5a;
+	--color-header-subtext: #7e8186;
+
+	/* Border Radii */
+	--border-radius-card: 8px;
+	--border-radius-input: 6px;
+	--border-radius-clear-btn: 50%;
+	--card-border-radius: 8px;
+
+	/* Spacing */
+	--padding-container-top: 24px;
+	--padding-card: 24px;
+	--padding-test-notice-vertical: 12px;
+	--padding-test-notice-horizontal: 24px;
+	--margin-bottom-card: 16px;
+	--padding-form-input: 12px;
+	--card-padding: 24px;
+	--card-margin-bottom: 16px;
+
+	/* Dimensions */
+	--container-width: 448px;
+	--submit-btn-height: 48px;
+	--checkbox-size: 18px;
+
+	/* Others */
+	--box-shadow-card: 0px 4px 16px 0px var(--color-card-shadow);
+	--opacity-placeholder: 0.5;
+}
+`;
diff --git a/packages/nodes-base/nodes/Form/formCompletionUtils.ts b/packages/nodes-base/nodes/Form/formCompletionUtils.ts
index f2b19fabae..9f1e6e3f0d 100644
--- a/packages/nodes-base/nodes/Form/formCompletionUtils.ts
+++ b/packages/nodes-base/nodes/Form/formCompletionUtils.ts
@@ -5,7 +5,7 @@ import {
 	type IWebhookResponseData,
 } from 'n8n-workflow';
 
-import { sanitizeHtml } from './utils';
+import { sanitizeCustomCss, sanitizeHtml } from './utils';
 
 export const renderFormCompletion = async (
 	context: IWebhookFunctions,
@@ -15,7 +15,10 @@ export const renderFormCompletion = async (
 	const completionTitle = context.getNodeParameter('completionTitle', '') as string;
 	const completionMessage = context.getNodeParameter('completionMessage', '') as string;
 	const redirectUrl = context.getNodeParameter('redirectUrl', '') as string;
-	const options = context.getNodeParameter('options', {}) as { formTitle: string };
+	const options = context.getNodeParameter('options', {}) as {
+		formTitle: string;
+		customCss?: string;
+	};
 	const responseText = context.getNodeParameter('responseText', '') as string;
 
 	let title = options.formTitle;
@@ -32,6 +35,7 @@ export const renderFormCompletion = async (
 		formTitle: title,
 		appendAttribution,
 		responseText: sanitizeHtml(responseText),
+		dangerousCustomCss: sanitizeCustomCss(options.customCss),
 		redirectUrl,
 	});
 
diff --git a/packages/nodes-base/nodes/Form/formNodeUtils.ts b/packages/nodes-base/nodes/Form/formNodeUtils.ts
index 1d8aeebd40..4d33b1365d 100644
--- a/packages/nodes-base/nodes/Form/formNodeUtils.ts
+++ b/packages/nodes-base/nodes/Form/formNodeUtils.ts
@@ -19,6 +19,7 @@ export const renderFormNode = async (
 		formTitle: string;
 		formDescription: string;
 		buttonLabel: string;
+		customCss?: string;
 	};
 
 	let title = options.formTitle;
@@ -56,6 +57,7 @@ export const renderFormNode = async (
 		redirectUrl: undefined,
 		appendAttribution,
 		buttonLabel,
+		customCss: options.customCss,
 	});
 
 	return {
diff --git a/packages/nodes-base/nodes/Form/interfaces.ts b/packages/nodes-base/nodes/Form/interfaces.ts
index b04d30d1d3..23b0b31f3f 100644
--- a/packages/nodes-base/nodes/Form/interfaces.ts
+++ b/packages/nodes-base/nodes/Form/interfaces.ts
@@ -31,6 +31,7 @@ export type FormTriggerData = {
 	useResponseData?: boolean;
 	appendAttribution?: boolean;
 	buttonLabel?: string;
+	dangerousCustomCss?: string;
 };
 
 export const FORM_TRIGGER_AUTHENTICATION_PROPERTY = 'authentication';
diff --git a/packages/nodes-base/nodes/Form/test/Form.node.test.ts b/packages/nodes-base/nodes/Form/test/Form.node.test.ts
index ec5b1c93da..5998f2d20a 100644
--- a/packages/nodes-base/nodes/Form/test/Form.node.test.ts
+++ b/packages/nodes-base/nodes/Form/test/Form.node.test.ts
@@ -306,6 +306,90 @@ describe('Form Node', () => {
 			}
 		});
 
+		it('should pass customCss to form template', async () => {
+			const mockResponseObject = {
+				render: jest.fn(),
+			};
+			mockWebhookFunctions.getResponseObject.mockReturnValue(
+				mockResponseObject as unknown as Response,
+			);
+			mockWebhookFunctions.getRequestObject.mockReturnValue({ method: 'GET' } as Request);
+			mockWebhookFunctions.getParentNodes.mockReturnValue([
+				{
+					type: 'n8n-nodes-base.formTrigger',
+					name: 'Form Trigger',
+					typeVersion: 2.1,
+					disabled: false,
+				},
+			]);
+			mockWebhookFunctions.evaluateExpression.mockReturnValue('test');
+			mockWebhookFunctions.getNode.mockReturnValue(mock<INode>());
+			mockWebhookFunctions.getNodeParameter.mockImplementation((paramName: string) => {
+				if (paramName === 'operation') return 'page';
+				if (paramName === 'formFields.values') return [];
+				if (paramName === 'options') {
+					return {
+						customCss: '.form-container { background-color: #f5f5f5; }',
+					};
+				}
+				return undefined;
+			});
+
+			mockWebhookFunctions.getChildNodes.mockReturnValue([]);
+
+			await form.webhook(mockWebhookFunctions);
+
+			expect(mockResponseObject.render).toHaveBeenCalledWith(
+				'form-trigger',
+				expect.objectContaining({
+					dangerousCustomCss: '.form-container { background-color: #f5f5f5; }',
+				}),
+			);
+		});
+
+		it('should pass customCss to form completion template', async () => {
+			mockWebhookFunctions.getRequestObject.mockReturnValue({ method: 'GET' } as Request);
+			mockWebhookFunctions.getNodeParameter.mockImplementation((paramName) => {
+				if (paramName === 'operation') return 'completion';
+				if (paramName === 'respondWith') return 'text';
+				if (paramName === 'completionTitle') return 'Completion Title';
+				if (paramName === 'completionMessage') return 'Completion Message';
+				if (paramName === 'options')
+					return {
+						customCss: '.completion-container { color: blue; }',
+					};
+				if (paramName === 'formFields.values') return [];
+				return {};
+			});
+			mockWebhookFunctions.getParentNodes.mockReturnValue([
+				{
+					type: 'n8n-nodes-base.formTrigger',
+					name: 'Form Trigger',
+					typeVersion: 2.1,
+					disabled: false,
+				},
+			]);
+			mockWebhookFunctions.evaluateExpression.mockReturnValue('test');
+
+			const mockResponseObject = {
+				render: jest.fn(),
+			};
+			mockWebhookFunctions.getResponseObject.mockReturnValue(
+				mockResponseObject as unknown as Response,
+			);
+			mockWebhookFunctions.getNode.mockReturnValue(mock<INode>());
+
+			const result = await form.webhook(mockWebhookFunctions);
+
+			expect(result).toEqual({ noWebhookResponse: true });
+			expect(mockResponseObject.render).toHaveBeenCalledWith(
+				'form-trigger-completion',
+				expect.objectContaining({
+					dangerousCustomCss: '.completion-container { color: blue; }',
+				}),
+			);
+		});
+
 		it('should handle completion operation and redirect', async () => {
 			mockWebhookFunctions.getRequestObject.mockReturnValue({ method: 'GET' } as Request);
 			mockWebhookFunctions.getNodeParameter.mockImplementation((paramName) => {
diff --git a/packages/nodes-base/nodes/Form/test/FormTriggerV2.node.test.ts b/packages/nodes-base/nodes/Form/test/FormTriggerV2.node.test.ts
index fe2b9a5a41..f97c071976 100644
--- a/packages/nodes-base/nodes/Form/test/FormTriggerV2.node.test.ts
+++ b/packages/nodes-base/nodes/Form/test/FormTriggerV2.node.test.ts
@@ -241,6 +241,33 @@ describe('FormTrigger', () => {
 		);
 	});
 
+	it('should apply customCss property to form render', async () => {
+		const formFields = [{ fieldLabel: 'Name', fieldType: 'text', requiredField: true }];
+
+		const { response } = await testVersionedWebhookTriggerNode(FormTrigger, 2.2, {
+			mode: 'manual',
+			node: {
+				typeVersion: 2.2,
+				parameters: {
+					formTitle: 'Custom CSS Test',
+					formDescription: 'Testing custom CSS',
+					responseMode: 'onReceived',
+					formFields: { values: formFields },
+					options: {
+						customCss: '.form-input { border-color: red; }',
+					},
+				},
+			},
+		});
+
+		expect(response.render).toHaveBeenCalledWith(
+			'form-trigger',
+			expect.objectContaining({
+				dangerousCustomCss: '.form-input { border-color: red; }',
+			}),
+		);
+	});
+
 	it('should handle files', async () => {
 		const formFields = [
 			{
diff --git a/packages/nodes-base/nodes/Form/utils.ts b/packages/nodes-base/nodes/Form/utils.ts
index 40a2c64a0e..d23ebb73a0 100644
--- a/packages/nodes-base/nodes/Form/utils.ts
+++ b/packages/nodes-base/nodes/Form/utils.ts
@@ -72,6 +72,18 @@ export function sanitizeHtml(text: string) {
 	});
 }
 
+export function sanitizeCustomCss(css: string | undefined): string | undefined {
+	if (!css) return undefined;
+
+	// Use sanitize-html with custom settings for CSS
+	return sanitize(css, {
+		allowedTags: [], // No HTML tags allowed
+		allowedAttributes: {}, // No attributes allowed
+		// This ensures we're only keeping the text content
+		// which should be the CSS, while removing any HTML/script tags
+	});
+}
+
 export function createDescriptionMetadata(description: string) {
 	return description === ''
 		? 'n8n form'
@@ -91,6 +103,7 @@ export function prepareFormData({
 	useResponseData,
 	appendAttribution = true,
 	buttonLabel,
+	customCss,
 }: {
 	formTitle: string;
 	formDescription: string;
@@ -104,6 +117,7 @@ export function prepareFormData({
 	appendAttribution?: boolean;
 	buttonLabel?: string;
 	formSubmittedHeader?: string;
+	customCss?: string;
 }) {
 	const validForm = formFields.length > 0;
 	const utm_campaign = instanceId ? `&utm_campaign=${instanceId}` : '';
@@ -126,6 +140,7 @@ export function prepareFormData({
 		useResponseData,
 		appendAttribution,
 		buttonLabel,
+		dangerousCustomCss: sanitizeCustomCss(customCss),
 	};
 
 	if (redirectUrl) {
@@ -352,6 +367,7 @@ export function renderForm({
 	redirectUrl,
 	appendAttribution,
 	buttonLabel,
+	customCss,
 }: {
 	context: IWebhookFunctions;
 	res: Response;
@@ -364,6 +380,7 @@ export function renderForm({
 	redirectUrl?: string;
 	appendAttribution?: boolean;
 	buttonLabel?: string;
+	customCss?: string;
 }) {
 	formDescription = (formDescription || '').replace(/\\n/g, '\n').replace(/<br>/g, '\n');
 	const instanceId = context.getInstanceId();
@@ -406,6 +423,7 @@ export function renderForm({
 		useResponseData,
 		appendAttribution,
 		buttonLabel,
+		customCss,
 	});
 
 	res.render('form-trigger', data);
@@ -436,6 +454,7 @@ export async function formWebhook(
 		useWorkflowTimezone?: boolean;
 		appendAttribution?: boolean;
 		buttonLabel?: string;
+		customCss?: string;
 	};
 	const res = context.getResponseObject();
 	const req = context.getRequestObject();
@@ -526,6 +545,7 @@ export async function formWebhook(
 			redirectUrl,
 			appendAttribution,
 			buttonLabel,
+			customCss: options.customCss,
 		});
 
 		return {
diff --git a/packages/nodes-base/nodes/Form/v2/FormTriggerV2.node.ts b/packages/nodes-base/nodes/Form/v2/FormTriggerV2.node.ts
index da813c758d..46b45d2ef5 100644
--- a/packages/nodes-base/nodes/Form/v2/FormTriggerV2.node.ts
+++ b/packages/nodes-base/nodes/Form/v2/FormTriggerV2.node.ts
@@ -19,6 +19,7 @@ import {
 	respondWithOptions,
 	webhookPath,
 } from '../common.descriptions';
+import { cssVariables } from '../cssVariables';
 import { FORM_TRIGGER_AUTHENTICATION_PROPERTY } from '../interfaces';
 import { formWebhook } from '../utils';
 
@@ -180,6 +181,22 @@ const descriptionV2: INodeTypeDescription = {
 						},
 					},
 				},
+				{
+					displayName: 'Custom Form Styling',
+					name: 'customCss',
+					type: 'string',
+					typeOptions: {
+						rows: 10,
+						editor: 'cssEditor',
+					},
+					displayOptions: {
+						show: {
+							'@version': [{ _cnd: { gt: 2 } }],
+						},
+					},
+					default: cssVariables.trim(),
+					description: 'Override default styling of the public form interface with CSS',
+				},
 			],
 		},
 	],
diff --git a/packages/workflow/src/Interfaces.ts b/packages/workflow/src/Interfaces.ts
index fba34bc0a0..9ef38c4532 100644
--- a/packages/workflow/src/Interfaces.ts
+++ b/packages/workflow/src/Interfaces.ts
@@ -1242,7 +1242,7 @@ export type NodePropertyTypes =
 
 export type CodeAutocompleteTypes = 'function' | 'functionItem';
 
-export type EditorType = 'codeNodeEditor' | 'jsEditor' | 'htmlEditor' | 'sqlEditor';
+export type EditorType = 'codeNodeEditor' | 'jsEditor' | 'htmlEditor' | 'sqlEditor' | 'cssEditor';
 export type CodeNodeEditorLanguage = (typeof CODE_LANGUAGES)[number];
 export type CodeExecutionMode = (typeof CODE_EXECUTION_MODES)[number];
 export type SQLDialect =
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b247ee1f0f..3b7f1f4d95 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -638,6 +638,9 @@ importers:
       redis:
         specifier: 4.6.12
         version: 4.6.12
+      sanitize-html:
+        specifier: 2.12.1
+        version: 2.12.1
       sqlite3:
         specifier: 5.1.7
         version: 5.1.7
@@ -672,6 +675,9 @@ importers:
       '@types/pg':
         specifier: ^8.11.6
         version: 8.11.6
+      '@types/sanitize-html':
+        specifier: ^2.11.0
+        version: 2.11.0
       '@types/temp':
         specifier: ^0.9.1
         version: 0.9.4
@@ -1434,6 +1440,9 @@ importers:
       '@codemirror/commands':
         specifier: ^6.5.0
         version: 6.5.0
+      '@codemirror/lang-css':
+        specifier: ^6.0.1
+        version: 6.0.1(@codemirror/view@6.26.3)(@lezer/common@1.1.0)
       '@codemirror/lang-javascript':
         specifier: ^6.2.2
         version: 6.2.2
@@ -8008,9 +8017,6 @@ packages:
   domutils@2.8.0:
     resolution: {integrity: sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==}
 
-  domutils@3.0.1:
-    resolution: {integrity: sha512-z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q==}
-
   domutils@3.1.0:
     resolution: {integrity: sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==}
 
@@ -21254,12 +21260,6 @@ snapshots:
       domelementtype: 2.3.0
       domhandler: 4.3.1
 
-  domutils@3.0.1:
-    dependencies:
-      dom-serializer: 2.0.0
-      domelementtype: 2.3.0
-      domhandler: 5.0.3
-
   domutils@3.1.0:
     dependencies:
       dom-serializer: 2.0.0
@@ -22732,7 +22732,7 @@ snapshots:
     dependencies:
       domelementtype: 2.3.0
       domhandler: 5.0.3
-      domutils: 3.0.1
+      domutils: 3.1.0
       entities: 4.5.0
 
   htmlparser2@9.1.0:
@@ -26350,7 +26350,7 @@ snapshots:
       htmlparser2: 8.0.2
       is-plain-object: 5.0.0
       parse-srcset: 1.0.2
-      postcss: 8.4.38
+      postcss: 8.4.49
 
   sass@1.64.1:
     dependencies:

From 684353436dc10709596e98241ef3a655d57a6782 Mon Sep 17 00:00:00 2001
From: Charlie Kolb <charlie@n8n.io>
Date: Fri, 28 Feb 2025 12:44:23 +0100
Subject: [PATCH 42/47] ci: Bump "Publish To DockerHub" timeout (no-changelog)
 (#13560)

---
 .github/workflows/release-publish.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release-publish.yml b/.github/workflows/release-publish.yml
index 32063d2fe5..62a17fb927 100644
--- a/.github/workflows/release-publish.yml
+++ b/.github/workflows/release-publish.yml
@@ -74,7 +74,7 @@ jobs:
     needs: [publish-to-npm]
     runs-on: ubuntu-latest
     if: github.event.pull_request.merged == true
-    timeout-minutes: 10
+    timeout-minutes: 15
 
     steps:
       - name: Checkout

From f5743176e57106f5ef626251ed53a4ef9813746f Mon Sep 17 00:00:00 2001
From: Alex Grozav <alex@grozav.com>
Date: Fri, 28 Feb 2025 14:28:30 +0200
Subject: [PATCH 43/47] refactor(editor): Move editor-ui and design-system to
 frontend dir (no-changelog) (#13564)

---
 .github/scripts/trim-fe-packageJson.js        |    4 +-
 .github/workflows/release-publish.yml         |    2 +-
 .prettierignore                               |    2 +-
 CONTRIBUTING.md                               |    4 +-
 codecov.yml                                   |    2 -
 docker/images/n8n/Dockerfile                  |    2 +-
 package.json                                  |    6 +-
 packages/@n8n/eslint-config/local-rules.js    |    2 +-
 packages/design-system/biome.jsonc            |    7 -
 .../@n8n}/design-system/.browserslistrc       |    0
 .../@n8n}/design-system/.eslintrc.js          |    0
 .../@n8n}/design-system/.gitignore            |    0
 .../@n8n}/design-system/.npmignore            |    0
 .../@n8n}/design-system/.storybook/fonts.scss |    0
 .../@n8n}/design-system/.storybook/main.ts    |    0
 .../@n8n}/design-system/.storybook/preview.js |    0
 .../design-system/.storybook/storybook.scss   |    0
 .../@n8n}/design-system/README.md             |    2 +-
 .../frontend/@n8n/design-system/biome.jsonc   |    7 +
 .../@n8n}/design-system/chromatic.config.json |    0
 .../@n8n}/design-system/package.json          |    6 +-
 .../@n8n}/design-system/postcss.config.js     |    0
 .../@n8n}/design-system/public/.nojekyll      |    0
 .../assets/images/storybook-logo-dark.png     |  Bin
 .../assets/images/storybook-logo-light.png    |  Bin
 .../design-system/src/__tests__/render.ts     |    2 +-
 .../design-system/src/__tests__/setup.ts      |    2 +-
 .../AskAssistantAvatar.test.ts                |    0
 .../AssistantAvatar.stories.ts                |    0
 .../AskAssistantAvatar/AssistantAvatar.vue    |    0
 .../AskAssistantAvatar.test.ts.snap           |    0
 .../AskAssistantButton.stories.ts             |    0
 .../AskAssistantButton.test.ts                |    0
 .../AskAssistantButton/AskAssistantButton.vue |    0
 .../AskAssistantButton.test.ts.snap           |    0
 .../AskAssistantChat.stories.ts               |    0
 .../AskAssistantChat/AskAssistantChat.test.ts |    2 +-
 .../AskAssistantChat/AskAssistantChat.vue     |    0
 .../AskAssistantChat.test.ts.snap             |    0
 .../AskAssistantIcon/AssistantIcon.stories.ts |    0
 .../AskAssistantIcon/AssistantIcon.test.ts    |    0
 .../AskAssistantIcon/AssistantIcon.vue        |    0
 .../__snapshots__/AssistantIcon.test.ts.snap  |    0
 .../AskAssistantLoadingMessage.test.ts        |    0
 .../AssistantLoadingMessage.stories.ts        |    0
 .../AssistantLoadingMessage.vue               |    0
 .../DemoComponent.stories.ts                  |    0
 .../DemoComponent.vue                         |    0
 .../AskAssistantLoadingMessage.test.ts.snap   |    0
 .../AskAssistantText/AssistantText.stories.ts |    0
 .../AskAssistantText/AssistantText.test.ts    |    0
 .../AskAssistantText/AssistantText.vue        |    0
 .../__snapshots__/AssistantText.test.ts.snap  |    0
 .../src/components/BetaTag/BetaTag.stories.ts |    0
 .../src/components/BetaTag/BetaTag.test.ts    |    0
 .../src/components/BetaTag/BetaTag.vue        |    0
 .../__snapshots__/BetaTag.test.ts.snap        |    0
 .../BlinkingCursor/BlinkingCursor.stories.ts  |    0
 .../BlinkingCursor/BlinkingCursor.test.ts     |    0
 .../BlinkingCursor/BlinkingCursor.vue         |    0
 .../__snapshots__/BlinkingCursor.test.ts.snap |    0
 .../components/CodeDiff/CodeDiff.stories.ts   |    0
 .../src/components/CodeDiff/CodeDiff.test.ts  |    0
 .../src/components/CodeDiff/CodeDiff.vue      |    2 +-
 .../__snapshots__/CodeDiff.test.ts.snap       |    0
 .../ConditionalRouterLink.test.ts             |    0
 .../CondtionalRouterLink.vue                  |    0
 .../ConditionalRouterLink.test.ts.snap        |    0
 .../components/ConditionalRouterLink/index.ts |    0
 .../InlineAskAssistantButton.stories.ts       |    0
 .../InlineAskAssistantButton.vue              |    0
 .../N8nActionBox/ActionBox.stories.ts         |    0
 .../components/N8nActionBox/ActionBox.test.ts |    0
 .../src/components/N8nActionBox/ActionBox.vue |    4 +-
 .../__snapshots__/ActionBox.test.ts.snap      |    0
 .../src/components/N8nActionBox/index.ts      |    0
 .../ActionDropdown.stories.ts                 |    0
 .../N8nActionDropdown/ActionDropdown.test.ts  |    0
 .../N8nActionDropdown/ActionDropdown.vue      |    2 +-
 .../__snapshots__/ActionDropdown.test.ts.snap |    0
 .../src/components/N8nActionDropdown/index.ts |    0
 .../N8nActionToggle/ActionToggle.stories.ts   |    0
 .../N8nActionToggle/ActionToggle.vue          |    4 +-
 .../src/components/N8nActionToggle/index.ts   |    0
 .../src/components/N8nAlert/Alert.stories.ts  |    0
 .../src/components/N8nAlert/Alert.test.ts     |    0
 .../src/components/N8nAlert/Alert.vue         |    0
 .../src/components/N8nAlert/index.ts          |    0
 .../components/N8nAvatar/Avatar.stories.ts    |    0
 .../src/components/N8nAvatar/Avatar.test.ts   |    0
 .../src/components/N8nAvatar/Avatar.vue       |    0
 .../src/components/N8nAvatar/index.ts         |    0
 .../src/components/N8nBadge/Badge.stories.ts  |    0
 .../src/components/N8nBadge/Badge.test.ts     |    0
 .../src/components/N8nBadge/Badge.vue         |    2 +-
 .../N8nBadge/__snapshots__/Badge.test.ts.snap |    0
 .../src/components/N8nBadge/index.ts          |    0
 .../components/N8nBlockUi/BlockUi.stories.ts  |    0
 .../src/components/N8nBlockUi/BlockUi.test.ts |    0
 .../src/components/N8nBlockUi/BlockUi.vue     |    0
 .../src/components/N8nBlockUi/index.ts        |    0
 .../N8nBreadcrumbs/AsyncLoadingCacheDemo.vue  |    0
 .../N8nBreadcrumbs/BreadCrumbs.test.ts        |    0
 .../N8nBreadcrumbs/Breadcrumbs.stories.ts     |    2 +-
 .../components/N8nBreadcrumbs/Breadcrumbs.vue |    2 +-
 .../__snapshots__/BreadCrumbs.test.ts.snap    |    0
 .../src/components/N8nBreadcrumbs/index.ts    |    0
 .../src/components/N8nButton/Button.scss      |    0
 .../components/N8nButton/Button.stories.ts    |    0
 .../src/components/N8nButton/Button.test.ts   |    0
 .../src/components/N8nButton/Button.vue       |    2 +-
 .../__snapshots__/Button.test.ts.snap         |    0
 .../src/components/N8nButton/index.ts         |    0
 .../components/N8nCallout/Callout.stories.ts  |    0
 .../src/components/N8nCallout/Callout.test.ts |    0
 .../src/components/N8nCallout/Callout.vue     |    2 +-
 .../__snapshots__/Callout.test.ts.snap        |    0
 .../src/components/N8nCallout/index.ts        |    0
 .../src/components/N8nCard/Card.stories.ts    |    0
 .../src/components/N8nCard/Card.test.ts       |    0
 .../src/components/N8nCard/Card.vue           |    0
 .../N8nCard/__snapshots__/Card.test.ts.snap   |    0
 .../src/components/N8nCard/index.ts           |    0
 .../N8nCheckbox/Checkbox.stories.ts           |    0
 .../components/N8nCheckbox/Checkbox.test.ts   |    0
 .../src/components/N8nCheckbox/Checkbox.vue   |    0
 .../__snapshots__/Checkbox.test.ts.snap       |    0
 .../src/components/N8nCheckbox/index.ts       |    0
 .../N8nCircleLoader/CircleLoader.stories.ts   |    0
 .../N8nCircleLoader/CircleLoader.test.ts      |    0
 .../N8nCircleLoader/CircleLoader.vue          |    0
 .../__snapshots__/CircleLoader.test.ts.snap   |    0
 .../src/components/N8nCircleLoader/index.ts   |    0
 .../N8nColorPicker/ColorPicker.stories.ts     |    0
 .../N8nColorPicker/ColorPicker.test.ts        |    0
 .../components/N8nColorPicker/ColorPicker.vue |    0
 .../__snapshots__/ColorPicker.test.ts.snap    |    0
 .../src/components/N8nColorPicker/index.ts    |    0
 .../N8nDatatable/Datatable.stories.ts         |    0
 .../components/N8nDatatable/Datatable.test.ts |    2 +-
 .../src/components/N8nDatatable/Datatable.vue |    0
 .../__snapshots__/Datatable.test.ts.snap      |    0
 .../components/N8nDatatable/__tests__/data.ts |    0
 .../src/components/N8nDatatable/index.ts      |    0
 .../components/N8nFormBox/FormBox.stories.ts  |    0
 .../src/components/N8nFormBox/FormBox.test.ts |    0
 .../src/components/N8nFormBox/FormBox.vue     |    2 +-
 .../__snapshots__/FormBox.test.ts.snap        |    0
 .../src/components/N8nFormBox/index.ts        |    0
 .../N8nFormInput/FormInput.stories.ts         |    0
 .../src/components/N8nFormInput/FormInput.vue |    0
 .../src/components/N8nFormInput/index.ts      |    0
 .../src/components/N8nFormInput/validators.ts |    0
 .../N8nFormInputs/FormInputs.stories.ts       |    0
 .../components/N8nFormInputs/FormInputs.vue   |    0
 .../src/components/N8nFormInputs/index.ts     |    0
 .../components/N8nHeading/Heading.stories.ts  |    0
 .../src/components/N8nHeading/Heading.vue     |    0
 .../src/components/N8nHeading/index.ts        |    0
 .../src/components/N8nIcon/Icon.stories.ts    |    0
 .../src/components/N8nIcon/Icon.vue           |    2 +-
 .../src/components/N8nIcon/index.ts           |    0
 .../N8nIconButton/IconButton.stories.ts       |    0
 .../components/N8nIconButton/IconButton.vue   |    2 +-
 .../src/components/N8nIconButton/index.d.ts   |    0
 .../src/components/N8nIconButton/index.ts     |    0
 .../N8nIconPicker/IconPicker.stories.ts       |    0
 .../N8nIconPicker/IconPicker.test.ts          |    0
 .../components/N8nIconPicker/IconPicker.vue   |    0
 .../src/components/N8nIconPicker/constants.ts |    0
 .../src/components/N8nIconPicker/index.ts     |    0
 .../N8nInfoAccordion/InfoAccordion.stories.ts |    0
 .../N8nInfoAccordion/InfoAccordion.vue        |    2 +-
 .../src/components/N8nInfoAccordion/index.ts  |    0
 .../components/N8nInfoTip/InfoTip.stories.ts  |    0
 .../src/components/N8nInfoTip/InfoTip.test.ts |    0
 .../src/components/N8nInfoTip/InfoTip.vue     |    2 +-
 .../__snapshots__/InfoTip.test.ts.snap        |    0
 .../src/components/N8nInfoTip/index.ts        |    0
 .../src/components/N8nInput/Input.stories.ts  |    0
 .../src/components/N8nInput/Input.test.ts     |    0
 .../src/components/N8nInput/Input.vue         |    4 +-
 .../N8nInput/__snapshots__/Input.test.ts.snap |    0
 .../src/components/N8nInput/index.ts          |    0
 .../N8nInputLabel/InputLabel.stories.ts       |    0
 .../N8nInputLabel/InputLabel.test.ts          |    0
 .../components/N8nInputLabel/InputLabel.vue   |    2 +-
 .../__snapshots__/InputLabel.test.ts.snap     |    0
 .../src/components/N8nInputLabel/index.ts     |    0
 .../N8nInputNumber/InputNumber.stories.ts     |    0
 .../components/N8nInputNumber/InputNumber.vue |    2 +-
 .../src/components/N8nInputNumber/index.ts    |    0
 .../KeyboardShortcut.stories.ts               |    0
 .../N8nKeyboardShortcut.vue                   |    0
 .../components/N8nKeyboardShortcut/index.ts   |    0
 .../src/components/N8nLink/Link.stories.ts    |    0
 .../src/components/N8nLink/Link.vue           |    2 +-
 .../src/components/N8nLink/index.ts           |    0
 .../components/N8nLoading/Loading.stories.ts  |    0
 .../src/components/N8nLoading/Loading.vue     |    0
 .../src/components/N8nLoading/index.ts        |    0
 .../N8nMarkdown/Markdown.stories.ts           |    0
 .../components/N8nMarkdown/Markdown.test.ts   |    2 +-
 .../src/components/N8nMarkdown/Markdown.vue   |    0
 .../src/components/N8nMarkdown/index.ts       |    0
 .../src/components/N8nMenu/Menu.stories.ts    |    0
 .../src/components/N8nMenu/Menu.vue           |    0
 .../src/components/N8nMenu/index.ts           |    0
 .../N8nMenuItem/MenuItem.stories.ts           |    0
 .../src/components/N8nMenuItem/MenuItem.vue   |    0
 .../src/components/N8nMenuItem/index.ts       |    0
 .../src/components/N8nMenuItem/routerUtil.ts  |    2 +-
 .../NavigationDropdown.stories.ts             |    0
 .../NavigationDropdown.test.ts                |    0
 .../NavigationDropdown.vue                    |    0
 .../components/N8nNavigationDropdown/index.ts |    0
 .../NodeCreatorNode.stories.ts                |    0
 .../N8nNodeCreatorNode/NodeCreatorNode.vue    |    0
 .../components/N8nNodeCreatorNode/index.ts    |    0
 .../N8nNodeIcon/NodeIcon.stories.ts           |    0
 .../src/components/N8nNodeIcon/NodeIcon.vue   |    0
 .../src/components/N8nNodeIcon/index.ts       |    0
 .../components/N8nNotice/Notice.stories.ts    |    0
 .../src/components/N8nNotice/Notice.test.ts   |    4 +-
 .../src/components/N8nNotice/Notice.vue       |    0
 .../__snapshots__/Notice.test.ts.snap         |    0
 .../src/components/N8nNotice/index.ts         |    0
 .../src/components/N8nOption/Option.vue       |    0
 .../src/components/N8nOption/index.ts         |    0
 .../N8nPagination/Pagination.stories.ts       |    0
 .../components/N8nPagination/Pagination.vue   |    0
 .../src/components/N8nPagination/index.ts     |    0
 .../components/N8nPopover/Popover.stories.ts  |    0
 .../src/components/N8nPopover/Popover.vue     |    0
 .../src/components/N8nPopover/index.ts        |    0
 .../src/components/N8nPulse/Pulse.stories.ts  |    0
 .../src/components/N8nPulse/Pulse.vue         |    0
 .../src/components/N8nPulse/index.ts          |    0
 .../N8nRadioButtons/RadioButton.vue           |    0
 .../N8nRadioButtons/RadioButtons.stories.ts   |    0
 .../N8nRadioButtons/RadioButtons.vue          |    0
 .../src/components/N8nRadioButtons/index.ts   |    0
 .../RecycleScroller.stories.ts                |    0
 .../RecycleScroller.test.ts                   |    0
 .../N8nRecycleScroller/RecycleScroller.vue    |    0
 .../RecycleScroller.test.ts.snap              |    0
 .../components/N8nRecycleScroller/index.ts    |    0
 .../N8nResizeWrapper/ResizeWrapper.stories.ts |    0
 .../N8nResizeWrapper/ResizeWrapper.vue        |    2 +-
 .../src/components/N8nResizeWrapper/index.ts  |    0
 .../ResizeableSticky.stories.ts               |    0
 .../N8nResizeableSticky/ResizeableSticky.vue  |    2 +-
 .../components/N8nResizeableSticky/index.ts   |    0
 .../src/components/N8nRoute/Route.test.ts     |    0
 .../src/components/N8nRoute/Route.vue         |    0
 .../N8nRoute/__snapshots__/Route.test.ts.snap |    0
 .../src/components/N8nRoute/index.ts          |    0
 .../components/N8nSelect/Select.stories.ts    |    0
 .../src/components/N8nSelect/Select.test.ts   |    2 +-
 .../src/components/N8nSelect/Select.vue       |    2 +-
 .../__snapshots__/Select.test.ts.snap         |    0
 .../src/components/N8nSelect/index.ts         |    0
 .../SelectableList.stories.ts                 |    0
 .../N8nSelectableList/SelectableList.test.ts  |    0
 .../N8nSelectableList/SelectableList.vue      |    0
 .../__snapshots__/SelectableList.test.ts.snap |    0
 .../src/components/N8nSelectableList/index.ts |    0
 .../components/N8nSpinner/Spinner.stories.ts  |    0
 .../src/components/N8nSpinner/Spinner.vue     |    2 +-
 .../src/components/N8nSpinner/index.d.ts      |    0
 .../src/components/N8nSpinner/index.ts        |    0
 .../components/N8nSticky/Sticky.stories.ts    |    0
 .../src/components/N8nSticky/Sticky.vue       |    0
 .../src/components/N8nSticky/constants.ts     |    0
 .../src/components/N8nSticky/index.ts         |    0
 .../src/components/N8nSticky/types.ts         |    0
 .../src/components/N8nTabs/Tabs.stories.ts    |    0
 .../src/components/N8nTabs/Tabs.vue           |    0
 .../src/components/N8nTabs/index.ts           |    0
 .../src/components/N8nTag/Tag.stories.ts      |    0
 .../src/components/N8nTag/Tag.vue             |    0
 .../src/components/N8nTag/index.ts            |    0
 .../src/components/N8nTags/Tags.stories.ts    |    0
 .../src/components/N8nTags/Tags.vue           |    0
 .../src/components/N8nTags/index.ts           |    0
 .../src/components/N8nText/Text.stories.ts    |    0
 .../src/components/N8nText/Text.vue           |    2 +-
 .../src/components/N8nText/index.ts           |    0
 .../components/N8nTooltip/Tooltip.stories.ts  |    0
 .../src/components/N8nTooltip/Tooltip.test.ts |    0
 .../src/components/N8nTooltip/Tooltip.vue     |    2 +-
 .../src/components/N8nTooltip/index.ts        |    0
 .../src/components/N8nTree/Tree.stories.ts    |    0
 .../src/components/N8nTree/Tree.test.ts       |    0
 .../src/components/N8nTree/Tree.vue           |    0
 .../N8nTree/__snapshots__/Tree.test.ts.snap   |    0
 .../src/components/N8nTree/index.ts           |    0
 .../N8nUserInfo/UserInfo.stories.ts           |    0
 .../src/components/N8nUserInfo/UserInfo.vue   |    0
 .../src/components/N8nUserInfo/index.ts       |    0
 .../N8nUserSelect/UserSelect.stories.ts       |    0
 .../components/N8nUserSelect/UserSelect.vue   |    0
 .../src/components/N8nUserSelect/index.ts     |    0
 .../N8nUserStack/UserStack.stories.ts         |    0
 .../components/N8nUserStack/UserStack.test.ts |    0
 .../src/components/N8nUserStack/UserStack.vue |    2 +-
 .../src/components/N8nUserStack/index.ts      |    0
 .../N8nUsersList/UsersList.stories.ts         |    2 +-
 .../src/components/N8nUsersList/UsersList.vue |    0
 .../src/components/N8nUsersList/index.ts      |    0
 .../ResizeObserver/ResizeObserver.vue         |    0
 .../src/components/ResizeObserver/index.ts    |    0
 .../design-system/src/components/index.ts     |    0
 .../design-system/src/composables/useI18n.ts  |    0
 .../design-system/src/css/_primitives.scss    |    0
 .../design-system/src/css/_tokens.dark.scss   |    0
 .../@n8n}/design-system/src/css/_tokens.scss  |    0
 .../@n8n}/design-system/src/css/alert.scss    |    0
 .../@n8n}/design-system/src/css/aside.scss    |    0
 .../design-system/src/css/autocomplete.scss   |    0
 .../@n8n}/design-system/src/css/avatar.scss   |    0
 .../@n8n}/design-system/src/css/backtop.scss  |    0
 .../@n8n}/design-system/src/css/badge.scss    |    0
 .../@n8n}/design-system/src/css/base.scss     |    0
 .../src/css/breadcrumb-item.scss              |    0
 .../design-system/src/css/breadcrumb.scss     |    0
 .../design-system/src/css/button-group.scss   |    0
 .../@n8n}/design-system/src/css/calendar.scss |    0
 .../@n8n}/design-system/src/css/card.scss     |    0
 .../design-system/src/css/carousel-item.scss  |    0
 .../@n8n}/design-system/src/css/carousel.scss |    0
 .../design-system/src/css/cascader-panel.scss |    0
 .../@n8n}/design-system/src/css/cascader.scss |    0
 .../src/css/checkbox-button.scss              |    0
 .../design-system/src/css/checkbox-group.scss |    0
 .../@n8n}/design-system/src/css/checkbox.scss |    0
 .../@n8n}/design-system/src/css/col.scss      |    0
 .../design-system/src/css/collapse-item.scss  |    0
 .../@n8n}/design-system/src/css/collapse.scss |    0
 .../design-system/src/css/color-picker.scss   |    0
 .../design-system/src/css/common/popup.scss   |    0
 .../src/css/common/transition.scss            |    0
 .../design-system/src/css/common/var.scss     |    0
 .../design-system/src/css/container.scss      |    0
 .../design-system/src/css/date-picker.scss    |    0
 .../src/css/date-picker/date-picker.scss      |    0
 .../css/date-picker/date-range-picker.scss    |    0
 .../src/css/date-picker/date-table.scss       |    0
 .../src/css/date-picker/month-table.scss      |    0
 .../src/css/date-picker/picker-panel.scss     |    0
 .../src/css/date-picker/picker.scss           |    0
 .../src/css/date-picker/time-picker.scss      |    0
 .../css/date-picker/time-range-picker.scss    |    0
 .../src/css/date-picker/time-spinner.scss     |    0
 .../src/css/date-picker/year-table.scss       |    0
 .../@n8n}/design-system/src/css/dialog.scss   |    0
 .../@n8n}/design-system/src/css/display.scss  |    0
 .../@n8n}/design-system/src/css/divider.scss  |    0
 .../@n8n}/design-system/src/css/drawer.scss   |    0
 .../design-system/src/css/dropdown-item.scss  |    0
 .../design-system/src/css/dropdown-menu.scss  |    0
 .../@n8n}/design-system/src/css/dropdown.scss |    0
 .../src/css/fonts/element-icons.ttf           |  Bin
 .../src/css/fonts/element-icons.woff          |  Bin
 .../@n8n}/design-system/src/css/footer.scss   |    0
 .../design-system/src/css/form-item.scss      |    0
 .../@n8n}/design-system/src/css/form.scss     |    0
 .../@n8n}/design-system/src/css/header.scss   |    0
 .../@n8n}/design-system/src/css/icon.scss     |    0
 .../@n8n}/design-system/src/css/image.scss    |    0
 .../@n8n}/design-system/src/css/index.scss    |    0
 .../src/css/infinite-scroll.scss              |    0
 .../design-system/src/css/infiniteScroll.scss |    0
 .../design-system/src/css/input-number.scss   |    0
 .../@n8n}/design-system/src/css/input.scss    |    0
 .../@n8n}/design-system/src/css/link.scss     |    0
 .../@n8n}/design-system/src/css/loading.scss  |    0
 .../@n8n}/design-system/src/css/main.scss     |    0
 .../src/css/menu-item-group.scss              |    0
 .../design-system/src/css/menu-item.scss      |    0
 .../@n8n}/design-system/src/css/menu.scss     |    0
 .../design-system/src/css/message-box.scss    |    0
 .../@n8n}/design-system/src/css/message.scss  |    0
 .../src/css/mixins/_breakpoints.scss          |    0
 .../design-system/src/css/mixins/_button.scss |    0
 .../design-system/src/css/mixins/config.scss  |    0
 .../src/css/mixins/function.scss              |    0
 .../design-system/src/css/mixins/index.scss   |    0
 .../design-system/src/css/mixins/mixins.scss  |    0
 .../design-system/src/css/mixins/utils.scss   |    0
 .../design-system/src/css/notification.scss   |    0
 .../design-system/src/css/option-group.scss   |    0
 .../@n8n}/design-system/src/css/option.scss   |    0
 .../design-system/src/css/page-header.scss    |    0
 .../design-system/src/css/pagination.scss     |    0
 .../design-system/src/css/popconfirm.scss     |    0
 .../@n8n}/design-system/src/css/popover.scss  |    0
 .../@n8n}/design-system/src/css/popper.scss   |    0
 .../@n8n}/design-system/src/css/progress.scss |    0
 .../design-system/src/css/radio-button.scss   |    0
 .../design-system/src/css/radio-group.scss    |    0
 .../@n8n}/design-system/src/css/radio.scss    |    0
 .../@n8n}/design-system/src/css/rate.scss     |    0
 .../@n8n}/design-system/src/css/reset.scss    |    0
 .../@n8n}/design-system/src/css/row.scss      |    0
 .../design-system/src/css/scrollbar.scss      |    0
 .../src/css/select-dropdown.scss              |    0
 .../@n8n}/design-system/src/css/select.scss   |    0
 .../@n8n}/design-system/src/css/skeleton.scss |    0
 .../@n8n}/design-system/src/css/slider.scss   |    0
 .../@n8n}/design-system/src/css/spinner.scss  |    0
 .../@n8n}/design-system/src/css/step.scss     |    0
 .../@n8n}/design-system/src/css/steps.scss    |    0
 .../@n8n}/design-system/src/css/submenu.scss  |    0
 .../@n8n}/design-system/src/css/switch.scss   |    0
 .../@n8n}/design-system/src/css/tab-pane.scss |    0
 .../design-system/src/css/table-column.scss   |    0
 .../@n8n}/design-system/src/css/table.scss    |    0
 .../@n8n}/design-system/src/css/tabs.scss     |    0
 .../@n8n}/design-system/src/css/tag.scss      |    0
 .../design-system/src/css/tailwind/index.css  |    0
 .../design-system/src/css/time-picker.scss    |    0
 .../design-system/src/css/time-select.scss    |    0
 .../design-system/src/css/timeline-item.scss  |    0
 .../@n8n}/design-system/src/css/timeline.scss |    0
 .../@n8n}/design-system/src/css/tooltip.scss  |    0
 .../@n8n}/design-system/src/css/transfer.scss |    0
 .../@n8n}/design-system/src/css/tree.scss     |    0
 .../@n8n}/design-system/src/css/upload.scss   |    0
 .../src/css/utilities/_float.scss             |    0
 .../src/css/utilities/_link.scss              |    0
 .../src/css/utilities/_list.scss              |    0
 .../src/css/utilities/_spacing.scss           |    0
 .../src/css/utilities/_typography.scss        |    0
 .../src/css/utilities/index.scss              |    0
 .../design-system/src/directives/index.ts     |    0
 .../src/directives/n8n-html.test.ts           |    0
 .../design-system/src/directives/n8n-html.ts  |    0
 .../src/directives/n8n-truncate.test.ts       |    0
 .../src/directives/n8n-truncate.ts            |    0
 .../@n8n}/design-system/src/index.ts          |    0
 .../@n8n}/design-system/src/locale/format.ts  |    0
 .../@n8n}/design-system/src/locale/index.ts   |    2 +-
 .../@n8n}/design-system/src/locale/lang/en.ts |    2 +-
 .../@n8n}/design-system/src/mixins/index.ts   |    0
 .../@n8n}/design-system/src/mixins/locale.ts  |    0
 .../@n8n}/design-system/src/plugin.ts         |    0
 .../design-system/src/shims-modules.d.ts      |    0
 .../@n8n}/design-system/src/shims-vue.d.ts    |    0
 .../src/styleguide/ColorCircles.test.ts       |    0
 .../src/styleguide/ColorCircles.utils.ts      |    0
 .../src/styleguide/ColorCircles.vue           |    0
 .../src/styleguide/Sizes.test.ts              |    0
 .../design-system/src/styleguide/Sizes.vue    |    0
 .../src/styleguide/VariableTable.vue          |    0
 .../__snapshots__/ColorCircles.test.ts.snap   |    0
 .../__snapshots__/Sizes.test.ts.snap          |    0
 .../src/styleguide/border.stories.ts          |    0
 .../src/styleguide/colors.stories.ts          |    0
 .../styleguide/colorsprimitives.stories.ts    |    0
 .../styleguide/components/SpacingPreview.vue  |    0
 .../src/styleguide/fonts.stories.ts           |    0
 .../src/styleguide/spacing.stories.ts         |    0
 .../src/styleguide/utilities/float.stories.ts |    0
 .../src/styleguide/utilities/lists.stories.ts |    0
 .../styleguide/utilities/spacing.stories.ts   |    0
 .../src/types/action-dropdown.ts              |    2 +-
 .../design-system/src/types/assistant.ts      |    0
 .../@n8n}/design-system/src/types/button.ts   |    0
 .../design-system/src/types/datatable.ts      |    0
 .../@n8n}/design-system/src/types/form.ts     |    2 +-
 .../@n8n}/design-system/src/types/i18n.ts     |    0
 .../@n8n}/design-system/src/types/icon.ts     |    2 +-
 .../@n8n}/design-system/src/types/index.ts    |    0
 .../@n8n}/design-system/src/types/input.ts    |    0
 .../src/types/keyboardshortcut.ts             |    0
 .../@n8n}/design-system/src/types/menu.ts     |    0
 .../src/types/node-creator-node.ts            |    0
 .../@n8n}/design-system/src/types/resize.ts   |    0
 .../@n8n}/design-system/src/types/select.ts   |    0
 .../@n8n}/design-system/src/types/text.ts     |    0
 .../@n8n}/design-system/src/types/user.ts     |    0
 .../@n8n}/design-system/src/utils.scss        |    0
 .../design-system/src/utils/form-event-bus.ts |    0
 .../@n8n}/design-system/src/utils/index.ts    |    0
 .../design-system/src/utils/labelUtil.test.ts |    0
 .../design-system/src/utils/labelUtil.ts      |    0
 .../design-system/src/utils/markdown.test.ts  |    0
 .../@n8n}/design-system/src/utils/markdown.ts |    0
 .../design-system/src/utils/testUtils.ts      |    0
 .../design-system/src/utils/typeguards.ts     |    0
 .../@n8n}/design-system/src/utils/uid.ts      |    0
 .../src/utils/valueByPath.test.ts             |    2 +-
 .../design-system/src/utils/valueByPath.ts    |    0
 .../@n8n}/design-system/tailwind.config.js    |    0
 .../design-system/theme/preview/docs.min.css  |    0
 .../design-system/theme/preview/index.html    |    0
 .../@n8n}/design-system/tsconfig.json         |   12 +-
 .../@n8n}/design-system/vite.config.mts       |    9 +-
 .../{ => frontend}/editor-ui/.browserslistrc  |    0
 .../{ => frontend}/editor-ui/.eslintrc.js     |    0
 packages/{ => frontend}/editor-ui/.gitignore  |    0
 packages/{ => frontend}/editor-ui/.npmignore  |    0
 packages/{ => frontend}/editor-ui/README.md   |    0
 packages/{ => frontend}/editor-ui/biome.jsonc |    4 +-
 packages/{ => frontend}/editor-ui/index.html  |    0
 packages/{ => frontend}/editor-ui/index.js    |    0
 .../{ => frontend}/editor-ui/package.json     |    9 +-
 .../editor-ui/postcss.config.js               |    0
 .../editor-ui/public/favicon.ico              |  Bin
 .../static/community_package_tooltip_img.png  |  Bin
 .../public/static/data-mapping-gif.gif        |  Bin
 .../editor-ui/public/static/form-grey.svg     |    0
 .../static/google-auth/disabled.dark.png      |  Bin
 .../public/static/google-auth/disabled.png    |  Bin
 .../public/static/google-auth/focus.dark.png  |  Bin
 .../public/static/google-auth/focus.png       |  Bin
 .../public/static/google-auth/normal.dark.png |  Bin
 .../public/static/google-auth/normal.png      |  Bin
 .../static/google-auth/pressed.dark.png       |  Bin
 .../public/static/google-auth/pressed.png     |  Bin
 .../editor-ui/public/static/n8n-logo.png      |  Bin
 .../editor-ui/public/static/og_image.png      |  Bin
 .../editor-ui/public/static/open-ai.svg       |    0
 .../editor-ui/public/static/webhook-icon.svg  |    0
 packages/{ => frontend}/editor-ui/src/App.vue |    0
 .../{ => frontend}/editor-ui/src/Interface.ts |    4 +-
 .../editor-ui/src/__tests__/data/canvas.ts    |    0
 .../editor-ui/src/__tests__/data/index.ts     |    0
 .../editor-ui/src/__tests__/data/projects.ts  |    0
 .../editor-ui/src/__tests__/data/users.ts     |    0
 .../editor-ui/src/__tests__/defaults.ts       |    0
 .../editor-ui/src/__tests__/mocks.ts          |    0
 .../editor-ui/src/__tests__/render.ts         |    0
 .../__tests__/server/endpoints/credential.ts  |    0
 .../server/endpoints/credentialType.ts        |    0
 .../src/__tests__/server/endpoints/index.ts   |    0
 .../__tests__/server/endpoints/settings.ts    |    0
 .../server/endpoints/sourceControl.ts         |    0
 .../src/__tests__/server/endpoints/sso.ts     |    0
 .../src/__tests__/server/endpoints/tag.ts     |    0
 .../src/__tests__/server/endpoints/user.ts    |    0
 .../__tests__/server/endpoints/variable.ts    |    0
 .../__tests__/server/endpoints/workflow.ts    |    0
 .../__tests__/server/factories/credential.ts  |    0
 .../server/factories/credentialType.ts        |    0
 .../src/__tests__/server/factories/index.ts   |    0
 .../src/__tests__/server/factories/tag.ts     |    0
 .../src/__tests__/server/factories/user.ts    |    0
 .../__tests__/server/factories/variable.ts    |    0
 .../__tests__/server/factories/workflow.ts    |    0
 .../src/__tests__/server/fixtures/index.ts    |    0
 .../src/__tests__/server/fixtures/tags.ts     |    0
 .../__tests__/server/fixtures/workflows.ts    |    0
 .../editor-ui/src/__tests__/server/index.ts   |    0
 .../src/__tests__/server/models/credential.ts |    0
 .../__tests__/server/models/credentialType.ts |    0
 .../src/__tests__/server/models/index.ts      |    0
 .../src/__tests__/server/models/tag.ts        |    0
 .../src/__tests__/server/models/user.ts       |    0
 .../src/__tests__/server/models/variable.ts   |    0
 .../src/__tests__/server/models/workflow.ts   |    0
 .../editor-ui/src/__tests__/server/types.ts   |    0
 .../editor-ui/src/__tests__/setup.ts          |    0
 .../editor-ui/src/__tests__/utils.ts          |    0
 .../{ => frontend}/editor-ui/src/api/ai.ts    |    0
 .../editor-ui/src/api/api-keys.ts             |    0
 .../editor-ui/src/api/cloudPlans.ts           |    0
 .../editor-ui/src/api/communityNodes.ts       |    0
 .../editor-ui/src/api/credentials.ee.ts       |    0
 .../editor-ui/src/api/credentials.ts          |    0
 .../{ => frontend}/editor-ui/src/api/ctas.ts  |    0
 .../editor-ui/src/api/environments.ee.ts      |    0
 .../editor-ui/src/api/eventbus.ee.ts          |    0
 .../editor-ui/src/api/events.ts               |    0
 .../editor-ui/src/api/externalSecrets.ee.ts   |    0
 .../editor-ui/src/api/invitation.ts           |    0
 .../{ => frontend}/editor-ui/src/api/ldap.ts  |    0
 .../{ => frontend}/editor-ui/src/api/mfa.ts   |    0
 .../editor-ui/src/api/nodeTypes.ts            |    0
 .../editor-ui/src/api/npsSurvey.ts            |    0
 .../editor-ui/src/api/orchestration.ts        |    0
 .../editor-ui/src/api/projects.api.ts         |    0
 .../editor-ui/src/api/roles.api.ts            |    0
 .../editor-ui/src/api/schemaPreview.ts        |    0
 .../editor-ui/src/api/settings.ts             |    0
 .../editor-ui/src/api/sourceControl.ts        |    0
 .../{ => frontend}/editor-ui/src/api/sso.ts   |    0
 .../{ => frontend}/editor-ui/src/api/tags.ts  |    0
 .../editor-ui/src/api/templates.ts            |    0
 .../src/api/test/schemaPreview.test.ts        |    0
 .../editor-ui/src/api/testDefinition.ee.ts    |    0
 .../{ => frontend}/editor-ui/src/api/ui.ts    |    0
 .../{ => frontend}/editor-ui/src/api/usage.ts |    0
 .../{ => frontend}/editor-ui/src/api/users.ts |    0
 .../editor-ui/src/api/versions.ts             |    0
 .../editor-ui/src/api/workflow-webhooks.ts    |    0
 .../editor-ui/src/api/workflowHistory.ts      |    0
 .../editor-ui/src/api/workflows.ee.ts         |    0
 .../editor-ui/src/api/workflows.ts            |    0
 .../src/assets/images/aws-secrets-manager.svg |    0
 .../src/assets/images/azure-key-vault.svg     |    0
 .../editor-ui/src/assets/images/doppler.webp  |  Bin
 .../src/assets/images/gcp-secrets-manager.svg |    0
 .../src/assets/images/hashicorp.webp          |  Bin
 .../src/assets/images/infisical.webp          |  Bin
 .../editor-ui/src/components/AboutModal.vue   |    0
 .../src/components/ActivationModal.vue        |    0
 .../editor-ui/src/components/AiStarsIcon.vue  |    0
 .../src/components/AiUpdatedCodeMessage.vue   |    0
 .../components/AnnotationTagsDropdown.ee.vue  |    0
 .../editor-ui/src/components/ApiKeyCard.vue   |    0
 .../ApiKeyCreateOrEditModal.test.ts           |    0
 .../components/ApiKeyCreateOrEditModal.vue    |    2 +-
 .../AskAssistant/AskAssistantChat.vue         |    2 +-
 .../AskAssistantFloatingButton.vue            |    4 +-
 .../AskAssistant/NewAssistantSessionModal.vue |    4 +-
 .../AssignmentCollection/Assignment.test.ts   |    0
 .../AssignmentCollection/Assignment.vue       |    2 +-
 .../AssignmentCollection.test.ts              |    0
 .../AssignmentCollection.vue                  |    0
 .../AssignmentCollection/TypeSelect.test.ts   |    0
 .../AssignmentCollection/TypeSelect.vue       |    0
 .../AssignmentCollection/constants.ts         |    0
 .../components/AssignmentCollection/utils.ts  |    0
 .../editor-ui/src/components/Badge.vue        |    0
 .../editor-ui/src/components/Banner.vue       |    0
 .../src/components/BannersStack.test.ts       |    0
 .../BecomeTemplateCreatorCta.vue              |    0
 .../becomeTemplateCreatorStore.ts             |    0
 .../src/components/BinaryDataDisplay.vue      |    0
 .../src/components/BinaryDataDisplayEmbed.vue |    0
 .../src/components/BreakpointsObserver.vue    |    0
 .../ButtonParameter/ButtonParameter.test.ts   |    0
 .../ButtonParameter/ButtonParameter.vue       |    2 +-
 .../components/ButtonParameter/utils.test.ts  |    0
 .../src/components/ButtonParameter/utils.ts   |    0
 .../components/CanvasChat/CanvasChat.test.ts  |    0
 .../src/components/CanvasChat/CanvasChat.vue  |    0
 .../CanvasChat/components/ChatLogsPanel.vue   |    0
 .../components/ChatMessagesPanel.vue          |    0
 .../components/MessageOptionAction.vue        |    0
 .../components/MessageOptionTooltip.vue       |    0
 .../composables/useChatMessaging.ts           |    0
 .../CanvasChat/composables/useChatTrigger.ts  |    0
 .../CanvasChat/composables/useResize.ts       |    2 +-
 .../src/components/CanvasChat/types/chat.ts   |    0
 .../components/ChangePasswordModal.test.ts    |    0
 .../src/components/ChangePasswordModal.vue    |    2 +-
 .../src/components/ChatEmbedModal.test.ts     |    0
 .../src/components/ChatEmbedModal.vue         |    0
 .../components/CodeNodeEditor/AskAI/AskAI.vue |    2 +-
 .../CodeNodeEditor/CodeNodeEditor.vue         |    0
 .../components/CodeNodeEditor/completer.ts    |    0
 .../completions/base.completions.ts           |    0
 .../completions/execution.completions.ts      |    0
 .../completions/itemField.completions.test.ts |    0
 .../completions/itemField.completions.ts      |    0
 .../completions/itemIndex.completions.ts      |    0
 .../CodeNodeEditor/completions/js.snippets.ts |    0
 .../completions/jsonField.completions.ts      |    0
 .../completions/luxon.completions.ts          |    0
 .../completions/prevNode.completions.ts       |    0
 .../completions/require.completions.ts        |    0
 .../completions/secrets.completions.ts        |    0
 .../completions/variables.completions.ts      |    0
 .../completions/workflow.completions.ts       |    0
 .../components/CodeNodeEditor/constants.ts    |    0
 .../src/components/CodeNodeEditor/linter.ts   |    0
 .../src/components/CodeNodeEditor/theme.ts    |    0
 .../src/components/CodeNodeEditor/types.ts    |    0
 .../components/CodeNodeEditor/utils.test.ts   |    0
 .../src/components/CodeNodeEditor/utils.ts    |    0
 .../src/components/CollaborationPane.test.ts  |    0
 .../components/CollectionParameter.test.ts    |    0
 .../src/components/CollectionParameter.vue    |    0
 .../src/components/CollectionWorkflowCard.vue |    0
 .../src/components/CommunityPackageCard.vue   |    0
 .../CommunityPackageInstallModal.test.ts      |    0
 .../CommunityPackageInstallModal.vue          |    0
 .../CommunityPackageManageConfirmModal.vue    |    0
 .../CommunityPlusEnrollmentModal.test.ts      |    0
 .../CommunityPlusEnrollmentModal.vue          |    4 +-
 .../src/components/ContactPromptModal.vue     |    0
 .../components/ContextMenu/ContextMenu.vue    |    2 +-
 .../src/components/CopyInput.test.ts          |    0
 .../editor-ui/src/components/CopyInput.vue    |    0
 .../src/components/CredentialCard.test.ts     |    0
 .../src/components/CredentialCard.vue         |    0
 .../src/components/CredentialConfig.test.ts   |    0
 .../CredentialEdit/AuthTypeSelector.vue       |    0
 .../CredentialEdit/CredentialConfig.vue       |    2 +-
 .../CredentialEdit/CredentialDocs.vue         |    0
 .../CredentialEdit/CredentialEdit.vue         |    2 +-
 .../CredentialEdit/CredentialInfo.vue         |    2 +-
 .../CredentialEdit/CredentialInputs.vue       |    0
 .../CredentialEdit/CredentialSharing.ee.vue   |    0
 .../CredentialEdit/GoogleAuthButton.vue       |    0
 .../CredentialEdit/OauthButton.test.ts        |    0
 .../components/CredentialEdit/OauthButton.vue |    0
 .../__tests__/CredentialEdit.test.ts          |    0
 .../src/components/CredentialEdit/docs.ts     |    0
 .../src/components/CredentialIcon.test.ts     |    0
 .../src/components/CredentialIcon.vue         |    2 +-
 .../CredentialPicker.test.constants.ts        |    0
 .../CredentialPicker/CredentialPicker.test.ts |    0
 .../CredentialPicker/CredentialPicker.vue     |    0
 .../CredentialPicker/CredentialsDropdown.vue  |    0
 .../src/components/CredentialsSelect.vue      |    2 +-
 .../src/components/CredentialsSelectModal.vue |    2 +-
 .../src/components/CssEditor/CssEditor.vue    |    0
 .../src/components/DebugPaywallModal.vue      |    0
 .../src/components/DeleteUserModal.test.ts    |    0
 .../src/components/DeleteUserModal.vue        |    0
 .../editor-ui/src/components/Draggable.vue    |    0
 .../src/components/DraggableTarget.vue        |    0
 .../src/components/DropArea/DropArea.test.ts  |    0
 .../src/components/DropArea/DropArea.vue      |    0
 .../components/DuplicateWorkflowDialog.vue    |    0
 .../src/components/EnterpriseEdition.ee.vue   |    0
 .../components/Error/NodeErrorView.test.ts    |    0
 .../src/components/Error/NodeErrorView.vue    |    2 +-
 .../ExpandableInput/ExpandableInputBase.vue   |    0
 .../ExpandableInput/ExpandableInputEdit.vue   |    0
 .../ExpandableInputPreview.vue                |    0
 .../components/ExpressionEditModal.test.ts    |    0
 .../src/components/ExpressionEditModal.vue    |    4 +-
 .../ExpressionEditorModalInput.vue            |    0
 .../components/ExpressionEditorModal/theme.ts |    0
 .../ExpressionEditorModalInput.test.ts        |    0
 .../src/components/ExpressionFunctionIcon.vue |    0
 .../ExpressionParameterInput.test.ts          |    0
 .../components/ExpressionParameterInput.vue   |    0
 .../ExternalSecretsProviderCard.ee.vue        |    0
 ...rnalSecretsProviderConnectionSwitch.ee.vue |    0
 .../ExternalSecretsProviderImage.ee.vue       |    0
 .../ExternalSecretsProviderModal.ee.vue       |    0
 .../editor-ui/src/components/Feedback.test.ts |    0
 .../editor-ui/src/components/Feedback.vue     |    0
 .../FilterConditions/CombinatorSelect.vue     |    0
 .../components/FilterConditions/Condition.vue |    0
 .../FilterConditions/FilterConditions.test.ts |    0
 .../FilterConditions/FilterConditions.vue     |    0
 .../FilterConditions/OperatorSelect.vue       |    0
 .../components/FilterConditions/constants.ts  |    0
 .../src/components/FilterConditions/types.ts  |    0
 .../components/FilterConditions/utils.test.ts |    0
 .../src/components/FilterConditions/utils.ts  |    0
 .../FixedCollectionParameter.test.ts          |    0
 .../components/FixedCollectionParameter.vue   |    2 +-
 .../src/components/Folders/FolderCard.test.ts |    0
 .../src/components/Folders/FolderCard.vue     |    2 +-
 .../src/components/Folders/constants.ts       |    0
 .../components/FreeAiCreditsCallout.test.ts   |    0
 .../src/components/FreeAiCreditsCallout.vue   |    0
 .../src/components/GiftNotificationIcon.vue   |    0
 .../editor-ui/src/components/GoBackButton.vue |    0
 .../src/components/HtmlEditor.test.ts         |    0
 .../src/components/HtmlEditor/HtmlEditor.vue  |    0
 .../src/components/HtmlEditor/types.ts        |    0
 .../src/components/HtmlEditor/utils.ts        |    0
 .../src/components/ImportCurlModal.vue        |    0
 .../src/components/ImportCurlParameter.vue    |    0
 .../ExpressionOutput.vue                      |    0
 .../InlineExpressionEditorInput.vue           |    0
 .../InlineExpressionEditorOutput.test.ts      |    0
 .../InlineExpressionEditorOutput.vue          |    0
 .../InlineExpressionTip.test.ts               |    0
 .../InlineExpressionTip.vue                   |    0
 .../OutputItemSelect.vue                      |    0
 .../InlineExpressionEditor/theme.ts           |    0
 .../src/components/InlineNameEdit.vue         |    0
 .../src/components/InlineTextEdit.vue         |    0
 .../src/components/InputNodeSelect.vue        |    0
 .../src/components/InputPanel.test.ts         |    0
 .../editor-ui/src/components/InputPanel.vue   |    2 +-
 .../InputTriple/InputTriple.test.ts           |    0
 .../components/InputTriple/InputTriple.vue    |    0
 .../src/components/IntersectionObserved.vue   |    0
 .../src/components/IntersectionObserver.vue   |    0
 .../src/components/InviteUsersModal.vue       |    2 +-
 .../editor-ui/src/components/JsEditor.test.ts |    0
 .../src/components/JsEditor/JsEditor.vue      |    0
 .../src/components/JsonEditor.test.ts         |    0
 .../src/components/JsonEditor/JsonEditor.vue  |    0
 .../components/KeyboardShortcutTooltip.vue    |    0
 .../editor-ui/src/components/Logo/Logo.vue    |    0
 .../components/Logo/__tests__/Logo.test.ts    |    0
 .../__tests__/__snapshots__/Logo.test.ts.snap |    0
 .../src/components/Logo/logo-icon.svg         |    0
 .../src/components/Logo/logo-text.svg         |    0
 .../MainHeader/CollaborationPane.vue          |    0
 .../src/components/MainHeader/MainHeader.vue  |    0
 .../src/components/MainHeader/TabBar.test.ts  |    0
 .../src/components/MainHeader/TabBar.vue      |    0
 .../MainHeader/WorkflowDetails.test.ts        |    0
 .../components/MainHeader/WorkflowDetails.vue |    0
 .../MainHeader/WorkflowHistoryButton.test.ts  |    0
 .../MainHeader/WorkflowHistoryButton.vue      |    0
 .../editor-ui/src/components/MainSidebar.vue  |    2 +-
 .../MainSidebarSourceControl.test.ts          |    0
 .../components/MainSidebarSourceControl.vue   |    0
 .../editor-ui/src/components/MappingPill.vue  |    0
 .../src/components/MfaSetupModal.vue          |    0
 .../editor-ui/src/components/Modal.vue        |    0
 .../editor-ui/src/components/ModalDrawer.vue  |    0
 .../editor-ui/src/components/ModalRoot.vue    |    0
 .../editor-ui/src/components/Modals.vue       |    0
 .../src/components/MultipleParameter.test.ts  |    0
 .../src/components/MultipleParameter.vue      |    2 +-
 .../src/components/NDVDraggablePanels.vue     |    0
 .../src/components/NDVFloatingNodes.vue       |    0
 .../src/components/NDVSubConnections.test.ts  |    0
 .../src/components/NDVSubConnections.vue      |    0
 .../src/components/Node/NodeCreation.vue      |    0
 .../Node/NodeCreator/CategoryItem.test.ts     |    0
 .../Node/NodeCreator/ItemTypes/ActionItem.vue |    0
 .../NodeCreator/ItemTypes/CategoryItem.vue    |    0
 .../Node/NodeCreator/ItemTypes/LabelItem.vue  |    0
 .../Node/NodeCreator/ItemTypes/LinkItem.vue   |    0
 .../Node/NodeCreator/ItemTypes/NodeItem.vue   |    0
 .../NodeCreator/ItemTypes/SubcategoryItem.vue |    0
 .../Node/NodeCreator/ItemTypes/ViewItem.vue   |    0
 .../Node/NodeCreator/ItemsRenderer.test.ts    |    0
 .../Node/NodeCreator/Modes/ActionsMode.vue    |    0
 .../Node/NodeCreator/Modes/NodesMode.vue      |    0
 .../Node/NodeCreator/NodeCreator.vue          |    2 +-
 .../Node/NodeCreator/NodesListPanel.test.ts   |    0
 .../Node/NodeCreator/OrderSwitcher.vue        |    0
 .../Node/NodeCreator/Panel/NoResults.vue      |    0
 .../Node/NodeCreator/Panel/NoResultsIcon.vue  |    0
 .../Node/NodeCreator/Panel/NodesListPanel.vue |    0
 .../Node/NodeCreator/Panel/SearchBar.vue      |    0
 .../Renderers/CategorizedItemsRenderer.vue    |    0
 .../NodeCreator/Renderers/ItemsRenderer.vue   |    0
 .../Node/NodeCreator/__tests__/utils.ts       |    0
 .../NodeCreator/composables/useActions.ts     |    0
 .../composables/useActionsGeneration.ts       |    0
 .../composables/useKeyboardNavigation.ts      |    0
 .../NodeCreator/composables/useViewStacks.ts  |    0
 .../Node/NodeCreator/useActions.test.ts       |    0
 .../NodeCreator/useActionsGeneration.test.ts  |    0
 .../NodeCreator/useKeyboardNavigation.test.ts |    0
 .../components/Node/NodeCreator/utils.test.ts |    0
 .../src/components/Node/NodeCreator/utils.ts  |    0
 .../components/Node/NodeCreator/viewsData.ts  |    2 +-
 .../src/components/NodeCredentials.test.ts    |    0
 .../src/components/NodeCredentials.vue        |    2 +-
 .../src/components/NodeDetailsView.test.ts    |    0
 .../src/components/NodeDetailsView.vue        |    0
 .../src/components/NodeExecuteButton.vue      |    0
 .../NodeExecutionErrorMessage.test.ts         |    0
 .../components/NodeExecutionErrorMessage.vue  |    0
 .../editor-ui/src/components/NodeIcon.vue     |    0
 .../editor-ui/src/components/NodeList.vue     |    0
 .../editor-ui/src/components/NodeSettings.vue |    0
 .../src/components/NodeSettingsTabs.vue       |    0
 .../src/components/NodeTitle.test.ts          |    0
 .../editor-ui/src/components/NodeTitle.vue    |    0
 .../NodeViewUnfinishedWorkflowMessage.vue     |    0
 .../editor-ui/src/components/NodeWebhooks.vue |    0
 .../editor-ui/src/components/NpsSurvey.vue    |    0
 .../editor-ui/src/components/OutputPanel.vue  |    2 +-
 .../src/components/PanelDragButton.vue        |    0
 .../src/components/ParameterInput.test.ts     |    0
 .../src/components/ParameterInput.vue         |    2 +-
 .../src/components/ParameterInputExpanded.vue |    0
 .../src/components/ParameterInputFull.test.ts |    0
 .../src/components/ParameterInputFull.vue     |    2 +-
 .../src/components/ParameterInputHint.vue     |    0
 .../ParameterInputList.test.constants.ts      |    0
 .../src/components/ParameterInputList.test.ts |    0
 .../src/components/ParameterInputList.vue     |    2 +-
 .../FromAiOverrideButton.vue                  |    0
 .../FromAiOverrideField.vue                   |    0
 .../ParameterOverrideSelectableList.vue       |    2 +-
 .../components/ParameterInputWrapper.test.ts  |    0
 .../src/components/ParameterInputWrapper.vue  |    0
 .../src/components/ParameterIssues.vue        |    2 +-
 .../src/components/ParameterOptions.test.ts   |    0
 .../src/components/ParameterOptions.vue       |    0
 .../components/PersonalizationModal.test.ts   |    0
 .../src/components/PersonalizationModal.vue   |    2 +-
 .../Projects/ProjectCardBadge.test.ts         |    0
 .../components/Projects/ProjectCardBadge.vue  |    0
 .../Projects/ProjectCreateResource.vue        |    4 +-
 .../Projects/ProjectDeleteDialog.vue          |    0
 .../components/Projects/ProjectHeader.test.ts |    0
 .../src/components/Projects/ProjectHeader.vue |    2 +-
 .../src/components/Projects/ProjectIcon.vue   |    0
 .../Projects/ProjectMoveResourceModal.test.ts |    0
 .../Projects/ProjectMoveResourceModal.vue     |    0
 ...rojectMoveResourceModalCredentialsList.vue |    0
 .../ProjectMoveSuccessToastMessage.test.ts    |    0
 .../ProjectMoveSuccessToastMessage.vue        |    0
 .../Projects/ProjectNavigation.test.ts        |    0
 .../components/Projects/ProjectNavigation.vue |    2 +-
 .../Projects/ProjectRoleUpgradeDialog.vue     |    0
 .../Projects/ProjectSharing.test.ts           |    0
 .../components/Projects/ProjectSharing.vue    |    0
 .../Projects/ProjectSharingInfo.vue           |    0
 .../components/Projects/ProjectTabs.test.ts   |    0
 .../src/components/Projects/ProjectTabs.vue   |    0
 .../PromptMfaCodeModal/PromptMfaCodeModal.vue |    2 +-
 .../components/PushConnectionTracker.test.ts  |    0
 .../src/components/PushConnectionTracker.vue  |    0
 .../ResourceLocator/ResourceLocator.vue       |    0
 .../ResourceLocatorDropdown.vue               |    2 +-
 .../ResourceLocator/resourceLocator.scss      |    0
 .../src/components/ResourceMapper.test.ts     |    0
 .../ResourceMapper/MappingFields.vue          |    2 +-
 .../ResourceMapper/MappingModeSelect.vue      |    2 +-
 .../ResourceMapper/MatchingColumnsSelect.vue  |    2 +-
 .../ResourceMapper.test.constants.ts          |    0
 .../ResourceMapper/ResourceMapper.test.ts     |    0
 .../ResourceMapper/ResourceMapper.vue         |    2 +-
 .../editor-ui/src/components/RunData.test.ts  |    0
 .../editor-ui/src/components/RunData.vue      |    2 +-
 .../RunDataAi/AiRunContentBlock.vue           |    0
 .../src/components/RunDataAi/RunDataAi.vue    |    0
 .../components/RunDataAi/RunDataAiContent.vue |    0
 .../RunDataAi/useAiContentParsers.ts          |    0
 .../src/components/RunDataAi/utils.test.ts    |    0
 .../src/components/RunDataAi/utils.ts         |    0
 .../editor-ui/src/components/RunDataHtml.vue  |    0
 .../src/components/RunDataJson.test.ts        |    0
 .../editor-ui/src/components/RunDataJson.vue  |    0
 .../src/components/RunDataJsonActions.vue     |    0
 .../src/components/RunDataPinButton.test.ts   |    0
 .../src/components/RunDataPinButton.vue       |    2 +-
 .../src/components/RunDataSearch.test.ts      |    0
 .../src/components/RunDataSearch.vue          |    0
 .../src/components/RunDataTable.test.ts       |    0
 .../editor-ui/src/components/RunDataTable.vue |    2 +-
 .../editor-ui/src/components/RunInfo.vue      |    2 +-
 .../src/components/SQLEditor.test.ts          |    0
 .../editor-ui/src/components/SSOLogin.test.ts |    0
 .../editor-ui/src/components/SSOLogin.vue     |    0
 .../editor-ui/src/components/SaveButton.vue   |    0
 .../editor-ui/src/components/ScopesNotice.vue |    0
 .../EventDestinationCard.ee.vue               |    0
 .../EventDestinationSettingsModal.ee.vue      |    0
 .../EventSelection.ee.vue                     |    0
 .../SettingsLogStreaming/Helpers.ee.ts        |    0
 .../SettingsLogStreaming/descriptions.ee.ts   |    0
 .../src/components/SettingsSidebar.vue        |    2 +-
 .../SetupWorkflowCredentialsButton.test.ts    |    0
 .../SetupWorkflowCredentialsButton.vue        |    0
 .../SetupWorkflowCredentialsModal.vue         |    2 +-
 .../useSetupWorkflowCredentialsModalState.ts  |    0
 .../editor-ui/src/components/ShortenName.vue  |    0
 ...ourceControlInitializationErrorMessage.vue |    0
 .../SourceControlPullModal.ee.test.ts         |    0
 .../components/SourceControlPullModal.ee.vue  |    2 +-
 .../SourceControlPushModal.ee.test.ts         |    0
 .../components/SourceControlPushModal.ee.vue  |    2 +-
 .../src/components/SqlEditor/SqlEditor.vue    |    0
 .../src/components/TagsContainer.vue          |    0
 .../editor-ui/src/components/TagsDropdown.vue |    2 +-
 .../TagsManager/AnnotationTagsManager.ee.vue  |    0
 .../src/components/TagsManager/NoTagsView.vue |    0
 .../components/TagsManager/TagsManager.vue    |    0
 .../TagsManager/TagsView/TagsTable.vue        |    2 +-
 .../TagsManager/TagsView/TagsTableHeader.vue  |    0
 .../TagsManager/TagsView/TagsView.vue         |    0
 .../TagsManager/WorkflowTagsManager.vue       |    0
 .../src/components/Telemetry.test.ts          |    0
 .../editor-ui/src/components/Telemetry.vue    |    0
 .../editor-ui/src/components/TemplateCard.vue |    0
 .../src/components/TemplateDetails.vue        |    0
 .../src/components/TemplateDetailsBlock.vue   |    0
 .../src/components/TemplateFilters.vue        |    0
 .../editor-ui/src/components/TemplateList.vue |    0
 .../src/components/TemplatesInfoCard.test.ts  |    0
 .../src/components/TemplatesInfoCard.vue      |    0
 .../src/components/TemplatesInfoCarousel.vue  |    0
 .../EditDefinition/BlockArrow.vue             |    0
 .../EditDefinition/DescriptionInput.vue       |    0
 .../EditDefinition/EvaluationStep.vue         |    2 +-
 .../EditDefinition/MetricsInput.vue           |    2 +-
 .../EditDefinition/NodesPinning.vue           |    2 +-
 .../EditDefinition/TagsInput.vue              |    0
 .../EditDefinition/TestNameInput.vue          |    0
 .../EditDefinition/WorkflowSelector.vue       |    2 +-
 .../EditDefinition/sections/ConfigSection.vue |    2 +-
 .../EditDefinition/sections/RunsSection.vue   |    0
 .../EditDefinition/tests/NodesPinning.test.ts |    0
 .../ListDefinition/EmptyState.vue             |    2 +-
 .../ListDefinition/TestItem.vue               |    4 +-
 .../TestDefinition/ListRuns/MetricsChart.vue  |    0
 .../TestDefinition/ListRuns/TestRunsTable.vue |    2 +-
 .../composables/useMetricsChart.ts            |    0
 .../composables/useTestDefinitionForm.ts      |    2 +-
 .../TestDefinition/shared/TableCell.vue       |    0
 .../TestDefinition/shared/TableStatusCell.vue |    2 +-
 .../TestDefinition/shared/TestTableBase.vue   |    2 +-
 .../TestDefinition/tests/MetricsInput.test.ts |    0
 .../tests/useMetricsChart.test.ts             |    0
 .../tests/useTestDefinitionForm.test.ts       |    0
 .../src/components/TestDefinition/types.ts    |    0
 .../editor-ui/src/components/TextEdit.vue     |    0
 .../src/components/TextWithHIghlights.test.ts |    0
 .../src/components/TextWithHighlights.vue     |    0
 .../editor-ui/src/components/TimeAgo.vue      |    0
 .../editor-ui/src/components/TitledList.vue   |    0
 .../editor-ui/src/components/TriggerPanel.vue |    0
 .../editor-ui/src/components/UpdatesPanel.vue |    0
 .../src/components/VariablesForm.vue          |    2 +-
 .../components/VariablesUsageBadge.test.ts    |    0
 .../src/components/VariablesUsageBadge.vue    |    2 +-
 .../editor-ui/src/components/VersionCard.vue  |    0
 .../src/components/VirtualSchema.test.ts      |    0
 .../src/components/VirtualSchema.vue          |    2 +-
 .../src/components/VirtualSchemaHeader.vue    |    2 +-
 .../src/components/VirtualSchemaItem.vue      |    0
 .../src/components/WarningTooltip.vue         |    0
 .../editor-ui/src/components/WireMeUp.vue     |    0
 .../src/components/WorkerList.ee.vue          |    0
 .../components/Workers/WorkerAccordion.ee.vue |    0
 .../src/components/Workers/WorkerCard.ee.vue  |    0
 .../Workers/WorkerChartsAccordion.ee.vue      |    0
 .../Workers/WorkerJobAccordion.ee.vue         |    0
 .../Workers/WorkerNetAccordion.ee.vue         |    0
 .../WorkflowActivationErrorMessage.vue        |    0
 .../src/components/WorkflowActivator.test.ts  |    0
 .../src/components/WorkflowActivator.vue      |    0
 .../src/components/WorkflowCard.test.ts       |    0
 .../editor-ui/src/components/WorkflowCard.vue |    0
 .../WorkflowHistoryContent.test.ts            |    2 +-
 .../WorkflowHistoryContent.vue                |    0
 .../WorkflowHistoryList.test.ts               |    2 +-
 .../WorkflowHistory/WorkflowHistoryList.vue   |    2 +-
 .../WorkflowHistoryListItem.test.ts           |    2 +-
 .../WorkflowHistoryListItem.vue               |    2 +-
 .../WorkflowHistoryVersionRestoreModal.vue    |    0
 .../src/components/WorkflowPreview.test.ts    |    0
 .../src/components/WorkflowPreview.vue        |    0
 .../WorkflowSelectorParameterInput.vue        |    0
 .../useWorkflowResourceLocatorDropdown.ts     |    0
 .../useWorkflowResourceLocatorModes.ts        |    0
 .../useWorkflowResourcesLocator.ts            |    0
 .../src/components/WorkflowSettings.test.ts   |    0
 .../src/components/WorkflowSettings.vue       |    0
 .../src/components/WorkflowShareModal.ee.vue  |    0
 .../src/components/WorkflowTagsContainer.vue  |    0
 .../src/components/WorkflowTagsDropdown.vue   |    0
 .../ChangePasswordModal.test.ts.snap          |    0
 .../__snapshots__/InputPanel.test.ts.snap     |    4 +-
 .../MultipleParameter.test.ts.snap            |    0
 .../PushConnectionTracker.test.ts.snap        |    0
 .../__snapshots__/RunDataJson.test.ts.snap    |    0
 .../__snapshots__/VirtualSchema.test.ts.snap  |    0
 .../__tests__/utils/ResourceMapper.utils.ts   |    0
 .../src/components/banners/BannerStack.vue    |    0
 .../src/components/banners/BaseBanner.vue     |    0
 .../banners/EmailConfirmationBanner.vue       |    0
 .../banners/NonProductionLicenseBanner.vue    |    0
 .../src/components/banners/TrialBanner.vue    |    0
 .../components/banners/TrialOverBanner.vue    |    0
 .../src/components/banners/V1Banner.test.ts   |    0
 .../src/components/banners/V1Banner.vue       |    0
 .../__snapshots__/V1Banner.test.ts.snap       |    0
 .../src/components/canvas/Canvas.test.ts      |    2 +-
 .../src/components/canvas/Canvas.vue          |    0
 .../components/canvas/WorkflowCanvas.test.ts  |    0
 .../src/components/canvas/WorkflowCanvas.vue  |    0
 .../background/CanvasBackground.test.ts       |    0
 .../elements/background/CanvasBackground.vue  |    0
 .../CanvasBackgroundStripedPattern.vue        |    0
 .../CanvasBackground.test.ts.snap             |    0
 .../elements/buttons/CanvasChatButton.test.ts |    0
 .../elements/buttons/CanvasChatButton.vue     |    0
 .../CanvasClearExecutionDataButton.test.ts    |    0
 .../CanvasClearExecutionDataButton.vue        |    0
 .../buttons/CanvasControlButtons.test.ts      |    0
 .../elements/buttons/CanvasControlButtons.vue |    0
 .../buttons/CanvasRunWorkflowButton.test.ts   |    0
 .../buttons/CanvasRunWorkflowButton.vue       |    0
 .../CanvasStopCurrentExecutionButton.test.ts  |    0
 .../CanvasStopCurrentExecutionButton.vue      |    0
 .../CanvasStopWaitingForWebhookButton.test.ts |    0
 .../CanvasStopWaitingForWebhookButton.vue     |    0
 .../CanvasChatButton.test.ts.snap             |    0
 ...anvasClearExecutionDataButton.test.ts.snap |    0
 .../CanvasControlButtons.test.ts.snap         |    0
 .../CanvasExecuteWorkflowButton.test.ts.snap  |    0
 .../CanvasRunWorkflowButton.test.ts.snap      |    0
 ...vasStopCurrentExecutionButton.test.ts.snap |    0
 ...asStopWaitingForWebhookButton.test.ts.snap |    0
 .../elements/edges/CanvasArrowHeadMarker.vue  |    0
 .../edges/CanvasConnectionLine.test.ts        |    0
 .../elements/edges/CanvasConnectionLine.vue   |    0
 .../canvas/elements/edges/CanvasEdge.test.ts  |    0
 .../canvas/elements/edges/CanvasEdge.vue      |    0
 .../elements/edges/CanvasEdgeToolbar.test.ts  |    0
 .../elements/edges/CanvasEdgeToolbar.vue      |    0
 .../elements/edges/utils/getEdgeRenderData.ts |    0
 .../canvas/elements/edges/utils/index.ts      |    0
 .../handles/CanvasHandleRenderer.test.ts      |    0
 .../elements/handles/CanvasHandleRenderer.vue |    0
 .../CanvasHandleMainInput.test.ts             |    0
 .../render-types/CanvasHandleMainInput.vue    |    0
 .../CanvasHandleMainOutput.test.ts            |    0
 .../render-types/CanvasHandleMainOutput.vue   |    0
 .../CanvasHandleNonMainInput.test.ts          |    0
 .../render-types/CanvasHandleNonMainInput.vue |    0
 .../CanvasHandleNonMainOutput.test.ts         |    0
 .../CanvasHandleNonMainOutput.vue             |    0
 .../parts/CanvasHandleDiamond.test.ts         |    0
 .../parts/CanvasHandleDiamond.vue             |    0
 .../parts/CanvasHandleDot.test.ts             |    0
 .../render-types/parts/CanvasHandleDot.vue    |    0
 .../parts/CanvasHandlePlus.test.ts            |    0
 .../render-types/parts/CanvasHandlePlus.vue   |    0
 .../parts/CanvasHandleRectangle.test.ts       |    0
 .../parts/CanvasHandleRectangle.vue           |    0
 .../CanvasHandleDiamond.test.ts.snap          |    0
 .../CanvasHandleDot.test.ts.snap              |    0
 .../CanvasHandlePlus.test.ts.snap             |    0
 .../CanvasHandleRectangle.test.ts.snap        |    0
 .../canvas/elements/nodes/CanvasNode.test.ts  |    0
 .../canvas/elements/nodes/CanvasNode.vue      |    0
 .../elements/nodes/CanvasNodeRenderer.test.ts |    0
 .../elements/nodes/CanvasNodeRenderer.vue     |    0
 .../elements/nodes/CanvasNodeToolbar.test.ts  |    0
 .../elements/nodes/CanvasNodeToolbar.vue      |    0
 .../nodes/render-types/CanvasNodeAddNodes.vue |    0
 .../render-types/CanvasNodeDefault.test.ts    |    0
 .../nodes/render-types/CanvasNodeDefault.vue  |    0
 .../render-types/CanvasNodeStickyNote.test.ts |    0
 .../render-types/CanvasNodeStickyNote.vue     |    0
 .../CanvasNodeDefault.test.ts.snap            |    0
 .../CanvasNodeStickyNote.test.ts.snap         |    0
 .../CanvasNodeDisabledStrikeThrough.test.ts   |    0
 .../parts/CanvasNodeDisabledStrikeThrough.vue |    0
 .../parts/CanvasNodeStatusIcons.test.ts       |    0
 .../parts/CanvasNodeStatusIcons.vue           |    2 +-
 .../parts/CanvasNodeTooltip.test.ts           |    0
 .../render-types/parts/CanvasNodeTooltip.vue  |    0
 .../render-types/parts/CanvasNodeTrigger.vue  |    0
 .../CanvasNodeStickyColorSelector.test.ts     |    0
 .../toolbar/CanvasNodeStickyColorSelector.vue |    0
 .../ConcurrentExecutionsHeader.test.ts        |    0
 .../executions/ConcurrentExecutionsHeader.vue |    0
 .../executions/ExecutionsFilter.test.ts       |    0
 .../executions/ExecutionsFilter.vue           |    0
 .../components/executions/ExecutionsTime.vue  |    0
 .../global/GlobalExecutionsList.test.ts       |    0
 .../global/GlobalExecutionsList.vue           |    0
 .../global/GlobalExecutionsListItem.test.ts   |    0
 .../global/GlobalExecutionsListItem.vue       |    0
 ...balExecutionsListItemQueuedTooltip.test.ts |    0
 .../GlobalExecutionsListItemQueuedTooltip.vue |    0
 .../executions/workflow/VoteButtons.vue       |    0
 .../WorkflowExecutionAnnotationPanel.ee.vue   |    0
 .../workflow/WorkflowExecutionsCard.test.ts   |    0
 .../workflow/WorkflowExecutionsCard.vue       |    0
 .../WorkflowExecutionsInfoAccordion.vue       |    0
 .../WorkflowExecutionsLandingPage.vue         |    0
 .../workflow/WorkflowExecutionsList.vue       |    0
 .../WorkflowExecutionsPreview.test.ts         |    0
 .../workflow/WorkflowExecutionsPreview.vue    |    2 +-
 .../WorkflowExecutionsSidebar.test.ts         |    0
 .../workflow/WorkflowExecutionsSidebar.vue    |    0
 .../forms/ResourceFiltersDropdown.vue         |    0
 .../src/components/layouts/PageViewLayout.vue |    0
 .../components/layouts/PageViewLayoutList.vue |    0
 .../layouts/ResourcesListLayout.test.ts       |    0
 .../layouts/ResourcesListLayout.vue           |    2 +-
 .../editor-ui/src/components/layouts/index.ts |    0
 .../transitions/SlideTransition.vue           |    0
 .../useBugReporting.test.ts.snap              |    0
 .../useCanvasOperations.test.ts.snap          |    0
 .../__snapshots__/useContextMenu.test.ts.snap |    0
 .../__snapshots__/useDebugInfo.test.ts.snap   |    0
 .../useAIAssistantHelpers.test.constants.ts   |    0
 .../composables/useAIAssistantHelpers.test.ts |    0
 .../src/composables/useAIAssistantHelpers.ts  |    0
 .../src/composables/useActiveNode.test.ts     |    0
 .../src/composables/useActiveNode.ts          |    0
 .../useAutocompleteTelemetry.test.ts          |    0
 .../composables/useAutocompleteTelemetry.ts   |    0
 .../src/composables/useBeforeUnload.test.ts   |    0
 .../src/composables/useBeforeUnload.ts        |    0
 .../src/composables/useBugReporting.test.ts   |    0
 .../src/composables/useBugReporting.ts        |    0
 .../editor-ui/src/composables/useCanvas.ts    |    0
 .../src/composables/useCanvasMapping.test.ts  |    0
 .../src/composables/useCanvasMapping.ts       |    0
 .../src/composables/useCanvasNode.test.ts     |    0
 .../src/composables/useCanvasNode.ts          |    0
 .../src/composables/useCanvasNodeHandle.ts    |    0
 .../composables/useCanvasNodeHover.test.ts    |    0
 .../src/composables/useCanvasNodeHover.ts     |    0
 .../composables/useCanvasOperations.test.ts   |    0
 .../src/composables/useCanvasOperations.ts    |    0
 .../composables/useCanvasTraversal.test.ts    |    0
 .../src/composables/useCanvasTraversal.ts     |    0
 .../src/composables/useClipboard.test.ts      |    0
 .../editor-ui/src/composables/useClipboard.ts |    0
 .../src/composables/useCodeEditor.test.ts     |    0
 .../src/composables/useCodeEditor.ts          |    0
 .../src/composables/useContextMenu.test.ts    |    0
 .../src/composables/useContextMenu.ts         |    0
 .../src/composables/useDataSchema.test.ts     |    0
 .../src/composables/useDataSchema.ts          |    0
 .../src/composables/useDebounce.test.ts       |    0
 .../editor-ui/src/composables/useDebounce.ts  |    0
 .../src/composables/useDebugInfo.test.ts      |    0
 .../editor-ui/src/composables/useDebugInfo.ts |    0
 .../src/composables/useDocumentTitle.test.ts  |    0
 .../src/composables/useDocumentTitle.ts       |    0
 .../src/composables/useDocumentVisibility.ts  |    0
 .../src/composables/useExecutingNode.test.ts  |    0
 .../src/composables/useExecutingNode.ts       |    0
 .../composables/useExecutionDebugging.test.ts |    0
 .../src/composables/useExecutionDebugging.ts  |    0
 .../composables/useExecutionHelpers.test.ts   |    0
 .../src/composables/useExecutionHelpers.ts    |    0
 .../composables/useExpressionEditor.test.ts   |    0
 .../src/composables/useExpressionEditor.ts    |    0
 .../src/composables/useExternalHooks.ts       |    0
 .../composables/useExternalSecretsProvider.ts |    0
 .../useGlobalEntityCreation.test.ts           |    0
 .../composables/useGlobalEntityCreation.ts    |    0
 .../src/composables/useGlobalLinkActions.ts   |    0
 .../src/composables/useHistoryHelper.test.ts  |    0
 .../src/composables/useHistoryHelper.ts       |    0
 .../editor-ui/src/composables/useI18n.ts      |    0
 .../composables/useImportCurlCommand.test.ts  |    0
 .../src/composables/useImportCurlCommand.ts   |    0
 .../src/composables/useKeybindings.test.ts    |    0
 .../src/composables/useKeybindings.ts         |    0
 .../src/composables/useLoadingService.ts      |    0
 .../editor-ui/src/composables/useMessage.ts   |    0
 .../composables/useNodeConnections.test.ts    |    0
 .../src/composables/useNodeConnections.ts     |    0
 .../src/composables/useNodeDirtiness.test.ts  |    0
 .../src/composables/useNodeDirtiness.ts       |    0
 .../src/composables/useNodeHelpers.test.ts    |    0
 .../src/composables/useNodeHelpers.ts         |    0
 .../composables/useNodeSpecificationValues.ts |    0
 .../src/composables/useNodeType.test.ts       |    0
 .../editor-ui/src/composables/useNodeType.ts  |    0
 .../usePageRedirectionHelper.test.ts          |    0
 .../composables/usePageRedirectionHelper.ts   |    0
 .../src/composables/usePinnedData.test.ts     |    0
 .../src/composables/usePinnedData.ts          |    0
 .../src/composables/usePushConnection.test.ts |    0
 .../src/composables/usePushConnection.ts      |    0
 .../composables/useResolvedExpression.test.ts |    0
 .../src/composables/useResolvedExpression.ts  |    0
 .../src/composables/useRunWorkflow.test.ts    |    0
 .../src/composables/useRunWorkflow.ts         |    0
 .../src/composables/useStorage.test.ts        |    0
 .../editor-ui/src/composables/useStorage.ts   |    0
 .../src/composables/useStyles.test.ts         |    0
 .../editor-ui/src/composables/useStyles.ts    |    0
 .../editor-ui/src/composables/useTelemetry.ts |    0
 .../src/composables/useToast.test.ts          |    0
 .../editor-ui/src/composables/useToast.ts     |    0
 .../src/composables/useUniqueNodeName.test.ts |    0
 .../src/composables/useUniqueNodeName.ts      |    0
 .../src/composables/useUserHelpers.ts         |    0
 .../src/composables/useWorkflowActivate.ts    |    0
 .../composables/useWorkflowHelpers.test.ts    |    0
 .../src/composables/useWorkflowHelpers.ts     |    0
 .../{ => frontend}/editor-ui/src/constants.ts |    0
 .../editor-ui/src/constants.workflows.ts      |    0
 .../src/event-bus/code-node-editor.ts         |    0
 .../editor-ui/src/event-bus/data-pinning.ts   |    0
 .../src/event-bus/global-link-actions.ts      |    0
 .../editor-ui/src/event-bus/html-editor.ts    |    0
 .../editor-ui/src/event-bus/import-curl.ts    |    0
 .../editor-ui/src/event-bus/index.ts          |    0
 .../editor-ui/src/event-bus/mfa.ts            |    0
 .../editor-ui/src/event-bus/ndv.ts            |    0
 .../editor-ui/src/event-bus/node-view.ts      |    0
 .../editor-ui/src/event-bus/source-control.ts |    0
 .../{ => frontend}/editor-ui/src/init.test.ts |    0
 packages/{ => frontend}/editor-ui/src/init.ts |    0
 packages/{ => frontend}/editor-ui/src/main.ts |    4 +-
 .../src/mixins/workflowHelpers.test.ts        |    0
 .../editor-ui/src/models/history.ts           |    0
 .../editor-ui/src/n8n-theme-variables.scss    |    0
 .../editor-ui/src/n8n-theme.scss              |    0
 .../editor-ui/src/permissions.test.ts         |    0
 .../editor-ui/src/permissions.ts              |    0
 .../editor-ui/src/plugins/chartjs.ts          |    0
 .../codemirror/completions/__tests__/mock.ts  |    0
 .../codemirror/completions/addCompletions.ts  |    0
 .../completions/base.completions.test.ts      |    0
 .../completions/blank.completions.ts          |    0
 .../completions/bracketAccess.completions.ts  |    0
 .../completions/completions.test.ts           |    0
 .../codemirror/completions/constants.ts       |    0
 .../completions/datatype.completions.ts       |    0
 .../completions/dollar.completions.ts         |    0
 .../codemirror/completions/infoBoxRenderer.ts |    0
 .../completions/itemField.completions.test.ts |    0
 .../completions/itemIndex.completions.test.ts |    0
 .../completions/jsonField.completions.test.ts |    0
 .../luxon.instance.docs.ts                    |    0
 .../luxon.static.docs.ts                      |    0
 .../completions/nonDollar.completions.ts      |    0
 .../completions/prevNode.completions.test.ts  |    0
 .../completions/require.completions.test.ts   |    0
 .../plugins/codemirror/completions/types.ts   |    0
 .../codemirror/completions/utils.test.ts      |    0
 .../plugins/codemirror/completions/utils.ts   |    0
 .../completions/variables.completions.test.ts |    0
 .../plugins/codemirror/dragAndDrop.test.ts    |    0
 .../src/plugins/codemirror/dragAndDrop.ts     |    0
 .../expressionCloseBrackets.test.ts           |    0
 .../codemirror/expressionCloseBrackets.ts     |    0
 .../src/plugins/codemirror/format.ts          |    0
 .../src/plugins/codemirror/keymap.ts          |    0
 .../src/plugins/codemirror/multiCursor.ts     |    0
 .../src/plugins/codemirror/n8nLang.ts         |    0
 .../codemirror/resolvableHighlighter.ts       |    0
 .../codemirror/tooltips/InfoBoxTooltip.ts     |    0
 .../tooltips/infoBoxTooltip.test.ts           |    0
 .../typescript/client/completions.ts          |    0
 .../codemirror/typescript/client/facet.ts     |    0
 .../typescript/client/hoverTooltip.ts         |    0
 .../codemirror/typescript/client/linter.ts    |    0
 .../codemirror/typescript/client/snippets.ts  |    0
 .../typescript/client/useTypescript.ts        |    0
 .../plugins/codemirror/typescript/types.ts    |    0
 .../codemirror/typescript/worker/cache.ts     |    0
 .../typescript/worker/completions.ts          |    0
 .../codemirror/typescript/worker/constants.ts |    0
 .../typescript/worker/dynamicTypes.test.ts    |    0
 .../typescript/worker/dynamicTypes.ts         |    0
 .../codemirror/typescript/worker/env.ts       |    0
 .../typescript/worker/hoverTooltip.ts         |    0
 .../codemirror/typescript/worker/linter.ts    |    0
 .../typescript/worker/npmTypesLoader.ts       |    0
 .../worker/type-declarations/globals.d.ts     |    0
 .../n8n-once-for-all-items.d.ts               |    0
 .../n8n-once-for-each-item.d.ts               |    0
 .../worker/type-declarations/n8n.d.ts         |    0
 .../typescript/worker/typescript.worker.ts    |    0
 .../typescript/worker/typescriptAst.ts        |    0
 .../codemirror/typescript/worker/utils.ts     |    0
 .../editor-ui/src/plugins/components.ts       |    2 +-
 .../editor-ui/src/plugins/directives.ts       |    0
 .../src/plugins/i18n/docs/ADDENDUM.md         |    0
 .../editor-ui/src/plugins/i18n/docs/README.md |   12 +-
 .../src/plugins/i18n/docs/img/cred.png        |  Bin
 .../src/plugins/i18n/docs/img/header1.png     |  Bin
 .../src/plugins/i18n/docs/img/header2.png     |  Bin
 .../src/plugins/i18n/docs/img/header3.png     |  Bin
 .../src/plugins/i18n/docs/img/header4.png     |  Bin
 .../src/plugins/i18n/docs/img/header5.png     |  Bin
 .../src/plugins/i18n/docs/img/node1.png       |  Bin
 .../src/plugins/i18n/docs/img/node2.png       |  Bin
 .../src/plugins/i18n/docs/img/node4.png       |  Bin
 .../editor-ui/src/plugins/i18n/index.ts       |    2 +-
 .../src/plugins/i18n/locales/en.json          |    0
 .../editor-ui/src/plugins/i18n/utils.ts       |    0
 .../editor-ui/src/plugins/icons/custom.ts     |    0
 .../editor-ui/src/plugins/icons/index.ts      |    0
 .../editor-ui/src/plugins/index.ts            |    0
 .../editor-ui/src/plugins/sentry.test.ts      |    0
 .../editor-ui/src/plugins/sentry.ts           |    0
 .../editor-ui/src/plugins/telemetry.test.ts   |    0
 .../editor-ui/src/plugins/telemetry/index.ts  |    0
 .../src/plugins/telemetry/telemetry.types.ts  |    0
 .../{ => frontend}/editor-ui/src/polyfills.ts |    0
 .../__tests__/mockEventSource.ts              |    0
 .../__tests__/mockWebSocketClient.ts          |    0
 .../__tests__/useEventSourceClient.test.ts    |    0
 .../__tests__/useHeartbeat.test.ts            |    0
 .../__tests__/useWebSocketClient.test.ts      |    0
 .../push-connection/useEventSourceClient.ts   |    0
 .../src/push-connection/useHeartbeat.ts       |    0
 .../src/push-connection/useReconnectTimer.ts  |    0
 .../src/push-connection/useWebSocketClient.ts |    0
 .../editor-ui/src/router.test.ts              |    0
 .../{ => frontend}/editor-ui/src/router.ts    |    0
 .../editor-ui/src/routes/projects.routes.ts   |    0
 .../editor-ui/src/shims-modules.d.ts          |    0
 .../editor-ui/src/shims-vue.d.ts              |    0
 .../{ => frontend}/editor-ui/src/shims.d.ts   |    0
 .../stores/__tests__/utils/cloudStoreUtils.ts |    0
 .../utils/workflowHistoryTestUtils.ts         |    0
 .../editor-ui/src/stores/apiKeys.store.ts     |    0
 .../src/stores/assistant.store.test.ts        |    2 +-
 .../editor-ui/src/stores/assistant.store.ts   |    2 +-
 .../editor-ui/src/stores/auditLogs.store.ts   |    0
 .../editor-ui/src/stores/canvas.store.ts      |    0
 .../editor-ui/src/stores/cloudPlan.store.ts   |    0
 .../src/stores/collaboration.store.ts         |    0
 .../src/stores/communityNodes.store.ts        |    0
 .../editor-ui/src/stores/credentials.store.ts |    0
 .../editor-ui/src/stores/credentials.test.ts  |    0
 .../src/stores/environments.ee.store.ts       |    0
 .../editor-ui/src/stores/environments.test.ts |    0
 .../src/stores/executions.store.test.ts       |    0
 .../editor-ui/src/stores/executions.store.ts  |    0
 .../src/stores/externalSecrets.ee.store.ts    |    0
 .../editor-ui/src/stores/history.store.ts     |    0
 .../src/stores/logStreaming.store.ts          |    0
 .../editor-ui/src/stores/ndv.store.ts         |    0
 .../src/stores/nodeCreator.store.test.ts      |    0
 .../editor-ui/src/stores/nodeCreator.store.ts |    0
 .../editor-ui/src/stores/nodeTypes.store.ts   |    0
 .../src/stores/npsStore.store.test.ts         |    0
 .../editor-ui/src/stores/npsSurvey.store.ts   |    0
 .../src/stores/orchestration.store.ts         |    0
 .../editor-ui/src/stores/posthog.store.ts     |    0
 .../editor-ui/src/stores/posthog.test.ts      |    0
 .../editor-ui/src/stores/projects.store.ts    |    0
 .../src/stores/pushConnection.store.test.ts   |    0
 .../src/stores/pushConnection.store.ts        |    0
 .../editor-ui/src/stores/rbac.store.test.ts   |    0
 .../editor-ui/src/stores/rbac.store.ts        |    0
 .../editor-ui/src/stores/roles.store.test.ts  |    0
 .../editor-ui/src/stores/roles.store.ts       |    0
 .../editor-ui/src/stores/root.store.ts        |    0
 .../src/stores/schemaPreview.store.ts         |    0
 .../src/stores/settings.store.test.ts         |    0
 .../editor-ui/src/stores/settings.store.ts    |    0
 .../src/stores/sourceControl.store.ts         |    0
 .../editor-ui/src/stores/sso.store.ts         |    0
 .../editor-ui/src/stores/sso.test.ts          |    0
 .../editor-ui/src/stores/tags.store.ts        |    0
 .../editor-ui/src/stores/templates.store.ts   |    0
 .../stores/testDefinition.store.ee.test.ts    |    0
 .../src/stores/testDefinition.store.ee.ts     |    0
 .../editor-ui/src/stores/ui.store.ts          |    0
 .../editor-ui/src/stores/ui.test.ts           |    0
 .../editor-ui/src/stores/ui.utils.ts          |    0
 .../editor-ui/src/stores/usage.store.ts       |    0
 .../editor-ui/src/stores/usage.test.ts        |    0
 .../editor-ui/src/stores/users.store.test.ts  |    0
 .../editor-ui/src/stores/users.store.ts       |    0
 .../editor-ui/src/stores/versions.store.ts    |    0
 .../editor-ui/src/stores/webhooks.store.ts    |    0
 .../src/stores/workflowHistory.store.test.ts  |    0
 .../src/stores/workflowHistory.store.ts       |    0
 .../src/stores/workflows.ee.store.ts          |    0
 .../src/stores/workflows.store.test.ts        |    0
 .../editor-ui/src/stores/workflows.store.ts   |    0
 .../editor-ui/src/styles/_animations.scss     |    0
 .../editor-ui/src/styles/_global.scss         |    0
 .../editor-ui/src/styles/_variables.scss      |    0
 .../editor-ui/src/styles/index.scss           |    0
 .../src/styles/plugins/_codemirror.scss       |    0
 .../src/styles/plugins/_vueflow.scss          |    0
 .../editor-ui/src/styles/plugins/index.scss   |    0
 .../editor-ui/src/type-utils.d.ts             |    0
 .../editor-ui/src/types/assistant.types.ts    |    0
 .../editor-ui/src/types/canvas.ts             |    0
 .../editor-ui/src/types/completions.ts        |    0
 .../editor-ui/src/types/expressions.ts        |    0
 .../editor-ui/src/types/externalHooks.ts      |    2 +-
 .../editor-ui/src/types/index.ts              |    0
 .../editor-ui/src/types/projects.types.ts     |    0
 .../editor-ui/src/types/pushConnection.ts     |    0
 .../editor-ui/src/types/rbac.ts               |    0
 .../editor-ui/src/types/roles.types.ts        |    0
 .../editor-ui/src/types/router.ts             |    0
 .../src/types/sourceControl.types.ts          |    0
 .../editor-ui/src/types/workflowHistory.ts    |    0
 .../editor-ui/src/utils/apiUtils.test.ts      |    0
 .../editor-ui/src/utils/apiUtils.ts           |    0
 .../editor-ui/src/utils/canvasUtils.test.ts   |    0
 .../editor-ui/src/utils/canvasUtils.ts        |    0
 .../src/utils/credentialOnlyNodes.ts          |    0
 .../src/utils/easyAiWorkflowUtils.test.ts     |    0
 .../src/utils/easyAiWorkflowUtils.ts          |    0
 .../editor-ui/src/utils/eventUtils.ts         |    0
 .../src/utils/executionUtils.test.ts          |    0
 .../editor-ui/src/utils/executionUtils.ts     |    0
 .../editor-ui/src/utils/expressions.test.ts   |    0
 .../editor-ui/src/utils/expressions.ts        |    0
 .../editor-ui/src/utils/forceParse.ts         |    0
 .../src/utils/formatters/dateFormatter.ts     |    0
 .../src/utils/formatters/listFormatter.ts     |    0
 .../src/utils/fromAIOverrideUtils.test.ts     |    0
 .../src/utils/fromAIOverrideUtils.ts          |    0
 .../editor-ui/src/utils/htmlUtils.test.ts     |    0
 .../editor-ui/src/utils/htmlUtils.ts          |    0
 .../editor-ui/src/utils/injectStrict.test.ts  |    0
 .../editor-ui/src/utils/injectStrict.ts       |    0
 .../editor-ui/src/utils/mappingUtils.test.ts  |    0
 .../editor-ui/src/utils/mappingUtils.ts       |    0
 .../src/utils/nodeSettingsUtils.test.ts       |    0
 .../editor-ui/src/utils/nodeSettingsUtils.ts  |    0
 .../editor-ui/src/utils/nodeTypeUtils.test.ts |    0
 .../src/utils/nodeTypes/nodeTypeTransforms.ts |    0
 .../editor-ui/src/utils/nodeTypesUtils.ts     |    0
 .../editor-ui/src/utils/nodeViewUtils.test.ts |    0
 .../editor-ui/src/utils/nodeViewUtils.ts      |    0
 .../src/utils/nodes/nodeTransforms.ts         |    0
 .../editor-ui/src/utils/objectUtils.test.ts   |    0
 .../editor-ui/src/utils/objectUtils.ts        |    0
 .../src/utils/pairedItemUtils.test.ts         |    0
 .../editor-ui/src/utils/pairedItemUtils.ts    |    0
 .../src/utils/projects.utils.test.ts          |    0
 .../editor-ui/src/utils/projects.utils.ts     |    0
 .../src/utils/rbac/checks/hasRole.test.ts     |    0
 .../src/utils/rbac/checks/hasRole.ts          |    0
 .../src/utils/rbac/checks/hasScope.test.ts    |    0
 .../src/utils/rbac/checks/hasScope.ts         |    0
 .../editor-ui/src/utils/rbac/checks/index.ts  |    0
 .../utils/rbac/checks/isAuthenticated.test.ts |    0
 .../src/utils/rbac/checks/isAuthenticated.ts  |    0
 .../utils/rbac/checks/isDefaultUser.test.ts   |    0
 .../src/utils/rbac/checks/isDefaultUser.ts    |    0
 .../checks/isEnterpriseFeatureEnabled.test.ts |    0
 .../rbac/checks/isEnterpriseFeatureEnabled.ts |    0
 .../src/utils/rbac/checks/isGuest.test.ts     |    0
 .../src/utils/rbac/checks/isGuest.ts          |    0
 .../utils/rbac/checks/isInstanceOwner.test.ts |    0
 .../src/utils/rbac/checks/isInstanceOwner.ts  |    0
 .../src/utils/rbac/checks/isValid.test.ts     |    0
 .../src/utils/rbac/checks/isValid.ts          |    0
 .../editor-ui/src/utils/rbac/middleware.ts    |    0
 .../rbac/middleware/authenticated.test.ts     |    0
 .../utils/rbac/middleware/authenticated.ts    |    0
 .../src/utils/rbac/middleware/custom.test.ts  |    0
 .../src/utils/rbac/middleware/custom.ts       |    0
 .../utils/rbac/middleware/defaultUser.test.ts |    0
 .../src/utils/rbac/middleware/defaultUser.ts  |    0
 .../utils/rbac/middleware/enterprise.test.ts  |    0
 .../src/utils/rbac/middleware/enterprise.ts   |    0
 .../src/utils/rbac/middleware/guest.test.ts   |    0
 .../src/utils/rbac/middleware/guest.ts        |    0
 .../src/utils/rbac/middleware/rbac.test.ts    |    0
 .../src/utils/rbac/middleware/rbac.ts         |    0
 .../src/utils/rbac/middleware/role.test.ts    |    0
 .../src/utils/rbac/middleware/role.ts         |    0
 .../src/utils/rbac/permissions.test.ts        |    0
 .../editor-ui/src/utils/rbac/permissions.ts   |    0
 .../editor-ui/src/utils/rbacUtils.test.ts     |    0
 .../editor-ui/src/utils/rbacUtils.ts          |    0
 .../src/utils/sourceControlUtils.test.ts      |    0
 .../editor-ui/src/utils/sourceControlUtils.ts |    0
 .../editor-ui/src/utils/telemetryUtils.ts     |    0
 .../utils/templates/templateActions.test.ts   |    0
 .../src/utils/templates/templateActions.ts    |    0
 .../templates/templateTransforms.test.ts      |    0
 .../src/utils/templates/templateTransforms.ts |    0
 .../src/utils/templates/templateTypes.ts      |    0
 .../src/utils/templates/typeGuards.ts         |    0
 .../src/utils/testData/nodeTypeTestData.ts    |    0
 .../editor-ui/src/utils/typeGuards.ts         |    0
 .../editor-ui/src/utils/typeHelpers.ts        |    0
 .../editor-ui/src/utils/typesUtils.test.ts    |    0
 .../editor-ui/src/utils/typesUtils.ts         |    0
 .../editor-ui/src/utils/userUtils.ts          |    0
 .../editor-ui/src/utils/workerUtils.ts        |    0
 .../editor-ui/src/views/AuthView.test.ts      |    0
 .../editor-ui/src/views/AuthView.vue          |    0
 .../editor-ui/src/views/CanvasAddButton.vue   |    0
 .../src/views/ChangePasswordView.vue          |    0
 .../src/views/CredentialsView.test.ts         |    0
 .../editor-ui/src/views/CredentialsView.vue   |    2 +-
 .../editor-ui/src/views/ErrorView.vue         |    0
 .../editor-ui/src/views/ExecutionsView.vue    |    0
 .../src/views/ForgotMyPasswordView.test.ts    |    0
 .../src/views/ForgotMyPasswordView.vue        |    0
 .../editor-ui/src/views/LoadingView.vue       |    0
 .../editor-ui/src/views/MfaView.vue           |    0
 .../editor-ui/src/views/NodeView.vue          |    2 +-
 .../src/views/ProjectSettings.test.ts         |    0
 .../editor-ui/src/views/ProjectSettings.vue   |    2 +-
 .../src/views/SamlOnboarding.test.ts          |    0
 .../editor-ui/src/views/SamlOnboarding.vue    |    2 +-
 .../src/views/SettingsApiView.test.ts         |    0
 .../editor-ui/src/views/SettingsApiView.vue   |    0
 .../src/views/SettingsCommunityNodesView.vue  |    0
 .../src/views/SettingsExternalSecrets.test.ts |    0
 .../src/views/SettingsExternalSecrets.vue     |    0
 .../editor-ui/src/views/SettingsLdapView.vue  |    2 +-
 .../src/views/SettingsLogStreamingView.vue    |    0
 .../src/views/SettingsPersonalView.test.ts    |    0
 .../src/views/SettingsPersonalView.vue        |    2 +-
 .../src/views/SettingsSourceControl.test.ts   |    0
 .../src/views/SettingsSourceControl.vue       |    2 +-
 .../editor-ui/src/views/SettingsSso.test.ts   |    0
 .../editor-ui/src/views/SettingsSso.vue       |    0
 .../src/views/SettingsUsageAndPlan.test.ts    |    0
 .../src/views/SettingsUsageAndPlan.vue        |    2 +-
 .../src/views/SettingsUsersView.test.ts       |    0
 .../editor-ui/src/views/SettingsUsersView.vue |    0
 .../editor-ui/src/views/SettingsView.test.ts  |    0
 .../editor-ui/src/views/SettingsView.vue      |    0
 .../editor-ui/src/views/SetupView.vue         |    0
 .../AppsRequiringCredsNotice.vue              |    2 +-
 .../IconSuccess.vue                           |    0
 .../SetupTemplateFormStep.vue                 |    2 +-
 .../SetupWorkflowFromTemplateView.vue         |    4 +-
 .../__tests__/setupTemplate.store.testData.ts |    0
 .../setupTemplate.store.test.ts               |    0
 .../setupTemplate.store.ts                    |    0
 .../useCredentialSetupState.test.ts           |    0
 .../useCredentialSetupState.ts                |    0
 .../editor-ui/src/views/SigninView.test.ts    |    0
 .../editor-ui/src/views/SigninView.vue        |    0
 .../editor-ui/src/views/SignoutView.vue       |    0
 .../editor-ui/src/views/SignupView.test.ts    |    0
 .../editor-ui/src/views/SignupView.vue        |    0
 .../src/views/TemplatesCollectionView.vue     |    0
 .../src/views/TemplatesSearchView.vue         |    0
 .../editor-ui/src/views/TemplatesView.vue     |    0
 .../src/views/TemplatesWorkflowView.vue       |    0
 .../TestDefinition/TestDefinitionEditView.vue |    2 +-
 .../TestDefinition/TestDefinitionListView.vue |    2 +-
 .../TestDefinition/TestDefinitionNewView.vue  |    0
 .../TestDefinition/TestDefinitionRootView.vue |    0
 .../TestDefinitionRunDetailView.vue           |    2 +-
 .../tests/TestDefinitionEditView.test.ts      |    0
 .../tests/TestDefinitionListView.test.ts      |    0
 .../tests/TestDefinitionRootView.test.ts      |    0
 .../editor-ui/src/views/VariablesView.test.ts |    0
 .../editor-ui/src/views/VariablesView.vue     |    4 +-
 .../editor-ui/src/views/WorkerView.vue        |    0
 .../src/views/WorkflowExecutionsView.vue      |    0
 .../src/views/WorkflowHistory.test.ts         |    0
 .../editor-ui/src/views/WorkflowHistory.vue   |    0
 .../src/views/WorkflowOnboardingView.vue      |    0
 .../editor-ui/src/views/WorkflowsView.test.ts |    0
 .../editor-ui/src/views/WorkflowsView.vue     |    4 +-
 .../editor-ui/src/vue-virtual-scroller.d.ts   |    0
 .../editor-ui/tailwind.config.js              |    0
 .../editor-ui/tests/e2e/.eslintrc.js          |    0
 .../{ => frontend}/editor-ui/tsconfig.json    |   19 +-
 .../{ => frontend}/editor-ui/vite.config.mts  |   22 +-
 packages/workflow/package.json                |    2 +-
 pnpm-lock.yaml                                | 1429 +++++++----------
 turbo.json                                    |    4 +-
 1635 files changed, 805 insertions(+), 1079 deletions(-)
 delete mode 100644 packages/design-system/biome.jsonc
 rename packages/{ => frontend/@n8n}/design-system/.browserslistrc (100%)
 rename packages/{ => frontend/@n8n}/design-system/.eslintrc.js (100%)
 rename packages/{ => frontend/@n8n}/design-system/.gitignore (100%)
 rename packages/{ => frontend/@n8n}/design-system/.npmignore (100%)
 rename packages/{ => frontend/@n8n}/design-system/.storybook/fonts.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/.storybook/main.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/.storybook/preview.js (100%)
 rename packages/{ => frontend/@n8n}/design-system/.storybook/storybook.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/README.md (97%)
 create mode 100644 packages/frontend/@n8n/design-system/biome.jsonc
 rename packages/{ => frontend/@n8n}/design-system/chromatic.config.json (100%)
 rename packages/{ => frontend/@n8n}/design-system/package.json (95%)
 rename packages/{ => frontend/@n8n}/design-system/postcss.config.js (100%)
 rename packages/{ => frontend/@n8n}/design-system/public/.nojekyll (100%)
 rename packages/{ => frontend/@n8n}/design-system/public/assets/images/storybook-logo-dark.png (100%)
 rename packages/{ => frontend/@n8n}/design-system/public/assets/images/storybook-logo-light.png (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/__tests__/render.ts (90%)
 rename packages/{ => frontend/@n8n}/design-system/src/__tests__/setup.ts (89%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/AskAssistantAvatar/AskAssistantAvatar.test.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/AskAssistantAvatar/AssistantAvatar.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/AskAssistantAvatar/AssistantAvatar.vue (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/AskAssistantAvatar/__snapshots__/AskAssistantAvatar.test.ts.snap (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/AskAssistantButton/AskAssistantButton.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/AskAssistantButton/AskAssistantButton.test.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/AskAssistantButton/AskAssistantButton.vue (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/AskAssistantButton/__snapshots__/AskAssistantButton.test.ts.snap (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/AskAssistantChat/AskAssistantChat.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/AskAssistantChat/AskAssistantChat.test.ts (99%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/AskAssistantChat/AskAssistantChat.vue (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/AskAssistantChat/__snapshots__/AskAssistantChat.test.ts.snap (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/AskAssistantIcon/AssistantIcon.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/AskAssistantIcon/AssistantIcon.test.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/AskAssistantIcon/AssistantIcon.vue (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/AskAssistantIcon/__snapshots__/AssistantIcon.test.ts.snap (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/AskAssistantLoadingMessage/AskAssistantLoadingMessage.test.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/AskAssistantLoadingMessage/AssistantLoadingMessage.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/AskAssistantLoadingMessage/AssistantLoadingMessage.vue (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/AskAssistantLoadingMessage/DemoComponent.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/AskAssistantLoadingMessage/DemoComponent.vue (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/AskAssistantLoadingMessage/__snapshots__/AskAssistantLoadingMessage.test.ts.snap (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/AskAssistantText/AssistantText.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/AskAssistantText/AssistantText.test.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/AskAssistantText/AssistantText.vue (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/AskAssistantText/__snapshots__/AssistantText.test.ts.snap (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/BetaTag/BetaTag.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/BetaTag/BetaTag.test.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/BetaTag/BetaTag.vue (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/BetaTag/__snapshots__/BetaTag.test.ts.snap (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/BlinkingCursor/BlinkingCursor.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/BlinkingCursor/BlinkingCursor.test.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/BlinkingCursor/BlinkingCursor.vue (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/BlinkingCursor/__snapshots__/BlinkingCursor.test.ts.snap (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/CodeDiff/CodeDiff.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/CodeDiff/CodeDiff.test.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/CodeDiff/CodeDiff.vue (98%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/CodeDiff/__snapshots__/CodeDiff.test.ts.snap (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/ConditionalRouterLink/ConditionalRouterLink.test.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/ConditionalRouterLink/CondtionalRouterLink.vue (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/ConditionalRouterLink/__snapshots__/ConditionalRouterLink.test.ts.snap (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/ConditionalRouterLink/index.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/InlineAskAssistantButton/InlineAskAssistantButton.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/InlineAskAssistantButton/InlineAskAssistantButton.vue (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nActionBox/ActionBox.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nActionBox/ActionBox.test.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nActionBox/ActionBox.vue (94%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nActionBox/__snapshots__/ActionBox.test.ts.snap (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nActionBox/index.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nActionDropdown/ActionDropdown.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nActionDropdown/ActionDropdown.test.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nActionDropdown/ActionDropdown.vue (98%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nActionDropdown/__snapshots__/ActionDropdown.test.ts.snap (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nActionDropdown/index.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nActionToggle/ActionToggle.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nActionToggle/ActionToggle.vue (96%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nActionToggle/index.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nAlert/Alert.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nAlert/Alert.test.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nAlert/Alert.vue (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nAlert/index.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nAvatar/Avatar.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nAvatar/Avatar.test.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nAvatar/Avatar.vue (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nAvatar/index.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nBadge/Badge.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nBadge/Badge.test.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nBadge/Badge.vue (96%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nBadge/__snapshots__/Badge.test.ts.snap (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nBadge/index.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nBlockUi/BlockUi.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nBlockUi/BlockUi.test.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nBlockUi/BlockUi.vue (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nBlockUi/index.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nBreadcrumbs/AsyncLoadingCacheDemo.vue (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nBreadcrumbs/BreadCrumbs.test.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nBreadcrumbs/Breadcrumbs.stories.ts (99%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nBreadcrumbs/Breadcrumbs.vue (99%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nBreadcrumbs/__snapshots__/BreadCrumbs.test.ts.snap (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nBreadcrumbs/index.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nButton/Button.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nButton/Button.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nButton/Button.test.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nButton/Button.vue (99%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nButton/__snapshots__/Button.test.ts.snap (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nButton/index.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nCallout/Callout.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nCallout/Callout.test.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nCallout/Callout.vue (98%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nCallout/__snapshots__/Callout.test.ts.snap (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nCallout/index.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nCard/Card.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nCard/Card.test.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nCard/Card.vue (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nCard/__snapshots__/Card.test.ts.snap (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nCard/index.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nCheckbox/Checkbox.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nCheckbox/Checkbox.test.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nCheckbox/Checkbox.vue (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nCheckbox/__snapshots__/Checkbox.test.ts.snap (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nCheckbox/index.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nCircleLoader/CircleLoader.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nCircleLoader/CircleLoader.test.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nCircleLoader/CircleLoader.vue (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nCircleLoader/__snapshots__/CircleLoader.test.ts.snap (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nCircleLoader/index.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nColorPicker/ColorPicker.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nColorPicker/ColorPicker.test.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nColorPicker/ColorPicker.vue (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nColorPicker/__snapshots__/ColorPicker.test.ts.snap (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nColorPicker/index.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nDatatable/Datatable.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nDatatable/Datatable.test.ts (97%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nDatatable/Datatable.vue (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nDatatable/__snapshots__/Datatable.test.ts.snap (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nDatatable/__tests__/data.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nDatatable/index.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nFormBox/FormBox.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nFormBox/FormBox.test.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nFormBox/FormBox.vue (97%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nFormBox/__snapshots__/FormBox.test.ts.snap (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nFormBox/index.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nFormInput/FormInput.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nFormInput/FormInput.vue (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nFormInput/index.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nFormInput/validators.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nFormInputs/FormInputs.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nFormInputs/FormInputs.vue (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nFormInputs/index.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nHeading/Heading.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nHeading/Heading.vue (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nHeading/index.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nIcon/Icon.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nIcon/Icon.vue (92%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nIcon/index.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nIconButton/IconButton.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nIconButton/IconButton.vue (83%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nIconButton/index.d.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nIconButton/index.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nIconPicker/IconPicker.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nIconPicker/IconPicker.test.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nIconPicker/IconPicker.vue (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nIconPicker/constants.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nIconPicker/index.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nInfoAccordion/InfoAccordion.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nInfoAccordion/InfoAccordion.vue (98%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nInfoAccordion/index.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nInfoTip/InfoTip.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nInfoTip/InfoTip.test.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nInfoTip/InfoTip.vue (97%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nInfoTip/__snapshots__/InfoTip.test.ts.snap (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nInfoTip/index.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nInput/Input.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nInput/Input.test.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nInput/Input.vue (95%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nInput/__snapshots__/Input.test.ts.snap (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nInput/index.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nInputLabel/InputLabel.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nInputLabel/InputLabel.test.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nInputLabel/InputLabel.vue (98%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nInputLabel/__snapshots__/InputLabel.test.ts.snap (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nInputLabel/index.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nInputNumber/InputNumber.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nInputNumber/InputNumber.vue (87%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nInputNumber/index.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nKeyboardShortcut/KeyboardShortcut.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nKeyboardShortcut/N8nKeyboardShortcut.vue (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nKeyboardShortcut/index.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nLink/Link.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nLink/Link.vue (96%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nLink/index.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nLoading/Loading.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nLoading/Loading.vue (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nLoading/index.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nMarkdown/Markdown.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nMarkdown/Markdown.test.ts (97%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nMarkdown/Markdown.vue (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nMarkdown/index.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nMenu/Menu.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nMenu/Menu.vue (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nMenu/index.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nMenuItem/MenuItem.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nMenuItem/MenuItem.vue (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nMenuItem/index.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nMenuItem/routerUtil.ts (95%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nNavigationDropdown/NavigationDropdown.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nNavigationDropdown/NavigationDropdown.test.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nNavigationDropdown/NavigationDropdown.vue (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nNavigationDropdown/index.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nNodeCreatorNode/NodeCreatorNode.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nNodeCreatorNode/NodeCreatorNode.vue (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nNodeCreatorNode/index.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nNodeIcon/NodeIcon.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nNodeIcon/NodeIcon.vue (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nNodeIcon/index.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nNotice/Notice.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nNotice/Notice.test.ts (93%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nNotice/Notice.vue (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nNotice/__snapshots__/Notice.test.ts.snap (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nNotice/index.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nOption/Option.vue (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nOption/index.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nPagination/Pagination.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nPagination/Pagination.vue (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nPagination/index.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nPopover/Popover.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nPopover/Popover.vue (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nPopover/index.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nPulse/Pulse.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nPulse/Pulse.vue (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nPulse/index.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nRadioButtons/RadioButton.vue (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nRadioButtons/RadioButtons.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nRadioButtons/RadioButtons.vue (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nRadioButtons/index.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nRecycleScroller/RecycleScroller.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nRecycleScroller/RecycleScroller.test.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nRecycleScroller/RecycleScroller.vue (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nRecycleScroller/__snapshots__/RecycleScroller.test.ts.snap (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nRecycleScroller/index.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nResizeWrapper/ResizeWrapper.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nResizeWrapper/ResizeWrapper.vue (99%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nResizeWrapper/index.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nResizeableSticky/ResizeableSticky.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nResizeableSticky/ResizeableSticky.vue (96%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nResizeableSticky/index.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nRoute/Route.test.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nRoute/Route.vue (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nRoute/__snapshots__/Route.test.ts.snap (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nRoute/index.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nSelect/Select.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nSelect/Select.test.ts (96%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nSelect/Select.vue (98%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nSelect/__snapshots__/Select.test.ts.snap (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nSelect/index.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nSelectableList/SelectableList.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nSelectableList/SelectableList.test.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nSelectableList/SelectableList.vue (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nSelectableList/__snapshots__/SelectableList.test.ts.snap (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nSelectableList/index.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nSpinner/Spinner.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nSpinner/Spinner.vue (95%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nSpinner/index.d.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nSpinner/index.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nSticky/Sticky.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nSticky/Sticky.vue (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nSticky/constants.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nSticky/index.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nSticky/types.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nTabs/Tabs.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nTabs/Tabs.vue (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nTabs/index.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nTag/Tag.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nTag/Tag.vue (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nTag/index.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nTags/Tags.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nTags/Tags.vue (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nTags/index.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nText/Text.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nText/Text.vue (96%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nText/index.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nTooltip/Tooltip.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nTooltip/Tooltip.test.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nTooltip/Tooltip.vue (95%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nTooltip/index.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nTree/Tree.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nTree/Tree.test.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nTree/Tree.vue (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nTree/__snapshots__/Tree.test.ts.snap (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nTree/index.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nUserInfo/UserInfo.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nUserInfo/UserInfo.vue (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nUserInfo/index.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nUserSelect/UserSelect.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nUserSelect/UserSelect.vue (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nUserSelect/index.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nUserStack/UserStack.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nUserStack/UserStack.test.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nUserStack/UserStack.vue (98%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nUserStack/index.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nUsersList/UsersList.stories.ts (96%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nUsersList/UsersList.vue (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/N8nUsersList/index.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/ResizeObserver/ResizeObserver.vue (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/ResizeObserver/index.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/components/index.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/composables/useI18n.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/_primitives.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/_tokens.dark.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/_tokens.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/alert.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/aside.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/autocomplete.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/avatar.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/backtop.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/badge.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/base.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/breadcrumb-item.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/breadcrumb.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/button-group.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/calendar.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/card.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/carousel-item.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/carousel.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/cascader-panel.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/cascader.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/checkbox-button.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/checkbox-group.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/checkbox.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/col.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/collapse-item.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/collapse.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/color-picker.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/common/popup.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/common/transition.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/common/var.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/container.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/date-picker.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/date-picker/date-picker.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/date-picker/date-range-picker.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/date-picker/date-table.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/date-picker/month-table.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/date-picker/picker-panel.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/date-picker/picker.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/date-picker/time-picker.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/date-picker/time-range-picker.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/date-picker/time-spinner.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/date-picker/year-table.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/dialog.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/display.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/divider.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/drawer.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/dropdown-item.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/dropdown-menu.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/dropdown.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/fonts/element-icons.ttf (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/fonts/element-icons.woff (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/footer.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/form-item.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/form.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/header.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/icon.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/image.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/index.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/infinite-scroll.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/infiniteScroll.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/input-number.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/input.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/link.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/loading.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/main.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/menu-item-group.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/menu-item.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/menu.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/message-box.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/message.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/mixins/_breakpoints.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/mixins/_button.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/mixins/config.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/mixins/function.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/mixins/index.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/mixins/mixins.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/mixins/utils.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/notification.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/option-group.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/option.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/page-header.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/pagination.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/popconfirm.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/popover.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/popper.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/progress.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/radio-button.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/radio-group.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/radio.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/rate.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/reset.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/row.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/scrollbar.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/select-dropdown.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/select.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/skeleton.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/slider.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/spinner.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/step.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/steps.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/submenu.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/switch.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/tab-pane.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/table-column.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/table.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/tabs.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/tag.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/tailwind/index.css (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/time-picker.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/time-select.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/timeline-item.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/timeline.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/tooltip.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/transfer.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/tree.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/upload.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/utilities/_float.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/utilities/_link.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/utilities/_list.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/utilities/_spacing.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/utilities/_typography.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/css/utilities/index.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/directives/index.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/directives/n8n-html.test.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/directives/n8n-html.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/directives/n8n-truncate.test.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/directives/n8n-truncate.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/index.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/locale/format.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/locale/index.ts (93%)
 rename packages/{ => frontend/@n8n}/design-system/src/locale/lang/en.ts (97%)
 rename packages/{ => frontend/@n8n}/design-system/src/mixins/index.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/mixins/locale.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/plugin.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/shims-modules.d.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/shims-vue.d.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/styleguide/ColorCircles.test.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/styleguide/ColorCircles.utils.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/styleguide/ColorCircles.vue (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/styleguide/Sizes.test.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/styleguide/Sizes.vue (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/styleguide/VariableTable.vue (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/styleguide/__snapshots__/ColorCircles.test.ts.snap (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/styleguide/__snapshots__/Sizes.test.ts.snap (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/styleguide/border.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/styleguide/colors.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/styleguide/colorsprimitives.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/styleguide/components/SpacingPreview.vue (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/styleguide/fonts.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/styleguide/spacing.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/styleguide/utilities/float.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/styleguide/utilities/lists.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/styleguide/utilities/spacing.stories.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/types/action-dropdown.ts (73%)
 rename packages/{ => frontend/@n8n}/design-system/src/types/assistant.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/types/button.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/types/datatable.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/types/form.ts (96%)
 rename packages/{ => frontend/@n8n}/design-system/src/types/i18n.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/types/icon.ts (81%)
 rename packages/{ => frontend/@n8n}/design-system/src/types/index.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/types/input.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/types/keyboardshortcut.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/types/menu.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/types/node-creator-node.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/types/resize.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/types/select.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/types/text.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/types/user.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/utils.scss (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/utils/form-event-bus.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/utils/index.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/utils/labelUtil.test.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/utils/labelUtil.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/utils/markdown.test.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/utils/markdown.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/utils/testUtils.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/utils/typeguards.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/utils/uid.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/src/utils/valueByPath.test.ts (94%)
 rename packages/{ => frontend/@n8n}/design-system/src/utils/valueByPath.ts (100%)
 rename packages/{ => frontend/@n8n}/design-system/tailwind.config.js (100%)
 rename packages/{ => frontend/@n8n}/design-system/theme/preview/docs.min.css (100%)
 rename packages/{ => frontend/@n8n}/design-system/theme/preview/index.html (100%)
 rename packages/{ => frontend/@n8n}/design-system/tsconfig.json (55%)
 rename packages/{ => frontend/@n8n}/design-system/vite.config.mts (79%)
 rename packages/{ => frontend}/editor-ui/.browserslistrc (100%)
 rename packages/{ => frontend}/editor-ui/.eslintrc.js (100%)
 rename packages/{ => frontend}/editor-ui/.gitignore (100%)
 rename packages/{ => frontend}/editor-ui/.npmignore (100%)
 rename packages/{ => frontend}/editor-ui/README.md (100%)
 rename packages/{ => frontend}/editor-ui/biome.jsonc (69%)
 rename packages/{ => frontend}/editor-ui/index.html (100%)
 rename packages/{ => frontend}/editor-ui/index.js (100%)
 rename packages/{ => frontend}/editor-ui/package.json (96%)
 rename packages/{ => frontend}/editor-ui/postcss.config.js (100%)
 rename packages/{ => frontend}/editor-ui/public/favicon.ico (100%)
 rename packages/{ => frontend}/editor-ui/public/static/community_package_tooltip_img.png (100%)
 rename packages/{ => frontend}/editor-ui/public/static/data-mapping-gif.gif (100%)
 rename packages/{ => frontend}/editor-ui/public/static/form-grey.svg (100%)
 rename packages/{ => frontend}/editor-ui/public/static/google-auth/disabled.dark.png (100%)
 rename packages/{ => frontend}/editor-ui/public/static/google-auth/disabled.png (100%)
 rename packages/{ => frontend}/editor-ui/public/static/google-auth/focus.dark.png (100%)
 rename packages/{ => frontend}/editor-ui/public/static/google-auth/focus.png (100%)
 rename packages/{ => frontend}/editor-ui/public/static/google-auth/normal.dark.png (100%)
 rename packages/{ => frontend}/editor-ui/public/static/google-auth/normal.png (100%)
 rename packages/{ => frontend}/editor-ui/public/static/google-auth/pressed.dark.png (100%)
 rename packages/{ => frontend}/editor-ui/public/static/google-auth/pressed.png (100%)
 rename packages/{ => frontend}/editor-ui/public/static/n8n-logo.png (100%)
 rename packages/{ => frontend}/editor-ui/public/static/og_image.png (100%)
 rename packages/{ => frontend}/editor-ui/public/static/open-ai.svg (100%)
 rename packages/{ => frontend}/editor-ui/public/static/webhook-icon.svg (100%)
 rename packages/{ => frontend}/editor-ui/src/App.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/Interface.ts (99%)
 rename packages/{ => frontend}/editor-ui/src/__tests__/data/canvas.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/__tests__/data/index.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/__tests__/data/projects.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/__tests__/data/users.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/__tests__/defaults.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/__tests__/mocks.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/__tests__/render.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/__tests__/server/endpoints/credential.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/__tests__/server/endpoints/credentialType.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/__tests__/server/endpoints/index.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/__tests__/server/endpoints/settings.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/__tests__/server/endpoints/sourceControl.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/__tests__/server/endpoints/sso.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/__tests__/server/endpoints/tag.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/__tests__/server/endpoints/user.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/__tests__/server/endpoints/variable.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/__tests__/server/endpoints/workflow.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/__tests__/server/factories/credential.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/__tests__/server/factories/credentialType.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/__tests__/server/factories/index.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/__tests__/server/factories/tag.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/__tests__/server/factories/user.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/__tests__/server/factories/variable.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/__tests__/server/factories/workflow.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/__tests__/server/fixtures/index.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/__tests__/server/fixtures/tags.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/__tests__/server/fixtures/workflows.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/__tests__/server/index.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/__tests__/server/models/credential.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/__tests__/server/models/credentialType.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/__tests__/server/models/index.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/__tests__/server/models/tag.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/__tests__/server/models/user.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/__tests__/server/models/variable.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/__tests__/server/models/workflow.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/__tests__/server/types.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/__tests__/setup.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/__tests__/utils.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/api/ai.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/api/api-keys.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/api/cloudPlans.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/api/communityNodes.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/api/credentials.ee.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/api/credentials.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/api/ctas.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/api/environments.ee.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/api/eventbus.ee.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/api/events.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/api/externalSecrets.ee.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/api/invitation.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/api/ldap.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/api/mfa.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/api/nodeTypes.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/api/npsSurvey.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/api/orchestration.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/api/projects.api.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/api/roles.api.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/api/schemaPreview.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/api/settings.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/api/sourceControl.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/api/sso.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/api/tags.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/api/templates.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/api/test/schemaPreview.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/api/testDefinition.ee.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/api/ui.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/api/usage.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/api/users.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/api/versions.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/api/workflow-webhooks.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/api/workflowHistory.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/api/workflows.ee.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/api/workflows.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/assets/images/aws-secrets-manager.svg (100%)
 rename packages/{ => frontend}/editor-ui/src/assets/images/azure-key-vault.svg (100%)
 rename packages/{ => frontend}/editor-ui/src/assets/images/doppler.webp (100%)
 rename packages/{ => frontend}/editor-ui/src/assets/images/gcp-secrets-manager.svg (100%)
 rename packages/{ => frontend}/editor-ui/src/assets/images/hashicorp.webp (100%)
 rename packages/{ => frontend}/editor-ui/src/assets/images/infisical.webp (100%)
 rename packages/{ => frontend}/editor-ui/src/components/AboutModal.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/ActivationModal.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/AiStarsIcon.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/AiUpdatedCodeMessage.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/AnnotationTagsDropdown.ee.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/ApiKeyCard.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/ApiKeyCreateOrEditModal.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/ApiKeyCreateOrEditModal.vue (99%)
 rename packages/{ => frontend}/editor-ui/src/components/AskAssistant/AskAssistantChat.vue (96%)
 rename packages/{ => frontend}/editor-ui/src/components/AskAssistant/AskAssistantFloatingButton.vue (91%)
 rename packages/{ => frontend}/editor-ui/src/components/AskAssistant/NewAssistantSessionModal.vue (92%)
 rename packages/{ => frontend}/editor-ui/src/components/AssignmentCollection/Assignment.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/AssignmentCollection/Assignment.vue (99%)
 rename packages/{ => frontend}/editor-ui/src/components/AssignmentCollection/AssignmentCollection.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/AssignmentCollection/AssignmentCollection.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/AssignmentCollection/TypeSelect.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/AssignmentCollection/TypeSelect.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/AssignmentCollection/constants.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/AssignmentCollection/utils.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Badge.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Banner.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/BannersStack.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/BecomeTemplateCreatorCta/BecomeTemplateCreatorCta.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/BecomeTemplateCreatorCta/becomeTemplateCreatorStore.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/BinaryDataDisplay.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/BinaryDataDisplayEmbed.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/BreakpointsObserver.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/ButtonParameter/ButtonParameter.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/ButtonParameter/ButtonParameter.vue (99%)
 rename packages/{ => frontend}/editor-ui/src/components/ButtonParameter/utils.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/ButtonParameter/utils.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/CanvasChat/CanvasChat.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/CanvasChat/CanvasChat.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/CanvasChat/components/ChatLogsPanel.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/CanvasChat/components/ChatMessagesPanel.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/CanvasChat/components/MessageOptionAction.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/CanvasChat/components/MessageOptionTooltip.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/CanvasChat/composables/useChatMessaging.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/CanvasChat/composables/useChatTrigger.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/CanvasChat/composables/useResize.ts (98%)
 rename packages/{ => frontend}/editor-ui/src/components/CanvasChat/types/chat.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/ChangePasswordModal.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/ChangePasswordModal.vue (98%)
 rename packages/{ => frontend}/editor-ui/src/components/ChatEmbedModal.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/ChatEmbedModal.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/CodeNodeEditor/AskAI/AskAI.vue (99%)
 rename packages/{ => frontend}/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/CodeNodeEditor/completer.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/CodeNodeEditor/completions/base.completions.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/CodeNodeEditor/completions/execution.completions.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/CodeNodeEditor/completions/itemField.completions.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/CodeNodeEditor/completions/itemField.completions.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/CodeNodeEditor/completions/itemIndex.completions.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/CodeNodeEditor/completions/js.snippets.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/CodeNodeEditor/completions/jsonField.completions.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/CodeNodeEditor/completions/luxon.completions.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/CodeNodeEditor/completions/prevNode.completions.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/CodeNodeEditor/completions/require.completions.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/CodeNodeEditor/completions/secrets.completions.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/CodeNodeEditor/completions/variables.completions.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/CodeNodeEditor/completions/workflow.completions.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/CodeNodeEditor/constants.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/CodeNodeEditor/linter.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/CodeNodeEditor/theme.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/CodeNodeEditor/types.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/CodeNodeEditor/utils.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/CodeNodeEditor/utils.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/CollaborationPane.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/CollectionParameter.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/CollectionParameter.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/CollectionWorkflowCard.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/CommunityPackageCard.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/CommunityPackageInstallModal.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/CommunityPackageInstallModal.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/CommunityPackageManageConfirmModal.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/CommunityPlusEnrollmentModal.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/CommunityPlusEnrollmentModal.vue (97%)
 rename packages/{ => frontend}/editor-ui/src/components/ContactPromptModal.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/ContextMenu/ContextMenu.vue (96%)
 rename packages/{ => frontend}/editor-ui/src/components/CopyInput.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/CopyInput.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/CredentialCard.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/CredentialCard.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/CredentialConfig.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/CredentialEdit/AuthTypeSelector.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/CredentialEdit/CredentialConfig.vue (99%)
 rename packages/{ => frontend}/editor-ui/src/components/CredentialEdit/CredentialDocs.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/CredentialEdit/CredentialEdit.vue (99%)
 rename packages/{ => frontend}/editor-ui/src/components/CredentialEdit/CredentialInfo.vue (97%)
 rename packages/{ => frontend}/editor-ui/src/components/CredentialEdit/CredentialInputs.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/CredentialEdit/CredentialSharing.ee.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/CredentialEdit/GoogleAuthButton.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/CredentialEdit/OauthButton.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/CredentialEdit/OauthButton.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/CredentialEdit/__tests__/CredentialEdit.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/CredentialEdit/docs.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/CredentialIcon.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/CredentialIcon.vue (98%)
 rename packages/{ => frontend}/editor-ui/src/components/CredentialPicker/CredentialPicker.test.constants.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/CredentialPicker/CredentialPicker.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/CredentialPicker/CredentialPicker.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/CredentialPicker/CredentialsDropdown.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/CredentialsSelect.vue (98%)
 rename packages/{ => frontend}/editor-ui/src/components/CredentialsSelectModal.vue (98%)
 rename packages/{ => frontend}/editor-ui/src/components/CssEditor/CssEditor.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/DebugPaywallModal.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/DeleteUserModal.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/DeleteUserModal.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Draggable.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/DraggableTarget.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/DropArea/DropArea.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/DropArea/DropArea.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/DuplicateWorkflowDialog.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/EnterpriseEdition.ee.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Error/NodeErrorView.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Error/NodeErrorView.vue (99%)
 rename packages/{ => frontend}/editor-ui/src/components/ExpandableInput/ExpandableInputBase.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/ExpandableInput/ExpandableInputEdit.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/ExpandableInput/ExpandableInputPreview.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/ExpressionEditModal.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/ExpressionEditModal.vue (98%)
 rename packages/{ => frontend}/editor-ui/src/components/ExpressionEditorModal/ExpressionEditorModalInput.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/ExpressionEditorModal/theme.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/ExpressionEditorModalInput.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/ExpressionFunctionIcon.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/ExpressionParameterInput.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/ExpressionParameterInput.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/ExternalSecretsProviderCard.ee.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/ExternalSecretsProviderConnectionSwitch.ee.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/ExternalSecretsProviderImage.ee.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/ExternalSecretsProviderModal.ee.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Feedback.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Feedback.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/FilterConditions/CombinatorSelect.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/FilterConditions/Condition.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/FilterConditions/FilterConditions.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/FilterConditions/FilterConditions.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/FilterConditions/OperatorSelect.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/FilterConditions/constants.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/FilterConditions/types.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/FilterConditions/utils.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/FilterConditions/utils.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/FixedCollectionParameter.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/FixedCollectionParameter.vue (99%)
 rename packages/{ => frontend}/editor-ui/src/components/Folders/FolderCard.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Folders/FolderCard.vue (98%)
 rename packages/{ => frontend}/editor-ui/src/components/Folders/constants.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/FreeAiCreditsCallout.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/FreeAiCreditsCallout.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/GiftNotificationIcon.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/GoBackButton.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/HtmlEditor.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/HtmlEditor/HtmlEditor.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/HtmlEditor/types.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/HtmlEditor/utils.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/ImportCurlModal.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/ImportCurlParameter.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/InlineExpressionEditor/ExpressionOutput.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorInput.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorOutput.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorOutput.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/InlineExpressionEditor/InlineExpressionTip.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/InlineExpressionEditor/InlineExpressionTip.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/InlineExpressionEditor/OutputItemSelect.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/InlineExpressionEditor/theme.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/InlineNameEdit.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/InlineTextEdit.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/InputNodeSelect.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/InputPanel.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/InputPanel.vue (99%)
 rename packages/{ => frontend}/editor-ui/src/components/InputTriple/InputTriple.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/InputTriple/InputTriple.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/IntersectionObserved.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/IntersectionObserver.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/InviteUsersModal.vue (99%)
 rename packages/{ => frontend}/editor-ui/src/components/JsEditor.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/JsEditor/JsEditor.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/JsonEditor.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/JsonEditor/JsonEditor.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/KeyboardShortcutTooltip.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Logo/Logo.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Logo/__tests__/Logo.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Logo/__tests__/__snapshots__/Logo.test.ts.snap (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Logo/logo-icon.svg (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Logo/logo-text.svg (100%)
 rename packages/{ => frontend}/editor-ui/src/components/MainHeader/CollaborationPane.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/MainHeader/MainHeader.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/MainHeader/TabBar.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/MainHeader/TabBar.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/MainHeader/WorkflowDetails.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/MainHeader/WorkflowDetails.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/MainHeader/WorkflowHistoryButton.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/MainHeader/WorkflowHistoryButton.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/MainSidebar.vue (99%)
 rename packages/{ => frontend}/editor-ui/src/components/MainSidebarSourceControl.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/MainSidebarSourceControl.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/MappingPill.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/MfaSetupModal.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Modal.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/ModalDrawer.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/ModalRoot.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Modals.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/MultipleParameter.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/MultipleParameter.vue (98%)
 rename packages/{ => frontend}/editor-ui/src/components/NDVDraggablePanels.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/NDVFloatingNodes.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/NDVSubConnections.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/NDVSubConnections.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Node/NodeCreation.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Node/NodeCreator/CategoryItem.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Node/NodeCreator/ItemTypes/ActionItem.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Node/NodeCreator/ItemTypes/CategoryItem.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Node/NodeCreator/ItemTypes/LabelItem.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Node/NodeCreator/ItemTypes/LinkItem.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Node/NodeCreator/ItemTypes/NodeItem.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Node/NodeCreator/ItemTypes/SubcategoryItem.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Node/NodeCreator/ItemTypes/ViewItem.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Node/NodeCreator/ItemsRenderer.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Node/NodeCreator/Modes/ActionsMode.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Node/NodeCreator/Modes/NodesMode.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Node/NodeCreator/NodeCreator.vue (98%)
 rename packages/{ => frontend}/editor-ui/src/components/Node/NodeCreator/NodesListPanel.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Node/NodeCreator/OrderSwitcher.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Node/NodeCreator/Panel/NoResults.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Node/NodeCreator/Panel/NoResultsIcon.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Node/NodeCreator/Panel/NodesListPanel.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Node/NodeCreator/Panel/SearchBar.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Node/NodeCreator/Renderers/CategorizedItemsRenderer.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Node/NodeCreator/Renderers/ItemsRenderer.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Node/NodeCreator/__tests__/utils.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Node/NodeCreator/composables/useActions.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Node/NodeCreator/composables/useActionsGeneration.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Node/NodeCreator/composables/useKeyboardNavigation.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Node/NodeCreator/composables/useViewStacks.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Node/NodeCreator/useActions.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Node/NodeCreator/useActionsGeneration.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Node/NodeCreator/useKeyboardNavigation.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Node/NodeCreator/utils.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Node/NodeCreator/utils.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Node/NodeCreator/viewsData.ts (99%)
 rename packages/{ => frontend}/editor-ui/src/components/NodeCredentials.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/NodeCredentials.vue (99%)
 rename packages/{ => frontend}/editor-ui/src/components/NodeDetailsView.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/NodeDetailsView.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/NodeExecuteButton.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/NodeExecutionErrorMessage.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/NodeExecutionErrorMessage.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/NodeIcon.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/NodeList.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/NodeSettings.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/NodeSettingsTabs.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/NodeTitle.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/NodeTitle.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/NodeViewUnfinishedWorkflowMessage.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/NodeWebhooks.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/NpsSurvey.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/OutputPanel.vue (99%)
 rename packages/{ => frontend}/editor-ui/src/components/PanelDragButton.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/ParameterInput.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/ParameterInput.vue (99%)
 rename packages/{ => frontend}/editor-ui/src/components/ParameterInputExpanded.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/ParameterInputFull.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/ParameterInputFull.vue (99%)
 rename packages/{ => frontend}/editor-ui/src/components/ParameterInputHint.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/ParameterInputList.test.constants.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/ParameterInputList.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/ParameterInputList.vue (99%)
 rename packages/{ => frontend}/editor-ui/src/components/ParameterInputOverrides/FromAiOverrideButton.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/ParameterInputOverrides/FromAiOverrideField.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/ParameterInputOverrides/ParameterOverrideSelectableList.vue (96%)
 rename packages/{ => frontend}/editor-ui/src/components/ParameterInputWrapper.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/ParameterInputWrapper.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/ParameterIssues.vue (92%)
 rename packages/{ => frontend}/editor-ui/src/components/ParameterOptions.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/ParameterOptions.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/PersonalizationModal.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/PersonalizationModal.vue (99%)
 rename packages/{ => frontend}/editor-ui/src/components/Projects/ProjectCardBadge.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Projects/ProjectCardBadge.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Projects/ProjectCreateResource.vue (91%)
 rename packages/{ => frontend}/editor-ui/src/components/Projects/ProjectDeleteDialog.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Projects/ProjectHeader.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Projects/ProjectHeader.vue (98%)
 rename packages/{ => frontend}/editor-ui/src/components/Projects/ProjectIcon.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Projects/ProjectMoveResourceModal.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Projects/ProjectMoveResourceModal.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Projects/ProjectMoveResourceModalCredentialsList.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Projects/ProjectMoveSuccessToastMessage.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Projects/ProjectMoveSuccessToastMessage.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Projects/ProjectNavigation.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Projects/ProjectNavigation.vue (98%)
 rename packages/{ => frontend}/editor-ui/src/components/Projects/ProjectRoleUpgradeDialog.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Projects/ProjectSharing.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Projects/ProjectSharing.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Projects/ProjectSharingInfo.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Projects/ProjectTabs.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Projects/ProjectTabs.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/PromptMfaCodeModal/PromptMfaCodeModal.vue (97%)
 rename packages/{ => frontend}/editor-ui/src/components/PushConnectionTracker.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/PushConnectionTracker.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/ResourceLocator/ResourceLocator.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/ResourceLocator/ResourceLocatorDropdown.vue (99%)
 rename packages/{ => frontend}/editor-ui/src/components/ResourceLocator/resourceLocator.scss (100%)
 rename packages/{ => frontend}/editor-ui/src/components/ResourceMapper.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/ResourceMapper/MappingFields.vue (99%)
 rename packages/{ => frontend}/editor-ui/src/components/ResourceMapper/MappingModeSelect.vue (98%)
 rename packages/{ => frontend}/editor-ui/src/components/ResourceMapper/MatchingColumnsSelect.vue (98%)
 rename packages/{ => frontend}/editor-ui/src/components/ResourceMapper/ResourceMapper.test.constants.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/ResourceMapper/ResourceMapper.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/ResourceMapper/ResourceMapper.vue (99%)
 rename packages/{ => frontend}/editor-ui/src/components/RunData.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/RunData.vue (99%)
 rename packages/{ => frontend}/editor-ui/src/components/RunDataAi/AiRunContentBlock.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/RunDataAi/RunDataAi.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/RunDataAi/RunDataAiContent.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/RunDataAi/useAiContentParsers.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/RunDataAi/utils.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/RunDataAi/utils.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/RunDataHtml.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/RunDataJson.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/RunDataJson.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/RunDataJsonActions.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/RunDataPinButton.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/RunDataPinButton.vue (95%)
 rename packages/{ => frontend}/editor-ui/src/components/RunDataSearch.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/RunDataSearch.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/RunDataTable.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/RunDataTable.vue (99%)
 rename packages/{ => frontend}/editor-ui/src/components/RunInfo.vue (97%)
 rename packages/{ => frontend}/editor-ui/src/components/SQLEditor.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/SSOLogin.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/SSOLogin.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/SaveButton.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/ScopesNotice.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/SettingsLogStreaming/EventDestinationCard.ee.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/SettingsLogStreaming/EventDestinationSettingsModal.ee.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/SettingsLogStreaming/EventSelection.ee.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/SettingsLogStreaming/Helpers.ee.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/SettingsLogStreaming/descriptions.ee.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/SettingsSidebar.vue (98%)
 rename packages/{ => frontend}/editor-ui/src/components/SetupWorkflowCredentialsButton/SetupWorkflowCredentialsButton.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/SetupWorkflowCredentialsButton/SetupWorkflowCredentialsButton.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/SetupWorkflowCredentialsModal/SetupWorkflowCredentialsModal.vue (98%)
 rename packages/{ => frontend}/editor-ui/src/components/SetupWorkflowCredentialsModal/useSetupWorkflowCredentialsModalState.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/ShortenName.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/SourceControlInitializationErrorMessage.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/SourceControlPullModal.ee.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/SourceControlPullModal.ee.vue (98%)
 rename packages/{ => frontend}/editor-ui/src/components/SourceControlPushModal.ee.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/SourceControlPushModal.ee.vue (99%)
 rename packages/{ => frontend}/editor-ui/src/components/SqlEditor/SqlEditor.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/TagsContainer.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/TagsDropdown.vue (99%)
 rename packages/{ => frontend}/editor-ui/src/components/TagsManager/AnnotationTagsManager.ee.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/TagsManager/NoTagsView.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/TagsManager/TagsManager.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/TagsManager/TagsView/TagsTable.vue (99%)
 rename packages/{ => frontend}/editor-ui/src/components/TagsManager/TagsView/TagsTableHeader.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/TagsManager/TagsView/TagsView.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/TagsManager/WorkflowTagsManager.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Telemetry.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Telemetry.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/TemplateCard.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/TemplateDetails.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/TemplateDetailsBlock.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/TemplateFilters.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/TemplateList.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/TemplatesInfoCard.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/TemplatesInfoCard.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/TemplatesInfoCarousel.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/TestDefinition/EditDefinition/BlockArrow.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/TestDefinition/EditDefinition/DescriptionInput.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/TestDefinition/EditDefinition/EvaluationStep.vue (98%)
 rename packages/{ => frontend}/editor-ui/src/components/TestDefinition/EditDefinition/MetricsInput.vue (96%)
 rename packages/{ => frontend}/editor-ui/src/components/TestDefinition/EditDefinition/NodesPinning.vue (99%)
 rename packages/{ => frontend}/editor-ui/src/components/TestDefinition/EditDefinition/TagsInput.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/TestDefinition/EditDefinition/TestNameInput.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/TestDefinition/EditDefinition/WorkflowSelector.vue (98%)
 rename packages/{ => frontend}/editor-ui/src/components/TestDefinition/EditDefinition/sections/ConfigSection.vue (99%)
 rename packages/{ => frontend}/editor-ui/src/components/TestDefinition/EditDefinition/sections/RunsSection.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/TestDefinition/EditDefinition/tests/NodesPinning.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/TestDefinition/ListDefinition/EmptyState.vue (98%)
 rename packages/{ => frontend}/editor-ui/src/components/TestDefinition/ListDefinition/TestItem.vue (97%)
 rename packages/{ => frontend}/editor-ui/src/components/TestDefinition/ListRuns/MetricsChart.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/TestDefinition/ListRuns/TestRunsTable.vue (98%)
 rename packages/{ => frontend}/editor-ui/src/components/TestDefinition/composables/useMetricsChart.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/TestDefinition/composables/useTestDefinitionForm.ts (99%)
 rename packages/{ => frontend}/editor-ui/src/components/TestDefinition/shared/TableCell.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/TestDefinition/shared/TableStatusCell.vue (98%)
 rename packages/{ => frontend}/editor-ui/src/components/TestDefinition/shared/TestTableBase.vue (98%)
 rename packages/{ => frontend}/editor-ui/src/components/TestDefinition/tests/MetricsInput.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/TestDefinition/tests/useMetricsChart.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/TestDefinition/tests/useTestDefinitionForm.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/TestDefinition/types.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/TextEdit.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/TextWithHIghlights.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/TextWithHighlights.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/TimeAgo.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/TitledList.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/TriggerPanel.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/UpdatesPanel.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/VariablesForm.vue (98%)
 rename packages/{ => frontend}/editor-ui/src/components/VariablesUsageBadge.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/VariablesUsageBadge.vue (95%)
 rename packages/{ => frontend}/editor-ui/src/components/VersionCard.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/VirtualSchema.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/VirtualSchema.vue (99%)
 rename packages/{ => frontend}/editor-ui/src/components/VirtualSchemaHeader.vue (98%)
 rename packages/{ => frontend}/editor-ui/src/components/VirtualSchemaItem.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/WarningTooltip.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/WireMeUp.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/WorkerList.ee.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Workers/WorkerAccordion.ee.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Workers/WorkerCard.ee.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Workers/WorkerChartsAccordion.ee.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Workers/WorkerJobAccordion.ee.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/Workers/WorkerNetAccordion.ee.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/WorkflowActivationErrorMessage.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/WorkflowActivator.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/WorkflowActivator.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/WorkflowCard.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/WorkflowCard.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/WorkflowHistory/WorkflowHistoryContent.test.ts (98%)
 rename packages/{ => frontend}/editor-ui/src/components/WorkflowHistory/WorkflowHistoryContent.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/WorkflowHistory/WorkflowHistoryList.test.ts (98%)
 rename packages/{ => frontend}/editor-ui/src/components/WorkflowHistory/WorkflowHistoryList.vue (98%)
 rename packages/{ => frontend}/editor-ui/src/components/WorkflowHistory/WorkflowHistoryListItem.test.ts (98%)
 rename packages/{ => frontend}/editor-ui/src/components/WorkflowHistory/WorkflowHistoryListItem.vue (98%)
 rename packages/{ => frontend}/editor-ui/src/components/WorkflowHistory/WorkflowHistoryVersionRestoreModal.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/WorkflowPreview.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/WorkflowPreview.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/WorkflowSelectorParameterInput/WorkflowSelectorParameterInput.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/WorkflowSelectorParameterInput/useWorkflowResourceLocatorDropdown.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/WorkflowSelectorParameterInput/useWorkflowResourceLocatorModes.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/WorkflowSelectorParameterInput/useWorkflowResourcesLocator.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/WorkflowSettings.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/WorkflowSettings.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/WorkflowShareModal.ee.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/WorkflowTagsContainer.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/WorkflowTagsDropdown.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/__snapshots__/ChangePasswordModal.test.ts.snap (100%)
 rename packages/{ => frontend}/editor-ui/src/components/__snapshots__/InputPanel.test.ts.snap (98%)
 rename packages/{ => frontend}/editor-ui/src/components/__snapshots__/MultipleParameter.test.ts.snap (100%)
 rename packages/{ => frontend}/editor-ui/src/components/__snapshots__/PushConnectionTracker.test.ts.snap (100%)
 rename packages/{ => frontend}/editor-ui/src/components/__snapshots__/RunDataJson.test.ts.snap (100%)
 rename packages/{ => frontend}/editor-ui/src/components/__snapshots__/VirtualSchema.test.ts.snap (100%)
 rename packages/{ => frontend}/editor-ui/src/components/__tests__/utils/ResourceMapper.utils.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/banners/BannerStack.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/banners/BaseBanner.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/banners/EmailConfirmationBanner.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/banners/NonProductionLicenseBanner.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/banners/TrialBanner.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/banners/TrialOverBanner.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/banners/V1Banner.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/banners/V1Banner.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/banners/__snapshots__/V1Banner.test.ts.snap (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/Canvas.test.ts (99%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/Canvas.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/WorkflowCanvas.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/WorkflowCanvas.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/background/CanvasBackground.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/background/CanvasBackground.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/background/CanvasBackgroundStripedPattern.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/background/__snapshots__/CanvasBackground.test.ts.snap (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/buttons/CanvasChatButton.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/buttons/CanvasChatButton.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/buttons/CanvasClearExecutionDataButton.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/buttons/CanvasClearExecutionDataButton.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/buttons/CanvasControlButtons.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/buttons/CanvasControlButtons.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/buttons/CanvasRunWorkflowButton.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/buttons/CanvasRunWorkflowButton.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/buttons/CanvasStopCurrentExecutionButton.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/buttons/CanvasStopCurrentExecutionButton.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/buttons/CanvasStopWaitingForWebhookButton.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/buttons/CanvasStopWaitingForWebhookButton.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasChatButton.test.ts.snap (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasClearExecutionDataButton.test.ts.snap (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasControlButtons.test.ts.snap (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasExecuteWorkflowButton.test.ts.snap (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasRunWorkflowButton.test.ts.snap (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasStopCurrentExecutionButton.test.ts.snap (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasStopWaitingForWebhookButton.test.ts.snap (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/edges/CanvasArrowHeadMarker.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/edges/CanvasConnectionLine.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/edges/CanvasConnectionLine.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/edges/CanvasEdge.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/edges/CanvasEdge.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/edges/CanvasEdgeToolbar.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/edges/CanvasEdgeToolbar.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/edges/utils/getEdgeRenderData.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/edges/utils/index.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/handles/CanvasHandleRenderer.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/handles/CanvasHandleRenderer.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleMainInput.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleMainInput.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleMainOutput.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleMainOutput.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleNonMainInput.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleNonMainInput.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleNonMainOutput.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleNonMainOutput.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandleDiamond.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandleDiamond.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandleDot.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandleDot.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandlePlus.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandlePlus.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandleRectangle.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandleRectangle.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/handles/render-types/parts/__snapshots__/CanvasHandleDiamond.test.ts.snap (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/handles/render-types/parts/__snapshots__/CanvasHandleDot.test.ts.snap (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/handles/render-types/parts/__snapshots__/CanvasHandlePlus.test.ts.snap (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/handles/render-types/parts/__snapshots__/CanvasHandleRectangle.test.ts.snap (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/nodes/CanvasNode.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/nodes/CanvasNode.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/nodes/CanvasNodeRenderer.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/nodes/CanvasNodeRenderer.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/nodes/CanvasNodeToolbar.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/nodes/CanvasNodeToolbar.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeAddNodes.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeDefault.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeDefault.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeStickyNote.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeStickyNote.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/nodes/render-types/__snapshots__/CanvasNodeDefault.test.ts.snap (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/nodes/render-types/__snapshots__/CanvasNodeStickyNote.test.ts.snap (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeDisabledStrikeThrough.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeDisabledStrikeThrough.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeStatusIcons.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeStatusIcons.vue (98%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeTooltip.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeTooltip.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeTrigger.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/nodes/toolbar/CanvasNodeStickyColorSelector.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/canvas/elements/nodes/toolbar/CanvasNodeStickyColorSelector.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/executions/ConcurrentExecutionsHeader.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/executions/ConcurrentExecutionsHeader.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/executions/ExecutionsFilter.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/executions/ExecutionsFilter.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/executions/ExecutionsTime.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/executions/global/GlobalExecutionsList.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/executions/global/GlobalExecutionsList.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/executions/global/GlobalExecutionsListItem.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/executions/global/GlobalExecutionsListItem.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/executions/global/GlobalExecutionsListItemQueuedTooltip.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/executions/global/GlobalExecutionsListItemQueuedTooltip.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/executions/workflow/VoteButtons.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/executions/workflow/WorkflowExecutionAnnotationPanel.ee.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/executions/workflow/WorkflowExecutionsCard.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/executions/workflow/WorkflowExecutionsCard.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/executions/workflow/WorkflowExecutionsInfoAccordion.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/executions/workflow/WorkflowExecutionsLandingPage.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/executions/workflow/WorkflowExecutionsList.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/executions/workflow/WorkflowExecutionsPreview.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/executions/workflow/WorkflowExecutionsPreview.vue (99%)
 rename packages/{ => frontend}/editor-ui/src/components/executions/workflow/WorkflowExecutionsSidebar.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/executions/workflow/WorkflowExecutionsSidebar.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/forms/ResourceFiltersDropdown.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/layouts/PageViewLayout.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/layouts/PageViewLayoutList.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/components/layouts/ResourcesListLayout.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/layouts/ResourcesListLayout.vue (99%)
 rename packages/{ => frontend}/editor-ui/src/components/layouts/index.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/components/transitions/SlideTransition.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/__snapshots__/useBugReporting.test.ts.snap (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/__snapshots__/useCanvasOperations.test.ts.snap (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/__snapshots__/useContextMenu.test.ts.snap (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/__snapshots__/useDebugInfo.test.ts.snap (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useAIAssistantHelpers.test.constants.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useAIAssistantHelpers.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useAIAssistantHelpers.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useActiveNode.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useActiveNode.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useAutocompleteTelemetry.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useAutocompleteTelemetry.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useBeforeUnload.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useBeforeUnload.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useBugReporting.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useBugReporting.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useCanvas.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useCanvasMapping.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useCanvasMapping.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useCanvasNode.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useCanvasNode.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useCanvasNodeHandle.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useCanvasNodeHover.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useCanvasNodeHover.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useCanvasOperations.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useCanvasOperations.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useCanvasTraversal.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useCanvasTraversal.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useClipboard.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useClipboard.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useCodeEditor.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useCodeEditor.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useContextMenu.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useContextMenu.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useDataSchema.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useDataSchema.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useDebounce.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useDebounce.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useDebugInfo.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useDebugInfo.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useDocumentTitle.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useDocumentTitle.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useDocumentVisibility.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useExecutingNode.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useExecutingNode.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useExecutionDebugging.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useExecutionDebugging.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useExecutionHelpers.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useExecutionHelpers.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useExpressionEditor.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useExpressionEditor.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useExternalHooks.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useExternalSecretsProvider.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useGlobalEntityCreation.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useGlobalEntityCreation.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useGlobalLinkActions.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useHistoryHelper.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useHistoryHelper.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useI18n.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useImportCurlCommand.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useImportCurlCommand.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useKeybindings.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useKeybindings.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useLoadingService.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useMessage.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useNodeConnections.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useNodeConnections.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useNodeDirtiness.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useNodeDirtiness.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useNodeHelpers.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useNodeHelpers.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useNodeSpecificationValues.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useNodeType.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useNodeType.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/usePageRedirectionHelper.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/usePageRedirectionHelper.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/usePinnedData.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/usePinnedData.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/usePushConnection.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/usePushConnection.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useResolvedExpression.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useResolvedExpression.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useRunWorkflow.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useRunWorkflow.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useStorage.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useStorage.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useStyles.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useStyles.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useTelemetry.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useToast.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useToast.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useUniqueNodeName.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useUniqueNodeName.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useUserHelpers.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useWorkflowActivate.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useWorkflowHelpers.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/composables/useWorkflowHelpers.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/constants.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/constants.workflows.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/event-bus/code-node-editor.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/event-bus/data-pinning.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/event-bus/global-link-actions.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/event-bus/html-editor.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/event-bus/import-curl.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/event-bus/index.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/event-bus/mfa.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/event-bus/ndv.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/event-bus/node-view.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/event-bus/source-control.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/init.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/init.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/main.ts (94%)
 rename packages/{ => frontend}/editor-ui/src/mixins/workflowHelpers.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/models/history.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/n8n-theme-variables.scss (100%)
 rename packages/{ => frontend}/editor-ui/src/n8n-theme.scss (100%)
 rename packages/{ => frontend}/editor-ui/src/permissions.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/permissions.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/chartjs.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/codemirror/completions/__tests__/mock.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/codemirror/completions/addCompletions.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/codemirror/completions/base.completions.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/codemirror/completions/blank.completions.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/codemirror/completions/bracketAccess.completions.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/codemirror/completions/completions.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/codemirror/completions/constants.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/codemirror/completions/datatype.completions.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/codemirror/completions/dollar.completions.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/codemirror/completions/infoBoxRenderer.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/codemirror/completions/itemField.completions.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/codemirror/completions/itemIndex.completions.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/codemirror/completions/jsonField.completions.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/codemirror/completions/nativesAutocompleteDocs/luxon.instance.docs.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/codemirror/completions/nativesAutocompleteDocs/luxon.static.docs.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/codemirror/completions/nonDollar.completions.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/codemirror/completions/prevNode.completions.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/codemirror/completions/require.completions.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/codemirror/completions/types.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/codemirror/completions/utils.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/codemirror/completions/utils.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/codemirror/completions/variables.completions.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/codemirror/dragAndDrop.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/codemirror/dragAndDrop.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/codemirror/expressionCloseBrackets.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/codemirror/expressionCloseBrackets.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/codemirror/format.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/codemirror/keymap.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/codemirror/multiCursor.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/codemirror/n8nLang.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/codemirror/resolvableHighlighter.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/codemirror/tooltips/InfoBoxTooltip.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/codemirror/tooltips/infoBoxTooltip.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/codemirror/typescript/client/completions.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/codemirror/typescript/client/facet.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/codemirror/typescript/client/hoverTooltip.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/codemirror/typescript/client/linter.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/codemirror/typescript/client/snippets.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/codemirror/typescript/client/useTypescript.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/codemirror/typescript/types.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/codemirror/typescript/worker/cache.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/codemirror/typescript/worker/completions.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/codemirror/typescript/worker/constants.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/codemirror/typescript/worker/dynamicTypes.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/codemirror/typescript/worker/dynamicTypes.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/codemirror/typescript/worker/env.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/codemirror/typescript/worker/hoverTooltip.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/codemirror/typescript/worker/linter.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/codemirror/typescript/worker/npmTypesLoader.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/codemirror/typescript/worker/type-declarations/globals.d.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/codemirror/typescript/worker/type-declarations/n8n-once-for-all-items.d.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/codemirror/typescript/worker/type-declarations/n8n-once-for-each-item.d.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/codemirror/typescript/worker/type-declarations/n8n.d.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/codemirror/typescript/worker/typescript.worker.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/codemirror/typescript/worker/typescriptAst.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/codemirror/typescript/worker/utils.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/components.ts (95%)
 rename packages/{ => frontend}/editor-ui/src/plugins/directives.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/i18n/docs/ADDENDUM.md (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/i18n/docs/README.md (93%)
 rename packages/{ => frontend}/editor-ui/src/plugins/i18n/docs/img/cred.png (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/i18n/docs/img/header1.png (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/i18n/docs/img/header2.png (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/i18n/docs/img/header3.png (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/i18n/docs/img/header4.png (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/i18n/docs/img/header5.png (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/i18n/docs/img/node1.png (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/i18n/docs/img/node2.png (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/i18n/docs/img/node4.png (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/i18n/index.ts (99%)
 rename packages/{ => frontend}/editor-ui/src/plugins/i18n/locales/en.json (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/i18n/utils.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/icons/custom.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/icons/index.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/index.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/sentry.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/sentry.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/telemetry.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/telemetry/index.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/plugins/telemetry/telemetry.types.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/polyfills.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/push-connection/__tests__/mockEventSource.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/push-connection/__tests__/mockWebSocketClient.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/push-connection/__tests__/useEventSourceClient.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/push-connection/__tests__/useHeartbeat.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/push-connection/__tests__/useWebSocketClient.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/push-connection/useEventSourceClient.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/push-connection/useHeartbeat.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/push-connection/useReconnectTimer.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/push-connection/useWebSocketClient.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/router.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/router.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/routes/projects.routes.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/shims-modules.d.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/shims-vue.d.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/shims.d.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/stores/__tests__/utils/cloudStoreUtils.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/stores/__tests__/utils/workflowHistoryTestUtils.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/stores/apiKeys.store.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/stores/assistant.store.test.ts (99%)
 rename packages/{ => frontend}/editor-ui/src/stores/assistant.store.ts (99%)
 rename packages/{ => frontend}/editor-ui/src/stores/auditLogs.store.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/stores/canvas.store.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/stores/cloudPlan.store.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/stores/collaboration.store.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/stores/communityNodes.store.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/stores/credentials.store.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/stores/credentials.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/stores/environments.ee.store.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/stores/environments.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/stores/executions.store.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/stores/executions.store.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/stores/externalSecrets.ee.store.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/stores/history.store.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/stores/logStreaming.store.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/stores/ndv.store.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/stores/nodeCreator.store.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/stores/nodeCreator.store.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/stores/nodeTypes.store.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/stores/npsStore.store.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/stores/npsSurvey.store.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/stores/orchestration.store.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/stores/posthog.store.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/stores/posthog.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/stores/projects.store.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/stores/pushConnection.store.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/stores/pushConnection.store.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/stores/rbac.store.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/stores/rbac.store.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/stores/roles.store.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/stores/roles.store.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/stores/root.store.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/stores/schemaPreview.store.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/stores/settings.store.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/stores/settings.store.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/stores/sourceControl.store.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/stores/sso.store.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/stores/sso.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/stores/tags.store.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/stores/templates.store.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/stores/testDefinition.store.ee.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/stores/testDefinition.store.ee.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/stores/ui.store.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/stores/ui.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/stores/ui.utils.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/stores/usage.store.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/stores/usage.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/stores/users.store.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/stores/users.store.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/stores/versions.store.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/stores/webhooks.store.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/stores/workflowHistory.store.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/stores/workflowHistory.store.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/stores/workflows.ee.store.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/stores/workflows.store.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/stores/workflows.store.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/styles/_animations.scss (100%)
 rename packages/{ => frontend}/editor-ui/src/styles/_global.scss (100%)
 rename packages/{ => frontend}/editor-ui/src/styles/_variables.scss (100%)
 rename packages/{ => frontend}/editor-ui/src/styles/index.scss (100%)
 rename packages/{ => frontend}/editor-ui/src/styles/plugins/_codemirror.scss (100%)
 rename packages/{ => frontend}/editor-ui/src/styles/plugins/_vueflow.scss (100%)
 rename packages/{ => frontend}/editor-ui/src/styles/plugins/index.scss (100%)
 rename packages/{ => frontend}/editor-ui/src/type-utils.d.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/types/assistant.types.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/types/canvas.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/types/completions.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/types/expressions.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/types/externalHooks.ts (99%)
 rename packages/{ => frontend}/editor-ui/src/types/index.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/types/projects.types.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/types/pushConnection.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/types/rbac.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/types/roles.types.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/types/router.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/types/sourceControl.types.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/types/workflowHistory.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/apiUtils.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/apiUtils.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/canvasUtils.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/canvasUtils.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/credentialOnlyNodes.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/easyAiWorkflowUtils.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/easyAiWorkflowUtils.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/eventUtils.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/executionUtils.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/executionUtils.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/expressions.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/expressions.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/forceParse.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/formatters/dateFormatter.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/formatters/listFormatter.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/fromAIOverrideUtils.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/fromAIOverrideUtils.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/htmlUtils.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/htmlUtils.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/injectStrict.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/injectStrict.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/mappingUtils.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/mappingUtils.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/nodeSettingsUtils.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/nodeSettingsUtils.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/nodeTypeUtils.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/nodeTypes/nodeTypeTransforms.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/nodeTypesUtils.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/nodeViewUtils.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/nodeViewUtils.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/nodes/nodeTransforms.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/objectUtils.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/objectUtils.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/pairedItemUtils.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/pairedItemUtils.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/projects.utils.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/projects.utils.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/rbac/checks/hasRole.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/rbac/checks/hasRole.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/rbac/checks/hasScope.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/rbac/checks/hasScope.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/rbac/checks/index.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/rbac/checks/isAuthenticated.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/rbac/checks/isAuthenticated.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/rbac/checks/isDefaultUser.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/rbac/checks/isDefaultUser.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/rbac/checks/isEnterpriseFeatureEnabled.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/rbac/checks/isEnterpriseFeatureEnabled.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/rbac/checks/isGuest.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/rbac/checks/isGuest.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/rbac/checks/isInstanceOwner.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/rbac/checks/isInstanceOwner.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/rbac/checks/isValid.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/rbac/checks/isValid.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/rbac/middleware.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/rbac/middleware/authenticated.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/rbac/middleware/authenticated.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/rbac/middleware/custom.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/rbac/middleware/custom.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/rbac/middleware/defaultUser.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/rbac/middleware/defaultUser.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/rbac/middleware/enterprise.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/rbac/middleware/enterprise.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/rbac/middleware/guest.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/rbac/middleware/guest.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/rbac/middleware/rbac.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/rbac/middleware/rbac.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/rbac/middleware/role.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/rbac/middleware/role.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/rbac/permissions.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/rbac/permissions.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/rbacUtils.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/rbacUtils.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/sourceControlUtils.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/sourceControlUtils.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/telemetryUtils.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/templates/templateActions.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/templates/templateActions.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/templates/templateTransforms.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/templates/templateTransforms.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/templates/templateTypes.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/templates/typeGuards.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/testData/nodeTypeTestData.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/typeGuards.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/typeHelpers.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/typesUtils.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/typesUtils.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/userUtils.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/utils/workerUtils.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/views/AuthView.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/views/AuthView.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/views/CanvasAddButton.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/views/ChangePasswordView.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/views/CredentialsView.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/views/CredentialsView.vue (99%)
 rename packages/{ => frontend}/editor-ui/src/views/ErrorView.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/views/ExecutionsView.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/views/ForgotMyPasswordView.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/views/ForgotMyPasswordView.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/views/LoadingView.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/views/MfaView.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/views/NodeView.vue (99%)
 rename packages/{ => frontend}/editor-ui/src/views/ProjectSettings.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/views/ProjectSettings.vue (99%)
 rename packages/{ => frontend}/editor-ui/src/views/SamlOnboarding.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/views/SamlOnboarding.vue (96%)
 rename packages/{ => frontend}/editor-ui/src/views/SettingsApiView.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/views/SettingsApiView.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/views/SettingsCommunityNodesView.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/views/SettingsExternalSecrets.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/views/SettingsExternalSecrets.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/views/SettingsLdapView.vue (99%)
 rename packages/{ => frontend}/editor-ui/src/views/SettingsLogStreamingView.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/views/SettingsPersonalView.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/views/SettingsPersonalView.vue (99%)
 rename packages/{ => frontend}/editor-ui/src/views/SettingsSourceControl.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/views/SettingsSourceControl.vue (99%)
 rename packages/{ => frontend}/editor-ui/src/views/SettingsSso.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/views/SettingsSso.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/views/SettingsUsageAndPlan.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/views/SettingsUsageAndPlan.vue (99%)
 rename packages/{ => frontend}/editor-ui/src/views/SettingsUsersView.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/views/SettingsUsersView.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/views/SettingsView.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/views/SettingsView.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/views/SetupView.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/views/SetupWorkflowFromTemplateView/AppsRequiringCredsNotice.vue (93%)
 rename packages/{ => frontend}/editor-ui/src/views/SetupWorkflowFromTemplateView/IconSuccess.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/views/SetupWorkflowFromTemplateView/SetupTemplateFormStep.vue (98%)
 rename packages/{ => frontend}/editor-ui/src/views/SetupWorkflowFromTemplateView/SetupWorkflowFromTemplateView.vue (97%)
 rename packages/{ => frontend}/editor-ui/src/views/SetupWorkflowFromTemplateView/__tests__/setupTemplate.store.testData.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/views/SetupWorkflowFromTemplateView/setupTemplate.store.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/views/SetupWorkflowFromTemplateView/setupTemplate.store.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/views/SetupWorkflowFromTemplateView/useCredentialSetupState.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/views/SetupWorkflowFromTemplateView/useCredentialSetupState.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/views/SigninView.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/views/SigninView.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/views/SignoutView.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/views/SignupView.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/views/SignupView.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/views/TemplatesCollectionView.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/views/TemplatesSearchView.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/views/TemplatesView.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/views/TemplatesWorkflowView.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/views/TestDefinition/TestDefinitionEditView.vue (99%)
 rename packages/{ => frontend}/editor-ui/src/views/TestDefinition/TestDefinitionListView.vue (99%)
 rename packages/{ => frontend}/editor-ui/src/views/TestDefinition/TestDefinitionNewView.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/views/TestDefinition/TestDefinitionRootView.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/views/TestDefinition/TestDefinitionRunDetailView.vue (99%)
 rename packages/{ => frontend}/editor-ui/src/views/TestDefinition/tests/TestDefinitionEditView.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/views/TestDefinition/tests/TestDefinitionListView.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/views/TestDefinition/tests/TestDefinitionRootView.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/views/VariablesView.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/views/VariablesView.vue (99%)
 rename packages/{ => frontend}/editor-ui/src/views/WorkerView.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/views/WorkflowExecutionsView.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/views/WorkflowHistory.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/views/WorkflowHistory.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/views/WorkflowOnboardingView.vue (100%)
 rename packages/{ => frontend}/editor-ui/src/views/WorkflowsView.test.ts (100%)
 rename packages/{ => frontend}/editor-ui/src/views/WorkflowsView.vue (99%)
 rename packages/{ => frontend}/editor-ui/src/vue-virtual-scroller.d.ts (100%)
 rename packages/{ => frontend}/editor-ui/tailwind.config.js (100%)
 rename packages/{ => frontend}/editor-ui/tests/e2e/.eslintrc.js (100%)
 rename packages/{ => frontend}/editor-ui/tsconfig.json (51%)
 rename packages/{ => frontend}/editor-ui/vite.config.mts (84%)

diff --git a/.github/scripts/trim-fe-packageJson.js b/.github/scripts/trim-fe-packageJson.js
index b331f37e5f..50f456d2a9 100644
--- a/.github/scripts/trim-fe-packageJson.js
+++ b/.github/scripts/trim-fe-packageJson.js
@@ -14,5 +14,5 @@ const trimPackageJson = (packageName) => {
 };
 
 trimPackageJson('frontend/@n8n/chat');
-trimPackageJson('design-system');
-trimPackageJson('editor-ui');
+trimPackageJson('frontend/@n8n/design-system');
+trimPackageJson('frontend/editor-ui');
diff --git a/.github/workflows/release-publish.yml b/.github/workflows/release-publish.yml
index 62a17fb927..c38f038105 100644
--- a/.github/workflows/release-publish.yml
+++ b/.github/workflows/release-publish.yml
@@ -162,7 +162,7 @@ jobs:
         with:
           projects: ${{ secrets.SENTRY_FRONTEND_PROJECT }}
           version: ${{ needs.publish-to-npm.outputs.release }}
-          sourcemaps: packages/editor-ui/dist
+          sourcemaps: packages/frontend/editor-ui/dist
 
       - name: Create a backend release
         uses: getsentry/action-release@v1.7.0
diff --git a/.prettierignore b/.prettierignore
index 192edfec2d..d34c856f88 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -2,7 +2,7 @@ coverage
 dist
 package.json
 pnpm-lock.yaml
-packages/editor-ui/index.html
+packages/frontend/editor-ui/index.html
 packages/nodes-base/nodes/**/test
 packages/cli/templates/form-trigger.handlebars
 packages/cli/templates/form-trigger-completion.handlebars
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 5e495fda9c..ef062a12a0 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -49,8 +49,8 @@ The most important directories:
   execution, active webhooks and
   workflows. **Contact n8n before
   starting on any changes here**
-- [/packages/design-system](/packages/design-system) - Vue frontend components
-- [/packages/editor-ui](/packages/editor-ui) - Vue frontend workflow editor
+- [/packages/frontend/@n8n/design-system](/packages/design-system) - Vue frontend components
+- [/packages/frontend/editor-ui](/packages/editor-ui) - Vue frontend workflow editor
 - [/packages/node-dev](/packages/node-dev) - CLI to create new n8n-nodes
 - [/packages/nodes-base](/packages/nodes-base) - Base n8n nodes
 - [/packages/workflow](/packages/workflow) - Workflow code with interfaces which
diff --git a/codecov.yml b/codecov.yml
index 3afef4c8a2..1d61749328 100644
--- a/codecov.yml
+++ b/codecov.yml
@@ -43,8 +43,6 @@ component_management:
       name: Frontend
       paths:
         - packages/@n8n/codemirror-lang/**
-        - packages/design-system/**
-        - packages/editor-ui/**
         - packages/frontend/**
     - component_id: nodes_packages
       name: Nodes
diff --git a/docker/images/n8n/Dockerfile b/docker/images/n8n/Dockerfile
index 8edff951d4..e81732dda2 100644
--- a/docker/images/n8n/Dockerfile
+++ b/docker/images/n8n/Dockerfile
@@ -20,7 +20,7 @@ RUN set -eux; \
 	npm install -g --omit=dev n8n@${N8N_VERSION} --ignore-scripts && \
 	npm rebuild --prefix=/usr/local/lib/node_modules/n8n sqlite3 && \
 	rm -rf /usr/local/lib/node_modules/n8n/node_modules/@n8n/chat && \
-	rm -rf /usr/local/lib/node_modules/n8n/node_modules/n8n-design-system && \
+	rm -rf /usr/local/lib/node_modules/n8n/node_modules/@n8n/design-system && \
 	rm -rf /usr/local/lib/node_modules/n8n/node_modules/n8n-editor-ui/node_modules && \
 	find /usr/local/lib/node_modules/n8n -type f -name "*.ts" -o -name "*.js.map" -o -name "*.vue" | xargs rm -f && \
 	rm -rf /root/.npm
diff --git a/package.json b/package.json
index 0c4e802a40..cf9e4cb9ea 100644
--- a/package.json
+++ b/package.json
@@ -15,10 +15,10 @@
     "build:frontend": "turbo run build:frontend",
     "build:nodes": "turbo run build:nodes",
     "typecheck": "turbo typecheck",
-    "dev": "turbo run dev --parallel --env-mode=loose --filter=!n8n-design-system --filter=!@n8n/chat --filter=!@n8n/task-runner",
-    "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": "turbo run dev --parallel --env-mode=loose --filter=!@n8n/design-system --filter=!@n8n/chat --filter=!@n8n/task-runner",
+    "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": "run-p start \"dev:fe:editor --filter=@n8n/design-system\"",
     "dev:fe:editor": "turbo run dev --parallel --env-mode=loose --filter=n8n-editor-ui",
     "dev:e2e": "cd cypress && pnpm run test:e2e:dev",
     "dev:e2e:v1": "cd cypress && pnpm run test:e2e:dev:v1",
diff --git a/packages/@n8n/eslint-config/local-rules.js b/packages/@n8n/eslint-config/local-rules.js
index d32d72f89c..7d169a7192 100644
--- a/packages/@n8n/eslint-config/local-rules.js
+++ b/packages/@n8n/eslint-config/local-rules.js
@@ -320,7 +320,7 @@ module.exports = {
 			const LOCALE_NAMESPACE = '$locale';
 			const LOCALE_FILEPATH = cwd.endsWith('editor-ui')
 				? path.join(cwd, locale)
-				: path.join(cwd, 'packages/editor-ui', locale);
+				: path.join(cwd, 'packages/frontend/editor-ui', locale);
 
 			let LOCALE_MAP;
 
diff --git a/packages/design-system/biome.jsonc b/packages/design-system/biome.jsonc
deleted file mode 100644
index 2c06b58894..0000000000
--- a/packages/design-system/biome.jsonc
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"$schema": "../../node_modules/@biomejs/biome/configuration_schema.json",
-	"extends": ["../../biome.jsonc"],
-	"formatter": {
-		"ignore": ["theme/**"]
-	}
-}
diff --git a/packages/design-system/.browserslistrc b/packages/frontend/@n8n/design-system/.browserslistrc
similarity index 100%
rename from packages/design-system/.browserslistrc
rename to packages/frontend/@n8n/design-system/.browserslistrc
diff --git a/packages/design-system/.eslintrc.js b/packages/frontend/@n8n/design-system/.eslintrc.js
similarity index 100%
rename from packages/design-system/.eslintrc.js
rename to packages/frontend/@n8n/design-system/.eslintrc.js
diff --git a/packages/design-system/.gitignore b/packages/frontend/@n8n/design-system/.gitignore
similarity index 100%
rename from packages/design-system/.gitignore
rename to packages/frontend/@n8n/design-system/.gitignore
diff --git a/packages/design-system/.npmignore b/packages/frontend/@n8n/design-system/.npmignore
similarity index 100%
rename from packages/design-system/.npmignore
rename to packages/frontend/@n8n/design-system/.npmignore
diff --git a/packages/design-system/.storybook/fonts.scss b/packages/frontend/@n8n/design-system/.storybook/fonts.scss
similarity index 100%
rename from packages/design-system/.storybook/fonts.scss
rename to packages/frontend/@n8n/design-system/.storybook/fonts.scss
diff --git a/packages/design-system/.storybook/main.ts b/packages/frontend/@n8n/design-system/.storybook/main.ts
similarity index 100%
rename from packages/design-system/.storybook/main.ts
rename to packages/frontend/@n8n/design-system/.storybook/main.ts
diff --git a/packages/design-system/.storybook/preview.js b/packages/frontend/@n8n/design-system/.storybook/preview.js
similarity index 100%
rename from packages/design-system/.storybook/preview.js
rename to packages/frontend/@n8n/design-system/.storybook/preview.js
diff --git a/packages/design-system/.storybook/storybook.scss b/packages/frontend/@n8n/design-system/.storybook/storybook.scss
similarity index 100%
rename from packages/design-system/.storybook/storybook.scss
rename to packages/frontend/@n8n/design-system/.storybook/storybook.scss
diff --git a/packages/design-system/README.md b/packages/frontend/@n8n/design-system/README.md
similarity index 97%
rename from packages/design-system/README.md
rename to packages/frontend/@n8n/design-system/README.md
index c43317d077..03b49fd4db 100644
--- a/packages/design-system/README.md
+++ b/packages/frontend/@n8n/design-system/README.md
@@ -1,6 +1,6 @@
 ![n8n.io - Workflow Automation](https://user-images.githubusercontent.com/65276001/173571060-9f2f6d7b-bac0-43b6-bdb2-001da9694058.png)
 
-# n8n-design-system
+# @n8n/design-system
 
 A component system for [n8n](https://n8n.io) using Storybook to preview.
 
diff --git a/packages/frontend/@n8n/design-system/biome.jsonc b/packages/frontend/@n8n/design-system/biome.jsonc
new file mode 100644
index 0000000000..10254c3c13
--- /dev/null
+++ b/packages/frontend/@n8n/design-system/biome.jsonc
@@ -0,0 +1,7 @@
+{
+	"$schema": "../../../../node_modules/@biomejs/biome/configuration_schema.json",
+	"extends": ["../../../../biome.jsonc"],
+	"formatter": {
+		"ignore": ["theme/**"]
+	}
+}
diff --git a/packages/design-system/chromatic.config.json b/packages/frontend/@n8n/design-system/chromatic.config.json
similarity index 100%
rename from packages/design-system/chromatic.config.json
rename to packages/frontend/@n8n/design-system/chromatic.config.json
diff --git a/packages/design-system/package.json b/packages/frontend/@n8n/design-system/package.json
similarity index 95%
rename from packages/design-system/package.json
rename to packages/frontend/@n8n/design-system/package.json
index fab4c8f986..5189f53216 100644
--- a/packages/design-system/package.json
+++ b/packages/frontend/@n8n/design-system/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "n8n-design-system",
+  "name": "@n8n/design-system",
   "version": "1.69.0",
   "main": "src/index.ts",
   "import": "src/index.ts",
@@ -13,8 +13,8 @@
     "build:storybook": "storybook build",
     "storybook": "storybook dev -p 6006 --no-open",
     "chromatic": "chromatic",
-    "format": "biome format --write .  && prettier --write . --ignore-path ../../.prettierignore",
-    "format:check": "biome ci .  && prettier --check . --ignore-path ../../.prettierignore",
+    "format": "biome format --write .  && prettier --write . --ignore-path ../../../../.prettierignore",
+    "format:check": "biome ci .  && prettier --check . --ignore-path ../../../../.prettierignore",
     "lint": "eslint src --ext .js,.ts,.vue --quiet",
     "lintfix": "eslint src --ext .js,.ts,.vue --fix"
   },
diff --git a/packages/design-system/postcss.config.js b/packages/frontend/@n8n/design-system/postcss.config.js
similarity index 100%
rename from packages/design-system/postcss.config.js
rename to packages/frontend/@n8n/design-system/postcss.config.js
diff --git a/packages/design-system/public/.nojekyll b/packages/frontend/@n8n/design-system/public/.nojekyll
similarity index 100%
rename from packages/design-system/public/.nojekyll
rename to packages/frontend/@n8n/design-system/public/.nojekyll
diff --git a/packages/design-system/public/assets/images/storybook-logo-dark.png b/packages/frontend/@n8n/design-system/public/assets/images/storybook-logo-dark.png
similarity index 100%
rename from packages/design-system/public/assets/images/storybook-logo-dark.png
rename to packages/frontend/@n8n/design-system/public/assets/images/storybook-logo-dark.png
diff --git a/packages/design-system/public/assets/images/storybook-logo-light.png b/packages/frontend/@n8n/design-system/public/assets/images/storybook-logo-light.png
similarity index 100%
rename from packages/design-system/public/assets/images/storybook-logo-light.png
rename to packages/frontend/@n8n/design-system/public/assets/images/storybook-logo-light.png
diff --git a/packages/design-system/src/__tests__/render.ts b/packages/frontend/@n8n/design-system/src/__tests__/render.ts
similarity index 90%
rename from packages/design-system/src/__tests__/render.ts
rename to packages/frontend/@n8n/design-system/src/__tests__/render.ts
index afe27e6855..1dc03ed2ef 100644
--- a/packages/design-system/src/__tests__/render.ts
+++ b/packages/frontend/@n8n/design-system/src/__tests__/render.ts
@@ -1,6 +1,6 @@
 import { render } from '@testing-library/vue';
 
-import { N8nPlugin } from 'n8n-design-system/plugin';
+import { N8nPlugin } from '@n8n/design-system/plugin';
 
 type Component = Parameters<typeof render>[0];
 type RenderOptions = Parameters<typeof render>[1];
diff --git a/packages/design-system/src/__tests__/setup.ts b/packages/frontend/@n8n/design-system/src/__tests__/setup.ts
similarity index 89%
rename from packages/design-system/src/__tests__/setup.ts
rename to packages/frontend/@n8n/design-system/src/__tests__/setup.ts
index 5c091e2925..20c4db3cb1 100644
--- a/packages/design-system/src/__tests__/setup.ts
+++ b/packages/frontend/@n8n/design-system/src/__tests__/setup.ts
@@ -2,7 +2,7 @@ import '@testing-library/jest-dom';
 import { configure } from '@testing-library/vue';
 import { config } from '@vue/test-utils';
 
-import { N8nPlugin } from 'n8n-design-system/plugin';
+import { N8nPlugin } from '@n8n/design-system/plugin';
 
 configure({ testIdAttribute: 'data-test-id' });
 
diff --git a/packages/design-system/src/components/AskAssistantAvatar/AskAssistantAvatar.test.ts b/packages/frontend/@n8n/design-system/src/components/AskAssistantAvatar/AskAssistantAvatar.test.ts
similarity index 100%
rename from packages/design-system/src/components/AskAssistantAvatar/AskAssistantAvatar.test.ts
rename to packages/frontend/@n8n/design-system/src/components/AskAssistantAvatar/AskAssistantAvatar.test.ts
diff --git a/packages/design-system/src/components/AskAssistantAvatar/AssistantAvatar.stories.ts b/packages/frontend/@n8n/design-system/src/components/AskAssistantAvatar/AssistantAvatar.stories.ts
similarity index 100%
rename from packages/design-system/src/components/AskAssistantAvatar/AssistantAvatar.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/AskAssistantAvatar/AssistantAvatar.stories.ts
diff --git a/packages/design-system/src/components/AskAssistantAvatar/AssistantAvatar.vue b/packages/frontend/@n8n/design-system/src/components/AskAssistantAvatar/AssistantAvatar.vue
similarity index 100%
rename from packages/design-system/src/components/AskAssistantAvatar/AssistantAvatar.vue
rename to packages/frontend/@n8n/design-system/src/components/AskAssistantAvatar/AssistantAvatar.vue
diff --git a/packages/design-system/src/components/AskAssistantAvatar/__snapshots__/AskAssistantAvatar.test.ts.snap b/packages/frontend/@n8n/design-system/src/components/AskAssistantAvatar/__snapshots__/AskAssistantAvatar.test.ts.snap
similarity index 100%
rename from packages/design-system/src/components/AskAssistantAvatar/__snapshots__/AskAssistantAvatar.test.ts.snap
rename to packages/frontend/@n8n/design-system/src/components/AskAssistantAvatar/__snapshots__/AskAssistantAvatar.test.ts.snap
diff --git a/packages/design-system/src/components/AskAssistantButton/AskAssistantButton.stories.ts b/packages/frontend/@n8n/design-system/src/components/AskAssistantButton/AskAssistantButton.stories.ts
similarity index 100%
rename from packages/design-system/src/components/AskAssistantButton/AskAssistantButton.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/AskAssistantButton/AskAssistantButton.stories.ts
diff --git a/packages/design-system/src/components/AskAssistantButton/AskAssistantButton.test.ts b/packages/frontend/@n8n/design-system/src/components/AskAssistantButton/AskAssistantButton.test.ts
similarity index 100%
rename from packages/design-system/src/components/AskAssistantButton/AskAssistantButton.test.ts
rename to packages/frontend/@n8n/design-system/src/components/AskAssistantButton/AskAssistantButton.test.ts
diff --git a/packages/design-system/src/components/AskAssistantButton/AskAssistantButton.vue b/packages/frontend/@n8n/design-system/src/components/AskAssistantButton/AskAssistantButton.vue
similarity index 100%
rename from packages/design-system/src/components/AskAssistantButton/AskAssistantButton.vue
rename to packages/frontend/@n8n/design-system/src/components/AskAssistantButton/AskAssistantButton.vue
diff --git a/packages/design-system/src/components/AskAssistantButton/__snapshots__/AskAssistantButton.test.ts.snap b/packages/frontend/@n8n/design-system/src/components/AskAssistantButton/__snapshots__/AskAssistantButton.test.ts.snap
similarity index 100%
rename from packages/design-system/src/components/AskAssistantButton/__snapshots__/AskAssistantButton.test.ts.snap
rename to packages/frontend/@n8n/design-system/src/components/AskAssistantButton/__snapshots__/AskAssistantButton.test.ts.snap
diff --git a/packages/design-system/src/components/AskAssistantChat/AskAssistantChat.stories.ts b/packages/frontend/@n8n/design-system/src/components/AskAssistantChat/AskAssistantChat.stories.ts
similarity index 100%
rename from packages/design-system/src/components/AskAssistantChat/AskAssistantChat.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/AskAssistantChat/AskAssistantChat.stories.ts
diff --git a/packages/design-system/src/components/AskAssistantChat/AskAssistantChat.test.ts b/packages/frontend/@n8n/design-system/src/components/AskAssistantChat/AskAssistantChat.test.ts
similarity index 99%
rename from packages/design-system/src/components/AskAssistantChat/AskAssistantChat.test.ts
rename to packages/frontend/@n8n/design-system/src/components/AskAssistantChat/AskAssistantChat.test.ts
index 9874965e82..77e76646b7 100644
--- a/packages/design-system/src/components/AskAssistantChat/AskAssistantChat.test.ts
+++ b/packages/frontend/@n8n/design-system/src/components/AskAssistantChat/AskAssistantChat.test.ts
@@ -1,6 +1,6 @@
 import { render } from '@testing-library/vue';
 
-import { n8nHtml } from 'n8n-design-system/directives';
+import { n8nHtml } from '@n8n/design-system/directives';
 
 import AskAssistantChat from './AskAssistantChat.vue';
 
diff --git a/packages/design-system/src/components/AskAssistantChat/AskAssistantChat.vue b/packages/frontend/@n8n/design-system/src/components/AskAssistantChat/AskAssistantChat.vue
similarity index 100%
rename from packages/design-system/src/components/AskAssistantChat/AskAssistantChat.vue
rename to packages/frontend/@n8n/design-system/src/components/AskAssistantChat/AskAssistantChat.vue
diff --git a/packages/design-system/src/components/AskAssistantChat/__snapshots__/AskAssistantChat.test.ts.snap b/packages/frontend/@n8n/design-system/src/components/AskAssistantChat/__snapshots__/AskAssistantChat.test.ts.snap
similarity index 100%
rename from packages/design-system/src/components/AskAssistantChat/__snapshots__/AskAssistantChat.test.ts.snap
rename to packages/frontend/@n8n/design-system/src/components/AskAssistantChat/__snapshots__/AskAssistantChat.test.ts.snap
diff --git a/packages/design-system/src/components/AskAssistantIcon/AssistantIcon.stories.ts b/packages/frontend/@n8n/design-system/src/components/AskAssistantIcon/AssistantIcon.stories.ts
similarity index 100%
rename from packages/design-system/src/components/AskAssistantIcon/AssistantIcon.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/AskAssistantIcon/AssistantIcon.stories.ts
diff --git a/packages/design-system/src/components/AskAssistantIcon/AssistantIcon.test.ts b/packages/frontend/@n8n/design-system/src/components/AskAssistantIcon/AssistantIcon.test.ts
similarity index 100%
rename from packages/design-system/src/components/AskAssistantIcon/AssistantIcon.test.ts
rename to packages/frontend/@n8n/design-system/src/components/AskAssistantIcon/AssistantIcon.test.ts
diff --git a/packages/design-system/src/components/AskAssistantIcon/AssistantIcon.vue b/packages/frontend/@n8n/design-system/src/components/AskAssistantIcon/AssistantIcon.vue
similarity index 100%
rename from packages/design-system/src/components/AskAssistantIcon/AssistantIcon.vue
rename to packages/frontend/@n8n/design-system/src/components/AskAssistantIcon/AssistantIcon.vue
diff --git a/packages/design-system/src/components/AskAssistantIcon/__snapshots__/AssistantIcon.test.ts.snap b/packages/frontend/@n8n/design-system/src/components/AskAssistantIcon/__snapshots__/AssistantIcon.test.ts.snap
similarity index 100%
rename from packages/design-system/src/components/AskAssistantIcon/__snapshots__/AssistantIcon.test.ts.snap
rename to packages/frontend/@n8n/design-system/src/components/AskAssistantIcon/__snapshots__/AssistantIcon.test.ts.snap
diff --git a/packages/design-system/src/components/AskAssistantLoadingMessage/AskAssistantLoadingMessage.test.ts b/packages/frontend/@n8n/design-system/src/components/AskAssistantLoadingMessage/AskAssistantLoadingMessage.test.ts
similarity index 100%
rename from packages/design-system/src/components/AskAssistantLoadingMessage/AskAssistantLoadingMessage.test.ts
rename to packages/frontend/@n8n/design-system/src/components/AskAssistantLoadingMessage/AskAssistantLoadingMessage.test.ts
diff --git a/packages/design-system/src/components/AskAssistantLoadingMessage/AssistantLoadingMessage.stories.ts b/packages/frontend/@n8n/design-system/src/components/AskAssistantLoadingMessage/AssistantLoadingMessage.stories.ts
similarity index 100%
rename from packages/design-system/src/components/AskAssistantLoadingMessage/AssistantLoadingMessage.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/AskAssistantLoadingMessage/AssistantLoadingMessage.stories.ts
diff --git a/packages/design-system/src/components/AskAssistantLoadingMessage/AssistantLoadingMessage.vue b/packages/frontend/@n8n/design-system/src/components/AskAssistantLoadingMessage/AssistantLoadingMessage.vue
similarity index 100%
rename from packages/design-system/src/components/AskAssistantLoadingMessage/AssistantLoadingMessage.vue
rename to packages/frontend/@n8n/design-system/src/components/AskAssistantLoadingMessage/AssistantLoadingMessage.vue
diff --git a/packages/design-system/src/components/AskAssistantLoadingMessage/DemoComponent.stories.ts b/packages/frontend/@n8n/design-system/src/components/AskAssistantLoadingMessage/DemoComponent.stories.ts
similarity index 100%
rename from packages/design-system/src/components/AskAssistantLoadingMessage/DemoComponent.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/AskAssistantLoadingMessage/DemoComponent.stories.ts
diff --git a/packages/design-system/src/components/AskAssistantLoadingMessage/DemoComponent.vue b/packages/frontend/@n8n/design-system/src/components/AskAssistantLoadingMessage/DemoComponent.vue
similarity index 100%
rename from packages/design-system/src/components/AskAssistantLoadingMessage/DemoComponent.vue
rename to packages/frontend/@n8n/design-system/src/components/AskAssistantLoadingMessage/DemoComponent.vue
diff --git a/packages/design-system/src/components/AskAssistantLoadingMessage/__snapshots__/AskAssistantLoadingMessage.test.ts.snap b/packages/frontend/@n8n/design-system/src/components/AskAssistantLoadingMessage/__snapshots__/AskAssistantLoadingMessage.test.ts.snap
similarity index 100%
rename from packages/design-system/src/components/AskAssistantLoadingMessage/__snapshots__/AskAssistantLoadingMessage.test.ts.snap
rename to packages/frontend/@n8n/design-system/src/components/AskAssistantLoadingMessage/__snapshots__/AskAssistantLoadingMessage.test.ts.snap
diff --git a/packages/design-system/src/components/AskAssistantText/AssistantText.stories.ts b/packages/frontend/@n8n/design-system/src/components/AskAssistantText/AssistantText.stories.ts
similarity index 100%
rename from packages/design-system/src/components/AskAssistantText/AssistantText.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/AskAssistantText/AssistantText.stories.ts
diff --git a/packages/design-system/src/components/AskAssistantText/AssistantText.test.ts b/packages/frontend/@n8n/design-system/src/components/AskAssistantText/AssistantText.test.ts
similarity index 100%
rename from packages/design-system/src/components/AskAssistantText/AssistantText.test.ts
rename to packages/frontend/@n8n/design-system/src/components/AskAssistantText/AssistantText.test.ts
diff --git a/packages/design-system/src/components/AskAssistantText/AssistantText.vue b/packages/frontend/@n8n/design-system/src/components/AskAssistantText/AssistantText.vue
similarity index 100%
rename from packages/design-system/src/components/AskAssistantText/AssistantText.vue
rename to packages/frontend/@n8n/design-system/src/components/AskAssistantText/AssistantText.vue
diff --git a/packages/design-system/src/components/AskAssistantText/__snapshots__/AssistantText.test.ts.snap b/packages/frontend/@n8n/design-system/src/components/AskAssistantText/__snapshots__/AssistantText.test.ts.snap
similarity index 100%
rename from packages/design-system/src/components/AskAssistantText/__snapshots__/AssistantText.test.ts.snap
rename to packages/frontend/@n8n/design-system/src/components/AskAssistantText/__snapshots__/AssistantText.test.ts.snap
diff --git a/packages/design-system/src/components/BetaTag/BetaTag.stories.ts b/packages/frontend/@n8n/design-system/src/components/BetaTag/BetaTag.stories.ts
similarity index 100%
rename from packages/design-system/src/components/BetaTag/BetaTag.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/BetaTag/BetaTag.stories.ts
diff --git a/packages/design-system/src/components/BetaTag/BetaTag.test.ts b/packages/frontend/@n8n/design-system/src/components/BetaTag/BetaTag.test.ts
similarity index 100%
rename from packages/design-system/src/components/BetaTag/BetaTag.test.ts
rename to packages/frontend/@n8n/design-system/src/components/BetaTag/BetaTag.test.ts
diff --git a/packages/design-system/src/components/BetaTag/BetaTag.vue b/packages/frontend/@n8n/design-system/src/components/BetaTag/BetaTag.vue
similarity index 100%
rename from packages/design-system/src/components/BetaTag/BetaTag.vue
rename to packages/frontend/@n8n/design-system/src/components/BetaTag/BetaTag.vue
diff --git a/packages/design-system/src/components/BetaTag/__snapshots__/BetaTag.test.ts.snap b/packages/frontend/@n8n/design-system/src/components/BetaTag/__snapshots__/BetaTag.test.ts.snap
similarity index 100%
rename from packages/design-system/src/components/BetaTag/__snapshots__/BetaTag.test.ts.snap
rename to packages/frontend/@n8n/design-system/src/components/BetaTag/__snapshots__/BetaTag.test.ts.snap
diff --git a/packages/design-system/src/components/BlinkingCursor/BlinkingCursor.stories.ts b/packages/frontend/@n8n/design-system/src/components/BlinkingCursor/BlinkingCursor.stories.ts
similarity index 100%
rename from packages/design-system/src/components/BlinkingCursor/BlinkingCursor.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/BlinkingCursor/BlinkingCursor.stories.ts
diff --git a/packages/design-system/src/components/BlinkingCursor/BlinkingCursor.test.ts b/packages/frontend/@n8n/design-system/src/components/BlinkingCursor/BlinkingCursor.test.ts
similarity index 100%
rename from packages/design-system/src/components/BlinkingCursor/BlinkingCursor.test.ts
rename to packages/frontend/@n8n/design-system/src/components/BlinkingCursor/BlinkingCursor.test.ts
diff --git a/packages/design-system/src/components/BlinkingCursor/BlinkingCursor.vue b/packages/frontend/@n8n/design-system/src/components/BlinkingCursor/BlinkingCursor.vue
similarity index 100%
rename from packages/design-system/src/components/BlinkingCursor/BlinkingCursor.vue
rename to packages/frontend/@n8n/design-system/src/components/BlinkingCursor/BlinkingCursor.vue
diff --git a/packages/design-system/src/components/BlinkingCursor/__snapshots__/BlinkingCursor.test.ts.snap b/packages/frontend/@n8n/design-system/src/components/BlinkingCursor/__snapshots__/BlinkingCursor.test.ts.snap
similarity index 100%
rename from packages/design-system/src/components/BlinkingCursor/__snapshots__/BlinkingCursor.test.ts.snap
rename to packages/frontend/@n8n/design-system/src/components/BlinkingCursor/__snapshots__/BlinkingCursor.test.ts.snap
diff --git a/packages/design-system/src/components/CodeDiff/CodeDiff.stories.ts b/packages/frontend/@n8n/design-system/src/components/CodeDiff/CodeDiff.stories.ts
similarity index 100%
rename from packages/design-system/src/components/CodeDiff/CodeDiff.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/CodeDiff/CodeDiff.stories.ts
diff --git a/packages/design-system/src/components/CodeDiff/CodeDiff.test.ts b/packages/frontend/@n8n/design-system/src/components/CodeDiff/CodeDiff.test.ts
similarity index 100%
rename from packages/design-system/src/components/CodeDiff/CodeDiff.test.ts
rename to packages/frontend/@n8n/design-system/src/components/CodeDiff/CodeDiff.test.ts
diff --git a/packages/design-system/src/components/CodeDiff/CodeDiff.vue b/packages/frontend/@n8n/design-system/src/components/CodeDiff/CodeDiff.vue
similarity index 98%
rename from packages/design-system/src/components/CodeDiff/CodeDiff.vue
rename to packages/frontend/@n8n/design-system/src/components/CodeDiff/CodeDiff.vue
index 7030438571..36e6129d9a 100644
--- a/packages/design-system/src/components/CodeDiff/CodeDiff.vue
+++ b/packages/frontend/@n8n/design-system/src/components/CodeDiff/CodeDiff.vue
@@ -2,7 +2,7 @@
 import parseDiff from 'parse-diff';
 import { computed } from 'vue';
 
-import { useI18n } from 'n8n-design-system/composables/useI18n';
+import { useI18n } from '@n8n/design-system/composables/useI18n';
 
 const MIN_LINES = 4;
 
diff --git a/packages/design-system/src/components/CodeDiff/__snapshots__/CodeDiff.test.ts.snap b/packages/frontend/@n8n/design-system/src/components/CodeDiff/__snapshots__/CodeDiff.test.ts.snap
similarity index 100%
rename from packages/design-system/src/components/CodeDiff/__snapshots__/CodeDiff.test.ts.snap
rename to packages/frontend/@n8n/design-system/src/components/CodeDiff/__snapshots__/CodeDiff.test.ts.snap
diff --git a/packages/design-system/src/components/ConditionalRouterLink/ConditionalRouterLink.test.ts b/packages/frontend/@n8n/design-system/src/components/ConditionalRouterLink/ConditionalRouterLink.test.ts
similarity index 100%
rename from packages/design-system/src/components/ConditionalRouterLink/ConditionalRouterLink.test.ts
rename to packages/frontend/@n8n/design-system/src/components/ConditionalRouterLink/ConditionalRouterLink.test.ts
diff --git a/packages/design-system/src/components/ConditionalRouterLink/CondtionalRouterLink.vue b/packages/frontend/@n8n/design-system/src/components/ConditionalRouterLink/CondtionalRouterLink.vue
similarity index 100%
rename from packages/design-system/src/components/ConditionalRouterLink/CondtionalRouterLink.vue
rename to packages/frontend/@n8n/design-system/src/components/ConditionalRouterLink/CondtionalRouterLink.vue
diff --git a/packages/design-system/src/components/ConditionalRouterLink/__snapshots__/ConditionalRouterLink.test.ts.snap b/packages/frontend/@n8n/design-system/src/components/ConditionalRouterLink/__snapshots__/ConditionalRouterLink.test.ts.snap
similarity index 100%
rename from packages/design-system/src/components/ConditionalRouterLink/__snapshots__/ConditionalRouterLink.test.ts.snap
rename to packages/frontend/@n8n/design-system/src/components/ConditionalRouterLink/__snapshots__/ConditionalRouterLink.test.ts.snap
diff --git a/packages/design-system/src/components/ConditionalRouterLink/index.ts b/packages/frontend/@n8n/design-system/src/components/ConditionalRouterLink/index.ts
similarity index 100%
rename from packages/design-system/src/components/ConditionalRouterLink/index.ts
rename to packages/frontend/@n8n/design-system/src/components/ConditionalRouterLink/index.ts
diff --git a/packages/design-system/src/components/InlineAskAssistantButton/InlineAskAssistantButton.stories.ts b/packages/frontend/@n8n/design-system/src/components/InlineAskAssistantButton/InlineAskAssistantButton.stories.ts
similarity index 100%
rename from packages/design-system/src/components/InlineAskAssistantButton/InlineAskAssistantButton.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/InlineAskAssistantButton/InlineAskAssistantButton.stories.ts
diff --git a/packages/design-system/src/components/InlineAskAssistantButton/InlineAskAssistantButton.vue b/packages/frontend/@n8n/design-system/src/components/InlineAskAssistantButton/InlineAskAssistantButton.vue
similarity index 100%
rename from packages/design-system/src/components/InlineAskAssistantButton/InlineAskAssistantButton.vue
rename to packages/frontend/@n8n/design-system/src/components/InlineAskAssistantButton/InlineAskAssistantButton.vue
diff --git a/packages/design-system/src/components/N8nActionBox/ActionBox.stories.ts b/packages/frontend/@n8n/design-system/src/components/N8nActionBox/ActionBox.stories.ts
similarity index 100%
rename from packages/design-system/src/components/N8nActionBox/ActionBox.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nActionBox/ActionBox.stories.ts
diff --git a/packages/design-system/src/components/N8nActionBox/ActionBox.test.ts b/packages/frontend/@n8n/design-system/src/components/N8nActionBox/ActionBox.test.ts
similarity index 100%
rename from packages/design-system/src/components/N8nActionBox/ActionBox.test.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nActionBox/ActionBox.test.ts
diff --git a/packages/design-system/src/components/N8nActionBox/ActionBox.vue b/packages/frontend/@n8n/design-system/src/components/N8nActionBox/ActionBox.vue
similarity index 94%
rename from packages/design-system/src/components/N8nActionBox/ActionBox.vue
rename to packages/frontend/@n8n/design-system/src/components/N8nActionBox/ActionBox.vue
index b04ccb1049..a658e513fb 100644
--- a/packages/design-system/src/components/N8nActionBox/ActionBox.vue
+++ b/packages/frontend/@n8n/design-system/src/components/N8nActionBox/ActionBox.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
-import N8nTooltip from 'n8n-design-system/components/N8nTooltip/Tooltip.vue';
-import type { ButtonType } from 'n8n-design-system/types/button';
+import N8nTooltip from '@n8n/design-system/components/N8nTooltip/Tooltip.vue';
+import type { ButtonType } from '@n8n/design-system/types/button';
 
 import N8nButton from '../N8nButton';
 import N8nCallout, { type CalloutTheme } from '../N8nCallout';
diff --git a/packages/design-system/src/components/N8nActionBox/__snapshots__/ActionBox.test.ts.snap b/packages/frontend/@n8n/design-system/src/components/N8nActionBox/__snapshots__/ActionBox.test.ts.snap
similarity index 100%
rename from packages/design-system/src/components/N8nActionBox/__snapshots__/ActionBox.test.ts.snap
rename to packages/frontend/@n8n/design-system/src/components/N8nActionBox/__snapshots__/ActionBox.test.ts.snap
diff --git a/packages/design-system/src/components/N8nActionBox/index.ts b/packages/frontend/@n8n/design-system/src/components/N8nActionBox/index.ts
similarity index 100%
rename from packages/design-system/src/components/N8nActionBox/index.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nActionBox/index.ts
diff --git a/packages/design-system/src/components/N8nActionDropdown/ActionDropdown.stories.ts b/packages/frontend/@n8n/design-system/src/components/N8nActionDropdown/ActionDropdown.stories.ts
similarity index 100%
rename from packages/design-system/src/components/N8nActionDropdown/ActionDropdown.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nActionDropdown/ActionDropdown.stories.ts
diff --git a/packages/design-system/src/components/N8nActionDropdown/ActionDropdown.test.ts b/packages/frontend/@n8n/design-system/src/components/N8nActionDropdown/ActionDropdown.test.ts
similarity index 100%
rename from packages/design-system/src/components/N8nActionDropdown/ActionDropdown.test.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nActionDropdown/ActionDropdown.test.ts
diff --git a/packages/design-system/src/components/N8nActionDropdown/ActionDropdown.vue b/packages/frontend/@n8n/design-system/src/components/N8nActionDropdown/ActionDropdown.vue
similarity index 98%
rename from packages/design-system/src/components/N8nActionDropdown/ActionDropdown.vue
rename to packages/frontend/@n8n/design-system/src/components/N8nActionDropdown/ActionDropdown.vue
index 10c191c387..ac9c795f41 100644
--- a/packages/design-system/src/components/N8nActionDropdown/ActionDropdown.vue
+++ b/packages/frontend/@n8n/design-system/src/components/N8nActionDropdown/ActionDropdown.vue
@@ -8,7 +8,7 @@
 import { ElDropdown, ElDropdownMenu, ElDropdownItem, type Placement } from 'element-plus';
 import { ref, useCssModule, useAttrs, computed } from 'vue';
 
-import type { IconSize } from 'n8n-design-system/types/icon';
+import type { IconSize } from '@n8n/design-system/types/icon';
 
 import type { ActionDropdownItem } from '../../types';
 import N8nIcon from '../N8nIcon';
diff --git a/packages/design-system/src/components/N8nActionDropdown/__snapshots__/ActionDropdown.test.ts.snap b/packages/frontend/@n8n/design-system/src/components/N8nActionDropdown/__snapshots__/ActionDropdown.test.ts.snap
similarity index 100%
rename from packages/design-system/src/components/N8nActionDropdown/__snapshots__/ActionDropdown.test.ts.snap
rename to packages/frontend/@n8n/design-system/src/components/N8nActionDropdown/__snapshots__/ActionDropdown.test.ts.snap
diff --git a/packages/design-system/src/components/N8nActionDropdown/index.ts b/packages/frontend/@n8n/design-system/src/components/N8nActionDropdown/index.ts
similarity index 100%
rename from packages/design-system/src/components/N8nActionDropdown/index.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nActionDropdown/index.ts
diff --git a/packages/design-system/src/components/N8nActionToggle/ActionToggle.stories.ts b/packages/frontend/@n8n/design-system/src/components/N8nActionToggle/ActionToggle.stories.ts
similarity index 100%
rename from packages/design-system/src/components/N8nActionToggle/ActionToggle.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nActionToggle/ActionToggle.stories.ts
diff --git a/packages/design-system/src/components/N8nActionToggle/ActionToggle.vue b/packages/frontend/@n8n/design-system/src/components/N8nActionToggle/ActionToggle.vue
similarity index 96%
rename from packages/design-system/src/components/N8nActionToggle/ActionToggle.vue
rename to packages/frontend/@n8n/design-system/src/components/N8nActionToggle/ActionToggle.vue
index 57dd20bf0d..7f0cd6988f 100644
--- a/packages/design-system/src/components/N8nActionToggle/ActionToggle.vue
+++ b/packages/frontend/@n8n/design-system/src/components/N8nActionToggle/ActionToggle.vue
@@ -2,8 +2,8 @@
 import { ElDropdown, ElDropdownMenu, ElDropdownItem, type Placement } from 'element-plus';
 import { ref } from 'vue';
 
-import type { UserAction } from 'n8n-design-system/types';
-import type { IconOrientation, IconSize } from 'n8n-design-system/types/icon';
+import type { UserAction } from '@n8n/design-system/types';
+import type { IconOrientation, IconSize } from '@n8n/design-system/types/icon';
 
 import N8nIcon from '../N8nIcon';
 
diff --git a/packages/design-system/src/components/N8nActionToggle/index.ts b/packages/frontend/@n8n/design-system/src/components/N8nActionToggle/index.ts
similarity index 100%
rename from packages/design-system/src/components/N8nActionToggle/index.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nActionToggle/index.ts
diff --git a/packages/design-system/src/components/N8nAlert/Alert.stories.ts b/packages/frontend/@n8n/design-system/src/components/N8nAlert/Alert.stories.ts
similarity index 100%
rename from packages/design-system/src/components/N8nAlert/Alert.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nAlert/Alert.stories.ts
diff --git a/packages/design-system/src/components/N8nAlert/Alert.test.ts b/packages/frontend/@n8n/design-system/src/components/N8nAlert/Alert.test.ts
similarity index 100%
rename from packages/design-system/src/components/N8nAlert/Alert.test.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nAlert/Alert.test.ts
diff --git a/packages/design-system/src/components/N8nAlert/Alert.vue b/packages/frontend/@n8n/design-system/src/components/N8nAlert/Alert.vue
similarity index 100%
rename from packages/design-system/src/components/N8nAlert/Alert.vue
rename to packages/frontend/@n8n/design-system/src/components/N8nAlert/Alert.vue
diff --git a/packages/design-system/src/components/N8nAlert/index.ts b/packages/frontend/@n8n/design-system/src/components/N8nAlert/index.ts
similarity index 100%
rename from packages/design-system/src/components/N8nAlert/index.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nAlert/index.ts
diff --git a/packages/design-system/src/components/N8nAvatar/Avatar.stories.ts b/packages/frontend/@n8n/design-system/src/components/N8nAvatar/Avatar.stories.ts
similarity index 100%
rename from packages/design-system/src/components/N8nAvatar/Avatar.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nAvatar/Avatar.stories.ts
diff --git a/packages/design-system/src/components/N8nAvatar/Avatar.test.ts b/packages/frontend/@n8n/design-system/src/components/N8nAvatar/Avatar.test.ts
similarity index 100%
rename from packages/design-system/src/components/N8nAvatar/Avatar.test.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nAvatar/Avatar.test.ts
diff --git a/packages/design-system/src/components/N8nAvatar/Avatar.vue b/packages/frontend/@n8n/design-system/src/components/N8nAvatar/Avatar.vue
similarity index 100%
rename from packages/design-system/src/components/N8nAvatar/Avatar.vue
rename to packages/frontend/@n8n/design-system/src/components/N8nAvatar/Avatar.vue
diff --git a/packages/design-system/src/components/N8nAvatar/index.ts b/packages/frontend/@n8n/design-system/src/components/N8nAvatar/index.ts
similarity index 100%
rename from packages/design-system/src/components/N8nAvatar/index.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nAvatar/index.ts
diff --git a/packages/design-system/src/components/N8nBadge/Badge.stories.ts b/packages/frontend/@n8n/design-system/src/components/N8nBadge/Badge.stories.ts
similarity index 100%
rename from packages/design-system/src/components/N8nBadge/Badge.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nBadge/Badge.stories.ts
diff --git a/packages/design-system/src/components/N8nBadge/Badge.test.ts b/packages/frontend/@n8n/design-system/src/components/N8nBadge/Badge.test.ts
similarity index 100%
rename from packages/design-system/src/components/N8nBadge/Badge.test.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nBadge/Badge.test.ts
diff --git a/packages/design-system/src/components/N8nBadge/Badge.vue b/packages/frontend/@n8n/design-system/src/components/N8nBadge/Badge.vue
similarity index 96%
rename from packages/design-system/src/components/N8nBadge/Badge.vue
rename to packages/frontend/@n8n/design-system/src/components/N8nBadge/Badge.vue
index 8fe8968478..fe679f347a 100644
--- a/packages/design-system/src/components/N8nBadge/Badge.vue
+++ b/packages/frontend/@n8n/design-system/src/components/N8nBadge/Badge.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import type { TextSize } from 'n8n-design-system/types/text';
+import type { TextSize } from '@n8n/design-system/types/text';
 
 import N8nText from '../N8nText';
 
diff --git a/packages/design-system/src/components/N8nBadge/__snapshots__/Badge.test.ts.snap b/packages/frontend/@n8n/design-system/src/components/N8nBadge/__snapshots__/Badge.test.ts.snap
similarity index 100%
rename from packages/design-system/src/components/N8nBadge/__snapshots__/Badge.test.ts.snap
rename to packages/frontend/@n8n/design-system/src/components/N8nBadge/__snapshots__/Badge.test.ts.snap
diff --git a/packages/design-system/src/components/N8nBadge/index.ts b/packages/frontend/@n8n/design-system/src/components/N8nBadge/index.ts
similarity index 100%
rename from packages/design-system/src/components/N8nBadge/index.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nBadge/index.ts
diff --git a/packages/design-system/src/components/N8nBlockUi/BlockUi.stories.ts b/packages/frontend/@n8n/design-system/src/components/N8nBlockUi/BlockUi.stories.ts
similarity index 100%
rename from packages/design-system/src/components/N8nBlockUi/BlockUi.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nBlockUi/BlockUi.stories.ts
diff --git a/packages/design-system/src/components/N8nBlockUi/BlockUi.test.ts b/packages/frontend/@n8n/design-system/src/components/N8nBlockUi/BlockUi.test.ts
similarity index 100%
rename from packages/design-system/src/components/N8nBlockUi/BlockUi.test.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nBlockUi/BlockUi.test.ts
diff --git a/packages/design-system/src/components/N8nBlockUi/BlockUi.vue b/packages/frontend/@n8n/design-system/src/components/N8nBlockUi/BlockUi.vue
similarity index 100%
rename from packages/design-system/src/components/N8nBlockUi/BlockUi.vue
rename to packages/frontend/@n8n/design-system/src/components/N8nBlockUi/BlockUi.vue
diff --git a/packages/design-system/src/components/N8nBlockUi/index.ts b/packages/frontend/@n8n/design-system/src/components/N8nBlockUi/index.ts
similarity index 100%
rename from packages/design-system/src/components/N8nBlockUi/index.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nBlockUi/index.ts
diff --git a/packages/design-system/src/components/N8nBreadcrumbs/AsyncLoadingCacheDemo.vue b/packages/frontend/@n8n/design-system/src/components/N8nBreadcrumbs/AsyncLoadingCacheDemo.vue
similarity index 100%
rename from packages/design-system/src/components/N8nBreadcrumbs/AsyncLoadingCacheDemo.vue
rename to packages/frontend/@n8n/design-system/src/components/N8nBreadcrumbs/AsyncLoadingCacheDemo.vue
diff --git a/packages/design-system/src/components/N8nBreadcrumbs/BreadCrumbs.test.ts b/packages/frontend/@n8n/design-system/src/components/N8nBreadcrumbs/BreadCrumbs.test.ts
similarity index 100%
rename from packages/design-system/src/components/N8nBreadcrumbs/BreadCrumbs.test.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nBreadcrumbs/BreadCrumbs.test.ts
diff --git a/packages/design-system/src/components/N8nBreadcrumbs/Breadcrumbs.stories.ts b/packages/frontend/@n8n/design-system/src/components/N8nBreadcrumbs/Breadcrumbs.stories.ts
similarity index 99%
rename from packages/design-system/src/components/N8nBreadcrumbs/Breadcrumbs.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nBreadcrumbs/Breadcrumbs.stories.ts
index 1ed833502f..92fcbb2621 100644
--- a/packages/design-system/src/components/N8nBreadcrumbs/Breadcrumbs.stories.ts
+++ b/packages/frontend/@n8n/design-system/src/components/N8nBreadcrumbs/Breadcrumbs.stories.ts
@@ -1,6 +1,6 @@
 import type { StoryFn } from '@storybook/vue3';
 
-import type { UserAction } from 'n8n-design-system/types';
+import type { UserAction } from '@n8n/design-system/types';
 
 import AsyncLoadingCacheDemo from './AsyncLoadingCacheDemo.vue';
 import Breadcrumbs from './Breadcrumbs.vue';
diff --git a/packages/design-system/src/components/N8nBreadcrumbs/Breadcrumbs.vue b/packages/frontend/@n8n/design-system/src/components/N8nBreadcrumbs/Breadcrumbs.vue
similarity index 99%
rename from packages/design-system/src/components/N8nBreadcrumbs/Breadcrumbs.vue
rename to packages/frontend/@n8n/design-system/src/components/N8nBreadcrumbs/Breadcrumbs.vue
index d556770072..ff017bf2aa 100644
--- a/packages/design-system/src/components/N8nBreadcrumbs/Breadcrumbs.vue
+++ b/packages/frontend/@n8n/design-system/src/components/N8nBreadcrumbs/Breadcrumbs.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import { computed, ref, watch } from 'vue';
 
-import type { UserAction } from 'n8n-design-system/types';
+import type { UserAction } from '@n8n/design-system/types';
 
 import N8nLoading from '../N8nLoading';
 
diff --git a/packages/design-system/src/components/N8nBreadcrumbs/__snapshots__/BreadCrumbs.test.ts.snap b/packages/frontend/@n8n/design-system/src/components/N8nBreadcrumbs/__snapshots__/BreadCrumbs.test.ts.snap
similarity index 100%
rename from packages/design-system/src/components/N8nBreadcrumbs/__snapshots__/BreadCrumbs.test.ts.snap
rename to packages/frontend/@n8n/design-system/src/components/N8nBreadcrumbs/__snapshots__/BreadCrumbs.test.ts.snap
diff --git a/packages/design-system/src/components/N8nBreadcrumbs/index.ts b/packages/frontend/@n8n/design-system/src/components/N8nBreadcrumbs/index.ts
similarity index 100%
rename from packages/design-system/src/components/N8nBreadcrumbs/index.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nBreadcrumbs/index.ts
diff --git a/packages/design-system/src/components/N8nButton/Button.scss b/packages/frontend/@n8n/design-system/src/components/N8nButton/Button.scss
similarity index 100%
rename from packages/design-system/src/components/N8nButton/Button.scss
rename to packages/frontend/@n8n/design-system/src/components/N8nButton/Button.scss
diff --git a/packages/design-system/src/components/N8nButton/Button.stories.ts b/packages/frontend/@n8n/design-system/src/components/N8nButton/Button.stories.ts
similarity index 100%
rename from packages/design-system/src/components/N8nButton/Button.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nButton/Button.stories.ts
diff --git a/packages/design-system/src/components/N8nButton/Button.test.ts b/packages/frontend/@n8n/design-system/src/components/N8nButton/Button.test.ts
similarity index 100%
rename from packages/design-system/src/components/N8nButton/Button.test.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nButton/Button.test.ts
diff --git a/packages/design-system/src/components/N8nButton/Button.vue b/packages/frontend/@n8n/design-system/src/components/N8nButton/Button.vue
similarity index 99%
rename from packages/design-system/src/components/N8nButton/Button.vue
rename to packages/frontend/@n8n/design-system/src/components/N8nButton/Button.vue
index f0c0c71a77..14aef2d084 100644
--- a/packages/design-system/src/components/N8nButton/Button.vue
+++ b/packages/frontend/@n8n/design-system/src/components/N8nButton/Button.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { useCssModule, computed, useAttrs, watchEffect } from 'vue';
 
-import type { ButtonProps } from 'n8n-design-system/types/button';
+import type { ButtonProps } from '@n8n/design-system/types/button';
 
 import N8nIcon from '../N8nIcon';
 import N8nSpinner from '../N8nSpinner';
diff --git a/packages/design-system/src/components/N8nButton/__snapshots__/Button.test.ts.snap b/packages/frontend/@n8n/design-system/src/components/N8nButton/__snapshots__/Button.test.ts.snap
similarity index 100%
rename from packages/design-system/src/components/N8nButton/__snapshots__/Button.test.ts.snap
rename to packages/frontend/@n8n/design-system/src/components/N8nButton/__snapshots__/Button.test.ts.snap
diff --git a/packages/design-system/src/components/N8nButton/index.ts b/packages/frontend/@n8n/design-system/src/components/N8nButton/index.ts
similarity index 100%
rename from packages/design-system/src/components/N8nButton/index.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nButton/index.ts
diff --git a/packages/design-system/src/components/N8nCallout/Callout.stories.ts b/packages/frontend/@n8n/design-system/src/components/N8nCallout/Callout.stories.ts
similarity index 100%
rename from packages/design-system/src/components/N8nCallout/Callout.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nCallout/Callout.stories.ts
diff --git a/packages/design-system/src/components/N8nCallout/Callout.test.ts b/packages/frontend/@n8n/design-system/src/components/N8nCallout/Callout.test.ts
similarity index 100%
rename from packages/design-system/src/components/N8nCallout/Callout.test.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nCallout/Callout.test.ts
diff --git a/packages/design-system/src/components/N8nCallout/Callout.vue b/packages/frontend/@n8n/design-system/src/components/N8nCallout/Callout.vue
similarity index 98%
rename from packages/design-system/src/components/N8nCallout/Callout.vue
rename to packages/frontend/@n8n/design-system/src/components/N8nCallout/Callout.vue
index 6a796ba32a..095149320c 100644
--- a/packages/design-system/src/components/N8nCallout/Callout.vue
+++ b/packages/frontend/@n8n/design-system/src/components/N8nCallout/Callout.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import { computed, useCssModule } from 'vue';
 
-import type { IconSize } from 'n8n-design-system/types/icon';
+import type { IconSize } from '@n8n/design-system/types/icon';
 
 import N8nIcon from '../N8nIcon';
 import N8nText from '../N8nText';
diff --git a/packages/design-system/src/components/N8nCallout/__snapshots__/Callout.test.ts.snap b/packages/frontend/@n8n/design-system/src/components/N8nCallout/__snapshots__/Callout.test.ts.snap
similarity index 100%
rename from packages/design-system/src/components/N8nCallout/__snapshots__/Callout.test.ts.snap
rename to packages/frontend/@n8n/design-system/src/components/N8nCallout/__snapshots__/Callout.test.ts.snap
diff --git a/packages/design-system/src/components/N8nCallout/index.ts b/packages/frontend/@n8n/design-system/src/components/N8nCallout/index.ts
similarity index 100%
rename from packages/design-system/src/components/N8nCallout/index.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nCallout/index.ts
diff --git a/packages/design-system/src/components/N8nCard/Card.stories.ts b/packages/frontend/@n8n/design-system/src/components/N8nCard/Card.stories.ts
similarity index 100%
rename from packages/design-system/src/components/N8nCard/Card.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nCard/Card.stories.ts
diff --git a/packages/design-system/src/components/N8nCard/Card.test.ts b/packages/frontend/@n8n/design-system/src/components/N8nCard/Card.test.ts
similarity index 100%
rename from packages/design-system/src/components/N8nCard/Card.test.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nCard/Card.test.ts
diff --git a/packages/design-system/src/components/N8nCard/Card.vue b/packages/frontend/@n8n/design-system/src/components/N8nCard/Card.vue
similarity index 100%
rename from packages/design-system/src/components/N8nCard/Card.vue
rename to packages/frontend/@n8n/design-system/src/components/N8nCard/Card.vue
diff --git a/packages/design-system/src/components/N8nCard/__snapshots__/Card.test.ts.snap b/packages/frontend/@n8n/design-system/src/components/N8nCard/__snapshots__/Card.test.ts.snap
similarity index 100%
rename from packages/design-system/src/components/N8nCard/__snapshots__/Card.test.ts.snap
rename to packages/frontend/@n8n/design-system/src/components/N8nCard/__snapshots__/Card.test.ts.snap
diff --git a/packages/design-system/src/components/N8nCard/index.ts b/packages/frontend/@n8n/design-system/src/components/N8nCard/index.ts
similarity index 100%
rename from packages/design-system/src/components/N8nCard/index.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nCard/index.ts
diff --git a/packages/design-system/src/components/N8nCheckbox/Checkbox.stories.ts b/packages/frontend/@n8n/design-system/src/components/N8nCheckbox/Checkbox.stories.ts
similarity index 100%
rename from packages/design-system/src/components/N8nCheckbox/Checkbox.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nCheckbox/Checkbox.stories.ts
diff --git a/packages/design-system/src/components/N8nCheckbox/Checkbox.test.ts b/packages/frontend/@n8n/design-system/src/components/N8nCheckbox/Checkbox.test.ts
similarity index 100%
rename from packages/design-system/src/components/N8nCheckbox/Checkbox.test.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nCheckbox/Checkbox.test.ts
diff --git a/packages/design-system/src/components/N8nCheckbox/Checkbox.vue b/packages/frontend/@n8n/design-system/src/components/N8nCheckbox/Checkbox.vue
similarity index 100%
rename from packages/design-system/src/components/N8nCheckbox/Checkbox.vue
rename to packages/frontend/@n8n/design-system/src/components/N8nCheckbox/Checkbox.vue
diff --git a/packages/design-system/src/components/N8nCheckbox/__snapshots__/Checkbox.test.ts.snap b/packages/frontend/@n8n/design-system/src/components/N8nCheckbox/__snapshots__/Checkbox.test.ts.snap
similarity index 100%
rename from packages/design-system/src/components/N8nCheckbox/__snapshots__/Checkbox.test.ts.snap
rename to packages/frontend/@n8n/design-system/src/components/N8nCheckbox/__snapshots__/Checkbox.test.ts.snap
diff --git a/packages/design-system/src/components/N8nCheckbox/index.ts b/packages/frontend/@n8n/design-system/src/components/N8nCheckbox/index.ts
similarity index 100%
rename from packages/design-system/src/components/N8nCheckbox/index.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nCheckbox/index.ts
diff --git a/packages/design-system/src/components/N8nCircleLoader/CircleLoader.stories.ts b/packages/frontend/@n8n/design-system/src/components/N8nCircleLoader/CircleLoader.stories.ts
similarity index 100%
rename from packages/design-system/src/components/N8nCircleLoader/CircleLoader.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nCircleLoader/CircleLoader.stories.ts
diff --git a/packages/design-system/src/components/N8nCircleLoader/CircleLoader.test.ts b/packages/frontend/@n8n/design-system/src/components/N8nCircleLoader/CircleLoader.test.ts
similarity index 100%
rename from packages/design-system/src/components/N8nCircleLoader/CircleLoader.test.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nCircleLoader/CircleLoader.test.ts
diff --git a/packages/design-system/src/components/N8nCircleLoader/CircleLoader.vue b/packages/frontend/@n8n/design-system/src/components/N8nCircleLoader/CircleLoader.vue
similarity index 100%
rename from packages/design-system/src/components/N8nCircleLoader/CircleLoader.vue
rename to packages/frontend/@n8n/design-system/src/components/N8nCircleLoader/CircleLoader.vue
diff --git a/packages/design-system/src/components/N8nCircleLoader/__snapshots__/CircleLoader.test.ts.snap b/packages/frontend/@n8n/design-system/src/components/N8nCircleLoader/__snapshots__/CircleLoader.test.ts.snap
similarity index 100%
rename from packages/design-system/src/components/N8nCircleLoader/__snapshots__/CircleLoader.test.ts.snap
rename to packages/frontend/@n8n/design-system/src/components/N8nCircleLoader/__snapshots__/CircleLoader.test.ts.snap
diff --git a/packages/design-system/src/components/N8nCircleLoader/index.ts b/packages/frontend/@n8n/design-system/src/components/N8nCircleLoader/index.ts
similarity index 100%
rename from packages/design-system/src/components/N8nCircleLoader/index.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nCircleLoader/index.ts
diff --git a/packages/design-system/src/components/N8nColorPicker/ColorPicker.stories.ts b/packages/frontend/@n8n/design-system/src/components/N8nColorPicker/ColorPicker.stories.ts
similarity index 100%
rename from packages/design-system/src/components/N8nColorPicker/ColorPicker.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nColorPicker/ColorPicker.stories.ts
diff --git a/packages/design-system/src/components/N8nColorPicker/ColorPicker.test.ts b/packages/frontend/@n8n/design-system/src/components/N8nColorPicker/ColorPicker.test.ts
similarity index 100%
rename from packages/design-system/src/components/N8nColorPicker/ColorPicker.test.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nColorPicker/ColorPicker.test.ts
diff --git a/packages/design-system/src/components/N8nColorPicker/ColorPicker.vue b/packages/frontend/@n8n/design-system/src/components/N8nColorPicker/ColorPicker.vue
similarity index 100%
rename from packages/design-system/src/components/N8nColorPicker/ColorPicker.vue
rename to packages/frontend/@n8n/design-system/src/components/N8nColorPicker/ColorPicker.vue
diff --git a/packages/design-system/src/components/N8nColorPicker/__snapshots__/ColorPicker.test.ts.snap b/packages/frontend/@n8n/design-system/src/components/N8nColorPicker/__snapshots__/ColorPicker.test.ts.snap
similarity index 100%
rename from packages/design-system/src/components/N8nColorPicker/__snapshots__/ColorPicker.test.ts.snap
rename to packages/frontend/@n8n/design-system/src/components/N8nColorPicker/__snapshots__/ColorPicker.test.ts.snap
diff --git a/packages/design-system/src/components/N8nColorPicker/index.ts b/packages/frontend/@n8n/design-system/src/components/N8nColorPicker/index.ts
similarity index 100%
rename from packages/design-system/src/components/N8nColorPicker/index.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nColorPicker/index.ts
diff --git a/packages/design-system/src/components/N8nDatatable/Datatable.stories.ts b/packages/frontend/@n8n/design-system/src/components/N8nDatatable/Datatable.stories.ts
similarity index 100%
rename from packages/design-system/src/components/N8nDatatable/Datatable.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nDatatable/Datatable.stories.ts
diff --git a/packages/design-system/src/components/N8nDatatable/Datatable.test.ts b/packages/frontend/@n8n/design-system/src/components/N8nDatatable/Datatable.test.ts
similarity index 97%
rename from packages/design-system/src/components/N8nDatatable/Datatable.test.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nDatatable/Datatable.test.ts
index de8659c71c..68337ab7a9 100644
--- a/packages/design-system/src/components/N8nDatatable/Datatable.test.ts
+++ b/packages/frontend/@n8n/design-system/src/components/N8nDatatable/Datatable.test.ts
@@ -1,6 +1,6 @@
 import { render } from '@testing-library/vue';
 
-import { removeDynamicAttributes } from 'n8n-design-system/utils';
+import { removeDynamicAttributes } from '@n8n/design-system/utils';
 
 import { rows, columns } from './__tests__/data';
 import N8nDatatable from './Datatable.vue';
diff --git a/packages/design-system/src/components/N8nDatatable/Datatable.vue b/packages/frontend/@n8n/design-system/src/components/N8nDatatable/Datatable.vue
similarity index 100%
rename from packages/design-system/src/components/N8nDatatable/Datatable.vue
rename to packages/frontend/@n8n/design-system/src/components/N8nDatatable/Datatable.vue
diff --git a/packages/design-system/src/components/N8nDatatable/__snapshots__/Datatable.test.ts.snap b/packages/frontend/@n8n/design-system/src/components/N8nDatatable/__snapshots__/Datatable.test.ts.snap
similarity index 100%
rename from packages/design-system/src/components/N8nDatatable/__snapshots__/Datatable.test.ts.snap
rename to packages/frontend/@n8n/design-system/src/components/N8nDatatable/__snapshots__/Datatable.test.ts.snap
diff --git a/packages/design-system/src/components/N8nDatatable/__tests__/data.ts b/packages/frontend/@n8n/design-system/src/components/N8nDatatable/__tests__/data.ts
similarity index 100%
rename from packages/design-system/src/components/N8nDatatable/__tests__/data.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nDatatable/__tests__/data.ts
diff --git a/packages/design-system/src/components/N8nDatatable/index.ts b/packages/frontend/@n8n/design-system/src/components/N8nDatatable/index.ts
similarity index 100%
rename from packages/design-system/src/components/N8nDatatable/index.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nDatatable/index.ts
diff --git a/packages/design-system/src/components/N8nFormBox/FormBox.stories.ts b/packages/frontend/@n8n/design-system/src/components/N8nFormBox/FormBox.stories.ts
similarity index 100%
rename from packages/design-system/src/components/N8nFormBox/FormBox.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nFormBox/FormBox.stories.ts
diff --git a/packages/design-system/src/components/N8nFormBox/FormBox.test.ts b/packages/frontend/@n8n/design-system/src/components/N8nFormBox/FormBox.test.ts
similarity index 100%
rename from packages/design-system/src/components/N8nFormBox/FormBox.test.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nFormBox/FormBox.test.ts
diff --git a/packages/design-system/src/components/N8nFormBox/FormBox.vue b/packages/frontend/@n8n/design-system/src/components/N8nFormBox/FormBox.vue
similarity index 97%
rename from packages/design-system/src/components/N8nFormBox/FormBox.vue
rename to packages/frontend/@n8n/design-system/src/components/N8nFormBox/FormBox.vue
index 7c33a95a78..337cb350bf 100644
--- a/packages/design-system/src/components/N8nFormBox/FormBox.vue
+++ b/packages/frontend/@n8n/design-system/src/components/N8nFormBox/FormBox.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import type { IFormInput } from 'n8n-design-system/types';
+import type { IFormInput } from '@n8n/design-system/types';
 
 import { createFormEventBus } from '../../utils';
 import N8nButton from '../N8nButton';
diff --git a/packages/design-system/src/components/N8nFormBox/__snapshots__/FormBox.test.ts.snap b/packages/frontend/@n8n/design-system/src/components/N8nFormBox/__snapshots__/FormBox.test.ts.snap
similarity index 100%
rename from packages/design-system/src/components/N8nFormBox/__snapshots__/FormBox.test.ts.snap
rename to packages/frontend/@n8n/design-system/src/components/N8nFormBox/__snapshots__/FormBox.test.ts.snap
diff --git a/packages/design-system/src/components/N8nFormBox/index.ts b/packages/frontend/@n8n/design-system/src/components/N8nFormBox/index.ts
similarity index 100%
rename from packages/design-system/src/components/N8nFormBox/index.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nFormBox/index.ts
diff --git a/packages/design-system/src/components/N8nFormInput/FormInput.stories.ts b/packages/frontend/@n8n/design-system/src/components/N8nFormInput/FormInput.stories.ts
similarity index 100%
rename from packages/design-system/src/components/N8nFormInput/FormInput.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nFormInput/FormInput.stories.ts
diff --git a/packages/design-system/src/components/N8nFormInput/FormInput.vue b/packages/frontend/@n8n/design-system/src/components/N8nFormInput/FormInput.vue
similarity index 100%
rename from packages/design-system/src/components/N8nFormInput/FormInput.vue
rename to packages/frontend/@n8n/design-system/src/components/N8nFormInput/FormInput.vue
diff --git a/packages/design-system/src/components/N8nFormInput/index.ts b/packages/frontend/@n8n/design-system/src/components/N8nFormInput/index.ts
similarity index 100%
rename from packages/design-system/src/components/N8nFormInput/index.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nFormInput/index.ts
diff --git a/packages/design-system/src/components/N8nFormInput/validators.ts b/packages/frontend/@n8n/design-system/src/components/N8nFormInput/validators.ts
similarity index 100%
rename from packages/design-system/src/components/N8nFormInput/validators.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nFormInput/validators.ts
diff --git a/packages/design-system/src/components/N8nFormInputs/FormInputs.stories.ts b/packages/frontend/@n8n/design-system/src/components/N8nFormInputs/FormInputs.stories.ts
similarity index 100%
rename from packages/design-system/src/components/N8nFormInputs/FormInputs.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nFormInputs/FormInputs.stories.ts
diff --git a/packages/design-system/src/components/N8nFormInputs/FormInputs.vue b/packages/frontend/@n8n/design-system/src/components/N8nFormInputs/FormInputs.vue
similarity index 100%
rename from packages/design-system/src/components/N8nFormInputs/FormInputs.vue
rename to packages/frontend/@n8n/design-system/src/components/N8nFormInputs/FormInputs.vue
diff --git a/packages/design-system/src/components/N8nFormInputs/index.ts b/packages/frontend/@n8n/design-system/src/components/N8nFormInputs/index.ts
similarity index 100%
rename from packages/design-system/src/components/N8nFormInputs/index.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nFormInputs/index.ts
diff --git a/packages/design-system/src/components/N8nHeading/Heading.stories.ts b/packages/frontend/@n8n/design-system/src/components/N8nHeading/Heading.stories.ts
similarity index 100%
rename from packages/design-system/src/components/N8nHeading/Heading.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nHeading/Heading.stories.ts
diff --git a/packages/design-system/src/components/N8nHeading/Heading.vue b/packages/frontend/@n8n/design-system/src/components/N8nHeading/Heading.vue
similarity index 100%
rename from packages/design-system/src/components/N8nHeading/Heading.vue
rename to packages/frontend/@n8n/design-system/src/components/N8nHeading/Heading.vue
diff --git a/packages/design-system/src/components/N8nHeading/index.ts b/packages/frontend/@n8n/design-system/src/components/N8nHeading/index.ts
similarity index 100%
rename from packages/design-system/src/components/N8nHeading/index.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nHeading/index.ts
diff --git a/packages/design-system/src/components/N8nIcon/Icon.stories.ts b/packages/frontend/@n8n/design-system/src/components/N8nIcon/Icon.stories.ts
similarity index 100%
rename from packages/design-system/src/components/N8nIcon/Icon.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nIcon/Icon.stories.ts
diff --git a/packages/design-system/src/components/N8nIcon/Icon.vue b/packages/frontend/@n8n/design-system/src/components/N8nIcon/Icon.vue
similarity index 92%
rename from packages/design-system/src/components/N8nIcon/Icon.vue
rename to packages/frontend/@n8n/design-system/src/components/N8nIcon/Icon.vue
index dc764fab24..d303d00e3a 100644
--- a/packages/design-system/src/components/N8nIcon/Icon.vue
+++ b/packages/frontend/@n8n/design-system/src/components/N8nIcon/Icon.vue
@@ -2,7 +2,7 @@
 import type { FontAwesomeIconProps } from '@fortawesome/vue-fontawesome';
 import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome';
 
-import type { IconSize, IconColor } from 'n8n-design-system/types/icon';
+import type { IconSize, IconColor } from '@n8n/design-system/types/icon';
 
 import N8nText from '../N8nText';
 
diff --git a/packages/design-system/src/components/N8nIcon/index.ts b/packages/frontend/@n8n/design-system/src/components/N8nIcon/index.ts
similarity index 100%
rename from packages/design-system/src/components/N8nIcon/index.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nIcon/index.ts
diff --git a/packages/design-system/src/components/N8nIconButton/IconButton.stories.ts b/packages/frontend/@n8n/design-system/src/components/N8nIconButton/IconButton.stories.ts
similarity index 100%
rename from packages/design-system/src/components/N8nIconButton/IconButton.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nIconButton/IconButton.stories.ts
diff --git a/packages/design-system/src/components/N8nIconButton/IconButton.vue b/packages/frontend/@n8n/design-system/src/components/N8nIconButton/IconButton.vue
similarity index 83%
rename from packages/design-system/src/components/N8nIconButton/IconButton.vue
rename to packages/frontend/@n8n/design-system/src/components/N8nIconButton/IconButton.vue
index 52770c1853..6c2170d49d 100644
--- a/packages/design-system/src/components/N8nIconButton/IconButton.vue
+++ b/packages/frontend/@n8n/design-system/src/components/N8nIconButton/IconButton.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import type { IconButtonProps } from 'n8n-design-system/types/button';
+import type { IconButtonProps } from '@n8n/design-system/types/button';
 
 import N8nButton from '../N8nButton';
 
diff --git a/packages/design-system/src/components/N8nIconButton/index.d.ts b/packages/frontend/@n8n/design-system/src/components/N8nIconButton/index.d.ts
similarity index 100%
rename from packages/design-system/src/components/N8nIconButton/index.d.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nIconButton/index.d.ts
diff --git a/packages/design-system/src/components/N8nIconButton/index.ts b/packages/frontend/@n8n/design-system/src/components/N8nIconButton/index.ts
similarity index 100%
rename from packages/design-system/src/components/N8nIconButton/index.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nIconButton/index.ts
diff --git a/packages/design-system/src/components/N8nIconPicker/IconPicker.stories.ts b/packages/frontend/@n8n/design-system/src/components/N8nIconPicker/IconPicker.stories.ts
similarity index 100%
rename from packages/design-system/src/components/N8nIconPicker/IconPicker.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nIconPicker/IconPicker.stories.ts
diff --git a/packages/design-system/src/components/N8nIconPicker/IconPicker.test.ts b/packages/frontend/@n8n/design-system/src/components/N8nIconPicker/IconPicker.test.ts
similarity index 100%
rename from packages/design-system/src/components/N8nIconPicker/IconPicker.test.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nIconPicker/IconPicker.test.ts
diff --git a/packages/design-system/src/components/N8nIconPicker/IconPicker.vue b/packages/frontend/@n8n/design-system/src/components/N8nIconPicker/IconPicker.vue
similarity index 100%
rename from packages/design-system/src/components/N8nIconPicker/IconPicker.vue
rename to packages/frontend/@n8n/design-system/src/components/N8nIconPicker/IconPicker.vue
diff --git a/packages/design-system/src/components/N8nIconPicker/constants.ts b/packages/frontend/@n8n/design-system/src/components/N8nIconPicker/constants.ts
similarity index 100%
rename from packages/design-system/src/components/N8nIconPicker/constants.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nIconPicker/constants.ts
diff --git a/packages/design-system/src/components/N8nIconPicker/index.ts b/packages/frontend/@n8n/design-system/src/components/N8nIconPicker/index.ts
similarity index 100%
rename from packages/design-system/src/components/N8nIconPicker/index.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nIconPicker/index.ts
diff --git a/packages/design-system/src/components/N8nInfoAccordion/InfoAccordion.stories.ts b/packages/frontend/@n8n/design-system/src/components/N8nInfoAccordion/InfoAccordion.stories.ts
similarity index 100%
rename from packages/design-system/src/components/N8nInfoAccordion/InfoAccordion.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nInfoAccordion/InfoAccordion.stories.ts
diff --git a/packages/design-system/src/components/N8nInfoAccordion/InfoAccordion.vue b/packages/frontend/@n8n/design-system/src/components/N8nInfoAccordion/InfoAccordion.vue
similarity index 98%
rename from packages/design-system/src/components/N8nInfoAccordion/InfoAccordion.vue
rename to packages/frontend/@n8n/design-system/src/components/N8nInfoAccordion/InfoAccordion.vue
index e84c18cc4c..7ef2af20f1 100644
--- a/packages/design-system/src/components/N8nInfoAccordion/InfoAccordion.vue
+++ b/packages/frontend/@n8n/design-system/src/components/N8nInfoAccordion/InfoAccordion.vue
@@ -2,7 +2,7 @@
 import { createEventBus, type EventBus } from '@n8n/utils/event-bus';
 import { onMounted, ref } from 'vue';
 
-import type { IconColor } from 'n8n-design-system/types/icon';
+import type { IconColor } from '@n8n/design-system/types/icon';
 
 import N8nIcon from '../N8nIcon';
 import N8nText from '../N8nText';
diff --git a/packages/design-system/src/components/N8nInfoAccordion/index.ts b/packages/frontend/@n8n/design-system/src/components/N8nInfoAccordion/index.ts
similarity index 100%
rename from packages/design-system/src/components/N8nInfoAccordion/index.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nInfoAccordion/index.ts
diff --git a/packages/design-system/src/components/N8nInfoTip/InfoTip.stories.ts b/packages/frontend/@n8n/design-system/src/components/N8nInfoTip/InfoTip.stories.ts
similarity index 100%
rename from packages/design-system/src/components/N8nInfoTip/InfoTip.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nInfoTip/InfoTip.stories.ts
diff --git a/packages/design-system/src/components/N8nInfoTip/InfoTip.test.ts b/packages/frontend/@n8n/design-system/src/components/N8nInfoTip/InfoTip.test.ts
similarity index 100%
rename from packages/design-system/src/components/N8nInfoTip/InfoTip.test.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nInfoTip/InfoTip.test.ts
diff --git a/packages/design-system/src/components/N8nInfoTip/InfoTip.vue b/packages/frontend/@n8n/design-system/src/components/N8nInfoTip/InfoTip.vue
similarity index 97%
rename from packages/design-system/src/components/N8nInfoTip/InfoTip.vue
rename to packages/frontend/@n8n/design-system/src/components/N8nInfoTip/InfoTip.vue
index 8ea89d8f8b..e80547c0fc 100644
--- a/packages/design-system/src/components/N8nInfoTip/InfoTip.vue
+++ b/packages/frontend/@n8n/design-system/src/components/N8nInfoTip/InfoTip.vue
@@ -2,7 +2,7 @@
 import type { Placement } from 'element-plus';
 import { computed } from 'vue';
 
-import type { IconColor } from 'n8n-design-system/types/icon';
+import type { IconColor } from '@n8n/design-system/types/icon';
 
 import N8nIcon from '../N8nIcon';
 import N8nTooltip from '../N8nTooltip';
diff --git a/packages/design-system/src/components/N8nInfoTip/__snapshots__/InfoTip.test.ts.snap b/packages/frontend/@n8n/design-system/src/components/N8nInfoTip/__snapshots__/InfoTip.test.ts.snap
similarity index 100%
rename from packages/design-system/src/components/N8nInfoTip/__snapshots__/InfoTip.test.ts.snap
rename to packages/frontend/@n8n/design-system/src/components/N8nInfoTip/__snapshots__/InfoTip.test.ts.snap
diff --git a/packages/design-system/src/components/N8nInfoTip/index.ts b/packages/frontend/@n8n/design-system/src/components/N8nInfoTip/index.ts
similarity index 100%
rename from packages/design-system/src/components/N8nInfoTip/index.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nInfoTip/index.ts
diff --git a/packages/design-system/src/components/N8nInput/Input.stories.ts b/packages/frontend/@n8n/design-system/src/components/N8nInput/Input.stories.ts
similarity index 100%
rename from packages/design-system/src/components/N8nInput/Input.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nInput/Input.stories.ts
diff --git a/packages/design-system/src/components/N8nInput/Input.test.ts b/packages/frontend/@n8n/design-system/src/components/N8nInput/Input.test.ts
similarity index 100%
rename from packages/design-system/src/components/N8nInput/Input.test.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nInput/Input.test.ts
diff --git a/packages/design-system/src/components/N8nInput/Input.vue b/packages/frontend/@n8n/design-system/src/components/N8nInput/Input.vue
similarity index 95%
rename from packages/design-system/src/components/N8nInput/Input.vue
rename to packages/frontend/@n8n/design-system/src/components/N8nInput/Input.vue
index 7df719728a..b622a349cd 100644
--- a/packages/design-system/src/components/N8nInput/Input.vue
+++ b/packages/frontend/@n8n/design-system/src/components/N8nInput/Input.vue
@@ -2,8 +2,8 @@
 import { ElInput } from 'element-plus';
 import { computed, ref } from 'vue';
 
-import type { ElementPlusSizePropType, InputAutocompletePropType } from 'n8n-design-system/types';
-import type { InputSize, InputType } from 'n8n-design-system/types/input';
+import type { ElementPlusSizePropType, InputAutocompletePropType } from '@n8n/design-system/types';
+import type { InputSize, InputType } from '@n8n/design-system/types/input';
 
 import { uid } from '../../utils';
 
diff --git a/packages/design-system/src/components/N8nInput/__snapshots__/Input.test.ts.snap b/packages/frontend/@n8n/design-system/src/components/N8nInput/__snapshots__/Input.test.ts.snap
similarity index 100%
rename from packages/design-system/src/components/N8nInput/__snapshots__/Input.test.ts.snap
rename to packages/frontend/@n8n/design-system/src/components/N8nInput/__snapshots__/Input.test.ts.snap
diff --git a/packages/design-system/src/components/N8nInput/index.ts b/packages/frontend/@n8n/design-system/src/components/N8nInput/index.ts
similarity index 100%
rename from packages/design-system/src/components/N8nInput/index.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nInput/index.ts
diff --git a/packages/design-system/src/components/N8nInputLabel/InputLabel.stories.ts b/packages/frontend/@n8n/design-system/src/components/N8nInputLabel/InputLabel.stories.ts
similarity index 100%
rename from packages/design-system/src/components/N8nInputLabel/InputLabel.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nInputLabel/InputLabel.stories.ts
diff --git a/packages/design-system/src/components/N8nInputLabel/InputLabel.test.ts b/packages/frontend/@n8n/design-system/src/components/N8nInputLabel/InputLabel.test.ts
similarity index 100%
rename from packages/design-system/src/components/N8nInputLabel/InputLabel.test.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nInputLabel/InputLabel.test.ts
diff --git a/packages/design-system/src/components/N8nInputLabel/InputLabel.vue b/packages/frontend/@n8n/design-system/src/components/N8nInputLabel/InputLabel.vue
similarity index 98%
rename from packages/design-system/src/components/N8nInputLabel/InputLabel.vue
rename to packages/frontend/@n8n/design-system/src/components/N8nInputLabel/InputLabel.vue
index 2224528c1e..b08090bbed 100644
--- a/packages/design-system/src/components/N8nInputLabel/InputLabel.vue
+++ b/packages/frontend/@n8n/design-system/src/components/N8nInputLabel/InputLabel.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import type { TextColor } from 'n8n-design-system/types/text';
+import type { TextColor } from '@n8n/design-system/types/text';
 
 import N8nIcon from '../N8nIcon';
 import N8nText from '../N8nText';
diff --git a/packages/design-system/src/components/N8nInputLabel/__snapshots__/InputLabel.test.ts.snap b/packages/frontend/@n8n/design-system/src/components/N8nInputLabel/__snapshots__/InputLabel.test.ts.snap
similarity index 100%
rename from packages/design-system/src/components/N8nInputLabel/__snapshots__/InputLabel.test.ts.snap
rename to packages/frontend/@n8n/design-system/src/components/N8nInputLabel/__snapshots__/InputLabel.test.ts.snap
diff --git a/packages/design-system/src/components/N8nInputLabel/index.ts b/packages/frontend/@n8n/design-system/src/components/N8nInputLabel/index.ts
similarity index 100%
rename from packages/design-system/src/components/N8nInputLabel/index.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nInputLabel/index.ts
diff --git a/packages/design-system/src/components/N8nInputNumber/InputNumber.stories.ts b/packages/frontend/@n8n/design-system/src/components/N8nInputNumber/InputNumber.stories.ts
similarity index 100%
rename from packages/design-system/src/components/N8nInputNumber/InputNumber.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nInputNumber/InputNumber.stories.ts
diff --git a/packages/design-system/src/components/N8nInputNumber/InputNumber.vue b/packages/frontend/@n8n/design-system/src/components/N8nInputNumber/InputNumber.vue
similarity index 87%
rename from packages/design-system/src/components/N8nInputNumber/InputNumber.vue
rename to packages/frontend/@n8n/design-system/src/components/N8nInputNumber/InputNumber.vue
index de90395ef5..829f4dd5da 100644
--- a/packages/design-system/src/components/N8nInputNumber/InputNumber.vue
+++ b/packages/frontend/@n8n/design-system/src/components/N8nInputNumber/InputNumber.vue
@@ -2,7 +2,7 @@
 import { ElInputNumber } from 'element-plus';
 import { computed } from 'vue';
 
-import type { ElementPlusSizePropType, InputSize } from 'n8n-design-system/types';
+import type { ElementPlusSizePropType, InputSize } from '@n8n/design-system/types';
 
 type InputNumberProps = {
 	size?: InputSize;
diff --git a/packages/design-system/src/components/N8nInputNumber/index.ts b/packages/frontend/@n8n/design-system/src/components/N8nInputNumber/index.ts
similarity index 100%
rename from packages/design-system/src/components/N8nInputNumber/index.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nInputNumber/index.ts
diff --git a/packages/design-system/src/components/N8nKeyboardShortcut/KeyboardShortcut.stories.ts b/packages/frontend/@n8n/design-system/src/components/N8nKeyboardShortcut/KeyboardShortcut.stories.ts
similarity index 100%
rename from packages/design-system/src/components/N8nKeyboardShortcut/KeyboardShortcut.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nKeyboardShortcut/KeyboardShortcut.stories.ts
diff --git a/packages/design-system/src/components/N8nKeyboardShortcut/N8nKeyboardShortcut.vue b/packages/frontend/@n8n/design-system/src/components/N8nKeyboardShortcut/N8nKeyboardShortcut.vue
similarity index 100%
rename from packages/design-system/src/components/N8nKeyboardShortcut/N8nKeyboardShortcut.vue
rename to packages/frontend/@n8n/design-system/src/components/N8nKeyboardShortcut/N8nKeyboardShortcut.vue
diff --git a/packages/design-system/src/components/N8nKeyboardShortcut/index.ts b/packages/frontend/@n8n/design-system/src/components/N8nKeyboardShortcut/index.ts
similarity index 100%
rename from packages/design-system/src/components/N8nKeyboardShortcut/index.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nKeyboardShortcut/index.ts
diff --git a/packages/design-system/src/components/N8nLink/Link.stories.ts b/packages/frontend/@n8n/design-system/src/components/N8nLink/Link.stories.ts
similarity index 100%
rename from packages/design-system/src/components/N8nLink/Link.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nLink/Link.stories.ts
diff --git a/packages/design-system/src/components/N8nLink/Link.vue b/packages/frontend/@n8n/design-system/src/components/N8nLink/Link.vue
similarity index 96%
rename from packages/design-system/src/components/N8nLink/Link.vue
rename to packages/frontend/@n8n/design-system/src/components/N8nLink/Link.vue
index 2f3f5e88c8..457cfe060d 100644
--- a/packages/design-system/src/components/N8nLink/Link.vue
+++ b/packages/frontend/@n8n/design-system/src/components/N8nLink/Link.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import type { RouteLocationRaw } from 'vue-router';
 
-import type { TextSize } from 'n8n-design-system/types/text';
+import type { TextSize } from '@n8n/design-system/types/text';
 
 import N8nRoute from '../N8nRoute';
 import N8nText from '../N8nText';
diff --git a/packages/design-system/src/components/N8nLink/index.ts b/packages/frontend/@n8n/design-system/src/components/N8nLink/index.ts
similarity index 100%
rename from packages/design-system/src/components/N8nLink/index.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nLink/index.ts
diff --git a/packages/design-system/src/components/N8nLoading/Loading.stories.ts b/packages/frontend/@n8n/design-system/src/components/N8nLoading/Loading.stories.ts
similarity index 100%
rename from packages/design-system/src/components/N8nLoading/Loading.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nLoading/Loading.stories.ts
diff --git a/packages/design-system/src/components/N8nLoading/Loading.vue b/packages/frontend/@n8n/design-system/src/components/N8nLoading/Loading.vue
similarity index 100%
rename from packages/design-system/src/components/N8nLoading/Loading.vue
rename to packages/frontend/@n8n/design-system/src/components/N8nLoading/Loading.vue
diff --git a/packages/design-system/src/components/N8nLoading/index.ts b/packages/frontend/@n8n/design-system/src/components/N8nLoading/index.ts
similarity index 100%
rename from packages/design-system/src/components/N8nLoading/index.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nLoading/index.ts
diff --git a/packages/design-system/src/components/N8nMarkdown/Markdown.stories.ts b/packages/frontend/@n8n/design-system/src/components/N8nMarkdown/Markdown.stories.ts
similarity index 100%
rename from packages/design-system/src/components/N8nMarkdown/Markdown.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nMarkdown/Markdown.stories.ts
diff --git a/packages/design-system/src/components/N8nMarkdown/Markdown.test.ts b/packages/frontend/@n8n/design-system/src/components/N8nMarkdown/Markdown.test.ts
similarity index 97%
rename from packages/design-system/src/components/N8nMarkdown/Markdown.test.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nMarkdown/Markdown.test.ts
index 0e77779b5d..63b085a159 100644
--- a/packages/design-system/src/components/N8nMarkdown/Markdown.test.ts
+++ b/packages/frontend/@n8n/design-system/src/components/N8nMarkdown/Markdown.test.ts
@@ -1,6 +1,6 @@
 import { render, fireEvent } from '@testing-library/vue';
 
-import { n8nHtml } from 'n8n-design-system/directives';
+import { n8nHtml } from '@n8n/design-system/directives';
 
 import N8nMarkdown from './Markdown.vue';
 
diff --git a/packages/design-system/src/components/N8nMarkdown/Markdown.vue b/packages/frontend/@n8n/design-system/src/components/N8nMarkdown/Markdown.vue
similarity index 100%
rename from packages/design-system/src/components/N8nMarkdown/Markdown.vue
rename to packages/frontend/@n8n/design-system/src/components/N8nMarkdown/Markdown.vue
diff --git a/packages/design-system/src/components/N8nMarkdown/index.ts b/packages/frontend/@n8n/design-system/src/components/N8nMarkdown/index.ts
similarity index 100%
rename from packages/design-system/src/components/N8nMarkdown/index.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nMarkdown/index.ts
diff --git a/packages/design-system/src/components/N8nMenu/Menu.stories.ts b/packages/frontend/@n8n/design-system/src/components/N8nMenu/Menu.stories.ts
similarity index 100%
rename from packages/design-system/src/components/N8nMenu/Menu.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nMenu/Menu.stories.ts
diff --git a/packages/design-system/src/components/N8nMenu/Menu.vue b/packages/frontend/@n8n/design-system/src/components/N8nMenu/Menu.vue
similarity index 100%
rename from packages/design-system/src/components/N8nMenu/Menu.vue
rename to packages/frontend/@n8n/design-system/src/components/N8nMenu/Menu.vue
diff --git a/packages/design-system/src/components/N8nMenu/index.ts b/packages/frontend/@n8n/design-system/src/components/N8nMenu/index.ts
similarity index 100%
rename from packages/design-system/src/components/N8nMenu/index.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nMenu/index.ts
diff --git a/packages/design-system/src/components/N8nMenuItem/MenuItem.stories.ts b/packages/frontend/@n8n/design-system/src/components/N8nMenuItem/MenuItem.stories.ts
similarity index 100%
rename from packages/design-system/src/components/N8nMenuItem/MenuItem.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nMenuItem/MenuItem.stories.ts
diff --git a/packages/design-system/src/components/N8nMenuItem/MenuItem.vue b/packages/frontend/@n8n/design-system/src/components/N8nMenuItem/MenuItem.vue
similarity index 100%
rename from packages/design-system/src/components/N8nMenuItem/MenuItem.vue
rename to packages/frontend/@n8n/design-system/src/components/N8nMenuItem/MenuItem.vue
diff --git a/packages/design-system/src/components/N8nMenuItem/index.ts b/packages/frontend/@n8n/design-system/src/components/N8nMenuItem/index.ts
similarity index 100%
rename from packages/design-system/src/components/N8nMenuItem/index.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nMenuItem/index.ts
diff --git a/packages/design-system/src/components/N8nMenuItem/routerUtil.ts b/packages/frontend/@n8n/design-system/src/components/N8nMenuItem/routerUtil.ts
similarity index 95%
rename from packages/design-system/src/components/N8nMenuItem/routerUtil.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nMenuItem/routerUtil.ts
index 30d4c20b38..4588ccc350 100644
--- a/packages/design-system/src/components/N8nMenuItem/routerUtil.ts
+++ b/packages/frontend/@n8n/design-system/src/components/N8nMenuItem/routerUtil.ts
@@ -1,6 +1,6 @@
 import type { RouteLocationNormalizedLoaded, RouteLocationRaw } from 'vue-router';
 
-import type { IMenuItem } from 'n8n-design-system/types';
+import type { IMenuItem } from '@n8n/design-system/types';
 
 /**
  * Checks if the given menu item matches the current route.
diff --git a/packages/design-system/src/components/N8nNavigationDropdown/NavigationDropdown.stories.ts b/packages/frontend/@n8n/design-system/src/components/N8nNavigationDropdown/NavigationDropdown.stories.ts
similarity index 100%
rename from packages/design-system/src/components/N8nNavigationDropdown/NavigationDropdown.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nNavigationDropdown/NavigationDropdown.stories.ts
diff --git a/packages/design-system/src/components/N8nNavigationDropdown/NavigationDropdown.test.ts b/packages/frontend/@n8n/design-system/src/components/N8nNavigationDropdown/NavigationDropdown.test.ts
similarity index 100%
rename from packages/design-system/src/components/N8nNavigationDropdown/NavigationDropdown.test.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nNavigationDropdown/NavigationDropdown.test.ts
diff --git a/packages/design-system/src/components/N8nNavigationDropdown/NavigationDropdown.vue b/packages/frontend/@n8n/design-system/src/components/N8nNavigationDropdown/NavigationDropdown.vue
similarity index 100%
rename from packages/design-system/src/components/N8nNavigationDropdown/NavigationDropdown.vue
rename to packages/frontend/@n8n/design-system/src/components/N8nNavigationDropdown/NavigationDropdown.vue
diff --git a/packages/design-system/src/components/N8nNavigationDropdown/index.ts b/packages/frontend/@n8n/design-system/src/components/N8nNavigationDropdown/index.ts
similarity index 100%
rename from packages/design-system/src/components/N8nNavigationDropdown/index.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nNavigationDropdown/index.ts
diff --git a/packages/design-system/src/components/N8nNodeCreatorNode/NodeCreatorNode.stories.ts b/packages/frontend/@n8n/design-system/src/components/N8nNodeCreatorNode/NodeCreatorNode.stories.ts
similarity index 100%
rename from packages/design-system/src/components/N8nNodeCreatorNode/NodeCreatorNode.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nNodeCreatorNode/NodeCreatorNode.stories.ts
diff --git a/packages/design-system/src/components/N8nNodeCreatorNode/NodeCreatorNode.vue b/packages/frontend/@n8n/design-system/src/components/N8nNodeCreatorNode/NodeCreatorNode.vue
similarity index 100%
rename from packages/design-system/src/components/N8nNodeCreatorNode/NodeCreatorNode.vue
rename to packages/frontend/@n8n/design-system/src/components/N8nNodeCreatorNode/NodeCreatorNode.vue
diff --git a/packages/design-system/src/components/N8nNodeCreatorNode/index.ts b/packages/frontend/@n8n/design-system/src/components/N8nNodeCreatorNode/index.ts
similarity index 100%
rename from packages/design-system/src/components/N8nNodeCreatorNode/index.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nNodeCreatorNode/index.ts
diff --git a/packages/design-system/src/components/N8nNodeIcon/NodeIcon.stories.ts b/packages/frontend/@n8n/design-system/src/components/N8nNodeIcon/NodeIcon.stories.ts
similarity index 100%
rename from packages/design-system/src/components/N8nNodeIcon/NodeIcon.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nNodeIcon/NodeIcon.stories.ts
diff --git a/packages/design-system/src/components/N8nNodeIcon/NodeIcon.vue b/packages/frontend/@n8n/design-system/src/components/N8nNodeIcon/NodeIcon.vue
similarity index 100%
rename from packages/design-system/src/components/N8nNodeIcon/NodeIcon.vue
rename to packages/frontend/@n8n/design-system/src/components/N8nNodeIcon/NodeIcon.vue
diff --git a/packages/design-system/src/components/N8nNodeIcon/index.ts b/packages/frontend/@n8n/design-system/src/components/N8nNodeIcon/index.ts
similarity index 100%
rename from packages/design-system/src/components/N8nNodeIcon/index.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nNodeIcon/index.ts
diff --git a/packages/design-system/src/components/N8nNotice/Notice.stories.ts b/packages/frontend/@n8n/design-system/src/components/N8nNotice/Notice.stories.ts
similarity index 100%
rename from packages/design-system/src/components/N8nNotice/Notice.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nNotice/Notice.stories.ts
diff --git a/packages/design-system/src/components/N8nNotice/Notice.test.ts b/packages/frontend/@n8n/design-system/src/components/N8nNotice/Notice.test.ts
similarity index 93%
rename from packages/design-system/src/components/N8nNotice/Notice.test.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nNotice/Notice.test.ts
index 8ef26d1a9c..46a7ffbaec 100644
--- a/packages/design-system/src/components/N8nNotice/Notice.test.ts
+++ b/packages/frontend/@n8n/design-system/src/components/N8nNotice/Notice.test.ts
@@ -1,7 +1,7 @@
 import { render } from '@testing-library/vue';
 
-import { N8nText } from 'n8n-design-system/components';
-import { n8nHtml } from 'n8n-design-system/directives';
+import { N8nText } from '@n8n/design-system/components';
+import { n8nHtml } from '@n8n/design-system/directives';
 
 import N8nNotice from './Notice.vue';
 
diff --git a/packages/design-system/src/components/N8nNotice/Notice.vue b/packages/frontend/@n8n/design-system/src/components/N8nNotice/Notice.vue
similarity index 100%
rename from packages/design-system/src/components/N8nNotice/Notice.vue
rename to packages/frontend/@n8n/design-system/src/components/N8nNotice/Notice.vue
diff --git a/packages/design-system/src/components/N8nNotice/__snapshots__/Notice.test.ts.snap b/packages/frontend/@n8n/design-system/src/components/N8nNotice/__snapshots__/Notice.test.ts.snap
similarity index 100%
rename from packages/design-system/src/components/N8nNotice/__snapshots__/Notice.test.ts.snap
rename to packages/frontend/@n8n/design-system/src/components/N8nNotice/__snapshots__/Notice.test.ts.snap
diff --git a/packages/design-system/src/components/N8nNotice/index.ts b/packages/frontend/@n8n/design-system/src/components/N8nNotice/index.ts
similarity index 100%
rename from packages/design-system/src/components/N8nNotice/index.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nNotice/index.ts
diff --git a/packages/design-system/src/components/N8nOption/Option.vue b/packages/frontend/@n8n/design-system/src/components/N8nOption/Option.vue
similarity index 100%
rename from packages/design-system/src/components/N8nOption/Option.vue
rename to packages/frontend/@n8n/design-system/src/components/N8nOption/Option.vue
diff --git a/packages/design-system/src/components/N8nOption/index.ts b/packages/frontend/@n8n/design-system/src/components/N8nOption/index.ts
similarity index 100%
rename from packages/design-system/src/components/N8nOption/index.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nOption/index.ts
diff --git a/packages/design-system/src/components/N8nPagination/Pagination.stories.ts b/packages/frontend/@n8n/design-system/src/components/N8nPagination/Pagination.stories.ts
similarity index 100%
rename from packages/design-system/src/components/N8nPagination/Pagination.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nPagination/Pagination.stories.ts
diff --git a/packages/design-system/src/components/N8nPagination/Pagination.vue b/packages/frontend/@n8n/design-system/src/components/N8nPagination/Pagination.vue
similarity index 100%
rename from packages/design-system/src/components/N8nPagination/Pagination.vue
rename to packages/frontend/@n8n/design-system/src/components/N8nPagination/Pagination.vue
diff --git a/packages/design-system/src/components/N8nPagination/index.ts b/packages/frontend/@n8n/design-system/src/components/N8nPagination/index.ts
similarity index 100%
rename from packages/design-system/src/components/N8nPagination/index.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nPagination/index.ts
diff --git a/packages/design-system/src/components/N8nPopover/Popover.stories.ts b/packages/frontend/@n8n/design-system/src/components/N8nPopover/Popover.stories.ts
similarity index 100%
rename from packages/design-system/src/components/N8nPopover/Popover.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nPopover/Popover.stories.ts
diff --git a/packages/design-system/src/components/N8nPopover/Popover.vue b/packages/frontend/@n8n/design-system/src/components/N8nPopover/Popover.vue
similarity index 100%
rename from packages/design-system/src/components/N8nPopover/Popover.vue
rename to packages/frontend/@n8n/design-system/src/components/N8nPopover/Popover.vue
diff --git a/packages/design-system/src/components/N8nPopover/index.ts b/packages/frontend/@n8n/design-system/src/components/N8nPopover/index.ts
similarity index 100%
rename from packages/design-system/src/components/N8nPopover/index.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nPopover/index.ts
diff --git a/packages/design-system/src/components/N8nPulse/Pulse.stories.ts b/packages/frontend/@n8n/design-system/src/components/N8nPulse/Pulse.stories.ts
similarity index 100%
rename from packages/design-system/src/components/N8nPulse/Pulse.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nPulse/Pulse.stories.ts
diff --git a/packages/design-system/src/components/N8nPulse/Pulse.vue b/packages/frontend/@n8n/design-system/src/components/N8nPulse/Pulse.vue
similarity index 100%
rename from packages/design-system/src/components/N8nPulse/Pulse.vue
rename to packages/frontend/@n8n/design-system/src/components/N8nPulse/Pulse.vue
diff --git a/packages/design-system/src/components/N8nPulse/index.ts b/packages/frontend/@n8n/design-system/src/components/N8nPulse/index.ts
similarity index 100%
rename from packages/design-system/src/components/N8nPulse/index.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nPulse/index.ts
diff --git a/packages/design-system/src/components/N8nRadioButtons/RadioButton.vue b/packages/frontend/@n8n/design-system/src/components/N8nRadioButtons/RadioButton.vue
similarity index 100%
rename from packages/design-system/src/components/N8nRadioButtons/RadioButton.vue
rename to packages/frontend/@n8n/design-system/src/components/N8nRadioButtons/RadioButton.vue
diff --git a/packages/design-system/src/components/N8nRadioButtons/RadioButtons.stories.ts b/packages/frontend/@n8n/design-system/src/components/N8nRadioButtons/RadioButtons.stories.ts
similarity index 100%
rename from packages/design-system/src/components/N8nRadioButtons/RadioButtons.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nRadioButtons/RadioButtons.stories.ts
diff --git a/packages/design-system/src/components/N8nRadioButtons/RadioButtons.vue b/packages/frontend/@n8n/design-system/src/components/N8nRadioButtons/RadioButtons.vue
similarity index 100%
rename from packages/design-system/src/components/N8nRadioButtons/RadioButtons.vue
rename to packages/frontend/@n8n/design-system/src/components/N8nRadioButtons/RadioButtons.vue
diff --git a/packages/design-system/src/components/N8nRadioButtons/index.ts b/packages/frontend/@n8n/design-system/src/components/N8nRadioButtons/index.ts
similarity index 100%
rename from packages/design-system/src/components/N8nRadioButtons/index.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nRadioButtons/index.ts
diff --git a/packages/design-system/src/components/N8nRecycleScroller/RecycleScroller.stories.ts b/packages/frontend/@n8n/design-system/src/components/N8nRecycleScroller/RecycleScroller.stories.ts
similarity index 100%
rename from packages/design-system/src/components/N8nRecycleScroller/RecycleScroller.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nRecycleScroller/RecycleScroller.stories.ts
diff --git a/packages/design-system/src/components/N8nRecycleScroller/RecycleScroller.test.ts b/packages/frontend/@n8n/design-system/src/components/N8nRecycleScroller/RecycleScroller.test.ts
similarity index 100%
rename from packages/design-system/src/components/N8nRecycleScroller/RecycleScroller.test.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nRecycleScroller/RecycleScroller.test.ts
diff --git a/packages/design-system/src/components/N8nRecycleScroller/RecycleScroller.vue b/packages/frontend/@n8n/design-system/src/components/N8nRecycleScroller/RecycleScroller.vue
similarity index 100%
rename from packages/design-system/src/components/N8nRecycleScroller/RecycleScroller.vue
rename to packages/frontend/@n8n/design-system/src/components/N8nRecycleScroller/RecycleScroller.vue
diff --git a/packages/design-system/src/components/N8nRecycleScroller/__snapshots__/RecycleScroller.test.ts.snap b/packages/frontend/@n8n/design-system/src/components/N8nRecycleScroller/__snapshots__/RecycleScroller.test.ts.snap
similarity index 100%
rename from packages/design-system/src/components/N8nRecycleScroller/__snapshots__/RecycleScroller.test.ts.snap
rename to packages/frontend/@n8n/design-system/src/components/N8nRecycleScroller/__snapshots__/RecycleScroller.test.ts.snap
diff --git a/packages/design-system/src/components/N8nRecycleScroller/index.ts b/packages/frontend/@n8n/design-system/src/components/N8nRecycleScroller/index.ts
similarity index 100%
rename from packages/design-system/src/components/N8nRecycleScroller/index.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nRecycleScroller/index.ts
diff --git a/packages/design-system/src/components/N8nResizeWrapper/ResizeWrapper.stories.ts b/packages/frontend/@n8n/design-system/src/components/N8nResizeWrapper/ResizeWrapper.stories.ts
similarity index 100%
rename from packages/design-system/src/components/N8nResizeWrapper/ResizeWrapper.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nResizeWrapper/ResizeWrapper.stories.ts
diff --git a/packages/design-system/src/components/N8nResizeWrapper/ResizeWrapper.vue b/packages/frontend/@n8n/design-system/src/components/N8nResizeWrapper/ResizeWrapper.vue
similarity index 99%
rename from packages/design-system/src/components/N8nResizeWrapper/ResizeWrapper.vue
rename to packages/frontend/@n8n/design-system/src/components/N8nResizeWrapper/ResizeWrapper.vue
index f4804a37fc..e1bbb58c33 100644
--- a/packages/design-system/src/components/N8nResizeWrapper/ResizeWrapper.vue
+++ b/packages/frontend/@n8n/design-system/src/components/N8nResizeWrapper/ResizeWrapper.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import { computed, ref, useCssModule } from 'vue';
 
-import { directionsCursorMaps, type Direction, type ResizeData } from 'n8n-design-system/types';
+import { directionsCursorMaps, type Direction, type ResizeData } from '@n8n/design-system/types';
 
 function closestNumber(value: number, divisor: number): number {
 	const q = value / divisor;
diff --git a/packages/design-system/src/components/N8nResizeWrapper/index.ts b/packages/frontend/@n8n/design-system/src/components/N8nResizeWrapper/index.ts
similarity index 100%
rename from packages/design-system/src/components/N8nResizeWrapper/index.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nResizeWrapper/index.ts
diff --git a/packages/design-system/src/components/N8nResizeableSticky/ResizeableSticky.stories.ts b/packages/frontend/@n8n/design-system/src/components/N8nResizeableSticky/ResizeableSticky.stories.ts
similarity index 100%
rename from packages/design-system/src/components/N8nResizeableSticky/ResizeableSticky.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nResizeableSticky/ResizeableSticky.stories.ts
diff --git a/packages/design-system/src/components/N8nResizeableSticky/ResizeableSticky.vue b/packages/frontend/@n8n/design-system/src/components/N8nResizeableSticky/ResizeableSticky.vue
similarity index 96%
rename from packages/design-system/src/components/N8nResizeableSticky/ResizeableSticky.vue
rename to packages/frontend/@n8n/design-system/src/components/N8nResizeableSticky/ResizeableSticky.vue
index 81f74bbe9a..48ce776bbd 100644
--- a/packages/design-system/src/components/N8nResizeableSticky/ResizeableSticky.vue
+++ b/packages/frontend/@n8n/design-system/src/components/N8nResizeableSticky/ResizeableSticky.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import { computed, ref, useAttrs } from 'vue';
 
-import { type ResizeData } from 'n8n-design-system/types';
+import { type ResizeData } from '@n8n/design-system/types';
 
 import N8nResizeWrapper from '../N8nResizeWrapper/ResizeWrapper.vue';
 import { defaultStickyProps } from '../N8nSticky/constants';
diff --git a/packages/design-system/src/components/N8nResizeableSticky/index.ts b/packages/frontend/@n8n/design-system/src/components/N8nResizeableSticky/index.ts
similarity index 100%
rename from packages/design-system/src/components/N8nResizeableSticky/index.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nResizeableSticky/index.ts
diff --git a/packages/design-system/src/components/N8nRoute/Route.test.ts b/packages/frontend/@n8n/design-system/src/components/N8nRoute/Route.test.ts
similarity index 100%
rename from packages/design-system/src/components/N8nRoute/Route.test.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nRoute/Route.test.ts
diff --git a/packages/design-system/src/components/N8nRoute/Route.vue b/packages/frontend/@n8n/design-system/src/components/N8nRoute/Route.vue
similarity index 100%
rename from packages/design-system/src/components/N8nRoute/Route.vue
rename to packages/frontend/@n8n/design-system/src/components/N8nRoute/Route.vue
diff --git a/packages/design-system/src/components/N8nRoute/__snapshots__/Route.test.ts.snap b/packages/frontend/@n8n/design-system/src/components/N8nRoute/__snapshots__/Route.test.ts.snap
similarity index 100%
rename from packages/design-system/src/components/N8nRoute/__snapshots__/Route.test.ts.snap
rename to packages/frontend/@n8n/design-system/src/components/N8nRoute/__snapshots__/Route.test.ts.snap
diff --git a/packages/design-system/src/components/N8nRoute/index.ts b/packages/frontend/@n8n/design-system/src/components/N8nRoute/index.ts
similarity index 100%
rename from packages/design-system/src/components/N8nRoute/index.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nRoute/index.ts
diff --git a/packages/design-system/src/components/N8nSelect/Select.stories.ts b/packages/frontend/@n8n/design-system/src/components/N8nSelect/Select.stories.ts
similarity index 100%
rename from packages/design-system/src/components/N8nSelect/Select.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nSelect/Select.stories.ts
diff --git a/packages/design-system/src/components/N8nSelect/Select.test.ts b/packages/frontend/@n8n/design-system/src/components/N8nSelect/Select.test.ts
similarity index 96%
rename from packages/design-system/src/components/N8nSelect/Select.test.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nSelect/Select.test.ts
index 9aafcf2bff..4314067445 100644
--- a/packages/design-system/src/components/N8nSelect/Select.test.ts
+++ b/packages/frontend/@n8n/design-system/src/components/N8nSelect/Select.test.ts
@@ -2,7 +2,7 @@ import userEvent from '@testing-library/user-event';
 import { render, waitFor, within } from '@testing-library/vue';
 import { defineComponent, ref } from 'vue';
 
-import { removeDynamicAttributes } from 'n8n-design-system/utils';
+import { removeDynamicAttributes } from '@n8n/design-system/utils';
 
 import N8nSelect from './Select.vue';
 import N8nOption from '../N8nOption/Option.vue';
diff --git a/packages/design-system/src/components/N8nSelect/Select.vue b/packages/frontend/@n8n/design-system/src/components/N8nSelect/Select.vue
similarity index 98%
rename from packages/design-system/src/components/N8nSelect/Select.vue
rename to packages/frontend/@n8n/design-system/src/components/N8nSelect/Select.vue
index 28c1fc049a..fc62e3cc16 100644
--- a/packages/design-system/src/components/N8nSelect/Select.vue
+++ b/packages/frontend/@n8n/design-system/src/components/N8nSelect/Select.vue
@@ -3,7 +3,7 @@ import { ElSelect } from 'element-plus';
 import type { PropType } from 'vue';
 import { computed, ref, useAttrs } from 'vue';
 
-import type { SelectSize } from 'n8n-design-system/types';
+import type { SelectSize } from '@n8n/design-system/types';
 
 import { isEventBindingElementAttribute } from '../../utils';
 
diff --git a/packages/design-system/src/components/N8nSelect/__snapshots__/Select.test.ts.snap b/packages/frontend/@n8n/design-system/src/components/N8nSelect/__snapshots__/Select.test.ts.snap
similarity index 100%
rename from packages/design-system/src/components/N8nSelect/__snapshots__/Select.test.ts.snap
rename to packages/frontend/@n8n/design-system/src/components/N8nSelect/__snapshots__/Select.test.ts.snap
diff --git a/packages/design-system/src/components/N8nSelect/index.ts b/packages/frontend/@n8n/design-system/src/components/N8nSelect/index.ts
similarity index 100%
rename from packages/design-system/src/components/N8nSelect/index.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nSelect/index.ts
diff --git a/packages/design-system/src/components/N8nSelectableList/SelectableList.stories.ts b/packages/frontend/@n8n/design-system/src/components/N8nSelectableList/SelectableList.stories.ts
similarity index 100%
rename from packages/design-system/src/components/N8nSelectableList/SelectableList.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nSelectableList/SelectableList.stories.ts
diff --git a/packages/design-system/src/components/N8nSelectableList/SelectableList.test.ts b/packages/frontend/@n8n/design-system/src/components/N8nSelectableList/SelectableList.test.ts
similarity index 100%
rename from packages/design-system/src/components/N8nSelectableList/SelectableList.test.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nSelectableList/SelectableList.test.ts
diff --git a/packages/design-system/src/components/N8nSelectableList/SelectableList.vue b/packages/frontend/@n8n/design-system/src/components/N8nSelectableList/SelectableList.vue
similarity index 100%
rename from packages/design-system/src/components/N8nSelectableList/SelectableList.vue
rename to packages/frontend/@n8n/design-system/src/components/N8nSelectableList/SelectableList.vue
diff --git a/packages/design-system/src/components/N8nSelectableList/__snapshots__/SelectableList.test.ts.snap b/packages/frontend/@n8n/design-system/src/components/N8nSelectableList/__snapshots__/SelectableList.test.ts.snap
similarity index 100%
rename from packages/design-system/src/components/N8nSelectableList/__snapshots__/SelectableList.test.ts.snap
rename to packages/frontend/@n8n/design-system/src/components/N8nSelectableList/__snapshots__/SelectableList.test.ts.snap
diff --git a/packages/design-system/src/components/N8nSelectableList/index.ts b/packages/frontend/@n8n/design-system/src/components/N8nSelectableList/index.ts
similarity index 100%
rename from packages/design-system/src/components/N8nSelectableList/index.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nSelectableList/index.ts
diff --git a/packages/design-system/src/components/N8nSpinner/Spinner.stories.ts b/packages/frontend/@n8n/design-system/src/components/N8nSpinner/Spinner.stories.ts
similarity index 100%
rename from packages/design-system/src/components/N8nSpinner/Spinner.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nSpinner/Spinner.stories.ts
diff --git a/packages/design-system/src/components/N8nSpinner/Spinner.vue b/packages/frontend/@n8n/design-system/src/components/N8nSpinner/Spinner.vue
similarity index 95%
rename from packages/design-system/src/components/N8nSpinner/Spinner.vue
rename to packages/frontend/@n8n/design-system/src/components/N8nSpinner/Spinner.vue
index ddee4f4d76..afd72e1a8c 100644
--- a/packages/design-system/src/components/N8nSpinner/Spinner.vue
+++ b/packages/frontend/@n8n/design-system/src/components/N8nSpinner/Spinner.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import type { TextSize } from 'n8n-design-system/types/text';
+import type { TextSize } from '@n8n/design-system/types/text';
 
 import N8nIcon from '../N8nIcon';
 
diff --git a/packages/design-system/src/components/N8nSpinner/index.d.ts b/packages/frontend/@n8n/design-system/src/components/N8nSpinner/index.d.ts
similarity index 100%
rename from packages/design-system/src/components/N8nSpinner/index.d.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nSpinner/index.d.ts
diff --git a/packages/design-system/src/components/N8nSpinner/index.ts b/packages/frontend/@n8n/design-system/src/components/N8nSpinner/index.ts
similarity index 100%
rename from packages/design-system/src/components/N8nSpinner/index.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nSpinner/index.ts
diff --git a/packages/design-system/src/components/N8nSticky/Sticky.stories.ts b/packages/frontend/@n8n/design-system/src/components/N8nSticky/Sticky.stories.ts
similarity index 100%
rename from packages/design-system/src/components/N8nSticky/Sticky.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nSticky/Sticky.stories.ts
diff --git a/packages/design-system/src/components/N8nSticky/Sticky.vue b/packages/frontend/@n8n/design-system/src/components/N8nSticky/Sticky.vue
similarity index 100%
rename from packages/design-system/src/components/N8nSticky/Sticky.vue
rename to packages/frontend/@n8n/design-system/src/components/N8nSticky/Sticky.vue
diff --git a/packages/design-system/src/components/N8nSticky/constants.ts b/packages/frontend/@n8n/design-system/src/components/N8nSticky/constants.ts
similarity index 100%
rename from packages/design-system/src/components/N8nSticky/constants.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nSticky/constants.ts
diff --git a/packages/design-system/src/components/N8nSticky/index.ts b/packages/frontend/@n8n/design-system/src/components/N8nSticky/index.ts
similarity index 100%
rename from packages/design-system/src/components/N8nSticky/index.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nSticky/index.ts
diff --git a/packages/design-system/src/components/N8nSticky/types.ts b/packages/frontend/@n8n/design-system/src/components/N8nSticky/types.ts
similarity index 100%
rename from packages/design-system/src/components/N8nSticky/types.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nSticky/types.ts
diff --git a/packages/design-system/src/components/N8nTabs/Tabs.stories.ts b/packages/frontend/@n8n/design-system/src/components/N8nTabs/Tabs.stories.ts
similarity index 100%
rename from packages/design-system/src/components/N8nTabs/Tabs.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nTabs/Tabs.stories.ts
diff --git a/packages/design-system/src/components/N8nTabs/Tabs.vue b/packages/frontend/@n8n/design-system/src/components/N8nTabs/Tabs.vue
similarity index 100%
rename from packages/design-system/src/components/N8nTabs/Tabs.vue
rename to packages/frontend/@n8n/design-system/src/components/N8nTabs/Tabs.vue
diff --git a/packages/design-system/src/components/N8nTabs/index.ts b/packages/frontend/@n8n/design-system/src/components/N8nTabs/index.ts
similarity index 100%
rename from packages/design-system/src/components/N8nTabs/index.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nTabs/index.ts
diff --git a/packages/design-system/src/components/N8nTag/Tag.stories.ts b/packages/frontend/@n8n/design-system/src/components/N8nTag/Tag.stories.ts
similarity index 100%
rename from packages/design-system/src/components/N8nTag/Tag.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nTag/Tag.stories.ts
diff --git a/packages/design-system/src/components/N8nTag/Tag.vue b/packages/frontend/@n8n/design-system/src/components/N8nTag/Tag.vue
similarity index 100%
rename from packages/design-system/src/components/N8nTag/Tag.vue
rename to packages/frontend/@n8n/design-system/src/components/N8nTag/Tag.vue
diff --git a/packages/design-system/src/components/N8nTag/index.ts b/packages/frontend/@n8n/design-system/src/components/N8nTag/index.ts
similarity index 100%
rename from packages/design-system/src/components/N8nTag/index.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nTag/index.ts
diff --git a/packages/design-system/src/components/N8nTags/Tags.stories.ts b/packages/frontend/@n8n/design-system/src/components/N8nTags/Tags.stories.ts
similarity index 100%
rename from packages/design-system/src/components/N8nTags/Tags.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nTags/Tags.stories.ts
diff --git a/packages/design-system/src/components/N8nTags/Tags.vue b/packages/frontend/@n8n/design-system/src/components/N8nTags/Tags.vue
similarity index 100%
rename from packages/design-system/src/components/N8nTags/Tags.vue
rename to packages/frontend/@n8n/design-system/src/components/N8nTags/Tags.vue
diff --git a/packages/design-system/src/components/N8nTags/index.ts b/packages/frontend/@n8n/design-system/src/components/N8nTags/index.ts
similarity index 100%
rename from packages/design-system/src/components/N8nTags/index.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nTags/index.ts
diff --git a/packages/design-system/src/components/N8nText/Text.stories.ts b/packages/frontend/@n8n/design-system/src/components/N8nText/Text.stories.ts
similarity index 100%
rename from packages/design-system/src/components/N8nText/Text.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nText/Text.stories.ts
diff --git a/packages/design-system/src/components/N8nText/Text.vue b/packages/frontend/@n8n/design-system/src/components/N8nText/Text.vue
similarity index 96%
rename from packages/design-system/src/components/N8nText/Text.vue
rename to packages/frontend/@n8n/design-system/src/components/N8nText/Text.vue
index 1c7c012dad..d4df98723c 100644
--- a/packages/design-system/src/components/N8nText/Text.vue
+++ b/packages/frontend/@n8n/design-system/src/components/N8nText/Text.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import { computed, useCssModule } from 'vue';
 
-import type { TextAlign, TextColor, TextSize } from 'n8n-design-system/types/text';
+import type { TextAlign, TextColor, TextSize } from '@n8n/design-system/types/text';
 
 interface TextProps {
 	bold?: boolean;
diff --git a/packages/design-system/src/components/N8nText/index.ts b/packages/frontend/@n8n/design-system/src/components/N8nText/index.ts
similarity index 100%
rename from packages/design-system/src/components/N8nText/index.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nText/index.ts
diff --git a/packages/design-system/src/components/N8nTooltip/Tooltip.stories.ts b/packages/frontend/@n8n/design-system/src/components/N8nTooltip/Tooltip.stories.ts
similarity index 100%
rename from packages/design-system/src/components/N8nTooltip/Tooltip.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nTooltip/Tooltip.stories.ts
diff --git a/packages/design-system/src/components/N8nTooltip/Tooltip.test.ts b/packages/frontend/@n8n/design-system/src/components/N8nTooltip/Tooltip.test.ts
similarity index 100%
rename from packages/design-system/src/components/N8nTooltip/Tooltip.test.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nTooltip/Tooltip.test.ts
diff --git a/packages/design-system/src/components/N8nTooltip/Tooltip.vue b/packages/frontend/@n8n/design-system/src/components/N8nTooltip/Tooltip.vue
similarity index 95%
rename from packages/design-system/src/components/N8nTooltip/Tooltip.vue
rename to packages/frontend/@n8n/design-system/src/components/N8nTooltip/Tooltip.vue
index d0eb5b610e..234ed2ecc2 100644
--- a/packages/design-system/src/components/N8nTooltip/Tooltip.vue
+++ b/packages/frontend/@n8n/design-system/src/components/N8nTooltip/Tooltip.vue
@@ -2,7 +2,7 @@
 import { ElTooltip } from 'element-plus';
 import type { PropType } from 'vue';
 
-import type { IN8nButton } from 'n8n-design-system/types';
+import type { IN8nButton } from '@n8n/design-system/types';
 
 import N8nButton from '../N8nButton';
 
diff --git a/packages/design-system/src/components/N8nTooltip/index.ts b/packages/frontend/@n8n/design-system/src/components/N8nTooltip/index.ts
similarity index 100%
rename from packages/design-system/src/components/N8nTooltip/index.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nTooltip/index.ts
diff --git a/packages/design-system/src/components/N8nTree/Tree.stories.ts b/packages/frontend/@n8n/design-system/src/components/N8nTree/Tree.stories.ts
similarity index 100%
rename from packages/design-system/src/components/N8nTree/Tree.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nTree/Tree.stories.ts
diff --git a/packages/design-system/src/components/N8nTree/Tree.test.ts b/packages/frontend/@n8n/design-system/src/components/N8nTree/Tree.test.ts
similarity index 100%
rename from packages/design-system/src/components/N8nTree/Tree.test.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nTree/Tree.test.ts
diff --git a/packages/design-system/src/components/N8nTree/Tree.vue b/packages/frontend/@n8n/design-system/src/components/N8nTree/Tree.vue
similarity index 100%
rename from packages/design-system/src/components/N8nTree/Tree.vue
rename to packages/frontend/@n8n/design-system/src/components/N8nTree/Tree.vue
diff --git a/packages/design-system/src/components/N8nTree/__snapshots__/Tree.test.ts.snap b/packages/frontend/@n8n/design-system/src/components/N8nTree/__snapshots__/Tree.test.ts.snap
similarity index 100%
rename from packages/design-system/src/components/N8nTree/__snapshots__/Tree.test.ts.snap
rename to packages/frontend/@n8n/design-system/src/components/N8nTree/__snapshots__/Tree.test.ts.snap
diff --git a/packages/design-system/src/components/N8nTree/index.ts b/packages/frontend/@n8n/design-system/src/components/N8nTree/index.ts
similarity index 100%
rename from packages/design-system/src/components/N8nTree/index.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nTree/index.ts
diff --git a/packages/design-system/src/components/N8nUserInfo/UserInfo.stories.ts b/packages/frontend/@n8n/design-system/src/components/N8nUserInfo/UserInfo.stories.ts
similarity index 100%
rename from packages/design-system/src/components/N8nUserInfo/UserInfo.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nUserInfo/UserInfo.stories.ts
diff --git a/packages/design-system/src/components/N8nUserInfo/UserInfo.vue b/packages/frontend/@n8n/design-system/src/components/N8nUserInfo/UserInfo.vue
similarity index 100%
rename from packages/design-system/src/components/N8nUserInfo/UserInfo.vue
rename to packages/frontend/@n8n/design-system/src/components/N8nUserInfo/UserInfo.vue
diff --git a/packages/design-system/src/components/N8nUserInfo/index.ts b/packages/frontend/@n8n/design-system/src/components/N8nUserInfo/index.ts
similarity index 100%
rename from packages/design-system/src/components/N8nUserInfo/index.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nUserInfo/index.ts
diff --git a/packages/design-system/src/components/N8nUserSelect/UserSelect.stories.ts b/packages/frontend/@n8n/design-system/src/components/N8nUserSelect/UserSelect.stories.ts
similarity index 100%
rename from packages/design-system/src/components/N8nUserSelect/UserSelect.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nUserSelect/UserSelect.stories.ts
diff --git a/packages/design-system/src/components/N8nUserSelect/UserSelect.vue b/packages/frontend/@n8n/design-system/src/components/N8nUserSelect/UserSelect.vue
similarity index 100%
rename from packages/design-system/src/components/N8nUserSelect/UserSelect.vue
rename to packages/frontend/@n8n/design-system/src/components/N8nUserSelect/UserSelect.vue
diff --git a/packages/design-system/src/components/N8nUserSelect/index.ts b/packages/frontend/@n8n/design-system/src/components/N8nUserSelect/index.ts
similarity index 100%
rename from packages/design-system/src/components/N8nUserSelect/index.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nUserSelect/index.ts
diff --git a/packages/design-system/src/components/N8nUserStack/UserStack.stories.ts b/packages/frontend/@n8n/design-system/src/components/N8nUserStack/UserStack.stories.ts
similarity index 100%
rename from packages/design-system/src/components/N8nUserStack/UserStack.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nUserStack/UserStack.stories.ts
diff --git a/packages/design-system/src/components/N8nUserStack/UserStack.test.ts b/packages/frontend/@n8n/design-system/src/components/N8nUserStack/UserStack.test.ts
similarity index 100%
rename from packages/design-system/src/components/N8nUserStack/UserStack.test.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nUserStack/UserStack.test.ts
diff --git a/packages/design-system/src/components/N8nUserStack/UserStack.vue b/packages/frontend/@n8n/design-system/src/components/N8nUserStack/UserStack.vue
similarity index 98%
rename from packages/design-system/src/components/N8nUserStack/UserStack.vue
rename to packages/frontend/@n8n/design-system/src/components/N8nUserStack/UserStack.vue
index b1a9bf8f11..ab771c3726 100644
--- a/packages/design-system/src/components/N8nUserStack/UserStack.vue
+++ b/packages/frontend/@n8n/design-system/src/components/N8nUserStack/UserStack.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import { computed } from 'vue';
 
-import type { IUser, UserStackGroups } from 'n8n-design-system/types';
+import type { IUser, UserStackGroups } from '@n8n/design-system/types';
 
 import N8nAvatar from '../N8nAvatar';
 import N8nUserInfo from '../N8nUserInfo';
diff --git a/packages/design-system/src/components/N8nUserStack/index.ts b/packages/frontend/@n8n/design-system/src/components/N8nUserStack/index.ts
similarity index 100%
rename from packages/design-system/src/components/N8nUserStack/index.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nUserStack/index.ts
diff --git a/packages/design-system/src/components/N8nUsersList/UsersList.stories.ts b/packages/frontend/@n8n/design-system/src/components/N8nUsersList/UsersList.stories.ts
similarity index 96%
rename from packages/design-system/src/components/N8nUsersList/UsersList.stories.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nUsersList/UsersList.stories.ts
index cfaf9b3fb0..9ec399c335 100644
--- a/packages/design-system/src/components/N8nUsersList/UsersList.stories.ts
+++ b/packages/frontend/@n8n/design-system/src/components/N8nUsersList/UsersList.stories.ts
@@ -1,7 +1,7 @@
 import { action } from '@storybook/addon-actions';
 import type { StoryFn } from '@storybook/vue3';
 
-import type { IUser } from 'n8n-design-system/types';
+import type { IUser } from '@n8n/design-system/types';
 
 import N8nUsersList from './UsersList.vue';
 
diff --git a/packages/design-system/src/components/N8nUsersList/UsersList.vue b/packages/frontend/@n8n/design-system/src/components/N8nUsersList/UsersList.vue
similarity index 100%
rename from packages/design-system/src/components/N8nUsersList/UsersList.vue
rename to packages/frontend/@n8n/design-system/src/components/N8nUsersList/UsersList.vue
diff --git a/packages/design-system/src/components/N8nUsersList/index.ts b/packages/frontend/@n8n/design-system/src/components/N8nUsersList/index.ts
similarity index 100%
rename from packages/design-system/src/components/N8nUsersList/index.ts
rename to packages/frontend/@n8n/design-system/src/components/N8nUsersList/index.ts
diff --git a/packages/design-system/src/components/ResizeObserver/ResizeObserver.vue b/packages/frontend/@n8n/design-system/src/components/ResizeObserver/ResizeObserver.vue
similarity index 100%
rename from packages/design-system/src/components/ResizeObserver/ResizeObserver.vue
rename to packages/frontend/@n8n/design-system/src/components/ResizeObserver/ResizeObserver.vue
diff --git a/packages/design-system/src/components/ResizeObserver/index.ts b/packages/frontend/@n8n/design-system/src/components/ResizeObserver/index.ts
similarity index 100%
rename from packages/design-system/src/components/ResizeObserver/index.ts
rename to packages/frontend/@n8n/design-system/src/components/ResizeObserver/index.ts
diff --git a/packages/design-system/src/components/index.ts b/packages/frontend/@n8n/design-system/src/components/index.ts
similarity index 100%
rename from packages/design-system/src/components/index.ts
rename to packages/frontend/@n8n/design-system/src/components/index.ts
diff --git a/packages/design-system/src/composables/useI18n.ts b/packages/frontend/@n8n/design-system/src/composables/useI18n.ts
similarity index 100%
rename from packages/design-system/src/composables/useI18n.ts
rename to packages/frontend/@n8n/design-system/src/composables/useI18n.ts
diff --git a/packages/design-system/src/css/_primitives.scss b/packages/frontend/@n8n/design-system/src/css/_primitives.scss
similarity index 100%
rename from packages/design-system/src/css/_primitives.scss
rename to packages/frontend/@n8n/design-system/src/css/_primitives.scss
diff --git a/packages/design-system/src/css/_tokens.dark.scss b/packages/frontend/@n8n/design-system/src/css/_tokens.dark.scss
similarity index 100%
rename from packages/design-system/src/css/_tokens.dark.scss
rename to packages/frontend/@n8n/design-system/src/css/_tokens.dark.scss
diff --git a/packages/design-system/src/css/_tokens.scss b/packages/frontend/@n8n/design-system/src/css/_tokens.scss
similarity index 100%
rename from packages/design-system/src/css/_tokens.scss
rename to packages/frontend/@n8n/design-system/src/css/_tokens.scss
diff --git a/packages/design-system/src/css/alert.scss b/packages/frontend/@n8n/design-system/src/css/alert.scss
similarity index 100%
rename from packages/design-system/src/css/alert.scss
rename to packages/frontend/@n8n/design-system/src/css/alert.scss
diff --git a/packages/design-system/src/css/aside.scss b/packages/frontend/@n8n/design-system/src/css/aside.scss
similarity index 100%
rename from packages/design-system/src/css/aside.scss
rename to packages/frontend/@n8n/design-system/src/css/aside.scss
diff --git a/packages/design-system/src/css/autocomplete.scss b/packages/frontend/@n8n/design-system/src/css/autocomplete.scss
similarity index 100%
rename from packages/design-system/src/css/autocomplete.scss
rename to packages/frontend/@n8n/design-system/src/css/autocomplete.scss
diff --git a/packages/design-system/src/css/avatar.scss b/packages/frontend/@n8n/design-system/src/css/avatar.scss
similarity index 100%
rename from packages/design-system/src/css/avatar.scss
rename to packages/frontend/@n8n/design-system/src/css/avatar.scss
diff --git a/packages/design-system/src/css/backtop.scss b/packages/frontend/@n8n/design-system/src/css/backtop.scss
similarity index 100%
rename from packages/design-system/src/css/backtop.scss
rename to packages/frontend/@n8n/design-system/src/css/backtop.scss
diff --git a/packages/design-system/src/css/badge.scss b/packages/frontend/@n8n/design-system/src/css/badge.scss
similarity index 100%
rename from packages/design-system/src/css/badge.scss
rename to packages/frontend/@n8n/design-system/src/css/badge.scss
diff --git a/packages/design-system/src/css/base.scss b/packages/frontend/@n8n/design-system/src/css/base.scss
similarity index 100%
rename from packages/design-system/src/css/base.scss
rename to packages/frontend/@n8n/design-system/src/css/base.scss
diff --git a/packages/design-system/src/css/breadcrumb-item.scss b/packages/frontend/@n8n/design-system/src/css/breadcrumb-item.scss
similarity index 100%
rename from packages/design-system/src/css/breadcrumb-item.scss
rename to packages/frontend/@n8n/design-system/src/css/breadcrumb-item.scss
diff --git a/packages/design-system/src/css/breadcrumb.scss b/packages/frontend/@n8n/design-system/src/css/breadcrumb.scss
similarity index 100%
rename from packages/design-system/src/css/breadcrumb.scss
rename to packages/frontend/@n8n/design-system/src/css/breadcrumb.scss
diff --git a/packages/design-system/src/css/button-group.scss b/packages/frontend/@n8n/design-system/src/css/button-group.scss
similarity index 100%
rename from packages/design-system/src/css/button-group.scss
rename to packages/frontend/@n8n/design-system/src/css/button-group.scss
diff --git a/packages/design-system/src/css/calendar.scss b/packages/frontend/@n8n/design-system/src/css/calendar.scss
similarity index 100%
rename from packages/design-system/src/css/calendar.scss
rename to packages/frontend/@n8n/design-system/src/css/calendar.scss
diff --git a/packages/design-system/src/css/card.scss b/packages/frontend/@n8n/design-system/src/css/card.scss
similarity index 100%
rename from packages/design-system/src/css/card.scss
rename to packages/frontend/@n8n/design-system/src/css/card.scss
diff --git a/packages/design-system/src/css/carousel-item.scss b/packages/frontend/@n8n/design-system/src/css/carousel-item.scss
similarity index 100%
rename from packages/design-system/src/css/carousel-item.scss
rename to packages/frontend/@n8n/design-system/src/css/carousel-item.scss
diff --git a/packages/design-system/src/css/carousel.scss b/packages/frontend/@n8n/design-system/src/css/carousel.scss
similarity index 100%
rename from packages/design-system/src/css/carousel.scss
rename to packages/frontend/@n8n/design-system/src/css/carousel.scss
diff --git a/packages/design-system/src/css/cascader-panel.scss b/packages/frontend/@n8n/design-system/src/css/cascader-panel.scss
similarity index 100%
rename from packages/design-system/src/css/cascader-panel.scss
rename to packages/frontend/@n8n/design-system/src/css/cascader-panel.scss
diff --git a/packages/design-system/src/css/cascader.scss b/packages/frontend/@n8n/design-system/src/css/cascader.scss
similarity index 100%
rename from packages/design-system/src/css/cascader.scss
rename to packages/frontend/@n8n/design-system/src/css/cascader.scss
diff --git a/packages/design-system/src/css/checkbox-button.scss b/packages/frontend/@n8n/design-system/src/css/checkbox-button.scss
similarity index 100%
rename from packages/design-system/src/css/checkbox-button.scss
rename to packages/frontend/@n8n/design-system/src/css/checkbox-button.scss
diff --git a/packages/design-system/src/css/checkbox-group.scss b/packages/frontend/@n8n/design-system/src/css/checkbox-group.scss
similarity index 100%
rename from packages/design-system/src/css/checkbox-group.scss
rename to packages/frontend/@n8n/design-system/src/css/checkbox-group.scss
diff --git a/packages/design-system/src/css/checkbox.scss b/packages/frontend/@n8n/design-system/src/css/checkbox.scss
similarity index 100%
rename from packages/design-system/src/css/checkbox.scss
rename to packages/frontend/@n8n/design-system/src/css/checkbox.scss
diff --git a/packages/design-system/src/css/col.scss b/packages/frontend/@n8n/design-system/src/css/col.scss
similarity index 100%
rename from packages/design-system/src/css/col.scss
rename to packages/frontend/@n8n/design-system/src/css/col.scss
diff --git a/packages/design-system/src/css/collapse-item.scss b/packages/frontend/@n8n/design-system/src/css/collapse-item.scss
similarity index 100%
rename from packages/design-system/src/css/collapse-item.scss
rename to packages/frontend/@n8n/design-system/src/css/collapse-item.scss
diff --git a/packages/design-system/src/css/collapse.scss b/packages/frontend/@n8n/design-system/src/css/collapse.scss
similarity index 100%
rename from packages/design-system/src/css/collapse.scss
rename to packages/frontend/@n8n/design-system/src/css/collapse.scss
diff --git a/packages/design-system/src/css/color-picker.scss b/packages/frontend/@n8n/design-system/src/css/color-picker.scss
similarity index 100%
rename from packages/design-system/src/css/color-picker.scss
rename to packages/frontend/@n8n/design-system/src/css/color-picker.scss
diff --git a/packages/design-system/src/css/common/popup.scss b/packages/frontend/@n8n/design-system/src/css/common/popup.scss
similarity index 100%
rename from packages/design-system/src/css/common/popup.scss
rename to packages/frontend/@n8n/design-system/src/css/common/popup.scss
diff --git a/packages/design-system/src/css/common/transition.scss b/packages/frontend/@n8n/design-system/src/css/common/transition.scss
similarity index 100%
rename from packages/design-system/src/css/common/transition.scss
rename to packages/frontend/@n8n/design-system/src/css/common/transition.scss
diff --git a/packages/design-system/src/css/common/var.scss b/packages/frontend/@n8n/design-system/src/css/common/var.scss
similarity index 100%
rename from packages/design-system/src/css/common/var.scss
rename to packages/frontend/@n8n/design-system/src/css/common/var.scss
diff --git a/packages/design-system/src/css/container.scss b/packages/frontend/@n8n/design-system/src/css/container.scss
similarity index 100%
rename from packages/design-system/src/css/container.scss
rename to packages/frontend/@n8n/design-system/src/css/container.scss
diff --git a/packages/design-system/src/css/date-picker.scss b/packages/frontend/@n8n/design-system/src/css/date-picker.scss
similarity index 100%
rename from packages/design-system/src/css/date-picker.scss
rename to packages/frontend/@n8n/design-system/src/css/date-picker.scss
diff --git a/packages/design-system/src/css/date-picker/date-picker.scss b/packages/frontend/@n8n/design-system/src/css/date-picker/date-picker.scss
similarity index 100%
rename from packages/design-system/src/css/date-picker/date-picker.scss
rename to packages/frontend/@n8n/design-system/src/css/date-picker/date-picker.scss
diff --git a/packages/design-system/src/css/date-picker/date-range-picker.scss b/packages/frontend/@n8n/design-system/src/css/date-picker/date-range-picker.scss
similarity index 100%
rename from packages/design-system/src/css/date-picker/date-range-picker.scss
rename to packages/frontend/@n8n/design-system/src/css/date-picker/date-range-picker.scss
diff --git a/packages/design-system/src/css/date-picker/date-table.scss b/packages/frontend/@n8n/design-system/src/css/date-picker/date-table.scss
similarity index 100%
rename from packages/design-system/src/css/date-picker/date-table.scss
rename to packages/frontend/@n8n/design-system/src/css/date-picker/date-table.scss
diff --git a/packages/design-system/src/css/date-picker/month-table.scss b/packages/frontend/@n8n/design-system/src/css/date-picker/month-table.scss
similarity index 100%
rename from packages/design-system/src/css/date-picker/month-table.scss
rename to packages/frontend/@n8n/design-system/src/css/date-picker/month-table.scss
diff --git a/packages/design-system/src/css/date-picker/picker-panel.scss b/packages/frontend/@n8n/design-system/src/css/date-picker/picker-panel.scss
similarity index 100%
rename from packages/design-system/src/css/date-picker/picker-panel.scss
rename to packages/frontend/@n8n/design-system/src/css/date-picker/picker-panel.scss
diff --git a/packages/design-system/src/css/date-picker/picker.scss b/packages/frontend/@n8n/design-system/src/css/date-picker/picker.scss
similarity index 100%
rename from packages/design-system/src/css/date-picker/picker.scss
rename to packages/frontend/@n8n/design-system/src/css/date-picker/picker.scss
diff --git a/packages/design-system/src/css/date-picker/time-picker.scss b/packages/frontend/@n8n/design-system/src/css/date-picker/time-picker.scss
similarity index 100%
rename from packages/design-system/src/css/date-picker/time-picker.scss
rename to packages/frontend/@n8n/design-system/src/css/date-picker/time-picker.scss
diff --git a/packages/design-system/src/css/date-picker/time-range-picker.scss b/packages/frontend/@n8n/design-system/src/css/date-picker/time-range-picker.scss
similarity index 100%
rename from packages/design-system/src/css/date-picker/time-range-picker.scss
rename to packages/frontend/@n8n/design-system/src/css/date-picker/time-range-picker.scss
diff --git a/packages/design-system/src/css/date-picker/time-spinner.scss b/packages/frontend/@n8n/design-system/src/css/date-picker/time-spinner.scss
similarity index 100%
rename from packages/design-system/src/css/date-picker/time-spinner.scss
rename to packages/frontend/@n8n/design-system/src/css/date-picker/time-spinner.scss
diff --git a/packages/design-system/src/css/date-picker/year-table.scss b/packages/frontend/@n8n/design-system/src/css/date-picker/year-table.scss
similarity index 100%
rename from packages/design-system/src/css/date-picker/year-table.scss
rename to packages/frontend/@n8n/design-system/src/css/date-picker/year-table.scss
diff --git a/packages/design-system/src/css/dialog.scss b/packages/frontend/@n8n/design-system/src/css/dialog.scss
similarity index 100%
rename from packages/design-system/src/css/dialog.scss
rename to packages/frontend/@n8n/design-system/src/css/dialog.scss
diff --git a/packages/design-system/src/css/display.scss b/packages/frontend/@n8n/design-system/src/css/display.scss
similarity index 100%
rename from packages/design-system/src/css/display.scss
rename to packages/frontend/@n8n/design-system/src/css/display.scss
diff --git a/packages/design-system/src/css/divider.scss b/packages/frontend/@n8n/design-system/src/css/divider.scss
similarity index 100%
rename from packages/design-system/src/css/divider.scss
rename to packages/frontend/@n8n/design-system/src/css/divider.scss
diff --git a/packages/design-system/src/css/drawer.scss b/packages/frontend/@n8n/design-system/src/css/drawer.scss
similarity index 100%
rename from packages/design-system/src/css/drawer.scss
rename to packages/frontend/@n8n/design-system/src/css/drawer.scss
diff --git a/packages/design-system/src/css/dropdown-item.scss b/packages/frontend/@n8n/design-system/src/css/dropdown-item.scss
similarity index 100%
rename from packages/design-system/src/css/dropdown-item.scss
rename to packages/frontend/@n8n/design-system/src/css/dropdown-item.scss
diff --git a/packages/design-system/src/css/dropdown-menu.scss b/packages/frontend/@n8n/design-system/src/css/dropdown-menu.scss
similarity index 100%
rename from packages/design-system/src/css/dropdown-menu.scss
rename to packages/frontend/@n8n/design-system/src/css/dropdown-menu.scss
diff --git a/packages/design-system/src/css/dropdown.scss b/packages/frontend/@n8n/design-system/src/css/dropdown.scss
similarity index 100%
rename from packages/design-system/src/css/dropdown.scss
rename to packages/frontend/@n8n/design-system/src/css/dropdown.scss
diff --git a/packages/design-system/src/css/fonts/element-icons.ttf b/packages/frontend/@n8n/design-system/src/css/fonts/element-icons.ttf
similarity index 100%
rename from packages/design-system/src/css/fonts/element-icons.ttf
rename to packages/frontend/@n8n/design-system/src/css/fonts/element-icons.ttf
diff --git a/packages/design-system/src/css/fonts/element-icons.woff b/packages/frontend/@n8n/design-system/src/css/fonts/element-icons.woff
similarity index 100%
rename from packages/design-system/src/css/fonts/element-icons.woff
rename to packages/frontend/@n8n/design-system/src/css/fonts/element-icons.woff
diff --git a/packages/design-system/src/css/footer.scss b/packages/frontend/@n8n/design-system/src/css/footer.scss
similarity index 100%
rename from packages/design-system/src/css/footer.scss
rename to packages/frontend/@n8n/design-system/src/css/footer.scss
diff --git a/packages/design-system/src/css/form-item.scss b/packages/frontend/@n8n/design-system/src/css/form-item.scss
similarity index 100%
rename from packages/design-system/src/css/form-item.scss
rename to packages/frontend/@n8n/design-system/src/css/form-item.scss
diff --git a/packages/design-system/src/css/form.scss b/packages/frontend/@n8n/design-system/src/css/form.scss
similarity index 100%
rename from packages/design-system/src/css/form.scss
rename to packages/frontend/@n8n/design-system/src/css/form.scss
diff --git a/packages/design-system/src/css/header.scss b/packages/frontend/@n8n/design-system/src/css/header.scss
similarity index 100%
rename from packages/design-system/src/css/header.scss
rename to packages/frontend/@n8n/design-system/src/css/header.scss
diff --git a/packages/design-system/src/css/icon.scss b/packages/frontend/@n8n/design-system/src/css/icon.scss
similarity index 100%
rename from packages/design-system/src/css/icon.scss
rename to packages/frontend/@n8n/design-system/src/css/icon.scss
diff --git a/packages/design-system/src/css/image.scss b/packages/frontend/@n8n/design-system/src/css/image.scss
similarity index 100%
rename from packages/design-system/src/css/image.scss
rename to packages/frontend/@n8n/design-system/src/css/image.scss
diff --git a/packages/design-system/src/css/index.scss b/packages/frontend/@n8n/design-system/src/css/index.scss
similarity index 100%
rename from packages/design-system/src/css/index.scss
rename to packages/frontend/@n8n/design-system/src/css/index.scss
diff --git a/packages/design-system/src/css/infinite-scroll.scss b/packages/frontend/@n8n/design-system/src/css/infinite-scroll.scss
similarity index 100%
rename from packages/design-system/src/css/infinite-scroll.scss
rename to packages/frontend/@n8n/design-system/src/css/infinite-scroll.scss
diff --git a/packages/design-system/src/css/infiniteScroll.scss b/packages/frontend/@n8n/design-system/src/css/infiniteScroll.scss
similarity index 100%
rename from packages/design-system/src/css/infiniteScroll.scss
rename to packages/frontend/@n8n/design-system/src/css/infiniteScroll.scss
diff --git a/packages/design-system/src/css/input-number.scss b/packages/frontend/@n8n/design-system/src/css/input-number.scss
similarity index 100%
rename from packages/design-system/src/css/input-number.scss
rename to packages/frontend/@n8n/design-system/src/css/input-number.scss
diff --git a/packages/design-system/src/css/input.scss b/packages/frontend/@n8n/design-system/src/css/input.scss
similarity index 100%
rename from packages/design-system/src/css/input.scss
rename to packages/frontend/@n8n/design-system/src/css/input.scss
diff --git a/packages/design-system/src/css/link.scss b/packages/frontend/@n8n/design-system/src/css/link.scss
similarity index 100%
rename from packages/design-system/src/css/link.scss
rename to packages/frontend/@n8n/design-system/src/css/link.scss
diff --git a/packages/design-system/src/css/loading.scss b/packages/frontend/@n8n/design-system/src/css/loading.scss
similarity index 100%
rename from packages/design-system/src/css/loading.scss
rename to packages/frontend/@n8n/design-system/src/css/loading.scss
diff --git a/packages/design-system/src/css/main.scss b/packages/frontend/@n8n/design-system/src/css/main.scss
similarity index 100%
rename from packages/design-system/src/css/main.scss
rename to packages/frontend/@n8n/design-system/src/css/main.scss
diff --git a/packages/design-system/src/css/menu-item-group.scss b/packages/frontend/@n8n/design-system/src/css/menu-item-group.scss
similarity index 100%
rename from packages/design-system/src/css/menu-item-group.scss
rename to packages/frontend/@n8n/design-system/src/css/menu-item-group.scss
diff --git a/packages/design-system/src/css/menu-item.scss b/packages/frontend/@n8n/design-system/src/css/menu-item.scss
similarity index 100%
rename from packages/design-system/src/css/menu-item.scss
rename to packages/frontend/@n8n/design-system/src/css/menu-item.scss
diff --git a/packages/design-system/src/css/menu.scss b/packages/frontend/@n8n/design-system/src/css/menu.scss
similarity index 100%
rename from packages/design-system/src/css/menu.scss
rename to packages/frontend/@n8n/design-system/src/css/menu.scss
diff --git a/packages/design-system/src/css/message-box.scss b/packages/frontend/@n8n/design-system/src/css/message-box.scss
similarity index 100%
rename from packages/design-system/src/css/message-box.scss
rename to packages/frontend/@n8n/design-system/src/css/message-box.scss
diff --git a/packages/design-system/src/css/message.scss b/packages/frontend/@n8n/design-system/src/css/message.scss
similarity index 100%
rename from packages/design-system/src/css/message.scss
rename to packages/frontend/@n8n/design-system/src/css/message.scss
diff --git a/packages/design-system/src/css/mixins/_breakpoints.scss b/packages/frontend/@n8n/design-system/src/css/mixins/_breakpoints.scss
similarity index 100%
rename from packages/design-system/src/css/mixins/_breakpoints.scss
rename to packages/frontend/@n8n/design-system/src/css/mixins/_breakpoints.scss
diff --git a/packages/design-system/src/css/mixins/_button.scss b/packages/frontend/@n8n/design-system/src/css/mixins/_button.scss
similarity index 100%
rename from packages/design-system/src/css/mixins/_button.scss
rename to packages/frontend/@n8n/design-system/src/css/mixins/_button.scss
diff --git a/packages/design-system/src/css/mixins/config.scss b/packages/frontend/@n8n/design-system/src/css/mixins/config.scss
similarity index 100%
rename from packages/design-system/src/css/mixins/config.scss
rename to packages/frontend/@n8n/design-system/src/css/mixins/config.scss
diff --git a/packages/design-system/src/css/mixins/function.scss b/packages/frontend/@n8n/design-system/src/css/mixins/function.scss
similarity index 100%
rename from packages/design-system/src/css/mixins/function.scss
rename to packages/frontend/@n8n/design-system/src/css/mixins/function.scss
diff --git a/packages/design-system/src/css/mixins/index.scss b/packages/frontend/@n8n/design-system/src/css/mixins/index.scss
similarity index 100%
rename from packages/design-system/src/css/mixins/index.scss
rename to packages/frontend/@n8n/design-system/src/css/mixins/index.scss
diff --git a/packages/design-system/src/css/mixins/mixins.scss b/packages/frontend/@n8n/design-system/src/css/mixins/mixins.scss
similarity index 100%
rename from packages/design-system/src/css/mixins/mixins.scss
rename to packages/frontend/@n8n/design-system/src/css/mixins/mixins.scss
diff --git a/packages/design-system/src/css/mixins/utils.scss b/packages/frontend/@n8n/design-system/src/css/mixins/utils.scss
similarity index 100%
rename from packages/design-system/src/css/mixins/utils.scss
rename to packages/frontend/@n8n/design-system/src/css/mixins/utils.scss
diff --git a/packages/design-system/src/css/notification.scss b/packages/frontend/@n8n/design-system/src/css/notification.scss
similarity index 100%
rename from packages/design-system/src/css/notification.scss
rename to packages/frontend/@n8n/design-system/src/css/notification.scss
diff --git a/packages/design-system/src/css/option-group.scss b/packages/frontend/@n8n/design-system/src/css/option-group.scss
similarity index 100%
rename from packages/design-system/src/css/option-group.scss
rename to packages/frontend/@n8n/design-system/src/css/option-group.scss
diff --git a/packages/design-system/src/css/option.scss b/packages/frontend/@n8n/design-system/src/css/option.scss
similarity index 100%
rename from packages/design-system/src/css/option.scss
rename to packages/frontend/@n8n/design-system/src/css/option.scss
diff --git a/packages/design-system/src/css/page-header.scss b/packages/frontend/@n8n/design-system/src/css/page-header.scss
similarity index 100%
rename from packages/design-system/src/css/page-header.scss
rename to packages/frontend/@n8n/design-system/src/css/page-header.scss
diff --git a/packages/design-system/src/css/pagination.scss b/packages/frontend/@n8n/design-system/src/css/pagination.scss
similarity index 100%
rename from packages/design-system/src/css/pagination.scss
rename to packages/frontend/@n8n/design-system/src/css/pagination.scss
diff --git a/packages/design-system/src/css/popconfirm.scss b/packages/frontend/@n8n/design-system/src/css/popconfirm.scss
similarity index 100%
rename from packages/design-system/src/css/popconfirm.scss
rename to packages/frontend/@n8n/design-system/src/css/popconfirm.scss
diff --git a/packages/design-system/src/css/popover.scss b/packages/frontend/@n8n/design-system/src/css/popover.scss
similarity index 100%
rename from packages/design-system/src/css/popover.scss
rename to packages/frontend/@n8n/design-system/src/css/popover.scss
diff --git a/packages/design-system/src/css/popper.scss b/packages/frontend/@n8n/design-system/src/css/popper.scss
similarity index 100%
rename from packages/design-system/src/css/popper.scss
rename to packages/frontend/@n8n/design-system/src/css/popper.scss
diff --git a/packages/design-system/src/css/progress.scss b/packages/frontend/@n8n/design-system/src/css/progress.scss
similarity index 100%
rename from packages/design-system/src/css/progress.scss
rename to packages/frontend/@n8n/design-system/src/css/progress.scss
diff --git a/packages/design-system/src/css/radio-button.scss b/packages/frontend/@n8n/design-system/src/css/radio-button.scss
similarity index 100%
rename from packages/design-system/src/css/radio-button.scss
rename to packages/frontend/@n8n/design-system/src/css/radio-button.scss
diff --git a/packages/design-system/src/css/radio-group.scss b/packages/frontend/@n8n/design-system/src/css/radio-group.scss
similarity index 100%
rename from packages/design-system/src/css/radio-group.scss
rename to packages/frontend/@n8n/design-system/src/css/radio-group.scss
diff --git a/packages/design-system/src/css/radio.scss b/packages/frontend/@n8n/design-system/src/css/radio.scss
similarity index 100%
rename from packages/design-system/src/css/radio.scss
rename to packages/frontend/@n8n/design-system/src/css/radio.scss
diff --git a/packages/design-system/src/css/rate.scss b/packages/frontend/@n8n/design-system/src/css/rate.scss
similarity index 100%
rename from packages/design-system/src/css/rate.scss
rename to packages/frontend/@n8n/design-system/src/css/rate.scss
diff --git a/packages/design-system/src/css/reset.scss b/packages/frontend/@n8n/design-system/src/css/reset.scss
similarity index 100%
rename from packages/design-system/src/css/reset.scss
rename to packages/frontend/@n8n/design-system/src/css/reset.scss
diff --git a/packages/design-system/src/css/row.scss b/packages/frontend/@n8n/design-system/src/css/row.scss
similarity index 100%
rename from packages/design-system/src/css/row.scss
rename to packages/frontend/@n8n/design-system/src/css/row.scss
diff --git a/packages/design-system/src/css/scrollbar.scss b/packages/frontend/@n8n/design-system/src/css/scrollbar.scss
similarity index 100%
rename from packages/design-system/src/css/scrollbar.scss
rename to packages/frontend/@n8n/design-system/src/css/scrollbar.scss
diff --git a/packages/design-system/src/css/select-dropdown.scss b/packages/frontend/@n8n/design-system/src/css/select-dropdown.scss
similarity index 100%
rename from packages/design-system/src/css/select-dropdown.scss
rename to packages/frontend/@n8n/design-system/src/css/select-dropdown.scss
diff --git a/packages/design-system/src/css/select.scss b/packages/frontend/@n8n/design-system/src/css/select.scss
similarity index 100%
rename from packages/design-system/src/css/select.scss
rename to packages/frontend/@n8n/design-system/src/css/select.scss
diff --git a/packages/design-system/src/css/skeleton.scss b/packages/frontend/@n8n/design-system/src/css/skeleton.scss
similarity index 100%
rename from packages/design-system/src/css/skeleton.scss
rename to packages/frontend/@n8n/design-system/src/css/skeleton.scss
diff --git a/packages/design-system/src/css/slider.scss b/packages/frontend/@n8n/design-system/src/css/slider.scss
similarity index 100%
rename from packages/design-system/src/css/slider.scss
rename to packages/frontend/@n8n/design-system/src/css/slider.scss
diff --git a/packages/design-system/src/css/spinner.scss b/packages/frontend/@n8n/design-system/src/css/spinner.scss
similarity index 100%
rename from packages/design-system/src/css/spinner.scss
rename to packages/frontend/@n8n/design-system/src/css/spinner.scss
diff --git a/packages/design-system/src/css/step.scss b/packages/frontend/@n8n/design-system/src/css/step.scss
similarity index 100%
rename from packages/design-system/src/css/step.scss
rename to packages/frontend/@n8n/design-system/src/css/step.scss
diff --git a/packages/design-system/src/css/steps.scss b/packages/frontend/@n8n/design-system/src/css/steps.scss
similarity index 100%
rename from packages/design-system/src/css/steps.scss
rename to packages/frontend/@n8n/design-system/src/css/steps.scss
diff --git a/packages/design-system/src/css/submenu.scss b/packages/frontend/@n8n/design-system/src/css/submenu.scss
similarity index 100%
rename from packages/design-system/src/css/submenu.scss
rename to packages/frontend/@n8n/design-system/src/css/submenu.scss
diff --git a/packages/design-system/src/css/switch.scss b/packages/frontend/@n8n/design-system/src/css/switch.scss
similarity index 100%
rename from packages/design-system/src/css/switch.scss
rename to packages/frontend/@n8n/design-system/src/css/switch.scss
diff --git a/packages/design-system/src/css/tab-pane.scss b/packages/frontend/@n8n/design-system/src/css/tab-pane.scss
similarity index 100%
rename from packages/design-system/src/css/tab-pane.scss
rename to packages/frontend/@n8n/design-system/src/css/tab-pane.scss
diff --git a/packages/design-system/src/css/table-column.scss b/packages/frontend/@n8n/design-system/src/css/table-column.scss
similarity index 100%
rename from packages/design-system/src/css/table-column.scss
rename to packages/frontend/@n8n/design-system/src/css/table-column.scss
diff --git a/packages/design-system/src/css/table.scss b/packages/frontend/@n8n/design-system/src/css/table.scss
similarity index 100%
rename from packages/design-system/src/css/table.scss
rename to packages/frontend/@n8n/design-system/src/css/table.scss
diff --git a/packages/design-system/src/css/tabs.scss b/packages/frontend/@n8n/design-system/src/css/tabs.scss
similarity index 100%
rename from packages/design-system/src/css/tabs.scss
rename to packages/frontend/@n8n/design-system/src/css/tabs.scss
diff --git a/packages/design-system/src/css/tag.scss b/packages/frontend/@n8n/design-system/src/css/tag.scss
similarity index 100%
rename from packages/design-system/src/css/tag.scss
rename to packages/frontend/@n8n/design-system/src/css/tag.scss
diff --git a/packages/design-system/src/css/tailwind/index.css b/packages/frontend/@n8n/design-system/src/css/tailwind/index.css
similarity index 100%
rename from packages/design-system/src/css/tailwind/index.css
rename to packages/frontend/@n8n/design-system/src/css/tailwind/index.css
diff --git a/packages/design-system/src/css/time-picker.scss b/packages/frontend/@n8n/design-system/src/css/time-picker.scss
similarity index 100%
rename from packages/design-system/src/css/time-picker.scss
rename to packages/frontend/@n8n/design-system/src/css/time-picker.scss
diff --git a/packages/design-system/src/css/time-select.scss b/packages/frontend/@n8n/design-system/src/css/time-select.scss
similarity index 100%
rename from packages/design-system/src/css/time-select.scss
rename to packages/frontend/@n8n/design-system/src/css/time-select.scss
diff --git a/packages/design-system/src/css/timeline-item.scss b/packages/frontend/@n8n/design-system/src/css/timeline-item.scss
similarity index 100%
rename from packages/design-system/src/css/timeline-item.scss
rename to packages/frontend/@n8n/design-system/src/css/timeline-item.scss
diff --git a/packages/design-system/src/css/timeline.scss b/packages/frontend/@n8n/design-system/src/css/timeline.scss
similarity index 100%
rename from packages/design-system/src/css/timeline.scss
rename to packages/frontend/@n8n/design-system/src/css/timeline.scss
diff --git a/packages/design-system/src/css/tooltip.scss b/packages/frontend/@n8n/design-system/src/css/tooltip.scss
similarity index 100%
rename from packages/design-system/src/css/tooltip.scss
rename to packages/frontend/@n8n/design-system/src/css/tooltip.scss
diff --git a/packages/design-system/src/css/transfer.scss b/packages/frontend/@n8n/design-system/src/css/transfer.scss
similarity index 100%
rename from packages/design-system/src/css/transfer.scss
rename to packages/frontend/@n8n/design-system/src/css/transfer.scss
diff --git a/packages/design-system/src/css/tree.scss b/packages/frontend/@n8n/design-system/src/css/tree.scss
similarity index 100%
rename from packages/design-system/src/css/tree.scss
rename to packages/frontend/@n8n/design-system/src/css/tree.scss
diff --git a/packages/design-system/src/css/upload.scss b/packages/frontend/@n8n/design-system/src/css/upload.scss
similarity index 100%
rename from packages/design-system/src/css/upload.scss
rename to packages/frontend/@n8n/design-system/src/css/upload.scss
diff --git a/packages/design-system/src/css/utilities/_float.scss b/packages/frontend/@n8n/design-system/src/css/utilities/_float.scss
similarity index 100%
rename from packages/design-system/src/css/utilities/_float.scss
rename to packages/frontend/@n8n/design-system/src/css/utilities/_float.scss
diff --git a/packages/design-system/src/css/utilities/_link.scss b/packages/frontend/@n8n/design-system/src/css/utilities/_link.scss
similarity index 100%
rename from packages/design-system/src/css/utilities/_link.scss
rename to packages/frontend/@n8n/design-system/src/css/utilities/_link.scss
diff --git a/packages/design-system/src/css/utilities/_list.scss b/packages/frontend/@n8n/design-system/src/css/utilities/_list.scss
similarity index 100%
rename from packages/design-system/src/css/utilities/_list.scss
rename to packages/frontend/@n8n/design-system/src/css/utilities/_list.scss
diff --git a/packages/design-system/src/css/utilities/_spacing.scss b/packages/frontend/@n8n/design-system/src/css/utilities/_spacing.scss
similarity index 100%
rename from packages/design-system/src/css/utilities/_spacing.scss
rename to packages/frontend/@n8n/design-system/src/css/utilities/_spacing.scss
diff --git a/packages/design-system/src/css/utilities/_typography.scss b/packages/frontend/@n8n/design-system/src/css/utilities/_typography.scss
similarity index 100%
rename from packages/design-system/src/css/utilities/_typography.scss
rename to packages/frontend/@n8n/design-system/src/css/utilities/_typography.scss
diff --git a/packages/design-system/src/css/utilities/index.scss b/packages/frontend/@n8n/design-system/src/css/utilities/index.scss
similarity index 100%
rename from packages/design-system/src/css/utilities/index.scss
rename to packages/frontend/@n8n/design-system/src/css/utilities/index.scss
diff --git a/packages/design-system/src/directives/index.ts b/packages/frontend/@n8n/design-system/src/directives/index.ts
similarity index 100%
rename from packages/design-system/src/directives/index.ts
rename to packages/frontend/@n8n/design-system/src/directives/index.ts
diff --git a/packages/design-system/src/directives/n8n-html.test.ts b/packages/frontend/@n8n/design-system/src/directives/n8n-html.test.ts
similarity index 100%
rename from packages/design-system/src/directives/n8n-html.test.ts
rename to packages/frontend/@n8n/design-system/src/directives/n8n-html.test.ts
diff --git a/packages/design-system/src/directives/n8n-html.ts b/packages/frontend/@n8n/design-system/src/directives/n8n-html.ts
similarity index 100%
rename from packages/design-system/src/directives/n8n-html.ts
rename to packages/frontend/@n8n/design-system/src/directives/n8n-html.ts
diff --git a/packages/design-system/src/directives/n8n-truncate.test.ts b/packages/frontend/@n8n/design-system/src/directives/n8n-truncate.test.ts
similarity index 100%
rename from packages/design-system/src/directives/n8n-truncate.test.ts
rename to packages/frontend/@n8n/design-system/src/directives/n8n-truncate.test.ts
diff --git a/packages/design-system/src/directives/n8n-truncate.ts b/packages/frontend/@n8n/design-system/src/directives/n8n-truncate.ts
similarity index 100%
rename from packages/design-system/src/directives/n8n-truncate.ts
rename to packages/frontend/@n8n/design-system/src/directives/n8n-truncate.ts
diff --git a/packages/design-system/src/index.ts b/packages/frontend/@n8n/design-system/src/index.ts
similarity index 100%
rename from packages/design-system/src/index.ts
rename to packages/frontend/@n8n/design-system/src/index.ts
diff --git a/packages/design-system/src/locale/format.ts b/packages/frontend/@n8n/design-system/src/locale/format.ts
similarity index 100%
rename from packages/design-system/src/locale/format.ts
rename to packages/frontend/@n8n/design-system/src/locale/format.ts
diff --git a/packages/design-system/src/locale/index.ts b/packages/frontend/@n8n/design-system/src/locale/index.ts
similarity index 93%
rename from packages/design-system/src/locale/index.ts
rename to packages/frontend/@n8n/design-system/src/locale/index.ts
index 48652a5a65..117a7ec172 100644
--- a/packages/design-system/src/locale/index.ts
+++ b/packages/frontend/@n8n/design-system/src/locale/index.ts
@@ -1,4 +1,4 @@
-import type { N8nLocale, N8nLocaleTranslateFn } from 'n8n-design-system/types';
+import type { N8nLocale, N8nLocaleTranslateFn } from '@n8n/design-system/types';
 
 import createFormatTemplate from './format';
 import defaultLang from '../locale/lang/en';
diff --git a/packages/design-system/src/locale/lang/en.ts b/packages/frontend/@n8n/design-system/src/locale/lang/en.ts
similarity index 97%
rename from packages/design-system/src/locale/lang/en.ts
rename to packages/frontend/@n8n/design-system/src/locale/lang/en.ts
index 3743bf92c6..8a83d84359 100644
--- a/packages/design-system/src/locale/lang/en.ts
+++ b/packages/frontend/@n8n/design-system/src/locale/lang/en.ts
@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/naming-convention */
-import type { N8nLocale } from 'n8n-design-system/types';
+import type { N8nLocale } from '@n8n/design-system/types';
 
 export default {
 	'generic.retry': 'Retry',
diff --git a/packages/design-system/src/mixins/index.ts b/packages/frontend/@n8n/design-system/src/mixins/index.ts
similarity index 100%
rename from packages/design-system/src/mixins/index.ts
rename to packages/frontend/@n8n/design-system/src/mixins/index.ts
diff --git a/packages/design-system/src/mixins/locale.ts b/packages/frontend/@n8n/design-system/src/mixins/locale.ts
similarity index 100%
rename from packages/design-system/src/mixins/locale.ts
rename to packages/frontend/@n8n/design-system/src/mixins/locale.ts
diff --git a/packages/design-system/src/plugin.ts b/packages/frontend/@n8n/design-system/src/plugin.ts
similarity index 100%
rename from packages/design-system/src/plugin.ts
rename to packages/frontend/@n8n/design-system/src/plugin.ts
diff --git a/packages/design-system/src/shims-modules.d.ts b/packages/frontend/@n8n/design-system/src/shims-modules.d.ts
similarity index 100%
rename from packages/design-system/src/shims-modules.d.ts
rename to packages/frontend/@n8n/design-system/src/shims-modules.d.ts
diff --git a/packages/design-system/src/shims-vue.d.ts b/packages/frontend/@n8n/design-system/src/shims-vue.d.ts
similarity index 100%
rename from packages/design-system/src/shims-vue.d.ts
rename to packages/frontend/@n8n/design-system/src/shims-vue.d.ts
diff --git a/packages/design-system/src/styleguide/ColorCircles.test.ts b/packages/frontend/@n8n/design-system/src/styleguide/ColorCircles.test.ts
similarity index 100%
rename from packages/design-system/src/styleguide/ColorCircles.test.ts
rename to packages/frontend/@n8n/design-system/src/styleguide/ColorCircles.test.ts
diff --git a/packages/design-system/src/styleguide/ColorCircles.utils.ts b/packages/frontend/@n8n/design-system/src/styleguide/ColorCircles.utils.ts
similarity index 100%
rename from packages/design-system/src/styleguide/ColorCircles.utils.ts
rename to packages/frontend/@n8n/design-system/src/styleguide/ColorCircles.utils.ts
diff --git a/packages/design-system/src/styleguide/ColorCircles.vue b/packages/frontend/@n8n/design-system/src/styleguide/ColorCircles.vue
similarity index 100%
rename from packages/design-system/src/styleguide/ColorCircles.vue
rename to packages/frontend/@n8n/design-system/src/styleguide/ColorCircles.vue
diff --git a/packages/design-system/src/styleguide/Sizes.test.ts b/packages/frontend/@n8n/design-system/src/styleguide/Sizes.test.ts
similarity index 100%
rename from packages/design-system/src/styleguide/Sizes.test.ts
rename to packages/frontend/@n8n/design-system/src/styleguide/Sizes.test.ts
diff --git a/packages/design-system/src/styleguide/Sizes.vue b/packages/frontend/@n8n/design-system/src/styleguide/Sizes.vue
similarity index 100%
rename from packages/design-system/src/styleguide/Sizes.vue
rename to packages/frontend/@n8n/design-system/src/styleguide/Sizes.vue
diff --git a/packages/design-system/src/styleguide/VariableTable.vue b/packages/frontend/@n8n/design-system/src/styleguide/VariableTable.vue
similarity index 100%
rename from packages/design-system/src/styleguide/VariableTable.vue
rename to packages/frontend/@n8n/design-system/src/styleguide/VariableTable.vue
diff --git a/packages/design-system/src/styleguide/__snapshots__/ColorCircles.test.ts.snap b/packages/frontend/@n8n/design-system/src/styleguide/__snapshots__/ColorCircles.test.ts.snap
similarity index 100%
rename from packages/design-system/src/styleguide/__snapshots__/ColorCircles.test.ts.snap
rename to packages/frontend/@n8n/design-system/src/styleguide/__snapshots__/ColorCircles.test.ts.snap
diff --git a/packages/design-system/src/styleguide/__snapshots__/Sizes.test.ts.snap b/packages/frontend/@n8n/design-system/src/styleguide/__snapshots__/Sizes.test.ts.snap
similarity index 100%
rename from packages/design-system/src/styleguide/__snapshots__/Sizes.test.ts.snap
rename to packages/frontend/@n8n/design-system/src/styleguide/__snapshots__/Sizes.test.ts.snap
diff --git a/packages/design-system/src/styleguide/border.stories.ts b/packages/frontend/@n8n/design-system/src/styleguide/border.stories.ts
similarity index 100%
rename from packages/design-system/src/styleguide/border.stories.ts
rename to packages/frontend/@n8n/design-system/src/styleguide/border.stories.ts
diff --git a/packages/design-system/src/styleguide/colors.stories.ts b/packages/frontend/@n8n/design-system/src/styleguide/colors.stories.ts
similarity index 100%
rename from packages/design-system/src/styleguide/colors.stories.ts
rename to packages/frontend/@n8n/design-system/src/styleguide/colors.stories.ts
diff --git a/packages/design-system/src/styleguide/colorsprimitives.stories.ts b/packages/frontend/@n8n/design-system/src/styleguide/colorsprimitives.stories.ts
similarity index 100%
rename from packages/design-system/src/styleguide/colorsprimitives.stories.ts
rename to packages/frontend/@n8n/design-system/src/styleguide/colorsprimitives.stories.ts
diff --git a/packages/design-system/src/styleguide/components/SpacingPreview.vue b/packages/frontend/@n8n/design-system/src/styleguide/components/SpacingPreview.vue
similarity index 100%
rename from packages/design-system/src/styleguide/components/SpacingPreview.vue
rename to packages/frontend/@n8n/design-system/src/styleguide/components/SpacingPreview.vue
diff --git a/packages/design-system/src/styleguide/fonts.stories.ts b/packages/frontend/@n8n/design-system/src/styleguide/fonts.stories.ts
similarity index 100%
rename from packages/design-system/src/styleguide/fonts.stories.ts
rename to packages/frontend/@n8n/design-system/src/styleguide/fonts.stories.ts
diff --git a/packages/design-system/src/styleguide/spacing.stories.ts b/packages/frontend/@n8n/design-system/src/styleguide/spacing.stories.ts
similarity index 100%
rename from packages/design-system/src/styleguide/spacing.stories.ts
rename to packages/frontend/@n8n/design-system/src/styleguide/spacing.stories.ts
diff --git a/packages/design-system/src/styleguide/utilities/float.stories.ts b/packages/frontend/@n8n/design-system/src/styleguide/utilities/float.stories.ts
similarity index 100%
rename from packages/design-system/src/styleguide/utilities/float.stories.ts
rename to packages/frontend/@n8n/design-system/src/styleguide/utilities/float.stories.ts
diff --git a/packages/design-system/src/styleguide/utilities/lists.stories.ts b/packages/frontend/@n8n/design-system/src/styleguide/utilities/lists.stories.ts
similarity index 100%
rename from packages/design-system/src/styleguide/utilities/lists.stories.ts
rename to packages/frontend/@n8n/design-system/src/styleguide/utilities/lists.stories.ts
diff --git a/packages/design-system/src/styleguide/utilities/spacing.stories.ts b/packages/frontend/@n8n/design-system/src/styleguide/utilities/spacing.stories.ts
similarity index 100%
rename from packages/design-system/src/styleguide/utilities/spacing.stories.ts
rename to packages/frontend/@n8n/design-system/src/styleguide/utilities/spacing.stories.ts
diff --git a/packages/design-system/src/types/action-dropdown.ts b/packages/frontend/@n8n/design-system/src/types/action-dropdown.ts
similarity index 73%
rename from packages/design-system/src/types/action-dropdown.ts
rename to packages/frontend/@n8n/design-system/src/types/action-dropdown.ts
index b04b51aba7..a5d39a7cca 100644
--- a/packages/design-system/src/types/action-dropdown.ts
+++ b/packages/frontend/@n8n/design-system/src/types/action-dropdown.ts
@@ -1,4 +1,4 @@
-import type { KeyboardShortcut } from 'n8n-design-system/types/keyboardshortcut';
+import type { KeyboardShortcut } from '@n8n/design-system/types/keyboardshortcut';
 
 export interface ActionDropdownItem {
 	id: string;
diff --git a/packages/design-system/src/types/assistant.ts b/packages/frontend/@n8n/design-system/src/types/assistant.ts
similarity index 100%
rename from packages/design-system/src/types/assistant.ts
rename to packages/frontend/@n8n/design-system/src/types/assistant.ts
diff --git a/packages/design-system/src/types/button.ts b/packages/frontend/@n8n/design-system/src/types/button.ts
similarity index 100%
rename from packages/design-system/src/types/button.ts
rename to packages/frontend/@n8n/design-system/src/types/button.ts
diff --git a/packages/design-system/src/types/datatable.ts b/packages/frontend/@n8n/design-system/src/types/datatable.ts
similarity index 100%
rename from packages/design-system/src/types/datatable.ts
rename to packages/frontend/@n8n/design-system/src/types/datatable.ts
diff --git a/packages/design-system/src/types/form.ts b/packages/frontend/@n8n/design-system/src/types/form.ts
similarity index 96%
rename from packages/design-system/src/types/form.ts
rename to packages/frontend/@n8n/design-system/src/types/form.ts
index bffaf67c81..742e6b1bd0 100644
--- a/packages/design-system/src/types/form.ts
+++ b/packages/frontend/@n8n/design-system/src/types/form.ts
@@ -1,4 +1,4 @@
-import type { N8nLocaleTranslateFnOptions } from 'n8n-design-system/types/i18n';
+import type { N8nLocaleTranslateFnOptions } from '@n8n/design-system/types/i18n';
 
 export type Rule = { name: string; config?: unknown };
 
diff --git a/packages/design-system/src/types/i18n.ts b/packages/frontend/@n8n/design-system/src/types/i18n.ts
similarity index 100%
rename from packages/design-system/src/types/i18n.ts
rename to packages/frontend/@n8n/design-system/src/types/i18n.ts
diff --git a/packages/design-system/src/types/icon.ts b/packages/frontend/@n8n/design-system/src/types/icon.ts
similarity index 81%
rename from packages/design-system/src/types/icon.ts
rename to packages/frontend/@n8n/design-system/src/types/icon.ts
index e2d7a36634..8cd048ab61 100644
--- a/packages/design-system/src/types/icon.ts
+++ b/packages/frontend/@n8n/design-system/src/types/icon.ts
@@ -1,4 +1,4 @@
-import type { TextColor } from 'n8n-design-system/types/text';
+import type { TextColor } from '@n8n/design-system/types/text';
 
 const ICON_SIZE = ['xsmall', 'small', 'medium', 'large'] as const;
 export type IconSize = (typeof ICON_SIZE)[number];
diff --git a/packages/design-system/src/types/index.ts b/packages/frontend/@n8n/design-system/src/types/index.ts
similarity index 100%
rename from packages/design-system/src/types/index.ts
rename to packages/frontend/@n8n/design-system/src/types/index.ts
diff --git a/packages/design-system/src/types/input.ts b/packages/frontend/@n8n/design-system/src/types/input.ts
similarity index 100%
rename from packages/design-system/src/types/input.ts
rename to packages/frontend/@n8n/design-system/src/types/input.ts
diff --git a/packages/design-system/src/types/keyboardshortcut.ts b/packages/frontend/@n8n/design-system/src/types/keyboardshortcut.ts
similarity index 100%
rename from packages/design-system/src/types/keyboardshortcut.ts
rename to packages/frontend/@n8n/design-system/src/types/keyboardshortcut.ts
diff --git a/packages/design-system/src/types/menu.ts b/packages/frontend/@n8n/design-system/src/types/menu.ts
similarity index 100%
rename from packages/design-system/src/types/menu.ts
rename to packages/frontend/@n8n/design-system/src/types/menu.ts
diff --git a/packages/design-system/src/types/node-creator-node.ts b/packages/frontend/@n8n/design-system/src/types/node-creator-node.ts
similarity index 100%
rename from packages/design-system/src/types/node-creator-node.ts
rename to packages/frontend/@n8n/design-system/src/types/node-creator-node.ts
diff --git a/packages/design-system/src/types/resize.ts b/packages/frontend/@n8n/design-system/src/types/resize.ts
similarity index 100%
rename from packages/design-system/src/types/resize.ts
rename to packages/frontend/@n8n/design-system/src/types/resize.ts
diff --git a/packages/design-system/src/types/select.ts b/packages/frontend/@n8n/design-system/src/types/select.ts
similarity index 100%
rename from packages/design-system/src/types/select.ts
rename to packages/frontend/@n8n/design-system/src/types/select.ts
diff --git a/packages/design-system/src/types/text.ts b/packages/frontend/@n8n/design-system/src/types/text.ts
similarity index 100%
rename from packages/design-system/src/types/text.ts
rename to packages/frontend/@n8n/design-system/src/types/text.ts
diff --git a/packages/design-system/src/types/user.ts b/packages/frontend/@n8n/design-system/src/types/user.ts
similarity index 100%
rename from packages/design-system/src/types/user.ts
rename to packages/frontend/@n8n/design-system/src/types/user.ts
diff --git a/packages/design-system/src/utils.scss b/packages/frontend/@n8n/design-system/src/utils.scss
similarity index 100%
rename from packages/design-system/src/utils.scss
rename to packages/frontend/@n8n/design-system/src/utils.scss
diff --git a/packages/design-system/src/utils/form-event-bus.ts b/packages/frontend/@n8n/design-system/src/utils/form-event-bus.ts
similarity index 100%
rename from packages/design-system/src/utils/form-event-bus.ts
rename to packages/frontend/@n8n/design-system/src/utils/form-event-bus.ts
diff --git a/packages/design-system/src/utils/index.ts b/packages/frontend/@n8n/design-system/src/utils/index.ts
similarity index 100%
rename from packages/design-system/src/utils/index.ts
rename to packages/frontend/@n8n/design-system/src/utils/index.ts
diff --git a/packages/design-system/src/utils/labelUtil.test.ts b/packages/frontend/@n8n/design-system/src/utils/labelUtil.test.ts
similarity index 100%
rename from packages/design-system/src/utils/labelUtil.test.ts
rename to packages/frontend/@n8n/design-system/src/utils/labelUtil.test.ts
diff --git a/packages/design-system/src/utils/labelUtil.ts b/packages/frontend/@n8n/design-system/src/utils/labelUtil.ts
similarity index 100%
rename from packages/design-system/src/utils/labelUtil.ts
rename to packages/frontend/@n8n/design-system/src/utils/labelUtil.ts
diff --git a/packages/design-system/src/utils/markdown.test.ts b/packages/frontend/@n8n/design-system/src/utils/markdown.test.ts
similarity index 100%
rename from packages/design-system/src/utils/markdown.test.ts
rename to packages/frontend/@n8n/design-system/src/utils/markdown.test.ts
diff --git a/packages/design-system/src/utils/markdown.ts b/packages/frontend/@n8n/design-system/src/utils/markdown.ts
similarity index 100%
rename from packages/design-system/src/utils/markdown.ts
rename to packages/frontend/@n8n/design-system/src/utils/markdown.ts
diff --git a/packages/design-system/src/utils/testUtils.ts b/packages/frontend/@n8n/design-system/src/utils/testUtils.ts
similarity index 100%
rename from packages/design-system/src/utils/testUtils.ts
rename to packages/frontend/@n8n/design-system/src/utils/testUtils.ts
diff --git a/packages/design-system/src/utils/typeguards.ts b/packages/frontend/@n8n/design-system/src/utils/typeguards.ts
similarity index 100%
rename from packages/design-system/src/utils/typeguards.ts
rename to packages/frontend/@n8n/design-system/src/utils/typeguards.ts
diff --git a/packages/design-system/src/utils/uid.ts b/packages/frontend/@n8n/design-system/src/utils/uid.ts
similarity index 100%
rename from packages/design-system/src/utils/uid.ts
rename to packages/frontend/@n8n/design-system/src/utils/uid.ts
diff --git a/packages/design-system/src/utils/valueByPath.test.ts b/packages/frontend/@n8n/design-system/src/utils/valueByPath.test.ts
similarity index 94%
rename from packages/design-system/src/utils/valueByPath.test.ts
rename to packages/frontend/@n8n/design-system/src/utils/valueByPath.test.ts
index 9ea56c11c3..f605058e3a 100644
--- a/packages/design-system/src/utils/valueByPath.test.ts
+++ b/packages/frontend/@n8n/design-system/src/utils/valueByPath.test.ts
@@ -1,4 +1,4 @@
-import { getValueByPath } from 'n8n-design-system/utils';
+import { getValueByPath } from '@n8n/design-system/utils';
 
 describe('getValueByPath()', () => {
 	const object = {
diff --git a/packages/design-system/src/utils/valueByPath.ts b/packages/frontend/@n8n/design-system/src/utils/valueByPath.ts
similarity index 100%
rename from packages/design-system/src/utils/valueByPath.ts
rename to packages/frontend/@n8n/design-system/src/utils/valueByPath.ts
diff --git a/packages/design-system/tailwind.config.js b/packages/frontend/@n8n/design-system/tailwind.config.js
similarity index 100%
rename from packages/design-system/tailwind.config.js
rename to packages/frontend/@n8n/design-system/tailwind.config.js
diff --git a/packages/design-system/theme/preview/docs.min.css b/packages/frontend/@n8n/design-system/theme/preview/docs.min.css
similarity index 100%
rename from packages/design-system/theme/preview/docs.min.css
rename to packages/frontend/@n8n/design-system/theme/preview/docs.min.css
diff --git a/packages/design-system/theme/preview/index.html b/packages/frontend/@n8n/design-system/theme/preview/index.html
similarity index 100%
rename from packages/design-system/theme/preview/index.html
rename to packages/frontend/@n8n/design-system/theme/preview/index.html
diff --git a/packages/design-system/tsconfig.json b/packages/frontend/@n8n/design-system/tsconfig.json
similarity index 55%
rename from packages/design-system/tsconfig.json
rename to packages/frontend/@n8n/design-system/tsconfig.json
index 32876cc14a..3e0c2d0daa 100644
--- a/packages/design-system/tsconfig.json
+++ b/packages/frontend/@n8n/design-system/tsconfig.json
@@ -2,19 +2,19 @@
 	"extends": "@n8n/typescript-config/tsconfig.frontend.json",
 	"compilerOptions": {
 		"baseUrl": ".",
-		"rootDirs": [".", "../../frontend/@n8n/composables/src"],
+		"rootDirs": [".", "../composables/src"],
 		"outDir": "dist",
 		"types": ["vite/client", "vitest/globals"],
 		"typeRoots": [
 			"./node_modules/@testing-library",
 			"./node_modules/@types",
-			"../../node_modules",
-			"../../node_modules/@types"
+			"../../../../node_modules",
+			"../../../../node_modules/@types"
 		],
 		"paths": {
-			"n8n-design-system*": ["./src*"],
-			"@n8n/composables*": ["../frontend/@n8n/composables/src*"],
-			"@n8n/utils*": ["../@n8n/utils/src*"]
+			"@n8n/design-system*": ["./src*"],
+			"@n8n/composables*": ["../composables/src*"],
+			"@n8n/utils*": ["../../../@n8n/utils/src*"]
 		}
 	},
 	"include": ["src/**/*.ts", "src/**/*.vue"]
diff --git a/packages/design-system/vite.config.mts b/packages/frontend/@n8n/design-system/vite.config.mts
similarity index 79%
rename from packages/design-system/vite.config.mts
rename to packages/frontend/@n8n/design-system/vite.config.mts
index ed626b2842..022a04cbf8 100644
--- a/packages/design-system/vite.config.mts
+++ b/packages/frontend/@n8n/design-system/vite.config.mts
@@ -6,8 +6,7 @@ import icons from 'unplugin-icons/vite';
 import iconsResolver from 'unplugin-icons/resolver';
 import { vitestConfig } from '@n8n/vitest-config/frontend';
 
-const n8nDir = resolve(__dirname, '..', '@n8n');
-const frontendDir = resolve(__dirname, '..', 'frontend');
+const packagesDir = resolve(__dirname, '..', '..', '..');
 
 export default mergeConfig(
 	defineConfig({
@@ -30,9 +29,9 @@ export default mergeConfig(
 		resolve: {
 			alias: {
 				'@': resolve(__dirname, 'src'),
-				'n8n-design-system': resolve(__dirname, 'src'),
-				'@n8n/composables(.*)': resolve(frontendDir, '@n8n', 'composables', 'src$1'),
-				'@n8n/utils(.*)': resolve(n8nDir, '@n8n', 'utils', 'src$1'),
+				'@n8n/design-system': resolve(__dirname, 'src'),
+				'@n8n/composables(.*)': resolve(packagesDir, 'frontend', '@n8n', 'composables', 'src$1'),
+				'@n8n/utils(.*)': resolve(packagesDir, '@n8n', 'utils', 'src$1'),
 				lodash: 'lodash-es',
 			},
 		},
diff --git a/packages/editor-ui/.browserslistrc b/packages/frontend/editor-ui/.browserslistrc
similarity index 100%
rename from packages/editor-ui/.browserslistrc
rename to packages/frontend/editor-ui/.browserslistrc
diff --git a/packages/editor-ui/.eslintrc.js b/packages/frontend/editor-ui/.eslintrc.js
similarity index 100%
rename from packages/editor-ui/.eslintrc.js
rename to packages/frontend/editor-ui/.eslintrc.js
diff --git a/packages/editor-ui/.gitignore b/packages/frontend/editor-ui/.gitignore
similarity index 100%
rename from packages/editor-ui/.gitignore
rename to packages/frontend/editor-ui/.gitignore
diff --git a/packages/editor-ui/.npmignore b/packages/frontend/editor-ui/.npmignore
similarity index 100%
rename from packages/editor-ui/.npmignore
rename to packages/frontend/editor-ui/.npmignore
diff --git a/packages/editor-ui/README.md b/packages/frontend/editor-ui/README.md
similarity index 100%
rename from packages/editor-ui/README.md
rename to packages/frontend/editor-ui/README.md
diff --git a/packages/editor-ui/biome.jsonc b/packages/frontend/editor-ui/biome.jsonc
similarity index 69%
rename from packages/editor-ui/biome.jsonc
rename to packages/frontend/editor-ui/biome.jsonc
index a8cf126857..eaf75ce7d1 100644
--- a/packages/editor-ui/biome.jsonc
+++ b/packages/frontend/editor-ui/biome.jsonc
@@ -1,6 +1,6 @@
 {
-	"$schema": "../../node_modules/@biomejs/biome/configuration_schema.json",
-	"extends": ["../../biome.jsonc"]
+	"$schema": "../../../node_modules/@biomejs/biome/configuration_schema.json",
+	"extends": ["../../../biome.jsonc"]
 	// Although nothing is extended here, it is required so biome use the
 	// editor-ui gitignore file:
 	// > For now, Biome only takes the ignore file in the working directory into account.
diff --git a/packages/editor-ui/index.html b/packages/frontend/editor-ui/index.html
similarity index 100%
rename from packages/editor-ui/index.html
rename to packages/frontend/editor-ui/index.html
diff --git a/packages/editor-ui/index.js b/packages/frontend/editor-ui/index.js
similarity index 100%
rename from packages/editor-ui/index.js
rename to packages/frontend/editor-ui/index.js
diff --git a/packages/editor-ui/package.json b/packages/frontend/editor-ui/package.json
similarity index 96%
rename from packages/editor-ui/package.json
rename to packages/frontend/editor-ui/package.json
index 39492b7071..3e2ab0662f 100644
--- a/packages/editor-ui/package.json
+++ b/packages/frontend/editor-ui/package.json
@@ -11,8 +11,8 @@
     "dev": "pnpm serve",
     "lint": "eslint src --ext .js,.ts,.vue --quiet",
     "lintfix": "eslint src --ext .js,.ts,.vue --fix",
-    "format": "biome format --write . && prettier --write . --ignore-path ../../.prettierignore",
-    "format:check": "biome ci . && prettier --check . --ignore-path ../../.prettierignore",
+    "format": "biome format --write . && prettier --write . --ignore-path ../../../.prettierignore",
+    "format:check": "biome ci . && prettier --check . --ignore-path ../../../.prettierignore",
     "serve": "cross-env VUE_APP_URL_BASE_API=http://localhost:5678/ vite --host 0.0.0.0 --port 8080 dev",
     "test": "vitest run",
     "test:dev": "vitest --silent=false"
@@ -30,12 +30,13 @@
     "@codemirror/state": "^6.4.1",
     "@codemirror/view": "^6.26.3",
     "@fontsource/open-sans": "^4.5.0",
-    "@lezer/common": "^1.0.4",
+    "@lezer/common": "1.1.0",
     "@n8n/api-types": "workspace:*",
     "@n8n/chat": "workspace:*",
     "@n8n/codemirror-lang": "workspace:*",
     "@n8n/codemirror-lang-sql": "^1.0.2",
     "@n8n/composables": "workspace:*",
+    "@n8n/design-system": "workspace:*",
     "@n8n/permissions": "workspace:*",
     "@n8n/utils": "workspace:*",
     "@replit/codemirror-indentation-markers": "^6.5.3",
@@ -68,7 +69,6 @@
     "jsonpath": "^1.1.1",
     "lodash-es": "^4.17.21",
     "luxon": "catalog:",
-    "n8n-design-system": "workspace:*",
     "n8n-workflow": "workspace:*",
     "pinia": "^2.2.4",
     "prettier": "^3.3.3",
@@ -105,7 +105,6 @@
     "@types/json-schema": "^7.0.15",
     "@types/jsonpath": "^0.2.0",
     "@types/lodash-es": "^4.17.6",
-    "@types/luxon": "^3.2.0",
     "@types/uuid": "catalog:",
     "@vitejs/plugin-legacy": "^6.0.0",
     "@vitejs/plugin-vue": "catalog:frontend",
diff --git a/packages/editor-ui/postcss.config.js b/packages/frontend/editor-ui/postcss.config.js
similarity index 100%
rename from packages/editor-ui/postcss.config.js
rename to packages/frontend/editor-ui/postcss.config.js
diff --git a/packages/editor-ui/public/favicon.ico b/packages/frontend/editor-ui/public/favicon.ico
similarity index 100%
rename from packages/editor-ui/public/favicon.ico
rename to packages/frontend/editor-ui/public/favicon.ico
diff --git a/packages/editor-ui/public/static/community_package_tooltip_img.png b/packages/frontend/editor-ui/public/static/community_package_tooltip_img.png
similarity index 100%
rename from packages/editor-ui/public/static/community_package_tooltip_img.png
rename to packages/frontend/editor-ui/public/static/community_package_tooltip_img.png
diff --git a/packages/editor-ui/public/static/data-mapping-gif.gif b/packages/frontend/editor-ui/public/static/data-mapping-gif.gif
similarity index 100%
rename from packages/editor-ui/public/static/data-mapping-gif.gif
rename to packages/frontend/editor-ui/public/static/data-mapping-gif.gif
diff --git a/packages/editor-ui/public/static/form-grey.svg b/packages/frontend/editor-ui/public/static/form-grey.svg
similarity index 100%
rename from packages/editor-ui/public/static/form-grey.svg
rename to packages/frontend/editor-ui/public/static/form-grey.svg
diff --git a/packages/editor-ui/public/static/google-auth/disabled.dark.png b/packages/frontend/editor-ui/public/static/google-auth/disabled.dark.png
similarity index 100%
rename from packages/editor-ui/public/static/google-auth/disabled.dark.png
rename to packages/frontend/editor-ui/public/static/google-auth/disabled.dark.png
diff --git a/packages/editor-ui/public/static/google-auth/disabled.png b/packages/frontend/editor-ui/public/static/google-auth/disabled.png
similarity index 100%
rename from packages/editor-ui/public/static/google-auth/disabled.png
rename to packages/frontend/editor-ui/public/static/google-auth/disabled.png
diff --git a/packages/editor-ui/public/static/google-auth/focus.dark.png b/packages/frontend/editor-ui/public/static/google-auth/focus.dark.png
similarity index 100%
rename from packages/editor-ui/public/static/google-auth/focus.dark.png
rename to packages/frontend/editor-ui/public/static/google-auth/focus.dark.png
diff --git a/packages/editor-ui/public/static/google-auth/focus.png b/packages/frontend/editor-ui/public/static/google-auth/focus.png
similarity index 100%
rename from packages/editor-ui/public/static/google-auth/focus.png
rename to packages/frontend/editor-ui/public/static/google-auth/focus.png
diff --git a/packages/editor-ui/public/static/google-auth/normal.dark.png b/packages/frontend/editor-ui/public/static/google-auth/normal.dark.png
similarity index 100%
rename from packages/editor-ui/public/static/google-auth/normal.dark.png
rename to packages/frontend/editor-ui/public/static/google-auth/normal.dark.png
diff --git a/packages/editor-ui/public/static/google-auth/normal.png b/packages/frontend/editor-ui/public/static/google-auth/normal.png
similarity index 100%
rename from packages/editor-ui/public/static/google-auth/normal.png
rename to packages/frontend/editor-ui/public/static/google-auth/normal.png
diff --git a/packages/editor-ui/public/static/google-auth/pressed.dark.png b/packages/frontend/editor-ui/public/static/google-auth/pressed.dark.png
similarity index 100%
rename from packages/editor-ui/public/static/google-auth/pressed.dark.png
rename to packages/frontend/editor-ui/public/static/google-auth/pressed.dark.png
diff --git a/packages/editor-ui/public/static/google-auth/pressed.png b/packages/frontend/editor-ui/public/static/google-auth/pressed.png
similarity index 100%
rename from packages/editor-ui/public/static/google-auth/pressed.png
rename to packages/frontend/editor-ui/public/static/google-auth/pressed.png
diff --git a/packages/editor-ui/public/static/n8n-logo.png b/packages/frontend/editor-ui/public/static/n8n-logo.png
similarity index 100%
rename from packages/editor-ui/public/static/n8n-logo.png
rename to packages/frontend/editor-ui/public/static/n8n-logo.png
diff --git a/packages/editor-ui/public/static/og_image.png b/packages/frontend/editor-ui/public/static/og_image.png
similarity index 100%
rename from packages/editor-ui/public/static/og_image.png
rename to packages/frontend/editor-ui/public/static/og_image.png
diff --git a/packages/editor-ui/public/static/open-ai.svg b/packages/frontend/editor-ui/public/static/open-ai.svg
similarity index 100%
rename from packages/editor-ui/public/static/open-ai.svg
rename to packages/frontend/editor-ui/public/static/open-ai.svg
diff --git a/packages/editor-ui/public/static/webhook-icon.svg b/packages/frontend/editor-ui/public/static/webhook-icon.svg
similarity index 100%
rename from packages/editor-ui/public/static/webhook-icon.svg
rename to packages/frontend/editor-ui/public/static/webhook-icon.svg
diff --git a/packages/editor-ui/src/App.vue b/packages/frontend/editor-ui/src/App.vue
similarity index 100%
rename from packages/editor-ui/src/App.vue
rename to packages/frontend/editor-ui/src/App.vue
diff --git a/packages/editor-ui/src/Interface.ts b/packages/frontend/editor-ui/src/Interface.ts
similarity index 99%
rename from packages/editor-ui/src/Interface.ts
rename to packages/frontend/editor-ui/src/Interface.ts
index 8edee2fa37..f57339b134 100644
--- a/packages/editor-ui/src/Interface.ts
+++ b/packages/frontend/editor-ui/src/Interface.ts
@@ -8,7 +8,7 @@ import type {
 	IVersionNotificationSettings,
 } from '@n8n/api-types';
 import type { Scope } from '@n8n/permissions';
-import type { NodeCreatorTag } from 'n8n-design-system';
+import type { NodeCreatorTag } from '@n8n/design-system';
 import type {
 	GenericValue,
 	IConnections,
@@ -59,7 +59,7 @@ import type { BulkCommand, Undoable } from '@/models/history';
 
 import type { ProjectSharingData } from '@/types/projects.types';
 
-export * from 'n8n-design-system/types';
+export * from '@n8n/design-system/types';
 
 declare global {
 	interface Window {
diff --git a/packages/editor-ui/src/__tests__/data/canvas.ts b/packages/frontend/editor-ui/src/__tests__/data/canvas.ts
similarity index 100%
rename from packages/editor-ui/src/__tests__/data/canvas.ts
rename to packages/frontend/editor-ui/src/__tests__/data/canvas.ts
diff --git a/packages/editor-ui/src/__tests__/data/index.ts b/packages/frontend/editor-ui/src/__tests__/data/index.ts
similarity index 100%
rename from packages/editor-ui/src/__tests__/data/index.ts
rename to packages/frontend/editor-ui/src/__tests__/data/index.ts
diff --git a/packages/editor-ui/src/__tests__/data/projects.ts b/packages/frontend/editor-ui/src/__tests__/data/projects.ts
similarity index 100%
rename from packages/editor-ui/src/__tests__/data/projects.ts
rename to packages/frontend/editor-ui/src/__tests__/data/projects.ts
diff --git a/packages/editor-ui/src/__tests__/data/users.ts b/packages/frontend/editor-ui/src/__tests__/data/users.ts
similarity index 100%
rename from packages/editor-ui/src/__tests__/data/users.ts
rename to packages/frontend/editor-ui/src/__tests__/data/users.ts
diff --git a/packages/editor-ui/src/__tests__/defaults.ts b/packages/frontend/editor-ui/src/__tests__/defaults.ts
similarity index 100%
rename from packages/editor-ui/src/__tests__/defaults.ts
rename to packages/frontend/editor-ui/src/__tests__/defaults.ts
diff --git a/packages/editor-ui/src/__tests__/mocks.ts b/packages/frontend/editor-ui/src/__tests__/mocks.ts
similarity index 100%
rename from packages/editor-ui/src/__tests__/mocks.ts
rename to packages/frontend/editor-ui/src/__tests__/mocks.ts
diff --git a/packages/editor-ui/src/__tests__/render.ts b/packages/frontend/editor-ui/src/__tests__/render.ts
similarity index 100%
rename from packages/editor-ui/src/__tests__/render.ts
rename to packages/frontend/editor-ui/src/__tests__/render.ts
diff --git a/packages/editor-ui/src/__tests__/server/endpoints/credential.ts b/packages/frontend/editor-ui/src/__tests__/server/endpoints/credential.ts
similarity index 100%
rename from packages/editor-ui/src/__tests__/server/endpoints/credential.ts
rename to packages/frontend/editor-ui/src/__tests__/server/endpoints/credential.ts
diff --git a/packages/editor-ui/src/__tests__/server/endpoints/credentialType.ts b/packages/frontend/editor-ui/src/__tests__/server/endpoints/credentialType.ts
similarity index 100%
rename from packages/editor-ui/src/__tests__/server/endpoints/credentialType.ts
rename to packages/frontend/editor-ui/src/__tests__/server/endpoints/credentialType.ts
diff --git a/packages/editor-ui/src/__tests__/server/endpoints/index.ts b/packages/frontend/editor-ui/src/__tests__/server/endpoints/index.ts
similarity index 100%
rename from packages/editor-ui/src/__tests__/server/endpoints/index.ts
rename to packages/frontend/editor-ui/src/__tests__/server/endpoints/index.ts
diff --git a/packages/editor-ui/src/__tests__/server/endpoints/settings.ts b/packages/frontend/editor-ui/src/__tests__/server/endpoints/settings.ts
similarity index 100%
rename from packages/editor-ui/src/__tests__/server/endpoints/settings.ts
rename to packages/frontend/editor-ui/src/__tests__/server/endpoints/settings.ts
diff --git a/packages/editor-ui/src/__tests__/server/endpoints/sourceControl.ts b/packages/frontend/editor-ui/src/__tests__/server/endpoints/sourceControl.ts
similarity index 100%
rename from packages/editor-ui/src/__tests__/server/endpoints/sourceControl.ts
rename to packages/frontend/editor-ui/src/__tests__/server/endpoints/sourceControl.ts
diff --git a/packages/editor-ui/src/__tests__/server/endpoints/sso.ts b/packages/frontend/editor-ui/src/__tests__/server/endpoints/sso.ts
similarity index 100%
rename from packages/editor-ui/src/__tests__/server/endpoints/sso.ts
rename to packages/frontend/editor-ui/src/__tests__/server/endpoints/sso.ts
diff --git a/packages/editor-ui/src/__tests__/server/endpoints/tag.ts b/packages/frontend/editor-ui/src/__tests__/server/endpoints/tag.ts
similarity index 100%
rename from packages/editor-ui/src/__tests__/server/endpoints/tag.ts
rename to packages/frontend/editor-ui/src/__tests__/server/endpoints/tag.ts
diff --git a/packages/editor-ui/src/__tests__/server/endpoints/user.ts b/packages/frontend/editor-ui/src/__tests__/server/endpoints/user.ts
similarity index 100%
rename from packages/editor-ui/src/__tests__/server/endpoints/user.ts
rename to packages/frontend/editor-ui/src/__tests__/server/endpoints/user.ts
diff --git a/packages/editor-ui/src/__tests__/server/endpoints/variable.ts b/packages/frontend/editor-ui/src/__tests__/server/endpoints/variable.ts
similarity index 100%
rename from packages/editor-ui/src/__tests__/server/endpoints/variable.ts
rename to packages/frontend/editor-ui/src/__tests__/server/endpoints/variable.ts
diff --git a/packages/editor-ui/src/__tests__/server/endpoints/workflow.ts b/packages/frontend/editor-ui/src/__tests__/server/endpoints/workflow.ts
similarity index 100%
rename from packages/editor-ui/src/__tests__/server/endpoints/workflow.ts
rename to packages/frontend/editor-ui/src/__tests__/server/endpoints/workflow.ts
diff --git a/packages/editor-ui/src/__tests__/server/factories/credential.ts b/packages/frontend/editor-ui/src/__tests__/server/factories/credential.ts
similarity index 100%
rename from packages/editor-ui/src/__tests__/server/factories/credential.ts
rename to packages/frontend/editor-ui/src/__tests__/server/factories/credential.ts
diff --git a/packages/editor-ui/src/__tests__/server/factories/credentialType.ts b/packages/frontend/editor-ui/src/__tests__/server/factories/credentialType.ts
similarity index 100%
rename from packages/editor-ui/src/__tests__/server/factories/credentialType.ts
rename to packages/frontend/editor-ui/src/__tests__/server/factories/credentialType.ts
diff --git a/packages/editor-ui/src/__tests__/server/factories/index.ts b/packages/frontend/editor-ui/src/__tests__/server/factories/index.ts
similarity index 100%
rename from packages/editor-ui/src/__tests__/server/factories/index.ts
rename to packages/frontend/editor-ui/src/__tests__/server/factories/index.ts
diff --git a/packages/editor-ui/src/__tests__/server/factories/tag.ts b/packages/frontend/editor-ui/src/__tests__/server/factories/tag.ts
similarity index 100%
rename from packages/editor-ui/src/__tests__/server/factories/tag.ts
rename to packages/frontend/editor-ui/src/__tests__/server/factories/tag.ts
diff --git a/packages/editor-ui/src/__tests__/server/factories/user.ts b/packages/frontend/editor-ui/src/__tests__/server/factories/user.ts
similarity index 100%
rename from packages/editor-ui/src/__tests__/server/factories/user.ts
rename to packages/frontend/editor-ui/src/__tests__/server/factories/user.ts
diff --git a/packages/editor-ui/src/__tests__/server/factories/variable.ts b/packages/frontend/editor-ui/src/__tests__/server/factories/variable.ts
similarity index 100%
rename from packages/editor-ui/src/__tests__/server/factories/variable.ts
rename to packages/frontend/editor-ui/src/__tests__/server/factories/variable.ts
diff --git a/packages/editor-ui/src/__tests__/server/factories/workflow.ts b/packages/frontend/editor-ui/src/__tests__/server/factories/workflow.ts
similarity index 100%
rename from packages/editor-ui/src/__tests__/server/factories/workflow.ts
rename to packages/frontend/editor-ui/src/__tests__/server/factories/workflow.ts
diff --git a/packages/editor-ui/src/__tests__/server/fixtures/index.ts b/packages/frontend/editor-ui/src/__tests__/server/fixtures/index.ts
similarity index 100%
rename from packages/editor-ui/src/__tests__/server/fixtures/index.ts
rename to packages/frontend/editor-ui/src/__tests__/server/fixtures/index.ts
diff --git a/packages/editor-ui/src/__tests__/server/fixtures/tags.ts b/packages/frontend/editor-ui/src/__tests__/server/fixtures/tags.ts
similarity index 100%
rename from packages/editor-ui/src/__tests__/server/fixtures/tags.ts
rename to packages/frontend/editor-ui/src/__tests__/server/fixtures/tags.ts
diff --git a/packages/editor-ui/src/__tests__/server/fixtures/workflows.ts b/packages/frontend/editor-ui/src/__tests__/server/fixtures/workflows.ts
similarity index 100%
rename from packages/editor-ui/src/__tests__/server/fixtures/workflows.ts
rename to packages/frontend/editor-ui/src/__tests__/server/fixtures/workflows.ts
diff --git a/packages/editor-ui/src/__tests__/server/index.ts b/packages/frontend/editor-ui/src/__tests__/server/index.ts
similarity index 100%
rename from packages/editor-ui/src/__tests__/server/index.ts
rename to packages/frontend/editor-ui/src/__tests__/server/index.ts
diff --git a/packages/editor-ui/src/__tests__/server/models/credential.ts b/packages/frontend/editor-ui/src/__tests__/server/models/credential.ts
similarity index 100%
rename from packages/editor-ui/src/__tests__/server/models/credential.ts
rename to packages/frontend/editor-ui/src/__tests__/server/models/credential.ts
diff --git a/packages/editor-ui/src/__tests__/server/models/credentialType.ts b/packages/frontend/editor-ui/src/__tests__/server/models/credentialType.ts
similarity index 100%
rename from packages/editor-ui/src/__tests__/server/models/credentialType.ts
rename to packages/frontend/editor-ui/src/__tests__/server/models/credentialType.ts
diff --git a/packages/editor-ui/src/__tests__/server/models/index.ts b/packages/frontend/editor-ui/src/__tests__/server/models/index.ts
similarity index 100%
rename from packages/editor-ui/src/__tests__/server/models/index.ts
rename to packages/frontend/editor-ui/src/__tests__/server/models/index.ts
diff --git a/packages/editor-ui/src/__tests__/server/models/tag.ts b/packages/frontend/editor-ui/src/__tests__/server/models/tag.ts
similarity index 100%
rename from packages/editor-ui/src/__tests__/server/models/tag.ts
rename to packages/frontend/editor-ui/src/__tests__/server/models/tag.ts
diff --git a/packages/editor-ui/src/__tests__/server/models/user.ts b/packages/frontend/editor-ui/src/__tests__/server/models/user.ts
similarity index 100%
rename from packages/editor-ui/src/__tests__/server/models/user.ts
rename to packages/frontend/editor-ui/src/__tests__/server/models/user.ts
diff --git a/packages/editor-ui/src/__tests__/server/models/variable.ts b/packages/frontend/editor-ui/src/__tests__/server/models/variable.ts
similarity index 100%
rename from packages/editor-ui/src/__tests__/server/models/variable.ts
rename to packages/frontend/editor-ui/src/__tests__/server/models/variable.ts
diff --git a/packages/editor-ui/src/__tests__/server/models/workflow.ts b/packages/frontend/editor-ui/src/__tests__/server/models/workflow.ts
similarity index 100%
rename from packages/editor-ui/src/__tests__/server/models/workflow.ts
rename to packages/frontend/editor-ui/src/__tests__/server/models/workflow.ts
diff --git a/packages/editor-ui/src/__tests__/server/types.ts b/packages/frontend/editor-ui/src/__tests__/server/types.ts
similarity index 100%
rename from packages/editor-ui/src/__tests__/server/types.ts
rename to packages/frontend/editor-ui/src/__tests__/server/types.ts
diff --git a/packages/editor-ui/src/__tests__/setup.ts b/packages/frontend/editor-ui/src/__tests__/setup.ts
similarity index 100%
rename from packages/editor-ui/src/__tests__/setup.ts
rename to packages/frontend/editor-ui/src/__tests__/setup.ts
diff --git a/packages/editor-ui/src/__tests__/utils.ts b/packages/frontend/editor-ui/src/__tests__/utils.ts
similarity index 100%
rename from packages/editor-ui/src/__tests__/utils.ts
rename to packages/frontend/editor-ui/src/__tests__/utils.ts
diff --git a/packages/editor-ui/src/api/ai.ts b/packages/frontend/editor-ui/src/api/ai.ts
similarity index 100%
rename from packages/editor-ui/src/api/ai.ts
rename to packages/frontend/editor-ui/src/api/ai.ts
diff --git a/packages/editor-ui/src/api/api-keys.ts b/packages/frontend/editor-ui/src/api/api-keys.ts
similarity index 100%
rename from packages/editor-ui/src/api/api-keys.ts
rename to packages/frontend/editor-ui/src/api/api-keys.ts
diff --git a/packages/editor-ui/src/api/cloudPlans.ts b/packages/frontend/editor-ui/src/api/cloudPlans.ts
similarity index 100%
rename from packages/editor-ui/src/api/cloudPlans.ts
rename to packages/frontend/editor-ui/src/api/cloudPlans.ts
diff --git a/packages/editor-ui/src/api/communityNodes.ts b/packages/frontend/editor-ui/src/api/communityNodes.ts
similarity index 100%
rename from packages/editor-ui/src/api/communityNodes.ts
rename to packages/frontend/editor-ui/src/api/communityNodes.ts
diff --git a/packages/editor-ui/src/api/credentials.ee.ts b/packages/frontend/editor-ui/src/api/credentials.ee.ts
similarity index 100%
rename from packages/editor-ui/src/api/credentials.ee.ts
rename to packages/frontend/editor-ui/src/api/credentials.ee.ts
diff --git a/packages/editor-ui/src/api/credentials.ts b/packages/frontend/editor-ui/src/api/credentials.ts
similarity index 100%
rename from packages/editor-ui/src/api/credentials.ts
rename to packages/frontend/editor-ui/src/api/credentials.ts
diff --git a/packages/editor-ui/src/api/ctas.ts b/packages/frontend/editor-ui/src/api/ctas.ts
similarity index 100%
rename from packages/editor-ui/src/api/ctas.ts
rename to packages/frontend/editor-ui/src/api/ctas.ts
diff --git a/packages/editor-ui/src/api/environments.ee.ts b/packages/frontend/editor-ui/src/api/environments.ee.ts
similarity index 100%
rename from packages/editor-ui/src/api/environments.ee.ts
rename to packages/frontend/editor-ui/src/api/environments.ee.ts
diff --git a/packages/editor-ui/src/api/eventbus.ee.ts b/packages/frontend/editor-ui/src/api/eventbus.ee.ts
similarity index 100%
rename from packages/editor-ui/src/api/eventbus.ee.ts
rename to packages/frontend/editor-ui/src/api/eventbus.ee.ts
diff --git a/packages/editor-ui/src/api/events.ts b/packages/frontend/editor-ui/src/api/events.ts
similarity index 100%
rename from packages/editor-ui/src/api/events.ts
rename to packages/frontend/editor-ui/src/api/events.ts
diff --git a/packages/editor-ui/src/api/externalSecrets.ee.ts b/packages/frontend/editor-ui/src/api/externalSecrets.ee.ts
similarity index 100%
rename from packages/editor-ui/src/api/externalSecrets.ee.ts
rename to packages/frontend/editor-ui/src/api/externalSecrets.ee.ts
diff --git a/packages/editor-ui/src/api/invitation.ts b/packages/frontend/editor-ui/src/api/invitation.ts
similarity index 100%
rename from packages/editor-ui/src/api/invitation.ts
rename to packages/frontend/editor-ui/src/api/invitation.ts
diff --git a/packages/editor-ui/src/api/ldap.ts b/packages/frontend/editor-ui/src/api/ldap.ts
similarity index 100%
rename from packages/editor-ui/src/api/ldap.ts
rename to packages/frontend/editor-ui/src/api/ldap.ts
diff --git a/packages/editor-ui/src/api/mfa.ts b/packages/frontend/editor-ui/src/api/mfa.ts
similarity index 100%
rename from packages/editor-ui/src/api/mfa.ts
rename to packages/frontend/editor-ui/src/api/mfa.ts
diff --git a/packages/editor-ui/src/api/nodeTypes.ts b/packages/frontend/editor-ui/src/api/nodeTypes.ts
similarity index 100%
rename from packages/editor-ui/src/api/nodeTypes.ts
rename to packages/frontend/editor-ui/src/api/nodeTypes.ts
diff --git a/packages/editor-ui/src/api/npsSurvey.ts b/packages/frontend/editor-ui/src/api/npsSurvey.ts
similarity index 100%
rename from packages/editor-ui/src/api/npsSurvey.ts
rename to packages/frontend/editor-ui/src/api/npsSurvey.ts
diff --git a/packages/editor-ui/src/api/orchestration.ts b/packages/frontend/editor-ui/src/api/orchestration.ts
similarity index 100%
rename from packages/editor-ui/src/api/orchestration.ts
rename to packages/frontend/editor-ui/src/api/orchestration.ts
diff --git a/packages/editor-ui/src/api/projects.api.ts b/packages/frontend/editor-ui/src/api/projects.api.ts
similarity index 100%
rename from packages/editor-ui/src/api/projects.api.ts
rename to packages/frontend/editor-ui/src/api/projects.api.ts
diff --git a/packages/editor-ui/src/api/roles.api.ts b/packages/frontend/editor-ui/src/api/roles.api.ts
similarity index 100%
rename from packages/editor-ui/src/api/roles.api.ts
rename to packages/frontend/editor-ui/src/api/roles.api.ts
diff --git a/packages/editor-ui/src/api/schemaPreview.ts b/packages/frontend/editor-ui/src/api/schemaPreview.ts
similarity index 100%
rename from packages/editor-ui/src/api/schemaPreview.ts
rename to packages/frontend/editor-ui/src/api/schemaPreview.ts
diff --git a/packages/editor-ui/src/api/settings.ts b/packages/frontend/editor-ui/src/api/settings.ts
similarity index 100%
rename from packages/editor-ui/src/api/settings.ts
rename to packages/frontend/editor-ui/src/api/settings.ts
diff --git a/packages/editor-ui/src/api/sourceControl.ts b/packages/frontend/editor-ui/src/api/sourceControl.ts
similarity index 100%
rename from packages/editor-ui/src/api/sourceControl.ts
rename to packages/frontend/editor-ui/src/api/sourceControl.ts
diff --git a/packages/editor-ui/src/api/sso.ts b/packages/frontend/editor-ui/src/api/sso.ts
similarity index 100%
rename from packages/editor-ui/src/api/sso.ts
rename to packages/frontend/editor-ui/src/api/sso.ts
diff --git a/packages/editor-ui/src/api/tags.ts b/packages/frontend/editor-ui/src/api/tags.ts
similarity index 100%
rename from packages/editor-ui/src/api/tags.ts
rename to packages/frontend/editor-ui/src/api/tags.ts
diff --git a/packages/editor-ui/src/api/templates.ts b/packages/frontend/editor-ui/src/api/templates.ts
similarity index 100%
rename from packages/editor-ui/src/api/templates.ts
rename to packages/frontend/editor-ui/src/api/templates.ts
diff --git a/packages/editor-ui/src/api/test/schemaPreview.test.ts b/packages/frontend/editor-ui/src/api/test/schemaPreview.test.ts
similarity index 100%
rename from packages/editor-ui/src/api/test/schemaPreview.test.ts
rename to packages/frontend/editor-ui/src/api/test/schemaPreview.test.ts
diff --git a/packages/editor-ui/src/api/testDefinition.ee.ts b/packages/frontend/editor-ui/src/api/testDefinition.ee.ts
similarity index 100%
rename from packages/editor-ui/src/api/testDefinition.ee.ts
rename to packages/frontend/editor-ui/src/api/testDefinition.ee.ts
diff --git a/packages/editor-ui/src/api/ui.ts b/packages/frontend/editor-ui/src/api/ui.ts
similarity index 100%
rename from packages/editor-ui/src/api/ui.ts
rename to packages/frontend/editor-ui/src/api/ui.ts
diff --git a/packages/editor-ui/src/api/usage.ts b/packages/frontend/editor-ui/src/api/usage.ts
similarity index 100%
rename from packages/editor-ui/src/api/usage.ts
rename to packages/frontend/editor-ui/src/api/usage.ts
diff --git a/packages/editor-ui/src/api/users.ts b/packages/frontend/editor-ui/src/api/users.ts
similarity index 100%
rename from packages/editor-ui/src/api/users.ts
rename to packages/frontend/editor-ui/src/api/users.ts
diff --git a/packages/editor-ui/src/api/versions.ts b/packages/frontend/editor-ui/src/api/versions.ts
similarity index 100%
rename from packages/editor-ui/src/api/versions.ts
rename to packages/frontend/editor-ui/src/api/versions.ts
diff --git a/packages/editor-ui/src/api/workflow-webhooks.ts b/packages/frontend/editor-ui/src/api/workflow-webhooks.ts
similarity index 100%
rename from packages/editor-ui/src/api/workflow-webhooks.ts
rename to packages/frontend/editor-ui/src/api/workflow-webhooks.ts
diff --git a/packages/editor-ui/src/api/workflowHistory.ts b/packages/frontend/editor-ui/src/api/workflowHistory.ts
similarity index 100%
rename from packages/editor-ui/src/api/workflowHistory.ts
rename to packages/frontend/editor-ui/src/api/workflowHistory.ts
diff --git a/packages/editor-ui/src/api/workflows.ee.ts b/packages/frontend/editor-ui/src/api/workflows.ee.ts
similarity index 100%
rename from packages/editor-ui/src/api/workflows.ee.ts
rename to packages/frontend/editor-ui/src/api/workflows.ee.ts
diff --git a/packages/editor-ui/src/api/workflows.ts b/packages/frontend/editor-ui/src/api/workflows.ts
similarity index 100%
rename from packages/editor-ui/src/api/workflows.ts
rename to packages/frontend/editor-ui/src/api/workflows.ts
diff --git a/packages/editor-ui/src/assets/images/aws-secrets-manager.svg b/packages/frontend/editor-ui/src/assets/images/aws-secrets-manager.svg
similarity index 100%
rename from packages/editor-ui/src/assets/images/aws-secrets-manager.svg
rename to packages/frontend/editor-ui/src/assets/images/aws-secrets-manager.svg
diff --git a/packages/editor-ui/src/assets/images/azure-key-vault.svg b/packages/frontend/editor-ui/src/assets/images/azure-key-vault.svg
similarity index 100%
rename from packages/editor-ui/src/assets/images/azure-key-vault.svg
rename to packages/frontend/editor-ui/src/assets/images/azure-key-vault.svg
diff --git a/packages/editor-ui/src/assets/images/doppler.webp b/packages/frontend/editor-ui/src/assets/images/doppler.webp
similarity index 100%
rename from packages/editor-ui/src/assets/images/doppler.webp
rename to packages/frontend/editor-ui/src/assets/images/doppler.webp
diff --git a/packages/editor-ui/src/assets/images/gcp-secrets-manager.svg b/packages/frontend/editor-ui/src/assets/images/gcp-secrets-manager.svg
similarity index 100%
rename from packages/editor-ui/src/assets/images/gcp-secrets-manager.svg
rename to packages/frontend/editor-ui/src/assets/images/gcp-secrets-manager.svg
diff --git a/packages/editor-ui/src/assets/images/hashicorp.webp b/packages/frontend/editor-ui/src/assets/images/hashicorp.webp
similarity index 100%
rename from packages/editor-ui/src/assets/images/hashicorp.webp
rename to packages/frontend/editor-ui/src/assets/images/hashicorp.webp
diff --git a/packages/editor-ui/src/assets/images/infisical.webp b/packages/frontend/editor-ui/src/assets/images/infisical.webp
similarity index 100%
rename from packages/editor-ui/src/assets/images/infisical.webp
rename to packages/frontend/editor-ui/src/assets/images/infisical.webp
diff --git a/packages/editor-ui/src/components/AboutModal.vue b/packages/frontend/editor-ui/src/components/AboutModal.vue
similarity index 100%
rename from packages/editor-ui/src/components/AboutModal.vue
rename to packages/frontend/editor-ui/src/components/AboutModal.vue
diff --git a/packages/editor-ui/src/components/ActivationModal.vue b/packages/frontend/editor-ui/src/components/ActivationModal.vue
similarity index 100%
rename from packages/editor-ui/src/components/ActivationModal.vue
rename to packages/frontend/editor-ui/src/components/ActivationModal.vue
diff --git a/packages/editor-ui/src/components/AiStarsIcon.vue b/packages/frontend/editor-ui/src/components/AiStarsIcon.vue
similarity index 100%
rename from packages/editor-ui/src/components/AiStarsIcon.vue
rename to packages/frontend/editor-ui/src/components/AiStarsIcon.vue
diff --git a/packages/editor-ui/src/components/AiUpdatedCodeMessage.vue b/packages/frontend/editor-ui/src/components/AiUpdatedCodeMessage.vue
similarity index 100%
rename from packages/editor-ui/src/components/AiUpdatedCodeMessage.vue
rename to packages/frontend/editor-ui/src/components/AiUpdatedCodeMessage.vue
diff --git a/packages/editor-ui/src/components/AnnotationTagsDropdown.ee.vue b/packages/frontend/editor-ui/src/components/AnnotationTagsDropdown.ee.vue
similarity index 100%
rename from packages/editor-ui/src/components/AnnotationTagsDropdown.ee.vue
rename to packages/frontend/editor-ui/src/components/AnnotationTagsDropdown.ee.vue
diff --git a/packages/editor-ui/src/components/ApiKeyCard.vue b/packages/frontend/editor-ui/src/components/ApiKeyCard.vue
similarity index 100%
rename from packages/editor-ui/src/components/ApiKeyCard.vue
rename to packages/frontend/editor-ui/src/components/ApiKeyCard.vue
diff --git a/packages/editor-ui/src/components/ApiKeyCreateOrEditModal.test.ts b/packages/frontend/editor-ui/src/components/ApiKeyCreateOrEditModal.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/ApiKeyCreateOrEditModal.test.ts
rename to packages/frontend/editor-ui/src/components/ApiKeyCreateOrEditModal.test.ts
diff --git a/packages/editor-ui/src/components/ApiKeyCreateOrEditModal.vue b/packages/frontend/editor-ui/src/components/ApiKeyCreateOrEditModal.vue
similarity index 99%
rename from packages/editor-ui/src/components/ApiKeyCreateOrEditModal.vue
rename to packages/frontend/editor-ui/src/components/ApiKeyCreateOrEditModal.vue
index 5bdb217fa3..c0531bacae 100644
--- a/packages/editor-ui/src/components/ApiKeyCreateOrEditModal.vue
+++ b/packages/frontend/editor-ui/src/components/ApiKeyCreateOrEditModal.vue
@@ -11,7 +11,7 @@ import { useDocumentTitle } from '@/composables/useDocumentTitle';
 import { useApiKeysStore } from '@/stores/apiKeys.store';
 import { useToast } from '@/composables/useToast';
 import type { BaseTextKey } from '@/plugins/i18n';
-import { N8nText } from 'n8n-design-system';
+import { N8nText } from '@n8n/design-system';
 import { DateTime } from 'luxon';
 import type { ApiKey, ApiKeyWithRawValue, CreateApiKeyRequestDto } from '@n8n/api-types';
 
diff --git a/packages/editor-ui/src/components/AskAssistant/AskAssistantChat.vue b/packages/frontend/editor-ui/src/components/AskAssistant/AskAssistantChat.vue
similarity index 96%
rename from packages/editor-ui/src/components/AskAssistant/AskAssistantChat.vue
rename to packages/frontend/editor-ui/src/components/AskAssistant/AskAssistantChat.vue
index 362859edee..ba97886996 100644
--- a/packages/editor-ui/src/components/AskAssistant/AskAssistantChat.vue
+++ b/packages/frontend/editor-ui/src/components/AskAssistant/AskAssistantChat.vue
@@ -4,7 +4,7 @@ import { useDebounce } from '@/composables/useDebounce';
 import { useUsersStore } from '@/stores/users.store';
 import { computed } from 'vue';
 import SlideTransition from '@/components/transitions/SlideTransition.vue';
-import AskAssistantChat from 'n8n-design-system/components/AskAssistantChat/AskAssistantChat.vue';
+import AskAssistantChat from '@n8n/design-system/components/AskAssistantChat/AskAssistantChat.vue';
 import { useTelemetry } from '@/composables/useTelemetry';
 
 const assistantStore = useAssistantStore();
diff --git a/packages/editor-ui/src/components/AskAssistant/AskAssistantFloatingButton.vue b/packages/frontend/editor-ui/src/components/AskAssistant/AskAssistantFloatingButton.vue
similarity index 91%
rename from packages/editor-ui/src/components/AskAssistant/AskAssistantFloatingButton.vue
rename to packages/frontend/editor-ui/src/components/AskAssistant/AskAssistantFloatingButton.vue
index 6a9746c65e..8c3c24783d 100644
--- a/packages/editor-ui/src/components/AskAssistant/AskAssistantFloatingButton.vue
+++ b/packages/frontend/editor-ui/src/components/AskAssistant/AskAssistantFloatingButton.vue
@@ -3,8 +3,8 @@ import { useI18n } from '@/composables/useI18n';
 import { useStyles } from '@/composables/useStyles';
 import { useAssistantStore } from '@/stores/assistant.store';
 import { useCanvasStore } from '@/stores/canvas.store';
-import AssistantAvatar from 'n8n-design-system/components/AskAssistantAvatar/AssistantAvatar.vue';
-import AskAssistantButton from 'n8n-design-system/components/AskAssistantButton/AskAssistantButton.vue';
+import AssistantAvatar from '@n8n/design-system/components/AskAssistantAvatar/AssistantAvatar.vue';
+import AskAssistantButton from '@n8n/design-system/components/AskAssistantButton/AskAssistantButton.vue';
 import { computed } from 'vue';
 
 const assistantStore = useAssistantStore();
diff --git a/packages/editor-ui/src/components/AskAssistant/NewAssistantSessionModal.vue b/packages/frontend/editor-ui/src/components/AskAssistant/NewAssistantSessionModal.vue
similarity index 92%
rename from packages/editor-ui/src/components/AskAssistant/NewAssistantSessionModal.vue
rename to packages/frontend/editor-ui/src/components/AskAssistant/NewAssistantSessionModal.vue
index 4113aeecf4..40cad98ded 100644
--- a/packages/editor-ui/src/components/AskAssistant/NewAssistantSessionModal.vue
+++ b/packages/frontend/editor-ui/src/components/AskAssistant/NewAssistantSessionModal.vue
@@ -1,8 +1,8 @@
 <script lang="ts" setup>
 import { NEW_ASSISTANT_SESSION_MODAL } from '@/constants';
 import Modal from '../Modal.vue';
-import AssistantIcon from 'n8n-design-system/components/AskAssistantIcon/AssistantIcon.vue';
-import AssistantText from 'n8n-design-system/components/AskAssistantText/AssistantText.vue';
+import AssistantIcon from '@n8n/design-system/components/AskAssistantIcon/AssistantIcon.vue';
+import AssistantText from '@n8n/design-system/components/AskAssistantText/AssistantText.vue';
 import { useI18n } from '@/composables/useI18n';
 import { useUIStore } from '@/stores/ui.store';
 import type { ChatRequest } from '@/types/assistant.types';
diff --git a/packages/editor-ui/src/components/AssignmentCollection/Assignment.test.ts b/packages/frontend/editor-ui/src/components/AssignmentCollection/Assignment.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/AssignmentCollection/Assignment.test.ts
rename to packages/frontend/editor-ui/src/components/AssignmentCollection/Assignment.test.ts
diff --git a/packages/editor-ui/src/components/AssignmentCollection/Assignment.vue b/packages/frontend/editor-ui/src/components/AssignmentCollection/Assignment.vue
similarity index 99%
rename from packages/editor-ui/src/components/AssignmentCollection/Assignment.vue
rename to packages/frontend/editor-ui/src/components/AssignmentCollection/Assignment.vue
index 1e9c827234..96f940711e 100644
--- a/packages/editor-ui/src/components/AssignmentCollection/Assignment.vue
+++ b/packages/frontend/editor-ui/src/components/AssignmentCollection/Assignment.vue
@@ -10,7 +10,7 @@ import { useNDVStore } from '@/stores/ndv.store';
 import type { AssignmentValue, INodeProperties } from 'n8n-workflow';
 import { computed, ref } from 'vue';
 import TypeSelect from './TypeSelect.vue';
-import { N8nIconButton } from 'n8n-design-system';
+import { N8nIconButton } from '@n8n/design-system';
 
 interface Props {
 	path: string;
diff --git a/packages/editor-ui/src/components/AssignmentCollection/AssignmentCollection.test.ts b/packages/frontend/editor-ui/src/components/AssignmentCollection/AssignmentCollection.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/AssignmentCollection/AssignmentCollection.test.ts
rename to packages/frontend/editor-ui/src/components/AssignmentCollection/AssignmentCollection.test.ts
diff --git a/packages/editor-ui/src/components/AssignmentCollection/AssignmentCollection.vue b/packages/frontend/editor-ui/src/components/AssignmentCollection/AssignmentCollection.vue
similarity index 100%
rename from packages/editor-ui/src/components/AssignmentCollection/AssignmentCollection.vue
rename to packages/frontend/editor-ui/src/components/AssignmentCollection/AssignmentCollection.vue
diff --git a/packages/editor-ui/src/components/AssignmentCollection/TypeSelect.test.ts b/packages/frontend/editor-ui/src/components/AssignmentCollection/TypeSelect.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/AssignmentCollection/TypeSelect.test.ts
rename to packages/frontend/editor-ui/src/components/AssignmentCollection/TypeSelect.test.ts
diff --git a/packages/editor-ui/src/components/AssignmentCollection/TypeSelect.vue b/packages/frontend/editor-ui/src/components/AssignmentCollection/TypeSelect.vue
similarity index 100%
rename from packages/editor-ui/src/components/AssignmentCollection/TypeSelect.vue
rename to packages/frontend/editor-ui/src/components/AssignmentCollection/TypeSelect.vue
diff --git a/packages/editor-ui/src/components/AssignmentCollection/constants.ts b/packages/frontend/editor-ui/src/components/AssignmentCollection/constants.ts
similarity index 100%
rename from packages/editor-ui/src/components/AssignmentCollection/constants.ts
rename to packages/frontend/editor-ui/src/components/AssignmentCollection/constants.ts
diff --git a/packages/editor-ui/src/components/AssignmentCollection/utils.ts b/packages/frontend/editor-ui/src/components/AssignmentCollection/utils.ts
similarity index 100%
rename from packages/editor-ui/src/components/AssignmentCollection/utils.ts
rename to packages/frontend/editor-ui/src/components/AssignmentCollection/utils.ts
diff --git a/packages/editor-ui/src/components/Badge.vue b/packages/frontend/editor-ui/src/components/Badge.vue
similarity index 100%
rename from packages/editor-ui/src/components/Badge.vue
rename to packages/frontend/editor-ui/src/components/Badge.vue
diff --git a/packages/editor-ui/src/components/Banner.vue b/packages/frontend/editor-ui/src/components/Banner.vue
similarity index 100%
rename from packages/editor-ui/src/components/Banner.vue
rename to packages/frontend/editor-ui/src/components/Banner.vue
diff --git a/packages/editor-ui/src/components/BannersStack.test.ts b/packages/frontend/editor-ui/src/components/BannersStack.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/BannersStack.test.ts
rename to packages/frontend/editor-ui/src/components/BannersStack.test.ts
diff --git a/packages/editor-ui/src/components/BecomeTemplateCreatorCta/BecomeTemplateCreatorCta.vue b/packages/frontend/editor-ui/src/components/BecomeTemplateCreatorCta/BecomeTemplateCreatorCta.vue
similarity index 100%
rename from packages/editor-ui/src/components/BecomeTemplateCreatorCta/BecomeTemplateCreatorCta.vue
rename to packages/frontend/editor-ui/src/components/BecomeTemplateCreatorCta/BecomeTemplateCreatorCta.vue
diff --git a/packages/editor-ui/src/components/BecomeTemplateCreatorCta/becomeTemplateCreatorStore.ts b/packages/frontend/editor-ui/src/components/BecomeTemplateCreatorCta/becomeTemplateCreatorStore.ts
similarity index 100%
rename from packages/editor-ui/src/components/BecomeTemplateCreatorCta/becomeTemplateCreatorStore.ts
rename to packages/frontend/editor-ui/src/components/BecomeTemplateCreatorCta/becomeTemplateCreatorStore.ts
diff --git a/packages/editor-ui/src/components/BinaryDataDisplay.vue b/packages/frontend/editor-ui/src/components/BinaryDataDisplay.vue
similarity index 100%
rename from packages/editor-ui/src/components/BinaryDataDisplay.vue
rename to packages/frontend/editor-ui/src/components/BinaryDataDisplay.vue
diff --git a/packages/editor-ui/src/components/BinaryDataDisplayEmbed.vue b/packages/frontend/editor-ui/src/components/BinaryDataDisplayEmbed.vue
similarity index 100%
rename from packages/editor-ui/src/components/BinaryDataDisplayEmbed.vue
rename to packages/frontend/editor-ui/src/components/BinaryDataDisplayEmbed.vue
diff --git a/packages/editor-ui/src/components/BreakpointsObserver.vue b/packages/frontend/editor-ui/src/components/BreakpointsObserver.vue
similarity index 100%
rename from packages/editor-ui/src/components/BreakpointsObserver.vue
rename to packages/frontend/editor-ui/src/components/BreakpointsObserver.vue
diff --git a/packages/editor-ui/src/components/ButtonParameter/ButtonParameter.test.ts b/packages/frontend/editor-ui/src/components/ButtonParameter/ButtonParameter.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/ButtonParameter/ButtonParameter.test.ts
rename to packages/frontend/editor-ui/src/components/ButtonParameter/ButtonParameter.test.ts
diff --git a/packages/editor-ui/src/components/ButtonParameter/ButtonParameter.vue b/packages/frontend/editor-ui/src/components/ButtonParameter/ButtonParameter.vue
similarity index 99%
rename from packages/editor-ui/src/components/ButtonParameter/ButtonParameter.vue
rename to packages/frontend/editor-ui/src/components/ButtonParameter/ButtonParameter.vue
index e10933bd19..4a0acf7946 100644
--- a/packages/editor-ui/src/components/ButtonParameter/ButtonParameter.vue
+++ b/packages/frontend/editor-ui/src/components/ButtonParameter/ButtonParameter.vue
@@ -2,7 +2,7 @@
 import { type INodeProperties, type NodePropertyAction } from 'n8n-workflow';
 import type { INodeUi, IUpdateInformation } from '@/Interface';
 import { ref, computed, onMounted } from 'vue';
-import { N8nButton, N8nInput, N8nTooltip } from 'n8n-design-system/components';
+import { N8nButton, N8nInput, N8nTooltip } from '@n8n/design-system/components';
 import { useI18n } from '@/composables/useI18n';
 import { useToast } from '@/composables/useToast';
 import { useNDVStore } from '@/stores/ndv.store';
diff --git a/packages/editor-ui/src/components/ButtonParameter/utils.test.ts b/packages/frontend/editor-ui/src/components/ButtonParameter/utils.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/ButtonParameter/utils.test.ts
rename to packages/frontend/editor-ui/src/components/ButtonParameter/utils.test.ts
diff --git a/packages/editor-ui/src/components/ButtonParameter/utils.ts b/packages/frontend/editor-ui/src/components/ButtonParameter/utils.ts
similarity index 100%
rename from packages/editor-ui/src/components/ButtonParameter/utils.ts
rename to packages/frontend/editor-ui/src/components/ButtonParameter/utils.ts
diff --git a/packages/editor-ui/src/components/CanvasChat/CanvasChat.test.ts b/packages/frontend/editor-ui/src/components/CanvasChat/CanvasChat.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/CanvasChat/CanvasChat.test.ts
rename to packages/frontend/editor-ui/src/components/CanvasChat/CanvasChat.test.ts
diff --git a/packages/editor-ui/src/components/CanvasChat/CanvasChat.vue b/packages/frontend/editor-ui/src/components/CanvasChat/CanvasChat.vue
similarity index 100%
rename from packages/editor-ui/src/components/CanvasChat/CanvasChat.vue
rename to packages/frontend/editor-ui/src/components/CanvasChat/CanvasChat.vue
diff --git a/packages/editor-ui/src/components/CanvasChat/components/ChatLogsPanel.vue b/packages/frontend/editor-ui/src/components/CanvasChat/components/ChatLogsPanel.vue
similarity index 100%
rename from packages/editor-ui/src/components/CanvasChat/components/ChatLogsPanel.vue
rename to packages/frontend/editor-ui/src/components/CanvasChat/components/ChatLogsPanel.vue
diff --git a/packages/editor-ui/src/components/CanvasChat/components/ChatMessagesPanel.vue b/packages/frontend/editor-ui/src/components/CanvasChat/components/ChatMessagesPanel.vue
similarity index 100%
rename from packages/editor-ui/src/components/CanvasChat/components/ChatMessagesPanel.vue
rename to packages/frontend/editor-ui/src/components/CanvasChat/components/ChatMessagesPanel.vue
diff --git a/packages/editor-ui/src/components/CanvasChat/components/MessageOptionAction.vue b/packages/frontend/editor-ui/src/components/CanvasChat/components/MessageOptionAction.vue
similarity index 100%
rename from packages/editor-ui/src/components/CanvasChat/components/MessageOptionAction.vue
rename to packages/frontend/editor-ui/src/components/CanvasChat/components/MessageOptionAction.vue
diff --git a/packages/editor-ui/src/components/CanvasChat/components/MessageOptionTooltip.vue b/packages/frontend/editor-ui/src/components/CanvasChat/components/MessageOptionTooltip.vue
similarity index 100%
rename from packages/editor-ui/src/components/CanvasChat/components/MessageOptionTooltip.vue
rename to packages/frontend/editor-ui/src/components/CanvasChat/components/MessageOptionTooltip.vue
diff --git a/packages/editor-ui/src/components/CanvasChat/composables/useChatMessaging.ts b/packages/frontend/editor-ui/src/components/CanvasChat/composables/useChatMessaging.ts
similarity index 100%
rename from packages/editor-ui/src/components/CanvasChat/composables/useChatMessaging.ts
rename to packages/frontend/editor-ui/src/components/CanvasChat/composables/useChatMessaging.ts
diff --git a/packages/editor-ui/src/components/CanvasChat/composables/useChatTrigger.ts b/packages/frontend/editor-ui/src/components/CanvasChat/composables/useChatTrigger.ts
similarity index 100%
rename from packages/editor-ui/src/components/CanvasChat/composables/useChatTrigger.ts
rename to packages/frontend/editor-ui/src/components/CanvasChat/composables/useChatTrigger.ts
diff --git a/packages/editor-ui/src/components/CanvasChat/composables/useResize.ts b/packages/frontend/editor-ui/src/components/CanvasChat/composables/useResize.ts
similarity index 98%
rename from packages/editor-ui/src/components/CanvasChat/composables/useResize.ts
rename to packages/frontend/editor-ui/src/components/CanvasChat/composables/useResize.ts
index 273cf4cf03..2808977363 100644
--- a/packages/editor-ui/src/components/CanvasChat/composables/useResize.ts
+++ b/packages/frontend/editor-ui/src/components/CanvasChat/composables/useResize.ts
@@ -3,7 +3,7 @@ import { ref, computed, onMounted, onBeforeUnmount, watchEffect } from 'vue';
 import { useDebounce } from '@/composables/useDebounce';
 import type { IChatResizeStyles } from '../types/chat';
 import { useStorage } from '@/composables/useStorage';
-import { type ResizeData } from 'n8n-design-system';
+import { type ResizeData } from '@n8n/design-system';
 
 const LOCAL_STORAGE_PANEL_HEIGHT = 'N8N_CANVAS_CHAT_HEIGHT';
 const LOCAL_STORAGE_PANEL_WIDTH = 'N8N_CANVAS_CHAT_WIDTH';
diff --git a/packages/editor-ui/src/components/CanvasChat/types/chat.ts b/packages/frontend/editor-ui/src/components/CanvasChat/types/chat.ts
similarity index 100%
rename from packages/editor-ui/src/components/CanvasChat/types/chat.ts
rename to packages/frontend/editor-ui/src/components/CanvasChat/types/chat.ts
diff --git a/packages/editor-ui/src/components/ChangePasswordModal.test.ts b/packages/frontend/editor-ui/src/components/ChangePasswordModal.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/ChangePasswordModal.test.ts
rename to packages/frontend/editor-ui/src/components/ChangePasswordModal.test.ts
diff --git a/packages/editor-ui/src/components/ChangePasswordModal.vue b/packages/frontend/editor-ui/src/components/ChangePasswordModal.vue
similarity index 98%
rename from packages/editor-ui/src/components/ChangePasswordModal.vue
rename to packages/frontend/editor-ui/src/components/ChangePasswordModal.vue
index 776d9d131a..b2b0cb274b 100644
--- a/packages/editor-ui/src/components/ChangePasswordModal.vue
+++ b/packages/frontend/editor-ui/src/components/ChangePasswordModal.vue
@@ -4,7 +4,7 @@ import { useToast } from '@/composables/useToast';
 import { CHANGE_PASSWORD_MODAL_KEY } from '../constants';
 import Modal from '@/components/Modal.vue';
 import { useUsersStore } from '@/stores/users.store';
-import { createFormEventBus } from 'n8n-design-system/utils';
+import { createFormEventBus } from '@n8n/design-system/utils';
 import { createEventBus } from '@n8n/utils/event-bus';
 import type { IFormInputs, IFormInput } from '@/Interface';
 import { useI18n } from '@/composables/useI18n';
diff --git a/packages/editor-ui/src/components/ChatEmbedModal.test.ts b/packages/frontend/editor-ui/src/components/ChatEmbedModal.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/ChatEmbedModal.test.ts
rename to packages/frontend/editor-ui/src/components/ChatEmbedModal.test.ts
diff --git a/packages/editor-ui/src/components/ChatEmbedModal.vue b/packages/frontend/editor-ui/src/components/ChatEmbedModal.vue
similarity index 100%
rename from packages/editor-ui/src/components/ChatEmbedModal.vue
rename to packages/frontend/editor-ui/src/components/ChatEmbedModal.vue
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/AskAI/AskAI.vue b/packages/frontend/editor-ui/src/components/CodeNodeEditor/AskAI/AskAI.vue
similarity index 99%
rename from packages/editor-ui/src/components/CodeNodeEditor/AskAI/AskAI.vue
rename to packages/frontend/editor-ui/src/components/CodeNodeEditor/AskAI/AskAI.vue
index b68e613a1d..8ea0af07ad 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/AskAI/AskAI.vue
+++ b/packages/frontend/editor-ui/src/components/CodeNodeEditor/AskAI/AskAI.vue
@@ -3,7 +3,7 @@ import { ref, computed, onMounted } from 'vue';
 import { snakeCase } from 'lodash-es';
 import { useSessionStorage } from '@vueuse/core';
 
-import { N8nButton, N8nInput, N8nTooltip } from 'n8n-design-system/components';
+import { N8nButton, N8nInput, N8nTooltip } from '@n8n/design-system/components';
 import { randomInt } from 'n8n-workflow';
 import type { CodeExecutionMode, INodeExecutionData } from 'n8n-workflow';
 
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue b/packages/frontend/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
similarity index 100%
rename from packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
rename to packages/frontend/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/completer.ts b/packages/frontend/editor-ui/src/components/CodeNodeEditor/completer.ts
similarity index 100%
rename from packages/editor-ui/src/components/CodeNodeEditor/completer.ts
rename to packages/frontend/editor-ui/src/components/CodeNodeEditor/completer.ts
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/completions/base.completions.ts b/packages/frontend/editor-ui/src/components/CodeNodeEditor/completions/base.completions.ts
similarity index 100%
rename from packages/editor-ui/src/components/CodeNodeEditor/completions/base.completions.ts
rename to packages/frontend/editor-ui/src/components/CodeNodeEditor/completions/base.completions.ts
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/completions/execution.completions.ts b/packages/frontend/editor-ui/src/components/CodeNodeEditor/completions/execution.completions.ts
similarity index 100%
rename from packages/editor-ui/src/components/CodeNodeEditor/completions/execution.completions.ts
rename to packages/frontend/editor-ui/src/components/CodeNodeEditor/completions/execution.completions.ts
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/completions/itemField.completions.test.ts b/packages/frontend/editor-ui/src/components/CodeNodeEditor/completions/itemField.completions.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/CodeNodeEditor/completions/itemField.completions.test.ts
rename to packages/frontend/editor-ui/src/components/CodeNodeEditor/completions/itemField.completions.test.ts
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/completions/itemField.completions.ts b/packages/frontend/editor-ui/src/components/CodeNodeEditor/completions/itemField.completions.ts
similarity index 100%
rename from packages/editor-ui/src/components/CodeNodeEditor/completions/itemField.completions.ts
rename to packages/frontend/editor-ui/src/components/CodeNodeEditor/completions/itemField.completions.ts
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/completions/itemIndex.completions.ts b/packages/frontend/editor-ui/src/components/CodeNodeEditor/completions/itemIndex.completions.ts
similarity index 100%
rename from packages/editor-ui/src/components/CodeNodeEditor/completions/itemIndex.completions.ts
rename to packages/frontend/editor-ui/src/components/CodeNodeEditor/completions/itemIndex.completions.ts
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/completions/js.snippets.ts b/packages/frontend/editor-ui/src/components/CodeNodeEditor/completions/js.snippets.ts
similarity index 100%
rename from packages/editor-ui/src/components/CodeNodeEditor/completions/js.snippets.ts
rename to packages/frontend/editor-ui/src/components/CodeNodeEditor/completions/js.snippets.ts
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/completions/jsonField.completions.ts b/packages/frontend/editor-ui/src/components/CodeNodeEditor/completions/jsonField.completions.ts
similarity index 100%
rename from packages/editor-ui/src/components/CodeNodeEditor/completions/jsonField.completions.ts
rename to packages/frontend/editor-ui/src/components/CodeNodeEditor/completions/jsonField.completions.ts
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/completions/luxon.completions.ts b/packages/frontend/editor-ui/src/components/CodeNodeEditor/completions/luxon.completions.ts
similarity index 100%
rename from packages/editor-ui/src/components/CodeNodeEditor/completions/luxon.completions.ts
rename to packages/frontend/editor-ui/src/components/CodeNodeEditor/completions/luxon.completions.ts
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/completions/prevNode.completions.ts b/packages/frontend/editor-ui/src/components/CodeNodeEditor/completions/prevNode.completions.ts
similarity index 100%
rename from packages/editor-ui/src/components/CodeNodeEditor/completions/prevNode.completions.ts
rename to packages/frontend/editor-ui/src/components/CodeNodeEditor/completions/prevNode.completions.ts
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/completions/require.completions.ts b/packages/frontend/editor-ui/src/components/CodeNodeEditor/completions/require.completions.ts
similarity index 100%
rename from packages/editor-ui/src/components/CodeNodeEditor/completions/require.completions.ts
rename to packages/frontend/editor-ui/src/components/CodeNodeEditor/completions/require.completions.ts
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/completions/secrets.completions.ts b/packages/frontend/editor-ui/src/components/CodeNodeEditor/completions/secrets.completions.ts
similarity index 100%
rename from packages/editor-ui/src/components/CodeNodeEditor/completions/secrets.completions.ts
rename to packages/frontend/editor-ui/src/components/CodeNodeEditor/completions/secrets.completions.ts
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/completions/variables.completions.ts b/packages/frontend/editor-ui/src/components/CodeNodeEditor/completions/variables.completions.ts
similarity index 100%
rename from packages/editor-ui/src/components/CodeNodeEditor/completions/variables.completions.ts
rename to packages/frontend/editor-ui/src/components/CodeNodeEditor/completions/variables.completions.ts
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/completions/workflow.completions.ts b/packages/frontend/editor-ui/src/components/CodeNodeEditor/completions/workflow.completions.ts
similarity index 100%
rename from packages/editor-ui/src/components/CodeNodeEditor/completions/workflow.completions.ts
rename to packages/frontend/editor-ui/src/components/CodeNodeEditor/completions/workflow.completions.ts
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/constants.ts b/packages/frontend/editor-ui/src/components/CodeNodeEditor/constants.ts
similarity index 100%
rename from packages/editor-ui/src/components/CodeNodeEditor/constants.ts
rename to packages/frontend/editor-ui/src/components/CodeNodeEditor/constants.ts
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/linter.ts b/packages/frontend/editor-ui/src/components/CodeNodeEditor/linter.ts
similarity index 100%
rename from packages/editor-ui/src/components/CodeNodeEditor/linter.ts
rename to packages/frontend/editor-ui/src/components/CodeNodeEditor/linter.ts
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/theme.ts b/packages/frontend/editor-ui/src/components/CodeNodeEditor/theme.ts
similarity index 100%
rename from packages/editor-ui/src/components/CodeNodeEditor/theme.ts
rename to packages/frontend/editor-ui/src/components/CodeNodeEditor/theme.ts
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/types.ts b/packages/frontend/editor-ui/src/components/CodeNodeEditor/types.ts
similarity index 100%
rename from packages/editor-ui/src/components/CodeNodeEditor/types.ts
rename to packages/frontend/editor-ui/src/components/CodeNodeEditor/types.ts
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/utils.test.ts b/packages/frontend/editor-ui/src/components/CodeNodeEditor/utils.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/CodeNodeEditor/utils.test.ts
rename to packages/frontend/editor-ui/src/components/CodeNodeEditor/utils.test.ts
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/utils.ts b/packages/frontend/editor-ui/src/components/CodeNodeEditor/utils.ts
similarity index 100%
rename from packages/editor-ui/src/components/CodeNodeEditor/utils.ts
rename to packages/frontend/editor-ui/src/components/CodeNodeEditor/utils.ts
diff --git a/packages/editor-ui/src/components/CollaborationPane.test.ts b/packages/frontend/editor-ui/src/components/CollaborationPane.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/CollaborationPane.test.ts
rename to packages/frontend/editor-ui/src/components/CollaborationPane.test.ts
diff --git a/packages/editor-ui/src/components/CollectionParameter.test.ts b/packages/frontend/editor-ui/src/components/CollectionParameter.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/CollectionParameter.test.ts
rename to packages/frontend/editor-ui/src/components/CollectionParameter.test.ts
diff --git a/packages/editor-ui/src/components/CollectionParameter.vue b/packages/frontend/editor-ui/src/components/CollectionParameter.vue
similarity index 100%
rename from packages/editor-ui/src/components/CollectionParameter.vue
rename to packages/frontend/editor-ui/src/components/CollectionParameter.vue
diff --git a/packages/editor-ui/src/components/CollectionWorkflowCard.vue b/packages/frontend/editor-ui/src/components/CollectionWorkflowCard.vue
similarity index 100%
rename from packages/editor-ui/src/components/CollectionWorkflowCard.vue
rename to packages/frontend/editor-ui/src/components/CollectionWorkflowCard.vue
diff --git a/packages/editor-ui/src/components/CommunityPackageCard.vue b/packages/frontend/editor-ui/src/components/CommunityPackageCard.vue
similarity index 100%
rename from packages/editor-ui/src/components/CommunityPackageCard.vue
rename to packages/frontend/editor-ui/src/components/CommunityPackageCard.vue
diff --git a/packages/editor-ui/src/components/CommunityPackageInstallModal.test.ts b/packages/frontend/editor-ui/src/components/CommunityPackageInstallModal.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/CommunityPackageInstallModal.test.ts
rename to packages/frontend/editor-ui/src/components/CommunityPackageInstallModal.test.ts
diff --git a/packages/editor-ui/src/components/CommunityPackageInstallModal.vue b/packages/frontend/editor-ui/src/components/CommunityPackageInstallModal.vue
similarity index 100%
rename from packages/editor-ui/src/components/CommunityPackageInstallModal.vue
rename to packages/frontend/editor-ui/src/components/CommunityPackageInstallModal.vue
diff --git a/packages/editor-ui/src/components/CommunityPackageManageConfirmModal.vue b/packages/frontend/editor-ui/src/components/CommunityPackageManageConfirmModal.vue
similarity index 100%
rename from packages/editor-ui/src/components/CommunityPackageManageConfirmModal.vue
rename to packages/frontend/editor-ui/src/components/CommunityPackageManageConfirmModal.vue
diff --git a/packages/editor-ui/src/components/CommunityPlusEnrollmentModal.test.ts b/packages/frontend/editor-ui/src/components/CommunityPlusEnrollmentModal.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/CommunityPlusEnrollmentModal.test.ts
rename to packages/frontend/editor-ui/src/components/CommunityPlusEnrollmentModal.test.ts
diff --git a/packages/editor-ui/src/components/CommunityPlusEnrollmentModal.vue b/packages/frontend/editor-ui/src/components/CommunityPlusEnrollmentModal.vue
similarity index 97%
rename from packages/editor-ui/src/components/CommunityPlusEnrollmentModal.vue
rename to packages/frontend/editor-ui/src/components/CommunityPlusEnrollmentModal.vue
index b25d958173..6db5e70426 100644
--- a/packages/editor-ui/src/components/CommunityPlusEnrollmentModal.vue
+++ b/packages/frontend/editor-ui/src/components/CommunityPlusEnrollmentModal.vue
@@ -1,8 +1,8 @@
 <script lang="ts" setup="">
 import { ref } from 'vue';
 import { createEventBus } from '@n8n/utils/event-bus';
-import type { Validatable, IValidator } from 'n8n-design-system';
-import { N8nFormInput } from 'n8n-design-system';
+import type { Validatable, IValidator } from '@n8n/design-system';
+import { N8nFormInput } from '@n8n/design-system';
 import { VALID_EMAIL_REGEX } from '@/constants';
 import Modal from '@/components/Modal.vue';
 import { useI18n } from '@/composables/useI18n';
diff --git a/packages/editor-ui/src/components/ContactPromptModal.vue b/packages/frontend/editor-ui/src/components/ContactPromptModal.vue
similarity index 100%
rename from packages/editor-ui/src/components/ContactPromptModal.vue
rename to packages/frontend/editor-ui/src/components/ContactPromptModal.vue
diff --git a/packages/editor-ui/src/components/ContextMenu/ContextMenu.vue b/packages/frontend/editor-ui/src/components/ContextMenu/ContextMenu.vue
similarity index 96%
rename from packages/editor-ui/src/components/ContextMenu/ContextMenu.vue
rename to packages/frontend/editor-ui/src/components/ContextMenu/ContextMenu.vue
index 2425559e83..6ef92d3b44 100644
--- a/packages/editor-ui/src/components/ContextMenu/ContextMenu.vue
+++ b/packages/frontend/editor-ui/src/components/ContextMenu/ContextMenu.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { type ContextMenuAction, useContextMenu } from '@/composables/useContextMenu';
-import { N8nActionDropdown } from 'n8n-design-system';
+import { N8nActionDropdown } from '@n8n/design-system';
 import { watch, ref } from 'vue';
 import { onClickOutside } from '@vueuse/core';
 
diff --git a/packages/editor-ui/src/components/CopyInput.test.ts b/packages/frontend/editor-ui/src/components/CopyInput.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/CopyInput.test.ts
rename to packages/frontend/editor-ui/src/components/CopyInput.test.ts
diff --git a/packages/editor-ui/src/components/CopyInput.vue b/packages/frontend/editor-ui/src/components/CopyInput.vue
similarity index 100%
rename from packages/editor-ui/src/components/CopyInput.vue
rename to packages/frontend/editor-ui/src/components/CopyInput.vue
diff --git a/packages/editor-ui/src/components/CredentialCard.test.ts b/packages/frontend/editor-ui/src/components/CredentialCard.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/CredentialCard.test.ts
rename to packages/frontend/editor-ui/src/components/CredentialCard.test.ts
diff --git a/packages/editor-ui/src/components/CredentialCard.vue b/packages/frontend/editor-ui/src/components/CredentialCard.vue
similarity index 100%
rename from packages/editor-ui/src/components/CredentialCard.vue
rename to packages/frontend/editor-ui/src/components/CredentialCard.vue
diff --git a/packages/editor-ui/src/components/CredentialConfig.test.ts b/packages/frontend/editor-ui/src/components/CredentialConfig.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/CredentialConfig.test.ts
rename to packages/frontend/editor-ui/src/components/CredentialConfig.test.ts
diff --git a/packages/editor-ui/src/components/CredentialEdit/AuthTypeSelector.vue b/packages/frontend/editor-ui/src/components/CredentialEdit/AuthTypeSelector.vue
similarity index 100%
rename from packages/editor-ui/src/components/CredentialEdit/AuthTypeSelector.vue
rename to packages/frontend/editor-ui/src/components/CredentialEdit/AuthTypeSelector.vue
diff --git a/packages/editor-ui/src/components/CredentialEdit/CredentialConfig.vue b/packages/frontend/editor-ui/src/components/CredentialEdit/CredentialConfig.vue
similarity index 99%
rename from packages/editor-ui/src/components/CredentialEdit/CredentialConfig.vue
rename to packages/frontend/editor-ui/src/components/CredentialEdit/CredentialConfig.vue
index 45c1802852..1281fc407b 100644
--- a/packages/editor-ui/src/components/CredentialEdit/CredentialConfig.vue
+++ b/packages/frontend/editor-ui/src/components/CredentialEdit/CredentialConfig.vue
@@ -36,7 +36,7 @@ import CredentialDocs from './CredentialDocs.vue';
 import { CREDENTIAL_MARKDOWN_DOCS } from './docs';
 import { usePostHog } from '@/stores/posthog.store';
 import { useAssistantStore } from '@/stores/assistant.store';
-import InlineAskAssistantButton from 'n8n-design-system/components/InlineAskAssistantButton/InlineAskAssistantButton.vue';
+import InlineAskAssistantButton from '@n8n/design-system/components/InlineAskAssistantButton/InlineAskAssistantButton.vue';
 
 type Props = {
 	mode: string;
diff --git a/packages/editor-ui/src/components/CredentialEdit/CredentialDocs.vue b/packages/frontend/editor-ui/src/components/CredentialEdit/CredentialDocs.vue
similarity index 100%
rename from packages/editor-ui/src/components/CredentialEdit/CredentialDocs.vue
rename to packages/frontend/editor-ui/src/components/CredentialEdit/CredentialDocs.vue
diff --git a/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue b/packages/frontend/editor-ui/src/components/CredentialEdit/CredentialEdit.vue
similarity index 99%
rename from packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue
rename to packages/frontend/editor-ui/src/components/CredentialEdit/CredentialEdit.vue
index 0b65f7a0b6..5be36dfba9 100644
--- a/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue
+++ b/packages/frontend/editor-ui/src/components/CredentialEdit/CredentialEdit.vue
@@ -38,7 +38,7 @@ import { useUIStore } from '@/stores/ui.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import type { Project, ProjectSharingData } from '@/types/projects.types';
 import { assert } from '@n8n/utils/assert';
-import type { IMenuItem } from 'n8n-design-system';
+import type { IMenuItem } from '@n8n/design-system';
 import { createEventBus } from '@n8n/utils/event-bus';
 
 import { useExternalHooks } from '@/composables/useExternalHooks';
diff --git a/packages/editor-ui/src/components/CredentialEdit/CredentialInfo.vue b/packages/frontend/editor-ui/src/components/CredentialEdit/CredentialInfo.vue
similarity index 97%
rename from packages/editor-ui/src/components/CredentialEdit/CredentialInfo.vue
rename to packages/frontend/editor-ui/src/components/CredentialEdit/CredentialInfo.vue
index f046faf2fa..0d4fbf09e6 100644
--- a/packages/editor-ui/src/components/CredentialEdit/CredentialInfo.vue
+++ b/packages/frontend/editor-ui/src/components/CredentialEdit/CredentialInfo.vue
@@ -2,7 +2,7 @@
 import TimeAgo from '../TimeAgo.vue';
 import { useI18n } from '@/composables/useI18n';
 import type { ICredentialsDecryptedResponse, ICredentialsResponse } from '@/Interface';
-import { N8nText } from 'n8n-design-system';
+import { N8nText } from '@n8n/design-system';
 
 type Props = {
 	currentCredential: ICredentialsResponse | ICredentialsDecryptedResponse | null;
diff --git a/packages/editor-ui/src/components/CredentialEdit/CredentialInputs.vue b/packages/frontend/editor-ui/src/components/CredentialEdit/CredentialInputs.vue
similarity index 100%
rename from packages/editor-ui/src/components/CredentialEdit/CredentialInputs.vue
rename to packages/frontend/editor-ui/src/components/CredentialEdit/CredentialInputs.vue
diff --git a/packages/editor-ui/src/components/CredentialEdit/CredentialSharing.ee.vue b/packages/frontend/editor-ui/src/components/CredentialEdit/CredentialSharing.ee.vue
similarity index 100%
rename from packages/editor-ui/src/components/CredentialEdit/CredentialSharing.ee.vue
rename to packages/frontend/editor-ui/src/components/CredentialEdit/CredentialSharing.ee.vue
diff --git a/packages/editor-ui/src/components/CredentialEdit/GoogleAuthButton.vue b/packages/frontend/editor-ui/src/components/CredentialEdit/GoogleAuthButton.vue
similarity index 100%
rename from packages/editor-ui/src/components/CredentialEdit/GoogleAuthButton.vue
rename to packages/frontend/editor-ui/src/components/CredentialEdit/GoogleAuthButton.vue
diff --git a/packages/editor-ui/src/components/CredentialEdit/OauthButton.test.ts b/packages/frontend/editor-ui/src/components/CredentialEdit/OauthButton.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/CredentialEdit/OauthButton.test.ts
rename to packages/frontend/editor-ui/src/components/CredentialEdit/OauthButton.test.ts
diff --git a/packages/editor-ui/src/components/CredentialEdit/OauthButton.vue b/packages/frontend/editor-ui/src/components/CredentialEdit/OauthButton.vue
similarity index 100%
rename from packages/editor-ui/src/components/CredentialEdit/OauthButton.vue
rename to packages/frontend/editor-ui/src/components/CredentialEdit/OauthButton.vue
diff --git a/packages/editor-ui/src/components/CredentialEdit/__tests__/CredentialEdit.test.ts b/packages/frontend/editor-ui/src/components/CredentialEdit/__tests__/CredentialEdit.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/CredentialEdit/__tests__/CredentialEdit.test.ts
rename to packages/frontend/editor-ui/src/components/CredentialEdit/__tests__/CredentialEdit.test.ts
diff --git a/packages/editor-ui/src/components/CredentialEdit/docs.ts b/packages/frontend/editor-ui/src/components/CredentialEdit/docs.ts
similarity index 100%
rename from packages/editor-ui/src/components/CredentialEdit/docs.ts
rename to packages/frontend/editor-ui/src/components/CredentialEdit/docs.ts
diff --git a/packages/editor-ui/src/components/CredentialIcon.test.ts b/packages/frontend/editor-ui/src/components/CredentialIcon.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/CredentialIcon.test.ts
rename to packages/frontend/editor-ui/src/components/CredentialIcon.test.ts
diff --git a/packages/editor-ui/src/components/CredentialIcon.vue b/packages/frontend/editor-ui/src/components/CredentialIcon.vue
similarity index 98%
rename from packages/editor-ui/src/components/CredentialIcon.vue
rename to packages/frontend/editor-ui/src/components/CredentialIcon.vue
index 07ca323e17..c8672c1681 100644
--- a/packages/editor-ui/src/components/CredentialIcon.vue
+++ b/packages/frontend/editor-ui/src/components/CredentialIcon.vue
@@ -4,7 +4,7 @@ import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { useRootStore } from '@/stores/root.store';
 import { useUIStore } from '@/stores/ui.store';
 import { getThemedValue } from '@/utils/nodeTypesUtils';
-import { N8nNodeIcon } from 'n8n-design-system';
+import { N8nNodeIcon } from '@n8n/design-system';
 import type { ICredentialType } from 'n8n-workflow';
 import { computed } from 'vue';
 
diff --git a/packages/editor-ui/src/components/CredentialPicker/CredentialPicker.test.constants.ts b/packages/frontend/editor-ui/src/components/CredentialPicker/CredentialPicker.test.constants.ts
similarity index 100%
rename from packages/editor-ui/src/components/CredentialPicker/CredentialPicker.test.constants.ts
rename to packages/frontend/editor-ui/src/components/CredentialPicker/CredentialPicker.test.constants.ts
diff --git a/packages/editor-ui/src/components/CredentialPicker/CredentialPicker.test.ts b/packages/frontend/editor-ui/src/components/CredentialPicker/CredentialPicker.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/CredentialPicker/CredentialPicker.test.ts
rename to packages/frontend/editor-ui/src/components/CredentialPicker/CredentialPicker.test.ts
diff --git a/packages/editor-ui/src/components/CredentialPicker/CredentialPicker.vue b/packages/frontend/editor-ui/src/components/CredentialPicker/CredentialPicker.vue
similarity index 100%
rename from packages/editor-ui/src/components/CredentialPicker/CredentialPicker.vue
rename to packages/frontend/editor-ui/src/components/CredentialPicker/CredentialPicker.vue
diff --git a/packages/editor-ui/src/components/CredentialPicker/CredentialsDropdown.vue b/packages/frontend/editor-ui/src/components/CredentialPicker/CredentialsDropdown.vue
similarity index 100%
rename from packages/editor-ui/src/components/CredentialPicker/CredentialsDropdown.vue
rename to packages/frontend/editor-ui/src/components/CredentialPicker/CredentialsDropdown.vue
diff --git a/packages/editor-ui/src/components/CredentialsSelect.vue b/packages/frontend/editor-ui/src/components/CredentialsSelect.vue
similarity index 98%
rename from packages/editor-ui/src/components/CredentialsSelect.vue
rename to packages/frontend/editor-ui/src/components/CredentialsSelect.vue
index 36807f12a4..18ce4b70df 100644
--- a/packages/editor-ui/src/components/CredentialsSelect.vue
+++ b/packages/frontend/editor-ui/src/components/CredentialsSelect.vue
@@ -4,7 +4,7 @@ import { computed, ref } from 'vue';
 import ScopesNotice from '@/components/ScopesNotice.vue';
 import NodeCredentials from '@/components/NodeCredentials.vue';
 import { useCredentialsStore } from '@/stores/credentials.store';
-import { N8nOption, N8nSelect } from 'n8n-design-system';
+import { N8nOption, N8nSelect } from '@n8n/design-system';
 import type { INodeUi, INodeUpdatePropertiesInformation } from '@/Interface';
 import { useI18n } from '@/composables/useI18n';
 
diff --git a/packages/editor-ui/src/components/CredentialsSelectModal.vue b/packages/frontend/editor-ui/src/components/CredentialsSelectModal.vue
similarity index 98%
rename from packages/editor-ui/src/components/CredentialsSelectModal.vue
rename to packages/frontend/editor-ui/src/components/CredentialsSelectModal.vue
index e2392ada65..35480a262c 100644
--- a/packages/editor-ui/src/components/CredentialsSelectModal.vue
+++ b/packages/frontend/editor-ui/src/components/CredentialsSelectModal.vue
@@ -4,7 +4,7 @@ import { useTelemetry } from '@/composables/useTelemetry';
 import { useCredentialsStore } from '@/stores/credentials.store';
 import { useUIStore } from '@/stores/ui.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
-import { N8nButton, N8nSelect } from 'n8n-design-system';
+import { N8nButton, N8nSelect } from '@n8n/design-system';
 import { createEventBus } from '@n8n/utils/event-bus';
 import { onMounted, ref } from 'vue';
 import { CREDENTIAL_SELECT_MODAL_KEY } from '../constants';
diff --git a/packages/editor-ui/src/components/CssEditor/CssEditor.vue b/packages/frontend/editor-ui/src/components/CssEditor/CssEditor.vue
similarity index 100%
rename from packages/editor-ui/src/components/CssEditor/CssEditor.vue
rename to packages/frontend/editor-ui/src/components/CssEditor/CssEditor.vue
diff --git a/packages/editor-ui/src/components/DebugPaywallModal.vue b/packages/frontend/editor-ui/src/components/DebugPaywallModal.vue
similarity index 100%
rename from packages/editor-ui/src/components/DebugPaywallModal.vue
rename to packages/frontend/editor-ui/src/components/DebugPaywallModal.vue
diff --git a/packages/editor-ui/src/components/DeleteUserModal.test.ts b/packages/frontend/editor-ui/src/components/DeleteUserModal.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/DeleteUserModal.test.ts
rename to packages/frontend/editor-ui/src/components/DeleteUserModal.test.ts
diff --git a/packages/editor-ui/src/components/DeleteUserModal.vue b/packages/frontend/editor-ui/src/components/DeleteUserModal.vue
similarity index 100%
rename from packages/editor-ui/src/components/DeleteUserModal.vue
rename to packages/frontend/editor-ui/src/components/DeleteUserModal.vue
diff --git a/packages/editor-ui/src/components/Draggable.vue b/packages/frontend/editor-ui/src/components/Draggable.vue
similarity index 100%
rename from packages/editor-ui/src/components/Draggable.vue
rename to packages/frontend/editor-ui/src/components/Draggable.vue
diff --git a/packages/editor-ui/src/components/DraggableTarget.vue b/packages/frontend/editor-ui/src/components/DraggableTarget.vue
similarity index 100%
rename from packages/editor-ui/src/components/DraggableTarget.vue
rename to packages/frontend/editor-ui/src/components/DraggableTarget.vue
diff --git a/packages/editor-ui/src/components/DropArea/DropArea.test.ts b/packages/frontend/editor-ui/src/components/DropArea/DropArea.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/DropArea/DropArea.test.ts
rename to packages/frontend/editor-ui/src/components/DropArea/DropArea.test.ts
diff --git a/packages/editor-ui/src/components/DropArea/DropArea.vue b/packages/frontend/editor-ui/src/components/DropArea/DropArea.vue
similarity index 100%
rename from packages/editor-ui/src/components/DropArea/DropArea.vue
rename to packages/frontend/editor-ui/src/components/DropArea/DropArea.vue
diff --git a/packages/editor-ui/src/components/DuplicateWorkflowDialog.vue b/packages/frontend/editor-ui/src/components/DuplicateWorkflowDialog.vue
similarity index 100%
rename from packages/editor-ui/src/components/DuplicateWorkflowDialog.vue
rename to packages/frontend/editor-ui/src/components/DuplicateWorkflowDialog.vue
diff --git a/packages/editor-ui/src/components/EnterpriseEdition.ee.vue b/packages/frontend/editor-ui/src/components/EnterpriseEdition.ee.vue
similarity index 100%
rename from packages/editor-ui/src/components/EnterpriseEdition.ee.vue
rename to packages/frontend/editor-ui/src/components/EnterpriseEdition.ee.vue
diff --git a/packages/editor-ui/src/components/Error/NodeErrorView.test.ts b/packages/frontend/editor-ui/src/components/Error/NodeErrorView.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/Error/NodeErrorView.test.ts
rename to packages/frontend/editor-ui/src/components/Error/NodeErrorView.test.ts
diff --git a/packages/editor-ui/src/components/Error/NodeErrorView.vue b/packages/frontend/editor-ui/src/components/Error/NodeErrorView.vue
similarity index 99%
rename from packages/editor-ui/src/components/Error/NodeErrorView.vue
rename to packages/frontend/editor-ui/src/components/Error/NodeErrorView.vue
index f1b8a1f7c6..b21cc52a22 100644
--- a/packages/editor-ui/src/components/Error/NodeErrorView.vue
+++ b/packages/frontend/editor-ui/src/components/Error/NodeErrorView.vue
@@ -20,7 +20,7 @@ import { MAX_DISPLAY_DATA_SIZE, NEW_ASSISTANT_SESSION_MODAL } from '@/constants'
 import type { BaseTextKey } from '@/plugins/i18n';
 import { useAssistantStore } from '@/stores/assistant.store';
 import type { ChatRequest } from '@/types/assistant.types';
-import InlineAskAssistantButton from 'n8n-design-system/components/InlineAskAssistantButton/InlineAskAssistantButton.vue';
+import InlineAskAssistantButton from '@n8n/design-system/components/InlineAskAssistantButton/InlineAskAssistantButton.vue';
 import { useUIStore } from '@/stores/ui.store';
 import { isCommunityPackageName } from '@/utils/nodeTypesUtils';
 import { useAIAssistantHelpers } from '@/composables/useAIAssistantHelpers';
diff --git a/packages/editor-ui/src/components/ExpandableInput/ExpandableInputBase.vue b/packages/frontend/editor-ui/src/components/ExpandableInput/ExpandableInputBase.vue
similarity index 100%
rename from packages/editor-ui/src/components/ExpandableInput/ExpandableInputBase.vue
rename to packages/frontend/editor-ui/src/components/ExpandableInput/ExpandableInputBase.vue
diff --git a/packages/editor-ui/src/components/ExpandableInput/ExpandableInputEdit.vue b/packages/frontend/editor-ui/src/components/ExpandableInput/ExpandableInputEdit.vue
similarity index 100%
rename from packages/editor-ui/src/components/ExpandableInput/ExpandableInputEdit.vue
rename to packages/frontend/editor-ui/src/components/ExpandableInput/ExpandableInputEdit.vue
diff --git a/packages/editor-ui/src/components/ExpandableInput/ExpandableInputPreview.vue b/packages/frontend/editor-ui/src/components/ExpandableInput/ExpandableInputPreview.vue
similarity index 100%
rename from packages/editor-ui/src/components/ExpandableInput/ExpandableInputPreview.vue
rename to packages/frontend/editor-ui/src/components/ExpandableInput/ExpandableInputPreview.vue
diff --git a/packages/editor-ui/src/components/ExpressionEditModal.test.ts b/packages/frontend/editor-ui/src/components/ExpressionEditModal.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/ExpressionEditModal.test.ts
rename to packages/frontend/editor-ui/src/components/ExpressionEditModal.test.ts
diff --git a/packages/editor-ui/src/components/ExpressionEditModal.vue b/packages/frontend/editor-ui/src/components/ExpressionEditModal.vue
similarity index 98%
rename from packages/editor-ui/src/components/ExpressionEditModal.vue
rename to packages/frontend/editor-ui/src/components/ExpressionEditModal.vue
index 15fb08f88c..4f2a13de78 100644
--- a/packages/editor-ui/src/components/ExpressionEditModal.vue
+++ b/packages/frontend/editor-ui/src/components/ExpressionEditModal.vue
@@ -22,8 +22,8 @@ import DraggableTarget from './DraggableTarget.vue';
 import { dropInExpressionEditor } from '@/plugins/codemirror/dragAndDrop';
 
 import { APP_MODALS_ELEMENT_ID } from '@/constants';
-import { N8nInput, N8nText } from 'n8n-design-system';
-import { N8nResizeWrapper, type ResizeData } from 'n8n-design-system';
+import { N8nInput, N8nText } from '@n8n/design-system';
+import { N8nResizeWrapper, type ResizeData } from '@n8n/design-system';
 import { useThrottleFn } from '@vueuse/core';
 
 const DEFAULT_LEFT_SIDEBAR_WIDTH = 360;
diff --git a/packages/editor-ui/src/components/ExpressionEditorModal/ExpressionEditorModalInput.vue b/packages/frontend/editor-ui/src/components/ExpressionEditorModal/ExpressionEditorModalInput.vue
similarity index 100%
rename from packages/editor-ui/src/components/ExpressionEditorModal/ExpressionEditorModalInput.vue
rename to packages/frontend/editor-ui/src/components/ExpressionEditorModal/ExpressionEditorModalInput.vue
diff --git a/packages/editor-ui/src/components/ExpressionEditorModal/theme.ts b/packages/frontend/editor-ui/src/components/ExpressionEditorModal/theme.ts
similarity index 100%
rename from packages/editor-ui/src/components/ExpressionEditorModal/theme.ts
rename to packages/frontend/editor-ui/src/components/ExpressionEditorModal/theme.ts
diff --git a/packages/editor-ui/src/components/ExpressionEditorModalInput.test.ts b/packages/frontend/editor-ui/src/components/ExpressionEditorModalInput.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/ExpressionEditorModalInput.test.ts
rename to packages/frontend/editor-ui/src/components/ExpressionEditorModalInput.test.ts
diff --git a/packages/editor-ui/src/components/ExpressionFunctionIcon.vue b/packages/frontend/editor-ui/src/components/ExpressionFunctionIcon.vue
similarity index 100%
rename from packages/editor-ui/src/components/ExpressionFunctionIcon.vue
rename to packages/frontend/editor-ui/src/components/ExpressionFunctionIcon.vue
diff --git a/packages/editor-ui/src/components/ExpressionParameterInput.test.ts b/packages/frontend/editor-ui/src/components/ExpressionParameterInput.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/ExpressionParameterInput.test.ts
rename to packages/frontend/editor-ui/src/components/ExpressionParameterInput.test.ts
diff --git a/packages/editor-ui/src/components/ExpressionParameterInput.vue b/packages/frontend/editor-ui/src/components/ExpressionParameterInput.vue
similarity index 100%
rename from packages/editor-ui/src/components/ExpressionParameterInput.vue
rename to packages/frontend/editor-ui/src/components/ExpressionParameterInput.vue
diff --git a/packages/editor-ui/src/components/ExternalSecretsProviderCard.ee.vue b/packages/frontend/editor-ui/src/components/ExternalSecretsProviderCard.ee.vue
similarity index 100%
rename from packages/editor-ui/src/components/ExternalSecretsProviderCard.ee.vue
rename to packages/frontend/editor-ui/src/components/ExternalSecretsProviderCard.ee.vue
diff --git a/packages/editor-ui/src/components/ExternalSecretsProviderConnectionSwitch.ee.vue b/packages/frontend/editor-ui/src/components/ExternalSecretsProviderConnectionSwitch.ee.vue
similarity index 100%
rename from packages/editor-ui/src/components/ExternalSecretsProviderConnectionSwitch.ee.vue
rename to packages/frontend/editor-ui/src/components/ExternalSecretsProviderConnectionSwitch.ee.vue
diff --git a/packages/editor-ui/src/components/ExternalSecretsProviderImage.ee.vue b/packages/frontend/editor-ui/src/components/ExternalSecretsProviderImage.ee.vue
similarity index 100%
rename from packages/editor-ui/src/components/ExternalSecretsProviderImage.ee.vue
rename to packages/frontend/editor-ui/src/components/ExternalSecretsProviderImage.ee.vue
diff --git a/packages/editor-ui/src/components/ExternalSecretsProviderModal.ee.vue b/packages/frontend/editor-ui/src/components/ExternalSecretsProviderModal.ee.vue
similarity index 100%
rename from packages/editor-ui/src/components/ExternalSecretsProviderModal.ee.vue
rename to packages/frontend/editor-ui/src/components/ExternalSecretsProviderModal.ee.vue
diff --git a/packages/editor-ui/src/components/Feedback.test.ts b/packages/frontend/editor-ui/src/components/Feedback.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/Feedback.test.ts
rename to packages/frontend/editor-ui/src/components/Feedback.test.ts
diff --git a/packages/editor-ui/src/components/Feedback.vue b/packages/frontend/editor-ui/src/components/Feedback.vue
similarity index 100%
rename from packages/editor-ui/src/components/Feedback.vue
rename to packages/frontend/editor-ui/src/components/Feedback.vue
diff --git a/packages/editor-ui/src/components/FilterConditions/CombinatorSelect.vue b/packages/frontend/editor-ui/src/components/FilterConditions/CombinatorSelect.vue
similarity index 100%
rename from packages/editor-ui/src/components/FilterConditions/CombinatorSelect.vue
rename to packages/frontend/editor-ui/src/components/FilterConditions/CombinatorSelect.vue
diff --git a/packages/editor-ui/src/components/FilterConditions/Condition.vue b/packages/frontend/editor-ui/src/components/FilterConditions/Condition.vue
similarity index 100%
rename from packages/editor-ui/src/components/FilterConditions/Condition.vue
rename to packages/frontend/editor-ui/src/components/FilterConditions/Condition.vue
diff --git a/packages/editor-ui/src/components/FilterConditions/FilterConditions.test.ts b/packages/frontend/editor-ui/src/components/FilterConditions/FilterConditions.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/FilterConditions/FilterConditions.test.ts
rename to packages/frontend/editor-ui/src/components/FilterConditions/FilterConditions.test.ts
diff --git a/packages/editor-ui/src/components/FilterConditions/FilterConditions.vue b/packages/frontend/editor-ui/src/components/FilterConditions/FilterConditions.vue
similarity index 100%
rename from packages/editor-ui/src/components/FilterConditions/FilterConditions.vue
rename to packages/frontend/editor-ui/src/components/FilterConditions/FilterConditions.vue
diff --git a/packages/editor-ui/src/components/FilterConditions/OperatorSelect.vue b/packages/frontend/editor-ui/src/components/FilterConditions/OperatorSelect.vue
similarity index 100%
rename from packages/editor-ui/src/components/FilterConditions/OperatorSelect.vue
rename to packages/frontend/editor-ui/src/components/FilterConditions/OperatorSelect.vue
diff --git a/packages/editor-ui/src/components/FilterConditions/constants.ts b/packages/frontend/editor-ui/src/components/FilterConditions/constants.ts
similarity index 100%
rename from packages/editor-ui/src/components/FilterConditions/constants.ts
rename to packages/frontend/editor-ui/src/components/FilterConditions/constants.ts
diff --git a/packages/editor-ui/src/components/FilterConditions/types.ts b/packages/frontend/editor-ui/src/components/FilterConditions/types.ts
similarity index 100%
rename from packages/editor-ui/src/components/FilterConditions/types.ts
rename to packages/frontend/editor-ui/src/components/FilterConditions/types.ts
diff --git a/packages/editor-ui/src/components/FilterConditions/utils.test.ts b/packages/frontend/editor-ui/src/components/FilterConditions/utils.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/FilterConditions/utils.test.ts
rename to packages/frontend/editor-ui/src/components/FilterConditions/utils.test.ts
diff --git a/packages/editor-ui/src/components/FilterConditions/utils.ts b/packages/frontend/editor-ui/src/components/FilterConditions/utils.ts
similarity index 100%
rename from packages/editor-ui/src/components/FilterConditions/utils.ts
rename to packages/frontend/editor-ui/src/components/FilterConditions/utils.ts
diff --git a/packages/editor-ui/src/components/FixedCollectionParameter.test.ts b/packages/frontend/editor-ui/src/components/FixedCollectionParameter.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/FixedCollectionParameter.test.ts
rename to packages/frontend/editor-ui/src/components/FixedCollectionParameter.test.ts
diff --git a/packages/editor-ui/src/components/FixedCollectionParameter.vue b/packages/frontend/editor-ui/src/components/FixedCollectionParameter.vue
similarity index 99%
rename from packages/editor-ui/src/components/FixedCollectionParameter.vue
rename to packages/frontend/editor-ui/src/components/FixedCollectionParameter.vue
index 04f8c9e773..60a98c723f 100644
--- a/packages/editor-ui/src/components/FixedCollectionParameter.vue
+++ b/packages/frontend/editor-ui/src/components/FixedCollectionParameter.vue
@@ -15,7 +15,7 @@ import {
 	N8nInputLabel,
 	N8nText,
 	N8nButton,
-} from 'n8n-design-system';
+} from '@n8n/design-system';
 import ParameterInputList from './ParameterInputList.vue';
 import Draggable from 'vuedraggable';
 import { useWorkflowsStore } from '@/stores/workflows.store';
diff --git a/packages/editor-ui/src/components/Folders/FolderCard.test.ts b/packages/frontend/editor-ui/src/components/Folders/FolderCard.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/Folders/FolderCard.test.ts
rename to packages/frontend/editor-ui/src/components/Folders/FolderCard.test.ts
diff --git a/packages/editor-ui/src/components/Folders/FolderCard.vue b/packages/frontend/editor-ui/src/components/Folders/FolderCard.vue
similarity index 98%
rename from packages/editor-ui/src/components/Folders/FolderCard.vue
rename to packages/frontend/editor-ui/src/components/Folders/FolderCard.vue
index a10210889b..02d8a443d3 100644
--- a/packages/editor-ui/src/components/Folders/FolderCard.vue
+++ b/packages/frontend/editor-ui/src/components/Folders/FolderCard.vue
@@ -6,7 +6,7 @@ import { type ProjectIcon, ProjectTypes } from '@/types/projects.types';
 import { useI18n } from '@/composables/useI18n';
 import { useRoute, useRouter } from 'vue-router';
 import { VIEWS } from '@/constants';
-import type { PathItem } from 'n8n-design-system/components/N8nBreadcrumbs/Breadcrumbs.vue';
+import type { PathItem } from '@n8n/design-system/components/N8nBreadcrumbs/Breadcrumbs.vue';
 import type { UserAction } from '@/Interface';
 
 type Props = {
diff --git a/packages/editor-ui/src/components/Folders/constants.ts b/packages/frontend/editor-ui/src/components/Folders/constants.ts
similarity index 100%
rename from packages/editor-ui/src/components/Folders/constants.ts
rename to packages/frontend/editor-ui/src/components/Folders/constants.ts
diff --git a/packages/editor-ui/src/components/FreeAiCreditsCallout.test.ts b/packages/frontend/editor-ui/src/components/FreeAiCreditsCallout.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/FreeAiCreditsCallout.test.ts
rename to packages/frontend/editor-ui/src/components/FreeAiCreditsCallout.test.ts
diff --git a/packages/editor-ui/src/components/FreeAiCreditsCallout.vue b/packages/frontend/editor-ui/src/components/FreeAiCreditsCallout.vue
similarity index 100%
rename from packages/editor-ui/src/components/FreeAiCreditsCallout.vue
rename to packages/frontend/editor-ui/src/components/FreeAiCreditsCallout.vue
diff --git a/packages/editor-ui/src/components/GiftNotificationIcon.vue b/packages/frontend/editor-ui/src/components/GiftNotificationIcon.vue
similarity index 100%
rename from packages/editor-ui/src/components/GiftNotificationIcon.vue
rename to packages/frontend/editor-ui/src/components/GiftNotificationIcon.vue
diff --git a/packages/editor-ui/src/components/GoBackButton.vue b/packages/frontend/editor-ui/src/components/GoBackButton.vue
similarity index 100%
rename from packages/editor-ui/src/components/GoBackButton.vue
rename to packages/frontend/editor-ui/src/components/GoBackButton.vue
diff --git a/packages/editor-ui/src/components/HtmlEditor.test.ts b/packages/frontend/editor-ui/src/components/HtmlEditor.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/HtmlEditor.test.ts
rename to packages/frontend/editor-ui/src/components/HtmlEditor.test.ts
diff --git a/packages/editor-ui/src/components/HtmlEditor/HtmlEditor.vue b/packages/frontend/editor-ui/src/components/HtmlEditor/HtmlEditor.vue
similarity index 100%
rename from packages/editor-ui/src/components/HtmlEditor/HtmlEditor.vue
rename to packages/frontend/editor-ui/src/components/HtmlEditor/HtmlEditor.vue
diff --git a/packages/editor-ui/src/components/HtmlEditor/types.ts b/packages/frontend/editor-ui/src/components/HtmlEditor/types.ts
similarity index 100%
rename from packages/editor-ui/src/components/HtmlEditor/types.ts
rename to packages/frontend/editor-ui/src/components/HtmlEditor/types.ts
diff --git a/packages/editor-ui/src/components/HtmlEditor/utils.ts b/packages/frontend/editor-ui/src/components/HtmlEditor/utils.ts
similarity index 100%
rename from packages/editor-ui/src/components/HtmlEditor/utils.ts
rename to packages/frontend/editor-ui/src/components/HtmlEditor/utils.ts
diff --git a/packages/editor-ui/src/components/ImportCurlModal.vue b/packages/frontend/editor-ui/src/components/ImportCurlModal.vue
similarity index 100%
rename from packages/editor-ui/src/components/ImportCurlModal.vue
rename to packages/frontend/editor-ui/src/components/ImportCurlModal.vue
diff --git a/packages/editor-ui/src/components/ImportCurlParameter.vue b/packages/frontend/editor-ui/src/components/ImportCurlParameter.vue
similarity index 100%
rename from packages/editor-ui/src/components/ImportCurlParameter.vue
rename to packages/frontend/editor-ui/src/components/ImportCurlParameter.vue
diff --git a/packages/editor-ui/src/components/InlineExpressionEditor/ExpressionOutput.vue b/packages/frontend/editor-ui/src/components/InlineExpressionEditor/ExpressionOutput.vue
similarity index 100%
rename from packages/editor-ui/src/components/InlineExpressionEditor/ExpressionOutput.vue
rename to packages/frontend/editor-ui/src/components/InlineExpressionEditor/ExpressionOutput.vue
diff --git a/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorInput.vue b/packages/frontend/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorInput.vue
similarity index 100%
rename from packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorInput.vue
rename to packages/frontend/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorInput.vue
diff --git a/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorOutput.test.ts b/packages/frontend/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorOutput.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorOutput.test.ts
rename to packages/frontend/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorOutput.test.ts
diff --git a/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorOutput.vue b/packages/frontend/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorOutput.vue
similarity index 100%
rename from packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorOutput.vue
rename to packages/frontend/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorOutput.vue
diff --git a/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionTip.test.ts b/packages/frontend/editor-ui/src/components/InlineExpressionEditor/InlineExpressionTip.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionTip.test.ts
rename to packages/frontend/editor-ui/src/components/InlineExpressionEditor/InlineExpressionTip.test.ts
diff --git a/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionTip.vue b/packages/frontend/editor-ui/src/components/InlineExpressionEditor/InlineExpressionTip.vue
similarity index 100%
rename from packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionTip.vue
rename to packages/frontend/editor-ui/src/components/InlineExpressionEditor/InlineExpressionTip.vue
diff --git a/packages/editor-ui/src/components/InlineExpressionEditor/OutputItemSelect.vue b/packages/frontend/editor-ui/src/components/InlineExpressionEditor/OutputItemSelect.vue
similarity index 100%
rename from packages/editor-ui/src/components/InlineExpressionEditor/OutputItemSelect.vue
rename to packages/frontend/editor-ui/src/components/InlineExpressionEditor/OutputItemSelect.vue
diff --git a/packages/editor-ui/src/components/InlineExpressionEditor/theme.ts b/packages/frontend/editor-ui/src/components/InlineExpressionEditor/theme.ts
similarity index 100%
rename from packages/editor-ui/src/components/InlineExpressionEditor/theme.ts
rename to packages/frontend/editor-ui/src/components/InlineExpressionEditor/theme.ts
diff --git a/packages/editor-ui/src/components/InlineNameEdit.vue b/packages/frontend/editor-ui/src/components/InlineNameEdit.vue
similarity index 100%
rename from packages/editor-ui/src/components/InlineNameEdit.vue
rename to packages/frontend/editor-ui/src/components/InlineNameEdit.vue
diff --git a/packages/editor-ui/src/components/InlineTextEdit.vue b/packages/frontend/editor-ui/src/components/InlineTextEdit.vue
similarity index 100%
rename from packages/editor-ui/src/components/InlineTextEdit.vue
rename to packages/frontend/editor-ui/src/components/InlineTextEdit.vue
diff --git a/packages/editor-ui/src/components/InputNodeSelect.vue b/packages/frontend/editor-ui/src/components/InputNodeSelect.vue
similarity index 100%
rename from packages/editor-ui/src/components/InputNodeSelect.vue
rename to packages/frontend/editor-ui/src/components/InputNodeSelect.vue
diff --git a/packages/editor-ui/src/components/InputPanel.test.ts b/packages/frontend/editor-ui/src/components/InputPanel.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/InputPanel.test.ts
rename to packages/frontend/editor-ui/src/components/InputPanel.test.ts
diff --git a/packages/editor-ui/src/components/InputPanel.vue b/packages/frontend/editor-ui/src/components/InputPanel.vue
similarity index 99%
rename from packages/editor-ui/src/components/InputPanel.vue
rename to packages/frontend/editor-ui/src/components/InputPanel.vue
index d1af1ae98d..436e4608bc 100644
--- a/packages/editor-ui/src/components/InputPanel.vue
+++ b/packages/frontend/editor-ui/src/components/InputPanel.vue
@@ -12,7 +12,7 @@ import { useUIStore } from '@/stores/ui.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { waitingNodeTooltip } from '@/utils/executionUtils';
 import { uniqBy } from 'lodash-es';
-import { N8nIcon, N8nRadioButtons, N8nText, N8nTooltip } from 'n8n-design-system';
+import { N8nIcon, N8nRadioButtons, N8nText, N8nTooltip } from '@n8n/design-system';
 import type { INodeInputConfiguration, INodeOutputConfiguration, Workflow } from 'n8n-workflow';
 import { NodeConnectionType, NodeHelpers } from 'n8n-workflow';
 import { storeToRefs } from 'pinia';
diff --git a/packages/editor-ui/src/components/InputTriple/InputTriple.test.ts b/packages/frontend/editor-ui/src/components/InputTriple/InputTriple.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/InputTriple/InputTriple.test.ts
rename to packages/frontend/editor-ui/src/components/InputTriple/InputTriple.test.ts
diff --git a/packages/editor-ui/src/components/InputTriple/InputTriple.vue b/packages/frontend/editor-ui/src/components/InputTriple/InputTriple.vue
similarity index 100%
rename from packages/editor-ui/src/components/InputTriple/InputTriple.vue
rename to packages/frontend/editor-ui/src/components/InputTriple/InputTriple.vue
diff --git a/packages/editor-ui/src/components/IntersectionObserved.vue b/packages/frontend/editor-ui/src/components/IntersectionObserved.vue
similarity index 100%
rename from packages/editor-ui/src/components/IntersectionObserved.vue
rename to packages/frontend/editor-ui/src/components/IntersectionObserved.vue
diff --git a/packages/editor-ui/src/components/IntersectionObserver.vue b/packages/frontend/editor-ui/src/components/IntersectionObserver.vue
similarity index 100%
rename from packages/editor-ui/src/components/IntersectionObserver.vue
rename to packages/frontend/editor-ui/src/components/IntersectionObserver.vue
diff --git a/packages/editor-ui/src/components/InviteUsersModal.vue b/packages/frontend/editor-ui/src/components/InviteUsersModal.vue
similarity index 99%
rename from packages/editor-ui/src/components/InviteUsersModal.vue
rename to packages/frontend/editor-ui/src/components/InviteUsersModal.vue
index e06c65b02d..eca9dca585 100644
--- a/packages/editor-ui/src/components/InviteUsersModal.vue
+++ b/packages/frontend/editor-ui/src/components/InviteUsersModal.vue
@@ -11,7 +11,7 @@ import {
 } from '@/constants';
 import { useUsersStore } from '@/stores/users.store';
 import { useSettingsStore } from '@/stores/settings.store';
-import { createFormEventBus } from 'n8n-design-system/utils';
+import { createFormEventBus } from '@n8n/design-system/utils';
 import { createEventBus } from '@n8n/utils/event-bus';
 import { useClipboard } from '@/composables/useClipboard';
 import { useI18n } from '@/composables/useI18n';
diff --git a/packages/editor-ui/src/components/JsEditor.test.ts b/packages/frontend/editor-ui/src/components/JsEditor.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/JsEditor.test.ts
rename to packages/frontend/editor-ui/src/components/JsEditor.test.ts
diff --git a/packages/editor-ui/src/components/JsEditor/JsEditor.vue b/packages/frontend/editor-ui/src/components/JsEditor/JsEditor.vue
similarity index 100%
rename from packages/editor-ui/src/components/JsEditor/JsEditor.vue
rename to packages/frontend/editor-ui/src/components/JsEditor/JsEditor.vue
diff --git a/packages/editor-ui/src/components/JsonEditor.test.ts b/packages/frontend/editor-ui/src/components/JsonEditor.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/JsonEditor.test.ts
rename to packages/frontend/editor-ui/src/components/JsonEditor.test.ts
diff --git a/packages/editor-ui/src/components/JsonEditor/JsonEditor.vue b/packages/frontend/editor-ui/src/components/JsonEditor/JsonEditor.vue
similarity index 100%
rename from packages/editor-ui/src/components/JsonEditor/JsonEditor.vue
rename to packages/frontend/editor-ui/src/components/JsonEditor/JsonEditor.vue
diff --git a/packages/editor-ui/src/components/KeyboardShortcutTooltip.vue b/packages/frontend/editor-ui/src/components/KeyboardShortcutTooltip.vue
similarity index 100%
rename from packages/editor-ui/src/components/KeyboardShortcutTooltip.vue
rename to packages/frontend/editor-ui/src/components/KeyboardShortcutTooltip.vue
diff --git a/packages/editor-ui/src/components/Logo/Logo.vue b/packages/frontend/editor-ui/src/components/Logo/Logo.vue
similarity index 100%
rename from packages/editor-ui/src/components/Logo/Logo.vue
rename to packages/frontend/editor-ui/src/components/Logo/Logo.vue
diff --git a/packages/editor-ui/src/components/Logo/__tests__/Logo.test.ts b/packages/frontend/editor-ui/src/components/Logo/__tests__/Logo.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/Logo/__tests__/Logo.test.ts
rename to packages/frontend/editor-ui/src/components/Logo/__tests__/Logo.test.ts
diff --git a/packages/editor-ui/src/components/Logo/__tests__/__snapshots__/Logo.test.ts.snap b/packages/frontend/editor-ui/src/components/Logo/__tests__/__snapshots__/Logo.test.ts.snap
similarity index 100%
rename from packages/editor-ui/src/components/Logo/__tests__/__snapshots__/Logo.test.ts.snap
rename to packages/frontend/editor-ui/src/components/Logo/__tests__/__snapshots__/Logo.test.ts.snap
diff --git a/packages/editor-ui/src/components/Logo/logo-icon.svg b/packages/frontend/editor-ui/src/components/Logo/logo-icon.svg
similarity index 100%
rename from packages/editor-ui/src/components/Logo/logo-icon.svg
rename to packages/frontend/editor-ui/src/components/Logo/logo-icon.svg
diff --git a/packages/editor-ui/src/components/Logo/logo-text.svg b/packages/frontend/editor-ui/src/components/Logo/logo-text.svg
similarity index 100%
rename from packages/editor-ui/src/components/Logo/logo-text.svg
rename to packages/frontend/editor-ui/src/components/Logo/logo-text.svg
diff --git a/packages/editor-ui/src/components/MainHeader/CollaborationPane.vue b/packages/frontend/editor-ui/src/components/MainHeader/CollaborationPane.vue
similarity index 100%
rename from packages/editor-ui/src/components/MainHeader/CollaborationPane.vue
rename to packages/frontend/editor-ui/src/components/MainHeader/CollaborationPane.vue
diff --git a/packages/editor-ui/src/components/MainHeader/MainHeader.vue b/packages/frontend/editor-ui/src/components/MainHeader/MainHeader.vue
similarity index 100%
rename from packages/editor-ui/src/components/MainHeader/MainHeader.vue
rename to packages/frontend/editor-ui/src/components/MainHeader/MainHeader.vue
diff --git a/packages/editor-ui/src/components/MainHeader/TabBar.test.ts b/packages/frontend/editor-ui/src/components/MainHeader/TabBar.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/MainHeader/TabBar.test.ts
rename to packages/frontend/editor-ui/src/components/MainHeader/TabBar.test.ts
diff --git a/packages/editor-ui/src/components/MainHeader/TabBar.vue b/packages/frontend/editor-ui/src/components/MainHeader/TabBar.vue
similarity index 100%
rename from packages/editor-ui/src/components/MainHeader/TabBar.vue
rename to packages/frontend/editor-ui/src/components/MainHeader/TabBar.vue
diff --git a/packages/editor-ui/src/components/MainHeader/WorkflowDetails.test.ts b/packages/frontend/editor-ui/src/components/MainHeader/WorkflowDetails.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/MainHeader/WorkflowDetails.test.ts
rename to packages/frontend/editor-ui/src/components/MainHeader/WorkflowDetails.test.ts
diff --git a/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue b/packages/frontend/editor-ui/src/components/MainHeader/WorkflowDetails.vue
similarity index 100%
rename from packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue
rename to packages/frontend/editor-ui/src/components/MainHeader/WorkflowDetails.vue
diff --git a/packages/editor-ui/src/components/MainHeader/WorkflowHistoryButton.test.ts b/packages/frontend/editor-ui/src/components/MainHeader/WorkflowHistoryButton.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/MainHeader/WorkflowHistoryButton.test.ts
rename to packages/frontend/editor-ui/src/components/MainHeader/WorkflowHistoryButton.test.ts
diff --git a/packages/editor-ui/src/components/MainHeader/WorkflowHistoryButton.vue b/packages/frontend/editor-ui/src/components/MainHeader/WorkflowHistoryButton.vue
similarity index 100%
rename from packages/editor-ui/src/components/MainHeader/WorkflowHistoryButton.vue
rename to packages/frontend/editor-ui/src/components/MainHeader/WorkflowHistoryButton.vue
diff --git a/packages/editor-ui/src/components/MainSidebar.vue b/packages/frontend/editor-ui/src/components/MainSidebar.vue
similarity index 99%
rename from packages/editor-ui/src/components/MainSidebar.vue
rename to packages/frontend/editor-ui/src/components/MainSidebar.vue
index e5fb044a80..f354ff5d6c 100644
--- a/packages/editor-ui/src/components/MainSidebar.vue
+++ b/packages/frontend/editor-ui/src/components/MainSidebar.vue
@@ -24,7 +24,7 @@ import { useBugReporting } from '@/composables/useBugReporting';
 import { usePageRedirectionHelper } from '@/composables/usePageRedirectionHelper';
 
 import { useGlobalEntityCreation } from '@/composables/useGlobalEntityCreation';
-import { N8nNavigationDropdown, N8nTooltip, N8nLink, N8nIconButton } from 'n8n-design-system';
+import { N8nNavigationDropdown, N8nTooltip, N8nLink, N8nIconButton } from '@n8n/design-system';
 import { onClickOutside, type VueInstance } from '@vueuse/core';
 import Logo from './Logo/Logo.vue';
 
diff --git a/packages/editor-ui/src/components/MainSidebarSourceControl.test.ts b/packages/frontend/editor-ui/src/components/MainSidebarSourceControl.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/MainSidebarSourceControl.test.ts
rename to packages/frontend/editor-ui/src/components/MainSidebarSourceControl.test.ts
diff --git a/packages/editor-ui/src/components/MainSidebarSourceControl.vue b/packages/frontend/editor-ui/src/components/MainSidebarSourceControl.vue
similarity index 100%
rename from packages/editor-ui/src/components/MainSidebarSourceControl.vue
rename to packages/frontend/editor-ui/src/components/MainSidebarSourceControl.vue
diff --git a/packages/editor-ui/src/components/MappingPill.vue b/packages/frontend/editor-ui/src/components/MappingPill.vue
similarity index 100%
rename from packages/editor-ui/src/components/MappingPill.vue
rename to packages/frontend/editor-ui/src/components/MappingPill.vue
diff --git a/packages/editor-ui/src/components/MfaSetupModal.vue b/packages/frontend/editor-ui/src/components/MfaSetupModal.vue
similarity index 100%
rename from packages/editor-ui/src/components/MfaSetupModal.vue
rename to packages/frontend/editor-ui/src/components/MfaSetupModal.vue
diff --git a/packages/editor-ui/src/components/Modal.vue b/packages/frontend/editor-ui/src/components/Modal.vue
similarity index 100%
rename from packages/editor-ui/src/components/Modal.vue
rename to packages/frontend/editor-ui/src/components/Modal.vue
diff --git a/packages/editor-ui/src/components/ModalDrawer.vue b/packages/frontend/editor-ui/src/components/ModalDrawer.vue
similarity index 100%
rename from packages/editor-ui/src/components/ModalDrawer.vue
rename to packages/frontend/editor-ui/src/components/ModalDrawer.vue
diff --git a/packages/editor-ui/src/components/ModalRoot.vue b/packages/frontend/editor-ui/src/components/ModalRoot.vue
similarity index 100%
rename from packages/editor-ui/src/components/ModalRoot.vue
rename to packages/frontend/editor-ui/src/components/ModalRoot.vue
diff --git a/packages/editor-ui/src/components/Modals.vue b/packages/frontend/editor-ui/src/components/Modals.vue
similarity index 100%
rename from packages/editor-ui/src/components/Modals.vue
rename to packages/frontend/editor-ui/src/components/Modals.vue
diff --git a/packages/editor-ui/src/components/MultipleParameter.test.ts b/packages/frontend/editor-ui/src/components/MultipleParameter.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/MultipleParameter.test.ts
rename to packages/frontend/editor-ui/src/components/MultipleParameter.test.ts
diff --git a/packages/editor-ui/src/components/MultipleParameter.vue b/packages/frontend/editor-ui/src/components/MultipleParameter.vue
similarity index 98%
rename from packages/editor-ui/src/components/MultipleParameter.vue
rename to packages/frontend/editor-ui/src/components/MultipleParameter.vue
index 19fae8fb87..0f9751e460 100644
--- a/packages/editor-ui/src/components/MultipleParameter.vue
+++ b/packages/frontend/editor-ui/src/components/MultipleParameter.vue
@@ -8,7 +8,7 @@ import { useI18n } from '@/composables/useI18n';
 import type { IUpdateInformation } from '@/Interface';
 import CollectionParameter from '@/components/CollectionParameter.vue';
 import ParameterInputFull from '@/components/ParameterInputFull.vue';
-import { N8nButton, N8nInputLabel, N8nText } from 'n8n-design-system';
+import { N8nButton, N8nInputLabel, N8nText } from '@n8n/design-system';
 import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome';
 
 defineOptions({ name: 'MultipleParameter' });
diff --git a/packages/editor-ui/src/components/NDVDraggablePanels.vue b/packages/frontend/editor-ui/src/components/NDVDraggablePanels.vue
similarity index 100%
rename from packages/editor-ui/src/components/NDVDraggablePanels.vue
rename to packages/frontend/editor-ui/src/components/NDVDraggablePanels.vue
diff --git a/packages/editor-ui/src/components/NDVFloatingNodes.vue b/packages/frontend/editor-ui/src/components/NDVFloatingNodes.vue
similarity index 100%
rename from packages/editor-ui/src/components/NDVFloatingNodes.vue
rename to packages/frontend/editor-ui/src/components/NDVFloatingNodes.vue
diff --git a/packages/editor-ui/src/components/NDVSubConnections.test.ts b/packages/frontend/editor-ui/src/components/NDVSubConnections.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/NDVSubConnections.test.ts
rename to packages/frontend/editor-ui/src/components/NDVSubConnections.test.ts
diff --git a/packages/editor-ui/src/components/NDVSubConnections.vue b/packages/frontend/editor-ui/src/components/NDVSubConnections.vue
similarity index 100%
rename from packages/editor-ui/src/components/NDVSubConnections.vue
rename to packages/frontend/editor-ui/src/components/NDVSubConnections.vue
diff --git a/packages/editor-ui/src/components/Node/NodeCreation.vue b/packages/frontend/editor-ui/src/components/Node/NodeCreation.vue
similarity index 100%
rename from packages/editor-ui/src/components/Node/NodeCreation.vue
rename to packages/frontend/editor-ui/src/components/Node/NodeCreation.vue
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/CategoryItem.test.ts b/packages/frontend/editor-ui/src/components/Node/NodeCreator/CategoryItem.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/Node/NodeCreator/CategoryItem.test.ts
rename to packages/frontend/editor-ui/src/components/Node/NodeCreator/CategoryItem.test.ts
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/ActionItem.vue b/packages/frontend/editor-ui/src/components/Node/NodeCreator/ItemTypes/ActionItem.vue
similarity index 100%
rename from packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/ActionItem.vue
rename to packages/frontend/editor-ui/src/components/Node/NodeCreator/ItemTypes/ActionItem.vue
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/CategoryItem.vue b/packages/frontend/editor-ui/src/components/Node/NodeCreator/ItemTypes/CategoryItem.vue
similarity index 100%
rename from packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/CategoryItem.vue
rename to packages/frontend/editor-ui/src/components/Node/NodeCreator/ItemTypes/CategoryItem.vue
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/LabelItem.vue b/packages/frontend/editor-ui/src/components/Node/NodeCreator/ItemTypes/LabelItem.vue
similarity index 100%
rename from packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/LabelItem.vue
rename to packages/frontend/editor-ui/src/components/Node/NodeCreator/ItemTypes/LabelItem.vue
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/LinkItem.vue b/packages/frontend/editor-ui/src/components/Node/NodeCreator/ItemTypes/LinkItem.vue
similarity index 100%
rename from packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/LinkItem.vue
rename to packages/frontend/editor-ui/src/components/Node/NodeCreator/ItemTypes/LinkItem.vue
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/NodeItem.vue b/packages/frontend/editor-ui/src/components/Node/NodeCreator/ItemTypes/NodeItem.vue
similarity index 100%
rename from packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/NodeItem.vue
rename to packages/frontend/editor-ui/src/components/Node/NodeCreator/ItemTypes/NodeItem.vue
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/SubcategoryItem.vue b/packages/frontend/editor-ui/src/components/Node/NodeCreator/ItemTypes/SubcategoryItem.vue
similarity index 100%
rename from packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/SubcategoryItem.vue
rename to packages/frontend/editor-ui/src/components/Node/NodeCreator/ItemTypes/SubcategoryItem.vue
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/ViewItem.vue b/packages/frontend/editor-ui/src/components/Node/NodeCreator/ItemTypes/ViewItem.vue
similarity index 100%
rename from packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/ViewItem.vue
rename to packages/frontend/editor-ui/src/components/Node/NodeCreator/ItemTypes/ViewItem.vue
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/ItemsRenderer.test.ts b/packages/frontend/editor-ui/src/components/Node/NodeCreator/ItemsRenderer.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/Node/NodeCreator/ItemsRenderer.test.ts
rename to packages/frontend/editor-ui/src/components/Node/NodeCreator/ItemsRenderer.test.ts
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/Modes/ActionsMode.vue b/packages/frontend/editor-ui/src/components/Node/NodeCreator/Modes/ActionsMode.vue
similarity index 100%
rename from packages/editor-ui/src/components/Node/NodeCreator/Modes/ActionsMode.vue
rename to packages/frontend/editor-ui/src/components/Node/NodeCreator/Modes/ActionsMode.vue
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/Modes/NodesMode.vue b/packages/frontend/editor-ui/src/components/Node/NodeCreator/Modes/NodesMode.vue
similarity index 100%
rename from packages/editor-ui/src/components/Node/NodeCreator/Modes/NodesMode.vue
rename to packages/frontend/editor-ui/src/components/Node/NodeCreator/Modes/NodesMode.vue
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/NodeCreator.vue b/packages/frontend/editor-ui/src/components/Node/NodeCreator/NodeCreator.vue
similarity index 98%
rename from packages/editor-ui/src/components/Node/NodeCreator/NodeCreator.vue
rename to packages/frontend/editor-ui/src/components/Node/NodeCreator/NodeCreator.vue
index fbdb7d0b7b..8b4acf9803 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/NodeCreator.vue
+++ b/packages/frontend/editor-ui/src/components/Node/NodeCreator/NodeCreator.vue
@@ -13,7 +13,7 @@ import { useCredentialsStore } from '@/stores/credentials.store';
 import { useUIStore } from '@/stores/ui.store';
 import { DRAG_EVENT_DATA_KEY } from '@/constants';
 import { useAssistantStore } from '@/stores/assistant.store';
-import N8nIconButton from 'n8n-design-system/components/N8nIconButton/IconButton.vue';
+import N8nIconButton from '@n8n/design-system/components/N8nIconButton/IconButton.vue';
 
 export interface Props {
 	active?: boolean;
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/NodesListPanel.test.ts b/packages/frontend/editor-ui/src/components/Node/NodeCreator/NodesListPanel.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/Node/NodeCreator/NodesListPanel.test.ts
rename to packages/frontend/editor-ui/src/components/Node/NodeCreator/NodesListPanel.test.ts
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/OrderSwitcher.vue b/packages/frontend/editor-ui/src/components/Node/NodeCreator/OrderSwitcher.vue
similarity index 100%
rename from packages/editor-ui/src/components/Node/NodeCreator/OrderSwitcher.vue
rename to packages/frontend/editor-ui/src/components/Node/NodeCreator/OrderSwitcher.vue
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/Panel/NoResults.vue b/packages/frontend/editor-ui/src/components/Node/NodeCreator/Panel/NoResults.vue
similarity index 100%
rename from packages/editor-ui/src/components/Node/NodeCreator/Panel/NoResults.vue
rename to packages/frontend/editor-ui/src/components/Node/NodeCreator/Panel/NoResults.vue
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/Panel/NoResultsIcon.vue b/packages/frontend/editor-ui/src/components/Node/NodeCreator/Panel/NoResultsIcon.vue
similarity index 100%
rename from packages/editor-ui/src/components/Node/NodeCreator/Panel/NoResultsIcon.vue
rename to packages/frontend/editor-ui/src/components/Node/NodeCreator/Panel/NoResultsIcon.vue
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/Panel/NodesListPanel.vue b/packages/frontend/editor-ui/src/components/Node/NodeCreator/Panel/NodesListPanel.vue
similarity index 100%
rename from packages/editor-ui/src/components/Node/NodeCreator/Panel/NodesListPanel.vue
rename to packages/frontend/editor-ui/src/components/Node/NodeCreator/Panel/NodesListPanel.vue
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/Panel/SearchBar.vue b/packages/frontend/editor-ui/src/components/Node/NodeCreator/Panel/SearchBar.vue
similarity index 100%
rename from packages/editor-ui/src/components/Node/NodeCreator/Panel/SearchBar.vue
rename to packages/frontend/editor-ui/src/components/Node/NodeCreator/Panel/SearchBar.vue
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/Renderers/CategorizedItemsRenderer.vue b/packages/frontend/editor-ui/src/components/Node/NodeCreator/Renderers/CategorizedItemsRenderer.vue
similarity index 100%
rename from packages/editor-ui/src/components/Node/NodeCreator/Renderers/CategorizedItemsRenderer.vue
rename to packages/frontend/editor-ui/src/components/Node/NodeCreator/Renderers/CategorizedItemsRenderer.vue
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/Renderers/ItemsRenderer.vue b/packages/frontend/editor-ui/src/components/Node/NodeCreator/Renderers/ItemsRenderer.vue
similarity index 100%
rename from packages/editor-ui/src/components/Node/NodeCreator/Renderers/ItemsRenderer.vue
rename to packages/frontend/editor-ui/src/components/Node/NodeCreator/Renderers/ItemsRenderer.vue
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/__tests__/utils.ts b/packages/frontend/editor-ui/src/components/Node/NodeCreator/__tests__/utils.ts
similarity index 100%
rename from packages/editor-ui/src/components/Node/NodeCreator/__tests__/utils.ts
rename to packages/frontend/editor-ui/src/components/Node/NodeCreator/__tests__/utils.ts
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/composables/useActions.ts b/packages/frontend/editor-ui/src/components/Node/NodeCreator/composables/useActions.ts
similarity index 100%
rename from packages/editor-ui/src/components/Node/NodeCreator/composables/useActions.ts
rename to packages/frontend/editor-ui/src/components/Node/NodeCreator/composables/useActions.ts
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/composables/useActionsGeneration.ts b/packages/frontend/editor-ui/src/components/Node/NodeCreator/composables/useActionsGeneration.ts
similarity index 100%
rename from packages/editor-ui/src/components/Node/NodeCreator/composables/useActionsGeneration.ts
rename to packages/frontend/editor-ui/src/components/Node/NodeCreator/composables/useActionsGeneration.ts
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/composables/useKeyboardNavigation.ts b/packages/frontend/editor-ui/src/components/Node/NodeCreator/composables/useKeyboardNavigation.ts
similarity index 100%
rename from packages/editor-ui/src/components/Node/NodeCreator/composables/useKeyboardNavigation.ts
rename to packages/frontend/editor-ui/src/components/Node/NodeCreator/composables/useKeyboardNavigation.ts
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/composables/useViewStacks.ts b/packages/frontend/editor-ui/src/components/Node/NodeCreator/composables/useViewStacks.ts
similarity index 100%
rename from packages/editor-ui/src/components/Node/NodeCreator/composables/useViewStacks.ts
rename to packages/frontend/editor-ui/src/components/Node/NodeCreator/composables/useViewStacks.ts
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/useActions.test.ts b/packages/frontend/editor-ui/src/components/Node/NodeCreator/useActions.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/Node/NodeCreator/useActions.test.ts
rename to packages/frontend/editor-ui/src/components/Node/NodeCreator/useActions.test.ts
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/useActionsGeneration.test.ts b/packages/frontend/editor-ui/src/components/Node/NodeCreator/useActionsGeneration.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/Node/NodeCreator/useActionsGeneration.test.ts
rename to packages/frontend/editor-ui/src/components/Node/NodeCreator/useActionsGeneration.test.ts
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/useKeyboardNavigation.test.ts b/packages/frontend/editor-ui/src/components/Node/NodeCreator/useKeyboardNavigation.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/Node/NodeCreator/useKeyboardNavigation.test.ts
rename to packages/frontend/editor-ui/src/components/Node/NodeCreator/useKeyboardNavigation.test.ts
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/utils.test.ts b/packages/frontend/editor-ui/src/components/Node/NodeCreator/utils.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/Node/NodeCreator/utils.test.ts
rename to packages/frontend/editor-ui/src/components/Node/NodeCreator/utils.test.ts
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/utils.ts b/packages/frontend/editor-ui/src/components/Node/NodeCreator/utils.ts
similarity index 100%
rename from packages/editor-ui/src/components/Node/NodeCreator/utils.ts
rename to packages/frontend/editor-ui/src/components/Node/NodeCreator/utils.ts
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/viewsData.ts b/packages/frontend/editor-ui/src/components/Node/NodeCreator/viewsData.ts
similarity index 99%
rename from packages/editor-ui/src/components/Node/NodeCreator/viewsData.ts
rename to packages/frontend/editor-ui/src/components/Node/NodeCreator/viewsData.ts
index 1c34520b9f..6e718a7fc2 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/viewsData.ts
+++ b/packages/frontend/editor-ui/src/components/Node/NodeCreator/viewsData.ts
@@ -544,7 +544,7 @@ export function RegularView(nodes: SimplifiedNodeType[]) {
 			// - add "HITL" to the "categories" property of the node's codex
 			// - add "HITL": ["Human in the Loop"] to the "subcategories" property of the node's codex
 			// node has to have the "sendAndWait" operation, if a new operation needs to be included here:
-			// - update getHumanInTheLoopActions in packages/editor-ui/src/components/Node/NodeCreator/Modes/NodesMode.vue
+			// - update getHumanInTheLoopActions in packages/frontend/editor-ui/src/components/Node/NodeCreator/Modes/NodesMode.vue
 			{
 				type: 'subcategory',
 				key: HITL_SUBCATEGORY,
diff --git a/packages/editor-ui/src/components/NodeCredentials.test.ts b/packages/frontend/editor-ui/src/components/NodeCredentials.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/NodeCredentials.test.ts
rename to packages/frontend/editor-ui/src/components/NodeCredentials.test.ts
diff --git a/packages/editor-ui/src/components/NodeCredentials.vue b/packages/frontend/editor-ui/src/components/NodeCredentials.vue
similarity index 99%
rename from packages/editor-ui/src/components/NodeCredentials.vue
rename to packages/frontend/editor-ui/src/components/NodeCredentials.vue
index 1cc4b965bb..ebd404b139 100644
--- a/packages/editor-ui/src/components/NodeCredentials.vue
+++ b/packages/frontend/editor-ui/src/components/NodeCredentials.vue
@@ -39,7 +39,7 @@ import {
 	N8nSelect,
 	N8nText,
 	N8nTooltip,
-} from 'n8n-design-system';
+} from '@n8n/design-system';
 import { isEmpty } from '@/utils/typesUtils';
 
 interface CredentialDropdownOption extends ICredentialsResponse {
diff --git a/packages/editor-ui/src/components/NodeDetailsView.test.ts b/packages/frontend/editor-ui/src/components/NodeDetailsView.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/NodeDetailsView.test.ts
rename to packages/frontend/editor-ui/src/components/NodeDetailsView.test.ts
diff --git a/packages/editor-ui/src/components/NodeDetailsView.vue b/packages/frontend/editor-ui/src/components/NodeDetailsView.vue
similarity index 100%
rename from packages/editor-ui/src/components/NodeDetailsView.vue
rename to packages/frontend/editor-ui/src/components/NodeDetailsView.vue
diff --git a/packages/editor-ui/src/components/NodeExecuteButton.vue b/packages/frontend/editor-ui/src/components/NodeExecuteButton.vue
similarity index 100%
rename from packages/editor-ui/src/components/NodeExecuteButton.vue
rename to packages/frontend/editor-ui/src/components/NodeExecuteButton.vue
diff --git a/packages/editor-ui/src/components/NodeExecutionErrorMessage.test.ts b/packages/frontend/editor-ui/src/components/NodeExecutionErrorMessage.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/NodeExecutionErrorMessage.test.ts
rename to packages/frontend/editor-ui/src/components/NodeExecutionErrorMessage.test.ts
diff --git a/packages/editor-ui/src/components/NodeExecutionErrorMessage.vue b/packages/frontend/editor-ui/src/components/NodeExecutionErrorMessage.vue
similarity index 100%
rename from packages/editor-ui/src/components/NodeExecutionErrorMessage.vue
rename to packages/frontend/editor-ui/src/components/NodeExecutionErrorMessage.vue
diff --git a/packages/editor-ui/src/components/NodeIcon.vue b/packages/frontend/editor-ui/src/components/NodeIcon.vue
similarity index 100%
rename from packages/editor-ui/src/components/NodeIcon.vue
rename to packages/frontend/editor-ui/src/components/NodeIcon.vue
diff --git a/packages/editor-ui/src/components/NodeList.vue b/packages/frontend/editor-ui/src/components/NodeList.vue
similarity index 100%
rename from packages/editor-ui/src/components/NodeList.vue
rename to packages/frontend/editor-ui/src/components/NodeList.vue
diff --git a/packages/editor-ui/src/components/NodeSettings.vue b/packages/frontend/editor-ui/src/components/NodeSettings.vue
similarity index 100%
rename from packages/editor-ui/src/components/NodeSettings.vue
rename to packages/frontend/editor-ui/src/components/NodeSettings.vue
diff --git a/packages/editor-ui/src/components/NodeSettingsTabs.vue b/packages/frontend/editor-ui/src/components/NodeSettingsTabs.vue
similarity index 100%
rename from packages/editor-ui/src/components/NodeSettingsTabs.vue
rename to packages/frontend/editor-ui/src/components/NodeSettingsTabs.vue
diff --git a/packages/editor-ui/src/components/NodeTitle.test.ts b/packages/frontend/editor-ui/src/components/NodeTitle.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/NodeTitle.test.ts
rename to packages/frontend/editor-ui/src/components/NodeTitle.test.ts
diff --git a/packages/editor-ui/src/components/NodeTitle.vue b/packages/frontend/editor-ui/src/components/NodeTitle.vue
similarity index 100%
rename from packages/editor-ui/src/components/NodeTitle.vue
rename to packages/frontend/editor-ui/src/components/NodeTitle.vue
diff --git a/packages/editor-ui/src/components/NodeViewUnfinishedWorkflowMessage.vue b/packages/frontend/editor-ui/src/components/NodeViewUnfinishedWorkflowMessage.vue
similarity index 100%
rename from packages/editor-ui/src/components/NodeViewUnfinishedWorkflowMessage.vue
rename to packages/frontend/editor-ui/src/components/NodeViewUnfinishedWorkflowMessage.vue
diff --git a/packages/editor-ui/src/components/NodeWebhooks.vue b/packages/frontend/editor-ui/src/components/NodeWebhooks.vue
similarity index 100%
rename from packages/editor-ui/src/components/NodeWebhooks.vue
rename to packages/frontend/editor-ui/src/components/NodeWebhooks.vue
diff --git a/packages/editor-ui/src/components/NpsSurvey.vue b/packages/frontend/editor-ui/src/components/NpsSurvey.vue
similarity index 100%
rename from packages/editor-ui/src/components/NpsSurvey.vue
rename to packages/frontend/editor-ui/src/components/NpsSurvey.vue
diff --git a/packages/editor-ui/src/components/OutputPanel.vue b/packages/frontend/editor-ui/src/components/OutputPanel.vue
similarity index 99%
rename from packages/editor-ui/src/components/OutputPanel.vue
rename to packages/frontend/editor-ui/src/components/OutputPanel.vue
index c537f120bc..34ce3d4383 100644
--- a/packages/editor-ui/src/components/OutputPanel.vue
+++ b/packages/frontend/editor-ui/src/components/OutputPanel.vue
@@ -20,7 +20,7 @@ import { usePinnedData } from '@/composables/usePinnedData';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { useI18n } from '@/composables/useI18n';
 import { waitingNodeTooltip } from '@/utils/executionUtils';
-import { N8nRadioButtons, N8nText } from 'n8n-design-system';
+import { N8nRadioButtons, N8nText } from '@n8n/design-system';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useNodeDirtiness } from '@/composables/useNodeDirtiness';
 import { CanvasNodeDirtiness } from '@/types';
diff --git a/packages/editor-ui/src/components/PanelDragButton.vue b/packages/frontend/editor-ui/src/components/PanelDragButton.vue
similarity index 100%
rename from packages/editor-ui/src/components/PanelDragButton.vue
rename to packages/frontend/editor-ui/src/components/PanelDragButton.vue
diff --git a/packages/editor-ui/src/components/ParameterInput.test.ts b/packages/frontend/editor-ui/src/components/ParameterInput.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/ParameterInput.test.ts
rename to packages/frontend/editor-ui/src/components/ParameterInput.test.ts
diff --git a/packages/editor-ui/src/components/ParameterInput.vue b/packages/frontend/editor-ui/src/components/ParameterInput.vue
similarity index 99%
rename from packages/editor-ui/src/components/ParameterInput.vue
rename to packages/frontend/editor-ui/src/components/ParameterInput.vue
index 6c672ffe1d..08d3cf15f1 100644
--- a/packages/editor-ui/src/components/ParameterInput.vue
+++ b/packages/frontend/editor-ui/src/components/ParameterInput.vue
@@ -61,7 +61,7 @@ import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { isCredentialOnlyNodeType } from '@/utils/credentialOnlyNodes';
-import { N8nIcon, N8nInput, N8nInputNumber, N8nOption, N8nSelect } from 'n8n-design-system';
+import { N8nIcon, N8nInput, N8nInputNumber, N8nOption, N8nSelect } from '@n8n/design-system';
 import type { EventBus } from '@n8n/utils/event-bus';
 import { createEventBus } from '@n8n/utils/event-bus';
 import { useRouter } from 'vue-router';
diff --git a/packages/editor-ui/src/components/ParameterInputExpanded.vue b/packages/frontend/editor-ui/src/components/ParameterInputExpanded.vue
similarity index 100%
rename from packages/editor-ui/src/components/ParameterInputExpanded.vue
rename to packages/frontend/editor-ui/src/components/ParameterInputExpanded.vue
diff --git a/packages/editor-ui/src/components/ParameterInputFull.test.ts b/packages/frontend/editor-ui/src/components/ParameterInputFull.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/ParameterInputFull.test.ts
rename to packages/frontend/editor-ui/src/components/ParameterInputFull.test.ts
diff --git a/packages/editor-ui/src/components/ParameterInputFull.vue b/packages/frontend/editor-ui/src/components/ParameterInputFull.vue
similarity index 99%
rename from packages/editor-ui/src/components/ParameterInputFull.vue
rename to packages/frontend/editor-ui/src/components/ParameterInputFull.vue
index 024abe3f33..b0a6f8f9b6 100644
--- a/packages/editor-ui/src/components/ParameterInputFull.vue
+++ b/packages/frontend/editor-ui/src/components/ParameterInputFull.vue
@@ -19,7 +19,7 @@ import {
 	type IParameterLabel,
 	type NodeParameterValueType,
 } from 'n8n-workflow';
-import { N8nInputLabel } from 'n8n-design-system';
+import { N8nInputLabel } from '@n8n/design-system';
 import {
 	buildValueFromOverride,
 	type FromAIOverride,
diff --git a/packages/editor-ui/src/components/ParameterInputHint.vue b/packages/frontend/editor-ui/src/components/ParameterInputHint.vue
similarity index 100%
rename from packages/editor-ui/src/components/ParameterInputHint.vue
rename to packages/frontend/editor-ui/src/components/ParameterInputHint.vue
diff --git a/packages/editor-ui/src/components/ParameterInputList.test.constants.ts b/packages/frontend/editor-ui/src/components/ParameterInputList.test.constants.ts
similarity index 100%
rename from packages/editor-ui/src/components/ParameterInputList.test.constants.ts
rename to packages/frontend/editor-ui/src/components/ParameterInputList.test.constants.ts
diff --git a/packages/editor-ui/src/components/ParameterInputList.test.ts b/packages/frontend/editor-ui/src/components/ParameterInputList.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/ParameterInputList.test.ts
rename to packages/frontend/editor-ui/src/components/ParameterInputList.test.ts
diff --git a/packages/editor-ui/src/components/ParameterInputList.vue b/packages/frontend/editor-ui/src/components/ParameterInputList.vue
similarity index 99%
rename from packages/editor-ui/src/components/ParameterInputList.vue
rename to packages/frontend/editor-ui/src/components/ParameterInputList.vue
index ee74656637..bed01160dd 100644
--- a/packages/editor-ui/src/components/ParameterInputList.vue
+++ b/packages/frontend/editor-ui/src/components/ParameterInputList.vue
@@ -36,7 +36,7 @@ import {
 import { captureException } from '@sentry/vue';
 import { computedWithControl } from '@vueuse/core';
 import { get, set } from 'lodash-es';
-import { N8nIcon, N8nIconButton, N8nInputLabel, N8nNotice, N8nText } from 'n8n-design-system';
+import { N8nIcon, N8nIconButton, N8nInputLabel, N8nNotice, N8nText } from '@n8n/design-system';
 import { useRouter } from 'vue-router';
 
 const LazyFixedCollectionParameter = defineAsyncComponent(
diff --git a/packages/editor-ui/src/components/ParameterInputOverrides/FromAiOverrideButton.vue b/packages/frontend/editor-ui/src/components/ParameterInputOverrides/FromAiOverrideButton.vue
similarity index 100%
rename from packages/editor-ui/src/components/ParameterInputOverrides/FromAiOverrideButton.vue
rename to packages/frontend/editor-ui/src/components/ParameterInputOverrides/FromAiOverrideButton.vue
diff --git a/packages/editor-ui/src/components/ParameterInputOverrides/FromAiOverrideField.vue b/packages/frontend/editor-ui/src/components/ParameterInputOverrides/FromAiOverrideField.vue
similarity index 100%
rename from packages/editor-ui/src/components/ParameterInputOverrides/FromAiOverrideField.vue
rename to packages/frontend/editor-ui/src/components/ParameterInputOverrides/FromAiOverrideField.vue
diff --git a/packages/editor-ui/src/components/ParameterInputOverrides/ParameterOverrideSelectableList.vue b/packages/frontend/editor-ui/src/components/ParameterInputOverrides/ParameterOverrideSelectableList.vue
similarity index 96%
rename from packages/editor-ui/src/components/ParameterInputOverrides/ParameterOverrideSelectableList.vue
rename to packages/frontend/editor-ui/src/components/ParameterInputOverrides/ParameterOverrideSelectableList.vue
index 6f77cabbf6..013752844f 100644
--- a/packages/editor-ui/src/components/ParameterInputOverrides/ParameterOverrideSelectableList.vue
+++ b/packages/frontend/editor-ui/src/components/ParameterInputOverrides/ParameterOverrideSelectableList.vue
@@ -4,7 +4,7 @@ import type { IUpdateInformation } from '@/Interface';
 import { type INodeProperties } from 'n8n-workflow';
 import { buildValueFromOverride, type FromAIOverride } from '../../utils/fromAIOverrideUtils';
 import { computed } from 'vue';
-import { N8nSelectableList } from 'n8n-design-system';
+import { N8nSelectableList } from '@n8n/design-system';
 
 type Props = {
 	parameter: INodeProperties;
diff --git a/packages/editor-ui/src/components/ParameterInputWrapper.test.ts b/packages/frontend/editor-ui/src/components/ParameterInputWrapper.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/ParameterInputWrapper.test.ts
rename to packages/frontend/editor-ui/src/components/ParameterInputWrapper.test.ts
diff --git a/packages/editor-ui/src/components/ParameterInputWrapper.vue b/packages/frontend/editor-ui/src/components/ParameterInputWrapper.vue
similarity index 100%
rename from packages/editor-ui/src/components/ParameterInputWrapper.vue
rename to packages/frontend/editor-ui/src/components/ParameterInputWrapper.vue
diff --git a/packages/editor-ui/src/components/ParameterIssues.vue b/packages/frontend/editor-ui/src/components/ParameterIssues.vue
similarity index 92%
rename from packages/editor-ui/src/components/ParameterIssues.vue
rename to packages/frontend/editor-ui/src/components/ParameterIssues.vue
index 6c023727d4..d6981ff551 100644
--- a/packages/editor-ui/src/components/ParameterIssues.vue
+++ b/packages/frontend/editor-ui/src/components/ParameterIssues.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import TitledList from '@/components/TitledList.vue';
 import { useI18n } from '@/composables/useI18n';
-import { N8nTooltip, N8nIcon } from 'n8n-design-system';
+import { N8nTooltip, N8nIcon } from '@n8n/design-system';
 
 defineProps<{
 	issues: string[];
diff --git a/packages/editor-ui/src/components/ParameterOptions.test.ts b/packages/frontend/editor-ui/src/components/ParameterOptions.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/ParameterOptions.test.ts
rename to packages/frontend/editor-ui/src/components/ParameterOptions.test.ts
diff --git a/packages/editor-ui/src/components/ParameterOptions.vue b/packages/frontend/editor-ui/src/components/ParameterOptions.vue
similarity index 100%
rename from packages/editor-ui/src/components/ParameterOptions.vue
rename to packages/frontend/editor-ui/src/components/ParameterOptions.vue
diff --git a/packages/editor-ui/src/components/PersonalizationModal.test.ts b/packages/frontend/editor-ui/src/components/PersonalizationModal.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/PersonalizationModal.test.ts
rename to packages/frontend/editor-ui/src/components/PersonalizationModal.test.ts
diff --git a/packages/editor-ui/src/components/PersonalizationModal.vue b/packages/frontend/editor-ui/src/components/PersonalizationModal.vue
similarity index 99%
rename from packages/editor-ui/src/components/PersonalizationModal.vue
rename to packages/frontend/editor-ui/src/components/PersonalizationModal.vue
index 0f09830039..ea45b37324 100644
--- a/packages/editor-ui/src/components/PersonalizationModal.vue
+++ b/packages/frontend/editor-ui/src/components/PersonalizationModal.vue
@@ -86,7 +86,7 @@ import Modal from '@/components/Modal.vue';
 import type { IFormInputs, IPersonalizationLatestVersion } from '@/Interface';
 import { useRootStore } from '@/stores/root.store';
 import { useUsersStore } from '@/stores/users.store';
-import { createFormEventBus } from 'n8n-design-system/utils';
+import { createFormEventBus } from '@n8n/design-system/utils';
 import { createEventBus } from '@n8n/utils/event-bus';
 import { usePostHog } from '@/stores/posthog.store';
 import { useExternalHooks } from '@/composables/useExternalHooks';
diff --git a/packages/editor-ui/src/components/Projects/ProjectCardBadge.test.ts b/packages/frontend/editor-ui/src/components/Projects/ProjectCardBadge.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/Projects/ProjectCardBadge.test.ts
rename to packages/frontend/editor-ui/src/components/Projects/ProjectCardBadge.test.ts
diff --git a/packages/editor-ui/src/components/Projects/ProjectCardBadge.vue b/packages/frontend/editor-ui/src/components/Projects/ProjectCardBadge.vue
similarity index 100%
rename from packages/editor-ui/src/components/Projects/ProjectCardBadge.vue
rename to packages/frontend/editor-ui/src/components/Projects/ProjectCardBadge.vue
diff --git a/packages/editor-ui/src/components/Projects/ProjectCreateResource.vue b/packages/frontend/editor-ui/src/components/Projects/ProjectCreateResource.vue
similarity index 91%
rename from packages/editor-ui/src/components/Projects/ProjectCreateResource.vue
rename to packages/frontend/editor-ui/src/components/Projects/ProjectCreateResource.vue
index 850ce5bf2c..de23ed69ac 100644
--- a/packages/editor-ui/src/components/Projects/ProjectCreateResource.vue
+++ b/packages/frontend/editor-ui/src/components/Projects/ProjectCreateResource.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
-import type { ButtonType } from 'n8n-design-system';
-import { N8nIconButton, N8nActionToggle } from 'n8n-design-system';
+import type { ButtonType } from '@n8n/design-system';
+import { N8nIconButton, N8nActionToggle } from '@n8n/design-system';
 import { ref } from 'vue';
 
 type Action = {
diff --git a/packages/editor-ui/src/components/Projects/ProjectDeleteDialog.vue b/packages/frontend/editor-ui/src/components/Projects/ProjectDeleteDialog.vue
similarity index 100%
rename from packages/editor-ui/src/components/Projects/ProjectDeleteDialog.vue
rename to packages/frontend/editor-ui/src/components/Projects/ProjectDeleteDialog.vue
diff --git a/packages/editor-ui/src/components/Projects/ProjectHeader.test.ts b/packages/frontend/editor-ui/src/components/Projects/ProjectHeader.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/Projects/ProjectHeader.test.ts
rename to packages/frontend/editor-ui/src/components/Projects/ProjectHeader.test.ts
diff --git a/packages/editor-ui/src/components/Projects/ProjectHeader.vue b/packages/frontend/editor-ui/src/components/Projects/ProjectHeader.vue
similarity index 98%
rename from packages/editor-ui/src/components/Projects/ProjectHeader.vue
rename to packages/frontend/editor-ui/src/components/Projects/ProjectHeader.vue
index 80a45bfeb6..98511e3b8b 100644
--- a/packages/editor-ui/src/components/Projects/ProjectHeader.vue
+++ b/packages/frontend/editor-ui/src/components/Projects/ProjectHeader.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { computed } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
-import { N8nButton, N8nTooltip } from 'n8n-design-system';
+import { N8nButton, N8nTooltip } from '@n8n/design-system';
 import { useI18n } from '@/composables/useI18n';
 import { type ProjectIcon, ProjectTypes } from '@/types/projects.types';
 import { useProjectsStore } from '@/stores/projects.store';
diff --git a/packages/editor-ui/src/components/Projects/ProjectIcon.vue b/packages/frontend/editor-ui/src/components/Projects/ProjectIcon.vue
similarity index 100%
rename from packages/editor-ui/src/components/Projects/ProjectIcon.vue
rename to packages/frontend/editor-ui/src/components/Projects/ProjectIcon.vue
diff --git a/packages/editor-ui/src/components/Projects/ProjectMoveResourceModal.test.ts b/packages/frontend/editor-ui/src/components/Projects/ProjectMoveResourceModal.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/Projects/ProjectMoveResourceModal.test.ts
rename to packages/frontend/editor-ui/src/components/Projects/ProjectMoveResourceModal.test.ts
diff --git a/packages/editor-ui/src/components/Projects/ProjectMoveResourceModal.vue b/packages/frontend/editor-ui/src/components/Projects/ProjectMoveResourceModal.vue
similarity index 100%
rename from packages/editor-ui/src/components/Projects/ProjectMoveResourceModal.vue
rename to packages/frontend/editor-ui/src/components/Projects/ProjectMoveResourceModal.vue
diff --git a/packages/editor-ui/src/components/Projects/ProjectMoveResourceModalCredentialsList.vue b/packages/frontend/editor-ui/src/components/Projects/ProjectMoveResourceModalCredentialsList.vue
similarity index 100%
rename from packages/editor-ui/src/components/Projects/ProjectMoveResourceModalCredentialsList.vue
rename to packages/frontend/editor-ui/src/components/Projects/ProjectMoveResourceModalCredentialsList.vue
diff --git a/packages/editor-ui/src/components/Projects/ProjectMoveSuccessToastMessage.test.ts b/packages/frontend/editor-ui/src/components/Projects/ProjectMoveSuccessToastMessage.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/Projects/ProjectMoveSuccessToastMessage.test.ts
rename to packages/frontend/editor-ui/src/components/Projects/ProjectMoveSuccessToastMessage.test.ts
diff --git a/packages/editor-ui/src/components/Projects/ProjectMoveSuccessToastMessage.vue b/packages/frontend/editor-ui/src/components/Projects/ProjectMoveSuccessToastMessage.vue
similarity index 100%
rename from packages/editor-ui/src/components/Projects/ProjectMoveSuccessToastMessage.vue
rename to packages/frontend/editor-ui/src/components/Projects/ProjectMoveSuccessToastMessage.vue
diff --git a/packages/editor-ui/src/components/Projects/ProjectNavigation.test.ts b/packages/frontend/editor-ui/src/components/Projects/ProjectNavigation.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/Projects/ProjectNavigation.test.ts
rename to packages/frontend/editor-ui/src/components/Projects/ProjectNavigation.test.ts
diff --git a/packages/editor-ui/src/components/Projects/ProjectNavigation.vue b/packages/frontend/editor-ui/src/components/Projects/ProjectNavigation.vue
similarity index 98%
rename from packages/editor-ui/src/components/Projects/ProjectNavigation.vue
rename to packages/frontend/editor-ui/src/components/Projects/ProjectNavigation.vue
index 8bb31bdd76..9ed1e58bdf 100644
--- a/packages/editor-ui/src/components/Projects/ProjectNavigation.vue
+++ b/packages/frontend/editor-ui/src/components/Projects/ProjectNavigation.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { computed } from 'vue';
-import type { IMenuItem } from 'n8n-design-system/types';
+import type { IMenuItem } from '@n8n/design-system/types';
 import { useI18n } from '@/composables/useI18n';
 import { VIEWS } from '@/constants';
 import { useProjectsStore } from '@/stores/projects.store';
diff --git a/packages/editor-ui/src/components/Projects/ProjectRoleUpgradeDialog.vue b/packages/frontend/editor-ui/src/components/Projects/ProjectRoleUpgradeDialog.vue
similarity index 100%
rename from packages/editor-ui/src/components/Projects/ProjectRoleUpgradeDialog.vue
rename to packages/frontend/editor-ui/src/components/Projects/ProjectRoleUpgradeDialog.vue
diff --git a/packages/editor-ui/src/components/Projects/ProjectSharing.test.ts b/packages/frontend/editor-ui/src/components/Projects/ProjectSharing.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/Projects/ProjectSharing.test.ts
rename to packages/frontend/editor-ui/src/components/Projects/ProjectSharing.test.ts
diff --git a/packages/editor-ui/src/components/Projects/ProjectSharing.vue b/packages/frontend/editor-ui/src/components/Projects/ProjectSharing.vue
similarity index 100%
rename from packages/editor-ui/src/components/Projects/ProjectSharing.vue
rename to packages/frontend/editor-ui/src/components/Projects/ProjectSharing.vue
diff --git a/packages/editor-ui/src/components/Projects/ProjectSharingInfo.vue b/packages/frontend/editor-ui/src/components/Projects/ProjectSharingInfo.vue
similarity index 100%
rename from packages/editor-ui/src/components/Projects/ProjectSharingInfo.vue
rename to packages/frontend/editor-ui/src/components/Projects/ProjectSharingInfo.vue
diff --git a/packages/editor-ui/src/components/Projects/ProjectTabs.test.ts b/packages/frontend/editor-ui/src/components/Projects/ProjectTabs.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/Projects/ProjectTabs.test.ts
rename to packages/frontend/editor-ui/src/components/Projects/ProjectTabs.test.ts
diff --git a/packages/editor-ui/src/components/Projects/ProjectTabs.vue b/packages/frontend/editor-ui/src/components/Projects/ProjectTabs.vue
similarity index 100%
rename from packages/editor-ui/src/components/Projects/ProjectTabs.vue
rename to packages/frontend/editor-ui/src/components/Projects/ProjectTabs.vue
diff --git a/packages/editor-ui/src/components/PromptMfaCodeModal/PromptMfaCodeModal.vue b/packages/frontend/editor-ui/src/components/PromptMfaCodeModal/PromptMfaCodeModal.vue
similarity index 97%
rename from packages/editor-ui/src/components/PromptMfaCodeModal/PromptMfaCodeModal.vue
rename to packages/frontend/editor-ui/src/components/PromptMfaCodeModal/PromptMfaCodeModal.vue
index 65092c9d84..97a4745bb2 100644
--- a/packages/editor-ui/src/components/PromptMfaCodeModal/PromptMfaCodeModal.vue
+++ b/packages/frontend/editor-ui/src/components/PromptMfaCodeModal/PromptMfaCodeModal.vue
@@ -5,7 +5,7 @@ import { PROMPT_MFA_CODE_MODAL_KEY } from '@/constants';
 import { useI18n } from '@/composables/useI18n';
 import { promptMfaCodeBus } from '@/event-bus';
 import type { IFormInputs } from '@/Interface';
-import { createFormEventBus } from 'n8n-design-system/utils';
+import { createFormEventBus } from '@n8n/design-system/utils';
 import { validate as validateUuid } from 'uuid';
 
 const i18n = useI18n();
diff --git a/packages/editor-ui/src/components/PushConnectionTracker.test.ts b/packages/frontend/editor-ui/src/components/PushConnectionTracker.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/PushConnectionTracker.test.ts
rename to packages/frontend/editor-ui/src/components/PushConnectionTracker.test.ts
diff --git a/packages/editor-ui/src/components/PushConnectionTracker.vue b/packages/frontend/editor-ui/src/components/PushConnectionTracker.vue
similarity index 100%
rename from packages/editor-ui/src/components/PushConnectionTracker.vue
rename to packages/frontend/editor-ui/src/components/PushConnectionTracker.vue
diff --git a/packages/editor-ui/src/components/ResourceLocator/ResourceLocator.vue b/packages/frontend/editor-ui/src/components/ResourceLocator/ResourceLocator.vue
similarity index 100%
rename from packages/editor-ui/src/components/ResourceLocator/ResourceLocator.vue
rename to packages/frontend/editor-ui/src/components/ResourceLocator/ResourceLocator.vue
diff --git a/packages/editor-ui/src/components/ResourceLocator/ResourceLocatorDropdown.vue b/packages/frontend/editor-ui/src/components/ResourceLocator/ResourceLocatorDropdown.vue
similarity index 99%
rename from packages/editor-ui/src/components/ResourceLocator/ResourceLocatorDropdown.vue
rename to packages/frontend/editor-ui/src/components/ResourceLocator/ResourceLocatorDropdown.vue
index 1378f45b3e..aac04c41cd 100644
--- a/packages/editor-ui/src/components/ResourceLocator/ResourceLocatorDropdown.vue
+++ b/packages/frontend/editor-ui/src/components/ResourceLocator/ResourceLocatorDropdown.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { useI18n } from '@/composables/useI18n';
 import type { IResourceLocatorResultExpanded } from '@/Interface';
-import { N8nLoading } from 'n8n-design-system';
+import { N8nLoading } from '@n8n/design-system';
 import type { EventBus } from '@n8n/utils/event-bus';
 import { createEventBus } from '@n8n/utils/event-bus';
 import type { NodeParameterValue } from 'n8n-workflow';
diff --git a/packages/editor-ui/src/components/ResourceLocator/resourceLocator.scss b/packages/frontend/editor-ui/src/components/ResourceLocator/resourceLocator.scss
similarity index 100%
rename from packages/editor-ui/src/components/ResourceLocator/resourceLocator.scss
rename to packages/frontend/editor-ui/src/components/ResourceLocator/resourceLocator.scss
diff --git a/packages/editor-ui/src/components/ResourceMapper.test.ts b/packages/frontend/editor-ui/src/components/ResourceMapper.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/ResourceMapper.test.ts
rename to packages/frontend/editor-ui/src/components/ResourceMapper.test.ts
diff --git a/packages/editor-ui/src/components/ResourceMapper/MappingFields.vue b/packages/frontend/editor-ui/src/components/ResourceMapper/MappingFields.vue
similarity index 99%
rename from packages/editor-ui/src/components/ResourceMapper/MappingFields.vue
rename to packages/frontend/editor-ui/src/components/ResourceMapper/MappingFields.vue
index 298267119c..119b92c0f7 100644
--- a/packages/editor-ui/src/components/ResourceMapper/MappingFields.vue
+++ b/packages/frontend/editor-ui/src/components/ResourceMapper/MappingFields.vue
@@ -28,7 +28,7 @@ import {
 	N8nOption,
 	N8nSelect,
 	N8nTooltip,
-} from 'n8n-design-system';
+} from '@n8n/design-system';
 import { useI18n } from '@/composables/useI18n';
 
 interface Props {
diff --git a/packages/editor-ui/src/components/ResourceMapper/MappingModeSelect.vue b/packages/frontend/editor-ui/src/components/ResourceMapper/MappingModeSelect.vue
similarity index 98%
rename from packages/editor-ui/src/components/ResourceMapper/MappingModeSelect.vue
rename to packages/frontend/editor-ui/src/components/ResourceMapper/MappingModeSelect.vue
index ab250a07d3..fd9f2d2125 100644
--- a/packages/editor-ui/src/components/ResourceMapper/MappingModeSelect.vue
+++ b/packages/frontend/editor-ui/src/components/ResourceMapper/MappingModeSelect.vue
@@ -3,7 +3,7 @@ import type { INodePropertyTypeOptions, ResourceMapperFields } from 'n8n-workflo
 import { computed, ref, watch } from 'vue';
 import { i18n as locale } from '@/plugins/i18n';
 import { useNodeSpecificationValues } from '@/composables/useNodeSpecificationValues';
-import { N8nInputLabel, N8nSelect, N8nText } from 'n8n-design-system';
+import { N8nInputLabel, N8nSelect, N8nText } from '@n8n/design-system';
 
 interface Props {
 	initialValue: string;
diff --git a/packages/editor-ui/src/components/ResourceMapper/MatchingColumnsSelect.vue b/packages/frontend/editor-ui/src/components/ResourceMapper/MatchingColumnsSelect.vue
similarity index 98%
rename from packages/editor-ui/src/components/ResourceMapper/MatchingColumnsSelect.vue
rename to packages/frontend/editor-ui/src/components/ResourceMapper/MatchingColumnsSelect.vue
index e663190c95..72eefdc1e4 100644
--- a/packages/editor-ui/src/components/ResourceMapper/MatchingColumnsSelect.vue
+++ b/packages/frontend/editor-ui/src/components/ResourceMapper/MatchingColumnsSelect.vue
@@ -9,7 +9,7 @@ import { computed, reactive, watch } from 'vue';
 import { i18n as locale } from '@/plugins/i18n';
 import { useNodeSpecificationValues } from '@/composables/useNodeSpecificationValues';
 import ParameterOptions from '@/components/ParameterOptions.vue';
-import { N8nInputLabel, N8nNotice, N8nSelect } from 'n8n-design-system';
+import { N8nInputLabel, N8nNotice, N8nSelect } from '@n8n/design-system';
 
 interface Props {
 	parameter: INodeProperties;
diff --git a/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.test.constants.ts b/packages/frontend/editor-ui/src/components/ResourceMapper/ResourceMapper.test.constants.ts
similarity index 100%
rename from packages/editor-ui/src/components/ResourceMapper/ResourceMapper.test.constants.ts
rename to packages/frontend/editor-ui/src/components/ResourceMapper/ResourceMapper.test.constants.ts
diff --git a/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.test.ts b/packages/frontend/editor-ui/src/components/ResourceMapper/ResourceMapper.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/ResourceMapper/ResourceMapper.test.ts
rename to packages/frontend/editor-ui/src/components/ResourceMapper/ResourceMapper.test.ts
diff --git a/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.vue b/packages/frontend/editor-ui/src/components/ResourceMapper/ResourceMapper.vue
similarity index 99%
rename from packages/editor-ui/src/components/ResourceMapper/ResourceMapper.vue
rename to packages/frontend/editor-ui/src/components/ResourceMapper/ResourceMapper.vue
index b95841a656..7ce1335cba 100644
--- a/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.vue
+++ b/packages/frontend/editor-ui/src/components/ResourceMapper/ResourceMapper.vue
@@ -28,7 +28,7 @@ import { i18n as locale } from '@/plugins/i18n';
 import { useNDVStore } from '@/stores/ndv.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useDocumentVisibility } from '@/composables/useDocumentVisibility';
-import { N8nButton, N8nCallout, N8nNotice } from 'n8n-design-system';
+import { N8nButton, N8nCallout, N8nNotice } from '@n8n/design-system';
 import { isEqual } from 'lodash-es';
 
 type Props = {
diff --git a/packages/editor-ui/src/components/RunData.test.ts b/packages/frontend/editor-ui/src/components/RunData.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/RunData.test.ts
rename to packages/frontend/editor-ui/src/components/RunData.test.ts
diff --git a/packages/editor-ui/src/components/RunData.vue b/packages/frontend/editor-ui/src/components/RunData.vue
similarity index 99%
rename from packages/editor-ui/src/components/RunData.vue
rename to packages/frontend/editor-ui/src/components/RunData.vue
index 2ff86f2374..75ea77f386 100644
--- a/packages/editor-ui/src/components/RunData.vue
+++ b/packages/frontend/editor-ui/src/components/RunData.vue
@@ -79,7 +79,7 @@ import {
 	N8nTabs,
 	N8nText,
 	N8nTooltip,
-} from 'n8n-design-system';
+} from '@n8n/design-system';
 import { storeToRefs } from 'pinia';
 import { useRoute } from 'vue-router';
 import { useExecutionHelpers } from '@/composables/useExecutionHelpers';
diff --git a/packages/editor-ui/src/components/RunDataAi/AiRunContentBlock.vue b/packages/frontend/editor-ui/src/components/RunDataAi/AiRunContentBlock.vue
similarity index 100%
rename from packages/editor-ui/src/components/RunDataAi/AiRunContentBlock.vue
rename to packages/frontend/editor-ui/src/components/RunDataAi/AiRunContentBlock.vue
diff --git a/packages/editor-ui/src/components/RunDataAi/RunDataAi.vue b/packages/frontend/editor-ui/src/components/RunDataAi/RunDataAi.vue
similarity index 100%
rename from packages/editor-ui/src/components/RunDataAi/RunDataAi.vue
rename to packages/frontend/editor-ui/src/components/RunDataAi/RunDataAi.vue
diff --git a/packages/editor-ui/src/components/RunDataAi/RunDataAiContent.vue b/packages/frontend/editor-ui/src/components/RunDataAi/RunDataAiContent.vue
similarity index 100%
rename from packages/editor-ui/src/components/RunDataAi/RunDataAiContent.vue
rename to packages/frontend/editor-ui/src/components/RunDataAi/RunDataAiContent.vue
diff --git a/packages/editor-ui/src/components/RunDataAi/useAiContentParsers.ts b/packages/frontend/editor-ui/src/components/RunDataAi/useAiContentParsers.ts
similarity index 100%
rename from packages/editor-ui/src/components/RunDataAi/useAiContentParsers.ts
rename to packages/frontend/editor-ui/src/components/RunDataAi/useAiContentParsers.ts
diff --git a/packages/editor-ui/src/components/RunDataAi/utils.test.ts b/packages/frontend/editor-ui/src/components/RunDataAi/utils.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/RunDataAi/utils.test.ts
rename to packages/frontend/editor-ui/src/components/RunDataAi/utils.test.ts
diff --git a/packages/editor-ui/src/components/RunDataAi/utils.ts b/packages/frontend/editor-ui/src/components/RunDataAi/utils.ts
similarity index 100%
rename from packages/editor-ui/src/components/RunDataAi/utils.ts
rename to packages/frontend/editor-ui/src/components/RunDataAi/utils.ts
diff --git a/packages/editor-ui/src/components/RunDataHtml.vue b/packages/frontend/editor-ui/src/components/RunDataHtml.vue
similarity index 100%
rename from packages/editor-ui/src/components/RunDataHtml.vue
rename to packages/frontend/editor-ui/src/components/RunDataHtml.vue
diff --git a/packages/editor-ui/src/components/RunDataJson.test.ts b/packages/frontend/editor-ui/src/components/RunDataJson.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/RunDataJson.test.ts
rename to packages/frontend/editor-ui/src/components/RunDataJson.test.ts
diff --git a/packages/editor-ui/src/components/RunDataJson.vue b/packages/frontend/editor-ui/src/components/RunDataJson.vue
similarity index 100%
rename from packages/editor-ui/src/components/RunDataJson.vue
rename to packages/frontend/editor-ui/src/components/RunDataJson.vue
diff --git a/packages/editor-ui/src/components/RunDataJsonActions.vue b/packages/frontend/editor-ui/src/components/RunDataJsonActions.vue
similarity index 100%
rename from packages/editor-ui/src/components/RunDataJsonActions.vue
rename to packages/frontend/editor-ui/src/components/RunDataJsonActions.vue
diff --git a/packages/editor-ui/src/components/RunDataPinButton.test.ts b/packages/frontend/editor-ui/src/components/RunDataPinButton.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/RunDataPinButton.test.ts
rename to packages/frontend/editor-ui/src/components/RunDataPinButton.test.ts
diff --git a/packages/editor-ui/src/components/RunDataPinButton.vue b/packages/frontend/editor-ui/src/components/RunDataPinButton.vue
similarity index 95%
rename from packages/editor-ui/src/components/RunDataPinButton.vue
rename to packages/frontend/editor-ui/src/components/RunDataPinButton.vue
index ff01e78645..4b79abb6fa 100644
--- a/packages/editor-ui/src/components/RunDataPinButton.vue
+++ b/packages/frontend/editor-ui/src/components/RunDataPinButton.vue
@@ -2,7 +2,7 @@
 import { computed } from 'vue';
 import { useI18n } from '@/composables/useI18n';
 import type { usePinnedData } from '@/composables/usePinnedData';
-import { N8nIconButton, N8nLink, N8nText, N8nTooltip } from 'n8n-design-system';
+import { N8nIconButton, N8nLink, N8nText, N8nTooltip } from '@n8n/design-system';
 
 const locale = useI18n();
 
diff --git a/packages/editor-ui/src/components/RunDataSearch.test.ts b/packages/frontend/editor-ui/src/components/RunDataSearch.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/RunDataSearch.test.ts
rename to packages/frontend/editor-ui/src/components/RunDataSearch.test.ts
diff --git a/packages/editor-ui/src/components/RunDataSearch.vue b/packages/frontend/editor-ui/src/components/RunDataSearch.vue
similarity index 100%
rename from packages/editor-ui/src/components/RunDataSearch.vue
rename to packages/frontend/editor-ui/src/components/RunDataSearch.vue
diff --git a/packages/editor-ui/src/components/RunDataTable.test.ts b/packages/frontend/editor-ui/src/components/RunDataTable.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/RunDataTable.test.ts
rename to packages/frontend/editor-ui/src/components/RunDataTable.test.ts
diff --git a/packages/editor-ui/src/components/RunDataTable.vue b/packages/frontend/editor-ui/src/components/RunDataTable.vue
similarity index 99%
rename from packages/editor-ui/src/components/RunDataTable.vue
rename to packages/frontend/editor-ui/src/components/RunDataTable.vue
index c8423e6b6e..35a22b78af 100644
--- a/packages/editor-ui/src/components/RunDataTable.vue
+++ b/packages/frontend/editor-ui/src/components/RunDataTable.vue
@@ -13,7 +13,7 @@ import MappingPill from './MappingPill.vue';
 import TextWithHighlights from './TextWithHighlights.vue';
 import { useI18n } from '@/composables/useI18n';
 import { useTelemetry } from '@/composables/useTelemetry';
-import { N8nIconButton, N8nInfoTip, N8nTooltip, N8nTree } from 'n8n-design-system';
+import { N8nIconButton, N8nInfoTip, N8nTooltip, N8nTree } from '@n8n/design-system';
 import { storeToRefs } from 'pinia';
 import { useExecutionHelpers } from '@/composables/useExecutionHelpers';
 
diff --git a/packages/editor-ui/src/components/RunInfo.vue b/packages/frontend/editor-ui/src/components/RunInfo.vue
similarity index 97%
rename from packages/editor-ui/src/components/RunInfo.vue
rename to packages/frontend/editor-ui/src/components/RunInfo.vue
index 0f9329be36..bda5788883 100644
--- a/packages/editor-ui/src/components/RunInfo.vue
+++ b/packages/frontend/editor-ui/src/components/RunInfo.vue
@@ -3,7 +3,7 @@ import type { ITaskData } from 'n8n-workflow';
 import { convertToDisplayDateComponents } from '@/utils/formatters/dateFormatter';
 import { computed } from 'vue';
 import { useI18n } from '@/composables/useI18n';
-import { N8nInfoTip } from 'n8n-design-system';
+import { N8nInfoTip } from '@n8n/design-system';
 
 const i18n = useI18n();
 
diff --git a/packages/editor-ui/src/components/SQLEditor.test.ts b/packages/frontend/editor-ui/src/components/SQLEditor.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/SQLEditor.test.ts
rename to packages/frontend/editor-ui/src/components/SQLEditor.test.ts
diff --git a/packages/editor-ui/src/components/SSOLogin.test.ts b/packages/frontend/editor-ui/src/components/SSOLogin.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/SSOLogin.test.ts
rename to packages/frontend/editor-ui/src/components/SSOLogin.test.ts
diff --git a/packages/editor-ui/src/components/SSOLogin.vue b/packages/frontend/editor-ui/src/components/SSOLogin.vue
similarity index 100%
rename from packages/editor-ui/src/components/SSOLogin.vue
rename to packages/frontend/editor-ui/src/components/SSOLogin.vue
diff --git a/packages/editor-ui/src/components/SaveButton.vue b/packages/frontend/editor-ui/src/components/SaveButton.vue
similarity index 100%
rename from packages/editor-ui/src/components/SaveButton.vue
rename to packages/frontend/editor-ui/src/components/SaveButton.vue
diff --git a/packages/editor-ui/src/components/ScopesNotice.vue b/packages/frontend/editor-ui/src/components/ScopesNotice.vue
similarity index 100%
rename from packages/editor-ui/src/components/ScopesNotice.vue
rename to packages/frontend/editor-ui/src/components/ScopesNotice.vue
diff --git a/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationCard.ee.vue b/packages/frontend/editor-ui/src/components/SettingsLogStreaming/EventDestinationCard.ee.vue
similarity index 100%
rename from packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationCard.ee.vue
rename to packages/frontend/editor-ui/src/components/SettingsLogStreaming/EventDestinationCard.ee.vue
diff --git a/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationSettingsModal.ee.vue b/packages/frontend/editor-ui/src/components/SettingsLogStreaming/EventDestinationSettingsModal.ee.vue
similarity index 100%
rename from packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationSettingsModal.ee.vue
rename to packages/frontend/editor-ui/src/components/SettingsLogStreaming/EventDestinationSettingsModal.ee.vue
diff --git a/packages/editor-ui/src/components/SettingsLogStreaming/EventSelection.ee.vue b/packages/frontend/editor-ui/src/components/SettingsLogStreaming/EventSelection.ee.vue
similarity index 100%
rename from packages/editor-ui/src/components/SettingsLogStreaming/EventSelection.ee.vue
rename to packages/frontend/editor-ui/src/components/SettingsLogStreaming/EventSelection.ee.vue
diff --git a/packages/editor-ui/src/components/SettingsLogStreaming/Helpers.ee.ts b/packages/frontend/editor-ui/src/components/SettingsLogStreaming/Helpers.ee.ts
similarity index 100%
rename from packages/editor-ui/src/components/SettingsLogStreaming/Helpers.ee.ts
rename to packages/frontend/editor-ui/src/components/SettingsLogStreaming/Helpers.ee.ts
diff --git a/packages/editor-ui/src/components/SettingsLogStreaming/descriptions.ee.ts b/packages/frontend/editor-ui/src/components/SettingsLogStreaming/descriptions.ee.ts
similarity index 100%
rename from packages/editor-ui/src/components/SettingsLogStreaming/descriptions.ee.ts
rename to packages/frontend/editor-ui/src/components/SettingsLogStreaming/descriptions.ee.ts
diff --git a/packages/editor-ui/src/components/SettingsSidebar.vue b/packages/frontend/editor-ui/src/components/SettingsSidebar.vue
similarity index 98%
rename from packages/editor-ui/src/components/SettingsSidebar.vue
rename to packages/frontend/editor-ui/src/components/SettingsSidebar.vue
index 41a7de813e..0cd3e33b28 100644
--- a/packages/editor-ui/src/components/SettingsSidebar.vue
+++ b/packages/frontend/editor-ui/src/components/SettingsSidebar.vue
@@ -2,7 +2,7 @@
 import { computed } from 'vue';
 import { ABOUT_MODAL_KEY, VIEWS } from '@/constants';
 import { useUserHelpers } from '@/composables/useUserHelpers';
-import type { IMenuItem } from 'n8n-design-system';
+import type { IMenuItem } from '@n8n/design-system';
 import { useUIStore } from '@/stores/ui.store';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useRootStore } from '@/stores/root.store';
diff --git a/packages/editor-ui/src/components/SetupWorkflowCredentialsButton/SetupWorkflowCredentialsButton.test.ts b/packages/frontend/editor-ui/src/components/SetupWorkflowCredentialsButton/SetupWorkflowCredentialsButton.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/SetupWorkflowCredentialsButton/SetupWorkflowCredentialsButton.test.ts
rename to packages/frontend/editor-ui/src/components/SetupWorkflowCredentialsButton/SetupWorkflowCredentialsButton.test.ts
diff --git a/packages/editor-ui/src/components/SetupWorkflowCredentialsButton/SetupWorkflowCredentialsButton.vue b/packages/frontend/editor-ui/src/components/SetupWorkflowCredentialsButton/SetupWorkflowCredentialsButton.vue
similarity index 100%
rename from packages/editor-ui/src/components/SetupWorkflowCredentialsButton/SetupWorkflowCredentialsButton.vue
rename to packages/frontend/editor-ui/src/components/SetupWorkflowCredentialsButton/SetupWorkflowCredentialsButton.vue
diff --git a/packages/editor-ui/src/components/SetupWorkflowCredentialsModal/SetupWorkflowCredentialsModal.vue b/packages/frontend/editor-ui/src/components/SetupWorkflowCredentialsModal/SetupWorkflowCredentialsModal.vue
similarity index 98%
rename from packages/editor-ui/src/components/SetupWorkflowCredentialsModal/SetupWorkflowCredentialsModal.vue
rename to packages/frontend/editor-ui/src/components/SetupWorkflowCredentialsModal/SetupWorkflowCredentialsModal.vue
index 9ed964665f..96b2e47e78 100644
--- a/packages/editor-ui/src/components/SetupWorkflowCredentialsModal/SetupWorkflowCredentialsModal.vue
+++ b/packages/frontend/editor-ui/src/components/SetupWorkflowCredentialsModal/SetupWorkflowCredentialsModal.vue
@@ -2,7 +2,7 @@
 import Modal from '@/components/Modal.vue';
 import { useSetupWorkflowCredentialsModalState } from '@/components/SetupWorkflowCredentialsModal/useSetupWorkflowCredentialsModalState';
 import { useI18n } from '@/composables/useI18n';
-import N8nHeading from 'n8n-design-system/components/N8nHeading';
+import N8nHeading from '@n8n/design-system/components/N8nHeading';
 import AppsRequiringCredsNotice from '@/views/SetupWorkflowFromTemplateView/AppsRequiringCredsNotice.vue';
 import SetupTemplateFormStep from '@/views/SetupWorkflowFromTemplateView/SetupTemplateFormStep.vue';
 import { onMounted, onUnmounted } from 'vue';
diff --git a/packages/editor-ui/src/components/SetupWorkflowCredentialsModal/useSetupWorkflowCredentialsModalState.ts b/packages/frontend/editor-ui/src/components/SetupWorkflowCredentialsModal/useSetupWorkflowCredentialsModalState.ts
similarity index 100%
rename from packages/editor-ui/src/components/SetupWorkflowCredentialsModal/useSetupWorkflowCredentialsModalState.ts
rename to packages/frontend/editor-ui/src/components/SetupWorkflowCredentialsModal/useSetupWorkflowCredentialsModalState.ts
diff --git a/packages/editor-ui/src/components/ShortenName.vue b/packages/frontend/editor-ui/src/components/ShortenName.vue
similarity index 100%
rename from packages/editor-ui/src/components/ShortenName.vue
rename to packages/frontend/editor-ui/src/components/ShortenName.vue
diff --git a/packages/editor-ui/src/components/SourceControlInitializationErrorMessage.vue b/packages/frontend/editor-ui/src/components/SourceControlInitializationErrorMessage.vue
similarity index 100%
rename from packages/editor-ui/src/components/SourceControlInitializationErrorMessage.vue
rename to packages/frontend/editor-ui/src/components/SourceControlInitializationErrorMessage.vue
diff --git a/packages/editor-ui/src/components/SourceControlPullModal.ee.test.ts b/packages/frontend/editor-ui/src/components/SourceControlPullModal.ee.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/SourceControlPullModal.ee.test.ts
rename to packages/frontend/editor-ui/src/components/SourceControlPullModal.ee.test.ts
diff --git a/packages/editor-ui/src/components/SourceControlPullModal.ee.vue b/packages/frontend/editor-ui/src/components/SourceControlPullModal.ee.vue
similarity index 98%
rename from packages/editor-ui/src/components/SourceControlPullModal.ee.vue
rename to packages/frontend/editor-ui/src/components/SourceControlPullModal.ee.vue
index b89f487933..a8b4a1df7a 100644
--- a/packages/editor-ui/src/components/SourceControlPullModal.ee.vue
+++ b/packages/frontend/editor-ui/src/components/SourceControlPullModal.ee.vue
@@ -10,7 +10,7 @@ import { useUIStore } from '@/stores/ui.store';
 import { computed } from 'vue';
 import { sourceControlEventBus } from '@/event-bus/source-control';
 import { orderBy, groupBy } from 'lodash-es';
-import { N8nBadge, N8nText, N8nLink, N8nButton } from 'n8n-design-system';
+import { N8nBadge, N8nText, N8nLink, N8nButton } from '@n8n/design-system';
 import { RouterLink } from 'vue-router';
 import {
 	getStatusText,
diff --git a/packages/editor-ui/src/components/SourceControlPushModal.ee.test.ts b/packages/frontend/editor-ui/src/components/SourceControlPushModal.ee.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/SourceControlPushModal.ee.test.ts
rename to packages/frontend/editor-ui/src/components/SourceControlPushModal.ee.test.ts
diff --git a/packages/editor-ui/src/components/SourceControlPushModal.ee.vue b/packages/frontend/editor-ui/src/components/SourceControlPushModal.ee.vue
similarity index 99%
rename from packages/editor-ui/src/components/SourceControlPushModal.ee.vue
rename to packages/frontend/editor-ui/src/components/SourceControlPushModal.ee.vue
index 1898cb2f03..d26a7a4928 100644
--- a/packages/editor-ui/src/components/SourceControlPushModal.ee.vue
+++ b/packages/frontend/editor-ui/src/components/SourceControlPushModal.ee.vue
@@ -28,7 +28,7 @@ import {
 	N8nOption,
 	N8nInputLabel,
 	N8nInfoTip,
-} from 'n8n-design-system';
+} from '@n8n/design-system';
 import {
 	type SourceControlledFile,
 	SOURCE_CONTROL_FILE_STATUS,
diff --git a/packages/editor-ui/src/components/SqlEditor/SqlEditor.vue b/packages/frontend/editor-ui/src/components/SqlEditor/SqlEditor.vue
similarity index 100%
rename from packages/editor-ui/src/components/SqlEditor/SqlEditor.vue
rename to packages/frontend/editor-ui/src/components/SqlEditor/SqlEditor.vue
diff --git a/packages/editor-ui/src/components/TagsContainer.vue b/packages/frontend/editor-ui/src/components/TagsContainer.vue
similarity index 100%
rename from packages/editor-ui/src/components/TagsContainer.vue
rename to packages/frontend/editor-ui/src/components/TagsContainer.vue
diff --git a/packages/editor-ui/src/components/TagsDropdown.vue b/packages/frontend/editor-ui/src/components/TagsDropdown.vue
similarity index 99%
rename from packages/editor-ui/src/components/TagsDropdown.vue
rename to packages/frontend/editor-ui/src/components/TagsDropdown.vue
index 0037fb25fa..1ba67a3182 100644
--- a/packages/editor-ui/src/components/TagsDropdown.vue
+++ b/packages/frontend/editor-ui/src/components/TagsDropdown.vue
@@ -3,7 +3,7 @@ import { computed, nextTick, onBeforeUnmount, onMounted, ref, watch } from 'vue'
 import { onClickOutside } from '@vueuse/core';
 import type { ITag } from '@/Interface';
 import { MAX_TAG_NAME_LENGTH } from '@/constants';
-import { N8nOption, N8nSelect } from 'n8n-design-system';
+import { N8nOption, N8nSelect } from '@n8n/design-system';
 import type { EventBus } from '@n8n/utils/event-bus';
 import { useI18n } from '@/composables/useI18n';
 import { v4 as uuid } from 'uuid';
diff --git a/packages/editor-ui/src/components/TagsManager/AnnotationTagsManager.ee.vue b/packages/frontend/editor-ui/src/components/TagsManager/AnnotationTagsManager.ee.vue
similarity index 100%
rename from packages/editor-ui/src/components/TagsManager/AnnotationTagsManager.ee.vue
rename to packages/frontend/editor-ui/src/components/TagsManager/AnnotationTagsManager.ee.vue
diff --git a/packages/editor-ui/src/components/TagsManager/NoTagsView.vue b/packages/frontend/editor-ui/src/components/TagsManager/NoTagsView.vue
similarity index 100%
rename from packages/editor-ui/src/components/TagsManager/NoTagsView.vue
rename to packages/frontend/editor-ui/src/components/TagsManager/NoTagsView.vue
diff --git a/packages/editor-ui/src/components/TagsManager/TagsManager.vue b/packages/frontend/editor-ui/src/components/TagsManager/TagsManager.vue
similarity index 100%
rename from packages/editor-ui/src/components/TagsManager/TagsManager.vue
rename to packages/frontend/editor-ui/src/components/TagsManager/TagsManager.vue
diff --git a/packages/editor-ui/src/components/TagsManager/TagsView/TagsTable.vue b/packages/frontend/editor-ui/src/components/TagsManager/TagsView/TagsTable.vue
similarity index 99%
rename from packages/editor-ui/src/components/TagsManager/TagsView/TagsTable.vue
rename to packages/frontend/editor-ui/src/components/TagsManager/TagsView/TagsTable.vue
index 9b217ed6d6..65e7f5eac0 100644
--- a/packages/editor-ui/src/components/TagsManager/TagsView/TagsTable.vue
+++ b/packages/frontend/editor-ui/src/components/TagsManager/TagsView/TagsTable.vue
@@ -3,7 +3,7 @@ import { ElTable } from 'element-plus';
 import { MAX_TAG_NAME_LENGTH } from '@/constants';
 import type { ITagRow } from '@/Interface';
 import { onMounted, ref, watch } from 'vue';
-import { N8nInput } from 'n8n-design-system';
+import { N8nInput } from '@n8n/design-system';
 import type { BaseTextKey } from '@/plugins/i18n';
 import { useI18n } from '@/composables/useI18n';
 
diff --git a/packages/editor-ui/src/components/TagsManager/TagsView/TagsTableHeader.vue b/packages/frontend/editor-ui/src/components/TagsManager/TagsView/TagsTableHeader.vue
similarity index 100%
rename from packages/editor-ui/src/components/TagsManager/TagsView/TagsTableHeader.vue
rename to packages/frontend/editor-ui/src/components/TagsManager/TagsView/TagsTableHeader.vue
diff --git a/packages/editor-ui/src/components/TagsManager/TagsView/TagsView.vue b/packages/frontend/editor-ui/src/components/TagsManager/TagsView/TagsView.vue
similarity index 100%
rename from packages/editor-ui/src/components/TagsManager/TagsView/TagsView.vue
rename to packages/frontend/editor-ui/src/components/TagsManager/TagsView/TagsView.vue
diff --git a/packages/editor-ui/src/components/TagsManager/WorkflowTagsManager.vue b/packages/frontend/editor-ui/src/components/TagsManager/WorkflowTagsManager.vue
similarity index 100%
rename from packages/editor-ui/src/components/TagsManager/WorkflowTagsManager.vue
rename to packages/frontend/editor-ui/src/components/TagsManager/WorkflowTagsManager.vue
diff --git a/packages/editor-ui/src/components/Telemetry.test.ts b/packages/frontend/editor-ui/src/components/Telemetry.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/Telemetry.test.ts
rename to packages/frontend/editor-ui/src/components/Telemetry.test.ts
diff --git a/packages/editor-ui/src/components/Telemetry.vue b/packages/frontend/editor-ui/src/components/Telemetry.vue
similarity index 100%
rename from packages/editor-ui/src/components/Telemetry.vue
rename to packages/frontend/editor-ui/src/components/Telemetry.vue
diff --git a/packages/editor-ui/src/components/TemplateCard.vue b/packages/frontend/editor-ui/src/components/TemplateCard.vue
similarity index 100%
rename from packages/editor-ui/src/components/TemplateCard.vue
rename to packages/frontend/editor-ui/src/components/TemplateCard.vue
diff --git a/packages/editor-ui/src/components/TemplateDetails.vue b/packages/frontend/editor-ui/src/components/TemplateDetails.vue
similarity index 100%
rename from packages/editor-ui/src/components/TemplateDetails.vue
rename to packages/frontend/editor-ui/src/components/TemplateDetails.vue
diff --git a/packages/editor-ui/src/components/TemplateDetailsBlock.vue b/packages/frontend/editor-ui/src/components/TemplateDetailsBlock.vue
similarity index 100%
rename from packages/editor-ui/src/components/TemplateDetailsBlock.vue
rename to packages/frontend/editor-ui/src/components/TemplateDetailsBlock.vue
diff --git a/packages/editor-ui/src/components/TemplateFilters.vue b/packages/frontend/editor-ui/src/components/TemplateFilters.vue
similarity index 100%
rename from packages/editor-ui/src/components/TemplateFilters.vue
rename to packages/frontend/editor-ui/src/components/TemplateFilters.vue
diff --git a/packages/editor-ui/src/components/TemplateList.vue b/packages/frontend/editor-ui/src/components/TemplateList.vue
similarity index 100%
rename from packages/editor-ui/src/components/TemplateList.vue
rename to packages/frontend/editor-ui/src/components/TemplateList.vue
diff --git a/packages/editor-ui/src/components/TemplatesInfoCard.test.ts b/packages/frontend/editor-ui/src/components/TemplatesInfoCard.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/TemplatesInfoCard.test.ts
rename to packages/frontend/editor-ui/src/components/TemplatesInfoCard.test.ts
diff --git a/packages/editor-ui/src/components/TemplatesInfoCard.vue b/packages/frontend/editor-ui/src/components/TemplatesInfoCard.vue
similarity index 100%
rename from packages/editor-ui/src/components/TemplatesInfoCard.vue
rename to packages/frontend/editor-ui/src/components/TemplatesInfoCard.vue
diff --git a/packages/editor-ui/src/components/TemplatesInfoCarousel.vue b/packages/frontend/editor-ui/src/components/TemplatesInfoCarousel.vue
similarity index 100%
rename from packages/editor-ui/src/components/TemplatesInfoCarousel.vue
rename to packages/frontend/editor-ui/src/components/TemplatesInfoCarousel.vue
diff --git a/packages/editor-ui/src/components/TestDefinition/EditDefinition/BlockArrow.vue b/packages/frontend/editor-ui/src/components/TestDefinition/EditDefinition/BlockArrow.vue
similarity index 100%
rename from packages/editor-ui/src/components/TestDefinition/EditDefinition/BlockArrow.vue
rename to packages/frontend/editor-ui/src/components/TestDefinition/EditDefinition/BlockArrow.vue
diff --git a/packages/editor-ui/src/components/TestDefinition/EditDefinition/DescriptionInput.vue b/packages/frontend/editor-ui/src/components/TestDefinition/EditDefinition/DescriptionInput.vue
similarity index 100%
rename from packages/editor-ui/src/components/TestDefinition/EditDefinition/DescriptionInput.vue
rename to packages/frontend/editor-ui/src/components/TestDefinition/EditDefinition/DescriptionInput.vue
diff --git a/packages/editor-ui/src/components/TestDefinition/EditDefinition/EvaluationStep.vue b/packages/frontend/editor-ui/src/components/TestDefinition/EditDefinition/EvaluationStep.vue
similarity index 98%
rename from packages/editor-ui/src/components/TestDefinition/EditDefinition/EvaluationStep.vue
rename to packages/frontend/editor-ui/src/components/TestDefinition/EditDefinition/EvaluationStep.vue
index 1988369e33..215f68b73f 100644
--- a/packages/editor-ui/src/components/TestDefinition/EditDefinition/EvaluationStep.vue
+++ b/packages/frontend/editor-ui/src/components/TestDefinition/EditDefinition/EvaluationStep.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { useI18n } from '@/composables/useI18n';
 import { type Modifier, detectOverflow } from '@popperjs/core';
-import { N8nInfoTip, N8nText, N8nTooltip } from 'n8n-design-system';
+import { N8nInfoTip, N8nText, N8nTooltip } from '@n8n/design-system';
 import { computed, ref, useCssModule } from 'vue';
 
 interface EvaluationStep {
diff --git a/packages/editor-ui/src/components/TestDefinition/EditDefinition/MetricsInput.vue b/packages/frontend/editor-ui/src/components/TestDefinition/EditDefinition/MetricsInput.vue
similarity index 96%
rename from packages/editor-ui/src/components/TestDefinition/EditDefinition/MetricsInput.vue
rename to packages/frontend/editor-ui/src/components/TestDefinition/EditDefinition/MetricsInput.vue
index 7a8c2cbc97..f679b6cdfa 100644
--- a/packages/editor-ui/src/components/TestDefinition/EditDefinition/MetricsInput.vue
+++ b/packages/frontend/editor-ui/src/components/TestDefinition/EditDefinition/MetricsInput.vue
@@ -2,7 +2,7 @@
 import { useTemplateRef, nextTick } from 'vue';
 import type { TestMetricRecord } from '@/api/testDefinition.ee';
 import { useI18n } from '@/composables/useI18n';
-import { N8nInput, N8nButton, N8nIconButton } from 'n8n-design-system';
+import { N8nInput, N8nButton, N8nIconButton } from '@n8n/design-system';
 
 export interface MetricsInputProps {
 	modelValue: Array<Partial<TestMetricRecord>>;
diff --git a/packages/editor-ui/src/components/TestDefinition/EditDefinition/NodesPinning.vue b/packages/frontend/editor-ui/src/components/TestDefinition/EditDefinition/NodesPinning.vue
similarity index 99%
rename from packages/editor-ui/src/components/TestDefinition/EditDefinition/NodesPinning.vue
rename to packages/frontend/editor-ui/src/components/TestDefinition/EditDefinition/NodesPinning.vue
index 9e21523f73..687f18006a 100644
--- a/packages/editor-ui/src/components/TestDefinition/EditDefinition/NodesPinning.vue
+++ b/packages/frontend/editor-ui/src/components/TestDefinition/EditDefinition/NodesPinning.vue
@@ -7,7 +7,7 @@ import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import type { CanvasConnectionPort, CanvasEventBusEvents, CanvasNodeData } from '@/types';
 import { useVueFlow } from '@vue-flow/core';
-import { N8nTooltip } from 'n8n-design-system';
+import { N8nTooltip } from '@n8n/design-system';
 import { createEventBus } from '@n8n/utils/event-bus';
 import { computed, onMounted, ref, useCssModule } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
diff --git a/packages/editor-ui/src/components/TestDefinition/EditDefinition/TagsInput.vue b/packages/frontend/editor-ui/src/components/TestDefinition/EditDefinition/TagsInput.vue
similarity index 100%
rename from packages/editor-ui/src/components/TestDefinition/EditDefinition/TagsInput.vue
rename to packages/frontend/editor-ui/src/components/TestDefinition/EditDefinition/TagsInput.vue
diff --git a/packages/editor-ui/src/components/TestDefinition/EditDefinition/TestNameInput.vue b/packages/frontend/editor-ui/src/components/TestDefinition/EditDefinition/TestNameInput.vue
similarity index 100%
rename from packages/editor-ui/src/components/TestDefinition/EditDefinition/TestNameInput.vue
rename to packages/frontend/editor-ui/src/components/TestDefinition/EditDefinition/TestNameInput.vue
diff --git a/packages/editor-ui/src/components/TestDefinition/EditDefinition/WorkflowSelector.vue b/packages/frontend/editor-ui/src/components/TestDefinition/EditDefinition/WorkflowSelector.vue
similarity index 98%
rename from packages/editor-ui/src/components/TestDefinition/EditDefinition/WorkflowSelector.vue
rename to packages/frontend/editor-ui/src/components/TestDefinition/EditDefinition/WorkflowSelector.vue
index b7a2350b68..65d979cb90 100644
--- a/packages/editor-ui/src/components/TestDefinition/EditDefinition/WorkflowSelector.vue
+++ b/packages/frontend/editor-ui/src/components/TestDefinition/EditDefinition/WorkflowSelector.vue
@@ -5,7 +5,7 @@ import { SAMPLE_EVALUATION_WORKFLOW } from '@/constants.workflows';
 import type { IWorkflowDataCreate } from '@/Interface';
 import { useProjectsStore } from '@/stores/projects.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
-import { N8nButton, N8nLink } from 'n8n-design-system';
+import { N8nButton, N8nLink } from '@n8n/design-system';
 import type { INodeParameterResourceLocator, IPinData } from 'n8n-workflow';
 import { computed, ref } from 'vue';
 import { useRouter } from 'vue-router';
diff --git a/packages/editor-ui/src/components/TestDefinition/EditDefinition/sections/ConfigSection.vue b/packages/frontend/editor-ui/src/components/TestDefinition/EditDefinition/sections/ConfigSection.vue
similarity index 99%
rename from packages/editor-ui/src/components/TestDefinition/EditDefinition/sections/ConfigSection.vue
rename to packages/frontend/editor-ui/src/components/TestDefinition/EditDefinition/sections/ConfigSection.vue
index ae1d497ace..fb16c7050f 100644
--- a/packages/editor-ui/src/components/TestDefinition/EditDefinition/sections/ConfigSection.vue
+++ b/packages/frontend/editor-ui/src/components/TestDefinition/EditDefinition/sections/ConfigSection.vue
@@ -9,7 +9,7 @@ import { useI18n } from '@/composables/useI18n';
 import { useMessage } from '@/composables/useMessage';
 import { NODE_PINNING_MODAL_KEY } from '@/constants';
 import type { ITag, ModalState } from '@/Interface';
-import { N8nButton, N8nTag, N8nText } from 'n8n-design-system';
+import { N8nButton, N8nTag, N8nText } from '@n8n/design-system';
 import type { IPinData } from 'n8n-workflow';
 import { computed, ref } from 'vue';
 
diff --git a/packages/editor-ui/src/components/TestDefinition/EditDefinition/sections/RunsSection.vue b/packages/frontend/editor-ui/src/components/TestDefinition/EditDefinition/sections/RunsSection.vue
similarity index 100%
rename from packages/editor-ui/src/components/TestDefinition/EditDefinition/sections/RunsSection.vue
rename to packages/frontend/editor-ui/src/components/TestDefinition/EditDefinition/sections/RunsSection.vue
diff --git a/packages/editor-ui/src/components/TestDefinition/EditDefinition/tests/NodesPinning.test.ts b/packages/frontend/editor-ui/src/components/TestDefinition/EditDefinition/tests/NodesPinning.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/TestDefinition/EditDefinition/tests/NodesPinning.test.ts
rename to packages/frontend/editor-ui/src/components/TestDefinition/EditDefinition/tests/NodesPinning.test.ts
diff --git a/packages/editor-ui/src/components/TestDefinition/ListDefinition/EmptyState.vue b/packages/frontend/editor-ui/src/components/TestDefinition/ListDefinition/EmptyState.vue
similarity index 98%
rename from packages/editor-ui/src/components/TestDefinition/ListDefinition/EmptyState.vue
rename to packages/frontend/editor-ui/src/components/TestDefinition/ListDefinition/EmptyState.vue
index 3259e72258..37fc00c1ab 100644
--- a/packages/editor-ui/src/components/TestDefinition/ListDefinition/EmptyState.vue
+++ b/packages/frontend/editor-ui/src/components/TestDefinition/ListDefinition/EmptyState.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { useI18n } from '@/composables/useI18n';
-import { N8nBadge, N8nButton, N8nText } from 'n8n-design-system';
+import { N8nBadge, N8nButton, N8nText } from '@n8n/design-system';
 import { computed } from 'vue';
 
 defineEmits<{ 'create-test': [] }>();
diff --git a/packages/editor-ui/src/components/TestDefinition/ListDefinition/TestItem.vue b/packages/frontend/editor-ui/src/components/TestDefinition/ListDefinition/TestItem.vue
similarity index 97%
rename from packages/editor-ui/src/components/TestDefinition/ListDefinition/TestItem.vue
rename to packages/frontend/editor-ui/src/components/TestDefinition/ListDefinition/TestItem.vue
index ebe7ace28d..2649c88ee0 100644
--- a/packages/editor-ui/src/components/TestDefinition/ListDefinition/TestItem.vue
+++ b/packages/frontend/editor-ui/src/components/TestDefinition/ListDefinition/TestItem.vue
@@ -2,8 +2,8 @@
 import type { TestRunRecord } from '@/api/testDefinition.ee';
 import TimeAgo from '@/components/TimeAgo.vue';
 import { useI18n } from '@/composables/useI18n';
-import { N8nIcon, N8nText } from 'n8n-design-system';
-import type { IconColor } from 'n8n-design-system/types/icon';
+import { N8nIcon, N8nText } from '@n8n/design-system';
+import type { IconColor } from '@n8n/design-system/types/icon';
 import { computed } from 'vue';
 
 const props = defineProps<{
diff --git a/packages/editor-ui/src/components/TestDefinition/ListRuns/MetricsChart.vue b/packages/frontend/editor-ui/src/components/TestDefinition/ListRuns/MetricsChart.vue
similarity index 100%
rename from packages/editor-ui/src/components/TestDefinition/ListRuns/MetricsChart.vue
rename to packages/frontend/editor-ui/src/components/TestDefinition/ListRuns/MetricsChart.vue
diff --git a/packages/editor-ui/src/components/TestDefinition/ListRuns/TestRunsTable.vue b/packages/frontend/editor-ui/src/components/TestDefinition/ListRuns/TestRunsTable.vue
similarity index 98%
rename from packages/editor-ui/src/components/TestDefinition/ListRuns/TestRunsTable.vue
rename to packages/frontend/editor-ui/src/components/TestDefinition/ListRuns/TestRunsTable.vue
index 5085801adf..e3bf8e8333 100644
--- a/packages/editor-ui/src/components/TestDefinition/ListRuns/TestRunsTable.vue
+++ b/packages/frontend/editor-ui/src/components/TestDefinition/ListRuns/TestRunsTable.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import type { TestRunRecord } from '@/api/testDefinition.ee';
 import { useI18n } from '@/composables/useI18n';
-import { N8nIcon, N8nText } from 'n8n-design-system';
+import { N8nIcon, N8nText } from '@n8n/design-system';
 import { computed, ref } from 'vue';
 import type { TestTableColumn } from '../shared/TestTableBase.vue';
 import TestTableBase from '../shared/TestTableBase.vue';
diff --git a/packages/editor-ui/src/components/TestDefinition/composables/useMetricsChart.ts b/packages/frontend/editor-ui/src/components/TestDefinition/composables/useMetricsChart.ts
similarity index 100%
rename from packages/editor-ui/src/components/TestDefinition/composables/useMetricsChart.ts
rename to packages/frontend/editor-ui/src/components/TestDefinition/composables/useMetricsChart.ts
diff --git a/packages/editor-ui/src/components/TestDefinition/composables/useTestDefinitionForm.ts b/packages/frontend/editor-ui/src/components/TestDefinition/composables/useTestDefinitionForm.ts
similarity index 99%
rename from packages/editor-ui/src/components/TestDefinition/composables/useTestDefinitionForm.ts
rename to packages/frontend/editor-ui/src/components/TestDefinition/composables/useTestDefinitionForm.ts
index 180384287b..efccf32148 100644
--- a/packages/editor-ui/src/components/TestDefinition/composables/useTestDefinitionForm.ts
+++ b/packages/frontend/editor-ui/src/components/TestDefinition/composables/useTestDefinitionForm.ts
@@ -2,7 +2,7 @@ import { ref, computed } from 'vue';
 import type { ComponentPublicInstance, ComputedRef } from 'vue';
 import { useTestDefinitionStore } from '@/stores/testDefinition.store.ee';
 import type AnnotationTagsDropdownEe from '@/components/AnnotationTagsDropdown.ee.vue';
-import type { N8nInput } from 'n8n-design-system';
+import type { N8nInput } from '@n8n/design-system';
 import type { UpdateTestDefinitionParams } from '@/api/testDefinition.ee';
 import type { EditableField, EditableFormState, EvaluationFormState } from '../types';
 
diff --git a/packages/editor-ui/src/components/TestDefinition/shared/TableCell.vue b/packages/frontend/editor-ui/src/components/TestDefinition/shared/TableCell.vue
similarity index 100%
rename from packages/editor-ui/src/components/TestDefinition/shared/TableCell.vue
rename to packages/frontend/editor-ui/src/components/TestDefinition/shared/TableCell.vue
diff --git a/packages/editor-ui/src/components/TestDefinition/shared/TableStatusCell.vue b/packages/frontend/editor-ui/src/components/TestDefinition/shared/TableStatusCell.vue
similarity index 98%
rename from packages/editor-ui/src/components/TestDefinition/shared/TableStatusCell.vue
rename to packages/frontend/editor-ui/src/components/TestDefinition/shared/TableStatusCell.vue
index 9ae7ebd9c4..97f718b083 100644
--- a/packages/editor-ui/src/components/TestDefinition/shared/TableStatusCell.vue
+++ b/packages/frontend/editor-ui/src/components/TestDefinition/shared/TableStatusCell.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts" generic="T">
-import N8nTooltip from 'n8n-design-system/components/N8nTooltip';
+import N8nTooltip from '@n8n/design-system/components/N8nTooltip';
 import type { BaseTextKey } from '@/plugins/i18n';
 import type { TestTableColumn } from '@/components/TestDefinition/shared/TestTableBase.vue';
 import { useI18n } from '@/composables/useI18n';
diff --git a/packages/editor-ui/src/components/TestDefinition/shared/TestTableBase.vue b/packages/frontend/editor-ui/src/components/TestDefinition/shared/TestTableBase.vue
similarity index 98%
rename from packages/editor-ui/src/components/TestDefinition/shared/TestTableBase.vue
rename to packages/frontend/editor-ui/src/components/TestDefinition/shared/TestTableBase.vue
index 59739223ad..8850a09558 100644
--- a/packages/editor-ui/src/components/TestDefinition/shared/TestTableBase.vue
+++ b/packages/frontend/editor-ui/src/components/TestDefinition/shared/TestTableBase.vue
@@ -2,7 +2,7 @@
 import type { TableInstance } from 'element-plus';
 import { ElTable, ElTableColumn } from 'element-plus';
 import { isEqual } from 'lodash-es';
-import { N8nIcon, N8nTooltip } from 'n8n-design-system';
+import { N8nIcon, N8nTooltip } from '@n8n/design-system';
 import { nextTick, ref, watch } from 'vue';
 import type { RouteLocationRaw } from 'vue-router';
 /**
diff --git a/packages/editor-ui/src/components/TestDefinition/tests/MetricsInput.test.ts b/packages/frontend/editor-ui/src/components/TestDefinition/tests/MetricsInput.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/TestDefinition/tests/MetricsInput.test.ts
rename to packages/frontend/editor-ui/src/components/TestDefinition/tests/MetricsInput.test.ts
diff --git a/packages/editor-ui/src/components/TestDefinition/tests/useMetricsChart.test.ts b/packages/frontend/editor-ui/src/components/TestDefinition/tests/useMetricsChart.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/TestDefinition/tests/useMetricsChart.test.ts
rename to packages/frontend/editor-ui/src/components/TestDefinition/tests/useMetricsChart.test.ts
diff --git a/packages/editor-ui/src/components/TestDefinition/tests/useTestDefinitionForm.test.ts b/packages/frontend/editor-ui/src/components/TestDefinition/tests/useTestDefinitionForm.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/TestDefinition/tests/useTestDefinitionForm.test.ts
rename to packages/frontend/editor-ui/src/components/TestDefinition/tests/useTestDefinitionForm.test.ts
diff --git a/packages/editor-ui/src/components/TestDefinition/types.ts b/packages/frontend/editor-ui/src/components/TestDefinition/types.ts
similarity index 100%
rename from packages/editor-ui/src/components/TestDefinition/types.ts
rename to packages/frontend/editor-ui/src/components/TestDefinition/types.ts
diff --git a/packages/editor-ui/src/components/TextEdit.vue b/packages/frontend/editor-ui/src/components/TextEdit.vue
similarity index 100%
rename from packages/editor-ui/src/components/TextEdit.vue
rename to packages/frontend/editor-ui/src/components/TextEdit.vue
diff --git a/packages/editor-ui/src/components/TextWithHIghlights.test.ts b/packages/frontend/editor-ui/src/components/TextWithHIghlights.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/TextWithHIghlights.test.ts
rename to packages/frontend/editor-ui/src/components/TextWithHIghlights.test.ts
diff --git a/packages/editor-ui/src/components/TextWithHighlights.vue b/packages/frontend/editor-ui/src/components/TextWithHighlights.vue
similarity index 100%
rename from packages/editor-ui/src/components/TextWithHighlights.vue
rename to packages/frontend/editor-ui/src/components/TextWithHighlights.vue
diff --git a/packages/editor-ui/src/components/TimeAgo.vue b/packages/frontend/editor-ui/src/components/TimeAgo.vue
similarity index 100%
rename from packages/editor-ui/src/components/TimeAgo.vue
rename to packages/frontend/editor-ui/src/components/TimeAgo.vue
diff --git a/packages/editor-ui/src/components/TitledList.vue b/packages/frontend/editor-ui/src/components/TitledList.vue
similarity index 100%
rename from packages/editor-ui/src/components/TitledList.vue
rename to packages/frontend/editor-ui/src/components/TitledList.vue
diff --git a/packages/editor-ui/src/components/TriggerPanel.vue b/packages/frontend/editor-ui/src/components/TriggerPanel.vue
similarity index 100%
rename from packages/editor-ui/src/components/TriggerPanel.vue
rename to packages/frontend/editor-ui/src/components/TriggerPanel.vue
diff --git a/packages/editor-ui/src/components/UpdatesPanel.vue b/packages/frontend/editor-ui/src/components/UpdatesPanel.vue
similarity index 100%
rename from packages/editor-ui/src/components/UpdatesPanel.vue
rename to packages/frontend/editor-ui/src/components/UpdatesPanel.vue
diff --git a/packages/editor-ui/src/components/VariablesForm.vue b/packages/frontend/editor-ui/src/components/VariablesForm.vue
similarity index 98%
rename from packages/editor-ui/src/components/VariablesForm.vue
rename to packages/frontend/editor-ui/src/components/VariablesForm.vue
index 76e1cd7043..6ef19833c0 100644
--- a/packages/editor-ui/src/components/VariablesForm.vue
+++ b/packages/frontend/editor-ui/src/components/VariablesForm.vue
@@ -2,7 +2,7 @@
 import type { EnvironmentVariable, Rule, RuleGroup } from '@/Interface';
 import { useI18n } from '@/composables/useI18n';
 import { computed, ref, reactive, toRaw } from 'vue';
-import { N8nFormInput, N8nButton } from 'n8n-design-system';
+import { N8nFormInput, N8nButton } from '@n8n/design-system';
 import VariablesUsageBadge from './VariablesUsageBadge.vue';
 
 const props = defineProps<{
diff --git a/packages/editor-ui/src/components/VariablesUsageBadge.test.ts b/packages/frontend/editor-ui/src/components/VariablesUsageBadge.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/VariablesUsageBadge.test.ts
rename to packages/frontend/editor-ui/src/components/VariablesUsageBadge.test.ts
diff --git a/packages/editor-ui/src/components/VariablesUsageBadge.vue b/packages/frontend/editor-ui/src/components/VariablesUsageBadge.vue
similarity index 95%
rename from packages/editor-ui/src/components/VariablesUsageBadge.vue
rename to packages/frontend/editor-ui/src/components/VariablesUsageBadge.vue
index 043d7e5d17..a8510b46c6 100644
--- a/packages/editor-ui/src/components/VariablesUsageBadge.vue
+++ b/packages/frontend/editor-ui/src/components/VariablesUsageBadge.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { computed } from 'vue';
-import { N8nTooltip } from 'n8n-design-system';
+import { N8nTooltip } from '@n8n/design-system';
 import { useI18n } from '@/composables/useI18n';
 import { useToast } from '@/composables/useToast';
 import { useClipboard } from '@/composables/useClipboard';
diff --git a/packages/editor-ui/src/components/VersionCard.vue b/packages/frontend/editor-ui/src/components/VersionCard.vue
similarity index 100%
rename from packages/editor-ui/src/components/VersionCard.vue
rename to packages/frontend/editor-ui/src/components/VersionCard.vue
diff --git a/packages/editor-ui/src/components/VirtualSchema.test.ts b/packages/frontend/editor-ui/src/components/VirtualSchema.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/VirtualSchema.test.ts
rename to packages/frontend/editor-ui/src/components/VirtualSchema.test.ts
diff --git a/packages/editor-ui/src/components/VirtualSchema.vue b/packages/frontend/editor-ui/src/components/VirtualSchema.vue
similarity index 99%
rename from packages/editor-ui/src/components/VirtualSchema.vue
rename to packages/frontend/editor-ui/src/components/VirtualSchema.vue
index 5aac9e57a8..87e259aeb5 100644
--- a/packages/editor-ui/src/components/VirtualSchema.vue
+++ b/packages/frontend/editor-ui/src/components/VirtualSchema.vue
@@ -3,7 +3,7 @@ import { computed, watch, ref } from 'vue';
 import type { INodeUi } from '@/Interface';
 import VirtualSchemaItem from '@/components/VirtualSchemaItem.vue';
 import VirtualSchemaHeader from '@/components/VirtualSchemaHeader.vue';
-import { N8nText } from 'n8n-design-system';
+import { N8nText } from '@n8n/design-system';
 import Draggable from '@/components/Draggable.vue';
 import { useNDVStore } from '@/stores/ndv.store';
 import { useTelemetry } from '@/composables/useTelemetry';
diff --git a/packages/editor-ui/src/components/VirtualSchemaHeader.vue b/packages/frontend/editor-ui/src/components/VirtualSchemaHeader.vue
similarity index 98%
rename from packages/editor-ui/src/components/VirtualSchemaHeader.vue
rename to packages/frontend/editor-ui/src/components/VirtualSchemaHeader.vue
index cdf87f168d..65daae051d 100644
--- a/packages/editor-ui/src/components/VirtualSchemaHeader.vue
+++ b/packages/frontend/editor-ui/src/components/VirtualSchemaHeader.vue
@@ -5,7 +5,7 @@ import { type INodeTypeDescription } from 'n8n-workflow';
 import { useI18n } from '@/composables/useI18n';
 import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome';
 import { DATA_EDITING_DOCS_URL } from '@/constants';
-import { N8nNotice } from 'n8n-design-system';
+import { N8nNotice } from '@n8n/design-system';
 
 const props = defineProps<{
 	title: string;
diff --git a/packages/editor-ui/src/components/VirtualSchemaItem.vue b/packages/frontend/editor-ui/src/components/VirtualSchemaItem.vue
similarity index 100%
rename from packages/editor-ui/src/components/VirtualSchemaItem.vue
rename to packages/frontend/editor-ui/src/components/VirtualSchemaItem.vue
diff --git a/packages/editor-ui/src/components/WarningTooltip.vue b/packages/frontend/editor-ui/src/components/WarningTooltip.vue
similarity index 100%
rename from packages/editor-ui/src/components/WarningTooltip.vue
rename to packages/frontend/editor-ui/src/components/WarningTooltip.vue
diff --git a/packages/editor-ui/src/components/WireMeUp.vue b/packages/frontend/editor-ui/src/components/WireMeUp.vue
similarity index 100%
rename from packages/editor-ui/src/components/WireMeUp.vue
rename to packages/frontend/editor-ui/src/components/WireMeUp.vue
diff --git a/packages/editor-ui/src/components/WorkerList.ee.vue b/packages/frontend/editor-ui/src/components/WorkerList.ee.vue
similarity index 100%
rename from packages/editor-ui/src/components/WorkerList.ee.vue
rename to packages/frontend/editor-ui/src/components/WorkerList.ee.vue
diff --git a/packages/editor-ui/src/components/Workers/WorkerAccordion.ee.vue b/packages/frontend/editor-ui/src/components/Workers/WorkerAccordion.ee.vue
similarity index 100%
rename from packages/editor-ui/src/components/Workers/WorkerAccordion.ee.vue
rename to packages/frontend/editor-ui/src/components/Workers/WorkerAccordion.ee.vue
diff --git a/packages/editor-ui/src/components/Workers/WorkerCard.ee.vue b/packages/frontend/editor-ui/src/components/Workers/WorkerCard.ee.vue
similarity index 100%
rename from packages/editor-ui/src/components/Workers/WorkerCard.ee.vue
rename to packages/frontend/editor-ui/src/components/Workers/WorkerCard.ee.vue
diff --git a/packages/editor-ui/src/components/Workers/WorkerChartsAccordion.ee.vue b/packages/frontend/editor-ui/src/components/Workers/WorkerChartsAccordion.ee.vue
similarity index 100%
rename from packages/editor-ui/src/components/Workers/WorkerChartsAccordion.ee.vue
rename to packages/frontend/editor-ui/src/components/Workers/WorkerChartsAccordion.ee.vue
diff --git a/packages/editor-ui/src/components/Workers/WorkerJobAccordion.ee.vue b/packages/frontend/editor-ui/src/components/Workers/WorkerJobAccordion.ee.vue
similarity index 100%
rename from packages/editor-ui/src/components/Workers/WorkerJobAccordion.ee.vue
rename to packages/frontend/editor-ui/src/components/Workers/WorkerJobAccordion.ee.vue
diff --git a/packages/editor-ui/src/components/Workers/WorkerNetAccordion.ee.vue b/packages/frontend/editor-ui/src/components/Workers/WorkerNetAccordion.ee.vue
similarity index 100%
rename from packages/editor-ui/src/components/Workers/WorkerNetAccordion.ee.vue
rename to packages/frontend/editor-ui/src/components/Workers/WorkerNetAccordion.ee.vue
diff --git a/packages/editor-ui/src/components/WorkflowActivationErrorMessage.vue b/packages/frontend/editor-ui/src/components/WorkflowActivationErrorMessage.vue
similarity index 100%
rename from packages/editor-ui/src/components/WorkflowActivationErrorMessage.vue
rename to packages/frontend/editor-ui/src/components/WorkflowActivationErrorMessage.vue
diff --git a/packages/editor-ui/src/components/WorkflowActivator.test.ts b/packages/frontend/editor-ui/src/components/WorkflowActivator.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/WorkflowActivator.test.ts
rename to packages/frontend/editor-ui/src/components/WorkflowActivator.test.ts
diff --git a/packages/editor-ui/src/components/WorkflowActivator.vue b/packages/frontend/editor-ui/src/components/WorkflowActivator.vue
similarity index 100%
rename from packages/editor-ui/src/components/WorkflowActivator.vue
rename to packages/frontend/editor-ui/src/components/WorkflowActivator.vue
diff --git a/packages/editor-ui/src/components/WorkflowCard.test.ts b/packages/frontend/editor-ui/src/components/WorkflowCard.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/WorkflowCard.test.ts
rename to packages/frontend/editor-ui/src/components/WorkflowCard.test.ts
diff --git a/packages/editor-ui/src/components/WorkflowCard.vue b/packages/frontend/editor-ui/src/components/WorkflowCard.vue
similarity index 100%
rename from packages/editor-ui/src/components/WorkflowCard.vue
rename to packages/frontend/editor-ui/src/components/WorkflowCard.vue
diff --git a/packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryContent.test.ts b/packages/frontend/editor-ui/src/components/WorkflowHistory/WorkflowHistoryContent.test.ts
similarity index 98%
rename from packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryContent.test.ts
rename to packages/frontend/editor-ui/src/components/WorkflowHistory/WorkflowHistoryContent.test.ts
index 078173f7bc..395e8d9a90 100644
--- a/packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryContent.test.ts
+++ b/packages/frontend/editor-ui/src/components/WorkflowHistory/WorkflowHistoryContent.test.ts
@@ -3,7 +3,7 @@ import type { MockInstance } from 'vitest';
 import { createPinia, setActivePinia } from 'pinia';
 import { waitFor } from '@testing-library/vue';
 import userEvent from '@testing-library/user-event';
-import type { UserAction } from 'n8n-design-system';
+import type { UserAction } from '@n8n/design-system';
 import { createComponentRenderer } from '@/__tests__/render';
 import WorkflowHistoryContent from '@/components/WorkflowHistory/WorkflowHistoryContent.vue';
 import type { WorkflowHistoryActionTypes } from '@/types/workflowHistory';
diff --git a/packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryContent.vue b/packages/frontend/editor-ui/src/components/WorkflowHistory/WorkflowHistoryContent.vue
similarity index 100%
rename from packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryContent.vue
rename to packages/frontend/editor-ui/src/components/WorkflowHistory/WorkflowHistoryContent.vue
diff --git a/packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryList.test.ts b/packages/frontend/editor-ui/src/components/WorkflowHistory/WorkflowHistoryList.test.ts
similarity index 98%
rename from packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryList.test.ts
rename to packages/frontend/editor-ui/src/components/WorkflowHistory/WorkflowHistoryList.test.ts
index 24f618b55b..edc2e09c6d 100644
--- a/packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryList.test.ts
+++ b/packages/frontend/editor-ui/src/components/WorkflowHistory/WorkflowHistoryList.test.ts
@@ -2,7 +2,7 @@ import { within } from '@testing-library/vue';
 import userEvent from '@testing-library/user-event';
 import { createPinia, setActivePinia } from 'pinia';
 import { faker } from '@faker-js/faker';
-import type { UserAction } from 'n8n-design-system';
+import type { UserAction } from '@n8n/design-system';
 import { createComponentRenderer } from '@/__tests__/render';
 import WorkflowHistoryList from '@/components/WorkflowHistory/WorkflowHistoryList.vue';
 import type { WorkflowHistoryActionTypes } from '@/types/workflowHistory';
diff --git a/packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryList.vue b/packages/frontend/editor-ui/src/components/WorkflowHistory/WorkflowHistoryList.vue
similarity index 98%
rename from packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryList.vue
rename to packages/frontend/editor-ui/src/components/WorkflowHistory/WorkflowHistoryList.vue
index 839722c01b..34a01fc581 100644
--- a/packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryList.vue
+++ b/packages/frontend/editor-ui/src/components/WorkflowHistory/WorkflowHistoryList.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { ref } from 'vue';
-import type { UserAction } from 'n8n-design-system';
+import type { UserAction } from '@n8n/design-system';
 import { useI18n } from '@/composables/useI18n';
 import type {
 	WorkflowHistory,
diff --git a/packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryListItem.test.ts b/packages/frontend/editor-ui/src/components/WorkflowHistory/WorkflowHistoryListItem.test.ts
similarity index 98%
rename from packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryListItem.test.ts
rename to packages/frontend/editor-ui/src/components/WorkflowHistory/WorkflowHistoryListItem.test.ts
index ab84d2c535..ffd2ad5586 100644
--- a/packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryListItem.test.ts
+++ b/packages/frontend/editor-ui/src/components/WorkflowHistory/WorkflowHistoryListItem.test.ts
@@ -1,6 +1,6 @@
 import { createPinia, setActivePinia } from 'pinia';
 import userEvent from '@testing-library/user-event';
-import type { UserAction } from 'n8n-design-system';
+import type { UserAction } from '@n8n/design-system';
 import { createComponentRenderer } from '@/__tests__/render';
 import WorkflowHistoryListItem from '@/components/WorkflowHistory/WorkflowHistoryListItem.vue';
 import type { WorkflowHistoryActionTypes } from '@/types/workflowHistory';
diff --git a/packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryListItem.vue b/packages/frontend/editor-ui/src/components/WorkflowHistory/WorkflowHistoryListItem.vue
similarity index 98%
rename from packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryListItem.vue
rename to packages/frontend/editor-ui/src/components/WorkflowHistory/WorkflowHistoryListItem.vue
index e4b0b97bf9..9bcf67c737 100644
--- a/packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryListItem.vue
+++ b/packages/frontend/editor-ui/src/components/WorkflowHistory/WorkflowHistoryListItem.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { computed, ref, onMounted } from 'vue';
 import dateformat from 'dateformat';
-import type { UserAction } from 'n8n-design-system';
+import type { UserAction } from '@n8n/design-system';
 import type {
 	WorkflowHistory,
 	WorkflowVersionId,
diff --git a/packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryVersionRestoreModal.vue b/packages/frontend/editor-ui/src/components/WorkflowHistory/WorkflowHistoryVersionRestoreModal.vue
similarity index 100%
rename from packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryVersionRestoreModal.vue
rename to packages/frontend/editor-ui/src/components/WorkflowHistory/WorkflowHistoryVersionRestoreModal.vue
diff --git a/packages/editor-ui/src/components/WorkflowPreview.test.ts b/packages/frontend/editor-ui/src/components/WorkflowPreview.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/WorkflowPreview.test.ts
rename to packages/frontend/editor-ui/src/components/WorkflowPreview.test.ts
diff --git a/packages/editor-ui/src/components/WorkflowPreview.vue b/packages/frontend/editor-ui/src/components/WorkflowPreview.vue
similarity index 100%
rename from packages/editor-ui/src/components/WorkflowPreview.vue
rename to packages/frontend/editor-ui/src/components/WorkflowPreview.vue
diff --git a/packages/editor-ui/src/components/WorkflowSelectorParameterInput/WorkflowSelectorParameterInput.vue b/packages/frontend/editor-ui/src/components/WorkflowSelectorParameterInput/WorkflowSelectorParameterInput.vue
similarity index 100%
rename from packages/editor-ui/src/components/WorkflowSelectorParameterInput/WorkflowSelectorParameterInput.vue
rename to packages/frontend/editor-ui/src/components/WorkflowSelectorParameterInput/WorkflowSelectorParameterInput.vue
diff --git a/packages/editor-ui/src/components/WorkflowSelectorParameterInput/useWorkflowResourceLocatorDropdown.ts b/packages/frontend/editor-ui/src/components/WorkflowSelectorParameterInput/useWorkflowResourceLocatorDropdown.ts
similarity index 100%
rename from packages/editor-ui/src/components/WorkflowSelectorParameterInput/useWorkflowResourceLocatorDropdown.ts
rename to packages/frontend/editor-ui/src/components/WorkflowSelectorParameterInput/useWorkflowResourceLocatorDropdown.ts
diff --git a/packages/editor-ui/src/components/WorkflowSelectorParameterInput/useWorkflowResourceLocatorModes.ts b/packages/frontend/editor-ui/src/components/WorkflowSelectorParameterInput/useWorkflowResourceLocatorModes.ts
similarity index 100%
rename from packages/editor-ui/src/components/WorkflowSelectorParameterInput/useWorkflowResourceLocatorModes.ts
rename to packages/frontend/editor-ui/src/components/WorkflowSelectorParameterInput/useWorkflowResourceLocatorModes.ts
diff --git a/packages/editor-ui/src/components/WorkflowSelectorParameterInput/useWorkflowResourcesLocator.ts b/packages/frontend/editor-ui/src/components/WorkflowSelectorParameterInput/useWorkflowResourcesLocator.ts
similarity index 100%
rename from packages/editor-ui/src/components/WorkflowSelectorParameterInput/useWorkflowResourcesLocator.ts
rename to packages/frontend/editor-ui/src/components/WorkflowSelectorParameterInput/useWorkflowResourcesLocator.ts
diff --git a/packages/editor-ui/src/components/WorkflowSettings.test.ts b/packages/frontend/editor-ui/src/components/WorkflowSettings.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/WorkflowSettings.test.ts
rename to packages/frontend/editor-ui/src/components/WorkflowSettings.test.ts
diff --git a/packages/editor-ui/src/components/WorkflowSettings.vue b/packages/frontend/editor-ui/src/components/WorkflowSettings.vue
similarity index 100%
rename from packages/editor-ui/src/components/WorkflowSettings.vue
rename to packages/frontend/editor-ui/src/components/WorkflowSettings.vue
diff --git a/packages/editor-ui/src/components/WorkflowShareModal.ee.vue b/packages/frontend/editor-ui/src/components/WorkflowShareModal.ee.vue
similarity index 100%
rename from packages/editor-ui/src/components/WorkflowShareModal.ee.vue
rename to packages/frontend/editor-ui/src/components/WorkflowShareModal.ee.vue
diff --git a/packages/editor-ui/src/components/WorkflowTagsContainer.vue b/packages/frontend/editor-ui/src/components/WorkflowTagsContainer.vue
similarity index 100%
rename from packages/editor-ui/src/components/WorkflowTagsContainer.vue
rename to packages/frontend/editor-ui/src/components/WorkflowTagsContainer.vue
diff --git a/packages/editor-ui/src/components/WorkflowTagsDropdown.vue b/packages/frontend/editor-ui/src/components/WorkflowTagsDropdown.vue
similarity index 100%
rename from packages/editor-ui/src/components/WorkflowTagsDropdown.vue
rename to packages/frontend/editor-ui/src/components/WorkflowTagsDropdown.vue
diff --git a/packages/editor-ui/src/components/__snapshots__/ChangePasswordModal.test.ts.snap b/packages/frontend/editor-ui/src/components/__snapshots__/ChangePasswordModal.test.ts.snap
similarity index 100%
rename from packages/editor-ui/src/components/__snapshots__/ChangePasswordModal.test.ts.snap
rename to packages/frontend/editor-ui/src/components/__snapshots__/ChangePasswordModal.test.ts.snap
diff --git a/packages/editor-ui/src/components/__snapshots__/InputPanel.test.ts.snap b/packages/frontend/editor-ui/src/components/__snapshots__/InputPanel.test.ts.snap
similarity index 98%
rename from packages/editor-ui/src/components/__snapshots__/InputPanel.test.ts.snap
rename to packages/frontend/editor-ui/src/components/__snapshots__/InputPanel.test.ts.snap
index d69e86aec3..4b43ea2b07 100644
--- a/packages/editor-ui/src/components/__snapshots__/InputPanel.test.ts.snap
+++ b/packages/frontend/editor-ui/src/components/__snapshots__/InputPanel.test.ts.snap
@@ -165,7 +165,7 @@ exports[`InputPanel > should render 1`] = `
       appear="false"
       class="uiBlocker"
       css="true"
-      data-v-249d9307=""
+      data-v-1a77a378=""
       data-v-2e5cd75c=""
       mode="out-in"
       name="fade"
@@ -174,7 +174,7 @@ exports[`InputPanel > should render 1`] = `
       <div
         aria-hidden="true"
         class="n8n-block-ui uiBlocker"
-        data-v-249d9307=""
+        data-v-1a77a378=""
         role="dialog"
         style="display: none;"
       />
diff --git a/packages/editor-ui/src/components/__snapshots__/MultipleParameter.test.ts.snap b/packages/frontend/editor-ui/src/components/__snapshots__/MultipleParameter.test.ts.snap
similarity index 100%
rename from packages/editor-ui/src/components/__snapshots__/MultipleParameter.test.ts.snap
rename to packages/frontend/editor-ui/src/components/__snapshots__/MultipleParameter.test.ts.snap
diff --git a/packages/editor-ui/src/components/__snapshots__/PushConnectionTracker.test.ts.snap b/packages/frontend/editor-ui/src/components/__snapshots__/PushConnectionTracker.test.ts.snap
similarity index 100%
rename from packages/editor-ui/src/components/__snapshots__/PushConnectionTracker.test.ts.snap
rename to packages/frontend/editor-ui/src/components/__snapshots__/PushConnectionTracker.test.ts.snap
diff --git a/packages/editor-ui/src/components/__snapshots__/RunDataJson.test.ts.snap b/packages/frontend/editor-ui/src/components/__snapshots__/RunDataJson.test.ts.snap
similarity index 100%
rename from packages/editor-ui/src/components/__snapshots__/RunDataJson.test.ts.snap
rename to packages/frontend/editor-ui/src/components/__snapshots__/RunDataJson.test.ts.snap
diff --git a/packages/editor-ui/src/components/__snapshots__/VirtualSchema.test.ts.snap b/packages/frontend/editor-ui/src/components/__snapshots__/VirtualSchema.test.ts.snap
similarity index 100%
rename from packages/editor-ui/src/components/__snapshots__/VirtualSchema.test.ts.snap
rename to packages/frontend/editor-ui/src/components/__snapshots__/VirtualSchema.test.ts.snap
diff --git a/packages/editor-ui/src/components/__tests__/utils/ResourceMapper.utils.ts b/packages/frontend/editor-ui/src/components/__tests__/utils/ResourceMapper.utils.ts
similarity index 100%
rename from packages/editor-ui/src/components/__tests__/utils/ResourceMapper.utils.ts
rename to packages/frontend/editor-ui/src/components/__tests__/utils/ResourceMapper.utils.ts
diff --git a/packages/editor-ui/src/components/banners/BannerStack.vue b/packages/frontend/editor-ui/src/components/banners/BannerStack.vue
similarity index 100%
rename from packages/editor-ui/src/components/banners/BannerStack.vue
rename to packages/frontend/editor-ui/src/components/banners/BannerStack.vue
diff --git a/packages/editor-ui/src/components/banners/BaseBanner.vue b/packages/frontend/editor-ui/src/components/banners/BaseBanner.vue
similarity index 100%
rename from packages/editor-ui/src/components/banners/BaseBanner.vue
rename to packages/frontend/editor-ui/src/components/banners/BaseBanner.vue
diff --git a/packages/editor-ui/src/components/banners/EmailConfirmationBanner.vue b/packages/frontend/editor-ui/src/components/banners/EmailConfirmationBanner.vue
similarity index 100%
rename from packages/editor-ui/src/components/banners/EmailConfirmationBanner.vue
rename to packages/frontend/editor-ui/src/components/banners/EmailConfirmationBanner.vue
diff --git a/packages/editor-ui/src/components/banners/NonProductionLicenseBanner.vue b/packages/frontend/editor-ui/src/components/banners/NonProductionLicenseBanner.vue
similarity index 100%
rename from packages/editor-ui/src/components/banners/NonProductionLicenseBanner.vue
rename to packages/frontend/editor-ui/src/components/banners/NonProductionLicenseBanner.vue
diff --git a/packages/editor-ui/src/components/banners/TrialBanner.vue b/packages/frontend/editor-ui/src/components/banners/TrialBanner.vue
similarity index 100%
rename from packages/editor-ui/src/components/banners/TrialBanner.vue
rename to packages/frontend/editor-ui/src/components/banners/TrialBanner.vue
diff --git a/packages/editor-ui/src/components/banners/TrialOverBanner.vue b/packages/frontend/editor-ui/src/components/banners/TrialOverBanner.vue
similarity index 100%
rename from packages/editor-ui/src/components/banners/TrialOverBanner.vue
rename to packages/frontend/editor-ui/src/components/banners/TrialOverBanner.vue
diff --git a/packages/editor-ui/src/components/banners/V1Banner.test.ts b/packages/frontend/editor-ui/src/components/banners/V1Banner.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/banners/V1Banner.test.ts
rename to packages/frontend/editor-ui/src/components/banners/V1Banner.test.ts
diff --git a/packages/editor-ui/src/components/banners/V1Banner.vue b/packages/frontend/editor-ui/src/components/banners/V1Banner.vue
similarity index 100%
rename from packages/editor-ui/src/components/banners/V1Banner.vue
rename to packages/frontend/editor-ui/src/components/banners/V1Banner.vue
diff --git a/packages/editor-ui/src/components/banners/__snapshots__/V1Banner.test.ts.snap b/packages/frontend/editor-ui/src/components/banners/__snapshots__/V1Banner.test.ts.snap
similarity index 100%
rename from packages/editor-ui/src/components/banners/__snapshots__/V1Banner.test.ts.snap
rename to packages/frontend/editor-ui/src/components/banners/__snapshots__/V1Banner.test.ts.snap
diff --git a/packages/editor-ui/src/components/canvas/Canvas.test.ts b/packages/frontend/editor-ui/src/components/canvas/Canvas.test.ts
similarity index 99%
rename from packages/editor-ui/src/components/canvas/Canvas.test.ts
rename to packages/frontend/editor-ui/src/components/canvas/Canvas.test.ts
index ec8a3f36ca..c40d75c6be 100644
--- a/packages/editor-ui/src/components/canvas/Canvas.test.ts
+++ b/packages/frontend/editor-ui/src/components/canvas/Canvas.test.ts
@@ -14,7 +14,7 @@ const matchMedia = global.window.matchMedia;
 global.window = jsdom.window as unknown as Window & typeof globalThis;
 global.window.matchMedia = matchMedia;
 
-vi.mock('n8n-design-system', async (importOriginal) => {
+vi.mock('@n8n/design-system', async (importOriginal) => {
 	const actual = await importOriginal<typeof useDeviceSupport>();
 	return { ...actual, useDeviceSupport: vi.fn(() => ({ isCtrlKeyPressed: vi.fn() })) };
 });
diff --git a/packages/editor-ui/src/components/canvas/Canvas.vue b/packages/frontend/editor-ui/src/components/canvas/Canvas.vue
similarity index 100%
rename from packages/editor-ui/src/components/canvas/Canvas.vue
rename to packages/frontend/editor-ui/src/components/canvas/Canvas.vue
diff --git a/packages/editor-ui/src/components/canvas/WorkflowCanvas.test.ts b/packages/frontend/editor-ui/src/components/canvas/WorkflowCanvas.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/canvas/WorkflowCanvas.test.ts
rename to packages/frontend/editor-ui/src/components/canvas/WorkflowCanvas.test.ts
diff --git a/packages/editor-ui/src/components/canvas/WorkflowCanvas.vue b/packages/frontend/editor-ui/src/components/canvas/WorkflowCanvas.vue
similarity index 100%
rename from packages/editor-ui/src/components/canvas/WorkflowCanvas.vue
rename to packages/frontend/editor-ui/src/components/canvas/WorkflowCanvas.vue
diff --git a/packages/editor-ui/src/components/canvas/elements/background/CanvasBackground.test.ts b/packages/frontend/editor-ui/src/components/canvas/elements/background/CanvasBackground.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/background/CanvasBackground.test.ts
rename to packages/frontend/editor-ui/src/components/canvas/elements/background/CanvasBackground.test.ts
diff --git a/packages/editor-ui/src/components/canvas/elements/background/CanvasBackground.vue b/packages/frontend/editor-ui/src/components/canvas/elements/background/CanvasBackground.vue
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/background/CanvasBackground.vue
rename to packages/frontend/editor-ui/src/components/canvas/elements/background/CanvasBackground.vue
diff --git a/packages/editor-ui/src/components/canvas/elements/background/CanvasBackgroundStripedPattern.vue b/packages/frontend/editor-ui/src/components/canvas/elements/background/CanvasBackgroundStripedPattern.vue
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/background/CanvasBackgroundStripedPattern.vue
rename to packages/frontend/editor-ui/src/components/canvas/elements/background/CanvasBackgroundStripedPattern.vue
diff --git a/packages/editor-ui/src/components/canvas/elements/background/__snapshots__/CanvasBackground.test.ts.snap b/packages/frontend/editor-ui/src/components/canvas/elements/background/__snapshots__/CanvasBackground.test.ts.snap
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/background/__snapshots__/CanvasBackground.test.ts.snap
rename to packages/frontend/editor-ui/src/components/canvas/elements/background/__snapshots__/CanvasBackground.test.ts.snap
diff --git a/packages/editor-ui/src/components/canvas/elements/buttons/CanvasChatButton.test.ts b/packages/frontend/editor-ui/src/components/canvas/elements/buttons/CanvasChatButton.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/buttons/CanvasChatButton.test.ts
rename to packages/frontend/editor-ui/src/components/canvas/elements/buttons/CanvasChatButton.test.ts
diff --git a/packages/editor-ui/src/components/canvas/elements/buttons/CanvasChatButton.vue b/packages/frontend/editor-ui/src/components/canvas/elements/buttons/CanvasChatButton.vue
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/buttons/CanvasChatButton.vue
rename to packages/frontend/editor-ui/src/components/canvas/elements/buttons/CanvasChatButton.vue
diff --git a/packages/editor-ui/src/components/canvas/elements/buttons/CanvasClearExecutionDataButton.test.ts b/packages/frontend/editor-ui/src/components/canvas/elements/buttons/CanvasClearExecutionDataButton.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/buttons/CanvasClearExecutionDataButton.test.ts
rename to packages/frontend/editor-ui/src/components/canvas/elements/buttons/CanvasClearExecutionDataButton.test.ts
diff --git a/packages/editor-ui/src/components/canvas/elements/buttons/CanvasClearExecutionDataButton.vue b/packages/frontend/editor-ui/src/components/canvas/elements/buttons/CanvasClearExecutionDataButton.vue
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/buttons/CanvasClearExecutionDataButton.vue
rename to packages/frontend/editor-ui/src/components/canvas/elements/buttons/CanvasClearExecutionDataButton.vue
diff --git a/packages/editor-ui/src/components/canvas/elements/buttons/CanvasControlButtons.test.ts b/packages/frontend/editor-ui/src/components/canvas/elements/buttons/CanvasControlButtons.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/buttons/CanvasControlButtons.test.ts
rename to packages/frontend/editor-ui/src/components/canvas/elements/buttons/CanvasControlButtons.test.ts
diff --git a/packages/editor-ui/src/components/canvas/elements/buttons/CanvasControlButtons.vue b/packages/frontend/editor-ui/src/components/canvas/elements/buttons/CanvasControlButtons.vue
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/buttons/CanvasControlButtons.vue
rename to packages/frontend/editor-ui/src/components/canvas/elements/buttons/CanvasControlButtons.vue
diff --git a/packages/editor-ui/src/components/canvas/elements/buttons/CanvasRunWorkflowButton.test.ts b/packages/frontend/editor-ui/src/components/canvas/elements/buttons/CanvasRunWorkflowButton.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/buttons/CanvasRunWorkflowButton.test.ts
rename to packages/frontend/editor-ui/src/components/canvas/elements/buttons/CanvasRunWorkflowButton.test.ts
diff --git a/packages/editor-ui/src/components/canvas/elements/buttons/CanvasRunWorkflowButton.vue b/packages/frontend/editor-ui/src/components/canvas/elements/buttons/CanvasRunWorkflowButton.vue
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/buttons/CanvasRunWorkflowButton.vue
rename to packages/frontend/editor-ui/src/components/canvas/elements/buttons/CanvasRunWorkflowButton.vue
diff --git a/packages/editor-ui/src/components/canvas/elements/buttons/CanvasStopCurrentExecutionButton.test.ts b/packages/frontend/editor-ui/src/components/canvas/elements/buttons/CanvasStopCurrentExecutionButton.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/buttons/CanvasStopCurrentExecutionButton.test.ts
rename to packages/frontend/editor-ui/src/components/canvas/elements/buttons/CanvasStopCurrentExecutionButton.test.ts
diff --git a/packages/editor-ui/src/components/canvas/elements/buttons/CanvasStopCurrentExecutionButton.vue b/packages/frontend/editor-ui/src/components/canvas/elements/buttons/CanvasStopCurrentExecutionButton.vue
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/buttons/CanvasStopCurrentExecutionButton.vue
rename to packages/frontend/editor-ui/src/components/canvas/elements/buttons/CanvasStopCurrentExecutionButton.vue
diff --git a/packages/editor-ui/src/components/canvas/elements/buttons/CanvasStopWaitingForWebhookButton.test.ts b/packages/frontend/editor-ui/src/components/canvas/elements/buttons/CanvasStopWaitingForWebhookButton.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/buttons/CanvasStopWaitingForWebhookButton.test.ts
rename to packages/frontend/editor-ui/src/components/canvas/elements/buttons/CanvasStopWaitingForWebhookButton.test.ts
diff --git a/packages/editor-ui/src/components/canvas/elements/buttons/CanvasStopWaitingForWebhookButton.vue b/packages/frontend/editor-ui/src/components/canvas/elements/buttons/CanvasStopWaitingForWebhookButton.vue
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/buttons/CanvasStopWaitingForWebhookButton.vue
rename to packages/frontend/editor-ui/src/components/canvas/elements/buttons/CanvasStopWaitingForWebhookButton.vue
diff --git a/packages/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasChatButton.test.ts.snap b/packages/frontend/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasChatButton.test.ts.snap
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasChatButton.test.ts.snap
rename to packages/frontend/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasChatButton.test.ts.snap
diff --git a/packages/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasClearExecutionDataButton.test.ts.snap b/packages/frontend/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasClearExecutionDataButton.test.ts.snap
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasClearExecutionDataButton.test.ts.snap
rename to packages/frontend/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasClearExecutionDataButton.test.ts.snap
diff --git a/packages/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasControlButtons.test.ts.snap b/packages/frontend/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasControlButtons.test.ts.snap
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasControlButtons.test.ts.snap
rename to packages/frontend/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasControlButtons.test.ts.snap
diff --git a/packages/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasExecuteWorkflowButton.test.ts.snap b/packages/frontend/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasExecuteWorkflowButton.test.ts.snap
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasExecuteWorkflowButton.test.ts.snap
rename to packages/frontend/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasExecuteWorkflowButton.test.ts.snap
diff --git a/packages/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasRunWorkflowButton.test.ts.snap b/packages/frontend/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasRunWorkflowButton.test.ts.snap
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasRunWorkflowButton.test.ts.snap
rename to packages/frontend/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasRunWorkflowButton.test.ts.snap
diff --git a/packages/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasStopCurrentExecutionButton.test.ts.snap b/packages/frontend/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasStopCurrentExecutionButton.test.ts.snap
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasStopCurrentExecutionButton.test.ts.snap
rename to packages/frontend/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasStopCurrentExecutionButton.test.ts.snap
diff --git a/packages/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasStopWaitingForWebhookButton.test.ts.snap b/packages/frontend/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasStopWaitingForWebhookButton.test.ts.snap
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasStopWaitingForWebhookButton.test.ts.snap
rename to packages/frontend/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasStopWaitingForWebhookButton.test.ts.snap
diff --git a/packages/editor-ui/src/components/canvas/elements/edges/CanvasArrowHeadMarker.vue b/packages/frontend/editor-ui/src/components/canvas/elements/edges/CanvasArrowHeadMarker.vue
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/edges/CanvasArrowHeadMarker.vue
rename to packages/frontend/editor-ui/src/components/canvas/elements/edges/CanvasArrowHeadMarker.vue
diff --git a/packages/editor-ui/src/components/canvas/elements/edges/CanvasConnectionLine.test.ts b/packages/frontend/editor-ui/src/components/canvas/elements/edges/CanvasConnectionLine.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/edges/CanvasConnectionLine.test.ts
rename to packages/frontend/editor-ui/src/components/canvas/elements/edges/CanvasConnectionLine.test.ts
diff --git a/packages/editor-ui/src/components/canvas/elements/edges/CanvasConnectionLine.vue b/packages/frontend/editor-ui/src/components/canvas/elements/edges/CanvasConnectionLine.vue
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/edges/CanvasConnectionLine.vue
rename to packages/frontend/editor-ui/src/components/canvas/elements/edges/CanvasConnectionLine.vue
diff --git a/packages/editor-ui/src/components/canvas/elements/edges/CanvasEdge.test.ts b/packages/frontend/editor-ui/src/components/canvas/elements/edges/CanvasEdge.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/edges/CanvasEdge.test.ts
rename to packages/frontend/editor-ui/src/components/canvas/elements/edges/CanvasEdge.test.ts
diff --git a/packages/editor-ui/src/components/canvas/elements/edges/CanvasEdge.vue b/packages/frontend/editor-ui/src/components/canvas/elements/edges/CanvasEdge.vue
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/edges/CanvasEdge.vue
rename to packages/frontend/editor-ui/src/components/canvas/elements/edges/CanvasEdge.vue
diff --git a/packages/editor-ui/src/components/canvas/elements/edges/CanvasEdgeToolbar.test.ts b/packages/frontend/editor-ui/src/components/canvas/elements/edges/CanvasEdgeToolbar.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/edges/CanvasEdgeToolbar.test.ts
rename to packages/frontend/editor-ui/src/components/canvas/elements/edges/CanvasEdgeToolbar.test.ts
diff --git a/packages/editor-ui/src/components/canvas/elements/edges/CanvasEdgeToolbar.vue b/packages/frontend/editor-ui/src/components/canvas/elements/edges/CanvasEdgeToolbar.vue
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/edges/CanvasEdgeToolbar.vue
rename to packages/frontend/editor-ui/src/components/canvas/elements/edges/CanvasEdgeToolbar.vue
diff --git a/packages/editor-ui/src/components/canvas/elements/edges/utils/getEdgeRenderData.ts b/packages/frontend/editor-ui/src/components/canvas/elements/edges/utils/getEdgeRenderData.ts
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/edges/utils/getEdgeRenderData.ts
rename to packages/frontend/editor-ui/src/components/canvas/elements/edges/utils/getEdgeRenderData.ts
diff --git a/packages/editor-ui/src/components/canvas/elements/edges/utils/index.ts b/packages/frontend/editor-ui/src/components/canvas/elements/edges/utils/index.ts
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/edges/utils/index.ts
rename to packages/frontend/editor-ui/src/components/canvas/elements/edges/utils/index.ts
diff --git a/packages/editor-ui/src/components/canvas/elements/handles/CanvasHandleRenderer.test.ts b/packages/frontend/editor-ui/src/components/canvas/elements/handles/CanvasHandleRenderer.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/handles/CanvasHandleRenderer.test.ts
rename to packages/frontend/editor-ui/src/components/canvas/elements/handles/CanvasHandleRenderer.test.ts
diff --git a/packages/editor-ui/src/components/canvas/elements/handles/CanvasHandleRenderer.vue b/packages/frontend/editor-ui/src/components/canvas/elements/handles/CanvasHandleRenderer.vue
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/handles/CanvasHandleRenderer.vue
rename to packages/frontend/editor-ui/src/components/canvas/elements/handles/CanvasHandleRenderer.vue
diff --git a/packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleMainInput.test.ts b/packages/frontend/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleMainInput.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleMainInput.test.ts
rename to packages/frontend/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleMainInput.test.ts
diff --git a/packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleMainInput.vue b/packages/frontend/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleMainInput.vue
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleMainInput.vue
rename to packages/frontend/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleMainInput.vue
diff --git a/packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleMainOutput.test.ts b/packages/frontend/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleMainOutput.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleMainOutput.test.ts
rename to packages/frontend/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleMainOutput.test.ts
diff --git a/packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleMainOutput.vue b/packages/frontend/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleMainOutput.vue
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleMainOutput.vue
rename to packages/frontend/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleMainOutput.vue
diff --git a/packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleNonMainInput.test.ts b/packages/frontend/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleNonMainInput.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleNonMainInput.test.ts
rename to packages/frontend/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleNonMainInput.test.ts
diff --git a/packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleNonMainInput.vue b/packages/frontend/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleNonMainInput.vue
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleNonMainInput.vue
rename to packages/frontend/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleNonMainInput.vue
diff --git a/packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleNonMainOutput.test.ts b/packages/frontend/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleNonMainOutput.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleNonMainOutput.test.ts
rename to packages/frontend/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleNonMainOutput.test.ts
diff --git a/packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleNonMainOutput.vue b/packages/frontend/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleNonMainOutput.vue
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleNonMainOutput.vue
rename to packages/frontend/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleNonMainOutput.vue
diff --git a/packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandleDiamond.test.ts b/packages/frontend/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandleDiamond.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandleDiamond.test.ts
rename to packages/frontend/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandleDiamond.test.ts
diff --git a/packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandleDiamond.vue b/packages/frontend/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandleDiamond.vue
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandleDiamond.vue
rename to packages/frontend/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandleDiamond.vue
diff --git a/packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandleDot.test.ts b/packages/frontend/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandleDot.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandleDot.test.ts
rename to packages/frontend/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandleDot.test.ts
diff --git a/packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandleDot.vue b/packages/frontend/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandleDot.vue
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandleDot.vue
rename to packages/frontend/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandleDot.vue
diff --git a/packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandlePlus.test.ts b/packages/frontend/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandlePlus.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandlePlus.test.ts
rename to packages/frontend/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandlePlus.test.ts
diff --git a/packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandlePlus.vue b/packages/frontend/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandlePlus.vue
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandlePlus.vue
rename to packages/frontend/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandlePlus.vue
diff --git a/packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandleRectangle.test.ts b/packages/frontend/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandleRectangle.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandleRectangle.test.ts
rename to packages/frontend/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandleRectangle.test.ts
diff --git a/packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandleRectangle.vue b/packages/frontend/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandleRectangle.vue
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandleRectangle.vue
rename to packages/frontend/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandleRectangle.vue
diff --git a/packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/__snapshots__/CanvasHandleDiamond.test.ts.snap b/packages/frontend/editor-ui/src/components/canvas/elements/handles/render-types/parts/__snapshots__/CanvasHandleDiamond.test.ts.snap
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/__snapshots__/CanvasHandleDiamond.test.ts.snap
rename to packages/frontend/editor-ui/src/components/canvas/elements/handles/render-types/parts/__snapshots__/CanvasHandleDiamond.test.ts.snap
diff --git a/packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/__snapshots__/CanvasHandleDot.test.ts.snap b/packages/frontend/editor-ui/src/components/canvas/elements/handles/render-types/parts/__snapshots__/CanvasHandleDot.test.ts.snap
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/__snapshots__/CanvasHandleDot.test.ts.snap
rename to packages/frontend/editor-ui/src/components/canvas/elements/handles/render-types/parts/__snapshots__/CanvasHandleDot.test.ts.snap
diff --git a/packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/__snapshots__/CanvasHandlePlus.test.ts.snap b/packages/frontend/editor-ui/src/components/canvas/elements/handles/render-types/parts/__snapshots__/CanvasHandlePlus.test.ts.snap
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/__snapshots__/CanvasHandlePlus.test.ts.snap
rename to packages/frontend/editor-ui/src/components/canvas/elements/handles/render-types/parts/__snapshots__/CanvasHandlePlus.test.ts.snap
diff --git a/packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/__snapshots__/CanvasHandleRectangle.test.ts.snap b/packages/frontend/editor-ui/src/components/canvas/elements/handles/render-types/parts/__snapshots__/CanvasHandleRectangle.test.ts.snap
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/__snapshots__/CanvasHandleRectangle.test.ts.snap
rename to packages/frontend/editor-ui/src/components/canvas/elements/handles/render-types/parts/__snapshots__/CanvasHandleRectangle.test.ts.snap
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNode.test.ts b/packages/frontend/editor-ui/src/components/canvas/elements/nodes/CanvasNode.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/nodes/CanvasNode.test.ts
rename to packages/frontend/editor-ui/src/components/canvas/elements/nodes/CanvasNode.test.ts
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNode.vue b/packages/frontend/editor-ui/src/components/canvas/elements/nodes/CanvasNode.vue
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/nodes/CanvasNode.vue
rename to packages/frontend/editor-ui/src/components/canvas/elements/nodes/CanvasNode.vue
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNodeRenderer.test.ts b/packages/frontend/editor-ui/src/components/canvas/elements/nodes/CanvasNodeRenderer.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/nodes/CanvasNodeRenderer.test.ts
rename to packages/frontend/editor-ui/src/components/canvas/elements/nodes/CanvasNodeRenderer.test.ts
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNodeRenderer.vue b/packages/frontend/editor-ui/src/components/canvas/elements/nodes/CanvasNodeRenderer.vue
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/nodes/CanvasNodeRenderer.vue
rename to packages/frontend/editor-ui/src/components/canvas/elements/nodes/CanvasNodeRenderer.vue
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNodeToolbar.test.ts b/packages/frontend/editor-ui/src/components/canvas/elements/nodes/CanvasNodeToolbar.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/nodes/CanvasNodeToolbar.test.ts
rename to packages/frontend/editor-ui/src/components/canvas/elements/nodes/CanvasNodeToolbar.test.ts
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNodeToolbar.vue b/packages/frontend/editor-ui/src/components/canvas/elements/nodes/CanvasNodeToolbar.vue
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/nodes/CanvasNodeToolbar.vue
rename to packages/frontend/editor-ui/src/components/canvas/elements/nodes/CanvasNodeToolbar.vue
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeAddNodes.vue b/packages/frontend/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeAddNodes.vue
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeAddNodes.vue
rename to packages/frontend/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeAddNodes.vue
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeDefault.test.ts b/packages/frontend/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeDefault.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeDefault.test.ts
rename to packages/frontend/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeDefault.test.ts
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeDefault.vue b/packages/frontend/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeDefault.vue
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeDefault.vue
rename to packages/frontend/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeDefault.vue
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeStickyNote.test.ts b/packages/frontend/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeStickyNote.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeStickyNote.test.ts
rename to packages/frontend/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeStickyNote.test.ts
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeStickyNote.vue b/packages/frontend/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeStickyNote.vue
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeStickyNote.vue
rename to packages/frontend/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeStickyNote.vue
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/__snapshots__/CanvasNodeDefault.test.ts.snap b/packages/frontend/editor-ui/src/components/canvas/elements/nodes/render-types/__snapshots__/CanvasNodeDefault.test.ts.snap
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/nodes/render-types/__snapshots__/CanvasNodeDefault.test.ts.snap
rename to packages/frontend/editor-ui/src/components/canvas/elements/nodes/render-types/__snapshots__/CanvasNodeDefault.test.ts.snap
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/__snapshots__/CanvasNodeStickyNote.test.ts.snap b/packages/frontend/editor-ui/src/components/canvas/elements/nodes/render-types/__snapshots__/CanvasNodeStickyNote.test.ts.snap
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/nodes/render-types/__snapshots__/CanvasNodeStickyNote.test.ts.snap
rename to packages/frontend/editor-ui/src/components/canvas/elements/nodes/render-types/__snapshots__/CanvasNodeStickyNote.test.ts.snap
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeDisabledStrikeThrough.test.ts b/packages/frontend/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeDisabledStrikeThrough.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeDisabledStrikeThrough.test.ts
rename to packages/frontend/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeDisabledStrikeThrough.test.ts
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeDisabledStrikeThrough.vue b/packages/frontend/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeDisabledStrikeThrough.vue
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeDisabledStrikeThrough.vue
rename to packages/frontend/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeDisabledStrikeThrough.vue
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeStatusIcons.test.ts b/packages/frontend/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeStatusIcons.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeStatusIcons.test.ts
rename to packages/frontend/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeStatusIcons.test.ts
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeStatusIcons.vue b/packages/frontend/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeStatusIcons.vue
similarity index 98%
rename from packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeStatusIcons.vue
rename to packages/frontend/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeStatusIcons.vue
index 32a23cc42b..0d400bc9e1 100644
--- a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeStatusIcons.vue
+++ b/packages/frontend/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeStatusIcons.vue
@@ -5,7 +5,7 @@ import { useNodeHelpers } from '@/composables/useNodeHelpers';
 import { useCanvasNode } from '@/composables/useCanvasNode';
 import { useI18n } from '@/composables/useI18n';
 import { CanvasNodeDirtiness, CanvasNodeRenderType } from '@/types';
-import { N8nTooltip } from 'n8n-design-system';
+import { N8nTooltip } from '@n8n/design-system';
 
 const nodeHelpers = useNodeHelpers();
 const i18n = useI18n();
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeTooltip.test.ts b/packages/frontend/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeTooltip.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeTooltip.test.ts
rename to packages/frontend/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeTooltip.test.ts
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeTooltip.vue b/packages/frontend/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeTooltip.vue
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeTooltip.vue
rename to packages/frontend/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeTooltip.vue
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeTrigger.vue b/packages/frontend/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeTrigger.vue
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeTrigger.vue
rename to packages/frontend/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeTrigger.vue
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/toolbar/CanvasNodeStickyColorSelector.test.ts b/packages/frontend/editor-ui/src/components/canvas/elements/nodes/toolbar/CanvasNodeStickyColorSelector.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/nodes/toolbar/CanvasNodeStickyColorSelector.test.ts
rename to packages/frontend/editor-ui/src/components/canvas/elements/nodes/toolbar/CanvasNodeStickyColorSelector.test.ts
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/toolbar/CanvasNodeStickyColorSelector.vue b/packages/frontend/editor-ui/src/components/canvas/elements/nodes/toolbar/CanvasNodeStickyColorSelector.vue
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/nodes/toolbar/CanvasNodeStickyColorSelector.vue
rename to packages/frontend/editor-ui/src/components/canvas/elements/nodes/toolbar/CanvasNodeStickyColorSelector.vue
diff --git a/packages/editor-ui/src/components/executions/ConcurrentExecutionsHeader.test.ts b/packages/frontend/editor-ui/src/components/executions/ConcurrentExecutionsHeader.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/executions/ConcurrentExecutionsHeader.test.ts
rename to packages/frontend/editor-ui/src/components/executions/ConcurrentExecutionsHeader.test.ts
diff --git a/packages/editor-ui/src/components/executions/ConcurrentExecutionsHeader.vue b/packages/frontend/editor-ui/src/components/executions/ConcurrentExecutionsHeader.vue
similarity index 100%
rename from packages/editor-ui/src/components/executions/ConcurrentExecutionsHeader.vue
rename to packages/frontend/editor-ui/src/components/executions/ConcurrentExecutionsHeader.vue
diff --git a/packages/editor-ui/src/components/executions/ExecutionsFilter.test.ts b/packages/frontend/editor-ui/src/components/executions/ExecutionsFilter.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/executions/ExecutionsFilter.test.ts
rename to packages/frontend/editor-ui/src/components/executions/ExecutionsFilter.test.ts
diff --git a/packages/editor-ui/src/components/executions/ExecutionsFilter.vue b/packages/frontend/editor-ui/src/components/executions/ExecutionsFilter.vue
similarity index 100%
rename from packages/editor-ui/src/components/executions/ExecutionsFilter.vue
rename to packages/frontend/editor-ui/src/components/executions/ExecutionsFilter.vue
diff --git a/packages/editor-ui/src/components/executions/ExecutionsTime.vue b/packages/frontend/editor-ui/src/components/executions/ExecutionsTime.vue
similarity index 100%
rename from packages/editor-ui/src/components/executions/ExecutionsTime.vue
rename to packages/frontend/editor-ui/src/components/executions/ExecutionsTime.vue
diff --git a/packages/editor-ui/src/components/executions/global/GlobalExecutionsList.test.ts b/packages/frontend/editor-ui/src/components/executions/global/GlobalExecutionsList.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/executions/global/GlobalExecutionsList.test.ts
rename to packages/frontend/editor-ui/src/components/executions/global/GlobalExecutionsList.test.ts
diff --git a/packages/editor-ui/src/components/executions/global/GlobalExecutionsList.vue b/packages/frontend/editor-ui/src/components/executions/global/GlobalExecutionsList.vue
similarity index 100%
rename from packages/editor-ui/src/components/executions/global/GlobalExecutionsList.vue
rename to packages/frontend/editor-ui/src/components/executions/global/GlobalExecutionsList.vue
diff --git a/packages/editor-ui/src/components/executions/global/GlobalExecutionsListItem.test.ts b/packages/frontend/editor-ui/src/components/executions/global/GlobalExecutionsListItem.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/executions/global/GlobalExecutionsListItem.test.ts
rename to packages/frontend/editor-ui/src/components/executions/global/GlobalExecutionsListItem.test.ts
diff --git a/packages/editor-ui/src/components/executions/global/GlobalExecutionsListItem.vue b/packages/frontend/editor-ui/src/components/executions/global/GlobalExecutionsListItem.vue
similarity index 100%
rename from packages/editor-ui/src/components/executions/global/GlobalExecutionsListItem.vue
rename to packages/frontend/editor-ui/src/components/executions/global/GlobalExecutionsListItem.vue
diff --git a/packages/editor-ui/src/components/executions/global/GlobalExecutionsListItemQueuedTooltip.test.ts b/packages/frontend/editor-ui/src/components/executions/global/GlobalExecutionsListItemQueuedTooltip.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/executions/global/GlobalExecutionsListItemQueuedTooltip.test.ts
rename to packages/frontend/editor-ui/src/components/executions/global/GlobalExecutionsListItemQueuedTooltip.test.ts
diff --git a/packages/editor-ui/src/components/executions/global/GlobalExecutionsListItemQueuedTooltip.vue b/packages/frontend/editor-ui/src/components/executions/global/GlobalExecutionsListItemQueuedTooltip.vue
similarity index 100%
rename from packages/editor-ui/src/components/executions/global/GlobalExecutionsListItemQueuedTooltip.vue
rename to packages/frontend/editor-ui/src/components/executions/global/GlobalExecutionsListItemQueuedTooltip.vue
diff --git a/packages/editor-ui/src/components/executions/workflow/VoteButtons.vue b/packages/frontend/editor-ui/src/components/executions/workflow/VoteButtons.vue
similarity index 100%
rename from packages/editor-ui/src/components/executions/workflow/VoteButtons.vue
rename to packages/frontend/editor-ui/src/components/executions/workflow/VoteButtons.vue
diff --git a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionAnnotationPanel.ee.vue b/packages/frontend/editor-ui/src/components/executions/workflow/WorkflowExecutionAnnotationPanel.ee.vue
similarity index 100%
rename from packages/editor-ui/src/components/executions/workflow/WorkflowExecutionAnnotationPanel.ee.vue
rename to packages/frontend/editor-ui/src/components/executions/workflow/WorkflowExecutionAnnotationPanel.ee.vue
diff --git a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsCard.test.ts b/packages/frontend/editor-ui/src/components/executions/workflow/WorkflowExecutionsCard.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsCard.test.ts
rename to packages/frontend/editor-ui/src/components/executions/workflow/WorkflowExecutionsCard.test.ts
diff --git a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsCard.vue b/packages/frontend/editor-ui/src/components/executions/workflow/WorkflowExecutionsCard.vue
similarity index 100%
rename from packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsCard.vue
rename to packages/frontend/editor-ui/src/components/executions/workflow/WorkflowExecutionsCard.vue
diff --git a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsInfoAccordion.vue b/packages/frontend/editor-ui/src/components/executions/workflow/WorkflowExecutionsInfoAccordion.vue
similarity index 100%
rename from packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsInfoAccordion.vue
rename to packages/frontend/editor-ui/src/components/executions/workflow/WorkflowExecutionsInfoAccordion.vue
diff --git a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsLandingPage.vue b/packages/frontend/editor-ui/src/components/executions/workflow/WorkflowExecutionsLandingPage.vue
similarity index 100%
rename from packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsLandingPage.vue
rename to packages/frontend/editor-ui/src/components/executions/workflow/WorkflowExecutionsLandingPage.vue
diff --git a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsList.vue b/packages/frontend/editor-ui/src/components/executions/workflow/WorkflowExecutionsList.vue
similarity index 100%
rename from packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsList.vue
rename to packages/frontend/editor-ui/src/components/executions/workflow/WorkflowExecutionsList.vue
diff --git a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsPreview.test.ts b/packages/frontend/editor-ui/src/components/executions/workflow/WorkflowExecutionsPreview.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsPreview.test.ts
rename to packages/frontend/editor-ui/src/components/executions/workflow/WorkflowExecutionsPreview.test.ts
diff --git a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsPreview.vue b/packages/frontend/editor-ui/src/components/executions/workflow/WorkflowExecutionsPreview.vue
similarity index 99%
rename from packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsPreview.vue
rename to packages/frontend/editor-ui/src/components/executions/workflow/WorkflowExecutionsPreview.vue
index 5b17dbfcfb..63d9e9dda0 100644
--- a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsPreview.vue
+++ b/packages/frontend/editor-ui/src/components/executions/workflow/WorkflowExecutionsPreview.vue
@@ -15,7 +15,7 @@ import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useTestDefinitionStore } from '@/stores/testDefinition.store.ee';
 import { getResourcePermissions } from '@/permissions';
 import { useSettingsStore } from '@/stores/settings.store';
-import type { ButtonType } from 'n8n-design-system';
+import type { ButtonType } from '@n8n/design-system';
 import { useExecutionsStore } from '@/stores/executions.store';
 import ProjectCreateResource from '@/components/Projects/ProjectCreateResource.vue';
 import { useToast } from '@/composables/useToast';
diff --git a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsSidebar.test.ts b/packages/frontend/editor-ui/src/components/executions/workflow/WorkflowExecutionsSidebar.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsSidebar.test.ts
rename to packages/frontend/editor-ui/src/components/executions/workflow/WorkflowExecutionsSidebar.test.ts
diff --git a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsSidebar.vue b/packages/frontend/editor-ui/src/components/executions/workflow/WorkflowExecutionsSidebar.vue
similarity index 100%
rename from packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsSidebar.vue
rename to packages/frontend/editor-ui/src/components/executions/workflow/WorkflowExecutionsSidebar.vue
diff --git a/packages/editor-ui/src/components/forms/ResourceFiltersDropdown.vue b/packages/frontend/editor-ui/src/components/forms/ResourceFiltersDropdown.vue
similarity index 100%
rename from packages/editor-ui/src/components/forms/ResourceFiltersDropdown.vue
rename to packages/frontend/editor-ui/src/components/forms/ResourceFiltersDropdown.vue
diff --git a/packages/editor-ui/src/components/layouts/PageViewLayout.vue b/packages/frontend/editor-ui/src/components/layouts/PageViewLayout.vue
similarity index 100%
rename from packages/editor-ui/src/components/layouts/PageViewLayout.vue
rename to packages/frontend/editor-ui/src/components/layouts/PageViewLayout.vue
diff --git a/packages/editor-ui/src/components/layouts/PageViewLayoutList.vue b/packages/frontend/editor-ui/src/components/layouts/PageViewLayoutList.vue
similarity index 100%
rename from packages/editor-ui/src/components/layouts/PageViewLayoutList.vue
rename to packages/frontend/editor-ui/src/components/layouts/PageViewLayoutList.vue
diff --git a/packages/editor-ui/src/components/layouts/ResourcesListLayout.test.ts b/packages/frontend/editor-ui/src/components/layouts/ResourcesListLayout.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/layouts/ResourcesListLayout.test.ts
rename to packages/frontend/editor-ui/src/components/layouts/ResourcesListLayout.test.ts
diff --git a/packages/editor-ui/src/components/layouts/ResourcesListLayout.vue b/packages/frontend/editor-ui/src/components/layouts/ResourcesListLayout.vue
similarity index 99%
rename from packages/editor-ui/src/components/layouts/ResourcesListLayout.vue
rename to packages/frontend/editor-ui/src/components/layouts/ResourcesListLayout.vue
index 80c777c8ac..8a47ebfdd8 100644
--- a/packages/editor-ui/src/components/layouts/ResourcesListLayout.vue
+++ b/packages/frontend/editor-ui/src/components/layouts/ResourcesListLayout.vue
@@ -6,7 +6,7 @@ import PageViewLayout from '@/components/layouts/PageViewLayout.vue';
 import PageViewLayoutList from '@/components/layouts/PageViewLayoutList.vue';
 import ResourceFiltersDropdown from '@/components/forms/ResourceFiltersDropdown.vue';
 import { useUsersStore } from '@/stores/users.store';
-import type { DatatableColumn } from 'n8n-design-system';
+import type { DatatableColumn } from '@n8n/design-system';
 import { useI18n } from '@/composables/useI18n';
 import { useDebounce } from '@/composables/useDebounce';
 import { useTelemetry } from '@/composables/useTelemetry';
diff --git a/packages/editor-ui/src/components/layouts/index.ts b/packages/frontend/editor-ui/src/components/layouts/index.ts
similarity index 100%
rename from packages/editor-ui/src/components/layouts/index.ts
rename to packages/frontend/editor-ui/src/components/layouts/index.ts
diff --git a/packages/editor-ui/src/components/transitions/SlideTransition.vue b/packages/frontend/editor-ui/src/components/transitions/SlideTransition.vue
similarity index 100%
rename from packages/editor-ui/src/components/transitions/SlideTransition.vue
rename to packages/frontend/editor-ui/src/components/transitions/SlideTransition.vue
diff --git a/packages/editor-ui/src/composables/__snapshots__/useBugReporting.test.ts.snap b/packages/frontend/editor-ui/src/composables/__snapshots__/useBugReporting.test.ts.snap
similarity index 100%
rename from packages/editor-ui/src/composables/__snapshots__/useBugReporting.test.ts.snap
rename to packages/frontend/editor-ui/src/composables/__snapshots__/useBugReporting.test.ts.snap
diff --git a/packages/editor-ui/src/composables/__snapshots__/useCanvasOperations.test.ts.snap b/packages/frontend/editor-ui/src/composables/__snapshots__/useCanvasOperations.test.ts.snap
similarity index 100%
rename from packages/editor-ui/src/composables/__snapshots__/useCanvasOperations.test.ts.snap
rename to packages/frontend/editor-ui/src/composables/__snapshots__/useCanvasOperations.test.ts.snap
diff --git a/packages/editor-ui/src/composables/__snapshots__/useContextMenu.test.ts.snap b/packages/frontend/editor-ui/src/composables/__snapshots__/useContextMenu.test.ts.snap
similarity index 100%
rename from packages/editor-ui/src/composables/__snapshots__/useContextMenu.test.ts.snap
rename to packages/frontend/editor-ui/src/composables/__snapshots__/useContextMenu.test.ts.snap
diff --git a/packages/editor-ui/src/composables/__snapshots__/useDebugInfo.test.ts.snap b/packages/frontend/editor-ui/src/composables/__snapshots__/useDebugInfo.test.ts.snap
similarity index 100%
rename from packages/editor-ui/src/composables/__snapshots__/useDebugInfo.test.ts.snap
rename to packages/frontend/editor-ui/src/composables/__snapshots__/useDebugInfo.test.ts.snap
diff --git a/packages/editor-ui/src/composables/useAIAssistantHelpers.test.constants.ts b/packages/frontend/editor-ui/src/composables/useAIAssistantHelpers.test.constants.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useAIAssistantHelpers.test.constants.ts
rename to packages/frontend/editor-ui/src/composables/useAIAssistantHelpers.test.constants.ts
diff --git a/packages/editor-ui/src/composables/useAIAssistantHelpers.test.ts b/packages/frontend/editor-ui/src/composables/useAIAssistantHelpers.test.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useAIAssistantHelpers.test.ts
rename to packages/frontend/editor-ui/src/composables/useAIAssistantHelpers.test.ts
diff --git a/packages/editor-ui/src/composables/useAIAssistantHelpers.ts b/packages/frontend/editor-ui/src/composables/useAIAssistantHelpers.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useAIAssistantHelpers.ts
rename to packages/frontend/editor-ui/src/composables/useAIAssistantHelpers.ts
diff --git a/packages/editor-ui/src/composables/useActiveNode.test.ts b/packages/frontend/editor-ui/src/composables/useActiveNode.test.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useActiveNode.test.ts
rename to packages/frontend/editor-ui/src/composables/useActiveNode.test.ts
diff --git a/packages/editor-ui/src/composables/useActiveNode.ts b/packages/frontend/editor-ui/src/composables/useActiveNode.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useActiveNode.ts
rename to packages/frontend/editor-ui/src/composables/useActiveNode.ts
diff --git a/packages/editor-ui/src/composables/useAutocompleteTelemetry.test.ts b/packages/frontend/editor-ui/src/composables/useAutocompleteTelemetry.test.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useAutocompleteTelemetry.test.ts
rename to packages/frontend/editor-ui/src/composables/useAutocompleteTelemetry.test.ts
diff --git a/packages/editor-ui/src/composables/useAutocompleteTelemetry.ts b/packages/frontend/editor-ui/src/composables/useAutocompleteTelemetry.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useAutocompleteTelemetry.ts
rename to packages/frontend/editor-ui/src/composables/useAutocompleteTelemetry.ts
diff --git a/packages/editor-ui/src/composables/useBeforeUnload.test.ts b/packages/frontend/editor-ui/src/composables/useBeforeUnload.test.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useBeforeUnload.test.ts
rename to packages/frontend/editor-ui/src/composables/useBeforeUnload.test.ts
diff --git a/packages/editor-ui/src/composables/useBeforeUnload.ts b/packages/frontend/editor-ui/src/composables/useBeforeUnload.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useBeforeUnload.ts
rename to packages/frontend/editor-ui/src/composables/useBeforeUnload.ts
diff --git a/packages/editor-ui/src/composables/useBugReporting.test.ts b/packages/frontend/editor-ui/src/composables/useBugReporting.test.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useBugReporting.test.ts
rename to packages/frontend/editor-ui/src/composables/useBugReporting.test.ts
diff --git a/packages/editor-ui/src/composables/useBugReporting.ts b/packages/frontend/editor-ui/src/composables/useBugReporting.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useBugReporting.ts
rename to packages/frontend/editor-ui/src/composables/useBugReporting.ts
diff --git a/packages/editor-ui/src/composables/useCanvas.ts b/packages/frontend/editor-ui/src/composables/useCanvas.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useCanvas.ts
rename to packages/frontend/editor-ui/src/composables/useCanvas.ts
diff --git a/packages/editor-ui/src/composables/useCanvasMapping.test.ts b/packages/frontend/editor-ui/src/composables/useCanvasMapping.test.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useCanvasMapping.test.ts
rename to packages/frontend/editor-ui/src/composables/useCanvasMapping.test.ts
diff --git a/packages/editor-ui/src/composables/useCanvasMapping.ts b/packages/frontend/editor-ui/src/composables/useCanvasMapping.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useCanvasMapping.ts
rename to packages/frontend/editor-ui/src/composables/useCanvasMapping.ts
diff --git a/packages/editor-ui/src/composables/useCanvasNode.test.ts b/packages/frontend/editor-ui/src/composables/useCanvasNode.test.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useCanvasNode.test.ts
rename to packages/frontend/editor-ui/src/composables/useCanvasNode.test.ts
diff --git a/packages/editor-ui/src/composables/useCanvasNode.ts b/packages/frontend/editor-ui/src/composables/useCanvasNode.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useCanvasNode.ts
rename to packages/frontend/editor-ui/src/composables/useCanvasNode.ts
diff --git a/packages/editor-ui/src/composables/useCanvasNodeHandle.ts b/packages/frontend/editor-ui/src/composables/useCanvasNodeHandle.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useCanvasNodeHandle.ts
rename to packages/frontend/editor-ui/src/composables/useCanvasNodeHandle.ts
diff --git a/packages/editor-ui/src/composables/useCanvasNodeHover.test.ts b/packages/frontend/editor-ui/src/composables/useCanvasNodeHover.test.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useCanvasNodeHover.test.ts
rename to packages/frontend/editor-ui/src/composables/useCanvasNodeHover.test.ts
diff --git a/packages/editor-ui/src/composables/useCanvasNodeHover.ts b/packages/frontend/editor-ui/src/composables/useCanvasNodeHover.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useCanvasNodeHover.ts
rename to packages/frontend/editor-ui/src/composables/useCanvasNodeHover.ts
diff --git a/packages/editor-ui/src/composables/useCanvasOperations.test.ts b/packages/frontend/editor-ui/src/composables/useCanvasOperations.test.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useCanvasOperations.test.ts
rename to packages/frontend/editor-ui/src/composables/useCanvasOperations.test.ts
diff --git a/packages/editor-ui/src/composables/useCanvasOperations.ts b/packages/frontend/editor-ui/src/composables/useCanvasOperations.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useCanvasOperations.ts
rename to packages/frontend/editor-ui/src/composables/useCanvasOperations.ts
diff --git a/packages/editor-ui/src/composables/useCanvasTraversal.test.ts b/packages/frontend/editor-ui/src/composables/useCanvasTraversal.test.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useCanvasTraversal.test.ts
rename to packages/frontend/editor-ui/src/composables/useCanvasTraversal.test.ts
diff --git a/packages/editor-ui/src/composables/useCanvasTraversal.ts b/packages/frontend/editor-ui/src/composables/useCanvasTraversal.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useCanvasTraversal.ts
rename to packages/frontend/editor-ui/src/composables/useCanvasTraversal.ts
diff --git a/packages/editor-ui/src/composables/useClipboard.test.ts b/packages/frontend/editor-ui/src/composables/useClipboard.test.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useClipboard.test.ts
rename to packages/frontend/editor-ui/src/composables/useClipboard.test.ts
diff --git a/packages/editor-ui/src/composables/useClipboard.ts b/packages/frontend/editor-ui/src/composables/useClipboard.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useClipboard.ts
rename to packages/frontend/editor-ui/src/composables/useClipboard.ts
diff --git a/packages/editor-ui/src/composables/useCodeEditor.test.ts b/packages/frontend/editor-ui/src/composables/useCodeEditor.test.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useCodeEditor.test.ts
rename to packages/frontend/editor-ui/src/composables/useCodeEditor.test.ts
diff --git a/packages/editor-ui/src/composables/useCodeEditor.ts b/packages/frontend/editor-ui/src/composables/useCodeEditor.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useCodeEditor.ts
rename to packages/frontend/editor-ui/src/composables/useCodeEditor.ts
diff --git a/packages/editor-ui/src/composables/useContextMenu.test.ts b/packages/frontend/editor-ui/src/composables/useContextMenu.test.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useContextMenu.test.ts
rename to packages/frontend/editor-ui/src/composables/useContextMenu.test.ts
diff --git a/packages/editor-ui/src/composables/useContextMenu.ts b/packages/frontend/editor-ui/src/composables/useContextMenu.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useContextMenu.ts
rename to packages/frontend/editor-ui/src/composables/useContextMenu.ts
diff --git a/packages/editor-ui/src/composables/useDataSchema.test.ts b/packages/frontend/editor-ui/src/composables/useDataSchema.test.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useDataSchema.test.ts
rename to packages/frontend/editor-ui/src/composables/useDataSchema.test.ts
diff --git a/packages/editor-ui/src/composables/useDataSchema.ts b/packages/frontend/editor-ui/src/composables/useDataSchema.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useDataSchema.ts
rename to packages/frontend/editor-ui/src/composables/useDataSchema.ts
diff --git a/packages/editor-ui/src/composables/useDebounce.test.ts b/packages/frontend/editor-ui/src/composables/useDebounce.test.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useDebounce.test.ts
rename to packages/frontend/editor-ui/src/composables/useDebounce.test.ts
diff --git a/packages/editor-ui/src/composables/useDebounce.ts b/packages/frontend/editor-ui/src/composables/useDebounce.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useDebounce.ts
rename to packages/frontend/editor-ui/src/composables/useDebounce.ts
diff --git a/packages/editor-ui/src/composables/useDebugInfo.test.ts b/packages/frontend/editor-ui/src/composables/useDebugInfo.test.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useDebugInfo.test.ts
rename to packages/frontend/editor-ui/src/composables/useDebugInfo.test.ts
diff --git a/packages/editor-ui/src/composables/useDebugInfo.ts b/packages/frontend/editor-ui/src/composables/useDebugInfo.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useDebugInfo.ts
rename to packages/frontend/editor-ui/src/composables/useDebugInfo.ts
diff --git a/packages/editor-ui/src/composables/useDocumentTitle.test.ts b/packages/frontend/editor-ui/src/composables/useDocumentTitle.test.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useDocumentTitle.test.ts
rename to packages/frontend/editor-ui/src/composables/useDocumentTitle.test.ts
diff --git a/packages/editor-ui/src/composables/useDocumentTitle.ts b/packages/frontend/editor-ui/src/composables/useDocumentTitle.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useDocumentTitle.ts
rename to packages/frontend/editor-ui/src/composables/useDocumentTitle.ts
diff --git a/packages/editor-ui/src/composables/useDocumentVisibility.ts b/packages/frontend/editor-ui/src/composables/useDocumentVisibility.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useDocumentVisibility.ts
rename to packages/frontend/editor-ui/src/composables/useDocumentVisibility.ts
diff --git a/packages/editor-ui/src/composables/useExecutingNode.test.ts b/packages/frontend/editor-ui/src/composables/useExecutingNode.test.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useExecutingNode.test.ts
rename to packages/frontend/editor-ui/src/composables/useExecutingNode.test.ts
diff --git a/packages/editor-ui/src/composables/useExecutingNode.ts b/packages/frontend/editor-ui/src/composables/useExecutingNode.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useExecutingNode.ts
rename to packages/frontend/editor-ui/src/composables/useExecutingNode.ts
diff --git a/packages/editor-ui/src/composables/useExecutionDebugging.test.ts b/packages/frontend/editor-ui/src/composables/useExecutionDebugging.test.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useExecutionDebugging.test.ts
rename to packages/frontend/editor-ui/src/composables/useExecutionDebugging.test.ts
diff --git a/packages/editor-ui/src/composables/useExecutionDebugging.ts b/packages/frontend/editor-ui/src/composables/useExecutionDebugging.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useExecutionDebugging.ts
rename to packages/frontend/editor-ui/src/composables/useExecutionDebugging.ts
diff --git a/packages/editor-ui/src/composables/useExecutionHelpers.test.ts b/packages/frontend/editor-ui/src/composables/useExecutionHelpers.test.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useExecutionHelpers.test.ts
rename to packages/frontend/editor-ui/src/composables/useExecutionHelpers.test.ts
diff --git a/packages/editor-ui/src/composables/useExecutionHelpers.ts b/packages/frontend/editor-ui/src/composables/useExecutionHelpers.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useExecutionHelpers.ts
rename to packages/frontend/editor-ui/src/composables/useExecutionHelpers.ts
diff --git a/packages/editor-ui/src/composables/useExpressionEditor.test.ts b/packages/frontend/editor-ui/src/composables/useExpressionEditor.test.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useExpressionEditor.test.ts
rename to packages/frontend/editor-ui/src/composables/useExpressionEditor.test.ts
diff --git a/packages/editor-ui/src/composables/useExpressionEditor.ts b/packages/frontend/editor-ui/src/composables/useExpressionEditor.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useExpressionEditor.ts
rename to packages/frontend/editor-ui/src/composables/useExpressionEditor.ts
diff --git a/packages/editor-ui/src/composables/useExternalHooks.ts b/packages/frontend/editor-ui/src/composables/useExternalHooks.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useExternalHooks.ts
rename to packages/frontend/editor-ui/src/composables/useExternalHooks.ts
diff --git a/packages/editor-ui/src/composables/useExternalSecretsProvider.ts b/packages/frontend/editor-ui/src/composables/useExternalSecretsProvider.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useExternalSecretsProvider.ts
rename to packages/frontend/editor-ui/src/composables/useExternalSecretsProvider.ts
diff --git a/packages/editor-ui/src/composables/useGlobalEntityCreation.test.ts b/packages/frontend/editor-ui/src/composables/useGlobalEntityCreation.test.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useGlobalEntityCreation.test.ts
rename to packages/frontend/editor-ui/src/composables/useGlobalEntityCreation.test.ts
diff --git a/packages/editor-ui/src/composables/useGlobalEntityCreation.ts b/packages/frontend/editor-ui/src/composables/useGlobalEntityCreation.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useGlobalEntityCreation.ts
rename to packages/frontend/editor-ui/src/composables/useGlobalEntityCreation.ts
diff --git a/packages/editor-ui/src/composables/useGlobalLinkActions.ts b/packages/frontend/editor-ui/src/composables/useGlobalLinkActions.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useGlobalLinkActions.ts
rename to packages/frontend/editor-ui/src/composables/useGlobalLinkActions.ts
diff --git a/packages/editor-ui/src/composables/useHistoryHelper.test.ts b/packages/frontend/editor-ui/src/composables/useHistoryHelper.test.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useHistoryHelper.test.ts
rename to packages/frontend/editor-ui/src/composables/useHistoryHelper.test.ts
diff --git a/packages/editor-ui/src/composables/useHistoryHelper.ts b/packages/frontend/editor-ui/src/composables/useHistoryHelper.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useHistoryHelper.ts
rename to packages/frontend/editor-ui/src/composables/useHistoryHelper.ts
diff --git a/packages/editor-ui/src/composables/useI18n.ts b/packages/frontend/editor-ui/src/composables/useI18n.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useI18n.ts
rename to packages/frontend/editor-ui/src/composables/useI18n.ts
diff --git a/packages/editor-ui/src/composables/useImportCurlCommand.test.ts b/packages/frontend/editor-ui/src/composables/useImportCurlCommand.test.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useImportCurlCommand.test.ts
rename to packages/frontend/editor-ui/src/composables/useImportCurlCommand.test.ts
diff --git a/packages/editor-ui/src/composables/useImportCurlCommand.ts b/packages/frontend/editor-ui/src/composables/useImportCurlCommand.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useImportCurlCommand.ts
rename to packages/frontend/editor-ui/src/composables/useImportCurlCommand.ts
diff --git a/packages/editor-ui/src/composables/useKeybindings.test.ts b/packages/frontend/editor-ui/src/composables/useKeybindings.test.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useKeybindings.test.ts
rename to packages/frontend/editor-ui/src/composables/useKeybindings.test.ts
diff --git a/packages/editor-ui/src/composables/useKeybindings.ts b/packages/frontend/editor-ui/src/composables/useKeybindings.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useKeybindings.ts
rename to packages/frontend/editor-ui/src/composables/useKeybindings.ts
diff --git a/packages/editor-ui/src/composables/useLoadingService.ts b/packages/frontend/editor-ui/src/composables/useLoadingService.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useLoadingService.ts
rename to packages/frontend/editor-ui/src/composables/useLoadingService.ts
diff --git a/packages/editor-ui/src/composables/useMessage.ts b/packages/frontend/editor-ui/src/composables/useMessage.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useMessage.ts
rename to packages/frontend/editor-ui/src/composables/useMessage.ts
diff --git a/packages/editor-ui/src/composables/useNodeConnections.test.ts b/packages/frontend/editor-ui/src/composables/useNodeConnections.test.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useNodeConnections.test.ts
rename to packages/frontend/editor-ui/src/composables/useNodeConnections.test.ts
diff --git a/packages/editor-ui/src/composables/useNodeConnections.ts b/packages/frontend/editor-ui/src/composables/useNodeConnections.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useNodeConnections.ts
rename to packages/frontend/editor-ui/src/composables/useNodeConnections.ts
diff --git a/packages/editor-ui/src/composables/useNodeDirtiness.test.ts b/packages/frontend/editor-ui/src/composables/useNodeDirtiness.test.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useNodeDirtiness.test.ts
rename to packages/frontend/editor-ui/src/composables/useNodeDirtiness.test.ts
diff --git a/packages/editor-ui/src/composables/useNodeDirtiness.ts b/packages/frontend/editor-ui/src/composables/useNodeDirtiness.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useNodeDirtiness.ts
rename to packages/frontend/editor-ui/src/composables/useNodeDirtiness.ts
diff --git a/packages/editor-ui/src/composables/useNodeHelpers.test.ts b/packages/frontend/editor-ui/src/composables/useNodeHelpers.test.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useNodeHelpers.test.ts
rename to packages/frontend/editor-ui/src/composables/useNodeHelpers.test.ts
diff --git a/packages/editor-ui/src/composables/useNodeHelpers.ts b/packages/frontend/editor-ui/src/composables/useNodeHelpers.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useNodeHelpers.ts
rename to packages/frontend/editor-ui/src/composables/useNodeHelpers.ts
diff --git a/packages/editor-ui/src/composables/useNodeSpecificationValues.ts b/packages/frontend/editor-ui/src/composables/useNodeSpecificationValues.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useNodeSpecificationValues.ts
rename to packages/frontend/editor-ui/src/composables/useNodeSpecificationValues.ts
diff --git a/packages/editor-ui/src/composables/useNodeType.test.ts b/packages/frontend/editor-ui/src/composables/useNodeType.test.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useNodeType.test.ts
rename to packages/frontend/editor-ui/src/composables/useNodeType.test.ts
diff --git a/packages/editor-ui/src/composables/useNodeType.ts b/packages/frontend/editor-ui/src/composables/useNodeType.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useNodeType.ts
rename to packages/frontend/editor-ui/src/composables/useNodeType.ts
diff --git a/packages/editor-ui/src/composables/usePageRedirectionHelper.test.ts b/packages/frontend/editor-ui/src/composables/usePageRedirectionHelper.test.ts
similarity index 100%
rename from packages/editor-ui/src/composables/usePageRedirectionHelper.test.ts
rename to packages/frontend/editor-ui/src/composables/usePageRedirectionHelper.test.ts
diff --git a/packages/editor-ui/src/composables/usePageRedirectionHelper.ts b/packages/frontend/editor-ui/src/composables/usePageRedirectionHelper.ts
similarity index 100%
rename from packages/editor-ui/src/composables/usePageRedirectionHelper.ts
rename to packages/frontend/editor-ui/src/composables/usePageRedirectionHelper.ts
diff --git a/packages/editor-ui/src/composables/usePinnedData.test.ts b/packages/frontend/editor-ui/src/composables/usePinnedData.test.ts
similarity index 100%
rename from packages/editor-ui/src/composables/usePinnedData.test.ts
rename to packages/frontend/editor-ui/src/composables/usePinnedData.test.ts
diff --git a/packages/editor-ui/src/composables/usePinnedData.ts b/packages/frontend/editor-ui/src/composables/usePinnedData.ts
similarity index 100%
rename from packages/editor-ui/src/composables/usePinnedData.ts
rename to packages/frontend/editor-ui/src/composables/usePinnedData.ts
diff --git a/packages/editor-ui/src/composables/usePushConnection.test.ts b/packages/frontend/editor-ui/src/composables/usePushConnection.test.ts
similarity index 100%
rename from packages/editor-ui/src/composables/usePushConnection.test.ts
rename to packages/frontend/editor-ui/src/composables/usePushConnection.test.ts
diff --git a/packages/editor-ui/src/composables/usePushConnection.ts b/packages/frontend/editor-ui/src/composables/usePushConnection.ts
similarity index 100%
rename from packages/editor-ui/src/composables/usePushConnection.ts
rename to packages/frontend/editor-ui/src/composables/usePushConnection.ts
diff --git a/packages/editor-ui/src/composables/useResolvedExpression.test.ts b/packages/frontend/editor-ui/src/composables/useResolvedExpression.test.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useResolvedExpression.test.ts
rename to packages/frontend/editor-ui/src/composables/useResolvedExpression.test.ts
diff --git a/packages/editor-ui/src/composables/useResolvedExpression.ts b/packages/frontend/editor-ui/src/composables/useResolvedExpression.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useResolvedExpression.ts
rename to packages/frontend/editor-ui/src/composables/useResolvedExpression.ts
diff --git a/packages/editor-ui/src/composables/useRunWorkflow.test.ts b/packages/frontend/editor-ui/src/composables/useRunWorkflow.test.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useRunWorkflow.test.ts
rename to packages/frontend/editor-ui/src/composables/useRunWorkflow.test.ts
diff --git a/packages/editor-ui/src/composables/useRunWorkflow.ts b/packages/frontend/editor-ui/src/composables/useRunWorkflow.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useRunWorkflow.ts
rename to packages/frontend/editor-ui/src/composables/useRunWorkflow.ts
diff --git a/packages/editor-ui/src/composables/useStorage.test.ts b/packages/frontend/editor-ui/src/composables/useStorage.test.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useStorage.test.ts
rename to packages/frontend/editor-ui/src/composables/useStorage.test.ts
diff --git a/packages/editor-ui/src/composables/useStorage.ts b/packages/frontend/editor-ui/src/composables/useStorage.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useStorage.ts
rename to packages/frontend/editor-ui/src/composables/useStorage.ts
diff --git a/packages/editor-ui/src/composables/useStyles.test.ts b/packages/frontend/editor-ui/src/composables/useStyles.test.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useStyles.test.ts
rename to packages/frontend/editor-ui/src/composables/useStyles.test.ts
diff --git a/packages/editor-ui/src/composables/useStyles.ts b/packages/frontend/editor-ui/src/composables/useStyles.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useStyles.ts
rename to packages/frontend/editor-ui/src/composables/useStyles.ts
diff --git a/packages/editor-ui/src/composables/useTelemetry.ts b/packages/frontend/editor-ui/src/composables/useTelemetry.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useTelemetry.ts
rename to packages/frontend/editor-ui/src/composables/useTelemetry.ts
diff --git a/packages/editor-ui/src/composables/useToast.test.ts b/packages/frontend/editor-ui/src/composables/useToast.test.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useToast.test.ts
rename to packages/frontend/editor-ui/src/composables/useToast.test.ts
diff --git a/packages/editor-ui/src/composables/useToast.ts b/packages/frontend/editor-ui/src/composables/useToast.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useToast.ts
rename to packages/frontend/editor-ui/src/composables/useToast.ts
diff --git a/packages/editor-ui/src/composables/useUniqueNodeName.test.ts b/packages/frontend/editor-ui/src/composables/useUniqueNodeName.test.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useUniqueNodeName.test.ts
rename to packages/frontend/editor-ui/src/composables/useUniqueNodeName.test.ts
diff --git a/packages/editor-ui/src/composables/useUniqueNodeName.ts b/packages/frontend/editor-ui/src/composables/useUniqueNodeName.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useUniqueNodeName.ts
rename to packages/frontend/editor-ui/src/composables/useUniqueNodeName.ts
diff --git a/packages/editor-ui/src/composables/useUserHelpers.ts b/packages/frontend/editor-ui/src/composables/useUserHelpers.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useUserHelpers.ts
rename to packages/frontend/editor-ui/src/composables/useUserHelpers.ts
diff --git a/packages/editor-ui/src/composables/useWorkflowActivate.ts b/packages/frontend/editor-ui/src/composables/useWorkflowActivate.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useWorkflowActivate.ts
rename to packages/frontend/editor-ui/src/composables/useWorkflowActivate.ts
diff --git a/packages/editor-ui/src/composables/useWorkflowHelpers.test.ts b/packages/frontend/editor-ui/src/composables/useWorkflowHelpers.test.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useWorkflowHelpers.test.ts
rename to packages/frontend/editor-ui/src/composables/useWorkflowHelpers.test.ts
diff --git a/packages/editor-ui/src/composables/useWorkflowHelpers.ts b/packages/frontend/editor-ui/src/composables/useWorkflowHelpers.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useWorkflowHelpers.ts
rename to packages/frontend/editor-ui/src/composables/useWorkflowHelpers.ts
diff --git a/packages/editor-ui/src/constants.ts b/packages/frontend/editor-ui/src/constants.ts
similarity index 100%
rename from packages/editor-ui/src/constants.ts
rename to packages/frontend/editor-ui/src/constants.ts
diff --git a/packages/editor-ui/src/constants.workflows.ts b/packages/frontend/editor-ui/src/constants.workflows.ts
similarity index 100%
rename from packages/editor-ui/src/constants.workflows.ts
rename to packages/frontend/editor-ui/src/constants.workflows.ts
diff --git a/packages/editor-ui/src/event-bus/code-node-editor.ts b/packages/frontend/editor-ui/src/event-bus/code-node-editor.ts
similarity index 100%
rename from packages/editor-ui/src/event-bus/code-node-editor.ts
rename to packages/frontend/editor-ui/src/event-bus/code-node-editor.ts
diff --git a/packages/editor-ui/src/event-bus/data-pinning.ts b/packages/frontend/editor-ui/src/event-bus/data-pinning.ts
similarity index 100%
rename from packages/editor-ui/src/event-bus/data-pinning.ts
rename to packages/frontend/editor-ui/src/event-bus/data-pinning.ts
diff --git a/packages/editor-ui/src/event-bus/global-link-actions.ts b/packages/frontend/editor-ui/src/event-bus/global-link-actions.ts
similarity index 100%
rename from packages/editor-ui/src/event-bus/global-link-actions.ts
rename to packages/frontend/editor-ui/src/event-bus/global-link-actions.ts
diff --git a/packages/editor-ui/src/event-bus/html-editor.ts b/packages/frontend/editor-ui/src/event-bus/html-editor.ts
similarity index 100%
rename from packages/editor-ui/src/event-bus/html-editor.ts
rename to packages/frontend/editor-ui/src/event-bus/html-editor.ts
diff --git a/packages/editor-ui/src/event-bus/import-curl.ts b/packages/frontend/editor-ui/src/event-bus/import-curl.ts
similarity index 100%
rename from packages/editor-ui/src/event-bus/import-curl.ts
rename to packages/frontend/editor-ui/src/event-bus/import-curl.ts
diff --git a/packages/editor-ui/src/event-bus/index.ts b/packages/frontend/editor-ui/src/event-bus/index.ts
similarity index 100%
rename from packages/editor-ui/src/event-bus/index.ts
rename to packages/frontend/editor-ui/src/event-bus/index.ts
diff --git a/packages/editor-ui/src/event-bus/mfa.ts b/packages/frontend/editor-ui/src/event-bus/mfa.ts
similarity index 100%
rename from packages/editor-ui/src/event-bus/mfa.ts
rename to packages/frontend/editor-ui/src/event-bus/mfa.ts
diff --git a/packages/editor-ui/src/event-bus/ndv.ts b/packages/frontend/editor-ui/src/event-bus/ndv.ts
similarity index 100%
rename from packages/editor-ui/src/event-bus/ndv.ts
rename to packages/frontend/editor-ui/src/event-bus/ndv.ts
diff --git a/packages/editor-ui/src/event-bus/node-view.ts b/packages/frontend/editor-ui/src/event-bus/node-view.ts
similarity index 100%
rename from packages/editor-ui/src/event-bus/node-view.ts
rename to packages/frontend/editor-ui/src/event-bus/node-view.ts
diff --git a/packages/editor-ui/src/event-bus/source-control.ts b/packages/frontend/editor-ui/src/event-bus/source-control.ts
similarity index 100%
rename from packages/editor-ui/src/event-bus/source-control.ts
rename to packages/frontend/editor-ui/src/event-bus/source-control.ts
diff --git a/packages/editor-ui/src/init.test.ts b/packages/frontend/editor-ui/src/init.test.ts
similarity index 100%
rename from packages/editor-ui/src/init.test.ts
rename to packages/frontend/editor-ui/src/init.test.ts
diff --git a/packages/editor-ui/src/init.ts b/packages/frontend/editor-ui/src/init.ts
similarity index 100%
rename from packages/editor-ui/src/init.ts
rename to packages/frontend/editor-ui/src/init.ts
diff --git a/packages/editor-ui/src/main.ts b/packages/frontend/editor-ui/src/main.ts
similarity index 94%
rename from packages/editor-ui/src/main.ts
rename to packages/frontend/editor-ui/src/main.ts
index 3420468976..0a3e01d0d6 100644
--- a/packages/editor-ui/src/main.ts
+++ b/packages/frontend/editor-ui/src/main.ts
@@ -7,8 +7,8 @@ import '@vue-flow/minimap/dist/style.css';
 import '@vue-flow/node-resizer/dist/style.css';
 
 import 'vue-json-pretty/lib/styles.css';
-import 'n8n-design-system/css/index.scss';
-// import 'n8n-design-system/css/tailwind/index.css';
+import '@n8n/design-system/css/index.scss';
+// import '@n8n/design-system/css/tailwind/index.css';
 
 import './n8n-theme.scss';
 
diff --git a/packages/editor-ui/src/mixins/workflowHelpers.test.ts b/packages/frontend/editor-ui/src/mixins/workflowHelpers.test.ts
similarity index 100%
rename from packages/editor-ui/src/mixins/workflowHelpers.test.ts
rename to packages/frontend/editor-ui/src/mixins/workflowHelpers.test.ts
diff --git a/packages/editor-ui/src/models/history.ts b/packages/frontend/editor-ui/src/models/history.ts
similarity index 100%
rename from packages/editor-ui/src/models/history.ts
rename to packages/frontend/editor-ui/src/models/history.ts
diff --git a/packages/editor-ui/src/n8n-theme-variables.scss b/packages/frontend/editor-ui/src/n8n-theme-variables.scss
similarity index 100%
rename from packages/editor-ui/src/n8n-theme-variables.scss
rename to packages/frontend/editor-ui/src/n8n-theme-variables.scss
diff --git a/packages/editor-ui/src/n8n-theme.scss b/packages/frontend/editor-ui/src/n8n-theme.scss
similarity index 100%
rename from packages/editor-ui/src/n8n-theme.scss
rename to packages/frontend/editor-ui/src/n8n-theme.scss
diff --git a/packages/editor-ui/src/permissions.test.ts b/packages/frontend/editor-ui/src/permissions.test.ts
similarity index 100%
rename from packages/editor-ui/src/permissions.test.ts
rename to packages/frontend/editor-ui/src/permissions.test.ts
diff --git a/packages/editor-ui/src/permissions.ts b/packages/frontend/editor-ui/src/permissions.ts
similarity index 100%
rename from packages/editor-ui/src/permissions.ts
rename to packages/frontend/editor-ui/src/permissions.ts
diff --git a/packages/editor-ui/src/plugins/chartjs.ts b/packages/frontend/editor-ui/src/plugins/chartjs.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/chartjs.ts
rename to packages/frontend/editor-ui/src/plugins/chartjs.ts
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/__tests__/mock.ts b/packages/frontend/editor-ui/src/plugins/codemirror/completions/__tests__/mock.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/codemirror/completions/__tests__/mock.ts
rename to packages/frontend/editor-ui/src/plugins/codemirror/completions/__tests__/mock.ts
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/addCompletions.ts b/packages/frontend/editor-ui/src/plugins/codemirror/completions/addCompletions.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/codemirror/completions/addCompletions.ts
rename to packages/frontend/editor-ui/src/plugins/codemirror/completions/addCompletions.ts
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/base.completions.test.ts b/packages/frontend/editor-ui/src/plugins/codemirror/completions/base.completions.test.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/codemirror/completions/base.completions.test.ts
rename to packages/frontend/editor-ui/src/plugins/codemirror/completions/base.completions.test.ts
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/blank.completions.ts b/packages/frontend/editor-ui/src/plugins/codemirror/completions/blank.completions.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/codemirror/completions/blank.completions.ts
rename to packages/frontend/editor-ui/src/plugins/codemirror/completions/blank.completions.ts
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/bracketAccess.completions.ts b/packages/frontend/editor-ui/src/plugins/codemirror/completions/bracketAccess.completions.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/codemirror/completions/bracketAccess.completions.ts
rename to packages/frontend/editor-ui/src/plugins/codemirror/completions/bracketAccess.completions.ts
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/completions.test.ts b/packages/frontend/editor-ui/src/plugins/codemirror/completions/completions.test.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/codemirror/completions/completions.test.ts
rename to packages/frontend/editor-ui/src/plugins/codemirror/completions/completions.test.ts
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/constants.ts b/packages/frontend/editor-ui/src/plugins/codemirror/completions/constants.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/codemirror/completions/constants.ts
rename to packages/frontend/editor-ui/src/plugins/codemirror/completions/constants.ts
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/datatype.completions.ts b/packages/frontend/editor-ui/src/plugins/codemirror/completions/datatype.completions.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/codemirror/completions/datatype.completions.ts
rename to packages/frontend/editor-ui/src/plugins/codemirror/completions/datatype.completions.ts
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/dollar.completions.ts b/packages/frontend/editor-ui/src/plugins/codemirror/completions/dollar.completions.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/codemirror/completions/dollar.completions.ts
rename to packages/frontend/editor-ui/src/plugins/codemirror/completions/dollar.completions.ts
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/infoBoxRenderer.ts b/packages/frontend/editor-ui/src/plugins/codemirror/completions/infoBoxRenderer.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/codemirror/completions/infoBoxRenderer.ts
rename to packages/frontend/editor-ui/src/plugins/codemirror/completions/infoBoxRenderer.ts
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/itemField.completions.test.ts b/packages/frontend/editor-ui/src/plugins/codemirror/completions/itemField.completions.test.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/codemirror/completions/itemField.completions.test.ts
rename to packages/frontend/editor-ui/src/plugins/codemirror/completions/itemField.completions.test.ts
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/itemIndex.completions.test.ts b/packages/frontend/editor-ui/src/plugins/codemirror/completions/itemIndex.completions.test.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/codemirror/completions/itemIndex.completions.test.ts
rename to packages/frontend/editor-ui/src/plugins/codemirror/completions/itemIndex.completions.test.ts
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/jsonField.completions.test.ts b/packages/frontend/editor-ui/src/plugins/codemirror/completions/jsonField.completions.test.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/codemirror/completions/jsonField.completions.test.ts
rename to packages/frontend/editor-ui/src/plugins/codemirror/completions/jsonField.completions.test.ts
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/nativesAutocompleteDocs/luxon.instance.docs.ts b/packages/frontend/editor-ui/src/plugins/codemirror/completions/nativesAutocompleteDocs/luxon.instance.docs.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/codemirror/completions/nativesAutocompleteDocs/luxon.instance.docs.ts
rename to packages/frontend/editor-ui/src/plugins/codemirror/completions/nativesAutocompleteDocs/luxon.instance.docs.ts
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/nativesAutocompleteDocs/luxon.static.docs.ts b/packages/frontend/editor-ui/src/plugins/codemirror/completions/nativesAutocompleteDocs/luxon.static.docs.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/codemirror/completions/nativesAutocompleteDocs/luxon.static.docs.ts
rename to packages/frontend/editor-ui/src/plugins/codemirror/completions/nativesAutocompleteDocs/luxon.static.docs.ts
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/nonDollar.completions.ts b/packages/frontend/editor-ui/src/plugins/codemirror/completions/nonDollar.completions.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/codemirror/completions/nonDollar.completions.ts
rename to packages/frontend/editor-ui/src/plugins/codemirror/completions/nonDollar.completions.ts
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/prevNode.completions.test.ts b/packages/frontend/editor-ui/src/plugins/codemirror/completions/prevNode.completions.test.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/codemirror/completions/prevNode.completions.test.ts
rename to packages/frontend/editor-ui/src/plugins/codemirror/completions/prevNode.completions.test.ts
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/require.completions.test.ts b/packages/frontend/editor-ui/src/plugins/codemirror/completions/require.completions.test.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/codemirror/completions/require.completions.test.ts
rename to packages/frontend/editor-ui/src/plugins/codemirror/completions/require.completions.test.ts
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/types.ts b/packages/frontend/editor-ui/src/plugins/codemirror/completions/types.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/codemirror/completions/types.ts
rename to packages/frontend/editor-ui/src/plugins/codemirror/completions/types.ts
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/utils.test.ts b/packages/frontend/editor-ui/src/plugins/codemirror/completions/utils.test.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/codemirror/completions/utils.test.ts
rename to packages/frontend/editor-ui/src/plugins/codemirror/completions/utils.test.ts
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/utils.ts b/packages/frontend/editor-ui/src/plugins/codemirror/completions/utils.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/codemirror/completions/utils.ts
rename to packages/frontend/editor-ui/src/plugins/codemirror/completions/utils.ts
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/variables.completions.test.ts b/packages/frontend/editor-ui/src/plugins/codemirror/completions/variables.completions.test.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/codemirror/completions/variables.completions.test.ts
rename to packages/frontend/editor-ui/src/plugins/codemirror/completions/variables.completions.test.ts
diff --git a/packages/editor-ui/src/plugins/codemirror/dragAndDrop.test.ts b/packages/frontend/editor-ui/src/plugins/codemirror/dragAndDrop.test.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/codemirror/dragAndDrop.test.ts
rename to packages/frontend/editor-ui/src/plugins/codemirror/dragAndDrop.test.ts
diff --git a/packages/editor-ui/src/plugins/codemirror/dragAndDrop.ts b/packages/frontend/editor-ui/src/plugins/codemirror/dragAndDrop.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/codemirror/dragAndDrop.ts
rename to packages/frontend/editor-ui/src/plugins/codemirror/dragAndDrop.ts
diff --git a/packages/editor-ui/src/plugins/codemirror/expressionCloseBrackets.test.ts b/packages/frontend/editor-ui/src/plugins/codemirror/expressionCloseBrackets.test.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/codemirror/expressionCloseBrackets.test.ts
rename to packages/frontend/editor-ui/src/plugins/codemirror/expressionCloseBrackets.test.ts
diff --git a/packages/editor-ui/src/plugins/codemirror/expressionCloseBrackets.ts b/packages/frontend/editor-ui/src/plugins/codemirror/expressionCloseBrackets.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/codemirror/expressionCloseBrackets.ts
rename to packages/frontend/editor-ui/src/plugins/codemirror/expressionCloseBrackets.ts
diff --git a/packages/editor-ui/src/plugins/codemirror/format.ts b/packages/frontend/editor-ui/src/plugins/codemirror/format.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/codemirror/format.ts
rename to packages/frontend/editor-ui/src/plugins/codemirror/format.ts
diff --git a/packages/editor-ui/src/plugins/codemirror/keymap.ts b/packages/frontend/editor-ui/src/plugins/codemirror/keymap.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/codemirror/keymap.ts
rename to packages/frontend/editor-ui/src/plugins/codemirror/keymap.ts
diff --git a/packages/editor-ui/src/plugins/codemirror/multiCursor.ts b/packages/frontend/editor-ui/src/plugins/codemirror/multiCursor.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/codemirror/multiCursor.ts
rename to packages/frontend/editor-ui/src/plugins/codemirror/multiCursor.ts
diff --git a/packages/editor-ui/src/plugins/codemirror/n8nLang.ts b/packages/frontend/editor-ui/src/plugins/codemirror/n8nLang.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/codemirror/n8nLang.ts
rename to packages/frontend/editor-ui/src/plugins/codemirror/n8nLang.ts
diff --git a/packages/editor-ui/src/plugins/codemirror/resolvableHighlighter.ts b/packages/frontend/editor-ui/src/plugins/codemirror/resolvableHighlighter.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/codemirror/resolvableHighlighter.ts
rename to packages/frontend/editor-ui/src/plugins/codemirror/resolvableHighlighter.ts
diff --git a/packages/editor-ui/src/plugins/codemirror/tooltips/InfoBoxTooltip.ts b/packages/frontend/editor-ui/src/plugins/codemirror/tooltips/InfoBoxTooltip.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/codemirror/tooltips/InfoBoxTooltip.ts
rename to packages/frontend/editor-ui/src/plugins/codemirror/tooltips/InfoBoxTooltip.ts
diff --git a/packages/editor-ui/src/plugins/codemirror/tooltips/infoBoxTooltip.test.ts b/packages/frontend/editor-ui/src/plugins/codemirror/tooltips/infoBoxTooltip.test.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/codemirror/tooltips/infoBoxTooltip.test.ts
rename to packages/frontend/editor-ui/src/plugins/codemirror/tooltips/infoBoxTooltip.test.ts
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/client/completions.ts b/packages/frontend/editor-ui/src/plugins/codemirror/typescript/client/completions.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/codemirror/typescript/client/completions.ts
rename to packages/frontend/editor-ui/src/plugins/codemirror/typescript/client/completions.ts
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/client/facet.ts b/packages/frontend/editor-ui/src/plugins/codemirror/typescript/client/facet.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/codemirror/typescript/client/facet.ts
rename to packages/frontend/editor-ui/src/plugins/codemirror/typescript/client/facet.ts
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/client/hoverTooltip.ts b/packages/frontend/editor-ui/src/plugins/codemirror/typescript/client/hoverTooltip.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/codemirror/typescript/client/hoverTooltip.ts
rename to packages/frontend/editor-ui/src/plugins/codemirror/typescript/client/hoverTooltip.ts
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/client/linter.ts b/packages/frontend/editor-ui/src/plugins/codemirror/typescript/client/linter.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/codemirror/typescript/client/linter.ts
rename to packages/frontend/editor-ui/src/plugins/codemirror/typescript/client/linter.ts
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/client/snippets.ts b/packages/frontend/editor-ui/src/plugins/codemirror/typescript/client/snippets.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/codemirror/typescript/client/snippets.ts
rename to packages/frontend/editor-ui/src/plugins/codemirror/typescript/client/snippets.ts
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/client/useTypescript.ts b/packages/frontend/editor-ui/src/plugins/codemirror/typescript/client/useTypescript.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/codemirror/typescript/client/useTypescript.ts
rename to packages/frontend/editor-ui/src/plugins/codemirror/typescript/client/useTypescript.ts
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/types.ts b/packages/frontend/editor-ui/src/plugins/codemirror/typescript/types.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/codemirror/typescript/types.ts
rename to packages/frontend/editor-ui/src/plugins/codemirror/typescript/types.ts
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/worker/cache.ts b/packages/frontend/editor-ui/src/plugins/codemirror/typescript/worker/cache.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/codemirror/typescript/worker/cache.ts
rename to packages/frontend/editor-ui/src/plugins/codemirror/typescript/worker/cache.ts
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/worker/completions.ts b/packages/frontend/editor-ui/src/plugins/codemirror/typescript/worker/completions.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/codemirror/typescript/worker/completions.ts
rename to packages/frontend/editor-ui/src/plugins/codemirror/typescript/worker/completions.ts
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/worker/constants.ts b/packages/frontend/editor-ui/src/plugins/codemirror/typescript/worker/constants.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/codemirror/typescript/worker/constants.ts
rename to packages/frontend/editor-ui/src/plugins/codemirror/typescript/worker/constants.ts
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/worker/dynamicTypes.test.ts b/packages/frontend/editor-ui/src/plugins/codemirror/typescript/worker/dynamicTypes.test.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/codemirror/typescript/worker/dynamicTypes.test.ts
rename to packages/frontend/editor-ui/src/plugins/codemirror/typescript/worker/dynamicTypes.test.ts
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/worker/dynamicTypes.ts b/packages/frontend/editor-ui/src/plugins/codemirror/typescript/worker/dynamicTypes.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/codemirror/typescript/worker/dynamicTypes.ts
rename to packages/frontend/editor-ui/src/plugins/codemirror/typescript/worker/dynamicTypes.ts
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/worker/env.ts b/packages/frontend/editor-ui/src/plugins/codemirror/typescript/worker/env.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/codemirror/typescript/worker/env.ts
rename to packages/frontend/editor-ui/src/plugins/codemirror/typescript/worker/env.ts
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/worker/hoverTooltip.ts b/packages/frontend/editor-ui/src/plugins/codemirror/typescript/worker/hoverTooltip.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/codemirror/typescript/worker/hoverTooltip.ts
rename to packages/frontend/editor-ui/src/plugins/codemirror/typescript/worker/hoverTooltip.ts
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/worker/linter.ts b/packages/frontend/editor-ui/src/plugins/codemirror/typescript/worker/linter.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/codemirror/typescript/worker/linter.ts
rename to packages/frontend/editor-ui/src/plugins/codemirror/typescript/worker/linter.ts
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/worker/npmTypesLoader.ts b/packages/frontend/editor-ui/src/plugins/codemirror/typescript/worker/npmTypesLoader.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/codemirror/typescript/worker/npmTypesLoader.ts
rename to packages/frontend/editor-ui/src/plugins/codemirror/typescript/worker/npmTypesLoader.ts
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/worker/type-declarations/globals.d.ts b/packages/frontend/editor-ui/src/plugins/codemirror/typescript/worker/type-declarations/globals.d.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/codemirror/typescript/worker/type-declarations/globals.d.ts
rename to packages/frontend/editor-ui/src/plugins/codemirror/typescript/worker/type-declarations/globals.d.ts
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/worker/type-declarations/n8n-once-for-all-items.d.ts b/packages/frontend/editor-ui/src/plugins/codemirror/typescript/worker/type-declarations/n8n-once-for-all-items.d.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/codemirror/typescript/worker/type-declarations/n8n-once-for-all-items.d.ts
rename to packages/frontend/editor-ui/src/plugins/codemirror/typescript/worker/type-declarations/n8n-once-for-all-items.d.ts
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/worker/type-declarations/n8n-once-for-each-item.d.ts b/packages/frontend/editor-ui/src/plugins/codemirror/typescript/worker/type-declarations/n8n-once-for-each-item.d.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/codemirror/typescript/worker/type-declarations/n8n-once-for-each-item.d.ts
rename to packages/frontend/editor-ui/src/plugins/codemirror/typescript/worker/type-declarations/n8n-once-for-each-item.d.ts
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/worker/type-declarations/n8n.d.ts b/packages/frontend/editor-ui/src/plugins/codemirror/typescript/worker/type-declarations/n8n.d.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/codemirror/typescript/worker/type-declarations/n8n.d.ts
rename to packages/frontend/editor-ui/src/plugins/codemirror/typescript/worker/type-declarations/n8n.d.ts
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/worker/typescript.worker.ts b/packages/frontend/editor-ui/src/plugins/codemirror/typescript/worker/typescript.worker.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/codemirror/typescript/worker/typescript.worker.ts
rename to packages/frontend/editor-ui/src/plugins/codemirror/typescript/worker/typescript.worker.ts
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/worker/typescriptAst.ts b/packages/frontend/editor-ui/src/plugins/codemirror/typescript/worker/typescriptAst.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/codemirror/typescript/worker/typescriptAst.ts
rename to packages/frontend/editor-ui/src/plugins/codemirror/typescript/worker/typescriptAst.ts
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/worker/utils.ts b/packages/frontend/editor-ui/src/plugins/codemirror/typescript/worker/utils.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/codemirror/typescript/worker/utils.ts
rename to packages/frontend/editor-ui/src/plugins/codemirror/typescript/worker/utils.ts
diff --git a/packages/editor-ui/src/plugins/components.ts b/packages/frontend/editor-ui/src/plugins/components.ts
similarity index 95%
rename from packages/editor-ui/src/plugins/components.ts
rename to packages/frontend/editor-ui/src/plugins/components.ts
index 38c600a8f4..089e75b578 100644
--- a/packages/editor-ui/src/plugins/components.ts
+++ b/packages/frontend/editor-ui/src/plugins/components.ts
@@ -3,7 +3,7 @@ import type { Plugin } from 'vue';
 import 'regenerator-runtime/runtime';
 
 import ElementPlus, { ElLoading, ElMessageBox } from 'element-plus';
-import { N8nPlugin } from 'n8n-design-system';
+import { N8nPlugin } from '@n8n/design-system';
 import { useMessage } from '@/composables/useMessage';
 import EnterpriseEdition from '@/components/EnterpriseEdition.ee.vue';
 import ParameterInputList from '@/components/ParameterInputList.vue';
diff --git a/packages/editor-ui/src/plugins/directives.ts b/packages/frontend/editor-ui/src/plugins/directives.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/directives.ts
rename to packages/frontend/editor-ui/src/plugins/directives.ts
diff --git a/packages/editor-ui/src/plugins/i18n/docs/ADDENDUM.md b/packages/frontend/editor-ui/src/plugins/i18n/docs/ADDENDUM.md
similarity index 100%
rename from packages/editor-ui/src/plugins/i18n/docs/ADDENDUM.md
rename to packages/frontend/editor-ui/src/plugins/i18n/docs/ADDENDUM.md
diff --git a/packages/editor-ui/src/plugins/i18n/docs/README.md b/packages/frontend/editor-ui/src/plugins/i18n/docs/README.md
similarity index 93%
rename from packages/editor-ui/src/plugins/i18n/docs/README.md
rename to packages/frontend/editor-ui/src/plugins/i18n/docs/README.md
index 5e57bb308e..322c413bab 100644
--- a/packages/editor-ui/src/plugins/i18n/docs/README.md
+++ b/packages/frontend/editor-ui/src/plugins/i18n/docs/README.md
@@ -50,11 +50,11 @@ Press "o" to open in Browser.
 
 ## Base text
 
-Base text is rendered with no dependencies, i.e. base text is fixed and does not change in any circumstances. Base text is supplied by the user in one file per locale in the `/editor-ui` package.
+Base text is rendered with no dependencies, i.e. base text is fixed and does not change in any circumstances. Base text is supplied by the user in one file per locale in the `/frontend/editor-ui` package.
 
 ### Locating base text
 
-The base text file for each locale is located at `/packages/editor-ui/src/plugins/i18n/locales/` and is named `{localeIdentifier}.json`. Keys in the base text file can be Vue component dirs, Vue component names, and references to symbols in those Vue components. These keys are added by the team as the UI is modified or expanded.
+The base text file for each locale is located at `/packages/frontend/editor-ui/src/plugins/i18n/locales/` and is named `{localeIdentifier}.json`. Keys in the base text file can be Vue component dirs, Vue component names, and references to symbols in those Vue components. These keys are added by the team as the UI is modified or expanded.
 
 ```json
 {
@@ -69,10 +69,10 @@ The base text file for each locale is located at `/packages/editor-ui/src/plugin
 1. Select a new locale identifier, e.g. `de`, copy the `en` JSON base text file with a new name:
 
 ```
-cp ./packages/editor-ui/src/plugins/i18n/locales/en.json ./packages/editor-ui/src/plugins/i18n/locales/de.json
+cp ./packages/frontend/editor-ui/src/plugins/i18n/locales/en.json ./packages/frontend/editor-ui/src/plugins/i18n/locales/de.json
 ```
 
-2. Find in the UI a string to translate, and search for it in the newly created base text file. Alternatively, find in `/editor-ui` a call to `i18n.baseText(key)`, e.g. `i18n.baseText('workflowActivator.deactivateWorkflow')`, and take note of the key and find it in the newly created base text file.
+2. Find in the UI a string to translate, and search for it in the newly created base text file. Alternatively, find in `/frontend/editor-ui` a call to `i18n.baseText(key)`, e.g. `i18n.baseText('workflowActivator.deactivateWorkflow')`, and take note of the key and find it in the newly created base text file.
 
 > **Note**: If you cannot find a string in the new base text file, either it does not belong to base text (i.e., the string might be part of header text, credential text, or node text), or the string might belong to the backend, where i18n is currently unsupported.
 
@@ -462,7 +462,7 @@ Example of `fixedCollection` parameter:
 
 ## Base text
 
-When translating a base text file at `/packages/editor-ui/src/plugins/i18n/locales/{localeIdentifier}.json`:
+When translating a base text file at `/packages/frontend/editor-ui/src/plugins/i18n/locales/{localeIdentifier}.json`:
 
 1. Open a terminal:
 
@@ -475,7 +475,7 @@ pnpm start
 
 ```sh
 export N8N_DEFAULT_LOCALE=de
-cd packages/editor-ui
+cd packages/frontend/editor-ui
 pnpm dev
 ```
 
diff --git a/packages/editor-ui/src/plugins/i18n/docs/img/cred.png b/packages/frontend/editor-ui/src/plugins/i18n/docs/img/cred.png
similarity index 100%
rename from packages/editor-ui/src/plugins/i18n/docs/img/cred.png
rename to packages/frontend/editor-ui/src/plugins/i18n/docs/img/cred.png
diff --git a/packages/editor-ui/src/plugins/i18n/docs/img/header1.png b/packages/frontend/editor-ui/src/plugins/i18n/docs/img/header1.png
similarity index 100%
rename from packages/editor-ui/src/plugins/i18n/docs/img/header1.png
rename to packages/frontend/editor-ui/src/plugins/i18n/docs/img/header1.png
diff --git a/packages/editor-ui/src/plugins/i18n/docs/img/header2.png b/packages/frontend/editor-ui/src/plugins/i18n/docs/img/header2.png
similarity index 100%
rename from packages/editor-ui/src/plugins/i18n/docs/img/header2.png
rename to packages/frontend/editor-ui/src/plugins/i18n/docs/img/header2.png
diff --git a/packages/editor-ui/src/plugins/i18n/docs/img/header3.png b/packages/frontend/editor-ui/src/plugins/i18n/docs/img/header3.png
similarity index 100%
rename from packages/editor-ui/src/plugins/i18n/docs/img/header3.png
rename to packages/frontend/editor-ui/src/plugins/i18n/docs/img/header3.png
diff --git a/packages/editor-ui/src/plugins/i18n/docs/img/header4.png b/packages/frontend/editor-ui/src/plugins/i18n/docs/img/header4.png
similarity index 100%
rename from packages/editor-ui/src/plugins/i18n/docs/img/header4.png
rename to packages/frontend/editor-ui/src/plugins/i18n/docs/img/header4.png
diff --git a/packages/editor-ui/src/plugins/i18n/docs/img/header5.png b/packages/frontend/editor-ui/src/plugins/i18n/docs/img/header5.png
similarity index 100%
rename from packages/editor-ui/src/plugins/i18n/docs/img/header5.png
rename to packages/frontend/editor-ui/src/plugins/i18n/docs/img/header5.png
diff --git a/packages/editor-ui/src/plugins/i18n/docs/img/node1.png b/packages/frontend/editor-ui/src/plugins/i18n/docs/img/node1.png
similarity index 100%
rename from packages/editor-ui/src/plugins/i18n/docs/img/node1.png
rename to packages/frontend/editor-ui/src/plugins/i18n/docs/img/node1.png
diff --git a/packages/editor-ui/src/plugins/i18n/docs/img/node2.png b/packages/frontend/editor-ui/src/plugins/i18n/docs/img/node2.png
similarity index 100%
rename from packages/editor-ui/src/plugins/i18n/docs/img/node2.png
rename to packages/frontend/editor-ui/src/plugins/i18n/docs/img/node2.png
diff --git a/packages/editor-ui/src/plugins/i18n/docs/img/node4.png b/packages/frontend/editor-ui/src/plugins/i18n/docs/img/node4.png
similarity index 100%
rename from packages/editor-ui/src/plugins/i18n/docs/img/node4.png
rename to packages/frontend/editor-ui/src/plugins/i18n/docs/img/node4.png
diff --git a/packages/editor-ui/src/plugins/i18n/index.ts b/packages/frontend/editor-ui/src/plugins/i18n/index.ts
similarity index 99%
rename from packages/editor-ui/src/plugins/i18n/index.ts
rename to packages/frontend/editor-ui/src/plugins/i18n/index.ts
index 2a3ff1fe9d..eee917a8fb 100644
--- a/packages/editor-ui/src/plugins/i18n/index.ts
+++ b/packages/frontend/editor-ui/src/plugins/i18n/index.ts
@@ -1,6 +1,6 @@
 import axios from 'axios';
 import { createI18n } from 'vue-i18n';
-import { locale } from 'n8n-design-system';
+import { locale } from '@n8n/design-system';
 import type { INodeProperties, INodePropertyCollection, INodePropertyOptions } from 'n8n-workflow';
 
 import type { INodeTranslationHeaders } from '@/Interface';
diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/frontend/editor-ui/src/plugins/i18n/locales/en.json
similarity index 100%
rename from packages/editor-ui/src/plugins/i18n/locales/en.json
rename to packages/frontend/editor-ui/src/plugins/i18n/locales/en.json
diff --git a/packages/editor-ui/src/plugins/i18n/utils.ts b/packages/frontend/editor-ui/src/plugins/i18n/utils.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/i18n/utils.ts
rename to packages/frontend/editor-ui/src/plugins/i18n/utils.ts
diff --git a/packages/editor-ui/src/plugins/icons/custom.ts b/packages/frontend/editor-ui/src/plugins/icons/custom.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/icons/custom.ts
rename to packages/frontend/editor-ui/src/plugins/icons/custom.ts
diff --git a/packages/editor-ui/src/plugins/icons/index.ts b/packages/frontend/editor-ui/src/plugins/icons/index.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/icons/index.ts
rename to packages/frontend/editor-ui/src/plugins/icons/index.ts
diff --git a/packages/editor-ui/src/plugins/index.ts b/packages/frontend/editor-ui/src/plugins/index.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/index.ts
rename to packages/frontend/editor-ui/src/plugins/index.ts
diff --git a/packages/editor-ui/src/plugins/sentry.test.ts b/packages/frontend/editor-ui/src/plugins/sentry.test.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/sentry.test.ts
rename to packages/frontend/editor-ui/src/plugins/sentry.test.ts
diff --git a/packages/editor-ui/src/plugins/sentry.ts b/packages/frontend/editor-ui/src/plugins/sentry.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/sentry.ts
rename to packages/frontend/editor-ui/src/plugins/sentry.ts
diff --git a/packages/editor-ui/src/plugins/telemetry.test.ts b/packages/frontend/editor-ui/src/plugins/telemetry.test.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/telemetry.test.ts
rename to packages/frontend/editor-ui/src/plugins/telemetry.test.ts
diff --git a/packages/editor-ui/src/plugins/telemetry/index.ts b/packages/frontend/editor-ui/src/plugins/telemetry/index.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/telemetry/index.ts
rename to packages/frontend/editor-ui/src/plugins/telemetry/index.ts
diff --git a/packages/editor-ui/src/plugins/telemetry/telemetry.types.ts b/packages/frontend/editor-ui/src/plugins/telemetry/telemetry.types.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/telemetry/telemetry.types.ts
rename to packages/frontend/editor-ui/src/plugins/telemetry/telemetry.types.ts
diff --git a/packages/editor-ui/src/polyfills.ts b/packages/frontend/editor-ui/src/polyfills.ts
similarity index 100%
rename from packages/editor-ui/src/polyfills.ts
rename to packages/frontend/editor-ui/src/polyfills.ts
diff --git a/packages/editor-ui/src/push-connection/__tests__/mockEventSource.ts b/packages/frontend/editor-ui/src/push-connection/__tests__/mockEventSource.ts
similarity index 100%
rename from packages/editor-ui/src/push-connection/__tests__/mockEventSource.ts
rename to packages/frontend/editor-ui/src/push-connection/__tests__/mockEventSource.ts
diff --git a/packages/editor-ui/src/push-connection/__tests__/mockWebSocketClient.ts b/packages/frontend/editor-ui/src/push-connection/__tests__/mockWebSocketClient.ts
similarity index 100%
rename from packages/editor-ui/src/push-connection/__tests__/mockWebSocketClient.ts
rename to packages/frontend/editor-ui/src/push-connection/__tests__/mockWebSocketClient.ts
diff --git a/packages/editor-ui/src/push-connection/__tests__/useEventSourceClient.test.ts b/packages/frontend/editor-ui/src/push-connection/__tests__/useEventSourceClient.test.ts
similarity index 100%
rename from packages/editor-ui/src/push-connection/__tests__/useEventSourceClient.test.ts
rename to packages/frontend/editor-ui/src/push-connection/__tests__/useEventSourceClient.test.ts
diff --git a/packages/editor-ui/src/push-connection/__tests__/useHeartbeat.test.ts b/packages/frontend/editor-ui/src/push-connection/__tests__/useHeartbeat.test.ts
similarity index 100%
rename from packages/editor-ui/src/push-connection/__tests__/useHeartbeat.test.ts
rename to packages/frontend/editor-ui/src/push-connection/__tests__/useHeartbeat.test.ts
diff --git a/packages/editor-ui/src/push-connection/__tests__/useWebSocketClient.test.ts b/packages/frontend/editor-ui/src/push-connection/__tests__/useWebSocketClient.test.ts
similarity index 100%
rename from packages/editor-ui/src/push-connection/__tests__/useWebSocketClient.test.ts
rename to packages/frontend/editor-ui/src/push-connection/__tests__/useWebSocketClient.test.ts
diff --git a/packages/editor-ui/src/push-connection/useEventSourceClient.ts b/packages/frontend/editor-ui/src/push-connection/useEventSourceClient.ts
similarity index 100%
rename from packages/editor-ui/src/push-connection/useEventSourceClient.ts
rename to packages/frontend/editor-ui/src/push-connection/useEventSourceClient.ts
diff --git a/packages/editor-ui/src/push-connection/useHeartbeat.ts b/packages/frontend/editor-ui/src/push-connection/useHeartbeat.ts
similarity index 100%
rename from packages/editor-ui/src/push-connection/useHeartbeat.ts
rename to packages/frontend/editor-ui/src/push-connection/useHeartbeat.ts
diff --git a/packages/editor-ui/src/push-connection/useReconnectTimer.ts b/packages/frontend/editor-ui/src/push-connection/useReconnectTimer.ts
similarity index 100%
rename from packages/editor-ui/src/push-connection/useReconnectTimer.ts
rename to packages/frontend/editor-ui/src/push-connection/useReconnectTimer.ts
diff --git a/packages/editor-ui/src/push-connection/useWebSocketClient.ts b/packages/frontend/editor-ui/src/push-connection/useWebSocketClient.ts
similarity index 100%
rename from packages/editor-ui/src/push-connection/useWebSocketClient.ts
rename to packages/frontend/editor-ui/src/push-connection/useWebSocketClient.ts
diff --git a/packages/editor-ui/src/router.test.ts b/packages/frontend/editor-ui/src/router.test.ts
similarity index 100%
rename from packages/editor-ui/src/router.test.ts
rename to packages/frontend/editor-ui/src/router.test.ts
diff --git a/packages/editor-ui/src/router.ts b/packages/frontend/editor-ui/src/router.ts
similarity index 100%
rename from packages/editor-ui/src/router.ts
rename to packages/frontend/editor-ui/src/router.ts
diff --git a/packages/editor-ui/src/routes/projects.routes.ts b/packages/frontend/editor-ui/src/routes/projects.routes.ts
similarity index 100%
rename from packages/editor-ui/src/routes/projects.routes.ts
rename to packages/frontend/editor-ui/src/routes/projects.routes.ts
diff --git a/packages/editor-ui/src/shims-modules.d.ts b/packages/frontend/editor-ui/src/shims-modules.d.ts
similarity index 100%
rename from packages/editor-ui/src/shims-modules.d.ts
rename to packages/frontend/editor-ui/src/shims-modules.d.ts
diff --git a/packages/editor-ui/src/shims-vue.d.ts b/packages/frontend/editor-ui/src/shims-vue.d.ts
similarity index 100%
rename from packages/editor-ui/src/shims-vue.d.ts
rename to packages/frontend/editor-ui/src/shims-vue.d.ts
diff --git a/packages/editor-ui/src/shims.d.ts b/packages/frontend/editor-ui/src/shims.d.ts
similarity index 100%
rename from packages/editor-ui/src/shims.d.ts
rename to packages/frontend/editor-ui/src/shims.d.ts
diff --git a/packages/editor-ui/src/stores/__tests__/utils/cloudStoreUtils.ts b/packages/frontend/editor-ui/src/stores/__tests__/utils/cloudStoreUtils.ts
similarity index 100%
rename from packages/editor-ui/src/stores/__tests__/utils/cloudStoreUtils.ts
rename to packages/frontend/editor-ui/src/stores/__tests__/utils/cloudStoreUtils.ts
diff --git a/packages/editor-ui/src/stores/__tests__/utils/workflowHistoryTestUtils.ts b/packages/frontend/editor-ui/src/stores/__tests__/utils/workflowHistoryTestUtils.ts
similarity index 100%
rename from packages/editor-ui/src/stores/__tests__/utils/workflowHistoryTestUtils.ts
rename to packages/frontend/editor-ui/src/stores/__tests__/utils/workflowHistoryTestUtils.ts
diff --git a/packages/editor-ui/src/stores/apiKeys.store.ts b/packages/frontend/editor-ui/src/stores/apiKeys.store.ts
similarity index 100%
rename from packages/editor-ui/src/stores/apiKeys.store.ts
rename to packages/frontend/editor-ui/src/stores/apiKeys.store.ts
diff --git a/packages/editor-ui/src/stores/assistant.store.test.ts b/packages/frontend/editor-ui/src/stores/assistant.store.test.ts
similarity index 99%
rename from packages/editor-ui/src/stores/assistant.store.test.ts
rename to packages/frontend/editor-ui/src/stores/assistant.store.test.ts
index c5877a0648..8fcd6c699f 100644
--- a/packages/editor-ui/src/stores/assistant.store.test.ts
+++ b/packages/frontend/editor-ui/src/stores/assistant.store.test.ts
@@ -18,7 +18,7 @@ import { reactive } from 'vue';
 import * as chatAPI from '@/api/ai';
 import * as telemetryModule from '@/composables/useTelemetry';
 import type { Telemetry } from '@/plugins/telemetry';
-import type { ChatUI } from 'n8n-design-system/types/assistant';
+import type { ChatUI } from '@n8n/design-system/types/assistant';
 
 let settingsStore: ReturnType<typeof useSettingsStore>;
 let posthogStore: ReturnType<typeof usePostHog>;
diff --git a/packages/editor-ui/src/stores/assistant.store.ts b/packages/frontend/editor-ui/src/stores/assistant.store.ts
similarity index 99%
rename from packages/editor-ui/src/stores/assistant.store.ts
rename to packages/frontend/editor-ui/src/stores/assistant.store.ts
index ad0197bee8..b7a5b6dbb0 100644
--- a/packages/editor-ui/src/stores/assistant.store.ts
+++ b/packages/frontend/editor-ui/src/stores/assistant.store.ts
@@ -8,7 +8,7 @@ import {
 	CREDENTIAL_EDIT_MODAL_KEY,
 } from '@/constants';
 import type { ChatRequest } from '@/types/assistant.types';
-import type { ChatUI } from 'n8n-design-system/types/assistant';
+import type { ChatUI } from '@n8n/design-system/types/assistant';
 import { defineStore } from 'pinia';
 import type { PushPayload } from '@n8n/api-types';
 import { computed, h, ref, watch } from 'vue';
diff --git a/packages/editor-ui/src/stores/auditLogs.store.ts b/packages/frontend/editor-ui/src/stores/auditLogs.store.ts
similarity index 100%
rename from packages/editor-ui/src/stores/auditLogs.store.ts
rename to packages/frontend/editor-ui/src/stores/auditLogs.store.ts
diff --git a/packages/editor-ui/src/stores/canvas.store.ts b/packages/frontend/editor-ui/src/stores/canvas.store.ts
similarity index 100%
rename from packages/editor-ui/src/stores/canvas.store.ts
rename to packages/frontend/editor-ui/src/stores/canvas.store.ts
diff --git a/packages/editor-ui/src/stores/cloudPlan.store.ts b/packages/frontend/editor-ui/src/stores/cloudPlan.store.ts
similarity index 100%
rename from packages/editor-ui/src/stores/cloudPlan.store.ts
rename to packages/frontend/editor-ui/src/stores/cloudPlan.store.ts
diff --git a/packages/editor-ui/src/stores/collaboration.store.ts b/packages/frontend/editor-ui/src/stores/collaboration.store.ts
similarity index 100%
rename from packages/editor-ui/src/stores/collaboration.store.ts
rename to packages/frontend/editor-ui/src/stores/collaboration.store.ts
diff --git a/packages/editor-ui/src/stores/communityNodes.store.ts b/packages/frontend/editor-ui/src/stores/communityNodes.store.ts
similarity index 100%
rename from packages/editor-ui/src/stores/communityNodes.store.ts
rename to packages/frontend/editor-ui/src/stores/communityNodes.store.ts
diff --git a/packages/editor-ui/src/stores/credentials.store.ts b/packages/frontend/editor-ui/src/stores/credentials.store.ts
similarity index 100%
rename from packages/editor-ui/src/stores/credentials.store.ts
rename to packages/frontend/editor-ui/src/stores/credentials.store.ts
diff --git a/packages/editor-ui/src/stores/credentials.test.ts b/packages/frontend/editor-ui/src/stores/credentials.test.ts
similarity index 100%
rename from packages/editor-ui/src/stores/credentials.test.ts
rename to packages/frontend/editor-ui/src/stores/credentials.test.ts
diff --git a/packages/editor-ui/src/stores/environments.ee.store.ts b/packages/frontend/editor-ui/src/stores/environments.ee.store.ts
similarity index 100%
rename from packages/editor-ui/src/stores/environments.ee.store.ts
rename to packages/frontend/editor-ui/src/stores/environments.ee.store.ts
diff --git a/packages/editor-ui/src/stores/environments.test.ts b/packages/frontend/editor-ui/src/stores/environments.test.ts
similarity index 100%
rename from packages/editor-ui/src/stores/environments.test.ts
rename to packages/frontend/editor-ui/src/stores/environments.test.ts
diff --git a/packages/editor-ui/src/stores/executions.store.test.ts b/packages/frontend/editor-ui/src/stores/executions.store.test.ts
similarity index 100%
rename from packages/editor-ui/src/stores/executions.store.test.ts
rename to packages/frontend/editor-ui/src/stores/executions.store.test.ts
diff --git a/packages/editor-ui/src/stores/executions.store.ts b/packages/frontend/editor-ui/src/stores/executions.store.ts
similarity index 100%
rename from packages/editor-ui/src/stores/executions.store.ts
rename to packages/frontend/editor-ui/src/stores/executions.store.ts
diff --git a/packages/editor-ui/src/stores/externalSecrets.ee.store.ts b/packages/frontend/editor-ui/src/stores/externalSecrets.ee.store.ts
similarity index 100%
rename from packages/editor-ui/src/stores/externalSecrets.ee.store.ts
rename to packages/frontend/editor-ui/src/stores/externalSecrets.ee.store.ts
diff --git a/packages/editor-ui/src/stores/history.store.ts b/packages/frontend/editor-ui/src/stores/history.store.ts
similarity index 100%
rename from packages/editor-ui/src/stores/history.store.ts
rename to packages/frontend/editor-ui/src/stores/history.store.ts
diff --git a/packages/editor-ui/src/stores/logStreaming.store.ts b/packages/frontend/editor-ui/src/stores/logStreaming.store.ts
similarity index 100%
rename from packages/editor-ui/src/stores/logStreaming.store.ts
rename to packages/frontend/editor-ui/src/stores/logStreaming.store.ts
diff --git a/packages/editor-ui/src/stores/ndv.store.ts b/packages/frontend/editor-ui/src/stores/ndv.store.ts
similarity index 100%
rename from packages/editor-ui/src/stores/ndv.store.ts
rename to packages/frontend/editor-ui/src/stores/ndv.store.ts
diff --git a/packages/editor-ui/src/stores/nodeCreator.store.test.ts b/packages/frontend/editor-ui/src/stores/nodeCreator.store.test.ts
similarity index 100%
rename from packages/editor-ui/src/stores/nodeCreator.store.test.ts
rename to packages/frontend/editor-ui/src/stores/nodeCreator.store.test.ts
diff --git a/packages/editor-ui/src/stores/nodeCreator.store.ts b/packages/frontend/editor-ui/src/stores/nodeCreator.store.ts
similarity index 100%
rename from packages/editor-ui/src/stores/nodeCreator.store.ts
rename to packages/frontend/editor-ui/src/stores/nodeCreator.store.ts
diff --git a/packages/editor-ui/src/stores/nodeTypes.store.ts b/packages/frontend/editor-ui/src/stores/nodeTypes.store.ts
similarity index 100%
rename from packages/editor-ui/src/stores/nodeTypes.store.ts
rename to packages/frontend/editor-ui/src/stores/nodeTypes.store.ts
diff --git a/packages/editor-ui/src/stores/npsStore.store.test.ts b/packages/frontend/editor-ui/src/stores/npsStore.store.test.ts
similarity index 100%
rename from packages/editor-ui/src/stores/npsStore.store.test.ts
rename to packages/frontend/editor-ui/src/stores/npsStore.store.test.ts
diff --git a/packages/editor-ui/src/stores/npsSurvey.store.ts b/packages/frontend/editor-ui/src/stores/npsSurvey.store.ts
similarity index 100%
rename from packages/editor-ui/src/stores/npsSurvey.store.ts
rename to packages/frontend/editor-ui/src/stores/npsSurvey.store.ts
diff --git a/packages/editor-ui/src/stores/orchestration.store.ts b/packages/frontend/editor-ui/src/stores/orchestration.store.ts
similarity index 100%
rename from packages/editor-ui/src/stores/orchestration.store.ts
rename to packages/frontend/editor-ui/src/stores/orchestration.store.ts
diff --git a/packages/editor-ui/src/stores/posthog.store.ts b/packages/frontend/editor-ui/src/stores/posthog.store.ts
similarity index 100%
rename from packages/editor-ui/src/stores/posthog.store.ts
rename to packages/frontend/editor-ui/src/stores/posthog.store.ts
diff --git a/packages/editor-ui/src/stores/posthog.test.ts b/packages/frontend/editor-ui/src/stores/posthog.test.ts
similarity index 100%
rename from packages/editor-ui/src/stores/posthog.test.ts
rename to packages/frontend/editor-ui/src/stores/posthog.test.ts
diff --git a/packages/editor-ui/src/stores/projects.store.ts b/packages/frontend/editor-ui/src/stores/projects.store.ts
similarity index 100%
rename from packages/editor-ui/src/stores/projects.store.ts
rename to packages/frontend/editor-ui/src/stores/projects.store.ts
diff --git a/packages/editor-ui/src/stores/pushConnection.store.test.ts b/packages/frontend/editor-ui/src/stores/pushConnection.store.test.ts
similarity index 100%
rename from packages/editor-ui/src/stores/pushConnection.store.test.ts
rename to packages/frontend/editor-ui/src/stores/pushConnection.store.test.ts
diff --git a/packages/editor-ui/src/stores/pushConnection.store.ts b/packages/frontend/editor-ui/src/stores/pushConnection.store.ts
similarity index 100%
rename from packages/editor-ui/src/stores/pushConnection.store.ts
rename to packages/frontend/editor-ui/src/stores/pushConnection.store.ts
diff --git a/packages/editor-ui/src/stores/rbac.store.test.ts b/packages/frontend/editor-ui/src/stores/rbac.store.test.ts
similarity index 100%
rename from packages/editor-ui/src/stores/rbac.store.test.ts
rename to packages/frontend/editor-ui/src/stores/rbac.store.test.ts
diff --git a/packages/editor-ui/src/stores/rbac.store.ts b/packages/frontend/editor-ui/src/stores/rbac.store.ts
similarity index 100%
rename from packages/editor-ui/src/stores/rbac.store.ts
rename to packages/frontend/editor-ui/src/stores/rbac.store.ts
diff --git a/packages/editor-ui/src/stores/roles.store.test.ts b/packages/frontend/editor-ui/src/stores/roles.store.test.ts
similarity index 100%
rename from packages/editor-ui/src/stores/roles.store.test.ts
rename to packages/frontend/editor-ui/src/stores/roles.store.test.ts
diff --git a/packages/editor-ui/src/stores/roles.store.ts b/packages/frontend/editor-ui/src/stores/roles.store.ts
similarity index 100%
rename from packages/editor-ui/src/stores/roles.store.ts
rename to packages/frontend/editor-ui/src/stores/roles.store.ts
diff --git a/packages/editor-ui/src/stores/root.store.ts b/packages/frontend/editor-ui/src/stores/root.store.ts
similarity index 100%
rename from packages/editor-ui/src/stores/root.store.ts
rename to packages/frontend/editor-ui/src/stores/root.store.ts
diff --git a/packages/editor-ui/src/stores/schemaPreview.store.ts b/packages/frontend/editor-ui/src/stores/schemaPreview.store.ts
similarity index 100%
rename from packages/editor-ui/src/stores/schemaPreview.store.ts
rename to packages/frontend/editor-ui/src/stores/schemaPreview.store.ts
diff --git a/packages/editor-ui/src/stores/settings.store.test.ts b/packages/frontend/editor-ui/src/stores/settings.store.test.ts
similarity index 100%
rename from packages/editor-ui/src/stores/settings.store.test.ts
rename to packages/frontend/editor-ui/src/stores/settings.store.test.ts
diff --git a/packages/editor-ui/src/stores/settings.store.ts b/packages/frontend/editor-ui/src/stores/settings.store.ts
similarity index 100%
rename from packages/editor-ui/src/stores/settings.store.ts
rename to packages/frontend/editor-ui/src/stores/settings.store.ts
diff --git a/packages/editor-ui/src/stores/sourceControl.store.ts b/packages/frontend/editor-ui/src/stores/sourceControl.store.ts
similarity index 100%
rename from packages/editor-ui/src/stores/sourceControl.store.ts
rename to packages/frontend/editor-ui/src/stores/sourceControl.store.ts
diff --git a/packages/editor-ui/src/stores/sso.store.ts b/packages/frontend/editor-ui/src/stores/sso.store.ts
similarity index 100%
rename from packages/editor-ui/src/stores/sso.store.ts
rename to packages/frontend/editor-ui/src/stores/sso.store.ts
diff --git a/packages/editor-ui/src/stores/sso.test.ts b/packages/frontend/editor-ui/src/stores/sso.test.ts
similarity index 100%
rename from packages/editor-ui/src/stores/sso.test.ts
rename to packages/frontend/editor-ui/src/stores/sso.test.ts
diff --git a/packages/editor-ui/src/stores/tags.store.ts b/packages/frontend/editor-ui/src/stores/tags.store.ts
similarity index 100%
rename from packages/editor-ui/src/stores/tags.store.ts
rename to packages/frontend/editor-ui/src/stores/tags.store.ts
diff --git a/packages/editor-ui/src/stores/templates.store.ts b/packages/frontend/editor-ui/src/stores/templates.store.ts
similarity index 100%
rename from packages/editor-ui/src/stores/templates.store.ts
rename to packages/frontend/editor-ui/src/stores/templates.store.ts
diff --git a/packages/editor-ui/src/stores/testDefinition.store.ee.test.ts b/packages/frontend/editor-ui/src/stores/testDefinition.store.ee.test.ts
similarity index 100%
rename from packages/editor-ui/src/stores/testDefinition.store.ee.test.ts
rename to packages/frontend/editor-ui/src/stores/testDefinition.store.ee.test.ts
diff --git a/packages/editor-ui/src/stores/testDefinition.store.ee.ts b/packages/frontend/editor-ui/src/stores/testDefinition.store.ee.ts
similarity index 100%
rename from packages/editor-ui/src/stores/testDefinition.store.ee.ts
rename to packages/frontend/editor-ui/src/stores/testDefinition.store.ee.ts
diff --git a/packages/editor-ui/src/stores/ui.store.ts b/packages/frontend/editor-ui/src/stores/ui.store.ts
similarity index 100%
rename from packages/editor-ui/src/stores/ui.store.ts
rename to packages/frontend/editor-ui/src/stores/ui.store.ts
diff --git a/packages/editor-ui/src/stores/ui.test.ts b/packages/frontend/editor-ui/src/stores/ui.test.ts
similarity index 100%
rename from packages/editor-ui/src/stores/ui.test.ts
rename to packages/frontend/editor-ui/src/stores/ui.test.ts
diff --git a/packages/editor-ui/src/stores/ui.utils.ts b/packages/frontend/editor-ui/src/stores/ui.utils.ts
similarity index 100%
rename from packages/editor-ui/src/stores/ui.utils.ts
rename to packages/frontend/editor-ui/src/stores/ui.utils.ts
diff --git a/packages/editor-ui/src/stores/usage.store.ts b/packages/frontend/editor-ui/src/stores/usage.store.ts
similarity index 100%
rename from packages/editor-ui/src/stores/usage.store.ts
rename to packages/frontend/editor-ui/src/stores/usage.store.ts
diff --git a/packages/editor-ui/src/stores/usage.test.ts b/packages/frontend/editor-ui/src/stores/usage.test.ts
similarity index 100%
rename from packages/editor-ui/src/stores/usage.test.ts
rename to packages/frontend/editor-ui/src/stores/usage.test.ts
diff --git a/packages/editor-ui/src/stores/users.store.test.ts b/packages/frontend/editor-ui/src/stores/users.store.test.ts
similarity index 100%
rename from packages/editor-ui/src/stores/users.store.test.ts
rename to packages/frontend/editor-ui/src/stores/users.store.test.ts
diff --git a/packages/editor-ui/src/stores/users.store.ts b/packages/frontend/editor-ui/src/stores/users.store.ts
similarity index 100%
rename from packages/editor-ui/src/stores/users.store.ts
rename to packages/frontend/editor-ui/src/stores/users.store.ts
diff --git a/packages/editor-ui/src/stores/versions.store.ts b/packages/frontend/editor-ui/src/stores/versions.store.ts
similarity index 100%
rename from packages/editor-ui/src/stores/versions.store.ts
rename to packages/frontend/editor-ui/src/stores/versions.store.ts
diff --git a/packages/editor-ui/src/stores/webhooks.store.ts b/packages/frontend/editor-ui/src/stores/webhooks.store.ts
similarity index 100%
rename from packages/editor-ui/src/stores/webhooks.store.ts
rename to packages/frontend/editor-ui/src/stores/webhooks.store.ts
diff --git a/packages/editor-ui/src/stores/workflowHistory.store.test.ts b/packages/frontend/editor-ui/src/stores/workflowHistory.store.test.ts
similarity index 100%
rename from packages/editor-ui/src/stores/workflowHistory.store.test.ts
rename to packages/frontend/editor-ui/src/stores/workflowHistory.store.test.ts
diff --git a/packages/editor-ui/src/stores/workflowHistory.store.ts b/packages/frontend/editor-ui/src/stores/workflowHistory.store.ts
similarity index 100%
rename from packages/editor-ui/src/stores/workflowHistory.store.ts
rename to packages/frontend/editor-ui/src/stores/workflowHistory.store.ts
diff --git a/packages/editor-ui/src/stores/workflows.ee.store.ts b/packages/frontend/editor-ui/src/stores/workflows.ee.store.ts
similarity index 100%
rename from packages/editor-ui/src/stores/workflows.ee.store.ts
rename to packages/frontend/editor-ui/src/stores/workflows.ee.store.ts
diff --git a/packages/editor-ui/src/stores/workflows.store.test.ts b/packages/frontend/editor-ui/src/stores/workflows.store.test.ts
similarity index 100%
rename from packages/editor-ui/src/stores/workflows.store.test.ts
rename to packages/frontend/editor-ui/src/stores/workflows.store.test.ts
diff --git a/packages/editor-ui/src/stores/workflows.store.ts b/packages/frontend/editor-ui/src/stores/workflows.store.ts
similarity index 100%
rename from packages/editor-ui/src/stores/workflows.store.ts
rename to packages/frontend/editor-ui/src/stores/workflows.store.ts
diff --git a/packages/editor-ui/src/styles/_animations.scss b/packages/frontend/editor-ui/src/styles/_animations.scss
similarity index 100%
rename from packages/editor-ui/src/styles/_animations.scss
rename to packages/frontend/editor-ui/src/styles/_animations.scss
diff --git a/packages/editor-ui/src/styles/_global.scss b/packages/frontend/editor-ui/src/styles/_global.scss
similarity index 100%
rename from packages/editor-ui/src/styles/_global.scss
rename to packages/frontend/editor-ui/src/styles/_global.scss
diff --git a/packages/editor-ui/src/styles/_variables.scss b/packages/frontend/editor-ui/src/styles/_variables.scss
similarity index 100%
rename from packages/editor-ui/src/styles/_variables.scss
rename to packages/frontend/editor-ui/src/styles/_variables.scss
diff --git a/packages/editor-ui/src/styles/index.scss b/packages/frontend/editor-ui/src/styles/index.scss
similarity index 100%
rename from packages/editor-ui/src/styles/index.scss
rename to packages/frontend/editor-ui/src/styles/index.scss
diff --git a/packages/editor-ui/src/styles/plugins/_codemirror.scss b/packages/frontend/editor-ui/src/styles/plugins/_codemirror.scss
similarity index 100%
rename from packages/editor-ui/src/styles/plugins/_codemirror.scss
rename to packages/frontend/editor-ui/src/styles/plugins/_codemirror.scss
diff --git a/packages/editor-ui/src/styles/plugins/_vueflow.scss b/packages/frontend/editor-ui/src/styles/plugins/_vueflow.scss
similarity index 100%
rename from packages/editor-ui/src/styles/plugins/_vueflow.scss
rename to packages/frontend/editor-ui/src/styles/plugins/_vueflow.scss
diff --git a/packages/editor-ui/src/styles/plugins/index.scss b/packages/frontend/editor-ui/src/styles/plugins/index.scss
similarity index 100%
rename from packages/editor-ui/src/styles/plugins/index.scss
rename to packages/frontend/editor-ui/src/styles/plugins/index.scss
diff --git a/packages/editor-ui/src/type-utils.d.ts b/packages/frontend/editor-ui/src/type-utils.d.ts
similarity index 100%
rename from packages/editor-ui/src/type-utils.d.ts
rename to packages/frontend/editor-ui/src/type-utils.d.ts
diff --git a/packages/editor-ui/src/types/assistant.types.ts b/packages/frontend/editor-ui/src/types/assistant.types.ts
similarity index 100%
rename from packages/editor-ui/src/types/assistant.types.ts
rename to packages/frontend/editor-ui/src/types/assistant.types.ts
diff --git a/packages/editor-ui/src/types/canvas.ts b/packages/frontend/editor-ui/src/types/canvas.ts
similarity index 100%
rename from packages/editor-ui/src/types/canvas.ts
rename to packages/frontend/editor-ui/src/types/canvas.ts
diff --git a/packages/editor-ui/src/types/completions.ts b/packages/frontend/editor-ui/src/types/completions.ts
similarity index 100%
rename from packages/editor-ui/src/types/completions.ts
rename to packages/frontend/editor-ui/src/types/completions.ts
diff --git a/packages/editor-ui/src/types/expressions.ts b/packages/frontend/editor-ui/src/types/expressions.ts
similarity index 100%
rename from packages/editor-ui/src/types/expressions.ts
rename to packages/frontend/editor-ui/src/types/expressions.ts
diff --git a/packages/editor-ui/src/types/externalHooks.ts b/packages/frontend/editor-ui/src/types/externalHooks.ts
similarity index 99%
rename from packages/editor-ui/src/types/externalHooks.ts
rename to packages/frontend/editor-ui/src/types/externalHooks.ts
index 8e5b19a73f..57ce8b4c8c 100644
--- a/packages/editor-ui/src/types/externalHooks.ts
+++ b/packages/frontend/editor-ui/src/types/externalHooks.ts
@@ -1,4 +1,4 @@
-import type { N8nInput } from 'n8n-design-system';
+import type { N8nInput } from '@n8n/design-system';
 import type {
 	ExecutionError,
 	GenericValue,
diff --git a/packages/editor-ui/src/types/index.ts b/packages/frontend/editor-ui/src/types/index.ts
similarity index 100%
rename from packages/editor-ui/src/types/index.ts
rename to packages/frontend/editor-ui/src/types/index.ts
diff --git a/packages/editor-ui/src/types/projects.types.ts b/packages/frontend/editor-ui/src/types/projects.types.ts
similarity index 100%
rename from packages/editor-ui/src/types/projects.types.ts
rename to packages/frontend/editor-ui/src/types/projects.types.ts
diff --git a/packages/editor-ui/src/types/pushConnection.ts b/packages/frontend/editor-ui/src/types/pushConnection.ts
similarity index 100%
rename from packages/editor-ui/src/types/pushConnection.ts
rename to packages/frontend/editor-ui/src/types/pushConnection.ts
diff --git a/packages/editor-ui/src/types/rbac.ts b/packages/frontend/editor-ui/src/types/rbac.ts
similarity index 100%
rename from packages/editor-ui/src/types/rbac.ts
rename to packages/frontend/editor-ui/src/types/rbac.ts
diff --git a/packages/editor-ui/src/types/roles.types.ts b/packages/frontend/editor-ui/src/types/roles.types.ts
similarity index 100%
rename from packages/editor-ui/src/types/roles.types.ts
rename to packages/frontend/editor-ui/src/types/roles.types.ts
diff --git a/packages/editor-ui/src/types/router.ts b/packages/frontend/editor-ui/src/types/router.ts
similarity index 100%
rename from packages/editor-ui/src/types/router.ts
rename to packages/frontend/editor-ui/src/types/router.ts
diff --git a/packages/editor-ui/src/types/sourceControl.types.ts b/packages/frontend/editor-ui/src/types/sourceControl.types.ts
similarity index 100%
rename from packages/editor-ui/src/types/sourceControl.types.ts
rename to packages/frontend/editor-ui/src/types/sourceControl.types.ts
diff --git a/packages/editor-ui/src/types/workflowHistory.ts b/packages/frontend/editor-ui/src/types/workflowHistory.ts
similarity index 100%
rename from packages/editor-ui/src/types/workflowHistory.ts
rename to packages/frontend/editor-ui/src/types/workflowHistory.ts
diff --git a/packages/editor-ui/src/utils/apiUtils.test.ts b/packages/frontend/editor-ui/src/utils/apiUtils.test.ts
similarity index 100%
rename from packages/editor-ui/src/utils/apiUtils.test.ts
rename to packages/frontend/editor-ui/src/utils/apiUtils.test.ts
diff --git a/packages/editor-ui/src/utils/apiUtils.ts b/packages/frontend/editor-ui/src/utils/apiUtils.ts
similarity index 100%
rename from packages/editor-ui/src/utils/apiUtils.ts
rename to packages/frontend/editor-ui/src/utils/apiUtils.ts
diff --git a/packages/editor-ui/src/utils/canvasUtils.test.ts b/packages/frontend/editor-ui/src/utils/canvasUtils.test.ts
similarity index 100%
rename from packages/editor-ui/src/utils/canvasUtils.test.ts
rename to packages/frontend/editor-ui/src/utils/canvasUtils.test.ts
diff --git a/packages/editor-ui/src/utils/canvasUtils.ts b/packages/frontend/editor-ui/src/utils/canvasUtils.ts
similarity index 100%
rename from packages/editor-ui/src/utils/canvasUtils.ts
rename to packages/frontend/editor-ui/src/utils/canvasUtils.ts
diff --git a/packages/editor-ui/src/utils/credentialOnlyNodes.ts b/packages/frontend/editor-ui/src/utils/credentialOnlyNodes.ts
similarity index 100%
rename from packages/editor-ui/src/utils/credentialOnlyNodes.ts
rename to packages/frontend/editor-ui/src/utils/credentialOnlyNodes.ts
diff --git a/packages/editor-ui/src/utils/easyAiWorkflowUtils.test.ts b/packages/frontend/editor-ui/src/utils/easyAiWorkflowUtils.test.ts
similarity index 100%
rename from packages/editor-ui/src/utils/easyAiWorkflowUtils.test.ts
rename to packages/frontend/editor-ui/src/utils/easyAiWorkflowUtils.test.ts
diff --git a/packages/editor-ui/src/utils/easyAiWorkflowUtils.ts b/packages/frontend/editor-ui/src/utils/easyAiWorkflowUtils.ts
similarity index 100%
rename from packages/editor-ui/src/utils/easyAiWorkflowUtils.ts
rename to packages/frontend/editor-ui/src/utils/easyAiWorkflowUtils.ts
diff --git a/packages/editor-ui/src/utils/eventUtils.ts b/packages/frontend/editor-ui/src/utils/eventUtils.ts
similarity index 100%
rename from packages/editor-ui/src/utils/eventUtils.ts
rename to packages/frontend/editor-ui/src/utils/eventUtils.ts
diff --git a/packages/editor-ui/src/utils/executionUtils.test.ts b/packages/frontend/editor-ui/src/utils/executionUtils.test.ts
similarity index 100%
rename from packages/editor-ui/src/utils/executionUtils.test.ts
rename to packages/frontend/editor-ui/src/utils/executionUtils.test.ts
diff --git a/packages/editor-ui/src/utils/executionUtils.ts b/packages/frontend/editor-ui/src/utils/executionUtils.ts
similarity index 100%
rename from packages/editor-ui/src/utils/executionUtils.ts
rename to packages/frontend/editor-ui/src/utils/executionUtils.ts
diff --git a/packages/editor-ui/src/utils/expressions.test.ts b/packages/frontend/editor-ui/src/utils/expressions.test.ts
similarity index 100%
rename from packages/editor-ui/src/utils/expressions.test.ts
rename to packages/frontend/editor-ui/src/utils/expressions.test.ts
diff --git a/packages/editor-ui/src/utils/expressions.ts b/packages/frontend/editor-ui/src/utils/expressions.ts
similarity index 100%
rename from packages/editor-ui/src/utils/expressions.ts
rename to packages/frontend/editor-ui/src/utils/expressions.ts
diff --git a/packages/editor-ui/src/utils/forceParse.ts b/packages/frontend/editor-ui/src/utils/forceParse.ts
similarity index 100%
rename from packages/editor-ui/src/utils/forceParse.ts
rename to packages/frontend/editor-ui/src/utils/forceParse.ts
diff --git a/packages/editor-ui/src/utils/formatters/dateFormatter.ts b/packages/frontend/editor-ui/src/utils/formatters/dateFormatter.ts
similarity index 100%
rename from packages/editor-ui/src/utils/formatters/dateFormatter.ts
rename to packages/frontend/editor-ui/src/utils/formatters/dateFormatter.ts
diff --git a/packages/editor-ui/src/utils/formatters/listFormatter.ts b/packages/frontend/editor-ui/src/utils/formatters/listFormatter.ts
similarity index 100%
rename from packages/editor-ui/src/utils/formatters/listFormatter.ts
rename to packages/frontend/editor-ui/src/utils/formatters/listFormatter.ts
diff --git a/packages/editor-ui/src/utils/fromAIOverrideUtils.test.ts b/packages/frontend/editor-ui/src/utils/fromAIOverrideUtils.test.ts
similarity index 100%
rename from packages/editor-ui/src/utils/fromAIOverrideUtils.test.ts
rename to packages/frontend/editor-ui/src/utils/fromAIOverrideUtils.test.ts
diff --git a/packages/editor-ui/src/utils/fromAIOverrideUtils.ts b/packages/frontend/editor-ui/src/utils/fromAIOverrideUtils.ts
similarity index 100%
rename from packages/editor-ui/src/utils/fromAIOverrideUtils.ts
rename to packages/frontend/editor-ui/src/utils/fromAIOverrideUtils.ts
diff --git a/packages/editor-ui/src/utils/htmlUtils.test.ts b/packages/frontend/editor-ui/src/utils/htmlUtils.test.ts
similarity index 100%
rename from packages/editor-ui/src/utils/htmlUtils.test.ts
rename to packages/frontend/editor-ui/src/utils/htmlUtils.test.ts
diff --git a/packages/editor-ui/src/utils/htmlUtils.ts b/packages/frontend/editor-ui/src/utils/htmlUtils.ts
similarity index 100%
rename from packages/editor-ui/src/utils/htmlUtils.ts
rename to packages/frontend/editor-ui/src/utils/htmlUtils.ts
diff --git a/packages/editor-ui/src/utils/injectStrict.test.ts b/packages/frontend/editor-ui/src/utils/injectStrict.test.ts
similarity index 100%
rename from packages/editor-ui/src/utils/injectStrict.test.ts
rename to packages/frontend/editor-ui/src/utils/injectStrict.test.ts
diff --git a/packages/editor-ui/src/utils/injectStrict.ts b/packages/frontend/editor-ui/src/utils/injectStrict.ts
similarity index 100%
rename from packages/editor-ui/src/utils/injectStrict.ts
rename to packages/frontend/editor-ui/src/utils/injectStrict.ts
diff --git a/packages/editor-ui/src/utils/mappingUtils.test.ts b/packages/frontend/editor-ui/src/utils/mappingUtils.test.ts
similarity index 100%
rename from packages/editor-ui/src/utils/mappingUtils.test.ts
rename to packages/frontend/editor-ui/src/utils/mappingUtils.test.ts
diff --git a/packages/editor-ui/src/utils/mappingUtils.ts b/packages/frontend/editor-ui/src/utils/mappingUtils.ts
similarity index 100%
rename from packages/editor-ui/src/utils/mappingUtils.ts
rename to packages/frontend/editor-ui/src/utils/mappingUtils.ts
diff --git a/packages/editor-ui/src/utils/nodeSettingsUtils.test.ts b/packages/frontend/editor-ui/src/utils/nodeSettingsUtils.test.ts
similarity index 100%
rename from packages/editor-ui/src/utils/nodeSettingsUtils.test.ts
rename to packages/frontend/editor-ui/src/utils/nodeSettingsUtils.test.ts
diff --git a/packages/editor-ui/src/utils/nodeSettingsUtils.ts b/packages/frontend/editor-ui/src/utils/nodeSettingsUtils.ts
similarity index 100%
rename from packages/editor-ui/src/utils/nodeSettingsUtils.ts
rename to packages/frontend/editor-ui/src/utils/nodeSettingsUtils.ts
diff --git a/packages/editor-ui/src/utils/nodeTypeUtils.test.ts b/packages/frontend/editor-ui/src/utils/nodeTypeUtils.test.ts
similarity index 100%
rename from packages/editor-ui/src/utils/nodeTypeUtils.test.ts
rename to packages/frontend/editor-ui/src/utils/nodeTypeUtils.test.ts
diff --git a/packages/editor-ui/src/utils/nodeTypes/nodeTypeTransforms.ts b/packages/frontend/editor-ui/src/utils/nodeTypes/nodeTypeTransforms.ts
similarity index 100%
rename from packages/editor-ui/src/utils/nodeTypes/nodeTypeTransforms.ts
rename to packages/frontend/editor-ui/src/utils/nodeTypes/nodeTypeTransforms.ts
diff --git a/packages/editor-ui/src/utils/nodeTypesUtils.ts b/packages/frontend/editor-ui/src/utils/nodeTypesUtils.ts
similarity index 100%
rename from packages/editor-ui/src/utils/nodeTypesUtils.ts
rename to packages/frontend/editor-ui/src/utils/nodeTypesUtils.ts
diff --git a/packages/editor-ui/src/utils/nodeViewUtils.test.ts b/packages/frontend/editor-ui/src/utils/nodeViewUtils.test.ts
similarity index 100%
rename from packages/editor-ui/src/utils/nodeViewUtils.test.ts
rename to packages/frontend/editor-ui/src/utils/nodeViewUtils.test.ts
diff --git a/packages/editor-ui/src/utils/nodeViewUtils.ts b/packages/frontend/editor-ui/src/utils/nodeViewUtils.ts
similarity index 100%
rename from packages/editor-ui/src/utils/nodeViewUtils.ts
rename to packages/frontend/editor-ui/src/utils/nodeViewUtils.ts
diff --git a/packages/editor-ui/src/utils/nodes/nodeTransforms.ts b/packages/frontend/editor-ui/src/utils/nodes/nodeTransforms.ts
similarity index 100%
rename from packages/editor-ui/src/utils/nodes/nodeTransforms.ts
rename to packages/frontend/editor-ui/src/utils/nodes/nodeTransforms.ts
diff --git a/packages/editor-ui/src/utils/objectUtils.test.ts b/packages/frontend/editor-ui/src/utils/objectUtils.test.ts
similarity index 100%
rename from packages/editor-ui/src/utils/objectUtils.test.ts
rename to packages/frontend/editor-ui/src/utils/objectUtils.test.ts
diff --git a/packages/editor-ui/src/utils/objectUtils.ts b/packages/frontend/editor-ui/src/utils/objectUtils.ts
similarity index 100%
rename from packages/editor-ui/src/utils/objectUtils.ts
rename to packages/frontend/editor-ui/src/utils/objectUtils.ts
diff --git a/packages/editor-ui/src/utils/pairedItemUtils.test.ts b/packages/frontend/editor-ui/src/utils/pairedItemUtils.test.ts
similarity index 100%
rename from packages/editor-ui/src/utils/pairedItemUtils.test.ts
rename to packages/frontend/editor-ui/src/utils/pairedItemUtils.test.ts
diff --git a/packages/editor-ui/src/utils/pairedItemUtils.ts b/packages/frontend/editor-ui/src/utils/pairedItemUtils.ts
similarity index 100%
rename from packages/editor-ui/src/utils/pairedItemUtils.ts
rename to packages/frontend/editor-ui/src/utils/pairedItemUtils.ts
diff --git a/packages/editor-ui/src/utils/projects.utils.test.ts b/packages/frontend/editor-ui/src/utils/projects.utils.test.ts
similarity index 100%
rename from packages/editor-ui/src/utils/projects.utils.test.ts
rename to packages/frontend/editor-ui/src/utils/projects.utils.test.ts
diff --git a/packages/editor-ui/src/utils/projects.utils.ts b/packages/frontend/editor-ui/src/utils/projects.utils.ts
similarity index 100%
rename from packages/editor-ui/src/utils/projects.utils.ts
rename to packages/frontend/editor-ui/src/utils/projects.utils.ts
diff --git a/packages/editor-ui/src/utils/rbac/checks/hasRole.test.ts b/packages/frontend/editor-ui/src/utils/rbac/checks/hasRole.test.ts
similarity index 100%
rename from packages/editor-ui/src/utils/rbac/checks/hasRole.test.ts
rename to packages/frontend/editor-ui/src/utils/rbac/checks/hasRole.test.ts
diff --git a/packages/editor-ui/src/utils/rbac/checks/hasRole.ts b/packages/frontend/editor-ui/src/utils/rbac/checks/hasRole.ts
similarity index 100%
rename from packages/editor-ui/src/utils/rbac/checks/hasRole.ts
rename to packages/frontend/editor-ui/src/utils/rbac/checks/hasRole.ts
diff --git a/packages/editor-ui/src/utils/rbac/checks/hasScope.test.ts b/packages/frontend/editor-ui/src/utils/rbac/checks/hasScope.test.ts
similarity index 100%
rename from packages/editor-ui/src/utils/rbac/checks/hasScope.test.ts
rename to packages/frontend/editor-ui/src/utils/rbac/checks/hasScope.test.ts
diff --git a/packages/editor-ui/src/utils/rbac/checks/hasScope.ts b/packages/frontend/editor-ui/src/utils/rbac/checks/hasScope.ts
similarity index 100%
rename from packages/editor-ui/src/utils/rbac/checks/hasScope.ts
rename to packages/frontend/editor-ui/src/utils/rbac/checks/hasScope.ts
diff --git a/packages/editor-ui/src/utils/rbac/checks/index.ts b/packages/frontend/editor-ui/src/utils/rbac/checks/index.ts
similarity index 100%
rename from packages/editor-ui/src/utils/rbac/checks/index.ts
rename to packages/frontend/editor-ui/src/utils/rbac/checks/index.ts
diff --git a/packages/editor-ui/src/utils/rbac/checks/isAuthenticated.test.ts b/packages/frontend/editor-ui/src/utils/rbac/checks/isAuthenticated.test.ts
similarity index 100%
rename from packages/editor-ui/src/utils/rbac/checks/isAuthenticated.test.ts
rename to packages/frontend/editor-ui/src/utils/rbac/checks/isAuthenticated.test.ts
diff --git a/packages/editor-ui/src/utils/rbac/checks/isAuthenticated.ts b/packages/frontend/editor-ui/src/utils/rbac/checks/isAuthenticated.ts
similarity index 100%
rename from packages/editor-ui/src/utils/rbac/checks/isAuthenticated.ts
rename to packages/frontend/editor-ui/src/utils/rbac/checks/isAuthenticated.ts
diff --git a/packages/editor-ui/src/utils/rbac/checks/isDefaultUser.test.ts b/packages/frontend/editor-ui/src/utils/rbac/checks/isDefaultUser.test.ts
similarity index 100%
rename from packages/editor-ui/src/utils/rbac/checks/isDefaultUser.test.ts
rename to packages/frontend/editor-ui/src/utils/rbac/checks/isDefaultUser.test.ts
diff --git a/packages/editor-ui/src/utils/rbac/checks/isDefaultUser.ts b/packages/frontend/editor-ui/src/utils/rbac/checks/isDefaultUser.ts
similarity index 100%
rename from packages/editor-ui/src/utils/rbac/checks/isDefaultUser.ts
rename to packages/frontend/editor-ui/src/utils/rbac/checks/isDefaultUser.ts
diff --git a/packages/editor-ui/src/utils/rbac/checks/isEnterpriseFeatureEnabled.test.ts b/packages/frontend/editor-ui/src/utils/rbac/checks/isEnterpriseFeatureEnabled.test.ts
similarity index 100%
rename from packages/editor-ui/src/utils/rbac/checks/isEnterpriseFeatureEnabled.test.ts
rename to packages/frontend/editor-ui/src/utils/rbac/checks/isEnterpriseFeatureEnabled.test.ts
diff --git a/packages/editor-ui/src/utils/rbac/checks/isEnterpriseFeatureEnabled.ts b/packages/frontend/editor-ui/src/utils/rbac/checks/isEnterpriseFeatureEnabled.ts
similarity index 100%
rename from packages/editor-ui/src/utils/rbac/checks/isEnterpriseFeatureEnabled.ts
rename to packages/frontend/editor-ui/src/utils/rbac/checks/isEnterpriseFeatureEnabled.ts
diff --git a/packages/editor-ui/src/utils/rbac/checks/isGuest.test.ts b/packages/frontend/editor-ui/src/utils/rbac/checks/isGuest.test.ts
similarity index 100%
rename from packages/editor-ui/src/utils/rbac/checks/isGuest.test.ts
rename to packages/frontend/editor-ui/src/utils/rbac/checks/isGuest.test.ts
diff --git a/packages/editor-ui/src/utils/rbac/checks/isGuest.ts b/packages/frontend/editor-ui/src/utils/rbac/checks/isGuest.ts
similarity index 100%
rename from packages/editor-ui/src/utils/rbac/checks/isGuest.ts
rename to packages/frontend/editor-ui/src/utils/rbac/checks/isGuest.ts
diff --git a/packages/editor-ui/src/utils/rbac/checks/isInstanceOwner.test.ts b/packages/frontend/editor-ui/src/utils/rbac/checks/isInstanceOwner.test.ts
similarity index 100%
rename from packages/editor-ui/src/utils/rbac/checks/isInstanceOwner.test.ts
rename to packages/frontend/editor-ui/src/utils/rbac/checks/isInstanceOwner.test.ts
diff --git a/packages/editor-ui/src/utils/rbac/checks/isInstanceOwner.ts b/packages/frontend/editor-ui/src/utils/rbac/checks/isInstanceOwner.ts
similarity index 100%
rename from packages/editor-ui/src/utils/rbac/checks/isInstanceOwner.ts
rename to packages/frontend/editor-ui/src/utils/rbac/checks/isInstanceOwner.ts
diff --git a/packages/editor-ui/src/utils/rbac/checks/isValid.test.ts b/packages/frontend/editor-ui/src/utils/rbac/checks/isValid.test.ts
similarity index 100%
rename from packages/editor-ui/src/utils/rbac/checks/isValid.test.ts
rename to packages/frontend/editor-ui/src/utils/rbac/checks/isValid.test.ts
diff --git a/packages/editor-ui/src/utils/rbac/checks/isValid.ts b/packages/frontend/editor-ui/src/utils/rbac/checks/isValid.ts
similarity index 100%
rename from packages/editor-ui/src/utils/rbac/checks/isValid.ts
rename to packages/frontend/editor-ui/src/utils/rbac/checks/isValid.ts
diff --git a/packages/editor-ui/src/utils/rbac/middleware.ts b/packages/frontend/editor-ui/src/utils/rbac/middleware.ts
similarity index 100%
rename from packages/editor-ui/src/utils/rbac/middleware.ts
rename to packages/frontend/editor-ui/src/utils/rbac/middleware.ts
diff --git a/packages/editor-ui/src/utils/rbac/middleware/authenticated.test.ts b/packages/frontend/editor-ui/src/utils/rbac/middleware/authenticated.test.ts
similarity index 100%
rename from packages/editor-ui/src/utils/rbac/middleware/authenticated.test.ts
rename to packages/frontend/editor-ui/src/utils/rbac/middleware/authenticated.test.ts
diff --git a/packages/editor-ui/src/utils/rbac/middleware/authenticated.ts b/packages/frontend/editor-ui/src/utils/rbac/middleware/authenticated.ts
similarity index 100%
rename from packages/editor-ui/src/utils/rbac/middleware/authenticated.ts
rename to packages/frontend/editor-ui/src/utils/rbac/middleware/authenticated.ts
diff --git a/packages/editor-ui/src/utils/rbac/middleware/custom.test.ts b/packages/frontend/editor-ui/src/utils/rbac/middleware/custom.test.ts
similarity index 100%
rename from packages/editor-ui/src/utils/rbac/middleware/custom.test.ts
rename to packages/frontend/editor-ui/src/utils/rbac/middleware/custom.test.ts
diff --git a/packages/editor-ui/src/utils/rbac/middleware/custom.ts b/packages/frontend/editor-ui/src/utils/rbac/middleware/custom.ts
similarity index 100%
rename from packages/editor-ui/src/utils/rbac/middleware/custom.ts
rename to packages/frontend/editor-ui/src/utils/rbac/middleware/custom.ts
diff --git a/packages/editor-ui/src/utils/rbac/middleware/defaultUser.test.ts b/packages/frontend/editor-ui/src/utils/rbac/middleware/defaultUser.test.ts
similarity index 100%
rename from packages/editor-ui/src/utils/rbac/middleware/defaultUser.test.ts
rename to packages/frontend/editor-ui/src/utils/rbac/middleware/defaultUser.test.ts
diff --git a/packages/editor-ui/src/utils/rbac/middleware/defaultUser.ts b/packages/frontend/editor-ui/src/utils/rbac/middleware/defaultUser.ts
similarity index 100%
rename from packages/editor-ui/src/utils/rbac/middleware/defaultUser.ts
rename to packages/frontend/editor-ui/src/utils/rbac/middleware/defaultUser.ts
diff --git a/packages/editor-ui/src/utils/rbac/middleware/enterprise.test.ts b/packages/frontend/editor-ui/src/utils/rbac/middleware/enterprise.test.ts
similarity index 100%
rename from packages/editor-ui/src/utils/rbac/middleware/enterprise.test.ts
rename to packages/frontend/editor-ui/src/utils/rbac/middleware/enterprise.test.ts
diff --git a/packages/editor-ui/src/utils/rbac/middleware/enterprise.ts b/packages/frontend/editor-ui/src/utils/rbac/middleware/enterprise.ts
similarity index 100%
rename from packages/editor-ui/src/utils/rbac/middleware/enterprise.ts
rename to packages/frontend/editor-ui/src/utils/rbac/middleware/enterprise.ts
diff --git a/packages/editor-ui/src/utils/rbac/middleware/guest.test.ts b/packages/frontend/editor-ui/src/utils/rbac/middleware/guest.test.ts
similarity index 100%
rename from packages/editor-ui/src/utils/rbac/middleware/guest.test.ts
rename to packages/frontend/editor-ui/src/utils/rbac/middleware/guest.test.ts
diff --git a/packages/editor-ui/src/utils/rbac/middleware/guest.ts b/packages/frontend/editor-ui/src/utils/rbac/middleware/guest.ts
similarity index 100%
rename from packages/editor-ui/src/utils/rbac/middleware/guest.ts
rename to packages/frontend/editor-ui/src/utils/rbac/middleware/guest.ts
diff --git a/packages/editor-ui/src/utils/rbac/middleware/rbac.test.ts b/packages/frontend/editor-ui/src/utils/rbac/middleware/rbac.test.ts
similarity index 100%
rename from packages/editor-ui/src/utils/rbac/middleware/rbac.test.ts
rename to packages/frontend/editor-ui/src/utils/rbac/middleware/rbac.test.ts
diff --git a/packages/editor-ui/src/utils/rbac/middleware/rbac.ts b/packages/frontend/editor-ui/src/utils/rbac/middleware/rbac.ts
similarity index 100%
rename from packages/editor-ui/src/utils/rbac/middleware/rbac.ts
rename to packages/frontend/editor-ui/src/utils/rbac/middleware/rbac.ts
diff --git a/packages/editor-ui/src/utils/rbac/middleware/role.test.ts b/packages/frontend/editor-ui/src/utils/rbac/middleware/role.test.ts
similarity index 100%
rename from packages/editor-ui/src/utils/rbac/middleware/role.test.ts
rename to packages/frontend/editor-ui/src/utils/rbac/middleware/role.test.ts
diff --git a/packages/editor-ui/src/utils/rbac/middleware/role.ts b/packages/frontend/editor-ui/src/utils/rbac/middleware/role.ts
similarity index 100%
rename from packages/editor-ui/src/utils/rbac/middleware/role.ts
rename to packages/frontend/editor-ui/src/utils/rbac/middleware/role.ts
diff --git a/packages/editor-ui/src/utils/rbac/permissions.test.ts b/packages/frontend/editor-ui/src/utils/rbac/permissions.test.ts
similarity index 100%
rename from packages/editor-ui/src/utils/rbac/permissions.test.ts
rename to packages/frontend/editor-ui/src/utils/rbac/permissions.test.ts
diff --git a/packages/editor-ui/src/utils/rbac/permissions.ts b/packages/frontend/editor-ui/src/utils/rbac/permissions.ts
similarity index 100%
rename from packages/editor-ui/src/utils/rbac/permissions.ts
rename to packages/frontend/editor-ui/src/utils/rbac/permissions.ts
diff --git a/packages/editor-ui/src/utils/rbacUtils.test.ts b/packages/frontend/editor-ui/src/utils/rbacUtils.test.ts
similarity index 100%
rename from packages/editor-ui/src/utils/rbacUtils.test.ts
rename to packages/frontend/editor-ui/src/utils/rbacUtils.test.ts
diff --git a/packages/editor-ui/src/utils/rbacUtils.ts b/packages/frontend/editor-ui/src/utils/rbacUtils.ts
similarity index 100%
rename from packages/editor-ui/src/utils/rbacUtils.ts
rename to packages/frontend/editor-ui/src/utils/rbacUtils.ts
diff --git a/packages/editor-ui/src/utils/sourceControlUtils.test.ts b/packages/frontend/editor-ui/src/utils/sourceControlUtils.test.ts
similarity index 100%
rename from packages/editor-ui/src/utils/sourceControlUtils.test.ts
rename to packages/frontend/editor-ui/src/utils/sourceControlUtils.test.ts
diff --git a/packages/editor-ui/src/utils/sourceControlUtils.ts b/packages/frontend/editor-ui/src/utils/sourceControlUtils.ts
similarity index 100%
rename from packages/editor-ui/src/utils/sourceControlUtils.ts
rename to packages/frontend/editor-ui/src/utils/sourceControlUtils.ts
diff --git a/packages/editor-ui/src/utils/telemetryUtils.ts b/packages/frontend/editor-ui/src/utils/telemetryUtils.ts
similarity index 100%
rename from packages/editor-ui/src/utils/telemetryUtils.ts
rename to packages/frontend/editor-ui/src/utils/telemetryUtils.ts
diff --git a/packages/editor-ui/src/utils/templates/templateActions.test.ts b/packages/frontend/editor-ui/src/utils/templates/templateActions.test.ts
similarity index 100%
rename from packages/editor-ui/src/utils/templates/templateActions.test.ts
rename to packages/frontend/editor-ui/src/utils/templates/templateActions.test.ts
diff --git a/packages/editor-ui/src/utils/templates/templateActions.ts b/packages/frontend/editor-ui/src/utils/templates/templateActions.ts
similarity index 100%
rename from packages/editor-ui/src/utils/templates/templateActions.ts
rename to packages/frontend/editor-ui/src/utils/templates/templateActions.ts
diff --git a/packages/editor-ui/src/utils/templates/templateTransforms.test.ts b/packages/frontend/editor-ui/src/utils/templates/templateTransforms.test.ts
similarity index 100%
rename from packages/editor-ui/src/utils/templates/templateTransforms.test.ts
rename to packages/frontend/editor-ui/src/utils/templates/templateTransforms.test.ts
diff --git a/packages/editor-ui/src/utils/templates/templateTransforms.ts b/packages/frontend/editor-ui/src/utils/templates/templateTransforms.ts
similarity index 100%
rename from packages/editor-ui/src/utils/templates/templateTransforms.ts
rename to packages/frontend/editor-ui/src/utils/templates/templateTransforms.ts
diff --git a/packages/editor-ui/src/utils/templates/templateTypes.ts b/packages/frontend/editor-ui/src/utils/templates/templateTypes.ts
similarity index 100%
rename from packages/editor-ui/src/utils/templates/templateTypes.ts
rename to packages/frontend/editor-ui/src/utils/templates/templateTypes.ts
diff --git a/packages/editor-ui/src/utils/templates/typeGuards.ts b/packages/frontend/editor-ui/src/utils/templates/typeGuards.ts
similarity index 100%
rename from packages/editor-ui/src/utils/templates/typeGuards.ts
rename to packages/frontend/editor-ui/src/utils/templates/typeGuards.ts
diff --git a/packages/editor-ui/src/utils/testData/nodeTypeTestData.ts b/packages/frontend/editor-ui/src/utils/testData/nodeTypeTestData.ts
similarity index 100%
rename from packages/editor-ui/src/utils/testData/nodeTypeTestData.ts
rename to packages/frontend/editor-ui/src/utils/testData/nodeTypeTestData.ts
diff --git a/packages/editor-ui/src/utils/typeGuards.ts b/packages/frontend/editor-ui/src/utils/typeGuards.ts
similarity index 100%
rename from packages/editor-ui/src/utils/typeGuards.ts
rename to packages/frontend/editor-ui/src/utils/typeGuards.ts
diff --git a/packages/editor-ui/src/utils/typeHelpers.ts b/packages/frontend/editor-ui/src/utils/typeHelpers.ts
similarity index 100%
rename from packages/editor-ui/src/utils/typeHelpers.ts
rename to packages/frontend/editor-ui/src/utils/typeHelpers.ts
diff --git a/packages/editor-ui/src/utils/typesUtils.test.ts b/packages/frontend/editor-ui/src/utils/typesUtils.test.ts
similarity index 100%
rename from packages/editor-ui/src/utils/typesUtils.test.ts
rename to packages/frontend/editor-ui/src/utils/typesUtils.test.ts
diff --git a/packages/editor-ui/src/utils/typesUtils.ts b/packages/frontend/editor-ui/src/utils/typesUtils.ts
similarity index 100%
rename from packages/editor-ui/src/utils/typesUtils.ts
rename to packages/frontend/editor-ui/src/utils/typesUtils.ts
diff --git a/packages/editor-ui/src/utils/userUtils.ts b/packages/frontend/editor-ui/src/utils/userUtils.ts
similarity index 100%
rename from packages/editor-ui/src/utils/userUtils.ts
rename to packages/frontend/editor-ui/src/utils/userUtils.ts
diff --git a/packages/editor-ui/src/utils/workerUtils.ts b/packages/frontend/editor-ui/src/utils/workerUtils.ts
similarity index 100%
rename from packages/editor-ui/src/utils/workerUtils.ts
rename to packages/frontend/editor-ui/src/utils/workerUtils.ts
diff --git a/packages/editor-ui/src/views/AuthView.test.ts b/packages/frontend/editor-ui/src/views/AuthView.test.ts
similarity index 100%
rename from packages/editor-ui/src/views/AuthView.test.ts
rename to packages/frontend/editor-ui/src/views/AuthView.test.ts
diff --git a/packages/editor-ui/src/views/AuthView.vue b/packages/frontend/editor-ui/src/views/AuthView.vue
similarity index 100%
rename from packages/editor-ui/src/views/AuthView.vue
rename to packages/frontend/editor-ui/src/views/AuthView.vue
diff --git a/packages/editor-ui/src/views/CanvasAddButton.vue b/packages/frontend/editor-ui/src/views/CanvasAddButton.vue
similarity index 100%
rename from packages/editor-ui/src/views/CanvasAddButton.vue
rename to packages/frontend/editor-ui/src/views/CanvasAddButton.vue
diff --git a/packages/editor-ui/src/views/ChangePasswordView.vue b/packages/frontend/editor-ui/src/views/ChangePasswordView.vue
similarity index 100%
rename from packages/editor-ui/src/views/ChangePasswordView.vue
rename to packages/frontend/editor-ui/src/views/ChangePasswordView.vue
diff --git a/packages/editor-ui/src/views/CredentialsView.test.ts b/packages/frontend/editor-ui/src/views/CredentialsView.test.ts
similarity index 100%
rename from packages/editor-ui/src/views/CredentialsView.test.ts
rename to packages/frontend/editor-ui/src/views/CredentialsView.test.ts
diff --git a/packages/editor-ui/src/views/CredentialsView.vue b/packages/frontend/editor-ui/src/views/CredentialsView.vue
similarity index 99%
rename from packages/editor-ui/src/views/CredentialsView.vue
rename to packages/frontend/editor-ui/src/views/CredentialsView.vue
index f520329696..d6f611dd73 100644
--- a/packages/editor-ui/src/views/CredentialsView.vue
+++ b/packages/frontend/editor-ui/src/views/CredentialsView.vue
@@ -28,7 +28,7 @@ import { useDocumentTitle } from '@/composables/useDocumentTitle';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { useI18n } from '@/composables/useI18n';
 import ProjectHeader from '@/components/Projects/ProjectHeader.vue';
-import { N8nCheckbox } from 'n8n-design-system';
+import { N8nCheckbox } from '@n8n/design-system';
 import { pickBy } from 'lodash-es';
 import { CREDENTIAL_EMPTY_VALUE } from 'n8n-workflow';
 import { isCredentialsResource } from '@/utils/typeGuards';
diff --git a/packages/editor-ui/src/views/ErrorView.vue b/packages/frontend/editor-ui/src/views/ErrorView.vue
similarity index 100%
rename from packages/editor-ui/src/views/ErrorView.vue
rename to packages/frontend/editor-ui/src/views/ErrorView.vue
diff --git a/packages/editor-ui/src/views/ExecutionsView.vue b/packages/frontend/editor-ui/src/views/ExecutionsView.vue
similarity index 100%
rename from packages/editor-ui/src/views/ExecutionsView.vue
rename to packages/frontend/editor-ui/src/views/ExecutionsView.vue
diff --git a/packages/editor-ui/src/views/ForgotMyPasswordView.test.ts b/packages/frontend/editor-ui/src/views/ForgotMyPasswordView.test.ts
similarity index 100%
rename from packages/editor-ui/src/views/ForgotMyPasswordView.test.ts
rename to packages/frontend/editor-ui/src/views/ForgotMyPasswordView.test.ts
diff --git a/packages/editor-ui/src/views/ForgotMyPasswordView.vue b/packages/frontend/editor-ui/src/views/ForgotMyPasswordView.vue
similarity index 100%
rename from packages/editor-ui/src/views/ForgotMyPasswordView.vue
rename to packages/frontend/editor-ui/src/views/ForgotMyPasswordView.vue
diff --git a/packages/editor-ui/src/views/LoadingView.vue b/packages/frontend/editor-ui/src/views/LoadingView.vue
similarity index 100%
rename from packages/editor-ui/src/views/LoadingView.vue
rename to packages/frontend/editor-ui/src/views/LoadingView.vue
diff --git a/packages/editor-ui/src/views/MfaView.vue b/packages/frontend/editor-ui/src/views/MfaView.vue
similarity index 100%
rename from packages/editor-ui/src/views/MfaView.vue
rename to packages/frontend/editor-ui/src/views/MfaView.vue
diff --git a/packages/editor-ui/src/views/NodeView.vue b/packages/frontend/editor-ui/src/views/NodeView.vue
similarity index 99%
rename from packages/editor-ui/src/views/NodeView.vue
rename to packages/frontend/editor-ui/src/views/NodeView.vue
index c91b6ce5df..6b508fb2da 100644
--- a/packages/editor-ui/src/views/NodeView.vue
+++ b/packages/frontend/editor-ui/src/views/NodeView.vue
@@ -102,7 +102,7 @@ import CanvasClearExecutionDataButton from '@/components/canvas/elements/buttons
 import { nodeViewEventBus } from '@/event-bus';
 import { tryToParseNumber } from '@/utils/typesUtils';
 import { useTemplatesStore } from '@/stores/templates.store';
-import { N8nCallout } from 'n8n-design-system';
+import { N8nCallout } from '@n8n/design-system';
 import { createEventBus } from '@n8n/utils/event-bus';
 import type { PinDataSource } from '@/composables/usePinnedData';
 import { useClipboard } from '@/composables/useClipboard';
diff --git a/packages/editor-ui/src/views/ProjectSettings.test.ts b/packages/frontend/editor-ui/src/views/ProjectSettings.test.ts
similarity index 100%
rename from packages/editor-ui/src/views/ProjectSettings.test.ts
rename to packages/frontend/editor-ui/src/views/ProjectSettings.test.ts
diff --git a/packages/editor-ui/src/views/ProjectSettings.vue b/packages/frontend/editor-ui/src/views/ProjectSettings.vue
similarity index 99%
rename from packages/editor-ui/src/views/ProjectSettings.vue
rename to packages/frontend/editor-ui/src/views/ProjectSettings.vue
index 2a64b95fe1..bba575c402 100644
--- a/packages/editor-ui/src/views/ProjectSettings.vue
+++ b/packages/frontend/editor-ui/src/views/ProjectSettings.vue
@@ -2,7 +2,7 @@
 import { computed, ref, watch, onBeforeMount, onMounted, nextTick } from 'vue';
 import { useRouter } from 'vue-router';
 import { deepCopy } from 'n8n-workflow';
-import { N8nFormInput } from 'n8n-design-system';
+import { N8nFormInput } from '@n8n/design-system';
 import { useUsersStore } from '@/stores/users.store';
 import type { IUser } from '@/Interface';
 import { useI18n } from '@/composables/useI18n';
diff --git a/packages/editor-ui/src/views/SamlOnboarding.test.ts b/packages/frontend/editor-ui/src/views/SamlOnboarding.test.ts
similarity index 100%
rename from packages/editor-ui/src/views/SamlOnboarding.test.ts
rename to packages/frontend/editor-ui/src/views/SamlOnboarding.test.ts
diff --git a/packages/editor-ui/src/views/SamlOnboarding.vue b/packages/frontend/editor-ui/src/views/SamlOnboarding.vue
similarity index 96%
rename from packages/editor-ui/src/views/SamlOnboarding.vue
rename to packages/frontend/editor-ui/src/views/SamlOnboarding.vue
index 5976917cf4..46937b18cc 100644
--- a/packages/editor-ui/src/views/SamlOnboarding.vue
+++ b/packages/frontend/editor-ui/src/views/SamlOnboarding.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import { reactive, ref } from 'vue';
 import { useRouter } from 'vue-router';
-import type { IFormBoxConfig } from 'n8n-design-system';
+import type { IFormBoxConfig } from '@n8n/design-system';
 import AuthView from '@/views/AuthView.vue';
 import { VIEWS } from '@/constants';
 import { useI18n } from '@/composables/useI18n';
diff --git a/packages/editor-ui/src/views/SettingsApiView.test.ts b/packages/frontend/editor-ui/src/views/SettingsApiView.test.ts
similarity index 100%
rename from packages/editor-ui/src/views/SettingsApiView.test.ts
rename to packages/frontend/editor-ui/src/views/SettingsApiView.test.ts
diff --git a/packages/editor-ui/src/views/SettingsApiView.vue b/packages/frontend/editor-ui/src/views/SettingsApiView.vue
similarity index 100%
rename from packages/editor-ui/src/views/SettingsApiView.vue
rename to packages/frontend/editor-ui/src/views/SettingsApiView.vue
diff --git a/packages/editor-ui/src/views/SettingsCommunityNodesView.vue b/packages/frontend/editor-ui/src/views/SettingsCommunityNodesView.vue
similarity index 100%
rename from packages/editor-ui/src/views/SettingsCommunityNodesView.vue
rename to packages/frontend/editor-ui/src/views/SettingsCommunityNodesView.vue
diff --git a/packages/editor-ui/src/views/SettingsExternalSecrets.test.ts b/packages/frontend/editor-ui/src/views/SettingsExternalSecrets.test.ts
similarity index 100%
rename from packages/editor-ui/src/views/SettingsExternalSecrets.test.ts
rename to packages/frontend/editor-ui/src/views/SettingsExternalSecrets.test.ts
diff --git a/packages/editor-ui/src/views/SettingsExternalSecrets.vue b/packages/frontend/editor-ui/src/views/SettingsExternalSecrets.vue
similarity index 100%
rename from packages/editor-ui/src/views/SettingsExternalSecrets.vue
rename to packages/frontend/editor-ui/src/views/SettingsExternalSecrets.vue
diff --git a/packages/editor-ui/src/views/SettingsLdapView.vue b/packages/frontend/editor-ui/src/views/SettingsLdapView.vue
similarity index 99%
rename from packages/editor-ui/src/views/SettingsLdapView.vue
rename to packages/frontend/editor-ui/src/views/SettingsLdapView.vue
index c1e71cd857..926f24193d 100644
--- a/packages/editor-ui/src/views/SettingsLdapView.vue
+++ b/packages/frontend/editor-ui/src/views/SettingsLdapView.vue
@@ -20,7 +20,7 @@ import { ElTable, ElTableColumn } from 'element-plus';
 import type { Events } from 'v3-infinite-loading';
 import InfiniteLoading from 'v3-infinite-loading';
 import { useSettingsStore } from '@/stores/settings.store';
-import { createFormEventBus } from 'n8n-design-system/utils';
+import { createFormEventBus } from '@n8n/design-system/utils';
 import type { TableColumnCtx } from 'element-plus';
 import { useI18n } from '@/composables/useI18n';
 import { usePageRedirectionHelper } from '@/composables/usePageRedirectionHelper';
diff --git a/packages/editor-ui/src/views/SettingsLogStreamingView.vue b/packages/frontend/editor-ui/src/views/SettingsLogStreamingView.vue
similarity index 100%
rename from packages/editor-ui/src/views/SettingsLogStreamingView.vue
rename to packages/frontend/editor-ui/src/views/SettingsLogStreamingView.vue
diff --git a/packages/editor-ui/src/views/SettingsPersonalView.test.ts b/packages/frontend/editor-ui/src/views/SettingsPersonalView.test.ts
similarity index 100%
rename from packages/editor-ui/src/views/SettingsPersonalView.test.ts
rename to packages/frontend/editor-ui/src/views/SettingsPersonalView.test.ts
diff --git a/packages/editor-ui/src/views/SettingsPersonalView.vue b/packages/frontend/editor-ui/src/views/SettingsPersonalView.vue
similarity index 99%
rename from packages/editor-ui/src/views/SettingsPersonalView.vue
rename to packages/frontend/editor-ui/src/views/SettingsPersonalView.vue
index f757c553cc..150d926dee 100644
--- a/packages/editor-ui/src/views/SettingsPersonalView.vue
+++ b/packages/frontend/editor-ui/src/views/SettingsPersonalView.vue
@@ -13,7 +13,7 @@ import {
 import { useUIStore } from '@/stores/ui.store';
 import { useUsersStore } from '@/stores/users.store';
 import { useSettingsStore } from '@/stores/settings.store';
-import { createFormEventBus } from 'n8n-design-system/utils';
+import { createFormEventBus } from '@n8n/design-system/utils';
 import type { MfaModalEvents } from '@/event-bus/mfa';
 import { promptMfaCodeBus } from '@/event-bus/mfa';
 
diff --git a/packages/editor-ui/src/views/SettingsSourceControl.test.ts b/packages/frontend/editor-ui/src/views/SettingsSourceControl.test.ts
similarity index 100%
rename from packages/editor-ui/src/views/SettingsSourceControl.test.ts
rename to packages/frontend/editor-ui/src/views/SettingsSourceControl.test.ts
diff --git a/packages/editor-ui/src/views/SettingsSourceControl.vue b/packages/frontend/editor-ui/src/views/SettingsSourceControl.vue
similarity index 99%
rename from packages/editor-ui/src/views/SettingsSourceControl.vue
rename to packages/frontend/editor-ui/src/views/SettingsSourceControl.vue
index 3c9fd3ab2a..afaba368eb 100644
--- a/packages/editor-ui/src/views/SettingsSourceControl.vue
+++ b/packages/frontend/editor-ui/src/views/SettingsSourceControl.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { computed, reactive, ref, onMounted } from 'vue';
-import type { Rule, RuleGroup } from 'n8n-design-system/types';
+import type { Rule, RuleGroup } from '@n8n/design-system/types';
 import { MODAL_CONFIRM } from '@/constants';
 import { useSourceControlStore } from '@/stores/sourceControl.store';
 import { useToast } from '@/composables/useToast';
diff --git a/packages/editor-ui/src/views/SettingsSso.test.ts b/packages/frontend/editor-ui/src/views/SettingsSso.test.ts
similarity index 100%
rename from packages/editor-ui/src/views/SettingsSso.test.ts
rename to packages/frontend/editor-ui/src/views/SettingsSso.test.ts
diff --git a/packages/editor-ui/src/views/SettingsSso.vue b/packages/frontend/editor-ui/src/views/SettingsSso.vue
similarity index 100%
rename from packages/editor-ui/src/views/SettingsSso.vue
rename to packages/frontend/editor-ui/src/views/SettingsSso.vue
diff --git a/packages/editor-ui/src/views/SettingsUsageAndPlan.test.ts b/packages/frontend/editor-ui/src/views/SettingsUsageAndPlan.test.ts
similarity index 100%
rename from packages/editor-ui/src/views/SettingsUsageAndPlan.test.ts
rename to packages/frontend/editor-ui/src/views/SettingsUsageAndPlan.test.ts
diff --git a/packages/editor-ui/src/views/SettingsUsageAndPlan.vue b/packages/frontend/editor-ui/src/views/SettingsUsageAndPlan.vue
similarity index 99%
rename from packages/editor-ui/src/views/SettingsUsageAndPlan.vue
rename to packages/frontend/editor-ui/src/views/SettingsUsageAndPlan.vue
index 8a2bb7feab..3bcc54e245 100644
--- a/packages/editor-ui/src/views/SettingsUsageAndPlan.vue
+++ b/packages/frontend/editor-ui/src/views/SettingsUsageAndPlan.vue
@@ -9,7 +9,7 @@ import { useUIStore } from '@/stores/ui.store';
 import { useToast } from '@/composables/useToast';
 import { useDocumentTitle } from '@/composables/useDocumentTitle';
 import { hasPermission } from '@/utils/rbac/permissions';
-import N8nInfoTip from 'n8n-design-system/components/N8nInfoTip';
+import N8nInfoTip from '@n8n/design-system/components/N8nInfoTip';
 import { COMMUNITY_PLUS_ENROLLMENT_MODAL } from '@/constants';
 import { useUsersStore } from '@/stores/users.store';
 import { getResourcePermissions } from '@/permissions';
diff --git a/packages/editor-ui/src/views/SettingsUsersView.test.ts b/packages/frontend/editor-ui/src/views/SettingsUsersView.test.ts
similarity index 100%
rename from packages/editor-ui/src/views/SettingsUsersView.test.ts
rename to packages/frontend/editor-ui/src/views/SettingsUsersView.test.ts
diff --git a/packages/editor-ui/src/views/SettingsUsersView.vue b/packages/frontend/editor-ui/src/views/SettingsUsersView.vue
similarity index 100%
rename from packages/editor-ui/src/views/SettingsUsersView.vue
rename to packages/frontend/editor-ui/src/views/SettingsUsersView.vue
diff --git a/packages/editor-ui/src/views/SettingsView.test.ts b/packages/frontend/editor-ui/src/views/SettingsView.test.ts
similarity index 100%
rename from packages/editor-ui/src/views/SettingsView.test.ts
rename to packages/frontend/editor-ui/src/views/SettingsView.test.ts
diff --git a/packages/editor-ui/src/views/SettingsView.vue b/packages/frontend/editor-ui/src/views/SettingsView.vue
similarity index 100%
rename from packages/editor-ui/src/views/SettingsView.vue
rename to packages/frontend/editor-ui/src/views/SettingsView.vue
diff --git a/packages/editor-ui/src/views/SetupView.vue b/packages/frontend/editor-ui/src/views/SetupView.vue
similarity index 100%
rename from packages/editor-ui/src/views/SetupView.vue
rename to packages/frontend/editor-ui/src/views/SetupView.vue
diff --git a/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/AppsRequiringCredsNotice.vue b/packages/frontend/editor-ui/src/views/SetupWorkflowFromTemplateView/AppsRequiringCredsNotice.vue
similarity index 93%
rename from packages/editor-ui/src/views/SetupWorkflowFromTemplateView/AppsRequiringCredsNotice.vue
rename to packages/frontend/editor-ui/src/views/SetupWorkflowFromTemplateView/AppsRequiringCredsNotice.vue
index ac5bfbe63a..0ee7a33da7 100644
--- a/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/AppsRequiringCredsNotice.vue
+++ b/packages/frontend/editor-ui/src/views/SetupWorkflowFromTemplateView/AppsRequiringCredsNotice.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { computed } from 'vue';
-import N8nNotice from 'n8n-design-system/components/N8nNotice';
+import N8nNotice from '@n8n/design-system/components/N8nNotice';
 import { formatList } from '@/utils/formatters/listFormatter';
 import { useI18n } from '@/composables/useI18n';
 import type {
diff --git a/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/IconSuccess.vue b/packages/frontend/editor-ui/src/views/SetupWorkflowFromTemplateView/IconSuccess.vue
similarity index 100%
rename from packages/editor-ui/src/views/SetupWorkflowFromTemplateView/IconSuccess.vue
rename to packages/frontend/editor-ui/src/views/SetupWorkflowFromTemplateView/IconSuccess.vue
diff --git a/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/SetupTemplateFormStep.vue b/packages/frontend/editor-ui/src/views/SetupWorkflowFromTemplateView/SetupTemplateFormStep.vue
similarity index 98%
rename from packages/editor-ui/src/views/SetupWorkflowFromTemplateView/SetupTemplateFormStep.vue
rename to packages/frontend/editor-ui/src/views/SetupWorkflowFromTemplateView/SetupTemplateFormStep.vue
index c482d31114..87d17757f1 100644
--- a/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/SetupTemplateFormStep.vue
+++ b/packages/frontend/editor-ui/src/views/SetupWorkflowFromTemplateView/SetupTemplateFormStep.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { computed } from 'vue';
-import N8nHeading from 'n8n-design-system/components/N8nHeading';
+import N8nHeading from '@n8n/design-system/components/N8nHeading';
 import NodeIcon from '@/components/NodeIcon.vue';
 import CredentialPicker from '@/components/CredentialPicker/CredentialPicker.vue';
 import IconSuccess from './IconSuccess.vue';
diff --git a/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/SetupWorkflowFromTemplateView.vue b/packages/frontend/editor-ui/src/views/SetupWorkflowFromTemplateView/SetupWorkflowFromTemplateView.vue
similarity index 97%
rename from packages/editor-ui/src/views/SetupWorkflowFromTemplateView/SetupWorkflowFromTemplateView.vue
rename to packages/frontend/editor-ui/src/views/SetupWorkflowFromTemplateView/SetupWorkflowFromTemplateView.vue
index 1869070eb4..da44977431 100644
--- a/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/SetupWorkflowFromTemplateView.vue
+++ b/packages/frontend/editor-ui/src/views/SetupWorkflowFromTemplateView/SetupWorkflowFromTemplateView.vue
@@ -2,8 +2,8 @@
 import { computed, onBeforeMount, onMounted, watch } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import { useSetupTemplateStore } from './setupTemplate.store';
-import N8nHeading from 'n8n-design-system/components/N8nHeading';
-import N8nLink from 'n8n-design-system/components/N8nLink';
+import N8nHeading from '@n8n/design-system/components/N8nHeading';
+import N8nLink from '@n8n/design-system/components/N8nLink';
 import AppsRequiringCredsNotice from './AppsRequiringCredsNotice.vue';
 import SetupTemplateFormStep from './SetupTemplateFormStep.vue';
 import TemplatesView from '../TemplatesView.vue';
diff --git a/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/__tests__/setupTemplate.store.testData.ts b/packages/frontend/editor-ui/src/views/SetupWorkflowFromTemplateView/__tests__/setupTemplate.store.testData.ts
similarity index 100%
rename from packages/editor-ui/src/views/SetupWorkflowFromTemplateView/__tests__/setupTemplate.store.testData.ts
rename to packages/frontend/editor-ui/src/views/SetupWorkflowFromTemplateView/__tests__/setupTemplate.store.testData.ts
diff --git a/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/setupTemplate.store.test.ts b/packages/frontend/editor-ui/src/views/SetupWorkflowFromTemplateView/setupTemplate.store.test.ts
similarity index 100%
rename from packages/editor-ui/src/views/SetupWorkflowFromTemplateView/setupTemplate.store.test.ts
rename to packages/frontend/editor-ui/src/views/SetupWorkflowFromTemplateView/setupTemplate.store.test.ts
diff --git a/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/setupTemplate.store.ts b/packages/frontend/editor-ui/src/views/SetupWorkflowFromTemplateView/setupTemplate.store.ts
similarity index 100%
rename from packages/editor-ui/src/views/SetupWorkflowFromTemplateView/setupTemplate.store.ts
rename to packages/frontend/editor-ui/src/views/SetupWorkflowFromTemplateView/setupTemplate.store.ts
diff --git a/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/useCredentialSetupState.test.ts b/packages/frontend/editor-ui/src/views/SetupWorkflowFromTemplateView/useCredentialSetupState.test.ts
similarity index 100%
rename from packages/editor-ui/src/views/SetupWorkflowFromTemplateView/useCredentialSetupState.test.ts
rename to packages/frontend/editor-ui/src/views/SetupWorkflowFromTemplateView/useCredentialSetupState.test.ts
diff --git a/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/useCredentialSetupState.ts b/packages/frontend/editor-ui/src/views/SetupWorkflowFromTemplateView/useCredentialSetupState.ts
similarity index 100%
rename from packages/editor-ui/src/views/SetupWorkflowFromTemplateView/useCredentialSetupState.ts
rename to packages/frontend/editor-ui/src/views/SetupWorkflowFromTemplateView/useCredentialSetupState.ts
diff --git a/packages/editor-ui/src/views/SigninView.test.ts b/packages/frontend/editor-ui/src/views/SigninView.test.ts
similarity index 100%
rename from packages/editor-ui/src/views/SigninView.test.ts
rename to packages/frontend/editor-ui/src/views/SigninView.test.ts
diff --git a/packages/editor-ui/src/views/SigninView.vue b/packages/frontend/editor-ui/src/views/SigninView.vue
similarity index 100%
rename from packages/editor-ui/src/views/SigninView.vue
rename to packages/frontend/editor-ui/src/views/SigninView.vue
diff --git a/packages/editor-ui/src/views/SignoutView.vue b/packages/frontend/editor-ui/src/views/SignoutView.vue
similarity index 100%
rename from packages/editor-ui/src/views/SignoutView.vue
rename to packages/frontend/editor-ui/src/views/SignoutView.vue
diff --git a/packages/editor-ui/src/views/SignupView.test.ts b/packages/frontend/editor-ui/src/views/SignupView.test.ts
similarity index 100%
rename from packages/editor-ui/src/views/SignupView.test.ts
rename to packages/frontend/editor-ui/src/views/SignupView.test.ts
diff --git a/packages/editor-ui/src/views/SignupView.vue b/packages/frontend/editor-ui/src/views/SignupView.vue
similarity index 100%
rename from packages/editor-ui/src/views/SignupView.vue
rename to packages/frontend/editor-ui/src/views/SignupView.vue
diff --git a/packages/editor-ui/src/views/TemplatesCollectionView.vue b/packages/frontend/editor-ui/src/views/TemplatesCollectionView.vue
similarity index 100%
rename from packages/editor-ui/src/views/TemplatesCollectionView.vue
rename to packages/frontend/editor-ui/src/views/TemplatesCollectionView.vue
diff --git a/packages/editor-ui/src/views/TemplatesSearchView.vue b/packages/frontend/editor-ui/src/views/TemplatesSearchView.vue
similarity index 100%
rename from packages/editor-ui/src/views/TemplatesSearchView.vue
rename to packages/frontend/editor-ui/src/views/TemplatesSearchView.vue
diff --git a/packages/editor-ui/src/views/TemplatesView.vue b/packages/frontend/editor-ui/src/views/TemplatesView.vue
similarity index 100%
rename from packages/editor-ui/src/views/TemplatesView.vue
rename to packages/frontend/editor-ui/src/views/TemplatesView.vue
diff --git a/packages/editor-ui/src/views/TemplatesWorkflowView.vue b/packages/frontend/editor-ui/src/views/TemplatesWorkflowView.vue
similarity index 100%
rename from packages/editor-ui/src/views/TemplatesWorkflowView.vue
rename to packages/frontend/editor-ui/src/views/TemplatesWorkflowView.vue
diff --git a/packages/editor-ui/src/views/TestDefinition/TestDefinitionEditView.vue b/packages/frontend/editor-ui/src/views/TestDefinition/TestDefinitionEditView.vue
similarity index 99%
rename from packages/editor-ui/src/views/TestDefinition/TestDefinitionEditView.vue
rename to packages/frontend/editor-ui/src/views/TestDefinition/TestDefinitionEditView.vue
index 5e191f24d6..719f5605ac 100644
--- a/packages/editor-ui/src/views/TestDefinition/TestDefinitionEditView.vue
+++ b/packages/frontend/editor-ui/src/views/TestDefinition/TestDefinitionEditView.vue
@@ -17,7 +17,7 @@ import { useTestDefinitionStore } from '@/stores/testDefinition.store.ee';
 import { useUIStore } from '@/stores/ui.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useDocumentVisibility } from '@vueuse/core';
-import { N8nButton, N8nIconButton, N8nText } from 'n8n-design-system';
+import { N8nButton, N8nIconButton, N8nText } from '@n8n/design-system';
 import type { IDataObject, IPinData } from 'n8n-workflow';
 
 const props = defineProps<{
diff --git a/packages/editor-ui/src/views/TestDefinition/TestDefinitionListView.vue b/packages/frontend/editor-ui/src/views/TestDefinition/TestDefinitionListView.vue
similarity index 99%
rename from packages/editor-ui/src/views/TestDefinition/TestDefinitionListView.vue
rename to packages/frontend/editor-ui/src/views/TestDefinition/TestDefinitionListView.vue
index b24489e378..da481a5b68 100644
--- a/packages/editor-ui/src/views/TestDefinition/TestDefinitionListView.vue
+++ b/packages/frontend/editor-ui/src/views/TestDefinition/TestDefinitionListView.vue
@@ -15,7 +15,7 @@ import {
 	N8nIconButton,
 	N8nLoading,
 	N8nTooltip,
-} from 'n8n-design-system';
+} from '@n8n/design-system';
 import { computed, h } from 'vue';
 import { RouterLink, useRouter } from 'vue-router';
 
diff --git a/packages/editor-ui/src/views/TestDefinition/TestDefinitionNewView.vue b/packages/frontend/editor-ui/src/views/TestDefinition/TestDefinitionNewView.vue
similarity index 100%
rename from packages/editor-ui/src/views/TestDefinition/TestDefinitionNewView.vue
rename to packages/frontend/editor-ui/src/views/TestDefinition/TestDefinitionNewView.vue
diff --git a/packages/editor-ui/src/views/TestDefinition/TestDefinitionRootView.vue b/packages/frontend/editor-ui/src/views/TestDefinition/TestDefinitionRootView.vue
similarity index 100%
rename from packages/editor-ui/src/views/TestDefinition/TestDefinitionRootView.vue
rename to packages/frontend/editor-ui/src/views/TestDefinition/TestDefinitionRootView.vue
diff --git a/packages/editor-ui/src/views/TestDefinition/TestDefinitionRunDetailView.vue b/packages/frontend/editor-ui/src/views/TestDefinition/TestDefinitionRunDetailView.vue
similarity index 99%
rename from packages/editor-ui/src/views/TestDefinition/TestDefinitionRunDetailView.vue
rename to packages/frontend/editor-ui/src/views/TestDefinition/TestDefinitionRunDetailView.vue
index 85d1582461..11d242a8bf 100644
--- a/packages/editor-ui/src/views/TestDefinition/TestDefinitionRunDetailView.vue
+++ b/packages/frontend/editor-ui/src/views/TestDefinition/TestDefinitionRunDetailView.vue
@@ -8,7 +8,7 @@ import { VIEWS } from '@/constants';
 import type { BaseTextKey } from '@/plugins/i18n';
 import { useTestDefinitionStore } from '@/stores/testDefinition.store.ee';
 import { convertToDisplayDate } from '@/utils/typesUtils';
-import { N8nActionToggle, N8nButton, N8nText, N8nTooltip } from 'n8n-design-system';
+import { N8nActionToggle, N8nButton, N8nText, N8nTooltip } from '@n8n/design-system';
 import { computed, onMounted, ref } from 'vue';
 import { useRouter } from 'vue-router';
 
diff --git a/packages/editor-ui/src/views/TestDefinition/tests/TestDefinitionEditView.test.ts b/packages/frontend/editor-ui/src/views/TestDefinition/tests/TestDefinitionEditView.test.ts
similarity index 100%
rename from packages/editor-ui/src/views/TestDefinition/tests/TestDefinitionEditView.test.ts
rename to packages/frontend/editor-ui/src/views/TestDefinition/tests/TestDefinitionEditView.test.ts
diff --git a/packages/editor-ui/src/views/TestDefinition/tests/TestDefinitionListView.test.ts b/packages/frontend/editor-ui/src/views/TestDefinition/tests/TestDefinitionListView.test.ts
similarity index 100%
rename from packages/editor-ui/src/views/TestDefinition/tests/TestDefinitionListView.test.ts
rename to packages/frontend/editor-ui/src/views/TestDefinition/tests/TestDefinitionListView.test.ts
diff --git a/packages/editor-ui/src/views/TestDefinition/tests/TestDefinitionRootView.test.ts b/packages/frontend/editor-ui/src/views/TestDefinition/tests/TestDefinitionRootView.test.ts
similarity index 100%
rename from packages/editor-ui/src/views/TestDefinition/tests/TestDefinitionRootView.test.ts
rename to packages/frontend/editor-ui/src/views/TestDefinition/tests/TestDefinitionRootView.test.ts
diff --git a/packages/editor-ui/src/views/VariablesView.test.ts b/packages/frontend/editor-ui/src/views/VariablesView.test.ts
similarity index 100%
rename from packages/editor-ui/src/views/VariablesView.test.ts
rename to packages/frontend/editor-ui/src/views/VariablesView.test.ts
diff --git a/packages/editor-ui/src/views/VariablesView.vue b/packages/frontend/editor-ui/src/views/VariablesView.vue
similarity index 99%
rename from packages/editor-ui/src/views/VariablesView.vue
rename to packages/frontend/editor-ui/src/views/VariablesView.vue
index 68740904cd..b829b64676 100644
--- a/packages/editor-ui/src/views/VariablesView.vue
+++ b/packages/frontend/editor-ui/src/views/VariablesView.vue
@@ -22,7 +22,7 @@ import ResourcesListLayout, {
 
 import { EnterpriseEditionFeature, MODAL_CONFIRM } from '@/constants';
 import type { DatatableColumn, EnvironmentVariable } from '@/Interface';
-import { uid } from 'n8n-design-system/utils';
+import { uid } from '@n8n/design-system/utils';
 import { getResourcePermissions } from '@/permissions';
 import { usePageRedirectionHelper } from '@/composables/usePageRedirectionHelper';
 import { useAsyncState } from '@vueuse/core';
@@ -34,7 +34,7 @@ import {
 	N8nInputLabel,
 	N8nCheckbox,
 	N8nBadge,
-} from 'n8n-design-system';
+} from '@n8n/design-system';
 
 const settingsStore = useSettingsStore();
 const environmentsStore = useEnvironmentsStore();
diff --git a/packages/editor-ui/src/views/WorkerView.vue b/packages/frontend/editor-ui/src/views/WorkerView.vue
similarity index 100%
rename from packages/editor-ui/src/views/WorkerView.vue
rename to packages/frontend/editor-ui/src/views/WorkerView.vue
diff --git a/packages/editor-ui/src/views/WorkflowExecutionsView.vue b/packages/frontend/editor-ui/src/views/WorkflowExecutionsView.vue
similarity index 100%
rename from packages/editor-ui/src/views/WorkflowExecutionsView.vue
rename to packages/frontend/editor-ui/src/views/WorkflowExecutionsView.vue
diff --git a/packages/editor-ui/src/views/WorkflowHistory.test.ts b/packages/frontend/editor-ui/src/views/WorkflowHistory.test.ts
similarity index 100%
rename from packages/editor-ui/src/views/WorkflowHistory.test.ts
rename to packages/frontend/editor-ui/src/views/WorkflowHistory.test.ts
diff --git a/packages/editor-ui/src/views/WorkflowHistory.vue b/packages/frontend/editor-ui/src/views/WorkflowHistory.vue
similarity index 100%
rename from packages/editor-ui/src/views/WorkflowHistory.vue
rename to packages/frontend/editor-ui/src/views/WorkflowHistory.vue
diff --git a/packages/editor-ui/src/views/WorkflowOnboardingView.vue b/packages/frontend/editor-ui/src/views/WorkflowOnboardingView.vue
similarity index 100%
rename from packages/editor-ui/src/views/WorkflowOnboardingView.vue
rename to packages/frontend/editor-ui/src/views/WorkflowOnboardingView.vue
diff --git a/packages/editor-ui/src/views/WorkflowsView.test.ts b/packages/frontend/editor-ui/src/views/WorkflowsView.test.ts
similarity index 100%
rename from packages/editor-ui/src/views/WorkflowsView.test.ts
rename to packages/frontend/editor-ui/src/views/WorkflowsView.test.ts
diff --git a/packages/editor-ui/src/views/WorkflowsView.vue b/packages/frontend/editor-ui/src/views/WorkflowsView.vue
similarity index 99%
rename from packages/editor-ui/src/views/WorkflowsView.vue
rename to packages/frontend/editor-ui/src/views/WorkflowsView.vue
index a1ddddc963..3d2a963481 100644
--- a/packages/editor-ui/src/views/WorkflowsView.vue
+++ b/packages/frontend/editor-ui/src/views/WorkflowsView.vue
@@ -38,12 +38,12 @@ import {
 	N8nOption,
 	N8nSelect,
 	N8nText,
-} from 'n8n-design-system';
+} from '@n8n/design-system';
 import ProjectHeader from '@/components/Projects/ProjectHeader.vue';
 import { getEasyAiWorkflowJson } from '@/utils/easyAiWorkflowUtils';
 import { useDebounce } from '@/composables/useDebounce';
 import { createEventBus } from '@n8n/utils/event-bus';
-import type { PathItem } from 'n8n-design-system/components/N8nBreadcrumbs/Breadcrumbs.vue';
+import type { PathItem } from '@n8n/design-system/components/N8nBreadcrumbs/Breadcrumbs.vue';
 import { ProjectTypes } from '@/types/projects.types';
 import { FOLDER_LIST_ITEM_ACTIONS } from '@/components/Folders/constants';
 import { debounce } from 'lodash-es';
diff --git a/packages/editor-ui/src/vue-virtual-scroller.d.ts b/packages/frontend/editor-ui/src/vue-virtual-scroller.d.ts
similarity index 100%
rename from packages/editor-ui/src/vue-virtual-scroller.d.ts
rename to packages/frontend/editor-ui/src/vue-virtual-scroller.d.ts
diff --git a/packages/editor-ui/tailwind.config.js b/packages/frontend/editor-ui/tailwind.config.js
similarity index 100%
rename from packages/editor-ui/tailwind.config.js
rename to packages/frontend/editor-ui/tailwind.config.js
diff --git a/packages/editor-ui/tests/e2e/.eslintrc.js b/packages/frontend/editor-ui/tests/e2e/.eslintrc.js
similarity index 100%
rename from packages/editor-ui/tests/e2e/.eslintrc.js
rename to packages/frontend/editor-ui/tests/e2e/.eslintrc.js
diff --git a/packages/editor-ui/tsconfig.json b/packages/frontend/editor-ui/tsconfig.json
similarity index 51%
rename from packages/editor-ui/tsconfig.json
rename to packages/frontend/editor-ui/tsconfig.json
index ff3d627bab..26a0871c10 100644
--- a/packages/editor-ui/tsconfig.json
+++ b/packages/frontend/editor-ui/tsconfig.json
@@ -2,25 +2,20 @@
 	"extends": "@n8n/typescript-config/tsconfig.frontend.json",
 	"compilerOptions": {
 		"baseUrl": ".",
-		"rootDirs": [
-			".",
-			"../frontend/@n8n/composables/src",
-			"../frontend/@n8n/chat/src",
-			"../design-system/src"
-		],
+		"rootDirs": [".", "../@n8n/composables/src", "../@n8n/chat/src", "../@n8n/design-system/src"],
 		"outDir": "dist",
 		"types": [
 			"vitest/globals",
 			"unplugin-icons/types/vue",
-			"../design-system/src/shims-modules.d.ts"
+			"../@n8n/design-system/src/shims-modules.d.ts"
 		],
 		"paths": {
 			"@/*": ["./src/*"],
-			"n8n-design-system*": ["../design-system/src*"],
-			"@n8n/composables*": ["../frontend/@n8n/composables/src*"],
-			"@n8n/chat*": ["../frontend/@n8n/chat/src*"],
-			"@n8n/api-types*": ["../@n8n/api-types/src*"],
-			"@n8n/utils*": ["../@n8n/utils/src*"]
+			"@n8n/composables*": ["../@n8n/composables/src*"],
+			"@n8n/chat*": ["../@n8n/chat/src*"],
+			"@n8n/design-system*": ["../@n8n/design-system/src*"],
+			"@n8n/api-types*": ["../../@n8n/api-types/src*"],
+			"@n8n/utils*": ["../../@n8n/utils/src*"]
 		},
 		// TODO: remove all options below this line
 		"useUnknownInCatchVariables": false
diff --git a/packages/editor-ui/vite.config.mts b/packages/frontend/editor-ui/vite.config.mts
similarity index 84%
rename from packages/editor-ui/vite.config.mts
rename to packages/frontend/editor-ui/vite.config.mts
index b2eddbb37a..b85e4cfa6e 100644
--- a/packages/editor-ui/vite.config.mts
+++ b/packages/frontend/editor-ui/vite.config.mts
@@ -18,28 +18,26 @@ const { NODE_ENV } = process.env;
 
 const browsers = browserslist.loadConfig({ path: process.cwd() });
 
+const packagesDir = resolve(__dirname, '..', '..');
+
 const alias = [
 	{ find: '@', replacement: resolve(__dirname, 'src') },
 	{ find: 'stream', replacement: 'stream-browserify' },
-	{
-		find: /^n8n-design-system$/,
-		replacement: resolve(__dirname, '..', 'design-system', 'src', 'index.ts'),
-	},
-	{
-		find: /^n8n-design-system\//,
-		replacement: resolve(__dirname, '..', 'design-system', 'src') + '/',
-	},
 	{
 		find: /^@n8n\/chat(.+)$/,
-		replacement: resolve(__dirname, '..', 'frontend', '@n8n', 'chat', 'src$1'),
+		replacement: resolve(packagesDir, 'frontend', '@n8n', 'chat', 'src$1'),
 	},
 	{
 		find: /^@n8n\/composables(.+)$/,
-		replacement: resolve(__dirname, '..', 'frontend', '@n8n', 'composables', 'src$1'),
+		replacement: resolve(packagesDir, 'frontend', '@n8n', 'composables', 'src$1'),
+	},
+	{
+		find: /^@n8n\/design-system(.+)$/,
+		replacement: resolve(packagesDir, 'frontend', '@n8n', 'design-system', 'src$1'),
 	},
 	{
 		find: /^@n8n\/utils(.+)$/,
-		replacement: resolve(__dirname, '..', '@n8n', 'utils', 'src$1'),
+		replacement: resolve(packagesDir, '@n8n', 'utils', 'src$1'),
 	},
 	...['orderBy', 'camelCase', 'cloneDeep', 'startCase'].map((name) => ({
 		find: new RegExp(`^lodash.${name}$`, 'i'),
@@ -106,7 +104,7 @@ export default mergeConfig(
 					additionalData: [
 						'',
 						'@use "@/n8n-theme-variables.scss" as *;',
-						'@use "n8n-design-system/css/mixins" as mixins;',
+						'@use "@n8n/design-system/css/mixins" as mixins;',
 					].join('\n'),
 				},
 			},
diff --git a/packages/workflow/package.json b/packages/workflow/package.json
index 701d064450..a793542c52 100644
--- a/packages/workflow/package.json
+++ b/packages/workflow/package.json
@@ -37,7 +37,7 @@
     "@types/express": "catalog:",
     "@types/jmespath": "^0.15.0",
     "@types/lodash": "catalog:",
-    "@types/luxon": "^3.2.0",
+    "@types/luxon": "3.2.0",
     "@types/md5": "^2.3.5",
     "@types/xml2js": "catalog:"
   },
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3b7f1f4d95..7820190cbd 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -230,7 +230,7 @@ importers:
         version: 7.0.0
       ts-jest:
         specifier: ^29.1.1
-        version: 29.1.1(@babel/core@7.24.0)(@jest/types@29.6.1)(babel-jest@29.6.2(@babel/core@7.24.0))(jest@29.6.2(@types/node@18.16.16)(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.7.2)))(typescript@5.7.2)
+        version: 29.1.1(@babel/core@7.26.0)(@jest/types@29.6.1)(babel-jest@29.6.2(@babel/core@7.26.0))(jest@29.6.2(@types/node@18.16.16)(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.7.2)))(typescript@5.7.2)
       tsc-alias:
         specifier: ^1.8.10
         version: 1.8.10
@@ -986,7 +986,7 @@ importers:
         version: link:../core
       n8n-editor-ui:
         specifier: workspace:*
-        version: link:../editor-ui
+        version: link:../frontend/editor-ui
       n8n-nodes-base:
         specifier: workspace:*
         version: link:../nodes-base
@@ -1305,449 +1305,6 @@ importers:
         specifier: 'catalog:'
         version: 0.4.14
 
-  packages/design-system:
-    dependencies:
-      '@fortawesome/fontawesome-svg-core':
-        specifier: ^1.2.36
-        version: 1.2.36
-      '@fortawesome/free-solid-svg-icons':
-        specifier: ^5.15.4
-        version: 5.15.4
-      '@fortawesome/vue-fontawesome':
-        specifier: ^3.0.3
-        version: 3.0.3(@fortawesome/fontawesome-svg-core@1.2.36)(vue@3.5.13(typescript@5.7.2))
-      '@n8n/composables':
-        specifier: workspace:*
-        version: link:../frontend/@n8n/composables
-      '@n8n/utils':
-        specifier: workspace:*
-        version: link:../@n8n/utils
-      '@vueuse/core':
-        specifier: '*'
-        version: 10.11.0(vue@3.5.13(typescript@5.7.2))
-      element-plus:
-        specifier: 2.4.3
-        version: 2.4.3(vue@3.5.13(typescript@5.7.2))
-      is-emoji-supported:
-        specifier: ^0.0.5
-        version: 0.0.5
-      markdown-it:
-        specifier: ^13.0.2
-        version: 13.0.2
-      markdown-it-emoji:
-        specifier: ^2.0.2
-        version: 2.0.2
-      markdown-it-link-attributes:
-        specifier: ^4.0.1
-        version: 4.0.1
-      markdown-it-task-lists:
-        specifier: ^2.1.1
-        version: 2.1.1
-      parse-diff:
-        specifier: ^0.11.1
-        version: 0.11.1
-      sanitize-html:
-        specifier: 2.12.1
-        version: 2.12.1
-      vue:
-        specifier: catalog:frontend
-        version: 3.5.13(typescript@5.7.2)
-      vue-boring-avatars:
-        specifier: ^1.3.0
-        version: 1.3.0(vue@3.5.13(typescript@5.7.2))
-      vue-router:
-        specifier: catalog:frontend
-        version: 4.5.0(vue@3.5.13(typescript@5.7.2))
-      xss:
-        specifier: 'catalog:'
-        version: 1.0.15
-    devDependencies:
-      '@n8n/eslint-config':
-        specifier: workspace:*
-        version: link:../@n8n/eslint-config
-      '@n8n/storybook':
-        specifier: workspace:*
-        version: link:../@n8n/storybook
-      '@n8n/typescript-config':
-        specifier: workspace:*
-        version: link:../@n8n/typescript-config
-      '@n8n/vitest-config':
-        specifier: workspace:*
-        version: link:../@n8n/vitest-config
-      '@testing-library/jest-dom':
-        specifier: ^6.6.3
-        version: 6.6.3
-      '@testing-library/user-event':
-        specifier: ^14.6.0
-        version: 14.6.0(@testing-library/dom@10.4.0)
-      '@testing-library/vue':
-        specifier: ^8.1.0
-        version: 8.1.0(@vue/compiler-sfc@3.5.13)(vue@3.5.13(typescript@5.7.2))
-      '@types/markdown-it':
-        specifier: ^13.0.9
-        version: 13.0.9
-      '@types/markdown-it-emoji':
-        specifier: ^2.0.2
-        version: 2.0.5
-      '@types/markdown-it-link-attributes':
-        specifier: ^3.0.5
-        version: 3.0.5
-      '@types/sanitize-html':
-        specifier: ^2.11.0
-        version: 2.11.0
-      '@vitejs/plugin-vue':
-        specifier: catalog:frontend
-        version: 5.2.1(vite@6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1))(vue@3.5.13(typescript@5.7.2))
-      '@vitest/coverage-v8':
-        specifier: catalog:frontend
-        version: 3.0.5(vitest@3.0.5(@types/debug@4.1.12)(@types/node@18.16.16)(jiti@1.21.0)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1))
-      autoprefixer:
-        specifier: ^10.4.19
-        version: 10.4.19(postcss@8.4.38)
-      postcss:
-        specifier: ^8.4.38
-        version: 8.4.38
-      sass:
-        specifier: ^1.64.1
-        version: 1.64.1
-      tailwindcss:
-        specifier: ^3.4.3
-        version: 3.4.3(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.7.2))
-      unplugin-icons:
-        specifier: ^0.19.0
-        version: 0.19.0(@vue/compiler-sfc@3.5.13)
-      unplugin-vue-components:
-        specifier: ^0.27.2
-        version: 0.27.3(@babel/parser@7.26.3)(rollup@4.24.0)(vue@3.5.13(typescript@5.7.2))
-      vite:
-        specifier: catalog:frontend
-        version: 6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1)
-      vitest:
-        specifier: catalog:frontend
-        version: 3.0.5(@types/debug@4.1.12)(@types/node@18.16.16)(jiti@1.21.0)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1)
-      vitest-mock-extended:
-        specifier: catalog:frontend
-        version: 2.0.2(typescript@5.7.2)(vitest@3.0.5(@types/debug@4.1.12)(@types/node@18.16.16)(jiti@1.21.0)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1))
-      vue-tsc:
-        specifier: ^2.1.10
-        version: 2.1.10(patch_hash=e2aee939ccac8a57fe449bfd92bedd8117841579526217bc39aca26c6b8c317f)(typescript@5.7.2)
-
-  packages/editor-ui:
-    dependencies:
-      '@codemirror/autocomplete':
-        specifier: ^6.16.0
-        version: 6.16.0(@codemirror/language@6.10.1)(@codemirror/state@6.4.1)(@codemirror/view@6.26.3)(@lezer/common@1.1.0)
-      '@codemirror/commands':
-        specifier: ^6.5.0
-        version: 6.5.0
-      '@codemirror/lang-css':
-        specifier: ^6.0.1
-        version: 6.0.1(@codemirror/view@6.26.3)(@lezer/common@1.1.0)
-      '@codemirror/lang-javascript':
-        specifier: ^6.2.2
-        version: 6.2.2
-      '@codemirror/lang-json':
-        specifier: ^6.0.1
-        version: 6.0.1
-      '@codemirror/lang-python':
-        specifier: ^6.1.6
-        version: 6.1.6(@codemirror/view@6.26.3)
-      '@codemirror/language':
-        specifier: ^6.10.1
-        version: 6.10.1
-      '@codemirror/lint':
-        specifier: ^6.8.0
-        version: 6.8.0
-      '@codemirror/search':
-        specifier: ^6.5.6
-        version: 6.5.6
-      '@codemirror/state':
-        specifier: ^6.4.1
-        version: 6.4.1
-      '@codemirror/view':
-        specifier: ^6.26.3
-        version: 6.26.3
-      '@fontsource/open-sans':
-        specifier: ^4.5.0
-        version: 4.5.12
-      '@fortawesome/fontawesome-svg-core':
-        specifier: '*'
-        version: 1.2.36
-      '@fortawesome/free-regular-svg-icons':
-        specifier: '*'
-        version: 6.2.0
-      '@fortawesome/free-solid-svg-icons':
-        specifier: '*'
-        version: 5.15.4
-      '@fortawesome/vue-fontawesome':
-        specifier: '*'
-        version: 3.0.3(@fortawesome/fontawesome-svg-core@1.2.36)(vue@3.5.13(typescript@5.7.2))
-      '@lezer/common':
-        specifier: ^1.0.4
-        version: 1.1.0
-      '@n8n/api-types':
-        specifier: workspace:*
-        version: link:../@n8n/api-types
-      '@n8n/chat':
-        specifier: workspace:*
-        version: link:../frontend/@n8n/chat
-      '@n8n/codemirror-lang':
-        specifier: workspace:*
-        version: link:../@n8n/codemirror-lang
-      '@n8n/codemirror-lang-sql':
-        specifier: ^1.0.2
-        version: 1.0.2(@codemirror/view@6.26.3)(@lezer/common@1.1.0)
-      '@n8n/composables':
-        specifier: workspace:*
-        version: link:../frontend/@n8n/composables
-      '@n8n/permissions':
-        specifier: workspace:*
-        version: link:../@n8n/permissions
-      '@n8n/utils':
-        specifier: workspace:*
-        version: link:../@n8n/utils
-      '@replit/codemirror-indentation-markers':
-        specifier: ^6.5.3
-        version: 6.5.3(@codemirror/language@6.10.1)(@codemirror/state@6.4.1)(@codemirror/view@6.26.3)
-      '@sentry/vue':
-        specifier: catalog:frontend
-        version: 8.33.1(vue@3.5.13(typescript@5.7.2))
-      '@typescript/vfs':
-        specifier: ^1.6.0
-        version: 1.6.0(typescript@5.7.2)
-      '@vue-flow/background':
-        specifier: ^1.3.2
-        version: 1.3.2(@vue-flow/core@1.42.1(vue@3.5.13(typescript@5.7.2)))(vue@3.5.13(typescript@5.7.2))
-      '@vue-flow/controls':
-        specifier: ^1.1.2
-        version: 1.1.2(@vue-flow/core@1.42.1(vue@3.5.13(typescript@5.7.2)))(vue@3.5.13(typescript@5.7.2))
-      '@vue-flow/core':
-        specifier: ^1.42.1
-        version: 1.42.1(vue@3.5.13(typescript@5.7.2))
-      '@vue-flow/minimap':
-        specifier: ^1.5.2
-        version: 1.5.2(@vue-flow/core@1.42.1(vue@3.5.13(typescript@5.7.2)))(vue@3.5.13(typescript@5.7.2))
-      '@vue-flow/node-resizer':
-        specifier: ^1.4.0
-        version: 1.4.0(@vue-flow/core@1.42.1(vue@3.5.13(typescript@5.7.2)))(vue@3.5.13(typescript@5.7.2))
-      '@vueuse/components':
-        specifier: ^10.11.0
-        version: 10.11.0(vue@3.5.13(typescript@5.7.2))
-      '@vueuse/core':
-        specifier: catalog:frontend
-        version: 10.11.0(vue@3.5.13(typescript@5.7.2))
-      array.prototype.tosorted:
-        specifier: 1.1.4
-        version: 1.1.4
-      axios:
-        specifier: 'catalog:'
-        version: 1.7.4
-      bowser:
-        specifier: 2.11.0
-        version: 2.11.0
-      change-case:
-        specifier: ^5.4.4
-        version: 5.4.4
-      chart.js:
-        specifier: ^4.4.0
-        version: 4.4.0
-      codemirror-lang-html-n8n:
-        specifier: ^1.0.0
-        version: 1.0.0
-      comlink:
-        specifier: ^4.4.1
-        version: 4.4.1
-      core-js:
-        specifier: ^3.40.0
-        version: 3.40.0
-      curlconverter:
-        specifier: ^4.12.0
-        version: 4.12.0
-      dateformat:
-        specifier: ^3.0.3
-        version: 3.0.3
-      email-providers:
-        specifier: ^2.0.1
-        version: 2.0.1
-      esprima-next:
-        specifier: 5.8.4
-        version: 5.8.4
-      fast-json-stable-stringify:
-        specifier: ^2.1.0
-        version: 2.1.0
-      file-saver:
-        specifier: ^2.0.2
-        version: 2.0.5
-      flatted:
-        specifier: 'catalog:'
-        version: 3.2.7
-      highlight.js:
-        specifier: catalog:frontend
-        version: 11.9.0
-      humanize-duration:
-        specifier: ^3.27.2
-        version: 3.27.3
-      jsonpath:
-        specifier: ^1.1.1
-        version: 1.1.1
-      lodash-es:
-        specifier: ^4.17.21
-        version: 4.17.21
-      luxon:
-        specifier: 'catalog:'
-        version: 3.4.4
-      n8n-design-system:
-        specifier: workspace:*
-        version: link:../design-system
-      n8n-workflow:
-        specifier: workspace:*
-        version: link:../workflow
-      pinia:
-        specifier: ^2.2.4
-        version: 2.2.4(typescript@5.7.2)(vue@3.5.13(typescript@5.7.2))
-      prettier:
-        specifier: ^3.3.3
-        version: 3.3.3
-      qrcode.vue:
-        specifier: ^3.3.4
-        version: 3.3.4(vue@3.5.13(typescript@5.7.2))
-      stream-browserify:
-        specifier: ^3.0.0
-        version: 3.0.0
-      timeago.js:
-        specifier: ^4.0.2
-        version: 4.0.2
-      typescript:
-        specifier: ^5.7.2
-        version: 5.7.2
-      uuid:
-        specifier: 'catalog:'
-        version: 10.0.0
-      v3-infinite-loading:
-        specifier: ^1.2.2
-        version: 1.2.2
-      vue:
-        specifier: catalog:frontend
-        version: 3.5.13(typescript@5.7.2)
-      vue-agile:
-        specifier: ^2.0.0
-        version: 2.0.0
-      vue-chartjs:
-        specifier: ^5.2.0
-        version: 5.2.0(chart.js@4.4.0)(vue@3.5.13(typescript@5.7.2))
-      vue-github-button:
-        specifier: ^3.1.3
-        version: 3.1.3
-      vue-i18n:
-        specifier: ^9.2.2
-        version: 9.2.2(vue@3.5.13(typescript@5.7.2))
-      vue-json-pretty:
-        specifier: 2.2.4
-        version: 2.2.4(vue@3.5.13(typescript@5.7.2))
-      vue-markdown-render:
-        specifier: catalog:frontend
-        version: 2.2.1(vue@3.5.13(typescript@5.7.2))
-      vue-router:
-        specifier: catalog:frontend
-        version: 4.5.0(vue@3.5.13(typescript@5.7.2))
-      vue-virtual-scroller:
-        specifier: 2.0.0-beta.8
-        version: 2.0.0-beta.8(vue@3.5.13(typescript@5.7.2))
-      vue3-touch-events:
-        specifier: ^4.1.3
-        version: 4.1.3
-      vuedraggable:
-        specifier: 4.1.0
-        version: 4.1.0(vue@3.5.13(typescript@5.7.2))
-      web-tree-sitter:
-        specifier: 0.24.3
-        version: 0.24.3
-      xss:
-        specifier: 'catalog:'
-        version: 1.0.15
-    devDependencies:
-      '@faker-js/faker':
-        specifier: ^8.0.2
-        version: 8.0.2
-      '@iconify/json':
-        specifier: ^2.2.228
-        version: 2.2.230
-      '@n8n/eslint-config':
-        specifier: workspace:*
-        version: link:../@n8n/eslint-config
-      '@n8n/typescript-config':
-        specifier: workspace:*
-        version: link:../@n8n/typescript-config
-      '@n8n/vitest-config':
-        specifier: workspace:*
-        version: link:../@n8n/vitest-config
-      '@pinia/testing':
-        specifier: ^0.1.6
-        version: 0.1.6(pinia@2.2.4(typescript@5.7.2)(vue@3.5.13(typescript@5.7.2)))(vue@3.5.13(typescript@5.7.2))
-      '@types/dateformat':
-        specifier: ^3.0.0
-        version: 3.0.1
-      '@types/file-saver':
-        specifier: ^2.0.1
-        version: 2.0.5
-      '@types/humanize-duration':
-        specifier: ^3.27.1
-        version: 3.27.1
-      '@types/json-schema':
-        specifier: ^7.0.15
-        version: 7.0.15
-      '@types/jsonpath':
-        specifier: ^0.2.0
-        version: 0.2.0
-      '@types/lodash-es':
-        specifier: ^4.17.6
-        version: 4.17.6
-      '@types/luxon':
-        specifier: ^3.2.0
-        version: 3.2.0
-      '@types/uuid':
-        specifier: 'catalog:'
-        version: 10.0.0
-      '@vitejs/plugin-legacy':
-        specifier: ^6.0.0
-        version: 6.0.0(terser@5.16.1)(vite@6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1))
-      '@vitejs/plugin-vue':
-        specifier: catalog:frontend
-        version: 5.2.1(vite@6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1))(vue@3.5.13(typescript@5.7.2))
-      '@vitest/coverage-v8':
-        specifier: catalog:frontend
-        version: 3.0.5(vitest@3.0.5(@types/debug@4.1.12)(@types/node@18.16.16)(jiti@1.21.0)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1))
-      browserslist-to-esbuild:
-        specifier: ^2.1.1
-        version: 2.1.1(browserslist@4.24.2)
-      miragejs:
-        specifier: ^0.1.48
-        version: 0.1.48
-      unplugin-icons:
-        specifier: ^0.19.0
-        version: 0.19.0(@vue/compiler-sfc@3.5.13)
-      unplugin-vue-components:
-        specifier: ^0.27.2
-        version: 0.27.3(@babel/parser@7.26.3)(rollup@4.24.0)(vue@3.5.13(typescript@5.7.2))
-      vite:
-        specifier: catalog:frontend
-        version: 6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1)
-      vite-plugin-static-copy:
-        specifier: 2.2.0
-        version: 2.2.0(vite@6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1))
-      vite-svg-loader:
-        specifier: 5.1.0
-        version: 5.1.0(vue@3.5.13(typescript@5.7.2))
-      vitest:
-        specifier: catalog:frontend
-        version: 3.0.5(@types/debug@4.1.12)(@types/node@18.16.16)(jiti@1.21.0)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1)
-      vitest-mock-extended:
-        specifier: catalog:frontend
-        version: 2.0.2(typescript@5.7.2)(vitest@3.0.5(@types/debug@4.1.12)(@types/node@18.16.16)(jiti@1.21.0)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1))
-      vue-tsc:
-        specifier: ^2.1.10
-        version: 2.1.10(patch_hash=e2aee939ccac8a57fe449bfd92bedd8117841579526217bc39aca26c6b8c317f)(typescript@5.7.2)
-
   packages/frontend/@n8n/chat:
     dependencies:
       '@vueuse/core':
@@ -1857,6 +1414,446 @@ importers:
         specifier: ^2.1.10
         version: 2.1.10(patch_hash=e2aee939ccac8a57fe449bfd92bedd8117841579526217bc39aca26c6b8c317f)(typescript@5.7.2)
 
+  packages/frontend/@n8n/design-system:
+    dependencies:
+      '@fortawesome/fontawesome-svg-core':
+        specifier: ^1.2.36
+        version: 1.2.36
+      '@fortawesome/free-solid-svg-icons':
+        specifier: ^5.15.4
+        version: 5.15.4
+      '@fortawesome/vue-fontawesome':
+        specifier: ^3.0.3
+        version: 3.0.3(@fortawesome/fontawesome-svg-core@1.2.36)(vue@3.5.13(typescript@5.7.2))
+      '@n8n/composables':
+        specifier: workspace:*
+        version: link:../composables
+      '@n8n/utils':
+        specifier: workspace:*
+        version: link:../../../@n8n/utils
+      '@vueuse/core':
+        specifier: '*'
+        version: 10.11.0(vue@3.5.13(typescript@5.7.2))
+      element-plus:
+        specifier: 2.4.3
+        version: 2.4.3(vue@3.5.13(typescript@5.7.2))
+      is-emoji-supported:
+        specifier: ^0.0.5
+        version: 0.0.5
+      markdown-it:
+        specifier: ^13.0.2
+        version: 13.0.2
+      markdown-it-emoji:
+        specifier: ^2.0.2
+        version: 2.0.2
+      markdown-it-link-attributes:
+        specifier: ^4.0.1
+        version: 4.0.1
+      markdown-it-task-lists:
+        specifier: ^2.1.1
+        version: 2.1.1
+      parse-diff:
+        specifier: ^0.11.1
+        version: 0.11.1
+      sanitize-html:
+        specifier: 2.12.1
+        version: 2.12.1
+      vue:
+        specifier: catalog:frontend
+        version: 3.5.13(typescript@5.7.2)
+      vue-boring-avatars:
+        specifier: ^1.3.0
+        version: 1.3.0(vue@3.5.13(typescript@5.7.2))
+      vue-router:
+        specifier: catalog:frontend
+        version: 4.5.0(vue@3.5.13(typescript@5.7.2))
+      xss:
+        specifier: 'catalog:'
+        version: 1.0.15
+    devDependencies:
+      '@n8n/eslint-config':
+        specifier: workspace:*
+        version: link:../../../@n8n/eslint-config
+      '@n8n/storybook':
+        specifier: workspace:*
+        version: link:../../../@n8n/storybook
+      '@n8n/typescript-config':
+        specifier: workspace:*
+        version: link:../../../@n8n/typescript-config
+      '@n8n/vitest-config':
+        specifier: workspace:*
+        version: link:../../../@n8n/vitest-config
+      '@testing-library/jest-dom':
+        specifier: ^6.6.3
+        version: 6.6.3
+      '@testing-library/user-event':
+        specifier: ^14.6.0
+        version: 14.6.0(@testing-library/dom@10.4.0)
+      '@testing-library/vue':
+        specifier: ^8.1.0
+        version: 8.1.0(@vue/compiler-sfc@3.5.13)(vue@3.5.13(typescript@5.7.2))
+      '@types/markdown-it':
+        specifier: ^13.0.9
+        version: 13.0.9
+      '@types/markdown-it-emoji':
+        specifier: ^2.0.2
+        version: 2.0.5
+      '@types/markdown-it-link-attributes':
+        specifier: ^3.0.5
+        version: 3.0.5
+      '@types/sanitize-html':
+        specifier: ^2.11.0
+        version: 2.11.0
+      '@vitejs/plugin-vue':
+        specifier: catalog:frontend
+        version: 5.2.1(vite@6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1))(vue@3.5.13(typescript@5.7.2))
+      '@vitest/coverage-v8':
+        specifier: catalog:frontend
+        version: 3.0.5(vitest@3.0.5(@types/debug@4.1.12)(@types/node@18.16.16)(jiti@1.21.0)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1))
+      autoprefixer:
+        specifier: ^10.4.19
+        version: 10.4.19(postcss@8.4.49)
+      postcss:
+        specifier: ^8.4.38
+        version: 8.4.49
+      sass:
+        specifier: ^1.64.1
+        version: 1.64.1
+      tailwindcss:
+        specifier: ^3.4.3
+        version: 3.4.3(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.7.2))
+      unplugin-icons:
+        specifier: ^0.19.0
+        version: 0.19.0(@vue/compiler-sfc@3.5.13)
+      unplugin-vue-components:
+        specifier: ^0.27.2
+        version: 0.27.3(@babel/parser@7.26.3)(rollup@4.24.0)(vue@3.5.13(typescript@5.7.2))
+      vite:
+        specifier: catalog:frontend
+        version: 6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1)
+      vitest:
+        specifier: catalog:frontend
+        version: 3.0.5(@types/debug@4.1.12)(@types/node@18.16.16)(jiti@1.21.0)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1)
+      vitest-mock-extended:
+        specifier: catalog:frontend
+        version: 2.0.2(typescript@5.7.2)(vitest@3.0.5(@types/debug@4.1.12)(@types/node@18.16.16)(jiti@1.21.0)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1))
+      vue-tsc:
+        specifier: ^2.1.10
+        version: 2.1.10(patch_hash=e2aee939ccac8a57fe449bfd92bedd8117841579526217bc39aca26c6b8c317f)(typescript@5.7.2)
+
+  packages/frontend/editor-ui:
+    dependencies:
+      '@codemirror/autocomplete':
+        specifier: ^6.16.0
+        version: 6.16.0(@codemirror/language@6.10.1)(@codemirror/state@6.4.1)(@codemirror/view@6.26.3)(@lezer/common@1.1.0)
+      '@codemirror/commands':
+        specifier: ^6.5.0
+        version: 6.5.0
+      '@codemirror/lang-css':
+        specifier: ^6.0.1
+        version: 6.0.1(@codemirror/view@6.26.3)(@lezer/common@1.1.0)
+      '@codemirror/lang-javascript':
+        specifier: ^6.2.2
+        version: 6.2.2
+      '@codemirror/lang-json':
+        specifier: ^6.0.1
+        version: 6.0.1
+      '@codemirror/lang-python':
+        specifier: ^6.1.6
+        version: 6.1.6(@codemirror/view@6.26.3)
+      '@codemirror/language':
+        specifier: ^6.10.1
+        version: 6.10.1
+      '@codemirror/lint':
+        specifier: ^6.8.0
+        version: 6.8.0
+      '@codemirror/search':
+        specifier: ^6.5.6
+        version: 6.5.6
+      '@codemirror/state':
+        specifier: ^6.4.1
+        version: 6.4.1
+      '@codemirror/view':
+        specifier: ^6.26.3
+        version: 6.26.3
+      '@fontsource/open-sans':
+        specifier: ^4.5.0
+        version: 4.5.12
+      '@fortawesome/fontawesome-svg-core':
+        specifier: '*'
+        version: 1.2.36
+      '@fortawesome/free-regular-svg-icons':
+        specifier: '*'
+        version: 6.2.0
+      '@fortawesome/free-solid-svg-icons':
+        specifier: '*'
+        version: 5.15.4
+      '@fortawesome/vue-fontawesome':
+        specifier: '*'
+        version: 3.0.3(@fortawesome/fontawesome-svg-core@1.2.36)(vue@3.5.13(typescript@5.7.2))
+      '@lezer/common':
+        specifier: 1.1.0
+        version: 1.1.0
+      '@n8n/api-types':
+        specifier: workspace:*
+        version: link:../../@n8n/api-types
+      '@n8n/chat':
+        specifier: workspace:*
+        version: link:../@n8n/chat
+      '@n8n/codemirror-lang':
+        specifier: workspace:*
+        version: link:../../@n8n/codemirror-lang
+      '@n8n/codemirror-lang-sql':
+        specifier: ^1.0.2
+        version: 1.0.2(@codemirror/view@6.26.3)(@lezer/common@1.1.0)
+      '@n8n/composables':
+        specifier: workspace:*
+        version: link:../@n8n/composables
+      '@n8n/design-system':
+        specifier: workspace:*
+        version: link:../@n8n/design-system
+      '@n8n/permissions':
+        specifier: workspace:*
+        version: link:../../@n8n/permissions
+      '@n8n/utils':
+        specifier: workspace:*
+        version: link:../../@n8n/utils
+      '@replit/codemirror-indentation-markers':
+        specifier: ^6.5.3
+        version: 6.5.3(@codemirror/language@6.10.1)(@codemirror/state@6.4.1)(@codemirror/view@6.26.3)
+      '@sentry/vue':
+        specifier: catalog:frontend
+        version: 8.33.1(vue@3.5.13(typescript@5.7.2))
+      '@typescript/vfs':
+        specifier: ^1.6.0
+        version: 1.6.0(typescript@5.7.2)
+      '@vue-flow/background':
+        specifier: ^1.3.2
+        version: 1.3.2(@vue-flow/core@1.42.1(vue@3.5.13(typescript@5.7.2)))(vue@3.5.13(typescript@5.7.2))
+      '@vue-flow/controls':
+        specifier: ^1.1.2
+        version: 1.1.2(@vue-flow/core@1.42.1(vue@3.5.13(typescript@5.7.2)))(vue@3.5.13(typescript@5.7.2))
+      '@vue-flow/core':
+        specifier: ^1.42.1
+        version: 1.42.1(vue@3.5.13(typescript@5.7.2))
+      '@vue-flow/minimap':
+        specifier: ^1.5.2
+        version: 1.5.2(@vue-flow/core@1.42.1(vue@3.5.13(typescript@5.7.2)))(vue@3.5.13(typescript@5.7.2))
+      '@vue-flow/node-resizer':
+        specifier: ^1.4.0
+        version: 1.4.0(@vue-flow/core@1.42.1(vue@3.5.13(typescript@5.7.2)))(vue@3.5.13(typescript@5.7.2))
+      '@vueuse/components':
+        specifier: ^10.11.0
+        version: 10.11.0(vue@3.5.13(typescript@5.7.2))
+      '@vueuse/core':
+        specifier: catalog:frontend
+        version: 10.11.0(vue@3.5.13(typescript@5.7.2))
+      array.prototype.tosorted:
+        specifier: 1.1.4
+        version: 1.1.4
+      axios:
+        specifier: 'catalog:'
+        version: 1.7.4
+      bowser:
+        specifier: 2.11.0
+        version: 2.11.0
+      change-case:
+        specifier: ^5.4.4
+        version: 5.4.4
+      chart.js:
+        specifier: ^4.4.0
+        version: 4.4.0
+      codemirror-lang-html-n8n:
+        specifier: ^1.0.0
+        version: 1.0.0
+      comlink:
+        specifier: ^4.4.1
+        version: 4.4.1
+      core-js:
+        specifier: ^3.40.0
+        version: 3.40.0
+      curlconverter:
+        specifier: ^4.12.0
+        version: 4.12.0
+      dateformat:
+        specifier: ^3.0.3
+        version: 3.0.3
+      email-providers:
+        specifier: ^2.0.1
+        version: 2.0.1
+      esprima-next:
+        specifier: 5.8.4
+        version: 5.8.4
+      fast-json-stable-stringify:
+        specifier: ^2.1.0
+        version: 2.1.0
+      file-saver:
+        specifier: ^2.0.2
+        version: 2.0.5
+      flatted:
+        specifier: 'catalog:'
+        version: 3.2.7
+      highlight.js:
+        specifier: catalog:frontend
+        version: 11.9.0
+      humanize-duration:
+        specifier: ^3.27.2
+        version: 3.27.3
+      jsonpath:
+        specifier: ^1.1.1
+        version: 1.1.1
+      lodash-es:
+        specifier: ^4.17.21
+        version: 4.17.21
+      luxon:
+        specifier: 'catalog:'
+        version: 3.4.4
+      n8n-workflow:
+        specifier: workspace:*
+        version: link:../../workflow
+      pinia:
+        specifier: ^2.2.4
+        version: 2.2.4(typescript@5.7.2)(vue@3.5.13(typescript@5.7.2))
+      prettier:
+        specifier: ^3.3.3
+        version: 3.3.3
+      qrcode.vue:
+        specifier: ^3.3.4
+        version: 3.3.4(vue@3.5.13(typescript@5.7.2))
+      stream-browserify:
+        specifier: ^3.0.0
+        version: 3.0.0
+      timeago.js:
+        specifier: ^4.0.2
+        version: 4.0.2
+      typescript:
+        specifier: ^5.7.2
+        version: 5.7.2
+      uuid:
+        specifier: 'catalog:'
+        version: 10.0.0
+      v3-infinite-loading:
+        specifier: ^1.2.2
+        version: 1.2.2
+      vue:
+        specifier: catalog:frontend
+        version: 3.5.13(typescript@5.7.2)
+      vue-agile:
+        specifier: ^2.0.0
+        version: 2.0.0
+      vue-chartjs:
+        specifier: ^5.2.0
+        version: 5.2.0(chart.js@4.4.0)(vue@3.5.13(typescript@5.7.2))
+      vue-github-button:
+        specifier: ^3.1.3
+        version: 3.1.3
+      vue-i18n:
+        specifier: ^9.2.2
+        version: 9.2.2(vue@3.5.13(typescript@5.7.2))
+      vue-json-pretty:
+        specifier: 2.2.4
+        version: 2.2.4(vue@3.5.13(typescript@5.7.2))
+      vue-markdown-render:
+        specifier: catalog:frontend
+        version: 2.2.1(vue@3.5.13(typescript@5.7.2))
+      vue-router:
+        specifier: catalog:frontend
+        version: 4.5.0(vue@3.5.13(typescript@5.7.2))
+      vue-virtual-scroller:
+        specifier: 2.0.0-beta.8
+        version: 2.0.0-beta.8(vue@3.5.13(typescript@5.7.2))
+      vue3-touch-events:
+        specifier: ^4.1.3
+        version: 4.1.3
+      vuedraggable:
+        specifier: 4.1.0
+        version: 4.1.0(vue@3.5.13(typescript@5.7.2))
+      web-tree-sitter:
+        specifier: 0.24.3
+        version: 0.24.3
+      xss:
+        specifier: 'catalog:'
+        version: 1.0.15
+    devDependencies:
+      '@faker-js/faker':
+        specifier: ^8.0.2
+        version: 8.0.2
+      '@iconify/json':
+        specifier: ^2.2.228
+        version: 2.2.230
+      '@n8n/eslint-config':
+        specifier: workspace:*
+        version: link:../../@n8n/eslint-config
+      '@n8n/typescript-config':
+        specifier: workspace:*
+        version: link:../../@n8n/typescript-config
+      '@n8n/vitest-config':
+        specifier: workspace:*
+        version: link:../../@n8n/vitest-config
+      '@pinia/testing':
+        specifier: ^0.1.6
+        version: 0.1.6(pinia@2.2.4(typescript@5.7.2)(vue@3.5.13(typescript@5.7.2)))(vue@3.5.13(typescript@5.7.2))
+      '@types/dateformat':
+        specifier: ^3.0.0
+        version: 3.0.1
+      '@types/file-saver':
+        specifier: ^2.0.1
+        version: 2.0.5
+      '@types/humanize-duration':
+        specifier: ^3.27.1
+        version: 3.27.1
+      '@types/json-schema':
+        specifier: ^7.0.15
+        version: 7.0.15
+      '@types/jsonpath':
+        specifier: ^0.2.0
+        version: 0.2.0
+      '@types/lodash-es':
+        specifier: ^4.17.6
+        version: 4.17.6
+      '@types/uuid':
+        specifier: 'catalog:'
+        version: 10.0.0
+      '@vitejs/plugin-legacy':
+        specifier: ^6.0.0
+        version: 6.0.0(terser@5.16.1)(vite@6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1))
+      '@vitejs/plugin-vue':
+        specifier: catalog:frontend
+        version: 5.2.1(vite@6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1))(vue@3.5.13(typescript@5.7.2))
+      '@vitest/coverage-v8':
+        specifier: catalog:frontend
+        version: 3.0.5(vitest@3.0.5(@types/debug@4.1.12)(@types/node@18.16.16)(jiti@1.21.0)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1))
+      browserslist-to-esbuild:
+        specifier: ^2.1.1
+        version: 2.1.1(browserslist@4.24.2)
+      miragejs:
+        specifier: ^0.1.48
+        version: 0.1.48
+      unplugin-icons:
+        specifier: ^0.19.0
+        version: 0.19.0(@vue/compiler-sfc@3.5.13)
+      unplugin-vue-components:
+        specifier: ^0.27.2
+        version: 0.27.3(@babel/parser@7.26.3)(rollup@4.24.0)(vue@3.5.13(typescript@5.7.2))
+      vite:
+        specifier: catalog:frontend
+        version: 6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1)
+      vite-plugin-static-copy:
+        specifier: 2.2.0
+        version: 2.2.0(vite@6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1))
+      vite-svg-loader:
+        specifier: 5.1.0
+        version: 5.1.0(vue@3.5.13(typescript@5.7.2))
+      vitest:
+        specifier: catalog:frontend
+        version: 3.0.5(@types/debug@4.1.12)(@types/node@18.16.16)(jiti@1.21.0)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1)
+      vitest-mock-extended:
+        specifier: catalog:frontend
+        version: 2.0.2(typescript@5.7.2)(vitest@3.0.5(@types/debug@4.1.12)(@types/node@18.16.16)(jiti@1.21.0)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1))
+      vue-tsc:
+        specifier: ^2.1.10
+        version: 2.1.10(patch_hash=e2aee939ccac8a57fe449bfd92bedd8117841579526217bc39aca26c6b8c317f)(typescript@5.7.2)
+
   packages/node-dev:
     dependencies:
       '@n8n/di':
@@ -2262,7 +2259,7 @@ importers:
         specifier: 'catalog:'
         version: 4.14.195
       '@types/luxon':
-        specifier: ^3.2.0
+        specifier: 3.2.0
         version: 3.2.0
       '@types/md5':
         specifier: ^2.3.5
@@ -2623,30 +2620,14 @@ packages:
     resolution: {integrity: sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/compat-data@7.23.5':
-    resolution: {integrity: sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==}
-    engines: {node: '>=6.9.0'}
-
   '@babel/compat-data@7.26.3':
     resolution: {integrity: sha512-nHIxvKPniQXpmQLb0vhY3VaFb3S0YrTAwpOWJZh1wn3oJPjJk9Asva204PsBdmAE8vpzfHudT8DB0scYvy9q0g==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/core@7.24.0':
-    resolution: {integrity: sha512-fQfkg0Gjkza3nf0c7/w6Xf34BW4YvzNfACRLmmb7XRLa6XHdR+K9AlJlxneFfWYf6uhOzuzZVTjF/8KfndZANw==}
-    engines: {node: '>=6.9.0'}
-
   '@babel/core@7.26.0':
     resolution: {integrity: sha512-i1SLeK+DzNnQ3LL/CswPCa/E5u4lh1k6IAEphON8F+cXt0t9euTshDru0q7/IqMa1PMPz5RnHuHscF8/ZJsStg==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/generator@7.22.9':
-    resolution: {integrity: sha512-KtLMbmicyuK2Ak/FTCJVbDnkN1SlT8/kceFTiuDiiRUUSMnHMidxSCdG4ndkTOHHpoomWe/4xkvHkEOncwjYIw==}
-    engines: {node: '>=6.9.0'}
-
-  '@babel/generator@7.23.6':
-    resolution: {integrity: sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==}
-    engines: {node: '>=6.9.0'}
-
   '@babel/generator@7.26.3':
     resolution: {integrity: sha512-6FF/urZvD0sTeO7k6/B15pMLC4CHUv1426lzr3N01aHJTl046uCAh9LXW/fzeXXjPNCJ6iABW5XaWOsIZB93aQ==}
     engines: {node: '>=6.9.0'}
@@ -2655,10 +2636,6 @@ packages:
     resolution: {integrity: sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/helper-compilation-targets@7.23.6':
-    resolution: {integrity: sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==}
-    engines: {node: '>=6.9.0'}
-
   '@babel/helper-compilation-targets@7.25.9':
     resolution: {integrity: sha512-j9Db8Suy6yV/VHa4qzrj9yZfZxhLWQdVnRlXxmKLYlhWUVB1sB2G5sxuWYXk/whHD9iW76PmNzxZ4UCnTQTVEQ==}
     engines: {node: '>=6.9.0'}
@@ -2680,36 +2657,14 @@ packages:
     peerDependencies:
       '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0
 
-  '@babel/helper-environment-visitor@7.22.20':
-    resolution: {integrity: sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==}
-    engines: {node: '>=6.9.0'}
-
-  '@babel/helper-function-name@7.23.0':
-    resolution: {integrity: sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==}
-    engines: {node: '>=6.9.0'}
-
-  '@babel/helper-hoist-variables@7.22.5':
-    resolution: {integrity: sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==}
-    engines: {node: '>=6.9.0'}
-
   '@babel/helper-member-expression-to-functions@7.25.9':
     resolution: {integrity: sha512-wbfdZ9w5vk0C0oyHqAJbc62+vet5prjj01jjJ8sKn3j9h3MQQlflEdXYvuqRWjHnM12coDEqiC1IRCi0U/EKwQ==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/helper-module-imports@7.22.15':
-    resolution: {integrity: sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==}
-    engines: {node: '>=6.9.0'}
-
   '@babel/helper-module-imports@7.25.9':
     resolution: {integrity: sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/helper-module-transforms@7.23.3':
-    resolution: {integrity: sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0
-
   '@babel/helper-module-transforms@7.26.0':
     resolution: {integrity: sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==}
     engines: {node: '>=6.9.0'}
@@ -2720,10 +2675,6 @@ packages:
     resolution: {integrity: sha512-FIpuNaz5ow8VyrYcnXQTDRGvV6tTjkNtCK/RYNDXGSLlUD6cBuQTSw43CShGxjvfBTfcUA/r6UhUCbtYqkhcuQ==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/helper-plugin-utils@7.22.5':
-    resolution: {integrity: sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==}
-    engines: {node: '>=6.9.0'}
-
   '@babel/helper-plugin-utils@7.25.9':
     resolution: {integrity: sha512-kSMlyUVdWe25rEsRGviIgOWnoT/nfABVWlqt9N19/dIPWViAOW2s9wznP5tURbs/IDuNk4gPy3YdYRgH3uxhBw==}
     engines: {node: '>=6.9.0'}
@@ -2740,18 +2691,10 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0
 
-  '@babel/helper-simple-access@7.22.5':
-    resolution: {integrity: sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==}
-    engines: {node: '>=6.9.0'}
-
   '@babel/helper-skip-transparent-expression-wrappers@7.25.9':
     resolution: {integrity: sha512-K4Du3BFa3gvyhzgPcntrkDgZzQaq6uozzcpGbOO1OEJaI+EJdqWIMTLgFgQf6lrfiDFo5FU+BxKepI9RmZqahA==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/helper-split-export-declaration@7.22.6':
-    resolution: {integrity: sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==}
-    engines: {node: '>=6.9.0'}
-
   '@babel/helper-string-parser@7.25.9':
     resolution: {integrity: sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==}
     engines: {node: '>=6.9.0'}
@@ -2764,10 +2707,6 @@ packages:
     resolution: {integrity: sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/helper-validator-option@7.23.5':
-    resolution: {integrity: sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==}
-    engines: {node: '>=6.9.0'}
-
   '@babel/helper-validator-option@7.25.9':
     resolution: {integrity: sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==}
     engines: {node: '>=6.9.0'}
@@ -2776,10 +2715,6 @@ packages:
     resolution: {integrity: sha512-ETzz9UTjQSTmw39GboatdymDq4XIQbR8ySgVrylRhPOFpsd+JrKHIuF0de7GCWmem+T4uC5z7EZguod7Wj4A4g==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/helpers@7.24.0':
-    resolution: {integrity: sha512-ulDZdc0Aj5uLc5nETsa7EPx2L7rM0YJM8r7ck7U73AXi7qOV44IHHRAYZHY6iU1rr3C5N4NtTmMRUJP6kwCWeA==}
-    engines: {node: '>=6.9.0'}
-
   '@babel/helpers@7.26.0':
     resolution: {integrity: sha512-tbhNuIxNcVb21pInl3ZSjksLCvgdZy9KwJ8brv993QtIVKJBBkYXz4q4ZbAv31GdnC+R90np23L5FbEBlthAEw==}
     engines: {node: '>=6.9.0'}
@@ -3231,18 +3166,10 @@ packages:
     resolution: {integrity: sha512-UwgBRMjJP+xv857DCngvqXI3Iq6J4v0wXmwc6sapg+zyhbwmQX67LUEFrkK5tbyJ30jGuG3ZvWpBiB9LCy1kWw==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/template@7.24.0':
-    resolution: {integrity: sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==}
-    engines: {node: '>=6.9.0'}
-
   '@babel/template@7.25.9':
     resolution: {integrity: sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/traverse@7.24.0':
-    resolution: {integrity: sha512-HfuJlI8qq3dEDmNU5ChzzpZRWq+oxCZQyMzIMEqLho+AQnhMnKQUzH6ydo3RBl/YjPCuk68Y6s0Gx0AeyULiWw==}
-    engines: {node: '>=6.9.0'}
-
   '@babel/traverse@7.26.3':
     resolution: {integrity: sha512-yTmc8J+Sj8yLzwr4PD5Xb/WF3bOYu2C2OoSZPzbuqRm4n98XirsbzaX+GloeO376UnSYIYJ4NCanwV5/ugZkwA==}
     engines: {node: '>=6.9.0'}
@@ -6473,9 +6400,6 @@ packages:
   '@vue/compiler-vue2@2.7.16':
     resolution: {integrity: sha512-qYC3Psj9S/mfu9uVi5WvNZIzq+xnXMhOwbTFKKDD7b1lhpnn71jXSFdTQ+WsIEk0ONCd7VV2IMm7ONl6tbQ86A==}
 
-  '@vue/devtools-api@6.4.5':
-    resolution: {integrity: sha512-JD5fcdIuFxU4fQyXUu3w2KpAJHzTVdN+p4iOX2lMWSHMOoQdMAcpFLZzm9Z/2nmsoZ1a96QEhZ26e50xLBsgOQ==}
-
   '@vue/devtools-api@6.6.4':
     resolution: {integrity: sha512-sGhTPMuXqZ1rVOk32RylztWkfXTRhuS7vgAKv0zjqk8gbsHkJ7xfFf+jbySxt7tWObEJwyKaHMikV/WGDiQm8g==}
 
@@ -7062,11 +6986,6 @@ packages:
     peerDependencies:
       browserslist: '*'
 
-  browserslist@4.23.0:
-    resolution: {integrity: sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==}
-    engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
-    hasBin: true
-
   browserslist@4.24.2:
     resolution: {integrity: sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==}
     engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
@@ -7182,9 +7101,6 @@ packages:
   camelize@1.0.1:
     resolution: {integrity: sha512-dU+Tx2fsypxTgtLoE36npi3UqcjSSMNYfkqgmoEhtZrraP5VWq0K7FkWVTYa8eMPtnU/G2txVsfdCJTn9uzpuQ==}
 
-  caniuse-lite@1.0.30001667:
-    resolution: {integrity: sha512-7LTwJjcRkzKFmtqGsibMeuXmvFDfZq/nzIjnmgCGzKKRVzjD72selLDK1oPF/Oxzmt4fNcPvTDvGqSDG4tCALw==}
-
   caniuse-lite@1.0.30001677:
     resolution: {integrity: sha512-fmfjsOlJUpMWu+mAAtZZZHz7UEwsUxIIvu1TJfO1HqFQvB/B+ii0xr9B5HpbZY/mC4XZ8SvjHJqtAY6pDPQEog==}
 
@@ -7887,10 +7803,6 @@ packages:
     resolution: {integrity: sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==}
     engines: {node: '>=8'}
 
-  define-properties@1.2.0:
-    resolution: {integrity: sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==}
-    engines: {node: '>= 0.4'}
-
   define-properties@1.2.1:
     resolution: {integrity: sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==}
     engines: {node: '>= 0.4'}
@@ -8073,9 +7985,6 @@ packages:
     engines: {node: '>=0.10.0'}
     hasBin: true
 
-  electron-to-chromium@1.4.703:
-    resolution: {integrity: sha512-094ZZC4nHXPKl/OwPinSMtLN9+hoFkdfQGKnvXbY+3WEAYtVDpz9UhJIViiY6Zb8agvqxiaJzNG9M+pRZWvSZw==}
-
   electron-to-chromium@1.5.51:
     resolution: {integrity: sha512-kKeWV57KSS8jH4alKt/jKnvHPmJgBxXzGUSbMd4eQF+iOsVPl7bz2KUmu6eo80eMP8wVioTfTyTzdMgM15WXNg==}
 
@@ -9768,11 +9677,6 @@ packages:
     resolution: {integrity: sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==}
     hasBin: true
 
-  jsesc@2.5.2:
-    resolution: {integrity: sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==}
-    engines: {node: '>=4'}
-    hasBin: true
-
   jsesc@3.0.2:
     resolution: {integrity: sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==}
     engines: {node: '>=6'}
@@ -10238,9 +10142,6 @@ packages:
     resolution: {integrity: sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==}
     hasBin: true
 
-  magic-string@0.30.10:
-    resolution: {integrity: sha512-iIRwTIf0QKV3UAnYK4PU8uiEc4SRh5jX0mwpIwETPpHdhVM4f53RSwS/vXvN1JhGX+Cs7B8qIq3d6AH49O5fAQ==}
-
   magic-string@0.30.14:
     resolution: {integrity: sha512-5c99P1WKTed11ZC0HMJOj6CDIue6F8ySu+bJL+85q1zBEIY8IklrJ1eiKC2NDRh3Ct3FcvmJPyQHb9erXMTJNw==}
 
@@ -10845,9 +10746,6 @@ packages:
   node-readfiles@0.2.0:
     resolution: {integrity: sha512-SU00ZarexNlE4Rjdm83vglt5Y9yiQ+XI1XpflWlb7q7UTN1JUItm69xMeiQCTxtTfnzt+83T8Cx+vI2ED++VDA==}
 
-  node-releases@2.0.14:
-    resolution: {integrity: sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==}
-
   node-releases@2.0.18:
     resolution: {integrity: sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==}
 
@@ -11438,10 +11336,6 @@ packages:
     resolution: {integrity: sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==}
     engines: {node: ^10 || ^12 || >=14}
 
-  postcss@8.4.38:
-    resolution: {integrity: sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==}
-    engines: {node: ^10 || ^12 || >=14}
-
   postcss@8.4.49:
     resolution: {integrity: sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==}
     engines: {node: ^10 || ^12 || >=14}
@@ -12289,10 +12183,6 @@ packages:
   sortablejs@1.14.0:
     resolution: {integrity: sha512-pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w==}
 
-  source-map-js@1.2.0:
-    resolution: {integrity: sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==}
-    engines: {node: '>=0.10.0'}
-
   source-map-js@1.2.1:
     resolution: {integrity: sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==}
     engines: {node: '>=0.10.0'}
@@ -13170,12 +13060,6 @@ packages:
     resolution: {integrity: sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==}
     engines: {node: '>=8'}
 
-  update-browserslist-db@1.0.13:
-    resolution: {integrity: sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==}
-    hasBin: true
-    peerDependencies:
-      browserslist: '>= 4.21.0'
-
   update-browserslist-db@1.1.1:
     resolution: {integrity: sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==}
     hasBin: true
@@ -13847,7 +13731,7 @@ snapshots:
   '@acuminous/bitsyntax@0.1.2':
     dependencies:
       buffer-more-ints: 1.0.0
-      debug: 4.4.0
+      debug: 4.4.0(supports-color@8.1.1)
       safe-buffer: 5.1.2
     transitivePeerDependencies:
       - supports-color
@@ -14917,30 +14801,8 @@ snapshots:
       js-tokens: 4.0.0
       picocolors: 1.1.1
 
-  '@babel/compat-data@7.23.5': {}
-
   '@babel/compat-data@7.26.3': {}
 
-  '@babel/core@7.24.0':
-    dependencies:
-      '@ampproject/remapping': 2.3.0
-      '@babel/code-frame': 7.26.2
-      '@babel/generator': 7.23.6
-      '@babel/helper-compilation-targets': 7.23.6
-      '@babel/helper-module-transforms': 7.23.3(@babel/core@7.24.0)
-      '@babel/helpers': 7.24.0
-      '@babel/parser': 7.26.3
-      '@babel/template': 7.24.0
-      '@babel/traverse': 7.24.0
-      '@babel/types': 7.26.3
-      convert-source-map: 2.0.0
-      debug: 4.4.0
-      gensync: 1.0.0-beta.2
-      json5: 2.2.3
-      semver: 7.6.0
-    transitivePeerDependencies:
-      - supports-color
-
   '@babel/core@7.26.0':
     dependencies:
       '@ampproject/remapping': 2.3.0
@@ -14954,27 +14816,13 @@ snapshots:
       '@babel/traverse': 7.26.3
       '@babel/types': 7.26.3
       convert-source-map: 2.0.0
-      debug: 4.4.0
+      debug: 4.4.0(supports-color@8.1.1)
       gensync: 1.0.0-beta.2
       json5: 2.2.3
       semver: 7.6.0
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/generator@7.22.9':
-    dependencies:
-      '@babel/types': 7.26.3
-      '@jridgewell/gen-mapping': 0.3.5
-      '@jridgewell/trace-mapping': 0.3.25
-      jsesc: 2.5.2
-
-  '@babel/generator@7.23.6':
-    dependencies:
-      '@babel/types': 7.26.3
-      '@jridgewell/gen-mapping': 0.3.5
-      '@jridgewell/trace-mapping': 0.3.25
-      jsesc: 2.5.2
-
   '@babel/generator@7.26.3':
     dependencies:
       '@babel/parser': 7.26.3
@@ -14987,14 +14835,6 @@ snapshots:
     dependencies:
       '@babel/types': 7.26.3
 
-  '@babel/helper-compilation-targets@7.23.6':
-    dependencies:
-      '@babel/compat-data': 7.23.5
-      '@babel/helper-validator-option': 7.23.5
-      browserslist: 4.24.2
-      lru-cache: 5.1.1
-      semver: 7.6.0
-
   '@babel/helper-compilation-targets@7.25.9':
     dependencies:
       '@babel/compat-data': 7.26.3
@@ -15028,23 +14868,12 @@ snapshots:
       '@babel/core': 7.26.0
       '@babel/helper-compilation-targets': 7.25.9
       '@babel/helper-plugin-utils': 7.25.9
-      debug: 4.4.0
+      debug: 4.4.0(supports-color@8.1.1)
       lodash.debounce: 4.0.8
       resolve: 1.22.8
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/helper-environment-visitor@7.22.20': {}
-
-  '@babel/helper-function-name@7.23.0':
-    dependencies:
-      '@babel/template': 7.24.0
-      '@babel/types': 7.26.3
-
-  '@babel/helper-hoist-variables@7.22.5':
-    dependencies:
-      '@babel/types': 7.26.3
-
   '@babel/helper-member-expression-to-functions@7.25.9':
     dependencies:
       '@babel/traverse': 7.26.3
@@ -15052,10 +14881,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/helper-module-imports@7.22.15':
-    dependencies:
-      '@babel/types': 7.26.3
-
   '@babel/helper-module-imports@7.25.9':
     dependencies:
       '@babel/traverse': 7.26.3
@@ -15063,15 +14888,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/helper-module-transforms@7.23.3(@babel/core@7.24.0)':
-    dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-environment-visitor': 7.22.20
-      '@babel/helper-module-imports': 7.22.15
-      '@babel/helper-simple-access': 7.22.5
-      '@babel/helper-split-export-declaration': 7.22.6
-      '@babel/helper-validator-identifier': 7.25.9
-
   '@babel/helper-module-transforms@7.26.0(@babel/core@7.26.0)':
     dependencies:
       '@babel/core': 7.26.0
@@ -15085,8 +14901,6 @@ snapshots:
     dependencies:
       '@babel/types': 7.26.3
 
-  '@babel/helper-plugin-utils@7.22.5': {}
-
   '@babel/helper-plugin-utils@7.25.9': {}
 
   '@babel/helper-remap-async-to-generator@7.25.9(@babel/core@7.26.0)':
@@ -15107,10 +14921,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/helper-simple-access@7.22.5':
-    dependencies:
-      '@babel/types': 7.26.3
-
   '@babel/helper-skip-transparent-expression-wrappers@7.25.9':
     dependencies:
       '@babel/traverse': 7.26.3
@@ -15118,18 +14928,12 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/helper-split-export-declaration@7.22.6':
-    dependencies:
-      '@babel/types': 7.26.3
-
   '@babel/helper-string-parser@7.25.9': {}
 
   '@babel/helper-validator-identifier@7.22.20': {}
 
   '@babel/helper-validator-identifier@7.25.9': {}
 
-  '@babel/helper-validator-option@7.23.5': {}
-
   '@babel/helper-validator-option@7.25.9': {}
 
   '@babel/helper-wrap-function@7.25.9':
@@ -15140,14 +14944,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/helpers@7.24.0':
-    dependencies:
-      '@babel/template': 7.24.0
-      '@babel/traverse': 7.24.0
-      '@babel/types': 7.26.3
-    transitivePeerDependencies:
-      - supports-color
-
   '@babel/helpers@7.26.0':
     dependencies:
       '@babel/template': 7.25.9
@@ -15196,20 +14992,20 @@ snapshots:
     dependencies:
       '@babel/core': 7.26.0
 
-  '@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.24.0)':
+  '@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.26.0)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
 
-  '@babel/plugin-syntax-bigint@7.8.3(@babel/core@7.24.0)':
+  '@babel/plugin-syntax-bigint@7.8.3(@babel/core@7.26.0)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
 
-  '@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.24.0)':
+  '@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.26.0)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
 
   '@babel/plugin-syntax-import-assertions@7.26.0(@babel/core@7.26.0)':
     dependencies:
@@ -15221,60 +15017,60 @@ snapshots:
       '@babel/core': 7.26.0
       '@babel/helper-plugin-utils': 7.25.9
 
-  '@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.24.0)':
+  '@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.26.0)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
 
-  '@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.24.0)':
+  '@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.26.0)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
 
-  '@babel/plugin-syntax-jsx@7.18.6(@babel/core@7.24.0)':
+  '@babel/plugin-syntax-jsx@7.18.6(@babel/core@7.26.0)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
 
-  '@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.24.0)':
+  '@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.26.0)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
 
-  '@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.24.0)':
+  '@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.26.0)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
 
-  '@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.24.0)':
+  '@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.26.0)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
 
-  '@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.24.0)':
+  '@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.26.0)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
 
-  '@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.24.0)':
+  '@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.26.0)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
 
-  '@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.24.0)':
+  '@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.26.0)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
 
-  '@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.24.0)':
+  '@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.26.0)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
 
-  '@babel/plugin-syntax-typescript@7.20.0(@babel/core@7.24.0)':
+  '@babel/plugin-syntax-typescript@7.20.0(@babel/core@7.26.0)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
 
   '@babel/plugin-syntax-unicode-sets-regex@7.18.6(@babel/core@7.26.0)':
     dependencies:
@@ -15687,33 +15483,12 @@ snapshots:
     dependencies:
       regenerator-runtime: 0.14.1
 
-  '@babel/template@7.24.0':
-    dependencies:
-      '@babel/code-frame': 7.26.2
-      '@babel/parser': 7.26.3
-      '@babel/types': 7.26.3
-
   '@babel/template@7.25.9':
     dependencies:
       '@babel/code-frame': 7.26.2
       '@babel/parser': 7.26.3
       '@babel/types': 7.26.3
 
-  '@babel/traverse@7.24.0':
-    dependencies:
-      '@babel/code-frame': 7.26.2
-      '@babel/generator': 7.23.6
-      '@babel/helper-environment-visitor': 7.22.20
-      '@babel/helper-function-name': 7.23.0
-      '@babel/helper-hoist-variables': 7.22.5
-      '@babel/helper-split-export-declaration': 7.22.6
-      '@babel/parser': 7.26.3
-      '@babel/types': 7.26.3
-      debug: 4.4.0
-      globals: 11.12.0
-    transitivePeerDependencies:
-      - supports-color
-
   '@babel/traverse@7.26.3':
     dependencies:
       '@babel/code-frame': 7.26.2
@@ -15721,7 +15496,7 @@ snapshots:
       '@babel/parser': 7.26.3
       '@babel/template': 7.25.9
       '@babel/types': 7.26.3
-      debug: 4.4.0
+      debug: 4.4.0(supports-color@8.1.1)
       globals: 11.12.0
     transitivePeerDependencies:
       - supports-color
@@ -16076,7 +15851,7 @@ snapshots:
   '@eslint/eslintrc@2.1.4':
     dependencies:
       ajv: 6.12.6
-      debug: 4.4.0
+      debug: 4.4.0(supports-color@8.1.1)
       espree: 9.6.1
       globals: 13.20.0
       ignore: 5.2.4
@@ -16230,7 +16005,7 @@ snapshots:
   '@humanwhocodes/config-array@0.11.14':
     dependencies:
       '@humanwhocodes/object-schema': 2.0.2
-      debug: 4.4.0
+      debug: 4.4.0(supports-color@8.1.1)
       minimatch: 3.1.2
     transitivePeerDependencies:
       - supports-color
@@ -16268,7 +16043,7 @@ snapshots:
       '@antfu/install-pkg': 0.1.1
       '@antfu/utils': 0.7.10
       '@iconify/types': 2.0.0
-      debug: 4.4.0
+      debug: 4.4.0(supports-color@8.1.1)
       kolorist: 1.8.0
       local-pkg: 0.5.0
       mlly: 1.7.1
@@ -16539,7 +16314,7 @@ snapshots:
 
   '@jest/transform@29.6.2':
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.26.0
       '@jest/types': 29.6.1
       '@jridgewell/trace-mapping': 0.3.25
       babel-plugin-istanbul: 6.1.1
@@ -16616,7 +16391,7 @@ snapshots:
 
   '@kwsites/file-exists@1.1.1':
     dependencies:
-      debug: 4.4.0
+      debug: 4.4.0(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -19228,7 +19003,7 @@ snapshots:
     dependencies:
       '@typescript-eslint/typescript-estree': 7.2.0(typescript@5.7.2)
       '@typescript-eslint/utils': 7.2.0(eslint@8.57.0)(typescript@5.7.2)
-      debug: 4.4.0
+      debug: 4.4.0(supports-color@8.1.1)
       eslint: 8.57.0
       ts-api-utils: 1.0.1(typescript@5.7.2)
     optionalDependencies:
@@ -19244,7 +19019,7 @@ snapshots:
     dependencies:
       '@typescript-eslint/types': 6.21.0
       '@typescript-eslint/visitor-keys': 6.21.0
-      debug: 4.4.0
+      debug: 4.4.0(supports-color@8.1.1)
       globby: 11.1.0
       is-glob: 4.0.3
       minimatch: 9.0.3
@@ -19259,7 +19034,7 @@ snapshots:
     dependencies:
       '@typescript-eslint/types': 7.2.0
       '@typescript-eslint/visitor-keys': 7.2.0
-      debug: 4.4.0
+      debug: 4.4.0(supports-color@8.1.1)
       globby: 11.1.0
       is-glob: 4.0.3
       minimatch: 9.0.3
@@ -19310,7 +19085,7 @@ snapshots:
 
   '@typescript/vfs@1.6.0(typescript@5.7.2)':
     dependencies:
-      debug: 4.3.6(supports-color@8.1.1)
+      debug: 4.4.0(supports-color@8.1.1)
       typescript: 5.7.2
     transitivePeerDependencies:
       - supports-color
@@ -19324,7 +19099,7 @@ snapshots:
       browserslist: 4.24.2
       browserslist-to-esbuild: 2.1.1(browserslist@4.24.2)
       core-js: 3.40.0
-      magic-string: 0.30.14
+      magic-string: 0.30.17
       regenerator-runtime: 0.14.1
       systemjs: 6.15.1
       terser: 5.16.1
@@ -19341,7 +19116,7 @@ snapshots:
     dependencies:
       '@ampproject/remapping': 2.3.0
       '@bcoe/v8-coverage': 1.0.2
-      debug: 4.4.0
+      debug: 4.4.0(supports-color@8.1.1)
       istanbul-lib-coverage: 3.2.2
       istanbul-lib-report: 3.0.1
       istanbul-lib-source-maps: 5.0.6
@@ -19508,8 +19283,6 @@ snapshots:
       de-indent: 1.0.2
       he: 1.2.0
 
-  '@vue/devtools-api@6.4.5': {}
-
   '@vue/devtools-api@6.6.4': {}
 
   '@vue/eslint-config-typescript@13.0.0(eslint-plugin-vue@9.23.0(eslint@8.57.0))(eslint@8.57.0)(typescript@5.7.2)':
@@ -19679,19 +19452,19 @@ snapshots:
 
   agent-base@6.0.2:
     dependencies:
-      debug: 4.4.0
+      debug: 4.4.0(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
   agent-base@7.1.0:
     dependencies:
-      debug: 4.4.0
+      debug: 4.4.0(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
   agentkeepalive@4.2.1:
     dependencies:
-      debug: 4.4.0
+      debug: 4.4.0(supports-color@8.1.1)
       depd: 1.1.2
       humanize-ms: 1.2.1
     transitivePeerDependencies:
@@ -19967,14 +19740,14 @@ snapshots:
 
   at-least-node@1.0.0: {}
 
-  autoprefixer@10.4.19(postcss@8.4.38):
+  autoprefixer@10.4.19(postcss@8.4.49):
     dependencies:
-      browserslist: 4.23.0
-      caniuse-lite: 1.0.30001667
+      browserslist: 4.24.2
+      caniuse-lite: 1.0.30001677
       fraction.js: 4.3.7
       normalize-range: 0.1.2
       picocolors: 1.1.1
-      postcss: 8.4.38
+      postcss: 8.4.49
       postcss-value-parser: 4.2.0
 
   available-typed-arrays@1.0.7:
@@ -20036,13 +19809,13 @@ snapshots:
     transitivePeerDependencies:
       - debug
 
-  babel-jest@29.6.2(@babel/core@7.24.0):
+  babel-jest@29.6.2(@babel/core@7.26.0):
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.26.0
       '@jest/transform': 29.6.2
       '@types/babel__core': 7.20.0
       babel-plugin-istanbul: 6.1.1
-      babel-preset-jest: 29.5.0(@babel/core@7.24.0)
+      babel-preset-jest: 29.5.0(@babel/core@7.26.0)
       chalk: 4.1.2
       graceful-fs: 4.2.11
       slash: 3.0.0
@@ -20051,7 +19824,7 @@ snapshots:
 
   babel-plugin-istanbul@6.1.1:
     dependencies:
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/helper-plugin-utils': 7.25.9
       '@istanbuljs/load-nyc-config': 1.1.0
       '@istanbuljs/schema': 0.1.3
       istanbul-lib-instrument: 5.2.1
@@ -20061,7 +19834,7 @@ snapshots:
 
   babel-plugin-jest-hoist@29.5.0:
     dependencies:
-      '@babel/template': 7.24.0
+      '@babel/template': 7.25.9
       '@babel/types': 7.26.3
       '@types/babel__core': 7.20.0
       '@types/babel__traverse': 7.18.2
@@ -20090,27 +19863,27 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  babel-preset-current-node-syntax@1.0.1(@babel/core@7.24.0):
+  babel-preset-current-node-syntax@1.0.1(@babel/core@7.26.0):
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.24.0)
-      '@babel/plugin-syntax-bigint': 7.8.3(@babel/core@7.24.0)
-      '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.24.0)
-      '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.24.0)
-      '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.24.0)
-      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.24.0)
-      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.24.0)
-      '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.24.0)
-      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.24.0)
-      '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.24.0)
-      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.24.0)
-      '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.24.0)
+      '@babel/core': 7.26.0
+      '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.26.0)
+      '@babel/plugin-syntax-bigint': 7.8.3(@babel/core@7.26.0)
+      '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.26.0)
+      '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.26.0)
+      '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.26.0)
+      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.26.0)
+      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.26.0)
+      '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.26.0)
+      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.26.0)
+      '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.26.0)
+      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.26.0)
+      '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.26.0)
 
-  babel-preset-jest@29.5.0(@babel/core@7.24.0):
+  babel-preset-jest@29.5.0(@babel/core@7.26.0):
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.26.0
       babel-plugin-jest-hoist: 29.5.0
-      babel-preset-current-node-syntax: 1.0.1(@babel/core@7.24.0)
+      babel-preset-current-node-syntax: 1.0.1(@babel/core@7.26.0)
 
   babel-walk@3.0.0-canary-5:
     dependencies:
@@ -20218,13 +19991,6 @@ snapshots:
       browserslist: 4.24.2
       meow: 13.2.0
 
-  browserslist@4.23.0:
-    dependencies:
-      caniuse-lite: 1.0.30001667
-      electron-to-chromium: 1.4.703
-      node-releases: 2.0.14
-      update-browserslist-db: 1.0.13(browserslist@4.23.0)
-
   browserslist@4.24.2:
     dependencies:
       caniuse-lite: 1.0.30001677
@@ -20366,8 +20132,6 @@ snapshots:
 
   camelize@1.0.1: {}
 
-  caniuse-lite@1.0.30001667: {}
-
   caniuse-lite@1.0.30001677: {}
 
   capital-case@1.0.4:
@@ -21094,9 +20858,11 @@ snapshots:
     dependencies:
       ms: 2.1.3
 
-  debug@4.4.0:
+  debug@4.4.0(supports-color@8.1.1):
     dependencies:
       ms: 2.1.3
+    optionalDependencies:
+      supports-color: 8.1.1
 
   decamelize@1.2.0: {}
 
@@ -21150,11 +20916,6 @@ snapshots:
 
   define-lazy-prop@2.0.0: {}
 
-  define-properties@1.2.0:
-    dependencies:
-      has-property-descriptors: 1.0.2
-      object-keys: 1.1.1
-
   define-properties@1.2.1:
     dependencies:
       define-data-property: 1.1.4
@@ -21325,8 +21086,6 @@ snapshots:
     dependencies:
       jake: 10.8.5
 
-  electron-to-chromium@1.4.703: {}
-
   electron-to-chromium@1.5.51: {}
 
   element-plus@2.4.3(vue@3.5.13(typescript@5.7.2)):
@@ -21600,7 +21359,7 @@ snapshots:
 
   esbuild-register@3.5.0(esbuild@0.24.0):
     dependencies:
-      debug: 4.4.0
+      debug: 4.4.0(supports-color@8.1.1)
       esbuild: 0.24.0
     transitivePeerDependencies:
       - supports-color
@@ -22072,7 +21831,7 @@ snapshots:
 
   extract-zip@2.0.1(supports-color@8.1.1):
     dependencies:
-      debug: 4.3.6(supports-color@8.1.1)
+      debug: 4.4.0(supports-color@8.1.1)
       get-stream: 5.2.0
       yauzl: 2.10.0
     optionalDependencies:
@@ -22228,7 +21987,7 @@ snapshots:
 
   follow-redirects@1.15.6(debug@4.4.0):
     optionalDependencies:
-      debug: 4.4.0
+      debug: 4.4.0(supports-color@8.1.1)
 
   for-each@0.3.3:
     dependencies:
@@ -22757,7 +22516,7 @@ snapshots:
     dependencies:
       '@tootallnate/once': 1.1.2
       agent-base: 6.0.2
-      debug: 4.4.0
+      debug: 4.4.0(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
     optional: true
@@ -22766,14 +22525,14 @@ snapshots:
     dependencies:
       '@tootallnate/once': 2.0.0
       agent-base: 6.0.2
-      debug: 4.4.0
+      debug: 4.4.0(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
   http-proxy-agent@7.0.0:
     dependencies:
       agent-base: 7.1.0
-      debug: 4.4.0
+      debug: 4.4.0(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -22788,21 +22547,21 @@ snapshots:
   https-proxy-agent@5.0.1:
     dependencies:
       agent-base: 6.0.2
-      debug: 4.4.0
+      debug: 4.4.0(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
   https-proxy-agent@7.0.2:
     dependencies:
       agent-base: 7.1.0
-      debug: 4.4.0
+      debug: 4.4.0(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
   https-proxy-agent@7.0.5:
     dependencies:
       agent-base: 7.1.0
-      debug: 4.4.0
+      debug: 4.4.0(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -22823,7 +22582,7 @@ snapshots:
       '@types/tough-cookie': 4.0.2
       axios: 1.7.4(debug@4.4.0)
       camelcase: 6.3.0
-      debug: 4.4.0
+      debug: 4.4.0(supports-color@8.1.1)
       dotenv: 16.4.5
       extend: 3.0.2
       file-type: 16.5.4
@@ -23145,7 +22904,7 @@ snapshots:
 
   istanbul-lib-instrument@5.2.1:
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.26.0
       '@babel/parser': 7.26.3
       '@istanbuljs/schema': 0.1.3
       istanbul-lib-coverage: 3.2.2
@@ -23161,7 +22920,7 @@ snapshots:
 
   istanbul-lib-source-maps@4.0.1:
     dependencies:
-      debug: 4.4.0
+      debug: 4.4.0(supports-color@8.1.1)
       istanbul-lib-coverage: 3.2.2
       source-map: 0.6.1
     transitivePeerDependencies:
@@ -23170,7 +22929,7 @@ snapshots:
   istanbul-lib-source-maps@5.0.6:
     dependencies:
       '@jridgewell/trace-mapping': 0.3.25
-      debug: 4.4.0
+      debug: 4.4.0(supports-color@8.1.1)
       istanbul-lib-coverage: 3.2.2
     transitivePeerDependencies:
       - supports-color
@@ -23252,10 +23011,10 @@ snapshots:
 
   jest-config@29.6.2(@types/node@18.16.16)(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.7.2)):
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.26.0
       '@jest/test-sequencer': 29.6.2
       '@jest/types': 29.6.1
-      babel-jest: 29.6.2(@babel/core@7.24.0)
+      babel-jest: 29.6.2(@babel/core@7.26.0)
       chalk: 4.1.2
       ci-info: 3.8.0
       deepmerge: 4.3.1
@@ -23486,15 +23245,15 @@ snapshots:
 
   jest-snapshot@29.6.2:
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/generator': 7.22.9
-      '@babel/plugin-syntax-jsx': 7.18.6(@babel/core@7.24.0)
-      '@babel/plugin-syntax-typescript': 7.20.0(@babel/core@7.24.0)
+      '@babel/core': 7.26.0
+      '@babel/generator': 7.26.3
+      '@babel/plugin-syntax-jsx': 7.18.6(@babel/core@7.26.0)
+      '@babel/plugin-syntax-typescript': 7.20.0(@babel/core@7.26.0)
       '@babel/types': 7.26.3
       '@jest/expect-utils': 29.6.2
       '@jest/transform': 29.6.2
       '@jest/types': 29.6.1
-      babel-preset-current-node-syntax: 1.0.1(@babel/core@7.24.0)
+      babel-preset-current-node-syntax: 1.0.1(@babel/core@7.26.0)
       chalk: 4.1.2
       expect: 29.6.2
       graceful-fs: 4.2.11
@@ -23690,8 +23449,6 @@ snapshots:
 
   jsesc@0.5.0: {}
 
-  jsesc@2.5.2: {}
-
   jsesc@3.0.2: {}
 
   json-bigint@1.0.0:
@@ -24128,10 +23885,6 @@ snapshots:
 
   lz-string@1.5.0: {}
 
-  magic-string@0.30.10:
-    dependencies:
-      '@jridgewell/sourcemap-codec': 1.5.0
-
   magic-string@0.30.14:
     dependencies:
       '@jridgewell/sourcemap-codec': 1.5.0
@@ -24744,7 +24497,7 @@ snapshots:
   mqtt-packet@9.0.0:
     dependencies:
       bl: 6.0.12
-      debug: 4.4.0
+      debug: 4.4.0(supports-color@8.1.1)
       process-nextick-args: 2.0.1
     transitivePeerDependencies:
       - supports-color
@@ -24957,8 +24710,6 @@ snapshots:
     dependencies:
       es6-promise: 3.3.1
 
-  node-releases@2.0.14: {}
-
   node-releases@2.0.18: {}
 
   node-rsa@1.1.1:
@@ -25048,7 +24799,7 @@ snapshots:
 
   number-allocator@1.0.14:
     dependencies:
-      debug: 4.4.0
+      debug: 4.4.0(supports-color@8.1.1)
       js-sdsl: 4.3.0
     transitivePeerDependencies:
       - supports-color
@@ -25099,7 +24850,7 @@ snapshots:
   object-is@1.1.5:
     dependencies:
       call-bind: 1.0.7
-      define-properties: 1.2.0
+      define-properties: 1.2.1
 
   object-is@1.1.6:
     dependencies:
@@ -25524,24 +25275,24 @@ snapshots:
 
   possible-typed-array-names@1.0.0: {}
 
-  postcss-import@15.1.0(postcss@8.4.38):
+  postcss-import@15.1.0(postcss@8.4.49):
     dependencies:
-      postcss: 8.4.38
+      postcss: 8.4.49
       postcss-value-parser: 4.2.0
       read-cache: 1.0.0
       resolve: 1.22.8
 
-  postcss-js@4.0.1(postcss@8.4.38):
+  postcss-js@4.0.1(postcss@8.4.49):
     dependencies:
       camelcase-css: 2.0.1
-      postcss: 8.4.38
+      postcss: 8.4.49
 
-  postcss-load-config@4.0.2(postcss@8.4.38)(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.7.2)):
+  postcss-load-config@4.0.2(postcss@8.4.49)(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.7.2)):
     dependencies:
       lilconfig: 3.1.2
       yaml: 2.3.4
     optionalDependencies:
-      postcss: 8.4.38
+      postcss: 8.4.49
       ts-node: 10.9.2(@types/node@18.16.16)(typescript@5.7.2)
 
   postcss-load-config@6.0.1(jiti@1.21.0)(postcss@8.4.49):
@@ -25551,9 +25302,9 @@ snapshots:
       jiti: 1.21.0
       postcss: 8.4.49
 
-  postcss-nested@6.0.1(postcss@8.4.38):
+  postcss-nested@6.0.1(postcss@8.4.49):
     dependencies:
-      postcss: 8.4.38
+      postcss: 8.4.49
       postcss-selector-parser: 6.0.16
 
   postcss-selector-parser@6.0.16:
@@ -25569,12 +25320,6 @@ snapshots:
       picocolors: 1.1.1
       source-map-js: 1.2.1
 
-  postcss@8.4.38:
-    dependencies:
-      nanoid: 3.3.8
-      picocolors: 1.1.1
-      source-map-js: 1.2.0
-
   postcss@8.4.49:
     dependencies:
       nanoid: 3.3.8
@@ -26173,7 +25918,7 @@ snapshots:
 
   require-in-the-middle@7.4.0:
     dependencies:
-      debug: 4.4.0
+      debug: 4.4.0(supports-color@8.1.1)
       module-details-from-path: 1.0.3
       resolve: 1.22.8
     transitivePeerDependencies:
@@ -26574,7 +26319,7 @@ snapshots:
 
   simple-websocket@9.1.0:
     dependencies:
-      debug: 4.4.0
+      debug: 4.4.0(supports-color@8.1.1)
       queue-microtask: 1.2.3
       randombytes: 2.1.0
       readable-stream: 3.6.0
@@ -26654,7 +26399,7 @@ snapshots:
   socks-proxy-agent@6.2.1:
     dependencies:
       agent-base: 6.0.2
-      debug: 4.4.0
+      debug: 4.4.0(supports-color@8.1.1)
       socks: 2.8.3
     transitivePeerDependencies:
       - supports-color
@@ -26668,8 +26413,6 @@ snapshots:
 
   sortablejs@1.14.0: {}
 
-  source-map-js@1.2.0: {}
-
   source-map-js@1.2.1: {}
 
   source-map-support@0.5.13:
@@ -26969,7 +26712,7 @@ snapshots:
     dependencies:
       component-emitter: 1.3.0
       cookiejar: 2.1.4
-      debug: 4.4.0
+      debug: 4.4.0(supports-color@8.1.1)
       fast-safe-stringify: 2.1.1
       form-data: 4.0.0
       formidable: 3.5.1
@@ -27055,11 +26798,11 @@ snapshots:
       normalize-path: 3.0.0
       object-hash: 3.0.0
       picocolors: 1.1.1
-      postcss: 8.4.38
-      postcss-import: 15.1.0(postcss@8.4.38)
-      postcss-js: 4.0.1(postcss@8.4.38)
-      postcss-load-config: 4.0.2(postcss@8.4.38)(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.7.2))
-      postcss-nested: 6.0.1(postcss@8.4.38)
+      postcss: 8.4.49
+      postcss-import: 15.1.0(postcss@8.4.49)
+      postcss-js: 4.0.1(postcss@8.4.49)
+      postcss-load-config: 4.0.2(postcss@8.4.49)(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.7.2))
+      postcss-nested: 6.0.1(postcss@8.4.49)
       postcss-selector-parser: 6.0.16
       resolve: 1.22.8
       sucrase: 3.35.0
@@ -27299,7 +27042,7 @@ snapshots:
 
   ts-interface-checker@0.1.13: {}
 
-  ts-jest@29.1.1(@babel/core@7.24.0)(@jest/types@29.6.1)(babel-jest@29.6.2(@babel/core@7.24.0))(jest@29.6.2(@types/node@18.16.16)(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.7.2)))(typescript@5.7.2):
+  ts-jest@29.1.1(@babel/core@7.26.0)(@jest/types@29.6.1)(babel-jest@29.6.2(@babel/core@7.26.0))(jest@29.6.2(@types/node@18.16.16)(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.7.2)))(typescript@5.7.2):
     dependencies:
       bs-logger: 0.2.6
       fast-json-stable-stringify: 2.1.0
@@ -27312,9 +27055,9 @@ snapshots:
       typescript: 5.7.2
       yargs-parser: 21.1.1
     optionalDependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.26.0
       '@jest/types': 29.6.1
-      babel-jest: 29.6.2(@babel/core@7.24.0)
+      babel-jest: 29.6.2(@babel/core@7.26.0)
 
   ts-map@1.0.3: {}
 
@@ -27379,7 +27122,7 @@ snapshots:
       cac: 6.7.14
       chokidar: 4.0.1
       consola: 3.4.0
-      debug: 4.4.0
+      debug: 4.4.0(supports-color@8.1.1)
       esbuild: 0.24.0
       joycon: 3.1.1
       picocolors: 1.1.1
@@ -27583,7 +27326,7 @@ snapshots:
       '@antfu/install-pkg': 0.3.3
       '@antfu/utils': 0.7.10
       '@iconify/utils': 2.1.25
-      debug: 4.4.0
+      debug: 4.4.0(supports-color@8.1.1)
       kolorist: 1.8.0
       local-pkg: 0.5.0
       unplugin: 1.11.0
@@ -27597,10 +27340,10 @@ snapshots:
       '@antfu/utils': 0.7.10
       '@rollup/pluginutils': 5.1.0(rollup@4.24.0)
       chokidar: 4.0.1
-      debug: 4.3.5
+      debug: 4.4.0(supports-color@8.1.1)
       fast-glob: 3.3.2
       local-pkg: 0.5.0
-      magic-string: 0.30.10
+      magic-string: 0.30.17
       minimatch: 9.0.5
       mlly: 1.7.1
       unplugin: 1.11.0
@@ -27620,12 +27363,6 @@ snapshots:
 
   untildify@4.0.0: {}
 
-  update-browserslist-db@1.0.13(browserslist@4.23.0):
-    dependencies:
-      browserslist: 4.23.0
-      escalade: 3.1.1
-      picocolors: 1.1.1
-
   update-browserslist-db@1.1.1(browserslist@4.24.2):
     dependencies:
       browserslist: 4.24.2
@@ -27722,7 +27459,7 @@ snapshots:
   vite-node@3.0.5(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1):
     dependencies:
       cac: 6.7.14
-      debug: 4.4.0
+      debug: 4.4.0(supports-color@8.1.1)
       es-module-lexer: 1.6.0
       pathe: 2.0.2
       vite: 6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1)
@@ -27747,7 +27484,7 @@ snapshots:
       '@volar/typescript': 2.4.10
       '@vue/language-core': 2.1.6(typescript@5.7.2)
       compare-versions: 6.1.1
-      debug: 4.4.0
+      debug: 4.4.0(supports-color@8.1.1)
       kolorist: 1.8.0
       local-pkg: 0.5.0
       magic-string: 0.30.17
@@ -27810,7 +27547,7 @@ snapshots:
       '@vitest/spy': 3.0.5
       '@vitest/utils': 3.0.5
       chai: 5.1.2
-      debug: 4.4.0
+      debug: 4.4.0(supports-color@8.1.1)
       expect-type: 1.1.0
       magic-string: 0.30.17
       pathe: 2.0.2
@@ -27913,7 +27650,7 @@ snapshots:
       '@intlify/core-base': 9.2.2
       '@intlify/shared': 9.2.2
       '@intlify/vue-devtools': 9.2.2
-      '@vue/devtools-api': 6.4.5
+      '@vue/devtools-api': 6.6.4
       vue: 3.5.13(typescript@5.7.2)
 
   vue-inbrowser-compiler-independent-utils@4.71.1(vue@3.5.13(typescript@5.7.2)):
diff --git a/turbo.json b/turbo.json
index 5851fb4572..4dad3b8c8a 100644
--- a/turbo.json
+++ b/turbo.json
@@ -46,7 +46,7 @@
 				"@n8n/storybook#lint",
 				"n8n-cypress#lint",
 				"@n8n/composables#build",
-				"n8n-design-system#lint",
+				"@n8n/design-system#lint",
 				"n8n-editor-ui#lint"
 			]
 		},
@@ -79,7 +79,7 @@
 				"@n8n/chat#test",
 				"@n8n/codemirror-lang#test",
 				"@n8n/composables#build",
-				"n8n-design-system#test",
+				"@n8n/design-system#test",
 				"n8n-editor-ui#test"
 			],
 			"outputs": ["coverage/**"]

From 294f0194145ca4139d9d9cea0729bf83d0871c94 Mon Sep 17 00:00:00 2001
From: "Loan J." <joliveau.loan@gmail.com>
Date: Fri, 28 Feb 2025 09:08:01 -0500
Subject: [PATCH 44/47] fix(Odoo Node): Model and fields dynamic fetching
 errors (#13511)

---
 packages/nodes-base/nodes/Odoo/Odoo.node.ts | 25 +++++++--------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/packages/nodes-base/nodes/Odoo/Odoo.node.ts b/packages/nodes-base/nodes/Odoo/Odoo.node.ts
index 8fc94d69c3..d507d756fc 100644
--- a/packages/nodes-base/nodes/Odoo/Odoo.node.ts
+++ b/packages/nodes-base/nodes/Odoo/Odoo.node.ts
@@ -116,19 +116,18 @@ export class Odoo implements INodeType {
 				const userID = await odooGetUserID.call(this, db, username, password, url);
 
 				const response = await odooGetModelFields.call(this, db, userID, password, resource, url);
-				const options = Object.values(response).map((field) => {
+				const options = Object.entries(response).map(([key, field]) => {
 					const optionField = field as { [key: string]: string };
-					let name = '';
 					try {
-						name = capitalCase(optionField.name);
+						optionField.name = capitalCase(optionField.name);
 					} catch (error) {
-						name = optionField.name;
+						optionField.name = optionField.string;
 					}
 					return {
-						name,
-						value: optionField.name,
+						name: optionField.name,
+						value: key,
 						// nodelinter-ignore-next-line
-						description: `name: ${optionField?.name}, type: ${optionField?.type} required: ${optionField?.required}`,
+						description: `name: ${key}, type: ${optionField?.type} required: ${optionField?.required}`,
 					};
 				});
 
@@ -148,15 +147,7 @@ export class Odoo implements INodeType {
 					params: {
 						service: 'object',
 						method: 'execute',
-						args: [
-							db,
-							userID,
-							password,
-							'ir.model',
-							'search_read',
-							[],
-							['name', 'model', 'modules'],
-						],
+						args: [db, userID, password, 'ir.model', 'search_read', [], ['name', 'model']],
 					},
 					id: randomInt(100),
 				};
@@ -167,7 +158,7 @@ export class Odoo implements INodeType {
 					return {
 						name: model.name,
 						value: model.model,
-						description: `model: ${model.model}<br> modules: ${model.modules}`,
+						description: `model: ${model.model}`,
 					};
 				});
 				return options as INodePropertyOptions[];

From aea2e79bf2d5fca65a58ebf8299011aef5402204 Mon Sep 17 00:00:00 2001
From: shortstacked <declan@n8n.io>
Date: Fri, 28 Feb 2025 14:28:07 +0000
Subject: [PATCH 45/47] test: CAT-680 Increase Cypress screen size for testing
 (no-changelog) (#13590)

---
 cypress/cypress.config.js                      |  2 ++
 cypress/e2e/12-canvas.cy.ts                    |  1 +
 cypress/e2e/20-workflow-executions.cy.ts       | 18 ++++++++++++------
 .../Test-workflow-with-long-parameters.json    | 17 +++++++++++++++++
 4 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/cypress/cypress.config.js b/cypress/cypress.config.js
index 63913af7f8..e7b953d6ca 100644
--- a/cypress/cypress.config.js
+++ b/cypress/cypress.config.js
@@ -14,6 +14,8 @@ module.exports = defineConfig({
 	experimentalMemoryManagement: true,
 	e2e: {
 		baseUrl: BASE_URL,
+		viewportWidth: 1536,
+		viewportHeight: 960,
 		video: true,
 		screenshotOnRunFailure: true,
 		experimentalInteractiveRunEvents: true,
diff --git a/cypress/e2e/12-canvas.cy.ts b/cypress/e2e/12-canvas.cy.ts
index c4fc11c237..3035a61ca2 100644
--- a/cypress/e2e/12-canvas.cy.ts
+++ b/cypress/e2e/12-canvas.cy.ts
@@ -384,6 +384,7 @@ describe('Canvas Node Manipulation and Navigation', () => {
 			WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
 			WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
 			WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
+			WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
 			// At this point last added node should be off-screen
 			WorkflowPage.getters.canvasNodes().last().should('not.be.visible');
 			WorkflowPage.getters.zoomToFitButton().click();
diff --git a/cypress/e2e/20-workflow-executions.cy.ts b/cypress/e2e/20-workflow-executions.cy.ts
index 5788af171c..618334e2b6 100644
--- a/cypress/e2e/20-workflow-executions.cy.ts
+++ b/cypress/e2e/20-workflow-executions.cy.ts
@@ -27,8 +27,8 @@ describe('Workflow Executions', () => {
 
 			executionsTab.getters.executionsList().scrollTo(0, 500).wait(0);
 
-			executionsTab.getters.executionListItems().should('have.length', 11);
-			executionsTab.getters.successfulExecutionListItems().should('have.length', 9);
+			executionsTab.getters.executionListItems().should('have.length', 30);
+			executionsTab.getters.successfulExecutionListItems().should('have.length', 28);
 			executionsTab.getters.failedExecutionListItems().should('have.length', 2);
 			executionsTab.getters
 				.executionListItems()
@@ -185,8 +185,9 @@ describe('Workflow Executions', () => {
 				.invoke('attr', 'title')
 				.should('eq', newWorkflowName);
 		});
-
-		it('should load items and auto scroll after filter change', () => {
+		// This should be a component test. Abstracting this away into to ensure our lists work.
+		// eslint-disable-next-line n8n-local-rules/no-skipped-tests
+		it.skip('should load items and auto scroll after filter change', () => {
 			createMockExecutions();
 			createMockExecutions();
 			cy.intercept('GET', '/rest/executions?filter=*').as('getExecutions');
@@ -289,15 +290,20 @@ describe('Workflow Executions', () => {
 });
 
 const createMockExecutions = () => {
-	executionsTab.actions.createManualExecutions(5);
+	executionsTab.actions.createManualExecutions(15);
+	// This wait is added to allow time for the notifications to expire
+	cy.wait(2000);
 	// Make some failed executions by enabling Code node with syntax error
 	executionsTab.actions.toggleNodeEnabled('Error');
 	workflowPage.getters.disabledNodes().should('have.length', 0);
 	executionsTab.actions.createManualExecutions(2);
+	// This wait is added to allow time for the notifications to expire
+	cy.wait(2000);
+
 	// Then add some more successful ones
 	executionsTab.actions.toggleNodeEnabled('Error');
 	workflowPage.getters.disabledNodes().should('have.length', 1);
-	executionsTab.actions.createManualExecutions(4);
+	executionsTab.actions.createManualExecutions(15);
 };
 
 const checkMainHeaderELements = () => {
diff --git a/cypress/fixtures/Test-workflow-with-long-parameters.json b/cypress/fixtures/Test-workflow-with-long-parameters.json
index d4d052f6f0..3c64a184b5 100644
--- a/cypress/fixtures/Test-workflow-with-long-parameters.json
+++ b/cypress/fixtures/Test-workflow-with-long-parameters.json
@@ -25,6 +25,18 @@
               "value": "test",
               "type": "string"
             },
+            {
+              "id": "85095836-4e94-442f-9270-e1a89008c125",
+              "name": "test",
+              "value": "test",
+              "type": "string"
+            },
+            {
+              "id": "85095836-4e94-442f-9270-e1a89008c121",
+              "name": "test",
+              "value": "test",
+              "type": "string"
+            },
             {
               "id": "b6163f8a-bca6-4364-8b38-182df37c55cd",
               "name": "=should be visible!",
@@ -50,6 +62,10 @@
         "blocksUi": "blocks",
         "text": "=should be visible",
         "otherOptions": {
+          "includeLinkToWorkflow": true,
+          "link_names": false,
+          "mrkdwn": true,
+          "unfurl_links": false,
           "sendAsUser": "=not visible"
         }
       },
@@ -67,6 +83,7 @@
       "parameters": {
         "rule": {
           "interval": [
+            {},
             {},
             {
               "field": "=should be visible"

From f381a24145271f4df4fa5c9345bb12c984f6e1fc Mon Sep 17 00:00:00 2001
From: Elias Meire <elias@meire.dev>
Date: Fri, 28 Feb 2025 15:28:55 +0100
Subject: [PATCH 46/47] feat(editor): Automatically tidy up workflows (#13471)

---
 cypress/composables/workflow.ts               |   2 +-
 .../N8nKeyboardShortcut.vue                   |   8 +-
 packages/frontend/editor-ui/package.json      |   1 +
 .../editor-ui/src/__tests__/data/canvas.ts    |  58 +-
 .../editor-ui/src/components/TidyUpIcon.vue   |   8 +
 .../src/components/canvas/Canvas.vue          |  98 ++--
 .../elements/buttons/CanvasControlButtons.vue |  34 ++
 .../CanvasControlButtons.test.ts.snap         |   6 +-
 .../useCanvasLayout.test.ts.snap              | 171 ++++++
 .../__snapshots__/useContextMenu.test.ts.snap |  72 +++
 .../src/composables/useCanvasLayout.test.ts   | 170 ++++++
 .../src/composables/useCanvasLayout.ts        | 516 ++++++++++++++++++
 .../src/composables/useContextMenu.ts         |  18 +-
 .../src/plugins/i18n/locales/en.json          |   3 +
 pnpm-lock.yaml                                |  16 +
 15 files changed, 1139 insertions(+), 42 deletions(-)
 create mode 100644 packages/frontend/editor-ui/src/components/TidyUpIcon.vue
 create mode 100644 packages/frontend/editor-ui/src/composables/__snapshots__/useCanvasLayout.test.ts.snap
 create mode 100644 packages/frontend/editor-ui/src/composables/useCanvasLayout.test.ts
 create mode 100644 packages/frontend/editor-ui/src/composables/useCanvasLayout.ts

diff --git a/cypress/composables/workflow.ts b/cypress/composables/workflow.ts
index 7d783c1d3c..ff9788349b 100644
--- a/cypress/composables/workflow.ts
+++ b/cypress/composables/workflow.ts
@@ -356,5 +356,5 @@ export function openContextMenu(
 }
 
 export function clickContextMenuAction(action: string) {
-	getContextMenuAction(action).click();
+	getContextMenuAction(action).click({ force: true });
 }
diff --git a/packages/frontend/@n8n/design-system/src/components/N8nKeyboardShortcut/N8nKeyboardShortcut.vue b/packages/frontend/@n8n/design-system/src/components/N8nKeyboardShortcut/N8nKeyboardShortcut.vue
index ea237e5531..b95eff1b0e 100644
--- a/packages/frontend/@n8n/design-system/src/components/N8nKeyboardShortcut/N8nKeyboardShortcut.vue
+++ b/packages/frontend/@n8n/design-system/src/components/N8nKeyboardShortcut/N8nKeyboardShortcut.vue
@@ -14,16 +14,16 @@ const keys = computed(() => {
 		allKeys.unshift('⌘');
 	}
 
-	if (props.shiftKey) {
-		allKeys.unshift('⇧');
+	if (props.metaKey && !isMacOs) {
+		allKeys.unshift('Ctrl');
 	}
 
 	if (props.altKey) {
 		allKeys.unshift(isMacOs ? '⌥' : 'Alt');
 	}
 
-	if (props.metaKey && !isMacOs) {
-		allKeys.unshift('Ctrl');
+	if (props.shiftKey) {
+		allKeys.unshift('⇧');
 	}
 
 	return allKeys;
diff --git a/packages/frontend/editor-ui/package.json b/packages/frontend/editor-ui/package.json
index 3e2ab0662f..1b4b6fd0a2 100644
--- a/packages/frontend/editor-ui/package.json
+++ b/packages/frontend/editor-ui/package.json
@@ -29,6 +29,7 @@
     "@codemirror/search": "^6.5.6",
     "@codemirror/state": "^6.4.1",
     "@codemirror/view": "^6.26.3",
+    "@dagrejs/dagre": "^1.1.4",
     "@fontsource/open-sans": "^4.5.0",
     "@lezer/common": "1.1.0",
     "@n8n/api-types": "workspace:*",
diff --git a/packages/frontend/editor-ui/src/__tests__/data/canvas.ts b/packages/frontend/editor-ui/src/__tests__/data/canvas.ts
index fbbbb8b0aa..08330730c3 100644
--- a/packages/frontend/editor-ui/src/__tests__/data/canvas.ts
+++ b/packages/frontend/editor-ui/src/__tests__/data/canvas.ts
@@ -12,9 +12,9 @@ import type {
 } from '@/types';
 import { CanvasConnectionMode, CanvasNodeRenderType } from '@/types';
 import { NodeConnectionType } from 'n8n-workflow';
+import type { GraphEdge, GraphNode, ViewportTransform } from '@vue-flow/core';
 import type { EventBus } from '@n8n/utils/event-bus';
 import { createEventBus } from '@n8n/utils/event-bus';
-import type { ViewportTransform } from '@vue-flow/core';
 
 export function createCanvasNodeData({
 	id = 'node',
@@ -69,6 +69,35 @@ export function createCanvasNodeElement({
 	};
 }
 
+export function createCanvasGraphNode({
+	id = '1',
+	type = 'default',
+	label = 'Node',
+	position = { x: 100, y: 100 },
+	dimensions = { width: 100, height: 100 },
+	data,
+	...rest
+}: Partial<
+	Omit<GraphNode<CanvasNodeData>, 'data'> & { data: Partial<CanvasNodeData> }
+> = {}): GraphNode<CanvasNodeData> {
+	return {
+		id,
+		type,
+		label,
+		position,
+		computedPosition: { ...position, z: 0 },
+		dimensions,
+		dragging: false,
+		isParent: false,
+		selected: false,
+		resizing: false,
+		handleBounds: {},
+		events: {},
+		data: createCanvasNodeData({ id, type, ...data }),
+		...rest,
+	};
+}
+
 export function createCanvasNodeProps({
 	id = 'node',
 	label = 'Test Node',
@@ -196,3 +225,30 @@ export function createCanvasConnection(
 		...(nodeBInput ? { targetHandle: `inputs/${nodeBInput.type}/${nodeBInput.index}` } : {}),
 	};
 }
+
+export function createCanvasGraphEdge(
+	nodeA: GraphNode,
+	nodeB: GraphNode,
+	{ sourceIndex = 0, targetIndex = 0 } = {},
+): GraphEdge {
+	const nodeAOutput = nodeA.data?.outputs[sourceIndex];
+	const nodeBInput = nodeA.data?.inputs[targetIndex];
+
+	return {
+		id: `${nodeA.id}-${nodeB.id}`,
+		source: nodeA.id,
+		target: nodeB.id,
+		sourceX: nodeA.position.x,
+		sourceY: nodeA.position.y,
+		targetX: nodeB.position.x,
+		targetY: nodeB.position.y,
+		type: 'default',
+		selected: false,
+		sourceNode: nodeA,
+		targetNode: nodeB,
+		data: {},
+		events: {},
+		...(nodeAOutput ? { sourceHandle: `outputs/${nodeAOutput.type}/${nodeAOutput.index}` } : {}),
+		...(nodeBInput ? { targetHandle: `inputs/${nodeBInput.type}/${nodeBInput.index}` } : {}),
+	};
+}
diff --git a/packages/frontend/editor-ui/src/components/TidyUpIcon.vue b/packages/frontend/editor-ui/src/components/TidyUpIcon.vue
new file mode 100644
index 0000000000..a6faf6b561
--- /dev/null
+++ b/packages/frontend/editor-ui/src/components/TidyUpIcon.vue
@@ -0,0 +1,8 @@
+<template>
+	<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+		<path
+			fill="currentColor"
+			d="M1.6.13c-.18-.17-.47-.18-.62 0L.56.57.14.98c-.2.15-.18.44 0 .62l3.63 3.6c.1.1.1.27 0 .37-.2.2-.53.52-.93.94-.56.57-.12 1.62.22 2.11.05.07.12.1.2.1.05-.01.1-.04.15-.08l5.23-5.22c.1-.1.1-.26-.02-.34-.5-.34-1.55-.78-2.12-.22-.42.4-.75.73-.94.93-.1.1-.27.1-.37 0L1.6.13ZM9.5 3.9c.07-.09.2-.1.3-.04l6.07 3.44c.15.08.18.29.05.4l-1.21 1.22a.26.26 0 0 1-.26.07l-2.18-.64a.26.26 0 0 0-.32.33l.76 2.02c.04.1.01.2-.06.27L7.7 15.92a.26.26 0 0 1-.41-.05L3.83 9.8a.26.26 0 0 1 .04-.3l5.62-5.6Z"
+		/>
+	</svg>
+</template>
diff --git a/packages/frontend/editor-ui/src/components/canvas/Canvas.vue b/packages/frontend/editor-ui/src/components/canvas/Canvas.vue
index a9d1056a01..918b0b06a3 100644
--- a/packages/frontend/editor-ui/src/components/canvas/Canvas.vue
+++ b/packages/frontend/editor-ui/src/components/canvas/Canvas.vue
@@ -18,7 +18,17 @@ import { useVueFlow, VueFlow, PanelPosition, MarkerType } from '@vue-flow/core';
 import { MiniMap } from '@vue-flow/minimap';
 import Node from './elements/nodes/CanvasNode.vue';
 import Edge from './elements/edges/CanvasEdge.vue';
-import { computed, onMounted, onUnmounted, provide, ref, toRef, useCssModule, watch } from 'vue';
+import {
+	computed,
+	nextTick,
+	onMounted,
+	onUnmounted,
+	provide,
+	ref,
+	toRef,
+	useCssModule,
+	watch,
+} from 'vue';
 import type { EventBus } from '@n8n/utils/event-bus';
 import { createEventBus } from '@n8n/utils/event-bus';
 import { useDeviceSupport } from '@n8n/composables/useDeviceSupport';
@@ -37,6 +47,7 @@ import CanvasBackground from './elements/background/CanvasBackground.vue';
 import { useCanvasTraversal } from '@/composables/useCanvasTraversal';
 import { NodeConnectionType } from 'n8n-workflow';
 import { useCanvasNodeHover } from '@/composables/useCanvasNodeHover';
+import { useCanvasLayout } from '@/composables/useCanvasLayout';
 
 const $style = useCssModule();
 
@@ -139,6 +150,7 @@ const {
 	getDownstreamNodes,
 	getUpstreamNodes,
 } = useCanvasTraversal(vueFlow);
+const { layout } = useCanvasLayout({ id: props.id });
 
 const isPaneReady = ref(false);
 
@@ -245,38 +257,43 @@ function selectUpstreamNodes(id: string) {
 	onSelectNodes({ ids: [...upstreamNodes.map((node) => node.id), id] });
 }
 
-const keyMap = computed(() => ({
-	ctrl_c: emitWithSelectedNodes((ids) => emit('copy:nodes', ids)),
-	enter: emitWithLastSelectedNode((id) => onSetNodeActivated(id)),
-	ctrl_a: () => addSelectedNodes(graphNodes.value),
-	// Support both key and code for zooming in and out
-	'shift_+|+|=|shift_Equal|Equal': async () => await onZoomIn(),
-	'shift+_|-|_|shift_Minus|Minus': async () => await onZoomOut(),
-	0: async () => await onResetZoom(),
-	1: async () => await onFitView(),
-	ArrowUp: emitWithLastSelectedNode(selectUpperSiblingNode),
-	ArrowDown: emitWithLastSelectedNode(selectLowerSiblingNode),
-	ArrowLeft: emitWithLastSelectedNode(selectLeftNode),
-	ArrowRight: emitWithLastSelectedNode(selectRightNode),
-	shift_ArrowLeft: emitWithLastSelectedNode(selectUpstreamNodes),
-	shift_ArrowRight: emitWithLastSelectedNode(selectDownstreamNodes),
+const keyMap = computed(() => {
+	const readOnlyKeymap = {
+		ctrl_c: emitWithSelectedNodes((ids) => emit('copy:nodes', ids)),
+		enter: emitWithLastSelectedNode((id) => onSetNodeActivated(id)),
+		ctrl_a: () => addSelectedNodes(graphNodes.value),
+		// Support both key and code for zooming in and out
+		'shift_+|+|=|shift_Equal|Equal': async () => await onZoomIn(),
+		'shift+_|-|_|shift_Minus|Minus': async () => await onZoomOut(),
+		0: async () => await onResetZoom(),
+		1: async () => await onFitView(),
+		ArrowUp: emitWithLastSelectedNode(selectUpperSiblingNode),
+		ArrowDown: emitWithLastSelectedNode(selectLowerSiblingNode),
+		ArrowLeft: emitWithLastSelectedNode(selectLeftNode),
+		ArrowRight: emitWithLastSelectedNode(selectRightNode),
+		shift_ArrowLeft: emitWithLastSelectedNode(selectUpstreamNodes),
+		shift_ArrowRight: emitWithLastSelectedNode(selectDownstreamNodes),
+	};
 
-	...(props.readOnly
-		? {}
-		: {
-				ctrl_x: emitWithSelectedNodes((ids) => emit('cut:nodes', ids)),
-				'delete|backspace': emitWithSelectedNodes((ids) => emit('delete:nodes', ids)),
-				ctrl_d: emitWithSelectedNodes((ids) => emit('duplicate:nodes', ids)),
-				d: emitWithSelectedNodes((ids) => emit('update:nodes:enabled', ids)),
-				p: emitWithSelectedNodes((ids) => emit('update:nodes:pin', ids, 'keyboard-shortcut')),
-				f2: emitWithLastSelectedNode((id) => emit('update:node:name', id)),
-				tab: () => emit('create:node', 'tab'),
-				shift_s: () => emit('create:sticky'),
-				ctrl_alt_n: () => emit('create:workflow'),
-				ctrl_enter: () => emit('run:workflow'),
-				ctrl_s: () => emit('save:workflow'),
-			}),
-}));
+	if (props.readOnly) return readOnlyKeymap;
+
+	const fullKeymap = {
+		...readOnlyKeymap,
+		ctrl_x: emitWithSelectedNodes((ids) => emit('cut:nodes', ids)),
+		'delete|backspace': emitWithSelectedNodes((ids) => emit('delete:nodes', ids)),
+		ctrl_d: emitWithSelectedNodes((ids) => emit('duplicate:nodes', ids)),
+		d: emitWithSelectedNodes((ids) => emit('update:nodes:enabled', ids)),
+		p: emitWithSelectedNodes((ids) => emit('update:nodes:pin', ids, 'keyboard-shortcut')),
+		f2: emitWithLastSelectedNode((id) => emit('update:node:name', id)),
+		tab: () => emit('create:node', 'tab'),
+		shift_s: () => emit('create:sticky'),
+		ctrl_alt_n: () => emit('create:workflow'),
+		ctrl_enter: () => emit('run:workflow'),
+		ctrl_s: () => emit('save:workflow'),
+		shift_alt_t: onTidyUp,
+	};
+	return fullKeymap;
+});
 
 useKeybindings(keyMap, { disabled: disableKeyBindings });
 
@@ -589,7 +606,7 @@ function onOpenNodeContextMenu(
 	contextMenu.open(event, { source, nodeId: id });
 }
 
-function onContextMenuAction(action: ContextMenuAction, nodeIds: string[]) {
+async function onContextMenuAction(action: ContextMenuAction, nodeIds: string[]) {
 	switch (action) {
 		case 'add_node':
 			return emit('create:node', 'context_menu');
@@ -617,6 +634,20 @@ function onContextMenuAction(action: ContextMenuAction, nodeIds: string[]) {
 			return emit('update:node:name', nodeIds[0]);
 		case 'change_color':
 			return props.eventBus.emit('nodes:action', { ids: nodeIds, action: 'update:sticky:color' });
+		case 'tidy_up':
+			return await onTidyUp();
+	}
+}
+
+async function onTidyUp() {
+	const applyOnSelection = selectedNodes.value.length > 1;
+	const { nodes } = layout(applyOnSelection ? 'selection' : 'all');
+
+	onUpdateNodesPosition(nodes.map((node) => ({ id: node.id, position: { x: node.x, y: node.y } })));
+
+	if (!applyOnSelection) {
+		await nextTick();
+		await onFitView();
 	}
 }
 
@@ -840,6 +871,7 @@ provide(CanvasKey, {
 			@zoom-in="onZoomIn"
 			@zoom-out="onZoomOut"
 			@reset-zoom="onResetZoom"
+			@tidy-up="onTidyUp"
 		/>
 
 		<Suspense>
diff --git a/packages/frontend/editor-ui/src/components/canvas/elements/buttons/CanvasControlButtons.vue b/packages/frontend/editor-ui/src/components/canvas/elements/buttons/CanvasControlButtons.vue
index 5d9a7a3435..ddc7cce8c8 100644
--- a/packages/frontend/editor-ui/src/components/canvas/elements/buttons/CanvasControlButtons.vue
+++ b/packages/frontend/editor-ui/src/components/canvas/elements/buttons/CanvasControlButtons.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import { Controls } from '@vue-flow/controls';
 import KeyboardShortcutTooltip from '@/components/KeyboardShortcutTooltip.vue';
+import TidyUpIcon from '@/components/TidyUpIcon.vue';
 import { computed } from 'vue';
 import { useI18n } from '@/composables/useI18n';
 
@@ -18,6 +19,7 @@ const emit = defineEmits<{
 	'zoom-in': [];
 	'zoom-out': [];
 	'zoom-to-fit': [];
+	'tidy-up': [];
 }>();
 
 const i18n = useI18n();
@@ -39,6 +41,10 @@ function onZoomOut() {
 function onZoomToFit() {
 	emit('zoom-to-fit');
 }
+
+function onTidyUp() {
+	emit('tidy-up');
+}
 </script>
 <template>
 	<Controls :show-zoom="false" :show-fit-view="false">
@@ -85,9 +91,37 @@ function onZoomToFit() {
 				@click="onResetZoom"
 			/>
 		</KeyboardShortcutTooltip>
+		<KeyboardShortcutTooltip
+			:label="i18n.baseText('nodeView.tidyUp')"
+			:shortcut="{ shiftKey: true, altKey: true, keys: ['T'] }"
+		>
+			<N8nButton
+				square
+				type="tertiary"
+				size="large"
+				data-test-id="tidy-up-button"
+				:class="$style.iconButton"
+				@click="onTidyUp"
+			>
+				<TidyUpIcon />
+			</N8nButton>
+		</KeyboardShortcutTooltip>
 	</Controls>
 </template>
 
+<style module lang="scss">
+.iconButton {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+
+	svg {
+		width: 16px;
+		height: 16px;
+	}
+}
+</style>
+
 <style lang="scss">
 .vue-flow__controls {
 	display: flex;
diff --git a/packages/frontend/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasControlButtons.test.ts.snap b/packages/frontend/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasControlButtons.test.ts.snap
index d5e55528b1..860476802c 100644
--- a/packages/frontend/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasControlButtons.test.ts.snap
+++ b/packages/frontend/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasControlButtons.test.ts.snap
@@ -20,6 +20,10 @@ exports[`CanvasControlButtons > should render correctly 1`] = `
   </button>
   <!--teleport start-->
   <!--teleport end-->
-  <!--v-if-->
+  <!--v-if--><button class="button button tertiary large square iconButton el-tooltip__trigger el-tooltip__trigger iconButton el-tooltip__trigger el-tooltip__trigger" aria-live="polite" data-test-id="tidy-up-button">
+    <!--v-if--><span><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path fill="currentColor" d="M1.6.13c-.18-.17-.47-.18-.62 0L.56.57.14.98c-.2.15-.18.44 0 .62l3.63 3.6c.1.1.1.27 0 .37-.2.2-.53.52-.93.94-.56.57-.12 1.62.22 2.11.05.07.12.1.2.1.05-.01.1-.04.15-.08l5.23-5.22c.1-.1.1-.26-.02-.34-.5-.34-1.55-.78-2.12-.22-.42.4-.75.73-.94.93-.1.1-.27.1-.37 0L1.6.13ZM9.5 3.9c.07-.09.2-.1.3-.04l6.07 3.44c.15.08.18.29.05.4l-1.21 1.22a.26.26 0 0 1-.26.07l-2.18-.64a.26.26 0 0 0-.32.33l.76 2.02c.04.1.01.2-.06.27L7.7 15.92a.26.26 0 0 1-.41-.05L3.83 9.8a.26.26 0 0 1 .04-.3l5.62-5.6Z"></path></svg></span>
+  </button>
+  <!--teleport start-->
+  <!--teleport end-->
 </div>"
 `;
diff --git a/packages/frontend/editor-ui/src/composables/__snapshots__/useCanvasLayout.test.ts.snap b/packages/frontend/editor-ui/src/composables/__snapshots__/useCanvasLayout.test.ts.snap
new file mode 100644
index 0000000000..74736d4375
--- /dev/null
+++ b/packages/frontend/editor-ui/src/composables/__snapshots__/useCanvasLayout.test.ts.snap
@@ -0,0 +1,171 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`useCanvasLayout > should layout a basic workflow 1`] = `
+{
+  "boundingBox": {
+    "height": 100,
+    "width": 540,
+    "x": 0,
+    "y": 0,
+  },
+  "nodes": [
+    {
+      "id": "node1",
+      "x": 100,
+      "y": 100,
+    },
+    {
+      "id": "node2",
+      "x": 320,
+      "y": 100,
+    },
+    {
+      "id": "node3",
+      "x": 540,
+      "y": 100,
+    },
+  ],
+}
+`;
+
+exports[`useCanvasLayout > should layout a basic workflow with selected nodes 1`] = `
+{
+  "boundingBox": {
+    "height": 100,
+    "width": 540,
+    "x": 0,
+    "y": 0,
+  },
+  "nodes": [
+    {
+      "id": "node1",
+      "x": 100,
+      "y": 100,
+    },
+    {
+      "id": "node2",
+      "x": 320,
+      "y": 100,
+    },
+    {
+      "id": "node3",
+      "x": 540,
+      "y": 100,
+    },
+  ],
+}
+`;
+
+exports[`useCanvasLayout > should layout a workflow with AI nodes 1`] = `
+{
+  "boundingBox": {
+    "height": 540,
+    "width": 820,
+    "x": 0,
+    "y": 220,
+  },
+  "nodes": [
+    {
+      "id": "node1",
+      "x": 100,
+      "y": 100,
+    },
+    {
+      "id": "aiTool1",
+      "x": 320,
+      "y": 320,
+    },
+    {
+      "id": "aiTool2",
+      "x": 460,
+      "y": 320,
+    },
+    {
+      "id": "aiTool3",
+      "x": 600,
+      "y": 540,
+    },
+    {
+      "id": "aiAgent",
+      "x": 460,
+      "y": 100,
+    },
+    {
+      "id": "configurableAiTool",
+      "x": 600,
+      "y": 320,
+    },
+    {
+      "id": "node2",
+      "x": 820,
+      "y": 100,
+    },
+  ],
+}
+`;
+
+exports[`useCanvasLayout > should layout a workflow with sticky notes 1`] = `
+{
+  "boundingBox": {
+    "height": 100,
+    "width": 760,
+    "x": 0,
+    "y": 0,
+  },
+  "nodes": [
+    {
+      "id": "node1",
+      "x": 0,
+      "y": 0,
+    },
+    {
+      "id": "node2",
+      "x": 220,
+      "y": 0,
+    },
+    {
+      "id": "node3",
+      "x": 440,
+      "y": 0,
+    },
+    {
+      "id": "node4",
+      "x": 660,
+      "y": 0,
+    },
+    {
+      "id": "sticky",
+      "x": 130,
+      "y": -240,
+    },
+  ],
+}
+`;
+
+exports[`useCanvasLayout > should not reorder nodes vertically as it affects execution order 1`] = `
+{
+  "boundingBox": {
+    "height": 300,
+    "width": 320,
+    "x": 0,
+    "y": 0,
+  },
+  "nodes": [
+    {
+      "id": "node1",
+      "x": 0,
+      "y": -100,
+    },
+    {
+      "id": "node3",
+      "x": 220,
+      "y": -200,
+    },
+    {
+      "id": "node2",
+      "x": 220,
+      "y": 0,
+    },
+  ],
+}
+`;
diff --git a/packages/frontend/editor-ui/src/composables/__snapshots__/useContextMenu.test.ts.snap b/packages/frontend/editor-ui/src/composables/__snapshots__/useContextMenu.test.ts.snap
index ec9c211eac..1a9cb64c2b 100644
--- a/packages/frontend/editor-ui/src/composables/__snapshots__/useContextMenu.test.ts.snap
+++ b/packages/frontend/editor-ui/src/composables/__snapshots__/useContextMenu.test.ts.snap
@@ -67,6 +67,18 @@ exports[`useContextMenu > Read-only mode > should return the correct actions whe
       "metaKey": true,
     },
   },
+  {
+    "divided": true,
+    "id": "tidy_up",
+    "label": "Tidy up workflow",
+    "shortcut": {
+      "altKey": true,
+      "keys": [
+        "T",
+      ],
+      "shiftKey": true,
+    },
+  },
   {
     "disabled": false,
     "divided": true,
@@ -136,6 +148,18 @@ exports[`useContextMenu > Read-only mode > should return the correct actions whe
       "metaKey": true,
     },
   },
+  {
+    "divided": true,
+    "id": "tidy_up",
+    "label": "Tidy up workflow",
+    "shortcut": {
+      "altKey": true,
+      "keys": [
+        "T",
+      ],
+      "shiftKey": true,
+    },
+  },
   {
     "disabled": false,
     "divided": true,
@@ -234,6 +258,18 @@ exports[`useContextMenu > should return the correct actions opening the menu fro
       "metaKey": true,
     },
   },
+  {
+    "divided": true,
+    "id": "tidy_up",
+    "label": "Tidy up workflow",
+    "shortcut": {
+      "altKey": true,
+      "keys": [
+        "T",
+      ],
+      "shiftKey": true,
+    },
+  },
   {
     "disabled": false,
     "divided": true,
@@ -332,6 +368,18 @@ exports[`useContextMenu > should return the correct actions when right clicking
       "metaKey": true,
     },
   },
+  {
+    "divided": true,
+    "id": "tidy_up",
+    "label": "Tidy up workflow",
+    "shortcut": {
+      "altKey": true,
+      "keys": [
+        "T",
+      ],
+      "shiftKey": true,
+    },
+  },
   {
     "disabled": false,
     "divided": true,
@@ -401,6 +449,18 @@ exports[`useContextMenu > should return the correct actions when right clicking
       "metaKey": true,
     },
   },
+  {
+    "divided": true,
+    "id": "tidy_up",
+    "label": "Tidy up workflow",
+    "shortcut": {
+      "altKey": true,
+      "keys": [
+        "T",
+      ],
+      "shiftKey": true,
+    },
+  },
   {
     "disabled": false,
     "divided": true,
@@ -475,6 +535,18 @@ exports[`useContextMenu > should support opening and closing (default = right cl
       "metaKey": true,
     },
   },
+  {
+    "divided": true,
+    "id": "tidy_up",
+    "label": "Tidy up selection",
+    "shortcut": {
+      "altKey": true,
+      "keys": [
+        "T",
+      ],
+      "shiftKey": true,
+    },
+  },
   {
     "disabled": false,
     "divided": true,
diff --git a/packages/frontend/editor-ui/src/composables/useCanvasLayout.test.ts b/packages/frontend/editor-ui/src/composables/useCanvasLayout.test.ts
new file mode 100644
index 0000000000..9a6132e06f
--- /dev/null
+++ b/packages/frontend/editor-ui/src/composables/useCanvasLayout.test.ts
@@ -0,0 +1,170 @@
+import { useVueFlow, type GraphNode, type VueFlowStore } from '@vue-flow/core';
+import { ref } from 'vue';
+import { createCanvasGraphEdge, createCanvasGraphNode } from '../__tests__/data';
+import { CanvasNodeRenderType, type CanvasNodeData } from '../types';
+import { useCanvasLayout, type LayoutResult } from './useCanvasLayout';
+import { STICKY_NODE_TYPE } from '../constants';
+import { GRID_SIZE } from '../utils/nodeViewUtils';
+
+vi.mock('@vue-flow/core');
+
+function matchesGrid(result: LayoutResult) {
+	return result.nodes.every((node) => node.x % GRID_SIZE === 0 && node.y % GRID_SIZE === 0);
+}
+
+describe('useCanvasLayout', () => {
+	function createTestSetup(
+		nodes: Array<GraphNode<CanvasNodeData>>,
+		connections: Array<[string, string]>,
+		selectedNodeIds?: string[],
+	) {
+		const nodesById = Object.fromEntries(nodes.map((node) => [node.id, node]));
+		const edges = connections.map(([sourceId, targetId]) =>
+			createCanvasGraphEdge(nodesById[sourceId], nodesById[targetId]),
+		);
+		const edgesById = Object.fromEntries(edges.map((edge) => [edge.id, edge]));
+
+		const selectedNodes = selectedNodeIds?.map((id) => nodesById[id]) ?? nodes;
+
+		const vueFlowStoreMock = {
+			nodes: ref(nodes),
+			edges: ref(edges),
+			getSelectedNodes: ref(selectedNodes),
+			findNode: (nodeId: string) => nodesById[nodeId],
+			findEdge: (edgeId: string) => edgesById[edgeId],
+		} as unknown as VueFlowStore;
+
+		vi.mocked(useVueFlow).mockReturnValue(vueFlowStoreMock);
+
+		const { layout } = useCanvasLayout();
+
+		return { layout };
+	}
+
+	test('should layout a basic workflow', () => {
+		const nodes = [
+			createCanvasGraphNode({ id: 'node1' }),
+			createCanvasGraphNode({ id: 'node2' }),
+			createCanvasGraphNode({ id: 'node3' }),
+		];
+
+		const connections: Array<[string, string]> = [
+			['node1', 'node2'],
+			['node2', 'node3'],
+		];
+
+		const { layout } = createTestSetup(nodes, connections);
+		const result = layout('all');
+		expect(result).toMatchSnapshot();
+		expect(matchesGrid(result)).toBe(true);
+	});
+
+	test('should layout a basic workflow with selected nodes', () => {
+		const nodes = [
+			createCanvasGraphNode({ id: 'node1' }),
+			createCanvasGraphNode({ id: 'node2' }),
+			createCanvasGraphNode({ id: 'node3' }),
+			createCanvasGraphNode({ id: 'node4' }),
+		];
+
+		const connections: Array<[string, string]> = [
+			['node1', 'node2'],
+			['node2', 'node3'],
+			['node3', 'node4'],
+		];
+
+		const { layout } = createTestSetup(nodes, connections, ['node1', 'node2', 'node3']);
+		const result = layout('selection');
+		expect(result).toMatchSnapshot();
+		expect(matchesGrid(result)).toBe(true);
+	});
+
+	test('should layout a workflow with AI nodes', () => {
+		const nodes = [
+			createCanvasGraphNode({ id: 'node1' }),
+			createCanvasGraphNode({
+				id: 'aiAgent',
+				data: { render: { type: CanvasNodeRenderType.Default, options: { configurable: true } } },
+			}),
+			createCanvasGraphNode({
+				id: 'aiTool1',
+				data: { render: { type: CanvasNodeRenderType.Default, options: { configuration: true } } },
+			}),
+			createCanvasGraphNode({
+				id: 'aiTool2',
+				data: { render: { type: CanvasNodeRenderType.Default, options: { configuration: true } } },
+			}),
+			createCanvasGraphNode({
+				id: 'configurableAiTool',
+				data: {
+					render: {
+						type: CanvasNodeRenderType.Default,
+						options: { configurable: true, configuration: true },
+					},
+				},
+			}),
+			createCanvasGraphNode({
+				id: 'aiTool3',
+				data: { render: { type: CanvasNodeRenderType.Default, options: { configuration: true } } },
+			}),
+			createCanvasGraphNode({ id: 'node2' }),
+		];
+
+		const connections: Array<[string, string]> = [
+			['node1', 'aiAgent'],
+			['aiTool1', 'aiAgent'],
+			['aiTool2', 'aiAgent'],
+			['configurableAiTool', 'aiAgent'],
+			['aiTool3', 'configurableAiTool'],
+			['aiAgent', 'node2'],
+		];
+
+		const { layout } = createTestSetup(nodes, connections);
+		const result = layout('all');
+		expect(result).toMatchSnapshot();
+		expect(matchesGrid(result)).toBe(true);
+	});
+
+	test('should layout a workflow with sticky notes', () => {
+		const nodes = [
+			createCanvasGraphNode({ id: 'node1', position: { x: 0, y: 0 } }),
+			createCanvasGraphNode({ id: 'node2', position: { x: 500, y: 0 } }),
+			createCanvasGraphNode({ id: 'node3', position: { x: 700, y: 0 } }),
+			createCanvasGraphNode({ id: 'node4', position: { x: 1000, y: 0 } }),
+			createCanvasGraphNode({
+				id: 'sticky',
+				data: { type: STICKY_NODE_TYPE },
+				dimensions: { width: 500, height: 400 },
+				position: { x: 400, y: -100 },
+			}),
+		];
+
+		const connections: Array<[string, string]> = [
+			['node1', 'node2'],
+			['node2', 'node3'],
+			['node3', 'node4'],
+		];
+
+		const { layout } = createTestSetup(nodes, connections);
+		const result = layout('all');
+		expect(result).toMatchSnapshot();
+	});
+
+	test('should not reorder nodes vertically as it affects execution order', () => {
+		const nodes = [
+			createCanvasGraphNode({ id: 'node1', position: { x: 0, y: 0 } }),
+			createCanvasGraphNode({ id: 'node2', position: { x: 400, y: 200 } }),
+			createCanvasGraphNode({ id: 'node3', position: { x: 400, y: -200 } }),
+		];
+
+		const connections: Array<[string, string]> = [
+			['node1', 'node3'],
+			['node1', 'node2'],
+		];
+
+		const { layout } = createTestSetup(nodes, connections);
+		const result = layout('all');
+		expect(result).toMatchSnapshot();
+		expect(matchesGrid(result)).toBe(true);
+	});
+});
diff --git a/packages/frontend/editor-ui/src/composables/useCanvasLayout.ts b/packages/frontend/editor-ui/src/composables/useCanvasLayout.ts
new file mode 100644
index 0000000000..1ebb662b89
--- /dev/null
+++ b/packages/frontend/editor-ui/src/composables/useCanvasLayout.ts
@@ -0,0 +1,516 @@
+import dagre from '@dagrejs/dagre';
+
+import { useVueFlow, type GraphEdge, type GraphNode, type XYPosition } from '@vue-flow/core';
+import { STICKY_NODE_TYPE } from '../constants';
+import {
+	CanvasNodeRenderType,
+	type BoundingBox,
+	type CanvasConnection,
+	type CanvasNodeData,
+} from '../types';
+import { isPresent } from '../utils/typesUtils';
+import { GRID_SIZE, NODE_SIZE } from '../utils/nodeViewUtils';
+
+export type CanvasLayoutOptions = { id?: string };
+export type CanvasLayoutTarget = 'selection' | 'all';
+export type CanvasLayoutTargetData = {
+	nodes: Array<GraphNode<CanvasNodeData>>;
+	edges: CanvasConnection[];
+};
+
+export type NodeLayoutResult = {
+	id: string;
+	x: number;
+	y: number;
+	width?: number;
+	height?: number;
+};
+export type LayoutResult = { boundingBox: BoundingBox; nodes: NodeLayoutResult[] };
+
+export type CanvasNodeDictionary = Record<string, GraphNode<CanvasNodeData>>;
+
+const NODE_X_SPACING = GRID_SIZE * 6;
+const NODE_Y_SPACING = GRID_SIZE * 5;
+const SUBGRAPH_SPACING = GRID_SIZE * 8;
+const AI_X_SPACING = GRID_SIZE * 2;
+const AI_Y_SPACING = GRID_SIZE * 6;
+const STICKY_BOTTOM_PADDING = GRID_SIZE * 3;
+
+export function useCanvasLayout({ id: canvasId }: CanvasLayoutOptions = {}) {
+	const {
+		findNode,
+		findEdge,
+		getSelectedNodes,
+		edges: allEdges,
+		nodes: allNodes,
+	} = useVueFlow({ id: canvasId });
+
+	function getTargetData(target: CanvasLayoutTarget): CanvasLayoutTargetData {
+		if (target === 'selection') {
+			return { nodes: getSelectedNodes.value, edges: allEdges.value };
+		}
+		return { nodes: allNodes.value, edges: allEdges.value };
+	}
+
+	function sortByPosition(posA: XYPosition, posB: XYPosition): number {
+		const yDiff = posA.y - posB.y;
+		return yDiff === 0 ? posA.x - posB.x : yDiff;
+	}
+
+	function sortNodesByPosition(nodeA: GraphNode, nodeB: GraphNode): number {
+		const hasEdgesA = allEdges.value.some((edge) => edge.target === nodeA.id);
+		const hasEdgesB = allEdges.value.some((edge) => edge.target === nodeB.id);
+
+		if (!hasEdgesA && hasEdgesB) return -1;
+		if (hasEdgesA && !hasEdgesB) return 1;
+		return sortByPosition(nodeA.position, nodeB.position);
+	}
+
+	function sortEdgesByPosition(edgeA: GraphEdge, edgeB: GraphEdge): number {
+		return sortByPosition(positionFromEdge(edgeA), positionFromEdge(edgeB));
+	}
+
+	function positionFromEdge(edge: GraphEdge): XYPosition {
+		return { x: edge.targetX, y: edge.targetY };
+	}
+
+	function createDagreGraph({ nodes, edges }: CanvasLayoutTargetData) {
+		const graph = new dagre.graphlib.Graph();
+		graph.setDefaultEdgeLabel(() => ({}));
+
+		const graphNodes = nodes
+			.map((node) => findNode<CanvasNodeData>(node.id))
+			.filter(isPresent)
+			.sort(sortNodesByPosition);
+
+		const nodeIdSet = new Set(nodes.map((node) => node.id));
+
+		graphNodes.forEach(({ id: nodeId, position: { x, y }, dimensions: { width, height } }) => {
+			graph.setNode(nodeId, { width, height, x, y });
+		});
+
+		edges
+			.map((node) => findEdge<CanvasNodeData>(node.id))
+			.filter(isPresent)
+			.filter((edge) => nodeIdSet.has(edge.source) && nodeIdSet.has(edge.target))
+			.sort(sortEdgesByPosition)
+			.forEach((edge) => graph.setEdge(edge.source, edge.target));
+
+		return graph;
+	}
+
+	function createDagreSubGraph({
+		nodeIds,
+		parent,
+	}: { nodeIds: string[]; parent: dagre.graphlib.Graph }) {
+		const subGraph = new dagre.graphlib.Graph();
+		subGraph.setGraph({
+			rankdir: 'LR',
+			edgesep: NODE_Y_SPACING,
+			nodesep: NODE_Y_SPACING,
+			ranksep: NODE_X_SPACING,
+		});
+		subGraph.setDefaultEdgeLabel(() => ({}));
+		const nodeIdSet = new Set(nodeIds);
+
+		parent
+			.nodes()
+			.filter((nodeId) => nodeIdSet.has(nodeId))
+			.forEach((nodeId) => {
+				subGraph.setNode(nodeId, parent.node(nodeId));
+			});
+
+		parent
+			.edges()
+			.filter((edge) => nodeIdSet.has(edge.v) && nodeIdSet.has(edge.w))
+			.forEach((edge) => subGraph.setEdge(edge.v, edge.w, parent.edge(edge)));
+
+		return subGraph;
+	}
+
+	function createDagreVerticalGraph({ nodes }: { nodes: Array<{ id: string; box: BoundingBox }> }) {
+		const subGraph = new dagre.graphlib.Graph();
+		subGraph.setGraph({
+			rankdir: 'TB',
+			align: 'UL',
+			edgesep: SUBGRAPH_SPACING,
+			nodesep: SUBGRAPH_SPACING,
+			ranksep: SUBGRAPH_SPACING,
+		});
+		subGraph.setDefaultEdgeLabel(() => ({}));
+
+		nodes.forEach(({ id, box: { x, y, width, height } }) =>
+			subGraph.setNode(id, { x, y, width, height }),
+		);
+
+		nodes.forEach((node, index) => {
+			if (!nodes[index + 1]) return;
+			subGraph.setEdge(node.id, nodes[index + 1].id);
+		});
+
+		return subGraph;
+	}
+
+	function createAiSubGraph({
+		parent,
+		nodeIds,
+	}: { parent: dagre.graphlib.Graph; nodeIds: string[] }) {
+		const subGraph = new dagre.graphlib.Graph();
+		subGraph.setGraph({
+			rankdir: 'TB',
+			edgesep: AI_X_SPACING,
+			nodesep: AI_X_SPACING,
+			ranksep: AI_Y_SPACING,
+		});
+		subGraph.setDefaultEdgeLabel(() => ({}));
+		const nodeIdSet = new Set(nodeIds);
+
+		parent
+			.nodes()
+			.filter((nodeId) => nodeIdSet.has(nodeId))
+			.forEach((nodeId) => {
+				subGraph.setNode(nodeId, parent.node(nodeId));
+			});
+
+		parent
+			.edges()
+			.filter((edge) => nodeIdSet.has(edge.v) && nodeIdSet.has(edge.w))
+			.forEach((edge) => subGraph.setEdge(edge.w, edge.v));
+
+		return subGraph;
+	}
+
+	// For a list of bounding boxes, return the bounding box that contains them all
+	function compositeBoundingBox(boxes: BoundingBox[]): BoundingBox {
+		const { minX, minY, maxX, maxY } = boxes.reduce(
+			(bbox, node) => {
+				const { x, y, width, height } = node;
+				return {
+					minX: Math.min(bbox.minX, x),
+					maxX: Math.max(bbox.maxX, x + width),
+					minY: Math.min(bbox.minY, y),
+					maxY: Math.max(bbox.maxY, y + height),
+				};
+			},
+			{ minX: Infinity, minY: Infinity, maxX: -Infinity, maxY: -Infinity },
+		);
+
+		return {
+			x: minX,
+			y: minY,
+			width: maxX - minX,
+			height: maxY - minY,
+		};
+	}
+
+	function boundingBoxFromCanvasNode(node: GraphNode<CanvasNodeData>): BoundingBox {
+		return {
+			x: node.position.x,
+			y: node.position.y,
+			width: node.dimensions.width,
+			height: node.dimensions.height,
+		};
+	}
+
+	function boundingBoxFromDagreNode(node: dagre.Node): BoundingBox {
+		return {
+			x: node.x - node.width / 2,
+			y: node.y - node.height / 2,
+			width: node.width,
+			height: node.height,
+		};
+	}
+
+	function boundingBoxFromGraph(graph: dagre.graphlib.Graph): BoundingBox {
+		return compositeBoundingBox(
+			graph.nodes().map((nodeId) => boundingBoxFromDagreNode(graph.node(nodeId))),
+		);
+	}
+
+	function boundingBoxFromCanvasNodes(nodes: Array<GraphNode<CanvasNodeData>>): BoundingBox {
+		return compositeBoundingBox(nodes.map(boundingBoxFromCanvasNode));
+	}
+
+	// Is the `child` bounding box completely contained in the `parent` bounding box
+	function isCoveredBy(parent: BoundingBox, child: BoundingBox) {
+		const childRight = child.x + child.width;
+		const childBottom = child.y + child.height;
+		const parentRight = parent.x + parent.width;
+		const parentBottom = parent.y + parent.height;
+
+		return (
+			child.x >= parent.x &&
+			child.y >= parent.y &&
+			childRight <= parentRight &&
+			childBottom <= parentBottom
+		);
+	}
+
+	function centerHorizontally(container: BoundingBox, target: BoundingBox) {
+		const containerCenter = container.x + container.width / 2;
+		const newX = containerCenter - target.width / 2;
+		return newX;
+	}
+
+	function intersects(container: BoundingBox, target: BoundingBox, padding = 0): boolean {
+		// Add padding to target box dimensions
+		const targetWithPadding = {
+			x: target.x - padding,
+			y: target.y - padding,
+			width: target.width + padding * 2,
+			height: target.height + padding * 2,
+		};
+
+		const noIntersection =
+			targetWithPadding.x + targetWithPadding.width < container.x ||
+			targetWithPadding.x > container.x + container.width ||
+			targetWithPadding.y + targetWithPadding.height < container.y ||
+			targetWithPadding.y > container.y + container.height;
+
+		return !noIntersection;
+	}
+
+	function isAiParentNode(node: CanvasNodeData) {
+		return (
+			node.render.type === CanvasNodeRenderType.Default &&
+			node.render.options.configurable &&
+			!node.render.options.configuration
+		);
+	}
+
+	function isAiConfigNode(node: CanvasNodeData) {
+		return node.render.type === CanvasNodeRenderType.Default && node.render.options.configuration;
+	}
+
+	function getAllConnectedAiConfigNodes({
+		graph,
+		root,
+		nodeById,
+	}: {
+		graph: dagre.graphlib.Graph;
+		root: CanvasNodeData;
+		nodeById: CanvasNodeDictionary;
+	}): string[] {
+		return (graph.predecessors(root.id) as unknown as string[])
+			.map((successor) => nodeById[successor])
+			.filter((node) => isAiConfigNode(node.data))
+			.flatMap((node) => [
+				node.id,
+				...getAllConnectedAiConfigNodes({ graph, root: node.data, nodeById }),
+			]);
+	}
+
+	function layout(target: CanvasLayoutTarget): LayoutResult {
+		const { nodes, edges } = getTargetData(target);
+
+		const nonStickyNodes = nodes
+			.filter((node) => node.data.type !== STICKY_NODE_TYPE)
+			.map((node) => findNode(node.id))
+			.filter(isPresent);
+		const boundingBoxBefore = boundingBoxFromCanvasNodes(nonStickyNodes);
+
+		const parentGraph = createDagreGraph({ nodes: nonStickyNodes, edges });
+		const nodeById = nonStickyNodes.reduce((acc, node) => {
+			acc[node.id] = node;
+			return acc;
+		}, {} as CanvasNodeDictionary);
+
+		// Divide workflow in to subgraphs
+		// A subgraph contains a group of connected nodes that is not connected to any node outside of this group
+		const subgraphs = dagre.graphlib.alg.components(parentGraph).map((nodeIds) => {
+			const subgraph = createDagreSubGraph({ nodeIds, parent: parentGraph });
+			const aiParentNodes = subgraph
+				.nodes()
+				.map((nodeId) => nodeById[nodeId].data)
+				.filter(isAiParentNode);
+
+			// Create a subgraph for each AI (configurable) node and apply a top-bottom layout
+			// Then add the bounding box of this layout back into the parent graph before doing layout
+			const aiGraphs = aiParentNodes.map((aiParentNode) => {
+				const configNodeIds = getAllConnectedAiConfigNodes({
+					graph: subgraph,
+					nodeById,
+					root: aiParentNode,
+				});
+				const allAiNodeIds = configNodeIds.concat(aiParentNode.id);
+				const aiGraph = createAiSubGraph({
+					parent: subgraph,
+					nodeIds: allAiNodeIds,
+				});
+				configNodeIds.forEach((nodeId) => subgraph.removeNode(nodeId));
+				const rootEdges = subgraph
+					.edges()
+					.filter((edge) => edge.v === aiParentNode.id || edge.w === aiParentNode.id);
+
+				dagre.layout(aiGraph, { disableOptimalOrderHeuristic: true });
+				const aiBoundingBox = boundingBoxFromGraph(aiGraph);
+				subgraph.setNode(aiParentNode.id, {
+					width: aiBoundingBox.width,
+					height: aiBoundingBox.height,
+				});
+				rootEdges.forEach((edge) => subgraph.setEdge(edge));
+
+				return { graph: aiGraph, boundingBox: aiBoundingBox, aiParentNode };
+			});
+
+			dagre.layout(subgraph, { disableOptimalOrderHeuristic: true });
+
+			return { graph: subgraph, aiGraphs, boundingBox: boundingBoxFromGraph(subgraph) };
+		});
+
+		const compositeGraph = createDagreVerticalGraph({
+			nodes: subgraphs.map(({ boundingBox }, index) => ({
+				box: boundingBox,
+				id: index.toString(),
+			})),
+		});
+
+		dagre.layout(compositeGraph, { disableOptimalOrderHeuristic: true });
+
+		const boundingBoxByNodeId = subgraphs
+			.flatMap(({ graph, aiGraphs }, index) => {
+				const subgraphPosition = compositeGraph.node(index.toString());
+
+				const aiParentNodes = new Set(aiGraphs.map(({ aiParentNode }) => aiParentNode.id));
+				const offset = {
+					x: 0,
+					y: subgraphPosition.y - subgraphPosition.height / 2,
+				};
+
+				return graph.nodes().flatMap((nodeId) => {
+					const { x, y, width, height } = graph.node(nodeId);
+					const positionedNode = {
+						id: nodeId,
+						boundingBox: {
+							x: x + offset.x - width / 2,
+							y: y + offset.y - height / 2,
+							width,
+							height,
+						},
+					};
+
+					if (aiParentNodes.has(nodeId)) {
+						const aiGraph = aiGraphs.find(({ aiParentNode }) => aiParentNode.id === nodeId);
+
+						if (!aiGraph) return [];
+
+						const aiParentNodeBox = positionedNode.boundingBox;
+
+						const parentOffset = {
+							x: aiParentNodeBox.x,
+							y: aiParentNodeBox.y,
+						};
+
+						return aiGraph.graph.nodes().map((aiNodeId) => {
+							const aiNode = aiGraph.graph.node(aiNodeId);
+							const aiBoundingBox = {
+								x: aiNode.x + parentOffset.x - aiNode.width / 2,
+								y: aiNode.y + parentOffset.y - aiNode.height / 2,
+								width: aiNode.width,
+								height: aiNode.height,
+							};
+
+							return {
+								id: aiNodeId,
+								boundingBox: aiBoundingBox,
+							};
+						});
+					}
+
+					return positionedNode;
+				});
+			})
+			.reduce(
+				(acc, node) => {
+					acc[node.id] = node.boundingBox;
+					return acc;
+				},
+				{} as Record<string, BoundingBox>,
+			);
+
+		// Post process AI node vertical position
+		// The bounding box of the AI node sublayout is vertically centered with the other nodes, but we want it to be top-aligned when possible
+		// We need to be careful to only do this when it would not overlap with other nodes
+		subgraphs
+			.flatMap(({ aiGraphs }) => aiGraphs)
+			.forEach(({ graph }) => {
+				const aiNodes = graph.nodes();
+				const aiGraphBoundingBox = compositeBoundingBox(
+					aiNodes.map((nodeId) => boundingBoxByNodeId[nodeId]).filter(isPresent),
+				);
+				const aiNodeVerticalCorrection = aiGraphBoundingBox.height / 2 - NODE_SIZE / 2;
+				aiGraphBoundingBox.y += aiNodeVerticalCorrection;
+
+				const hasConflictingNodes = Object.entries(boundingBoxByNodeId)
+					.filter(([id]) => !graph.hasNode(id))
+					.some(([, nodeBoundingBox]) =>
+						intersects(aiGraphBoundingBox, nodeBoundingBox, NODE_Y_SPACING),
+					);
+
+				if (!hasConflictingNodes) {
+					for (const aiNode of aiNodes) {
+						boundingBoxByNodeId[aiNode].y += aiNodeVerticalCorrection;
+					}
+				}
+			});
+
+		const positionedNodes = Object.entries(boundingBoxByNodeId).map(([id, boundingBox]) => ({
+			id,
+			boundingBox,
+		}));
+		const boundingBoxAfter = compositeBoundingBox(positionedNodes.map((node) => node.boundingBox));
+
+		const anchor = {
+			x: boundingBoxAfter.x - boundingBoxBefore.x,
+			y: boundingBoxAfter.y - boundingBoxBefore.y,
+		};
+
+		const stickies = nodes
+			.filter((node) => node.data.type === STICKY_NODE_TYPE)
+			.map((node) => findNode(node.id))
+			.filter(isPresent);
+
+		const positionedStickies = stickies
+			.map((sticky) => {
+				const stickyBox = boundingBoxFromCanvasNode(sticky);
+				const coveredNodes = nonStickyNodes.filter((node) =>
+					isCoveredBy(boundingBoxFromCanvasNode(sticky), boundingBoxFromCanvasNode(node)),
+				);
+
+				if (coveredNodes.length === 0) return null;
+
+				const coveredNodesBoxAfter = compositeBoundingBox(
+					positionedNodes
+						.filter((node) => coveredNodes.some((covered) => covered.id === node.id))
+						.map(({ boundingBox }) => boundingBox),
+				);
+				return {
+					id: sticky.id,
+					boundingBox: {
+						x: centerHorizontally(coveredNodesBoxAfter, stickyBox),
+						y:
+							coveredNodesBoxAfter.y +
+							coveredNodesBoxAfter.height -
+							stickyBox.height +
+							STICKY_BOTTOM_PADDING,
+						height: stickyBox.height,
+						width: stickyBox.width,
+					},
+				};
+			})
+			.filter(isPresent);
+
+		return {
+			boundingBox: boundingBoxAfter,
+			nodes: positionedNodes.concat(positionedStickies).map(({ id, boundingBox }) => {
+				return {
+					id,
+					x: boundingBox.x - anchor.x,
+					y: boundingBox.y - anchor.y,
+				};
+			}),
+		};
+	}
+
+	return { layout };
+}
diff --git a/packages/frontend/editor-ui/src/composables/useContextMenu.ts b/packages/frontend/editor-ui/src/composables/useContextMenu.ts
index 21322cc910..208166b831 100644
--- a/packages/frontend/editor-ui/src/composables/useContextMenu.ts
+++ b/packages/frontend/editor-ui/src/composables/useContextMenu.ts
@@ -31,7 +31,8 @@ export type ContextMenuAction =
 	| 'deselect_all'
 	| 'add_node'
 	| 'add_sticky'
-	| 'change_color';
+	| 'change_color'
+	| 'tidy_up';
 
 const position = ref<XYPosition>([0, 0]);
 const isOpen = ref(false);
@@ -120,7 +121,7 @@ export const useContextMenu = (onAction: ContextMenuActionCallback = () => {}) =
 			},
 		};
 
-		const selectionActions = [
+		const selectionActions: ActionDropdownItem[] = [
 			{
 				id: 'select_all',
 				divided: true,
@@ -135,6 +136,17 @@ export const useContextMenu = (onAction: ContextMenuActionCallback = () => {}) =
 			},
 		];
 
+		const layoutActions: ActionDropdownItem[] = [
+			{
+				id: 'tidy_up',
+				divided: true,
+				label: i18n.baseText(
+					nodes.length < 2 ? 'contextMenu.tidyUpWorkflow' : 'contextMenu.tidyUpSelection',
+				),
+				shortcut: { shiftKey: true, altKey: true, keys: ['T'] },
+			},
+		];
+
 		if (nodes.length === 0) {
 			actions.value = [
 				{
@@ -149,6 +161,7 @@ export const useContextMenu = (onAction: ContextMenuActionCallback = () => {}) =
 					label: i18n.baseText('contextMenu.addSticky'),
 					disabled: isReadOnly.value,
 				},
+				...layoutActions,
 				...selectionActions,
 			];
 		} else {
@@ -180,6 +193,7 @@ export const useContextMenu = (onAction: ContextMenuActionCallback = () => {}) =
 					shortcut: { metaKey: true, keys: ['D'] },
 					disabled: isReadOnly.value || !nodes.every(canDuplicateNode),
 				},
+				...layoutActions,
 				...selectionActions,
 				{
 					id: 'delete',
diff --git a/packages/frontend/editor-ui/src/plugins/i18n/locales/en.json b/packages/frontend/editor-ui/src/plugins/i18n/locales/en.json
index 6d67060348..eb7dda1790 100644
--- a/packages/frontend/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/frontend/editor-ui/src/plugins/i18n/locales/en.json
@@ -1332,6 +1332,7 @@
 	"nodeView.redirecting": "Redirecting",
 	"nodeView.refresh": "Refresh",
 	"nodeView.resetZoom": "Reset Zoom",
+	"nodeView.tidyUp": "Tidy Up",
 	"nodeView.runButtonText.executeWorkflow": "Test workflow",
 	"nodeView.runButtonText.executingWorkflow": "Executing workflow",
 	"nodeView.runButtonText.waitingForTriggerEvent": "Waiting for trigger event",
@@ -1381,6 +1382,8 @@
 	"contextMenu.sticky": "sticky note | sticky notes",
 	"contextMenu.selectAll": "Select all",
 	"contextMenu.deselectAll": "Clear selection",
+	"contextMenu.tidyUpWorkflow": "Tidy up workflow",
+	"contextMenu.tidyUpSelection": "Tidy up selection",
 	"contextMenu.duplicate": "Duplicate | Duplicate {count} {subject}",
 	"contextMenu.open": "Open...",
 	"contextMenu.test": "Test step",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7820190cbd..1ba06540d3 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1576,6 +1576,9 @@ importers:
       '@codemirror/view':
         specifier: ^6.26.3
         version: 6.26.3
+      '@dagrejs/dagre':
+        specifier: ^1.1.4
+        version: 1.1.4
       '@fontsource/open-sans':
         specifier: ^4.5.0
         version: 4.5.12
@@ -3343,6 +3346,13 @@ packages:
   '@dabh/diagnostics@2.0.3':
     resolution: {integrity: sha512-hrlQOIi7hAfzsMqlGSFyVucrx38O+j6wiGOf//H2ecvIEqYN4ADBSS2iLMh5UFyDunCNniUIPk/q3riFv45xRA==}
 
+  '@dagrejs/dagre@1.1.4':
+    resolution: {integrity: sha512-QUTc54Cg/wvmlEUxB+uvoPVKFazM1H18kVHBQNmK2NbrDR5ihOCR6CXLnDSZzMcSQKJtabPUWridBOlJM3WkDg==}
+
+  '@dagrejs/graphlib@2.2.4':
+    resolution: {integrity: sha512-mepCf/e9+SKYy1d02/UkvSy6+6MoyXhVxP8lLDfA7BPE1X1d4dR0sZznmbM8/XVJ1GPM+Svnx7Xj6ZweByWUkw==}
+    engines: {node: '>17.0.0'}
+
   '@element-plus/icons-vue@2.3.1':
     resolution: {integrity: sha512-XxVUZv48RZAd87ucGS48jPf6pKu0yV5UCg9f4FFwtrYxXOwWuVJo6wOvSLKEoMQKjv8GsX/mhP6UsC1lRwbUWg==}
     peerDependencies:
@@ -15752,6 +15762,12 @@ snapshots:
       enabled: 2.0.0
       kuler: 2.0.0
 
+  '@dagrejs/dagre@1.1.4':
+    dependencies:
+      '@dagrejs/graphlib': 2.2.4
+
+  '@dagrejs/graphlib@2.2.4': {}
+
   '@element-plus/icons-vue@2.3.1(vue@3.5.13(typescript@5.7.2))':
     dependencies:
       vue: 3.5.13(typescript@5.7.2)

From 2cb9d9e29fc961a417d06c1449b79d4a0a66658e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milorad=20FIlipovi=C4=87?= <milorad@n8n.io>
Date: Fri, 28 Feb 2025 15:50:50 +0100
Subject: [PATCH 47/47] feat(editor): Add functionality to create folders
 (#13473)

---
 .../components/N8nBreadcrumbs/Breadcrumbs.vue |   6 +-
 packages/frontend/editor-ui/src/Interface.ts  |  16 +
 .../frontend/editor-ui/src/api/workflows.ts   |  26 +
 .../components/DuplicateWorkflowDialog.vue    |   3 +
 .../components/Folders/FolderBreadcrumbs.vue  |  89 +++
 .../src/components/Folders/FolderCard.test.ts |  12 +-
 .../src/components/Folders/FolderCard.vue     |  86 +--
 .../components/Projects/ProjectHeader.test.ts |   4 +
 .../src/components/Projects/ProjectHeader.vue |  43 +-
 .../editor-ui/src/components/WorkflowCard.vue |  69 ++-
 .../layouts/ResourcesListLayout.vue           |  49 +-
 .../src/composables/useWorkflowHelpers.ts     |  14 +-
 packages/frontend/editor-ui/src/constants.ts  |   3 +-
 .../src/plugins/i18n/locales/en.json          |  10 +
 .../editor-ui/src/plugins/icons/index.ts      |   2 +
 .../editor-ui/src/stores/folders.store.ts     | 102 +++
 .../editor-ui/src/stores/workflows.store.ts   |   8 +-
 .../frontend/editor-ui/src/views/NodeView.vue |   9 +-
 .../src/views/ProjectSettings.test.ts         |   3 +
 .../editor-ui/src/views/WorkflowsView.test.ts | 146 +++--
 .../editor-ui/src/views/WorkflowsView.vue     | 580 ++++++++++++++----
 21 files changed, 961 insertions(+), 319 deletions(-)
 create mode 100644 packages/frontend/editor-ui/src/components/Folders/FolderBreadcrumbs.vue
 create mode 100644 packages/frontend/editor-ui/src/stores/folders.store.ts

diff --git a/packages/frontend/@n8n/design-system/src/components/N8nBreadcrumbs/Breadcrumbs.vue b/packages/frontend/@n8n/design-system/src/components/N8nBreadcrumbs/Breadcrumbs.vue
index ff017bf2aa..a7ecd21628 100644
--- a/packages/frontend/@n8n/design-system/src/components/N8nBreadcrumbs/Breadcrumbs.vue
+++ b/packages/frontend/@n8n/design-system/src/components/N8nBreadcrumbs/Breadcrumbs.vue
@@ -340,12 +340,12 @@ const handleTooltipClose = () => {
 
 	.item,
 	.item * {
-		color: var(--color-text-light);
+		color: var(--color-text-base);
 		font-size: var(--font-size-m);
 	}
 
 	.item a:hover * {
-		color: var(--color-text-base);
+		color: var(--color-text-dark);
 	}
 
 	.ellipsis {
@@ -359,7 +359,7 @@ const handleTooltipClose = () => {
 
 	.separator {
 		font-size: var(--font-size-xl);
-		color: var(--prim-gray-670);
+		color: var(--color-foreground-base);
 	}
 }
 </style>
diff --git a/packages/frontend/editor-ui/src/Interface.ts b/packages/frontend/editor-ui/src/Interface.ts
index f57339b134..ceb7b1579e 100644
--- a/packages/frontend/editor-ui/src/Interface.ts
+++ b/packages/frontend/editor-ui/src/Interface.ts
@@ -58,6 +58,7 @@ import type {
 import type { BulkCommand, Undoable } from '@/models/history';
 
 import type { ProjectSharingData } from '@/types/projects.types';
+import type { PathItem } from '@n8n/design-system/components/N8nBreadcrumbs/Breadcrumbs.vue';
 
 export * from '@n8n/design-system/types';
 
@@ -243,6 +244,7 @@ export interface IWorkflowDataUpdate {
 
 export interface IWorkflowDataCreate extends IWorkflowDataUpdate {
 	projectId?: string;
+	parentFolderId?: string;
 }
 
 /**
@@ -333,6 +335,7 @@ export type WorkflowListItem = Omit<
 export type FolderShortInfo = {
 	id: string;
 	name: string;
+	parentFolder?: string;
 };
 
 export type BaseFolderItem = BaseResource & {
@@ -349,8 +352,21 @@ export interface FolderListItem extends BaseFolderItem {
 	resource: 'folder';
 }
 
+export type FolderPathItem = PathItem & { parentFolder?: string };
+
 export type WorkflowListResource = WorkflowListItem | FolderListItem;
 
+export type FolderCreateResponse = Omit<
+	FolderListItem,
+	'workflowCount' | 'tags' | 'sharedWithProjects' | 'homeProject'
+>;
+
+export type FolderTreeResponseItem = {
+	id: string;
+	name: string;
+	children: FolderTreeResponseItem[];
+};
+
 // Identical to cli.Interfaces.ts
 export interface IWorkflowShortResponse {
 	id: string;
diff --git a/packages/frontend/editor-ui/src/api/workflows.ts b/packages/frontend/editor-ui/src/api/workflows.ts
index 1302e1f1f5..7ac2e74d34 100644
--- a/packages/frontend/editor-ui/src/api/workflows.ts
+++ b/packages/frontend/editor-ui/src/api/workflows.ts
@@ -1,4 +1,6 @@
 import type {
+	FolderCreateResponse,
+	FolderTreeResponseItem,
 	IExecutionResponse,
 	IExecutionsCurrentSummaryExtended,
 	IRestApiContext,
@@ -84,3 +86,27 @@ export async function getExecutionData(context: IRestApiContext, executionId: st
 		`/executions/${executionId}`,
 	);
 }
+
+export async function createFolder(
+	context: IRestApiContext,
+	projectId: string,
+	name: string,
+	parentFolderId?: string,
+): Promise<FolderCreateResponse> {
+	return await makeRestApiRequest(context, 'POST', `/projects/${projectId}/folders`, {
+		name,
+		parentFolderId,
+	});
+}
+
+export async function getFolderPath(
+	context: IRestApiContext,
+	projectId: string,
+	folderId: string,
+): Promise<FolderTreeResponseItem[]> {
+	return await makeRestApiRequest(
+		context,
+		'GET',
+		`/projects/${projectId}/folders/${folderId}/tree`,
+	);
+}
diff --git a/packages/frontend/editor-ui/src/components/DuplicateWorkflowDialog.vue b/packages/frontend/editor-ui/src/components/DuplicateWorkflowDialog.vue
index 724d46eb0e..0f624311f0 100644
--- a/packages/frontend/editor-ui/src/components/DuplicateWorkflowDialog.vue
+++ b/packages/frontend/editor-ui/src/components/DuplicateWorkflowDialog.vue
@@ -72,6 +72,8 @@ const save = async (): Promise<void> => {
 		return;
 	}
 
+	const parentFolderId = router.currentRoute.value.params.folderId as string | undefined;
+
 	const currentWorkflowId = props.data.id;
 	isSaving.value = true;
 
@@ -102,6 +104,7 @@ const save = async (): Promise<void> => {
 			resetWebhookUrls: true,
 			openInNewWindow: true,
 			resetNodeIds: true,
+			parentFolderId,
 		});
 
 		if (saved) {
diff --git a/packages/frontend/editor-ui/src/components/Folders/FolderBreadcrumbs.vue b/packages/frontend/editor-ui/src/components/Folders/FolderBreadcrumbs.vue
new file mode 100644
index 0000000000..1c8e0fbe0a
--- /dev/null
+++ b/packages/frontend/editor-ui/src/components/Folders/FolderBreadcrumbs.vue
@@ -0,0 +1,89 @@
+<script setup lang="ts">
+import { useI18n } from '@/composables/useI18n';
+import type { FolderPathItem } from '@/Interface';
+import { useProjectsStore } from '@/stores/projects.store';
+import { ProjectTypes } from '@/types/projects.types';
+import type { UserAction } from '@n8n/design-system/types';
+import { type PathItem } from '@n8n/design-system/components/N8nBreadcrumbs/Breadcrumbs.vue';
+import { computed } from 'vue';
+
+type Props = {
+	actions: UserAction[];
+	breadcrumbs: {
+		visibleItems: FolderPathItem[];
+		hiddenItems: FolderPathItem[];
+	};
+};
+
+defineProps<Props>();
+
+const emit = defineEmits<{
+	itemSelected: [item: PathItem];
+	action: [action: string];
+}>();
+
+const i18n = useI18n();
+
+const projectsStore = useProjectsStore();
+
+const currentProject = computed(() => projectsStore.currentProject);
+
+const projectName = computed(() => {
+	if (currentProject.value?.type === ProjectTypes.Personal) {
+		return i18n.baseText('projects.menu.personal');
+	}
+	return currentProject.value?.name;
+});
+
+const onItemSelect = (item: PathItem) => {
+	emit('itemSelected', item);
+};
+
+const onAction = (action: string) => {
+	emit('action', action);
+};
+</script>
+<template>
+	<div :class="$style.container">
+		<n8n-breadcrumbs
+			v-if="breadcrumbs.visibleItems"
+			:items="breadcrumbs.visibleItems"
+			:highlight-last-item="false"
+			:path-truncated="breadcrumbs.visibleItems[0].parentFolder"
+			:hidden-items="breadcrumbs.hiddenItems"
+			data-test-id="folder-card-breadcrumbs"
+			@item-selected="onItemSelect"
+		>
+			<template v-if="currentProject" #prepend>
+				<div :class="$style['home-project']">
+					<n8n-link :to="`/projects/${currentProject.id}`">
+						<N8nText size="large" color="text-base">{{ projectName }}</N8nText>
+					</n8n-link>
+				</div>
+			</template>
+		</n8n-breadcrumbs>
+		<n8n-action-toggle
+			v-if="breadcrumbs.visibleItems"
+			:actions="actions"
+			theme="dark"
+			data-test-id="folder-breadcrumbs-actions"
+			@action="onAction"
+		/>
+	</div>
+</template>
+
+<style module lang="scss">
+.container {
+	display: flex;
+	align-items: center;
+}
+
+.home-project {
+	display: flex;
+	align-items: center;
+
+	&:hover * {
+		color: var(--color-text-dark);
+	}
+}
+</style>
diff --git a/packages/frontend/editor-ui/src/components/Folders/FolderCard.test.ts b/packages/frontend/editor-ui/src/components/Folders/FolderCard.test.ts
index b8aa155d2c..bf19b9a2fc 100644
--- a/packages/frontend/editor-ui/src/components/Folders/FolderCard.test.ts
+++ b/packages/frontend/editor-ui/src/components/Folders/FolderCard.test.ts
@@ -3,7 +3,7 @@ import userEvent from '@testing-library/user-event';
 import FolderCard from './FolderCard.vue';
 import { createPinia, setActivePinia } from 'pinia';
 import type { FolderResource } from '../layouts/ResourcesListLayout.vue';
-import type { UserAction } from '@/Interface';
+import type { FolderPathItem, UserAction } from '@/Interface';
 
 vi.mock('vue-router', () => {
 	const push = vi.fn();
@@ -61,6 +61,11 @@ const PARENT_FOLDER: FolderResource = {
 	},
 } as const satisfies FolderResource;
 
+const DEFAULT_BREADCRUMBS: { visibleItems: FolderPathItem[]; hiddenItems: FolderPathItem[] } = {
+	visibleItems: [{ id: '1', label: 'Parent 2' }],
+	hiddenItems: [{ id: '2', label: 'Parent 1', parentFolder: '1' }],
+};
+
 const renderComponent = createComponentRenderer(FolderCard, {
 	props: {
 		data: DEFAULT_FOLDER,
@@ -68,6 +73,7 @@ const renderComponent = createComponentRenderer(FolderCard, {
 			{ label: 'Open', value: 'open', disabled: false },
 			{ label: 'Delete', value: 'delete', disabled: false },
 		] as const satisfies UserAction[],
+		breadcrumbs: DEFAULT_BREADCRUMBS,
 	},
 	global: {
 		stubs: {
@@ -145,6 +151,10 @@ describe('FolderCard', () => {
 					},
 					parentFolder: PARENT_FOLDER,
 				},
+				breadcrumbs: {
+					visibleItems: [{ id: PARENT_FOLDER.id, label: PARENT_FOLDER.name, parentFolder: '1' }],
+					hiddenItems: [],
+				},
 			},
 		});
 		expect(getByTestId('folder-card-icon')).toBeInTheDocument();
diff --git a/packages/frontend/editor-ui/src/components/Folders/FolderCard.vue b/packages/frontend/editor-ui/src/components/Folders/FolderCard.vue
index 02d8a443d3..16f3ed3e5c 100644
--- a/packages/frontend/editor-ui/src/components/Folders/FolderCard.vue
+++ b/packages/frontend/editor-ui/src/components/Folders/FolderCard.vue
@@ -7,11 +7,15 @@ import { useI18n } from '@/composables/useI18n';
 import { useRoute, useRouter } from 'vue-router';
 import { VIEWS } from '@/constants';
 import type { PathItem } from '@n8n/design-system/components/N8nBreadcrumbs/Breadcrumbs.vue';
-import type { UserAction } from '@/Interface';
+import type { FolderPathItem, UserAction } from '@/Interface';
 
 type Props = {
 	data: FolderResource;
 	actions: UserAction[];
+	breadcrumbs: {
+		visibleItems: FolderPathItem[];
+		hiddenItems: FolderPathItem[];
+	};
 };
 
 const props = withDefaults(defineProps<Props>(), {
@@ -27,18 +31,6 @@ const emit = defineEmits<{
 	folderOpened: [{ folder: FolderResource }];
 }>();
 
-const breadCrumbsItems = computed(() => {
-	if (props.data.parentFolder) {
-		return [
-			{
-				id: props.data.parentFolder.id,
-				label: props.data.parentFolder.name,
-			},
-		];
-	}
-	return [];
-});
-
 const projectIcon = computed<ProjectIcon>(() => {
 	const defaultIcon: ProjectIcon = { type: 'icon', value: 'layer-group' };
 	if (props.data.homeProject?.type === ProjectTypes.Personal) {
@@ -109,7 +101,7 @@ const onBreadcrumbsItemClick = async (item: PathItem) => {
 						<n8n-text
 							size="small"
 							color="text-light"
-							:class="$style['info-cell']"
+							:class="[$style['info-cell'], $style['info-cell--workflow-count']]"
 							data-test-id="folder-card-workflow-count"
 						>
 							{{ data.workflowCount }} {{ i18n.baseText('generic.workflows') }}
@@ -117,7 +109,7 @@ const onBreadcrumbsItemClick = async (item: PathItem) => {
 						<n8n-text
 							size="small"
 							color="text-light"
-							:class="$style['info-cell']"
+							:class="[$style['info-cell'], $style['info-cell--updated']]"
 							data-test-id="folder-card-last-updated"
 						>
 							{{ i18n.baseText('workerList.item.lastUpdated') }}
@@ -126,7 +118,7 @@ const onBreadcrumbsItemClick = async (item: PathItem) => {
 						<n8n-text
 							size="small"
 							color="text-light"
-							:class="$style['info-cell']"
+							:class="[$style['info-cell'], $style['info-cell--created']]"
 							data-test-id="folder-card-created"
 						>
 							{{ i18n.baseText('workflows.item.created') }}
@@ -136,26 +128,29 @@ const onBreadcrumbsItemClick = async (item: PathItem) => {
 				</template>
 				<template #append>
 					<div :class="$style['card-actions']" @click.prevent>
-						<n8n-breadcrumbs
-							:items="breadCrumbsItems"
-							:path-truncated="true"
-							:show-border="true"
-							:highlight-last-item="false"
-							theme="small"
-							data-test-id="folder-card-breadcrumbs"
-							@item-selected="onBreadcrumbsItemClick"
-						>
-							<template v-if="data.homeProject" #prepend>
-								<div :class="$style['home-project']">
-									<n8n-link :to="`/projects/${data.homeProject.id}`">
-										<ProjectIcon :icon="projectIcon" :border-less="true" size="mini" />
-										<n8n-text size="small" :compact="true" :bold="true" color="text-base">
-											{{ projectName }}
-										</n8n-text>
-									</n8n-link>
-								</div>
-							</template>
-						</n8n-breadcrumbs>
+						<div :class="$style.breadcrumbs">
+							<n8n-breadcrumbs
+								:items="breadcrumbs.visibleItems"
+								:hidden-items="breadcrumbs.hiddenItems"
+								:path-truncated="breadcrumbs.visibleItems[0]?.parentFolder"
+								:show-border="true"
+								:highlight-last-item="false"
+								theme="small"
+								data-test-id="folder-card-breadcrumbs"
+								@item-selected="onBreadcrumbsItemClick"
+							>
+								<template v-if="data.homeProject" #prepend>
+									<div :class="$style['home-project']">
+										<n8n-link :to="`/projects/${data.homeProject.id}`">
+											<ProjectIcon :icon="projectIcon" :border-less="true" size="mini" />
+											<n8n-text size="small" :compact="true" :bold="true" color="text-base">
+												{{ projectName }}
+											</n8n-text>
+										</n8n-link>
+									</div>
+								</template>
+							</n8n-breadcrumbs>
+						</div>
 						<n8n-action-toggle
 							v-if="actions.length"
 							:actions="actions"
@@ -214,4 +209,23 @@ const onBreadcrumbsItemClick = async (item: PathItem) => {
 	gap: var(--spacing-3xs);
 	color: var(--color-text-dark);
 }
+
+@include mixins.breakpoint('sm-and-down') {
+	.card {
+		flex-wrap: wrap;
+
+		:global(.n8n-card-append) {
+			width: 100%;
+			margin-top: var(--spacing-3xs);
+			padding-left: 40px;
+		}
+		.card-actions {
+			width: 100%;
+			justify-content: space-between;
+		}
+	}
+	.info-cell--created {
+		display: none;
+	}
+}
 </style>
diff --git a/packages/frontend/editor-ui/src/components/Projects/ProjectHeader.test.ts b/packages/frontend/editor-ui/src/components/Projects/ProjectHeader.test.ts
index 09b652dab9..ae1ddcb267 100644
--- a/packages/frontend/editor-ui/src/components/Projects/ProjectHeader.test.ts
+++ b/packages/frontend/editor-ui/src/components/Projects/ProjectHeader.test.ts
@@ -11,6 +11,7 @@ import { ProjectTypes } from '@/types/projects.types';
 import { VIEWS } from '@/constants';
 import userEvent from '@testing-library/user-event';
 import { waitFor, within } from '@testing-library/vue';
+import { useSettingsStore } from '@/stores/settings.store';
 
 const mockPush = vi.fn();
 vi.mock('vue-router', async () => {
@@ -43,14 +44,17 @@ const renderComponent = createComponentRenderer(ProjectHeader, {
 
 let route: ReturnType<typeof router.useRoute>;
 let projectsStore: ReturnType<typeof mockedStore<typeof useProjectsStore>>;
+let settingsStore: ReturnType<typeof mockedStore<typeof useSettingsStore>>;
 
 describe('ProjectHeader', () => {
 	beforeEach(() => {
 		createTestingPinia();
 		route = router.useRoute();
 		projectsStore = mockedStore(useProjectsStore);
+		settingsStore = mockedStore(useSettingsStore);
 
 		projectsStore.teamProjectsLimit = -1;
+		settingsStore.settings.folders = { enabled: false };
 	});
 
 	afterEach(() => {
diff --git a/packages/frontend/editor-ui/src/components/Projects/ProjectHeader.vue b/packages/frontend/editor-ui/src/components/Projects/ProjectHeader.vue
index 98511e3b8b..de581b1be0 100644
--- a/packages/frontend/editor-ui/src/components/Projects/ProjectHeader.vue
+++ b/packages/frontend/editor-ui/src/components/Projects/ProjectHeader.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import { computed } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
+import type { UserAction } from '@n8n/design-system';
 import { N8nButton, N8nTooltip } from '@n8n/design-system';
 import { useI18n } from '@/composables/useI18n';
 import { type ProjectIcon, ProjectTypes } from '@/types/projects.types';
@@ -10,12 +11,18 @@ import { getResourcePermissions } from '@/permissions';
 import { VIEWS } from '@/constants';
 import { useSourceControlStore } from '@/stores/sourceControl.store';
 import ProjectCreateResource from '@/components/Projects/ProjectCreateResource.vue';
+import { useSettingsStore } from '@/stores/settings.store';
 
 const route = useRoute();
 const router = useRouter();
 const i18n = useI18n();
 const projectsStore = useProjectsStore();
 const sourceControlStore = useSourceControlStore();
+const settingsStore = useSettingsStore();
+
+const emit = defineEmits<{
+	createFolder: [];
+}>();
 
 const headerIcon = computed((): ProjectIcon => {
 	if (projectsStore.currentProject?.type === ProjectTypes.Personal) {
@@ -49,31 +56,43 @@ const showSettings = computed(
 );
 
 const homeProject = computed(() => projectsStore.currentProject ?? projectsStore.personalProject);
+const isFoldersFeatureEnabled = computed(() => settingsStore.settings.folders.enabled);
 
 const ACTION_TYPES = {
 	WORKFLOW: 'workflow',
 	CREDENTIAL: 'credential',
+	FOLDER: 'folder',
 } as const;
 type ActionTypes = (typeof ACTION_TYPES)[keyof typeof ACTION_TYPES];
 
 const createWorkflowButton = computed(() => ({
 	value: ACTION_TYPES.WORKFLOW,
-	label: 'Create Workflow',
+	label: i18n.baseText('projects.header.create.workflow'),
 	icon: sourceControlStore.preferences.branchReadOnly ? 'lock' : undefined,
 	size: 'mini' as const,
 	disabled:
 		sourceControlStore.preferences.branchReadOnly ||
 		!getResourcePermissions(homeProject.value?.scopes).workflow.create,
 }));
-const menu = computed(() => [
-	{
-		value: ACTION_TYPES.CREDENTIAL,
-		label: 'Create credential',
-		disabled:
-			sourceControlStore.preferences.branchReadOnly ||
-			!getResourcePermissions(homeProject.value?.scopes).credential.create,
-	},
-]);
+const menu = computed(() => {
+	const items: UserAction[] = [
+		{
+			value: ACTION_TYPES.CREDENTIAL,
+			label: i18n.baseText('projects.header.create.credential'),
+			disabled:
+				sourceControlStore.preferences.branchReadOnly ||
+				!getResourcePermissions(homeProject.value?.scopes).credential.create,
+		},
+	];
+	if (isFoldersFeatureEnabled.value) {
+		items.push({
+			value: ACTION_TYPES.FOLDER,
+			label: i18n.baseText('projects.header.create.folder'),
+			disabled: false,
+		});
+	}
+	return items;
+});
 
 const actions: Record<ActionTypes, (projectId: string) => void> = {
 	[ACTION_TYPES.WORKFLOW]: (projectId: string) => {
@@ -81,6 +100,7 @@ const actions: Record<ActionTypes, (projectId: string) => void> = {
 			name: VIEWS.NEW_WORKFLOW,
 			query: {
 				projectId,
+				parentFolderId: route.params.folderId as string,
 			},
 		});
 	},
@@ -93,6 +113,9 @@ const actions: Record<ActionTypes, (projectId: string) => void> = {
 			},
 		});
 	},
+	[ACTION_TYPES.FOLDER]: async () => {
+		emit('createFolder');
+	},
 } as const;
 
 const onSelect = (action: string) => {
diff --git a/packages/frontend/editor-ui/src/components/WorkflowCard.vue b/packages/frontend/editor-ui/src/components/WorkflowCard.vue
index ed5721ae36..4d74d5f204 100644
--- a/packages/frontend/editor-ui/src/components/WorkflowCard.vue
+++ b/packages/frontend/editor-ui/src/components/WorkflowCard.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { computed } from 'vue';
-import type { IUser } from '@/Interface';
+import type { FolderPathItem, IUser } from '@/Interface';
 import {
 	DUPLICATE_MODAL_KEY,
 	MODAL_CONFIRM,
@@ -39,6 +39,10 @@ const WORKFLOW_LIST_ITEM_ACTIONS = {
 const props = withDefaults(
 	defineProps<{
 		data: WorkflowResource;
+		breadcrumbs: {
+			visibleItems: FolderPathItem[];
+			hiddenItems: FolderPathItem[];
+		};
 		readOnly?: boolean;
 		workflowListEventBus?: EventBus;
 	}>(),
@@ -115,18 +119,6 @@ const formattedCreatedAtDate = computed(() => {
 	);
 });
 
-const breadCrumbsItems = computed(() => {
-	if (props.data.parentFolder) {
-		return [
-			{
-				id: props.data.parentFolder.id,
-				label: props.data.parentFolder.name,
-			},
-		];
-	}
-	return [];
-});
-
 const projectIcon = computed<CardProjectIcon>(() => {
 	const defaultIcon: CardProjectIcon = { type: 'icon', value: 'layer-group' };
 	if (props.data.homeProject?.type === ProjectTypes.Personal) {
@@ -306,26 +298,28 @@ const emitWorkflowActiveToggle = (value: { id: string; active: boolean }) => {
 					:resource-type-label="resourceTypeLabel"
 					:personal-project="projectsStore.personalProject"
 				/>
-				<n8n-breadcrumbs
-					v-else
-					:items="breadCrumbsItems"
-					:path-truncated="true"
-					:show-border="true"
-					:highlight-last-item="false"
-					theme="small"
-					data-test-id="folder-card-breadcrumbs"
-				>
-					<template v-if="data.homeProject" #prepend>
-						<div :class="$style['home-project']">
-							<n8n-link :to="`/projects/${data.homeProject.id}`">
-								<ProjectIcon :icon="projectIcon" :border-less="true" size="mini" />
-								<n8n-text size="small" :compact="true" :bold="true" color="text-base">{{
-									projectName
-								}}</n8n-text>
-							</n8n-link>
-						</div>
-					</template>
-				</n8n-breadcrumbs>
+				<div v-else :class="$style.breadcrumbs">
+					<n8n-breadcrumbs
+						:items="breadcrumbs.visibleItems"
+						:hidden-items="breadcrumbs.hiddenItems"
+						:path-truncated="breadcrumbs.visibleItems[0]?.parentFolder"
+						:show-border="true"
+						:highlight-last-item="false"
+						theme="small"
+						data-test-id="folder-card-breadcrumbs"
+					>
+						<template v-if="data.homeProject" #prepend>
+							<div :class="$style['home-project']">
+								<n8n-link :to="`/projects/${data.homeProject.id}`">
+									<ProjectIcon :icon="projectIcon" :border-less="true" size="mini" />
+									<n8n-text size="small" :compact="true" :bold="true" color="text-base">{{
+										projectName
+									}}</n8n-text>
+								</n8n-link>
+							</div>
+						</template>
+					</n8n-breadcrumbs>
+				</div>
 				<WorkflowActivator
 					class="mr-s"
 					:workflow-active="data.active"
@@ -405,8 +399,15 @@ const emitWorkflowActiveToggle = (value: { id: string; active: boolean }) => {
 		padding: 0 var(--spacing-s) var(--spacing-s);
 	}
 
-	.cardBadge {
+	.cardBadge,
+	.breadcrumbs {
 		margin-right: auto;
 	}
 }
+
+@include mixins.breakpoint('xs-only') {
+	.breadcrumbs > div {
+		flex-direction: column;
+	}
+}
 </style>
diff --git a/packages/frontend/editor-ui/src/components/layouts/ResourcesListLayout.vue b/packages/frontend/editor-ui/src/components/layouts/ResourcesListLayout.vue
index 8a47ebfdd8..b18e92f80d 100644
--- a/packages/frontend/editor-ui/src/components/layouts/ResourcesListLayout.vue
+++ b/packages/frontend/editor-ui/src/components/layouts/ResourcesListLayout.vue
@@ -555,22 +555,24 @@ const loadPaginationFromQueryString = async () => {
 									/>
 								</n8n-select>
 							</div>
-							<ResourceFiltersDropdown
-								v-if="showFiltersDropdown"
-								:keys="filterKeys"
-								:reset="resetFilters"
-								:model-value="filtersModel"
-								:shareable="shareable"
-								:just-icon="true"
-								@update:model-value="onUpdateFilters"
-								@update:filters-length="onUpdateFiltersLength"
-							>
-								<template #default="resourceFiltersSlotProps">
-									<slot name="filters" v-bind="resourceFiltersSlotProps" />
-								</template>
-							</ResourceFiltersDropdown>
+							<div :class="$style['sort-and-filter']">
+								<ResourceFiltersDropdown
+									v-if="showFiltersDropdown"
+									:keys="filterKeys"
+									:reset="resetFilters"
+									:model-value="filtersModel"
+									:shareable="shareable"
+									:just-icon="true"
+									@update:model-value="onUpdateFilters"
+									@update:filters-length="onUpdateFiltersLength"
+								>
+									<template #default="resourceFiltersSlotProps">
+										<slot name="filters" v-bind="resourceFiltersSlotProps" />
+									</template>
+								</ResourceFiltersDropdown>
+								<slot name="add-button"></slot>
+							</div>
 						</div>
-						<slot name="add-button"></slot>
 					</div>
 
 					<slot name="callout"></slot>
@@ -680,19 +682,20 @@ const loadPaginationFromQueryString = async () => {
 	justify-content: end;
 	width: 100%;
 
-	@include mixins.breakpoint('xs-only') {
-		grid-template-columns: 1fr auto;
-		grid-auto-flow: row;
+	.sort-and-filter {
+		display: flex;
+		gap: var(--spacing-2xs);
+		align-items: center;
+	}
 
-		> *:last-child {
-			grid-column: auto;
-		}
+	@include mixins.breakpoint('xs-only') {
+		grid-auto-flow: row;
+		grid-auto-columns: unset;
+		grid-template-columns: 1fr;
 	}
 }
 
 .search {
-	// max-width: 240px;
-
 	@include mixins.breakpoint('sm-and-down') {
 		max-width: 100%;
 	}
diff --git a/packages/frontend/editor-ui/src/composables/useWorkflowHelpers.ts b/packages/frontend/editor-ui/src/composables/useWorkflowHelpers.ts
index c2c46ab0b5..b915af24dd 100644
--- a/packages/frontend/editor-ui/src/composables/useWorkflowHelpers.ts
+++ b/packages/frontend/editor-ui/src/composables/useWorkflowHelpers.ts
@@ -34,6 +34,7 @@ import type {
 	ITag,
 	IUpdateInformation,
 	IWorkflowData,
+	IWorkflowDataCreate,
 	IWorkflowDataUpdate,
 	IWorkflowDb,
 	TargetItem,
@@ -811,9 +812,10 @@ export function useWorkflowHelpers(options: { router: ReturnType<typeof useRoute
 
 		const isLoading = useCanvasStore().isLoading;
 		const currentWorkflow = id || (router.currentRoute.value.params.name as string);
+		const parentFolderId = router.currentRoute.value.query.parentFolderId as string;
 
 		if (!currentWorkflow || ['new', PLACEHOLDER_EMPTY_WORKFLOW_ID].includes(currentWorkflow)) {
-			return await saveAsNewWorkflow({ name, tags }, redirect);
+			return await saveAsNewWorkflow({ name, tags, parentFolderId }, redirect);
 		}
 
 		// Workflow exists already so update it
@@ -914,6 +916,7 @@ export function useWorkflowHelpers(options: { router: ReturnType<typeof useRoute
 			resetWebhookUrls,
 			resetNodeIds,
 			openInNewWindow,
+			parentFolderId,
 			data,
 		}: {
 			name?: string;
@@ -921,14 +924,15 @@ export function useWorkflowHelpers(options: { router: ReturnType<typeof useRoute
 			resetWebhookUrls?: boolean;
 			openInNewWindow?: boolean;
 			resetNodeIds?: boolean;
-			data?: IWorkflowDataUpdate;
+			parentFolderId?: string;
+			data?: IWorkflowDataCreate;
 		} = {},
 		redirect = true,
 	): Promise<boolean> {
 		try {
 			uiStore.addActiveAction('workflowSaving');
 
-			const workflowDataRequest: IWorkflowDataUpdate = data || (await getWorkflowDataToSave());
+			const workflowDataRequest: IWorkflowDataCreate = data || (await getWorkflowDataToSave());
 			const changedNodes = {} as IDataObject;
 
 			if (resetNodeIds) {
@@ -957,6 +961,10 @@ export function useWorkflowHelpers(options: { router: ReturnType<typeof useRoute
 			if (tags) {
 				workflowDataRequest.tags = tags;
 			}
+
+			if (parentFolderId) {
+				workflowDataRequest.parentFolderId = parentFolderId;
+			}
 			const workflowData = await workflowsStore.createNewWorkflow(workflowDataRequest);
 
 			workflowsStore.addWorkflow(workflowData);
diff --git a/packages/frontend/editor-ui/src/constants.ts b/packages/frontend/editor-ui/src/constants.ts
index 6bb69b33fd..48dac521c0 100644
--- a/packages/frontend/editor-ui/src/constants.ts
+++ b/packages/frontend/editor-ui/src/constants.ts
@@ -33,7 +33,7 @@ export const MIN_WORKFLOW_NAME_LENGTH = 1;
 export const MAX_WORKFLOW_NAME_LENGTH = 128;
 export const DUPLICATE_POSTFFIX = ' copy';
 export const NODE_OUTPUT_DEFAULT_KEY = '_NODE_OUTPUT_DEFAULT_KEY_';
-export const DEFAULT_WORKFLOW_PAGE_SIZE = 10;
+export const DEFAULT_WORKFLOW_PAGE_SIZE = 50;
 
 // tags
 export const MAX_TAG_NAME_LENGTH = 24;
@@ -667,6 +667,7 @@ export const enum STORES {
 	PROJECTS = 'projects',
 	API_KEYS = 'apiKeys',
 	TEST_DEFINITION = 'testDefinition',
+	FOLDERS = 'folders',
 }
 
 export const enum SignInType {
diff --git a/packages/frontend/editor-ui/src/plugins/i18n/locales/en.json b/packages/frontend/editor-ui/src/plugins/i18n/locales/en.json
index eb7dda1790..bdcf6c2419 100644
--- a/packages/frontend/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/frontend/editor-ui/src/plugins/i18n/locales/en.json
@@ -34,6 +34,7 @@
 	"generic.cancel": "Cancel",
 	"generic.close": "Close",
 	"generic.confirm": "Confirm",
+	"generic.create": "Create",
 	"generic.deleteWorkflowError": "Problem deleting workflow",
 	"generic.filtersApplied": "Filters are currently applied.",
 	"generic.field": "field",
@@ -885,6 +886,12 @@
 	"forms.resourceFiltersDropdown.owner": "Owner",
 	"forms.resourceFiltersDropdown.owner.placeholder": "Filter by owner",
 	"forms.resourceFiltersDropdown.reset": "Reset all",
+	"folders.add": "Add folder",
+	"folders.add.here.message": "Create a new folder here",
+	"folders.add.to.parent.message": "Create folder in \"{parent}\"",
+	"folders.add.success.title": "Folder created",
+	"folders.add.success.message": "<a href=\"{link}\">Open {name}</a> now",
+	"folders.add.invalidName.message": "Please provide a valid folder name",
 	"generic.oauth1Api": "OAuth1 API",
 	"generic.oauth2Api": "OAuth2 API",
 	"genericHelpers.loading": "Loading",
@@ -2596,6 +2603,9 @@
 	"settings.mfa.updateConfiguration": "MFA configuration updated",
 	"settings.mfa.invalidAuthenticatorCode": "Invalid authenticator code",
 	"projects.header.subtitle": "All the workflows, credentials and executions you have access to",
+	"projects.header.create.workflow": "Create Workflow",
+	"projects.header.create.credential": "Create Credential",
+	"projects.header.create.folder": "Create Folder",
 	"projects.create": "Create",
 	"projects.create.personal": "Create in personal",
 	"projects.create.team": "Create in project",
diff --git a/packages/frontend/editor-ui/src/plugins/icons/index.ts b/packages/frontend/editor-ui/src/plugins/icons/index.ts
index 2fc86a0fa1..1b3c97c95e 100644
--- a/packages/frontend/editor-ui/src/plugins/icons/index.ts
+++ b/packages/frontend/editor-ui/src/plugins/icons/index.ts
@@ -73,6 +73,7 @@ import {
 	faFlask,
 	faFolder,
 	faFolderOpen,
+	faFolderPlus,
 	faFont,
 	faGlobeAmericas,
 	faGift,
@@ -255,6 +256,7 @@ export const FontAwesomePlugin: Plugin = {
 		addIcon(faFlask);
 		addIcon(faFolder);
 		addIcon(faFolderOpen);
+		addIcon(faFolderPlus);
 		addIcon(faFont);
 		addIcon(faGift);
 		addIcon(faGlobe);
diff --git a/packages/frontend/editor-ui/src/stores/folders.store.ts b/packages/frontend/editor-ui/src/stores/folders.store.ts
new file mode 100644
index 0000000000..3bce50fb88
--- /dev/null
+++ b/packages/frontend/editor-ui/src/stores/folders.store.ts
@@ -0,0 +1,102 @@
+import { defineStore } from 'pinia';
+import { STORES } from '@/constants';
+import type { FolderCreateResponse, FolderShortInfo, FolderTreeResponseItem } from '@/Interface';
+import * as workflowsApi from '@/api/workflows';
+import { useRootStore } from './root.store';
+import { ref } from 'vue';
+
+export const useFoldersStore = defineStore(STORES.FOLDERS, () => {
+	const rootStore = useRootStore();
+
+	const totalWorkflowCount = ref<number>(0);
+
+	/**
+	 * Cache visited folders so we can build breadcrumbs paths without fetching them from the server
+	 */
+	const breadcrumbsCache = ref<Record<string, FolderShortInfo>>({});
+
+	const cacheFolders = (folders: FolderShortInfo[]) => {
+		folders.forEach((folder) => {
+			if (!breadcrumbsCache.value[folder.id]) {
+				breadcrumbsCache.value[folder.id] = {
+					id: folder.id,
+					name: folder.name,
+					parentFolder: folder.parentFolder,
+				};
+			}
+		});
+	};
+
+	const getCachedFolder = (folderId: string) => {
+		return breadcrumbsCache.value[folderId];
+	};
+
+	async function createFolder(
+		name: string,
+		projectId: string,
+		parentFolderId?: string,
+	): Promise<FolderCreateResponse> {
+		return await workflowsApi.createFolder(
+			rootStore.restApiContext,
+			projectId,
+			name,
+			parentFolderId,
+		);
+	}
+
+	async function getFolderPath(
+		projectId: string,
+		folderId: string,
+	): Promise<FolderTreeResponseItem[]> {
+		const tree = await workflowsApi.getFolderPath(rootStore.restApiContext, projectId, folderId);
+		const forCache = extractFoldersForCache(tree);
+		cacheFolders(forCache);
+
+		return tree;
+	}
+
+	function extractFoldersForCache(
+		items: FolderTreeResponseItem[],
+		parentFolderId?: string,
+	): FolderShortInfo[] {
+		let result: FolderShortInfo[] = [];
+
+		items.forEach((item) => {
+			// Add current item to result
+			result.push({
+				id: item.id,
+				name: item.name,
+				parentFolder: parentFolderId,
+			});
+
+			// Process children recursively
+			if (item.children && item.children.length > 0) {
+				const childFolders = extractFoldersForCache(item.children, item.id);
+				result = [...result, ...childFolders];
+			}
+		});
+
+		return result;
+	}
+
+	async function fetchTotalWorkflowsAndFoldersCount(projectId?: string): Promise<number> {
+		const { count } = await workflowsApi.getWorkflowsAndFolders(
+			rootStore.restApiContext,
+			{ projectId },
+			{ skip: 0, take: 1 },
+			true,
+		);
+		totalWorkflowCount.value = count;
+		return count;
+	}
+
+	return {
+		fetchTotalWorkflowsAndFoldersCount,
+		breadcrumbsCache,
+		cacheFolders,
+		getCachedFolder,
+		createFolder,
+		getFolderPath,
+		totalWorkflowCount,
+	};
+});
diff --git a/packages/frontend/editor-ui/src/stores/workflows.store.ts b/packages/frontend/editor-ui/src/stores/workflows.store.ts
index 701914081f..eb6fa21f4e 100644
--- a/packages/frontend/editor-ui/src/stores/workflows.store.ts
+++ b/packages/frontend/editor-ui/src/stores/workflows.store.ts
@@ -515,7 +515,6 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 			Object.keys(options).length ? options : undefined,
 			includeFolders ? includeFolders : undefined,
 		);
-
 		totalWorkflowCount.value = count;
 		// Also set fetched workflows to store
 		// When fetching workflows from overview page, they don't have resource property
@@ -552,7 +551,11 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 		return workflowData;
 	}
 
-	async function getNewWorkflowData(name?: string, projectId?: string): Promise<INewWorkflowData> {
+	async function getNewWorkflowData(
+		name?: string,
+		projectId?: string,
+		parentFolderId?: string,
+	): Promise<INewWorkflowData> {
 		let workflowData = {
 			name: '',
 			settings: { ...defaults.settings },
@@ -561,6 +564,7 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 			const data: IDataObject = {
 				name,
 				projectId,
+				parentFolderId,
 			};
 
 			workflowData = await workflowsApi.getNewWorkflow(
diff --git a/packages/frontend/editor-ui/src/views/NodeView.vue b/packages/frontend/editor-ui/src/views/NodeView.vue
index 6b508fb2da..3c050cfea5 100644
--- a/packages/frontend/editor-ui/src/views/NodeView.vue
+++ b/packages/frontend/editor-ui/src/views/NodeView.vue
@@ -385,7 +385,11 @@ async function initializeRoute(force = false) {
 async function initializeWorkspaceForNewWorkflow() {
 	resetWorkspace();
 
-	await workflowsStore.getNewWorkflowData(undefined, projectsStore.currentProjectId);
+	await workflowsStore.getNewWorkflowData(
+		undefined,
+		projectsStore.currentProjectId,
+		route.query.parentFolderId as string | undefined,
+	);
 	workflowsStore.makeNewWorkflowShareable();
 
 	uiStore.nodeViewInitialized = true;
@@ -483,9 +487,10 @@ async function openTemplateFromWorkflowJSON(workflow: WorkflowDataWithTemplateId
 
 	isBlankRedirect.value = true;
 	const templateId = workflow.meta.templateId;
+	const parentFolderId = route.query.parentFolderId as string | undefined;
 	await router.replace({
 		name: VIEWS.NEW_WORKFLOW,
-		query: { templateId },
+		query: { templateId, parentFolderId },
 	});
 
 	await importTemplate({ id: templateId, name: workflow.name, workflow });
diff --git a/packages/frontend/editor-ui/src/views/ProjectSettings.test.ts b/packages/frontend/editor-ui/src/views/ProjectSettings.test.ts
index 1890c0bf59..2015b45eee 100644
--- a/packages/frontend/editor-ui/src/views/ProjectSettings.test.ts
+++ b/packages/frontend/editor-ui/src/views/ProjectSettings.test.ts
@@ -61,6 +61,9 @@ describe('ProjectSettings', () => {
 					},
 				},
 			},
+			folders: {
+				enabled: false,
+			},
 		} as FrontendSettings);
 		projectsStore.setCurrentProject({
 			id: '123',
diff --git a/packages/frontend/editor-ui/src/views/WorkflowsView.test.ts b/packages/frontend/editor-ui/src/views/WorkflowsView.test.ts
index e803cdbc3b..2bbed8fe01 100644
--- a/packages/frontend/editor-ui/src/views/WorkflowsView.test.ts
+++ b/packages/frontend/editor-ui/src/views/WorkflowsView.test.ts
@@ -14,6 +14,7 @@ import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useTagsStore } from '@/stores/tags.store';
 import { createRouter, createWebHistory } from 'vue-router';
 import * as usersApi from '@/api/users';
+import { useFoldersStore } from '@/stores/folders.store';
 
 vi.mock('@/api/projects.api');
 vi.mock('@/api/users');
@@ -40,6 +41,8 @@ const router = createRouter({
 });
 
 let pinia: ReturnType<typeof createTestingPinia>;
+let foldersStore: ReturnType<typeof mockedStore<typeof useFoldersStore>>;
+let workflowsStore: ReturnType<typeof mockedStore<typeof useWorkflowsStore>>;
 
 const renderComponent = createComponentRenderer(WorkflowsView, {
 	global: {
@@ -56,13 +59,18 @@ describe('WorkflowsView', () => {
 		await router.push('/');
 		await router.isReady();
 		pinia = createTestingPinia({ initialState });
+		foldersStore = mockedStore(useFoldersStore);
+		workflowsStore = mockedStore(useWorkflowsStore);
+
+		workflowsStore.fetchWorkflowsPage.mockResolvedValue([]);
+		workflowsStore.fetchActiveWorkflows.mockResolvedValue([]);
+
+		foldersStore.totalWorkflowCount = 0;
+		foldersStore.fetchTotalWorkflowsAndFoldersCount.mockResolvedValue(0);
 	});
 
 	describe('should show empty state', () => {
 		it('for non setup user', async () => {
-			const workflowsStore = mockedStore(useWorkflowsStore);
-			workflowsStore.fetchWorkflowsPage.mockResolvedValue([]);
-			workflowsStore.fetchActiveWorkflows.mockResolvedValue([]);
 			const { getByText } = renderComponent({ pinia });
 			await waitAllPromises();
 			expect(getByText('👋 Welcome!')).toBeVisible();
@@ -72,10 +80,6 @@ describe('WorkflowsView', () => {
 			const userStore = mockedStore(useUsersStore);
 			userStore.currentUser = { firstName: 'John' } as IUser;
 
-			const workflowsStore = mockedStore(useWorkflowsStore);
-			workflowsStore.fetchWorkflowsPage.mockResolvedValue([]);
-			workflowsStore.fetchActiveWorkflows.mockResolvedValue([]);
-
 			const { getByText } = renderComponent({ pinia });
 			await waitAllPromises();
 
@@ -83,18 +87,10 @@ describe('WorkflowsView', () => {
 		});
 
 		describe('when onboardingExperiment -> False', () => {
-			beforeEach(() => {
-				pinia = createTestingPinia({ initialState });
-			});
-
 			it('for readOnlyEnvironment', async () => {
 				const sourceControl = mockedStore(useSourceControlStore);
 				sourceControl.preferences.branchReadOnly = true;
 
-				const workflowsStore = mockedStore(useWorkflowsStore);
-				workflowsStore.fetchWorkflowsPage.mockResolvedValue([]);
-				workflowsStore.fetchActiveWorkflows.mockResolvedValue([]);
-
 				const { getByText } = renderComponent({ pinia });
 				await waitAllPromises();
 
@@ -103,10 +99,6 @@ describe('WorkflowsView', () => {
 			});
 
 			it('for noPermission', async () => {
-				const workflowsStore = mockedStore(useWorkflowsStore);
-				workflowsStore.fetchWorkflowsPage.mockResolvedValue([]);
-				workflowsStore.fetchActiveWorkflows.mockResolvedValue([]);
-
 				const { getByText } = renderComponent({ pinia });
 				await waitAllPromises();
 				expect(getByText('There are currently no workflows to view')).toBeInTheDocument();
@@ -115,9 +107,6 @@ describe('WorkflowsView', () => {
 			it('for user with create scope', async () => {
 				const projectsStore = mockedStore(useProjectsStore);
 				projectsStore.currentProject = { scopes: ['workflow:create'] } as Project;
-				const workflowsStore = mockedStore(useWorkflowsStore);
-				workflowsStore.fetchWorkflowsPage.mockResolvedValue([]);
-				workflowsStore.fetchActiveWorkflows.mockResolvedValue([]);
 
 				const { getByText } = renderComponent({ pinia });
 				await waitAllPromises();
@@ -129,10 +118,6 @@ describe('WorkflowsView', () => {
 			const projectsStore = mockedStore(useProjectsStore);
 			projectsStore.currentProject = { scopes: ['workflow:create'] } as Project;
 
-			const workflowsStore = mockedStore(useWorkflowsStore);
-			workflowsStore.fetchWorkflowsPage.mockResolvedValue([]);
-			workflowsStore.fetchActiveWorkflows.mockResolvedValue([]);
-
 			const { getByTestId } = renderComponent({ pinia });
 			await waitAllPromises();
 
@@ -145,10 +130,6 @@ describe('WorkflowsView', () => {
 	});
 
 	describe('filters', () => {
-		beforeEach(async () => {
-			pinia = createTestingPinia({ initialState });
-		});
-
 		it('should set tag filter based on query parameters', async () => {
 			await router.replace({ query: { tags: 'test-tag' } });
 
@@ -159,7 +140,6 @@ describe('WorkflowsView', () => {
 			tagStore.tagsById = {
 				'test-tag': TEST_TAG,
 			};
-			const workflowsStore = mockedStore(useWorkflowsStore);
 			workflowsStore.fetchWorkflowsPage.mockResolvedValue([]);
 
 			renderComponent({ pinia });
@@ -180,7 +160,6 @@ describe('WorkflowsView', () => {
 		it('should set search filter based on query parameters', async () => {
 			await router.replace({ query: { search: 'one' } });
 
-			const workflowsStore = mockedStore(useWorkflowsStore);
 			workflowsStore.fetchWorkflowsPage.mockResolvedValue([]);
 
 			renderComponent({ pinia });
@@ -201,7 +180,6 @@ describe('WorkflowsView', () => {
 		it('should set status filter based on query parameters', async () => {
 			await router.replace({ query: { status: 'true' } });
 
-			const workflowsStore = mockedStore(useWorkflowsStore);
 			workflowsStore.fetchWorkflowsPage.mockResolvedValue([]);
 
 			renderComponent({ pinia });
@@ -222,7 +200,6 @@ describe('WorkflowsView', () => {
 		it('should reset filters', async () => {
 			await router.replace({ query: { status: 'true' } });
 
-			const workflowsStore = mockedStore(useWorkflowsStore);
 			workflowsStore.fetchWorkflowsPage.mockResolvedValue([]);
 
 			const { queryByTestId, getByTestId } = renderComponent({ pinia });
@@ -240,7 +217,6 @@ describe('WorkflowsView', () => {
 
 		it('should remove incomplete properties', async () => {
 			await router.replace({ query: { tags: '' } });
-			const workflowsStore = mockedStore(useWorkflowsStore);
 			workflowsStore.fetchWorkflowsPage.mockResolvedValue([]);
 			renderComponent({ pinia });
 			await waitAllPromises();
@@ -249,7 +225,6 @@ describe('WorkflowsView', () => {
 
 		it('should remove invalid tags', async () => {
 			await router.replace({ query: { tags: 'non-existing-tag' } });
-			const workflowsStore = mockedStore(useWorkflowsStore);
 			workflowsStore.fetchWorkflowsPage.mockResolvedValue([]);
 			const tagStore = mockedStore(useTagsStore);
 			tagStore.allTags = [{ id: 'test-tag', name: 'tag' }];
@@ -259,60 +234,79 @@ describe('WorkflowsView', () => {
 		});
 	});
 
-	it('should reinitialize on source control pullWorkfolder', async () => {
-		vi.spyOn(usersApi, 'getUsers').mockResolvedValue([]);
-		pinia = createTestingPinia({ initialState, stubActions: false });
-		const userStore = mockedStore(useUsersStore);
-		const workflowsStore = mockedStore(useWorkflowsStore);
-		workflowsStore.fetchWorkflowsPage.mockResolvedValue([]);
-		workflowsStore.fetchActiveWorkflows.mockResolvedValue([]);
+	describe('source control', () => {
+		beforeEach(async () => {
+			pinia = createTestingPinia({ initialState, stubActions: false });
+			foldersStore = mockedStore(useFoldersStore);
+			foldersStore.totalWorkflowCount = 0;
+			foldersStore.fetchTotalWorkflowsAndFoldersCount.mockResolvedValue(0);
+			workflowsStore = mockedStore(useWorkflowsStore);
 
-		const sourceControl = useSourceControlStore();
+			workflowsStore.fetchWorkflowsPage.mockResolvedValue([]);
+			workflowsStore.fetchActiveWorkflows.mockResolvedValue([]);
+		});
+		it('should reinitialize on source control pullWorkfolder', async () => {
+			vi.spyOn(usersApi, 'getUsers').mockResolvedValue([]);
+			const userStore = mockedStore(useUsersStore);
 
-		renderComponent({ pinia });
+			const sourceControl = useSourceControlStore();
 
-		await sourceControl.pullWorkfolder(true);
-		expect(userStore.fetchUsers).toHaveBeenCalledTimes(2);
+			renderComponent({ pinia });
+
+			await sourceControl.pullWorkfolder(true);
+			expect(userStore.fetchUsers).toHaveBeenCalledTimes(2);
+		});
+	});
+});
+
+describe('Folders', () => {
+	beforeEach(async () => {
+		await router.push('/');
+		await router.isReady();
+		pinia = createTestingPinia({ initialState });
+		foldersStore = mockedStore(useFoldersStore);
+		workflowsStore = mockedStore(useWorkflowsStore);
 	});
 
-	it('should render workflow and folder cards', async () => {
-		const TEST_WORKFLOW_RESOURCE: WorkflowListResource = {
-			resource: 'workflow',
+	const TEST_WORKFLOW_RESOURCE: WorkflowListResource = {
+		resource: 'workflow',
+		id: '1',
+		name: 'Workflow 1',
+		createdAt: new Date().toISOString(),
+		updatedAt: new Date().toISOString(),
+		active: true,
+		homeProject: {
 			id: '1',
-			name: 'Workflow 1',
+			name: 'Project 1',
+			icon: null,
+			type: 'team',
 			createdAt: new Date().toISOString(),
 			updatedAt: new Date().toISOString(),
-			active: true,
-			homeProject: {
-				id: '1',
-				name: 'Project 1',
-				icon: null,
-				type: 'team',
-				createdAt: new Date().toISOString(),
-				updatedAt: new Date().toISOString(),
-			},
-		};
-		const TEST_FOLDER_RESOURCE: WorkflowListResource = {
-			resource: 'folder',
-			id: '2',
-			name: 'Folder 2',
+		},
+	};
+	const TEST_FOLDER_RESOURCE: WorkflowListResource = {
+		resource: 'folder',
+		id: '2',
+		name: 'Folder 2',
+		createdAt: new Date().toISOString(),
+		updatedAt: new Date().toISOString(),
+		workflowCount: 1,
+		homeProject: {
+			id: '1',
+			name: 'Project 1',
+			icon: null,
+			type: 'team',
 			createdAt: new Date().toISOString(),
 			updatedAt: new Date().toISOString(),
-			workflowCount: 1,
-			homeProject: {
-				id: '1',
-				name: 'Project 1',
-				icon: null,
-				type: 'team',
-				createdAt: new Date().toISOString(),
-				updatedAt: new Date().toISOString(),
-			},
-		};
+		},
+	};
+
+	it('should render workflow and folder cards', async () => {
 		// mock router resolve:
 		router.resolve = vi.fn().mockResolvedValue({
 			href: '/projects/1/folders/1',
 		});
-		const workflowsStore = mockedStore(useWorkflowsStore);
+		foldersStore.totalWorkflowCount = 2;
 		workflowsStore.fetchWorkflowsPage.mockResolvedValue([
 			TEST_WORKFLOW_RESOURCE,
 			TEST_FOLDER_RESOURCE,
diff --git a/packages/frontend/editor-ui/src/views/WorkflowsView.vue b/packages/frontend/editor-ui/src/views/WorkflowsView.vue
index 3d2a963481..c032499dfd 100644
--- a/packages/frontend/editor-ui/src/views/WorkflowsView.vue
+++ b/packages/frontend/editor-ui/src/views/WorkflowsView.vue
@@ -15,8 +15,15 @@ import {
 	EnterpriseEditionFeature,
 	VIEWS,
 	DEFAULT_WORKFLOW_PAGE_SIZE,
+	MODAL_CONFIRM,
 } from '@/constants';
-import type { IUser, UserAction, WorkflowListResource, WorkflowListItem } from '@/Interface';
+import type {
+	IUser,
+	UserAction,
+	WorkflowListResource,
+	WorkflowListItem,
+	FolderPathItem,
+} from '@/Interface';
 import { useUIStore } from '@/stores/ui.store';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useUsersStore } from '@/stores/users.store';
@@ -44,9 +51,12 @@ import { getEasyAiWorkflowJson } from '@/utils/easyAiWorkflowUtils';
 import { useDebounce } from '@/composables/useDebounce';
 import { createEventBus } from '@n8n/utils/event-bus';
 import type { PathItem } from '@n8n/design-system/components/N8nBreadcrumbs/Breadcrumbs.vue';
-import { ProjectTypes } from '@/types/projects.types';
+import { type ProjectSharingData, ProjectTypes } from '@/types/projects.types';
 import { FOLDER_LIST_ITEM_ACTIONS } from '@/components/Folders/constants';
 import { debounce } from 'lodash-es';
+import { useMessage } from '@/composables/useMessage';
+import { useToast } from '@/composables/useToast';
+import { useFoldersStore } from '@/stores/folders.store';
 
 interface Filters extends BaseFilters {
 	status: string | boolean;
@@ -70,6 +80,8 @@ const WORKFLOWS_SORT_MAP = {
 const i18n = useI18n();
 const route = useRoute();
 const router = useRouter();
+const message = useMessage();
+const toast = useToast();
 
 const sourceControlStore = useSourceControlStore();
 const usersStore = useUsersStore();
@@ -80,10 +92,13 @@ const projectsStore = useProjectsStore();
 const telemetry = useTelemetry();
 const uiStore = useUIStore();
 const tagsStore = useTagsStore();
+const foldersStore = useFoldersStore();
+
 const documentTitle = useDocumentTitle();
 const { callDebounced } = useDebounce();
 
 const loading = ref(false);
+const breadcrumbsLoading = ref(false);
 const filters = ref<Filters>({
 	search: '',
 	homeProject: '',
@@ -97,27 +112,34 @@ const workflowsAndFolders = ref<WorkflowListResource[]>([]);
 
 const easyAICalloutVisible = ref(true);
 
-const currentFolder = ref<FolderResource | undefined>(undefined);
-
 const currentPage = ref(1);
 const pageSize = ref(DEFAULT_WORKFLOW_PAGE_SIZE);
 const currentSort = ref('updatedAt:desc');
 
-const folderCardActions = ref<UserAction[]>([
+const currentFolderId = ref<string | null>(null);
+
+/**
+ * Folder actions
+ * These can appear on the list header, and then they are applied to current folder
+ * or on each folder card, and then they are applied to the clicked folder
+ * 'onlyAvailableOn' is used to specify where the action should be available, if not specified it will be available on both
+ */
+const folderActions = ref<Array<UserAction & { onlyAvailableOn?: 'mainBreadcrumbs' | 'card' }>>([
 	{
 		label: 'Open',
 		value: FOLDER_LIST_ITEM_ACTIONS.OPEN,
 		disabled: false,
+		onlyAvailableOn: 'card',
 	},
 	{
 		label: 'Create Folder',
 		value: FOLDER_LIST_ITEM_ACTIONS.CREATE,
-		disabled: true,
+		disabled: false,
 	},
 	{
 		label: 'Create Workflow',
 		value: FOLDER_LIST_ITEM_ACTIONS.CREATE_WORKFLOW,
-		disabled: true,
+		disabled: false,
 	},
 	{
 		label: 'Rename',
@@ -145,7 +167,16 @@ const folderCardActions = ref<UserAction[]>([
 		disabled: true,
 	},
 ]);
-
+const folderCardActions = computed(() =>
+	folderActions.value.filter(
+		(action) => !action.onlyAvailableOn || action.onlyAvailableOn === 'card',
+	),
+);
+const mainBreadcrumbsActions = computed(() =>
+	folderActions.value.filter(
+		(action) => !action.onlyAvailableOn || action.onlyAvailableOn === 'mainBreadcrumbs',
+	),
+);
 const readOnlyEnv = computed(() => sourceControlStore.preferences.branchReadOnly);
 const foldersEnabled = computed(() => settingsStore.settings.folders.enabled);
 const isOverviewPage = computed(() => route.name === VIEWS.WORKFLOWS);
@@ -153,17 +184,10 @@ const currentUser = computed(() => usersStore.currentUser ?? ({} as IUser));
 const isShareable = computed(
 	() => settingsStore.isEnterpriseFeatureEnabled[EnterpriseEditionFeature.Sharing],
 );
-
 const showFolders = computed(() => foldersEnabled.value && !isOverviewPage.value);
 
-const mainBreadcrumbsItems = computed<PathItem[] | undefined>(() => {
-	if (!showFolders.value || !currentFolder.value) return;
-	const items: PathItem[] = [];
-	items.push({
-		id: currentFolder.value.id,
-		label: currentFolder.value.name,
-	});
-	return items;
+const currentFolder = computed(() => {
+	return currentFolderId.value ? foldersStore.breadcrumbsCache[currentFolderId.value] : null;
 });
 
 const currentProject = computed(() => projectsStore.currentProject);
@@ -175,6 +199,13 @@ const projectName = computed(() => {
 	return currentProject.value?.name;
 });
 
+const currentParentName = computed(() => {
+	if (currentFolder.value) {
+		return currentFolder.value.name;
+	}
+	return projectName.value;
+});
+
 const workflowListResources = computed<Resource[]>(() => {
 	const resources: Resource[] = (workflowsAndFolders.value || []).map((resource) => {
 		if (resource.resource === 'folder') {
@@ -190,7 +221,6 @@ const workflowListResources = computed<Resource[]>(() => {
 				parentFolder: resource.parentFolder,
 			} as FolderResource;
 		} else {
-			// TODO: Once new endpoint is in place, we'll have to explicitly check for resource type
 			return {
 				resourceType: 'workflow',
 				id: resource.id,
@@ -249,6 +279,10 @@ const emptyListDescription = computed(() => {
 	}
 });
 
+/**
+ * WATCHERS AND STORE SUBSCRIPTIONS
+ */
+
 watch(
 	() => route.params?.projectId,
 	async () => {
@@ -259,14 +293,20 @@ watch(
 watch(
 	() => route.params?.folderId,
 	async (newVal) => {
-		if (!newVal) {
-			currentFolder.value = undefined;
-		}
+		currentFolderId.value = newVal as string;
 		await fetchWorkflows();
 	},
 );
 
-// Lifecycle hooks
+sourceControlStore.$onAction(({ name, after }) => {
+	if (name !== 'pullWorkfolder') return;
+	after(async () => await initialize());
+});
+
+/**
+ * LIFE-CYCLE HOOKS
+ */
+
 onMounted(async () => {
 	documentTitle.set(i18n.baseText('workflows.heading'));
 	void usersStore.showPersonalizationSurvey();
@@ -280,7 +320,90 @@ onBeforeUnmount(() => {
 	workflowListEventBus.off('workflow-duplicated', fetchWorkflows);
 });
 
-// Methods
+/**
+ * METHODS
+ */
+
+// Main component fetch methods
+const initialize = async () => {
+	loading.value = true;
+	await setFiltersFromQueryString();
+	if (!route.params.folderId) {
+		currentFolderId.value = null;
+	}
+	const [, resourcesPage] = await Promise.all([
+		usersStore.fetchUsers(),
+		fetchWorkflows(),
+		workflowsStore.fetchActiveWorkflows(),
+	]);
+	breadcrumbsLoading.value = false;
+	workflowsAndFolders.value = resourcesPage;
+	loading.value = false;
+};
+
+/**
+ * Fetches:
+ * - Current workflows and folders page
+ * - Total count of workflows and folders in the current project
+ * - Path to the current folder (if not cached)
+ */
+const fetchWorkflows = async () => {
+	// We debounce here so that fast enough fetches don't trigger
+	// the placeholder graphics for a few milliseconds, which would cause a flicker
+	const delayedLoading = debounce(() => {
+		loading.value = true;
+	}, 300);
+	const routeProjectId = route.params?.projectId as string | undefined;
+	const homeProjectFilter = filters.value.homeProject || undefined;
+	const parentFolder = (route.params?.folderId as string) || undefined;
+
+	const fetchedResources = await workflowsStore.fetchWorkflowsPage(
+		routeProjectId ?? homeProjectFilter,
+		currentPage.value,
+		pageSize.value,
+		currentSort.value,
+		{
+			name: filters.value.search || undefined,
+			active: filters.value.status ? Boolean(filters.value.status) : undefined,
+			tags: filters.value.tags.map((tagId) => tagsStore.tagsById[tagId]?.name),
+			parentFolderId: parentFolder ?? '0', // 0 is the root folder in the API
+		},
+		showFolders.value,
+	);
+	foldersStore.cacheFolders(
+		fetchedResources
+			.filter((resource) => resource.resource === 'folder')
+			.map((r) => ({ id: r.id, name: r.name, parentFolder: r.parentFolder?.id })),
+	);
+	const isCurrentFolderCached = foldersStore.breadcrumbsCache[parentFolder ?? ''] !== undefined;
+	const needToFetchFolderPath = parentFolder && !isCurrentFolderCached && routeProjectId;
+	if (needToFetchFolderPath) {
+		breadcrumbsLoading.value = true;
+		await foldersStore.getFolderPath(routeProjectId, parentFolder);
+		currentFolderId.value = parentFolder;
+		breadcrumbsLoading.value = false;
+	}
+	await foldersStore.fetchTotalWorkflowsAndFoldersCount(routeProjectId);
+
+	delayedLoading.cancel();
+	workflowsAndFolders.value = fetchedResources;
+	loading.value = false;
+	return fetchedResources;
+};
+
+// Filter and sort methods
+
+const onSortUpdated = async (sort: string) => {
+	currentSort.value =
+		WORKFLOWS_SORT_MAP[sort as keyof typeof WORKFLOWS_SORT_MAP] ?? 'updatedAt:desc';
+	if (currentSort.value !== 'updatedAt:desc') {
+		void router.replace({ query: { ...route.query, sort } });
+	} else {
+		void router.replace({ query: { ...route.query, sort: undefined } });
+	}
+	await fetchWorkflows();
+};
+
 const onFiltersUpdated = async () => {
 	currentPage.value = 1;
 	saveFiltersOnQueryString();
@@ -298,38 +421,6 @@ const onSearchUpdated = async (search: string) => {
 	}
 };
 
-const addWorkflow = () => {
-	uiStore.nodeViewInitialized = false;
-	void router.push({
-		name: VIEWS.NEW_WORKFLOW,
-		query: { projectId: route.params?.projectId },
-	});
-
-	telemetry.track('User clicked add workflow button', {
-		source: 'Workflows list',
-	});
-	trackEmptyCardClick('blank');
-};
-
-const trackEmptyCardClick = (option: 'blank' | 'templates' | 'courses') => {
-	telemetry.track('User clicked empty page option', {
-		option,
-	});
-};
-
-const initialize = async () => {
-	loading.value = true;
-	currentFolder.value = undefined;
-	await setFiltersFromQueryString();
-	const [, resourcesPage] = await Promise.all([
-		usersStore.fetchUsers(),
-		fetchWorkflows(),
-		workflowsStore.fetchActiveWorkflows(),
-	]);
-	workflowsAndFolders.value = resourcesPage;
-	loading.value = false;
-};
-
 const setCurrentPage = async (page: number) => {
 	currentPage.value = page;
 	await fetchWorkflows();
@@ -340,38 +431,6 @@ const setPageSize = async (size: number) => {
 	await fetchWorkflows();
 };
 
-const fetchWorkflows = async () => {
-	// We debounce here so that fast enough fetches don't trigger
-	// the placeholder graphics for a few milliseconds, which would cause a flicker
-	const delayedLoading = debounce(() => {
-		loading.value = true;
-	}, 300);
-	const routeProjectId = route.params?.projectId as string | undefined;
-	const homeProjectFilter = filters.value.homeProject || undefined;
-	const parentFolder = (route.params?.folderId as string) || '0';
-
-	const fetchedResources = await workflowsStore.fetchWorkflowsPage(
-		routeProjectId ?? homeProjectFilter,
-		currentPage.value,
-		pageSize.value,
-		currentSort.value,
-		{
-			name: filters.value.search || undefined,
-			active: filters.value.status ? Boolean(filters.value.status) : undefined,
-			tags: filters.value.tags.map((tagId) => tagsStore.tagsById[tagId]?.name),
-			parentFolderId: parentFolder,
-		},
-		showFolders.value,
-	);
-	// @ts-expect-error - Once we have an endpoint to fetch the path based on Id, we should remove this and fetch the path from the endpoint
-	currentFolder.value = fetchedResources[0]?.parentFolder;
-
-	delayedLoading.cancel();
-	workflowsAndFolders.value = fetchedResources;
-	loading.value = false;
-	return fetchedResources;
-};
-
 const onClickTag = async (tagId: string) => {
 	if (!filters.value.tags.includes(tagId)) {
 		filters.value.tags.push(tagId);
@@ -381,6 +440,8 @@ const onClickTag = async (tagId: string) => {
 	}
 };
 
+// Query string methods
+
 const saveFiltersOnQueryString = () => {
 	// Get current query parameters
 	const currentQuery = { ...route.query };
@@ -415,10 +476,6 @@ const saveFiltersOnQueryString = () => {
 	});
 };
 
-function isValidProjectId(projectId: string) {
-	return projectsStore.availableProjects.some((project) => project.id === projectId);
-}
-
 const setFiltersFromQueryString = async () => {
 	const newQuery: LocationQueryRaw = { ...route.query };
 	const { tags, status, search, homeProject, sort } = route.query ?? {};
@@ -486,10 +543,30 @@ const setFiltersFromQueryString = async () => {
 	void router.replace({ query: newQuery });
 };
 
-sourceControlStore.$onAction(({ name, after }) => {
-	if (name !== 'pullWorkfolder') return;
-	after(async () => await initialize());
-});
+// Misc methods
+
+const addWorkflow = () => {
+	uiStore.nodeViewInitialized = false;
+	void router.push({
+		name: VIEWS.NEW_WORKFLOW,
+		query: { projectId: route.params?.projectId, parentFolderId: route.params?.folderId },
+	});
+
+	telemetry.track('User clicked add workflow button', {
+		source: 'Workflows list',
+	});
+	trackEmptyCardClick('blank');
+};
+
+const trackEmptyCardClick = (option: 'blank' | 'templates' | 'courses') => {
+	telemetry.track('User clicked empty page option', {
+		option,
+	});
+};
+
+function isValidProjectId(projectId: string) {
+	return projectsStore.availableProjects.some((project) => project.id === projectId);
+}
 
 const openAIWorkflow = async (source: string) => {
 	dismissEasyAICallout();
@@ -512,7 +589,7 @@ const openAIWorkflow = async (source: string) => {
 	await router.push({
 		name: VIEWS.TEMPLATE_IMPORT,
 		params: { id: easyAiWorkflowJson.meta.templateId },
-		query: { fromJson: 'true' },
+		query: { fromJson: 'true', parentFolderId: route.params.folderId },
 	});
 };
 
@@ -520,17 +597,6 @@ const dismissEasyAICallout = () => {
 	easyAICalloutVisible.value = false;
 };
 
-const onSortUpdated = async (sort: string) => {
-	currentSort.value =
-		WORKFLOWS_SORT_MAP[sort as keyof typeof WORKFLOWS_SORT_MAP] ?? 'updatedAt:desc';
-	if (currentSort.value !== 'updatedAt:desc') {
-		void router.replace({ query: { ...route.query, sort } });
-	} else {
-		void router.replace({ query: { ...route.query, sort: undefined } });
-	}
-	await fetchWorkflows();
-};
-
 const onWorkflowActiveToggle = (data: { id: string; active: boolean }) => {
 	const workflow: WorkflowListItem | undefined = workflowsAndFolders.value.find(
 		(w): w is WorkflowListItem => w.id === data.id,
@@ -539,8 +605,219 @@ const onWorkflowActiveToggle = (data: { id: string; active: boolean }) => {
 	workflow.active = data.active;
 };
 
-const onFolderOpened = (data: { folder: FolderResource }) => {
-	currentFolder.value = data.folder;
+// Breadcrumbs methods
+
+/**
+ * Breadcrumbs: Calculate visible and hidden items for both main breadcrumbs and card breadcrumbs
+ * We do this here and pass to each component to avoid recalculating in each card
+ */
+const visibleBreadcrumbsItems = computed<FolderPathItem[]>(() => {
+	if (!currentFolder.value) return [];
+	const items: FolderPathItem[] = [];
+	const parent = foldersStore.getCachedFolder(currentFolder.value.parentFolder ?? '');
+	if (parent) {
+		items.push({
+			id: parent.id,
+			label: parent.name,
+			href: `/projects/${route.params.projectId}/folders/${parent.id}/workflows`,
+			parentFolder: parent.parentFolder,
+		});
+	}
+	items.push({
+		id: currentFolder.value.id,
+		label: currentFolder.value.name,
+		parentFolder: parent?.parentFolder,
+	});
+	return items;
+});
+
+const hiddenBreadcrumbsItems = computed<FolderPathItem[]>(() => {
+	const lastVisibleParent: FolderPathItem =
+		visibleBreadcrumbsItems.value[visibleBreadcrumbsItems.value.length - 1];
+	if (!lastVisibleParent) return [];
+	const items: FolderPathItem[] = [];
+	// Go through all the parent folders and add them to the hidden items
+	let parentFolder = lastVisibleParent.parentFolder;
+	while (parentFolder) {
+		const parent = foldersStore.getCachedFolder(parentFolder);
+
+		if (!parent) break;
+		items.unshift({
+			id: parent.id,
+			label: parent.name,
+			href: `/projects/${route.params.projectId}/folders/${parent.id}/workflows`,
+			parentFolder: parent.parentFolder,
+		});
+		parentFolder = parent.parentFolder;
+	}
+	return items;
+});
+
+/**
+ * Main breadcrumbs items that show on top of the list
+ * These show path to the current folder with up to 2 parents visible
+ */
+const mainBreadcrumbs = computed(() => {
+	return {
+		visibleItems: visibleBreadcrumbsItems.value,
+		hiddenItems: hiddenBreadcrumbsItems.value,
+	};
+});
+
+/**
+ * Card breadcrumbs items that show on workflow and folder cards
+ * These show path to the current folder with up to one parent visible
+ */
+const cardBreadcrumbs = computed(() => {
+	const visibleItems = visibleBreadcrumbsItems.value;
+	const hiddenItems = hiddenBreadcrumbsItems.value;
+	if (visibleItems.length > 1) {
+		return {
+			visibleItems: [visibleItems[visibleItems.length - 1]],
+			hiddenItems: [...hiddenItems, ...visibleItems.slice(0, visibleItems.length - 1)],
+		};
+	}
+	return {
+		visibleItems,
+		hiddenItems,
+	};
+});
+
+const onBreadcrumbItemClick = (item: PathItem) => {
+	if (item.href) {
+		loading.value = true;
+		void router
+			.push(item.href)
+			.then(() => {
+				currentFolderId.value = item.id;
+				loading.value = false;
+			})
+			.catch((error) => {
+				toast.showError(error, 'Error navigating to folder');
+			});
+	}
+};
+
+// Folder actions
+
+// Main header action handlers
+// These render next to the breadcrumbs and are applied to the current folder/project
+const onBreadCrumbsAction = async (action: string) => {
+	switch (action) {
+		case FOLDER_LIST_ITEM_ACTIONS.CREATE:
+			if (!route.params.projectId) return;
+			const currentParent = currentFolder.value?.name || projectName.value;
+			if (!currentParent) return;
+			await createFolder({
+				id: (route.params.folderId as string) ?? '-1',
+				name: currentParent,
+				type: currentFolder.value ? 'folder' : 'project',
+			});
+			break;
+		case FOLDER_LIST_ITEM_ACTIONS.CREATE_WORKFLOW:
+			addWorkflow();
+			break;
+		default:
+			break;
+	}
+};
+
+// Folder card action handlers
+// These render on each folder card and are applied to the clicked folder
+const onFolderCardAction = async (payload: { action: string; folderId: string }) => {
+	const clickedFolder = foldersStore.getCachedFolder(payload.folderId);
+	if (!clickedFolder) return;
+	switch (payload.action) {
+		case FOLDER_LIST_ITEM_ACTIONS.CREATE:
+			await createFolder({
+				id: clickedFolder.id,
+				name: clickedFolder.name,
+				type: 'folder',
+			});
+			break;
+		case FOLDER_LIST_ITEM_ACTIONS.CREATE_WORKFLOW:
+			currentFolderId.value = clickedFolder.id;
+			void router.push({
+				name: VIEWS.NEW_WORKFLOW,
+				query: { projectId: route.params?.projectId, parentFolderId: clickedFolder.id },
+			});
+			break;
+		default:
+			break;
+	}
+};
+
+// Reusable action handlers
+// Both action handlers ultimately call these methods once folder to apply action to is determined
+const createFolder = async (parent: { id: string; name: string; type: 'project' | 'folder' }) => {
+	const promptResponsePromise = message.prompt(
+		i18n.baseText('folders.add.to.parent.message', { interpolate: { parent: parent.name } }),
+		{
+			confirmButtonText: i18n.baseText('generic.create'),
+			cancelButtonText: i18n.baseText('generic.cancel'),
+			inputErrorMessage: i18n.baseText('folders.add.invalidName.message'),
+			inputValue: '',
+			inputPattern: /^[a-zA-Z0-9-_ ]{1,100}$/,
+			customClass: 'add-folder-modal',
+		},
+	);
+	const promptResponse = await promptResponsePromise;
+	if (promptResponse.action === MODAL_CONFIRM) {
+		const folderName = promptResponse.value;
+		try {
+			const newFolder = await foldersStore.createFolder(
+				folderName,
+				route.params.projectId as string,
+				parent.type === 'folder' ? parent.id : undefined,
+			);
+
+			let newFolderURL = `/projects/${route.params.projectId}`;
+			if (newFolder.parentFolder) {
+				newFolderURL = `/projects/${route.params.projectId}/folders/${newFolder.id}/workflows`;
+			}
+			toast.showMessage({
+				title: i18n.baseText('folders.add.success.title'),
+				message: i18n.baseText('folders.add.success.message', {
+					interpolate: {
+						link: newFolderURL,
+						name: newFolder.name,
+					},
+				}),
+				type: 'success',
+			});
+			// If we are on an empty list, just add the new folder to the list
+			if (!workflowsAndFolders.value.length) {
+				workflowsAndFolders.value = [
+					{
+						id: newFolder.id,
+						name: newFolder.name,
+						resource: 'folder',
+						createdAt: newFolder.createdAt,
+						updatedAt: newFolder.updatedAt,
+						homeProject: projectsStore.currentProject as ProjectSharingData,
+						sharedWithProjects: [],
+						workflowCount: 0,
+					},
+				];
+			} else {
+				// Else fetch again with same filters & pagination applied
+				await fetchWorkflows();
+			}
+		} catch (error) {
+			toast.showError(error, 'Error creating folder');
+		}
+	}
+};
+
+const createFolderInCurrent = async () => {
+	if (!route.params.projectId) return;
+	const currentParent = currentFolder.value?.name || projectName.value;
+	if (!currentParent) return;
+	await createFolder({
+		id: (route.params.folderId as string) ?? '-1',
+		name: currentParent,
+		type: currentFolder.value ? 'folder' : 'project',
+	});
 };
 </script>
 
@@ -556,7 +833,7 @@ const onFolderOpened = (data: { folder: FolderResource }) => {
 		:disabled="readOnlyEnv || !projectPermissions.workflow.create"
 		:loading="false"
 		:resources-refreshing="loading"
-		:custom-page-size="10"
+		:custom-page-size="DEFAULT_WORKFLOW_PAGE_SIZE"
 		:total-items="workflowsStore.totalWorkflowCount"
 		:dont-perform-sorting-and-filtering="true"
 		@click:add="addWorkflow"
@@ -567,7 +844,28 @@ const onFolderOpened = (data: { folder: FolderResource }) => {
 		@sort="onSortUpdated"
 	>
 		<template #header>
-			<ProjectHeader />
+			<ProjectHeader @create-folder="createFolderInCurrent" />
+		</template>
+		<template v-if="showFolders" #add-button>
+			<N8nTooltip placement="top">
+				<template #content>
+					{{
+						currentParentName
+							? i18n.baseText('folders.add.to.parent.message', {
+									interpolate: { parent: currentParentName },
+								})
+							: i18n.baseText('folders.add.here.message')
+					}}
+				</template>
+				<N8nButton
+					size="large"
+					icon="folder-plus"
+					type="tertiary"
+					data-test-id="add-folder-button"
+					:class="$style['add-folder-button']"
+					@click="createFolderInCurrent"
+				/>
+			</N8nTooltip>
 		</template>
 		<template #callout>
 			<N8nCallout
@@ -599,35 +897,33 @@ const onFolderOpened = (data: { folder: FolderResource }) => {
 			</N8nCallout>
 		</template>
 		<template #breadcrumbs>
-			<n8n-breadcrumbs
-				v-if="mainBreadcrumbsItems"
-				:items="mainBreadcrumbsItems"
-				:highlight-last-item="false"
-				:path-truncated="currentFolder !== undefined"
-				data-test-id="folder-card-breadcrumbs"
-			>
-				<template v-if="currentProject" #prepend>
-					<div :class="$style['home-project']">
-						<n8n-link :to="`/projects/${currentProject.id}`">
-							<N8nText size="large" color="text-base">{{ projectName }}</N8nText>
-						</n8n-link>
-					</div>
-				</template>
-			</n8n-breadcrumbs>
+			<div v-if="breadcrumbsLoading" :class="$style['breadcrumbs-loading']">
+				<n8n-loading :loading="breadcrumbsLoading" :rows="1" variant="p" />
+			</div>
+			<div v-else-if="showFolders && currentFolder" :class="$style['breadcrumbs-container']">
+				<FolderBreadcrumbs
+					:breadcrumbs="mainBreadcrumbs"
+					:actions="mainBreadcrumbsActions"
+					@item-selected="onBreadcrumbItemClick"
+					@action="onBreadCrumbsAction"
+				/>
+			</div>
 		</template>
 		<template #item="{ item: data }">
 			<FolderCard
 				v-if="(data as FolderResource | WorkflowResource).resourceType === 'folder'"
 				:data="data as FolderResource"
 				:actions="folderCardActions"
+				:breadcrumbs="cardBreadcrumbs"
 				class="mb-2xs"
-				@folder-opened="onFolderOpened"
+				@action="onFolderCardAction"
 			/>
 			<WorkflowCard
 				v-else
 				data-test-id="resources-list-item"
 				class="mb-2xs"
 				:data="data as WorkflowResource"
+				:breadcrumbs="cardBreadcrumbs"
 				:workflow-list-event-bus="workflowListEventBus"
 				:read-only="readOnlyEnv"
 				@click:tag="onClickTag"
@@ -770,8 +1066,36 @@ const onFolderOpened = (data: { folder: FolderResource }) => {
 	}
 }
 
-.home-project {
+.add-folder-button {
+	width: 40px;
+}
+
+.breadcrumbs-container {
 	display: flex;
 	align-items: center;
 }
+
+.breadcrumbs-loading {
+	:global(.el-skeleton__item) {
+		margin: 0;
+		height: 40px;
+		width: 400px;
+	}
+}
+</style>
+
+<style lang="scss">
+.add-folder-modal {
+	width: 500px;
+	padding-bottom: 0;
+	.el-message-box__message {
+		font-size: var(--font-size-xl);
+	}
+	.el-message-box__btns {
+		padding: 0 var(--spacing-l) var(--spacing-l);
+	}
+	.el-message-box__content {
+		padding: var(--spacing-l);
+	}
+}
 </style>