From 512eb112109f8458e9b383aa027a2345c6e99d3e Mon Sep 17 00:00:00 2001
From: Michael Kret <88898367+michael-radency@users.noreply.github.com>
Date: Fri, 26 Jul 2024 14:12:42 +0300
Subject: [PATCH 001/168] fix: Add original error message to messages, do not
 obfuscate if description provided in options (no-changelog) (#10202)

---
 .../src/errors/node-operation.error.ts        |  6 ++-
 .../workflow/test/errors/node.error.test.ts   | 43 +++++++++++++++++++
 2 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/packages/workflow/src/errors/node-operation.error.ts b/packages/workflow/src/errors/node-operation.error.ts
index b5fb2c518eae3..b0167250dcbef 100644
--- a/packages/workflow/src/errors/node-operation.error.ts
+++ b/packages/workflow/src/errors/node-operation.error.ts
@@ -34,7 +34,11 @@ export class NodeOperationError extends NodeError {
 			error.messages.forEach((message) => this.addToMessages(message));
 		}
 
-		if (obfuscateErrorMessage) this.message = OBFUSCATED_ERROR_MESSAGE;
+		if (obfuscateErrorMessage && !options.description) {
+			const originalMessage = typeof error === 'string' ? error : (error.message as string);
+			this.addToMessages(originalMessage);
+			this.message = OBFUSCATED_ERROR_MESSAGE;
+		}
 		if (options.message) this.message = options.message;
 		if (options.level) this.level = options.level;
 		if (options.functionality) this.functionality = options.functionality;
diff --git a/packages/workflow/test/errors/node.error.test.ts b/packages/workflow/test/errors/node.error.test.ts
index 7d0783a65c70c..357314c347bb3 100644
--- a/packages/workflow/test/errors/node.error.test.ts
+++ b/packages/workflow/test/errors/node.error.test.ts
@@ -2,6 +2,8 @@ import { mock } from 'jest-mock-extended';
 import type { INode } from '@/Interfaces';
 import { NodeApiError } from '@/errors/node-api.error';
 import { NodeOperationError } from '@/errors/node-operation.error';
+import { ApplicationError } from '@/errors/application.error';
+import { OBFUSCATED_ERROR_MESSAGE } from '@/Constants';
 
 describe('NodeError', () => {
 	const node = mock<INode>();
@@ -15,4 +17,45 @@ describe('NodeError', () => {
 		expect(wrapped1).toEqual(apiError);
 		expect(wrapped2).toEqual(opsError);
 	});
+
+	it('should obfuscate errors not processed by n8n', () => {
+		const error = new Error('Original error message');
+		const nodeOpError = new NodeOperationError(node, error);
+
+		expect(nodeOpError.message).toBe(OBFUSCATED_ERROR_MESSAGE);
+		expect(nodeOpError.messages).toContain('Original error message');
+	});
+
+	it('should not obfuscate errors processed by n8n', () => {
+		const appError = new ApplicationError('Processed error message');
+		const nodeOpError = new NodeOperationError(node, appError);
+
+		expect(nodeOpError.message).toBe('Processed error message');
+		expect(nodeOpError.messages).not.toContain('Processed error message');
+	});
+
+	it('should not obfuscate string errors', () => {
+		const errorMessage = 'String error message';
+		const nodeOpError = new NodeOperationError(node, errorMessage);
+
+		expect(nodeOpError.message).toBe(errorMessage);
+		expect(nodeOpError.messages).toHaveLength(0);
+	});
+
+	it('should not obfuscate error if description provided', () => {
+		const error = new Error('Initial error message');
+		const options = { description: 'Error description' };
+		const nodeOpError = new NodeOperationError(node, error, options);
+
+		expect(nodeOpError.message).toBe('Initial error message');
+	});
+
+	it('should respect provided options for message and description', () => {
+		const error = new Error('Initial error message');
+		const options = { message: 'Overridden message', description: 'Error description' };
+		const nodeOpError = new NodeOperationError(node, error, options);
+
+		expect(nodeOpError.message).toBe('Overridden message');
+		expect(nodeOpError.description).toBe('Error description');
+	});
 });

From 8ef0a0c58ac2a84aad649ccbe72aa907d005cc44 Mon Sep 17 00:00:00 2001
From: oleg <me@olegivaniv.com>
Date: Fri, 26 Jul 2024 13:19:06 +0200
Subject: [PATCH 002/168] feat(Sentiment Analysis Node): Implement Sentiment
 Analysis node (#10184)

---
 .../SentimentAnalysis.node.ts                 | 257 ++++++++++++++++++
 .../VectorStoreInMemory.node.ts               |  59 ++++
 packages/@n8n/nodes-langchain/package.json    |   1 +
 packages/editor-ui/src/plugins/icons/index.ts |   2 +
 4 files changed, 319 insertions(+)
 create mode 100644 packages/@n8n/nodes-langchain/nodes/chains/SentimentAnalysis/SentimentAnalysis.node.ts
 create mode 100644 packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreIndexer/VectorStoreInMemory.node.ts

diff --git a/packages/@n8n/nodes-langchain/nodes/chains/SentimentAnalysis/SentimentAnalysis.node.ts b/packages/@n8n/nodes-langchain/nodes/chains/SentimentAnalysis/SentimentAnalysis.node.ts
new file mode 100644
index 0000000000000..6f627edcfd495
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/chains/SentimentAnalysis/SentimentAnalysis.node.ts
@@ -0,0 +1,257 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeParameters,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+
+import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
+
+import type { BaseLanguageModel } from '@langchain/core/language_models/base';
+import { HumanMessage } from '@langchain/core/messages';
+import { SystemMessagePromptTemplate, ChatPromptTemplate } from '@langchain/core/prompts';
+import { OutputFixingParser, StructuredOutputParser } from 'langchain/output_parsers';
+import { z } from 'zod';
+import { getTracingConfig } from '../../../utils/tracing';
+
+const DEFAULT_SYSTEM_PROMPT_TEMPLATE =
+	'You are highly intelligent and accurate sentiment analyzer. Analyze the sentiment of the provided text. Categorize it into one of the following: {categories}. Use the provided formatting instructions. Only output the JSON.';
+
+const DEFAULT_CATEGORIES = 'Positive, Neutral, Negative';
+const configuredOutputs = (parameters: INodeParameters, defaultCategories: string) => {
+	const options = (parameters?.options ?? {}) as IDataObject;
+	const categories = (options?.categories as string) ?? defaultCategories;
+	const categoriesArray = categories.split(',').map((cat) => cat.trim());
+
+	const ret = categoriesArray.map((cat) => ({ type: NodeConnectionType.Main, displayName: cat }));
+	return ret;
+};
+
+export class SentimentAnalysis implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Sentiment Analysis',
+		name: 'sentimentAnalysis',
+		icon: 'fa:balance-scale-left',
+		iconColor: 'black',
+		group: ['transform'],
+		version: 1,
+		description: 'Analyze the sentiment of your text',
+		codex: {
+			categories: ['AI'],
+			subcategories: {
+				AI: ['Chains', 'Root Nodes'],
+			},
+			resources: {
+				primaryDocumentation: [
+					{
+						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/root-nodes/n8n-nodes-langchain.sentimentanalysis/',
+					},
+				],
+			},
+		},
+		defaults: {
+			name: 'Sentiment Analysis',
+		},
+		inputs: [
+			{ displayName: '', type: NodeConnectionType.Main },
+			{
+				displayName: 'Model',
+				maxConnections: 1,
+				type: NodeConnectionType.AiLanguageModel,
+				required: true,
+			},
+		],
+		outputs: `={{(${configuredOutputs})($parameter, "${DEFAULT_CATEGORIES}")}}`,
+		properties: [
+			{
+				displayName: 'Text to Analyze',
+				name: 'inputText',
+				type: 'string',
+				required: true,
+				default: '',
+				description: 'Use an expression to reference data in previous nodes or enter static text',
+				typeOptions: {
+					rows: 2,
+				},
+			},
+			{
+				displayName:
+					'Sentiment scores are LLM-generated estimates, not statistically rigorous measurements. They may be inconsistent across runs and should be used as rough indicators only.',
+				name: 'detailedResultsNotice',
+				type: 'notice',
+				default: '',
+				displayOptions: {
+					show: {
+						'/options.includeDetailedResults': [true],
+					},
+				},
+			},
+			{
+				displayName: 'Options',
+				name: 'options',
+				type: 'collection',
+				default: {},
+				placeholder: 'Add Option',
+				options: [
+					{
+						displayName: 'Sentiment Categories',
+						name: 'categories',
+						type: 'string',
+						default: DEFAULT_CATEGORIES,
+						description: 'A comma-separated list of categories to analyze',
+						noDataExpression: true,
+						typeOptions: {
+							rows: 2,
+						},
+					},
+					{
+						displayName: 'System Prompt Template',
+						name: 'systemPromptTemplate',
+						type: 'string',
+						default: DEFAULT_SYSTEM_PROMPT_TEMPLATE,
+						description: 'String to use directly as the system prompt template',
+						typeOptions: {
+							rows: 6,
+						},
+					},
+					{
+						displayName: 'Include Detailed Results',
+						name: 'includeDetailedResults',
+						type: 'boolean',
+						default: false,
+						description:
+							'Whether to include sentiment strength and confidence scores in the output',
+					},
+					{
+						displayName: 'Enable Auto-Fixing',
+						name: 'enableAutoFixing',
+						type: 'boolean',
+						default: true,
+						description: 'Whether to enable auto-fixing for the output parser',
+					},
+				],
+			},
+		],
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const items = this.getInputData();
+
+		const llm = (await this.getInputConnectionData(
+			NodeConnectionType.AiLanguageModel,
+			0,
+		)) as BaseLanguageModel;
+
+		const returnData: INodeExecutionData[][] = [];
+
+		for (let i = 0; i < items.length; i++) {
+			try {
+				const sentimentCategories = this.getNodeParameter(
+					'options.categories',
+					i,
+					DEFAULT_CATEGORIES,
+				) as string;
+
+				const categories = sentimentCategories
+					.split(',')
+					.map((cat) => cat.trim())
+					.filter(Boolean);
+
+				if (categories.length === 0) {
+					throw new NodeOperationError(this.getNode(), 'No sentiment categories provided', {
+						itemIndex: i,
+					});
+				}
+
+				// Initialize returnData with empty arrays for each category
+				if (returnData.length === 0) {
+					returnData.push(...Array.from({ length: categories.length }, () => []));
+				}
+
+				const options = this.getNodeParameter('options', i, {}) as {
+					systemPromptTemplate?: string;
+					includeDetailedResults?: boolean;
+					enableAutoFixing?: boolean;
+				};
+
+				const schema = z.object({
+					sentiment: z.enum(categories as [string, ...string[]]),
+					strength: z
+						.number()
+						.min(0)
+						.max(1)
+						.describe('Strength score for sentiment in relation to the category'),
+					confidence: z.number().min(0).max(1),
+				});
+
+				const structuredParser = StructuredOutputParser.fromZodSchema(schema);
+
+				const parser = options.enableAutoFixing
+					? OutputFixingParser.fromLLM(llm, structuredParser)
+					: structuredParser;
+
+				const systemPromptTemplate = SystemMessagePromptTemplate.fromTemplate(
+					`${options.systemPromptTemplate ?? DEFAULT_SYSTEM_PROMPT_TEMPLATE}
+		{format_instructions}`,
+				);
+
+				const input = this.getNodeParameter('inputText', i) as string;
+				const inputPrompt = new HumanMessage(input);
+				const messages = [
+					await systemPromptTemplate.format({
+						categories: sentimentCategories,
+						format_instructions: parser.getFormatInstructions(),
+					}),
+					inputPrompt,
+				];
+
+				const prompt = ChatPromptTemplate.fromMessages(messages);
+				const chain = prompt.pipe(llm).pipe(parser).withConfig(getTracingConfig(this));
+
+				try {
+					const output = await chain.invoke(messages);
+					const sentimentIndex = categories.findIndex(
+						(s) => s.toLowerCase() === output.sentiment.toLowerCase(),
+					);
+
+					if (sentimentIndex !== -1) {
+						const resultItem = { ...items[i] };
+						const sentimentAnalysis: IDataObject = {
+							category: output.sentiment,
+						};
+						if (options.includeDetailedResults) {
+							sentimentAnalysis.strength = output.strength;
+							sentimentAnalysis.confidence = output.confidence;
+						}
+						resultItem.json = {
+							...resultItem.json,
+							sentimentAnalysis,
+						};
+						returnData[sentimentIndex].push(resultItem);
+					}
+				} catch (error) {
+					throw new NodeOperationError(
+						this.getNode(),
+						'Error during parsing of LLM output, please check your LLM model and configuration',
+						{
+							itemIndex: i,
+						},
+					);
+				}
+			} catch (error) {
+				if (this.continueOnFail(error)) {
+					const executionErrorData = this.helpers.constructExecutionMetaData(
+						this.helpers.returnJsonArray({ error: error.message }),
+						{ itemData: { item: i } },
+					);
+					returnData[0].push(...executionErrorData);
+					continue;
+				}
+				throw error;
+			}
+		}
+		return returnData;
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreIndexer/VectorStoreInMemory.node.ts b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreIndexer/VectorStoreInMemory.node.ts
new file mode 100644
index 0000000000000..fecf8d163aff4
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreIndexer/VectorStoreInMemory.node.ts
@@ -0,0 +1,59 @@
+import type { INodeProperties } from 'n8n-workflow';
+import { createVectorStoreNode } from '../shared/createVectorStoreNode';
+import { MemoryVectorStoreManager } from '../shared/MemoryVectorStoreManager';
+
+const insertFields: INodeProperties[] = [
+	{
+		displayName:
+			'The embbded data are stored in the server memory, so they will be lost when the server is restarted. Additionally, if the amount of data is too large, it may cause the server to crash due to insufficient memory.',
+		name: 'notice',
+		type: 'notice',
+		default: '',
+	},
+	{
+		displayName: 'Clear Store',
+		name: 'clearStore',
+		type: 'boolean',
+		default: false,
+		description: 'Whether to clear the store before inserting new data',
+	},
+];
+
+export const VectorStoreInMemory = createVectorStoreNode({
+	meta: {
+		displayName: 'In-Memory Vector Store',
+		name: 'vectorStoreInMemory',
+		description: 'Work with your data in In-Memory Vector Store',
+		icon: 'fa:database',
+		docsUrl:
+			'https://docs.n8n.io/integrations/builtin/cluster-nodes/root-nodes/n8n-nodes-langchain.vectorstoreinmemory/',
+	},
+	sharedFields: [
+		{
+			displayName: 'Memory Key',
+			name: 'memoryKey',
+			type: 'string',
+			default: 'vector_store_key',
+			description:
+				'The key to use to store the vector memory in the workflow data. The key will be prefixed with the workflow ID to avoid collisions.',
+		},
+	],
+	insertFields,
+	loadFields: [],
+	retrieveFields: [],
+	async getVectorStoreClient(context, _filter, embeddings, itemIndex) {
+		const workflowId = context.getWorkflow().id;
+		const memoryKey = context.getNodeParameter('memoryKey', itemIndex) as string;
+		const vectorStoreSingleton = MemoryVectorStoreManager.getInstance(embeddings);
+
+		return await vectorStoreSingleton.getVectorStore(`${workflowId}__${memoryKey}`);
+	},
+	async populateVectorStore(context, embeddings, documents, itemIndex) {
+		const memoryKey = context.getNodeParameter('memoryKey', itemIndex) as string;
+		const clearStore = context.getNodeParameter('clearStore', itemIndex) as boolean;
+		const workflowId = context.getWorkflow().id;
+		const vectorStoreInstance = MemoryVectorStoreManager.getInstance(embeddings);
+
+		void vectorStoreInstance.addDocuments(`${workflowId}__${memoryKey}`, documents, clearStore);
+	},
+});
diff --git a/packages/@n8n/nodes-langchain/package.json b/packages/@n8n/nodes-langchain/package.json
index 3e78f776cc779..05a6b66344e4d 100644
--- a/packages/@n8n/nodes-langchain/package.json
+++ b/packages/@n8n/nodes-langchain/package.json
@@ -45,6 +45,7 @@
       "dist/nodes/chains/ChainSummarization/ChainSummarization.node.js",
       "dist/nodes/chains/ChainLLM/ChainLlm.node.js",
       "dist/nodes/chains/ChainRetrievalQA/ChainRetrievalQa.node.js",
+      "dist/nodes/chains/SentimentAnalysis/SentimentAnalysis.node.js",
       "dist/nodes/chains/InformationExtractor/InformationExtractor.node.js",
       "dist/nodes/chains/TextClassifier/TextClassifier.node.js",
       "dist/nodes/code/Code.node.js",
diff --git a/packages/editor-ui/src/plugins/icons/index.ts b/packages/editor-ui/src/plugins/icons/index.ts
index 6eeaef0a07bf2..1275361e275b6 100644
--- a/packages/editor-ui/src/plugins/icons/index.ts
+++ b/packages/editor-ui/src/plugins/icons/index.ts
@@ -14,6 +14,7 @@ import {
 	faArrowDown,
 	faAt,
 	faBan,
+	faBalanceScaleLeft,
 	faBars,
 	faBolt,
 	faBook,
@@ -181,6 +182,7 @@ export const FontAwesomePlugin: Plugin = {
 		addIcon(faArrowDown);
 		addIcon(faAt);
 		addIcon(faBan);
+		addIcon(faBalanceScaleLeft);
 		addIcon(faBars);
 		addIcon(faBolt);
 		addIcon(faBook);

From 5a51b1db5e06de7517900b16d4f2b3456f36c0b4 Mon Sep 17 00:00:00 2001
From: oleg <me@olegivaniv.com>
Date: Fri, 26 Jul 2024 14:30:33 +0200
Subject: [PATCH 003/168] refactor: Update Langchain modules & add Ollama tools
 support (#10208)

---
 .../nodes/agents/Agent/Agent.node.ts          |   1 +
 .../nodes/chains/ChainLLM/ChainLlm.node.ts    |   2 +-
 .../llms/LMChatOllama/LmChatOllama.node.ts    |   4 +-
 packages/@n8n/nodes-langchain/package.json    |  29 +-
 packages/workflow/package.json                |   2 +-
 pnpm-lock.yaml                                | 772 ++++++------------
 6 files changed, 286 insertions(+), 524 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 fd55a85e6f1a4..b7bd13e870322 100644
--- a/packages/@n8n/nodes-langchain/nodes/agents/Agent/Agent.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/Agent.node.ts
@@ -113,6 +113,7 @@ function getInputs(
 						'@n8n/n8n-nodes-langchain.lmChatAnthropic',
 						'@n8n/n8n-nodes-langchain.lmChatAzureOpenAi',
 						'@n8n/n8n-nodes-langchain.lmChatMistralCloud',
+						'@n8n/n8n-nodes-langchain.lmChatOllama',
 						'@n8n/n8n-nodes-langchain.lmChatOpenAi',
 						'@n8n/n8n-nodes-langchain.lmChatGroq',
 						'@n8n/n8n-nodes-langchain.lmChatGoogleVertex',
diff --git a/packages/@n8n/nodes-langchain/nodes/chains/ChainLLM/ChainLlm.node.ts b/packages/@n8n/nodes-langchain/nodes/chains/ChainLLM/ChainLlm.node.ts
index 35b83dead8d8c..003c8eb7dd1b9 100644
--- a/packages/@n8n/nodes-langchain/nodes/chains/ChainLLM/ChainLlm.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/chains/ChainLLM/ChainLlm.node.ts
@@ -22,7 +22,7 @@ import { LLMChain } from 'langchain/chains';
 import type { BaseChatModel } from '@langchain/core/language_models/chat_models';
 import { HumanMessage } from '@langchain/core/messages';
 import { ChatGoogleGenerativeAI } from '@langchain/google-genai';
-import { ChatOllama } from '@langchain/community/chat_models/ollama';
+import { ChatOllama } from '@langchain/ollama';
 import { getTemplateNoticeField } from '../../../utils/sharedFields';
 import {
 	getOptionalOutputParsers,
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LMChatOllama/LmChatOllama.node.ts b/packages/@n8n/nodes-langchain/nodes/llms/LMChatOllama/LmChatOllama.node.ts
index de6a53bfc4182..f0f9e5f630e29 100644
--- a/packages/@n8n/nodes-langchain/nodes/llms/LMChatOllama/LmChatOllama.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LMChatOllama/LmChatOllama.node.ts
@@ -7,8 +7,8 @@ import {
 	type SupplyData,
 } from 'n8n-workflow';
 
-import type { ChatOllamaInput } from '@langchain/community/chat_models/ollama';
-import { ChatOllama } from '@langchain/community/chat_models/ollama';
+import type { ChatOllamaInput } from '@langchain/ollama';
+import { ChatOllama } from '@langchain/ollama';
 import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
 import { ollamaModel, ollamaOptions, ollamaDescription } from '../LMOllama/description';
 import { N8nLlmTracing } from '../N8nLlmTracing';
diff --git a/packages/@n8n/nodes-langchain/package.json b/packages/@n8n/nodes-langchain/package.json
index 05a6b66344e4d..9c10d94c495d9 100644
--- a/packages/@n8n/nodes-langchain/package.json
+++ b/packages/@n8n/nodes-langchain/package.json
@@ -131,29 +131,30 @@
   "dependencies": {
     "@aws-sdk/client-bedrock-runtime": "3.535.0",
     "@aws-sdk/credential-provider-node": "3.535.0",
-    "@getzep/zep-cloud": "1.0.6",
+    "@getzep/zep-cloud": "1.0.11",
     "@getzep/zep-js": "0.9.0",
     "@google-ai/generativelanguage": "2.5.0",
     "@google-cloud/resource-manager": "5.3.0",
     "@google/generative-ai": "0.11.4",
     "@huggingface/inference": "2.7.0",
-    "@langchain/anthropic": "0.1.21",
+    "@langchain/anthropic": "0.2.9",
     "@langchain/cohere": "0.0.10",
-    "@langchain/community": "0.2.13",
-    "@langchain/core": "0.2.9",
-    "@langchain/google-genai": "0.0.16",
-    "@langchain/google-vertexai": "0.0.19",
-    "@langchain/groq": "0.0.12",
-    "@langchain/mistralai": "0.0.22",
-    "@langchain/openai": "0.0.33",
-    "@langchain/pinecone": "0.0.6",
+    "@langchain/community": "0.2.20",
+    "@langchain/core": "0.2.18",
+    "@langchain/google-genai": "0.0.23",
+    "@langchain/google-vertexai": "0.0.21",
+    "@langchain/groq": "0.0.15",
+    "@langchain/mistralai": "0.0.27",
+    "@langchain/ollama": "^0.0.2",
+    "@langchain/openai": "0.2.5",
+    "@langchain/pinecone": "0.0.8",
     "@langchain/qdrant": "^0.0.5",
     "@langchain/redis": "0.0.5",
-    "@langchain/textsplitters": "0.0.2",
+    "@langchain/textsplitters": "0.0.3",
     "@mozilla/readability": "^0.5.0",
     "@n8n/typeorm": "0.3.20-10",
     "@n8n/vm2": "3.9.20",
-    "@pinecone-database/pinecone": "2.2.1",
+    "@pinecone-database/pinecone": "3.0.0",
     "@qdrant/js-client-rest": "1.9.0",
     "@supabase/supabase-js": "2.43.4",
     "@types/pg": "^8.11.3",
@@ -168,12 +169,12 @@
     "html-to-text": "9.0.5",
     "jsdom": "^23.0.1",
     "json-schema-to-zod": "2.1.0",
-    "langchain": "0.2.2",
+    "langchain": "0.2.11",
     "lodash": "4.17.21",
     "mammoth": "1.7.2",
     "n8n-nodes-base": "workspace:*",
     "n8n-workflow": "workspace:*",
-    "openai": "4.47.1",
+    "openai": "4.53.0",
     "pdf-parse": "1.1.1",
     "pg": "8.11.3",
     "redis": "4.6.12",
diff --git a/packages/workflow/package.json b/packages/workflow/package.json
index 796a88e6a51de..96a4f31fd16fa 100644
--- a/packages/workflow/package.json
+++ b/packages/workflow/package.json
@@ -29,7 +29,7 @@
     "dist/**/*"
   ],
   "devDependencies": {
-    "@langchain/core": "^0.2.9",
+    "@langchain/core": "^0.2.18",
     "@types/deep-equal": "^1.0.1",
     "@types/express": "^4.17.21",
     "@types/jmespath": "^0.15.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7ad871719bd88..e97519b806455 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -263,8 +263,8 @@ importers:
         specifier: 3.535.0
         version: 3.535.0
       '@getzep/zep-cloud':
-        specifier: 1.0.6
-        version: 1.0.6(@langchain/core@0.2.9(langchain@0.2.2(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.47.1(encoding@0.1.13)))(encoding@0.1.13)(langchain@0.2.2(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))
+        specifier: 1.0.11
+        version: 1.0.11(@langchain/core@0.2.18)(encoding@0.1.13)(langchain@0.2.11)
       '@getzep/zep-js':
         specifier: 0.9.0
         version: 0.9.0
@@ -281,44 +281,47 @@ importers:
         specifier: 2.7.0
         version: 2.7.0
       '@langchain/anthropic':
-        specifier: 0.1.21
-        version: 0.1.21(encoding@0.1.13)(langchain@0.2.2(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.47.1(encoding@0.1.13))
+        specifier: 0.2.9
+        version: 0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))
       '@langchain/cohere':
         specifier: 0.0.10
-        version: 0.0.10(encoding@0.1.13)(langchain@0.2.2(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.47.1(encoding@0.1.13))
+        version: 0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))
       '@langchain/community':
-        specifier: 0.2.13
-        version: 0.2.13(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.6(@langchain/core@0.2.9(langchain@0.2.2(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.47.1(encoding@0.1.13)))(encoding@0.1.13)(langchain@0.2.2(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1)))(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@2.2.1)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1)
+        specifier: 0.2.20
+        version: 0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1)
       '@langchain/core':
-        specifier: 0.2.9
-        version: 0.2.9(langchain@0.2.2(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.47.1(encoding@0.1.13))
+        specifier: 0.2.18
+        version: 0.2.18(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))
       '@langchain/google-genai':
-        specifier: 0.0.16
-        version: 0.0.16(langchain@0.2.2(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.47.1(encoding@0.1.13))(zod@3.23.8)
+        specifier: 0.0.23
+        version: 0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8)
       '@langchain/google-vertexai':
-        specifier: 0.0.19
-        version: 0.0.19(encoding@0.1.13)(langchain@0.2.2(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.47.1(encoding@0.1.13))(zod@3.23.8)
+        specifier: 0.0.21
+        version: 0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8)
       '@langchain/groq':
-        specifier: 0.0.12
-        version: 0.0.12(encoding@0.1.13)(langchain@0.2.2(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.47.1(encoding@0.1.13))
+        specifier: 0.0.15
+        version: 0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))
       '@langchain/mistralai':
-        specifier: 0.0.22
-        version: 0.0.22(encoding@0.1.13)(langchain@0.2.2(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.47.1(encoding@0.1.13))
+        specifier: 0.0.27
+        version: 0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))
+      '@langchain/ollama':
+        specifier: ^0.0.2
+        version: 0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))
       '@langchain/openai':
-        specifier: 0.0.33
-        version: 0.0.33(encoding@0.1.13)(langchain@0.2.2(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))
+        specifier: 0.2.5
+        version: 0.2.5(encoding@0.1.13)(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))
       '@langchain/pinecone':
-        specifier: 0.0.6
-        version: 0.0.6(langchain@0.2.2(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.47.1(encoding@0.1.13))
+        specifier: 0.0.8
+        version: 0.0.8(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))
       '@langchain/qdrant':
         specifier: ^0.0.5
-        version: 0.0.5(langchain@0.2.2(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.47.1(encoding@0.1.13))(typescript@5.5.2)
+        version: 0.0.5(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))(typescript@5.5.2)
       '@langchain/redis':
         specifier: 0.0.5
-        version: 0.0.5(langchain@0.2.2(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.47.1(encoding@0.1.13))
+        version: 0.0.5(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))
       '@langchain/textsplitters':
-        specifier: 0.0.2
-        version: 0.0.2(langchain@0.2.2(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.47.1(encoding@0.1.13))
+        specifier: 0.0.3
+        version: 0.0.3(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))
       '@mozilla/readability':
         specifier: ^0.5.0
         version: 0.5.0
@@ -329,8 +332,8 @@ importers:
         specifier: 3.9.20
         version: 3.9.20
       '@pinecone-database/pinecone':
-        specifier: 2.2.1
-        version: 2.2.1
+        specifier: 3.0.0
+        version: 3.0.0
       '@qdrant/js-client-rest':
         specifier: 1.9.0
         version: 1.9.0(typescript@5.5.2)
@@ -374,8 +377,8 @@ importers:
         specifier: 2.1.0
         version: 2.1.0
       langchain:
-        specifier: 0.2.2
-        version: 0.2.2(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1)
+        specifier: 0.2.11
+        version: 0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1)
       lodash:
         specifier: 4.17.21
         version: 4.17.21
@@ -389,8 +392,8 @@ importers:
         specifier: workspace:*
         version: link:../../workflow
       openai:
-        specifier: 4.47.1
-        version: 4.47.1(encoding@0.1.13)
+        specifier: 4.53.0
+        version: 4.53.0(encoding@0.1.13)
       pdf-parse:
         specifier: 1.1.1
         version: 1.1.1
@@ -1668,8 +1671,8 @@ importers:
         version: 0.6.2
     devDependencies:
       '@langchain/core':
-        specifier: ^0.2.9
-        version: 0.2.9(langchain@0.2.3(axios@1.6.7)(jsdom@23.0.1)(openai@4.52.1))(openai@4.52.1)
+        specifier: ^0.2.18
+        version: 0.2.18(langchain@0.2.11(axios@1.6.7)(jsdom@23.0.1)(openai@4.53.0))(openai@4.53.0)
       '@types/deep-equal':
         specifier: ^1.0.1
         version: 1.0.1
@@ -1722,8 +1725,8 @@ packages:
   '@antfu/utils@0.7.10':
     resolution: {integrity: sha512-+562v9k4aI80m1+VuMHehNJWLOFjBnXn3tdOitzD0il5b7smkSBal4+a3oKiQTbrwMmN/TBUMDvbdoWDehgOww==}
 
-  '@anthropic-ai/sdk@0.21.1':
-    resolution: {integrity: sha512-fqdt74RTdplnaFOYhwNjjK/Ec09Dqv9ekYr7PuC6GdhV1RWkziqbpJBewn42CYYqCr92JeX6g+IXVgXmq9l7XQ==}
+  '@anthropic-ai/sdk@0.22.0':
+    resolution: {integrity: sha512-dv4BCC6FZJw3w66WNLsHlUFjhu19fS1L/5jMPApwhZLa/Oy1j0A2i3RypmDtHEPp4Wwg3aZkSHksp7VzYWjzmw==}
 
   '@apidevtools/json-schema-ref-parser@9.1.2':
     resolution: {integrity: sha512-r1w81DpR+KyRWd3f+rk6TNqMgedmAxZP5v5KWlXQWlgMUUtyEJch0DKEci1SorPMiSeM8XPl7MZ3miJ60JIpQg==}
@@ -3231,11 +3234,11 @@ packages:
   '@gar/promisify@1.1.3':
     resolution: {integrity: sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==}
 
-  '@getzep/zep-cloud@1.0.6':
-    resolution: {integrity: sha512-AQCkOb4raRrRglfS6ESvukUay5z1bugakFhGcPswKtvUL/Dbwb7jQkJxN0mJO8iqoxbacOBDuC8n61ZoxHUy2w==}
+  '@getzep/zep-cloud@1.0.11':
+    resolution: {integrity: sha512-rJLGzoQoOWmW+IMmfmTerR3P/W1VbTLGD022KKn1j9Cdv98Nb/lKBp+vFKUg9s/IDSz4s7xjMI2lZJzRN9Tz+Q==}
     peerDependencies:
-      '@langchain/core': ~0.1.29
-      langchain: ~0.1.19
+      '@langchain/core': '>=0.1.29 <0.3.0'
+      langchain: '>=0.1.19 <0.3.0'
     peerDependenciesMeta:
       '@langchain/core':
         optional: true
@@ -3519,16 +3522,16 @@ packages:
   '@kwsites/promise-deferred@1.1.1':
     resolution: {integrity: sha512-GaHYm+c0O9MjZRu0ongGBRbinu8gVAMd2UZjji6jVmqKtZluZnptXGWhz1E8j8D2HJ3f/yMxKAUC0b+57wncIw==}
 
-  '@langchain/anthropic@0.1.21':
-    resolution: {integrity: sha512-7L5UDhO93UYfBwdaGxIqc5ZGSQ4wgMyYdENflLYhA9Aeho+BSHd0Krqh6zEHNGy4p+OrCElyDy58G8yiDEpxvw==}
+  '@langchain/anthropic@0.2.9':
+    resolution: {integrity: sha512-i0ZXDPVvQUhpsQjKEYwrMHlhr0Z/q+Dzgidn/5c1v3n2LhJ8SjZVc6vugFvVxl0m8HlkuHxhIOlG5APVbyKjYg==}
     engines: {node: '>=18'}
 
   '@langchain/cohere@0.0.10':
     resolution: {integrity: sha512-qGeYeDKu6Itago3uSmVPjYD7BjHnA5miCYT3v4oRTXz2mDON4IrQit6Uk5dERLSrMKOrHCnRE9LYJEAyvo0s0Q==}
     engines: {node: '>=18'}
 
-  '@langchain/community@0.2.13':
-    resolution: {integrity: sha512-f0GZCGM5XP0r+H643GpUU4YelKHsUdhUY1Kb8rKpCoy8zgs1nUkiYDVylAf0ezwUOT4NYCEuwpw0jj8hQSLn1Q==}
+  '@langchain/community@0.2.20':
+    resolution: {integrity: sha512-3RyaH2CoFzn+2d9aDjHVFqK9499aL5BUixjFVJ8dGcarMN1vpgdLqkUMrJnpgZ06o7+SHhD8mvMmsMLSNSc4yA==}
     engines: {node: '>=18'}
     peerDependencies:
       '@aws-crypto/sha256-js': ^5.0.0
@@ -3557,6 +3560,7 @@ packages:
       '@google-cloud/storage': ^6.10.1 || ^7.7.0
       '@gradientai/nodejs-sdk': ^1.2.0
       '@huggingface/inference': ^2.6.4
+      '@langchain/langgraph': ~0.0.26
       '@layerup/layerup-security': ^1.5.12
       '@mendable/firecrawl-js': ^0.0.13
       '@mlc-ai/web-llm': 0.2.46
@@ -3587,10 +3591,10 @@ packages:
       '@vercel/postgres': ^0.5.0
       '@writerai/writer-sdk': ^0.40.2
       '@xata.io/client': ^0.28.0
-      '@xenova/transformers': ^2.5.4
+      '@xenova/transformers': ^2.17.2
       '@zilliz/milvus2-sdk-node': '>=2.3.5'
       apify-client: ^2.7.1
-      assemblyai: ^4.0.0
+      assemblyai: ^4.6.0
       better-sqlite3: '>=9.4.0 <12.0.0'
       cassandra-driver: ^4.7.2
       cborg: ^4.1.1
@@ -3704,6 +3708,8 @@ packages:
         optional: true
       '@huggingface/inference':
         optional: true
+      '@langchain/langgraph':
+        optional: true
       '@layerup/layerup-security':
         optional: true
       '@mendable/firecrawl-js':
@@ -3893,44 +3899,44 @@ packages:
       youtubei.js:
         optional: true
 
-  '@langchain/core@0.2.9':
-    resolution: {integrity: sha512-pJshopBZqMNF020q0OrrO+vfApWTZUlZecRYMM7TWA5M8/zvEyU/mgA9DlzeRjjDmG6pwF6dIKVjpl6fIGVXlQ==}
+  '@langchain/core@0.2.18':
+    resolution: {integrity: sha512-ru542BwNcsnDfjTeDbIkFIchwa54ctHZR+kVrC8U9NPS9/36iM8p8ruprOV7Zccj/oxtLE5UpEhV+9MZhVcFlA==}
     engines: {node: '>=18'}
 
-  '@langchain/google-common@0.0.19':
-    resolution: {integrity: sha512-Nw6b2NqHERGpnpf9eB3ZucYUQlApUjxJg82hkIj46fxu3r6Vyva//9zJSecpvtC1nASPQS/fcM9lM9Or1gaWBg==}
+  '@langchain/google-common@0.0.22':
+    resolution: {integrity: sha512-LE2IWgjDsif5mjrG/EeHCfK/fnDIbuDYtBLC+Fk4MDJAsztB11A6w5F0Ms86M0BcJrt5ni4FkuG3kocvvVG2nQ==}
     engines: {node: '>=18'}
 
-  '@langchain/google-gauth@0.0.19':
-    resolution: {integrity: sha512-T8kTEeIRIYkdZC7RfdfbWBuH7uz3PztDU0X0o9dlQDFlGdln4bSsnvprTN8eiUQ8AVsNCRnfh0WIOyv89qzJFA==}
+  '@langchain/google-gauth@0.0.21':
+    resolution: {integrity: sha512-2vaWACcocuklCL6XtRnTJD/QkrOmv/rF9yHibeDo4QGMbKzCrA9/TXE9T9N6hRl6tQD5qH2IR2rAp/f8ZUSfIQ==}
     engines: {node: '>=18'}
 
-  '@langchain/google-genai@0.0.16':
-    resolution: {integrity: sha512-aUHEeY7sTwxNqj7L5scvnOhNLOKPVSvf7HR6p1Y3M7BPyU63fXP7faB+qyuHmibtKU8pj+ApoXPpjRflYKSv4w==}
+  '@langchain/google-genai@0.0.23':
+    resolution: {integrity: sha512-MTSCJEoKsfU1inz0PWvAjITdNFM4s41uvBCwLpcgx3jWJIEisczFD82x86ahYqJlb2fD6tohYSaCH/4tKAdkXA==}
     engines: {node: '>=18'}
 
-  '@langchain/google-vertexai@0.0.19':
-    resolution: {integrity: sha512-yqXi0S44dtwmdgHfQZ80A7MsIUJR97I5QUe1urorfUvN42s2NMM1PTY+3VHFtVpUPV9506Pp2+/Fg7NEQz/cDw==}
+  '@langchain/google-vertexai@0.0.21':
+    resolution: {integrity: sha512-G1whuGxqs3Bj+qV62SIoYSlJxOr12nOqY/1pIqRha1X5AdLc4J1jlQcLQkkKguS94U6Uqhx6IjNtxPF9O/rWPQ==}
     engines: {node: '>=18'}
 
-  '@langchain/groq@0.0.12':
-    resolution: {integrity: sha512-qgrVBdUnK9Qe8fzMc9gmMPGzc/8swDYbQuHoqsZmeK7M3wxEPR60rKdZvbbkFzqn+1NdquyRTeVKSgihPCib5Q==}
+  '@langchain/groq@0.0.15':
+    resolution: {integrity: sha512-JN6dlPNHZEFKc8JjQzO+H7IqCpcE3s/1nYnb+sHxpc22Amr3yxXgp6CvanLhmD+R8Wj1AE1vG7AkzjM8MLtv+A==}
     engines: {node: '>=18'}
 
-  '@langchain/mistralai@0.0.22':
-    resolution: {integrity: sha512-cZ+HBz32Gq2zjkXcDs5hDnr8W0QxlRXhWAXu9zepwzLNe3aXxAD/lhz9l654o2fo89bqnuhtYgbGx8ZVYcDvCw==}
+  '@langchain/mistralai@0.0.27':
+    resolution: {integrity: sha512-dMFqUanzrNyFjMZ2PyVbu37lHOSeWfhYsrZqwbgavEu6/WPP4RJW9SvsKJ4pyDd2KF4eoTg+GmkFvluuTDiWOg==}
     engines: {node: '>=18'}
 
-  '@langchain/openai@0.0.33':
-    resolution: {integrity: sha512-hTBo9y9bHtFvMT5ySBW7TrmKhLSA91iNahigeqAFBVrLmBDz+6rzzLFc1mpq6JEAR3fZKdaUXqso3nB23jIpTw==}
+  '@langchain/ollama@0.0.2':
+    resolution: {integrity: sha512-RMgEensnUeL9+4/5Z2v8E2bjEazyq0THQtYEXF9M4cd2DRwIwq9KJmQMLwOqIZO4vNVWJd5Vn4v17ZRnikGytg==}
     engines: {node: '>=18'}
 
-  '@langchain/openai@0.1.3':
-    resolution: {integrity: sha512-riv/JC9x2A8b7GcHu8sx+mlZJ8KAwSSi231IPTlcciYnKozmrQ5H0vrtiD31fxiDbaRsk7tyCpkSBIOQEo7CyQ==}
+  '@langchain/openai@0.2.5':
+    resolution: {integrity: sha512-gQXS5VBFyAco0jgSnUVan6fYVSIxlffmDaeDGpXrAmz2nQPgiN/h24KYOt2NOZ1zRheRzRuO/CfRagMhyVUaFA==}
     engines: {node: '>=18'}
 
-  '@langchain/pinecone@0.0.6':
-    resolution: {integrity: sha512-iSi+3DZwK/ocwRVNDAAzjC9oa3E4yRlcgx53GSZ/w22QdDfb5PsxQoOXeqviEwUejLsGawbbex2ip1J4LKJ4/g==}
+  '@langchain/pinecone@0.0.8':
+    resolution: {integrity: sha512-pV23SUebsNoMDOKbervrFNzCD48KVPLRd85jl/k6Ir8fLJDYmvon76T/SyBbrxZBDmWTaszq/LMwtJTh/VyUJg==}
     engines: {node: '>=18'}
 
   '@langchain/qdrant@0.0.5':
@@ -3941,8 +3947,8 @@ packages:
     resolution: {integrity: sha512-Jleqg5nbZ4795r8ctdwawafjJs4/1gdQnpcz1VnQEBrGqPne+4jwuwBDzeMhByMBLRBB/I6jaiVs9t5wi5H7Tg==}
     engines: {node: '>=18'}
 
-  '@langchain/textsplitters@0.0.2':
-    resolution: {integrity: sha512-6bQOuYHTGYlkgPY/8M5WPq4nnXZpEysGzRopQCYjg2WLcEoIPUMMrXsAaNNdvU3BOeMrhin8izvpDPD165hX6Q==}
+  '@langchain/textsplitters@0.0.3':
+    resolution: {integrity: sha512-cXWgKE3sdWLSqAa8ykbCcUsUF1Kyr5J3HOWYGuobhPEycXW4WI++d5DhzdpL238mzoEXTi90VqfSCra37l5YqA==}
     engines: {node: '>=18'}
 
   '@lezer/common@1.1.0':
@@ -3998,8 +4004,8 @@ packages:
   '@miragejs/pretender-node-polyfill@0.1.2':
     resolution: {integrity: sha512-M/BexG/p05C5lFfMunxo/QcgIJnMT2vDVCd00wNqK2ImZONIlEETZwWJu1QtLxtmYlSHlCFl3JNzp0tLe7OJ5g==}
 
-  '@mistralai/mistralai@0.1.3':
-    resolution: {integrity: sha512-WUHxC2xdeqX9PTXJEqdiNY54vT2ir72WSJrZTTBKRnkfhX6zIfCYA24faRlWjUB5WTpn+wfdGsTMl3ArijlXFA==}
+  '@mistralai/mistralai@0.4.0':
+    resolution: {integrity: sha512-KmFzNro1RKxIFh19J3osmUQhucefBBauMXN5fa9doG6dT9OHR/moBvvn+riVlR7c0AVfuxO8Dfa03AyLYYzbyg==}
 
   '@mongodb-js/saslprep@1.1.0':
     resolution: {integrity: sha512-Xfijy7HvfzzqiOAhAepF4SGN5e9leLkMvg/OPOF97XemjfVCYN/oWa75wnkc6mltMSTwY+XlbhWgUOJmkFspSw==}
@@ -4185,9 +4191,9 @@ packages:
   '@otplib/preset-v11@12.0.1':
     resolution: {integrity: sha512-9hSetMI7ECqbFiKICrNa4w70deTUfArtwXykPUvSHWOdzOlfa9ajglu7mNCntlvxycTiOAXkQGwjQCzzDEMRMg==}
 
-  '@pinecone-database/pinecone@2.2.1':
-    resolution: {integrity: sha512-8i6oT8EzYLlxi5Th4tJ8Cae+VPyHzlEsiVSxCOEx+EahbzaiWmpQMZSmO/RlXF/dOjOI+pXvqfcFYcF1awtPlw==}
-    engines: {node: '>=14.0.0'}
+  '@pinecone-database/pinecone@3.0.0':
+    resolution: {integrity: sha512-ppBRr9MZRW8U2eww3QU1s5oTa0sXbaHrRJRS8x1++WVUPclcb6T6me/5sv9cLZDvldvsZY26k3fnrEoXLNnPUQ==}
+    engines: {node: '>=18.0.0'}
 
   '@pinia/testing@0.1.3':
     resolution: {integrity: sha512-D2Ds2s69kKFaRf2KCcP1NhNZEg5+we59aRyQalwRm7ygWfLM25nDH66267U3hNvRUOTx8ofL24GzodZkOmB5xw==}
@@ -9241,8 +9247,8 @@ packages:
   kuler@2.0.0:
     resolution: {integrity: sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A==}
 
-  langchain@0.2.2:
-    resolution: {integrity: sha512-4tt2QuwW8AXdIL8CRkQeGOCoYYH3QbLHfQ09yD0iWLV1rwUYJ8mIYFAz/+u6CB8YNEyR/HI105s4xrxFQbWa9g==}
+  langchain@0.2.11:
+    resolution: {integrity: sha512-6FQWKNAXuTmwuhHHMOmurLo8pydSRu5C/FwCYvYbR4ulCLqcsj+jre/kfXvA5BdHOZHNo6oQn0/5kxDNnhxMUA==}
     engines: {node: '>=18'}
     peerDependencies:
       '@aws-sdk/client-s3': ^3.310.0
@@ -9254,7 +9260,16 @@ packages:
       '@gomomento/sdk': ^1.51.1
       '@gomomento/sdk-core': ^1.51.1
       '@gomomento/sdk-web': ^1.51.1
-      '@google-ai/generativelanguage': ^2.5.0
+      '@langchain/anthropic': '*'
+      '@langchain/aws': '*'
+      '@langchain/cohere': '*'
+      '@langchain/community': '*'
+      '@langchain/google-genai': '*'
+      '@langchain/google-vertexai': '*'
+      '@langchain/google-vertexai-web': '*'
+      '@langchain/groq': '*'
+      '@langchain/mistralai': '*'
+      '@langchain/ollama': '*'
       '@mendable/firecrawl-js': ^0.0.13
       '@notionhq/client': ^2.2.10
       '@pinecone-database/pinecone': '*'
@@ -9262,7 +9277,7 @@ packages:
       '@vercel/kv': ^0.2.3
       '@xata.io/client': ^0.28.0
       apify-client: ^2.7.1
-      assemblyai: ^4.0.0
+      assemblyai: ^4.6.0
       axios: 1.6.7
       cheerio: ^1.0.0-rc.12
       chromadb: '*'
@@ -9290,7 +9305,7 @@ packages:
       redis: ^4.6.4
       sonix-speech-recognition: ^2.1.1
       srt-parser-2: ^1.2.3
-      typeorm: ^0.3.12
+      typeorm: ^0.3.20
       weaviate-ts-client: '*'
       web-auth-library: ^1.0.3
       ws: '>=8.17.1'
@@ -9315,163 +9330,25 @@ packages:
         optional: true
       '@gomomento/sdk-web':
         optional: true
-      '@google-ai/generativelanguage':
-        optional: true
-      '@mendable/firecrawl-js':
-        optional: true
-      '@notionhq/client':
-        optional: true
-      '@pinecone-database/pinecone':
-        optional: true
-      '@supabase/supabase-js':
-        optional: true
-      '@vercel/kv':
-        optional: true
-      '@xata.io/client':
-        optional: true
-      apify-client:
-        optional: true
-      assemblyai:
-        optional: true
-      axios:
-        optional: true
-      cheerio:
-        optional: true
-      chromadb:
-        optional: true
-      convex:
-        optional: true
-      couchbase:
-        optional: true
-      d3-dsv:
-        optional: true
-      epub2:
-        optional: true
-      faiss-node:
-        optional: true
-      fast-xml-parser:
-        optional: true
-      handlebars:
-        optional: true
-      html-to-text:
-        optional: true
-      ignore:
-        optional: true
-      ioredis:
-        optional: true
-      jsdom:
-        optional: true
-      mammoth:
-        optional: true
-      mongodb:
-        optional: true
-      node-llama-cpp:
-        optional: true
-      notion-to-md:
-        optional: true
-      officeparser:
-        optional: true
-      pdf-parse:
-        optional: true
-      peggy:
-        optional: true
-      playwright:
-        optional: true
-      puppeteer:
-        optional: true
-      pyodide:
-        optional: true
-      redis:
-        optional: true
-      sonix-speech-recognition:
-        optional: true
-      srt-parser-2:
-        optional: true
-      typeorm:
-        optional: true
-      weaviate-ts-client:
-        optional: true
-      web-auth-library:
-        optional: true
-      ws:
-        optional: true
-      youtube-transcript:
+      '@langchain/anthropic':
         optional: true
-      youtubei.js:
+      '@langchain/aws':
         optional: true
-
-  langchain@0.2.3:
-    resolution: {integrity: sha512-T9xR7zd+Nj0oXy6WoYKmZLy0DlQiDLFPGYWdOXDxy+AvqlujoPdVQgDSpdqiOHvAjezrByAoKxoHCz5XMwTP/Q==}
-    engines: {node: '>=18'}
-    peerDependencies:
-      '@aws-sdk/client-s3': ^3.310.0
-      '@aws-sdk/client-sagemaker-runtime': ^3.310.0
-      '@aws-sdk/client-sfn': ^3.310.0
-      '@aws-sdk/credential-provider-node': ^3.388.0
-      '@azure/storage-blob': ^12.15.0
-      '@browserbasehq/sdk': '*'
-      '@gomomento/sdk': ^1.51.1
-      '@gomomento/sdk-core': ^1.51.1
-      '@gomomento/sdk-web': ^1.51.1
-      '@mendable/firecrawl-js': ^0.0.13
-      '@notionhq/client': ^2.2.10
-      '@pinecone-database/pinecone': '*'
-      '@supabase/supabase-js': ^2.10.0
-      '@vercel/kv': ^0.2.3
-      '@xata.io/client': ^0.28.0
-      apify-client: ^2.7.1
-      assemblyai: ^4.0.0
-      axios: 1.6.7
-      cheerio: ^1.0.0-rc.12
-      chromadb: '*'
-      convex: ^1.3.1
-      couchbase: ^4.3.0
-      d3-dsv: ^2.0.0
-      epub2: ^3.0.1
-      faiss-node: '*'
-      fast-xml-parser: '*'
-      handlebars: ^4.7.8
-      html-to-text: ^9.0.5
-      ignore: ^5.2.0
-      ioredis: ^5.3.2
-      jsdom: '*'
-      mammoth: ^1.6.0
-      mongodb: '>=5.2.0'
-      node-llama-cpp: '*'
-      notion-to-md: ^3.1.0
-      officeparser: ^4.0.4
-      pdf-parse: 1.1.1
-      peggy: ^3.0.2
-      playwright: ^1.32.1
-      puppeteer: ^19.7.2
-      pyodide: ^0.24.1
-      redis: ^4.6.4
-      sonix-speech-recognition: ^2.1.1
-      srt-parser-2: ^1.2.3
-      typeorm: ^0.3.12
-      weaviate-ts-client: '*'
-      web-auth-library: ^1.0.3
-      ws: '>=8.17.1'
-      youtube-transcript: ^1.0.6
-      youtubei.js: ^9.1.0
-    peerDependenciesMeta:
-      '@aws-sdk/client-s3':
-        optional: true
-      '@aws-sdk/client-sagemaker-runtime':
+      '@langchain/cohere':
         optional: true
-      '@aws-sdk/client-sfn':
+      '@langchain/community':
         optional: true
-      '@aws-sdk/credential-provider-node':
+      '@langchain/google-genai':
         optional: true
-      '@azure/storage-blob':
+      '@langchain/google-vertexai':
         optional: true
-      '@browserbasehq/sdk':
+      '@langchain/google-vertexai-web':
         optional: true
-      '@gomomento/sdk':
+      '@langchain/groq':
         optional: true
-      '@gomomento/sdk-core':
+      '@langchain/mistralai':
         optional: true
-      '@gomomento/sdk-web':
+      '@langchain/ollama':
         optional: true
       '@mendable/firecrawl-js':
         optional: true
@@ -9559,9 +9436,6 @@ packages:
   langchainhub@0.0.8:
     resolution: {integrity: sha512-Woyb8YDHgqqTOZvWIbm2CaFDGfZ4NTSyXV687AG4vXEfoNo7cGQp7nhl7wL3ehenKWmNEmcxCLgOZzW8jE6lOQ==}
 
-  langsmith@0.1.12:
-    resolution: {integrity: sha512-ActVB73EPOIXNbtM8Xm+hjX/ZX39EOnNaCOVaRY/LZQiFDH6+ZbPd4hRm6FfwaXe1zhGqP9nKS3JtVTGY1S+VA==}
-
   langsmith@0.1.34:
     resolution: {integrity: sha512-aMv2k8kEaovhTuZnK6/6DMCoM7Jurvm1AzdESn+yN+HramRxp3sK32jFRz3ogkXP6GjAjOIofcnNkzhHXSUXGA==}
     peerDependencies:
@@ -9576,6 +9450,20 @@ packages:
       openai:
         optional: true
 
+  langsmith@0.1.39:
+    resolution: {integrity: sha512-K2/qbc96JhrZbSL74RbZ0DBOpTB9Mxicu8RQrZ88Xsp1bH2O3+y5EdcvC0g/1YzQWQhcQ4peknCA24c3VTNiNA==}
+    peerDependencies:
+      '@langchain/core': '*'
+      langchain: '*'
+      openai: '*'
+    peerDependenciesMeta:
+      '@langchain/core':
+        optional: true
+      langchain:
+        optional: true
+      openai:
+        optional: true
+
   lazy-ass@1.6.0:
     resolution: {integrity: sha512-cc8oEVoctTvsFZ/Oje/kGnHbpWHYBe8IAJe4C0QNc3t8uM/0Y8+erSz/7Y1ALuXTEZTMvxXwO6YbX1ey3ujiZw==}
     engines: {node: '> 0.8'}
@@ -10508,6 +10396,9 @@ packages:
   obuf@1.1.2:
     resolution: {integrity: sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==}
 
+  ollama@0.5.6:
+    resolution: {integrity: sha512-4BySAMt96+OCt4emL6DE78UBCGqC7GvteM9LRCd6WwJyefn0x9w2BrcUcLm9nJ9bYpRsmkhf0Au18Q5MhsA14w==}
+
   on-finished@2.4.1:
     resolution: {integrity: sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==}
     engines: {node: '>= 0.8'}
@@ -10541,12 +10432,8 @@ packages:
     resolution: {integrity: sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==}
     engines: {node: '>=12'}
 
-  openai@4.47.1:
-    resolution: {integrity: sha512-WWSxhC/69ZhYWxH/OBsLEirIjUcfpQ5+ihkXKp06hmeYXgBBIUCa9IptMzYx6NdkiOCsSGYCnTIsxaic3AjRCQ==}
-    hasBin: true
-
-  openai@4.52.1:
-    resolution: {integrity: sha512-kv2hevAWZZ3I/vd2t8znGO2rd8wkowncsfcYpo8i+wU9ML+JEcdqiViANXXjWWGjIhajFNixE6gOY1fEgqILAg==}
+  openai@4.53.0:
+    resolution: {integrity: sha512-XoMaJsSLuedW5eoMEMmZbdNoXgML3ujcU5KfwRnC6rnbmZkHE2Q4J/SArwhqCxQRqJwHnQUj1LpiROmKPExZJA==}
     hasBin: true
 
   openapi-sampler@1.4.0:
@@ -12785,6 +12672,10 @@ packages:
   uuencode@0.0.4:
     resolution: {integrity: sha512-yEEhCuCi5wRV7Z5ZVf9iV2gWMvUZqKJhAs1ecFdKJ0qzbyaVelmsE3QjYAamehfp9FKLiZbKldd+jklG3O0LfA==}
 
+  uuid@10.0.0:
+    resolution: {integrity: sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==}
+    hasBin: true
+
   uuid@8.3.2:
     resolution: {integrity: sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==}
     hasBin: true
@@ -12921,8 +12812,8 @@ packages:
   vue-component-type-helpers@2.0.19:
     resolution: {integrity: sha512-cN3f1aTxxKo4lzNeQAkVopswuImUrb5Iurll9Gaw5cqpnbTAxtEMM1mgi6ou4X79OCyqYv1U1mzBHJkzmiK82w==}
 
-  vue-component-type-helpers@2.0.28:
-    resolution: {integrity: sha512-hoK0UsKXrXDY9zdpdk+drqOqYHpPhbmfQUJ2mFYK57+l73mQxcYyCteQsolllwGaxhWihT077+OA/FR5ZPTceg==}
+  vue-component-type-helpers@2.0.29:
+    resolution: {integrity: sha512-58i+ZhUAUpwQ+9h5Hck0D+jr1qbYl4voRt5KffBx8qzELViQ4XdT/Tuo+mzq8u63teAG8K0lLaOiL5ofqW38rg==}
 
   vue-demi@0.14.5:
     resolution: {integrity: sha512-o9NUVpl/YlsGJ7t+xuqJKx8EBGf1quRhCiT6D/J0pfwmk9zUwYkC7yrF4SZCe6fETvSM3UNL2edcbYrSyc4QHA==}
@@ -13083,6 +12974,9 @@ packages:
     resolution: {integrity: sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==}
     engines: {node: '>=18'}
 
+  whatwg-fetch@3.6.20:
+    resolution: {integrity: sha512-EqhiFU6daOA8kpjOWTL0olhVOF3i7OrFzSYiGsEMB8GcXS+RrzauAERX65xMeNWVqxA6HXH2m69Z9LaKKdisfg==}
+
   whatwg-mimetype@3.0.0:
     resolution: {integrity: sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==}
     engines: {node: '>=12'}
@@ -13378,7 +13272,7 @@ snapshots:
 
   '@antfu/utils@0.7.10': {}
 
-  '@anthropic-ai/sdk@0.21.1(encoding@0.1.13)':
+  '@anthropic-ai/sdk@0.22.0(encoding@0.1.13)':
     dependencies:
       '@types/node': 18.16.16
       '@types/node-fetch': 2.6.4
@@ -15841,16 +15735,16 @@ snapshots:
   '@gar/promisify@1.1.3':
     optional: true
 
-  ? '@getzep/zep-cloud@1.0.6(@langchain/core@0.2.9(langchain@0.2.2(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.47.1(encoding@0.1.13)))(encoding@0.1.13)(langchain@0.2.2(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))'
-  : dependencies:
+  '@getzep/zep-cloud@1.0.11(@langchain/core@0.2.18)(encoding@0.1.13)(langchain@0.2.11)':
+    dependencies:
       form-data: 4.0.0
       node-fetch: 2.7.0(encoding@0.1.13)
       qs: 6.11.2
       url-join: 4.0.1
       zod: 3.23.8
     optionalDependencies:
-      '@langchain/core': 0.2.9(langchain@0.2.2(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.47.1(encoding@0.1.13))
-      langchain: 0.2.2(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1)
+      '@langchain/core': 0.2.18(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))
+      langchain: 0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1)
     transitivePeerDependencies:
       - encoding
 
@@ -16281,10 +16175,10 @@ snapshots:
 
   '@kwsites/promise-deferred@1.1.1': {}
 
-  '@langchain/anthropic@0.1.21(encoding@0.1.13)(langchain@0.2.2(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.47.1(encoding@0.1.13))':
+  '@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))':
     dependencies:
-      '@anthropic-ai/sdk': 0.21.1(encoding@0.1.13)
-      '@langchain/core': 0.2.9(langchain@0.2.2(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.47.1(encoding@0.1.13))
+      '@anthropic-ai/sdk': 0.22.0(encoding@0.1.13)
+      '@langchain/core': 0.2.18(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))
       fast-xml-parser: 4.3.5
       zod: 3.23.8
       zod-to-json-schema: 3.23.0(zod@3.23.8)
@@ -16294,39 +16188,39 @@ snapshots:
       - openai
       - supports-color
 
-  '@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.2(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.47.1(encoding@0.1.13))':
+  '@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))':
     dependencies:
-      '@langchain/core': 0.2.9(langchain@0.2.2(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.47.1(encoding@0.1.13))
+      '@langchain/core': 0.2.18(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))
       cohere-ai: 7.10.1(encoding@0.1.13)
     transitivePeerDependencies:
       - encoding
       - langchain
       - openai
 
-  ? '@langchain/community@0.2.13(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.6(@langchain/core@0.2.9(langchain@0.2.2(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.47.1(encoding@0.1.13)))(encoding@0.1.13)(langchain@0.2.2(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1)))(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@2.2.1)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1)'
+  ? '@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1)'
   : dependencies:
-      '@langchain/core': 0.2.9(langchain@0.2.3(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.47.1(encoding@0.1.13))
-      '@langchain/openai': 0.1.3(encoding@0.1.13)(langchain@0.2.3(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))
+      '@langchain/core': 0.2.18(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))
+      '@langchain/openai': 0.2.5(encoding@0.1.13)(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))
       binary-extensions: 2.2.0
       expr-eval: 2.0.2
       flat: 5.0.2
       js-yaml: 4.1.0
-      langchain: 0.2.3(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1)
-      langsmith: 0.1.34(@langchain/core@0.2.9(langchain@0.2.3(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.47.1(encoding@0.1.13)))(langchain@0.2.3(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.47.1(encoding@0.1.13))
-      uuid: 9.0.1
+      langchain: 0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1)
+      langsmith: 0.1.34(@langchain/core@0.2.18(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13)))(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))
+      uuid: 10.0.0
       zod: 3.23.8
       zod-to-json-schema: 3.23.0(zod@3.23.8)
     optionalDependencies:
       '@aws-sdk/client-bedrock-runtime': 3.535.0
       '@aws-sdk/client-s3': 3.478.0
       '@aws-sdk/credential-provider-node': 3.535.0
-      '@getzep/zep-cloud': 1.0.6(@langchain/core@0.2.9(langchain@0.2.2(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.47.1(encoding@0.1.13)))(encoding@0.1.13)(langchain@0.2.2(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))
+      '@getzep/zep-cloud': 1.0.11(@langchain/core@0.2.18)(encoding@0.1.13)(langchain@0.2.11)
       '@getzep/zep-js': 0.9.0
       '@google-ai/generativelanguage': 2.5.0(encoding@0.1.13)
       '@google-cloud/storage': 6.11.0(encoding@0.1.13)
       '@huggingface/inference': 2.7.0
       '@mozilla/readability': 0.5.0
-      '@pinecone-database/pinecone': 2.2.1
+      '@pinecone-database/pinecone': 3.0.0
       '@qdrant/js-client-rest': 1.9.0(typescript@5.5.2)
       '@smithy/eventstream-codec': 2.2.0
       '@smithy/protocol-http': 3.3.0
@@ -16355,6 +16249,15 @@ snapshots:
       ws: 8.17.1
     transitivePeerDependencies:
       - '@gomomento/sdk-web'
+      - '@langchain/anthropic'
+      - '@langchain/aws'
+      - '@langchain/cohere'
+      - '@langchain/google-genai'
+      - '@langchain/google-vertexai'
+      - '@langchain/google-vertexai-web'
+      - '@langchain/groq'
+      - '@langchain/mistralai'
+      - '@langchain/ollama'
       - axios
       - encoding
       - fast-xml-parser
@@ -16364,111 +16267,56 @@ snapshots:
       - pyodide
       - supports-color
 
-  '@langchain/core@0.2.9(langchain@0.2.2(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.47.1(encoding@0.1.13))':
-    dependencies:
-      ansi-styles: 5.2.0
-      camelcase: 6.3.0
-      decamelize: 1.2.0
-      js-tiktoken: 1.0.12
-      langsmith: 0.1.34(@langchain/core@0.2.9(langchain@0.2.2(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.47.1(encoding@0.1.13)))(langchain@0.2.2(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.47.1(encoding@0.1.13))
-      ml-distance: 4.0.1
-      mustache: 4.2.0
-      p-queue: 6.6.2
-      p-retry: 4.6.2
-      uuid: 9.0.1
-      zod: 3.23.8
-      zod-to-json-schema: 3.23.0(zod@3.23.8)
-    transitivePeerDependencies:
-      - langchain
-      - openai
-
-  '@langchain/core@0.2.9(langchain@0.2.3(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.47.1(encoding@0.1.13))':
-    dependencies:
-      ansi-styles: 5.2.0
-      camelcase: 6.3.0
-      decamelize: 1.2.0
-      js-tiktoken: 1.0.12
-      langsmith: 0.1.34(@langchain/core@0.2.9(langchain@0.2.3(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.47.1(encoding@0.1.13)))(langchain@0.2.3(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.47.1(encoding@0.1.13))
-      ml-distance: 4.0.1
-      mustache: 4.2.0
-      p-queue: 6.6.2
-      p-retry: 4.6.2
-      uuid: 9.0.1
-      zod: 3.23.8
-      zod-to-json-schema: 3.23.0(zod@3.23.8)
-    transitivePeerDependencies:
-      - langchain
-      - openai
-
-  '@langchain/core@0.2.9(langchain@0.2.3(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.52.1(encoding@0.1.13))':
-    dependencies:
-      ansi-styles: 5.2.0
-      camelcase: 6.3.0
-      decamelize: 1.2.0
-      js-tiktoken: 1.0.12
-      langsmith: 0.1.34(@langchain/core@0.2.9(langchain@0.2.3(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.52.1(encoding@0.1.13)))(langchain@0.2.3(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.52.1(encoding@0.1.13))
-      ml-distance: 4.0.1
-      mustache: 4.2.0
-      p-queue: 6.6.2
-      p-retry: 4.6.2
-      uuid: 9.0.1
-      zod: 3.23.8
-      zod-to-json-schema: 3.23.0(zod@3.23.8)
-    transitivePeerDependencies:
-      - langchain
-      - openai
-
-  '@langchain/core@0.2.9(langchain@0.2.3(axios@1.6.7)(jsdom@23.0.1)(openai@4.52.1))(openai@4.47.1)':
-    dependencies:
+  ? '@langchain/core@0.2.18(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))'
+  : dependencies:
       ansi-styles: 5.2.0
       camelcase: 6.3.0
       decamelize: 1.2.0
       js-tiktoken: 1.0.12
-      langsmith: 0.1.34(@langchain/core@0.2.9(langchain@0.2.3(axios@1.6.7)(jsdom@23.0.1)(openai@4.52.1))(openai@4.47.1))(langchain@0.2.3(axios@1.6.7)(jsdom@23.0.1)(openai@4.52.1))(openai@4.47.1)
+      langsmith: 0.1.39(@langchain/core@0.2.18(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13)))(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))
       ml-distance: 4.0.1
       mustache: 4.2.0
       p-queue: 6.6.2
       p-retry: 4.6.2
-      uuid: 9.0.1
+      uuid: 10.0.0
       zod: 3.23.8
       zod-to-json-schema: 3.23.0(zod@3.23.8)
     transitivePeerDependencies:
       - langchain
       - openai
-    optional: true
 
-  '@langchain/core@0.2.9(langchain@0.2.3(axios@1.6.7)(jsdom@23.0.1)(openai@4.52.1))(openai@4.52.1)':
+  '@langchain/core@0.2.18(langchain@0.2.11(axios@1.6.7)(jsdom@23.0.1)(openai@4.53.0))(openai@4.53.0)':
     dependencies:
       ansi-styles: 5.2.0
       camelcase: 6.3.0
       decamelize: 1.2.0
       js-tiktoken: 1.0.12
-      langsmith: 0.1.34(@langchain/core@0.2.9(langchain@0.2.3(axios@1.6.7)(jsdom@23.0.1)(openai@4.52.1))(openai@4.52.1))(langchain@0.2.3(axios@1.6.7)(jsdom@23.0.1)(openai@4.52.1))(openai@4.52.1)
+      langsmith: 0.1.39(@langchain/core@0.2.18(langchain@0.2.11(axios@1.6.7)(jsdom@23.0.1)(openai@4.53.0))(openai@4.53.0))(langchain@0.2.11(axios@1.6.7)(jsdom@23.0.1)(openai@4.53.0))(openai@4.53.0)
       ml-distance: 4.0.1
       mustache: 4.2.0
       p-queue: 6.6.2
       p-retry: 4.6.2
-      uuid: 9.0.1
+      uuid: 10.0.0
       zod: 3.23.8
       zod-to-json-schema: 3.23.0(zod@3.23.8)
     transitivePeerDependencies:
       - langchain
       - openai
 
-  '@langchain/google-common@0.0.19(langchain@0.2.2(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.47.1(encoding@0.1.13))(zod@3.23.8)':
-    dependencies:
-      '@langchain/core': 0.2.9(langchain@0.2.2(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.47.1(encoding@0.1.13))
-      uuid: 9.0.1
+  ? '@langchain/google-common@0.0.22(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))(zod@3.23.8)'
+  : dependencies:
+      '@langchain/core': 0.2.18(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))
+      uuid: 10.0.0
       zod-to-json-schema: 3.23.0(zod@3.23.8)
     transitivePeerDependencies:
       - langchain
       - openai
       - zod
 
-  '@langchain/google-gauth@0.0.19(encoding@0.1.13)(langchain@0.2.2(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.47.1(encoding@0.1.13))(zod@3.23.8)':
-    dependencies:
-      '@langchain/core': 0.2.9(langchain@0.2.2(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.47.1(encoding@0.1.13))
-      '@langchain/google-common': 0.0.19(langchain@0.2.2(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.47.1(encoding@0.1.13))(zod@3.23.8)
+  ? '@langchain/google-gauth@0.0.21(encoding@0.1.13)(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))(zod@3.23.8)'
+  : dependencies:
+      '@langchain/core': 0.2.18(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))
+      '@langchain/google-common': 0.0.22(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))(zod@3.23.8)
       google-auth-library: 8.9.0(encoding@0.1.13)
     transitivePeerDependencies:
       - encoding
@@ -16477,20 +16325,20 @@ snapshots:
       - supports-color
       - zod
 
-  '@langchain/google-genai@0.0.16(langchain@0.2.2(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.47.1(encoding@0.1.13))(zod@3.23.8)':
+  '@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8)':
     dependencies:
       '@google/generative-ai': 0.7.1
-      '@langchain/core': 0.2.9(langchain@0.2.2(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.47.1(encoding@0.1.13))
+      '@langchain/core': 0.2.18(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))
       zod-to-json-schema: 3.23.0(zod@3.23.8)
     transitivePeerDependencies:
       - langchain
       - openai
       - zod
 
-  '@langchain/google-vertexai@0.0.19(encoding@0.1.13)(langchain@0.2.2(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.47.1(encoding@0.1.13))(zod@3.23.8)':
+  '@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8)':
     dependencies:
-      '@langchain/core': 0.2.9(langchain@0.2.2(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.47.1(encoding@0.1.13))
-      '@langchain/google-gauth': 0.0.19(encoding@0.1.13)(langchain@0.2.2(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.47.1(encoding@0.1.13))(zod@3.23.8)
+      '@langchain/core': 0.2.18(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))
+      '@langchain/google-gauth': 0.0.21(encoding@0.1.13)(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))(zod@3.23.8)
     transitivePeerDependencies:
       - encoding
       - langchain
@@ -16498,10 +16346,10 @@ snapshots:
       - supports-color
       - zod
 
-  '@langchain/groq@0.0.12(encoding@0.1.13)(langchain@0.2.2(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.47.1(encoding@0.1.13))':
+  '@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))':
     dependencies:
-      '@langchain/core': 0.2.9(langchain@0.2.2(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.47.1(encoding@0.1.13))
-      '@langchain/openai': 0.0.33(encoding@0.1.13)(langchain@0.2.2(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))
+      '@langchain/core': 0.2.18(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))
+      '@langchain/openai': 0.2.5(encoding@0.1.13)(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))
       groq-sdk: 0.3.2(encoding@0.1.13)
       zod: 3.23.8
       zod-to-json-schema: 3.23.0(zod@3.23.8)
@@ -16511,11 +16359,11 @@ snapshots:
       - openai
       - supports-color
 
-  '@langchain/mistralai@0.0.22(encoding@0.1.13)(langchain@0.2.2(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.47.1(encoding@0.1.13))':
+  '@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))':
     dependencies:
-      '@langchain/core': 0.2.9(langchain@0.2.2(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.47.1(encoding@0.1.13))
-      '@mistralai/mistralai': 0.1.3(encoding@0.1.13)
-      uuid: 9.0.1
+      '@langchain/core': 0.2.18(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))
+      '@mistralai/mistralai': 0.4.0(encoding@0.1.13)
+      uuid: 10.0.0
       zod: 3.23.8
       zod-to-json-schema: 3.23.0(zod@3.23.8)
     transitivePeerDependencies:
@@ -16523,23 +16371,20 @@ snapshots:
       - langchain
       - openai
 
-  '@langchain/openai@0.0.33(encoding@0.1.13)(langchain@0.2.2(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))':
+  '@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))':
     dependencies:
-      '@langchain/core': 0.2.9(langchain@0.2.2(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.47.1(encoding@0.1.13))
-      js-tiktoken: 1.0.12
-      openai: 4.47.1(encoding@0.1.13)
-      zod: 3.23.8
-      zod-to-json-schema: 3.23.0(zod@3.23.8)
+      '@langchain/core': 0.2.18(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))
+      ollama: 0.5.6
+      uuid: 10.0.0
     transitivePeerDependencies:
-      - encoding
       - langchain
-      - supports-color
+      - openai
 
-  '@langchain/openai@0.0.33(encoding@0.1.13)(langchain@0.2.3(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))':
-    dependencies:
-      '@langchain/core': 0.2.9(langchain@0.2.3(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.47.1(encoding@0.1.13))
+  ? '@langchain/openai@0.2.5(encoding@0.1.13)(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))'
+  : dependencies:
+      '@langchain/core': 0.2.18(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))
       js-tiktoken: 1.0.12
-      openai: 4.47.1(encoding@0.1.13)
+      openai: 4.53.0(encoding@0.1.13)
       zod: 3.23.8
       zod-to-json-schema: 3.23.0(zod@3.23.8)
     transitivePeerDependencies:
@@ -16547,11 +16392,11 @@ snapshots:
       - langchain
       - supports-color
 
-  '@langchain/openai@0.0.33(langchain@0.2.3(axios@1.6.7)(jsdom@23.0.1)(openai@4.52.1))':
+  '@langchain/openai@0.2.5(langchain@0.2.11(axios@1.6.7)(jsdom@23.0.1)(openai@4.53.0))':
     dependencies:
-      '@langchain/core': 0.2.9(langchain@0.2.3(axios@1.6.7)(jsdom@23.0.1)(openai@4.52.1))(openai@4.47.1)
+      '@langchain/core': 0.2.18(langchain@0.2.11(axios@1.6.7)(jsdom@23.0.1)(openai@4.53.0))(openai@4.53.0)
       js-tiktoken: 1.0.12
-      openai: 4.47.1(encoding@0.1.13)
+      openai: 4.53.0(encoding@0.1.13)
       zod: 3.23.8
       zod-to-json-schema: 3.23.0(zod@3.23.8)
     transitivePeerDependencies:
@@ -16560,31 +16405,19 @@ snapshots:
       - supports-color
     optional: true
 
-  '@langchain/openai@0.1.3(encoding@0.1.13)(langchain@0.2.3(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))':
-    dependencies:
-      '@langchain/core': 0.2.9(langchain@0.2.3(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.52.1(encoding@0.1.13))
-      js-tiktoken: 1.0.12
-      openai: 4.52.1(encoding@0.1.13)
-      zod: 3.23.8
-      zod-to-json-schema: 3.23.0(zod@3.23.8)
-    transitivePeerDependencies:
-      - encoding
-      - langchain
-      - supports-color
-
-  '@langchain/pinecone@0.0.6(langchain@0.2.2(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.47.1(encoding@0.1.13))':
-    dependencies:
-      '@langchain/core': 0.2.9(langchain@0.2.2(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.47.1(encoding@0.1.13))
-      '@pinecone-database/pinecone': 2.2.1
+  ? '@langchain/pinecone@0.0.8(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))'
+  : dependencies:
+      '@langchain/core': 0.2.18(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))
+      '@pinecone-database/pinecone': 3.0.0
       flat: 5.0.2
-      uuid: 9.0.1
+      uuid: 10.0.0
     transitivePeerDependencies:
       - langchain
       - openai
 
-  '@langchain/qdrant@0.0.5(langchain@0.2.2(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.47.1(encoding@0.1.13))(typescript@5.5.2)':
-    dependencies:
-      '@langchain/core': 0.2.9(langchain@0.2.2(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.47.1(encoding@0.1.13))
+  ? '@langchain/qdrant@0.0.5(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))(typescript@5.5.2)'
+  : dependencies:
+      '@langchain/core': 0.2.18(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))
       '@qdrant/js-client-rest': 1.9.0(typescript@5.5.2)
       uuid: 9.0.1
     transitivePeerDependencies:
@@ -16592,33 +16425,25 @@ snapshots:
       - openai
       - typescript
 
-  '@langchain/redis@0.0.5(langchain@0.2.2(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.47.1(encoding@0.1.13))':
-    dependencies:
-      '@langchain/core': 0.2.9(langchain@0.2.2(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.47.1(encoding@0.1.13))
+  ? '@langchain/redis@0.0.5(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))'
+  : dependencies:
+      '@langchain/core': 0.2.18(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))
       redis: 4.6.13
     transitivePeerDependencies:
       - langchain
       - openai
 
-  '@langchain/textsplitters@0.0.2(langchain@0.2.2(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.47.1(encoding@0.1.13))':
-    dependencies:
-      '@langchain/core': 0.2.9(langchain@0.2.2(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.47.1(encoding@0.1.13))
-      js-tiktoken: 1.0.12
-    transitivePeerDependencies:
-      - langchain
-      - openai
-
-  '@langchain/textsplitters@0.0.2(langchain@0.2.3(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.47.1(encoding@0.1.13))':
-    dependencies:
-      '@langchain/core': 0.2.9(langchain@0.2.3(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.47.1(encoding@0.1.13))
+  ? '@langchain/textsplitters@0.0.3(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))'
+  : dependencies:
+      '@langchain/core': 0.2.18(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))
       js-tiktoken: 1.0.12
     transitivePeerDependencies:
       - langchain
       - openai
 
-  '@langchain/textsplitters@0.0.2(langchain@0.2.3(axios@1.6.7)(jsdom@23.0.1)(openai@4.52.1))(openai@4.52.1)':
+  '@langchain/textsplitters@0.0.3(langchain@0.2.11(axios@1.6.7)(jsdom@23.0.1)(openai@4.53.0))(openai@4.53.0)':
     dependencies:
-      '@langchain/core': 0.2.9(langchain@0.2.3(axios@1.6.7)(jsdom@23.0.1)(openai@4.52.1))(openai@4.52.1)
+      '@langchain/core': 0.2.18(langchain@0.2.11(axios@1.6.7)(jsdom@23.0.1)(openai@4.53.0))(openai@4.53.0)
       js-tiktoken: 1.0.12
     transitivePeerDependencies:
       - langchain
@@ -16711,7 +16536,7 @@ snapshots:
 
   '@miragejs/pretender-node-polyfill@0.1.2': {}
 
-  '@mistralai/mistralai@0.1.3(encoding@0.1.13)':
+  '@mistralai/mistralai@0.4.0(encoding@0.1.13)':
     dependencies:
       node-fetch: 2.7.0(encoding@0.1.13)
     transitivePeerDependencies:
@@ -16936,7 +16761,7 @@ snapshots:
       '@otplib/plugin-crypto': 12.0.1
       '@otplib/plugin-thirty-two': 12.0.1
 
-  '@pinecone-database/pinecone@2.2.1':
+  '@pinecone-database/pinecone@3.0.0':
     dependencies:
       '@sinclair/typebox': 0.29.6
       ajv: 8.12.0
@@ -18409,7 +18234,7 @@ snapshots:
       ts-dedent: 2.2.0
       type-fest: 2.19.0
       vue: 3.4.21(typescript@5.5.2)
-      vue-component-type-helpers: 2.0.28
+      vue-component-type-helpers: 2.0.29
     transitivePeerDependencies:
       - encoding
       - prettier
@@ -23664,72 +23489,36 @@ snapshots:
 
   kuler@2.0.0: {}
 
-  langchain@0.2.2(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1):
-    dependencies:
-      '@langchain/core': 0.2.9(langchain@0.2.2(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.47.1(encoding@0.1.13))
-      '@langchain/openai': 0.0.33(encoding@0.1.13)(langchain@0.2.2(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))
-      '@langchain/textsplitters': 0.0.2(langchain@0.2.2(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.47.1(encoding@0.1.13))
-      binary-extensions: 2.2.0
-      js-tiktoken: 1.0.12
-      js-yaml: 4.1.0
-      jsonpointer: 5.0.1
-      langchainhub: 0.0.8
-      langsmith: 0.1.12
-      ml-distance: 4.0.1
-      openapi-types: 12.1.3
-      p-retry: 4.6.2
-      uuid: 9.0.1
-      yaml: 2.3.4
-      zod: 3.23.8
-      zod-to-json-schema: 3.23.0(zod@3.23.8)
-    optionalDependencies:
-      '@aws-sdk/client-s3': 3.478.0
-      '@aws-sdk/credential-provider-node': 3.535.0
-      '@google-ai/generativelanguage': 2.5.0(encoding@0.1.13)
-      '@pinecone-database/pinecone': 2.2.1
-      '@supabase/supabase-js': 2.43.4
-      '@xata.io/client': 0.28.4(typescript@5.5.2)
-      axios: 1.6.7(debug@3.2.7)
-      cheerio: 1.0.0-rc.12
-      d3-dsv: 2.0.0
-      epub2: 3.0.2(ts-toolbelt@9.6.0)
-      fast-xml-parser: 4.3.5
-      handlebars: 4.7.8
-      html-to-text: 9.0.5
-      ignore: 5.2.4
-      ioredis: 5.3.2
-      jsdom: 23.0.1
-      mammoth: 1.7.2
-      pdf-parse: 1.1.1
-      redis: 4.6.12
-      ws: 8.17.1
-    transitivePeerDependencies:
-      - encoding
-      - openai
-      - supports-color
-
-  langchain@0.2.3(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1):
-    dependencies:
-      '@langchain/core': 0.2.9(langchain@0.2.3(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.47.1(encoding@0.1.13))
-      '@langchain/openai': 0.0.33(encoding@0.1.13)(langchain@0.2.3(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))
-      '@langchain/textsplitters': 0.0.2(langchain@0.2.3(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.47.1(encoding@0.1.13))
+  ? langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1)
+  : dependencies:
+      '@langchain/core': 0.2.18(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))
+      '@langchain/openai': 0.2.5(encoding@0.1.13)(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))
+      '@langchain/textsplitters': 0.0.3(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))
       binary-extensions: 2.2.0
       js-tiktoken: 1.0.12
       js-yaml: 4.1.0
       jsonpointer: 5.0.1
       langchainhub: 0.0.8
-      langsmith: 0.1.34(@langchain/core@0.2.9(langchain@0.2.3(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.47.1(encoding@0.1.13)))(langchain@0.2.3(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.47.1(encoding@0.1.13))
+      langsmith: 0.1.34(@langchain/core@0.2.18(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13)))(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))
       ml-distance: 4.0.1
       openapi-types: 12.1.3
       p-retry: 4.6.2
-      uuid: 9.0.1
+      uuid: 10.0.0
       yaml: 2.3.4
       zod: 3.23.8
       zod-to-json-schema: 3.23.0(zod@3.23.8)
     optionalDependencies:
       '@aws-sdk/client-s3': 3.478.0
       '@aws-sdk/credential-provider-node': 3.535.0
-      '@pinecone-database/pinecone': 2.2.1
+      '@langchain/anthropic': 0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))
+      '@langchain/cohere': 0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))
+      '@langchain/community': 0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1)
+      '@langchain/google-genai': 0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8)
+      '@langchain/google-vertexai': 0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8)
+      '@langchain/groq': 0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))
+      '@langchain/mistralai': 0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))
+      '@langchain/ollama': 0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))
+      '@pinecone-database/pinecone': 3.0.0
       '@supabase/supabase-js': 2.43.4
       '@xata.io/client': 0.28.4(typescript@5.5.2)
       axios: 1.6.7(debug@3.2.7)
@@ -23751,21 +23540,21 @@ snapshots:
       - openai
       - supports-color
 
-  langchain@0.2.3(axios@1.6.7)(jsdom@23.0.1)(openai@4.52.1):
+  langchain@0.2.11(axios@1.6.7)(jsdom@23.0.1)(openai@4.53.0):
     dependencies:
-      '@langchain/core': 0.2.9(langchain@0.2.3(axios@1.6.7)(jsdom@23.0.1)(openai@4.52.1))(openai@4.52.1)
-      '@langchain/openai': 0.0.33(langchain@0.2.3(axios@1.6.7)(jsdom@23.0.1)(openai@4.52.1))
-      '@langchain/textsplitters': 0.0.2(langchain@0.2.3(axios@1.6.7)(jsdom@23.0.1)(openai@4.52.1))(openai@4.52.1)
+      '@langchain/core': 0.2.18(langchain@0.2.11(axios@1.6.7)(jsdom@23.0.1)(openai@4.53.0))(openai@4.53.0)
+      '@langchain/openai': 0.2.5(langchain@0.2.11(axios@1.6.7)(jsdom@23.0.1)(openai@4.53.0))
+      '@langchain/textsplitters': 0.0.3(langchain@0.2.11(axios@1.6.7)(jsdom@23.0.1)(openai@4.53.0))(openai@4.53.0)
       binary-extensions: 2.2.0
       js-tiktoken: 1.0.12
       js-yaml: 4.1.0
       jsonpointer: 5.0.1
       langchainhub: 0.0.8
-      langsmith: 0.1.34(@langchain/core@0.2.9(langchain@0.2.3(axios@1.6.7)(jsdom@23.0.1)(openai@4.52.1))(openai@4.52.1))(langchain@0.2.3(axios@1.6.7)(jsdom@23.0.1)(openai@4.52.1))(openai@4.52.1)
+      langsmith: 0.1.34(@langchain/core@0.2.18(langchain@0.2.11(axios@1.6.7)(jsdom@23.0.1)(openai@4.53.0))(openai@4.53.0))(langchain@0.2.11(axios@1.6.7)(jsdom@23.0.1)(openai@4.53.0))(openai@4.53.0)
       ml-distance: 4.0.1
       openapi-types: 12.1.3
       p-retry: 4.6.2
-      uuid: 9.0.1
+      uuid: 10.0.0
       yaml: 2.3.4
       zod: 3.23.8
       zod-to-json-schema: 3.23.0(zod@3.23.8)
@@ -23780,15 +23569,7 @@ snapshots:
 
   langchainhub@0.0.8: {}
 
-  langsmith@0.1.12:
-    dependencies:
-      '@types/uuid': 9.0.7
-      commander: 10.0.1
-      p-queue: 6.6.2
-      p-retry: 4.6.2
-      uuid: 9.0.1
-
-  ? langsmith@0.1.34(@langchain/core@0.2.9(langchain@0.2.2(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.47.1(encoding@0.1.13)))(langchain@0.2.2(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.47.1(encoding@0.1.13))
+  ? langsmith@0.1.34(@langchain/core@0.2.18(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13)))(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))
   : dependencies:
       '@types/uuid': 9.0.7
       commander: 10.0.1
@@ -23797,12 +23578,12 @@ snapshots:
       p-retry: 4.6.2
       uuid: 9.0.1
     optionalDependencies:
-      '@langchain/core': 0.2.9(langchain@0.2.2(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.47.1(encoding@0.1.13))
-      langchain: 0.2.2(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1)
-      openai: 4.47.1(encoding@0.1.13)
+      '@langchain/core': 0.2.18(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))
+      langchain: 0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1)
+      openai: 4.53.0(encoding@0.1.13)
 
-  ? langsmith@0.1.34(@langchain/core@0.2.9(langchain@0.2.3(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.47.1(encoding@0.1.13)))(langchain@0.2.3(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.47.1(encoding@0.1.13))
-  : dependencies:
+  langsmith@0.1.34(@langchain/core@0.2.18(langchain@0.2.11(axios@1.6.7)(jsdom@23.0.1)(openai@4.53.0))(openai@4.53.0))(langchain@0.2.11(axios@1.6.7)(jsdom@23.0.1)(openai@4.53.0))(openai@4.53.0):
+    dependencies:
       '@types/uuid': 9.0.7
       commander: 10.0.1
       lodash.set: 4.3.2
@@ -23810,49 +23591,34 @@ snapshots:
       p-retry: 4.6.2
       uuid: 9.0.1
     optionalDependencies:
-      '@langchain/core': 0.2.9(langchain@0.2.3(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.47.1(encoding@0.1.13))
-      langchain: 0.2.3(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1)
-      openai: 4.47.1(encoding@0.1.13)
+      '@langchain/core': 0.2.18(langchain@0.2.11(axios@1.6.7)(jsdom@23.0.1)(openai@4.53.0))(openai@4.53.0)
+      langchain: 0.2.11(axios@1.6.7)(jsdom@23.0.1)(openai@4.53.0)
+      openai: 4.53.0(encoding@0.1.13)
+    optional: true
 
-  ? langsmith@0.1.34(@langchain/core@0.2.9(langchain@0.2.3(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.52.1(encoding@0.1.13)))(langchain@0.2.3(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.52.1(encoding@0.1.13))
+  ? langsmith@0.1.39(@langchain/core@0.2.18(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13)))(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))
   : dependencies:
       '@types/uuid': 9.0.7
       commander: 10.0.1
-      lodash.set: 4.3.2
-      p-queue: 6.6.2
-      p-retry: 4.6.2
-      uuid: 9.0.1
-    optionalDependencies:
-      '@langchain/core': 0.2.9(langchain@0.2.3(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.52.1(encoding@0.1.13))
-      langchain: 0.2.3(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@pinecone-database/pinecone@2.2.1)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.47.1(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1)
-      openai: 4.52.1(encoding@0.1.13)
-
-  langsmith@0.1.34(@langchain/core@0.2.9(langchain@0.2.3(axios@1.6.7)(jsdom@23.0.1)(openai@4.52.1))(openai@4.47.1))(langchain@0.2.3(axios@1.6.7)(jsdom@23.0.1)(openai@4.52.1))(openai@4.47.1):
-    dependencies:
-      '@types/uuid': 9.0.7
-      commander: 10.0.1
-      lodash.set: 4.3.2
       p-queue: 6.6.2
       p-retry: 4.6.2
       uuid: 9.0.1
     optionalDependencies:
-      '@langchain/core': 0.2.9(langchain@0.2.3(axios@1.6.7)(jsdom@23.0.1)(openai@4.52.1))(openai@4.47.1)
-      langchain: 0.2.3(axios@1.6.7)(jsdom@23.0.1)(openai@4.52.1)
-      openai: 4.47.1(encoding@0.1.13)
-    optional: true
+      '@langchain/core': 0.2.18(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))
+      langchain: 0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1)
+      openai: 4.53.0(encoding@0.1.13)
 
-  langsmith@0.1.34(@langchain/core@0.2.9(langchain@0.2.3(axios@1.6.7)(jsdom@23.0.1)(openai@4.52.1))(openai@4.52.1))(langchain@0.2.3(axios@1.6.7)(jsdom@23.0.1)(openai@4.52.1))(openai@4.52.1):
+  langsmith@0.1.39(@langchain/core@0.2.18(langchain@0.2.11(axios@1.6.7)(jsdom@23.0.1)(openai@4.53.0))(openai@4.53.0))(langchain@0.2.11(axios@1.6.7)(jsdom@23.0.1)(openai@4.53.0))(openai@4.53.0):
     dependencies:
       '@types/uuid': 9.0.7
       commander: 10.0.1
-      lodash.set: 4.3.2
       p-queue: 6.6.2
       p-retry: 4.6.2
       uuid: 9.0.1
     optionalDependencies:
-      '@langchain/core': 0.2.9(langchain@0.2.3(axios@1.6.7)(jsdom@23.0.1)(openai@4.52.1))(openai@4.52.1)
-      langchain: 0.2.3(axios@1.6.7)(jsdom@23.0.1)(openai@4.52.1)
-      openai: 4.52.1(encoding@0.1.13)
+      '@langchain/core': 0.2.18(langchain@0.2.11(axios@1.6.7)(jsdom@23.0.1)(openai@4.53.0))(openai@4.53.0)
+      langchain: 0.2.11(axios@1.6.7)(jsdom@23.0.1)(openai@4.53.0)
+      openai: 4.53.0(encoding@0.1.13)
 
   lazy-ass@1.6.0: {}
 
@@ -24848,6 +24614,10 @@ snapshots:
 
   obuf@1.1.2: {}
 
+  ollama@0.5.6:
+    dependencies:
+      whatwg-fetch: 3.6.20
+
   on-finished@2.4.1:
     dependencies:
       ee-first: 1.1.1
@@ -24885,21 +24655,7 @@ snapshots:
       is-docker: 2.2.1
       is-wsl: 2.2.0
 
-  openai@4.47.1(encoding@0.1.13):
-    dependencies:
-      '@types/node': 18.16.16
-      '@types/node-fetch': 2.6.4
-      abort-controller: 3.0.0
-      agentkeepalive: 4.2.1
-      form-data-encoder: 1.7.2
-      formdata-node: 4.4.1
-      node-fetch: 2.7.0(encoding@0.1.13)
-      web-streams-polyfill: 3.2.1
-    transitivePeerDependencies:
-      - encoding
-      - supports-color
-
-  openai@4.52.1(encoding@0.1.13):
+  openai@4.53.0(encoding@0.1.13):
     dependencies:
       '@types/node': 18.16.16
       '@types/node-fetch': 2.6.4
@@ -26940,7 +26696,7 @@ snapshots:
   terser@5.16.1:
     dependencies:
       '@jridgewell/source-map': 0.3.2
-      acorn: 8.11.2
+      acorn: 8.12.1
       commander: 2.20.3
       source-map-support: 0.5.21
     optional: true
@@ -27478,6 +27234,8 @@ snapshots:
 
   uuencode@0.0.4: {}
 
+  uuid@10.0.0: {}
+
   uuid@8.3.2: {}
 
   uuid@9.0.1: {}
@@ -27619,7 +27377,7 @@ snapshots:
 
   vue-component-type-helpers@2.0.19: {}
 
-  vue-component-type-helpers@2.0.28: {}
+  vue-component-type-helpers@2.0.29: {}
 
   vue-demi@0.14.5(vue@3.4.21(typescript@5.5.2)):
     dependencies:
@@ -27781,6 +27539,8 @@ snapshots:
     dependencies:
       iconv-lite: 0.6.3
 
+  whatwg-fetch@3.6.20: {}
+
   whatwg-mimetype@3.0.0: {}
 
   whatwg-mimetype@4.0.0: {}

From 44728d72423f5549dda09589f4a618ebd80899cb 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: Fri, 26 Jul 2024 14:30:49 +0200
Subject: [PATCH 004/168] feat(editor): Show new executions as `Queued` in the
 UI, until they actually start (#10204)

---
 packages/design-system/src/css/_tokens.scss   |  1 +
 .../executions/ExecutionsFilter.vue           |  1 +
 .../global/GlobalExecutionsListItem.vue       | 19 ++++++++----
 .../workflow/WorkflowExecutionsCard.vue       | 10 +++++++
 .../workflow/WorkflowExecutionsPreview.vue    | 30 ++++++++++++-------
 .../__tests__/useExecutionHelpers.test.ts     |  2 +-
 .../src/composables/useExecutionHelpers.ts    | 11 +++++--
 .../src/plugins/i18n/locales/en.json          |  2 ++
 8 files changed, 58 insertions(+), 18 deletions(-)

diff --git a/packages/design-system/src/css/_tokens.scss b/packages/design-system/src/css/_tokens.scss
index 8e4050821ea3d..40bf465cfa786 100644
--- a/packages/design-system/src/css/_tokens.scss
+++ b/packages/design-system/src/css/_tokens.scss
@@ -225,6 +225,7 @@
 	--color-notification-background: var(--color-background-xlight);
 
 	// Execution
+	--execution-card-border-new: var(--prim-gray-200);
 	--execution-card-border-success: var(--prim-color-alt-a-tint-300);
 	--execution-card-border-error: var(--prim-color-alt-c-tint-250);
 	--execution-card-border-waiting: var(--prim-color-secondary-tint-300);
diff --git a/packages/editor-ui/src/components/executions/ExecutionsFilter.vue b/packages/editor-ui/src/components/executions/ExecutionsFilter.vue
index b3f59e342428d..4b3ea805b03a2 100644
--- a/packages/editor-ui/src/components/executions/ExecutionsFilter.vue
+++ b/packages/editor-ui/src/components/executions/ExecutionsFilter.vue
@@ -84,6 +84,7 @@ const statuses = computed(() => [
 	{ id: 'all', name: locale.baseText('executionsList.anyStatus') },
 	{ id: 'error', name: locale.baseText('executionsList.error') },
 	{ id: 'canceled', name: locale.baseText('executionsList.canceled') },
+	{ id: 'new', name: locale.baseText('executionsList.new') },
 	{ id: 'running', name: locale.baseText('executionsList.running') },
 	{ id: 'success', name: locale.baseText('executionsList.success') },
 	{ id: 'waiting', name: locale.baseText('executionsList.waiting') },
diff --git a/packages/editor-ui/src/components/executions/global/GlobalExecutionsListItem.vue b/packages/editor-ui/src/components/executions/global/GlobalExecutionsListItem.vue
index ac11a59ddcdfe..e6fc6dacf2677 100644
--- a/packages/editor-ui/src/components/executions/global/GlobalExecutionsListItem.vue
+++ b/packages/editor-ui/src/components/executions/global/GlobalExecutionsListItem.vue
@@ -92,7 +92,7 @@ const statusText = computed(() => {
 		case 'crashed':
 			return i18n.baseText('executionsList.error');
 		case 'new':
-			return i18n.baseText('executionsList.running');
+			return i18n.baseText('executionsList.new');
 		case 'running':
 			return i18n.baseText('executionsList.running');
 		case 'success':
@@ -119,7 +119,7 @@ const statusTextTranslationPath = computed(() => {
 				return 'executionsList.statusText';
 			}
 		case 'new':
-			return 'executionsList.statusRunning';
+			return 'executionsList.statusTextWithoutTime';
 		case 'running':
 			return 'executionsList.statusRunning';
 		default:
@@ -192,7 +192,10 @@ async function handleActionItemClick(commandData: Command) {
 						<span v-else-if="!!execution.stoppedAt">
 							{{ formattedStoppedAtDate }}
 						</span>
-						<ExecutionsTime v-else :start-time="execution.startedAt" />
+						<ExecutionsTime
+							v-else-if="execution.status !== 'new'"
+							:start-time="execution.startedAt"
+						/>
 					</template>
 				</i18n-t>
 				<N8nTooltip v-else placement="top">
@@ -334,7 +337,10 @@ async function handleActionItemClick(commandData: Command) {
 		background: var(--execution-card-border-success);
 	}
 
-	&.new td:first-child::before,
+	&.new td:first-child::before {
+		background: var(--execution-card-border-new);
+	}
+
 	&.running td:first-child::before {
 		background: var(--execution-card-border-running);
 	}
@@ -382,7 +388,10 @@ async function handleActionItemClick(commandData: Command) {
 		font-weight: var(--font-weight-normal);
 	}
 
-	.new &,
+	.new {
+		color: var(--color-text-dark);
+	}
+
 	.running & {
 		color: var(--color-warning);
 	}
diff --git a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsCard.vue b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsCard.vue
index fc4907745fc4b..4c84a270425b9 100644
--- a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsCard.vue
+++ b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsCard.vue
@@ -208,6 +208,16 @@ export default defineComponent({
 		}
 	}
 
+	&.new {
+		&,
+		& .executionLink {
+			border-left: var(--spacing-4xs) var(--border-style-base) var(--execution-card-border-new);
+		}
+		.statusLabel {
+			color: var(--color-text-dark);
+		}
+	}
+
 	&.waiting {
 		&,
 		& .executionLink {
diff --git a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsPreview.vue b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsPreview.vue
index 1f36aea7abb60..af5c725a716be 100644
--- a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsPreview.vue
+++ b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsPreview.vue
@@ -1,5 +1,13 @@
 <template>
-	<div v-if="executionUIDetails?.name === 'running'" :class="$style.runningInfo">
+	<div v-if="executionUIDetails?.name === 'new'" :class="$style.newInfo">
+		<n8n-text :class="$style.newMessage" color="text-light">
+			{{ $locale.baseText('executionDetails.newMessage') }}
+		</n8n-text>
+		<n8n-button class="mt-l" type="tertiary" @click="handleStopClick">
+			{{ $locale.baseText('executionsList.stopExecution') }}
+		</n8n-button>
+	</div>
+	<div v-else-if="executionUIDetails?.name === 'running'" :class="$style.runningInfo">
 		<div :class="$style.spinner">
 			<n8n-spinner type="ring" />
 		</div>
@@ -34,7 +42,14 @@
 					{{ executionUIDetails.label }}
 				</n8n-text>
 				{{ ' ' }}
-				<n8n-text v-if="executionUIDetails.name === 'running'" color="text-base" size="medium">
+				<n8n-text
+					v-if="executionUIDetails?.showTimestamp === false"
+					color="text-base"
+					size="medium"
+				>
+					| ID#{{ execution.id }}
+				</n8n-text>
+				<n8n-text v-else-if="executionUIDetails.name === 'running'" color="text-base" size="medium">
 					{{
 						$locale.baseText('executionDetails.runningTimeRunning', {
 							interpolate: { time: executionUIDetails?.runningTime },
@@ -55,13 +70,6 @@
 					}}
 					| ID#{{ execution.id }}
 				</n8n-text>
-				<n8n-text
-					v-else-if="executionUIDetails?.name === 'waiting'"
-					color="text-base"
-					size="medium"
-				>
-					| ID#{{ execution.id }}
-				</n8n-text>
 				<br /><n8n-text v-if="execution.mode === 'retry'" color="text-base" size="medium">
 					{{ $locale.baseText('executionDetails.retry') }}
 					<router-link
@@ -296,6 +304,7 @@ export default defineComponent({
 	color: var(--color-danger);
 }
 
+.newInfo,
 .runningInfo {
 	display: flex;
 	flex-direction: column;
@@ -303,8 +312,9 @@ export default defineComponent({
 	margin-top: var(--spacing-4xl);
 }
 
+.newMessage,
 .runningMessage {
-	width: 200px;
+	width: 240px;
 	margin-top: var(--spacing-l);
 	text-align: center;
 }
diff --git a/packages/editor-ui/src/composables/__tests__/useExecutionHelpers.test.ts b/packages/editor-ui/src/composables/__tests__/useExecutionHelpers.test.ts
index 550f20adefe9d..29bd64ea4243e 100644
--- a/packages/editor-ui/src/composables/__tests__/useExecutionHelpers.test.ts
+++ b/packages/editor-ui/src/composables/__tests__/useExecutionHelpers.test.ts
@@ -9,7 +9,7 @@ describe('useExecutionHelpers()', () => {
 			['waiting', 'waiting', i18n.baseText('executionsList.waiting')],
 			['canceled', 'unknown', i18n.baseText('executionsList.canceled')],
 			['running', 'running', i18n.baseText('executionsList.running')],
-			['new', 'running', i18n.baseText('executionsList.running')],
+			['new', 'new', i18n.baseText('executionsList.new')],
 			['success', 'success', i18n.baseText('executionsList.succeeded')],
 			['error', 'error', i18n.baseText('executionsList.error')],
 			['crashed', 'error', i18n.baseText('executionsList.error')],
diff --git a/packages/editor-ui/src/composables/useExecutionHelpers.ts b/packages/editor-ui/src/composables/useExecutionHelpers.ts
index b39e03c5c1df0..a00f5b639a1fa 100644
--- a/packages/editor-ui/src/composables/useExecutionHelpers.ts
+++ b/packages/editor-ui/src/composables/useExecutionHelpers.ts
@@ -7,6 +7,7 @@ export interface IExecutionUIData {
 	label: string;
 	startTime: string;
 	runningTime: string;
+	showTimestamp: boolean;
 }
 
 export function useExecutionHelpers() {
@@ -18,14 +19,20 @@ export function useExecutionHelpers() {
 			startTime: formatDate(execution.startedAt),
 			label: 'Status unknown',
 			runningTime: '',
+			showTimestamp: true,
 		};
 
-		if (execution.status === 'waiting') {
+		if (execution.status === 'new') {
+			status.name = 'new';
+			status.label = i18n.baseText('executionsList.new');
+			status.showTimestamp = false;
+		} else if (execution.status === 'waiting') {
 			status.name = 'waiting';
 			status.label = i18n.baseText('executionsList.waiting');
+			status.showTimestamp = false;
 		} else if (execution.status === 'canceled') {
 			status.label = i18n.baseText('executionsList.canceled');
-		} else if (execution.status === 'running' || execution.status === 'new') {
+		} else if (execution.status === 'running') {
 			status.name = 'running';
 			status.label = i18n.baseText('executionsList.running');
 		} else if (execution.status === 'success') {
diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json
index 8d00e109e50ae..47ca00315f4c1 100644
--- a/packages/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/editor-ui/src/plugins/i18n/locales/en.json
@@ -636,6 +636,7 @@
 	"executionDetails.executionWaiting": "Execution waiting",
 	"executionDetails.executionWasSuccessful": "Execution was successful",
 	"executionDetails.of": "of",
+	"executionDetails.newMessage": "Execution waiting in the queue.",
 	"executionDetails.openWorkflow": "Open Workflow",
 	"executionDetails.readOnly.readOnly": "Read only",
 	"executionDetails.readOnly.youreViewingTheLogOf": "You're viewing the log of a previous execution. You cannot<br />\n\t\tmake changes since this execution already occurred. Make changes<br />\n\t\tto this workflow by clicking on its name on the left.",
@@ -680,6 +681,7 @@
 	"executionsList.modes.trigger": "trigger",
 	"executionsList.modes.webhook": "webhook",
 	"executionsList.name": "@:_reusableBaseText.name",
+	"executionsList.new": "Queued",
 	"executionsList.openPastExecution": "Open Past Execution",
 	"executionsList.retryExecution": "Retry execution",
 	"executionsList.retryOf": "Retry of",

From cd74f4312b33bb607c0f9802f5a14f351e6ab9c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Fri, 26 Jul 2024 14:38:41 +0200
Subject: [PATCH 005/168] refactor(editor): Add Infisical deprecation notice
 (#10191)

---
 .../cli/src/ExternalSecrets/providers/infisical.ts | 11 +++++++++--
 .../components/ExternalSecretsProviderCard.ee.vue  | 14 ++++++++++++++
 .../editor-ui/src/plugins/i18n/locales/en.json     |  1 +
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/packages/cli/src/ExternalSecrets/providers/infisical.ts b/packages/cli/src/ExternalSecrets/providers/infisical.ts
index d9a2f93cda814..d352d591790b3 100644
--- a/packages/cli/src/ExternalSecrets/providers/infisical.ts
+++ b/packages/cli/src/ExternalSecrets/providers/infisical.ts
@@ -3,7 +3,7 @@ import InfisicalClient from 'infisical-node';
 import { populateClientWorkspaceConfigsHelper } from 'infisical-node/lib/helpers/key';
 import { getServiceTokenData } from 'infisical-node/lib/api/serviceTokenData';
 import { ApplicationError, type IDataObject, type INodeProperties } from 'n8n-workflow';
-import { DOCS_HELP_NOTICE, EXTERNAL_SECRETS_NAME_REGEX } from '../constants';
+import { EXTERNAL_SECRETS_NAME_REGEX } from '../constants';
 
 export interface InfisicalSettings {
 	token: string;
@@ -24,7 +24,14 @@ interface InfisicalServiceToken {
 
 export class InfisicalProvider implements SecretsProvider {
 	properties: INodeProperties[] = [
-		DOCS_HELP_NOTICE,
+		{
+			displayName:
+				'<h2>Important information about our infisical integration</h2><br>From the <b>30th July, 2024</b>, we will no longer be supporting new connections to inifiscal secrets vault using service tokens. Existing service tokens will remain usable until <b>July, 2025</b>. After that period, we will be removing support for Infisical from our external secrets integrations. You can find out more information about this change on <a href="https://docs.n8n.io/external-secrets/#connect-n8n-to-your-secrets-store" target="_blank">our docs</a>',
+			name: 'notice',
+			type: 'notice',
+			default: '',
+			noDataExpression: true,
+		},
 		{
 			displayName: 'Service Token',
 			name: 'token',
diff --git a/packages/editor-ui/src/components/ExternalSecretsProviderCard.ee.vue b/packages/editor-ui/src/components/ExternalSecretsProviderCard.ee.vue
index 5722e2734afbc..53bf5dcb30242 100644
--- a/packages/editor-ui/src/components/ExternalSecretsProviderCard.ee.vue
+++ b/packages/editor-ui/src/components/ExternalSecretsProviderCard.ee.vue
@@ -133,6 +133,15 @@ async function onActionDropdownClick(id: string) {
 					</span>
 				</n8n-text>
 			</div>
+			<div v-if="provider.name === 'infisical'">
+				<font-awesome-icon
+					:class="$style['warningTriangle']"
+					icon="exclamation-triangle"
+				></font-awesome-icon>
+				<N8nBadge class="mr-xs" theme="tertiary" bold data-test-id="card-badge">
+					{{ i18n.baseText('settings.externalSecrets.card.deprecated') }}
+				</N8nBadge>
+			</div>
 			<div v-if="canConnect" :class="$style.cardActions">
 				<ExternalSecretsProviderConnectionSwitch
 					:provider="provider"
@@ -183,4 +192,9 @@ async function onActionDropdownClick(id: string) {
 	align-items: center;
 	margin-left: var(--spacing-s);
 }
+
+.warningTriangle {
+	color: var(--color-warning);
+	margin-right: var(--spacing-2xs);
+}
 </style>
diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json
index 47ca00315f4c1..5823850ff7977 100644
--- a/packages/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/editor-ui/src/plugins/i18n/locales/en.json
@@ -1761,6 +1761,7 @@
 	"settings.externalSecrets.actionBox.description.link": "More info",
 	"settings.externalSecrets.actionBox.buttonText": "See plans",
 	"settings.externalSecrets.card.setUp": "Set Up",
+	"settings.externalSecrets.card.deprecated": "deprecated",
 	"settings.externalSecrets.card.secretsCount": "{count} secrets",
 	"settings.externalSecrets.card.connectedAt": "Connected {date}",
 	"settings.externalSecrets.card.connected": "Enabled",

From 6f1d4adf058903e4f97ca64d5c2d860a47fa4bb9 Mon Sep 17 00:00:00 2001
From: oleg <me@olegivaniv.com>
Date: Fri, 26 Jul 2024 15:45:48 +0200
Subject: [PATCH 006/168] refactor: Delete mistakenly commited node file
 (no-changelog) (#10213)

---
 .../VectorStoreInMemory.node.ts               | 59 -------------------
 1 file changed, 59 deletions(-)
 delete mode 100644 packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreIndexer/VectorStoreInMemory.node.ts

diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreIndexer/VectorStoreInMemory.node.ts b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreIndexer/VectorStoreInMemory.node.ts
deleted file mode 100644
index fecf8d163aff4..0000000000000
--- a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreIndexer/VectorStoreInMemory.node.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-import type { INodeProperties } from 'n8n-workflow';
-import { createVectorStoreNode } from '../shared/createVectorStoreNode';
-import { MemoryVectorStoreManager } from '../shared/MemoryVectorStoreManager';
-
-const insertFields: INodeProperties[] = [
-	{
-		displayName:
-			'The embbded data are stored in the server memory, so they will be lost when the server is restarted. Additionally, if the amount of data is too large, it may cause the server to crash due to insufficient memory.',
-		name: 'notice',
-		type: 'notice',
-		default: '',
-	},
-	{
-		displayName: 'Clear Store',
-		name: 'clearStore',
-		type: 'boolean',
-		default: false,
-		description: 'Whether to clear the store before inserting new data',
-	},
-];
-
-export const VectorStoreInMemory = createVectorStoreNode({
-	meta: {
-		displayName: 'In-Memory Vector Store',
-		name: 'vectorStoreInMemory',
-		description: 'Work with your data in In-Memory Vector Store',
-		icon: 'fa:database',
-		docsUrl:
-			'https://docs.n8n.io/integrations/builtin/cluster-nodes/root-nodes/n8n-nodes-langchain.vectorstoreinmemory/',
-	},
-	sharedFields: [
-		{
-			displayName: 'Memory Key',
-			name: 'memoryKey',
-			type: 'string',
-			default: 'vector_store_key',
-			description:
-				'The key to use to store the vector memory in the workflow data. The key will be prefixed with the workflow ID to avoid collisions.',
-		},
-	],
-	insertFields,
-	loadFields: [],
-	retrieveFields: [],
-	async getVectorStoreClient(context, _filter, embeddings, itemIndex) {
-		const workflowId = context.getWorkflow().id;
-		const memoryKey = context.getNodeParameter('memoryKey', itemIndex) as string;
-		const vectorStoreSingleton = MemoryVectorStoreManager.getInstance(embeddings);
-
-		return await vectorStoreSingleton.getVectorStore(`${workflowId}__${memoryKey}`);
-	},
-	async populateVectorStore(context, embeddings, documents, itemIndex) {
-		const memoryKey = context.getNodeParameter('memoryKey', itemIndex) as string;
-		const clearStore = context.getNodeParameter('clearStore', itemIndex) as boolean;
-		const workflowId = context.getWorkflow().id;
-		const vectorStoreInstance = MemoryVectorStoreManager.getInstance(embeddings);
-
-		void vectorStoreInstance.addDocuments(`${workflowId}__${memoryKey}`, documents, clearStore);
-	},
-});

From 1718125c6d8589cf24dc8d34f6808dd6f1802691 Mon Sep 17 00:00:00 2001
From: Michael Kret <88898367+michael-radency@users.noreply.github.com>
Date: Fri, 26 Jul 2024 20:04:55 +0300
Subject: [PATCH 007/168] fix: Better error message when calling data
 transformation functions on a null value (#10210)

---
 packages/workflow/src/Extensions/utils.ts              | 10 +++-------
 .../ExpressionExtensions/ExpressionExtension.test.ts   |  7 ++-----
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/packages/workflow/src/Extensions/utils.ts b/packages/workflow/src/Extensions/utils.ts
index a144116dea64a..e56d37a691bfc 100644
--- a/packages/workflow/src/Extensions/utils.ts
+++ b/packages/workflow/src/Extensions/utils.ts
@@ -21,12 +21,8 @@ export const convertToDateTime = (value: string | Date | DateTime): DateTime | u
 
 export function checkIfValueDefinedOrThrow<T>(value: T, functionName: string): void {
 	if (value === undefined || value === null) {
-		throw new ExpressionExtensionError(
-			`${functionName}() could not be called on "${String(value)}" type`,
-			{
-				description:
-					'You are trying to access a field that does not exist, modify your expression or set a default value',
-			},
-		);
+		throw new ExpressionExtensionError(`${functionName} can't be used on ${String(value)} value`, {
+			description: `To ignore this error, add a ? to the variable before this function, e.g. my_var?.${functionName}`,
+		});
 	}
 }
diff --git a/packages/workflow/test/ExpressionExtensions/ExpressionExtension.test.ts b/packages/workflow/test/ExpressionExtensions/ExpressionExtension.test.ts
index a255de40068d0..b35cd2c7289ad 100644
--- a/packages/workflow/test/ExpressionExtensions/ExpressionExtension.test.ts
+++ b/packages/workflow/test/ExpressionExtensions/ExpressionExtension.test.ts
@@ -250,10 +250,7 @@ describe('tmpl Expression Parser', () => {
 				extend(undefined, 'toDateTime', []);
 			} catch (error) {
 				expect(error).toBeInstanceOf(ExpressionExtensionError);
-				expect(error).toHaveProperty(
-					'message',
-					'toDateTime() could not be called on "undefined" type',
-				);
+				expect(error).toHaveProperty('message', "toDateTime can't be used on undefined value");
 			}
 		});
 		test('input is null', () => {
@@ -261,7 +258,7 @@ describe('tmpl Expression Parser', () => {
 				extend(null, 'startsWith', []);
 			} catch (error) {
 				expect(error).toBeInstanceOf(ExpressionExtensionError);
-				expect(error).toHaveProperty('message', 'startsWith() could not be called on "null" type');
+				expect(error).toHaveProperty('message', "startsWith can't be used on null value");
 			}
 		});
 		test('input should be converted to upper case', () => {

From d165b33ceac4d24d0fc290bffe63b5f551204e38 Mon Sep 17 00:00:00 2001
From: Michael Kret <88898367+michael-radency@users.noreply.github.com>
Date: Fri, 26 Jul 2024 20:05:25 +0300
Subject: [PATCH 008/168] feat: Recovery option for jsonParse helper (#10182)

Co-authored-by: Elias Meire <elias@meire.dev>
---
 packages/workflow/src/TypeValidation.ts       |  4 +-
 packages/workflow/src/utils.ts                | 66 ++++++++++++++++++-
 packages/workflow/test/TypeValidation.test.ts | 11 ++--
 3 files changed, 75 insertions(+), 6 deletions(-)

diff --git a/packages/workflow/src/TypeValidation.ts b/packages/workflow/src/TypeValidation.ts
index 606c3d201ed3d..a2c299303fe0a 100644
--- a/packages/workflow/src/TypeValidation.ts
+++ b/packages/workflow/src/TypeValidation.ts
@@ -2,6 +2,7 @@ import { DateTime } from 'luxon';
 import type { FieldType, INodePropertyOptions, ValidationResult } from './Interfaces';
 import isObject from 'lodash/isObject';
 import { ApplicationError } from './errors';
+import { jsonParse } from './utils';
 
 export const tryToParseNumber = (value: unknown): number => {
 	const isValidNumber = !isNaN(Number(value));
@@ -135,7 +136,8 @@ export const tryToParseObject = (value: unknown): object => {
 		return value;
 	}
 	try {
-		const o = JSON.parse(String(value)) as object;
+		const o = jsonParse<object>(String(value), { acceptJSObject: true });
+
 		if (typeof o !== 'object' || Array.isArray(o)) {
 			throw new ApplicationError('Value is not a valid object', { extra: { value } });
 		}
diff --git a/packages/workflow/src/utils.ts b/packages/workflow/src/utils.ts
index e043b18ad0e6f..c0330955c3508 100644
--- a/packages/workflow/src/utils.ts
+++ b/packages/workflow/src/utils.ts
@@ -5,6 +5,13 @@ import { ALPHABET } from './Constants';
 import type { BinaryFileType, IDisplayOptions, INodeProperties, JsonObject } from './Interfaces';
 import { ApplicationError } from './errors/application.error';
 
+import {
+	parse as esprimaParse,
+	Syntax,
+	type Node as SyntaxNode,
+	type ExpressionStatement,
+} from 'esprima-next';
+
 const readStreamClasses = new Set(['ReadStream', 'Readable', 'ReadableStream']);
 
 // NOTE: BigInt.prototype.toJSON is not available, which causes JSON.stringify to throw an error
@@ -68,17 +75,74 @@ export const deepCopy = <T extends ((object | Date) & { toJSON?: () => string })
 };
 // eslint-enable
 
+function syntaxNodeToValue(expression?: SyntaxNode | null): unknown {
+	switch (expression?.type) {
+		case Syntax.ObjectExpression:
+			return Object.fromEntries(
+				expression.properties
+					.filter((prop) => prop.type === Syntax.Property)
+					.map(({ key, value }) => [syntaxNodeToValue(key), syntaxNodeToValue(value)]),
+			);
+		case Syntax.Identifier:
+			return expression.name;
+		case Syntax.Literal:
+			return expression.value;
+		case Syntax.ArrayExpression:
+			return expression.elements.map((exp) => syntaxNodeToValue(exp));
+		default:
+			return undefined;
+	}
+}
+
+/**
+ * Parse any JavaScript ObjectExpression, including:
+ * - single quoted keys
+ * - unquoted keys
+ */
+function parseJSObject(objectAsString: string): object {
+	const jsExpression = esprimaParse(`(${objectAsString})`).body.find(
+		(node): node is ExpressionStatement =>
+			node.type === Syntax.ExpressionStatement && node.expression.type === Syntax.ObjectExpression,
+	);
+
+	return syntaxNodeToValue(jsExpression?.expression) as object;
+}
+
 type MutuallyExclusive<T, U> =
 	| (T & { [k in Exclude<keyof U, keyof T>]?: never })
 	| (U & { [k in Exclude<keyof T, keyof U>]?: never });
 
-type JSONParseOptions<T> = MutuallyExclusive<{ errorMessage: string }, { fallbackValue: T }>;
+type JSONParseOptions<T> = { acceptJSObject?: boolean } & MutuallyExclusive<
+	{ errorMessage?: string },
+	{ fallbackValue?: T }
+>;
 
+/**
+ * Parses a JSON string into an object with optional error handling and recovery mechanisms.
+ *
+ * @param {string} jsonString - The JSON string to parse.
+ * @param {Object} [options] - Optional settings for parsing the JSON string. Either `fallbackValue` or `errorMessage` can be set, but not both.
+ * @param {boolean} [options.parseJSObject=false] - If true, attempts to recover from common JSON format errors by parsing the JSON string as a JavaScript Object.
+ * @param {string} [options.errorMessage] - A custom error message to throw if the JSON string cannot be parsed.
+ * @param {*} [options.fallbackValue] - A fallback value to return if the JSON string cannot be parsed.
+ * @returns {Object} - The parsed object, or the fallback value if parsing fails and `fallbackValue` is set.
+ */
 export const jsonParse = <T>(jsonString: string, options?: JSONParseOptions<T>): T => {
 	try {
 		return JSON.parse(jsonString) as T;
 	} catch (error) {
+		if (options?.acceptJSObject) {
+			try {
+				const jsonStringCleaned = parseJSObject(jsonString);
+				return jsonStringCleaned as T;
+			} catch (e) {
+				// Ignore this error and return the original error or the fallback value
+			}
+		}
 		if (options?.fallbackValue !== undefined) {
+			if (options.fallbackValue instanceof Function) {
+				return options.fallbackValue();
+			}
 			return options.fallbackValue;
 		} else if (options?.errorMessage) {
 			throw new ApplicationError(options.errorMessage);
diff --git a/packages/workflow/test/TypeValidation.test.ts b/packages/workflow/test/TypeValidation.test.ts
index eb50b434376b5..f01af4cedcc9d 100644
--- a/packages/workflow/test/TypeValidation.test.ts
+++ b/packages/workflow/test/TypeValidation.test.ts
@@ -145,10 +145,14 @@ describe('Type Validation', () => {
 		);
 	});
 
-	it('should validate and cast JSON properly', () => {
+	it('should validate and cast JSON & JS objects properly', () => {
 		const VALID_OBJECTS = [
 			['{"a": 1}', { a: 1 }],
+			['{a: 1}', { a: 1 }],
+			["{'a': '1'}", { a: '1' }],
+			["{'\\'single quoted\\' \"double quoted\"': 1}", { '\'single quoted\' "double quoted"': 1 }],
 			['{"a": 1, "b": { "c": 10, "d": "test"}}', { a: 1, b: { c: 10, d: 'test' } }],
+			["{\"a\": 1, b: { 'c': 10, d: 'test'}}", { a: 1, b: { c: 10, d: 'test' } }],
 			[{ name: 'John' }, { name: 'John' }],
 			[
 				{ name: 'John', address: { street: 'Via Roma', city: 'Milano' } },
@@ -162,19 +166,18 @@ describe('Type Validation', () => {
 			}),
 		);
 
-		const INVALID_JSON = [
+		const INVALID_OBJECTS = [
 			['one', 'two'],
 			'1',
 			'[1]',
 			'1.1',
 			1.1,
 			'"a"',
-			'{a: 1}',
 			'["apples", "oranges"]',
 			[{ name: 'john' }, { name: 'bob' }],
 			'[ { name: "john" }, { name: "bob" } ]',
 		];
-		INVALID_JSON.forEach((value) =>
+		INVALID_OBJECTS.forEach((value) =>
 			expect(validateFieldType('json', value, 'object').valid).toEqual(false),
 		);
 	});

From 5aba69bcf4d232d9860f3cd9fe57cb8839a2f96f Mon Sep 17 00:00:00 2001
From: Marcus <56945030+maspio@users.noreply.github.com>
Date: Mon, 29 Jul 2024 09:32:42 +0200
Subject: [PATCH 009/168] feat(HTTP Request Node): Add option to disable
 lowercase headers (#10154)

---
 .../nodes/HttpRequest/V3/HttpRequestV3.node.ts      | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts b/packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts
index c8f73909cfb1c..5fb21c41841dd 100644
--- a/packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts
+++ b/packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts
@@ -806,6 +806,13 @@ export class HttpRequestV3 implements INodeType {
 							],
 							default: 'brackets',
 						},
+						{
+							displayName: 'Lowercase Headers',
+							name: 'lowercaseHeaders',
+							type: 'boolean',
+							default: true,
+							description: 'Whether to lowercase header names',
+						},
 						{
 							displayName: 'Redirects',
 							name: 'redirect',
@@ -1388,6 +1395,7 @@ export class HttpRequestV3 implements INodeType {
 				allowUnauthorizedCerts,
 				queryParameterArrays,
 				response,
+				lowercaseHeaders,
 			} = this.getNodeParameter('options', itemIndex, {}) as {
 				batching: { batch: { batchSize: number; batchInterval: number } };
 				proxy: string;
@@ -1398,6 +1406,7 @@ export class HttpRequestV3 implements INodeType {
 					response: { neverError: boolean; responseFormat: string; fullResponse: boolean };
 				};
 				redirect: { redirect: { maxRedirects: number; followRedirects: boolean } };
+				lowercaseHeaders: boolean;
 			};
 
 			const url = this.getNodeParameter('url', itemIndex) as string;
@@ -1611,7 +1620,9 @@ export class HttpRequestV3 implements INodeType {
 				}
 				requestOptions.headers = {
 					...requestOptions.headers,
-					...keysToLowercase(additionalHeaders),
+					...(lowercaseHeaders === undefined || lowercaseHeaders
+						? keysToLowercase(additionalHeaders)
+						: additionalHeaders),
 				};
 			}
 

From c0e37439a87105a0e66c8ebced42c06dab30dc5e Mon Sep 17 00:00:00 2001
From: Eugene <eugene@n8n.io>
Date: Mon, 29 Jul 2024 10:50:05 +0200
Subject: [PATCH 010/168] fix(editor): Fix parameter input glitch when there
 was an error loading remote options (#10209)

---
 packages/editor-ui/src/components/ParameterInput.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/editor-ui/src/components/ParameterInput.vue b/packages/editor-ui/src/components/ParameterInput.vue
index 5a25dbceba65f..588cf2bc3957c 100644
--- a/packages/editor-ui/src/components/ParameterInput.vue
+++ b/packages/editor-ui/src/components/ParameterInput.vue
@@ -253,7 +253,11 @@
 					:size="inputSize"
 					:type="getStringInputType"
 					:rows="editorRows"
-					:disabled="isReadOnly"
+					:disabled="
+						isReadOnly ||
+						remoteParameterOptionsLoading ||
+						remoteParameterOptionsLoadingIssues !== null
+					"
 					:title="displayTitle"
 					:placeholder="getPlaceholder()"
 					@update:model-value="(valueChanged($event) as undefined) && onUpdateTextInput($event)"

From 40a5226e24448a4428143e69d80ebc78238365a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Mon, 29 Jul 2024 11:01:18 +0200
Subject: [PATCH 011/168] fix(editor): Defer `User saved credentials` telemetry
 event for OAuth credentials (#10215)

---
 .../CredentialEdit/CredentialEdit.vue         | 43 +++++++++++++++----
 1 file changed, 35 insertions(+), 8 deletions(-)

diff --git a/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue b/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue
index 7eac3f344e614..fd539fed7554f 100644
--- a/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue
+++ b/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue
@@ -751,6 +751,12 @@ async function testCredential(credentialDetails: ICredentialsDecrypted) {
 	scrollToTop();
 }
 
+function usesExternalSecrets(data: Record<string, unknown>): boolean {
+	return Object.entries(data).some(
+		([, value]) => typeof value !== 'object' && /=.*\{\{[^}]*\$secrets\.[^}]+}}.*/.test(`${value}`),
+	);
+}
+
 async function saveCredential(): Promise<ICredentialsResponse | null> {
 	if (!requiredPropertiesFilled.value) {
 		showValidationWarning.value = true;
@@ -844,18 +850,13 @@ async function saveCredential(): Promise<ICredentialsResponse | null> {
 			testedSuccessfully.value = false;
 		}
 
-		const usesExternalSecrets = Object.entries(credentialDetails.data ?? {}).some(
-			([, value]) =>
-				typeof value !== 'object' && /=.*\{\{[^}]*\$secrets\.[^}]+}}.*/.test(`${value}`),
-		);
-
 		const trackProperties: ITelemetryTrackProperties = {
 			credential_type: credentialDetails.type,
 			workflow_id: workflowsStore.workflowId,
 			credential_id: credential.id,
 			is_complete: !!requiredPropertiesFilled.value,
 			is_new: isNewCredential,
-			uses_external_secrets: usesExternalSecrets,
+			uses_external_secrets: usesExternalSecrets(credentialDetails.data ?? {}),
 		};
 
 		if (isOAuthType.value) {
@@ -872,7 +873,15 @@ async function saveCredential(): Promise<ICredentialsResponse | null> {
 			trackProperties.authError = authError.value;
 		}
 
-		telemetry.track('User saved credentials', trackProperties);
+		/**
+		 * For non-OAuth credentials we track saving on clicking the `Save` button, but for
+		 * OAuth credentials we track saving at the end of the flow (BroastcastChannel event)
+		 * so that the `is_valid` property is correct.
+		 */
+		if (!isOAuthType.value) {
+			telemetry.track('User saved credentials', trackProperties);
+		}
+
 		await externalHooks.run('credentialEdit.saveCredential', trackProperties);
 	}
 
@@ -1050,7 +1059,25 @@ async function oAuthCredentialAuthorize() {
 
 	const oauthChannel = new BroadcastChannel('oauth-callback');
 	const receiveMessage = (event: MessageEvent) => {
-		if (event.data === 'success') {
+		const successfullyConnected = event.data === 'success';
+
+		const trackProperties: ITelemetryTrackProperties = {
+			credential_type: credentialTypeName.value,
+			workflow_id: workflowsStore.workflowId,
+			credential_id: credentialId.value,
+			is_complete: !!requiredPropertiesFilled.value,
+			is_new: props.mode === 'new' && !credentialId.value,
+			is_valid: successfullyConnected,
+			uses_external_secrets: usesExternalSecrets(credentialData.value),
+		};
+
+		if (ndvStore.activeNode) {
+			trackProperties.node_type = ndvStore.activeNode.type;
+		}
+
+		telemetry.track('User saved credentials', trackProperties);
+
+		if (successfullyConnected) {
 			oauthChannel.removeEventListener('message', receiveMessage);
 
 			// Set some kind of data that status changes.

From e2ee91569a382bfbf787cf45204c72c821a860a0 Mon Sep 17 00:00:00 2001
From: Jon <jonathan.bennetts@gmail.com>
Date: Mon, 29 Jul 2024 10:05:16 +0100
Subject: [PATCH 012/168] feat(Shopify Node): Update Shopify API version
 (#10155)

---
 .../credentials/ShopifyAccessTokenApi.credentials.ts       | 3 +--
 packages/nodes-base/credentials/ShopifyApi.credentials.ts  | 3 +--
 packages/nodes-base/nodes/Shopify/GenericFunctions.ts      | 2 +-
 packages/nodes-base/nodes/Shopify/Shopify.node.ts          | 7 +++++++
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/packages/nodes-base/credentials/ShopifyAccessTokenApi.credentials.ts b/packages/nodes-base/credentials/ShopifyAccessTokenApi.credentials.ts
index 3d47202ca2dbe..282fddedd4c7a 100644
--- a/packages/nodes-base/credentials/ShopifyAccessTokenApi.credentials.ts
+++ b/packages/nodes-base/credentials/ShopifyAccessTokenApi.credentials.ts
@@ -4,7 +4,6 @@ import type {
 	ICredentialType,
 	INodeProperties,
 } from 'n8n-workflow';
-
 export class ShopifyAccessTokenApi implements ICredentialType {
 	name = 'shopifyAccessTokenApi';
 
@@ -51,7 +50,7 @@ export class ShopifyAccessTokenApi implements ICredentialType {
 
 	test: ICredentialTestRequest = {
 		request: {
-			baseURL: '=https://{{$credentials?.shopSubdomain}}.myshopify.com/admin/api/2019-10',
+			baseURL: '=https://{{$credentials?.shopSubdomain}}.myshopify.com/admin/api/2024-07',
 			url: '/products.json',
 		},
 	};
diff --git a/packages/nodes-base/credentials/ShopifyApi.credentials.ts b/packages/nodes-base/credentials/ShopifyApi.credentials.ts
index aa01dbf01dd12..2efc64609ec00 100644
--- a/packages/nodes-base/credentials/ShopifyApi.credentials.ts
+++ b/packages/nodes-base/credentials/ShopifyApi.credentials.ts
@@ -6,7 +6,6 @@ import type {
 	IHttpRequestOptions,
 	INodeProperties,
 } from 'n8n-workflow';
-
 export class ShopifyApi implements ICredentialType {
 	name = 'shopifyApi';
 
@@ -63,7 +62,7 @@ export class ShopifyApi implements ICredentialType {
 
 	test: ICredentialTestRequest = {
 		request: {
-			baseURL: '=https://{{$credentials.shopSubdomain}}.myshopify.com/admin/api/2019-10',
+			baseURL: '=https://{{$credentials.shopSubdomain}}.myshopify.com/admin/api/2024-07',
 			url: '/products.json',
 		},
 	};
diff --git a/packages/nodes-base/nodes/Shopify/GenericFunctions.ts b/packages/nodes-base/nodes/Shopify/GenericFunctions.ts
index d2d1852ad6d8c..ff515edfb119b 100644
--- a/packages/nodes-base/nodes/Shopify/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Shopify/GenericFunctions.ts
@@ -38,7 +38,7 @@ export async function shopifyApiRequest(
 	const options: IRequestOptions = {
 		method,
 		qs: query,
-		uri: uri || `https://${credentials.shopSubdomain}.myshopify.com/admin/api/2019-10${resource}`,
+		uri: uri || `https://${credentials.shopSubdomain}.myshopify.com/admin/api/2024-07/${resource}`,
 		body,
 		json: true,
 	};
diff --git a/packages/nodes-base/nodes/Shopify/Shopify.node.ts b/packages/nodes-base/nodes/Shopify/Shopify.node.ts
index 5175dfe6fdae0..a6e8323e7e468 100644
--- a/packages/nodes-base/nodes/Shopify/Shopify.node.ts
+++ b/packages/nodes-base/nodes/Shopify/Shopify.node.ts
@@ -63,6 +63,13 @@ export class Shopify implements INodeType {
 			},
 		],
 		properties: [
+			{
+				displayName: 'Shopify API Version: 2024-07',
+				type: 'notice',
+				name: 'apiVersion',
+				default: '',
+				isNodeSetting: true,
+			},
 			{
 				displayName: 'Authentication',
 				name: 'authentication',

From 24ffca7c75b126e2a894add0b61576fdeb93a40b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Mon, 29 Jul 2024 11:41:28 +0200
Subject: [PATCH 013/168] refactor(core): Decouple server started event from
 internal hooks (no-changelog) (#10221)

---
 packages/cli/src/InternalHooks.ts             | 78 ---------------
 packages/cli/src/Server.ts                    |  5 +-
 packages/cli/src/eventbus/event.types.ts      |  2 +
 .../telemetry-event-relay.service.ts          | 77 +++++++++++++++
 packages/cli/test/unit/InternalHooks.test.ts  | 97 -------------------
 5 files changed, 82 insertions(+), 177 deletions(-)
 delete mode 100644 packages/cli/test/unit/InternalHooks.test.ts

diff --git a/packages/cli/src/InternalHooks.ts b/packages/cli/src/InternalHooks.ts
index 7c923388ed81c..e6418743d7b1a 100644
--- a/packages/cli/src/InternalHooks.ts
+++ b/packages/cli/src/InternalHooks.ts
@@ -1,8 +1,6 @@
 import { Service } from 'typedi';
 import { snakeCase } from 'change-case';
-import os from 'node:os';
 import { get as pslGet } from 'psl';
-import { GlobalConfig } from '@n8n/config';
 import type {
 	ExecutionStatus,
 	INodesGraphResult,
@@ -11,27 +9,23 @@ import type {
 	IWorkflowBase,
 } from 'n8n-workflow';
 import { TelemetryHelpers } from 'n8n-workflow';
-import { InstanceSettings } from 'n8n-core';
 
 import config from '@/config';
 import { N8N_VERSION } from '@/constants';
 import type { AuthProviderType } from '@db/entities/AuthIdentity';
 import type { User } from '@db/entities/User';
 import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
-import { WorkflowRepository } from '@db/repositories/workflow.repository';
 import { determineFinalExecutionStatus } from '@/executionLifecycleHooks/shared/sharedHookFunctions';
 import type {
 	ITelemetryUserDeletionData,
 	IWorkflowDb,
 	IExecutionTrackProperties,
 } from '@/Interfaces';
-import { License } from '@/License';
 import { WorkflowStatisticsService } from '@/services/workflow-statistics.service';
 import { NodeTypes } from '@/NodeTypes';
 import { Telemetry } from '@/telemetry';
 import type { Project } from '@db/entities/Project';
 import { ProjectRelationRepository } from './databases/repositories/projectRelation.repository';
-import { SharedCredentialsRepository } from './databases/repositories/sharedCredentials.repository';
 import { MessageEventBus } from './eventbus/MessageEventBus/MessageEventBus';
 
 /**
@@ -42,16 +36,11 @@ import { MessageEventBus } from './eventbus/MessageEventBus/MessageEventBus';
 @Service()
 export class InternalHooks {
 	constructor(
-		private readonly globalConfig: GlobalConfig,
 		private readonly telemetry: Telemetry,
 		private readonly nodeTypes: NodeTypes,
 		private readonly sharedWorkflowRepository: SharedWorkflowRepository,
-		private readonly workflowRepository: WorkflowRepository,
 		workflowStatisticsService: WorkflowStatisticsService,
-		private readonly instanceSettings: InstanceSettings,
-		private readonly license: License,
 		private readonly projectRelationRepository: ProjectRelationRepository,
-		private readonly sharedCredentialsRepository: SharedCredentialsRepository,
 		private readonly _eventBus: MessageEventBus, // needed until we decouple telemetry
 	) {
 		workflowStatisticsService.on(
@@ -68,73 +57,6 @@ export class InternalHooks {
 		await this.telemetry.init();
 	}
 
-	async onServerStarted(): Promise<unknown[]> {
-		const cpus = os.cpus();
-		const binaryDataConfig = config.getEnv('binaryDataManager');
-
-		const isS3Selected = config.getEnv('binaryDataManager.mode') === 's3';
-		const isS3Available = config.getEnv('binaryDataManager.availableModes').includes('s3');
-		const isS3Licensed = this.license.isBinaryDataS3Licensed();
-		const authenticationMethod = config.getEnv('userManagement.authenticationMethod');
-
-		const info = {
-			version_cli: N8N_VERSION,
-			db_type: this.globalConfig.database.type,
-			n8n_version_notifications_enabled: this.globalConfig.versionNotifications.enabled,
-			n8n_disable_production_main_process: config.getEnv(
-				'endpoints.disableProductionWebhooksOnMainProcess',
-			),
-			system_info: {
-				os: {
-					type: os.type(),
-					version: os.version(),
-				},
-				memory: os.totalmem() / 1024,
-				cpus: {
-					count: cpus.length,
-					model: cpus[0].model,
-					speed: cpus[0].speed,
-				},
-			},
-			execution_variables: {
-				executions_mode: config.getEnv('executions.mode'),
-				executions_timeout: config.getEnv('executions.timeout'),
-				executions_timeout_max: config.getEnv('executions.maxTimeout'),
-				executions_data_save_on_error: config.getEnv('executions.saveDataOnError'),
-				executions_data_save_on_success: config.getEnv('executions.saveDataOnSuccess'),
-				executions_data_save_on_progress: config.getEnv('executions.saveExecutionProgress'),
-				executions_data_save_manual_executions: config.getEnv(
-					'executions.saveDataManualExecutions',
-				),
-				executions_data_prune: config.getEnv('executions.pruneData'),
-				executions_data_max_age: config.getEnv('executions.pruneDataMaxAge'),
-			},
-			n8n_deployment_type: config.getEnv('deployment.type'),
-			n8n_binary_data_mode: binaryDataConfig.mode,
-			smtp_set_up: this.globalConfig.userManagement.emails.mode === 'smtp',
-			ldap_allowed: authenticationMethod === 'ldap',
-			saml_enabled: authenticationMethod === 'saml',
-			license_plan_name: this.license.getPlanName(),
-			license_tenant_id: config.getEnv('license.tenantId'),
-			binary_data_s3: isS3Available && isS3Selected && isS3Licensed,
-			multi_main_setup_enabled: config.getEnv('multiMainSetup.enabled'),
-		};
-
-		const firstWorkflow = await this.workflowRepository.findOne({
-			select: ['createdAt'],
-			order: { createdAt: 'ASC' },
-			where: {},
-		});
-
-		return await Promise.all([
-			this.telemetry.identify(info),
-			this.telemetry.track('Instance started', {
-				...info,
-				earliest_workflow_created: firstWorkflow?.createdAt,
-			}),
-		]);
-	}
-
 	async onFrontendSettingsAPI(pushRef?: string): Promise<void> {
 		return await this.telemetry.track('Session started', { session_id: pushRef });
 	}
diff --git a/packages/cli/src/Server.ts b/packages/cli/src/Server.ts
index a31a87f91d2a2..dc63d697e77b8 100644
--- a/packages/cli/src/Server.ts
+++ b/packages/cli/src/Server.ts
@@ -33,7 +33,6 @@ import { isLdapEnabled } from '@/Ldap/helpers.ee';
 import { AbstractServer } from '@/AbstractServer';
 import { PostHogClient } from '@/posthog';
 import { MessageEventBus } from '@/eventbus/MessageEventBus/MessageEventBus';
-import { InternalHooks } from '@/InternalHooks';
 import { handleMfaDisable, isMfaFeatureEnabled } from '@/Mfa/helpers';
 import type { FrontendService } from '@/services/frontend.service';
 import { OrchestrationService } from '@/services/orchestration.service';
@@ -66,6 +65,7 @@ import '@/ExternalSecrets/ExternalSecrets.controller.ee';
 import '@/license/license.controller';
 import '@/workflows/workflowHistory/workflowHistory.controller.ee';
 import '@/workflows/workflows.controller';
+import { EventService } from './eventbus/event.service';
 
 const exec = promisify(callbackExec);
 
@@ -82,6 +82,7 @@ export class Server extends AbstractServer {
 		private readonly orchestrationService: OrchestrationService,
 		private readonly postHogClient: PostHogClient,
 		private readonly globalConfig: GlobalConfig,
+		private readonly eventService: EventService,
 	) {
 		super('main');
 
@@ -106,7 +107,7 @@ export class Server extends AbstractServer {
 			void this.loadNodesAndCredentials.setupHotReload();
 		}
 
-		void Container.get(InternalHooks).onServerStarted();
+		this.eventService.emit('server-started');
 	}
 
 	private async registerAdditionalControllers() {
diff --git a/packages/cli/src/eventbus/event.types.ts b/packages/cli/src/eventbus/event.types.ts
index 08f40145a4477..225f9aca8c873 100644
--- a/packages/cli/src/eventbus/event.types.ts
+++ b/packages/cli/src/eventbus/event.types.ts
@@ -15,6 +15,8 @@ export type UserLike = {
  * Events sent by `EventService` and forwarded by relays, e.g. `AuditEventRelay` and `TelemetryEventRelay`.
  */
 export type Event = {
+	'server-started': {};
+
 	'workflow-created': {
 		user: UserLike;
 		workflow: IWorkflowBase;
diff --git a/packages/cli/src/telemetry/telemetry-event-relay.service.ts b/packages/cli/src/telemetry/telemetry-event-relay.service.ts
index ad99243b6aa29..63c7fe4d11e74 100644
--- a/packages/cli/src/telemetry/telemetry-event-relay.service.ts
+++ b/packages/cli/src/telemetry/telemetry-event-relay.service.ts
@@ -3,12 +3,20 @@ import { EventService } from '@/eventbus/event.service';
 import type { Event } from '@/eventbus/event.types';
 import { Telemetry } from '.';
 import config from '@/config';
+import os from 'node:os';
+import { License } from '@/License';
+import { GlobalConfig } from '@n8n/config';
+import { N8N_VERSION } from '@/constants';
+import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
 
 @Service()
 export class TelemetryEventRelay {
 	constructor(
 		private readonly eventService: EventService,
 		private readonly telemetry: Telemetry,
+		private readonly license: License,
+		private readonly globalConfig: GlobalConfig,
+		private readonly workflowRepository: WorkflowRepository,
 	) {}
 
 	async init() {
@@ -20,6 +28,8 @@ export class TelemetryEventRelay {
 	}
 
 	private setupHandlers() {
+		this.eventService.on('server-started', async () => await this.serverStarted());
+
 		this.eventService.on('team-project-updated', (event) => this.teamProjectUpdated(event));
 		this.eventService.on('team-project-deleted', (event) => this.teamProjectDeleted(event));
 		this.eventService.on('team-project-created', (event) => this.teamProjectCreated(event));
@@ -420,4 +430,71 @@ export class TelemetryEventRelay {
 	private loginFailedDueToLdapDisabled({ userId }: Event['login-failed-due-to-ldap-disabled']) {
 		void this.telemetry.track('User login failed since ldap disabled', { user_ud: userId });
 	}
+
+	private async serverStarted() {
+		const cpus = os.cpus();
+		const binaryDataConfig = config.getEnv('binaryDataManager');
+
+		const isS3Selected = config.getEnv('binaryDataManager.mode') === 's3';
+		const isS3Available = config.getEnv('binaryDataManager.availableModes').includes('s3');
+		const isS3Licensed = this.license.isBinaryDataS3Licensed();
+		const authenticationMethod = config.getEnv('userManagement.authenticationMethod');
+
+		const info = {
+			version_cli: N8N_VERSION,
+			db_type: this.globalConfig.database.type,
+			n8n_version_notifications_enabled: this.globalConfig.versionNotifications.enabled,
+			n8n_disable_production_main_process: config.getEnv(
+				'endpoints.disableProductionWebhooksOnMainProcess',
+			),
+			system_info: {
+				os: {
+					type: os.type(),
+					version: os.version(),
+				},
+				memory: os.totalmem() / 1024,
+				cpus: {
+					count: cpus.length,
+					model: cpus[0].model,
+					speed: cpus[0].speed,
+				},
+			},
+			execution_variables: {
+				executions_mode: config.getEnv('executions.mode'),
+				executions_timeout: config.getEnv('executions.timeout'),
+				executions_timeout_max: config.getEnv('executions.maxTimeout'),
+				executions_data_save_on_error: config.getEnv('executions.saveDataOnError'),
+				executions_data_save_on_success: config.getEnv('executions.saveDataOnSuccess'),
+				executions_data_save_on_progress: config.getEnv('executions.saveExecutionProgress'),
+				executions_data_save_manual_executions: config.getEnv(
+					'executions.saveDataManualExecutions',
+				),
+				executions_data_prune: config.getEnv('executions.pruneData'),
+				executions_data_max_age: config.getEnv('executions.pruneDataMaxAge'),
+			},
+			n8n_deployment_type: config.getEnv('deployment.type'),
+			n8n_binary_data_mode: binaryDataConfig.mode,
+			smtp_set_up: this.globalConfig.userManagement.emails.mode === 'smtp',
+			ldap_allowed: authenticationMethod === 'ldap',
+			saml_enabled: authenticationMethod === 'saml',
+			license_plan_name: this.license.getPlanName(),
+			license_tenant_id: config.getEnv('license.tenantId'),
+			binary_data_s3: isS3Available && isS3Selected && isS3Licensed,
+			multi_main_setup_enabled: config.getEnv('multiMainSetup.enabled'),
+		};
+
+		const firstWorkflow = await this.workflowRepository.findOne({
+			select: ['createdAt'],
+			order: { createdAt: 'ASC' },
+			where: {},
+		});
+
+		void Promise.all([
+			this.telemetry.identify(info),
+			this.telemetry.track('Instance started', {
+				...info,
+				earliest_workflow_created: firstWorkflow?.createdAt,
+			}),
+		]);
+	}
 }
diff --git a/packages/cli/test/unit/InternalHooks.test.ts b/packages/cli/test/unit/InternalHooks.test.ts
deleted file mode 100644
index 09835e4813ba5..0000000000000
--- a/packages/cli/test/unit/InternalHooks.test.ts
+++ /dev/null
@@ -1,97 +0,0 @@
-import { mock } from 'jest-mock-extended';
-import type { GlobalConfig } from '@n8n/config';
-import { N8N_VERSION } from '@/constants';
-import { InternalHooks } from '@/InternalHooks';
-import type { License } from '@/License';
-import type { Telemetry } from '@/telemetry';
-
-jest.mock('node:os', () => ({
-	tmpdir: () => '',
-	cpus: () => [{ model: 'MIPS R3000', speed: 40_000_000 }],
-	type: () => 'TempleOS',
-	version: () => '5.03',
-	totalmem: () => 1024 * 1024,
-}));
-
-describe('InternalHooks', () => {
-	const telemetry = mock<Telemetry>();
-	const license = mock<License>();
-	const globalConfig = mock<GlobalConfig>({
-		database: {
-			type: 'sqlite',
-		},
-		userManagement: {
-			emails: {
-				mode: 'smtp',
-			},
-		},
-		versionNotifications: {
-			enabled: true,
-		},
-	});
-	const internalHooks = new InternalHooks(
-		globalConfig,
-		telemetry,
-		mock(),
-		mock(),
-		mock(),
-		mock(),
-		mock(),
-		license,
-		mock(),
-		mock(),
-		mock(),
-	);
-
-	beforeEach(() => jest.clearAllMocks());
-
-	it('Should be defined', () => {
-		expect(internalHooks).toBeDefined();
-	});
-
-	it('Should forward license plan name and tenant id to identify when provided', async () => {
-		license.getPlanName.mockReturnValue('Best Plan');
-		globalConfig.database.type = 'sqlite';
-
-		await internalHooks.onServerStarted();
-
-		expect(telemetry.identify).toHaveBeenCalledWith({
-			version_cli: N8N_VERSION,
-			db_type: 'sqlite',
-			n8n_version_notifications_enabled: true,
-			n8n_disable_production_main_process: false,
-			system_info: {
-				memory: 1024,
-				os: {
-					type: 'TempleOS',
-					version: '5.03',
-				},
-				cpus: {
-					count: 1,
-					model: 'MIPS R3000',
-					speed: 40000000,
-				},
-			},
-			execution_variables: {
-				executions_data_max_age: 336,
-				executions_data_prune: true,
-				executions_data_save_manual_executions: true,
-				executions_data_save_on_error: 'all',
-				executions_data_save_on_progress: false,
-				executions_data_save_on_success: 'all',
-				executions_mode: 'regular',
-				executions_timeout: -1,
-				executions_timeout_max: 3600,
-			},
-			n8n_deployment_type: 'default',
-			n8n_binary_data_mode: 'default',
-			smtp_set_up: true,
-			ldap_allowed: false,
-			saml_enabled: false,
-			license_plan_name: 'Best Plan',
-			license_tenant_id: 1,
-			binary_data_s3: false,
-			multi_main_setup_enabled: false,
-		});
-	});
-});

From 00ec2533374d3def465efee718592fc4001d5602 Mon Sep 17 00:00:00 2001
From: Michael Kret <88898367+michael-radency@users.noreply.github.com>
Date: Mon, 29 Jul 2024 14:48:11 +0300
Subject: [PATCH 014/168] fix(Postgres Node): Option to treat query parameters
 enclosed in single quotas as text (#10214)

---
 .../nodes/Postgres/test/v2/operations.test.ts | 71 +++++++++++++++++++
 .../v2/actions/common.descriptions.ts         | 11 +++
 .../database/executeQuery.operation.ts        | 10 +++
 .../nodes/Postgres/v2/helpers/interfaces.ts   |  1 +
 4 files changed, 93 insertions(+)

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 61484e54a14b0..aff8c740a5c11 100644
--- a/packages/nodes-base/nodes/Postgres/test/v2/operations.test.ts
+++ b/packages/nodes-base/nodes/Postgres/test/v2/operations.test.ts
@@ -219,6 +219,77 @@ describe('Test PostgresV2, executeQuery operation', () => {
 			nodeOptions,
 		);
 	});
+
+	it('should call runQueries and insert enclosed placeholder into values', async () => {
+		const nodeParameters: IDataObject = {
+			operation: 'executeQuery',
+			query: "select '$1';",
+			options: {},
+		};
+		const nodeOptions = nodeParameters.options as IDataObject;
+
+		await executeQuery.execute.call(
+			createMockExecuteFunction(nodeParameters),
+			runQueries,
+			items,
+			nodeOptions,
+		);
+
+		expect(runQueries).toHaveBeenCalledWith(
+			[{ query: 'select $1;', values: ['$1'] }],
+			items,
+			nodeOptions,
+		);
+	});
+
+	it('should call runQueries and not insert enclosed placeholder into values because queryReplacement is defined', async () => {
+		const nodeParameters: IDataObject = {
+			operation: 'executeQuery',
+			query: "select '$1';",
+			options: {
+				queryReplacement: 'my_table',
+			},
+		};
+		const nodeOptions = nodeParameters.options as IDataObject;
+
+		await executeQuery.execute.call(
+			createMockExecuteFunction(nodeParameters),
+			runQueries,
+			items,
+			nodeOptions,
+		);
+
+		expect(runQueries).toHaveBeenCalledWith(
+			[{ query: "select '$1';", values: ['my_table'] }],
+			items,
+			nodeOptions,
+		);
+	});
+
+	it('should call runQueries and insert enclosed placeholder into values because treatQueryParametersInSingleQuotesAsText is true', async () => {
+		const nodeParameters: IDataObject = {
+			operation: 'executeQuery',
+			query: "select '$1';",
+			options: {
+				queryReplacement: 'my_table',
+				treatQueryParametersInSingleQuotesAsText: true,
+			},
+		};
+		const nodeOptions = nodeParameters.options as IDataObject;
+
+		await executeQuery.execute.call(
+			createMockExecuteFunction(nodeParameters),
+			runQueries,
+			items,
+			nodeOptions,
+		);
+
+		expect(runQueries).toHaveBeenCalledWith(
+			[{ query: 'select $2;', values: ['my_table', '$1'] }],
+			items,
+			nodeOptions,
+		);
+	});
 });
 
 describe('Test PostgresV2, insert operation', () => {
diff --git a/packages/nodes-base/nodes/Postgres/v2/actions/common.descriptions.ts b/packages/nodes-base/nodes/Postgres/v2/actions/common.descriptions.ts
index 1d4088820ff34..8814e9a4dfac5 100644
--- a/packages/nodes-base/nodes/Postgres/v2/actions/common.descriptions.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/actions/common.descriptions.ts
@@ -79,6 +79,17 @@ export const optionsCollection: INodeProperties = {
 				show: { '/operation': ['executeQuery'] },
 			},
 		},
+		{
+			// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+			displayName: 'Treat query parameters in single quotes as text',
+			name: 'treatQueryParametersInSingleQuotesAsText',
+			type: 'boolean',
+			default: false,
+			description: "Whether to treat query parameters enclosed in single quotes as text e.g. '$1'",
+			displayOptions: {
+				show: { queryReplacement: [{ _cnd: { exists: true } }] },
+			},
+		},
 		{
 			// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-multi-options
 			displayName: 'Output Columns',
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 6d7908905e856..2b8449e983ccb 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
@@ -109,6 +109,16 @@ export async function execute(
 			}
 		}
 
+		if (!queryReplacement || nodeOptions.treatQueryParametersInSingleQuotesAsText) {
+			let nextValueIndex = values.length + 1;
+			const literals = query.match(/'\$[0-9]+'/g) ?? [];
+			for (const literal of literals) {
+				query = query.replace(literal, `$${nextValueIndex}`);
+				values.push(literal.replace(/'/g, ''));
+				nextValueIndex++;
+			}
+		}
+
 		queries.push({ query, values });
 	}
 
diff --git a/packages/nodes-base/nodes/Postgres/v2/helpers/interfaces.ts b/packages/nodes-base/nodes/Postgres/v2/helpers/interfaces.ts
index 8a8677f4f040a..8aadf14ddc86c 100644
--- a/packages/nodes-base/nodes/Postgres/v2/helpers/interfaces.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/helpers/interfaces.ts
@@ -47,6 +47,7 @@ export type PostgresNodeOptions = {
 	largeNumbersOutput?: 'numbers' | 'text';
 	skipOnConflict?: boolean;
 	replaceEmptyStrings?: boolean;
+	treatQueryParametersInSingleQuotesAsText?: boolean;
 };
 
 export type PostgresNodeCredentials = {

From 4d37b9669f05a21582c6a59e7931093836e9cdd7 Mon Sep 17 00:00:00 2001
From: Jon <jonathan.bennetts@gmail.com>
Date: Mon, 29 Jul 2024 13:27:23 +0100
Subject: [PATCH 015/168] docs: Update add options text (no-changelog) (#10049)

---
 .../nodes/Affinity/OrganizationDescription.ts  |  4 ++--
 .../nodes/Affinity/PersonDescription.ts        |  4 ++--
 .../nodes/AgileCrm/CompanyDescription.ts       |  2 +-
 .../nodes/AgileCrm/ContactDescription.ts       |  2 +-
 .../nodes/Airtable/v1/AirtableV1.node.ts       |  4 ++--
 .../v2/actions/base/getMany.operation.ts       |  2 +-
 .../Airtable/v2/actions/common.descriptions.ts |  2 +-
 .../v2/actions/record/get.operation.ts         |  2 +-
 .../v2/actions/record/search.operation.ts      |  2 +-
 packages/nodes-base/nodes/Amqp/Amqp.node.ts    |  2 +-
 .../nodes-base/nodes/Amqp/AmqpTrigger.node.ts  |  2 +-
 packages/nodes-base/nodes/Aws/AwsSns.node.ts   |  2 +-
 .../nodes-base/nodes/Aws/SQS/AwsSqs.node.ts    |  2 +-
 .../nodes/Aws/Transcribe/AwsTranscribe.node.ts |  2 +-
 .../nodes/Baserow/OperationDescription.ts      |  2 +-
 .../nodes-base/nodes/Box/FileDescription.ts    |  2 +-
 .../nodes-base/nodes/Box/FolderDescription.ts  |  2 +-
 .../nodes/Brevo/ContactDescription.ts          |  2 +-
 .../Webex/descriptions/MeetingDescription.ts   |  4 ++--
 .../Webex/descriptions/MeetingTranscript.ts    |  2 +-
 .../nodes/Cockpit/CollectionDescription.ts     |  2 +-
 .../nodes-base/nodes/Coda/TableDescription.ts  |  6 +++---
 .../nodes-base/nodes/Coda/ViewDescription.ts   |  4 ++--
 .../nodes/CoinGecko/CoinDescription.ts         |  6 +++---
 .../nodes/CoinGecko/EventDescription.ts        |  2 +-
 .../CompareDatasets/CompareDatasets.node.ts    |  2 +-
 .../nodes/CrowdDev/descriptions/utils.ts       |  2 +-
 .../nodes/DateTime/V1/DateTimeV1.node.ts       |  4 ++--
 .../nodes/DateTime/V2/AddToDateDescription.ts  |  2 +-
 .../DateTime/V2/CurrentDateDescription.ts      |  2 +-
 .../DateTime/V2/ExtractDateDescription.ts      |  2 +-
 .../nodes/DateTime/V2/FormatDateDescription.ts |  2 +-
 .../nodes/DateTime/V2/GetTimeBetweenDates.ts   |  2 +-
 .../nodes/DateTime/V2/RoundDateDescription.ts  |  2 +-
 .../DateTime/V2/SubtractFromDateDescription.ts |  2 +-
 packages/nodes-base/nodes/Dhl/Dhl.node.ts      |  2 +-
 .../nodes/Discord/v1/DiscordV1.node.ts         |  2 +-
 .../v2/actions/channel/create.operation.ts     |  2 +-
 .../v2/actions/channel/getAll.operation.ts     |  2 +-
 .../v2/actions/channel/update.operation.ts     |  2 +-
 .../v2/actions/member/getAll.operation.ts      |  2 +-
 .../v2/actions/message/get.operation.ts        |  2 +-
 .../v2/actions/message/getAll.operation.ts     |  2 +-
 .../v2/actions/message/send.operation.ts       |  2 +-
 .../v2/actions/webhook/sendLegacy.operation.ts |  2 +-
 .../nodes/Discourse/UserDescription.ts         |  2 +-
 .../nodes/Dropcontact/Dropcontact.node.ts      |  2 +-
 .../nodes/EditImage/EditImage.node.ts          |  2 +-
 .../descriptions/DocumentDescription.ts        |  4 ++--
 .../EmailReadImap/v1/EmailReadImapV1.node.ts   |  2 +-
 .../EmailReadImap/v2/EmailReadImapV2.node.ts   |  2 +-
 .../nodes/EmailSend/v1/EmailSendV1.node.ts     |  2 +-
 .../nodes/EmailSend/v2/send.operation.ts       |  2 +-
 .../ExecuteWorkflow/ExecuteWorkflow.node.ts    |  2 +-
 .../nodes/Facebook/FacebookGraphApi.node.ts    |  2 +-
 .../FacebookLeadAdsTrigger.node.ts             |  2 +-
 .../actions/spreadsheet.operation.ts           |  2 +-
 .../actions/toBinary.operation.ts              |  2 +-
 .../ConvertToFile/actions/toJson.operation.ts  |  2 +-
 .../ConvertToFile/actions/toText.operation.ts  |  2 +-
 .../actions/moveTo.operation.ts                |  2 +-
 .../ExtractFromFile/actions/pdf.operation.ts   |  2 +-
 .../ReadWriteFile/actions/read.operation.ts    |  2 +-
 .../ReadWriteFile/actions/write.operation.ts   |  2 +-
 .../nodes/Form/common.descriptions.ts          |  2 +-
 .../nodes/Form/v1/FormTriggerV1.node.ts        |  2 +-
 .../nodes/Form/v2/FormTriggerV2.node.ts        |  2 +-
 .../nodes/Freshdesk/Freshdesk.node.ts          |  4 ++--
 .../descriptions/SearchDescription.ts          |  2 +-
 packages/nodes-base/nodes/Ftp/Ftp.node.ts      |  2 +-
 .../GetResponse/GetResponseTrigger.node.ts     |  2 +-
 .../nodes-base/nodes/Ghost/PostDescription.ts  |  8 ++++----
 .../Git/descriptions/AddConfigDescription.ts   |  2 +-
 .../Git/descriptions/CommitDescription.ts      |  2 +-
 .../nodes/Git/descriptions/LogDescription.ts   |  2 +-
 .../nodes/Git/descriptions/PushDescription.ts  |  2 +-
 .../nodes/Github/GithubTrigger.node.ts         |  2 +-
 .../nodes/Google/Ads/CampaignDescription.ts    |  2 +-
 .../Google/BigQuery/v1/RecordDescription.ts    |  6 +++---
 .../actions/database/executeQuery.operation.ts |  2 +-
 .../v2/actions/database/insert.operation.ts    |  2 +-
 .../Google/Calendar/CalendarDescription.ts     |  2 +-
 .../nodes/Google/Calendar/EventDescription.ts  |  6 +++---
 .../Calendar/GoogleCalendarTrigger.node.ts     |  2 +-
 .../descriptions/IncomingWebhookDescription.ts |  2 +-
 .../Chat/descriptions/MessageDescription.ts    |  2 +-
 .../GoogleCloudNaturalLanguage.node.ts         |  2 +-
 .../Google/Contacts/ContactDescription.ts      |  2 +-
 .../Google/Drive/GoogleDriveTrigger.node.ts    |  2 +-
 .../Google/Drive/v1/GoogleDriveV1.node.ts      | 18 +++++++++---------
 .../Drive/v2/actions/common.descriptions.ts    |  2 +-
 .../Drive/v2/actions/drive/create.operation.ts |  2 +-
 .../Drive/v2/actions/drive/get.operation.ts    |  2 +-
 .../Drive/v2/actions/drive/list.operation.ts   |  2 +-
 .../Drive/v2/actions/drive/update.operation.ts |  2 +-
 .../Drive/v2/actions/file/copy.operation.ts    |  2 +-
 .../actions/file/createFromText.operation.ts   |  2 +-
 .../v2/actions/file/deleteFile.operation.ts    |  2 +-
 .../v2/actions/file/download.operation.ts      |  2 +-
 .../Drive/v2/actions/file/update.operation.ts  |  2 +-
 .../Drive/v2/actions/file/upload.operation.ts  |  2 +-
 .../v2/actions/fileFolder/search.operation.ts  |  2 +-
 .../v2/actions/folder/create.operation.ts      |  2 +-
 .../actions/folder/deleteFolder.operation.ts   |  2 +-
 .../Google/GSuiteAdmin/GroupDescripion.ts      |  2 +-
 .../Google/GSuiteAdmin/UserDescription.ts      |  4 ++--
 .../nodes/Google/Gmail/GmailTrigger.node.ts    |  2 +-
 .../nodes/Google/Gmail/v2/DraftDescription.ts  |  6 +++---
 .../nodes/Google/Gmail/v2/LabelDescription.ts  |  2 +-
 .../Google/Gmail/v2/MessageDescription.ts      |  6 +++---
 .../nodes/Google/Gmail/v2/ThreadDescription.ts |  2 +-
 .../Perspective/GooglePerspective.node.ts      |  2 +-
 .../Google/Sheet/GoogleSheetsTrigger.node.ts   |  2 +-
 .../Google/Sheet/v1/versionDescription.ts      |  6 +++---
 .../Sheet/v2/actions/sheet/append.operation.ts |  2 +-
 .../actions/sheet/appendOrUpdate.operation.ts  |  2 +-
 .../Sheet/v2/actions/sheet/create.operation.ts |  2 +-
 .../Sheet/v2/actions/sheet/read.operation.ts   |  2 +-
 .../Sheet/v2/actions/sheet/update.operation.ts |  2 +-
 .../v2/actions/spreadsheet/create.operation.ts |  2 +-
 .../nodes/Google/Slides/GoogleSlides.node.ts   |  2 +-
 .../nodes/Google/YouTube/ChannelDescription.ts |  4 ++--
 .../Google/YouTube/PlaylistDescription.ts      | 10 +++++-----
 .../Google/YouTube/PlaylistItemDescription.ts  |  8 ++++----
 .../nodes/Google/YouTube/VideoDescription.ts   | 12 ++++++------
 .../nodes-base/nodes/Gotify/Gotify.node.ts     |  2 +-
 .../nodes/Grist/OperationDescription.ts        |  2 +-
 .../nodes/HelpScout/ConversationDescription.ts |  2 +-
 .../nodes/HelpScout/CustomerDescription.ts     |  2 +-
 .../v1/description/ContactDescription.ts       |  2 +-
 .../v2/description/ContactDescription.ts       |  2 +-
 packages/nodes-base/nodes/Html/Html.node.ts    |  4 ++--
 .../nodes/HtmlExtract/HtmlExtract.node.ts      |  2 +-
 .../nodes/HttpRequest/V1/HttpRequestV1.node.ts |  2 +-
 .../nodes/HttpRequest/V2/HttpRequestV2.node.ts |  2 +-
 .../nodes/HttpRequest/V3/HttpRequestV3.node.ts |  2 +-
 .../nodes/Hubspot/V2/CompanyDescription.ts     |  6 +++---
 .../nodes/Hubspot/V2/ContactDescription.ts     | 10 +++++-----
 .../nodes/Hubspot/V2/DealDescription.ts        |  6 +++---
 .../nodes/Hubspot/V2/FormDescription.ts        |  2 +-
 .../nodes/Hubspot/V2/TicketDescription.ts      |  4 ++--
 .../nodes/HumanticAI/ProfileDescription.ts     |  2 +-
 .../nodes/ICalendar/createEvent.operation.ts   |  2 +-
 .../nodes/ItemLists/V1/summarize.operation.ts  |  2 +-
 .../nodes/ItemLists/V2/summarize.operation.ts  |  2 +-
 .../V3/actions/itemList/summarize.operation.ts |  2 +-
 .../nodes/Jira/IssueCommentDescription.ts      |  4 ++--
 .../nodes-base/nodes/Jira/IssueDescription.ts  |  2 +-
 packages/nodes-base/nodes/Jwt/Jwt.node.ts      |  2 +-
 packages/nodes-base/nodes/Kafka/Kafka.node.ts  |  2 +-
 .../nodes/Kafka/KafkaTrigger.node.ts           |  2 +-
 .../nodes/Keap/CompanyDescription.ts           |  2 +-
 .../nodes/Keap/ContactDescription.ts           |  4 ++--
 .../nodes/Keap/EcommerceOrderDescripion.ts     |  2 +-
 .../nodes/KoBoToolbox/FormDescription.ts       |  2 +-
 .../nodes-base/nodes/KoBoToolbox/Options.ts    |  2 +-
 .../nodes/KoBoToolbox/SubmissionDescription.ts |  2 +-
 .../nodes-base/nodes/Ldap/LdapDescription.ts   |  2 +-
 .../nodes/LingvaNex/LingvaNex.node.ts          |  2 +-
 .../LocalFileTrigger/LocalFileTrigger.node.ts  |  2 +-
 packages/nodes-base/nodes/MQTT/Mqtt.node.ts    |  2 +-
 .../nodes-base/nodes/MQTT/MqttTrigger.node.ts  |  2 +-
 .../nodes/Magento/GenericFunctions.ts          |  2 +-
 .../nodes/Mailchimp/Mailchimp.node.ts          | 10 +++++-----
 .../nodes-base/nodes/Mandrill/Mandrill.node.ts |  2 +-
 .../nodes-base/nodes/Markdown/Markdown.node.ts |  4 ++--
 .../nodes/Matrix/MessageDescription.ts         |  2 +-
 .../v1/actions/message/post/description.ts     |  4 ++--
 .../nodes/Mautic/ContactDescription.ts         |  2 +-
 .../nodes-base/nodes/Merge/v2/descriptions.ts  |  2 +-
 .../nodes/Merge/v3/actions/mode/combineAll.ts  |  2 +-
 .../Merge/v3/actions/mode/combineByFields.ts   |  2 +-
 .../Merge/v3/actions/mode/combineByPosition.ts |  2 +-
 .../descriptions/AccountDescription.ts         |  4 ++--
 .../Microsoft/Excel/v1/TableDescription.ts     |  2 +-
 .../Excel/v2/actions/table/append.operation.ts |  2 +-
 .../Excel/v2/actions/table/lookup.operation.ts |  2 +-
 .../actions/workbook/addWorksheet.operation.ts |  2 +-
 .../v2/actions/worksheet/append.operation.ts   |  2 +-
 .../v2/actions/worksheet/readRows.operation.ts |  2 +-
 .../v2/actions/worksheet/update.operation.ts   |  2 +-
 .../v2/actions/worksheet/upsert.operation.ts   |  2 +-
 .../Microsoft/OneDrive/TriggerDescription.ts   |  4 ++--
 .../Outlook/trigger/MessageDescription.ts      |  2 +-
 .../Outlook/v2/actions/draft/get.operation.ts  |  2 +-
 .../v2/actions/folder/create.operation.ts      |  2 +-
 .../Outlook/v2/actions/folder/get.operation.ts |  2 +-
 .../actions/folderMessage/getAll.operation.ts  |  2 +-
 .../v2/actions/message/get.operation.ts        |  2 +-
 .../v2/actions/message/getAll.operation.ts     |  2 +-
 .../actions/messageAttachment/add.operation.ts |  2 +-
 .../messageAttachment/getAll.operation.ts      |  2 +-
 .../Teams/v1/ChatMessageDescription.ts         |  2 +-
 .../v2/actions/channel/create.operation.ts     |  2 +-
 .../v2/actions/channel/update.operation.ts     |  2 +-
 .../actions/channelMessage/create.operation.ts |  2 +-
 .../v2/actions/chatMessage/create.operation.ts |  2 +-
 .../Teams/v2/actions/task/create.operation.ts  |  2 +-
 .../nodes/MongoDb/MongoDbProperties.ts         |  4 ++--
 .../MoveBinaryData/MoveBinaryData.node.ts      |  2 +-
 .../MySql/v2/actions/common.descriptions.ts    |  2 +-
 .../nodes/N8n/ExecutionDescription.ts          |  4 ++--
 .../nodes/Netscaler/ADC/FileDescription.ts     |  2 +-
 .../nodes/NextCloud/NextCloud.node.ts          |  6 +++---
 .../nodes/NocoDB/OperationDescription.ts       |  2 +-
 .../descriptions/DatabasePageDescription.ts    |  4 ++--
 .../shared/descriptions/PageDescription.ts     |  2 +-
 .../nodes/OneSimpleApi/OneSimpleApi.node.ts    |  8 ++++----
 .../descriptions/ContainerDescription.ts       |  2 +-
 .../nodes-base/nodes/OpenAi/ChatDescription.ts |  2 +-
 .../nodes/OpenAi/ImageDescription.ts           |  2 +-
 .../nodes-base/nodes/OpenAi/TextDescription.ts |  2 +-
 .../nodes/OpenThesaurus/OpenThesaurus.node.ts  |  2 +-
 .../nodes/Orbit/MemberDescription.ts           |  2 +-
 .../nodes/Postgres/PostgresTrigger.node.ts     |  2 +-
 .../Postgres/v2/actions/common.descriptions.ts |  2 +-
 .../nodes/ProfitWell/MetricDescription.ts      |  2 +-
 .../nodes/QuickBase/RecordDescription.ts       |  6 +++---
 .../nodes/QuickChart/QuickChart.node.ts        |  4 ++--
 .../nodes-base/nodes/RabbitMQ/RabbitMQ.node.ts |  2 +-
 .../nodes/RabbitMQ/RabbitMQTrigger.node.ts     |  2 +-
 packages/nodes-base/nodes/Redis/Redis.node.ts  |  4 ++--
 .../nodes/Redis/RedisTrigger.node.ts           |  2 +-
 .../nodes/RenameKeys/RenameKeys.node.ts        |  2 +-
 .../RespondToWebhook/RespondToWebhook.node.ts  |  2 +-
 .../nodes/Rocketchat/Rocketchat.node.ts        |  2 +-
 .../nodes/RssFeedRead/RssFeedRead.node.ts      |  2 +-
 .../nodes/Salesmate/ActivityDescription.ts     |  2 +-
 .../nodes/Salesmate/CompanyDescription.ts      |  2 +-
 .../nodes/Salesmate/DealDescription.ts         |  2 +-
 .../nodes/SeaTable/RowDescription.ts           |  2 +-
 .../descriptions/CompanyDescription.ts         |  2 +-
 .../descriptions/IndustryDescription.ts        |  2 +-
 .../nodes/ServiceNow/IncidentDescription.ts    |  4 ++--
 packages/nodes-base/nodes/Set/v1/SetV1.node.ts |  2 +-
 packages/nodes-base/nodes/Set/v2/SetV2.node.ts |  2 +-
 .../nodes/Shopify/ProductDescription.ts        |  4 ++--
 .../nodes/Slack/V1/FileDescription.ts          |  2 +-
 .../nodes/Slack/V1/MessageDescription.ts       |  2 +-
 .../nodes/Slack/V1/StarDescription.ts          |  4 ++--
 .../nodes/Slack/V2/FileDescription.ts          |  2 +-
 .../nodes/Slack/V2/MessageDescription.ts       |  6 +++---
 .../nodes/Slack/V2/StarDescription.ts          |  4 ++--
 .../SplitInBatches/v1/SplitInBatchesV1.node.ts |  2 +-
 .../SplitInBatches/v2/SplitInBatchesV2.node.ts |  2 +-
 .../SplitInBatches/v3/SplitInBatchesV3.node.ts |  2 +-
 .../SearchConfigurationDescription.ts          |  2 +-
 .../v1/descriptions/SearchJobDescription.ts    |  2 +-
 .../v1/descriptions/SearchResultDescription.ts |  2 +-
 .../v2/actions/report/getAll.operation.ts      |  2 +-
 .../v2/actions/search/getResult.operation.ts   |  2 +-
 .../nodes/SpreadsheetFile/description.ts       |  4 ++--
 packages/nodes-base/nodes/Ssh/Ssh.node.ts      |  2 +-
 .../Storyblok/StoryManagementDescription.ts    |  2 +-
 .../nodes/Strava/StravaTrigger.node.ts         |  2 +-
 .../nodes/Switch/V3/SwitchV3.node.ts           |  2 +-
 .../nodes-base/nodes/Telegram/Telegram.node.ts |  2 +-
 .../TheHive/descriptions/AlertDescription.ts   |  4 ++--
 .../TheHive/descriptions/CaseDescription.ts    |  4 ++--
 .../TheHive/descriptions/LogDescription.ts     |  2 +-
 .../descriptions/ObservableDescription.ts      |  4 ++--
 .../TheHive/descriptions/TaskDescription.ts    |  4 ++--
 .../TheHiveProjectTrigger.node.ts              |  2 +-
 .../actions/alert/get.operation.ts             |  2 +-
 .../actions/case/addAttachment.operation.ts    |  2 +-
 .../actions/case/getAttachment.operation.ts    |  2 +-
 .../actions/page/update.operation.ts           |  2 +-
 .../descriptions/common.description.ts         |  2 +-
 .../nodes/Todoist/v1/TodoistV1.node.ts         |  4 ++--
 .../nodes/Todoist/v2/TodoistV2.node.ts         |  4 ++--
 packages/nodes-base/nodes/Totp/Totp.node.ts    |  2 +-
 .../Transform/Summarize/Summarize.node.ts      |  2 +-
 .../Twist/MessageConversationDescription.ts    |  2 +-
 packages/nodes-base/nodes/UProc/UProc.node.ts  |  2 +-
 .../Datacenter/CertificateDescription.ts       |  2 +-
 packages/nodes-base/nodes/Wait/Wait.node.ts    |  4 ++--
 .../nodes-base/nodes/Webhook/description.ts    |  2 +-
 .../nodes/WooCommerce/OrderDescription.ts      |  2 +-
 .../nodes/WooCommerce/ProductDescription.ts    |  2 +-
 .../nodes/Wordpress/PageDescription.ts         |  6 +++---
 .../nodes/Wordpress/PostDescription.ts         |  6 +++---
 .../nodes/Wordpress/UserDescription.ts         |  4 ++--
 .../WriteBinaryFile/WriteBinaryFile.node.ts    |  2 +-
 .../nodes/Xero/ContactDescription.ts           |  2 +-
 .../nodes/Xero/InvoiceDescription.ts           |  2 +-
 packages/nodes-base/nodes/Xml/Xml.node.ts      |  4 ++--
 .../nodes/Zendesk/TicketDescription.ts         |  2 +-
 .../nodes/Zendesk/ZendeskTrigger.node.ts       |  2 +-
 .../nodes/Zoho/descriptions/SharedFields.ts    |  2 +-
 289 files changed, 388 insertions(+), 388 deletions(-)

diff --git a/packages/nodes-base/nodes/Affinity/OrganizationDescription.ts b/packages/nodes-base/nodes/Affinity/OrganizationDescription.ts
index 25963a8858ae1..418bddbd80d7e 100644
--- a/packages/nodes-base/nodes/Affinity/OrganizationDescription.ts
+++ b/packages/nodes-base/nodes/Affinity/OrganizationDescription.ts
@@ -183,7 +183,7 @@ export const organizationFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
@@ -239,7 +239,7 @@ export const organizationFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/Affinity/PersonDescription.ts b/packages/nodes-base/nodes/Affinity/PersonDescription.ts
index 95ef90b4af42d..664a46a3e894d 100644
--- a/packages/nodes-base/nodes/Affinity/PersonDescription.ts
+++ b/packages/nodes-base/nodes/Affinity/PersonDescription.ts
@@ -219,7 +219,7 @@ export const personFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
@@ -275,7 +275,7 @@ export const personFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/AgileCrm/CompanyDescription.ts b/packages/nodes-base/nodes/AgileCrm/CompanyDescription.ts
index 97ac7aa72ae76..ad80279c132ba 100644
--- a/packages/nodes-base/nodes/AgileCrm/CompanyDescription.ts
+++ b/packages/nodes-base/nodes/AgileCrm/CompanyDescription.ts
@@ -279,7 +279,7 @@ export const companyFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/AgileCrm/ContactDescription.ts b/packages/nodes-base/nodes/AgileCrm/ContactDescription.ts
index 4b92f7cc4cdc9..e5e4156a21682 100644
--- a/packages/nodes-base/nodes/AgileCrm/ContactDescription.ts
+++ b/packages/nodes-base/nodes/AgileCrm/ContactDescription.ts
@@ -279,7 +279,7 @@ export const contactFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/Airtable/v1/AirtableV1.node.ts b/packages/nodes-base/nodes/Airtable/v1/AirtableV1.node.ts
index 3ce3a8ce7237f..b62ed931e11f9 100644
--- a/packages/nodes-base/nodes/Airtable/v1/AirtableV1.node.ts
+++ b/packages/nodes-base/nodes/Airtable/v1/AirtableV1.node.ts
@@ -347,7 +347,7 @@ const versionDescription: INodeTypeDescription = {
 			},
 			default: {},
 			description: 'Additional options which decide which records should be returned',
-			placeholder: 'Add Option',
+			placeholder: 'Add option',
 			options: [
 				{
 					displayName: 'Fields',
@@ -502,7 +502,7 @@ const versionDescription: INodeTypeDescription = {
 			displayName: 'Options',
 			name: 'options',
 			type: 'collection',
-			placeholder: 'Add Option',
+			placeholder: 'Add option',
 			displayOptions: {
 				show: {
 					operation: ['append', 'delete', 'update'],
diff --git a/packages/nodes-base/nodes/Airtable/v2/actions/base/getMany.operation.ts b/packages/nodes-base/nodes/Airtable/v2/actions/base/getMany.operation.ts
index a0ab51ac58f9e..da5f2f528e0ac 100644
--- a/packages/nodes-base/nodes/Airtable/v2/actions/base/getMany.operation.ts
+++ b/packages/nodes-base/nodes/Airtable/v2/actions/base/getMany.operation.ts
@@ -39,7 +39,7 @@ const properties: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			{
diff --git a/packages/nodes-base/nodes/Airtable/v2/actions/common.descriptions.ts b/packages/nodes-base/nodes/Airtable/v2/actions/common.descriptions.ts
index 22654c8635e98..43a07d696188c 100644
--- a/packages/nodes-base/nodes/Airtable/v2/actions/common.descriptions.ts
+++ b/packages/nodes-base/nodes/Airtable/v2/actions/common.descriptions.ts
@@ -165,7 +165,7 @@ export const insertUpdateOptions: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			{
diff --git a/packages/nodes-base/nodes/Airtable/v2/actions/record/get.operation.ts b/packages/nodes-base/nodes/Airtable/v2/actions/record/get.operation.ts
index 081accfabe4bc..4dcfaeda4e75f 100644
--- a/packages/nodes-base/nodes/Airtable/v2/actions/record/get.operation.ts
+++ b/packages/nodes-base/nodes/Airtable/v2/actions/record/get.operation.ts
@@ -28,7 +28,7 @@ const properties: INodeProperties[] = [
 		type: 'collection',
 		default: {},
 		description: 'Additional options which decide which records should be returned',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		options: [
 			{
 				// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-multi-options
diff --git a/packages/nodes-base/nodes/Airtable/v2/actions/record/search.operation.ts b/packages/nodes-base/nodes/Airtable/v2/actions/record/search.operation.ts
index f23a6a3453b79..beb11dc921f5d 100644
--- a/packages/nodes-base/nodes/Airtable/v2/actions/record/search.operation.ts
+++ b/packages/nodes-base/nodes/Airtable/v2/actions/record/search.operation.ts
@@ -50,7 +50,7 @@ const properties: INodeProperties[] = [
 		type: 'collection',
 		default: {},
 		description: 'Additional options which decide which records should be returned',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		options: [
 			{
 				// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-multi-options
diff --git a/packages/nodes-base/nodes/Amqp/Amqp.node.ts b/packages/nodes-base/nodes/Amqp/Amqp.node.ts
index cf2952a984b64..43b16c6caa96c 100644
--- a/packages/nodes-base/nodes/Amqp/Amqp.node.ts
+++ b/packages/nodes-base/nodes/Amqp/Amqp.node.ts
@@ -96,7 +96,7 @@ export class Amqp implements INodeType {
 				displayName: 'Options',
 				name: 'options',
 				type: 'collection',
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				default: {},
 				options: [
 					{
diff --git a/packages/nodes-base/nodes/Amqp/AmqpTrigger.node.ts b/packages/nodes-base/nodes/Amqp/AmqpTrigger.node.ts
index d4457f55a6aca..c9b72b8b2ce3f 100644
--- a/packages/nodes-base/nodes/Amqp/AmqpTrigger.node.ts
+++ b/packages/nodes-base/nodes/Amqp/AmqpTrigger.node.ts
@@ -64,7 +64,7 @@ export class AmqpTrigger implements INodeType {
 				displayName: 'Options',
 				name: 'options',
 				type: 'collection',
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				default: {},
 				options: [
 					{
diff --git a/packages/nodes-base/nodes/Aws/AwsSns.node.ts b/packages/nodes-base/nodes/Aws/AwsSns.node.ts
index a11447be8b715..101ab7b839aff 100644
--- a/packages/nodes-base/nodes/Aws/AwsSns.node.ts
+++ b/packages/nodes-base/nodes/Aws/AwsSns.node.ts
@@ -75,7 +75,7 @@ export class AwsSns implements INodeType {
 				displayName: 'Options',
 				name: 'options',
 				type: 'collection',
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				default: {},
 				options: [
 					{
diff --git a/packages/nodes-base/nodes/Aws/SQS/AwsSqs.node.ts b/packages/nodes-base/nodes/Aws/SQS/AwsSqs.node.ts
index 7911b5419fec6..40eda03de51fb 100644
--- a/packages/nodes-base/nodes/Aws/SQS/AwsSqs.node.ts
+++ b/packages/nodes-base/nodes/Aws/SQS/AwsSqs.node.ts
@@ -132,7 +132,7 @@ export class AwsSqs implements INodeType {
 					},
 				},
 				default: {},
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				options: [
 					{
 						displayName: 'Delay Seconds',
diff --git a/packages/nodes-base/nodes/Aws/Transcribe/AwsTranscribe.node.ts b/packages/nodes-base/nodes/Aws/Transcribe/AwsTranscribe.node.ts
index a5cfebd7617a0..95093b65c0010 100644
--- a/packages/nodes-base/nodes/Aws/Transcribe/AwsTranscribe.node.ts
+++ b/packages/nodes-base/nodes/Aws/Transcribe/AwsTranscribe.node.ts
@@ -166,7 +166,7 @@ export class AwsTranscribe implements INodeType {
 				displayName: 'Options',
 				name: 'options',
 				type: 'collection',
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				displayOptions: {
 					show: {
 						operation: ['create'],
diff --git a/packages/nodes-base/nodes/Baserow/OperationDescription.ts b/packages/nodes-base/nodes/Baserow/OperationDescription.ts
index 9a23053d81e67..e31c97fcabb81 100644
--- a/packages/nodes-base/nodes/Baserow/OperationDescription.ts
+++ b/packages/nodes-base/nodes/Baserow/OperationDescription.ts
@@ -203,7 +203,7 @@ export const operationFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'additionalOptions',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/Box/FileDescription.ts b/packages/nodes-base/nodes/Box/FileDescription.ts
index 48c49157409f4..a8159ae889fb1 100644
--- a/packages/nodes-base/nodes/Box/FileDescription.ts
+++ b/packages/nodes-base/nodes/Box/FileDescription.ts
@@ -610,7 +610,7 @@ export const fileFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		displayOptions: {
 			show: {
 				operation: ['share'],
diff --git a/packages/nodes-base/nodes/Box/FolderDescription.ts b/packages/nodes-base/nodes/Box/FolderDescription.ts
index b975f5e78c60f..a3cc171b62f16 100644
--- a/packages/nodes-base/nodes/Box/FolderDescription.ts
+++ b/packages/nodes-base/nodes/Box/FolderDescription.ts
@@ -570,7 +570,7 @@ export const folderFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		displayOptions: {
 			show: {
 				operation: ['share'],
diff --git a/packages/nodes-base/nodes/Brevo/ContactDescription.ts b/packages/nodes-base/nodes/Brevo/ContactDescription.ts
index 60a67c90cb72a..4153edcc99e25 100644
--- a/packages/nodes-base/nodes/Brevo/ContactDescription.ts
+++ b/packages/nodes-base/nodes/Brevo/ContactDescription.ts
@@ -250,7 +250,7 @@ const getAllOperations: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		displayOptions: {
 			show: {
 				resource: ['contact'],
diff --git a/packages/nodes-base/nodes/Cisco/Webex/descriptions/MeetingDescription.ts b/packages/nodes-base/nodes/Cisco/Webex/descriptions/MeetingDescription.ts
index 93d3f07c2fbad..3fefcf530f34e 100644
--- a/packages/nodes-base/nodes/Cisco/Webex/descriptions/MeetingDescription.ts
+++ b/packages/nodes-base/nodes/Cisco/Webex/descriptions/MeetingDescription.ts
@@ -382,7 +382,7 @@ export const meetingFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
@@ -430,7 +430,7 @@ export const meetingFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/Cisco/Webex/descriptions/MeetingTranscript.ts b/packages/nodes-base/nodes/Cisco/Webex/descriptions/MeetingTranscript.ts
index af82f39088d4c..2203ba60fb6f6 100644
--- a/packages/nodes-base/nodes/Cisco/Webex/descriptions/MeetingTranscript.ts
+++ b/packages/nodes-base/nodes/Cisco/Webex/descriptions/MeetingTranscript.ts
@@ -70,7 +70,7 @@ export const meetingTranscriptFields: INodeProperties[] = [
 			},
 		},
 		default: {},
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		options: [
 			{
 				displayName: 'Format',
diff --git a/packages/nodes-base/nodes/Cockpit/CollectionDescription.ts b/packages/nodes-base/nodes/Cockpit/CollectionDescription.ts
index d6f43d21cff69..e8dfb810a7e08 100644
--- a/packages/nodes-base/nodes/Cockpit/CollectionDescription.ts
+++ b/packages/nodes-base/nodes/Cockpit/CollectionDescription.ts
@@ -91,7 +91,7 @@ export const collectionFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/Coda/TableDescription.ts b/packages/nodes-base/nodes/Coda/TableDescription.ts
index 6edea4a2e55b3..5beff988e7abe 100644
--- a/packages/nodes-base/nodes/Coda/TableDescription.ts
+++ b/packages/nodes-base/nodes/Coda/TableDescription.ts
@@ -104,7 +104,7 @@ export const tableFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
@@ -189,7 +189,7 @@ export const tableFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
@@ -311,7 +311,7 @@ export const tableFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/Coda/ViewDescription.ts b/packages/nodes-base/nodes/Coda/ViewDescription.ts
index 881a1f78c6d3e..a649ca5747c36 100644
--- a/packages/nodes-base/nodes/Coda/ViewDescription.ts
+++ b/packages/nodes-base/nodes/Coda/ViewDescription.ts
@@ -221,7 +221,7 @@ export const viewFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
@@ -579,7 +579,7 @@ export const viewFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/CoinGecko/CoinDescription.ts b/packages/nodes-base/nodes/CoinGecko/CoinDescription.ts
index 58dbb956a1412..eb29e969e1d11 100644
--- a/packages/nodes-base/nodes/CoinGecko/CoinDescription.ts
+++ b/packages/nodes-base/nodes/CoinGecko/CoinDescription.ts
@@ -394,7 +394,7 @@ export const coinFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
@@ -555,7 +555,7 @@ export const coinFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
@@ -608,7 +608,7 @@ export const coinFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/CoinGecko/EventDescription.ts b/packages/nodes-base/nodes/CoinGecko/EventDescription.ts
index 811a9c5a3334e..1205724e3eb58 100644
--- a/packages/nodes-base/nodes/CoinGecko/EventDescription.ts
+++ b/packages/nodes-base/nodes/CoinGecko/EventDescription.ts
@@ -59,7 +59,7 @@ export const eventFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/CompareDatasets/CompareDatasets.node.ts b/packages/nodes-base/nodes/CompareDatasets/CompareDatasets.node.ts
index 332ca2920b28a..60d6e6199fb79 100644
--- a/packages/nodes-base/nodes/CompareDatasets/CompareDatasets.node.ts
+++ b/packages/nodes-base/nodes/CompareDatasets/CompareDatasets.node.ts
@@ -189,7 +189,7 @@ export class CompareDatasets implements INodeType {
 				displayName: 'Options',
 				name: 'options',
 				type: 'collection',
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				default: {},
 				options: [
 					{
diff --git a/packages/nodes-base/nodes/CrowdDev/descriptions/utils.ts b/packages/nodes-base/nodes/CrowdDev/descriptions/utils.ts
index 4feee2c1e7b90..10740fa023c97 100644
--- a/packages/nodes-base/nodes/CrowdDev/descriptions/utils.ts
+++ b/packages/nodes-base/nodes/CrowdDev/descriptions/utils.ts
@@ -51,7 +51,7 @@ export const getAdditionalOptions = (fields: INodeProperties[]): INodeProperties
 			},
 		},
 		default: {},
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		options: fields,
 	};
 };
diff --git a/packages/nodes-base/nodes/DateTime/V1/DateTimeV1.node.ts b/packages/nodes-base/nodes/DateTime/V1/DateTimeV1.node.ts
index 9b8256012e335..924b9d2eaabc0 100644
--- a/packages/nodes-base/nodes/DateTime/V1/DateTimeV1.node.ts
+++ b/packages/nodes-base/nodes/DateTime/V1/DateTimeV1.node.ts
@@ -203,7 +203,7 @@ const versionDescription: INodeTypeDescription = {
 				},
 			},
 			type: 'collection',
-			placeholder: 'Add Option',
+			placeholder: 'Add option',
 			default: {},
 			options: [
 				{
@@ -362,7 +362,7 @@ const versionDescription: INodeTypeDescription = {
 			displayName: 'Options',
 			name: 'options',
 			type: 'collection',
-			placeholder: 'Add Option',
+			placeholder: 'Add option',
 			default: {},
 			displayOptions: {
 				show: {
diff --git a/packages/nodes-base/nodes/DateTime/V2/AddToDateDescription.ts b/packages/nodes-base/nodes/DateTime/V2/AddToDateDescription.ts
index 247eb9d33a025..37e89016561ca 100644
--- a/packages/nodes-base/nodes/DateTime/V2/AddToDateDescription.ts
+++ b/packages/nodes-base/nodes/DateTime/V2/AddToDateDescription.ts
@@ -107,7 +107,7 @@ export const AddToDateDescription: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		displayOptions: {
 			show: {
 				operation: ['addToDate'],
diff --git a/packages/nodes-base/nodes/DateTime/V2/CurrentDateDescription.ts b/packages/nodes-base/nodes/DateTime/V2/CurrentDateDescription.ts
index 0440f67ba487e..26110b1b0d391 100644
--- a/packages/nodes-base/nodes/DateTime/V2/CurrentDateDescription.ts
+++ b/packages/nodes-base/nodes/DateTime/V2/CurrentDateDescription.ts
@@ -43,7 +43,7 @@ export const CurrentDateDescription: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		displayOptions: {
 			show: {
 				operation: ['getCurrentDate'],
diff --git a/packages/nodes-base/nodes/DateTime/V2/ExtractDateDescription.ts b/packages/nodes-base/nodes/DateTime/V2/ExtractDateDescription.ts
index 2cda97f00f6e4..4f59ea8e5493f 100644
--- a/packages/nodes-base/nodes/DateTime/V2/ExtractDateDescription.ts
+++ b/packages/nodes-base/nodes/DateTime/V2/ExtractDateDescription.ts
@@ -84,7 +84,7 @@ export const ExtractDateDescription: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		displayOptions: {
 			show: {
 				operation: ['extractDate'],
diff --git a/packages/nodes-base/nodes/DateTime/V2/FormatDateDescription.ts b/packages/nodes-base/nodes/DateTime/V2/FormatDateDescription.ts
index 18c041b2796b4..3111afa3a5408 100644
--- a/packages/nodes-base/nodes/DateTime/V2/FormatDateDescription.ts
+++ b/packages/nodes-base/nodes/DateTime/V2/FormatDateDescription.ts
@@ -110,7 +110,7 @@ export const FormatDateDescription: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		displayOptions: {
 			show: {
 				operation: ['formatDate'],
diff --git a/packages/nodes-base/nodes/DateTime/V2/GetTimeBetweenDates.ts b/packages/nodes-base/nodes/DateTime/V2/GetTimeBetweenDates.ts
index cb5edf49581c1..d4329c179e205 100644
--- a/packages/nodes-base/nodes/DateTime/V2/GetTimeBetweenDates.ts
+++ b/packages/nodes-base/nodes/DateTime/V2/GetTimeBetweenDates.ts
@@ -86,7 +86,7 @@ export const GetTimeBetweenDatesDescription: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		displayOptions: {
 			show: {
 				operation: ['getTimeBetweenDates'],
diff --git a/packages/nodes-base/nodes/DateTime/V2/RoundDateDescription.ts b/packages/nodes-base/nodes/DateTime/V2/RoundDateDescription.ts
index 4cd4266f58bec..8a0fa38c0c4fa 100644
--- a/packages/nodes-base/nodes/DateTime/V2/RoundDateDescription.ts
+++ b/packages/nodes-base/nodes/DateTime/V2/RoundDateDescription.ts
@@ -124,7 +124,7 @@ export const RoundDateDescription: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		displayOptions: {
 			show: {
 				operation: ['roundDate'],
diff --git a/packages/nodes-base/nodes/DateTime/V2/SubtractFromDateDescription.ts b/packages/nodes-base/nodes/DateTime/V2/SubtractFromDateDescription.ts
index acd9604e4418b..3d35de2db1783 100644
--- a/packages/nodes-base/nodes/DateTime/V2/SubtractFromDateDescription.ts
+++ b/packages/nodes-base/nodes/DateTime/V2/SubtractFromDateDescription.ts
@@ -107,7 +107,7 @@ export const SubtractFromDateDescription: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		displayOptions: {
 			show: {
 				operation: ['subtractFromDate'],
diff --git a/packages/nodes-base/nodes/Dhl/Dhl.node.ts b/packages/nodes-base/nodes/Dhl/Dhl.node.ts
index 4d1e915a64f66..9456a0e818db8 100644
--- a/packages/nodes-base/nodes/Dhl/Dhl.node.ts
+++ b/packages/nodes-base/nodes/Dhl/Dhl.node.ts
@@ -77,7 +77,7 @@ export class Dhl implements INodeType {
 				displayName: 'Options',
 				name: 'options',
 				type: 'collection',
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				default: {},
 				options: [
 					{
diff --git a/packages/nodes-base/nodes/Discord/v1/DiscordV1.node.ts b/packages/nodes-base/nodes/Discord/v1/DiscordV1.node.ts
index 54dd921797b29..c36ae729e3ffa 100644
--- a/packages/nodes-base/nodes/Discord/v1/DiscordV1.node.ts
+++ b/packages/nodes-base/nodes/Discord/v1/DiscordV1.node.ts
@@ -49,7 +49,7 @@ const versionDescription: INodeTypeDescription = {
 			displayName: 'Additional Fields',
 			name: 'options',
 			type: 'collection',
-			placeholder: 'Add Option',
+			placeholder: 'Add option',
 			default: {},
 			options: [
 				{
diff --git a/packages/nodes-base/nodes/Discord/v2/actions/channel/create.operation.ts b/packages/nodes-base/nodes/Discord/v2/actions/channel/create.operation.ts
index 9c78952409f14..51f4787d39ced 100644
--- a/packages/nodes-base/nodes/Discord/v2/actions/channel/create.operation.ts
+++ b/packages/nodes-base/nodes/Discord/v2/actions/channel/create.operation.ts
@@ -45,7 +45,7 @@ const properties: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			{
diff --git a/packages/nodes-base/nodes/Discord/v2/actions/channel/getAll.operation.ts b/packages/nodes-base/nodes/Discord/v2/actions/channel/getAll.operation.ts
index 7d4df19731b35..4b7df9c8fcf16 100644
--- a/packages/nodes-base/nodes/Discord/v2/actions/channel/getAll.operation.ts
+++ b/packages/nodes-base/nodes/Discord/v2/actions/channel/getAll.operation.ts
@@ -15,7 +15,7 @@ const properties: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			{
diff --git a/packages/nodes-base/nodes/Discord/v2/actions/channel/update.operation.ts b/packages/nodes-base/nodes/Discord/v2/actions/channel/update.operation.ts
index 1f37cce621fc6..b9b16a6301064 100644
--- a/packages/nodes-base/nodes/Discord/v2/actions/channel/update.operation.ts
+++ b/packages/nodes-base/nodes/Discord/v2/actions/channel/update.operation.ts
@@ -24,7 +24,7 @@ const properties: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			{
diff --git a/packages/nodes-base/nodes/Discord/v2/actions/member/getAll.operation.ts b/packages/nodes-base/nodes/Discord/v2/actions/member/getAll.operation.ts
index 58959cac3a9b2..b3e3fdabb4943 100644
--- a/packages/nodes-base/nodes/Discord/v2/actions/member/getAll.operation.ts
+++ b/packages/nodes-base/nodes/Discord/v2/actions/member/getAll.operation.ts
@@ -24,7 +24,7 @@ const properties: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [simplifyBoolean],
 	},
diff --git a/packages/nodes-base/nodes/Discord/v2/actions/message/get.operation.ts b/packages/nodes-base/nodes/Discord/v2/actions/message/get.operation.ts
index 00d7634a24434..46fc6cdb3f2d8 100644
--- a/packages/nodes-base/nodes/Discord/v2/actions/message/get.operation.ts
+++ b/packages/nodes-base/nodes/Discord/v2/actions/message/get.operation.ts
@@ -21,7 +21,7 @@ const properties: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [simplifyBoolean],
 	},
diff --git a/packages/nodes-base/nodes/Discord/v2/actions/message/getAll.operation.ts b/packages/nodes-base/nodes/Discord/v2/actions/message/getAll.operation.ts
index 4867e90df9d4e..02d05cc16ed0f 100644
--- a/packages/nodes-base/nodes/Discord/v2/actions/message/getAll.operation.ts
+++ b/packages/nodes-base/nodes/Discord/v2/actions/message/getAll.operation.ts
@@ -22,7 +22,7 @@ const properties: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [simplifyBoolean],
 	},
diff --git a/packages/nodes-base/nodes/Discord/v2/actions/message/send.operation.ts b/packages/nodes-base/nodes/Discord/v2/actions/message/send.operation.ts
index aa3f7ecb2773b..810630d6a5372 100644
--- a/packages/nodes-base/nodes/Discord/v2/actions/message/send.operation.ts
+++ b/packages/nodes-base/nodes/Discord/v2/actions/message/send.operation.ts
@@ -73,7 +73,7 @@ const properties: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			{
diff --git a/packages/nodes-base/nodes/Discord/v2/actions/webhook/sendLegacy.operation.ts b/packages/nodes-base/nodes/Discord/v2/actions/webhook/sendLegacy.operation.ts
index 6e8fe687935b4..e1f98bb3870ac 100644
--- a/packages/nodes-base/nodes/Discord/v2/actions/webhook/sendLegacy.operation.ts
+++ b/packages/nodes-base/nodes/Discord/v2/actions/webhook/sendLegacy.operation.ts
@@ -33,7 +33,7 @@ const properties: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			{
diff --git a/packages/nodes-base/nodes/Discourse/UserDescription.ts b/packages/nodes-base/nodes/Discourse/UserDescription.ts
index 8b750bfd0c2a2..3d48a570d57c1 100644
--- a/packages/nodes-base/nodes/Discourse/UserDescription.ts
+++ b/packages/nodes-base/nodes/Discourse/UserDescription.ts
@@ -264,7 +264,7 @@ export const userFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/Dropcontact/Dropcontact.node.ts b/packages/nodes-base/nodes/Dropcontact/Dropcontact.node.ts
index 0eddec8ac99e2..20c8a038d8867 100644
--- a/packages/nodes-base/nodes/Dropcontact/Dropcontact.node.ts
+++ b/packages/nodes-base/nodes/Dropcontact/Dropcontact.node.ts
@@ -190,7 +190,7 @@ export class Dropcontact implements INodeType {
 						operation: ['enrich'],
 					},
 				},
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				default: {},
 				options: [
 					{
diff --git a/packages/nodes-base/nodes/EditImage/EditImage.node.ts b/packages/nodes-base/nodes/EditImage/EditImage.node.ts
index 42bf5d965421c..8f25a52c343ae 100644
--- a/packages/nodes-base/nodes/EditImage/EditImage.node.ts
+++ b/packages/nodes-base/nodes/EditImage/EditImage.node.ts
@@ -863,7 +863,7 @@ export class EditImage implements INodeType {
 				displayName: 'Options',
 				name: 'options',
 				type: 'collection',
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				default: {},
 				displayOptions: {
 					hide: {
diff --git a/packages/nodes-base/nodes/Elastic/Elasticsearch/descriptions/DocumentDescription.ts b/packages/nodes-base/nodes/Elastic/Elasticsearch/descriptions/DocumentDescription.ts
index 0e07cecd4ea64..86cefdf4bd16a 100644
--- a/packages/nodes-base/nodes/Elastic/Elasticsearch/descriptions/DocumentDescription.ts
+++ b/packages/nodes-base/nodes/Elastic/Elasticsearch/descriptions/DocumentDescription.ts
@@ -130,7 +130,7 @@ export const documentFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
@@ -242,7 +242,7 @@ export const documentFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/EmailReadImap/v1/EmailReadImapV1.node.ts b/packages/nodes-base/nodes/EmailReadImap/v1/EmailReadImapV1.node.ts
index a7e321d1fd30d..ae26d59caa492 100644
--- a/packages/nodes-base/nodes/EmailReadImap/v1/EmailReadImapV1.node.ts
+++ b/packages/nodes-base/nodes/EmailReadImap/v1/EmailReadImapV1.node.ts
@@ -189,7 +189,7 @@ const versionDescription: INodeTypeDescription = {
 			displayName: 'Options',
 			name: 'options',
 			type: 'collection',
-			placeholder: 'Add Option',
+			placeholder: 'Add option',
 			default: {},
 			options: [
 				{
diff --git a/packages/nodes-base/nodes/EmailReadImap/v2/EmailReadImapV2.node.ts b/packages/nodes-base/nodes/EmailReadImap/v2/EmailReadImapV2.node.ts
index a00d5322585d1..5f46f63ce0376 100644
--- a/packages/nodes-base/nodes/EmailReadImap/v2/EmailReadImapV2.node.ts
+++ b/packages/nodes-base/nodes/EmailReadImap/v2/EmailReadImapV2.node.ts
@@ -193,7 +193,7 @@ const versionDescription: INodeTypeDescription = {
 			displayName: 'Options',
 			name: 'options',
 			type: 'collection',
-			placeholder: 'Add Option',
+			placeholder: 'Add option',
 			default: {},
 			options: [
 				{
diff --git a/packages/nodes-base/nodes/EmailSend/v1/EmailSendV1.node.ts b/packages/nodes-base/nodes/EmailSend/v1/EmailSendV1.node.ts
index d45c798079142..3c0d897f8f12f 100644
--- a/packages/nodes-base/nodes/EmailSend/v1/EmailSendV1.node.ts
+++ b/packages/nodes-base/nodes/EmailSend/v1/EmailSendV1.node.ts
@@ -106,7 +106,7 @@ const versionDescription: INodeTypeDescription = {
 			displayName: 'Options',
 			name: 'options',
 			type: 'collection',
-			placeholder: 'Add Option',
+			placeholder: 'Add option',
 			default: {},
 			options: [
 				{
diff --git a/packages/nodes-base/nodes/EmailSend/v2/send.operation.ts b/packages/nodes-base/nodes/EmailSend/v2/send.operation.ts
index fe733e0a024b2..4e1c8a60af8a8 100644
--- a/packages/nodes-base/nodes/EmailSend/v2/send.operation.ts
+++ b/packages/nodes-base/nodes/EmailSend/v2/send.operation.ts
@@ -133,7 +133,7 @@ const properties: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			{
diff --git a/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow.node.ts b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow.node.ts
index 6b1e84add33c9..6ab3c4cbf1424 100644
--- a/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow.node.ts
+++ b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow.node.ts
@@ -176,7 +176,7 @@ export class ExecuteWorkflow implements INodeType {
 				name: 'options',
 				type: 'collection',
 				default: {},
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				options: [
 					{
 						displayName: 'Wait For Sub-Workflow Completion',
diff --git a/packages/nodes-base/nodes/Facebook/FacebookGraphApi.node.ts b/packages/nodes-base/nodes/Facebook/FacebookGraphApi.node.ts
index b1c64a7a116b1..9a88354d2a52f 100644
--- a/packages/nodes-base/nodes/Facebook/FacebookGraphApi.node.ts
+++ b/packages/nodes-base/nodes/Facebook/FacebookGraphApi.node.ts
@@ -218,7 +218,7 @@ export class FacebookGraphApi implements INodeType {
 				displayName: 'Options',
 				name: 'options',
 				type: 'collection',
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				default: {},
 				options: [
 					{
diff --git a/packages/nodes-base/nodes/FacebookLeadAds/FacebookLeadAdsTrigger.node.ts b/packages/nodes-base/nodes/FacebookLeadAds/FacebookLeadAdsTrigger.node.ts
index e5eb80043ccb3..16eb6eb727dbe 100644
--- a/packages/nodes-base/nodes/FacebookLeadAds/FacebookLeadAdsTrigger.node.ts
+++ b/packages/nodes-base/nodes/FacebookLeadAds/FacebookLeadAdsTrigger.node.ts
@@ -125,7 +125,7 @@ export class FacebookLeadAdsTrigger implements INodeType {
 				displayName: 'Options',
 				name: 'options',
 				type: 'collection',
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				default: {},
 				options: [
 					{
diff --git a/packages/nodes-base/nodes/Files/ConvertToFile/actions/spreadsheet.operation.ts b/packages/nodes-base/nodes/Files/ConvertToFile/actions/spreadsheet.operation.ts
index dbb9227c98220..ebc16d65ba1fe 100644
--- a/packages/nodes-base/nodes/Files/ConvertToFile/actions/spreadsheet.operation.ts
+++ b/packages/nodes-base/nodes/Files/ConvertToFile/actions/spreadsheet.operation.ts
@@ -26,7 +26,7 @@ export const properties: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			{
diff --git a/packages/nodes-base/nodes/Files/ConvertToFile/actions/toBinary.operation.ts b/packages/nodes-base/nodes/Files/ConvertToFile/actions/toBinary.operation.ts
index 5670044232905..32f06986c61d1 100644
--- a/packages/nodes-base/nodes/Files/ConvertToFile/actions/toBinary.operation.ts
+++ b/packages/nodes-base/nodes/Files/ConvertToFile/actions/toBinary.operation.ts
@@ -32,7 +32,7 @@ export const properties: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			{
diff --git a/packages/nodes-base/nodes/Files/ConvertToFile/actions/toJson.operation.ts b/packages/nodes-base/nodes/Files/ConvertToFile/actions/toJson.operation.ts
index 26ff53964e633..1b1b5737230c3 100644
--- a/packages/nodes-base/nodes/Files/ConvertToFile/actions/toJson.operation.ts
+++ b/packages/nodes-base/nodes/Files/ConvertToFile/actions/toJson.operation.ts
@@ -36,7 +36,7 @@ export const properties: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			{
diff --git a/packages/nodes-base/nodes/Files/ConvertToFile/actions/toText.operation.ts b/packages/nodes-base/nodes/Files/ConvertToFile/actions/toText.operation.ts
index 823c818cfaa61..159383aa0fff1 100644
--- a/packages/nodes-base/nodes/Files/ConvertToFile/actions/toText.operation.ts
+++ b/packages/nodes-base/nodes/Files/ConvertToFile/actions/toText.operation.ts
@@ -32,7 +32,7 @@ export const properties: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			{
diff --git a/packages/nodes-base/nodes/Files/ExtractFromFile/actions/moveTo.operation.ts b/packages/nodes-base/nodes/Files/ExtractFromFile/actions/moveTo.operation.ts
index 3fd34e93c34cd..407a09811bc07 100644
--- a/packages/nodes-base/nodes/Files/ExtractFromFile/actions/moveTo.operation.ts
+++ b/packages/nodes-base/nodes/Files/ExtractFromFile/actions/moveTo.operation.ts
@@ -40,7 +40,7 @@ export const properties: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			{
diff --git a/packages/nodes-base/nodes/Files/ExtractFromFile/actions/pdf.operation.ts b/packages/nodes-base/nodes/Files/ExtractFromFile/actions/pdf.operation.ts
index 94b5aac9cbd40..0e3a7c38e3def 100644
--- a/packages/nodes-base/nodes/Files/ExtractFromFile/actions/pdf.operation.ts
+++ b/packages/nodes-base/nodes/Files/ExtractFromFile/actions/pdf.operation.ts
@@ -21,7 +21,7 @@ export const properties: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			{
diff --git a/packages/nodes-base/nodes/Files/ReadWriteFile/actions/read.operation.ts b/packages/nodes-base/nodes/Files/ReadWriteFile/actions/read.operation.ts
index 56390421127e1..3c62c7c0937e7 100644
--- a/packages/nodes-base/nodes/Files/ReadWriteFile/actions/read.operation.ts
+++ b/packages/nodes-base/nodes/Files/ReadWriteFile/actions/read.operation.ts
@@ -20,7 +20,7 @@ export const properties: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			{
diff --git a/packages/nodes-base/nodes/Files/ReadWriteFile/actions/write.operation.ts b/packages/nodes-base/nodes/Files/ReadWriteFile/actions/write.operation.ts
index 45b745e781747..55796b8064e63 100644
--- a/packages/nodes-base/nodes/Files/ReadWriteFile/actions/write.operation.ts
+++ b/packages/nodes-base/nodes/Files/ReadWriteFile/actions/write.operation.ts
@@ -29,7 +29,7 @@ export const properties: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			{
diff --git a/packages/nodes-base/nodes/Form/common.descriptions.ts b/packages/nodes-base/nodes/Form/common.descriptions.ts
index b8fd4c08a61e1..5ea322a2ec9c4 100644
--- a/packages/nodes-base/nodes/Form/common.descriptions.ts
+++ b/packages/nodes-base/nodes/Form/common.descriptions.ts
@@ -191,7 +191,7 @@ export const respondWithOptions: INodeProperties = {
 	displayName: 'Form Response',
 	name: 'respondWithOptions',
 	type: 'fixedCollection',
-	placeholder: 'Add Option',
+	placeholder: 'Add option',
 	default: { values: { respondWith: 'text' } },
 	options: [
 		{
diff --git a/packages/nodes-base/nodes/Form/v1/FormTriggerV1.node.ts b/packages/nodes-base/nodes/Form/v1/FormTriggerV1.node.ts
index bf31639bd64fc..3cfa64e51b9a8 100644
--- a/packages/nodes-base/nodes/Form/v1/FormTriggerV1.node.ts
+++ b/packages/nodes-base/nodes/Form/v1/FormTriggerV1.node.ts
@@ -62,7 +62,7 @@ const descriptionV1: INodeTypeDescription = {
 			displayName: 'Options',
 			name: 'options',
 			type: 'collection',
-			placeholder: 'Add Option',
+			placeholder: 'Add option',
 			default: {},
 			displayOptions: {
 				hide: {
diff --git a/packages/nodes-base/nodes/Form/v2/FormTriggerV2.node.ts b/packages/nodes-base/nodes/Form/v2/FormTriggerV2.node.ts
index 7ad3edf79d97d..e8f0f897cb4b6 100644
--- a/packages/nodes-base/nodes/Form/v2/FormTriggerV2.node.ts
+++ b/packages/nodes-base/nodes/Form/v2/FormTriggerV2.node.ts
@@ -74,7 +74,7 @@ const descriptionV2: INodeTypeDescription = {
 			displayName: 'Options',
 			name: 'options',
 			type: 'collection',
-			placeholder: 'Add Option',
+			placeholder: 'Add option',
 			default: {},
 			options: [
 				{
diff --git a/packages/nodes-base/nodes/Freshdesk/Freshdesk.node.ts b/packages/nodes-base/nodes/Freshdesk/Freshdesk.node.ts
index 85ca0205316ba..1f2fbb7ab0f66 100644
--- a/packages/nodes-base/nodes/Freshdesk/Freshdesk.node.ts
+++ b/packages/nodes-base/nodes/Freshdesk/Freshdesk.node.ts
@@ -347,7 +347,7 @@ export class Freshdesk implements INodeType {
 				displayName: 'Options',
 				name: 'options',
 				type: 'collection',
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				default: {},
 				displayOptions: {
 					show: {
@@ -901,7 +901,7 @@ export class Freshdesk implements INodeType {
 				displayName: 'Options',
 				name: 'options',
 				type: 'collection',
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				default: {},
 				displayOptions: {
 					show: {
diff --git a/packages/nodes-base/nodes/FreshworksCrm/descriptions/SearchDescription.ts b/packages/nodes-base/nodes/FreshworksCrm/descriptions/SearchDescription.ts
index 865b37b9ef4f6..e102f87338f84 100644
--- a/packages/nodes-base/nodes/FreshworksCrm/descriptions/SearchDescription.ts
+++ b/packages/nodes-base/nodes/FreshworksCrm/descriptions/SearchDescription.ts
@@ -188,7 +188,7 @@ export const searchFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/Ftp/Ftp.node.ts b/packages/nodes-base/nodes/Ftp/Ftp.node.ts
index 18cb5500e6e5c..bce2208ba69d3 100644
--- a/packages/nodes-base/nodes/Ftp/Ftp.node.ts
+++ b/packages/nodes-base/nodes/Ftp/Ftp.node.ts
@@ -228,7 +228,7 @@ export class Ftp implements INodeType {
 				displayName: 'Options',
 				name: 'options',
 				type: 'collection',
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				displayOptions: {
 					show: {
 						operation: ['delete'],
diff --git a/packages/nodes-base/nodes/GetResponse/GetResponseTrigger.node.ts b/packages/nodes-base/nodes/GetResponse/GetResponseTrigger.node.ts
index b26297360fdb6..2fa0d5dcf32c1 100644
--- a/packages/nodes-base/nodes/GetResponse/GetResponseTrigger.node.ts
+++ b/packages/nodes-base/nodes/GetResponse/GetResponseTrigger.node.ts
@@ -120,7 +120,7 @@ export class GetResponseTrigger implements INodeType {
 			{
 				displayName: 'Options',
 				name: 'options',
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				type: 'collection',
 				default: {},
 				options: [
diff --git a/packages/nodes-base/nodes/Ghost/PostDescription.ts b/packages/nodes-base/nodes/Ghost/PostDescription.ts
index de01ce27b5798..8532600908325 100644
--- a/packages/nodes-base/nodes/Ghost/PostDescription.ts
+++ b/packages/nodes-base/nodes/Ghost/PostDescription.ts
@@ -383,7 +383,7 @@ export const postFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
@@ -428,7 +428,7 @@ export const postFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
@@ -506,7 +506,7 @@ export const postFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
@@ -571,7 +571,7 @@ export const postFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/Git/descriptions/AddConfigDescription.ts b/packages/nodes-base/nodes/Git/descriptions/AddConfigDescription.ts
index c00498ae8fc86..ffb3284365292 100644
--- a/packages/nodes-base/nodes/Git/descriptions/AddConfigDescription.ts
+++ b/packages/nodes-base/nodes/Git/descriptions/AddConfigDescription.ts
@@ -38,7 +38,7 @@ export const addConfigFields: INodeProperties[] = [
 				operation: ['addConfig'],
 			},
 		},
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			{
diff --git a/packages/nodes-base/nodes/Git/descriptions/CommitDescription.ts b/packages/nodes-base/nodes/Git/descriptions/CommitDescription.ts
index 973820b5b2a12..4e2570f4a8a89 100644
--- a/packages/nodes-base/nodes/Git/descriptions/CommitDescription.ts
+++ b/packages/nodes-base/nodes/Git/descriptions/CommitDescription.ts
@@ -22,7 +22,7 @@ export const commitFields: INodeProperties[] = [
 				operation: ['commit'],
 			},
 		},
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			{
diff --git a/packages/nodes-base/nodes/Git/descriptions/LogDescription.ts b/packages/nodes-base/nodes/Git/descriptions/LogDescription.ts
index a1850eccbb906..7a4925f572ff4 100644
--- a/packages/nodes-base/nodes/Git/descriptions/LogDescription.ts
+++ b/packages/nodes-base/nodes/Git/descriptions/LogDescription.ts
@@ -39,7 +39,7 @@ export const logFields: INodeProperties[] = [
 				operation: ['log'],
 			},
 		},
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			{
diff --git a/packages/nodes-base/nodes/Git/descriptions/PushDescription.ts b/packages/nodes-base/nodes/Git/descriptions/PushDescription.ts
index 19d5f5376ee2c..45054de1b1858 100644
--- a/packages/nodes-base/nodes/Git/descriptions/PushDescription.ts
+++ b/packages/nodes-base/nodes/Git/descriptions/PushDescription.ts
@@ -10,7 +10,7 @@ export const pushFields: INodeProperties[] = [
 				operation: ['push'],
 			},
 		},
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			{
diff --git a/packages/nodes-base/nodes/Github/GithubTrigger.node.ts b/packages/nodes-base/nodes/Github/GithubTrigger.node.ts
index 71057926e969f..25caab4970562 100644
--- a/packages/nodes-base/nodes/Github/GithubTrigger.node.ts
+++ b/packages/nodes-base/nodes/Github/GithubTrigger.node.ts
@@ -438,7 +438,7 @@ export class GithubTrigger implements INodeType {
 				displayName: 'Options',
 				name: 'options',
 				type: 'collection',
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				default: {},
 				options: [
 					{
diff --git a/packages/nodes-base/nodes/Google/Ads/CampaignDescription.ts b/packages/nodes-base/nodes/Google/Ads/CampaignDescription.ts
index 4506b33d3c767..204486c250861 100644
--- a/packages/nodes-base/nodes/Google/Ads/CampaignDescription.ts
+++ b/packages/nodes-base/nodes/Google/Ads/CampaignDescription.ts
@@ -187,7 +187,7 @@ export const campaignFields: INodeProperties[] = [
 		},
 		default: {},
 		description: 'Additional options for fetching campaigns',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		options: [
 			{
 				displayName: 'Date Range',
diff --git a/packages/nodes-base/nodes/Google/BigQuery/v1/RecordDescription.ts b/packages/nodes-base/nodes/Google/BigQuery/v1/RecordDescription.ts
index 6124e51c11818..ec332ede4190c 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/v1/RecordDescription.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/v1/RecordDescription.ts
@@ -108,7 +108,7 @@ export const recordFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Options',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
@@ -122,7 +122,7 @@ export const recordFields: INodeProperties[] = [
 				name: 'ignoreUnknownValues',
 				type: 'boolean',
 				default: false,
-				description: 'Whether to gnore row values that do not match the schema',
+				description: 'Whether to ignore row values that do not match the schema',
 			},
 			{
 				displayName: 'Skip Invalid Rows',
@@ -257,7 +257,7 @@ export const recordFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Options',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/Google/BigQuery/v2/actions/database/executeQuery.operation.ts b/packages/nodes-base/nodes/Google/BigQuery/v2/actions/database/executeQuery.operation.ts
index 7278e502b380c..4752b2631c810 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/v2/actions/database/executeQuery.operation.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/v2/actions/database/executeQuery.operation.ts
@@ -54,7 +54,7 @@ const properties: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Options',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			{
diff --git a/packages/nodes-base/nodes/Google/BigQuery/v2/actions/database/insert.operation.ts b/packages/nodes-base/nodes/Google/BigQuery/v2/actions/database/insert.operation.ts
index f9ab0a3288a49..e42867ea394a4 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/v2/actions/database/insert.operation.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/v2/actions/database/insert.operation.ts
@@ -89,7 +89,7 @@ const properties: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Options',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			{
diff --git a/packages/nodes-base/nodes/Google/Calendar/CalendarDescription.ts b/packages/nodes-base/nodes/Google/Calendar/CalendarDescription.ts
index d712ead0f8874..68725c010ecca 100644
--- a/packages/nodes-base/nodes/Google/Calendar/CalendarDescription.ts
+++ b/packages/nodes-base/nodes/Google/Calendar/CalendarDescription.ts
@@ -106,7 +106,7 @@ export const calendarFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Options',
+		placeholder: 'Add option',
 		displayOptions: {
 			show: {
 				operation: ['availability'],
diff --git a/packages/nodes-base/nodes/Google/Calendar/EventDescription.ts b/packages/nodes-base/nodes/Google/Calendar/EventDescription.ts
index ee0d162b76aed..2a08e45a768bc 100644
--- a/packages/nodes-base/nodes/Google/Calendar/EventDescription.ts
+++ b/packages/nodes-base/nodes/Google/Calendar/EventDescription.ts
@@ -480,7 +480,7 @@ export const eventFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Options',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
@@ -536,7 +536,7 @@ export const eventFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Options',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
@@ -633,7 +633,7 @@ export const eventFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/Google/Calendar/GoogleCalendarTrigger.node.ts b/packages/nodes-base/nodes/Google/Calendar/GoogleCalendarTrigger.node.ts
index a79726cef5546..3a37632bc194b 100644
--- a/packages/nodes-base/nodes/Google/Calendar/GoogleCalendarTrigger.node.ts
+++ b/packages/nodes-base/nodes/Google/Calendar/GoogleCalendarTrigger.node.ts
@@ -112,7 +112,7 @@ export class GoogleCalendarTrigger implements INodeType {
 				displayName: 'Options',
 				name: 'options',
 				type: 'collection',
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				default: {},
 				options: [
 					{
diff --git a/packages/nodes-base/nodes/Google/Chat/descriptions/IncomingWebhookDescription.ts b/packages/nodes-base/nodes/Google/Chat/descriptions/IncomingWebhookDescription.ts
index ea8e98256ac8a..4f2fe54a1135d 100644
--- a/packages/nodes-base/nodes/Google/Chat/descriptions/IncomingWebhookDescription.ts
+++ b/packages/nodes-base/nodes/Google/Chat/descriptions/IncomingWebhookDescription.ts
@@ -72,7 +72,7 @@ export const incomingWebhookFields: INodeProperties[] = [
 		name: 'messageUi',
 		type: 'collection',
 		required: true,
-		placeholder: 'Add Options',
+		placeholder: 'Add option',
 		displayOptions: {
 			show: {
 				resource: ['incomingWebhook'],
diff --git a/packages/nodes-base/nodes/Google/Chat/descriptions/MessageDescription.ts b/packages/nodes-base/nodes/Google/Chat/descriptions/MessageDescription.ts
index 5bdc1cabaaa43..f363c2dfc7b8f 100644
--- a/packages/nodes-base/nodes/Google/Chat/descriptions/MessageDescription.ts
+++ b/packages/nodes-base/nodes/Google/Chat/descriptions/MessageDescription.ts
@@ -280,7 +280,7 @@ export const messageFields: INodeProperties[] = [
 		name: 'updateFieldsUi',
 		type: 'collection',
 		required: true,
-		placeholder: 'Add Options',
+		placeholder: 'Add option',
 		displayOptions: {
 			show: {
 				resource: ['message'],
diff --git a/packages/nodes-base/nodes/Google/CloudNaturalLanguage/GoogleCloudNaturalLanguage.node.ts b/packages/nodes-base/nodes/Google/CloudNaturalLanguage/GoogleCloudNaturalLanguage.node.ts
index 1c0813b3a7641..b482b41c0fc67 100644
--- a/packages/nodes-base/nodes/Google/CloudNaturalLanguage/GoogleCloudNaturalLanguage.node.ts
+++ b/packages/nodes-base/nodes/Google/CloudNaturalLanguage/GoogleCloudNaturalLanguage.node.ts
@@ -130,7 +130,7 @@ export class GoogleCloudNaturalLanguage implements INodeType {
 					},
 				},
 				default: {},
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				options: [
 					{
 						displayName: 'Document Type',
diff --git a/packages/nodes-base/nodes/Google/Contacts/ContactDescription.ts b/packages/nodes-base/nodes/Google/Contacts/ContactDescription.ts
index 49e6f83482c21..02bed61c9a362 100644
--- a/packages/nodes-base/nodes/Google/Contacts/ContactDescription.ts
+++ b/packages/nodes-base/nodes/Google/Contacts/ContactDescription.ts
@@ -892,7 +892,7 @@ export const contactFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/Google/Drive/GoogleDriveTrigger.node.ts b/packages/nodes-base/nodes/Google/Drive/GoogleDriveTrigger.node.ts
index 50efeade16a57..34226fae85fb2 100644
--- a/packages/nodes-base/nodes/Google/Drive/GoogleDriveTrigger.node.ts
+++ b/packages/nodes-base/nodes/Google/Drive/GoogleDriveTrigger.node.ts
@@ -343,7 +343,7 @@ export class GoogleDriveTrigger implements INodeType {
 						triggerOn: ['specificFile'],
 					},
 				},
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				default: {},
 				options: [
 					{
diff --git a/packages/nodes-base/nodes/Google/Drive/v1/GoogleDriveV1.node.ts b/packages/nodes-base/nodes/Google/Drive/v1/GoogleDriveV1.node.ts
index 90ab46dc81675..36e4c4b54178d 100644
--- a/packages/nodes-base/nodes/Google/Drive/v1/GoogleDriveV1.node.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v1/GoogleDriveV1.node.ts
@@ -372,7 +372,7 @@ const versionDescription: INodeTypeDescription = {
 			displayName: 'Options',
 			name: 'options',
 			type: 'collection',
-			placeholder: 'Add Option',
+			placeholder: 'Add option',
 			default: {},
 			displayOptions: {
 				show: {
@@ -884,7 +884,7 @@ const versionDescription: INodeTypeDescription = {
 			displayName: 'Update Fields',
 			name: 'updateFields',
 			type: 'collection',
-			placeholder: 'Add Option',
+			placeholder: 'Add option',
 			default: {},
 			displayOptions: {
 				show: {
@@ -942,7 +942,7 @@ const versionDescription: INodeTypeDescription = {
 			displayName: 'Options',
 			name: 'options',
 			type: 'collection',
-			placeholder: 'Add Option',
+			placeholder: 'Add option',
 			default: {},
 			displayOptions: {
 				show: {
@@ -1108,7 +1108,7 @@ const versionDescription: INodeTypeDescription = {
 			displayName: 'Options',
 			name: 'options',
 			type: 'collection',
-			placeholder: 'Add Option',
+			placeholder: 'Add option',
 			default: {},
 			displayOptions: {
 				show: {
@@ -1543,7 +1543,7 @@ const versionDescription: INodeTypeDescription = {
 			displayName: 'Options',
 			name: 'options',
 			type: 'collection',
-			placeholder: 'Add Option',
+			placeholder: 'Add option',
 			default: {},
 			displayOptions: {
 				show: {
@@ -1774,7 +1774,7 @@ const versionDescription: INodeTypeDescription = {
 			displayName: 'Options',
 			name: 'options',
 			type: 'collection',
-			placeholder: 'Add Option',
+			placeholder: 'Add option',
 			default: {},
 			displayOptions: {
 				show: {
@@ -1831,7 +1831,7 @@ const versionDescription: INodeTypeDescription = {
 			displayName: 'Options',
 			name: 'options',
 			type: 'collection',
-			placeholder: 'Add Option',
+			placeholder: 'Add option',
 			default: {},
 			displayOptions: {
 				show: {
@@ -1865,7 +1865,7 @@ const versionDescription: INodeTypeDescription = {
 			displayName: 'Update Fields',
 			name: 'options',
 			type: 'collection',
-			placeholder: 'Add Option',
+			placeholder: 'Add option',
 			default: {},
 			displayOptions: {
 				show: {
@@ -1935,7 +1935,7 @@ const versionDescription: INodeTypeDescription = {
 			displayName: 'Options',
 			name: 'options',
 			type: 'collection',
-			placeholder: 'Add Option',
+			placeholder: 'Add option',
 			default: {},
 			displayOptions: {
 				show: {
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/common.descriptions.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/common.descriptions.ts
index 1cb6d05911c58..acdd2780d186f 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/common.descriptions.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/common.descriptions.ts
@@ -288,7 +288,7 @@ export const shareOptions: INodeProperties = {
 	displayName: 'Options',
 	name: 'options',
 	type: 'collection',
-	placeholder: 'Add Option',
+	placeholder: 'Add option',
 	default: {},
 	options: [
 		{
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/create.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/create.operation.ts
index 18aa62a68b74c..3780ea05a56a3 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/create.operation.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/create.operation.ts
@@ -22,7 +22,7 @@ const properties: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			{
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/get.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/get.operation.ts
index 890043d43f068..1ccf2bd745e48 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/get.operation.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/get.operation.ts
@@ -18,7 +18,7 @@ const properties: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			{
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/list.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/list.operation.ts
index 7f9d03162ea65..d2cd34e901a63 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/list.operation.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/list.operation.ts
@@ -36,7 +36,7 @@ const properties: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			{
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/update.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/update.operation.ts
index 07b598b512b07..d80be9968ba84 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/update.operation.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/update.operation.ts
@@ -18,7 +18,7 @@ const properties: INodeProperties[] = [
 		displayName: 'Update Fields',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/copy.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/copy.operation.ts
index 368ff55e228f4..e019c7c55517c 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/copy.operation.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/copy.operation.ts
@@ -48,7 +48,7 @@ const properties: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			{
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/createFromText.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/createFromText.operation.ts
index ac45185040f40..d9c92a972aa35 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/createFromText.operation.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/createFromText.operation.ts
@@ -47,7 +47,7 @@ const properties: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			...updateCommonOptions,
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/deleteFile.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/deleteFile.operation.ts
index 241c210a81250..af8f03839d133 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/deleteFile.operation.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/deleteFile.operation.ts
@@ -13,7 +13,7 @@ const properties: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			{
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/download.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/download.operation.ts
index 26a21c2070d68..55e1124c58cf7 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/download.operation.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/download.operation.ts
@@ -19,7 +19,7 @@ const properties: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			{
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/update.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/update.operation.ts
index ec6282e58f6aa..27f19e8b61922 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/update.operation.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/update.operation.ts
@@ -57,7 +57,7 @@ const properties: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			...updateCommonOptions,
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/upload.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/upload.operation.ts
index 6c2dc379c12dc..da4ca390161f4 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/upload.operation.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/upload.operation.ts
@@ -49,7 +49,7 @@ const properties: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			...updateCommonOptions,
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/fileFolder/search.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/fileFolder/search.operation.ts
index d06997a3c141b..8774216197446 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/fileFolder/search.operation.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/fileFolder/search.operation.ts
@@ -158,7 +158,7 @@ const properties: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			{
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/folder/create.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/folder/create.operation.ts
index 643fa592cfff6..9b5e845d9286f 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/folder/create.operation.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/folder/create.operation.ts
@@ -34,7 +34,7 @@ const properties: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			{
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/folder/deleteFolder.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/folder/deleteFolder.operation.ts
index 8f1d8caad4761..ed85388da6d9d 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/folder/deleteFolder.operation.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/folder/deleteFolder.operation.ts
@@ -13,7 +13,7 @@ const properties: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			{
diff --git a/packages/nodes-base/nodes/Google/GSuiteAdmin/GroupDescripion.ts b/packages/nodes-base/nodes/Google/GSuiteAdmin/GroupDescripion.ts
index a48a6a585e007..3646800f9abc8 100644
--- a/packages/nodes-base/nodes/Google/GSuiteAdmin/GroupDescripion.ts
+++ b/packages/nodes-base/nodes/Google/GSuiteAdmin/GroupDescripion.ts
@@ -171,7 +171,7 @@ export const groupFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/Google/GSuiteAdmin/UserDescription.ts b/packages/nodes-base/nodes/Google/GSuiteAdmin/UserDescription.ts
index e3685380c9620..b88af02cc48cb 100644
--- a/packages/nodes-base/nodes/Google/GSuiteAdmin/UserDescription.ts
+++ b/packages/nodes-base/nodes/Google/GSuiteAdmin/UserDescription.ts
@@ -407,7 +407,7 @@ export const userFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Options',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
@@ -525,7 +525,7 @@ export const userFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/Google/Gmail/GmailTrigger.node.ts b/packages/nodes-base/nodes/Google/Gmail/GmailTrigger.node.ts
index 526c0466be12c..fea6580a86bc0 100644
--- a/packages/nodes-base/nodes/Google/Gmail/GmailTrigger.node.ts
+++ b/packages/nodes-base/nodes/Google/Gmail/GmailTrigger.node.ts
@@ -163,7 +163,7 @@ export class GmailTrigger implements INodeType {
 				displayName: 'Options',
 				name: 'options',
 				type: 'collection',
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				default: {},
 				displayOptions: {
 					hide: {
diff --git a/packages/nodes-base/nodes/Google/Gmail/v2/DraftDescription.ts b/packages/nodes-base/nodes/Google/Gmail/v2/DraftDescription.ts
index 3bd3dd2efa6f4..e97d7bb9be59f 100644
--- a/packages/nodes-base/nodes/Google/Gmail/v2/DraftDescription.ts
+++ b/packages/nodes-base/nodes/Google/Gmail/v2/DraftDescription.ts
@@ -107,7 +107,7 @@ export const draftFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		displayOptions: {
 			show: {
 				resource: ['draft'],
@@ -203,7 +203,7 @@ export const draftFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		displayOptions: {
 			show: {
 				resource: ['draft'],
@@ -268,7 +268,7 @@ export const draftFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/Google/Gmail/v2/LabelDescription.ts b/packages/nodes-base/nodes/Google/Gmail/v2/LabelDescription.ts
index 8d966dca9cc2a..94aff76407b41 100644
--- a/packages/nodes-base/nodes/Google/Gmail/v2/LabelDescription.ts
+++ b/packages/nodes-base/nodes/Google/Gmail/v2/LabelDescription.ts
@@ -72,7 +72,7 @@ export const labelFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		displayOptions: {
 			show: {
 				resource: ['label'],
diff --git a/packages/nodes-base/nodes/Google/Gmail/v2/MessageDescription.ts b/packages/nodes-base/nodes/Google/Gmail/v2/MessageDescription.ts
index 0f0875fd49d51..0378eb04e4a4a 100644
--- a/packages/nodes-base/nodes/Google/Gmail/v2/MessageDescription.ts
+++ b/packages/nodes-base/nodes/Google/Gmail/v2/MessageDescription.ts
@@ -190,7 +190,7 @@ export const messageFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		displayOptions: {
 			show: {
 				resource: ['message'],
@@ -301,7 +301,7 @@ export const messageFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		displayOptions: {
 			show: {
 				resource: ['message'],
@@ -487,7 +487,7 @@ export const messageFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/Google/Gmail/v2/ThreadDescription.ts b/packages/nodes-base/nodes/Google/Gmail/v2/ThreadDescription.ts
index e1e2a4693ceb5..64d1192a7f7a6 100644
--- a/packages/nodes-base/nodes/Google/Gmail/v2/ThreadDescription.ts
+++ b/packages/nodes-base/nodes/Google/Gmail/v2/ThreadDescription.ts
@@ -137,7 +137,7 @@ export const threadFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		displayOptions: {
 			show: {
 				resource: ['thread'],
diff --git a/packages/nodes-base/nodes/Google/Perspective/GooglePerspective.node.ts b/packages/nodes-base/nodes/Google/Perspective/GooglePerspective.node.ts
index 465f0dacd2014..b11d7c6467a7c 100644
--- a/packages/nodes-base/nodes/Google/Perspective/GooglePerspective.node.ts
+++ b/packages/nodes-base/nodes/Google/Perspective/GooglePerspective.node.ts
@@ -154,7 +154,7 @@ export class GooglePerspective implements INodeType {
 					},
 				},
 				default: {},
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				options: [
 					{
 						displayName: 'Language Name or ID',
diff --git a/packages/nodes-base/nodes/Google/Sheet/GoogleSheetsTrigger.node.ts b/packages/nodes-base/nodes/Google/Sheet/GoogleSheetsTrigger.node.ts
index da4dd338aac31..c8e6269dd76e5 100644
--- a/packages/nodes-base/nodes/Google/Sheet/GoogleSheetsTrigger.node.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/GoogleSheetsTrigger.node.ts
@@ -220,7 +220,7 @@ export class GoogleSheetsTrigger implements INodeType {
 				displayName: 'Options',
 				name: 'options',
 				type: 'collection',
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				default: {},
 				options: [
 					{
diff --git a/packages/nodes-base/nodes/Google/Sheet/v1/versionDescription.ts b/packages/nodes-base/nodes/Google/Sheet/v1/versionDescription.ts
index 294df40cd911d..fb3f0090bcc73 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v1/versionDescription.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v1/versionDescription.ts
@@ -471,7 +471,7 @@ export const versionDescription: INodeTypeDescription = {
 			displayName: 'Options',
 			name: 'options',
 			type: 'collection',
-			placeholder: 'Add Option',
+			placeholder: 'Add option',
 			default: {},
 			displayOptions: {
 				show: {
@@ -701,7 +701,7 @@ export const versionDescription: INodeTypeDescription = {
 			displayName: 'Options',
 			name: 'options',
 			type: 'collection',
-			placeholder: 'Add Option',
+			placeholder: 'Add option',
 			default: {},
 			displayOptions: {
 				show: {
@@ -775,7 +775,7 @@ export const versionDescription: INodeTypeDescription = {
 			displayName: 'Options',
 			name: 'options',
 			type: 'collection',
-			placeholder: 'Add Option',
+			placeholder: 'Add option',
 			default: {},
 			displayOptions: {
 				show: {
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/append.operation.ts b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/append.operation.ts
index 140b107e33275..4ec7b16c5edfc 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/append.operation.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/append.operation.ts
@@ -154,7 +154,7 @@ export const description: SheetProperties = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/appendOrUpdate.operation.ts b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/appendOrUpdate.operation.ts
index ab19282aba0a3..0260c889ed5d7 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/appendOrUpdate.operation.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/appendOrUpdate.operation.ts
@@ -193,7 +193,7 @@ export const description: SheetProperties = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/create.operation.ts b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/create.operation.ts
index 7dd880fb521b7..4c57bf1dea041 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/create.operation.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/create.operation.ts
@@ -24,7 +24,7 @@ export const description: SheetProperties = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/read.operation.ts b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/read.operation.ts
index 63e5a6989fa10..5f87c8baa523c 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/read.operation.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/read.operation.ts
@@ -121,7 +121,7 @@ export const description: SheetProperties = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/update.operation.ts b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/update.operation.ts
index 8f6466510ad3b..3d69573c43d1a 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/update.operation.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/update.operation.ts
@@ -184,7 +184,7 @@ export const description: SheetProperties = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/actions/spreadsheet/create.operation.ts b/packages/nodes-base/nodes/Google/Sheet/v2/actions/spreadsheet/create.operation.ts
index 155203e3761dd..cc0dd57f4887e 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/actions/spreadsheet/create.operation.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/actions/spreadsheet/create.operation.ts
@@ -59,7 +59,7 @@ export const description: SpreadSheetProperties = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/Google/Slides/GoogleSlides.node.ts b/packages/nodes-base/nodes/Google/Slides/GoogleSlides.node.ts
index c1f5073492606..f281c34aa7610 100644
--- a/packages/nodes-base/nodes/Google/Slides/GoogleSlides.node.ts
+++ b/packages/nodes-base/nodes/Google/Slides/GoogleSlides.node.ts
@@ -306,7 +306,7 @@ export class GoogleSlides implements INodeType {
 				displayName: 'Options',
 				name: 'options',
 				type: 'collection',
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				displayOptions: {
 					show: {
 						operation: ['replaceText'],
diff --git a/packages/nodes-base/nodes/Google/YouTube/ChannelDescription.ts b/packages/nodes-base/nodes/Google/YouTube/ChannelDescription.ts
index 7503b0af01f4b..d973aa1a94c18 100644
--- a/packages/nodes-base/nodes/Google/YouTube/ChannelDescription.ts
+++ b/packages/nodes-base/nodes/Google/YouTube/ChannelDescription.ts
@@ -137,7 +137,7 @@ export const channelFields: INodeProperties[] = [
 		displayName: 'Filters',
 		name: 'filters',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
@@ -184,7 +184,7 @@ export const channelFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/Google/YouTube/PlaylistDescription.ts b/packages/nodes-base/nodes/Google/YouTube/PlaylistDescription.ts
index 893035d4534e4..8fd8f7bc5168d 100644
--- a/packages/nodes-base/nodes/Google/YouTube/PlaylistDescription.ts
+++ b/packages/nodes-base/nodes/Google/YouTube/PlaylistDescription.ts
@@ -69,7 +69,7 @@ export const playlistFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
@@ -208,7 +208,7 @@ export const playlistFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
@@ -255,7 +255,7 @@ export const playlistFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
@@ -357,7 +357,7 @@ export const playlistFields: INodeProperties[] = [
 		displayName: 'Filters',
 		name: 'filters',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
@@ -388,7 +388,7 @@ export const playlistFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/Google/YouTube/PlaylistItemDescription.ts b/packages/nodes-base/nodes/Google/YouTube/PlaylistItemDescription.ts
index cfbd06add50f7..dec5a6d8cef26 100644
--- a/packages/nodes-base/nodes/Google/YouTube/PlaylistItemDescription.ts
+++ b/packages/nodes-base/nodes/Google/YouTube/PlaylistItemDescription.ts
@@ -80,7 +80,7 @@ export const playlistItemFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
@@ -191,7 +191,7 @@ export const playlistItemFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
@@ -230,7 +230,7 @@ export const playlistItemFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
@@ -342,7 +342,7 @@ export const playlistItemFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/Google/YouTube/VideoDescription.ts b/packages/nodes-base/nodes/Google/YouTube/VideoDescription.ts
index 339d20e3f0d17..d47239e1835d7 100644
--- a/packages/nodes-base/nodes/Google/YouTube/VideoDescription.ts
+++ b/packages/nodes-base/nodes/Google/YouTube/VideoDescription.ts
@@ -124,7 +124,7 @@ export const videoFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
@@ -266,7 +266,7 @@ export const videoFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
@@ -366,7 +366,7 @@ export const videoFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
@@ -423,7 +423,7 @@ export const videoFields: INodeProperties[] = [
 		displayName: 'Filters',
 		name: 'filters',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
@@ -535,7 +535,7 @@ export const videoFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
@@ -702,7 +702,7 @@ export const videoFields: INodeProperties[] = [
 		displayName: 'Update Fields',
 		name: 'updateFields',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/Gotify/Gotify.node.ts b/packages/nodes-base/nodes/Gotify/Gotify.node.ts
index e5edb61f7b6fb..cd088ff3e05b8 100644
--- a/packages/nodes-base/nodes/Gotify/Gotify.node.ts
+++ b/packages/nodes-base/nodes/Gotify/Gotify.node.ts
@@ -119,7 +119,7 @@ export class Gotify implements INodeType {
 				displayName: 'Options',
 				name: 'options',
 				type: 'collection',
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				displayOptions: {
 					show: {
 						resource: ['message'],
diff --git a/packages/nodes-base/nodes/Grist/OperationDescription.ts b/packages/nodes-base/nodes/Grist/OperationDescription.ts
index b3011e1822290..44a74f30c3a21 100644
--- a/packages/nodes-base/nodes/Grist/OperationDescription.ts
+++ b/packages/nodes-base/nodes/Grist/OperationDescription.ts
@@ -115,7 +115,7 @@ export const operationFields: INodeProperties[] = [
 			},
 		},
 		default: {},
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		options: [
 			{
 				displayName: 'Filter',
diff --git a/packages/nodes-base/nodes/HelpScout/ConversationDescription.ts b/packages/nodes-base/nodes/HelpScout/ConversationDescription.ts
index 695f2ccb09b72..cea445a5d4fe6 100644
--- a/packages/nodes-base/nodes/HelpScout/ConversationDescription.ts
+++ b/packages/nodes-base/nodes/HelpScout/ConversationDescription.ts
@@ -401,7 +401,7 @@ export const conversationFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/HelpScout/CustomerDescription.ts b/packages/nodes-base/nodes/HelpScout/CustomerDescription.ts
index b22c6e5092504..805985bd2926e 100644
--- a/packages/nodes-base/nodes/HelpScout/CustomerDescription.ts
+++ b/packages/nodes-base/nodes/HelpScout/CustomerDescription.ts
@@ -566,7 +566,7 @@ export const customerFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/HighLevel/v1/description/ContactDescription.ts b/packages/nodes-base/nodes/HighLevel/v1/description/ContactDescription.ts
index bd9e84a4fb59f..d7d84ef06fcba 100644
--- a/packages/nodes-base/nodes/HighLevel/v1/description/ContactDescription.ts
+++ b/packages/nodes-base/nodes/HighLevel/v1/description/ContactDescription.ts
@@ -757,7 +757,7 @@ const getAllProperties: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/HighLevel/v2/description/ContactDescription.ts b/packages/nodes-base/nodes/HighLevel/v2/description/ContactDescription.ts
index 60122e192baef..b60833eb71575 100644
--- a/packages/nodes-base/nodes/HighLevel/v2/description/ContactDescription.ts
+++ b/packages/nodes-base/nodes/HighLevel/v2/description/ContactDescription.ts
@@ -746,7 +746,7 @@ const getAllProperties: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/Html/Html.node.ts b/packages/nodes-base/nodes/Html/Html.node.ts
index 0d5c56dbd17d1..42dcd96d9bfc9 100644
--- a/packages/nodes-base/nodes/Html/Html.node.ts
+++ b/packages/nodes-base/nodes/Html/Html.node.ts
@@ -274,7 +274,7 @@ export class Html implements INodeType {
 				displayName: 'Options',
 				name: 'options',
 				type: 'collection',
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				default: {},
 				displayOptions: {
 					show: {
@@ -307,7 +307,7 @@ export class Html implements INodeType {
 				displayName: 'Options',
 				name: 'options',
 				type: 'collection',
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				default: {},
 				displayOptions: {
 					show: {
diff --git a/packages/nodes-base/nodes/HtmlExtract/HtmlExtract.node.ts b/packages/nodes-base/nodes/HtmlExtract/HtmlExtract.node.ts
index 161c491dac686..d76b660dd0aaf 100644
--- a/packages/nodes-base/nodes/HtmlExtract/HtmlExtract.node.ts
+++ b/packages/nodes-base/nodes/HtmlExtract/HtmlExtract.node.ts
@@ -192,7 +192,7 @@ export class HtmlExtract implements INodeType {
 				displayName: 'Options',
 				name: 'options',
 				type: 'collection',
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				default: {},
 				options: [
 					{
diff --git a/packages/nodes-base/nodes/HttpRequest/V1/HttpRequestV1.node.ts b/packages/nodes-base/nodes/HttpRequest/V1/HttpRequestV1.node.ts
index b0c5185373c7e..2a34b4f645b40 100644
--- a/packages/nodes-base/nodes/HttpRequest/V1/HttpRequestV1.node.ts
+++ b/packages/nodes-base/nodes/HttpRequest/V1/HttpRequestV1.node.ts
@@ -259,7 +259,7 @@ export class HttpRequestV1 implements INodeType {
 					displayName: 'Options',
 					name: 'options',
 					type: 'collection',
-					placeholder: 'Add Option',
+					placeholder: 'Add option',
 					default: {},
 					options: [
 						{
diff --git a/packages/nodes-base/nodes/HttpRequest/V2/HttpRequestV2.node.ts b/packages/nodes-base/nodes/HttpRequest/V2/HttpRequestV2.node.ts
index 5b1b53af7f589..76b1e2a0d8ce7 100644
--- a/packages/nodes-base/nodes/HttpRequest/V2/HttpRequestV2.node.ts
+++ b/packages/nodes-base/nodes/HttpRequest/V2/HttpRequestV2.node.ts
@@ -274,7 +274,7 @@ export class HttpRequestV2 implements INodeType {
 					displayName: 'Options',
 					name: 'options',
 					type: 'collection',
-					placeholder: 'Add Option',
+					placeholder: 'Add option',
 					default: {},
 					options: [
 						{
diff --git a/packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts b/packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts
index 5fb21c41841dd..4c832eeb71223 100644
--- a/packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts
+++ b/packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts
@@ -719,7 +719,7 @@ export class HttpRequestV3 implements INodeType {
 					displayName: 'Options',
 					name: 'options',
 					type: 'collection',
-					placeholder: 'Add Option',
+					placeholder: 'Add option',
 					default: {},
 					options: [
 						{
diff --git a/packages/nodes-base/nodes/Hubspot/V2/CompanyDescription.ts b/packages/nodes-base/nodes/Hubspot/V2/CompanyDescription.ts
index 04244059e12d3..425829305d44d 100644
--- a/packages/nodes-base/nodes/Hubspot/V2/CompanyDescription.ts
+++ b/packages/nodes-base/nodes/Hubspot/V2/CompanyDescription.ts
@@ -860,7 +860,7 @@ export const companyFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'additionalFields',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
@@ -1064,7 +1064,7 @@ export const companyFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'additionalFields',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
@@ -1181,7 +1181,7 @@ export const companyFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/Hubspot/V2/ContactDescription.ts b/packages/nodes-base/nodes/Hubspot/V2/ContactDescription.ts
index c8a9417ce6dea..c2bd3997d7cc5 100644
--- a/packages/nodes-base/nodes/Hubspot/V2/ContactDescription.ts
+++ b/packages/nodes-base/nodes/Hubspot/V2/ContactDescription.ts
@@ -508,7 +508,7 @@ export const contactFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
@@ -578,7 +578,7 @@ export const contactFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'additionalFields',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
@@ -706,7 +706,7 @@ export const contactFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'additionalFields',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
@@ -879,7 +879,7 @@ export const contactFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'additionalFields',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
@@ -1163,7 +1163,7 @@ export const contactFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'additionalFields',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/Hubspot/V2/DealDescription.ts b/packages/nodes-base/nodes/Hubspot/V2/DealDescription.ts
index ad28d00d0ef22..edc2152e05e84 100644
--- a/packages/nodes-base/nodes/Hubspot/V2/DealDescription.ts
+++ b/packages/nodes-base/nodes/Hubspot/V2/DealDescription.ts
@@ -571,7 +571,7 @@ export const dealFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'filters',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
@@ -757,7 +757,7 @@ export const dealFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'filters',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
@@ -981,7 +981,7 @@ export const dealFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'additionalFields',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/Hubspot/V2/FormDescription.ts b/packages/nodes-base/nodes/Hubspot/V2/FormDescription.ts
index 09c12497f5b8b..52da733193d64 100644
--- a/packages/nodes-base/nodes/Hubspot/V2/FormDescription.ts
+++ b/packages/nodes-base/nodes/Hubspot/V2/FormDescription.ts
@@ -55,7 +55,7 @@ export const formFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'additionalFields',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/Hubspot/V2/TicketDescription.ts b/packages/nodes-base/nodes/Hubspot/V2/TicketDescription.ts
index 50a4082f41730..a6a8b39857907 100644
--- a/packages/nodes-base/nodes/Hubspot/V2/TicketDescription.ts
+++ b/packages/nodes-base/nodes/Hubspot/V2/TicketDescription.ts
@@ -455,7 +455,7 @@ export const ticketFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'additionalFields',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
@@ -530,7 +530,7 @@ export const ticketFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'additionalFields',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/HumanticAI/ProfileDescription.ts b/packages/nodes-base/nodes/HumanticAI/ProfileDescription.ts
index e27350232ed6c..f6bdf0108a08b 100644
--- a/packages/nodes-base/nodes/HumanticAI/ProfileDescription.ts
+++ b/packages/nodes-base/nodes/HumanticAI/ProfileDescription.ts
@@ -104,7 +104,7 @@ export const profileFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/ICalendar/createEvent.operation.ts b/packages/nodes-base/nodes/ICalendar/createEvent.operation.ts
index ec6c5c4d881d4..0fbe9c0695e7f 100644
--- a/packages/nodes-base/nodes/ICalendar/createEvent.operation.ts
+++ b/packages/nodes-base/nodes/ICalendar/createEvent.operation.ts
@@ -60,7 +60,7 @@ export const description: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'additionalFields',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			{
diff --git a/packages/nodes-base/nodes/ItemLists/V1/summarize.operation.ts b/packages/nodes-base/nodes/ItemLists/V1/summarize.operation.ts
index c1f5b0d43fa48..673119063b856 100644
--- a/packages/nodes-base/nodes/ItemLists/V1/summarize.operation.ts
+++ b/packages/nodes-base/nodes/ItemLists/V1/summarize.operation.ts
@@ -272,7 +272,7 @@ export const description: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/ItemLists/V2/summarize.operation.ts b/packages/nodes-base/nodes/ItemLists/V2/summarize.operation.ts
index f29df77035cfa..f6fc2ddd7220d 100644
--- a/packages/nodes-base/nodes/ItemLists/V2/summarize.operation.ts
+++ b/packages/nodes-base/nodes/ItemLists/V2/summarize.operation.ts
@@ -272,7 +272,7 @@ export const description: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/summarize.operation.ts b/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/summarize.operation.ts
index 059446ac0f19a..d026beb2d7c36 100644
--- a/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/summarize.operation.ts
+++ b/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/summarize.operation.ts
@@ -262,7 +262,7 @@ export const properties: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			disableDotNotationBoolean,
diff --git a/packages/nodes-base/nodes/Jira/IssueCommentDescription.ts b/packages/nodes-base/nodes/Jira/IssueCommentDescription.ts
index 627e26cf63022..08b42e2d4fd46 100644
--- a/packages/nodes-base/nodes/Jira/IssueCommentDescription.ts
+++ b/packages/nodes-base/nodes/Jira/IssueCommentDescription.ts
@@ -111,7 +111,7 @@ export const issueCommentFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
@@ -414,7 +414,7 @@ export const issueCommentFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/Jira/IssueDescription.ts b/packages/nodes-base/nodes/Jira/IssueDescription.ts
index f2364cf59b727..818d201404858 100644
--- a/packages/nodes-base/nodes/Jira/IssueDescription.ts
+++ b/packages/nodes-base/nodes/Jira/IssueDescription.ts
@@ -878,7 +878,7 @@ export const issueFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		displayOptions: {
 			show: {
 				operation: ['getAll'],
diff --git a/packages/nodes-base/nodes/Jwt/Jwt.node.ts b/packages/nodes-base/nodes/Jwt/Jwt.node.ts
index e2721233441c1..e8d6300ebf707 100644
--- a/packages/nodes-base/nodes/Jwt/Jwt.node.ts
+++ b/packages/nodes-base/nodes/Jwt/Jwt.node.ts
@@ -204,7 +204,7 @@ export class Jwt implements INodeType {
 				displayName: 'Options',
 				name: 'options',
 				type: 'collection',
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				default: {},
 				options: [
 					{
diff --git a/packages/nodes-base/nodes/Kafka/Kafka.node.ts b/packages/nodes-base/nodes/Kafka/Kafka.node.ts
index 4353019817c36..8bbcf218d0525 100644
--- a/packages/nodes-base/nodes/Kafka/Kafka.node.ts
+++ b/packages/nodes-base/nodes/Kafka/Kafka.node.ts
@@ -178,7 +178,7 @@ export class Kafka implements INodeType {
 				name: 'options',
 				type: 'collection',
 				default: {},
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				options: [
 					{
 						displayName: 'Acks',
diff --git a/packages/nodes-base/nodes/Kafka/KafkaTrigger.node.ts b/packages/nodes-base/nodes/Kafka/KafkaTrigger.node.ts
index 55ddf40152742..ccd4ff600d33e 100644
--- a/packages/nodes-base/nodes/Kafka/KafkaTrigger.node.ts
+++ b/packages/nodes-base/nodes/Kafka/KafkaTrigger.node.ts
@@ -77,7 +77,7 @@ export class KafkaTrigger implements INodeType {
 				name: 'options',
 				type: 'collection',
 				default: {},
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				options: [
 					{
 						displayName: 'Allow Topic Creation',
diff --git a/packages/nodes-base/nodes/Keap/CompanyDescription.ts b/packages/nodes-base/nodes/Keap/CompanyDescription.ts
index eb8678d2c7adf..175bfd58a3984 100644
--- a/packages/nodes-base/nodes/Keap/CompanyDescription.ts
+++ b/packages/nodes-base/nodes/Keap/CompanyDescription.ts
@@ -268,7 +268,7 @@ export const companyFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/Keap/ContactDescription.ts b/packages/nodes-base/nodes/Keap/ContactDescription.ts
index ec6016688917d..bf4dbfbc55320 100644
--- a/packages/nodes-base/nodes/Keap/ContactDescription.ts
+++ b/packages/nodes-base/nodes/Keap/ContactDescription.ts
@@ -571,7 +571,7 @@ export const contactFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Options',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
@@ -628,7 +628,7 @@ export const contactFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/Keap/EcommerceOrderDescripion.ts b/packages/nodes-base/nodes/Keap/EcommerceOrderDescripion.ts
index bb54be9731fbd..d6b62bef67d18 100644
--- a/packages/nodes-base/nodes/Keap/EcommerceOrderDescripion.ts
+++ b/packages/nodes-base/nodes/Keap/EcommerceOrderDescripion.ts
@@ -378,7 +378,7 @@ export const ecommerceOrderFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/KoBoToolbox/FormDescription.ts b/packages/nodes-base/nodes/KoBoToolbox/FormDescription.ts
index 4619b689c38ec..56cf6791da972 100644
--- a/packages/nodes-base/nodes/KoBoToolbox/FormDescription.ts
+++ b/packages/nodes-base/nodes/KoBoToolbox/FormDescription.ts
@@ -94,7 +94,7 @@ export const formFields: INodeProperties[] = [
 	{
 		displayName: 'Options',
 		name: 'options',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		type: 'collection',
 		default: {},
 		displayOptions: {
diff --git a/packages/nodes-base/nodes/KoBoToolbox/Options.ts b/packages/nodes-base/nodes/KoBoToolbox/Options.ts
index c283da35f96c8..8ae59858ecb54 100644
--- a/packages/nodes-base/nodes/KoBoToolbox/Options.ts
+++ b/packages/nodes-base/nodes/KoBoToolbox/Options.ts
@@ -2,7 +2,7 @@ import type { INodeProperties } from 'n8n-workflow';
 
 export const options = {
 	displayName: 'Options',
-	placeholder: 'Add Option',
+	placeholder: 'Add option',
 	name: 'formatOptions',
 	type: 'collection',
 	default: {},
diff --git a/packages/nodes-base/nodes/KoBoToolbox/SubmissionDescription.ts b/packages/nodes-base/nodes/KoBoToolbox/SubmissionDescription.ts
index 52dc2c6d36048..3e71217b3a9ae 100644
--- a/packages/nodes-base/nodes/KoBoToolbox/SubmissionDescription.ts
+++ b/packages/nodes-base/nodes/KoBoToolbox/SubmissionDescription.ts
@@ -205,7 +205,7 @@ export const submissionFields: INodeProperties[] = [
 			},
 		},
 		default: {},
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		options: [
 			{
 				displayName: 'Download Attachments',
diff --git a/packages/nodes-base/nodes/Ldap/LdapDescription.ts b/packages/nodes-base/nodes/Ldap/LdapDescription.ts
index 0f523accb77e1..599aa2104a429 100644
--- a/packages/nodes-base/nodes/Ldap/LdapDescription.ts
+++ b/packages/nodes-base/nodes/Ldap/LdapDescription.ts
@@ -399,7 +399,7 @@ export const ldapFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/LingvaNex/LingvaNex.node.ts b/packages/nodes-base/nodes/LingvaNex/LingvaNex.node.ts
index fd1f03b120eaa..7ebfa563f3559 100644
--- a/packages/nodes-base/nodes/LingvaNex/LingvaNex.node.ts
+++ b/packages/nodes-base/nodes/LingvaNex/LingvaNex.node.ts
@@ -85,7 +85,7 @@ export class LingvaNex implements INodeType {
 				displayName: 'Additional Options',
 				name: 'options',
 				type: 'collection',
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				default: {},
 				displayOptions: {
 					show: {
diff --git a/packages/nodes-base/nodes/LocalFileTrigger/LocalFileTrigger.node.ts b/packages/nodes-base/nodes/LocalFileTrigger/LocalFileTrigger.node.ts
index fa8322a73cabb..1d2b3372e1516 100644
--- a/packages/nodes-base/nodes/LocalFileTrigger/LocalFileTrigger.node.ts
+++ b/packages/nodes-base/nodes/LocalFileTrigger/LocalFileTrigger.node.ts
@@ -123,7 +123,7 @@ export class LocalFileTrigger implements INodeType {
 				displayName: 'Options',
 				name: 'options',
 				type: 'collection',
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				default: {},
 				options: [
 					{
diff --git a/packages/nodes-base/nodes/MQTT/Mqtt.node.ts b/packages/nodes-base/nodes/MQTT/Mqtt.node.ts
index 40674103b9714..c4caad68c0923 100644
--- a/packages/nodes-base/nodes/MQTT/Mqtt.node.ts
+++ b/packages/nodes-base/nodes/MQTT/Mqtt.node.ts
@@ -66,7 +66,7 @@ export class Mqtt implements INodeType {
 				displayName: 'Options',
 				name: 'options',
 				type: 'collection',
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				default: {},
 				options: [
 					{
diff --git a/packages/nodes-base/nodes/MQTT/MqttTrigger.node.ts b/packages/nodes-base/nodes/MQTT/MqttTrigger.node.ts
index f88029c2b1769..864c2cd912e78 100644
--- a/packages/nodes-base/nodes/MQTT/MqttTrigger.node.ts
+++ b/packages/nodes-base/nodes/MQTT/MqttTrigger.node.ts
@@ -62,7 +62,7 @@ export class MqttTrigger implements INodeType {
 				displayName: 'Options',
 				name: 'options',
 				type: 'collection',
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				default: {},
 				options: [
 					{
diff --git a/packages/nodes-base/nodes/Magento/GenericFunctions.ts b/packages/nodes-base/nodes/Magento/GenericFunctions.ts
index f4255a3194155..279244638b472 100644
--- a/packages/nodes-base/nodes/Magento/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Magento/GenericFunctions.ts
@@ -405,7 +405,7 @@ export function getSearchFilters(
 			displayName: 'Options',
 			name: 'options',
 			type: 'collection',
-			placeholder: 'Add Option',
+			placeholder: 'Add option',
 			default: {},
 			displayOptions: {
 				show: {
diff --git a/packages/nodes-base/nodes/Mailchimp/Mailchimp.node.ts b/packages/nodes-base/nodes/Mailchimp/Mailchimp.node.ts
index dc8325d3ac23f..f65083a15db7c 100644
--- a/packages/nodes-base/nodes/Mailchimp/Mailchimp.node.ts
+++ b/packages/nodes-base/nodes/Mailchimp/Mailchimp.node.ts
@@ -356,7 +356,7 @@ export class Mailchimp implements INodeType {
 				displayName: 'Options',
 				name: 'options',
 				type: 'collection',
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				default: {},
 				displayOptions: {
 					show: {
@@ -703,7 +703,7 @@ export class Mailchimp implements INodeType {
 				displayName: 'Options',
 				name: 'options',
 				type: 'collection',
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				default: {},
 				displayOptions: {
 					show: {
@@ -785,7 +785,7 @@ export class Mailchimp implements INodeType {
 				displayName: 'Options',
 				name: 'options',
 				type: 'collection',
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				default: {},
 				displayOptions: {
 					show: {
@@ -1288,7 +1288,7 @@ export class Mailchimp implements INodeType {
 				displayName: 'Options',
 				name: 'options',
 				type: 'collection',
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				default: {},
 				displayOptions: {
 					show: {
@@ -1417,7 +1417,7 @@ export class Mailchimp implements INodeType {
 				displayName: 'Options',
 				name: 'options',
 				type: 'collection',
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				default: {},
 				displayOptions: {
 					show: {
diff --git a/packages/nodes-base/nodes/Mandrill/Mandrill.node.ts b/packages/nodes-base/nodes/Mandrill/Mandrill.node.ts
index 13da57be9eed7..e650e2ff4cc63 100644
--- a/packages/nodes-base/nodes/Mandrill/Mandrill.node.ts
+++ b/packages/nodes-base/nodes/Mandrill/Mandrill.node.ts
@@ -216,7 +216,7 @@ export class Mandrill implements INodeType {
 				displayName: 'Options',
 				name: 'options',
 				type: 'collection',
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				default: {},
 				displayOptions: {
 					show: {
diff --git a/packages/nodes-base/nodes/Markdown/Markdown.node.ts b/packages/nodes-base/nodes/Markdown/Markdown.node.ts
index 6289fbab690b3..d55c4944d8451 100644
--- a/packages/nodes-base/nodes/Markdown/Markdown.node.ts
+++ b/packages/nodes-base/nodes/Markdown/Markdown.node.ts
@@ -97,7 +97,7 @@ export class Markdown implements INodeType {
 				displayName: 'Options',
 				name: 'options',
 				type: 'collection',
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				default: {},
 				displayOptions: {
 					show: {
@@ -299,7 +299,7 @@ export class Markdown implements INodeType {
 				displayName: 'Options',
 				name: 'options',
 				type: 'collection',
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				default: {},
 				displayOptions: {
 					show: {
diff --git a/packages/nodes-base/nodes/Matrix/MessageDescription.ts b/packages/nodes-base/nodes/Matrix/MessageDescription.ts
index 973ea6ecc8b48..e9f4f94be3aec 100644
--- a/packages/nodes-base/nodes/Matrix/MessageDescription.ts
+++ b/packages/nodes-base/nodes/Matrix/MessageDescription.ts
@@ -201,7 +201,7 @@ export const messageFields: INodeProperties[] = [
 			},
 		},
 		default: {},
-		placeholder: 'Add options',
+		placeholder: 'Add option',
 		options: [
 			{
 				displayName: 'Filter',
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/message/post/description.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/message/post/description.ts
index 4f7fd29fe535c..2e6cddd000e4c 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/message/post/description.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/message/post/description.ts
@@ -113,7 +113,7 @@ export const messagePostDescription: MessageProperties = [
 							{
 								displayName: 'Options',
 								name: 'options',
-								placeholder: 'Add Option',
+								placeholder: 'Add option',
 								description: 'Adds a new option to select field',
 								type: 'fixedCollection',
 								typeOptions: {
@@ -367,7 +367,7 @@ export const messagePostDescription: MessageProperties = [
 		},
 		default: {},
 		description: 'Other options to set',
-		placeholder: 'Add options',
+		placeholder: 'Add option',
 		options: [
 			{
 				displayName: 'Make Comment',
diff --git a/packages/nodes-base/nodes/Mautic/ContactDescription.ts b/packages/nodes-base/nodes/Mautic/ContactDescription.ts
index 65b6b3ed3def5..b42bb2e08fa27 100644
--- a/packages/nodes-base/nodes/Mautic/ContactDescription.ts
+++ b/packages/nodes-base/nodes/Mautic/ContactDescription.ts
@@ -1178,7 +1178,7 @@ export const contactFields: INodeProperties[] = [
 				operation: ['sendEmail', 'editDoNotContactList', 'editContactPoint'],
 			},
 		},
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			{
diff --git a/packages/nodes-base/nodes/Merge/v2/descriptions.ts b/packages/nodes-base/nodes/Merge/v2/descriptions.ts
index 77e791be587e6..e5c0979adbade 100644
--- a/packages/nodes-base/nodes/Merge/v2/descriptions.ts
+++ b/packages/nodes-base/nodes/Merge/v2/descriptions.ts
@@ -80,7 +80,7 @@ export const optionsDescription: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			{
diff --git a/packages/nodes-base/nodes/Merge/v3/actions/mode/combineAll.ts b/packages/nodes-base/nodes/Merge/v3/actions/mode/combineAll.ts
index 32e9e470fa821..acdc1681d3a31 100644
--- a/packages/nodes-base/nodes/Merge/v3/actions/mode/combineAll.ts
+++ b/packages/nodes-base/nodes/Merge/v3/actions/mode/combineAll.ts
@@ -18,7 +18,7 @@ export const properties: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [clashHandlingProperties, fuzzyCompareProperty],
 	},
diff --git a/packages/nodes-base/nodes/Merge/v3/actions/mode/combineByFields.ts b/packages/nodes-base/nodes/Merge/v3/actions/mode/combineByFields.ts
index b9a2c848abcbe..2c5dc979b4436 100644
--- a/packages/nodes-base/nodes/Merge/v3/actions/mode/combineByFields.ts
+++ b/packages/nodes-base/nodes/Merge/v3/actions/mode/combineByFields.ts
@@ -199,7 +199,7 @@ export const properties: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			{
diff --git a/packages/nodes-base/nodes/Merge/v3/actions/mode/combineByPosition.ts b/packages/nodes-base/nodes/Merge/v3/actions/mode/combineByPosition.ts
index ce629978b9a75..2be6a03bf7adc 100644
--- a/packages/nodes-base/nodes/Merge/v3/actions/mode/combineByPosition.ts
+++ b/packages/nodes-base/nodes/Merge/v3/actions/mode/combineByPosition.ts
@@ -20,7 +20,7 @@ export const properties: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			{
diff --git a/packages/nodes-base/nodes/Microsoft/Dynamics/descriptions/AccountDescription.ts b/packages/nodes-base/nodes/Microsoft/Dynamics/descriptions/AccountDescription.ts
index 2d3cfc87ea477..8f50f3bb3673b 100644
--- a/packages/nodes-base/nodes/Microsoft/Dynamics/descriptions/AccountDescription.ts
+++ b/packages/nodes-base/nodes/Microsoft/Dynamics/descriptions/AccountDescription.ts
@@ -130,7 +130,7 @@ export const accountFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
@@ -208,7 +208,7 @@ export const accountFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v1/TableDescription.ts b/packages/nodes-base/nodes/Microsoft/Excel/v1/TableDescription.ts
index ccb10faae61c6..6c9d0f02d8c05 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v1/TableDescription.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v1/TableDescription.ts
@@ -499,7 +499,7 @@ export const tableFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/append.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/append.operation.ts
index 965986762e0da..7fe1ab6af943c 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/append.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/append.operation.ts
@@ -98,7 +98,7 @@ const properties: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			{
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/lookup.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/lookup.operation.ts
index 83f04dd8129a0..1227f2d6f393c 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/lookup.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/lookup.operation.ts
@@ -36,7 +36,7 @@ const properties: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			{
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/workbook/addWorksheet.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/workbook/addWorksheet.operation.ts
index a27d9c56cae51..bfc5c7a2b38c3 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/workbook/addWorksheet.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/workbook/addWorksheet.operation.ts
@@ -14,7 +14,7 @@ const properties: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'additionalFields',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			{
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/append.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/append.operation.ts
index 05247e6780d0f..ea97597b823f0 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/append.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/append.operation.ts
@@ -96,7 +96,7 @@ const properties: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			{
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/readRows.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/readRows.operation.ts
index 5a37c5294d2f3..bbd2eda7d157a 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/readRows.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/readRows.operation.ts
@@ -70,7 +70,7 @@ const properties: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			{
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/update.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/update.operation.ts
index 7d7c14384d133..c74b71be7af9a 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/update.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/update.operation.ts
@@ -171,7 +171,7 @@ const properties: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			{
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/upsert.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/upsert.operation.ts
index 9da839324bb99..6e4e86307f19d 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/upsert.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/upsert.operation.ts
@@ -135,7 +135,7 @@ const properties: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			{
diff --git a/packages/nodes-base/nodes/Microsoft/OneDrive/TriggerDescription.ts b/packages/nodes-base/nodes/Microsoft/OneDrive/TriggerDescription.ts
index 0a1a713b3dc81..3c7c5e2674331 100644
--- a/packages/nodes-base/nodes/Microsoft/OneDrive/TriggerDescription.ts
+++ b/packages/nodes-base/nodes/Microsoft/OneDrive/TriggerDescription.ts
@@ -245,7 +245,7 @@ export const triggerDescription: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
@@ -267,7 +267,7 @@ export const triggerDescription: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/trigger/MessageDescription.ts b/packages/nodes-base/nodes/Microsoft/Outlook/trigger/MessageDescription.ts
index 9ff9af88bf6c0..7173869f2e4db 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/trigger/MessageDescription.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/trigger/MessageDescription.ts
@@ -115,7 +115,7 @@ export const properties: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			{
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/get.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/get.operation.ts
index 3e69d91f5b68e..d8321768a9059 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/get.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/get.operation.ts
@@ -48,7 +48,7 @@ export const properties: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			{
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/create.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/create.operation.ts
index ad4d1ef4f1b02..521cdbeae937f 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/create.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/create.operation.ts
@@ -18,7 +18,7 @@ export const properties: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [{ ...folderRLC, displayName: 'Parent Folder', required: false }],
 	},
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/get.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/get.operation.ts
index 6ea2867a4ff97..b3f1c9014eec7 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/get.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/get.operation.ts
@@ -10,7 +10,7 @@ export const properties: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			{
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folderMessage/getAll.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folderMessage/getAll.operation.ts
index 7d3b57c7e0630..eec59b506165f 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folderMessage/getAll.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folderMessage/getAll.operation.ts
@@ -191,7 +191,7 @@ export const properties: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			{
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/get.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/get.operation.ts
index b253659e434e0..a69ca7efb8d3b 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/get.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/get.operation.ts
@@ -49,7 +49,7 @@ export const properties: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			{
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/getAll.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/getAll.operation.ts
index 6991118e14a12..64864f0bf026e 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/getAll.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/getAll.operation.ts
@@ -206,7 +206,7 @@ export const properties: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			{
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/add.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/add.operation.ts
index dd3f596197cda..c324581c1d24c 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/add.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/add.operation.ts
@@ -26,7 +26,7 @@ export const properties: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			{
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/getAll.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/getAll.operation.ts
index 81df8d111af0f..be250c309a305 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/getAll.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/getAll.operation.ts
@@ -10,7 +10,7 @@ export const properties: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			{
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v1/ChatMessageDescription.ts b/packages/nodes-base/nodes/Microsoft/Teams/v1/ChatMessageDescription.ts
index ccc309e565ca8..8813feedfccc2 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/v1/ChatMessageDescription.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v1/ChatMessageDescription.ts
@@ -107,7 +107,7 @@ export const chatMessageFields: INodeProperties[] = [
 		},
 		default: {},
 		description: 'Other options to set',
-		placeholder: 'Add options',
+		placeholder: 'Add option',
 		options: [
 			{
 				displayName: 'Include Link to Workflow',
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channel/create.operation.ts b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channel/create.operation.ts
index 7635dfc905af0..e41110a0b6342 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channel/create.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channel/create.operation.ts
@@ -19,7 +19,7 @@ const properties: INodeProperties[] = [
 		name: 'options',
 		type: 'collection',
 		default: {},
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		options: [
 			{
 				displayName: 'Description',
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channel/update.operation.ts b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channel/update.operation.ts
index 3a60563b56176..a88b19981da0d 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channel/update.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channel/update.operation.ts
@@ -19,7 +19,7 @@ const properties: INodeProperties[] = [
 		name: 'options',
 		type: 'collection',
 		default: {},
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		options: [
 			{
 				displayName: 'Description',
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channelMessage/create.operation.ts b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channelMessage/create.operation.ts
index 34c32341d9deb..8054bccbd61b8 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channelMessage/create.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channelMessage/create.operation.ts
@@ -40,7 +40,7 @@ const properties: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			{
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/chatMessage/create.operation.ts b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/chatMessage/create.operation.ts
index fbb5d568395ef..de4cf5dcab07f 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/chatMessage/create.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/chatMessage/create.operation.ts
@@ -41,7 +41,7 @@ const properties: INodeProperties[] = [
 		type: 'collection',
 		default: {},
 		description: 'Other options to set',
-		placeholder: 'Add options',
+		placeholder: 'Add option',
 		options: [
 			{
 				displayName: 'Include Link to Workflow',
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/task/create.operation.ts b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/task/create.operation.ts
index 72cf7ccc76ac6..29b7e46e453a9 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/task/create.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/task/create.operation.ts
@@ -22,7 +22,7 @@ const properties: INodeProperties[] = [
 		name: 'options',
 		type: 'collection',
 		default: {},
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		options: [
 			{
 				...memberRLC,
diff --git a/packages/nodes-base/nodes/MongoDb/MongoDbProperties.ts b/packages/nodes-base/nodes/MongoDb/MongoDbProperties.ts
index bc7dc1e918a68..a831bd57fa305 100644
--- a/packages/nodes-base/nodes/MongoDb/MongoDbProperties.ts
+++ b/packages/nodes-base/nodes/MongoDb/MongoDbProperties.ts
@@ -118,7 +118,7 @@ export const nodeProperties: INodeProperties[] = [
 			},
 		},
 		default: {},
-		placeholder: 'Add options',
+		placeholder: 'Add option',
 		description: 'Add query options',
 		options: [
 			{
@@ -240,7 +240,7 @@ export const nodeProperties: INodeProperties[] = [
 				operation: ['update', 'insert', 'findOneAndReplace', 'findOneAndUpdate'],
 			},
 		},
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			{
diff --git a/packages/nodes-base/nodes/MoveBinaryData/MoveBinaryData.node.ts b/packages/nodes-base/nodes/MoveBinaryData/MoveBinaryData.node.ts
index e4c536250aede..e7957c8f02a59 100644
--- a/packages/nodes-base/nodes/MoveBinaryData/MoveBinaryData.node.ts
+++ b/packages/nodes-base/nodes/MoveBinaryData/MoveBinaryData.node.ts
@@ -177,7 +177,7 @@ export class MoveBinaryData implements INodeType {
 				displayName: 'Options',
 				name: 'options',
 				type: 'collection',
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				default: {},
 				options: [
 					{
diff --git a/packages/nodes-base/nodes/MySql/v2/actions/common.descriptions.ts b/packages/nodes-base/nodes/MySql/v2/actions/common.descriptions.ts
index 3454f97562ffa..67a1eda87eb5f 100644
--- a/packages/nodes-base/nodes/MySql/v2/actions/common.descriptions.ts
+++ b/packages/nodes-base/nodes/MySql/v2/actions/common.descriptions.ts
@@ -33,7 +33,7 @@ export const optionsCollection: INodeProperties = {
 	name: 'options',
 	type: 'collection',
 	default: {},
-	placeholder: 'Add Option',
+	placeholder: 'Add option',
 	options: [
 		{
 			displayName: 'Connection Timeout',
diff --git a/packages/nodes-base/nodes/N8n/ExecutionDescription.ts b/packages/nodes-base/nodes/N8n/ExecutionDescription.ts
index eb951e19c21b7..b37184c77201d 100644
--- a/packages/nodes-base/nodes/N8n/ExecutionDescription.ts
+++ b/packages/nodes-base/nodes/N8n/ExecutionDescription.ts
@@ -173,7 +173,7 @@ const getAllOperation: INodeProperties[] = [
 		name: 'options',
 		type: 'collection',
 		default: {},
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		displayOptions: {
 			show: {
 				resource: ['execution'],
@@ -218,7 +218,7 @@ const getOperation: INodeProperties[] = [
 		name: 'options',
 		type: 'collection',
 		default: {},
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		displayOptions: {
 			show: {
 				resource: ['execution'],
diff --git a/packages/nodes-base/nodes/Netscaler/ADC/FileDescription.ts b/packages/nodes-base/nodes/Netscaler/ADC/FileDescription.ts
index b6a45dd2d9fba..b03f6e3963fc2 100644
--- a/packages/nodes-base/nodes/Netscaler/ADC/FileDescription.ts
+++ b/packages/nodes-base/nodes/Netscaler/ADC/FileDescription.ts
@@ -62,7 +62,7 @@ export const fileDescription: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/NextCloud/NextCloud.node.ts b/packages/nodes-base/nodes/NextCloud/NextCloud.node.ts
index 5ba8b7f5b60ab..f525157efca5e 100644
--- a/packages/nodes-base/nodes/NextCloud/NextCloud.node.ts
+++ b/packages/nodes-base/nodes/NextCloud/NextCloud.node.ts
@@ -544,7 +544,7 @@ export class NextCloud implements INodeType {
 				displayName: 'Options',
 				name: 'options',
 				type: 'collection',
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				default: {},
 				displayOptions: {
 					show: {
@@ -757,7 +757,7 @@ export class NextCloud implements INodeType {
 				displayName: 'Options',
 				name: 'options',
 				type: 'collection',
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				default: {},
 				displayOptions: {
 					show: {
@@ -792,7 +792,7 @@ export class NextCloud implements INodeType {
 				typeOptions: {
 					multipleValues: false,
 				},
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				default: {},
 				displayOptions: {
 					show: {
diff --git a/packages/nodes-base/nodes/NocoDB/OperationDescription.ts b/packages/nodes-base/nodes/NocoDB/OperationDescription.ts
index 0d1b7ec7437d7..c8eab2a7aa38b 100644
--- a/packages/nodes-base/nodes/NocoDB/OperationDescription.ts
+++ b/packages/nodes-base/nodes/NocoDB/OperationDescription.ts
@@ -288,7 +288,7 @@ export const operationFields: INodeProperties[] = [
 			},
 		},
 		default: {},
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		options: [
 			{
 				displayName: 'View ID',
diff --git a/packages/nodes-base/nodes/Notion/shared/descriptions/DatabasePageDescription.ts b/packages/nodes-base/nodes/Notion/shared/descriptions/DatabasePageDescription.ts
index 0c2e71b0c22c2..a4ce22cfb56ba 100644
--- a/packages/nodes-base/nodes/Notion/shared/descriptions/DatabasePageDescription.ts
+++ b/packages/nodes-base/nodes/Notion/shared/descriptions/DatabasePageDescription.ts
@@ -551,7 +551,7 @@ export const databasePageFields: INodeProperties[] = [
 			},
 		},
 		default: {},
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		options: [
 			{
 				displayName: 'Icon Type',
@@ -1019,7 +1019,7 @@ export const databasePageFields: INodeProperties[] = [
 			},
 		},
 		default: {},
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		options: [
 			{
 				displayName: 'Icon Type',
diff --git a/packages/nodes-base/nodes/Notion/shared/descriptions/PageDescription.ts b/packages/nodes-base/nodes/Notion/shared/descriptions/PageDescription.ts
index 602c28694f443..93c79fb2cfdb7 100644
--- a/packages/nodes-base/nodes/Notion/shared/descriptions/PageDescription.ts
+++ b/packages/nodes-base/nodes/Notion/shared/descriptions/PageDescription.ts
@@ -254,7 +254,7 @@ export const pageFields: INodeProperties[] = [
 			},
 		},
 		default: {},
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		options: [
 			{
 				displayName: 'Icon Type',
diff --git a/packages/nodes-base/nodes/OneSimpleApi/OneSimpleApi.node.ts b/packages/nodes-base/nodes/OneSimpleApi/OneSimpleApi.node.ts
index b678b2d51dac3..4bf37ae0d616e 100644
--- a/packages/nodes-base/nodes/OneSimpleApi/OneSimpleApi.node.ts
+++ b/packages/nodes-base/nodes/OneSimpleApi/OneSimpleApi.node.ts
@@ -222,7 +222,7 @@ export class OneSimpleApi implements INodeType {
 				displayName: 'Options',
 				name: 'options',
 				type: 'collection',
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				default: {},
 				displayOptions: {
 					show: {
@@ -342,7 +342,7 @@ export class OneSimpleApi implements INodeType {
 				displayName: 'Options',
 				name: 'options',
 				type: 'collection',
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				default: {},
 				displayOptions: {
 					show: {
@@ -439,7 +439,7 @@ export class OneSimpleApi implements INodeType {
 				displayName: 'Options',
 				name: 'options',
 				type: 'collection',
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				default: {},
 				displayOptions: {
 					show: {
@@ -603,7 +603,7 @@ export class OneSimpleApi implements INodeType {
 				displayName: 'Options',
 				name: 'options',
 				type: 'collection',
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				default: {},
 				displayOptions: {
 					show: {
diff --git a/packages/nodes-base/nodes/Onfleet/descriptions/ContainerDescription.ts b/packages/nodes-base/nodes/Onfleet/descriptions/ContainerDescription.ts
index b309c8cc96e93..fd081bb886354 100644
--- a/packages/nodes-base/nodes/Onfleet/descriptions/ContainerDescription.ts
+++ b/packages/nodes-base/nodes/Onfleet/descriptions/ContainerDescription.ts
@@ -170,7 +170,7 @@ export const containerFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/OpenAi/ChatDescription.ts b/packages/nodes-base/nodes/OpenAi/ChatDescription.ts
index 6bbea27f164f1..2b0ef3e8df4f3 100644
--- a/packages/nodes-base/nodes/OpenAi/ChatDescription.ts
+++ b/packages/nodes-base/nodes/OpenAi/ChatDescription.ts
@@ -265,7 +265,7 @@ const sharedOperations: INodeProperties[] = [
 	{
 		displayName: 'Options',
 		name: 'options',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		description: 'Additional options to add',
 		type: 'collection',
 		default: {},
diff --git a/packages/nodes-base/nodes/OpenAi/ImageDescription.ts b/packages/nodes-base/nodes/OpenAi/ImageDescription.ts
index ca26967525578..1cb5ceb89d2b8 100644
--- a/packages/nodes-base/nodes/OpenAi/ImageDescription.ts
+++ b/packages/nodes-base/nodes/OpenAi/ImageDescription.ts
@@ -242,7 +242,7 @@ const createOperations: INodeProperties[] = [
 	{
 		displayName: 'Options',
 		name: 'options',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		description: 'Additional options to add',
 		type: 'collection',
 		default: {},
diff --git a/packages/nodes-base/nodes/OpenAi/TextDescription.ts b/packages/nodes-base/nodes/OpenAi/TextDescription.ts
index 22d8b6a18c499..30b533e90e206 100644
--- a/packages/nodes-base/nodes/OpenAi/TextDescription.ts
+++ b/packages/nodes-base/nodes/OpenAi/TextDescription.ts
@@ -353,7 +353,7 @@ const sharedOperations: INodeProperties[] = [
 	{
 		displayName: 'Options',
 		name: 'options',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		description: 'Additional options to add',
 		type: 'collection',
 		default: {},
diff --git a/packages/nodes-base/nodes/OpenThesaurus/OpenThesaurus.node.ts b/packages/nodes-base/nodes/OpenThesaurus/OpenThesaurus.node.ts
index c2e2f0a228c81..c50e75be5d08c 100644
--- a/packages/nodes-base/nodes/OpenThesaurus/OpenThesaurus.node.ts
+++ b/packages/nodes-base/nodes/OpenThesaurus/OpenThesaurus.node.ts
@@ -56,7 +56,7 @@ export class OpenThesaurus implements INodeType {
 				displayName: 'Options',
 				name: 'options',
 				type: 'collection',
-				placeholder: 'Add Options',
+				placeholder: 'Add option',
 				displayOptions: {
 					show: {
 						operation: ['getSynonyms'],
diff --git a/packages/nodes-base/nodes/Orbit/MemberDescription.ts b/packages/nodes-base/nodes/Orbit/MemberDescription.ts
index 5f84d91e9dd3a..3ed0682e16cdf 100644
--- a/packages/nodes-base/nodes/Orbit/MemberDescription.ts
+++ b/packages/nodes-base/nodes/Orbit/MemberDescription.ts
@@ -210,7 +210,7 @@ export const memberFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/Postgres/PostgresTrigger.node.ts b/packages/nodes-base/nodes/Postgres/PostgresTrigger.node.ts
index 639da1d3e6092..f20645050ce88 100644
--- a/packages/nodes-base/nodes/Postgres/PostgresTrigger.node.ts
+++ b/packages/nodes-base/nodes/Postgres/PostgresTrigger.node.ts
@@ -213,7 +213,7 @@ export class PostgresTrigger implements INodeType {
 				displayName: 'Options',
 				name: 'options',
 				type: 'collection',
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				default: {},
 				options: [
 					{
diff --git a/packages/nodes-base/nodes/Postgres/v2/actions/common.descriptions.ts b/packages/nodes-base/nodes/Postgres/v2/actions/common.descriptions.ts
index 8814e9a4dfac5..c7444b70fecf1 100644
--- a/packages/nodes-base/nodes/Postgres/v2/actions/common.descriptions.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/actions/common.descriptions.ts
@@ -4,7 +4,7 @@ export const optionsCollection: INodeProperties = {
 	displayName: 'Options',
 	name: 'options',
 	type: 'collection',
-	placeholder: 'Add Option',
+	placeholder: 'Add option',
 	default: {},
 	options: [
 		{
diff --git a/packages/nodes-base/nodes/ProfitWell/MetricDescription.ts b/packages/nodes-base/nodes/ProfitWell/MetricDescription.ts
index 3b39bb302c438..439ccae9c1d9b 100644
--- a/packages/nodes-base/nodes/ProfitWell/MetricDescription.ts
+++ b/packages/nodes-base/nodes/ProfitWell/MetricDescription.ts
@@ -88,7 +88,7 @@ export const metricFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		displayOptions: {
 			show: {
 				resource: ['metric'],
diff --git a/packages/nodes-base/nodes/QuickBase/RecordDescription.ts b/packages/nodes-base/nodes/QuickBase/RecordDescription.ts
index 4593027a6cfe6..3140aa1d1e8f9 100644
--- a/packages/nodes-base/nodes/QuickBase/RecordDescription.ts
+++ b/packages/nodes-base/nodes/QuickBase/RecordDescription.ts
@@ -98,7 +98,7 @@ export const recordFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
@@ -353,7 +353,7 @@ export const recordFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
@@ -475,7 +475,7 @@ export const recordFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/QuickChart/QuickChart.node.ts b/packages/nodes-base/nodes/QuickChart/QuickChart.node.ts
index defe162abd37c..f3b9ef2efd9ae 100644
--- a/packages/nodes-base/nodes/QuickChart/QuickChart.node.ts
+++ b/packages/nodes-base/nodes/QuickChart/QuickChart.node.ts
@@ -126,7 +126,7 @@ export class QuickChart implements INodeType {
 				displayName: 'Chart Options',
 				name: 'chartOptions',
 				type: 'collection',
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				default: {},
 				options: [
 					{
@@ -207,7 +207,7 @@ export class QuickChart implements INodeType {
 				displayName: 'Dataset Options',
 				name: 'datasetOptions',
 				type: 'collection',
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				default: {},
 				options: [
 					{
diff --git a/packages/nodes-base/nodes/RabbitMQ/RabbitMQ.node.ts b/packages/nodes-base/nodes/RabbitMQ/RabbitMQ.node.ts
index c4f9ace2c6b88..a77cd873cebdd 100644
--- a/packages/nodes-base/nodes/RabbitMQ/RabbitMQ.node.ts
+++ b/packages/nodes-base/nodes/RabbitMQ/RabbitMQ.node.ts
@@ -247,7 +247,7 @@ export class RabbitMQ implements INodeType {
 						operation: ['sendMessage'],
 					},
 				},
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				options: [
 					{
 						displayName: 'Alternate Exchange',
diff --git a/packages/nodes-base/nodes/RabbitMQ/RabbitMQTrigger.node.ts b/packages/nodes-base/nodes/RabbitMQ/RabbitMQTrigger.node.ts
index ca9dd3c840558..a95c67ed26090 100644
--- a/packages/nodes-base/nodes/RabbitMQ/RabbitMQTrigger.node.ts
+++ b/packages/nodes-base/nodes/RabbitMQ/RabbitMQTrigger.node.ts
@@ -62,7 +62,7 @@ export class RabbitMQTrigger implements INodeType {
 				name: 'options',
 				type: 'collection',
 				default: {},
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				options: [
 					{
 						displayName: 'Content Is Binary',
diff --git a/packages/nodes-base/nodes/Redis/Redis.node.ts b/packages/nodes-base/nodes/Redis/Redis.node.ts
index 70d2dfc681f09..549a15e85a9cd 100644
--- a/packages/nodes-base/nodes/Redis/Redis.node.ts
+++ b/packages/nodes-base/nodes/Redis/Redis.node.ts
@@ -196,7 +196,7 @@ export class Redis implements INodeType {
 						operation: ['get'],
 					},
 				},
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				default: {},
 				options: [
 					{
@@ -484,7 +484,7 @@ export class Redis implements INodeType {
 						operation: ['pop'],
 					},
 				},
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				default: {},
 				options: [
 					{
diff --git a/packages/nodes-base/nodes/Redis/RedisTrigger.node.ts b/packages/nodes-base/nodes/Redis/RedisTrigger.node.ts
index 4a45c247074ba..da3c47a54e6ac 100644
--- a/packages/nodes-base/nodes/Redis/RedisTrigger.node.ts
+++ b/packages/nodes-base/nodes/Redis/RedisTrigger.node.ts
@@ -47,7 +47,7 @@ export class RedisTrigger implements INodeType {
 				displayName: 'Options',
 				name: 'options',
 				type: 'collection',
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				default: {},
 				options: [
 					{
diff --git a/packages/nodes-base/nodes/RenameKeys/RenameKeys.node.ts b/packages/nodes-base/nodes/RenameKeys/RenameKeys.node.ts
index 940bb04d171a8..004a1b8137aa2 100644
--- a/packages/nodes-base/nodes/RenameKeys/RenameKeys.node.ts
+++ b/packages/nodes-base/nodes/RenameKeys/RenameKeys.node.ts
@@ -76,7 +76,7 @@ export class RenameKeys implements INodeType {
 				name: 'additionalOptions',
 				type: 'collection',
 				default: {},
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				options: [
 					{
 						displayName: 'Regex',
diff --git a/packages/nodes-base/nodes/RespondToWebhook/RespondToWebhook.node.ts b/packages/nodes-base/nodes/RespondToWebhook/RespondToWebhook.node.ts
index 075ad8a950000..d9de41cc15ba8 100644
--- a/packages/nodes-base/nodes/RespondToWebhook/RespondToWebhook.node.ts
+++ b/packages/nodes-base/nodes/RespondToWebhook/RespondToWebhook.node.ts
@@ -221,7 +221,7 @@ export class RespondToWebhook implements INodeType {
 				displayName: 'Options',
 				name: 'options',
 				type: 'collection',
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				default: {},
 				options: [
 					{
diff --git a/packages/nodes-base/nodes/Rocketchat/Rocketchat.node.ts b/packages/nodes-base/nodes/Rocketchat/Rocketchat.node.ts
index 9ef0551efa633..143f6b14918fc 100644
--- a/packages/nodes-base/nodes/Rocketchat/Rocketchat.node.ts
+++ b/packages/nodes-base/nodes/Rocketchat/Rocketchat.node.ts
@@ -139,7 +139,7 @@ export class Rocketchat implements INodeType {
 				displayName: 'Options',
 				name: 'options',
 				type: 'collection',
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				default: {},
 				displayOptions: {
 					show: {
diff --git a/packages/nodes-base/nodes/RssFeedRead/RssFeedRead.node.ts b/packages/nodes-base/nodes/RssFeedRead/RssFeedRead.node.ts
index 18f4d72dd44f3..c2f688876f0fc 100644
--- a/packages/nodes-base/nodes/RssFeedRead/RssFeedRead.node.ts
+++ b/packages/nodes-base/nodes/RssFeedRead/RssFeedRead.node.ts
@@ -50,7 +50,7 @@ export class RssFeedRead implements INodeType {
 				displayName: 'Options',
 				name: 'options',
 				type: 'collection',
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				default: {},
 				options: [
 					{
diff --git a/packages/nodes-base/nodes/Salesmate/ActivityDescription.ts b/packages/nodes-base/nodes/Salesmate/ActivityDescription.ts
index 8ae1e0fdacb2e..ae1b89314a55a 100644
--- a/packages/nodes-base/nodes/Salesmate/ActivityDescription.ts
+++ b/packages/nodes-base/nodes/Salesmate/ActivityDescription.ts
@@ -349,7 +349,7 @@ export const activityFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/Salesmate/CompanyDescription.ts b/packages/nodes-base/nodes/Salesmate/CompanyDescription.ts
index 6dc4d77fd2df8..21eea15c70fac 100644
--- a/packages/nodes-base/nodes/Salesmate/CompanyDescription.ts
+++ b/packages/nodes-base/nodes/Salesmate/CompanyDescription.ts
@@ -454,7 +454,7 @@ export const companyFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/Salesmate/DealDescription.ts b/packages/nodes-base/nodes/Salesmate/DealDescription.ts
index d855b3c8a9e69..2a4f173accebd 100644
--- a/packages/nodes-base/nodes/Salesmate/DealDescription.ts
+++ b/packages/nodes-base/nodes/Salesmate/DealDescription.ts
@@ -608,7 +608,7 @@ export const dealFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/SeaTable/RowDescription.ts b/packages/nodes-base/nodes/SeaTable/RowDescription.ts
index 2d6e42a079640..08300d1070bce 100644
--- a/packages/nodes-base/nodes/SeaTable/RowDescription.ts
+++ b/packages/nodes-base/nodes/SeaTable/RowDescription.ts
@@ -277,7 +277,7 @@ export const rowFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/SecurityScorecard/descriptions/CompanyDescription.ts b/packages/nodes-base/nodes/SecurityScorecard/descriptions/CompanyDescription.ts
index da50c841328fd..fe76e38b1c6e1 100644
--- a/packages/nodes-base/nodes/SecurityScorecard/descriptions/CompanyDescription.ts
+++ b/packages/nodes-base/nodes/SecurityScorecard/descriptions/CompanyDescription.ts
@@ -172,7 +172,7 @@ export const companyFields: INodeProperties[] = [
 			},
 		},
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			{
diff --git a/packages/nodes-base/nodes/SecurityScorecard/descriptions/IndustryDescription.ts b/packages/nodes-base/nodes/SecurityScorecard/descriptions/IndustryDescription.ts
index 06345a46c4199..ce762c1f2c313 100644
--- a/packages/nodes-base/nodes/SecurityScorecard/descriptions/IndustryDescription.ts
+++ b/packages/nodes-base/nodes/SecurityScorecard/descriptions/IndustryDescription.ts
@@ -123,7 +123,7 @@ export const industryFields: INodeProperties[] = [
 			},
 		},
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			{
diff --git a/packages/nodes-base/nodes/ServiceNow/IncidentDescription.ts b/packages/nodes-base/nodes/ServiceNow/IncidentDescription.ts
index 97a52c09151d3..1c720442df9f9 100644
--- a/packages/nodes-base/nodes/ServiceNow/IncidentDescription.ts
+++ b/packages/nodes-base/nodes/ServiceNow/IncidentDescription.ts
@@ -300,7 +300,7 @@ export const incidentFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		displayOptions: {
 			show: {
 				resource: ['incident'],
@@ -382,7 +382,7 @@ export const incidentFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		displayOptions: {
 			show: {
 				resource: ['incident'],
diff --git a/packages/nodes-base/nodes/Set/v1/SetV1.node.ts b/packages/nodes-base/nodes/Set/v1/SetV1.node.ts
index b505b62451b58..141c3e3d48cbd 100644
--- a/packages/nodes-base/nodes/Set/v1/SetV1.node.ts
+++ b/packages/nodes-base/nodes/Set/v1/SetV1.node.ts
@@ -118,7 +118,7 @@ const versionDescription: INodeTypeDescription = {
 			displayName: 'Options',
 			name: 'options',
 			type: 'collection',
-			placeholder: 'Add Option',
+			placeholder: 'Add option',
 			default: {},
 			options: [
 				{
diff --git a/packages/nodes-base/nodes/Set/v2/SetV2.node.ts b/packages/nodes-base/nodes/Set/v2/SetV2.node.ts
index fa5e6c4e1685f..0f5c050cd02d3 100644
--- a/packages/nodes-base/nodes/Set/v2/SetV2.node.ts
+++ b/packages/nodes-base/nodes/Set/v2/SetV2.node.ts
@@ -200,7 +200,7 @@ const versionDescription: INodeTypeDescription = {
 			displayName: 'Options',
 			name: 'options',
 			type: 'collection',
-			placeholder: 'Add Option',
+			placeholder: 'Add option',
 			default: {},
 			options: [
 				{
diff --git a/packages/nodes-base/nodes/Shopify/ProductDescription.ts b/packages/nodes-base/nodes/Shopify/ProductDescription.ts
index 2c97c153e72b7..b0af1381c47d8 100644
--- a/packages/nodes-base/nodes/Shopify/ProductDescription.ts
+++ b/packages/nodes-base/nodes/Shopify/ProductDescription.ts
@@ -193,7 +193,7 @@ export const productFields: INodeProperties[] = [
 				displayName: 'Options',
 				name: 'productOptions',
 				type: 'fixedCollection',
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				typeOptions: {
 					multipleValues: true,
 				},
@@ -417,7 +417,7 @@ export const productFields: INodeProperties[] = [
 				displayName: 'Options',
 				name: 'productOptions',
 				type: 'fixedCollection',
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				typeOptions: {
 					multipleValues: true,
 				},
diff --git a/packages/nodes-base/nodes/Slack/V1/FileDescription.ts b/packages/nodes-base/nodes/Slack/V1/FileDescription.ts
index 57ffb0ac1a925..53d050109ae47 100644
--- a/packages/nodes-base/nodes/Slack/V1/FileDescription.ts
+++ b/packages/nodes-base/nodes/Slack/V1/FileDescription.ts
@@ -95,7 +95,7 @@ export const fileFields: INodeProperties[] = [
 		},
 		default: {},
 		description: 'Other options to set',
-		placeholder: 'Add options',
+		placeholder: 'Add option',
 		options: [
 			{
 				displayName: 'Channel Names or IDs',
diff --git a/packages/nodes-base/nodes/Slack/V1/MessageDescription.ts b/packages/nodes-base/nodes/Slack/V1/MessageDescription.ts
index 039d783aaabd6..89a55db151f68 100644
--- a/packages/nodes-base/nodes/Slack/V1/MessageDescription.ts
+++ b/packages/nodes-base/nodes/Slack/V1/MessageDescription.ts
@@ -154,7 +154,7 @@ export const messageFields: INodeProperties[] = [
 		},
 		default: {},
 		description: 'Other options to set',
-		placeholder: 'Add options',
+		placeholder: 'Add option',
 		options: [
 			{
 				displayName: 'Icon Emoji',
diff --git a/packages/nodes-base/nodes/Slack/V1/StarDescription.ts b/packages/nodes-base/nodes/Slack/V1/StarDescription.ts
index 958abf53ae16d..efbb068b4b069 100644
--- a/packages/nodes-base/nodes/Slack/V1/StarDescription.ts
+++ b/packages/nodes-base/nodes/Slack/V1/StarDescription.ts
@@ -51,7 +51,7 @@ export const starFields: INodeProperties[] = [
 		},
 		default: {},
 		description: 'Options to set',
-		placeholder: 'Add options',
+		placeholder: 'Add option',
 		options: [
 			{
 				displayName: 'Channel Name or ID',
@@ -103,7 +103,7 @@ export const starFields: INodeProperties[] = [
 		},
 		default: {},
 		description: 'Options to set',
-		placeholder: 'Add options',
+		placeholder: 'Add option',
 		options: [
 			{
 				displayName: 'Channel Name or ID',
diff --git a/packages/nodes-base/nodes/Slack/V2/FileDescription.ts b/packages/nodes-base/nodes/Slack/V2/FileDescription.ts
index 07d514ff493aa..0a8b55d3671e1 100644
--- a/packages/nodes-base/nodes/Slack/V2/FileDescription.ts
+++ b/packages/nodes-base/nodes/Slack/V2/FileDescription.ts
@@ -112,7 +112,7 @@ export const fileFields: INodeProperties[] = [
 		},
 		default: {},
 		description: 'Other options to set',
-		placeholder: 'Add options',
+		placeholder: 'Add option',
 		options: [
 			{
 				displayName: 'Channel Names or IDs',
diff --git a/packages/nodes-base/nodes/Slack/V2/MessageDescription.ts b/packages/nodes-base/nodes/Slack/V2/MessageDescription.ts
index e3708889fba55..68a088ee667f9 100644
--- a/packages/nodes-base/nodes/Slack/V2/MessageDescription.ts
+++ b/packages/nodes-base/nodes/Slack/V2/MessageDescription.ts
@@ -555,7 +555,7 @@ export const messageFields: INodeProperties[] = [
 		},
 		default: {},
 		description: 'Other options to set',
-		placeholder: 'Add options',
+		placeholder: 'Add option',
 		options: [
 			{
 				displayName: 'Include Link to Workflow',
@@ -944,7 +944,7 @@ export const messageFields: INodeProperties[] = [
 		displayName: 'Update Fields',
 		name: 'updateFields',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
@@ -1223,12 +1223,12 @@ export const messageFields: INodeProperties[] = [
 				description:
 					'Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
 				default: [],
-				placeholder: 'Select a channel...',
 				typeOptions: {
 					loadOptionsMethod: 'getChannelsName',
 				},
 			},
 		],
 		default: {},
+		placeholder: 'Add option',
 	},
 ];
diff --git a/packages/nodes-base/nodes/Slack/V2/StarDescription.ts b/packages/nodes-base/nodes/Slack/V2/StarDescription.ts
index d600202a9b575..d219daf5c4088 100644
--- a/packages/nodes-base/nodes/Slack/V2/StarDescription.ts
+++ b/packages/nodes-base/nodes/Slack/V2/StarDescription.ts
@@ -166,7 +166,7 @@ export const starFields: INodeProperties[] = [
 		},
 		default: {},
 		description: 'Options to set',
-		placeholder: 'Add options',
+		placeholder: 'Add option',
 		options: [
 			{
 				displayName: 'File Comment',
@@ -193,7 +193,7 @@ export const starFields: INodeProperties[] = [
 		},
 		default: {},
 		description: 'Options to set',
-		placeholder: 'Add options',
+		placeholder: 'Add option',
 		options: [
 			{
 				displayName: 'Channel Name or ID',
diff --git a/packages/nodes-base/nodes/SplitInBatches/v1/SplitInBatchesV1.node.ts b/packages/nodes-base/nodes/SplitInBatches/v1/SplitInBatchesV1.node.ts
index ba7d2c497abfd..7d44208e15709 100644
--- a/packages/nodes-base/nodes/SplitInBatches/v1/SplitInBatchesV1.node.ts
+++ b/packages/nodes-base/nodes/SplitInBatches/v1/SplitInBatchesV1.node.ts
@@ -44,7 +44,7 @@ export class SplitInBatchesV1 implements INodeType {
 				displayName: 'Options',
 				name: 'options',
 				type: 'collection',
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				default: {},
 				options: [
 					{
diff --git a/packages/nodes-base/nodes/SplitInBatches/v2/SplitInBatchesV2.node.ts b/packages/nodes-base/nodes/SplitInBatches/v2/SplitInBatchesV2.node.ts
index 27405a039c7eb..2ed649da540d5 100644
--- a/packages/nodes-base/nodes/SplitInBatches/v2/SplitInBatchesV2.node.ts
+++ b/packages/nodes-base/nodes/SplitInBatches/v2/SplitInBatchesV2.node.ts
@@ -46,7 +46,7 @@ export class SplitInBatchesV2 implements INodeType {
 				displayName: 'Options',
 				name: 'options',
 				type: 'collection',
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				default: {},
 				options: [
 					{
diff --git a/packages/nodes-base/nodes/SplitInBatches/v3/SplitInBatchesV3.node.ts b/packages/nodes-base/nodes/SplitInBatches/v3/SplitInBatchesV3.node.ts
index 0581c3d1bc906..b8c3e844ab328 100644
--- a/packages/nodes-base/nodes/SplitInBatches/v3/SplitInBatchesV3.node.ts
+++ b/packages/nodes-base/nodes/SplitInBatches/v3/SplitInBatchesV3.node.ts
@@ -47,7 +47,7 @@ export class SplitInBatchesV3 implements INodeType {
 				displayName: 'Options',
 				name: 'options',
 				type: 'collection',
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				default: {},
 				options: [
 					{
diff --git a/packages/nodes-base/nodes/Splunk/v1/descriptions/SearchConfigurationDescription.ts b/packages/nodes-base/nodes/Splunk/v1/descriptions/SearchConfigurationDescription.ts
index 0d280b7f86864..8908f0dedb699 100644
--- a/packages/nodes-base/nodes/Splunk/v1/descriptions/SearchConfigurationDescription.ts
+++ b/packages/nodes-base/nodes/Splunk/v1/descriptions/SearchConfigurationDescription.ts
@@ -109,7 +109,7 @@ export const searchConfigurationFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/Splunk/v1/descriptions/SearchJobDescription.ts b/packages/nodes-base/nodes/Splunk/v1/descriptions/SearchJobDescription.ts
index a3a54930c0b1a..345e3654c1fd5 100644
--- a/packages/nodes-base/nodes/Splunk/v1/descriptions/SearchJobDescription.ts
+++ b/packages/nodes-base/nodes/Splunk/v1/descriptions/SearchJobDescription.ts
@@ -329,7 +329,7 @@ export const searchJobFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/Splunk/v1/descriptions/SearchResultDescription.ts b/packages/nodes-base/nodes/Splunk/v1/descriptions/SearchResultDescription.ts
index 33bae71d5395b..4152feccfb660 100644
--- a/packages/nodes-base/nodes/Splunk/v1/descriptions/SearchResultDescription.ts
+++ b/packages/nodes-base/nodes/Splunk/v1/descriptions/SearchResultDescription.ts
@@ -121,7 +121,7 @@ export const searchResultFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/Splunk/v2/actions/report/getAll.operation.ts b/packages/nodes-base/nodes/Splunk/v2/actions/report/getAll.operation.ts
index 9f9ff44e27952..c667d9ad9386e 100644
--- a/packages/nodes-base/nodes/Splunk/v2/actions/report/getAll.operation.ts
+++ b/packages/nodes-base/nodes/Splunk/v2/actions/report/getAll.operation.ts
@@ -30,7 +30,7 @@ const properties: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			{
diff --git a/packages/nodes-base/nodes/Splunk/v2/actions/search/getResult.operation.ts b/packages/nodes-base/nodes/Splunk/v2/actions/search/getResult.operation.ts
index b80ac3457f317..246cce383e2fa 100644
--- a/packages/nodes-base/nodes/Splunk/v2/actions/search/getResult.operation.ts
+++ b/packages/nodes-base/nodes/Splunk/v2/actions/search/getResult.operation.ts
@@ -72,7 +72,7 @@ const properties: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			{
diff --git a/packages/nodes-base/nodes/SpreadsheetFile/description.ts b/packages/nodes-base/nodes/SpreadsheetFile/description.ts
index aac07f44d87aa..41c7ed21e8bc9 100644
--- a/packages/nodes-base/nodes/SpreadsheetFile/description.ts
+++ b/packages/nodes-base/nodes/SpreadsheetFile/description.ts
@@ -102,7 +102,7 @@ export const toFileOptions: INodeProperties = {
 	displayName: 'Options',
 	name: 'options',
 	type: 'collection',
-	placeholder: 'Add Option',
+	placeholder: 'Add option',
 	default: {},
 	displayOptions: {
 		show: {
@@ -156,7 +156,7 @@ export const fromFileOptions: INodeProperties = {
 	displayName: 'Options',
 	name: 'options',
 	type: 'collection',
-	placeholder: 'Add Option',
+	placeholder: 'Add option',
 	default: {},
 	displayOptions: {
 		show: {
diff --git a/packages/nodes-base/nodes/Ssh/Ssh.node.ts b/packages/nodes-base/nodes/Ssh/Ssh.node.ts
index eaf193df65c26..b96f805dfbbc3 100644
--- a/packages/nodes-base/nodes/Ssh/Ssh.node.ts
+++ b/packages/nodes-base/nodes/Ssh/Ssh.node.ts
@@ -256,7 +256,7 @@ export class Ssh implements INodeType {
 				displayName: 'Options',
 				name: 'options',
 				type: 'collection',
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				displayOptions: {
 					show: {
 						resource: ['file'],
diff --git a/packages/nodes-base/nodes/Storyblok/StoryManagementDescription.ts b/packages/nodes-base/nodes/Storyblok/StoryManagementDescription.ts
index 67b0f21334460..33f92521c607e 100644
--- a/packages/nodes-base/nodes/Storyblok/StoryManagementDescription.ts
+++ b/packages/nodes-base/nodes/Storyblok/StoryManagementDescription.ts
@@ -503,7 +503,7 @@ export const storyManagementFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		displayOptions: {
 			show: {
 				source: ['managementApi'],
diff --git a/packages/nodes-base/nodes/Strava/StravaTrigger.node.ts b/packages/nodes-base/nodes/Strava/StravaTrigger.node.ts
index c937825e5ff23..bbed04f481bfc 100644
--- a/packages/nodes-base/nodes/Strava/StravaTrigger.node.ts
+++ b/packages/nodes-base/nodes/Strava/StravaTrigger.node.ts
@@ -101,7 +101,7 @@ export class StravaTrigger implements INodeType {
 				displayName: 'Options',
 				name: 'options',
 				type: 'collection',
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				default: {},
 				options: [
 					{
diff --git a/packages/nodes-base/nodes/Switch/V3/SwitchV3.node.ts b/packages/nodes-base/nodes/Switch/V3/SwitchV3.node.ts
index 60e3e9a34c098..42939ddec654b 100644
--- a/packages/nodes-base/nodes/Switch/V3/SwitchV3.node.ts
+++ b/packages/nodes-base/nodes/Switch/V3/SwitchV3.node.ts
@@ -188,7 +188,7 @@ export class SwitchV3 implements INodeType {
 					displayName: 'Options',
 					name: 'options',
 					type: 'collection',
-					placeholder: 'Add Option',
+					placeholder: 'Add option',
 					default: {},
 					displayOptions: {
 						show: {
diff --git a/packages/nodes-base/nodes/Telegram/Telegram.node.ts b/packages/nodes-base/nodes/Telegram/Telegram.node.ts
index a51923e977a74..7e9f5671026e4 100644
--- a/packages/nodes-base/nodes/Telegram/Telegram.node.ts
+++ b/packages/nodes-base/nodes/Telegram/Telegram.node.ts
@@ -1420,7 +1420,7 @@ export class Telegram implements INodeType {
 				displayName: 'Reply Keyboard Options',
 				name: 'replyKeyboardOptions',
 				type: 'collection',
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				displayOptions: {
 					show: {
 						replyMarkup: ['replyKeyboard'],
diff --git a/packages/nodes-base/nodes/TheHive/descriptions/AlertDescription.ts b/packages/nodes-base/nodes/TheHive/descriptions/AlertDescription.ts
index 2522094645a76..b75734161017c 100644
--- a/packages/nodes-base/nodes/TheHive/descriptions/AlertDescription.ts
+++ b/packages/nodes-base/nodes/TheHive/descriptions/AlertDescription.ts
@@ -752,7 +752,7 @@ export const alertFields: INodeProperties[] = [
 			},
 		},
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			{
@@ -774,7 +774,7 @@ export const alertFields: INodeProperties[] = [
 			},
 		},
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			{
diff --git a/packages/nodes-base/nodes/TheHive/descriptions/CaseDescription.ts b/packages/nodes-base/nodes/TheHive/descriptions/CaseDescription.ts
index 938ea3d65c7a6..69391372c487f 100644
--- a/packages/nodes-base/nodes/TheHive/descriptions/CaseDescription.ts
+++ b/packages/nodes-base/nodes/TheHive/descriptions/CaseDescription.ts
@@ -255,7 +255,7 @@ export const caseFields: INodeProperties[] = [
 		displayName: 'Options',
 		type: 'collection',
 		name: 'options',
-		placeholder: 'Add options',
+		placeholder: 'Add option',
 		displayOptions: {
 			show: {
 				resource: ['case'],
@@ -608,7 +608,7 @@ export const caseFields: INodeProperties[] = [
 			},
 		},
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			{
diff --git a/packages/nodes-base/nodes/TheHive/descriptions/LogDescription.ts b/packages/nodes-base/nodes/TheHive/descriptions/LogDescription.ts
index 834201ed65e63..6092f3a862864 100644
--- a/packages/nodes-base/nodes/TheHive/descriptions/LogDescription.ts
+++ b/packages/nodes-base/nodes/TheHive/descriptions/LogDescription.ts
@@ -189,7 +189,7 @@ export const logFields: INodeProperties[] = [
 				operation: ['create'],
 			},
 		},
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		options: [
 			{
 				displayName: 'Attachment',
diff --git a/packages/nodes-base/nodes/TheHive/descriptions/ObservableDescription.ts b/packages/nodes-base/nodes/TheHive/descriptions/ObservableDescription.ts
index 747d6102222a0..0ddb36db145ce 100644
--- a/packages/nodes-base/nodes/TheHive/descriptions/ObservableDescription.ts
+++ b/packages/nodes-base/nodes/TheHive/descriptions/ObservableDescription.ts
@@ -298,7 +298,7 @@ export const observableFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
@@ -412,7 +412,7 @@ export const observableFields: INodeProperties[] = [
 			},
 		},
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			{
diff --git a/packages/nodes-base/nodes/TheHive/descriptions/TaskDescription.ts b/packages/nodes-base/nodes/TheHive/descriptions/TaskDescription.ts
index 56846a203bbb5..58bfaa3ede31d 100644
--- a/packages/nodes-base/nodes/TheHive/descriptions/TaskDescription.ts
+++ b/packages/nodes-base/nodes/TheHive/descriptions/TaskDescription.ts
@@ -169,7 +169,7 @@ export const taskFields: INodeProperties[] = [
 		displayName: 'Options',
 		type: 'collection',
 		name: 'options',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
@@ -303,7 +303,7 @@ export const taskFields: INodeProperties[] = [
 	{
 		displayName: 'Options',
 		name: 'options',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		type: 'collection',
 		default: {},
 		displayOptions: {
diff --git a/packages/nodes-base/nodes/TheHiveProject/TheHiveProjectTrigger.node.ts b/packages/nodes-base/nodes/TheHiveProject/TheHiveProjectTrigger.node.ts
index 074573e7de56c..6e8c8193971f0 100644
--- a/packages/nodes-base/nodes/TheHiveProject/TheHiveProjectTrigger.node.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/TheHiveProjectTrigger.node.ts
@@ -214,7 +214,7 @@ export class TheHiveProjectTrigger implements INodeType {
 				displayName: 'Options',
 				name: 'options',
 				type: 'collection',
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				default: {},
 				options: [
 					{
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/alert/get.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/alert/get.operation.ts
index 32cee8ca991c5..f634780025810 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/alert/get.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/alert/get.operation.ts
@@ -14,7 +14,7 @@ const properties: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			{
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/case/addAttachment.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/case/addAttachment.operation.ts
index 9f0bcdc6f5757..cae32b71b5e75 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/case/addAttachment.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/case/addAttachment.operation.ts
@@ -15,7 +15,7 @@ const properties: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			{
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/case/getAttachment.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/case/getAttachment.operation.ts
index cf538f4ab705f..e4dd177ec3abb 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/case/getAttachment.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/case/getAttachment.operation.ts
@@ -27,7 +27,7 @@ const properties: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			{
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/page/update.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/page/update.operation.ts
index 1b401e56454ae..8d41f9ba97be5 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/page/update.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/page/update.operation.ts
@@ -48,7 +48,7 @@ const properties: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		options: [
 			{
diff --git a/packages/nodes-base/nodes/TheHiveProject/descriptions/common.description.ts b/packages/nodes-base/nodes/TheHiveProject/descriptions/common.description.ts
index 612f4dd446523..b1ce20094af93 100644
--- a/packages/nodes-base/nodes/TheHiveProject/descriptions/common.description.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/descriptions/common.description.ts
@@ -204,7 +204,7 @@ export const searchOptions: INodeProperties = {
 	displayName: 'Options',
 	name: 'options',
 	type: 'collection',
-	placeholder: 'Add Option',
+	placeholder: 'Add option',
 	default: {},
 	options: [
 		{
diff --git a/packages/nodes-base/nodes/Todoist/v1/TodoistV1.node.ts b/packages/nodes-base/nodes/Todoist/v1/TodoistV1.node.ts
index 9bc5b9cabcf0e..6d4187225a587 100644
--- a/packages/nodes-base/nodes/Todoist/v1/TodoistV1.node.ts
+++ b/packages/nodes-base/nodes/Todoist/v1/TodoistV1.node.ts
@@ -279,7 +279,7 @@ const versionDescription: INodeTypeDescription = {
 			displayName: 'Additional Fields',
 			name: 'options',
 			type: 'collection',
-			placeholder: 'Add Option',
+			placeholder: 'Add option',
 			default: {},
 			displayOptions: {
 				show: {
@@ -390,7 +390,7 @@ const versionDescription: INodeTypeDescription = {
 			displayName: 'Filters',
 			name: 'filters',
 			type: 'collection',
-			placeholder: 'Add Option',
+			placeholder: 'Add option',
 			default: {},
 			displayOptions: {
 				show: {
diff --git a/packages/nodes-base/nodes/Todoist/v2/TodoistV2.node.ts b/packages/nodes-base/nodes/Todoist/v2/TodoistV2.node.ts
index 7836ca9e4b33e..d0c1841ceb89b 100644
--- a/packages/nodes-base/nodes/Todoist/v2/TodoistV2.node.ts
+++ b/packages/nodes-base/nodes/Todoist/v2/TodoistV2.node.ts
@@ -279,7 +279,7 @@ const versionDescription: INodeTypeDescription = {
 			displayName: 'Additional Fields',
 			name: 'options',
 			type: 'collection',
-			placeholder: 'Add Option',
+			placeholder: 'Add option',
 			default: {},
 			displayOptions: {
 				show: {
@@ -390,7 +390,7 @@ const versionDescription: INodeTypeDescription = {
 			displayName: 'Filters',
 			name: 'filters',
 			type: 'collection',
-			placeholder: 'Add Option',
+			placeholder: 'Add option',
 			default: {},
 			displayOptions: {
 				show: {
diff --git a/packages/nodes-base/nodes/Totp/Totp.node.ts b/packages/nodes-base/nodes/Totp/Totp.node.ts
index e61a1ec3dc496..92c02393ffb9e 100644
--- a/packages/nodes-base/nodes/Totp/Totp.node.ts
+++ b/packages/nodes-base/nodes/Totp/Totp.node.ts
@@ -54,7 +54,7 @@ export class Totp implements INodeType {
 					},
 				},
 				default: {},
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				options: [
 					{
 						displayName: 'Algorithm',
diff --git a/packages/nodes-base/nodes/Transform/Summarize/Summarize.node.ts b/packages/nodes-base/nodes/Transform/Summarize/Summarize.node.ts
index 526b6c8acfee2..2c4d73fcf08f2 100644
--- a/packages/nodes-base/nodes/Transform/Summarize/Summarize.node.ts
+++ b/packages/nodes-base/nodes/Transform/Summarize/Summarize.node.ts
@@ -237,7 +237,7 @@ export class Summarize implements INodeType {
 				displayName: 'Options',
 				name: 'options',
 				type: 'collection',
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				default: {},
 				options: [
 					{
diff --git a/packages/nodes-base/nodes/Twist/MessageConversationDescription.ts b/packages/nodes-base/nodes/Twist/MessageConversationDescription.ts
index 82f7fc4e486fa..dd111aa7a47b8 100644
--- a/packages/nodes-base/nodes/Twist/MessageConversationDescription.ts
+++ b/packages/nodes-base/nodes/Twist/MessageConversationDescription.ts
@@ -114,7 +114,7 @@ export const messageConversationFields: INodeProperties[] = [
 		},
 		default: {},
 		description: 'Other options to set',
-		placeholder: 'Add options',
+		placeholder: 'Add option',
 		options: [
 			{
 				displayName: 'Actions',
diff --git a/packages/nodes-base/nodes/UProc/UProc.node.ts b/packages/nodes-base/nodes/UProc/UProc.node.ts
index 3435b8b472682..a923d803cfa11 100644
--- a/packages/nodes-base/nodes/UProc/UProc.node.ts
+++ b/packages/nodes-base/nodes/UProc/UProc.node.ts
@@ -42,7 +42,7 @@ export class UProc implements INodeType {
 				displayName: 'Additional Options',
 				name: 'additionalOptions',
 				type: 'collection',
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				default: {},
 				displayOptions: {
 					show: {
diff --git a/packages/nodes-base/nodes/Venafi/Datacenter/CertificateDescription.ts b/packages/nodes-base/nodes/Venafi/Datacenter/CertificateDescription.ts
index 3973d830627a9..9f3ac8fe07f03 100644
--- a/packages/nodes-base/nodes/Venafi/Datacenter/CertificateDescription.ts
+++ b/packages/nodes-base/nodes/Venafi/Datacenter/CertificateDescription.ts
@@ -714,7 +714,7 @@ export const certificateFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/Wait/Wait.node.ts b/packages/nodes-base/nodes/Wait/Wait.node.ts
index 69907cdd62172..181a208f923c3 100644
--- a/packages/nodes-base/nodes/Wait/Wait.node.ts
+++ b/packages/nodes-base/nodes/Wait/Wait.node.ts
@@ -394,7 +394,7 @@ export class Wait extends Webhook {
 				displayName: 'Options',
 				name: 'options',
 				type: 'collection',
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				default: {},
 				displayOptions: {
 					show: {
@@ -410,7 +410,7 @@ export class Wait extends Webhook {
 				displayName: 'Options',
 				name: 'options',
 				type: 'collection',
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				default: {},
 				displayOptions: {
 					show: {
diff --git a/packages/nodes-base/nodes/Webhook/description.ts b/packages/nodes-base/nodes/Webhook/description.ts
index 5cf2c4540b1d3..c0cd992c8e775 100644
--- a/packages/nodes-base/nodes/Webhook/description.ts
+++ b/packages/nodes-base/nodes/Webhook/description.ts
@@ -205,7 +205,7 @@ export const optionsProperty: INodeProperties = {
 	displayName: 'Options',
 	name: 'options',
 	type: 'collection',
-	placeholder: 'Add Option',
+	placeholder: 'Add option',
 	default: {},
 	options: [
 		{
diff --git a/packages/nodes-base/nodes/WooCommerce/OrderDescription.ts b/packages/nodes-base/nodes/WooCommerce/OrderDescription.ts
index d8318b467ea37..ea05b27671593 100644
--- a/packages/nodes-base/nodes/WooCommerce/OrderDescription.ts
+++ b/packages/nodes-base/nodes/WooCommerce/OrderDescription.ts
@@ -1425,7 +1425,7 @@ export const orderFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/WooCommerce/ProductDescription.ts b/packages/nodes-base/nodes/WooCommerce/ProductDescription.ts
index 575ad584fde3d..68f82be91e937 100644
--- a/packages/nodes-base/nodes/WooCommerce/ProductDescription.ts
+++ b/packages/nodes-base/nodes/WooCommerce/ProductDescription.ts
@@ -1096,7 +1096,7 @@ export const productFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/Wordpress/PageDescription.ts b/packages/nodes-base/nodes/Wordpress/PageDescription.ts
index 32f3afec3156e..458c70ef83a5a 100644
--- a/packages/nodes-base/nodes/Wordpress/PageDescription.ts
+++ b/packages/nodes-base/nodes/Wordpress/PageDescription.ts
@@ -534,7 +534,7 @@ export const pageFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
@@ -612,7 +612,7 @@ export const pageFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
@@ -813,7 +813,7 @@ export const pageFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/Wordpress/PostDescription.ts b/packages/nodes-base/nodes/Wordpress/PostDescription.ts
index e2b0cd957c43a..1d5fbc87c7d04 100644
--- a/packages/nodes-base/nodes/Wordpress/PostDescription.ts
+++ b/packages/nodes-base/nodes/Wordpress/PostDescription.ts
@@ -614,7 +614,7 @@ export const postFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
@@ -692,7 +692,7 @@ export const postFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
@@ -925,7 +925,7 @@ export const postFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/Wordpress/UserDescription.ts b/packages/nodes-base/nodes/Wordpress/UserDescription.ts
index aae020c6d8905..52a68d137fdb9 100644
--- a/packages/nodes-base/nodes/Wordpress/UserDescription.ts
+++ b/packages/nodes-base/nodes/Wordpress/UserDescription.ts
@@ -299,7 +299,7 @@ export const userFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
@@ -369,7 +369,7 @@ export const userFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/WriteBinaryFile/WriteBinaryFile.node.ts b/packages/nodes-base/nodes/WriteBinaryFile/WriteBinaryFile.node.ts
index fa052daee210c..cb99c492aa330 100644
--- a/packages/nodes-base/nodes/WriteBinaryFile/WriteBinaryFile.node.ts
+++ b/packages/nodes-base/nodes/WriteBinaryFile/WriteBinaryFile.node.ts
@@ -46,7 +46,7 @@ export class WriteBinaryFile implements INodeType {
 				displayName: 'Options',
 				name: 'options',
 				type: 'collection',
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				default: {},
 				options: [
 					{
diff --git a/packages/nodes-base/nodes/Xero/ContactDescription.ts b/packages/nodes-base/nodes/Xero/ContactDescription.ts
index 36831a74f196d..a225abc59a27a 100644
--- a/packages/nodes-base/nodes/Xero/ContactDescription.ts
+++ b/packages/nodes-base/nodes/Xero/ContactDescription.ts
@@ -435,7 +435,7 @@ export const contactFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/Xero/InvoiceDescription.ts b/packages/nodes-base/nodes/Xero/InvoiceDescription.ts
index 394ab5fb03ef4..a8c11f1f82a72 100644
--- a/packages/nodes-base/nodes/Xero/InvoiceDescription.ts
+++ b/packages/nodes-base/nodes/Xero/InvoiceDescription.ts
@@ -863,7 +863,7 @@ export const invoiceFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/Xml/Xml.node.ts b/packages/nodes-base/nodes/Xml/Xml.node.ts
index e3a322c654bb4..d603b7e37e251 100644
--- a/packages/nodes-base/nodes/Xml/Xml.node.ts
+++ b/packages/nodes-base/nodes/Xml/Xml.node.ts
@@ -76,7 +76,7 @@ export class Xml implements INodeType {
 				displayName: 'Options',
 				name: 'options',
 				type: 'collection',
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				displayOptions: {
 					show: {
 						mode: ['jsonToxml'],
@@ -150,7 +150,7 @@ export class Xml implements INodeType {
 				displayName: 'Options',
 				name: 'options',
 				type: 'collection',
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 				displayOptions: {
 					show: {
 						mode: ['xmlToJson'],
diff --git a/packages/nodes-base/nodes/Zendesk/TicketDescription.ts b/packages/nodes-base/nodes/Zendesk/TicketDescription.ts
index b0835995aeb0d..7069234ec0dcc 100644
--- a/packages/nodes-base/nodes/Zendesk/TicketDescription.ts
+++ b/packages/nodes-base/nodes/Zendesk/TicketDescription.ts
@@ -568,7 +568,7 @@ export const ticketFields: INodeProperties[] = [
 		displayName: 'Options',
 		name: 'options',
 		type: 'collection',
-		placeholder: 'Add Option',
+		placeholder: 'Add option',
 		default: {},
 		displayOptions: {
 			show: {
diff --git a/packages/nodes-base/nodes/Zendesk/ZendeskTrigger.node.ts b/packages/nodes-base/nodes/Zendesk/ZendeskTrigger.node.ts
index 610eca1920dd3..92b0d88fd2149 100644
--- a/packages/nodes-base/nodes/Zendesk/ZendeskTrigger.node.ts
+++ b/packages/nodes-base/nodes/Zendesk/ZendeskTrigger.node.ts
@@ -109,7 +109,7 @@ export class ZendeskTrigger implements INodeType {
 						},
 					},
 				],
-				placeholder: 'Add Option',
+				placeholder: 'Add option',
 			},
 			{
 				displayName: 'Conditions',
diff --git a/packages/nodes-base/nodes/Zoho/descriptions/SharedFields.ts b/packages/nodes-base/nodes/Zoho/descriptions/SharedFields.ts
index 8e8d632ae9ffa..a1c70f3f210b0 100644
--- a/packages/nodes-base/nodes/Zoho/descriptions/SharedFields.ts
+++ b/packages/nodes-base/nodes/Zoho/descriptions/SharedFields.ts
@@ -353,7 +353,7 @@ export const makeGetAllFields = (resource: CamelCaseResource): INodeProperties[]
 			displayName: 'Options',
 			name: 'options',
 			type: 'collection',
-			placeholder: 'Add Option',
+			placeholder: 'Add option',
 			default: {},
 			displayOptions: {
 				show: {

From 7a30d845e923cf5b40daa498140e5ea66d42c872 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Mon, 29 Jul 2024 14:32:20 +0200
Subject: [PATCH 016/168] refactor(core): Port path, host, port, listen_address
 and protocol config (no-changelog) (#10223)

---
 packages/@n8n/config/src/index.ts             | 22 +++++++++++-
 packages/@n8n/config/test/config.test.ts      |  5 +++
 packages/cli/src/AbstractServer.ts            | 12 +++----
 packages/cli/src/PublicApi/index.ts           |  4 +--
 packages/cli/src/commands/start.ts            |  4 +--
 packages/cli/src/config/schema.ts             | 34 -------------------
 packages/cli/src/services/url.service.ts      |  8 ++---
 .../test/unit/services/user.service.test.ts   | 12 +++++--
 8 files changed, 48 insertions(+), 53 deletions(-)

diff --git a/packages/@n8n/config/src/index.ts b/packages/@n8n/config/src/index.ts
index b32c7c7dc3ef9..fee6718c6acdb 100644
--- a/packages/@n8n/config/src/index.ts
+++ b/packages/@n8n/config/src/index.ts
@@ -1,4 +1,4 @@
-import { Config, Nested } from './decorators';
+import { Config, Env, Nested } from './decorators';
 import { CredentialsConfig } from './configs/credentials';
 import { DatabaseConfig } from './configs/database';
 import { EmailConfig } from './configs/email';
@@ -51,4 +51,24 @@ export class GlobalConfig {
 
 	@Nested
 	readonly workflows: WorkflowsConfig;
+
+	/** Path n8n is deployed to */
+	@Env('N8N_PATH')
+	readonly path: string = '/';
+
+	/** Host name n8n can be reached */
+	@Env('N8N_HOST')
+	readonly host: string = 'localhost';
+
+	/** HTTP port n8n can be reached */
+	@Env('N8N_PORT')
+	readonly port: number = 5678;
+
+	/** IP address n8n should listen on */
+	@Env('N8N_LISTEN_ADDRESS')
+	readonly listen_address: string = '0.0.0.0';
+
+	/** HTTP Protocol via which n8n can be reached */
+	@Env('N8N_PROTOCOL')
+	readonly protocol: 'http' | 'https' = 'http';
 }
diff --git a/packages/@n8n/config/test/config.test.ts b/packages/@n8n/config/test/config.test.ts
index 90c9ee3240558..97afb0cda405e 100644
--- a/packages/@n8n/config/test/config.test.ts
+++ b/packages/@n8n/config/test/config.test.ts
@@ -18,6 +18,11 @@ describe('GlobalConfig', () => {
 	});
 
 	const defaultConfig: GlobalConfig = {
+		path: '/',
+		host: 'localhost',
+		port: 5678,
+		listen_address: '0.0.0.0',
+		protocol: 'http',
 		database: {
 			logging: {
 				enabled: false,
diff --git a/packages/cli/src/AbstractServer.ts b/packages/cli/src/AbstractServer.ts
index b458981c150a8..bef45bb1433d2 100644
--- a/packages/cli/src/AbstractServer.ts
+++ b/packages/cli/src/AbstractServer.ts
@@ -22,6 +22,7 @@ import { Logger } from '@/Logger';
 import { ServiceUnavailableError } from './errors/response-errors/service-unavailable.error';
 import { OnShutdown } from '@/decorators/OnShutdown';
 import { ActiveWebhooks } from '@/ActiveWebhooks';
+import { GlobalConfig } from '@n8n/config';
 
 @Service()
 export abstract class AbstractServer {
@@ -33,7 +34,7 @@ export abstract class AbstractServer {
 
 	protected externalHooks: ExternalHooks;
 
-	protected protocol = config.getEnv('protocol');
+	protected protocol = Container.get(GlobalConfig).protocol;
 
 	protected sslKey: string;
 
@@ -149,25 +150,24 @@ export abstract class AbstractServer {
 			this.server = http.createServer(app);
 		}
 
-		const PORT = config.getEnv('port');
-		const ADDRESS = config.getEnv('listen_address');
+		const { port, listen_address: address } = Container.get(GlobalConfig);
 
 		this.server.on('error', (error: Error & { code: string }) => {
 			if (error.code === 'EADDRINUSE') {
 				this.logger.info(
-					`n8n's port ${PORT} is already in use. Do you have another instance of n8n running already?`,
+					`n8n's port ${port} is already in use. Do you have another instance of n8n running already?`,
 				);
 				process.exit(1);
 			}
 		});
 
-		await new Promise<void>((resolve) => this.server.listen(PORT, ADDRESS, () => resolve()));
+		await new Promise<void>((resolve) => this.server.listen(port, address, () => resolve()));
 
 		this.externalHooks = Container.get(ExternalHooks);
 
 		await this.setupHealthCheck();
 
-		this.logger.info(`n8n ready on ${ADDRESS}, port ${PORT}`);
+		this.logger.info(`n8n ready on ${address}, port ${port}`);
 	}
 
 	async start(): Promise<void> {
diff --git a/packages/cli/src/PublicApi/index.ts b/packages/cli/src/PublicApi/index.ts
index 3ebb67f210479..d484a34e36941 100644
--- a/packages/cli/src/PublicApi/index.ts
+++ b/packages/cli/src/PublicApi/index.ts
@@ -10,8 +10,6 @@ import type { HttpError } from 'express-openapi-validator/dist/framework/types';
 import type { OpenAPIV3 } from 'openapi-types';
 import type { JsonObject } from 'swagger-ui-express';
 
-import config from '@/config';
-
 import { License } from '@/License';
 import { UserRepository } from '@db/repositories/user.repository';
 import { UrlService } from '@/services/url.service';
@@ -25,7 +23,7 @@ async function createApiRouter(
 	handlersDirectory: string,
 	publicApiEndpoint: string,
 ): Promise<Router> {
-	const n8nPath = config.getEnv('path');
+	const n8nPath = Container.get(GlobalConfig).path;
 	const swaggerDocument = YAML.load(openApiSpecPath) as JsonObject;
 	// add the server depending on the config so the user can interact with the API
 	// from the Swagger UI
diff --git a/packages/cli/src/commands/start.ts b/packages/cli/src/commands/start.ts
index b1ebd50393bc8..2e88c62e06194 100644
--- a/packages/cli/src/commands/start.ts
+++ b/packages/cli/src/commands/start.ts
@@ -124,7 +124,7 @@ export class Start extends BaseCommand {
 
 	private async generateStaticAssets() {
 		// Read the index file and replace the path placeholder
-		const n8nPath = config.getEnv('path');
+		const n8nPath = Container.get(GlobalConfig).path;
 		const restEndpoint = config.getEnv('endpoints.rest');
 		const hooksUrls = config.getEnv('externalFrontendHooksUrls');
 
@@ -283,7 +283,7 @@ export class Start extends BaseCommand {
 			}
 
 			const { default: localtunnel } = await import('@n8n/localtunnel');
-			const port = config.getEnv('port');
+			const { port } = Container.get(GlobalConfig);
 
 			const webhookTunnel = await localtunnel(port, {
 				host: 'https://hooks.n8n.cloud',
diff --git a/packages/cli/src/config/schema.ts b/packages/cli/src/config/schema.ts
index 061ab08b36b2f..1e6d00aed7699 100644
--- a/packages/cli/src/config/schema.ts
+++ b/packages/cli/src/config/schema.ts
@@ -307,40 +307,6 @@ export const schema = {
 		},
 	},
 
-	// How n8n can be reached (Editor & REST-API)
-	path: {
-		format: String,
-		default: '/',
-		arg: 'path',
-		env: 'N8N_PATH',
-		doc: 'Path n8n is deployed to',
-	},
-	host: {
-		format: String,
-		default: 'localhost',
-		arg: 'host',
-		env: 'N8N_HOST',
-		doc: 'Host name n8n can be reached',
-	},
-	port: {
-		format: Number,
-		default: 5678,
-		arg: 'port',
-		env: 'N8N_PORT',
-		doc: 'HTTP port n8n can be reached',
-	},
-	listen_address: {
-		format: String,
-		default: '0.0.0.0',
-		env: 'N8N_LISTEN_ADDRESS',
-		doc: 'IP address n8n should listen on',
-	},
-	protocol: {
-		format: ['http', 'https'] as const,
-		default: 'http',
-		env: 'N8N_PROTOCOL',
-		doc: 'HTTP Protocol via which n8n can be reached',
-	},
 	secure_cookie: {
 		doc: 'This sets the `Secure` flag on n8n auth cookie',
 		format: Boolean,
diff --git a/packages/cli/src/services/url.service.ts b/packages/cli/src/services/url.service.ts
index b1ef737c2f43e..8c0e1948fc971 100644
--- a/packages/cli/src/services/url.service.ts
+++ b/packages/cli/src/services/url.service.ts
@@ -1,12 +1,13 @@
 import { Service } from 'typedi';
 import config from '@/config';
+import { GlobalConfig } from '@n8n/config';
 
 @Service()
 export class UrlService {
 	/** Returns the base URL n8n is reachable from */
 	readonly baseUrl: string;
 
-	constructor() {
+	constructor(private readonly globalConfig: GlobalConfig) {
 		this.baseUrl = this.generateBaseUrl();
 	}
 
@@ -27,10 +28,7 @@ export class UrlService {
 	}
 
 	private generateBaseUrl(): string {
-		const protocol = config.getEnv('protocol');
-		const host = config.getEnv('host');
-		const port = config.getEnv('port');
-		const path = config.getEnv('path');
+		const { path, port, host, protocol } = this.globalConfig;
 
 		if ((protocol === 'http' && port === 80) || (protocol === 'https' && port === 443)) {
 			return `${protocol}://${host}${path}`;
diff --git a/packages/cli/test/unit/services/user.service.test.ts b/packages/cli/test/unit/services/user.service.test.ts
index 9f84b1d202ddd..89929f57b0b89 100644
--- a/packages/cli/test/unit/services/user.service.test.ts
+++ b/packages/cli/test/unit/services/user.service.test.ts
@@ -6,11 +6,19 @@ import { UserService } from '@/services/user.service';
 import { UrlService } from '@/services/url.service';
 import { mockInstance } from '../../shared/mocking';
 import { UserRepository } from '@/databases/repositories/user.repository';
+import { GlobalConfig } from '@n8n/config';
 
 describe('UserService', () => {
-	const urlService = new UrlService();
+	const globalConfig = mockInstance(GlobalConfig, {
+		host: 'localhost',
+		path: '/',
+		port: 5678,
+		listen_address: '0.0.0.0',
+		protocol: 'http',
+	});
+	const urlService = new UrlService(globalConfig);
 	const userRepository = mockInstance(UserRepository);
-	const userService = new UserService(mock(), userRepository, mock(), urlService);
+	const userService = new UserService(mock(), userRepository, mock(), urlService, mock());
 
 	const commonMockUser = Object.assign(new User(), {
 		id: uuid(),

From 711b667ebefe55740e5eb39f1f0f24ceee10e7b0 Mon Sep 17 00:00:00 2001
From: Michael Kret <88898367+michael-radency@users.noreply.github.com>
Date: Mon, 29 Jul 2024 15:58:03 +0300
Subject: [PATCH 017/168] feat(n8n Form Trigger Node): Improvements (#10092)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: कारतोफ्फेलस्क्रिप्ट™ <netroy@users.noreply.github.com>
Co-authored-by: Shireen Missi <94372015+ShireenMissi@users.noreply.github.com>
---
 .../cli/templates/form-trigger.handlebars     | 231 ++++++++++-
 .../src/composables/useRunWorkflow.ts         |   2 +-
 packages/editor-ui/src/constants.ts           |   1 +
 .../nodes-base/nodes/Form/FormTrigger.node.ts |   3 +-
 .../nodes/Form/common.descriptions.ts         |  64 +++
 packages/nodes-base/nodes/Form/interfaces.ts  |  14 +-
 .../nodes-base/nodes/Form/test/utils.test.ts  | 370 ++++++++++++++++++
 packages/nodes-base/nodes/Form/utils.ts       | 191 +++++++--
 .../nodes/Form/v2/FormTriggerV2.node.ts       |  86 +++-
 .../nodes-base/nodes/Webhook/Webhook.node.ts  |  93 +----
 packages/nodes-base/nodes/Webhook/utils.ts    | 104 ++++-
 packages/workflow/src/Interfaces.ts           |   1 +
 12 files changed, 1014 insertions(+), 146 deletions(-)
 create mode 100644 packages/nodes-base/nodes/Form/test/utils.test.ts

diff --git a/packages/cli/templates/form-trigger.handlebars b/packages/cli/templates/form-trigger.handlebars
index a54168d2af0c2..a4d0e6be9750c 100644
--- a/packages/cli/templates/form-trigger.handlebars
+++ b/packages/cli/templates/form-trigger.handlebars
@@ -59,6 +59,9 @@
 				margin-bottom: 16px;
 			}
 
+			.n8n-link {
+				padding-bottom: 24px;
+			}
 			.n8n-link a {
 				color: #7e8186;
 				font-weight: 600;
@@ -103,11 +106,12 @@
 				border-radius: 6px;
 				width: 100%;
 				font-size: 14px;
-				color: #909399;
+				color: #71747A;
 				font-weight: 400;
 				padding: 12px;
 			}
 
+			form textarea:focus,
 			form input:focus {
 				outline: none;
 				border-color: rgb(90, 76, 194);
@@ -128,7 +132,7 @@
 				border-radius: 6px;
 				width: 100%;
 				font-size: 14px;
-				color: #909399;
+				color: #71747A;
 				font-weight: 400;
 				background-color: white;
 				padding: 12px;
@@ -141,6 +145,10 @@
 					sans-serif;
 			}
 
+			::placeholder {
+				opacity: 0.5;
+			}
+
 			#submit-btn {
 				width: 100%;
 				height: 48px;
@@ -225,9 +233,77 @@
 				height: 18px;
 				cursor: pointer;
 			}
-
+			/* required field ----------------------------- */
 			.form-required {
 			}
+			label.form-required::after {
+					content: ' *';
+					color: #ff6d5a;
+			}
+
+			hr {
+				border: 0;
+				height: 1px;
+				border-top: 1px solid #dbdfe7;
+				margin-top: 24px;
+				margin-bottom: 24px;
+				display: none;
+			}
+
+			.file-input-wrapper {
+				position: relative;
+				display: inline-block;
+				width: 100%;
+			}
+			input[type="file"] {
+			}
+			.clear-button {
+				position: absolute;
+				right: 5px;
+				top: 50%;
+				transform: translateY(-65%);
+				background-color: #7e8186;
+				border: none;
+				border-radius: 50%;
+				font-size: 14px;
+				font-weight: 600;
+				font-family:
+					Open Sans,
+					sans-serif;
+				color: white;
+				width: 20px;
+				height: 20px;
+				text-align: center;
+				line-height: 20px;
+				cursor: pointer;
+				display: none;
+			}
+			input[type="file"]:not(:empty) + .clear-button {
+					display: inline-block;
+			}
+
+			@media only screen and (max-width: 400px) {
+				hr {
+					display: block;
+				}
+				.container {
+					width: 95%;
+					min-height: 100vh;
+					padding: 24px;
+					background-color: white;
+					border: 1px solid #dbdfe7;
+					border-radius: 8px;
+					box-shadow: 0px 4px 16px 0px #634dff0f;
+				}
+				.card {
+					padding: 0px;
+					background-color: white;
+					border: 0px solid #dbdfe7;
+					border-radius: 0px;
+					box-shadow: 0px 0px 10px 0px #634dff0f;
+					margin-bottom: 0px;
+				}
+			}
 		</style>
 	</head>
 
@@ -238,20 +314,23 @@
 					<div class='test-notice'>
 						<p>This is test version of your form. Use it only for testing your Form Trigger.</p>
 					</div>
+					<hr>
 				{{/if}}
 
+
+
 				{{#if validForm}}
 					<form class='card' action='#' method='POST' name='n8n-form' id='n8n-form' novalidate>
 						<div class='form-header'>
 							<h1>{{formTitle}}</h1>
-							<p>{{formDescription}} </p>
+							<p style="white-space: pre-line">{{formDescription}} </p>
 						</div>
 
 						<div class='inputs-wrapper'>
 							{{#each formFields}}
 								{{#if isMultiSelect}}
 									<div>
-										<label class='form-label'>{{label}}</label>
+										<label class='form-label {{inputRequired}}'>{{label}}</label>
 										<div class='multiselect {{inputRequired}}' id='{{id}}'>
 											{{#each multiSelectOptions}}
 												<div class='multiselect-option'>
@@ -268,7 +347,7 @@
 
 								{{#if isSelect}}
 									<div class='form-group'>
-										<label class='form-label' for='{{id}}'>{{label}}</label>
+										<label class='form-label {{inputRequired}}' for='{{id}}'>{{label}}</label>
 										<div class='select-input'>
 											<select id='{{id}}' name='{{id}}' class='{{inputRequired}}'>
 												<option value='' disabled selected>Select an option ...</option>
@@ -285,12 +364,32 @@
 
 								{{#if isTextarea}}
 									<div class='form-group'>
-										<label class='form-label' for='{{id}}'>{{label}}</label>
+										<label class='form-label {{inputRequired}}' for='{{id}}'>{{label}}</label>
 										<textarea
 											class='form-input {{inputRequired}}'
 											id='{{id}}'
 											name='{{id}}'
-										></textarea>
+											placeholder="{{placeholder}}"
+										>{{defaultValue}}</textarea>
+										<p class='{{errorId}} error-hidden'>
+											This field is required
+										</p>
+									</div>
+								{{/if}}
+
+								{{#if isFileInput}}
+									<div class='form-group file-input-wrapper'>
+										<label class='form-label {{inputRequired}}' for='{{id}}'>{{label}}</label>
+										<input
+											class='form-input {{inputRequired}}'
+											type='file'
+											id='{{id}}'
+											name='{{id}}'
+											accept='{{acceptFileTypes}}'
+											{{multipleFiles}}
+											placeholder="{{placeholder}}"
+										/>
+										<button class="clear-button">&times;</button>
 										<p class='{{errorId}} error-hidden'>
 											This field is required
 										</p>
@@ -299,12 +398,14 @@
 
 								{{#if isInput}}
 									<div class='form-group'>
-										<label class='form-label' for='{{id}}'>{{label}}</label>
+										<label class='form-label {{inputRequired}}' for='{{id}}'>{{label}}</label>
 										<input
 											class='form-input {{inputRequired}}'
 											type='{{type}}'
 											id='{{id}}'
 											name='{{id}}'
+											value="{{defaultValue}}"
+											placeholder="{{placeholder}}"
 										/>
 										<p class='{{errorId}} error-hidden'>
 											This field is required
@@ -355,9 +456,13 @@
 				</div>
 
 				{{#if appendAttribution}}
+					<hr>
 					<div class='n8n-link'>
 						<a href={{n8nWebsiteLink}} target='_blank'>
 							Form automated with
+							{{#if customAttribution}}
+								{{{customAttribution}}}
+							{{else}}
 							<svg
 								width='73'
 								height='20'
@@ -384,10 +489,13 @@
 									fill='#101330'
 								/>
 							</svg>
+							{{/if}}
 						</a>
 					</div>
 				{{/if}}
 
+
+
 				{{#if redirectUrl}}
 					<a id='redirectUrl' href='{{redirectUrl}}' style='display: none;'></a>
 				{{/if}}
@@ -396,10 +504,13 @@
 		</div>
 		<script>
 			function validateInput(input, errorElement) {
-				if (input.type === 'number' && input.value !== '') {
-					const value = input.value.trim();
+				const value = input.value.trim();
+				const type = input.type;
 
-					if (value === '' || isNaN(value)) {
+				if (type === 'email' && value !== '') {
+					return validateEmailInput(value, errorElement);
+				} else if (type === 'number' && value !== '') {
+					if (isNaN(value)) {
 						errorElement.textContent = 'Enter only numbers in this field';
 						errorElement.classList.add('error-show');
 						return false;
@@ -407,10 +518,26 @@
 						errorElement.classList.remove('error-show');
 						return true;
 					}
-				} else if (input.value === '') {
+				} else if (value === '') {
+					errorElement.textContent = 'This field is required';
+					errorElement.classList.add('error-show');
+					return false;
+				} else {
+					errorElement.classList.remove('error-show');
+					return true;
+				}
+			}
+
+			function validateEmailInput(value, errorElement) {
+				const regex = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/;
+				const isValidEmail = regex.test(value);
+
+				if (!isValidEmail) {
+					errorElement.textContent = 'Enter a valid email address in this field';
 					errorElement.classList.add('error-show');
 					return false;
 				} else {
+					errorElement.textContent = 'This field is required';
 					errorElement.classList.remove('error-show');
 					return true;
 				}
@@ -444,7 +571,44 @@
 
 			const form = document.querySelector('#n8n-form');
 
-			const requiredInputs = document.querySelectorAll('.form-required');
+			document.querySelectorAll("input[type=number]").forEach(function (element) {
+        element.addEventListener("wheel", function(event) {
+            if (document.activeElement === event.target) {
+                event.preventDefault();
+            }
+        });
+    	});
+
+			document.querySelectorAll('input[type="file"]').forEach(fileInput => {
+				const clearButton = fileInput.nextElementSibling;
+				let previousFiles = [];
+
+				fileInput.addEventListener('change', () => {
+					const files = fileInput.files;
+
+					if (files.length > 0) {
+							previousFiles = Array.from(files);
+							clearButton.style.display = 'inline-block';
+					} else {
+						if (previousFiles.length > 0) {
+							const dataTransfer = new DataTransfer();
+							previousFiles.forEach(file => dataTransfer.items.add(file));
+							fileInput.files = dataTransfer.files;
+							clearButton.style.display = 'inline-block';
+						}
+					}
+				});
+
+				clearButton.addEventListener('click', (event) => {
+					event.preventDefault();
+					fileInput.value = '';
+					previousFiles = [];
+					clearButton.style.display = 'none';
+				});
+			});
+
+			const requiredInputs = document.querySelectorAll('.form-required:not(label)');
+			const emailInputs = document.querySelectorAll("input[type=email]");
 
 			requiredInputs.forEach((input) => {
 				const errorSelector = `.error-${input.id}`;
@@ -464,10 +628,34 @@
 				}
 			});
 
+			emailInputs.forEach(function (input) {
+				const errorSelector = `.error-${input.id}`;
+				const error = document.querySelector(errorSelector);
+
+        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 = [];
 				e.preventDefault();
 
+				emailInputs.forEach(function (input) {
+					const value = input.value.trim();
+					if(value === '') {
+						return;
+					}
+					const errorSelector = `.error-${input.id}`;
+					const error = document.querySelector(errorSelector);
+					valid.push(validateEmailInput(value, error));
+				});
+
 				requiredInputs.forEach((input) => {
 					const errorSelector = `.error-${input.id}`;
 					const error = document.querySelector(errorSelector);
@@ -480,7 +668,20 @@
 				});
 
 				if (valid.every((v) => v)) {
-					var formData = new FormData(form);
+					var formData = new FormData();
+
+					for (const filed of form.elements) {
+						if(filed.type !== 'file') {
+							formData.append(filed.name, filed.value);
+						} else {
+							for (const file of filed.files) {
+								if(file.size === 0) {
+									continue;
+								}
+								formData.append(filed.name, file);
+							}
+						}
+					}
 
 					document.querySelectorAll('.multiselect').forEach((multiselect) => {
 						const selectedValues = getSelectedValues(multiselect);
diff --git a/packages/editor-ui/src/composables/useRunWorkflow.ts b/packages/editor-ui/src/composables/useRunWorkflow.ts
index 79c91b08d464a..9d59a49531abb 100644
--- a/packages/editor-ui/src/composables/useRunWorkflow.ts
+++ b/packages/editor-ui/src/composables/useRunWorkflow.ts
@@ -310,7 +310,7 @@ export function useRunWorkflow(useRunWorkflowOpts: { router: ReturnType<typeof u
 						testUrl = `${rootStore.formWaitingUrl}/${runWorkflowApiResponse.executionId}${suffix}`;
 					}
 
-					if (testUrl) openPopUpWindow(testUrl);
+					if (testUrl && options.source !== 'RunData.ManualChatMessage') openPopUpWindow(testUrl);
 				}
 			}
 
diff --git a/packages/editor-ui/src/constants.ts b/packages/editor-ui/src/constants.ts
index ea3e5a9662fce..8b30c972c8af0 100644
--- a/packages/editor-ui/src/constants.ts
+++ b/packages/editor-ui/src/constants.ts
@@ -648,6 +648,7 @@ export const KEEP_AUTH_IN_NDV_FOR_NODES = [
 	WAIT_NODE_TYPE,
 	DISCORD_NODE_TYPE,
 	CHAT_TRIGGER_NODE_TYPE,
+	FORM_TRIGGER_NODE_TYPE,
 ];
 export const MAIN_AUTH_FIELD_NAME = 'authentication';
 export const NODE_RESOURCE_FIELD_NAME = 'resource';
diff --git a/packages/nodes-base/nodes/Form/FormTrigger.node.ts b/packages/nodes-base/nodes/Form/FormTrigger.node.ts
index d81758abfa126..ca2c85dcc1883 100644
--- a/packages/nodes-base/nodes/Form/FormTrigger.node.ts
+++ b/packages/nodes-base/nodes/Form/FormTrigger.node.ts
@@ -11,12 +11,13 @@ export class FormTrigger extends VersionedNodeType {
 			icon: 'file:form.svg',
 			group: ['trigger'],
 			description: 'Runs the flow when an n8n generated webform is submitted',
-			defaultVersion: 2,
+			defaultVersion: 2.1,
 		};
 
 		const nodeVersions: IVersionedNodeType['nodeVersions'] = {
 			1: new FormTriggerV1(baseDescription),
 			2: new FormTriggerV2(baseDescription),
+			2.1: new FormTriggerV2(baseDescription),
 		};
 
 		super(nodeVersions, baseDescription);
diff --git a/packages/nodes-base/nodes/Form/common.descriptions.ts b/packages/nodes-base/nodes/Form/common.descriptions.ts
index 5ea322a2ec9c4..8ab9cc0927a53 100644
--- a/packages/nodes-base/nodes/Form/common.descriptions.ts
+++ b/packages/nodes-base/nodes/Form/common.descriptions.ts
@@ -28,6 +28,9 @@ export const formDescription: INodeProperties = {
 	placeholder: "e.g. We'll get back to you soon",
 	description:
 		'Shown underneath the Form Title. Can be used to prompt the user on how to complete the form.',
+	typeOptions: {
+		rows: 2,
+	},
 };
 
 export const formFields: INodeProperties = {
@@ -69,6 +72,14 @@ export const formFields: INodeProperties = {
 							name: 'Dropdown List',
 							value: 'dropdown',
 						},
+						{
+							name: 'Email',
+							value: 'email',
+						},
+						{
+							name: 'File',
+							value: 'file',
+						},
 						{
 							name: 'Number',
 							value: 'number',
@@ -88,6 +99,17 @@ export const formFields: INodeProperties = {
 					],
 					required: true,
 				},
+				{
+					displayName: 'Placeholder',
+					name: 'placeholder',
+					type: 'string',
+					default: '',
+					displayOptions: {
+						hide: {
+							fieldType: ['dropdown', 'date', 'file'],
+						},
+					},
+				},
 				{
 					displayName: 'Field Options',
 					name: 'fieldOptions',
@@ -133,6 +155,48 @@ export const formFields: INodeProperties = {
 						},
 					},
 				},
+				{
+					displayName: 'Multiple Files',
+					name: 'multipleFiles',
+					type: 'boolean',
+					default: true,
+					description:
+						'Whether to allow the user to select multiple files from the file input or just one',
+					displayOptions: {
+						show: {
+							fieldType: ['file'],
+						},
+					},
+				},
+				{
+					displayName: 'Accept File Types',
+					name: 'acceptFileTypes',
+					type: 'string',
+					default: '',
+					description: 'List of file types that can be uploaded, separated by commas',
+					hint: 'Leave empty to allow all file types',
+					placeholder: 'e.g. .jpg, .png',
+					displayOptions: {
+						show: {
+							fieldType: ['file'],
+						},
+					},
+				},
+				{
+					displayName: 'Format Date As',
+					name: 'formatDate',
+					type: 'string',
+					default: '',
+					description:
+						'Returns a string representation of this field formatted according to the specified format string. For a table of tokens and their interpretations, see <a href="https://moment.github.io/luxon/#/formatting?ID=table-of-tokens" target="_blank">here</a>.',
+					placeholder: 'e.g. dd/mm/yyyy',
+					hint: 'Leave empty to use the default format',
+					displayOptions: {
+						show: {
+							fieldType: ['date'],
+						},
+					},
+				},
 				{
 					displayName: 'Required Field',
 					name: 'requiredField',
diff --git a/packages/nodes-base/nodes/Form/interfaces.ts b/packages/nodes-base/nodes/Form/interfaces.ts
index ece460a7fe3e5..206b495764440 100644
--- a/packages/nodes-base/nodes/Form/interfaces.ts
+++ b/packages/nodes-base/nodes/Form/interfaces.ts
@@ -4,20 +4,29 @@ export type FormField = {
 	requiredField: boolean;
 	fieldOptions?: { values: Array<{ option: string }> };
 	multiselect?: boolean;
+	multipleFiles?: boolean;
+	acceptFileTypes?: string;
+	formatDate?: string;
+	placeholder?: string;
 };
 
 export type FormTriggerInput = {
 	isSelect?: boolean;
 	isMultiSelect?: boolean;
 	isTextarea?: boolean;
+	isFileInput?: boolean;
 	isInput?: boolean;
-	labbel: string;
+	label: string;
+	defaultValue?: string;
 	id: string;
 	errorId: string;
 	type?: 'text' | 'number' | 'date';
 	inputRequired: 'form-required' | '';
 	selectOptions?: string[];
 	multiSelectOptions?: Array<{ id: string; label: string }>;
+	acceptFileTypes?: string;
+	multipleFiles?: 'multiple' | '';
+	placeholder?: string;
 };
 
 export type FormTriggerData = {
@@ -31,4 +40,7 @@ export type FormTriggerData = {
 	formFields: FormTriggerInput[];
 	useResponseData?: boolean;
 	appendAttribution?: boolean;
+	customAttribution?: string;
 };
+
+export const FORM_TRIGGER_AUTHENTICATION_PROPERTY = 'authentication';
diff --git a/packages/nodes-base/nodes/Form/test/utils.test.ts b/packages/nodes-base/nodes/Form/test/utils.test.ts
new file mode 100644
index 0000000000000..769da0d2ab8f9
--- /dev/null
+++ b/packages/nodes-base/nodes/Form/test/utils.test.ts
@@ -0,0 +1,370 @@
+import { mock } from 'jest-mock-extended';
+import type { IWebhookFunctions } from 'n8n-workflow';
+import type { FormField } from '../interfaces';
+import { formWebhook, prepareFormData } from '../utils';
+
+describe('FormTrigger, formWebhook', () => {
+	beforeEach(() => {
+		jest.clearAllMocks();
+	});
+
+	it('should call response render', async () => {
+		const executeFunctions = mock<IWebhookFunctions>();
+		const mockRender = jest.fn();
+
+		const formFields: FormField[] = [
+			{ fieldLabel: 'Name', fieldType: 'text', requiredField: true },
+			{ fieldLabel: 'Age', fieldType: 'number', requiredField: false },
+			{
+				fieldLabel: 'Gender',
+				fieldType: 'select',
+				requiredField: true,
+				fieldOptions: { values: [{ option: 'Male' }, { option: 'Female' }] },
+			},
+			{
+				fieldLabel: 'Resume',
+				fieldType: 'file',
+				requiredField: true,
+				acceptFileTypes: '.pdf,.doc',
+				multipleFiles: false,
+			},
+		];
+
+		executeFunctions.getNode.mockReturnValue({ typeVersion: 2.1 } as any);
+		executeFunctions.getNodeParameter.calledWith('options').mockReturnValue({});
+		executeFunctions.getNodeParameter.calledWith('formTitle').mockReturnValue('Test Form');
+		executeFunctions.getNodeParameter
+			.calledWith('formDescription')
+			.mockReturnValue('Test Description');
+		executeFunctions.getNodeParameter.calledWith('responseMode').mockReturnValue('onReceived');
+		executeFunctions.getNodeParameter.calledWith('formFields.values').mockReturnValue(formFields);
+		executeFunctions.getResponseObject.mockReturnValue({ render: mockRender } as any);
+		executeFunctions.getRequestObject.mockReturnValue({ method: 'GET', query: {} } as any);
+		executeFunctions.getMode.mockReturnValue('manual');
+		executeFunctions.getInstanceId.mockReturnValue('instanceId');
+		executeFunctions.getBodyData.mockReturnValue({ data: {}, files: {} });
+		executeFunctions.getChildNodes.mockReturnValue([]);
+
+		await formWebhook(executeFunctions);
+
+		expect(mockRender).toHaveBeenCalledWith('form-trigger', {
+			appendAttribution: true,
+			customAttribution: undefined,
+			formDescription: 'Test Description',
+			formFields: [
+				{
+					defaultValue: '',
+					errorId: 'error-field-0',
+					id: 'field-0',
+					inputRequired: 'form-required',
+					isInput: true,
+					label: 'Name',
+					placeholder: undefined,
+					type: 'text',
+				},
+				{
+					defaultValue: '',
+					errorId: 'error-field-1',
+					id: 'field-1',
+					inputRequired: '',
+					isInput: true,
+					label: 'Age',
+					placeholder: undefined,
+					type: 'number',
+				},
+				{
+					defaultValue: '',
+					errorId: 'error-field-2',
+					id: 'field-2',
+					inputRequired: 'form-required',
+					isInput: true,
+					label: 'Gender',
+					placeholder: undefined,
+					type: 'select',
+				},
+				{
+					acceptFileTypes: '.pdf,.doc',
+					defaultValue: '',
+					errorId: 'error-field-3',
+					id: 'field-3',
+					inputRequired: 'form-required',
+					isFileInput: true,
+					label: 'Resume',
+					multipleFiles: '',
+					placeholder: undefined,
+				},
+			],
+			formSubmittedText: 'Your response has been recorded',
+			formTitle: 'Test Form',
+			n8nWebsiteLink:
+				'https://n8n.io/?utm_source=n8n-internal&utm_medium=form-trigger&utm_campaign=instanceId',
+			testRun: true,
+			useResponseData: false,
+			validForm: true,
+		});
+	});
+
+	it('should return workflowData on POST request', async () => {
+		const executeFunctions = mock<IWebhookFunctions>();
+		const mockStatus = jest.fn();
+		const mockEnd = jest.fn();
+
+		const formFields: FormField[] = [
+			{ fieldLabel: 'Name', fieldType: 'text', requiredField: true },
+			{ fieldLabel: 'Age', fieldType: 'number', requiredField: false },
+		];
+
+		const bodyData = {
+			'field-0': 'John Doe',
+			'field-1': '30',
+		};
+
+		executeFunctions.getNode.mockReturnValue({ typeVersion: 2.1 } as any);
+		executeFunctions.getNodeParameter.calledWith('options').mockReturnValue({});
+		executeFunctions.getNodeParameter.calledWith('responseMode').mockReturnValue('onReceived');
+		executeFunctions.getChildNodes.mockReturnValue([]);
+		executeFunctions.getNodeParameter.calledWith('formFields.values').mockReturnValue(formFields);
+		executeFunctions.getResponseObject.mockReturnValue({ status: mockStatus, end: mockEnd } as any);
+		executeFunctions.getRequestObject.mockReturnValue({ method: 'POST' } as any);
+		executeFunctions.getMode.mockReturnValue('manual');
+		executeFunctions.getInstanceId.mockReturnValue('instanceId');
+		executeFunctions.getBodyData.mockReturnValue({ data: bodyData, files: {} });
+
+		const result = await formWebhook(executeFunctions);
+
+		expect(result).toEqual({
+			webhookResponse: { status: 200 },
+			workflowData: [
+				[
+					{
+						json: {
+							Name: 'John Doe',
+							Age: 30,
+							submittedAt: expect.any(String),
+							formMode: 'test',
+						},
+					},
+				],
+			],
+		});
+	});
+});
+
+describe('FormTrigger, prepareFormData', () => {
+	it('should return valid form data with given parameters', () => {
+		const formFields: FormField[] = [
+			{
+				fieldLabel: 'Name',
+				fieldType: 'text',
+				requiredField: true,
+				placeholder: 'Enter your name',
+			},
+			{
+				fieldLabel: 'Email',
+				fieldType: 'email',
+				requiredField: true,
+				placeholder: 'Enter your email',
+			},
+			{
+				fieldLabel: 'Gender',
+				fieldType: 'dropdown',
+				requiredField: false,
+				fieldOptions: { values: [{ option: 'Male' }, { option: 'Female' }] },
+			},
+			{
+				fieldLabel: 'Files',
+				fieldType: 'file',
+				requiredField: false,
+				acceptFileTypes: '.jpg,.png',
+				multipleFiles: true,
+			},
+		];
+
+		const query = { Name: 'John Doe', Email: 'john@example.com' };
+
+		const result = prepareFormData({
+			formTitle: 'Test Form',
+			formDescription: 'This is a test form',
+			formSubmittedText: 'Thank you for your submission',
+			redirectUrl: 'https://example.com/thank-you',
+			formFields,
+			testRun: false,
+			query,
+			instanceId: 'test-instance',
+			useResponseData: true,
+		});
+
+		expect(result).toEqual({
+			testRun: false,
+			validForm: true,
+			formTitle: 'Test Form',
+			formDescription: 'This is a test form',
+			formSubmittedText: 'Thank you for your submission',
+			n8nWebsiteLink:
+				'https://n8n.io/?utm_source=n8n-internal&utm_medium=form-trigger&utm_campaign=test-instance',
+			formFields: [
+				{
+					id: 'field-0',
+					errorId: 'error-field-0',
+					label: 'Name',
+					inputRequired: 'form-required',
+					defaultValue: 'John Doe',
+					placeholder: 'Enter your name',
+					isInput: true,
+					type: 'text',
+				},
+				{
+					id: 'field-1',
+					errorId: 'error-field-1',
+					label: 'Email',
+					inputRequired: 'form-required',
+					defaultValue: 'john@example.com',
+					placeholder: 'Enter your email',
+					isInput: true,
+					type: 'email',
+				},
+				{
+					id: 'field-2',
+					errorId: 'error-field-2',
+					label: 'Gender',
+					inputRequired: '',
+					defaultValue: '',
+					placeholder: undefined,
+					isSelect: true,
+					selectOptions: ['Male', 'Female'],
+				},
+				{
+					id: 'field-3',
+					errorId: 'error-field-3',
+					label: 'Files',
+					inputRequired: '',
+					defaultValue: '',
+					placeholder: undefined,
+					isFileInput: true,
+					acceptFileTypes: '.jpg,.png',
+					multipleFiles: 'multiple',
+				},
+			],
+			useResponseData: true,
+			appendAttribution: true,
+			customAttribution: undefined,
+			redirectUrl: 'https://example.com/thank-you',
+		});
+	});
+
+	it('should handle missing optional fields gracefully', () => {
+		const formFields: FormField[] = [
+			{
+				fieldLabel: 'Name',
+				fieldType: 'text',
+				requiredField: true,
+				placeholder: 'Enter your name',
+			},
+		];
+
+		const result = prepareFormData({
+			formTitle: 'Test Form',
+			formDescription: 'This is a test form',
+			formSubmittedText: undefined,
+			redirectUrl: undefined,
+			formFields,
+			testRun: true,
+			query: {},
+		});
+
+		expect(result).toEqual({
+			testRun: true,
+			validForm: true,
+			formTitle: 'Test Form',
+			formDescription: 'This is a test form',
+			formSubmittedText: 'Your response has been recorded',
+			n8nWebsiteLink: 'https://n8n.io/?utm_source=n8n-internal&utm_medium=form-trigger',
+			formFields: [
+				{
+					id: 'field-0',
+					errorId: 'error-field-0',
+					label: 'Name',
+					inputRequired: 'form-required',
+					defaultValue: '',
+					placeholder: 'Enter your name',
+					isInput: true,
+					type: 'text',
+				},
+			],
+			useResponseData: undefined,
+			appendAttribution: true,
+			customAttribution: undefined,
+		});
+	});
+
+	it('should set redirectUrl with http if protocol is missing', () => {
+		const formFields: FormField[] = [
+			{
+				fieldLabel: 'Name',
+				fieldType: 'text',
+				requiredField: true,
+				placeholder: 'Enter your name',
+			},
+		];
+
+		const query = { Name: 'John Doe' };
+
+		const result = prepareFormData({
+			formTitle: 'Test Form',
+			formDescription: 'This is a test form',
+			formSubmittedText: undefined,
+			redirectUrl: 'example.com/thank-you',
+			formFields,
+			testRun: true,
+			query,
+		});
+
+		expect(result.redirectUrl).toBe('http://example.com/thank-you');
+	});
+
+	it('should return invalid form data when formFields are empty', () => {
+		const result = prepareFormData({
+			formTitle: 'Test Form',
+			formDescription: 'This is a test form',
+			formSubmittedText: undefined,
+			redirectUrl: undefined,
+			formFields: [],
+			testRun: true,
+			query: {},
+		});
+
+		expect(result.validForm).toBe(false);
+		expect(result.formFields).toEqual([]);
+	});
+
+	it('should correctly handle multiselect fields', () => {
+		const formFields: FormField[] = [
+			{
+				fieldLabel: 'Favorite Colors',
+				fieldType: 'text',
+				requiredField: true,
+				multiselect: true,
+				fieldOptions: { values: [{ option: 'Red' }, { option: 'Blue' }, { option: 'Green' }] },
+			},
+		];
+
+		const query = { 'Favorite Colors': 'Red,Blue' };
+
+		const result = prepareFormData({
+			formTitle: 'Test Form',
+			formDescription: 'This is a test form',
+			formSubmittedText: 'Thank you',
+			redirectUrl: 'example.com',
+			formFields,
+			testRun: false,
+			query,
+		});
+
+		expect(result.formFields[0].isMultiSelect).toBe(true);
+		expect(result.formFields[0].multiSelectOptions).toEqual([
+			{ id: 'option0', label: 'Red' },
+			{ id: 'option1', label: 'Blue' },
+			{ id: 'option2', label: 'Green' },
+		]);
+	});
+});
diff --git a/packages/nodes-base/nodes/Form/utils.ts b/packages/nodes-base/nodes/Form/utils.ts
index 3b402303d2edf..c5e8201b9b086 100644
--- a/packages/nodes-base/nodes/Form/utils.ts
+++ b/packages/nodes-base/nodes/Form/utils.ts
@@ -1,22 +1,45 @@
-import {
-	NodeOperationError,
-	jsonParse,
-	type IDataObject,
-	type IWebhookFunctions,
+import type {
+	INodeExecutionData,
+	MultiPartFormData,
+	IDataObject,
+	IWebhookFunctions,
 } from 'n8n-workflow';
+import { NodeOperationError, jsonParse } from 'n8n-workflow';
+
 import type { FormField, FormTriggerData, FormTriggerInput } from './interfaces';
+import { FORM_TRIGGER_AUTHENTICATION_PROPERTY } from './interfaces';
+
+import { WebhookAuthorizationError } from '../Webhook/error';
+import { validateWebhookAuthentication } from '../Webhook/utils';
+
+import { DateTime } from 'luxon';
+import isbot from 'isbot';
 
-export const prepareFormData = (
-	formTitle: string,
-	formDescription: string,
-	formSubmittedText: string | undefined,
-	redirectUrl: string | undefined,
-	formFields: FormField[],
-	testRun: boolean,
-	instanceId?: string,
-	useResponseData?: boolean,
+export function prepareFormData({
+	formTitle,
+	formDescription,
+	formSubmittedText,
+	redirectUrl,
+	formFields,
+	testRun,
+	query,
+	instanceId,
+	useResponseData,
 	appendAttribution = true,
-) => {
+	customAttribution,
+}: {
+	formTitle: string;
+	formDescription: string;
+	formSubmittedText: string | undefined;
+	redirectUrl: string | undefined;
+	formFields: FormField[];
+	testRun: boolean;
+	query: IDataObject;
+	instanceId?: string;
+	useResponseData?: boolean;
+	appendAttribution?: boolean;
+	customAttribution?: string;
+}) {
 	const validForm = formFields.length > 0;
 	const utm_campaign = instanceId ? `&utm_campaign=${instanceId}` : '';
 	const n8nWebsiteLink = `https://n8n.io/?utm_source=n8n-internal&utm_medium=form-trigger${utm_campaign}`;
@@ -35,6 +58,7 @@ export const prepareFormData = (
 		formFields: [],
 		useResponseData,
 		appendAttribution,
+		customAttribution,
 	};
 
 	if (redirectUrl) {
@@ -49,13 +73,15 @@ export const prepareFormData = (
 	}
 
 	for (const [index, field] of formFields.entries()) {
-		const { fieldType, requiredField, multiselect } = field;
+		const { fieldType, requiredField, multiselect, placeholder } = field;
 
 		const input: IDataObject = {
 			id: `field-${index}`,
 			errorId: `error-field-${index}`,
 			label: field.fieldLabel,
 			inputRequired: requiredField ? 'form-required' : '',
+			defaultValue: query[field.fieldLabel] ?? '',
+			placeholder,
 		};
 
 		if (multiselect) {
@@ -65,6 +91,10 @@ export const prepareFormData = (
 					id: `option${i}`,
 					label: e.option,
 				})) ?? [];
+		} else if (fieldType === 'file') {
+			input.isFileInput = true;
+			input.acceptFileTypes = field.acceptFileTypes;
+			input.multipleFiles = field.multipleFiles ? 'multiple' : '';
 		} else if (fieldType === 'dropdown') {
 			input.isSelect = true;
 			const fieldOptions = field.fieldOptions?.values ?? [];
@@ -73,14 +103,14 @@ export const prepareFormData = (
 			input.isTextarea = true;
 		} else {
 			input.isInput = true;
-			input.type = fieldType as 'text' | 'number' | 'date';
+			input.type = fieldType as 'text' | 'number' | 'date' | 'email';
 		}
 
 		formData.formFields.push(input as FormTriggerInput);
 	}
 
 	return formData;
-};
+}
 
 const checkResponseModeConfiguration = (context: IWebhookFunctions) => {
 	const responseMode = context.getNodeParameter('responseMode', 'onReceived') as string;
@@ -114,6 +144,37 @@ const checkResponseModeConfiguration = (context: IWebhookFunctions) => {
 };
 
 export async function formWebhook(context: IWebhookFunctions) {
+	const nodeVersion = context.getNode().typeVersion;
+	const options = context.getNodeParameter('options', {}) as {
+		ignoreBots?: boolean;
+		respondWithOptions?: {
+			values: {
+				respondWith: 'text' | 'redirect';
+				formSubmittedText: string;
+				redirectUrl: string;
+			};
+		};
+		formSubmittedText?: string;
+		useWorkflowTimezone?: boolean;
+		appendAttribution?: boolean;
+		customAttribution?: string;
+	};
+	const res = context.getResponseObject();
+	const req = context.getRequestObject();
+
+	try {
+		if (options.ignoreBots && isbot(req.headers['user-agent']))
+			throw new WebhookAuthorizationError(403);
+		await validateWebhookAuthentication(context, FORM_TRIGGER_AUTHENTICATION_PROPERTY);
+	} catch (error) {
+		if (error instanceof WebhookAuthorizationError) {
+			res.writeHead(error.responseCode, { 'WWW-Authenticate': 'Basic realm="Webhook"' });
+			res.end(error.message);
+			return { noWebhookResponse: true };
+		}
+		throw error;
+	}
+
 	const mode = context.getMode() === 'manual' ? 'test' : 'production';
 	const formFields = context.getNodeParameter('formFields.values', []) as FormField[];
 	const method = context.getRequestObject().method;
@@ -123,10 +184,11 @@ export async function formWebhook(context: IWebhookFunctions) {
 	//Show the form on GET request
 	if (method === 'GET') {
 		const formTitle = context.getNodeParameter('formTitle', '') as string;
-		const formDescription = context.getNodeParameter('formDescription', '') as string;
+		const formDescription = (context.getNodeParameter('formDescription', '') as string)
+			.replace(/\\n/g, '\n')
+			.replace(/<br>/g, '\n');
 		const instanceId = context.getInstanceId();
 		const responseMode = context.getNodeParameter('responseMode', '') as string;
-		const options = context.getNodeParameter('options', {}) as IDataObject;
 
 		let formSubmittedText;
 		let redirectUrl;
@@ -150,19 +212,22 @@ export async function formWebhook(context: IWebhookFunctions) {
 
 		const useResponseData = responseMode === 'responseNode';
 
-		const data = prepareFormData(
+		const query = context.getRequestObject().query as IDataObject;
+
+		const data = prepareFormData({
 			formTitle,
 			formDescription,
 			formSubmittedText,
 			redirectUrl,
 			formFields,
-			mode === 'test',
+			testRun: mode === 'test',
+			query,
 			instanceId,
 			useResponseData,
 			appendAttribution,
-		);
+			customAttribution: options.customAttribution as string,
+		});
 
-		const res = context.getResponseObject();
 		res.render('form-trigger', data);
 		return {
 			noWebhookResponse: true,
@@ -170,13 +235,64 @@ export async function formWebhook(context: IWebhookFunctions) {
 	}
 
 	const bodyData = (context.getBodyData().data as IDataObject) ?? {};
+	const files = (context.getBodyData().files as IDataObject) ?? {};
+
+	const returnItem: INodeExecutionData = {
+		json: {},
+	};
+	if (files && Object.keys(files).length) {
+		returnItem.binary = {};
+	}
+
+	for (const key of Object.keys(files)) {
+		const processFiles: MultiPartFormData.File[] = [];
+		let multiFile = false;
+		const filesInput = files[key] as MultiPartFormData.File[] | MultiPartFormData.File;
+
+		if (Array.isArray(filesInput)) {
+			bodyData[key] = filesInput.map((file) => ({
+				filename: file.originalFilename,
+				mimetype: file.mimetype,
+				size: file.size,
+			}));
+			processFiles.push(...filesInput);
+			multiFile = true;
+		} else {
+			bodyData[key] = {
+				filename: filesInput.originalFilename,
+				mimetype: filesInput.mimetype,
+				size: filesInput.size,
+			};
+			processFiles.push(filesInput);
+		}
+
+		const entryIndex = Number(key.replace(/field-/g, ''));
+		const fieldLabel = isNaN(entryIndex) ? key : formFields[entryIndex].fieldLabel;
+
+		let fileCount = 0;
+		for (const file of processFiles) {
+			let binaryPropertyName = fieldLabel.replace(/\W/g, '_');
+
+			if (multiFile) {
+				binaryPropertyName += `_${fileCount++}`;
+			}
+
+			returnItem.binary![binaryPropertyName] = await context.nodeHelpers.copyBinaryFile(
+				file.filepath,
+				file.originalFilename ?? file.newFilename,
+				file.mimetype,
+			);
+		}
+	}
 
-	const returnData: IDataObject = {};
 	for (const [index, field] of formFields.entries()) {
 		const key = `field-${index}`;
 		let value = bodyData[key] ?? null;
 
-		if (value === null) returnData[field.fieldLabel] = null;
+		if (value === null) {
+			returnItem.json[field.fieldLabel] = null;
+			continue;
+		}
 
 		if (field.fieldType === 'number') {
 			value = Number(value);
@@ -187,16 +303,31 @@ export async function formWebhook(context: IWebhookFunctions) {
 		if (field.multiselect && typeof value === 'string') {
 			value = jsonParse(value);
 		}
+		if (field.fieldType === 'date' && value && field.formatDate !== '') {
+			value = DateTime.fromFormat(String(value), 'yyyy-mm-dd').toFormat(field.formatDate as string);
+		}
+		if (field.fieldType === 'file' && field.multipleFiles && !Array.isArray(value)) {
+			value = [value];
+		}
+
+		returnItem.json[field.fieldLabel] = value;
+	}
+
+	let { useWorkflowTimezone } = options;
 
-		returnData[field.fieldLabel] = value;
+	if (useWorkflowTimezone === undefined && nodeVersion > 2) {
+		useWorkflowTimezone = true;
 	}
-	returnData.submittedAt = new Date().toISOString();
-	returnData.formMode = mode;
+
+	const timezone = useWorkflowTimezone ? context.getTimezone() : 'UTC';
+	returnItem.json.submittedAt = DateTime.now().setZone(timezone).toISO();
+
+	returnItem.json.formMode = mode;
 
 	const webhookResponse: IDataObject = { status: 200 };
 
 	return {
 		webhookResponse,
-		workflowData: [context.helpers.returnJsonArray(returnData)],
+		workflowData: [[returnItem]],
 	};
 }
diff --git a/packages/nodes-base/nodes/Form/v2/FormTriggerV2.node.ts b/packages/nodes-base/nodes/Form/v2/FormTriggerV2.node.ts
index e8f0f897cb4b6..878cdc5b6a675 100644
--- a/packages/nodes-base/nodes/Form/v2/FormTriggerV2.node.ts
+++ b/packages/nodes-base/nodes/Form/v2/FormTriggerV2.node.ts
@@ -1,9 +1,10 @@
 /* eslint-disable n8n-nodes-base/node-filename-against-convention */
-import {
-	type INodeType,
-	type INodeTypeBaseDescription,
-	type INodeTypeDescription,
-	type IWebhookFunctions,
+import type {
+	INodeProperties,
+	INodeType,
+	INodeTypeBaseDescription,
+	INodeTypeDescription,
+	IWebhookFunctions,
 } from 'n8n-workflow';
 
 import { formWebhook } from '../utils';
@@ -16,13 +17,22 @@ import {
 	respondWithOptions,
 	webhookPath,
 } from '../common.descriptions';
+import { FORM_TRIGGER_AUTHENTICATION_PROPERTY } from '../interfaces';
+
+const useWorkflowTimezone: INodeProperties = {
+	displayName: 'Use Workflow Timezone',
+	name: 'useWorkflowTimezone',
+	type: 'boolean',
+	default: false,
+	description: "Whether to use the workflow timezone set in node's settings rather than UTC",
+};
 
 const descriptionV2: INodeTypeDescription = {
 	displayName: 'n8n Form Trigger',
 	name: 'formTrigger',
 	icon: 'file:form.svg',
 	group: ['trigger'],
-	version: 2,
+	version: [2, 2.1],
 	description: 'Runs the flow when an n8n generated webform is submitted',
 	defaults: {
 		name: 'n8n Form Trigger',
@@ -54,7 +64,35 @@ const descriptionV2: INodeTypeDescription = {
 	eventTriggerDescription: 'Waiting for you to submit the form',
 	activationMessage: 'You can now make calls to your production Form URL.',
 	triggerPanel: formTriggerPanel,
+	credentials: [
+		{
+			// eslint-disable-next-line n8n-nodes-base/node-class-description-credentials-name-unsuffixed
+			name: 'httpBasicAuth',
+			required: true,
+			displayOptions: {
+				show: {
+					[FORM_TRIGGER_AUTHENTICATION_PROPERTY]: ['basicAuth'],
+				},
+			},
+		},
+	],
 	properties: [
+		{
+			displayName: 'Authentication',
+			name: FORM_TRIGGER_AUTHENTICATION_PROPERTY,
+			type: 'options',
+			options: [
+				{
+					name: 'Basic Auth',
+					value: 'basicAuth',
+				},
+				{
+					name: 'None',
+					value: 'none',
+				},
+			],
+			default: 'none',
+		},
 		webhookPath,
 		formTitle,
 		formDescription,
@@ -77,6 +115,17 @@ const descriptionV2: INodeTypeDescription = {
 			placeholder: 'Add option',
 			default: {},
 			options: [
+				{
+					displayName: 'Custom Attribution',
+					name: 'customAttribution',
+					type: 'string',
+					placeholder: 'e.g. <svg> ...</svg>',
+					description: "HTML code that will be shown at the bottom of the form instead n8n's logo",
+					default: '',
+					typeOptions: {
+						rows: 2,
+					},
+				},
 				{
 					// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
 					displayName: 'Append n8n Attribution',
@@ -94,6 +143,31 @@ const descriptionV2: INodeTypeDescription = {
 						},
 					},
 				},
+				{
+					displayName: 'Ignore Bots',
+					name: 'ignoreBots',
+					type: 'boolean',
+					default: false,
+					description: 'Whether to ignore requests from bots like link previewers and web crawlers',
+				},
+				{
+					...useWorkflowTimezone,
+					default: false,
+					displayOptions: {
+						show: {
+							'@version': [2],
+						},
+					},
+				},
+				{
+					...useWorkflowTimezone,
+					default: true,
+					displayOptions: {
+						show: {
+							'@version': [{ _cnd: { gt: 2 } }],
+						},
+					},
+				},
 			],
 		},
 	],
diff --git a/packages/nodes-base/nodes/Webhook/Webhook.node.ts b/packages/nodes-base/nodes/Webhook/Webhook.node.ts
index 9862a9c1f4c80..88021152e12b3 100644
--- a/packages/nodes-base/nodes/Webhook/Webhook.node.ts
+++ b/packages/nodes-base/nodes/Webhook/Webhook.node.ts
@@ -4,7 +4,6 @@ import { createWriteStream } from 'fs';
 import { stat } from 'fs/promises';
 import type {
 	IWebhookFunctions,
-	ICredentialDataDecryptedObject,
 	IDataObject,
 	INodeExecutionData,
 	INodeTypeDescription,
@@ -15,12 +14,9 @@ import type {
 import { BINARY_ENCODING, NodeOperationError, Node } from 'n8n-workflow';
 
 import { v4 as uuid } from 'uuid';
-import basicAuth from 'basic-auth';
 import isbot from 'isbot';
 import { file as tmpFile } from 'tmp-promise';
-import jwt from 'jsonwebtoken';
 
-import { formatPrivateKey } from '../../utils/utilities';
 import {
 	authenticationProperty,
 	credentialsProperty,
@@ -39,6 +35,7 @@ import {
 	configuredOutputs,
 	isIpWhitelisted,
 	setupOutputConnection,
+	validateWebhookAuthentication,
 } from './utils';
 
 export class Webhook extends Node {
@@ -265,93 +262,7 @@ export class Webhook extends Node {
 	}
 
 	private async validateAuth(context: IWebhookFunctions) {
-		const authentication = context.getNodeParameter(this.authPropertyName) as string;
-		if (authentication === 'none') return;
-
-		const req = context.getRequestObject();
-		const headers = context.getHeaderData();
-
-		if (authentication === 'basicAuth') {
-			// Basic authorization is needed to call webhook
-			let expectedAuth: ICredentialDataDecryptedObject | undefined;
-			try {
-				expectedAuth = await context.getCredentials('httpBasicAuth');
-			} catch {}
-
-			if (expectedAuth === undefined || !expectedAuth.user || !expectedAuth.password) {
-				// Data is not defined on node so can not authenticate
-				throw new WebhookAuthorizationError(500, 'No authentication data defined on node!');
-			}
-
-			const providedAuth = basicAuth(req);
-			// Authorization data is missing
-			if (!providedAuth) throw new WebhookAuthorizationError(401);
-
-			if (providedAuth.name !== expectedAuth.user || providedAuth.pass !== expectedAuth.password) {
-				// Provided authentication data is wrong
-				throw new WebhookAuthorizationError(403);
-			}
-		} else if (authentication === 'headerAuth') {
-			// Special header with value is needed to call webhook
-			let expectedAuth: ICredentialDataDecryptedObject | undefined;
-			try {
-				expectedAuth = await context.getCredentials('httpHeaderAuth');
-			} catch {}
-
-			if (expectedAuth === undefined || !expectedAuth.name || !expectedAuth.value) {
-				// Data is not defined on node so can not authenticate
-				throw new WebhookAuthorizationError(500, 'No authentication data defined on node!');
-			}
-			const headerName = (expectedAuth.name as string).toLowerCase();
-			const expectedValue = expectedAuth.value as string;
-
-			if (
-				!headers.hasOwnProperty(headerName) ||
-				(headers as IDataObject)[headerName] !== expectedValue
-			) {
-				// Provided authentication data is wrong
-				throw new WebhookAuthorizationError(403);
-			}
-		} else if (authentication === 'jwtAuth') {
-			let expectedAuth;
-
-			try {
-				expectedAuth = (await context.getCredentials('jwtAuth')) as {
-					keyType: 'passphrase' | 'pemKey';
-					publicKey: string;
-					secret: string;
-					algorithm: jwt.Algorithm;
-				};
-			} catch {}
-
-			if (expectedAuth === undefined) {
-				// Data is not defined on node so can not authenticate
-				throw new WebhookAuthorizationError(500, 'No authentication data defined on node!');
-			}
-
-			const authHeader = req.headers.authorization;
-			const token = authHeader?.split(' ')[1];
-
-			if (!token) {
-				throw new WebhookAuthorizationError(401, 'No token provided');
-			}
-
-			let secretOrPublicKey;
-
-			if (expectedAuth.keyType === 'passphrase') {
-				secretOrPublicKey = expectedAuth.secret;
-			} else {
-				secretOrPublicKey = formatPrivateKey(expectedAuth.publicKey, true);
-			}
-
-			try {
-				return jwt.verify(token, secretOrPublicKey, {
-					algorithms: [expectedAuth.algorithm],
-				}) as IDataObject;
-			} catch (error) {
-				throw new WebhookAuthorizationError(403, error.message);
-			}
-		}
+		return await validateWebhookAuthentication(context, this.authPropertyName);
 	}
 
 	private async handleFormData(
diff --git a/packages/nodes-base/nodes/Webhook/utils.ts b/packages/nodes-base/nodes/Webhook/utils.ts
index 33fd36331ecc8..2f3c25d660d8c 100644
--- a/packages/nodes-base/nodes/Webhook/utils.ts
+++ b/packages/nodes-base/nodes/Webhook/utils.ts
@@ -1,5 +1,14 @@
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
-import type { IWebhookFunctions, INodeExecutionData, IDataObject } from 'n8n-workflow';
+import type {
+	IWebhookFunctions,
+	INodeExecutionData,
+	IDataObject,
+	ICredentialDataDecryptedObject,
+} from 'n8n-workflow';
+import { WebhookAuthorizationError } from './error';
+import basicAuth from 'basic-auth';
+import jwt from 'jsonwebtoken';
+import { formatPrivateKey } from '../../utils/utilities';
 
 type WebhookParameters = {
 	httpMethod: string;
@@ -167,3 +176,96 @@ export const checkResponseModeConfiguration = (context: IWebhookFunctions) => {
 		);
 	}
 };
+
+export async function validateWebhookAuthentication(
+	ctx: IWebhookFunctions,
+	authPropertyName: string,
+) {
+	const authentication = ctx.getNodeParameter(authPropertyName) as string;
+	if (authentication === 'none') return;
+
+	const req = ctx.getRequestObject();
+	const headers = ctx.getHeaderData();
+
+	if (authentication === 'basicAuth') {
+		// Basic authorization is needed to call webhook
+		let expectedAuth: ICredentialDataDecryptedObject | undefined;
+		try {
+			expectedAuth = await ctx.getCredentials('httpBasicAuth');
+		} catch {}
+
+		if (expectedAuth === undefined || !expectedAuth.user || !expectedAuth.password) {
+			// Data is not defined on node so can not authenticate
+			throw new WebhookAuthorizationError(500, 'No authentication data defined on node!');
+		}
+
+		const providedAuth = basicAuth(req);
+		// Authorization data is missing
+		if (!providedAuth) throw new WebhookAuthorizationError(401);
+
+		if (providedAuth.name !== expectedAuth.user || providedAuth.pass !== expectedAuth.password) {
+			// Provided authentication data is wrong
+			throw new WebhookAuthorizationError(403);
+		}
+	} else if (authentication === 'headerAuth') {
+		// Special header with value is needed to call webhook
+		let expectedAuth: ICredentialDataDecryptedObject | undefined;
+		try {
+			expectedAuth = await ctx.getCredentials('httpHeaderAuth');
+		} catch {}
+
+		if (expectedAuth === undefined || !expectedAuth.name || !expectedAuth.value) {
+			// Data is not defined on node so can not authenticate
+			throw new WebhookAuthorizationError(500, 'No authentication data defined on node!');
+		}
+		const headerName = (expectedAuth.name as string).toLowerCase();
+		const expectedValue = expectedAuth.value as string;
+
+		if (
+			!headers.hasOwnProperty(headerName) ||
+			(headers as IDataObject)[headerName] !== expectedValue
+		) {
+			// Provided authentication data is wrong
+			throw new WebhookAuthorizationError(403);
+		}
+	} else if (authentication === 'jwtAuth') {
+		let expectedAuth;
+
+		try {
+			expectedAuth = (await ctx.getCredentials('jwtAuth')) as {
+				keyType: 'passphrase' | 'pemKey';
+				publicKey: string;
+				secret: string;
+				algorithm: jwt.Algorithm;
+			};
+		} catch {}
+
+		if (expectedAuth === undefined) {
+			// Data is not defined on node so can not authenticate
+			throw new WebhookAuthorizationError(500, 'No authentication data defined on node!');
+		}
+
+		const authHeader = req.headers.authorization;
+		const token = authHeader?.split(' ')[1];
+
+		if (!token) {
+			throw new WebhookAuthorizationError(401, 'No token provided');
+		}
+
+		let secretOrPublicKey;
+
+		if (expectedAuth.keyType === 'passphrase') {
+			secretOrPublicKey = expectedAuth.secret;
+		} else {
+			secretOrPublicKey = formatPrivateKey(expectedAuth.publicKey, true);
+		}
+
+		try {
+			return jwt.verify(token, secretOrPublicKey, {
+				algorithms: [expectedAuth.algorithm],
+			}) as IDataObject;
+		} catch (error) {
+			throw new WebhookAuthorizationError(403, error.message);
+		}
+	}
+}
diff --git a/packages/workflow/src/Interfaces.ts b/packages/workflow/src/Interfaces.ts
index 057c500b0bbbf..357ae12cfb522 100644
--- a/packages/workflow/src/Interfaces.ts
+++ b/packages/workflow/src/Interfaces.ts
@@ -1464,6 +1464,7 @@ export namespace MultiPartFormData {
 		mimetype?: string;
 		originalFilename?: string;
 		newFilename: string;
+		size?: number;
 	}
 
 	export type Request = express.Request<

From e5dfd7faf998c67785b3f1ff0a5aacb2cfc9f4f8 Mon Sep 17 00:00:00 2001
From: Michael Kret <88898367+michael-radency@users.noreply.github.com>
Date: Mon, 29 Jul 2024 17:56:55 +0300
Subject: [PATCH 018/168] fix(n8n Form Trigger Node): Remove custom attribution
 option (no-changelog) (#10229)

---
 packages/cli/templates/form-trigger.handlebars        |  4 ----
 packages/nodes-base/nodes/Form/interfaces.ts          |  1 -
 packages/nodes-base/nodes/Form/test/utils.test.ts     |  3 ---
 packages/nodes-base/nodes/Form/utils.ts               |  5 -----
 .../nodes-base/nodes/Form/v2/FormTriggerV2.node.ts    | 11 -----------
 5 files changed, 24 deletions(-)

diff --git a/packages/cli/templates/form-trigger.handlebars b/packages/cli/templates/form-trigger.handlebars
index a4d0e6be9750c..a1abca87b81a4 100644
--- a/packages/cli/templates/form-trigger.handlebars
+++ b/packages/cli/templates/form-trigger.handlebars
@@ -460,9 +460,6 @@
 					<div class='n8n-link'>
 						<a href={{n8nWebsiteLink}} target='_blank'>
 							Form automated with
-							{{#if customAttribution}}
-								{{{customAttribution}}}
-							{{else}}
 							<svg
 								width='73'
 								height='20'
@@ -489,7 +486,6 @@
 									fill='#101330'
 								/>
 							</svg>
-							{{/if}}
 						</a>
 					</div>
 				{{/if}}
diff --git a/packages/nodes-base/nodes/Form/interfaces.ts b/packages/nodes-base/nodes/Form/interfaces.ts
index 206b495764440..330a7584dcacb 100644
--- a/packages/nodes-base/nodes/Form/interfaces.ts
+++ b/packages/nodes-base/nodes/Form/interfaces.ts
@@ -40,7 +40,6 @@ export type FormTriggerData = {
 	formFields: FormTriggerInput[];
 	useResponseData?: boolean;
 	appendAttribution?: boolean;
-	customAttribution?: string;
 };
 
 export const FORM_TRIGGER_AUTHENTICATION_PROPERTY = 'authentication';
diff --git a/packages/nodes-base/nodes/Form/test/utils.test.ts b/packages/nodes-base/nodes/Form/test/utils.test.ts
index 769da0d2ab8f9..bb44a354e6c0f 100644
--- a/packages/nodes-base/nodes/Form/test/utils.test.ts
+++ b/packages/nodes-base/nodes/Form/test/utils.test.ts
@@ -49,7 +49,6 @@ describe('FormTrigger, formWebhook', () => {
 
 		expect(mockRender).toHaveBeenCalledWith('form-trigger', {
 			appendAttribution: true,
-			customAttribution: undefined,
 			formDescription: 'Test Description',
 			formFields: [
 				{
@@ -247,7 +246,6 @@ describe('FormTrigger, prepareFormData', () => {
 			],
 			useResponseData: true,
 			appendAttribution: true,
-			customAttribution: undefined,
 			redirectUrl: 'https://example.com/thank-you',
 		});
 	});
@@ -293,7 +291,6 @@ describe('FormTrigger, prepareFormData', () => {
 			],
 			useResponseData: undefined,
 			appendAttribution: true,
-			customAttribution: undefined,
 		});
 	});
 
diff --git a/packages/nodes-base/nodes/Form/utils.ts b/packages/nodes-base/nodes/Form/utils.ts
index c5e8201b9b086..1928c935bdea8 100644
--- a/packages/nodes-base/nodes/Form/utils.ts
+++ b/packages/nodes-base/nodes/Form/utils.ts
@@ -26,7 +26,6 @@ export function prepareFormData({
 	instanceId,
 	useResponseData,
 	appendAttribution = true,
-	customAttribution,
 }: {
 	formTitle: string;
 	formDescription: string;
@@ -38,7 +37,6 @@ export function prepareFormData({
 	instanceId?: string;
 	useResponseData?: boolean;
 	appendAttribution?: boolean;
-	customAttribution?: string;
 }) {
 	const validForm = formFields.length > 0;
 	const utm_campaign = instanceId ? `&utm_campaign=${instanceId}` : '';
@@ -58,7 +56,6 @@ export function prepareFormData({
 		formFields: [],
 		useResponseData,
 		appendAttribution,
-		customAttribution,
 	};
 
 	if (redirectUrl) {
@@ -157,7 +154,6 @@ export async function formWebhook(context: IWebhookFunctions) {
 		formSubmittedText?: string;
 		useWorkflowTimezone?: boolean;
 		appendAttribution?: boolean;
-		customAttribution?: string;
 	};
 	const res = context.getResponseObject();
 	const req = context.getRequestObject();
@@ -225,7 +221,6 @@ export async function formWebhook(context: IWebhookFunctions) {
 			instanceId,
 			useResponseData,
 			appendAttribution,
-			customAttribution: options.customAttribution as string,
 		});
 
 		res.render('form-trigger', data);
diff --git a/packages/nodes-base/nodes/Form/v2/FormTriggerV2.node.ts b/packages/nodes-base/nodes/Form/v2/FormTriggerV2.node.ts
index 878cdc5b6a675..90d1242c933a9 100644
--- a/packages/nodes-base/nodes/Form/v2/FormTriggerV2.node.ts
+++ b/packages/nodes-base/nodes/Form/v2/FormTriggerV2.node.ts
@@ -115,17 +115,6 @@ const descriptionV2: INodeTypeDescription = {
 			placeholder: 'Add option',
 			default: {},
 			options: [
-				{
-					displayName: 'Custom Attribution',
-					name: 'customAttribution',
-					type: 'string',
-					placeholder: 'e.g. <svg> ...</svg>',
-					description: "HTML code that will be shown at the bottom of the form instead n8n's logo",
-					default: '',
-					typeOptions: {
-						rows: 2,
-					},
-				},
 				{
 					// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
 					displayName: 'Append n8n Attribution',

From 1a7713ef263680da43f08b6c8a15aee7a0341493 Mon Sep 17 00:00:00 2001
From: jeanpaul <jeanpaul@users.noreply.github.com>
Date: Mon, 29 Jul 2024 17:08:20 +0200
Subject: [PATCH 019/168] fix(core): Fix missing successful items on
 continueErrorOutput with multiple outputs (#10218)

---
 packages/core/src/WorkflowExecute.ts       |   7 +-
 packages/core/test/WorkflowExecute.test.ts |   5 +-
 packages/core/test/helpers/constants.ts    | 684 ++++++++++++++++-----
 packages/workflow/src/Interfaces.ts        |   1 +
 4 files changed, 542 insertions(+), 155 deletions(-)

diff --git a/packages/core/src/WorkflowExecute.ts b/packages/core/src/WorkflowExecute.ts
index ec58e6c5d2381..ce17eafa9bb0d 100644
--- a/packages/core/src/WorkflowExecute.ts
+++ b/packages/core/src/WorkflowExecute.ts
@@ -1125,7 +1125,6 @@ export class WorkflowExecute {
 									);
 
 									const errorItems: INodeExecutionData[] = [];
-									const successItems: INodeExecutionData[] = [];
 									const closeFunctions: CloseFunction[] = [];
 									// Create a WorkflowDataProxy instance that we can get the data of the
 									// item which did error
@@ -1150,8 +1149,10 @@ export class WorkflowExecute {
 										outputIndex < mainOutputTypes.length - 1;
 										outputIndex++
 									) {
-										successItems.length = 0;
-										const items = nodeSuccessData.length ? nodeSuccessData[0] : [];
+										const successItems: INodeExecutionData[] = [];
+										const items = nodeSuccessData[outputIndex]?.length
+											? nodeSuccessData[outputIndex]
+											: [];
 
 										while (items.length) {
 											const item = items.pop();
diff --git a/packages/core/test/WorkflowExecute.test.ts b/packages/core/test/WorkflowExecute.test.ts
index 684aeaee559d5..0d2b6a735c7c2 100644
--- a/packages/core/test/WorkflowExecute.test.ts
+++ b/packages/core/test/WorkflowExecute.test.ts
@@ -120,7 +120,10 @@ describe('WorkflowExecute', () => {
 						if (nodeData.data === undefined) {
 							return null;
 						}
-						return nodeData.data.main[0]!.map((entry) => entry.json);
+						const toMap = testData.output.testAllOutputs
+							? nodeData.data.main
+							: [nodeData.data.main[0]!];
+						return toMap.map((data) => data!.map((entry) => entry.json));
 					});
 
 					// expect(resultData).toEqual(testData.output.nodeData[nodeName]);
diff --git a/packages/core/test/helpers/constants.ts b/packages/core/test/helpers/constants.ts
index c71044cdb38ba..8bbb3f200bd97 100644
--- a/packages/core/test/helpers/constants.ts
+++ b/packages/core/test/helpers/constants.ts
@@ -2786,22 +2786,28 @@ export const v1WorkflowExecuteTests: WorkflowTestData[] = [
 			nodeData: {
 				Set1: [
 					[
-						{
-							value1: 1,
-						},
+						[
+							{
+								value1: 1,
+							},
+						],
 					],
 				],
 				Set2: [
 					[
-						{
-							value1: 1,
-							value2: 2,
-						},
+						[
+							{
+								value1: 1,
+								value2: 2,
+							},
+						],
 					],
 					[
-						{
-							value2: 2,
-						},
+						[
+							{
+								value2: 2,
+							},
+						],
 					],
 				],
 			},
@@ -3065,74 +3071,90 @@ export const v1WorkflowExecuteTests: WorkflowTestData[] = [
 			nodeData: {
 				Set1: [
 					[
-						{
-							value1: 1,
-						},
+						[
+							{
+								value1: 1,
+							},
+						],
 					],
 				],
 				Set2: [
 					[
-						{
-							value2: 2,
-						},
+						[
+							{
+								value2: 2,
+							},
+						],
 					],
 				],
 				Set3: [
 					[
-						{
-							value1: 1,
-							value3: 3,
-						},
+						[
+							{
+								value1: 1,
+								value3: 3,
+							},
+						],
 					],
 				],
 				Set4: [
 					[
-						{
-							value1: 1,
-							value3: 3,
-							value4: 4,
-						},
+						[
+							{
+								value1: 1,
+								value3: 3,
+								value4: 4,
+							},
+						],
 					],
 				],
 				Merge1: [
 					[
-						{
-							value1: 1,
-						},
-						{
-							value2: 2,
-						},
+						[
+							{
+								value1: 1,
+							},
+							{
+								value2: 2,
+							},
+						],
 					],
 				],
 				Merge2: [
 					[
-						{
-							value2: 2,
-						},
+						[
+							{
+								value2: 2,
+							},
+						],
 					],
 				],
 				Merge3: [
 					[
-						{
-							value1: 1,
-							value3: 3,
-							value4: 4,
-						},
-						{
-							value2: 2,
-						},
+						[
+							{
+								value1: 1,
+								value3: 3,
+								value4: 4,
+							},
+							{
+								value2: 2,
+							},
+						],
 					],
 				],
 				Merge4: [
 					[
-						{
-							value1: 1,
-							value3: 3,
-							value4: 4,
-						},
-						{
-							value2: 2,
-						},
+						[
+							{
+								value1: 1,
+								value3: 3,
+								value4: 4,
+							},
+							{
+								value2: 2,
+							},
+						],
 					],
 				],
 			},
@@ -3903,113 +3925,143 @@ export const v1WorkflowExecuteTests: WorkflowTestData[] = [
 				'Merge2',
 			],
 			nodeData: {
-				Start: [[{}]],
+				Start: [[[{}]]],
 				Set1: [
 					[
-						{
-							counter: 1,
-						},
+						[
+							{
+								counter: 1,
+							},
+						],
 					],
 					[
-						{
-							counter: 2,
-						},
+						[
+							{
+								counter: 2,
+							},
+						],
 					],
 					[
-						{
-							counter: 3,
-						},
+						[
+							{
+								counter: 3,
+							},
+						],
 					],
 				],
 				Set: [
 					[
-						{
-							counter: 1,
-						},
+						[
+							{
+								counter: 1,
+							},
+						],
 					],
 					[
-						{
-							counter: 2,
-						},
+						[
+							{
+								counter: 2,
+							},
+						],
 					],
 					[
-						{
-							counter: 3,
-						},
+						[
+							{
+								counter: 3,
+							},
+						],
 					],
 				],
 				IF1: [
 					[
-						{
-							counter: 1,
-						},
+						[
+							{
+								counter: 1,
+							},
+						],
 					],
 					[
-						{
-							counter: 2,
-						},
+						[
+							{
+								counter: 2,
+							},
+						],
 					],
-					[],
+					[[]],
 				],
 				IF: [
 					[
-						{
-							counter: 1,
-						},
+						[
+							{
+								counter: 1,
+							},
+						],
 					],
 					[
-						{
-							counter: 2,
-						},
+						[
+							{
+								counter: 2,
+							},
+						],
 					],
-					[],
+					[[]],
 				],
 				Merge1: [
 					[
-						{
-							counter: 1,
-						},
-						{
-							counter: 1,
-						},
+						[
+							{
+								counter: 1,
+							},
+							{
+								counter: 1,
+							},
+						],
 					],
 					[
-						{
-							counter: 2,
-						},
-						{
-							counter: 2,
-						},
+						[
+							{
+								counter: 2,
+							},
+							{
+								counter: 2,
+							},
+						],
 					],
 				],
 				Merge: [
 					[
-						{
-							counter: 3,
-						},
-						{},
+						[
+							{
+								counter: 3,
+							},
+							{},
+						],
 					],
 				],
 				Merge2: [
 					[
-						{
-							counter: 1,
-						},
-						{
-							counter: 1,
-						},
-						{
-							counter: 3,
-						},
-						{},
+						[
+							{
+								counter: 1,
+							},
+							{
+								counter: 1,
+							},
+							{
+								counter: 3,
+							},
+							{},
+						],
 					],
 					[
-						{
-							counter: 2,
-						},
-						{
-							counter: 2,
-						},
+						[
+							{
+								counter: 2,
+							},
+							{
+								counter: 2,
+							},
+						],
 					],
 				],
 			},
@@ -4159,9 +4211,11 @@ export const v1WorkflowExecuteTests: WorkflowTestData[] = [
 			nodeData: {
 				Merge: [
 					[
-						{
-							test: 'a',
-						},
+						[
+							{
+								test: 'a',
+							},
+						],
 					],
 				],
 			},
@@ -4535,62 +4589,390 @@ export const v1WorkflowExecuteTests: WorkflowTestData[] = [
 			nodeData: {
 				Merge1: [
 					[
-						{
-							test: 'a',
-						},
+						[
+							{
+								test: 'a',
+							},
+						],
 					],
 				],
 				Merge2: [
 					[
-						{
-							test: 'a',
-						},
+						[
+							{
+								test: 'a',
+							},
+						],
 					],
 				],
 				Merge4: [
 					[
-						{
-							test: 'a',
-						},
-						{
-							test: 'a',
-						},
+						[
+							{
+								test: 'a',
+							},
+							{
+								test: 'a',
+							},
+						],
 					],
 				],
 				Merge5: [
 					[
-						{
-							test: 'a',
-						},
-						{
-							test: 'a',
-						},
+						[
+							{
+								test: 'a',
+							},
+							{
+								test: 'a',
+							},
+						],
 					],
 				],
 				Merge6: [
 					[
-						{
-							test: 'a',
-						},
-						{
-							test: 'a',
-						},
-						{
-							test: 'a',
-						},
+						[
+							{
+								test: 'a',
+							},
+							{
+								test: 'a',
+							},
+							{
+								test: 'a',
+							},
+						],
 					],
 				],
 				Merge7: [
 					[
-						{
-							test: 'a',
+						[
+							{
+								test: 'a',
+							},
+							{
+								test: 'a',
+							},
+							{
+								test: 'a',
+							},
+						],
+					],
+				],
+			},
+		},
+	},
+	{
+		description:
+			'Should output successful branches on multi-output nodes with continueErrorOutput selected',
+		input: {
+			workflowData: {
+				nodes: [
+					{
+						parameters: {},
+						id: '84b789e9-0dfc-4aa3-b0b2-cedf8966f904',
+						name: 'Start',
+						type: 'n8n-nodes-base.start',
+						position: [440, 1100],
+						typeVersion: 1,
+					},
+					{
+						parameters: {
+							assignments: {
+								assignments: [
+									{
+										id: '1ba24256-5b24-43cb-9638-fc1c2074d210',
+										name: 'name',
+										value: 'foo',
+										type: 'string',
+									},
+									{
+										id: 'eee5a4fe-923d-46a2-b19e-c18b97a6c535',
+										name: 'value',
+										value: 'bar',
+										type: 'string',
+									},
+								],
+							},
+							options: {},
 						},
-						{
-							test: 'a',
+						id: '01720c87-f4ae-4e0f-89d7-0612a378226b',
+						name: 'Edit Fields',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 3.4,
+						position: [780, 980],
+					},
+					{
+						parameters: {
+							assignments: {
+								assignments: [
+									{
+										id: '9182c7f5-7262-4366-8c04-cbf2bae338c1',
+										name: 'name',
+										value: 'bar',
+										type: 'string',
+									},
+									{
+										id: 'cba31e58-23a9-4620-9cfc-ebb433528e6a',
+										name: 'value',
+										value: 'baz',
+										type: 'string',
+									},
+								],
+							},
+							options: {},
 						},
-						{
-							test: 'a',
+						id: '2e7977b0-f74f-46e7-af48-e5cbb41706e4',
+						name: 'Edit Fields1',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 3.4,
+						position: [780, 1180],
+					},
+					{
+						parameters: {},
+						id: '95f67825-9244-44dc-82b9-7a6d7792e948',
+						name: 'Merge',
+						type: 'n8n-nodes-base.merge',
+						typeVersion: 1,
+						position: [1080, 1060],
+					},
+					{
+						parameters: {
+							assignments: {
+								assignments: [
+									{
+										id: '14d413c6-5088-4fb9-a895-e2e71557322d',
+										name: 'name',
+										value: '={{ $json.name }}',
+										type: 'string',
+									},
+									{
+										id: '77f3d6d9-5ae7-4109-9144-9832f3e9f3bc',
+										name: 'value',
+										value: '={{ $json.value }}',
+										type: 'string',
+									},
+								],
+							},
+							options: {},
 						},
+						id: '89c06371-f539-4574-86a8-6ba9994924b4',
+						name: 'Edit Fields3',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 3.4,
+						position: [1580, 1180],
+					},
+					{
+						parameters: {
+							conditions: {
+								options: {
+									caseSensitive: true,
+									leftValue: '',
+									typeValidation: 'strict',
+								},
+								conditions: [
+									{
+										id: '96f95963-0edc-4d65-9935-6e141f39fcb1',
+										leftValue: '={{ $json.name }}',
+										rightValue: 'foo',
+										operator: {
+											type: 'string',
+											operation: 'equals',
+											name: 'filter.operator.equals',
+										},
+									},
+								],
+								combinator: 'and',
+							},
+							options: {},
+						},
+						id: '6fcdb8ea-9afc-44cb-a125-cef6cbb5765b',
+						name: 'If1',
+						type: 'n8n-nodes-base.if',
+						typeVersion: 2,
+						position: [1360, 1060],
+						onError: 'continueErrorOutput',
+					},
+					{
+						parameters: {
+							assignments: {
+								assignments: [
+									{
+										id: 'c8974629-7b62-40f8-8add-08e4dc8698be',
+										name: 'name',
+										value: '={{ $json.name }}',
+										type: 'string',
+									},
+									{
+										id: '341a502e-3952-4654-b299-822fb2d303fe',
+										name: 'value',
+										value: '={{ $json.value }}',
+										type: 'string',
+									},
+								],
+							},
+							options: {},
+						},
+						id: 'b4152f19-d0e6-43cd-8a90-9a7396856367',
+						name: 'Edit Fields2',
+						type: 'n8n-nodes-base.set',
+						typeVersion: 3.4,
+						position: [1580, 900],
+					},
+				],
+				connections: {
+					Start: {
+						main: [
+							[
+								{
+									node: 'Edit Fields',
+									type: NodeConnectionType.Main,
+									index: 0,
+								},
+								{
+									node: 'Edit Fields1',
+									type: NodeConnectionType.Main,
+									index: 0,
+								},
+							],
+						],
+					},
+					'Edit Fields': {
+						main: [
+							[
+								{
+									node: 'Merge',
+									type: NodeConnectionType.Main,
+									index: 0,
+								},
+							],
+						],
+					},
+					'Edit Fields1': {
+						main: [
+							[
+								{
+									node: 'Merge',
+									type: NodeConnectionType.Main,
+									index: 1,
+								},
+							],
+						],
+					},
+					Merge: {
+						main: [
+							[
+								{
+									node: 'If1',
+									type: NodeConnectionType.Main,
+									index: 0,
+								},
+							],
+						],
+					},
+					If1: {
+						main: [
+							[
+								{
+									node: 'Edit Fields2',
+									type: NodeConnectionType.Main,
+									index: 0,
+								},
+							],
+							[
+								{
+									node: 'Edit Fields3',
+									type: NodeConnectionType.Main,
+									index: 0,
+								},
+							],
+						],
+					},
+				},
+			},
+		},
+		output: {
+			nodeExecutionOrder: [
+				'Start',
+				'Edit Fields',
+				'Edit Fields1',
+				'Merge',
+				'If1',
+				'Edit Fields2',
+				'Edit Fields3',
+			],
+			testAllOutputs: true,
+			nodeData: {
+				Start: [[[{}]]],
+				'Edit Fields': [
+					[
+						[
+							{
+								name: 'foo',
+								value: 'bar',
+							},
+						],
+					],
+				],
+				'Edit Fields1': [
+					[
+						[
+							{
+								name: 'bar',
+								value: 'baz',
+							},
+						],
+					],
+				],
+				Merge: [
+					[
+						[
+							{
+								name: 'foo',
+								value: 'bar',
+							},
+							{
+								name: 'bar',
+								value: 'baz',
+							},
+						],
+					],
+				],
+				If1: [
+					[
+						[
+							{
+								name: 'foo',
+								value: 'bar',
+							},
+						],
+						[
+							{
+								name: 'bar',
+								value: 'baz',
+							},
+						],
+						[],
+					],
+				],
+				'Edit Fields2': [
+					[
+						[
+							{
+								name: 'foo',
+								value: 'bar',
+							},
+						],
+					],
+				],
+				'Edit Fields3': [
+					[
+						[
+							{
+								name: 'bar',
+								value: 'baz',
+							},
+						],
 					],
 				],
 			},
diff --git a/packages/workflow/src/Interfaces.ts b/packages/workflow/src/Interfaces.ts
index 357ae12cfb522..ea31b06fef34b 100644
--- a/packages/workflow/src/Interfaces.ts
+++ b/packages/workflow/src/Interfaces.ts
@@ -2257,6 +2257,7 @@ export interface WorkflowTestData {
 	};
 	output: {
 		nodeExecutionOrder?: string[];
+		testAllOutputs?: boolean;
 		nodeData: {
 			[key: string]: any[][];
 		};

From de50ef759078e32477ec18fa4ec69c6e129b2535 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Mon, 29 Jul 2024 17:27:02 +0200
Subject: [PATCH 020/168] refactor(core): Display stack trace in error reporter
 (no-changelog) (#10225)

---
 packages/workflow/src/ErrorReporterProxy.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/workflow/src/ErrorReporterProxy.ts b/packages/workflow/src/ErrorReporterProxy.ts
index de6c6bec306ca..b878fcedf0cf5 100644
--- a/packages/workflow/src/ErrorReporterProxy.ts
+++ b/packages/workflow/src/ErrorReporterProxy.ts
@@ -5,13 +5,17 @@ interface ErrorReporter {
 	report: (error: Error | string, options?: ReportingOptions) => void;
 }
 
+const { NODE_ENV } = process.env;
+const inDevelopment = !NODE_ENV || NODE_ENV === 'development';
+
 const instance: ErrorReporter = {
 	report: (error) => {
 		if (error instanceof Error) {
 			let e = error;
 			do {
 				const meta = e instanceof ApplicationError ? e.extra : undefined;
-				Logger.error(`${e.constructor.name}: ${e.message}`, meta);
+				if (inDevelopment) console.log(e, meta);
+				else Logger.error(`${e.constructor.name}: ${e.message}`, meta);
 				e = e.cause as Error;
 			} while (e);
 		}

From cf70b06545b4f7dc97abf04f9dd63a2408bbd861 Mon Sep 17 00:00:00 2001
From: Ricardo Espinoza <ricardo@n8n.io>
Date: Mon, 29 Jul 2024 14:13:54 -0400
Subject: [PATCH 021/168] feat(core): Show Public API key value only once
 (no-changelog) (#10126)

---
 packages/cli/src/controllers/me.controller.ts     | 15 ++++++++++++++-
 packages/cli/src/databases/entities/User.ts       |  2 +-
 packages/cli/test/integration/me.api.test.ts      | 12 ++++++------
 .../test/unit/controllers/me.controller.test.ts   |  8 ++++----
 packages/editor-ui/src/components/CopyInput.vue   | 11 ++++++++++-
 .../editor-ui/src/plugins/i18n/locales/en.json    |  1 +
 packages/editor-ui/src/views/SettingsApiView.vue  |  7 ++++++-
 7 files changed, 42 insertions(+), 14 deletions(-)

diff --git a/packages/cli/src/controllers/me.controller.ts b/packages/cli/src/controllers/me.controller.ts
index 1e3fc22ca2755..62a2e101ff27d 100644
--- a/packages/cli/src/controllers/me.controller.ts
+++ b/packages/cli/src/controllers/me.controller.ts
@@ -25,6 +25,8 @@ import { UserRepository } from '@/databases/repositories/user.repository';
 import { isApiEnabled } from '@/PublicApi';
 import { EventService } from '@/eventbus/event.service';
 
+export const API_KEY_PREFIX = 'n8n_api_';
+
 export const isApiEnabledMiddleware: RequestHandler = (_, res, next) => {
 	if (isApiEnabled()) {
 		next();
@@ -208,7 +210,8 @@ export class MeController {
 	 */
 	@Get('/api-key', { middlewares: [isApiEnabledMiddleware] })
 	async getAPIKey(req: AuthenticatedRequest) {
-		return { apiKey: req.user.apiKey };
+		const apiKey = this.redactApiKey(req.user.apiKey);
+		return { apiKey };
 	}
 
 	/**
@@ -242,4 +245,14 @@ export class MeController {
 
 		return user.settings;
 	}
+
+	private redactApiKey(apiKey: string | null) {
+		if (!apiKey) return;
+		const keepLength = 5;
+		return (
+			API_KEY_PREFIX +
+			apiKey.slice(API_KEY_PREFIX.length, API_KEY_PREFIX.length + keepLength) +
+			'*'.repeat(apiKey.length - API_KEY_PREFIX.length - keepLength)
+		);
+	}
 }
diff --git a/packages/cli/src/databases/entities/User.ts b/packages/cli/src/databases/entities/User.ts
index 5755f24d847fc..d24af19742e6a 100644
--- a/packages/cli/src/databases/entities/User.ts
+++ b/packages/cli/src/databases/entities/User.ts
@@ -104,7 +104,7 @@ export class User extends WithTimestamps implements IUser {
 
 	@Column({ type: String, nullable: true })
 	@Index({ unique: true })
-	apiKey?: string | null;
+	apiKey: string | null;
 
 	@Column({ type: Boolean, default: false })
 	mfaEnabled: boolean;
diff --git a/packages/cli/test/integration/me.api.test.ts b/packages/cli/test/integration/me.api.test.ts
index 30e2ff27d1a8f..ef9757dc4439c 100644
--- a/packages/cli/test/integration/me.api.test.ts
+++ b/packages/cli/test/integration/me.api.test.ts
@@ -175,14 +175,14 @@ describe('Owner shell', () => {
 		expect(storedShellOwner.apiKey).toEqual(response.body.data.apiKey);
 	});
 
-	test('GET /me/api-key should fetch the api key', async () => {
+	test('GET /me/api-key should fetch the api key redacted', async () => {
 		const response = await authOwnerShellAgent.get('/me/api-key');
 
 		expect(response.statusCode).toBe(200);
-		expect(response.body.data.apiKey).toEqual(ownerShell.apiKey);
+		expect(response.body.data.apiKey).not.toEqual(ownerShell.apiKey);
 	});
 
-	test('DELETE /me/api-key should fetch the api key', async () => {
+	test('DELETE /me/api-key should delete the api key', async () => {
 		const response = await authOwnerShellAgent.delete('/me/api-key');
 
 		expect(response.statusCode).toBe(200);
@@ -327,14 +327,14 @@ describe('Member', () => {
 		expect(storedMember.apiKey).toEqual(response.body.data.apiKey);
 	});
 
-	test('GET /me/api-key should fetch the api key', async () => {
+	test('GET /me/api-key should fetch the api key redacted', async () => {
 		const response = await testServer.authAgentFor(member).get('/me/api-key');
 
 		expect(response.statusCode).toBe(200);
-		expect(response.body.data.apiKey).toEqual(member.apiKey);
+		expect(response.body.data.apiKey).not.toEqual(member.apiKey);
 	});
 
-	test('DELETE /me/api-key should fetch the api key', async () => {
+	test('DELETE /me/api-key should delete the api key', async () => {
 		const response = await testServer.authAgentFor(member).delete('/me/api-key');
 
 		expect(response.statusCode).toBe(200);
diff --git a/packages/cli/test/unit/controllers/me.controller.test.ts b/packages/cli/test/unit/controllers/me.controller.test.ts
index 6a9bff1251739..2416ecafbddb4 100644
--- a/packages/cli/test/unit/controllers/me.controller.test.ts
+++ b/packages/cli/test/unit/controllers/me.controller.test.ts
@@ -4,7 +4,7 @@ import jwt from 'jsonwebtoken';
 import { mock, anyObject } from 'jest-mock-extended';
 import type { PublicUser } from '@/Interfaces';
 import type { User } from '@db/entities/User';
-import { MeController } from '@/controllers/me.controller';
+import { API_KEY_PREFIX, MeController } from '@/controllers/me.controller';
 import { AUTH_COOKIE_NAME } from '@/constants';
 import type { AuthenticatedRequest, MeRequest } from '@/requests';
 import { UserService } from '@/services/user.service';
@@ -223,7 +223,7 @@ describe('MeController', () => {
 	describe('API Key methods', () => {
 		let req: AuthenticatedRequest;
 		beforeAll(() => {
-			req = mock({ user: mock<Partial<User>>({ id: '123', apiKey: 'test-key' }) });
+			req = mock({ user: mock<Partial<User>>({ id: '123', apiKey: `${API_KEY_PREFIX}test-key` }) });
 		});
 
 		describe('createAPIKey', () => {
@@ -234,9 +234,9 @@ describe('MeController', () => {
 		});
 
 		describe('getAPIKey', () => {
-			it('should return the users api key', async () => {
+			it('should return the users api key redacted', async () => {
 				const { apiKey } = await controller.getAPIKey(req);
-				expect(apiKey).toEqual(req.user.apiKey);
+				expect(apiKey).not.toEqual(req.user.apiKey);
 			});
 		});
 
diff --git a/packages/editor-ui/src/components/CopyInput.vue b/packages/editor-ui/src/components/CopyInput.vue
index e25a37007d7fa..8171885b265b5 100644
--- a/packages/editor-ui/src/components/CopyInput.vue
+++ b/packages/editor-ui/src/components/CopyInput.vue
@@ -6,13 +6,14 @@
 					[$style.copyText]: true,
 					[$style[size]]: true,
 					[$style.collapsed]: collapse,
+					[$style.noHover]: disableCopy,
 					'ph-no-capture': redactValue,
 				}"
 				data-test-id="copy-input"
 				@click="copy"
 			>
 				<span ref="copyInputValue">{{ value }}</span>
-				<div :class="$style.copyButton">
+				<div v-if="!disableCopy" :class="$style.copyButton">
 					<span>{{ copyButtonText }}</span>
 				</div>
 			</div>
@@ -36,6 +37,7 @@ type Props = {
 	size?: 'medium' | 'large';
 	collapse?: boolean;
 	redactValue?: boolean;
+	disableCopy: boolean;
 };
 
 const props = withDefaults(defineProps<Props>(), {
@@ -46,6 +48,7 @@ const props = withDefaults(defineProps<Props>(), {
 	size: 'medium',
 	copyButtonText: useI18n().baseText('generic.copy'),
 	toastTitle: useI18n().baseText('generic.copiedToClipboard'),
+	disableCopy: false,
 });
 const emit = defineEmits<{
 	copy: [];
@@ -55,6 +58,8 @@ const clipboard = useClipboard();
 const { showMessage } = useToast();
 
 function copy() {
+	if (props.disableCopy) return;
+
 	emit('copy');
 	void clipboard.copy(props.value ?? '');
 
@@ -88,6 +93,10 @@ function copy() {
 	}
 }
 
+.noHover {
+	cursor: default;
+}
+
 .large {
 	span {
 		font-size: var(--font-size-s);
diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json
index 5823850ff7977..b86ebe0f3e053 100644
--- a/packages/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/editor-ui/src/plugins/i18n/locales/en.json
@@ -1724,6 +1724,7 @@
 	"settings.api.view.copy.toast": "API Key copied to clipboard",
 	"settings.api.view.apiPlayground": "API Playground",
 	"settings.api.view.info": "Use your API Key to control n8n programmatically using the {apiAction}. But if you only want to trigger workflows, consider using the {webhookAction} instead.",
+	"settings.api.view.copy": "Make sure to copy your API key now as you will not be able to see this again.",
 	"settings.api.view.info.api": "n8n API",
 	"settings.api.view.info.webhook": "webhook node",
 	"settings.api.view.myKey": "My API Key",
diff --git a/packages/editor-ui/src/views/SettingsApiView.vue b/packages/editor-ui/src/views/SettingsApiView.vue
index 7681f872b956d..22219ef339b35 100644
--- a/packages/editor-ui/src/views/SettingsApiView.vue
+++ b/packages/editor-ui/src/views/SettingsApiView.vue
@@ -43,11 +43,13 @@
 						:copy-button-text="$locale.baseText('generic.clickToCopy')"
 						:toast-title="$locale.baseText('settings.api.view.copy.toast')"
 						:redact-value="true"
+						:disable-copy="isRedactedApiKey"
+						:hint="!isRedactedApiKey ? $locale.baseText('settings.api.view.copy') : ''"
 						@copy="onCopy"
 					/>
 				</div>
 			</n8n-card>
-			<div :class="$style.hint">
+			<div v-if="!isRedactedApiKey" :class="$style.hint">
 				<n8n-text size="small">
 					{{
 						$locale.baseText(`settings.api.view.${swaggerUIEnabled ? 'tryapi' : 'more-details'}`)
@@ -146,6 +148,9 @@ export default defineComponent({
 		isPublicApiEnabled(): boolean {
 			return this.settingsStore.isPublicApiEnabled;
 		},
+		isRedactedApiKey(): boolean {
+			return this.apiKey.includes('*');
+		},
 	},
 	methods: {
 		onUpgrade() {

From f5722e8823ccd2bc2b5f43ba3c849797d5690a93 Mon Sep 17 00:00:00 2001
From: Michael Kret <88898367+michael-radency@users.noreply.github.com>
Date: Mon, 29 Jul 2024 21:28:16 +0300
Subject: [PATCH 022/168] fix(Google BigQuery Node): Send timeoutMs in query,
 pagination support (#10205)

---
 .../test/v2/node/executeQuery.test.ts         | 13 ++--
 .../test/v2/node/insert.autoMapMode.test.ts   |  8 +--
 .../test/v2/node/insert.manualMode.test.ts    |  8 +--
 .../database/executeQuery.operation.ts        | 61 ++++++++++++++-----
 .../v2/actions/database/insert.operation.ts   |  6 +-
 .../Google/BigQuery/v2/methods/listSearch.ts  |  8 +--
 .../Google/BigQuery/v2/methods/loadOptions.ts |  6 +-
 .../Google/BigQuery/v2/transport/index.ts     | 17 +++---
 8 files changed, 80 insertions(+), 47 deletions(-)

diff --git a/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/executeQuery.test.ts b/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/executeQuery.test.ts
index 39cefa7319002..f7a0965d3d2ac 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/executeQuery.test.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/executeQuery.test.ts
@@ -10,7 +10,7 @@ jest.mock('../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../v2/transport');
 	return {
 		...originalModule,
-		googleApiRequest: jest.fn(async (method: IHttpRequestMethods, resource: string) => {
+		googleBigQueryApiRequest: jest.fn(async (method: IHttpRequestMethods, resource: string) => {
 			if (resource === '/v2/projects/test-project/jobs' && method === 'POST') {
 				return {
 					jobReference: {
@@ -25,7 +25,7 @@ jest.mock('../../../v2/transport', () => {
 				return {};
 			}
 		}),
-		// googleApiRequestAllItems: jest.fn(async () => {}),
+		googleBigQueryApiRequestAllItems: jest.fn(async () => ({ rows: [], schema: {} })),
 	};
 });
 
@@ -47,8 +47,9 @@ describe('Test Google BigQuery V2, executeQuery', () => {
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
 		const { result } = await executeWorkflow(testData, types);
 
-		expect(transport.googleApiRequest).toHaveBeenCalledTimes(2);
-		expect(transport.googleApiRequest).toHaveBeenCalledWith(
+		expect(transport.googleBigQueryApiRequest).toHaveBeenCalledTimes(1);
+		expect(transport.googleBigQueryApiRequestAllItems).toHaveBeenCalledTimes(1);
+		expect(transport.googleBigQueryApiRequest).toHaveBeenCalledWith(
 			'POST',
 			'/v2/projects/test-project/jobs',
 			{
@@ -60,11 +61,11 @@ describe('Test Google BigQuery V2, executeQuery', () => {
 				},
 			},
 		);
-		expect(transport.googleApiRequest).toHaveBeenCalledWith(
+		expect(transport.googleBigQueryApiRequestAllItems).toHaveBeenCalledWith(
 			'GET',
 			'/v2/projects/test-project/queries/job_123',
 			undefined,
-			{},
+			{ location: undefined, maxResults: 1000, timeoutMs: 10000 },
 		);
 
 		expect(result.finished).toEqual(true);
diff --git a/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/insert.autoMapMode.test.ts b/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/insert.autoMapMode.test.ts
index 001a06315f202..4ee4627838cce 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/insert.autoMapMode.test.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/insert.autoMapMode.test.ts
@@ -10,7 +10,7 @@ jest.mock('../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../v2/transport');
 	return {
 		...originalModule,
-		googleApiRequest: jest.fn(async (method: IHttpRequestMethods, resource: string) => {
+		googleBigQueryApiRequest: jest.fn(async (method: IHttpRequestMethods, resource: string) => {
 			if (
 				resource ===
 					'/v2/projects/test-project/datasets/bigquery_node_dev_test_dataset/tables/num_text' &&
@@ -55,13 +55,13 @@ describe('Test Google BigQuery V2, insert auto map', () => {
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
 		const { result } = await executeWorkflow(testData, types);
 
-		expect(transport.googleApiRequest).toHaveBeenCalledTimes(2);
-		expect(transport.googleApiRequest).toHaveBeenCalledWith(
+		expect(transport.googleBigQueryApiRequest).toHaveBeenCalledTimes(2);
+		expect(transport.googleBigQueryApiRequest).toHaveBeenCalledWith(
 			'GET',
 			'/v2/projects/test-project/datasets/bigquery_node_dev_test_dataset/tables/num_text',
 			{},
 		);
-		expect(transport.googleApiRequest).toHaveBeenCalledWith(
+		expect(transport.googleBigQueryApiRequest).toHaveBeenCalledWith(
 			'POST',
 			'/v2/projects/test-project/datasets/bigquery_node_dev_test_dataset/tables/num_text/insertAll',
 			{
diff --git a/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/insert.manualMode.test.ts b/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/insert.manualMode.test.ts
index 0d0215d5cd594..f4d94dda8b963 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/insert.manualMode.test.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/insert.manualMode.test.ts
@@ -10,7 +10,7 @@ jest.mock('../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../v2/transport');
 	return {
 		...originalModule,
-		googleApiRequest: jest.fn(async (method: IHttpRequestMethods, resource: string) => {
+		googleBigQueryApiRequest: jest.fn(async (method: IHttpRequestMethods, resource: string) => {
 			if (
 				resource ===
 					'/v2/projects/test-project/datasets/bigquery_node_dev_test_dataset/tables/test_json' &&
@@ -56,13 +56,13 @@ describe('Test Google BigQuery V2, insert define manually', () => {
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
 		const { result } = await executeWorkflow(testData, types);
 
-		expect(transport.googleApiRequest).toHaveBeenCalledTimes(2);
-		expect(transport.googleApiRequest).toHaveBeenCalledWith(
+		expect(transport.googleBigQueryApiRequest).toHaveBeenCalledTimes(2);
+		expect(transport.googleBigQueryApiRequest).toHaveBeenCalledWith(
 			'GET',
 			'/v2/projects/test-project/datasets/bigquery_node_dev_test_dataset/tables/test_json',
 			{},
 		);
-		expect(transport.googleApiRequest).toHaveBeenCalledWith(
+		expect(transport.googleBigQueryApiRequest).toHaveBeenCalledWith(
 			'POST',
 			'/v2/projects/test-project/datasets/bigquery_node_dev_test_dataset/tables/test_json/insertAll',
 			{
diff --git a/packages/nodes-base/nodes/Google/BigQuery/v2/actions/database/executeQuery.operation.ts b/packages/nodes-base/nodes/Google/BigQuery/v2/actions/database/executeQuery.operation.ts
index 4752b2631c810..2561a6e5a2dda 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/v2/actions/database/executeQuery.operation.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/v2/actions/database/executeQuery.operation.ts
@@ -9,7 +9,7 @@ import { ApplicationError, NodeOperationError, sleep } from 'n8n-workflow';
 import type { ResponseWithJobReference } from '../../helpers/interfaces';
 
 import { prepareOutput } from '../../helpers/utils';
-import { googleApiRequest } from '../../transport';
+import { googleBigQueryApiRequestAllItems, googleBigQueryApiRequest } from '../../transport';
 import { getResolvables, updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
@@ -108,18 +108,21 @@ const properties: INodeProperties[] = [
 					'Limits the bytes billed for this query. Queries with bytes billed above this limit will fail (without incurring a charge). String in <a href="https://developers.google.com/discovery/v1/type-format?utm_source=cloud.google.com&utm_medium=referral" target="_blank">Int64Value</a> format',
 			},
 			{
-				displayName: 'Max Results',
+				displayName: 'Max Results Per Page',
 				name: 'maxResults',
 				type: 'number',
 				default: 1000,
-				description: 'The maximum number of rows of data to return',
+				description:
+					'Maximum number of results to return per page of results. This is particularly useful when dealing with large datasets. It will not affect the total number of results returned, e.g. rows in a table. You can use LIMIT in your SQL query to limit the number of rows returned.',
 			},
 			{
 				displayName: 'Timeout',
 				name: 'timeoutMs',
 				type: 'number',
 				default: 10000,
-				description: 'How long to wait for the query to complete, in milliseconds',
+				hint: 'How long to wait for the query to complete, in milliseconds',
+				description:
+					'Specifies the maximum amount of time, in milliseconds, that the client is willing to wait for the query to complete. Be aware that the call is not guaranteed to wait for the specified timeout; it typically returns after around 200 seconds (200,000 milliseconds), even if the query is not complete.',
 			},
 			{
 				displayName: 'Raw Output',
@@ -154,19 +157,31 @@ const displayOptions = {
 export const description = updateDisplayOptions(displayOptions, properties);
 
 export async function execute(this: IExecuteFunctions): Promise<INodeExecutionData[]> {
-	// https://cloud.google.com/bigquery/docs/reference/rest/v2/jobs/query
-
 	const items = this.getInputData();
 	const length = items.length;
 
 	const returnData: INodeExecutionData[] = [];
 
 	let jobs = [];
+	let maxResults = 1000;
+	let timeoutMs = 10000;
 
 	for (let i = 0; i < length; i++) {
 		try {
 			let sqlQuery = this.getNodeParameter('sqlQuery', i) as string;
-			const options = this.getNodeParameter('options', i);
+
+			const options = this.getNodeParameter('options', i) as {
+				defaultDataset?: string;
+				dryRun?: boolean;
+				includeSchema?: boolean;
+				location?: string;
+				maximumBytesBilled?: string;
+				maxResults?: number;
+				timeoutMs?: number;
+				rawOutput?: boolean;
+				useLegacySql?: boolean;
+			};
+
 			const projectId = this.getNodeParameter('projectId', i, undefined, {
 				extractValue: true,
 			});
@@ -179,15 +194,25 @@ export async function execute(this: IExecuteFunctions): Promise<INodeExecutionDa
 			let includeSchema = false;
 
 			if (options.rawOutput !== undefined) {
-				rawOutput = options.rawOutput as boolean;
+				rawOutput = options.rawOutput;
 				delete options.rawOutput;
 			}
 
 			if (options.includeSchema !== undefined) {
-				includeSchema = options.includeSchema as boolean;
+				includeSchema = options.includeSchema;
 				delete options.includeSchema;
 			}
 
+			if (options.maxResults) {
+				maxResults = options.maxResults;
+				delete options.maxResults;
+			}
+
+			if (options.timeoutMs) {
+				timeoutMs = options.timeoutMs;
+				delete options.timeoutMs;
+			}
+
 			const body: IDataObject = { ...options };
 
 			body.query = sqlQuery;
@@ -203,7 +228,8 @@ export async function execute(this: IExecuteFunctions): Promise<INodeExecutionDa
 				body.useLegacySql = false;
 			}
 
-			const response: ResponseWithJobReference = await googleApiRequest.call(
+			//https://cloud.google.com/bigquery/docs/reference/rest/v2/jobs/insert
+			const response: ResponseWithJobReference = await googleBigQueryApiRequest.call(
 				this,
 				'POST',
 				`/v2/projects/${projectId}/jobs`,
@@ -222,13 +248,14 @@ export async function execute(this: IExecuteFunctions): Promise<INodeExecutionDa
 			}
 
 			const jobId = response?.jobReference?.jobId;
-			const raw = rawOutput || (options.dryRun as boolean) || false;
+			const raw = rawOutput || options.dryRun || false;
 			const location = options.location || response.jobReference.location;
 
 			if (response.status?.state === 'DONE') {
-				const qs = { location };
+				const qs = { location, maxResults, timeoutMs };
 
-				const queryResponse: IDataObject = await googleApiRequest.call(
+				//https://cloud.google.com/bigquery/docs/reference/rest/v2/jobs/getQueryResults
+				const queryResponse: IDataObject = await googleBigQueryApiRequestAllItems.call(
 					this,
 					'GET',
 					`/v2/projects/${projectId}/queries/${jobId}`,
@@ -272,9 +299,13 @@ export async function execute(this: IExecuteFunctions): Promise<INodeExecutionDa
 
 		for (const job of jobs) {
 			try {
-				const qs = job.location ? { location: job.location } : {};
+				const qs: IDataObject = job.location ? { location: job.location } : {};
+
+				qs.maxResults = maxResults;
+				qs.timeoutMs = timeoutMs;
 
-				const response: IDataObject = await googleApiRequest.call(
+				//https://cloud.google.com/bigquery/docs/reference/rest/v2/jobs/getQueryResults
+				const response: IDataObject = await googleBigQueryApiRequestAllItems.call(
 					this,
 					'GET',
 					`/v2/projects/${job.projectId}/queries/${job.jobId}`,
diff --git a/packages/nodes-base/nodes/Google/BigQuery/v2/actions/database/insert.operation.ts b/packages/nodes-base/nodes/Google/BigQuery/v2/actions/database/insert.operation.ts
index e42867ea394a4..899686a10692c 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/v2/actions/database/insert.operation.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/v2/actions/database/insert.operation.ts
@@ -8,7 +8,7 @@ import { NodeOperationError } from 'n8n-workflow';
 import { v4 as uuid } from 'uuid';
 import type { TableSchema } from '../../helpers/interfaces';
 import { checkSchema, wrapData } from '../../helpers/utils';
-import { googleApiRequest } from '../../transport';
+import { googleBigQueryApiRequest } from '../../transport';
 import { generatePairedItemData, updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
@@ -178,7 +178,7 @@ export async function execute(this: IExecuteFunctions): Promise<INodeExecutionDa
 	}
 
 	const schema = (
-		await googleApiRequest.call(
+		await googleBigQueryApiRequest.call(
 			this,
 			'GET',
 			`/v2/projects/${projectId}/datasets/${datasetId}/tables/${tableId}`,
@@ -230,7 +230,7 @@ export async function execute(this: IExecuteFunctions): Promise<INodeExecutionDa
 		const batch = rows.slice(i, i + batchSize);
 		body.rows = batch;
 
-		const responseData = await googleApiRequest.call(
+		const responseData = await googleBigQueryApiRequest.call(
 			this,
 			'POST',
 			`/v2/projects/${projectId}/datasets/${datasetId}/tables/${tableId}/insertAll`,
diff --git a/packages/nodes-base/nodes/Google/BigQuery/v2/methods/listSearch.ts b/packages/nodes-base/nodes/Google/BigQuery/v2/methods/listSearch.ts
index 40f44b6151ef7..2fb7cae03b3c7 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/v2/methods/listSearch.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/v2/methods/listSearch.ts
@@ -1,5 +1,5 @@
 import type { IDataObject, ILoadOptionsFunctions, INodeListSearchResult } from 'n8n-workflow';
-import { googleApiRequest } from '../transport';
+import { googleBigQueryApiRequest } from '../transport';
 
 export async function searchProjects(
 	this: ILoadOptionsFunctions,
@@ -10,7 +10,7 @@ export async function searchProjects(
 		pageToken: (paginationToken as string) || undefined,
 	};
 
-	const response = await googleApiRequest.call(this, 'GET', '/v2/projects', undefined, qs);
+	const response = await googleBigQueryApiRequest.call(this, 'GET', '/v2/projects', undefined, qs);
 
 	let { projects } = response;
 
@@ -45,7 +45,7 @@ export async function searchDatasets(
 		pageToken: (paginationToken as string) || undefined,
 	};
 
-	const response = await googleApiRequest.call(
+	const response = await googleBigQueryApiRequest.call(
 		this,
 		'GET',
 		`/v2/projects/${projectId}/datasets`,
@@ -87,7 +87,7 @@ export async function searchTables(
 		pageToken: (paginationToken as string) || undefined,
 	};
 
-	const response = await googleApiRequest.call(
+	const response = await googleBigQueryApiRequest.call(
 		this,
 		'GET',
 		`/v2/projects/${projectId}/datasets/${datasetId}/tables`,
diff --git a/packages/nodes-base/nodes/Google/BigQuery/v2/methods/loadOptions.ts b/packages/nodes-base/nodes/Google/BigQuery/v2/methods/loadOptions.ts
index aaf6fe7608eac..7b69f91570510 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/v2/methods/loadOptions.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/v2/methods/loadOptions.ts
@@ -1,12 +1,12 @@
 import type { IDataObject, ILoadOptionsFunctions, INodePropertyOptions } from 'n8n-workflow';
-import { googleApiRequest } from '../transport';
+import { googleBigQueryApiRequest } from '../transport';
 
 export async function getDatasets(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
 	const projectId = this.getNodeParameter('projectId', undefined, {
 		extractValue: true,
 	});
 	const returnData: INodePropertyOptions[] = [];
-	const { datasets } = await googleApiRequest.call(
+	const { datasets } = await googleBigQueryApiRequest.call(
 		this,
 		'GET',
 		`/v2/projects/${projectId}/datasets`,
@@ -33,7 +33,7 @@ export async function getSchema(this: ILoadOptionsFunctions): Promise<INodePrope
 
 	const returnData: INodePropertyOptions[] = [];
 
-	const { schema } = await googleApiRequest.call(
+	const { schema } = await googleBigQueryApiRequest.call(
 		this,
 		'GET',
 		`/v2/projects/${projectId}/datasets/${datasetId}/tables/${tableId}`,
diff --git a/packages/nodes-base/nodes/Google/BigQuery/v2/transport/index.ts b/packages/nodes-base/nodes/Google/BigQuery/v2/transport/index.ts
index d2ed271e24930..0f121b2a09259 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/v2/transport/index.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/v2/transport/index.ts
@@ -9,7 +9,7 @@ import type {
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 import { getGoogleAccessToken } from '../../../GenericFunctions';
 
-export async function googleApiRequest(
+export async function googleBigQueryApiRequest(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
 	method: IHttpRequestMethods,
 	resource: string,
@@ -67,25 +67,26 @@ export async function googleApiRequest(
 	}
 }
 
-export async function googleApiRequestAllItems(
+export async function googleBigQueryApiRequestAllItems(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
-	propertyName: string,
 	method: IHttpRequestMethods,
 	endpoint: string,
 	body: IDataObject = {},
 	query: IDataObject = {},
 ) {
-	const returnData: IDataObject[] = [];
+	let rows: IDataObject[] = [];
 
 	let responseData;
-	query.maxResults = 10000;
+	if (query.maxResults === undefined) {
+		query.maxResults = 1000;
+	}
 
 	do {
-		responseData = await googleApiRequest.call(this, method, endpoint, body, query);
+		responseData = await googleBigQueryApiRequest.call(this, method, endpoint, body, query);
 
 		query.pageToken = responseData.pageToken;
-		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
+		rows = rows.concat((responseData.rows as IDataObject[]) ?? []);
 	} while (responseData.pageToken !== undefined && responseData.pageToken !== '');
 
-	return returnData;
+	return { ...(responseData || {}), rows };
 }

From 361b5e7c37ba49b68dcf5b8122621aad4d8d96e0 Mon Sep 17 00:00:00 2001
From: Jon <jonathan.bennetts@gmail.com>
Date: Tue, 30 Jul 2024 07:35:42 +0100
Subject: [PATCH 023/168] fix(LinkedIn Node): Fix issue with some characters
 cutting off posts early (#10185)

---
 packages/nodes-base/nodes/LinkedIn/LinkedIn.node.ts | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/nodes-base/nodes/LinkedIn/LinkedIn.node.ts b/packages/nodes-base/nodes/LinkedIn/LinkedIn.node.ts
index 44272830e7d35..576a1accf391a 100644
--- a/packages/nodes-base/nodes/LinkedIn/LinkedIn.node.ts
+++ b/packages/nodes-base/nodes/LinkedIn/LinkedIn.node.ts
@@ -121,11 +121,14 @@ export class LinkedIn implements INodeType {
 			try {
 				if (resource === 'post') {
 					if (operation === 'create') {
-						const text = this.getNodeParameter('text', i) as string;
+						let text = this.getNodeParameter('text', i) as string;
 						const shareMediaCategory = this.getNodeParameter('shareMediaCategory', i) as string;
 						const postAs = this.getNodeParameter('postAs', i) as string;
 						const additionalFields = this.getNodeParameter('additionalFields', i);
 
+						// LinkedIn uses "little text" https://learn.microsoft.com/en-us/linkedin/marketing/community-management/shares/little-text-format?view=li-lms-2024-06
+						text = text.replace(/[\(*\)\[\]\{\}<>@|~_]/gm, (char) => '\\' + char);
+
 						let authorUrn = '';
 						let visibility = 'PUBLIC';
 
@@ -264,7 +267,9 @@ export class LinkedIn implements INodeType {
 								delete body.title;
 							}
 						} else {
-							Object.assign(body, { commentary: text });
+							Object.assign(body, {
+								commentary: text,
+							});
 						}
 						const endpoint = '/posts';
 						responseData = await linkedInApiRequest.call(this, 'POST', endpoint, body);

From 47c790402822ad153e498c78a9aed3216f4cf3cb Mon Sep 17 00:00:00 2001
From: Jon <jonathan.bennetts@gmail.com>
Date: Tue, 30 Jul 2024 07:35:58 +0100
Subject: [PATCH 024/168] docs: Update login url for OpenAI node (no-changelog)
 (#10222)

---
 packages/editor-ui/src/plugins/i18n/locales/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json
index b86ebe0f3e053..e5ee0088590c8 100644
--- a/packages/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/editor-ui/src/plugins/i18n/locales/en.json
@@ -542,7 +542,7 @@
 	"credentialEdit.credentialSharing.role.user": "User",
 	"credentialEdit.docs.aws": "Configure this credential:\n\n- Select your AWS **Region**.\n- Log in to your <a href=\"https://aws.amazon.com/\" target=\"_blank\">AWS</a> account.\n- Generate your access key pair:\n  - Open the AWS <a href=\"https://console.aws.amazon.com/iam\" target=\"_blank\">IAM console</a> and open your user menu.\n  - Select **Security credentials**.\n  - Create a new access key pair in the **Access Keys** section.\n  - Reveal the **Access Key ID** and **Secret Access Key** and enter them in n8n.\n- To use a **temporary security credential**, turn this option on and add a **Session token**.\n- If you use Amazon Virtual Private Cloud <a href=\"https://aws.amazon.com/vpc/\" target=\"_blank\">VPC</a> to host n8n, you can establish a connection between your VPC and some apps. Use **Custom Endpoints** to enter relevant custom endpoint(s) for this connection.\n\nClick the docs link above for more detailed instructions.",
 	"credentialEdit.docs.gmailOAuth2": "Configure this credential:\n\n- Log in to your <a href=\"https://cloud.google.com/\" target=\"_blank\">Google Cloud</a> account.\n- Go to <a href=\"https://console.cloud.google.com/apis/credentials\" target=\"_blank\">Google Cloud Console / APIs and services</a> and choose the project you want to use from the select at the top left (or create a new one and select it).\n- If you haven't used OAuth in this Google Cloud project before, <a href=\"https://developers.google.com/workspace/guides/configure-oauth-consent\" target=\"_blank\">configure the OAuth consent screen</a>.\n- In Credentials, select **+ CREATE CREDENTIALS > OAuth client ID**.\n- In the **Application type** dropdown, select **Web application**.\n- Under **Authorized redirect URIs**, select **+ ADD URI**. Paste in the OAuth redirect URL from n8n.\n- Select **Create**.\n- In Enabled APIs and services, select **+ ENABLE APIS AND SERVICES**.\n- Select and enable the Gmail API.\n- Back to Credentials, click on the credential in OAuth 2.0 Client IDs, and on the credential page, you will find the Client ID and Client Secret.\n\nClick the docs link above for more detailed instructions.",
-	"credentialEdit.docs.openAiApi": "Configure this credential:\n\n- Log in to your <a href=\"https://openai.com/\" target=\"_blank\">OpenAI</a> account.\n- Open your OpenAI <a href=\"https://platform.openai.com/api-keys\" target=\"_blank\">API keys</a> page to create an **API key**.\n- Enter an **Organization ID** if you belong to multiple organizations; otherwise, leave blank. Open your OpenAI <a href=\"https://platform.openai.com/account/organization\" target=\"_blank\">Organization Settings</a> page to get your Organization ID.\n\nClick the docs link above for more detailed instructions.",
+	"credentialEdit.docs.openAiApi": "Configure this credential:\n\n- Log in to your <a href=\"https://platform.openai.com/login\" target=\"_blank\">OpenAI</a> account.\n- Open your OpenAI <a href=\"https://platform.openai.com/api-keys\" target=\"_blank\">API keys</a> page to create an **API key**.\n- Enter an **Organization ID** if you belong to multiple organizations; otherwise, leave blank. Open your OpenAI <a href=\"https://platform.openai.com/account/organization\" target=\"_blank\">Organization Settings</a> page to get your Organization ID.\n\nClick the docs link above for more detailed instructions.",
 	"credentialSelectModal.addNewCredential": "Add new credential",
 	"credentialSelectModal.continue": "Continue",
 	"credentialSelectModal.searchForApp": "Search for app...",

From 99dc56c7a193cbbb7ba42f5d95374f0490639347 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Tue, 30 Jul 2024 10:20:21 +0200
Subject: [PATCH 025/168] refactor(core): Make instance role clearer
 (no-changelog) (#10188)

---
 packages/cli/src/License.ts                          |  2 +-
 packages/cli/src/commands/start.ts                   |  7 ++-----
 packages/cli/src/config/schema.ts                    | 11 ++++++-----
 .../__tests__/execution-recovery.service.test.ts     |  4 ++--
 .../cli/src/executions/execution-recovery.service.ts |  2 +-
 packages/cli/src/services/orchestration.service.ts   |  9 +++------
 .../services/orchestration/main/MultiMainSetup.ee.ts | 12 ++++++------
 packages/cli/src/services/pruning.service.ts         |  2 +-
 .../test/unit/services/orchestration.service.test.ts |  4 ++--
 9 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/packages/cli/src/License.ts b/packages/cli/src/License.ts
index 25abf0ecd6829..9a2740ce7cbb7 100644
--- a/packages/cli/src/License.ts
+++ b/packages/cli/src/License.ts
@@ -55,7 +55,7 @@ export class License {
 		 * This ensures the mains do not cause a 429 (too many requests) on license init.
 		 */
 		if (config.getEnv('multiMainSetup.enabled')) {
-			return autoRenewEnabled && config.getEnv('multiMainSetup.instanceType') === 'leader';
+			return autoRenewEnabled && config.getEnv('instanceRole') === 'leader';
 		}
 
 		return autoRenewEnabled;
diff --git a/packages/cli/src/commands/start.ts b/packages/cli/src/commands/start.ts
index 2e88c62e06194..c35344326e8e7 100644
--- a/packages/cli/src/commands/start.ts
+++ b/packages/cli/src/commands/start.ts
@@ -184,10 +184,7 @@ export class Start extends BaseCommand {
 		await this.initOrchestration();
 		this.logger.debug('Orchestration init complete');
 
-		if (
-			!config.getEnv('license.autoRenewEnabled') &&
-			config.getEnv('multiMainSetup.instanceType') === 'leader'
-		) {
+		if (!config.getEnv('license.autoRenewEnabled') && config.getEnv('instanceRole') === 'leader') {
 			this.logger.warn(
 				'Automatic license renewal is disabled. The license will not renew automatically, and access to licensed features may be lost!',
 			);
@@ -211,7 +208,7 @@ export class Start extends BaseCommand {
 
 	async initOrchestration() {
 		if (config.getEnv('executions.mode') === 'regular') {
-			config.set('multiMainSetup.instanceType', 'leader');
+			config.set('instanceRole', 'leader');
 			return;
 		}
 
diff --git a/packages/cli/src/config/schema.ts b/packages/cli/src/config/schema.ts
index 1e6d00aed7699..0b689b8f4cfbe 100644
--- a/packages/cli/src/config/schema.ts
+++ b/packages/cli/src/config/schema.ts
@@ -883,12 +883,13 @@ export const schema = {
 		},
 	},
 
+	instanceRole: {
+		doc: 'Always `leader` in single-main setup. `leader` or `follower` in multi-main setup.',
+		format: ['unset', 'leader', 'follower'] as const,
+		default: 'unset', // only until Start.initOrchestration
+	},
+
 	multiMainSetup: {
-		instanceType: {
-			doc: 'Type of instance in multi-main setup',
-			format: ['unset', 'leader', 'follower'] as const,
-			default: 'unset', // only until first leader key check
-		},
 		enabled: {
 			doc: 'Whether to enable multi-main setup for queue mode (license required)',
 			format: Boolean,
diff --git a/packages/cli/src/executions/__tests__/execution-recovery.service.test.ts b/packages/cli/src/executions/__tests__/execution-recovery.service.test.ts
index c1ad38538e337..7e33c6ac74a8a 100644
--- a/packages/cli/src/executions/__tests__/execution-recovery.service.test.ts
+++ b/packages/cli/src/executions/__tests__/execution-recovery.service.test.ts
@@ -48,7 +48,7 @@ describe('ExecutionRecoveryService', () => {
 	});
 
 	beforeEach(() => {
-		config.set('multiMainSetup.instanceType', 'leader');
+		config.set('instanceRole', 'leader');
 	});
 
 	afterEach(async () => {
@@ -130,7 +130,7 @@ describe('ExecutionRecoveryService', () => {
 				/**
 				 * Arrange
 				 */
-				config.set('multiMainSetup.instanceType', 'follower');
+				config.set('instanceRole', 'follower');
 				// @ts-expect-error Private method
 				const amendSpy = jest.spyOn(executionRecoveryService, 'amend');
 				const messages = setupMessages('123', 'Some workflow');
diff --git a/packages/cli/src/executions/execution-recovery.service.ts b/packages/cli/src/executions/execution-recovery.service.ts
index 4b4d90de54ad4..05431a6d9c9d5 100644
--- a/packages/cli/src/executions/execution-recovery.service.ts
+++ b/packages/cli/src/executions/execution-recovery.service.ts
@@ -332,7 +332,7 @@ export class ExecutionRecoveryService {
 	private shouldScheduleQueueRecovery() {
 		return (
 			config.getEnv('executions.mode') === 'queue' &&
-			config.getEnv('multiMainSetup.instanceType') === 'leader' &&
+			config.getEnv('instanceRole') === 'leader' &&
 			!this.isShuttingDown
 		);
 	}
diff --git a/packages/cli/src/services/orchestration.service.ts b/packages/cli/src/services/orchestration.service.ts
index 3d74f187acced..bfc1d140fc6fa 100644
--- a/packages/cli/src/services/orchestration.service.ts
+++ b/packages/cli/src/services/orchestration.service.ts
@@ -43,15 +43,12 @@ export class OrchestrationService {
 		return config.getEnv('redis.queueModeId');
 	}
 
-	/**
-	 * Whether this instance is the leader in a multi-main setup. Always `false` in single-main setup.
-	 */
 	get isLeader() {
-		return config.getEnv('multiMainSetup.instanceType') === 'leader';
+		return config.getEnv('instanceRole') === 'leader';
 	}
 
 	get isFollower() {
-		return config.getEnv('multiMainSetup.instanceType') !== 'leader';
+		return config.getEnv('instanceRole') !== 'leader';
 	}
 
 	sanityCheck() {
@@ -66,7 +63,7 @@ export class OrchestrationService {
 		if (this.isMultiMainSetupEnabled) {
 			await this.multiMainSetup.init();
 		} else {
-			config.set('multiMainSetup.instanceType', 'leader');
+			config.set('instanceRole', 'leader');
 		}
 
 		this.isInitialized = true;
diff --git a/packages/cli/src/services/orchestration/main/MultiMainSetup.ee.ts b/packages/cli/src/services/orchestration/main/MultiMainSetup.ee.ts
index 19cd14c4a87b9..3c8c052da70ae 100644
--- a/packages/cli/src/services/orchestration/main/MultiMainSetup.ee.ts
+++ b/packages/cli/src/services/orchestration/main/MultiMainSetup.ee.ts
@@ -45,7 +45,7 @@ export class MultiMainSetup extends EventEmitter {
 	async shutdown() {
 		clearInterval(this.leaderCheckInterval);
 
-		const isLeader = config.getEnv('multiMainSetup.instanceType') === 'leader';
+		const isLeader = config.getEnv('instanceRole') === 'leader';
 
 		if (isLeader) await this.redisPublisher.clear(this.leaderKey);
 	}
@@ -64,8 +64,8 @@ export class MultiMainSetup extends EventEmitter {
 		if (leaderId && leaderId !== this.instanceId) {
 			this.logger.debug(`[Instance ID ${this.instanceId}] Leader is other instance "${leaderId}"`);
 
-			if (config.getEnv('multiMainSetup.instanceType') === 'leader') {
-				config.set('multiMainSetup.instanceType', 'follower');
+			if (config.getEnv('instanceRole') === 'leader') {
+				config.set('instanceRole', 'follower');
 
 				this.emit('leader-stepdown'); // lost leadership - stop triggers, pollers, pruning, wait-tracking, queue recovery
 
@@ -80,7 +80,7 @@ export class MultiMainSetup extends EventEmitter {
 				`[Instance ID ${this.instanceId}] Leadership vacant, attempting to become leader...`,
 			);
 
-			config.set('multiMainSetup.instanceType', 'follower');
+			config.set('instanceRole', 'follower');
 
 			/**
 			 * Lost leadership - stop triggers, pollers, pruning, wait tracking, license renewal, queue recovery
@@ -101,7 +101,7 @@ export class MultiMainSetup extends EventEmitter {
 		if (keySetSuccessfully) {
 			this.logger.debug(`[Instance ID ${this.instanceId}] Leader is now this instance`);
 
-			config.set('multiMainSetup.instanceType', 'leader');
+			config.set('instanceRole', 'leader');
 
 			await this.redisPublisher.setExpiration(this.leaderKey, this.leaderKeyTtl);
 
@@ -110,7 +110,7 @@ export class MultiMainSetup extends EventEmitter {
 			 */
 			this.emit('leader-takeover');
 		} else {
-			config.set('multiMainSetup.instanceType', 'follower');
+			config.set('instanceRole', 'follower');
 		}
 	}
 
diff --git a/packages/cli/src/services/pruning.service.ts b/packages/cli/src/services/pruning.service.ts
index daa0883e1f861..78c0aad03750c 100644
--- a/packages/cli/src/services/pruning.service.ts
+++ b/packages/cli/src/services/pruning.service.ts
@@ -56,7 +56,7 @@ export class PruningService {
 		if (
 			config.getEnv('multiMainSetup.enabled') &&
 			config.getEnv('generic.instanceType') === 'main' &&
-			config.getEnv('multiMainSetup.instanceType') === 'follower'
+			config.getEnv('instanceRole') === 'follower'
 		) {
 			return false;
 		}
diff --git a/packages/cli/test/unit/services/orchestration.service.test.ts b/packages/cli/test/unit/services/orchestration.service.test.ts
index 43aba8d4843c7..0cdd73f605963 100644
--- a/packages/cli/test/unit/services/orchestration.service.test.ts
+++ b/packages/cli/test/unit/services/orchestration.service.test.ts
@@ -146,7 +146,7 @@ describe('Orchestration Service', () => {
 
 	describe('shouldAddWebhooks', () => {
 		beforeEach(() => {
-			config.set('multiMainSetup.instanceType', 'leader');
+			config.set('instanceRole', 'leader');
 		});
 		test('should return true for init', () => {
 			// We want to ensure that webhooks are populated on init
@@ -169,7 +169,7 @@ describe('Orchestration Service', () => {
 		});
 
 		test('should return false for update or activate when not leader', () => {
-			config.set('multiMainSetup.instanceType', 'follower');
+			config.set('instanceRole', 'follower');
 			const modes = ['update', 'activate'] as WorkflowActivateMode[];
 			for (const mode of modes) {
 				const result = os.shouldAddWebhooks(mode);

From 1fca3af335366b932e39da3fccea0b76a37d1c21 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: Tue, 30 Jul 2024 13:23:01 +0200
Subject: [PATCH 026/168] refactor(core): Use type-safe event emitters
 (no-changelog) (#10234)

---
 packages/cli/src/TypedEmitter.ts              | 48 ++++++++++++++
 packages/cli/src/WebhookHelpers.ts            |  9 ++-
 .../cli/src/WorkflowExecuteAdditionalData.ts  | 18 +++--
 .../concurrency-control.service.ts            |  6 +-
 .../cli/src/concurrency/concurrency-queue.ts  | 16 ++---
 packages/cli/src/eventbus/event.service.ts    | 14 +---
 packages/cli/src/push/index.ts                |  9 ++-
 .../cli/src/services/cache/cache.service.ts   | 16 ++---
 .../cli/src/services/cache/cache.types.ts     |  2 -
 .../orchestration/main/MultiMainSetup.ee.ts   |  9 ++-
 .../services/workflow-statistics.service.ts   | 65 +++++++++----------
 .../workflow-statistics.service.test.ts       |  1 +
 12 files changed, 124 insertions(+), 89 deletions(-)
 create mode 100644 packages/cli/src/TypedEmitter.ts

diff --git a/packages/cli/src/TypedEmitter.ts b/packages/cli/src/TypedEmitter.ts
new file mode 100644
index 0000000000000..176aa9584c907
--- /dev/null
+++ b/packages/cli/src/TypedEmitter.ts
@@ -0,0 +1,48 @@
+import { EventEmitter } from 'node:events';
+import debounce from 'lodash/debounce';
+
+type Payloads<ListenerMap> = {
+	[E in keyof ListenerMap]: unknown;
+};
+
+type Listener<Payload> = (payload: Payload) => void;
+
+export class TypedEmitter<ListenerMap extends Payloads<ListenerMap>> extends EventEmitter {
+	private debounceWait = 300; // milliseconds
+
+	override on<EventName extends keyof ListenerMap & string>(
+		eventName: EventName,
+		listener: Listener<ListenerMap[EventName]>,
+	) {
+		return super.on(eventName, listener);
+	}
+
+	override once<EventName extends keyof ListenerMap & string>(
+		eventName: EventName,
+		listener: Listener<ListenerMap[EventName]>,
+	) {
+		return super.once(eventName, listener);
+	}
+
+	override off<EventName extends keyof ListenerMap & string>(
+		eventName: EventName,
+		listener: Listener<ListenerMap[EventName]>,
+	) {
+		return super.off(eventName, listener);
+	}
+
+	override emit<EventName extends keyof ListenerMap & string>(
+		eventName: EventName,
+		payload?: ListenerMap[EventName],
+	): boolean {
+		return super.emit(eventName, payload);
+	}
+
+	protected debouncedEmit = debounce(
+		<EventName extends keyof ListenerMap & string>(
+			eventName: EventName,
+			payload?: ListenerMap[EventName],
+		) => super.emit(eventName, payload),
+		this.debounceWait,
+	);
+}
diff --git a/packages/cli/src/WebhookHelpers.ts b/packages/cli/src/WebhookHelpers.ts
index 95e8825e1a840..9342a97cda69c 100644
--- a/packages/cli/src/WebhookHelpers.ts
+++ b/packages/cli/src/WebhookHelpers.ts
@@ -360,11 +360,10 @@ export async function executeWebhook(
 				NodeExecuteFunctions,
 				executionMode,
 			);
-			Container.get(WorkflowStatisticsService).emit(
-				'nodeFetchedData',
-				workflow.id,
-				workflowStartNode,
-			);
+			Container.get(WorkflowStatisticsService).emit('nodeFetchedData', {
+				workflowId: workflow.id,
+				node: workflowStartNode,
+			});
 		} catch (err) {
 			// Send error response to webhook caller
 			const errorMessage = 'Workflow Webhook Error: Workflow could not be started!';
diff --git a/packages/cli/src/WorkflowExecuteAdditionalData.ts b/packages/cli/src/WorkflowExecuteAdditionalData.ts
index e5a17de7ec26d..754cfea693c3d 100644
--- a/packages/cli/src/WorkflowExecuteAdditionalData.ts
+++ b/packages/cli/src/WorkflowExecuteAdditionalData.ts
@@ -525,17 +525,16 @@ function hookFunctionsSave(): IWorkflowExecuteHooks {
 						);
 					}
 				} finally {
-					workflowStatisticsService.emit(
-						'workflowExecutionCompleted',
-						this.workflowData,
+					workflowStatisticsService.emit('workflowExecutionCompleted', {
+						workflowData: this.workflowData,
 						fullRunData,
-					);
+					});
 				}
 			},
 		],
 		nodeFetchedData: [
 			async (workflowId: string, node: INode) => {
-				workflowStatisticsService.emit('nodeFetchedData', workflowId, node);
+				workflowStatisticsService.emit('nodeFetchedData', { workflowId, node });
 			},
 		],
 	};
@@ -636,11 +635,10 @@ function hookFunctionsSaveWorker(): IWorkflowExecuteHooks {
 						this.retryOf,
 					);
 				} finally {
-					workflowStatisticsService.emit(
-						'workflowExecutionCompleted',
-						this.workflowData,
+					workflowStatisticsService.emit('workflowExecutionCompleted', {
+						workflowData: this.workflowData,
 						fullRunData,
-					);
+					});
 				}
 			},
 			async function (this: WorkflowHooks, runData: IRun): Promise<void> {
@@ -676,7 +674,7 @@ function hookFunctionsSaveWorker(): IWorkflowExecuteHooks {
 		],
 		nodeFetchedData: [
 			async (workflowId: string, node: INode) => {
-				workflowStatisticsService.emit('nodeFetchedData', workflowId, node);
+				workflowStatisticsService.emit('nodeFetchedData', { workflowId, node });
 			},
 		],
 	};
diff --git a/packages/cli/src/concurrency/concurrency-control.service.ts b/packages/cli/src/concurrency/concurrency-control.service.ts
index cf249c51722eb..c562448379fef 100644
--- a/packages/cli/src/concurrency/concurrency-control.service.ts
+++ b/packages/cli/src/concurrency/concurrency-control.service.ts
@@ -53,7 +53,7 @@ export class ConcurrencyControlService {
 
 		this.isEnabled = true;
 
-		this.productionQueue.on('concurrency-check', ({ capacity }: { capacity: number }) => {
+		this.productionQueue.on('concurrency-check', ({ capacity }) => {
 			if (this.shouldReport(capacity)) {
 				void this.telemetry.track('User hit concurrency limit', {
 					threshold: CLOUD_TEMP_PRODUCTION_LIMIT - capacity,
@@ -61,12 +61,12 @@ export class ConcurrencyControlService {
 			}
 		});
 
-		this.productionQueue.on('execution-throttled', ({ executionId }: { executionId: string }) => {
+		this.productionQueue.on('execution-throttled', ({ executionId }) => {
 			this.log('Execution throttled', { executionId });
 			this.eventService.emit('execution-throttled', { executionId });
 		});
 
-		this.productionQueue.on('execution-released', async (executionId: string) => {
+		this.productionQueue.on('execution-released', async (executionId) => {
 			this.log('Execution released', { executionId });
 			await this.executionRepository.resetStartedAt(executionId);
 		});
diff --git a/packages/cli/src/concurrency/concurrency-queue.ts b/packages/cli/src/concurrency/concurrency-queue.ts
index 90c62d2efc21e..1b578b5a8ef1d 100644
--- a/packages/cli/src/concurrency/concurrency-queue.ts
+++ b/packages/cli/src/concurrency/concurrency-queue.ts
@@ -1,9 +1,14 @@
 import { Service } from 'typedi';
-import { EventEmitter } from 'node:events';
-import debounce from 'lodash/debounce';
+import { TypedEmitter } from '@/TypedEmitter';
+
+type ConcurrencyEvents = {
+	'execution-throttled': { executionId: string };
+	'execution-released': string;
+	'concurrency-check': { capacity: number };
+};
 
 @Service()
-export class ConcurrencyQueue extends EventEmitter {
+export class ConcurrencyQueue extends TypedEmitter<ConcurrencyEvents> {
 	private readonly queue: Array<{
 		executionId: string;
 		resolve: () => void;
@@ -63,9 +68,4 @@ export class ConcurrencyQueue extends EventEmitter {
 
 		resolve();
 	}
-
-	private debouncedEmit = debounce(
-		(event: string, payload: object) => this.emit(event, payload),
-		300,
-	);
 }
diff --git a/packages/cli/src/eventbus/event.service.ts b/packages/cli/src/eventbus/event.service.ts
index 2df51af22cad1..2b16ff06ab40c 100644
--- a/packages/cli/src/eventbus/event.service.ts
+++ b/packages/cli/src/eventbus/event.service.ts
@@ -1,16 +1,6 @@
-import { EventEmitter } from 'node:events';
 import { Service } from 'typedi';
+import { TypedEmitter } from '@/TypedEmitter';
 import type { Event } from './event.types';
 
 @Service()
-export class EventService extends EventEmitter {
-	emit<K extends keyof Event>(eventName: K, arg?: Event[K]) {
-		super.emit(eventName, arg);
-		return true;
-	}
-
-	on<K extends keyof Event>(eventName: K, handler: (arg: Event[K]) => void) {
-		super.on(eventName, handler);
-		return this;
-	}
-}
+export class EventService extends TypedEmitter<Event> {}
diff --git a/packages/cli/src/push/index.ts b/packages/cli/src/push/index.ts
index 647ab40acf0c5..a946348430133 100644
--- a/packages/cli/src/push/index.ts
+++ b/packages/cli/src/push/index.ts
@@ -1,4 +1,3 @@
-import { EventEmitter } from 'events';
 import { ServerResponse } from 'http';
 import type { Server } from 'http';
 import type { Socket } from 'net';
@@ -17,6 +16,11 @@ import { OrchestrationService } from '@/services/orchestration.service';
 import { SSEPush } from './sse.push';
 import { WebSocketPush } from './websocket.push';
 import type { PushResponse, SSEPushRequest, WebSocketPushRequest } from './types';
+import { TypedEmitter } from '@/TypedEmitter';
+
+type PushEvents = {
+	editorUiConnected: string;
+};
 
 const useWebSockets = config.getEnv('push.backend') === 'websocket';
 
@@ -28,7 +32,7 @@ const useWebSockets = config.getEnv('push.backend') === 'websocket';
  * @emits message when a message is received from a client
  */
 @Service()
-export class Push extends EventEmitter {
+export class Push extends TypedEmitter<PushEvents> {
 	private backend = useWebSockets ? Container.get(WebSocketPush) : Container.get(SSEPush);
 
 	constructor(private readonly orchestrationService: OrchestrationService) {
@@ -37,7 +41,6 @@ export class Push extends EventEmitter {
 
 	handleRequest(req: SSEPushRequest | WebSocketPushRequest, res: PushResponse) {
 		const {
-			user,
 			ws,
 			query: { pushRef },
 		} = req;
diff --git a/packages/cli/src/services/cache/cache.service.ts b/packages/cli/src/services/cache/cache.service.ts
index 8e9a4dc95c009..75dad03b49d26 100644
--- a/packages/cli/src/services/cache/cache.service.ts
+++ b/packages/cli/src/services/cache/cache.service.ts
@@ -1,5 +1,3 @@
-import EventEmitter from 'node:events';
-
 import Container, { Service } from 'typedi';
 import { caching } from 'cache-manager';
 import { ApplicationError, jsonStringify } from 'n8n-workflow';
@@ -10,14 +8,20 @@ import { MalformedRefreshValueError } from '@/errors/cache-errors/malformed-refr
 import type {
 	TaggedRedisCache,
 	TaggedMemoryCache,
-	CacheEvent,
 	MaybeHash,
 	Hash,
 } from '@/services/cache/cache.types';
 import { TIME } from '@/constants';
+import { TypedEmitter } from '@/TypedEmitter';
+
+type CacheEvents = {
+	'metrics.cache.hit': never;
+	'metrics.cache.miss': never;
+	'metrics.cache.update': never;
+};
 
 @Service()
-export class CacheService extends EventEmitter {
+export class CacheService extends TypedEmitter<CacheEvents> {
 	private cache: TaggedRedisCache | TaggedMemoryCache;
 
 	async init() {
@@ -66,10 +70,6 @@ export class CacheService extends EventEmitter {
 		await this.cache.store.reset();
 	}
 
-	emit(event: CacheEvent, ...args: unknown[]) {
-		return super.emit(event, ...args);
-	}
-
 	isRedis() {
 		return this.cache.kind === 'redis';
 	}
diff --git a/packages/cli/src/services/cache/cache.types.ts b/packages/cli/src/services/cache/cache.types.ts
index 4e96b8012a799..f598e22494446 100644
--- a/packages/cli/src/services/cache/cache.types.ts
+++ b/packages/cli/src/services/cache/cache.types.ts
@@ -8,5 +8,3 @@ export type TaggedMemoryCache = MemoryCache & { kind: 'memory' };
 export type Hash<T = unknown> = Record<string, T>;
 
 export type MaybeHash<T> = Hash<T> | undefined;
-
-export type CacheEvent = `metrics.cache.${'hit' | 'miss' | 'update'}`;
diff --git a/packages/cli/src/services/orchestration/main/MultiMainSetup.ee.ts b/packages/cli/src/services/orchestration/main/MultiMainSetup.ee.ts
index 3c8c052da70ae..cabcf5996bc08 100644
--- a/packages/cli/src/services/orchestration/main/MultiMainSetup.ee.ts
+++ b/packages/cli/src/services/orchestration/main/MultiMainSetup.ee.ts
@@ -1,4 +1,3 @@
-import { EventEmitter } from 'node:events';
 import config from '@/config';
 import { Service } from 'typedi';
 import { TIME } from '@/constants';
@@ -6,9 +5,15 @@ import { ErrorReporterProxy as EventReporter } from 'n8n-workflow';
 import { Logger } from '@/Logger';
 import { RedisServicePubSubPublisher } from '@/services/redis/RedisServicePubSubPublisher';
 import { RedisClientService } from '@/services/redis/redis-client.service';
+import { TypedEmitter } from '@/TypedEmitter';
+
+type MultiMainEvents = {
+	'leader-stepdown': never;
+	'leader-takeover': never;
+};
 
 @Service()
-export class MultiMainSetup extends EventEmitter {
+export class MultiMainSetup extends TypedEmitter<MultiMainEvents> {
 	constructor(
 		private readonly logger: Logger,
 		private readonly redisPublisher: RedisServicePubSubPublisher,
diff --git a/packages/cli/src/services/workflow-statistics.service.ts b/packages/cli/src/services/workflow-statistics.service.ts
index 516732add87b4..9311ef885dfbd 100644
--- a/packages/cli/src/services/workflow-statistics.service.ts
+++ b/packages/cli/src/services/workflow-statistics.service.ts
@@ -1,29 +1,48 @@
-import { EventEmitter } from 'events';
-import { Container, Service } from 'typedi';
+import { Service } from 'typedi';
 import type { INode, IRun, IWorkflowBase } from 'n8n-workflow';
 import { StatisticsNames } from '@db/entities/WorkflowStatistics';
 import { WorkflowStatisticsRepository } from '@db/repositories/workflowStatistics.repository';
 import { UserService } from '@/services/user.service';
 import { Logger } from '@/Logger';
 import { OwnershipService } from './ownership.service';
+import { TypedEmitter } from '@/TypedEmitter';
+
+type WorkflowStatisticsEvents = {
+	nodeFetchedData: { workflowId: string; node: INode };
+	workflowExecutionCompleted: { workflowData: IWorkflowBase; fullRunData: IRun };
+	'telemetry.onFirstProductionWorkflowSuccess': {
+		project_id: string;
+		workflow_id: string;
+		user_id: string;
+	};
+	'telemetry.onFirstWorkflowDataLoad': {
+		user_id: string;
+		project_id: string;
+		workflow_id: string;
+		node_type: string;
+		node_id: string;
+	};
+};
 
 @Service()
-export class WorkflowStatisticsService extends EventEmitter {
+export class WorkflowStatisticsService extends TypedEmitter<WorkflowStatisticsEvents> {
 	constructor(
 		private readonly logger: Logger,
 		private readonly repository: WorkflowStatisticsRepository,
 		private readonly ownershipService: OwnershipService,
+		private readonly userService: UserService,
 	) {
 		super({ captureRejections: true });
 		if ('SKIP_STATISTICS_EVENTS' in process.env) return;
 
 		this.on(
 			'nodeFetchedData',
-			async (workflowId, node) => await this.nodeFetchedData(workflowId, node),
+			async ({ workflowId, node }) => await this.nodeFetchedData(workflowId, node),
 		);
 		this.on(
 			'workflowExecutionCompleted',
-			async (workflowData, runData) => await this.workflowExecutionCompleted(workflowData, runData),
+			async ({ workflowData, fullRunData }) =>
+				await this.workflowExecutionCompleted(workflowData, fullRunData),
 		);
 	}
 
@@ -49,18 +68,18 @@ export class WorkflowStatisticsService extends EventEmitter {
 			const upsertResult = await this.repository.upsertWorkflowStatistics(name, workflowId);
 
 			if (name === StatisticsNames.productionSuccess && upsertResult === 'insert') {
-				const project = await Container.get(OwnershipService).getWorkflowProjectCached(workflowId);
+				const project = await this.ownershipService.getWorkflowProjectCached(workflowId);
 				if (project.type === 'personal') {
-					const owner = await Container.get(OwnershipService).getProjectOwnerCached(project.id);
+					const owner = await this.ownershipService.getProjectOwnerCached(project.id);
 
 					const metrics = {
 						project_id: project.id,
 						workflow_id: workflowId,
-						user_id: owner?.id,
+						user_id: owner!.id,
 					};
 
 					if (owner && !owner.settings?.userActivated) {
-						await Container.get(UserService).updateSettings(owner.id, {
+						await this.userService.updateSettings(owner.id, {
 							firstSuccessfulWorkflowId: workflowId,
 							userActivated: true,
 							userActivatedAt: runData.startedAt.getTime(),
@@ -90,7 +109,7 @@ export class WorkflowStatisticsService extends EventEmitter {
 		const owner = await this.ownershipService.getProjectOwnerCached(project.id);
 
 		let metrics = {
-			user_id: owner?.id,
+			user_id: owner!.id,
 			project_id: project.id,
 			workflow_id: workflowId,
 			node_type: node.type,
@@ -111,29 +130,3 @@ export class WorkflowStatisticsService extends EventEmitter {
 		this.emit('telemetry.onFirstWorkflowDataLoad', metrics);
 	}
 }
-
-export declare interface WorkflowStatisticsService {
-	on(
-		event: 'nodeFetchedData',
-		listener: (workflowId: string | undefined | null, node: INode) => void,
-	): this;
-	on(
-		event: 'workflowExecutionCompleted',
-		listener: (workflowData: IWorkflowBase, runData: IRun) => void,
-	): this;
-	on(
-		event: 'telemetry.onFirstProductionWorkflowSuccess',
-		listener: (metrics: { user_id: string; workflow_id: string }) => void,
-	): this;
-	on(
-		event: 'telemetry.onFirstWorkflowDataLoad',
-		listener: (metrics: {
-			user_id: string;
-			workflow_id: string;
-			node_type: string;
-			node_id: string;
-			credential_type?: string;
-			credential_id?: string;
-		}) => void,
-	): this;
-}
diff --git a/packages/cli/test/unit/services/workflow-statistics.service.test.ts b/packages/cli/test/unit/services/workflow-statistics.service.test.ts
index da1338f8eb764..9bd9864bb0446 100644
--- a/packages/cli/test/unit/services/workflow-statistics.service.test.ts
+++ b/packages/cli/test/unit/services/workflow-statistics.service.test.ts
@@ -48,6 +48,7 @@ describe('WorkflowStatisticsService', () => {
 		mock(),
 		new WorkflowStatisticsRepository(dataSource, globalConfig),
 		ownershipService,
+		userService,
 	);
 
 	const onFirstProductionWorkflowSuccess = jest.fn();

From a2d08846d0b9ff342a54d0ba6ec283aaa3a0b7aa 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: Tue, 30 Jul 2024 13:27:15 +0200
Subject: [PATCH 027/168] ci: Setup pnpm catalog to centralize depedency
 versions (no-changelog) (#9974)

---
 cypress/package.json                       |   6 +-
 package.json                               |  13 +-
 packages/@n8n/chat/package.json            |  10 +-
 packages/@n8n/client-oauth2/package.json   |   2 +-
 packages/@n8n/config/package.json          |   2 +-
 packages/@n8n/nodes-langchain/package.json |   8 +-
 packages/cli/package.json                  |  24 +-
 packages/core/package.json                 |  24 +-
 packages/design-system/package.json        |   9 +-
 packages/editor-ui/package.json            |  17 +-
 packages/node-dev/package.json             |   4 +-
 packages/nodes-base/package.json           |  24 +-
 packages/workflow/package.json             |  16 +-
 pnpm-lock.yaml                             | 631 +++++++++++----------
 pnpm-workspace.yaml                        |  26 +
 15 files changed, 446 insertions(+), 370 deletions(-)

diff --git a/cypress/package.json b/cypress/package.json
index 7740b5483f01b..0e1ce734c02cf 100644
--- a/cypress/package.json
+++ b/cypress/package.json
@@ -14,7 +14,7 @@
     "start": "cd ..; pnpm start"
   },
   "devDependencies": {
-    "@types/lodash": "^4.14.195",
+    "@types/lodash": "catalog:",
     "eslint-plugin-cypress": "^3.3.0",
     "n8n-workflow": "workspace:*"
   },
@@ -24,8 +24,8 @@
     "cypress": "^13.11.0",
     "cypress-otp": "^1.0.3",
     "cypress-real-events": "^1.12.0",
-    "lodash": "4.17.21",
-    "nanoid": "3.3.6",
+    "lodash": "catalog:",
+    "nanoid": "catalog:",
     "start-server-and-test": "^2.0.3"
   }
 }
diff --git a/package.json b/package.json
index 59bae47e99169..0f32e0ea56dde 100644
--- a/package.json
+++ b/package.json
@@ -3,10 +3,10 @@
   "version": "1.52.0",
   "private": true,
   "engines": {
-    "node": ">=18.10",
-    "pnpm": ">=9.1"
+    "node": ">=20.15",
+    "pnpm": ">=9.5"
   },
-  "packageManager": "pnpm@9.1.4",
+  "packageManager": "pnpm@9.6.0",
   "scripts": {
     "preinstall": "node scripts/block-npm-install.js",
     "build": "turbo run build",
@@ -40,7 +40,6 @@
     "@n8n_io/eslint-config": "workspace:*",
     "@types/jest": "^29.5.3",
     "@types/supertest": "^6.0.2",
-    "@vitest/coverage-v8": "^1.6.0",
     "jest": "^29.6.2",
     "jest-environment-jsdom": "^29.6.2",
     "jest-expect-message": "^1.1.3",
@@ -56,11 +55,7 @@
     "tsc-alias": "^1.8.7",
     "tsc-watch": "^6.0.4",
     "turbo": "2.0.6",
-    "typescript": "*",
-    "vite": "^5.2.12",
-    "vitest": "^1.6.0",
-    "vitest-mock-extended": "^1.3.1",
-    "vue-tsc": "^2.0.19"
+    "typescript": "*"
   },
   "pnpm": {
     "onlyBuiltDependencies": [
diff --git a/packages/@n8n/chat/package.json b/packages/@n8n/chat/package.json
index 25b9212b3eb79..4f425b6fa8237 100644
--- a/packages/@n8n/chat/package.json
+++ b/packages/@n8n/chat/package.json
@@ -38,16 +38,20 @@
     "@vueuse/core": "^10.11.0",
     "highlight.js": "^11.8.0",
     "markdown-it-link-attributes": "^4.0.1",
-    "uuid": "^8.3.2",
-    "vue": "^3.4.21",
+    "uuid": "catalog:",
+    "vue": "catalog:frontend",
     "vue-markdown-render": "^2.1.1"
   },
   "devDependencies": {
     "@iconify-json/mdi": "^1.1.54",
     "@n8n/storybook": "workspace:*",
     "@types/markdown-it": "^12.2.3",
+    "@vitest/coverage-v8": "catalog:frontend",
     "unplugin-icons": "^0.19.0",
-    "vite-plugin-dts": "^3.9.1"
+    "vite": "catalog:frontend",
+    "vitest": "catalog:frontend",
+    "vite-plugin-dts": "^3.9.1",
+    "vue-tsc": "catalog:frontend"
   },
   "files": [
     "README.md",
diff --git a/packages/@n8n/client-oauth2/package.json b/packages/@n8n/client-oauth2/package.json
index 38ce65e8eedce..83b858a2e9fa0 100644
--- a/packages/@n8n/client-oauth2/package.json
+++ b/packages/@n8n/client-oauth2/package.json
@@ -20,6 +20,6 @@
     "dist/**/*"
   ],
   "dependencies": {
-    "axios": "1.6.7"
+    "axios": "catalog:"
   }
 }
diff --git a/packages/@n8n/config/package.json b/packages/@n8n/config/package.json
index d992cc5aee077..66332540fa2e6 100644
--- a/packages/@n8n/config/package.json
+++ b/packages/@n8n/config/package.json
@@ -21,6 +21,6 @@
   ],
   "dependencies": {
     "reflect-metadata": "0.2.2",
-    "typedi": "0.10.0"
+    "typedi": "catalog:"
   }
 }
diff --git a/packages/@n8n/nodes-langchain/package.json b/packages/@n8n/nodes-langchain/package.json
index 9c10d94c495d9..a52670e3e3faf 100644
--- a/packages/@n8n/nodes-langchain/package.json
+++ b/packages/@n8n/nodes-langchain/package.json
@@ -121,7 +121,7 @@
     ]
   },
   "devDependencies": {
-    "@types/basic-auth": "^1.1.3",
+    "@types/basic-auth": "catalog:",
     "@types/cheerio": "^0.22.15",
     "@types/html-to-text": "^9.0.1",
     "@types/json-schema": "^7.0.15",
@@ -159,18 +159,18 @@
     "@supabase/supabase-js": "2.43.4",
     "@types/pg": "^8.11.3",
     "@xata.io/client": "0.28.4",
-    "basic-auth": "2.0.1",
+    "basic-auth": "catalog:",
     "cheerio": "1.0.0-rc.12",
     "cohere-ai": "7.10.1",
     "d3-dsv": "2.0.0",
     "epub2": "3.0.2",
-    "form-data": "4.0.0",
+    "form-data": "catalog:",
     "generate-schema": "2.6.0",
     "html-to-text": "9.0.5",
     "jsdom": "^23.0.1",
     "json-schema-to-zod": "2.1.0",
     "langchain": "0.2.11",
-    "lodash": "4.17.21",
+    "lodash": "catalog:",
     "mammoth": "1.7.2",
     "n8n-nodes-base": "workspace:*",
     "n8n-workflow": "workspace:*",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index e69fb4fc26c52..b18513c3a20c9 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -56,12 +56,12 @@
     "@types/compression": "1.0.1",
     "@types/convict": "^6.1.1",
     "@types/cookie-parser": "^1.4.2",
-    "@types/express": "^4.17.21",
+    "@types/express": "catalog:",
     "@types/flat": "^5.0.5",
     "@types/formidable": "^3.4.5",
     "@types/json-diff": "^1.0.0",
     "@types/jsonwebtoken": "^9.0.6",
-    "@types/lodash": "^4.14.195",
+    "@types/lodash": "catalog:",
     "@types/psl": "^1.1.0",
     "@types/replacestream": "^4.0.1",
     "@types/shelljs": "^0.8.11",
@@ -69,10 +69,10 @@
     "@types/superagent": "^8.1.7",
     "@types/swagger-ui-express": "^4.1.6",
     "@types/syslog-client": "^1.1.2",
-    "@types/uuid": "^8.3.2",
+    "@types/uuid": "catalog:",
     "@types/validator": "^13.7.0",
     "@types/ws": "^8.5.4",
-    "@types/xml2js": "^0.4.14",
+    "@types/xml2js": "catalog:",
     "@types/yamljs": "^0.2.31",
     "@vvo/tzdb": "^6.141.0",
     "chokidar": "^3.5.2",
@@ -95,7 +95,7 @@
     "@sentry/integrations": "7.87.0",
     "@sentry/node": "7.87.0",
     "aws4": "1.11.0",
-    "axios": "1.6.7",
+    "axios": "catalog:",
     "bcryptjs": "2.4.3",
     "bull": "4.12.1",
     "cache-manager": "5.2.3",
@@ -115,7 +115,7 @@
     "express-openapi-validator": "5.1.6",
     "express-prom-bundle": "6.6.0",
     "express-rate-limit": "7.2.0",
-    "fast-glob": "3.2.12",
+    "fast-glob": "catalog:",
     "flat": "5.0.2",
     "flatted": "3.2.7",
     "formidable": "3.5.1",
@@ -128,14 +128,14 @@
     "jsonschema": "1.4.1",
     "jsonwebtoken": "9.0.2",
     "ldapts": "4.2.6",
-    "lodash": "4.17.21",
-    "luxon": "3.3.0",
+    "lodash": "catalog:",
+    "luxon": "catalog:",
     "mysql2": "3.10.0",
     "n8n-core": "workspace:*",
     "n8n-editor-ui": "workspace:*",
     "n8n-nodes-base": "workspace:*",
     "n8n-workflow": "workspace:*",
-    "nanoid": "3.3.6",
+    "nanoid": "catalog:",
     "nodemailer": "6.9.9",
     "oauth-1.0a": "2.2.6",
     "open": "7.4.2",
@@ -162,12 +162,12 @@
     "sshpk": "1.17.0",
     "swagger-ui-express": "5.0.0",
     "syslog-client": "1.1.1",
-    "typedi": "0.10.0",
-    "uuid": "8.3.2",
+    "typedi": "catalog:",
+    "uuid": "catalog:",
     "validator": "13.7.0",
     "winston": "3.8.2",
     "ws": "8.17.1",
-    "xml2js": "0.6.2",
+    "xml2js": "catalog:",
     "xmllint-wasm": "3.0.1",
     "yamljs": "0.3.0",
     "zod": "3.22.4"
diff --git a/packages/core/package.json b/packages/core/package.json
index 0eb22acf6d5eb..17f57cc99bad1 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -28,23 +28,23 @@
   "devDependencies": {
     "@types/aws4": "^1.5.1",
     "@types/concat-stream": "^2.0.0",
-    "@types/express": "^4.17.21",
-    "@types/lodash": "^4.14.195",
+    "@types/express": "catalog:",
+    "@types/lodash": "catalog:",
     "@types/mime-types": "^2.1.0",
-    "@types/uuid": "^8.3.2",
-    "@types/xml2js": "^0.4.14"
+    "@types/uuid": "catalog:",
+    "@types/xml2js": "catalog:"
   },
   "dependencies": {
     "@n8n/client-oauth2": "workspace:*",
     "aws4": "1.11.0",
-    "axios": "1.6.7",
+    "axios": "catalog:",
     "concat-stream": "2.0.0",
     "cron": "3.1.7",
-    "fast-glob": "3.2.12",
+    "fast-glob": "catalog:",
     "file-type": "16.5.4",
-    "form-data": "4.0.0",
-    "lodash": "4.17.21",
-    "luxon": "^3.4.4",
+    "form-data": "catalog:",
+    "lodash": "catalog:",
+    "luxon": "catalog:",
     "mime-types": "2.1.35",
     "n8n-workflow": "workspace:*",
     "oauth-1.0a": "2.2.6",
@@ -52,8 +52,8 @@
     "pretty-bytes": "5.6.0",
     "qs": "6.11.0",
     "ssh2": "1.15.0",
-    "typedi": "0.10.0",
-    "uuid": "8.3.2",
-    "xml2js": "0.6.2"
+    "typedi": "catalog:",
+    "uuid": "catalog:",
+    "xml2js": "catalog:"
   }
 }
diff --git a/packages/design-system/package.json b/packages/design-system/package.json
index 88b2e967d09ce..150636a64c3f0 100644
--- a/packages/design-system/package.json
+++ b/packages/design-system/package.json
@@ -27,13 +27,18 @@
     "@types/markdown-it-link-attributes": "^3.0.1",
     "@types/sanitize-html": "^2.11.0",
     "@vitejs/plugin-vue": "^5.0.4",
+    "@vitest/coverage-v8": "catalog:frontend",
     "@vue/test-utils": "^2.4.3",
     "autoprefixer": "^10.4.19",
     "postcss": "^8.4.38",
     "sass": "^1.64.1",
     "tailwindcss": "^3.4.3",
     "unplugin-icons": "^0.19.0",
-    "unplugin-vue-components": "^0.27.2"
+    "unplugin-vue-components": "^0.27.2",
+    "vite": "catalog:frontend",
+    "vitest": "catalog:frontend",
+    "vitest-mock-extended": "catalog:frontend",
+    "vue-tsc": "catalog:frontend"
   },
   "dependencies": {
     "@fortawesome/fontawesome-svg-core": "^1.2.36",
@@ -45,7 +50,7 @@
     "markdown-it-link-attributes": "^4.0.1",
     "markdown-it-task-lists": "^2.1.1",
     "sanitize-html": "2.12.1",
-    "vue": "^3.4.21",
+    "vue": "catalog:frontend",
     "vue-boring-avatars": "^1.3.0",
     "vue-router": "^4.2.2",
     "xss": "^1.0.14"
diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json
index a4425d2504d9a..d4acc7843d1b2 100644
--- a/packages/editor-ui/package.json
+++ b/packages/editor-ui/package.json
@@ -43,7 +43,7 @@
     "@vue-flow/node-resizer": "^1.4.0",
     "@vueuse/components": "^10.11.0",
     "@vueuse/core": "^10.11.0",
-    "axios": "1.6.7",
+    "axios": "catalog:",
     "chart.js": "^4.4.0",
     "codemirror-lang-html-n8n": "^1.0.0",
     "dateformat": "^3.0.3",
@@ -55,7 +55,7 @@
     "humanize-duration": "^3.27.2",
     "jsonpath": "^1.1.1",
     "lodash-es": "^4.17.21",
-    "luxon": "^3.3.0",
+    "luxon": "catalog:",
     "n8n-design-system": "workspace:*",
     "n8n-workflow": "workspace:*",
     "pinia": "^2.1.6",
@@ -63,9 +63,9 @@
     "qrcode.vue": "^3.3.4",
     "stream-browserify": "^3.0.0",
     "timeago.js": "^4.0.2",
-    "uuid": "^8.3.2",
+    "uuid": "catalog:",
     "v3-infinite-loading": "^1.2.2",
-    "vue": "^3.4.21",
+    "vue": "catalog:frontend",
     "vue-agile": "^2.0.0",
     "vue-chartjs": "^5.2.0",
     "vue-i18n": "^9.2.2",
@@ -86,11 +86,16 @@
     "@types/jsonpath": "^0.2.0",
     "@types/lodash-es": "^4.17.6",
     "@types/luxon": "^3.2.0",
-    "@types/uuid": "^8.3.2",
+    "@types/uuid": "catalog:",
+    "@vitest/coverage-v8": "catalog:frontend",
     "cross-env": "^7.0.3",
     "miragejs": "^0.1.48",
     "unplugin-icons": "^0.19.0",
-    "unplugin-vue-components": "^0.27.2"
+    "unplugin-vue-components": "^0.27.2",
+    "vite": "catalog:frontend",
+    "vitest": "catalog:frontend",
+    "vitest-mock-extended": "catalog:frontend",
+    "vue-tsc": "catalog:frontend"
   },
   "peerDependencies": {
     "@fortawesome/fontawesome-svg-core": "*",
diff --git a/packages/node-dev/package.json b/packages/node-dev/package.json
index 2a8333cd91c86..92db12b997737 100644
--- a/packages/node-dev/package.json
+++ b/packages/node-dev/package.json
@@ -40,12 +40,12 @@
   "dependencies": {
     "@oclif/core": "4.0.7",
     "change-case": "^4.1.1",
-    "fast-glob": "^3.2.5",
+    "fast-glob": "catalog:",
     "inquirer": "^7.0.1",
     "n8n-core": "workspace:*",
     "n8n-workflow": "workspace:*",
     "replace-in-file": "^6.0.0",
     "tmp-promise": "^3.0.3",
-    "typedi": "^0.10.0"
+    "typedi": "catalog:"
   }
 }
diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index ba352f63fc494..e512fb4ef89bc 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -802,15 +802,15 @@
   "devDependencies": {
     "@types/amqplib": "^0.10.1",
     "@types/aws4": "^1.5.1",
-    "@types/basic-auth": "^1.1.3",
+    "@types/basic-auth": "catalog:",
     "@types/cheerio": "^0.22.15",
     "@types/eventsource": "^1.1.2",
-    "@types/express": "^4.17.21",
+    "@types/express": "catalog:",
     "@types/html-to-text": "^9.0.1",
     "@types/gm": "^1.25.0",
     "@types/js-nacl": "^1.3.0",
     "@types/jsonwebtoken": "^9.0.6",
-    "@types/lodash": "^4.14.195",
+    "@types/lodash": "catalog:",
     "@types/lossless-json": "^1.0.0",
     "@types/mailparser": "^3.4.4",
     "@types/mime-types": "^2.1.0",
@@ -821,8 +821,8 @@
     "@types/showdown": "^1.9.4",
     "@types/snowflake-sdk": "^1.6.20",
     "@types/ssh2-sftp-client": "^5.1.0",
-    "@types/uuid": "^8.3.2",
-    "@types/xml2js": "^0.4.14",
+    "@types/uuid": "catalog:",
+    "@types/xml2js": "catalog:",
     "eslint-plugin-n8n-nodes-base": "^1.16.0",
     "n8n-core": "workspace:*"
   },
@@ -833,7 +833,7 @@
     "amqplib": "0.10.3",
     "alasql": "^4.4.0",
     "aws4": "1.11.0",
-    "basic-auth": "2.0.1",
+    "basic-auth": "catalog:",
     "change-case": "4.1.2",
     "cheerio": "1.0.0-rc.6",
     "chokidar": "3.5.2",
@@ -842,7 +842,7 @@
     "currency-codes": "2.1.0",
     "eventsource": "2.0.2",
     "html-to-text": "9.0.5",
-    "fast-glob": "3.2.12",
+    "fast-glob": "catalog:",
     "fflate": "0.7.4",
     "get-system-fonts": "2.0.2",
     "gm": "1.25.0",
@@ -854,9 +854,9 @@
     "jsonwebtoken": "9.0.2",
     "kafkajs": "1.16.0",
     "ldapts": "4.2.6",
-    "lodash": "4.17.21",
+    "lodash": "catalog:",
     "lossless-json": "1.0.5",
-    "luxon": "3.3.0",
+    "luxon": "catalog:",
     "mailparser": "3.6.7",
     "minifaker": "1.34.1",
     "moment-timezone": "0.5.37",
@@ -886,9 +886,9 @@
     "ssh2-sftp-client": "7.2.3",
     "tmp-promise": "3.0.3",
     "ts-ics": "^1.2.2",
-    "typedi": "0.10.0",
-    "uuid": "8.3.2",
+    "typedi": "catalog:",
+    "uuid": "catalog:",
     "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.2/xlsx-0.20.2.tgz",
-    "xml2js": "0.6.2"
+    "xml2js": "catalog:"
   }
 }
diff --git a/packages/workflow/package.json b/packages/workflow/package.json
index 96a4f31fd16fa..83de78636bf8c 100644
--- a/packages/workflow/package.json
+++ b/packages/workflow/package.json
@@ -31,31 +31,31 @@
   "devDependencies": {
     "@langchain/core": "^0.2.18",
     "@types/deep-equal": "^1.0.1",
-    "@types/express": "^4.17.21",
+    "@types/express": "catalog:",
     "@types/jmespath": "^0.15.0",
-    "@types/lodash": "^4.14.195",
+    "@types/lodash": "catalog:",
     "@types/luxon": "^3.2.0",
     "@types/md5": "^2.3.5",
-    "@types/xml2js": "^0.4.14"
+    "@types/xml2js": "catalog:"
   },
   "dependencies": {
     "@n8n/tournament": "1.0.2",
     "@n8n_io/riot-tmpl": "4.0.0",
     "ast-types": "0.15.2",
-    "axios": "1.6.7",
+    "axios": "catalog:",
     "callsites": "3.1.0",
     "deep-equal": "2.2.0",
     "esprima-next": "5.8.4",
-    "form-data": "4.0.0",
+    "form-data": "catalog:",
     "jmespath": "0.16.0",
     "js-base64": "3.7.2",
     "jssha": "3.3.1",
-    "lodash": "4.17.21",
-    "luxon": "3.3.0",
+    "lodash": "catalog:",
+    "luxon": "catalog:",
     "md5": "2.3.0",
     "recast": "0.21.5",
     "title-case": "3.0.3",
     "transliteration": "2.3.5",
-    "xml2js": "0.6.2"
+    "xml2js": "catalog:"
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index e97519b806455..58fd67d51719a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -4,6 +4,70 @@ settings:
   autoInstallPeers: true
   excludeLinksFromLockfile: false
 
+catalogs:
+  default:
+    '@types/basic-auth':
+      specifier: ^1.1.3
+      version: 1.1.3
+    '@types/express':
+      specifier: ^4.17.21
+      version: 4.17.21
+    '@types/lodash':
+      specifier: ^4.14.195
+      version: 4.14.195
+    '@types/uuid':
+      specifier: ^8.3.2
+      version: 8.3.4
+    '@types/xml2js':
+      specifier: ^0.4.14
+      version: 0.4.14
+    basic-auth:
+      specifier: 2.0.1
+      version: 2.0.1
+    fast-glob:
+      specifier: 3.2.12
+      version: 3.2.12
+    form-data:
+      specifier: 4.0.0
+      version: 4.0.0
+    lodash:
+      specifier: 4.17.21
+      version: 4.17.21
+    luxon:
+      specifier: 3.4.4
+      version: 3.4.4
+    nanoid:
+      specifier: 3.3.6
+      version: 3.3.6
+    typedi:
+      specifier: 0.10.0
+      version: 0.10.0
+    uuid:
+      specifier: 8.3.2
+      version: 8.3.2
+    xml2js:
+      specifier: 0.6.2
+      version: 0.6.2
+  frontend:
+    '@vitest/coverage-v8':
+      specifier: ^1.6.0
+      version: 1.6.0
+    vite:
+      specifier: ^5.2.12
+      version: 5.2.12
+    vitest:
+      specifier: ^1.6.0
+      version: 1.6.0
+    vitest-mock-extended:
+      specifier: ^1.3.1
+      version: 1.3.1
+    vue:
+      specifier: ^3.4.21
+      version: 3.4.21
+    vue-tsc:
+      specifier: ^2.0.19
+      version: 2.0.19
+
 overrides:
   '@types/node': ^18.16.16
   axios: 1.6.7
@@ -54,9 +118,6 @@ importers:
       '@types/supertest':
         specifier: ^6.0.2
         version: 6.0.2
-      '@vitest/coverage-v8':
-        specifier: ^1.6.0
-        version: 1.6.0(vitest@1.6.0(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1))
       jest:
         specifier: ^29.6.2
         version: 29.6.2(@types/node@18.16.16)
@@ -105,18 +166,6 @@ importers:
       typescript:
         specifier: ^5.5.2
         version: 5.5.2
-      vite:
-        specifier: ^5.2.12
-        version: 5.2.12(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1)
-      vitest:
-        specifier: ^1.6.0
-        version: 1.6.0(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1)
-      vitest-mock-extended:
-        specifier: ^1.3.1
-        version: 1.3.1(typescript@5.5.2)(vitest@1.6.0(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1))
-      vue-tsc:
-        specifier: ^2.0.19
-        version: 2.0.19(typescript@5.5.2)
 
   cypress:
     dependencies:
@@ -136,17 +185,17 @@ importers:
         specifier: ^1.12.0
         version: 1.12.0(cypress@13.11.0)
       lodash:
-        specifier: 4.17.21
+        specifier: 'catalog:'
         version: 4.17.21
       nanoid:
-        specifier: 3.3.6
+        specifier: 'catalog:'
         version: 3.3.6
       start-server-and-test:
         specifier: ^2.0.3
         version: 2.0.3
     devDependencies:
       '@types/lodash':
-        specifier: ^4.14.195
+        specifier: 'catalog:'
         version: 4.14.195
       eslint-plugin-cypress:
         specifier: ^3.3.0
@@ -167,10 +216,10 @@ importers:
         specifier: ^4.0.1
         version: 4.0.1
       uuid:
-        specifier: ^8.3.2
+        specifier: 'catalog:'
         version: 8.3.2
       vue:
-        specifier: ^3.4.21
+        specifier: catalog:frontend
         version: 3.4.21(typescript@5.5.2)
       vue-markdown-render:
         specifier: ^2.1.1
@@ -185,12 +234,24 @@ importers:
       '@types/markdown-it':
         specifier: ^12.2.3
         version: 12.2.3
+      '@vitest/coverage-v8':
+        specifier: catalog:frontend
+        version: 1.6.0(vitest@1.6.0(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1))
       unplugin-icons:
         specifier: ^0.19.0
         version: 0.19.0(@vue/compiler-sfc@3.4.21)(vue-template-compiler@2.7.14)
+      vite:
+        specifier: catalog:frontend
+        version: 5.2.12(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1)
       vite-plugin-dts:
         specifier: ^3.9.1
         version: 3.9.1(@types/node@18.16.16)(rollup@4.18.0)(typescript@5.5.2)(vite@5.2.12(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1))
+      vitest:
+        specifier: catalog:frontend
+        version: 1.6.0(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1)
+      vue-tsc:
+        specifier: catalog:frontend
+        version: 2.0.19(typescript@5.5.2)
 
   packages/@n8n/client-oauth2:
     dependencies:
@@ -220,7 +281,7 @@ importers:
         specifier: 0.2.2
         version: 0.2.2
       typedi:
-        specifier: 0.10.0
+        specifier: 'catalog:'
         version: 0.10.0(patch_hash=sk6omkefrosihg7lmqbzh7vfxe)
 
   packages/@n8n/imap:
@@ -288,10 +349,10 @@ importers:
         version: 0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))
       '@langchain/community':
         specifier: 0.2.20
-        version: 0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1)
+        version: 0.2.20(bl2awxa6z6ereahlcpz2dlbf6q)
       '@langchain/core':
         specifier: 0.2.18
-        version: 0.2.18(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))
+        version: 0.2.18(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))
       '@langchain/google-genai':
         specifier: 0.0.23
         version: 0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8)
@@ -309,19 +370,19 @@ importers:
         version: 0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))
       '@langchain/openai':
         specifier: 0.2.5
-        version: 0.2.5(encoding@0.1.13)(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))
+        version: 0.2.5(encoding@0.1.13)(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))
       '@langchain/pinecone':
         specifier: 0.0.8
-        version: 0.0.8(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))
+        version: 0.0.8(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))
       '@langchain/qdrant':
         specifier: ^0.0.5
-        version: 0.0.5(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))(typescript@5.5.2)
+        version: 0.0.5(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))(typescript@5.5.2)
       '@langchain/redis':
         specifier: 0.0.5
-        version: 0.0.5(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))
+        version: 0.0.5(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))
       '@langchain/textsplitters':
         specifier: 0.0.3
-        version: 0.0.3(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))
+        version: 0.0.3(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))
       '@mozilla/readability':
         specifier: ^0.5.0
         version: 0.5.0
@@ -347,7 +408,7 @@ importers:
         specifier: 0.28.4
         version: 0.28.4(typescript@5.5.2)
       basic-auth:
-        specifier: 2.0.1
+        specifier: 'catalog:'
         version: 2.0.1
       cheerio:
         specifier: 1.0.0-rc.12
@@ -362,7 +423,7 @@ importers:
         specifier: 3.0.2
         version: 3.0.2(ts-toolbelt@9.6.0)
       form-data:
-        specifier: 4.0.0
+        specifier: 'catalog:'
         version: 4.0.0
       generate-schema:
         specifier: 2.6.0
@@ -378,9 +439,9 @@ importers:
         version: 2.1.0
       langchain:
         specifier: 0.2.11
-        version: 0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1)
+        version: 0.2.11(3eonfu4fvxvjb5zdrprnb3pokq)
       lodash:
-        specifier: 4.17.21
+        specifier: 'catalog:'
         version: 4.17.21
       mammoth:
         specifier: 1.7.2
@@ -420,7 +481,7 @@ importers:
         version: 3.23.0(zod@3.23.8)
     devDependencies:
       '@types/basic-auth':
-        specifier: ^1.1.3
+        specifier: 'catalog:'
         version: 1.1.3
       '@types/cheerio':
         specifier: ^0.22.15
@@ -459,7 +520,7 @@ importers:
         version: 8.1.4(@types/react@18.0.27)(encoding@0.1.13)(prettier@3.2.5)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@storybook/addon-interactions':
         specifier: ^8.1.4
-        version: 8.1.4(@jest/globals@29.6.2)(@types/jest@29.5.3)(jest@29.6.2(@types/node@18.16.16))(vitest@1.6.0(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1))
+        version: 8.1.4(@jest/globals@29.6.2)(@types/jest@29.5.3)(jest@29.6.2(@types/node@18.16.16))(vitest@1.6.0(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1))
       '@storybook/addon-links':
         specifier: ^8.1.4
         version: 8.1.4(react@18.2.0)
@@ -471,7 +532,7 @@ importers:
         version: 8.1.4(@types/react@18.0.27)(encoding@0.1.13)(prettier@3.2.5)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@storybook/test':
         specifier: ^8.1.4
-        version: 8.1.4(@jest/globals@29.6.2)(@types/jest@29.5.3)(jest@29.6.2(@types/node@18.16.16))(vitest@1.6.0(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1))
+        version: 8.1.4(@jest/globals@29.6.2)(@types/jest@29.5.3)(jest@29.6.2(@types/node@18.16.16))(vitest@1.6.0(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1))
       '@storybook/vue3':
         specifier: ^8.1.4
         version: 8.1.4(encoding@0.1.13)(prettier@3.2.5)(vue@3.4.21(typescript@5.5.2))
@@ -644,7 +705,7 @@ importers:
         specifier: 7.2.0
         version: 7.2.0(express@4.19.2)
       fast-glob:
-        specifier: 3.2.12
+        specifier: 'catalog:'
         version: 3.2.12
       flat:
         specifier: 5.0.2
@@ -683,11 +744,11 @@ importers:
         specifier: 4.2.6
         version: 4.2.6
       lodash:
-        specifier: 4.17.21
+        specifier: 'catalog:'
         version: 4.17.21
       luxon:
-        specifier: 3.3.0
-        version: 3.3.0
+        specifier: 'catalog:'
+        version: 3.4.4
       mysql2:
         specifier: 3.10.0
         version: 3.10.0
@@ -704,7 +765,7 @@ importers:
         specifier: workspace:*
         version: link:../workflow
       nanoid:
-        specifier: 3.3.6
+        specifier: 'catalog:'
         version: 3.3.6
       nodemailer:
         specifier: 6.9.9
@@ -785,10 +846,10 @@ importers:
         specifier: 1.1.1
         version: 1.1.1
       typedi:
-        specifier: 0.10.0
+        specifier: 'catalog:'
         version: 0.10.0(patch_hash=sk6omkefrosihg7lmqbzh7vfxe)
       uuid:
-        specifier: 8.3.2
+        specifier: 'catalog:'
         version: 8.3.2
       validator:
         specifier: 13.7.0
@@ -800,7 +861,7 @@ importers:
         specifier: '>=8.17.1'
         version: 8.17.1
       xml2js:
-        specifier: 0.6.2
+        specifier: 'catalog:'
         version: 0.6.2
       xmllint-wasm:
         specifier: 3.0.1
@@ -831,7 +892,7 @@ importers:
         specifier: ^1.4.2
         version: 1.4.3
       '@types/express':
-        specifier: ^4.17.21
+        specifier: 'catalog:'
         version: 4.17.21
       '@types/flat':
         specifier: ^5.0.5
@@ -846,7 +907,7 @@ importers:
         specifier: ^9.0.6
         version: 9.0.6
       '@types/lodash':
-        specifier: ^4.14.195
+        specifier: 'catalog:'
         version: 4.14.195
       '@types/psl':
         specifier: ^1.1.0
@@ -870,7 +931,7 @@ importers:
         specifier: ^1.1.2
         version: 1.1.2
       '@types/uuid':
-        specifier: ^8.3.2
+        specifier: 'catalog:'
         version: 8.3.4
       '@types/validator':
         specifier: ^13.7.0
@@ -879,7 +940,7 @@ importers:
         specifier: ^8.5.4
         version: 8.5.4(patch_hash=nbzuqaoyqbrfwipijj5qriqqju)
       '@types/xml2js':
-        specifier: ^0.4.14
+        specifier: 'catalog:'
         version: 0.4.14
       '@types/yamljs':
         specifier: ^0.2.31
@@ -918,19 +979,19 @@ importers:
         specifier: 3.1.7
         version: 3.1.7
       fast-glob:
-        specifier: 3.2.12
+        specifier: 'catalog:'
         version: 3.2.12
       file-type:
         specifier: 16.5.4
         version: 16.5.4
       form-data:
-        specifier: 4.0.0
+        specifier: 'catalog:'
         version: 4.0.0
       lodash:
-        specifier: 4.17.21
+        specifier: 'catalog:'
         version: 4.17.21
       luxon:
-        specifier: ^3.4.4
+        specifier: 'catalog:'
         version: 3.4.4
       mime-types:
         specifier: 2.1.35
@@ -954,13 +1015,13 @@ importers:
         specifier: 1.15.0
         version: 1.15.0
       typedi:
-        specifier: 0.10.0
+        specifier: 'catalog:'
         version: 0.10.0(patch_hash=sk6omkefrosihg7lmqbzh7vfxe)
       uuid:
-        specifier: 8.3.2
+        specifier: 'catalog:'
         version: 8.3.2
       xml2js:
-        specifier: 0.6.2
+        specifier: 'catalog:'
         version: 0.6.2
     devDependencies:
       '@types/aws4':
@@ -970,19 +1031,19 @@ importers:
         specifier: ^2.0.0
         version: 2.0.0
       '@types/express':
-        specifier: ^4.17.21
+        specifier: 'catalog:'
         version: 4.17.21
       '@types/lodash':
-        specifier: ^4.14.195
+        specifier: 'catalog:'
         version: 4.14.195
       '@types/mime-types':
         specifier: ^2.1.0
         version: 2.1.1
       '@types/uuid':
-        specifier: ^8.3.2
+        specifier: 'catalog:'
         version: 8.3.4
       '@types/xml2js':
-        specifier: ^0.4.14
+        specifier: 'catalog:'
         version: 0.4.14
 
   packages/design-system:
@@ -1015,7 +1076,7 @@ importers:
         specifier: 2.12.1
         version: 2.12.1
       vue:
-        specifier: ^3.4.21
+        specifier: catalog:frontend
         version: 3.4.21(typescript@5.5.2)
       vue-boring-avatars:
         specifier: ^1.3.0
@@ -1054,6 +1115,9 @@ importers:
       '@vitejs/plugin-vue':
         specifier: ^5.0.4
         version: 5.0.4(vite@5.2.12(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1))(vue@3.4.21(typescript@5.5.2))
+      '@vitest/coverage-v8':
+        specifier: catalog:frontend
+        version: 1.6.0(vitest@1.6.0(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1))
       '@vue/test-utils':
         specifier: ^2.4.3
         version: 2.4.3(@vue/server-renderer@3.4.21(vue@3.4.21(typescript@5.5.2)))(vue@3.4.21(typescript@5.5.2))
@@ -1075,6 +1139,18 @@ importers:
       unplugin-vue-components:
         specifier: ^0.27.2
         version: 0.27.3(@babel/parser@7.24.6)(rollup@4.18.0)(vue@3.4.21(typescript@5.5.2))
+      vite:
+        specifier: catalog:frontend
+        version: 5.2.12(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1)
+      vitest:
+        specifier: catalog:frontend
+        version: 1.6.0(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1)
+      vitest-mock-extended:
+        specifier: catalog:frontend
+        version: 1.3.1(typescript@5.5.2)(vitest@1.6.0(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1))
+      vue-tsc:
+        specifier: catalog:frontend
+        version: 2.0.19(typescript@5.5.2)
 
   packages/editor-ui:
     dependencies:
@@ -1208,8 +1284,8 @@ importers:
         specifier: ^4.17.21
         version: 4.17.21
       luxon:
-        specifier: ^3.3.0
-        version: 3.3.0
+        specifier: 'catalog:'
+        version: 3.4.4
       n8n-design-system:
         specifier: workspace:*
         version: link:../design-system
@@ -1232,13 +1308,13 @@ importers:
         specifier: ^4.0.2
         version: 4.0.2
       uuid:
-        specifier: ^8.3.2
+        specifier: 'catalog:'
         version: 8.3.2
       v3-infinite-loading:
         specifier: ^1.2.2
         version: 1.2.2
       vue:
-        specifier: ^3.4.21
+        specifier: catalog:frontend
         version: 3.4.21(typescript@5.5.2)
       vue-agile:
         specifier: ^2.0.0
@@ -1296,8 +1372,11 @@ importers:
         specifier: ^3.2.0
         version: 3.2.0
       '@types/uuid':
-        specifier: ^8.3.2
+        specifier: 'catalog:'
         version: 8.3.4
+      '@vitest/coverage-v8':
+        specifier: catalog:frontend
+        version: 1.6.0(vitest@1.6.0(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1))
       cross-env:
         specifier: ^7.0.3
         version: 7.0.3
@@ -1310,6 +1389,18 @@ importers:
       unplugin-vue-components:
         specifier: ^0.27.2
         version: 0.27.3(@babel/parser@7.24.6)(rollup@4.18.0)(vue@3.4.21(typescript@5.5.2))
+      vite:
+        specifier: catalog:frontend
+        version: 5.2.12(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1)
+      vitest:
+        specifier: catalog:frontend
+        version: 1.6.0(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1)
+      vitest-mock-extended:
+        specifier: catalog:frontend
+        version: 1.3.1(typescript@5.5.2)(vitest@1.6.0(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1))
+      vue-tsc:
+        specifier: catalog:frontend
+        version: 2.0.19(typescript@5.5.2)
 
   packages/node-dev:
     dependencies:
@@ -1320,7 +1411,7 @@ importers:
         specifier: ^4.1.1
         version: 4.1.2
       fast-glob:
-        specifier: ^3.2.5
+        specifier: 'catalog:'
         version: 3.2.12
       inquirer:
         specifier: ^7.0.1
@@ -1338,7 +1429,7 @@ importers:
         specifier: ^3.0.3
         version: 3.0.3
       typedi:
-        specifier: ^0.10.0
+        specifier: 'catalog:'
         version: 0.10.0(patch_hash=sk6omkefrosihg7lmqbzh7vfxe)
     devDependencies:
       '@types/inquirer':
@@ -1366,7 +1457,7 @@ importers:
         specifier: 1.11.0
         version: 1.11.0
       basic-auth:
-        specifier: 2.0.1
+        specifier: 'catalog:'
         version: 2.0.1
       change-case:
         specifier: 4.1.2
@@ -1390,7 +1481,7 @@ importers:
         specifier: 2.0.2
         version: 2.0.2
       fast-glob:
-        specifier: 3.2.12
+        specifier: 'catalog:'
         version: 3.2.12
       fflate:
         specifier: 0.7.4
@@ -1429,14 +1520,14 @@ importers:
         specifier: 4.2.6
         version: 4.2.6
       lodash:
-        specifier: 4.17.21
+        specifier: 'catalog:'
         version: 4.17.21
       lossless-json:
         specifier: 1.0.5
         version: 1.0.5
       luxon:
-        specifier: 3.3.0
-        version: 3.3.0
+        specifier: 'catalog:'
+        version: 3.4.4
       mailparser:
         specifier: 3.6.7
         version: 3.6.7
@@ -1525,16 +1616,16 @@ importers:
         specifier: ^1.2.2
         version: 1.2.2(date-fns@2.30.0)(lodash@4.17.21)(zod@3.23.8)
       typedi:
-        specifier: 0.10.0
+        specifier: 'catalog:'
         version: 0.10.0(patch_hash=sk6omkefrosihg7lmqbzh7vfxe)
       uuid:
-        specifier: 8.3.2
+        specifier: 'catalog:'
         version: 8.3.2
       xlsx:
         specifier: https://cdn.sheetjs.com/xlsx-0.20.2/xlsx-0.20.2.tgz
         version: https://cdn.sheetjs.com/xlsx-0.20.2/xlsx-0.20.2.tgz
       xml2js:
-        specifier: 0.6.2
+        specifier: 'catalog:'
         version: 0.6.2
     devDependencies:
       '@types/amqplib':
@@ -1544,7 +1635,7 @@ importers:
         specifier: ^1.5.1
         version: 1.11.2
       '@types/basic-auth':
-        specifier: ^1.1.3
+        specifier: 'catalog:'
         version: 1.1.3
       '@types/cheerio':
         specifier: ^0.22.15
@@ -1553,7 +1644,7 @@ importers:
         specifier: ^1.1.2
         version: 1.1.9
       '@types/express':
-        specifier: ^4.17.21
+        specifier: 'catalog:'
         version: 4.17.21
       '@types/gm':
         specifier: ^1.25.0
@@ -1568,7 +1659,7 @@ importers:
         specifier: ^9.0.6
         version: 9.0.6
       '@types/lodash':
-        specifier: ^4.14.195
+        specifier: 'catalog:'
         version: 4.14.195
       '@types/lossless-json':
         specifier: ^1.0.0
@@ -1601,10 +1692,10 @@ importers:
         specifier: ^5.1.0
         version: 5.3.2
       '@types/uuid':
-        specifier: ^8.3.2
+        specifier: 'catalog:'
         version: 8.3.4
       '@types/xml2js':
-        specifier: ^0.4.14
+        specifier: 'catalog:'
         version: 0.4.14
       eslint-plugin-n8n-nodes-base:
         specifier: ^1.16.0
@@ -1637,7 +1728,7 @@ importers:
         specifier: 5.8.4
         version: 5.8.4
       form-data:
-        specifier: 4.0.0
+        specifier: 'catalog:'
         version: 4.0.0
       jmespath:
         specifier: 0.16.0
@@ -1649,11 +1740,11 @@ importers:
         specifier: 3.3.1
         version: 3.3.1
       lodash:
-        specifier: 4.17.21
+        specifier: 'catalog:'
         version: 4.17.21
       luxon:
-        specifier: 3.3.0
-        version: 3.3.0
+        specifier: 'catalog:'
+        version: 3.4.4
       md5:
         specifier: 2.3.0
         version: 2.3.0
@@ -1667,23 +1758,23 @@ importers:
         specifier: 2.3.5
         version: 2.3.5
       xml2js:
-        specifier: 0.6.2
+        specifier: 'catalog:'
         version: 0.6.2
     devDependencies:
       '@langchain/core':
         specifier: ^0.2.18
-        version: 0.2.18(langchain@0.2.11(axios@1.6.7)(jsdom@23.0.1)(openai@4.53.0))(openai@4.53.0)
+        version: 0.2.18(langchain@0.2.11(axios@1.6.7)(openai@4.53.0))(openai@4.53.0)
       '@types/deep-equal':
         specifier: ^1.0.1
         version: 1.0.1
       '@types/express':
-        specifier: ^4.17.21
+        specifier: 'catalog:'
         version: 4.17.21
       '@types/jmespath':
         specifier: ^0.15.0
         version: 0.15.0
       '@types/lodash':
-        specifier: ^4.14.195
+        specifier: 'catalog:'
         version: 4.14.195
       '@types/luxon':
         specifier: ^3.2.0
@@ -1692,7 +1783,7 @@ importers:
         specifier: ^2.3.5
         version: 2.3.5
       '@types/xml2js':
-        specifier: ^0.4.14
+        specifier: 'catalog:'
         version: 0.4.14
 
 packages:
@@ -3470,15 +3561,9 @@ packages:
   '@jridgewell/source-map@0.3.2':
     resolution: {integrity: sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==}
 
-  '@jridgewell/sourcemap-codec@1.4.14':
-    resolution: {integrity: sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==}
-
   '@jridgewell/sourcemap-codec@1.4.15':
     resolution: {integrity: sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==}
 
-  '@jridgewell/trace-mapping@0.3.18':
-    resolution: {integrity: sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==}
-
   '@jridgewell/trace-mapping@0.3.25':
     resolution: {integrity: sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==}
 
@@ -8828,10 +8913,6 @@ packages:
   isstream@0.1.2:
     resolution: {integrity: sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==}
 
-  istanbul-lib-coverage@3.2.0:
-    resolution: {integrity: sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==}
-    engines: {node: '>=8'}
-
   istanbul-lib-coverage@3.2.2:
     resolution: {integrity: sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==}
     engines: {node: '>=8'}
@@ -8840,10 +8921,6 @@ packages:
     resolution: {integrity: sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==}
     engines: {node: '>=8'}
 
-  istanbul-lib-report@3.0.0:
-    resolution: {integrity: sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==}
-    engines: {node: '>=8'}
-
   istanbul-lib-report@3.0.1:
     resolution: {integrity: sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==}
     engines: {node: '>=10'}
@@ -8856,10 +8933,6 @@ packages:
     resolution: {integrity: sha512-wHOoEsNJTVltaJp8eVkm8w+GVkVNHT2YDYo53YdzQEL2gWm1hBX5cGFR9hQJtuGLebidVX7et3+dmDZrmclduw==}
     engines: {node: '>=10'}
 
-  istanbul-reports@3.1.5:
-    resolution: {integrity: sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==}
-    engines: {node: '>=8'}
-
   istanbul-reports@3.1.6:
     resolution: {integrity: sha512-TLgnMkKg3iTDsQ9PbPTdpfAK2DzjF9mqUG7RMgcQl8oFjad8ob4laGxv5XV5U9MAfx8D6tSJiUyuAwzLicaxlg==}
     engines: {node: '>=8'}
@@ -9696,10 +9769,6 @@ packages:
   lunr@2.3.9:
     resolution: {integrity: sha512-zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow==}
 
-  luxon@3.3.0:
-    resolution: {integrity: sha512-An0UCfG/rSiqtAIiBPO0Y9/zAnHUZxAMiCpTd5h2smgsj7GGmcenvrvww2cqNA8/4A5ZrD1gJpHN2mIHZQF+Mg==}
-    engines: {node: '>=12'}
-
   luxon@3.4.4:
     resolution: {integrity: sha512-zobTr7akeGHnv7eBOXcRgMeCP6+uyYsczwmeRCauvpvaAltgNyTbLH/+VaEAPUeWBT+1GuNmz4wC/6jtQzbbVA==}
     engines: {node: '>=12'}
@@ -10628,9 +10697,6 @@ packages:
     resolution: {integrity: sha512-5HviZNaZcfqP95rwpv+1HDgUamezbqdSYTyzjTvwtJSnIH+3vnbmWsItli8OFEndS984VT55M3jduxZbX351gg==}
     engines: {node: '>=12'}
 
-  pathe@1.1.1:
-    resolution: {integrity: sha512-d+RQGp0MAYTIaDBIMmOfMwz3E+LOZnxx1HZd5R18mmCZY0QBlK0LDZfPc8FW8Ed2DlvsuE6PRjroDY+wg4+j/Q==}
-
   pathe@1.1.2:
     resolution: {integrity: sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==}
 
@@ -13247,7 +13313,7 @@ snapshots:
   '@acuminous/bitsyntax@0.1.2':
     dependencies:
       buffer-more-ints: 1.0.0
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@8.1.1)
       safe-buffer: 5.1.2
     transitivePeerDependencies:
       - supports-color
@@ -14360,10 +14426,10 @@ snapshots:
       '@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.24.0
+      '@babel/parser': 7.24.6
       '@babel/template': 7.24.0
       '@babel/traverse': 7.24.0
-      '@babel/types': 7.24.0
+      '@babel/types': 7.24.6
       convert-source-map: 2.0.0
       debug: 4.3.5(supports-color@8.1.1)
       gensync: 1.0.0-beta.2
@@ -14394,14 +14460,14 @@ snapshots:
 
   '@babel/generator@7.22.9':
     dependencies:
-      '@babel/types': 7.24.0
-      '@jridgewell/gen-mapping': 0.3.2
-      '@jridgewell/trace-mapping': 0.3.18
+      '@babel/types': 7.24.6
+      '@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.24.0
+      '@babel/types': 7.24.6
       '@jridgewell/gen-mapping': 0.3.5
       '@jridgewell/trace-mapping': 0.3.25
       jsesc: 2.5.2
@@ -14415,7 +14481,7 @@ snapshots:
 
   '@babel/helper-annotate-as-pure@7.22.5':
     dependencies:
-      '@babel/types': 7.24.0
+      '@babel/types': 7.24.6
 
   '@babel/helper-annotate-as-pure@7.24.6':
     dependencies:
@@ -14510,7 +14576,7 @@ snapshots:
   '@babel/helper-function-name@7.23.0':
     dependencies:
       '@babel/template': 7.24.0
-      '@babel/types': 7.24.0
+      '@babel/types': 7.24.6
 
   '@babel/helper-function-name@7.24.6':
     dependencies:
@@ -14519,7 +14585,7 @@ snapshots:
 
   '@babel/helper-hoist-variables@7.22.5':
     dependencies:
-      '@babel/types': 7.24.0
+      '@babel/types': 7.24.6
 
   '@babel/helper-hoist-variables@7.24.6':
     dependencies:
@@ -14527,7 +14593,7 @@ snapshots:
 
   '@babel/helper-member-expression-to-functions@7.23.0':
     dependencies:
-      '@babel/types': 7.24.0
+      '@babel/types': 7.24.6
 
   '@babel/helper-member-expression-to-functions@7.24.6':
     dependencies:
@@ -14535,7 +14601,7 @@ snapshots:
 
   '@babel/helper-module-imports@7.22.15':
     dependencies:
-      '@babel/types': 7.24.0
+      '@babel/types': 7.24.6
 
   '@babel/helper-module-imports@7.24.6':
     dependencies:
@@ -14570,7 +14636,7 @@ snapshots:
 
   '@babel/helper-optimise-call-expression@7.22.5':
     dependencies:
-      '@babel/types': 7.24.0
+      '@babel/types': 7.24.6
 
   '@babel/helper-optimise-call-expression@7.24.6':
     dependencies:
@@ -14605,7 +14671,7 @@ snapshots:
 
   '@babel/helper-simple-access@7.22.5':
     dependencies:
-      '@babel/types': 7.24.0
+      '@babel/types': 7.24.6
 
   '@babel/helper-simple-access@7.24.6':
     dependencies:
@@ -14613,7 +14679,7 @@ snapshots:
 
   '@babel/helper-skip-transparent-expression-wrappers@7.22.5':
     dependencies:
-      '@babel/types': 7.24.0
+      '@babel/types': 7.24.6
 
   '@babel/helper-skip-transparent-expression-wrappers@7.24.6':
     dependencies:
@@ -14621,7 +14687,7 @@ snapshots:
 
   '@babel/helper-split-export-declaration@7.22.6':
     dependencies:
-      '@babel/types': 7.24.0
+      '@babel/types': 7.24.6
 
   '@babel/helper-split-export-declaration@7.24.6':
     dependencies:
@@ -14649,7 +14715,7 @@ snapshots:
     dependencies:
       '@babel/template': 7.24.0
       '@babel/traverse': 7.24.0
-      '@babel/types': 7.24.0
+      '@babel/types': 7.24.6
     transitivePeerDependencies:
       - supports-color
 
@@ -15324,7 +15390,7 @@ snapshots:
     dependencies:
       '@babel/core': 7.24.6
       '@babel/helper-plugin-utils': 7.24.6
-      '@babel/types': 7.24.0
+      '@babel/types': 7.24.6
       esutils: 2.0.3
 
   '@babel/preset-typescript@7.23.3(@babel/core@7.24.6)':
@@ -15362,8 +15428,8 @@ snapshots:
   '@babel/template@7.24.0':
     dependencies:
       '@babel/code-frame': 7.24.6
-      '@babel/parser': 7.24.0
-      '@babel/types': 7.24.0
+      '@babel/parser': 7.24.6
+      '@babel/types': 7.24.6
 
   '@babel/template@7.24.6':
     dependencies:
@@ -15379,8 +15445,8 @@ snapshots:
       '@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.24.0
-      '@babel/types': 7.24.0
+      '@babel/parser': 7.24.6
+      '@babel/types': 7.24.6
       debug: 4.3.5(supports-color@8.1.1)
       globals: 11.12.0
     transitivePeerDependencies:
@@ -15743,8 +15809,8 @@ snapshots:
       url-join: 4.0.1
       zod: 3.23.8
     optionalDependencies:
-      '@langchain/core': 0.2.18(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))
-      langchain: 0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1)
+      '@langchain/core': 0.2.18(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))
+      langchain: 0.2.11(3eonfu4fvxvjb5zdrprnb3pokq)
     transitivePeerDependencies:
       - encoding
 
@@ -16008,18 +16074,18 @@ snapshots:
       '@jest/test-result': 29.6.2
       '@jest/transform': 29.6.2
       '@jest/types': 29.6.1
-      '@jridgewell/trace-mapping': 0.3.18
+      '@jridgewell/trace-mapping': 0.3.25
       '@types/node': 18.16.16
       chalk: 4.1.2
       collect-v8-coverage: 1.0.1
       exit: 0.1.2
       glob: 7.2.3
       graceful-fs: 4.2.11
-      istanbul-lib-coverage: 3.2.0
+      istanbul-lib-coverage: 3.2.2
       istanbul-lib-instrument: 5.2.1
-      istanbul-lib-report: 3.0.0
+      istanbul-lib-report: 3.0.1
       istanbul-lib-source-maps: 4.0.1
-      istanbul-reports: 3.1.5
+      istanbul-reports: 3.1.6
       jest-message-util: 29.6.2
       jest-util: 29.6.2
       jest-worker: 29.6.2
@@ -16044,7 +16110,7 @@ snapshots:
 
   '@jest/source-map@29.6.0':
     dependencies:
-      '@jridgewell/trace-mapping': 0.3.18
+      '@jridgewell/trace-mapping': 0.3.25
       callsites: 3.1.0
       graceful-fs: 4.2.11
 
@@ -16066,7 +16132,7 @@ snapshots:
     dependencies:
       '@babel/core': 7.24.0
       '@jest/types': 29.6.1
-      '@jridgewell/trace-mapping': 0.3.18
+      '@jridgewell/trace-mapping': 0.3.25
       babel-plugin-istanbul: 6.1.1
       chalk: 4.1.2
       convert-source-map: 2.0.0
@@ -16095,7 +16161,7 @@ snapshots:
     dependencies:
       '@jridgewell/set-array': 1.1.2
       '@jridgewell/sourcemap-codec': 1.4.15
-      '@jridgewell/trace-mapping': 0.3.18
+      '@jridgewell/trace-mapping': 0.3.25
 
   '@jridgewell/gen-mapping@0.3.5':
     dependencies:
@@ -16115,15 +16181,8 @@ snapshots:
       '@jridgewell/trace-mapping': 0.3.25
     optional: true
 
-  '@jridgewell/sourcemap-codec@1.4.14': {}
-
   '@jridgewell/sourcemap-codec@1.4.15': {}
 
-  '@jridgewell/trace-mapping@0.3.18':
-    dependencies:
-      '@jridgewell/resolve-uri': 3.1.0
-      '@jridgewell/sourcemap-codec': 1.4.14
-
   '@jridgewell/trace-mapping@0.3.25':
     dependencies:
       '@jridgewell/resolve-uri': 3.1.0
@@ -16169,7 +16228,7 @@ snapshots:
 
   '@kwsites/file-exists@1.1.1':
     dependencies:
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -16178,7 +16237,7 @@ snapshots:
   '@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))':
     dependencies:
       '@anthropic-ai/sdk': 0.22.0(encoding@0.1.13)
-      '@langchain/core': 0.2.18(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))
+      '@langchain/core': 0.2.18(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))
       fast-xml-parser: 4.3.5
       zod: 3.23.8
       zod-to-json-schema: 3.23.0(zod@3.23.8)
@@ -16190,23 +16249,23 @@ snapshots:
 
   '@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))':
     dependencies:
-      '@langchain/core': 0.2.18(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))
+      '@langchain/core': 0.2.18(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))
       cohere-ai: 7.10.1(encoding@0.1.13)
     transitivePeerDependencies:
       - encoding
       - langchain
       - openai
 
-  ? '@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1)'
-  : dependencies:
-      '@langchain/core': 0.2.18(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))
-      '@langchain/openai': 0.2.5(encoding@0.1.13)(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))
+  '@langchain/community@0.2.20(bl2awxa6z6ereahlcpz2dlbf6q)':
+    dependencies:
+      '@langchain/core': 0.2.18(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))
+      '@langchain/openai': 0.2.5(encoding@0.1.13)(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))
       binary-extensions: 2.2.0
       expr-eval: 2.0.2
       flat: 5.0.2
       js-yaml: 4.1.0
-      langchain: 0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1)
-      langsmith: 0.1.34(@langchain/core@0.2.18(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13)))(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))
+      langchain: 0.2.11(3eonfu4fvxvjb5zdrprnb3pokq)
+      langsmith: 0.1.34(@langchain/core@0.2.18(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13)))(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))
       uuid: 10.0.0
       zod: 3.23.8
       zod-to-json-schema: 3.23.0(zod@3.23.8)
@@ -16267,13 +16326,13 @@ snapshots:
       - pyodide
       - supports-color
 
-  ? '@langchain/core@0.2.18(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))'
-  : dependencies:
+  '@langchain/core@0.2.18(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))':
+    dependencies:
       ansi-styles: 5.2.0
       camelcase: 6.3.0
       decamelize: 1.2.0
       js-tiktoken: 1.0.12
-      langsmith: 0.1.39(@langchain/core@0.2.18(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13)))(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))
+      langsmith: 0.1.39(@langchain/core@0.2.18(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13)))(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))
       ml-distance: 4.0.1
       mustache: 4.2.0
       p-queue: 6.6.2
@@ -16285,13 +16344,13 @@ snapshots:
       - langchain
       - openai
 
-  '@langchain/core@0.2.18(langchain@0.2.11(axios@1.6.7)(jsdom@23.0.1)(openai@4.53.0))(openai@4.53.0)':
+  '@langchain/core@0.2.18(langchain@0.2.11(axios@1.6.7)(openai@4.53.0))(openai@4.53.0)':
     dependencies:
       ansi-styles: 5.2.0
       camelcase: 6.3.0
       decamelize: 1.2.0
       js-tiktoken: 1.0.12
-      langsmith: 0.1.39(@langchain/core@0.2.18(langchain@0.2.11(axios@1.6.7)(jsdom@23.0.1)(openai@4.53.0))(openai@4.53.0))(langchain@0.2.11(axios@1.6.7)(jsdom@23.0.1)(openai@4.53.0))(openai@4.53.0)
+      langsmith: 0.1.39(@langchain/core@0.2.18(langchain@0.2.11(axios@1.6.7)(openai@4.53.0))(openai@4.53.0))(langchain@0.2.11(axios@1.6.7)(openai@4.53.0))(openai@4.53.0)
       ml-distance: 4.0.1
       mustache: 4.2.0
       p-queue: 6.6.2
@@ -16303,9 +16362,9 @@ snapshots:
       - langchain
       - openai
 
-  ? '@langchain/google-common@0.0.22(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))(zod@3.23.8)'
-  : dependencies:
-      '@langchain/core': 0.2.18(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))
+  '@langchain/google-common@0.0.22(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))(zod@3.23.8)':
+    dependencies:
+      '@langchain/core': 0.2.18(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))
       uuid: 10.0.0
       zod-to-json-schema: 3.23.0(zod@3.23.8)
     transitivePeerDependencies:
@@ -16313,10 +16372,10 @@ snapshots:
       - openai
       - zod
 
-  ? '@langchain/google-gauth@0.0.21(encoding@0.1.13)(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))(zod@3.23.8)'
-  : dependencies:
-      '@langchain/core': 0.2.18(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))
-      '@langchain/google-common': 0.0.22(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))(zod@3.23.8)
+  '@langchain/google-gauth@0.0.21(encoding@0.1.13)(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))(zod@3.23.8)':
+    dependencies:
+      '@langchain/core': 0.2.18(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))
+      '@langchain/google-common': 0.0.22(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))(zod@3.23.8)
       google-auth-library: 8.9.0(encoding@0.1.13)
     transitivePeerDependencies:
       - encoding
@@ -16328,7 +16387,7 @@ snapshots:
   '@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8)':
     dependencies:
       '@google/generative-ai': 0.7.1
-      '@langchain/core': 0.2.18(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))
+      '@langchain/core': 0.2.18(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))
       zod-to-json-schema: 3.23.0(zod@3.23.8)
     transitivePeerDependencies:
       - langchain
@@ -16337,8 +16396,8 @@ snapshots:
 
   '@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8)':
     dependencies:
-      '@langchain/core': 0.2.18(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))
-      '@langchain/google-gauth': 0.0.21(encoding@0.1.13)(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))(zod@3.23.8)
+      '@langchain/core': 0.2.18(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))
+      '@langchain/google-gauth': 0.0.21(encoding@0.1.13)(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))(zod@3.23.8)
     transitivePeerDependencies:
       - encoding
       - langchain
@@ -16348,8 +16407,8 @@ snapshots:
 
   '@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))':
     dependencies:
-      '@langchain/core': 0.2.18(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))
-      '@langchain/openai': 0.2.5(encoding@0.1.13)(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))
+      '@langchain/core': 0.2.18(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))
+      '@langchain/openai': 0.2.5(encoding@0.1.13)(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))
       groq-sdk: 0.3.2(encoding@0.1.13)
       zod: 3.23.8
       zod-to-json-schema: 3.23.0(zod@3.23.8)
@@ -16361,7 +16420,7 @@ snapshots:
 
   '@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))':
     dependencies:
-      '@langchain/core': 0.2.18(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))
+      '@langchain/core': 0.2.18(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))
       '@mistralai/mistralai': 0.4.0(encoding@0.1.13)
       uuid: 10.0.0
       zod: 3.23.8
@@ -16373,16 +16432,16 @@ snapshots:
 
   '@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))':
     dependencies:
-      '@langchain/core': 0.2.18(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))
+      '@langchain/core': 0.2.18(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))
       ollama: 0.5.6
       uuid: 10.0.0
     transitivePeerDependencies:
       - langchain
       - openai
 
-  ? '@langchain/openai@0.2.5(encoding@0.1.13)(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))'
-  : dependencies:
-      '@langchain/core': 0.2.18(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))
+  '@langchain/openai@0.2.5(encoding@0.1.13)(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))':
+    dependencies:
+      '@langchain/core': 0.2.18(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))
       js-tiktoken: 1.0.12
       openai: 4.53.0(encoding@0.1.13)
       zod: 3.23.8
@@ -16392,9 +16451,9 @@ snapshots:
       - langchain
       - supports-color
 
-  '@langchain/openai@0.2.5(langchain@0.2.11(axios@1.6.7)(jsdom@23.0.1)(openai@4.53.0))':
+  '@langchain/openai@0.2.5(langchain@0.2.11(axios@1.6.7)(openai@4.53.0))':
     dependencies:
-      '@langchain/core': 0.2.18(langchain@0.2.11(axios@1.6.7)(jsdom@23.0.1)(openai@4.53.0))(openai@4.53.0)
+      '@langchain/core': 0.2.18(langchain@0.2.11(axios@1.6.7)(openai@4.53.0))(openai@4.53.0)
       js-tiktoken: 1.0.12
       openai: 4.53.0(encoding@0.1.13)
       zod: 3.23.8
@@ -16405,9 +16464,9 @@ snapshots:
       - supports-color
     optional: true
 
-  ? '@langchain/pinecone@0.0.8(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))'
-  : dependencies:
-      '@langchain/core': 0.2.18(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))
+  '@langchain/pinecone@0.0.8(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))':
+    dependencies:
+      '@langchain/core': 0.2.18(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))
       '@pinecone-database/pinecone': 3.0.0
       flat: 5.0.2
       uuid: 10.0.0
@@ -16415,9 +16474,9 @@ snapshots:
       - langchain
       - openai
 
-  ? '@langchain/qdrant@0.0.5(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))(typescript@5.5.2)'
-  : dependencies:
-      '@langchain/core': 0.2.18(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))
+  '@langchain/qdrant@0.0.5(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))(typescript@5.5.2)':
+    dependencies:
+      '@langchain/core': 0.2.18(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))
       '@qdrant/js-client-rest': 1.9.0(typescript@5.5.2)
       uuid: 9.0.1
     transitivePeerDependencies:
@@ -16425,25 +16484,25 @@ snapshots:
       - openai
       - typescript
 
-  ? '@langchain/redis@0.0.5(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))'
-  : dependencies:
-      '@langchain/core': 0.2.18(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))
+  '@langchain/redis@0.0.5(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))':
+    dependencies:
+      '@langchain/core': 0.2.18(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))
       redis: 4.6.13
     transitivePeerDependencies:
       - langchain
       - openai
 
-  ? '@langchain/textsplitters@0.0.3(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))'
-  : dependencies:
-      '@langchain/core': 0.2.18(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))
+  '@langchain/textsplitters@0.0.3(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))':
+    dependencies:
+      '@langchain/core': 0.2.18(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))
       js-tiktoken: 1.0.12
     transitivePeerDependencies:
       - langchain
       - openai
 
-  '@langchain/textsplitters@0.0.3(langchain@0.2.11(axios@1.6.7)(jsdom@23.0.1)(openai@4.53.0))(openai@4.53.0)':
+  '@langchain/textsplitters@0.0.3(langchain@0.2.11(axios@1.6.7)(openai@4.53.0))(openai@4.53.0)':
     dependencies:
-      '@langchain/core': 0.2.18(langchain@0.2.11(axios@1.6.7)(jsdom@23.0.1)(openai@4.53.0))(openai@4.53.0)
+      '@langchain/core': 0.2.18(langchain@0.2.11(axios@1.6.7)(openai@4.53.0))(openai@4.53.0)
       js-tiktoken: 1.0.12
     transitivePeerDependencies:
       - langchain
@@ -17712,11 +17771,11 @@ snapshots:
     dependencies:
       '@storybook/global': 5.0.0
 
-  '@storybook/addon-interactions@8.1.4(@jest/globals@29.6.2)(@types/jest@29.5.3)(jest@29.6.2(@types/node@18.16.16))(vitest@1.6.0(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1))':
+  '@storybook/addon-interactions@8.1.4(@jest/globals@29.6.2)(@types/jest@29.5.3)(jest@29.6.2(@types/node@18.16.16))(vitest@1.6.0(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1))':
     dependencies:
       '@storybook/global': 5.0.0
       '@storybook/instrumenter': 8.1.4
-      '@storybook/test': 8.1.4(@jest/globals@29.6.2)(@types/jest@29.5.3)(jest@29.6.2(@types/node@18.16.16))(vitest@1.6.0(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1))
+      '@storybook/test': 8.1.4(@jest/globals@29.6.2)(@types/jest@29.5.3)(jest@29.6.2(@types/node@18.16.16))(vitest@1.6.0(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1))
       '@storybook/types': 8.1.4
       polished: 4.2.2
       ts-dedent: 2.2.0
@@ -18164,14 +18223,14 @@ snapshots:
       - prettier
       - supports-color
 
-  '@storybook/test@8.1.4(@jest/globals@29.6.2)(@types/jest@29.5.3)(jest@29.6.2(@types/node@18.16.16))(vitest@1.6.0(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1))':
+  '@storybook/test@8.1.4(@jest/globals@29.6.2)(@types/jest@29.5.3)(jest@29.6.2(@types/node@18.16.16))(vitest@1.6.0(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1))':
     dependencies:
       '@storybook/client-logger': 8.1.4
       '@storybook/core-events': 8.1.4
       '@storybook/instrumenter': 8.1.4
       '@storybook/preview-api': 8.1.4
       '@testing-library/dom': 9.3.4
-      '@testing-library/jest-dom': 6.4.2(@jest/globals@29.6.2)(@types/jest@29.5.3)(jest@29.6.2(@types/node@18.16.16))(vitest@1.6.0(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1))
+      '@testing-library/jest-dom': 6.4.2(@jest/globals@29.6.2)(@types/jest@29.5.3)(jest@29.6.2(@types/node@18.16.16))(vitest@1.6.0(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1))
       '@testing-library/user-event': 14.5.2(@testing-library/dom@9.3.4)
       '@vitest/expect': 1.3.1
       '@vitest/spy': 1.3.1
@@ -18334,7 +18393,7 @@ snapshots:
       jest: 29.6.2(@types/node@18.16.16)
       vitest: 1.6.0(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1)
 
-  '@testing-library/jest-dom@6.4.2(@jest/globals@29.6.2)(@types/jest@29.5.3)(jest@29.6.2(@types/node@18.16.16))(vitest@1.6.0(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1))':
+  '@testing-library/jest-dom@6.4.2(@jest/globals@29.6.2)(@types/jest@29.5.3)(jest@29.6.2(@types/node@18.16.16))(vitest@1.6.0(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1))':
     dependencies:
       '@adobe/css-tools': 4.3.2
       '@babel/runtime': 7.23.6
@@ -18393,24 +18452,24 @@ snapshots:
 
   '@types/babel__core@7.20.0':
     dependencies:
-      '@babel/parser': 7.24.0
-      '@babel/types': 7.24.0
+      '@babel/parser': 7.24.6
+      '@babel/types': 7.24.6
       '@types/babel__generator': 7.6.4
       '@types/babel__template': 7.4.1
       '@types/babel__traverse': 7.18.2
 
   '@types/babel__generator@7.6.4':
     dependencies:
-      '@babel/types': 7.24.0
+      '@babel/types': 7.24.6
 
   '@types/babel__template@7.4.1':
     dependencies:
-      '@babel/parser': 7.24.0
-      '@babel/types': 7.24.0
+      '@babel/parser': 7.24.6
+      '@babel/types': 7.24.6
 
   '@types/babel__traverse@7.18.2':
     dependencies:
-      '@babel/types': 7.24.0
+      '@babel/types': 7.24.6
 
   '@types/basic-auth@1.1.3':
     dependencies:
@@ -18986,12 +19045,12 @@ snapshots:
     dependencies:
       '@ampproject/remapping': 2.2.1
       '@bcoe/v8-coverage': 0.2.3
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@8.1.1)
       istanbul-lib-coverage: 3.2.2
       istanbul-lib-report: 3.0.1
       istanbul-lib-source-maps: 5.0.4
       istanbul-reports: 3.1.6
-      magic-string: 0.30.8
+      magic-string: 0.30.10
       magicast: 0.3.3
       picocolors: 1.0.0
       std-env: 3.6.0
@@ -19017,12 +19076,12 @@ snapshots:
     dependencies:
       '@vitest/utils': 1.6.0
       p-limit: 5.0.0
-      pathe: 1.1.1
+      pathe: 1.1.2
 
   '@vitest/snapshot@1.6.0':
     dependencies:
-      magic-string: 0.30.8
-      pathe: 1.1.1
+      magic-string: 0.30.10
+      pathe: 1.1.2
       pretty-format: 29.7.0
 
   '@vitest/spy@1.3.1':
@@ -19122,15 +19181,15 @@ snapshots:
 
   '@vue/compiler-sfc@3.4.21':
     dependencies:
-      '@babel/parser': 7.24.0
+      '@babel/parser': 7.24.6
       '@vue/compiler-core': 3.4.21
       '@vue/compiler-dom': 3.4.21
       '@vue/compiler-ssr': 3.4.21
       '@vue/shared': 3.4.21
       estree-walker: 2.0.2
-      magic-string: 0.30.8
+      magic-string: 0.30.10
       postcss: 8.4.38
-      source-map-js: 1.0.2
+      source-map-js: 1.2.0
 
   '@vue/compiler-ssr@3.4.21':
     dependencies:
@@ -19182,7 +19241,7 @@ snapshots:
       '@vue/compiler-dom': 3.4.21
       '@vue/shared': 3.4.21
       computeds: 0.0.1
-      minimatch: 9.0.4
+      minimatch: 9.0.5
       path-browserify: 1.0.1
       vue-template-compiler: 2.7.14
     optionalDependencies:
@@ -19329,7 +19388,7 @@ snapshots:
 
   agent-base@6.0.2:
     dependencies:
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -19675,7 +19734,7 @@ snapshots:
   babel-plugin-jest-hoist@29.5.0:
     dependencies:
       '@babel/template': 7.24.0
-      '@babel/types': 7.24.0
+      '@babel/types': 7.24.6
       '@types/babel__core': 7.20.0
       '@types/babel__traverse': 7.18.2
 
@@ -22066,7 +22125,7 @@ snapshots:
       https-proxy-agent: 5.0.1
       mri: 1.2.0
       node-fetch-native: 1.0.1
-      pathe: 1.1.1
+      pathe: 1.1.2
       tar: 6.2.1
     transitivePeerDependencies:
       - supports-color
@@ -22143,7 +22202,7 @@ snapshots:
     dependencies:
       array-union: 2.1.0
       dir-glob: 3.0.1
-      fast-glob: 3.2.12
+      fast-glob: 3.3.2
       ignore: 5.2.4
       merge2: 1.4.1
       slash: 3.0.0
@@ -22414,7 +22473,7 @@ snapshots:
   http-proxy-agent@7.0.0:
     dependencies:
       agent-base: 7.1.0
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -22429,14 +22488,14 @@ snapshots:
   https-proxy-agent@5.0.1:
     dependencies:
       agent-base: 6.0.2
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
   https-proxy-agent@7.0.2:
     dependencies:
       agent-base: 7.1.0
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -22464,7 +22523,7 @@ snapshots:
 
   ics@2.40.0:
     dependencies:
-      nanoid: 3.3.6
+      nanoid: 3.3.7
       yup: 0.32.11
 
   ieee754@1.2.1: {}
@@ -22788,26 +22847,18 @@ snapshots:
 
   isstream@0.1.2: {}
 
-  istanbul-lib-coverage@3.2.0: {}
-
   istanbul-lib-coverage@3.2.2: {}
 
   istanbul-lib-instrument@5.2.1:
     dependencies:
       '@babel/core': 7.24.0
-      '@babel/parser': 7.24.0
+      '@babel/parser': 7.24.6
       '@istanbuljs/schema': 0.1.3
       istanbul-lib-coverage: 3.2.2
       semver: 7.6.0
     transitivePeerDependencies:
       - supports-color
 
-  istanbul-lib-report@3.0.0:
-    dependencies:
-      istanbul-lib-coverage: 3.2.2
-      make-dir: 3.1.0
-      supports-color: 7.2.0
-
   istanbul-lib-report@3.0.1:
     dependencies:
       istanbul-lib-coverage: 3.2.2
@@ -22825,16 +22876,11 @@ snapshots:
   istanbul-lib-source-maps@5.0.4:
     dependencies:
       '@jridgewell/trace-mapping': 0.3.25
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@8.1.1)
       istanbul-lib-coverage: 3.2.2
     transitivePeerDependencies:
       - supports-color
 
-  istanbul-reports@3.1.5:
-    dependencies:
-      html-escaper: 2.0.2
-      istanbul-lib-report: 3.0.1
-
   istanbul-reports@3.1.6:
     dependencies:
       html-escaper: 2.0.2
@@ -22925,7 +22971,7 @@ snapshots:
       jest-validate: 29.6.2
       micromatch: 4.0.5
       parse-json: 5.2.0
-      pretty-format: 29.6.2
+      pretty-format: 29.7.0
       slash: 3.0.0
       strip-json-comments: 3.1.1
     optionalDependencies:
@@ -23014,7 +23060,7 @@ snapshots:
       chalk: 4.1.2
       jest-diff: 29.5.0
       jest-get-type: 29.4.3
-      pretty-format: 29.6.2
+      pretty-format: 29.7.0
 
   jest-matcher-utils@29.6.2:
     dependencies:
@@ -23031,7 +23077,7 @@ snapshots:
       chalk: 4.1.2
       graceful-fs: 4.2.11
       micromatch: 4.0.5
-      pretty-format: 29.6.2
+      pretty-format: 29.7.0
       slash: 3.0.0
       stack-utils: 2.0.6
 
@@ -23043,7 +23089,7 @@ snapshots:
       chalk: 4.1.2
       graceful-fs: 4.2.11
       micromatch: 4.0.5
-      pretty-format: 29.6.2
+      pretty-format: 29.7.0
       slash: 3.0.0
       stack-utils: 2.0.6
 
@@ -23143,7 +23189,7 @@ snapshots:
       '@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/types': 7.24.0
+      '@babel/types': 7.24.6
       '@jest/expect-utils': 29.6.2
       '@jest/transform': 29.6.2
       '@jest/types': 29.6.1
@@ -23157,7 +23203,7 @@ snapshots:
       jest-message-util: 29.6.2
       jest-util: 29.6.2
       natural-compare: 1.4.0
-      pretty-format: 29.6.2
+      pretty-format: 29.7.0
       semver: 7.6.0
     transitivePeerDependencies:
       - supports-color
@@ -23187,7 +23233,7 @@ snapshots:
       chalk: 4.1.2
       jest-get-type: 29.4.3
       leven: 3.1.0
-      pretty-format: 29.6.2
+      pretty-format: 29.7.0
 
   jest-watcher@29.6.2:
     dependencies:
@@ -23278,7 +23324,7 @@ snapshots:
   jscodeshift@0.15.2(@babel/preset-env@7.24.6(@babel/core@7.24.6)):
     dependencies:
       '@babel/core': 7.24.6
-      '@babel/parser': 7.24.0
+      '@babel/parser': 7.24.6
       '@babel/plugin-transform-class-properties': 7.23.3(@babel/core@7.24.6)
       '@babel/plugin-transform-modules-commonjs': 7.23.3(@babel/core@7.24.6)
       '@babel/plugin-transform-nullish-coalescing-operator': 7.23.4(@babel/core@7.24.6)
@@ -23489,17 +23535,17 @@ snapshots:
 
   kuler@2.0.0: {}
 
-  ? langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1)
-  : dependencies:
-      '@langchain/core': 0.2.18(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))
-      '@langchain/openai': 0.2.5(encoding@0.1.13)(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))
-      '@langchain/textsplitters': 0.0.3(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))
+  langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq):
+    dependencies:
+      '@langchain/core': 0.2.18(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))
+      '@langchain/openai': 0.2.5(encoding@0.1.13)(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))
+      '@langchain/textsplitters': 0.0.3(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))
       binary-extensions: 2.2.0
       js-tiktoken: 1.0.12
       js-yaml: 4.1.0
       jsonpointer: 5.0.1
       langchainhub: 0.0.8
-      langsmith: 0.1.34(@langchain/core@0.2.18(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13)))(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))
+      langsmith: 0.1.34(@langchain/core@0.2.18(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13)))(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))
       ml-distance: 4.0.1
       openapi-types: 12.1.3
       p-retry: 4.6.2
@@ -23512,7 +23558,7 @@ snapshots:
       '@aws-sdk/credential-provider-node': 3.535.0
       '@langchain/anthropic': 0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))
       '@langchain/cohere': 0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))
-      '@langchain/community': 0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1)
+      '@langchain/community': 0.2.20(bl2awxa6z6ereahlcpz2dlbf6q)
       '@langchain/google-genai': 0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8)
       '@langchain/google-vertexai': 0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8)
       '@langchain/groq': 0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))
@@ -23540,17 +23586,17 @@ snapshots:
       - openai
       - supports-color
 
-  langchain@0.2.11(axios@1.6.7)(jsdom@23.0.1)(openai@4.53.0):
+  langchain@0.2.11(axios@1.6.7)(openai@4.53.0):
     dependencies:
-      '@langchain/core': 0.2.18(langchain@0.2.11(axios@1.6.7)(jsdom@23.0.1)(openai@4.53.0))(openai@4.53.0)
-      '@langchain/openai': 0.2.5(langchain@0.2.11(axios@1.6.7)(jsdom@23.0.1)(openai@4.53.0))
-      '@langchain/textsplitters': 0.0.3(langchain@0.2.11(axios@1.6.7)(jsdom@23.0.1)(openai@4.53.0))(openai@4.53.0)
+      '@langchain/core': 0.2.18(langchain@0.2.11(axios@1.6.7)(openai@4.53.0))(openai@4.53.0)
+      '@langchain/openai': 0.2.5(langchain@0.2.11(axios@1.6.7)(openai@4.53.0))
+      '@langchain/textsplitters': 0.0.3(langchain@0.2.11(axios@1.6.7)(openai@4.53.0))(openai@4.53.0)
       binary-extensions: 2.2.0
       js-tiktoken: 1.0.12
       js-yaml: 4.1.0
       jsonpointer: 5.0.1
       langchainhub: 0.0.8
-      langsmith: 0.1.34(@langchain/core@0.2.18(langchain@0.2.11(axios@1.6.7)(jsdom@23.0.1)(openai@4.53.0))(openai@4.53.0))(langchain@0.2.11(axios@1.6.7)(jsdom@23.0.1)(openai@4.53.0))(openai@4.53.0)
+      langsmith: 0.1.34(@langchain/core@0.2.18(langchain@0.2.11(axios@1.6.7)(openai@4.53.0))(openai@4.53.0))(langchain@0.2.11(axios@1.6.7)(openai@4.53.0))(openai@4.53.0)
       ml-distance: 4.0.1
       openapi-types: 12.1.3
       p-retry: 4.6.2
@@ -23560,7 +23606,6 @@ snapshots:
       zod-to-json-schema: 3.23.0(zod@3.23.8)
     optionalDependencies:
       axios: 1.6.7(debug@3.2.7)
-      jsdom: 23.0.1
     transitivePeerDependencies:
       - encoding
       - openai
@@ -23569,8 +23614,8 @@ snapshots:
 
   langchainhub@0.0.8: {}
 
-  ? langsmith@0.1.34(@langchain/core@0.2.18(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13)))(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))
-  : dependencies:
+  langsmith@0.1.34(@langchain/core@0.2.18(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13)))(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13)):
+    dependencies:
       '@types/uuid': 9.0.7
       commander: 10.0.1
       lodash.set: 4.3.2
@@ -23578,11 +23623,11 @@ snapshots:
       p-retry: 4.6.2
       uuid: 9.0.1
     optionalDependencies:
-      '@langchain/core': 0.2.18(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))
-      langchain: 0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1)
+      '@langchain/core': 0.2.18(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))
+      langchain: 0.2.11(3eonfu4fvxvjb5zdrprnb3pokq)
       openai: 4.53.0(encoding@0.1.13)
 
-  langsmith@0.1.34(@langchain/core@0.2.18(langchain@0.2.11(axios@1.6.7)(jsdom@23.0.1)(openai@4.53.0))(openai@4.53.0))(langchain@0.2.11(axios@1.6.7)(jsdom@23.0.1)(openai@4.53.0))(openai@4.53.0):
+  langsmith@0.1.34(@langchain/core@0.2.18(langchain@0.2.11(axios@1.6.7)(openai@4.53.0))(openai@4.53.0))(langchain@0.2.11(axios@1.6.7)(openai@4.53.0))(openai@4.53.0):
     dependencies:
       '@types/uuid': 9.0.7
       commander: 10.0.1
@@ -23591,24 +23636,24 @@ snapshots:
       p-retry: 4.6.2
       uuid: 9.0.1
     optionalDependencies:
-      '@langchain/core': 0.2.18(langchain@0.2.11(axios@1.6.7)(jsdom@23.0.1)(openai@4.53.0))(openai@4.53.0)
-      langchain: 0.2.11(axios@1.6.7)(jsdom@23.0.1)(openai@4.53.0)
+      '@langchain/core': 0.2.18(langchain@0.2.11(axios@1.6.7)(openai@4.53.0))(openai@4.53.0)
+      langchain: 0.2.11(axios@1.6.7)(openai@4.53.0)
       openai: 4.53.0(encoding@0.1.13)
     optional: true
 
-  ? langsmith@0.1.39(@langchain/core@0.2.18(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13)))(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))
-  : dependencies:
+  langsmith@0.1.39(@langchain/core@0.2.18(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13)))(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13)):
+    dependencies:
       '@types/uuid': 9.0.7
       commander: 10.0.1
       p-queue: 6.6.2
       p-retry: 4.6.2
       uuid: 9.0.1
     optionalDependencies:
-      '@langchain/core': 0.2.18(langchain@0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1))(openai@4.53.0(encoding@0.1.13))
-      langchain: 0.2.11(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/community@0.2.20(@aws-sdk/client-bedrock-runtime@3.535.0)(@aws-sdk/client-s3@3.478.0)(@aws-sdk/credential-provider-node@3.535.0)(@getzep/zep-cloud@1.0.11)(@getzep/zep-js@0.9.0)(@google-ai/generativelanguage@2.5.0(encoding@0.1.13))(@google-cloud/storage@6.11.0(encoding@0.1.13))(@huggingface/inference@2.7.0)(@langchain/anthropic@0.2.9)(@langchain/cohere@0.0.10)(@langchain/google-genai@0.0.23)(@langchain/google-vertexai@0.0.21)(@langchain/groq@0.0.15)(@langchain/mistralai@0.0.27)(@langchain/ollama@0.0.2)(@mozilla/readability@0.5.0)(@pinecone-database/pinecone@3.0.0)(@qdrant/js-client-rest@1.9.0(typescript@5.5.2))(@smithy/eventstream-codec@2.2.0)(@smithy/protocol-http@3.3.0)(@smithy/signature-v4@2.2.1)(@smithy/util-utf8@2.3.0)(@supabase/postgrest-js@1.15.2)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(cohere-ai@7.10.1(encoding@0.1.13))(crypto-js@4.2.0)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(google-auth-library@9.10.0(encoding@0.1.13))(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(jsonwebtoken@9.0.2)(lodash@4.17.21)(mammoth@1.7.2)(mysql2@3.10.0)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(pg@8.11.3)(redis@4.6.12)(ws@8.17.1))(@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8))(@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13)))(@pinecone-database/pinecone@3.0.0)(@supabase/supabase-js@2.43.4)(@xata.io/client@0.28.4(typescript@5.5.2))(axios@1.6.7)(cheerio@1.0.0-rc.12)(d3-dsv@2.0.0)(encoding@0.1.13)(epub2@3.0.2(ts-toolbelt@9.6.0))(fast-xml-parser@4.3.5)(handlebars@4.7.8)(html-to-text@9.0.5)(ignore@5.2.4)(ioredis@5.3.2)(jsdom@23.0.1)(mammoth@1.7.2)(openai@4.53.0(encoding@0.1.13))(pdf-parse@1.1.1)(redis@4.6.12)(ws@8.17.1)
+      '@langchain/core': 0.2.18(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))
+      langchain: 0.2.11(3eonfu4fvxvjb5zdrprnb3pokq)
       openai: 4.53.0(encoding@0.1.13)
 
-  langsmith@0.1.39(@langchain/core@0.2.18(langchain@0.2.11(axios@1.6.7)(jsdom@23.0.1)(openai@4.53.0))(openai@4.53.0))(langchain@0.2.11(axios@1.6.7)(jsdom@23.0.1)(openai@4.53.0))(openai@4.53.0):
+  langsmith@0.1.39(@langchain/core@0.2.18(langchain@0.2.11(axios@1.6.7)(openai@4.53.0))(openai@4.53.0))(langchain@0.2.11(axios@1.6.7)(openai@4.53.0))(openai@4.53.0):
     dependencies:
       '@types/uuid': 9.0.7
       commander: 10.0.1
@@ -23616,8 +23661,8 @@ snapshots:
       p-retry: 4.6.2
       uuid: 9.0.1
     optionalDependencies:
-      '@langchain/core': 0.2.18(langchain@0.2.11(axios@1.6.7)(jsdom@23.0.1)(openai@4.53.0))(openai@4.53.0)
-      langchain: 0.2.11(axios@1.6.7)(jsdom@23.0.1)(openai@4.53.0)
+      '@langchain/core': 0.2.18(langchain@0.2.11(axios@1.6.7)(openai@4.53.0))(openai@4.53.0)
+      langchain: 0.2.11(axios@1.6.7)(openai@4.53.0)
       openai: 4.53.0(encoding@0.1.13)
 
   lazy-ass@1.6.0: {}
@@ -23852,8 +23897,6 @@ snapshots:
 
   lunr@2.3.9: {}
 
-  luxon@3.3.0: {}
-
   luxon@3.4.4: {}
 
   lz-string@1.5.0: {}
@@ -24041,7 +24084,7 @@ snapshots:
   minifaker@1.34.1:
     dependencies:
       '@types/uuid': 8.3.4
-      nanoid: 3.3.6
+      nanoid: 3.3.7
       uuid: 8.3.2
 
   minimalistic-assert@1.0.1: {}
@@ -24165,7 +24208,7 @@ snapshots:
   mlly@1.4.2:
     dependencies:
       acorn: 8.11.2
-      pathe: 1.1.1
+      pathe: 1.1.2
       pkg-types: 1.0.3
       ufo: 1.3.2
 
@@ -24216,7 +24259,7 @@ snapshots:
   mqtt-packet@9.0.0:
     dependencies:
       bl: 6.0.12
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@8.1.1)
       process-nextick-args: 2.0.1
     transitivePeerDependencies:
       - supports-color
@@ -24510,7 +24553,7 @@ snapshots:
 
   number-allocator@1.0.14:
     dependencies:
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@8.1.1)
       js-sdsl: 4.3.0
     transitivePeerDependencies:
       - supports-color
@@ -24861,8 +24904,6 @@ snapshots:
 
   path-type@5.0.0: {}
 
-  pathe@1.1.1: {}
-
   pathe@1.1.2: {}
 
   pathval@1.1.1: {}
@@ -25011,7 +25052,7 @@ snapshots:
     dependencies:
       jsonc-parser: 3.2.0
       mlly: 1.4.2
-      pathe: 1.1.1
+      pathe: 1.1.2
 
   pkg-types@1.1.3:
     dependencies:
@@ -25064,9 +25105,9 @@ snapshots:
 
   postcss@8.4.31:
     dependencies:
-      nanoid: 3.3.6
+      nanoid: 3.3.7
       picocolors: 1.0.0
-      source-map-js: 1.0.2
+      source-map-js: 1.2.0
 
   postcss@8.4.38:
     dependencies:
@@ -26105,7 +26146,7 @@ snapshots:
 
   simple-websocket@9.1.0:
     dependencies:
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@8.1.1)
       queue-microtask: 1.2.3
       randombytes: 2.1.0
       readable-stream: 3.6.0
@@ -26510,7 +26551,7 @@ snapshots:
     dependencies:
       component-emitter: 1.3.0
       cookiejar: 2.1.4
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@8.1.1)
       fast-safe-stringify: 2.1.1
       form-data: 4.0.0
       formidable: 3.5.1
@@ -27244,7 +27285,7 @@ snapshots:
 
   v8-to-istanbul@9.1.0:
     dependencies:
-      '@jridgewell/trace-mapping': 0.3.18
+      '@jridgewell/trace-mapping': 0.3.25
       '@types/istanbul-lib-coverage': 2.0.4
       convert-source-map: 1.9.0
 
@@ -27266,8 +27307,8 @@ snapshots:
   vite-node@1.6.0(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1):
     dependencies:
       cac: 6.7.14
-      debug: 4.3.4(supports-color@8.1.1)
-      pathe: 1.1.1
+      debug: 4.3.5(supports-color@8.1.1)
+      pathe: 1.1.2
       picocolors: 1.0.0
       vite: 5.2.12(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1)
     transitivePeerDependencies:
@@ -27323,11 +27364,11 @@ snapshots:
       '@vitest/utils': 1.6.0
       acorn-walk: 8.3.2
       chai: 4.3.10
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@8.1.1)
       execa: 8.0.1
       local-pkg: 0.5.0
-      magic-string: 0.30.8
-      pathe: 1.1.1
+      magic-string: 0.30.10
+      pathe: 1.1.2
       picocolors: 1.0.0
       std-env: 3.6.0
       strip-literal: 2.0.0
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index add43b6c008b6..2ce2d3d7dfeec 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -3,3 +3,29 @@ packages:
   - packages/@n8n/*
   - packages/@n8n_io/*
   - cypress
+
+catalog:
+  '@types/basic-auth': ^1.1.3
+  '@types/express': ^4.17.21
+  '@types/lodash': ^4.14.195
+  '@types/uuid': ^8.3.2
+  '@types/xml2js': ^0.4.14
+  axios: 1.6.7
+  basic-auth: 2.0.1
+  fast-glob: 3.2.12
+  form-data: 4.0.0
+  lodash: 4.17.21
+  luxon: 3.4.4
+  nanoid: 3.3.6
+  typedi: 0.10.0
+  uuid: 8.3.2
+  xml2js: 0.6.2
+
+catalogs:
+  frontend:
+    '@vitest/coverage-v8': ^1.6.0
+    vite: ^5.2.12
+    vitest: ^1.6.0
+    vitest-mock-extended: ^1.3.1
+    vue: ^3.4.21
+    vue-tsc: ^2.0.19

From d6770b5fcaec6438d677b918aaeb1669ad7424c2 Mon Sep 17 00:00:00 2001
From: Tomi Turtiainen <10324676+tomi@users.noreply.github.com>
Date: Tue, 30 Jul 2024 14:49:41 +0300
Subject: [PATCH 028/168] fix(core): Flush instance stopped event immediately
 (#10238)

---
 packages/cli/src/InternalHooks.ts             | 171 +++++++-----------
 .../handlers/executions/executions.handler.ts |   4 +-
 .../v1/handlers/users/users.handler.ee.ts     |   4 +-
 .../handlers/workflows/workflows.handler.ts   |   6 +-
 .../email/UserManagementMailer.ts             |   8 +-
 packages/cli/src/auth/methods/ldap.ts         |   2 +-
 .../concurrency-control.service.ts            |   2 +-
 .../cli/src/controllers/auth.controller.ts    |   2 +-
 .../communityPackages.controller.ts           |   2 -
 .../src/controllers/invitation.controller.ts  |   2 +-
 packages/cli/src/controllers/me.controller.ts |   6 +-
 .../cli/src/controllers/owner.controller.ts   |   2 +-
 .../controllers/passwordReset.controller.ts   |  12 +-
 .../cli/src/controllers/users.controller.ts   |   4 +-
 packages/cli/src/services/frontend.service.ts |   2 +-
 packages/cli/src/services/user.service.ts     |   6 +-
 packages/cli/src/telemetry/index.ts           | 118 ++++++------
 .../telemetry-event-relay.service.ts          |  64 ++++---
 .../cli/src/workflows/workflow.service.ts     |   2 +-
 .../cli/src/workflows/workflows.controller.ts |   4 +-
 packages/cli/test/unit/Telemetry.test.ts      |  76 ++++----
 21 files changed, 224 insertions(+), 275 deletions(-)

diff --git a/packages/cli/src/InternalHooks.ts b/packages/cli/src/InternalHooks.ts
index e6418743d7b1a..dedfb46b0cb3f 100644
--- a/packages/cli/src/InternalHooks.ts
+++ b/packages/cli/src/InternalHooks.ts
@@ -43,13 +43,11 @@ export class InternalHooks {
 		private readonly projectRelationRepository: ProjectRelationRepository,
 		private readonly _eventBus: MessageEventBus, // needed until we decouple telemetry
 	) {
-		workflowStatisticsService.on(
-			'telemetry.onFirstProductionWorkflowSuccess',
-			async (metrics) => await this.onFirstProductionWorkflowSuccess(metrics),
+		workflowStatisticsService.on('telemetry.onFirstProductionWorkflowSuccess', (metrics) =>
+			this.onFirstProductionWorkflowSuccess(metrics),
 		);
-		workflowStatisticsService.on(
-			'telemetry.onFirstWorkflowDataLoad',
-			async (metrics) => await this.onFirstWorkflowDataLoad(metrics),
+		workflowStatisticsService.on('telemetry.onFirstWorkflowDataLoad', (metrics) =>
+			this.onFirstWorkflowDataLoad(metrics),
 		);
 	}
 
@@ -57,35 +55,29 @@ export class InternalHooks {
 		await this.telemetry.init();
 	}
 
-	async onFrontendSettingsAPI(pushRef?: string): Promise<void> {
-		return await this.telemetry.track('Session started', { session_id: pushRef });
+	onFrontendSettingsAPI(pushRef?: string): void {
+		this.telemetry.track('Session started', { session_id: pushRef });
 	}
 
-	async onPersonalizationSurveySubmitted(
-		userId: string,
-		answers: Record<string, string>,
-	): Promise<void> {
+	onPersonalizationSurveySubmitted(userId: string, answers: Record<string, string>): void {
 		const camelCaseKeys = Object.keys(answers);
 		const personalizationSurveyData = { user_id: userId } as Record<string, string | string[]>;
 		camelCaseKeys.forEach((camelCaseKey) => {
 			personalizationSurveyData[snakeCase(camelCaseKey)] = answers[camelCaseKey];
 		});
 
-		return await this.telemetry.track(
-			'User responded to personalization questions',
-			personalizationSurveyData,
-		);
+		this.telemetry.track('User responded to personalization questions', personalizationSurveyData);
 	}
 
-	async onWorkflowCreated(
+	onWorkflowCreated(
 		user: User,
 		workflow: IWorkflowBase,
 		project: Project,
 		publicApi: boolean,
-	): Promise<void> {
+	): void {
 		const { nodeGraph } = TelemetryHelpers.generateNodesGraph(workflow, this.nodeTypes);
 
-		void this.telemetry.track('User created workflow', {
+		this.telemetry.track('User created workflow', {
 			user_id: user.id,
 			workflow_id: workflow.id,
 			node_graph_string: JSON.stringify(nodeGraph),
@@ -95,8 +87,8 @@ export class InternalHooks {
 		});
 	}
 
-	async onWorkflowDeleted(user: User, workflowId: string, publicApi: boolean): Promise<void> {
-		void this.telemetry.track('User deleted workflow', {
+	onWorkflowDeleted(user: User, workflowId: string, publicApi: boolean): void {
+		this.telemetry.track('User deleted workflow', {
 			user_id: user.id,
 			workflow_id: workflowId,
 			public_api: publicApi,
@@ -136,7 +128,7 @@ export class InternalHooks {
 			(note) => note.overlapping,
 		).length;
 
-		void this.telemetry.track('User saved workflow', {
+		this.telemetry.track('User saved workflow', {
 			user_id: user.id,
 			workflow_id: workflow.id,
 			node_graph_string: JSON.stringify(nodeGraph),
@@ -155,7 +147,7 @@ export class InternalHooks {
 		workflow: IWorkflowBase,
 		runData?: IRun,
 		userId?: string,
-	): Promise<void> {
+	) {
 		if (!workflow.id) {
 			return;
 		}
@@ -165,8 +157,6 @@ export class InternalHooks {
 			return;
 		}
 
-		const promises = [];
-
 		const telemetryProperties: IExecutionTrackProperties = {
 			workflow_id: workflow.id,
 			is_manual: false,
@@ -270,7 +260,7 @@ export class InternalHooks {
 						node_id: nodeGraphResult.nameIndices[runData.data.startData?.destinationNode],
 					};
 
-					promises.push(this.telemetry.track('Manual node exec finished', telemetryPayload));
+					this.telemetry.track('Manual node exec finished', telemetryPayload);
 				} else {
 					nodeGraphResult.webhookNodeNames.forEach((name: string) => {
 						const execJson = runData.data.resultData.runData[name]?.[0]?.data?.main?.[0]?.[0]
@@ -282,56 +272,52 @@ export class InternalHooks {
 						}
 					});
 
-					promises.push(
-						this.telemetry.track('Manual workflow exec finished', manualExecEventProperties),
-					);
+					this.telemetry.track('Manual workflow exec finished', manualExecEventProperties);
 				}
 			}
 		}
 
-		void Promise.all([...promises, this.telemetry.trackWorkflowExecution(telemetryProperties)]);
+		this.telemetry.trackWorkflowExecution(telemetryProperties);
 	}
 
-	async onWorkflowSharingUpdate(workflowId: string, userId: string, userList: string[]) {
+	onWorkflowSharingUpdate(workflowId: string, userId: string, userList: string[]) {
 		const properties: ITelemetryTrackProperties = {
 			workflow_id: workflowId,
 			user_id_sharer: userId,
 			user_id_list: userList,
 		};
 
-		return await this.telemetry.track('User updated workflow sharing', properties);
+		this.telemetry.track('User updated workflow sharing', properties);
 	}
 
 	async onN8nStop(): Promise<void> {
 		const timeoutPromise = new Promise<void>((resolve) => {
-			setTimeout(() => {
-				resolve();
-			}, 3000);
+			setTimeout(resolve, 3000);
 		});
 
 		return await Promise.race([timeoutPromise, this.telemetry.trackN8nStop()]);
 	}
 
-	async onUserDeletion(userDeletionData: {
+	onUserDeletion(userDeletionData: {
 		user: User;
 		telemetryData: ITelemetryUserDeletionData;
 		publicApi: boolean;
-	}): Promise<void> {
-		void this.telemetry.track('User deleted user', {
+	}) {
+		this.telemetry.track('User deleted user', {
 			...userDeletionData.telemetryData,
 			user_id: userDeletionData.user.id,
 			public_api: userDeletionData.publicApi,
 		});
 	}
 
-	async onUserInvite(userInviteData: {
+	onUserInvite(userInviteData: {
 		user: User;
 		target_user_id: string[];
 		public_api: boolean;
 		email_sent: boolean;
 		invitee_role: string;
-	}): Promise<void> {
-		void this.telemetry.track('User invited new user', {
+	}) {
+		this.telemetry.track('User invited new user', {
 			user_id: userInviteData.user.id,
 			target_user_id: userInviteData.target_user_id,
 			public_api: userInviteData.public_api,
@@ -340,7 +326,7 @@ export class InternalHooks {
 		});
 	}
 
-	async onUserRoleChange(userRoleChangeData: {
+	onUserRoleChange(userRoleChangeData: {
 		user: User;
 		target_user_id: string;
 		public_api: boolean;
@@ -348,74 +334,53 @@ export class InternalHooks {
 	}) {
 		const { user, ...rest } = userRoleChangeData;
 
-		void this.telemetry.track('User changed role', { user_id: user.id, ...rest });
+		this.telemetry.track('User changed role', { user_id: user.id, ...rest });
 	}
 
-	async onUserRetrievedUser(userRetrievedData: {
-		user_id: string;
-		public_api: boolean;
-	}): Promise<void> {
-		return await this.telemetry.track('User retrieved user', userRetrievedData);
+	onUserRetrievedUser(userRetrievedData: { user_id: string; public_api: boolean }) {
+		this.telemetry.track('User retrieved user', userRetrievedData);
 	}
 
-	async onUserRetrievedAllUsers(userRetrievedData: {
-		user_id: string;
-		public_api: boolean;
-	}): Promise<void> {
-		return await this.telemetry.track('User retrieved all users', userRetrievedData);
+	onUserRetrievedAllUsers(userRetrievedData: { user_id: string; public_api: boolean }) {
+		this.telemetry.track('User retrieved all users', userRetrievedData);
 	}
 
-	async onUserRetrievedExecution(userRetrievedData: {
-		user_id: string;
-		public_api: boolean;
-	}): Promise<void> {
-		return await this.telemetry.track('User retrieved execution', userRetrievedData);
+	onUserRetrievedExecution(userRetrievedData: { user_id: string; public_api: boolean }) {
+		this.telemetry.track('User retrieved execution', userRetrievedData);
 	}
 
-	async onUserRetrievedAllExecutions(userRetrievedData: {
-		user_id: string;
-		public_api: boolean;
-	}): Promise<void> {
-		return await this.telemetry.track('User retrieved all executions', userRetrievedData);
+	onUserRetrievedAllExecutions(userRetrievedData: { user_id: string; public_api: boolean }) {
+		this.telemetry.track('User retrieved all executions', userRetrievedData);
 	}
 
-	async onUserRetrievedWorkflow(userRetrievedData: {
-		user_id: string;
-		public_api: boolean;
-	}): Promise<void> {
-		return await this.telemetry.track('User retrieved workflow', userRetrievedData);
+	onUserRetrievedWorkflow(userRetrievedData: { user_id: string; public_api: boolean }) {
+		this.telemetry.track('User retrieved workflow', userRetrievedData);
 	}
 
-	async onUserRetrievedAllWorkflows(userRetrievedData: {
-		user_id: string;
-		public_api: boolean;
-	}): Promise<void> {
-		return await this.telemetry.track('User retrieved all workflows', userRetrievedData);
+	onUserRetrievedAllWorkflows(userRetrievedData: { user_id: string; public_api: boolean }) {
+		this.telemetry.track('User retrieved all workflows', userRetrievedData);
 	}
 
-	async onUserUpdate(userUpdateData: { user: User; fields_changed: string[] }): Promise<void> {
-		void this.telemetry.track('User changed personal settings', {
+	onUserUpdate(userUpdateData: { user: User; fields_changed: string[] }) {
+		this.telemetry.track('User changed personal settings', {
 			user_id: userUpdateData.user.id,
 			fields_changed: userUpdateData.fields_changed,
 		});
 	}
 
-	async onUserInviteEmailClick(userInviteClickData: {
-		inviter: User;
-		invitee: User;
-	}): Promise<void> {
-		void this.telemetry.track('User clicked invite link from email', {
+	onUserInviteEmailClick(userInviteClickData: { inviter: User; invitee: User }) {
+		this.telemetry.track('User clicked invite link from email', {
 			user_id: userInviteClickData.invitee.id,
 		});
 	}
 
-	async onUserPasswordResetEmailClick(userPasswordResetData: { user: User }): Promise<void> {
-		void this.telemetry.track('User clicked password reset link from email', {
+	onUserPasswordResetEmailClick(userPasswordResetData: { user: User }) {
+		this.telemetry.track('User clicked password reset link from email', {
 			user_id: userPasswordResetData.user.id,
 		});
 	}
 
-	async onUserTransactionalEmail(userTransactionalEmailData: {
+	onUserTransactionalEmail(userTransactionalEmailData: {
 		user_id: string;
 		message_type:
 			| 'Reset password'
@@ -424,37 +389,34 @@ export class InternalHooks {
 			| 'Workflow shared'
 			| 'Credentials shared';
 		public_api: boolean;
-	}): Promise<void> {
-		return await this.telemetry.track(
-			'Instance sent transactional email to user',
-			userTransactionalEmailData,
-		);
+	}) {
+		this.telemetry.track('Instance sent transactional email to user', userTransactionalEmailData);
 	}
 
-	async onUserPasswordResetRequestClick(userPasswordResetData: { user: User }): Promise<void> {
-		void this.telemetry.track('User requested password reset while logged out', {
+	onUserPasswordResetRequestClick(userPasswordResetData: { user: User }) {
+		this.telemetry.track('User requested password reset while logged out', {
 			user_id: userPasswordResetData.user.id,
 		});
 	}
 
-	async onInstanceOwnerSetup(instanceOwnerSetupData: { user_id: string }): Promise<void> {
-		return await this.telemetry.track('Owner finished instance setup', instanceOwnerSetupData);
+	onInstanceOwnerSetup(instanceOwnerSetupData: { user_id: string }) {
+		this.telemetry.track('Owner finished instance setup', instanceOwnerSetupData);
 	}
 
-	async onUserSignup(
+	onUserSignup(
 		user: User,
 		userSignupData: {
 			user_type: AuthProviderType;
 			was_disabled_ldap_user: boolean;
 		},
-	): Promise<void> {
-		void this.telemetry.track('User signed up', {
+	) {
+		this.telemetry.track('User signed up', {
 			user_id: user.id,
 			...userSignupData,
 		});
 	}
 
-	async onEmailFailed(failedEmailData: {
+	onEmailFailed(failedEmailData: {
 		user: User;
 		message_type:
 			| 'Reset password'
@@ -463,8 +425,8 @@ export class InternalHooks {
 			| 'Workflow shared'
 			| 'Credentials shared';
 		public_api: boolean;
-	}): Promise<void> {
-		void this.telemetry.track('Instance failed to send transactional email to user', {
+	}) {
+		this.telemetry.track('Instance failed to send transactional email to user', {
 			user_id: failedEmailData.user.id,
 		});
 	}
@@ -472,21 +434,18 @@ export class InternalHooks {
 	/*
 	 * Execution Statistics
 	 */
-	async onFirstProductionWorkflowSuccess(data: {
-		user_id: string;
-		workflow_id: string;
-	}): Promise<void> {
-		return await this.telemetry.track('Workflow first prod success', data);
+	onFirstProductionWorkflowSuccess(data: { user_id: string; workflow_id: string }) {
+		this.telemetry.track('Workflow first prod success', data);
 	}
 
-	async onFirstWorkflowDataLoad(data: {
+	onFirstWorkflowDataLoad(data: {
 		user_id: string;
 		workflow_id: string;
 		node_type: string;
 		node_id: string;
 		credential_type?: string;
 		credential_id?: string;
-	}): Promise<void> {
-		return await this.telemetry.track('Workflow first data fetched', data);
+	}) {
+		this.telemetry.track('Workflow first data fetched', data);
 	}
 }
diff --git a/packages/cli/src/PublicApi/v1/handlers/executions/executions.handler.ts b/packages/cli/src/PublicApi/v1/handlers/executions/executions.handler.ts
index cd936d1d1cec1..16ca8093cb325 100644
--- a/packages/cli/src/PublicApi/v1/handlers/executions/executions.handler.ts
+++ b/packages/cli/src/PublicApi/v1/handlers/executions/executions.handler.ts
@@ -78,7 +78,7 @@ export = {
 				return res.status(404).json({ message: 'Not Found' });
 			}
 
-			void Container.get(InternalHooks).onUserRetrievedExecution({
+			Container.get(InternalHooks).onUserRetrievedExecution({
 				user_id: req.user.id,
 				public_api: true,
 			});
@@ -129,7 +129,7 @@ export = {
 			const count =
 				await Container.get(ExecutionRepository).getExecutionsCountForPublicApi(filters);
 
-			void Container.get(InternalHooks).onUserRetrievedAllExecutions({
+			Container.get(InternalHooks).onUserRetrievedAllExecutions({
 				user_id: req.user.id,
 				public_api: true,
 			});
diff --git a/packages/cli/src/PublicApi/v1/handlers/users/users.handler.ee.ts b/packages/cli/src/PublicApi/v1/handlers/users/users.handler.ee.ts
index 96b2d57239c57..0df22ec4aa9ef 100644
--- a/packages/cli/src/PublicApi/v1/handlers/users/users.handler.ee.ts
+++ b/packages/cli/src/PublicApi/v1/handlers/users/users.handler.ee.ts
@@ -33,7 +33,7 @@ export = {
 				public_api: true,
 			};
 
-			void Container.get(InternalHooks).onUserRetrievedUser(telemetryData);
+			Container.get(InternalHooks).onUserRetrievedUser(telemetryData);
 
 			return res.json(clean(user, { includeRole }));
 		},
@@ -56,7 +56,7 @@ export = {
 				public_api: true,
 			};
 
-			void Container.get(InternalHooks).onUserRetrievedAllUsers(telemetryData);
+			Container.get(InternalHooks).onUserRetrievedAllUsers(telemetryData);
 
 			return res.json({
 				data: clean(users, { includeRole }),
diff --git a/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.handler.ts b/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.handler.ts
index 943d53764daf3..5139cb686fd60 100644
--- a/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.handler.ts
+++ b/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.handler.ts
@@ -58,7 +58,7 @@ export = {
 			);
 
 			await Container.get(ExternalHooks).run('workflow.afterCreate', [createdWorkflow]);
-			void Container.get(InternalHooks).onWorkflowCreated(req.user, createdWorkflow, project, true);
+			Container.get(InternalHooks).onWorkflowCreated(req.user, createdWorkflow, project, true);
 			Container.get(EventService).emit('workflow-created', {
 				workflow: createdWorkflow,
 				user: req.user,
@@ -101,7 +101,7 @@ export = {
 				return res.status(404).json({ message: 'Not Found' });
 			}
 
-			void Container.get(InternalHooks).onUserRetrievedWorkflow({
+			Container.get(InternalHooks).onUserRetrievedWorkflow({
 				user_id: req.user.id,
 				public_api: true,
 			});
@@ -163,7 +163,7 @@ export = {
 				...(!config.getEnv('workflowTagsDisabled') && { relations: ['tags'] }),
 			});
 
-			void Container.get(InternalHooks).onUserRetrievedAllWorkflows({
+			Container.get(InternalHooks).onUserRetrievedAllWorkflows({
 				user_id: req.user.id,
 				public_api: true,
 			});
diff --git a/packages/cli/src/UserManagement/email/UserManagementMailer.ts b/packages/cli/src/UserManagement/email/UserManagementMailer.ts
index 531ce24cd67c4..6d60c3b4907e1 100644
--- a/packages/cli/src/UserManagement/email/UserManagementMailer.ts
+++ b/packages/cli/src/UserManagement/email/UserManagementMailer.ts
@@ -112,7 +112,7 @@ export class UserManagementMailer {
 
 			this.logger.info('Sent workflow shared email successfully', { sharerId: sharer.id });
 
-			void Container.get(InternalHooks).onUserTransactionalEmail({
+			Container.get(InternalHooks).onUserTransactionalEmail({
 				user_id: sharer.id,
 				message_type: 'Workflow shared',
 				public_api: false,
@@ -120,7 +120,7 @@ export class UserManagementMailer {
 
 			return result;
 		} catch (e) {
-			void Container.get(InternalHooks).onEmailFailed({
+			Container.get(InternalHooks).onEmailFailed({
 				user: sharer,
 				message_type: 'Workflow shared',
 				public_api: false,
@@ -171,7 +171,7 @@ export class UserManagementMailer {
 
 			this.logger.info('Sent credentials shared email successfully', { sharerId: sharer.id });
 
-			void Container.get(InternalHooks).onUserTransactionalEmail({
+			Container.get(InternalHooks).onUserTransactionalEmail({
 				user_id: sharer.id,
 				message_type: 'Credentials shared',
 				public_api: false,
@@ -179,7 +179,7 @@ export class UserManagementMailer {
 
 			return result;
 		} catch (e) {
-			void Container.get(InternalHooks).onEmailFailed({
+			Container.get(InternalHooks).onEmailFailed({
 				user: sharer,
 				message_type: 'Credentials shared',
 				public_api: false,
diff --git a/packages/cli/src/auth/methods/ldap.ts b/packages/cli/src/auth/methods/ldap.ts
index 09e8f38c87a03..c8946aec9321e 100644
--- a/packages/cli/src/auth/methods/ldap.ts
+++ b/packages/cli/src/auth/methods/ldap.ts
@@ -51,7 +51,7 @@ export const handleLdapLogin = async (
 			await updateLdapUserOnLocalDb(identity, ldapAttributesValues);
 		} else {
 			const user = await createLdapUserOnLocalDb(ldapAttributesValues, ldapId);
-			void Container.get(InternalHooks).onUserSignup(user, {
+			Container.get(InternalHooks).onUserSignup(user, {
 				user_type: 'ldap',
 				was_disabled_ldap_user: false,
 			});
diff --git a/packages/cli/src/concurrency/concurrency-control.service.ts b/packages/cli/src/concurrency/concurrency-control.service.ts
index c562448379fef..50c73fa668b4e 100644
--- a/packages/cli/src/concurrency/concurrency-control.service.ts
+++ b/packages/cli/src/concurrency/concurrency-control.service.ts
@@ -55,7 +55,7 @@ export class ConcurrencyControlService {
 
 		this.productionQueue.on('concurrency-check', ({ capacity }) => {
 			if (this.shouldReport(capacity)) {
-				void this.telemetry.track('User hit concurrency limit', {
+				this.telemetry.track('User hit concurrency limit', {
 					threshold: CLOUD_TEMP_PRODUCTION_LIMIT - capacity,
 				});
 			}
diff --git a/packages/cli/src/controllers/auth.controller.ts b/packages/cli/src/controllers/auth.controller.ts
index 7994221d9db6c..7711d95177e0f 100644
--- a/packages/cli/src/controllers/auth.controller.ts
+++ b/packages/cli/src/controllers/auth.controller.ts
@@ -179,7 +179,7 @@ export class AuthController {
 			throw new BadRequestError('Invalid request');
 		}
 
-		void this.internalHooks.onUserInviteEmailClick({ inviter, invitee });
+		this.internalHooks.onUserInviteEmailClick({ inviter, invitee });
 		this.eventService.emit('user-invite-email-click', { inviter, invitee });
 
 		const { firstName, lastName } = inviter;
diff --git a/packages/cli/src/controllers/communityPackages.controller.ts b/packages/cli/src/controllers/communityPackages.controller.ts
index b37d3df249ce4..1860e1df86652 100644
--- a/packages/cli/src/controllers/communityPackages.controller.ts
+++ b/packages/cli/src/controllers/communityPackages.controller.ts
@@ -9,7 +9,6 @@ import { Delete, Get, Middleware, Patch, Post, RestController, GlobalScope } fro
 import { NodeRequest } from '@/requests';
 import type { InstalledPackages } from '@db/entities/InstalledPackages';
 import type { CommunityPackages } from '@/Interfaces';
-import { InternalHooks } from '@/InternalHooks';
 import { Push } from '@/push';
 import { CommunityPackagesService } from '@/services/communityPackages.service';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
@@ -37,7 +36,6 @@ export function isNpmError(error: unknown): error is { code: number; stdout: str
 export class CommunityPackagesController {
 	constructor(
 		private readonly push: Push,
-		private readonly internalHooks: InternalHooks,
 		private readonly communityPackagesService: CommunityPackagesService,
 		private readonly eventService: EventService,
 	) {}
diff --git a/packages/cli/src/controllers/invitation.controller.ts b/packages/cli/src/controllers/invitation.controller.ts
index d89d077ae61b0..c32bf543002fd 100644
--- a/packages/cli/src/controllers/invitation.controller.ts
+++ b/packages/cli/src/controllers/invitation.controller.ts
@@ -168,7 +168,7 @@ export class InvitationController {
 
 		this.authService.issueCookie(res, updatedUser, req.browserId);
 
-		void this.internalHooks.onUserSignup(updatedUser, {
+		this.internalHooks.onUserSignup(updatedUser, {
 			user_type: 'email',
 			was_disabled_ldap_user: false,
 		});
diff --git a/packages/cli/src/controllers/me.controller.ts b/packages/cli/src/controllers/me.controller.ts
index 62a2e101ff27d..3f9366b441260 100644
--- a/packages/cli/src/controllers/me.controller.ts
+++ b/packages/cli/src/controllers/me.controller.ts
@@ -101,7 +101,7 @@ export class MeController {
 		this.authService.issueCookie(res, user, req.browserId);
 
 		const fieldsChanged = Object.keys(payload);
-		void this.internalHooks.onUserUpdate({ user, fields_changed: fieldsChanged });
+		this.internalHooks.onUserUpdate({ user, fields_changed: fieldsChanged });
 		this.eventService.emit('user-updated', { user, fieldsChanged });
 
 		const publicUser = await this.userService.toPublic(user);
@@ -151,7 +151,7 @@ export class MeController {
 
 		this.authService.issueCookie(res, updatedUser, req.browserId);
 
-		void this.internalHooks.onUserUpdate({ user: updatedUser, fields_changed: ['password'] });
+		this.internalHooks.onUserUpdate({ user: updatedUser, fields_changed: ['password'] });
 		this.eventService.emit('user-updated', { user: updatedUser, fieldsChanged: ['password'] });
 
 		await this.externalHooks.run('user.password.update', [updatedUser.email, updatedUser.password]);
@@ -186,7 +186,7 @@ export class MeController {
 
 		this.logger.info('User survey updated successfully', { userId: req.user.id });
 
-		void this.internalHooks.onPersonalizationSurveySubmitted(req.user.id, personalizationAnswers);
+		this.internalHooks.onPersonalizationSurveySubmitted(req.user.id, personalizationAnswers);
 
 		return { success: true };
 	}
diff --git a/packages/cli/src/controllers/owner.controller.ts b/packages/cli/src/controllers/owner.controller.ts
index 6077026c90202..9b86ac41ab313 100644
--- a/packages/cli/src/controllers/owner.controller.ts
+++ b/packages/cli/src/controllers/owner.controller.ts
@@ -85,7 +85,7 @@ export class OwnerController {
 
 		this.authService.issueCookie(res, owner, req.browserId);
 
-		void this.internalHooks.onInstanceOwnerSetup({ user_id: owner.id });
+		this.internalHooks.onInstanceOwnerSetup({ user_id: owner.id });
 
 		return await this.userService.toPublic(owner, { posthog: this.postHog, withScopes: true });
 	}
diff --git a/packages/cli/src/controllers/passwordReset.controller.ts b/packages/cli/src/controllers/passwordReset.controller.ts
index c548e607fd9d4..e17a0f15efe63 100644
--- a/packages/cli/src/controllers/passwordReset.controller.ts
+++ b/packages/cli/src/controllers/passwordReset.controller.ts
@@ -120,7 +120,7 @@ export class PasswordResetController {
 				domain: this.urlService.getInstanceBaseUrl(),
 			});
 		} catch (error) {
-			void this.internalHooks.onEmailFailed({
+			this.internalHooks.onEmailFailed({
 				user,
 				message_type: 'Reset password',
 				public_api: false,
@@ -132,13 +132,13 @@ export class PasswordResetController {
 		}
 
 		this.logger.info('Sent password reset email successfully', { userId: user.id, email });
-		void this.internalHooks.onUserTransactionalEmail({
+		this.internalHooks.onUserTransactionalEmail({
 			user_id: id,
 			message_type: 'Reset password',
 			public_api: false,
 		});
 
-		void this.internalHooks.onUserPasswordResetRequestClick({ user });
+		this.internalHooks.onUserPasswordResetRequestClick({ user });
 		this.eventService.emit('user-password-reset-request-click', { user });
 	}
 
@@ -171,7 +171,7 @@ export class PasswordResetController {
 		}
 
 		this.logger.info('Reset-password token resolved successfully', { userId: user.id });
-		void this.internalHooks.onUserPasswordResetEmailClick({ user });
+		this.internalHooks.onUserPasswordResetEmailClick({ user });
 		this.eventService.emit('user-password-reset-email-click', { user });
 	}
 
@@ -215,13 +215,13 @@ export class PasswordResetController {
 
 		this.authService.issueCookie(res, user, req.browserId);
 
-		void this.internalHooks.onUserUpdate({ user, fields_changed: ['password'] });
+		this.internalHooks.onUserUpdate({ user, fields_changed: ['password'] });
 		this.eventService.emit('user-updated', { user, fieldsChanged: ['password'] });
 
 		// if this user used to be an LDAP users
 		const ldapIdentity = user?.authIdentities?.find((i) => i.providerType === 'ldap');
 		if (ldapIdentity) {
-			void this.internalHooks.onUserSignup(user, {
+			this.internalHooks.onUserSignup(user, {
 				user_type: 'email',
 				was_disabled_ldap_user: true,
 			});
diff --git a/packages/cli/src/controllers/users.controller.ts b/packages/cli/src/controllers/users.controller.ts
index 0fd8481ed8813..f0815aa54d405 100644
--- a/packages/cli/src/controllers/users.controller.ts
+++ b/packages/cli/src/controllers/users.controller.ts
@@ -253,7 +253,7 @@ export class UsersController {
 			await trx.delete(User, { id: userToDelete.id });
 		});
 
-		void this.internalHooks.onUserDeletion({
+		this.internalHooks.onUserDeletion({
 			user: req.user,
 			telemetryData,
 			publicApi: false,
@@ -294,7 +294,7 @@ export class UsersController {
 
 		await this.userService.update(targetUser.id, { role: payload.newRoleName });
 
-		void this.internalHooks.onUserRoleChange({
+		this.internalHooks.onUserRoleChange({
 			user: req.user,
 			target_user_id: targetUser.id,
 			target_user_new_role: ['global', payload.newRoleName].join(' '),
diff --git a/packages/cli/src/services/frontend.service.ts b/packages/cli/src/services/frontend.service.ts
index 918de1793518c..4ada98a9cf7d7 100644
--- a/packages/cli/src/services/frontend.service.ts
+++ b/packages/cli/src/services/frontend.service.ts
@@ -244,7 +244,7 @@ export class FrontendService {
 	}
 
 	getSettings(pushRef?: string): IN8nUISettings {
-		void this.internalHooks.onFrontendSettingsAPI(pushRef);
+		this.internalHooks.onFrontendSettingsAPI(pushRef);
 
 		const restEndpoint = config.getEnv('endpoints.rest');
 
diff --git a/packages/cli/src/services/user.service.ts b/packages/cli/src/services/user.service.ts
index cc50e09f74607..007054c6aa980 100644
--- a/packages/cli/src/services/user.service.ts
+++ b/packages/cli/src/services/user.service.ts
@@ -144,14 +144,14 @@ export class UserService {
 					if (result.emailSent) {
 						invitedUser.user.emailSent = true;
 						delete invitedUser.user?.inviteAcceptUrl;
-						void Container.get(InternalHooks).onUserTransactionalEmail({
+						Container.get(InternalHooks).onUserTransactionalEmail({
 							user_id: id,
 							message_type: 'New user invite',
 							public_api: false,
 						});
 					}
 
-					void Container.get(InternalHooks).onUserInvite({
+					Container.get(InternalHooks).onUserInvite({
 						user: owner,
 						target_user_id: Object.values(toInviteUsers),
 						public_api: false,
@@ -164,7 +164,7 @@ export class UserService {
 					});
 				} catch (e) {
 					if (e instanceof Error) {
-						void Container.get(InternalHooks).onEmailFailed({
+						Container.get(InternalHooks).onEmailFailed({
 							user: owner,
 							message_type: 'New user invite',
 							public_api: false,
diff --git a/packages/cli/src/telemetry/index.ts b/packages/cli/src/telemetry/index.ts
index f63caf9b2c7b6..2d762297304cc 100644
--- a/packages/cli/src/telemetry/index.ts
+++ b/packages/cli/src/telemetry/index.ts
@@ -88,30 +88,28 @@ export class Telemetry {
 		); // every 6 hours
 	}
 
-	private async pulse(): Promise<unknown> {
+	private async pulse() {
 		if (!this.rudderStack) {
 			return;
 		}
 
-		const allPromises = Object.keys(this.executionCountsBuffer)
-			.filter((workflowId) => {
-				const data = this.executionCountsBuffer[workflowId];
-				const sum =
-					(data.manual_error?.count ?? 0) +
-					(data.manual_success?.count ?? 0) +
-					(data.prod_error?.count ?? 0) +
-					(data.prod_success?.count ?? 0);
-				return sum > 0;
-			})
-			.map(async (workflowId) => {
-				const promise = this.track('Workflow execution count', {
-					event_version: '2',
-					workflow_id: workflowId,
-					...this.executionCountsBuffer[workflowId],
-				});
-
-				return await promise;
+		const workflowIdsToReport = Object.keys(this.executionCountsBuffer).filter((workflowId) => {
+			const data = this.executionCountsBuffer[workflowId];
+			const sum =
+				(data.manual_error?.count ?? 0) +
+				(data.manual_success?.count ?? 0) +
+				(data.prod_error?.count ?? 0) +
+				(data.prod_success?.count ?? 0);
+			return sum > 0;
+		});
+
+		for (const workflowId of workflowIdsToReport) {
+			this.track('Workflow execution count', {
+				event_version: '2',
+				workflow_id: workflowId,
+				...this.executionCountsBuffer[workflowId],
 			});
+		}
 
 		this.executionCountsBuffer = {};
 
@@ -131,11 +129,11 @@ export class Telemetry {
 			team_projects: (await Container.get(ProjectRepository).getProjectCounts()).team,
 			project_role_count: await Container.get(ProjectRelationRepository).countUsersByRole(),
 		};
-		allPromises.push(this.track('pulse', pulsePacket));
-		return await Promise.all(allPromises);
+
+		this.track('pulse', pulsePacket);
 	}
 
-	async trackWorkflowExecution(properties: IExecutionTrackProperties): Promise<void> {
+	trackWorkflowExecution(properties: IExecutionTrackProperties) {
 		if (this.rudderStack) {
 			const execTime = new Date();
 			const workflowId = properties.workflow_id;
@@ -164,66 +162,60 @@ export class Telemetry {
 				properties.is_manual &&
 				properties.error_node_type?.startsWith('n8n-nodes-base')
 			) {
-				void this.track('Workflow execution errored', properties);
+				this.track('Workflow execution errored', properties);
 			}
 		}
 	}
 
 	async trackN8nStop(): Promise<void> {
 		clearInterval(this.pulseIntervalReference);
-		await this.track('User instance stopped');
-		void Promise.all([this.postHog.stop(), this.rudderStack?.flush()]);
+
+		this.track('User instance stopped');
+
+		await Promise.all([this.postHog.stop(), this.rudderStack?.flush()]);
 	}
 
-	async identify(traits?: {
-		[key: string]: string | number | boolean | object | undefined | null;
-	}): Promise<void> {
+	identify(traits?: { [key: string]: string | number | boolean | object | undefined | null }) {
+		if (!this.rudderStack) {
+			return;
+		}
+
 		const { instanceId } = this.instanceSettings;
-		return await new Promise<void>((resolve) => {
-			if (this.rudderStack) {
-				this.rudderStack.identify(
-					{
-						userId: instanceId,
-						traits: { ...traits, instanceId },
-					},
-					resolve,
-				);
-			} else {
-				resolve();
-			}
+
+		this.rudderStack.identify({
+			userId: instanceId,
+			traits: { ...traits, instanceId },
 		});
 	}
 
-	async track(
+	track(
 		eventName: string,
 		properties: ITelemetryTrackProperties = {},
 		{ withPostHog } = { withPostHog: false }, // whether to additionally track with PostHog
-	): Promise<void> {
-		const { instanceId } = this.instanceSettings;
-		return await new Promise<void>((resolve) => {
-			if (this.rudderStack) {
-				const { user_id } = properties;
-				const updatedProperties = {
-					...properties,
-					instance_id: instanceId,
-					version_cli: N8N_VERSION,
-				};
+	) {
+		if (!this.rudderStack) {
+			return;
+		}
 
-				const payload = {
-					userId: `${instanceId}${user_id ? `#${user_id}` : ''}`,
-					event: eventName,
-					properties: updatedProperties,
-				};
+		const { instanceId } = this.instanceSettings;
+		const { user_id } = properties;
+		const updatedProperties = {
+			...properties,
+			instance_id: instanceId,
+			version_cli: N8N_VERSION,
+		};
 
-				if (withPostHog) {
-					this.postHog?.track(payload);
-				}
+		const payload = {
+			userId: `${instanceId}${user_id ? `#${user_id}` : ''}`,
+			event: eventName,
+			properties: updatedProperties,
+		};
 
-				return this.rudderStack.track(payload, resolve);
-			}
+		if (withPostHog) {
+			this.postHog?.track(payload);
+		}
 
-			return resolve();
-		});
+		return this.rudderStack.track(payload);
 	}
 
 	// test helpers
diff --git a/packages/cli/src/telemetry/telemetry-event-relay.service.ts b/packages/cli/src/telemetry/telemetry-event-relay.service.ts
index 63c7fe4d11e74..bb1d4b8d560a2 100644
--- a/packages/cli/src/telemetry/telemetry-event-relay.service.ts
+++ b/packages/cli/src/telemetry/telemetry-event-relay.service.ts
@@ -104,7 +104,7 @@ export class TelemetryEventRelay {
 	}
 
 	private teamProjectUpdated({ userId, role, members, projectId }: Event['team-project-updated']) {
-		void this.telemetry.track('Project settings updated', {
+		this.telemetry.track('Project settings updated', {
 			user_id: userId,
 			role,
 			// eslint-disable-next-line @typescript-eslint/no-shadow
@@ -120,7 +120,7 @@ export class TelemetryEventRelay {
 		removalType,
 		targetProjectId,
 	}: Event['team-project-deleted']) {
-		void this.telemetry.track('User deleted project', {
+		this.telemetry.track('User deleted project', {
 			user_id: userId,
 			role,
 			project_id: projectId,
@@ -130,7 +130,7 @@ export class TelemetryEventRelay {
 	}
 
 	private teamProjectCreated({ userId, role }: Event['team-project-created']) {
-		void this.telemetry.track('User created project', {
+		this.telemetry.track('User created project', {
 			user_id: userId,
 			role,
 		});
@@ -142,7 +142,7 @@ export class TelemetryEventRelay {
 		repoType,
 		connected,
 	}: Event['source-control-settings-updated']) {
-		void this.telemetry.track('User updated source control settings', {
+		this.telemetry.track('User updated source control settings', {
 			branch_name: branchName,
 			read_only_instance: readOnlyInstance,
 			repo_type: repoType,
@@ -155,7 +155,7 @@ export class TelemetryEventRelay {
 		workflowConflicts,
 		credConflicts,
 	}: Event['source-control-user-started-pull-ui']) {
-		void this.telemetry.track('User started pull via UI', {
+		this.telemetry.track('User started pull via UI', {
 			workflow_updates: workflowUpdates,
 			workflow_conflicts: workflowConflicts,
 			cred_conflicts: credConflicts,
@@ -165,7 +165,7 @@ export class TelemetryEventRelay {
 	private sourceControlUserFinishedPullUi({
 		workflowUpdates,
 	}: Event['source-control-user-finished-pull-ui']) {
-		void this.telemetry.track('User finished pull via UI', {
+		this.telemetry.track('User finished pull via UI', {
 			workflow_updates: workflowUpdates,
 		});
 	}
@@ -178,7 +178,7 @@ export class TelemetryEventRelay {
 			workflow_updates: workflowUpdates,
 			forced,
 		});
-		void this.telemetry.track('User pulled via API', {
+		this.telemetry.track('User pulled via API', {
 			workflow_updates: workflowUpdates,
 			forced,
 		});
@@ -191,7 +191,7 @@ export class TelemetryEventRelay {
 		credsEligibleWithConflicts,
 		variablesEligible,
 	}: Event['source-control-user-started-push-ui']) {
-		void this.telemetry.track('User started push via UI', {
+		this.telemetry.track('User started push via UI', {
 			workflows_eligible: workflowsEligible,
 			workflows_eligible_with_conflicts: workflowsEligibleWithConflicts,
 			creds_eligible: credsEligible,
@@ -206,7 +206,7 @@ export class TelemetryEventRelay {
 		credsPushed,
 		variablesPushed,
 	}: Event['source-control-user-finished-push-ui']) {
-		void this.telemetry.track('User finished push via UI', {
+		this.telemetry.track('User finished push via UI', {
 			workflows_eligible: workflowsEligible,
 			workflows_pushed: workflowsPushed,
 			creds_pushed: credsPushed,
@@ -215,13 +215,13 @@ export class TelemetryEventRelay {
 	}
 
 	private licenseRenewalAttempted({ success }: Event['license-renewal-attempted']) {
-		void this.telemetry.track('Instance attempted to refresh license', {
+		this.telemetry.track('Instance attempted to refresh license', {
 			success,
 		});
 	}
 
 	private variableCreated() {
-		void this.telemetry.track('User created variable');
+		this.telemetry.track('User created variable');
 	}
 
 	private externalSecretsProviderSettingsSaved({
@@ -231,7 +231,7 @@ export class TelemetryEventRelay {
 		isNew,
 		errorMessage,
 	}: Event['external-secrets-provider-settings-saved']) {
-		void this.telemetry.track('User updated external secrets settings', {
+		this.telemetry.track('User updated external secrets settings', {
 			user_id: userId,
 			vault_type: vaultType,
 			is_valid: isValid,
@@ -241,7 +241,7 @@ export class TelemetryEventRelay {
 	}
 
 	private publicApiInvoked({ userId, path, method, apiVersion }: Event['public-api-invoked']) {
-		void this.telemetry.track('User invoked API', {
+		this.telemetry.track('User invoked API', {
 			user_id: userId,
 			path,
 			method,
@@ -252,7 +252,7 @@ export class TelemetryEventRelay {
 	private publicApiKeyCreated(event: Event['public-api-key-created']) {
 		const { user, publicApi } = event;
 
-		void this.telemetry.track('API key created', {
+		this.telemetry.track('API key created', {
 			user_id: user.id,
 			public_api: publicApi,
 		});
@@ -261,7 +261,7 @@ export class TelemetryEventRelay {
 	private publicApiKeyDeleted(event: Event['public-api-key-deleted']) {
 		const { user, publicApi } = event;
 
-		void this.telemetry.track('API key deleted', {
+		this.telemetry.track('API key deleted', {
 			user_id: user.id,
 			public_api: publicApi,
 		});
@@ -278,7 +278,7 @@ export class TelemetryEventRelay {
 		packageAuthorEmail,
 		failureReason,
 	}: Event['community-package-installed']) {
-		void this.telemetry.track('cnr package install finished', {
+		this.telemetry.track('cnr package install finished', {
 			user_id: user.id,
 			input_string: inputString,
 			package_name: packageName,
@@ -300,7 +300,7 @@ export class TelemetryEventRelay {
 		packageAuthor,
 		packageAuthorEmail,
 	}: Event['community-package-updated']) {
-		void this.telemetry.track('cnr package updated', {
+		this.telemetry.track('cnr package updated', {
 			user_id: user.id,
 			package_name: packageName,
 			package_version_current: packageVersionCurrent,
@@ -319,7 +319,7 @@ export class TelemetryEventRelay {
 		packageAuthor,
 		packageAuthorEmail,
 	}: Event['community-package-deleted']) {
-		void this.telemetry.track('cnr package deleted', {
+		this.telemetry.track('cnr package deleted', {
 			user_id: user.id,
 			package_name: packageName,
 			package_version: packageVersion,
@@ -336,7 +336,7 @@ export class TelemetryEventRelay {
 		projectId,
 		projectType,
 	}: Event['credentials-created']) {
-		void this.telemetry.track('User created credentials', {
+		this.telemetry.track('User created credentials', {
 			user_id: user.id,
 			credential_type: credentialType,
 			credential_id: credentialId,
@@ -353,7 +353,7 @@ export class TelemetryEventRelay {
 		userIdsShareesAdded,
 		shareesRemoved,
 	}: Event['credentials-shared']) {
-		void this.telemetry.track('User updated cred sharing', {
+		this.telemetry.track('User updated cred sharing', {
 			user_id: user.id,
 			credential_type: credentialType,
 			credential_id: credentialId,
@@ -364,7 +364,7 @@ export class TelemetryEventRelay {
 	}
 
 	private credentialsUpdated({ user, credentialId, credentialType }: Event['credentials-updated']) {
-		void this.telemetry.track('User updated credentials', {
+		this.telemetry.track('User updated credentials', {
 			user_id: user.id,
 			credential_type: credentialType,
 			credential_id: credentialId,
@@ -372,7 +372,7 @@ export class TelemetryEventRelay {
 	}
 
 	private credentialsDeleted({ user, credentialId, credentialType }: Event['credentials-deleted']) {
-		void this.telemetry.track('User deleted credentials', {
+		this.telemetry.track('User deleted credentials', {
 			user_id: user.id,
 			credential_type: credentialType,
 			credential_id: credentialId,
@@ -385,7 +385,7 @@ export class TelemetryEventRelay {
 		usersSynced,
 		error,
 	}: Event['ldap-general-sync-finished']) {
-		void this.telemetry.track('Ldap general sync finished', {
+		this.telemetry.track('Ldap general sync finished', {
 			type,
 			succeeded,
 			users_synced: usersSynced,
@@ -407,7 +407,7 @@ export class TelemetryEventRelay {
 		loginLabel,
 		loginEnabled,
 	}: Event['ldap-settings-updated']) {
-		void this.telemetry.track('User updated Ldap settings', {
+		this.telemetry.track('User updated Ldap settings', {
 			user_id: userId,
 			loginIdAttribute,
 			firstNameAttribute,
@@ -424,11 +424,11 @@ export class TelemetryEventRelay {
 	}
 
 	private ldapLoginSyncFailed({ error }: Event['ldap-login-sync-failed']) {
-		void this.telemetry.track('Ldap login sync failed', { error });
+		this.telemetry.track('Ldap login sync failed', { error });
 	}
 
 	private loginFailedDueToLdapDisabled({ userId }: Event['login-failed-due-to-ldap-disabled']) {
-		void this.telemetry.track('User login failed since ldap disabled', { user_ud: userId });
+		this.telemetry.track('User login failed since ldap disabled', { user_ud: userId });
 	}
 
 	private async serverStarted() {
@@ -489,12 +489,10 @@ export class TelemetryEventRelay {
 			where: {},
 		});
 
-		void Promise.all([
-			this.telemetry.identify(info),
-			this.telemetry.track('Instance started', {
-				...info,
-				earliest_workflow_created: firstWorkflow?.createdAt,
-			}),
-		]);
+		this.telemetry.identify(info);
+		this.telemetry.track('Instance started', {
+			...info,
+			earliest_workflow_created: firstWorkflow?.createdAt,
+		});
 	}
 }
diff --git a/packages/cli/src/workflows/workflow.service.ts b/packages/cli/src/workflows/workflow.service.ts
index cf742acecef2e..7c0cbfc242e1b 100644
--- a/packages/cli/src/workflows/workflow.service.ts
+++ b/packages/cli/src/workflows/workflow.service.ts
@@ -282,7 +282,7 @@ export class WorkflowService {
 		await this.workflowRepository.delete(workflowId);
 		await this.binaryDataService.deleteMany(idsForDeletion);
 
-		void Container.get(InternalHooks).onWorkflowDeleted(user, workflowId, false);
+		Container.get(InternalHooks).onWorkflowDeleted(user, workflowId, false);
 		this.eventService.emit('workflow-deleted', { user, workflowId });
 		await this.externalHooks.run('workflow.afterDelete', [workflowId]);
 
diff --git a/packages/cli/src/workflows/workflows.controller.ts b/packages/cli/src/workflows/workflows.controller.ts
index d0ec019586279..05863edb84c04 100644
--- a/packages/cli/src/workflows/workflows.controller.ts
+++ b/packages/cli/src/workflows/workflows.controller.ts
@@ -179,7 +179,7 @@ export class WorkflowsController {
 		delete savedWorkflowWithMetaData.shared;
 
 		await this.externalHooks.run('workflow.afterCreate', [savedWorkflow]);
-		void this.internalHooks.onWorkflowCreated(req.user, newWorkflow, project!, false);
+		this.internalHooks.onWorkflowCreated(req.user, newWorkflow, project!, false);
 		this.eventService.emit('workflow-created', { user: req.user, workflow: newWorkflow });
 
 		const scopes = await this.workflowService.getWorkflowScopes(req.user, savedWorkflow.id);
@@ -454,7 +454,7 @@ export class WorkflowsController {
 			newShareeIds = toShare;
 		});
 
-		void this.internalHooks.onWorkflowSharingUpdate(workflowId, req.user.id, shareWithIds);
+		this.internalHooks.onWorkflowSharingUpdate(workflowId, req.user.id, shareWithIds);
 
 		const projectsRelations = await this.projectRelationRepository.findBy({
 			projectId: In(newShareeIds),
diff --git a/packages/cli/test/unit/Telemetry.test.ts b/packages/cli/test/unit/Telemetry.test.ts
index 25f4a808675b0..e055abb1fdb74 100644
--- a/packages/cli/test/unit/Telemetry.test.ts
+++ b/packages/cli/test/unit/Telemetry.test.ts
@@ -14,11 +14,12 @@ describe('Telemetry', () => {
 	let startPulseSpy: jest.SpyInstance;
 	const spyTrack = jest.spyOn(Telemetry.prototype, 'track').mockName('track');
 
-	const mockRudderStack: Pick<RudderStack, 'flush' | 'identify' | 'track'> = {
-		flush: (resolve) => resolve?.(),
-		identify: (data, resolve) => resolve?.(),
-		track: (data, resolve) => resolve?.(),
-	};
+	const mockRudderStack = mock<RudderStack>();
+	mockRudderStack.track.mockImplementation(function (_, cb) {
+		cb?.();
+
+		return this;
+	});
 
 	let telemetry: Telemetry;
 	const instanceId = 'Telemetry unit test';
@@ -26,9 +27,9 @@ describe('Telemetry', () => {
 	const instanceSettings = mockInstance(InstanceSettings, { instanceId });
 
 	beforeAll(() => {
-		startPulseSpy = jest
-			.spyOn(Telemetry.prototype as any, 'startPulse')
-			.mockImplementation(() => {});
+		// @ts-expect-error Spying on private method
+		startPulseSpy = jest.spyOn(Telemetry.prototype, 'startPulse').mockImplementation(() => {});
+
 		jest.useFakeTimers();
 		jest.setSystemTime(testDateTime);
 		config.set('diagnostics.enabled', true);
@@ -49,7 +50,8 @@ describe('Telemetry', () => {
 		await postHog.init();
 
 		telemetry = new Telemetry(mock(), postHog, mock(), instanceSettings, mock());
-		(telemetry as any).rudderStack = mockRudderStack;
+		// @ts-expect-error Assigning to private property
+		telemetry.rudderStack = mockRudderStack;
 	});
 
 	afterEach(async () => {
@@ -79,30 +81,30 @@ describe('Telemetry', () => {
 			payload.is_manual = true;
 			payload.success = true;
 			const execTime1 = fakeJestSystemTime('2022-01-01 12:00:00');
-			await telemetry.trackWorkflowExecution(payload);
+			telemetry.trackWorkflowExecution(payload);
 			fakeJestSystemTime('2022-01-01 12:30:00');
-			await telemetry.trackWorkflowExecution(payload);
+			telemetry.trackWorkflowExecution(payload);
 
 			payload.is_manual = false;
 			payload.success = true;
 			const execTime2 = fakeJestSystemTime('2022-01-01 13:00:00');
-			await telemetry.trackWorkflowExecution(payload);
+			telemetry.trackWorkflowExecution(payload);
 			fakeJestSystemTime('2022-01-01 12:30:00');
-			await telemetry.trackWorkflowExecution(payload);
+			telemetry.trackWorkflowExecution(payload);
 
 			payload.is_manual = true;
 			payload.success = false;
 			const execTime3 = fakeJestSystemTime('2022-01-01 14:00:00');
-			await telemetry.trackWorkflowExecution(payload);
+			telemetry.trackWorkflowExecution(payload);
 			fakeJestSystemTime('2022-01-01 12:30:00');
-			await telemetry.trackWorkflowExecution(payload);
+			telemetry.trackWorkflowExecution(payload);
 
 			payload.is_manual = false;
 			payload.success = false;
 			const execTime4 = fakeJestSystemTime('2022-01-01 15:00:00');
-			await telemetry.trackWorkflowExecution(payload);
+			telemetry.trackWorkflowExecution(payload);
 			fakeJestSystemTime('2022-01-01 12:30:00');
-			await telemetry.trackWorkflowExecution(payload);
+			telemetry.trackWorkflowExecution(payload);
 
 			expect(spyTrack).toHaveBeenCalledTimes(0);
 
@@ -127,9 +129,9 @@ describe('Telemetry', () => {
 			};
 
 			const execTime1 = fakeJestSystemTime('2022-01-01 12:00:00');
-			await telemetry.trackWorkflowExecution(payload);
+			telemetry.trackWorkflowExecution(payload);
 			fakeJestSystemTime('2022-01-01 12:30:00');
-			await telemetry.trackWorkflowExecution(payload);
+			telemetry.trackWorkflowExecution(payload);
 
 			let execBuffer = telemetry.getCountsBuffer();
 
@@ -140,9 +142,9 @@ describe('Telemetry', () => {
 
 			payload.error_node_type = 'n8n-nodes-base.node-type';
 			fakeJestSystemTime('2022-01-01 13:00:00');
-			await telemetry.trackWorkflowExecution(payload);
+			telemetry.trackWorkflowExecution(payload);
 			fakeJestSystemTime('2022-01-01 12:30:00');
-			await telemetry.trackWorkflowExecution(payload);
+			telemetry.trackWorkflowExecution(payload);
 
 			execBuffer = telemetry.getCountsBuffer();
 
@@ -163,7 +165,7 @@ describe('Telemetry', () => {
 
 			// successful execution
 			const execTime1 = fakeJestSystemTime('2022-01-01 12:00:00');
-			await telemetry.trackWorkflowExecution(payload);
+			telemetry.trackWorkflowExecution(payload);
 
 			expect(spyTrack).toHaveBeenCalledTimes(0);
 
@@ -179,7 +181,7 @@ describe('Telemetry', () => {
 			payload.error_node_type = 'n8n-nodes-base.merge';
 			payload.workflow_id = '2';
 
-			await telemetry.trackWorkflowExecution(payload);
+			telemetry.trackWorkflowExecution(payload);
 
 			expect(spyTrack).toHaveBeenCalledTimes(0);
 
@@ -198,12 +200,12 @@ describe('Telemetry', () => {
 			payload.error_node_type = 'n8n-nodes-base.merge';
 			payload.workflow_id = '2';
 
-			await telemetry.trackWorkflowExecution(payload);
+			telemetry.trackWorkflowExecution(payload);
 
 			payload.error_node_type = 'n8n-nodes-base.merge';
 			payload.workflow_id = '1';
 
-			await telemetry.trackWorkflowExecution(payload);
+			telemetry.trackWorkflowExecution(payload);
 
 			expect(spyTrack).toHaveBeenCalledTimes(0);
 			execBuffer = telemetry.getCountsBuffer();
@@ -225,7 +227,7 @@ describe('Telemetry', () => {
 			const execTime2 = fakeJestSystemTime('2022-01-01 12:00:00');
 			payload.error_node_type = 'custom-package.custom-node';
 			payload.success = false;
-			await telemetry.trackWorkflowExecution(payload);
+			telemetry.trackWorkflowExecution(payload);
 
 			expect(spyTrack).toHaveBeenCalledTimes(0);
 
@@ -249,7 +251,7 @@ describe('Telemetry', () => {
 			payload.success = false;
 			payload.error_node_type = 'n8n-nodes-base.merge';
 			payload.is_manual = true;
-			await telemetry.trackWorkflowExecution(payload);
+			telemetry.trackWorkflowExecution(payload);
 
 			expect(spyTrack).toHaveBeenCalledTimes(1);
 
@@ -327,27 +329,27 @@ describe('Telemetry', () => {
 				error_node_type: 'custom-nodes-base.node-type',
 			};
 
-			await telemetry.trackWorkflowExecution(payload);
-			await telemetry.trackWorkflowExecution(payload);
+			telemetry.trackWorkflowExecution(payload);
+			telemetry.trackWorkflowExecution(payload);
 
 			payload.is_manual = false;
 			payload.success = true;
-			await telemetry.trackWorkflowExecution(payload);
-			await telemetry.trackWorkflowExecution(payload);
+			telemetry.trackWorkflowExecution(payload);
+			telemetry.trackWorkflowExecution(payload);
 
 			payload.is_manual = true;
 			payload.success = false;
-			await telemetry.trackWorkflowExecution(payload);
-			await telemetry.trackWorkflowExecution(payload);
+			telemetry.trackWorkflowExecution(payload);
+			telemetry.trackWorkflowExecution(payload);
 
 			payload.is_manual = false;
 			payload.success = false;
-			await telemetry.trackWorkflowExecution(payload);
-			await telemetry.trackWorkflowExecution(payload);
+			telemetry.trackWorkflowExecution(payload);
+			telemetry.trackWorkflowExecution(payload);
 
 			payload.workflow_id = '2';
-			await telemetry.trackWorkflowExecution(payload);
-			await telemetry.trackWorkflowExecution(payload);
+			telemetry.trackWorkflowExecution(payload);
+			telemetry.trackWorkflowExecution(payload);
 
 			expect(spyTrack).toHaveBeenCalledTimes(0);
 			expect(pulseSpy).toBeCalledTimes(0);

From f87854f8db360b7b870583753fcfb4af95adab8c Mon Sep 17 00:00:00 2001
From: Michael Kret <88898367+michael-radency@users.noreply.github.com>
Date: Tue, 30 Jul 2024 15:43:05 +0300
Subject: [PATCH 029/168] fix(Wait Node): Authentication fix (#10236)

---
 packages/nodes-base/nodes/Form/utils.ts     | 14 +++++----
 packages/nodes-base/nodes/Wait/Wait.node.ts | 33 ++++++++++++++++++++-
 2 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/packages/nodes-base/nodes/Form/utils.ts b/packages/nodes-base/nodes/Form/utils.ts
index 1928c935bdea8..2e79c5699ce5f 100644
--- a/packages/nodes-base/nodes/Form/utils.ts
+++ b/packages/nodes-base/nodes/Form/utils.ts
@@ -140,8 +140,11 @@ const checkResponseModeConfiguration = (context: IWebhookFunctions) => {
 	}
 };
 
-export async function formWebhook(context: IWebhookFunctions) {
-	const nodeVersion = context.getNode().typeVersion;
+export async function formWebhook(
+	context: IWebhookFunctions,
+	authProperty = FORM_TRIGGER_AUTHENTICATION_PROPERTY,
+) {
+	const node = context.getNode();
 	const options = context.getNodeParameter('options', {}) as {
 		ignoreBots?: boolean;
 		respondWithOptions?: {
@@ -159,9 +162,10 @@ export async function formWebhook(context: IWebhookFunctions) {
 	const req = context.getRequestObject();
 
 	try {
-		if (options.ignoreBots && isbot(req.headers['user-agent']))
+		if (options.ignoreBots && isbot(req.headers['user-agent'])) {
 			throw new WebhookAuthorizationError(403);
-		await validateWebhookAuthentication(context, FORM_TRIGGER_AUTHENTICATION_PROPERTY);
+		}
+		await validateWebhookAuthentication(context, authProperty);
 	} catch (error) {
 		if (error instanceof WebhookAuthorizationError) {
 			res.writeHead(error.responseCode, { 'WWW-Authenticate': 'Basic realm="Webhook"' });
@@ -310,7 +314,7 @@ export async function formWebhook(context: IWebhookFunctions) {
 
 	let { useWorkflowTimezone } = options;
 
-	if (useWorkflowTimezone === undefined && nodeVersion > 2) {
+	if (useWorkflowTimezone === undefined && node.typeVersion > 2) {
 		useWorkflowTimezone = true;
 	}
 
diff --git a/packages/nodes-base/nodes/Wait/Wait.node.ts b/packages/nodes-base/nodes/Wait/Wait.node.ts
index 181a208f923c3..98badea8331d8 100644
--- a/packages/nodes-base/nodes/Wait/Wait.node.ts
+++ b/packages/nodes-base/nodes/Wait/Wait.node.ts
@@ -237,6 +237,14 @@ export class Wait extends Webhook {
 		inputs: ['main'],
 		outputs: ['main'],
 		credentials: credentialsProperty(this.authPropertyName),
+		hints: [
+			{
+				message:
+					"When testing your workflow using the Editor UI, you can't see the rest of the execution following the Wait node. To inspect the execution results, enable Save Manual Executions in your Workflow settings so you can review the execution results there.",
+				location: 'outputPane',
+				whenToDisplay: 'beforeExecution',
+			},
+		],
 		webhooks: [
 			{
 				...defaultWebhookDescription,
@@ -294,6 +302,29 @@ export class Wait extends Webhook {
 				default: 'timeInterval',
 				description: 'Determines the waiting mode to use before the workflow continues',
 			},
+			{
+				displayName: 'Authentication',
+				name: 'incomingAuthentication',
+				type: 'options',
+				options: [
+					{
+						name: 'Basic Auth',
+						value: 'basicAuth',
+					},
+					{
+						name: 'None',
+						value: 'none',
+					},
+				],
+				default: 'none',
+				description:
+					'If and how incoming resume-webhook-requests to $execution.resumeFormUrl should be authenticated for additional security',
+				displayOptions: {
+					show: {
+						resume: ['form'],
+					},
+				},
+			},
 			{
 				...authenticationProperty(this.authPropertyName),
 				description:
@@ -427,7 +458,7 @@ export class Wait extends Webhook {
 
 	async webhook(context: IWebhookFunctions) {
 		const resume = context.getNodeParameter('resume', 0) as string;
-		if (resume === 'form') return await formWebhook(context);
+		if (resume === 'form') return await formWebhook(context, this.authPropertyName);
 		return await super.webhook(context);
 	}
 

From af695ebf934526d926ea87fe87df61aa73d70979 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Tue, 30 Jul 2024 14:58:07 +0200
Subject: [PATCH 030/168] feat: Support create, read, delete variables in
 Public API (#10241)

---
 .../variables/spec/paths/variables.id.yml     |  16 ++
 .../variables/spec/paths/variables.yml        |  40 +++++
 .../spec/schemas/parameters/variableId.yml    |   6 +
 .../variables/spec/schemas/variable.yml       |  17 ++
 .../variables/spec/schemas/variableList.yml   |  11 ++
 .../handlers/variables/variables.handler.ts   |  55 ++++++
 packages/cli/src/PublicApi/v1/openapi.yml     |   6 +
 .../shared/middlewares/global.middleware.ts   |  10 ++
 .../integration/publicApi/variables.test.ts   | 167 ++++++++++++++++++
 .../cli/test/integration/shared/db/users.ts   |   6 +-
 .../test/integration/shared/db/variables.ts   |  12 ++
 11 files changed, 345 insertions(+), 1 deletion(-)
 create mode 100644 packages/cli/src/PublicApi/v1/handlers/variables/spec/paths/variables.id.yml
 create mode 100644 packages/cli/src/PublicApi/v1/handlers/variables/spec/paths/variables.yml
 create mode 100644 packages/cli/src/PublicApi/v1/handlers/variables/spec/schemas/parameters/variableId.yml
 create mode 100644 packages/cli/src/PublicApi/v1/handlers/variables/spec/schemas/variable.yml
 create mode 100644 packages/cli/src/PublicApi/v1/handlers/variables/spec/schemas/variableList.yml
 create mode 100644 packages/cli/src/PublicApi/v1/handlers/variables/variables.handler.ts
 create mode 100644 packages/cli/test/integration/publicApi/variables.test.ts
 create mode 100644 packages/cli/test/integration/shared/db/variables.ts

diff --git a/packages/cli/src/PublicApi/v1/handlers/variables/spec/paths/variables.id.yml b/packages/cli/src/PublicApi/v1/handlers/variables/spec/paths/variables.id.yml
new file mode 100644
index 0000000000000..79c65416b26f6
--- /dev/null
+++ b/packages/cli/src/PublicApi/v1/handlers/variables/spec/paths/variables.id.yml
@@ -0,0 +1,16 @@
+delete:
+  x-eov-operation-id: deleteVariable
+  x-eov-operation-handler: v1/handlers/variables/variables.handler
+  tags:
+    - Variables
+  summary: Delete a variable
+  description: Delete a variable from your instance.
+  parameters:
+    - $ref: '../schemas/parameters/variableId.yml'
+  responses:
+    '204':
+      description: Operation successful.
+    '401':
+      $ref: '../../../../shared/spec/responses/unauthorized.yml'
+    '404':
+      $ref: '../../../../shared/spec/responses/notFound.yml'
diff --git a/packages/cli/src/PublicApi/v1/handlers/variables/spec/paths/variables.yml b/packages/cli/src/PublicApi/v1/handlers/variables/spec/paths/variables.yml
new file mode 100644
index 0000000000000..7418c2fe05716
--- /dev/null
+++ b/packages/cli/src/PublicApi/v1/handlers/variables/spec/paths/variables.yml
@@ -0,0 +1,40 @@
+post:
+  x-eov-operation-id: createVariable
+  x-eov-operation-handler: v1/handlers/variables/variables.handler
+  tags:
+    - Variables
+  summary: Create a variable
+  description: Create a variable in your instance.
+  requestBody:
+    description: Payload for variable to create.
+    content:
+      application/json:
+        schema:
+          $ref: '../schemas/variable.yml'
+    required: true
+  responses:
+    '201':
+      description: Operation successful.
+    '400':
+      $ref: '../../../../shared/spec/responses/badRequest.yml'
+    '401':
+      $ref: '../../../../shared/spec/responses/unauthorized.yml'
+get:
+  x-eov-operation-id: getVariables
+  x-eov-operation-handler: v1/handlers/variables/variables.handler
+  tags:
+    - Variables
+  summary: Retrieve variables
+  description: Retrieve variables from your instance.
+  parameters:
+    - $ref: '../../../../shared/spec/parameters/limit.yml'
+    - $ref: '../../../../shared/spec/parameters/cursor.yml'
+  responses:
+    '200':
+      description: Operation successful.
+      content:
+        application/json:
+          schema:
+            $ref: '../schemas/variableList.yml'
+    '401':
+      $ref: '../../../../shared/spec/responses/unauthorized.yml'
diff --git a/packages/cli/src/PublicApi/v1/handlers/variables/spec/schemas/parameters/variableId.yml b/packages/cli/src/PublicApi/v1/handlers/variables/spec/schemas/parameters/variableId.yml
new file mode 100644
index 0000000000000..a886039d8e195
--- /dev/null
+++ b/packages/cli/src/PublicApi/v1/handlers/variables/spec/schemas/parameters/variableId.yml
@@ -0,0 +1,6 @@
+name: id
+in: path
+description: The ID of the variable.
+required: true
+schema:
+  type: string
diff --git a/packages/cli/src/PublicApi/v1/handlers/variables/spec/schemas/variable.yml b/packages/cli/src/PublicApi/v1/handlers/variables/spec/schemas/variable.yml
new file mode 100644
index 0000000000000..319ad8d4403ae
--- /dev/null
+++ b/packages/cli/src/PublicApi/v1/handlers/variables/spec/schemas/variable.yml
@@ -0,0 +1,17 @@
+type: object
+additionalProperties: false
+required:
+  - key
+  - value
+properties:
+  id:
+    type: string
+    readOnly: true
+  key:
+    type: string
+  value:
+    type: string
+    example: test
+  type:
+    type: string
+    readOnly: true
diff --git a/packages/cli/src/PublicApi/v1/handlers/variables/spec/schemas/variableList.yml b/packages/cli/src/PublicApi/v1/handlers/variables/spec/schemas/variableList.yml
new file mode 100644
index 0000000000000..95e66e180f426
--- /dev/null
+++ b/packages/cli/src/PublicApi/v1/handlers/variables/spec/schemas/variableList.yml
@@ -0,0 +1,11 @@
+type: object
+properties:
+  data:
+    type: array
+    items:
+      $ref: './variable.yml'
+  nextCursor:
+    type: string
+    description: Paginate through variables by setting the cursor parameter to a nextCursor attribute returned by a previous request. Default value fetches the first "page" of the collection.
+    nullable: true
+    example: MTIzZTQ1NjctZTg5Yi0xMmQzLWE0NTYtNDI2NjE0MTc0MDA
diff --git a/packages/cli/src/PublicApi/v1/handlers/variables/variables.handler.ts b/packages/cli/src/PublicApi/v1/handlers/variables/variables.handler.ts
new file mode 100644
index 0000000000000..3073044eac03d
--- /dev/null
+++ b/packages/cli/src/PublicApi/v1/handlers/variables/variables.handler.ts
@@ -0,0 +1,55 @@
+import Container from 'typedi';
+import { VariablesRepository } from '@/databases/repositories/variables.repository';
+import { VariablesController } from '@/environments/variables/variables.controller.ee';
+import { globalScope, isLicensed, validCursor } from '../../shared/middlewares/global.middleware';
+import { encodeNextCursor } from '../../shared/services/pagination.service';
+import type { Response } from 'express';
+import type { VariablesRequest } from '@/requests';
+import type { PaginatedRequest } from '@/PublicApi/types';
+
+type Create = VariablesRequest.Create;
+type Delete = VariablesRequest.Delete;
+type GetAll = PaginatedRequest;
+
+export = {
+	createVariable: [
+		isLicensed('feat:variables'),
+		globalScope('variable:create'),
+		async (req: Create, res: Response) => {
+			await Container.get(VariablesController).createVariable(req);
+
+			res.status(201).send();
+		},
+	],
+	deleteVariable: [
+		isLicensed('feat:variables'),
+		globalScope('variable:delete'),
+		async (req: Delete, res: Response) => {
+			await Container.get(VariablesController).deleteVariable(req);
+
+			res.status(204).send();
+		},
+	],
+	getVariables: [
+		isLicensed('feat:variables'),
+		globalScope('variable:list'),
+		validCursor,
+		async (req: GetAll, res: Response) => {
+			const { offset = 0, limit = 100 } = req.query;
+
+			const [variables, count] = await Container.get(VariablesRepository).findAndCount({
+				skip: offset,
+				take: limit,
+			});
+
+			return res.json({
+				data: variables,
+				nextCursor: encodeNextCursor({
+					offset,
+					limit,
+					numberOfTotalRecords: count,
+				}),
+			});
+		},
+	],
+};
diff --git a/packages/cli/src/PublicApi/v1/openapi.yml b/packages/cli/src/PublicApi/v1/openapi.yml
index 9d8249983511c..91eacd53767ad 100644
--- a/packages/cli/src/PublicApi/v1/openapi.yml
+++ b/packages/cli/src/PublicApi/v1/openapi.yml
@@ -30,6 +30,8 @@ tags:
     description: Operations about tags
   - name: SourceControl
     description: Operations about source control
+  - name: Variables
+    description: Operations about variables
 
 paths:
   /audit:
@@ -64,6 +66,10 @@ paths:
     $ref: './handlers/users/spec/paths/users.id.yml'
   /source-control/pull:
     $ref: './handlers/sourceControl/spec/paths/sourceControl.yml'
+  /variables:
+    $ref: './handlers/variables/spec/paths/variables.yml'
+  /variables/{id}:
+    $ref: './handlers/variables/spec/paths/variables.id.yml'
 components:
   schemas:
     $ref: './shared/spec/schemas/_index.yml'
diff --git a/packages/cli/src/PublicApi/v1/shared/middlewares/global.middleware.ts b/packages/cli/src/PublicApi/v1/shared/middlewares/global.middleware.ts
index 6fa9bed113666..7e8c39bb91a3d 100644
--- a/packages/cli/src/PublicApi/v1/shared/middlewares/global.middleware.ts
+++ b/packages/cli/src/PublicApi/v1/shared/middlewares/global.middleware.ts
@@ -9,6 +9,8 @@ import type { PaginatedRequest } from '../../../types';
 import { decodeCursor } from '../services/pagination.service';
 import type { Scope } from '@n8n/permissions';
 import { userHasScope } from '@/permissions/checkAccess';
+import type { BooleanLicenseFeature } from '@/Interfaces';
+import { FeatureNotLicensedError } from '@/errors/feature-not-licensed.error';
 
 const UNLIMITED_USERS_QUOTA = -1;
 
@@ -86,3 +88,11 @@ export const validLicenseWithUserQuota = (
 
 	return next();
 };
+
+export const isLicensed = (feature: BooleanLicenseFeature) => {
+	return async (_: AuthenticatedRequest, res: express.Response, next: express.NextFunction) => {
+		if (Container.get(License).isFeatureEnabled(feature)) return next();
+
+		return res.status(403).json({ message: new FeatureNotLicensedError(feature).message });
+	};
+};
diff --git a/packages/cli/test/integration/publicApi/variables.test.ts b/packages/cli/test/integration/publicApi/variables.test.ts
new file mode 100644
index 0000000000000..b97c2467ebf63
--- /dev/null
+++ b/packages/cli/test/integration/publicApi/variables.test.ts
@@ -0,0 +1,167 @@
+import { setupTestServer } from '@test-integration/utils';
+import { createOwner } from '@test-integration/db/users';
+import { createVariable, getVariableOrFail } from '@test-integration/db/variables';
+import * as testDb from '../shared/testDb';
+import { FeatureNotLicensedError } from '@/errors/feature-not-licensed.error';
+
+describe('Variables in Public API', () => {
+	const testServer = setupTestServer({ endpointGroups: ['publicApi'] });
+
+	beforeAll(async () => {
+		await testDb.init();
+	});
+
+	beforeEach(async () => {
+		await testDb.truncate(['Variables', 'User']);
+	});
+
+	describe('GET /variables', () => {
+		it('if licensed, should return all variables with pagination', async () => {
+			/**
+			 * Arrange
+			 */
+			testServer.license.enable('feat:variables');
+			const owner = await createOwner({ withApiKey: true });
+			const variables = await Promise.all([createVariable(), createVariable(), createVariable()]);
+
+			/**
+			 * Act
+			 */
+			const response = await testServer.publicApiAgentFor(owner).get('/variables');
+
+			/**
+			 * Assert
+			 */
+			expect(response.status).toBe(200);
+			expect(response.body).toHaveProperty('data');
+			expect(response.body).toHaveProperty('nextCursor');
+			expect(Array.isArray(response.body.data)).toBe(true);
+			expect(response.body.data.length).toBe(variables.length);
+
+			variables.forEach(({ id, key, value }) => {
+				expect(response.body.data).toContainEqual(expect.objectContaining({ id, key, value }));
+			});
+		});
+
+		it('if not licensed, should reject', async () => {
+			/**
+			 * Arrange
+			 */
+			const owner = await createOwner({ withApiKey: true });
+
+			/**
+			 * Act
+			 */
+			const response = await testServer.publicApiAgentFor(owner).get('/variables');
+
+			/**
+			 * Assert
+			 */
+			expect(response.status).toBe(403);
+			expect(response.body).toHaveProperty(
+				'message',
+				new FeatureNotLicensedError('feat:variables').message,
+			);
+		});
+	});
+
+	describe('POST /variables', () => {
+		it('if licensed, should create a new variable', async () => {
+			/**
+			 * Arrange
+			 */
+			testServer.license.enable('feat:variables');
+			const owner = await createOwner({ withApiKey: true });
+			const variablePayload = { key: 'key', value: 'value' };
+
+			/**
+			 * Act
+			 */
+			const response = await testServer
+				.publicApiAgentFor(owner)
+				.post('/variables')
+				.send(variablePayload);
+
+			/**
+			 * Assert
+			 */
+			expect(response.status).toBe(201);
+			await expect(getVariableOrFail(response.body.id)).resolves.toEqual(
+				expect.objectContaining(variablePayload),
+			);
+		});
+
+		it('if not licensed, should reject', async () => {
+			/**
+			 * Arrange
+			 */
+			const owner = await createOwner({ withApiKey: true });
+			const variablePayload = { key: 'key', value: 'value' };
+
+			/**
+			 * Act
+			 */
+			const response = await testServer
+				.publicApiAgentFor(owner)
+				.post('/variables')
+				.send(variablePayload);
+
+			/**
+			 * Assert
+			 */
+			expect(response.status).toBe(403);
+			expect(response.body).toHaveProperty(
+				'message',
+				new FeatureNotLicensedError('feat:variables').message,
+			);
+		});
+	});
+
+	describe('DELETE /variables/:id', () => {
+		it('if licensed, should delete a variable', async () => {
+			/**
+			 * Arrange
+			 */
+			testServer.license.enable('feat:variables');
+			const owner = await createOwner({ withApiKey: true });
+			const variable = await createVariable();
+
+			/**
+			 * Act
+			 */
+			const response = await testServer
+				.publicApiAgentFor(owner)
+				.delete(`/variables/${variable.id}`);
+
+			/**
+			 * Assert
+			 */
+			expect(response.status).toBe(204);
+			await expect(getVariableOrFail(variable.id)).rejects.toThrow();
+		});
+
+		it('if not licensed, should reject', async () => {
+			/**
+			 * Arrange
+			 */
+			const owner = await createOwner({ withApiKey: true });
+			const variable = await createVariable();
+
+			/**
+			 * Act
+			 */
+			const response = await testServer
+				.publicApiAgentFor(owner)
+				.delete(`/variables/${variable.id}`);
+
+			/**
+			 * Assert
+			 */
+			expect(response.status).toBe(403);
+			expect(response.body).toHaveProperty(
+				'message',
+				new FeatureNotLicensedError('feat:variables').message,
+			);
+		});
+	});
+});
diff --git a/packages/cli/test/integration/shared/db/users.ts b/packages/cli/test/integration/shared/db/users.ts
index aa7a3baaa726f..f125f5ccded4f 100644
--- a/packages/cli/test/integration/shared/db/users.ts
+++ b/packages/cli/test/integration/shared/db/users.ts
@@ -78,7 +78,11 @@ export async function createUserWithMfaEnabled(
 	};
 }
 
-export async function createOwner() {
+export async function createOwner({ withApiKey } = { withApiKey: false }) {
+	if (withApiKey) {
+		return await addApiKey(await createUser({ role: 'global:owner' }));
+	}
+
 	return await createUser({ role: 'global:owner' });
 }
 
diff --git a/packages/cli/test/integration/shared/db/variables.ts b/packages/cli/test/integration/shared/db/variables.ts
new file mode 100644
index 0000000000000..68495da3b180f
--- /dev/null
+++ b/packages/cli/test/integration/shared/db/variables.ts
@@ -0,0 +1,12 @@
+import { VariablesRepository } from '@/databases/repositories/variables.repository';
+import { generateNanoId } from '@/databases/utils/generators';
+import { randomString } from 'n8n-workflow';
+import Container from 'typedi';
+
+export async function createVariable(key = randomString(5), value = randomString(5)) {
+	return await Container.get(VariablesRepository).save({ id: generateNanoId(), key, value });
+}
+
+export async function getVariableOrFail(id: string) {
+	return await Container.get(VariablesRepository).findOneOrFail({ where: { id } });
+}

From 3ccb9df2f902e46f8cbb9c46c0727f29d752a773 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Tue, 30 Jul 2024 14:58:25 +0200
Subject: [PATCH 031/168] feat: Introduce Google Cloud Platform as external
 secrets provider  (#10146)

---
 packages/cli/package.json                     |   1 +
 .../ExternalSecretsProviders.ee.ts            |   2 +
 .../__tests__/azure-key-vault.test.ts         |   4 +-
 .../__tests__/gcp-secrets-manager.test.ts     |  87 +++++++++++
 .../azure-key-vault/azure-key-vault.ts        |   4 +-
 .../gcp-secrets-manager.ts                    | 136 ++++++++++++++++++
 .../providers/gcp-secrets-manager/types.ts    |  19 +++
 .../src/assets/images/gcp-secrets-manager.svg |   9 ++
 .../ExternalSecretsProviderImage.ee.vue       |   2 +
 pnpm-lock.yaml                                |  44 +++---
 10 files changed, 283 insertions(+), 25 deletions(-)
 create mode 100644 packages/cli/src/ExternalSecrets/providers/__tests__/gcp-secrets-manager.test.ts
 create mode 100644 packages/cli/src/ExternalSecrets/providers/gcp-secrets-manager/gcp-secrets-manager.ts
 create mode 100644 packages/cli/src/ExternalSecrets/providers/gcp-secrets-manager/types.ts
 create mode 100644 packages/editor-ui/src/assets/images/gcp-secrets-manager.svg

diff --git a/packages/cli/package.json b/packages/cli/package.json
index b18513c3a20c9..60ace14d9bce8 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -83,6 +83,7 @@
   "dependencies": {
     "@azure/identity": "^4.3.0",
     "@azure/keyvault-secrets": "^4.8.0",
+    "@google-cloud/secret-manager": "^5.6.0",
     "@n8n/client-oauth2": "workspace:*",
     "@n8n/config": "workspace:*",
     "@n8n/localtunnel": "2.1.0",
diff --git a/packages/cli/src/ExternalSecrets/ExternalSecretsProviders.ee.ts b/packages/cli/src/ExternalSecrets/ExternalSecretsProviders.ee.ts
index 33228673c3bda..274a1d69aaa51 100644
--- a/packages/cli/src/ExternalSecrets/ExternalSecretsProviders.ee.ts
+++ b/packages/cli/src/ExternalSecrets/ExternalSecretsProviders.ee.ts
@@ -4,6 +4,7 @@ import { InfisicalProvider } from './providers/infisical';
 import { VaultProvider } from './providers/vault';
 import { AwsSecretsManager } from './providers/aws-secrets/aws-secrets-manager';
 import { AzureKeyVault } from './providers/azure-key-vault/azure-key-vault';
+import { GcpSecretsManager } from './providers/gcp-secrets-manager/gcp-secrets-manager';
 
 @Service()
 export class ExternalSecretsProviders {
@@ -12,6 +13,7 @@ export class ExternalSecretsProviders {
 		infisical: InfisicalProvider,
 		vault: VaultProvider,
 		azureKeyVault: AzureKeyVault,
+		gcpSecretsManager: GcpSecretsManager,
 	};
 
 	getProvider(name: string): { new (): SecretsProvider } | null {
diff --git a/packages/cli/src/ExternalSecrets/providers/__tests__/azure-key-vault.test.ts b/packages/cli/src/ExternalSecrets/providers/__tests__/azure-key-vault.test.ts
index 329bfca2acd6e..8bacd6bbb9d21 100644
--- a/packages/cli/src/ExternalSecrets/providers/__tests__/azure-key-vault.test.ts
+++ b/packages/cli/src/ExternalSecrets/providers/__tests__/azure-key-vault.test.ts
@@ -37,7 +37,7 @@ describe('AzureKeyVault', () => {
 					yield { name: 'secret1' };
 					yield { name: 'secret2' };
 					yield { name: 'secret3' }; // no value
-					yield { name: '#@&' }; // invalid name
+					yield { name: '#@&' }; // unsupported name
 				},
 			}));
 
@@ -65,6 +65,6 @@ describe('AzureKeyVault', () => {
 		expect(azureKeyVault.getSecret('secret1')).toBe('value1');
 		expect(azureKeyVault.getSecret('secret2')).toBe('value2');
 		expect(azureKeyVault.getSecret('secret3')).toBeUndefined(); // no value
-		expect(azureKeyVault.getSecret('#@&')).toBeUndefined(); // invalid name
+		expect(azureKeyVault.getSecret('#@&')).toBeUndefined(); // unsupported name
 	});
 });
diff --git a/packages/cli/src/ExternalSecrets/providers/__tests__/gcp-secrets-manager.test.ts b/packages/cli/src/ExternalSecrets/providers/__tests__/gcp-secrets-manager.test.ts
new file mode 100644
index 0000000000000..40673041a760c
--- /dev/null
+++ b/packages/cli/src/ExternalSecrets/providers/__tests__/gcp-secrets-manager.test.ts
@@ -0,0 +1,87 @@
+import { mock } from 'jest-mock-extended';
+import { GcpSecretsManager } from '../gcp-secrets-manager/gcp-secrets-manager';
+import type { GcpSecretsManagerContext } from '../gcp-secrets-manager/types';
+import { SecretManagerServiceClient } from '@google-cloud/secret-manager';
+import type { google } from '@google-cloud/secret-manager/build/protos/protos';
+
+jest.mock('@google-cloud/secret-manager');
+
+type GcpSecretVersionResponse = google.cloud.secretmanager.v1.IAccessSecretVersionResponse;
+
+describe('GCP Secrets Manager', () => {
+	const gcpSecretsManager = new GcpSecretsManager();
+
+	afterEach(() => {
+		jest.clearAllMocks();
+	});
+
+	it('should update cached secrets', async () => {
+		/**
+		 * Arrange
+		 */
+		const PROJECT_ID = 'my-project-id';
+
+		const SECRETS: Record<string, string> = {
+			secret1: 'value1',
+			secret2: 'value2',
+			secret3: '', // no value
+			'#@&': 'value', // unsupported name
+		};
+
+		await gcpSecretsManager.init(
+			mock<GcpSecretsManagerContext>({
+				settings: { serviceAccountKey: `{ "project_id": "${PROJECT_ID}" }` },
+			}),
+		);
+
+		const listSpy = jest
+			.spyOn(SecretManagerServiceClient.prototype, 'listSecrets')
+			// @ts-expect-error Partial mock
+			.mockResolvedValue([
+				[
+					{ name: `projects/${PROJECT_ID}/secrets/secret1` },
+					{ name: `projects/${PROJECT_ID}/secrets/secret2` },
+					{ name: `projects/${PROJECT_ID}/secrets/secret3` },
+					{ name: `projects/${PROJECT_ID}/secrets/#@&` },
+				],
+			]);
+
+		const getSpy = jest
+			.spyOn(SecretManagerServiceClient.prototype, 'accessSecretVersion')
+			.mockImplementation(async ({ name }: { name: string }) => {
+				const secretName = name.split('/')[3];
+				return [
+					{ payload: { data: Buffer.from(SECRETS[secretName]) } },
+				] as GcpSecretVersionResponse[];
+			});
+
+		/**
+		 * Act
+		 */
+		await gcpSecretsManager.connect();
+		await gcpSecretsManager.update();
+
+		/**
+		 * Assert
+		 */
+		expect(listSpy).toHaveBeenCalled();
+
+		expect(getSpy).toHaveBeenCalledWith({
+			name: `projects/${PROJECT_ID}/secrets/secret1/versions/latest`,
+		});
+		expect(getSpy).toHaveBeenCalledWith({
+			name: `projects/${PROJECT_ID}/secrets/secret2/versions/latest`,
+		});
+		expect(getSpy).toHaveBeenCalledWith({
+			name: `projects/${PROJECT_ID}/secrets/secret3/versions/latest`,
+		});
+		expect(getSpy).not.toHaveBeenCalledWith({
+			name: `projects/${PROJECT_ID}/secrets/#@&/versions/latest`,
+		});
+
+		expect(gcpSecretsManager.getSecret('secret1')).toBe('value1');
+		expect(gcpSecretsManager.getSecret('secret2')).toBe('value2');
+		expect(gcpSecretsManager.getSecret('secret3')).toBeUndefined(); // no value
+		expect(gcpSecretsManager.getSecret('#@&')).toBeUndefined(); // unsupported name
+	});
+});
diff --git a/packages/cli/src/ExternalSecrets/providers/azure-key-vault/azure-key-vault.ts b/packages/cli/src/ExternalSecrets/providers/azure-key-vault/azure-key-vault.ts
index c51e54e799ba1..7df196bdf96c4 100644
--- a/packages/cli/src/ExternalSecrets/providers/azure-key-vault/azure-key-vault.ts
+++ b/packages/cli/src/ExternalSecrets/providers/azure-key-vault/azure-key-vault.ts
@@ -74,7 +74,7 @@ export class AzureKeyVault implements SecretsProvider {
 			const credential = new ClientSecretCredential(tenantId, clientId, clientSecret);
 			this.client = new SecretClient(`https://${vaultName}.vault.azure.net/`, credential);
 			this.state = 'connected';
-		} catch (error) {
+		} catch {
 			this.state = 'error';
 		}
 	}
@@ -86,7 +86,7 @@ export class AzureKeyVault implements SecretsProvider {
 			await this.client.listPropertiesOfSecrets().next();
 			return [true];
 		} catch (error: unknown) {
-			return [false, error instanceof Error ? error.message : 'unknown error'];
+			return [false, error instanceof Error ? error.message : 'Unknown error'];
 		}
 	}
 
diff --git a/packages/cli/src/ExternalSecrets/providers/gcp-secrets-manager/gcp-secrets-manager.ts b/packages/cli/src/ExternalSecrets/providers/gcp-secrets-manager/gcp-secrets-manager.ts
new file mode 100644
index 0000000000000..64ed49f05cc41
--- /dev/null
+++ b/packages/cli/src/ExternalSecrets/providers/gcp-secrets-manager/gcp-secrets-manager.ts
@@ -0,0 +1,136 @@
+import { SecretManagerServiceClient as GcpClient } from '@google-cloud/secret-manager';
+import { DOCS_HELP_NOTICE, EXTERNAL_SECRETS_NAME_REGEX } from '@/ExternalSecrets/constants';
+import type { SecretsProvider, SecretsProviderState } from '@/Interfaces';
+import { jsonParse, type INodeProperties } from 'n8n-workflow';
+import type {
+	GcpSecretsManagerContext,
+	GcpSecretAccountKey,
+	RawGcpSecretAccountKey,
+} from './types';
+
+export class GcpSecretsManager implements SecretsProvider {
+	name = 'gcpSecretsManager';
+
+	displayName = 'GCP Secrets Manager';
+
+	state: SecretsProviderState = 'initializing';
+
+	properties: INodeProperties[] = [
+		DOCS_HELP_NOTICE,
+		{
+			displayName: 'Service Account Key',
+			name: 'serviceAccountKey',
+			type: 'string',
+			default: '',
+			required: true,
+			typeOptions: { password: true },
+			placeholder: 'e.g. { "type": "service_account", "project_id": "gcp-secrets-store", ... }',
+			hint: 'Content of JSON file downloaded from Google Cloud Console.',
+			noDataExpression: true,
+		},
+	];
+
+	private cachedSecrets: Record<string, string> = {};
+
+	private client: GcpClient;
+
+	private settings: GcpSecretAccountKey;
+
+	async init(context: GcpSecretsManagerContext) {
+		this.settings = this.parseSecretAccountKey(context.settings.serviceAccountKey);
+	}
+
+	async connect() {
+		const { projectId, privateKey, clientEmail } = this.settings;
+
+		try {
+			this.client = new GcpClient({
+				credentials: { client_email: clientEmail, private_key: privateKey },
+				projectId,
+			});
+			this.state = 'connected';
+		} catch {
+			this.state = 'error';
+		}
+	}
+
+	async test(): Promise<[boolean] | [boolean, string]> {
+		if (!this.client) return [false, 'Failed to connect to GCP Secrets Manager'];
+
+		try {
+			await this.client.initialize();
+			return [true];
+		} catch (error: unknown) {
+			return [false, error instanceof Error ? error.message : 'Unknown error'];
+		}
+	}
+
+	async disconnect() {
+		// unused
+	}
+
+	async update() {
+		const { projectId } = this.settings;
+
+		const [rawSecretNames] = await this.client.listSecrets({
+			parent: `projects/${projectId}`,
+		});
+
+		const secretNames = rawSecretNames.reduce<string[]>((acc, cur) => {
+			if (!cur.name || !EXTERNAL_SECRETS_NAME_REGEX.test(cur.name)) return acc;
+
+			const secretName = cur.name.split('/').pop();
+
+			if (secretName) acc.push(secretName);
+
+			return acc;
+		}, []);
+
+		const promises = secretNames.map(async (name) => {
+			const versions = await this.client.accessSecretVersion({
+				name: `projects/${projectId}/secrets/${name}/versions/latest`,
+			});
+
+			if (!Array.isArray(versions) || !versions.length) return null;
+
+			const [latestVersion] = versions;
+
+			if (!latestVersion.payload?.data) return null;
+
+			const value = latestVersion.payload.data.toString();
+
+			if (!value) return null;
+
+			return { name, value };
+		});
+
+		const results = await Promise.all(promises);
+
+		this.cachedSecrets = results.reduce<Record<string, string>>((acc, cur) => {
+			if (cur) acc[cur.name] = cur.value;
+			return acc;
+		}, {});
+	}
+
+	getSecret(name: string) {
+		return this.cachedSecrets[name];
+	}
+
+	hasSecret(name: string) {
+		return name in this.cachedSecrets;
+	}
+
+	getSecretNames() {
+		return Object.keys(this.cachedSecrets);
+	}
+
+	private parseSecretAccountKey(privateKey: string): GcpSecretAccountKey {
+		const parsed = jsonParse<RawGcpSecretAccountKey>(privateKey, { fallbackValue: {} });
+
+		return {
+			projectId: parsed?.project_id ?? '',
+			clientEmail: parsed?.client_email ?? '',
+			privateKey: parsed?.private_key ?? '',
+		};
+	}
+}
diff --git a/packages/cli/src/ExternalSecrets/providers/gcp-secrets-manager/types.ts b/packages/cli/src/ExternalSecrets/providers/gcp-secrets-manager/types.ts
new file mode 100644
index 0000000000000..c9611df9c4c2f
--- /dev/null
+++ b/packages/cli/src/ExternalSecrets/providers/gcp-secrets-manager/types.ts
@@ -0,0 +1,19 @@
+import type { SecretsProviderSettings } from '@/Interfaces';
+
+type JsonString = string;
+
+export type GcpSecretsManagerContext = SecretsProviderSettings<{
+	serviceAccountKey: JsonString;
+}>;
+
+export type RawGcpSecretAccountKey = {
+	project_id?: string;
+	private_key?: string;
+	client_email?: string;
+};
+
+export type GcpSecretAccountKey = {
+	projectId: string;
+	clientEmail: string;
+	privateKey: string;
+};
diff --git a/packages/editor-ui/src/assets/images/gcp-secrets-manager.svg b/packages/editor-ui/src/assets/images/gcp-secrets-manager.svg
new file mode 100644
index 0000000000000..a6e07c76819ad
--- /dev/null
+++ b/packages/editor-ui/src/assets/images/gcp-secrets-manager.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg width="800px" height="800px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g transform="translate(2.000000, 6.000000)" fill="#4285F4" fill-rule="nonzero">
+            <path d="M20,9.41469125e-14 L20,11.8867925 L16.0377358,11.8867925 C15.9335312,11.8867925 15.8490566,11.8023179 15.8490566,11.6981132 L15.8490566,10.5660377 C15.8490566,10.4618331 15.9335312,10.3773585 16.0377358,10.3773585 L18.4900566,10.377 L18.4900566,1.509 L16.0377358,1.50943396 C15.9335312,1.50943396 15.8490566,1.42495939 15.8490566,1.32075472 L15.8490566,0.188679245 C15.8490566,0.0844745755 15.9335312,9.41105434e-14 16.0377358,9.41469125e-14 L20,9.41469125e-14 Z M4.309101,9.41469125e-14 C4.41330567,9.3877869e-14 4.49778024,0.0844745755 4.49778024,0.188679245 L4.49778024,1.32075472 C4.49778024,1.42495939 4.41330567,1.50943396 4.309101,1.50943396 L1.509,1.509 L1.509,10.377 L4.29245283,10.3773585 C4.3966575,10.3773585 4.48113208,10.4618331 4.48113208,10.5660377 L4.48113208,11.6981132 C4.48113208,11.8023179 4.3966575,11.8867925 4.29245283,11.8867925 L2.14050999e-13,11.8867925 L2.14050999e-13,9.41469125e-14 L4.309101,9.41469125e-14 Z M15.4271098,3.86792453 L15.4271098,5.3240566 L15.4879305,5.34852941 L16.8381494,4.87130966 L17.1179245,5.69114872 L15.7555414,6.15613208 L15.719049,6.25402331 L16.6556874,7.51437292 L15.9501676,8.02830189 L15.0378575,6.76795228 L14.9527085,6.76795228 L14.0403984,8.02830189 L13.3348786,7.51437292 L14.2593529,6.25402331 L14.2350246,6.15613208 L12.8726415,5.69114872 L13.1524166,4.87130966 L14.4904714,5.34852941 L14.5634562,5.3240566 L14.5634562,3.86792453 L15.4271098,3.86792453 Z M5.19597773,3.86792453 L5.19597773,5.30963945 L5.2567984,5.33386996 L6.60701735,4.86137515 L6.88679245,5.673097 L5.52440936,6.13347656 L5.48791696,6.23039857 L6.42455533,7.47826947 L5.71903552,7.98711003 L4.80672541,6.73923913 L4.72157647,6.73923913 L3.80926637,7.98711003 L3.10374655,7.47826947 L4.02822079,6.23039857 L4.00389252,6.13347656 L2.64150943,5.673097 L2.92128453,4.86137515 L4.25933935,5.33386996 L4.33232416,5.30963945 L4.33232416,3.86792453 L5.19597773,3.86792453 Z M10.2903173,3.86792453 L10.2903173,5.30963945 L10.351138,5.33386996 L11.701357,4.86137515 L11.9811321,5.673097 L10.618749,6.13347656 L10.5822566,6.23039857 L11.518895,7.47826947 L10.8133751,7.98711003 L9.90106504,6.73923913 L9.81591609,6.73923913 L8.90360599,7.98711003 L8.19808618,7.47826947 L9.12256042,6.23039857 L9.09823215,6.13347656 L7.73584906,5.673097 L8.01562416,4.86137515 L9.35367897,5.33386996 L9.42666378,5.30963945 L9.42666378,3.86792453 L10.2903173,3.86792453 Z" >
+</path>
+        </g>
+    </g>
+</svg>
diff --git a/packages/editor-ui/src/components/ExternalSecretsProviderImage.ee.vue b/packages/editor-ui/src/components/ExternalSecretsProviderImage.ee.vue
index dc40fed88c53c..8d8eec910917d 100644
--- a/packages/editor-ui/src/components/ExternalSecretsProviderImage.ee.vue
+++ b/packages/editor-ui/src/components/ExternalSecretsProviderImage.ee.vue
@@ -7,6 +7,7 @@ import doppler from '../assets/images/doppler.webp';
 import vault from '../assets/images/hashicorp.webp';
 import awsSecretsManager from '../assets/images/aws-secrets-manager.svg';
 import azureKeyVault from '../assets/images/azure-key-vault.svg';
+import gcpSecretsManager from '../assets/images/gcp-secrets-manager.svg';
 
 const props = defineProps<{
 	provider: ExternalSecretsProvider;
@@ -20,6 +21,7 @@ const image = computed(
 			vault,
 			awsSecretsManager,
 			azureKeyVault,
+			gcpSecretsManager,
 		})[props.provider.name],
 );
 </script>
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 58fd67d51719a..005cdc310122d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -608,6 +608,9 @@ importers:
       '@azure/keyvault-secrets':
         specifier: ^4.8.0
         version: 4.8.0
+      '@google-cloud/secret-manager':
+        specifier: ^5.6.0
+        version: 5.6.0(encoding@0.1.13)
       '@n8n/client-oauth2':
         specifier: workspace:*
         version: link:../@n8n/client-oauth2
@@ -3360,6 +3363,10 @@ packages:
     resolution: {integrity: sha512-uWJJf6S2PJL7oZ4ezv16aZl9+IJqPo5GzUv1pZ3/qRiMj13p0ylEgX1+LxBpX71eEPKTwMHoJV2IBBe3EAq7Xw==}
     engines: {node: '>=14.0.0'}
 
+  '@google-cloud/secret-manager@5.6.0':
+    resolution: {integrity: sha512-0daW/OXQEVc6VQKPyJTQNyD+563I/TYQ7GCQJx4dq3lB666R9FUPvqHx9b/o/qQtZ5pfuoCbGZl3krpxgTSW8Q==}
+    engines: {node: '>=14.0.0'}
+
   '@google-cloud/storage@6.11.0':
     resolution: {integrity: sha512-p5VX5K2zLTrMXlKdS1CiQNkKpygyn7CBFm5ZvfhVj6+7QUsjWvYx9YDMkYXdarZ6JDt4cxiu451y9QUIH82ZTw==}
     engines: {node: '>=12'}
@@ -3376,11 +3383,6 @@ packages:
     resolution: {integrity: sha512-vYVqYzHicDqyKB+NQhAc54I1QWCBLCrYG6unqOIcBTHx+7x8C9lcoLj3KVJXs2VB4lUbpWY+Kk9NipcbXYWmvg==}
     engines: {node: '>=12.10.0'}
 
-  '@grpc/proto-loader@0.7.10':
-    resolution: {integrity: sha512-CAqDfoaQ8ykFd9zqBDn4k6iWT9loLAlc2ETmDFS9JCD70gDcnA4L3AFEo2iV7KyAtAAHFW9ftq1Fz+Vsgq80RQ==}
-    engines: {node: '>=6'}
-    hasBin: true
-
   '@grpc/proto-loader@0.7.13':
     resolution: {integrity: sha512-AiXO/bfe9bmxBjxxtYxFAXGZvMaN5s8kO+jBHAJCON8rJoB5YS/D6X7ZNc6XQkuHNmyl4CYaMI1fJ/Gn27RGGw==}
     engines: {node: '>=6'}
@@ -15843,6 +15845,13 @@ snapshots:
       - encoding
       - supports-color
 
+  '@google-cloud/secret-manager@5.6.0(encoding@0.1.13)':
+    dependencies:
+      google-gax: 4.3.4(encoding@0.1.13)
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
+
   '@google-cloud/storage@6.11.0(encoding@0.1.13)':
     dependencies:
       '@google-cloud/paginator': 3.0.7
@@ -15875,13 +15884,6 @@ snapshots:
       '@grpc/proto-loader': 0.7.13
       '@js-sdsl/ordered-map': 4.4.2
 
-  '@grpc/proto-loader@0.7.10':
-    dependencies:
-      lodash.camelcase: 4.3.0
-      long: 5.2.3
-      protobufjs: 7.3.0
-      yargs: 17.7.2
-
   '@grpc/proto-loader@0.7.13':
     dependencies:
       lodash.camelcase: 4.3.0
@@ -21305,7 +21307,7 @@ snapshots:
 
   eslint-import-resolver-node@0.3.9:
     dependencies:
-      debug: 3.2.7(supports-color@5.5.0)
+      debug: 3.2.7(supports-color@8.1.1)
       is-core-module: 2.13.1
       resolve: 1.22.8
     transitivePeerDependencies:
@@ -21330,7 +21332,7 @@ snapshots:
 
   eslint-module-utils@2.8.0(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.2))(eslint-plugin-import@2.29.1)(eslint@8.57.0))(eslint@8.57.0):
     dependencies:
-      debug: 3.2.7(supports-color@5.5.0)
+      debug: 3.2.7(supports-color@8.1.1)
     optionalDependencies:
       '@typescript-eslint/parser': 7.2.0(eslint@8.57.0)(typescript@5.5.2)
       eslint: 8.57.0
@@ -21350,7 +21352,7 @@ snapshots:
       array.prototype.findlastindex: 1.2.3
       array.prototype.flat: 1.3.2
       array.prototype.flatmap: 1.3.2
-      debug: 3.2.7(supports-color@5.5.0)
+      debug: 3.2.7(supports-color@8.1.1)
       doctrine: 2.1.0
       eslint: 8.57.0
       eslint-import-resolver-node: 0.3.9
@@ -21880,7 +21882,7 @@ snapshots:
 
   follow-redirects@1.15.6(debug@3.2.7):
     optionalDependencies:
-      debug: 3.2.7(supports-color@5.5.0)
+      debug: 3.2.7(supports-color@8.1.1)
 
   follow-redirects@1.15.6(debug@4.3.4):
     optionalDependencies:
@@ -22221,7 +22223,7 @@ snapshots:
       array-parallel: 0.1.3
       array-series: 0.1.5
       cross-spawn: 4.0.2
-      debug: 3.2.7(supports-color@5.5.0)
+      debug: 3.2.7(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -22255,7 +22257,7 @@ snapshots:
   google-gax@4.3.4(encoding@0.1.13):
     dependencies:
       '@grpc/grpc-js': 1.10.8
-      '@grpc/proto-loader': 0.7.10
+      '@grpc/proto-loader': 0.7.13
       '@types/long': 4.0.2
       abort-controller: 3.0.0
       duplexify: 4.1.2
@@ -24914,7 +24916,7 @@ snapshots:
 
   pdf-parse@1.1.1:
     dependencies:
-      debug: 3.2.7(supports-color@5.5.0)
+      debug: 3.2.7(supports-color@8.1.1)
       node-ensure: 0.0.0
     transitivePeerDependencies:
       - supports-color
@@ -25826,7 +25828,7 @@ snapshots:
 
   rhea@1.0.24:
     dependencies:
-      debug: 3.2.7(supports-color@5.5.0)
+      debug: 3.2.7(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -26200,7 +26202,7 @@ snapshots:
       binascii: 0.0.2
       bn.js: 5.2.1
       browser-request: 0.3.3
-      debug: 3.2.7(supports-color@5.5.0)
+      debug: 3.2.7(supports-color@8.1.1)
       expand-tilde: 2.0.2
       extend: 3.0.2
       fast-xml-parser: 4.2.7

From 452f52c124017e002e86c547ba42b1633b14beed Mon Sep 17 00:00:00 2001
From: jeanpaul <jeanpaul@users.noreply.github.com>
Date: Tue, 30 Jul 2024 16:19:47 +0200
Subject: [PATCH 032/168] fix(Text Classifier Node): Use proper documentation
 URL and respect continueOnFail (#10216)

---
 .../TextClassifier/TextClassifier.node.ts     | 49 +++++++++++++------
 1 file changed, 35 insertions(+), 14 deletions(-)

diff --git a/packages/@n8n/nodes-langchain/nodes/chains/TextClassifier/TextClassifier.node.ts b/packages/@n8n/nodes-langchain/nodes/chains/TextClassifier/TextClassifier.node.ts
index 6a433eaac31a0..0033361a07396 100644
--- a/packages/@n8n/nodes-langchain/nodes/chains/TextClassifier/TextClassifier.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/chains/TextClassifier/TextClassifier.node.ts
@@ -46,7 +46,7 @@ export class TextClassifier implements INodeType {
 			resources: {
 				primaryDocumentation: [
 					{
-						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/root-nodes/n8n-nodes-langchain.chainllm/',
+						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/root-nodes/n8n-nodes-langchain.text-classifier/',
 					},
 				],
 			},
@@ -203,20 +203,27 @@ export class TextClassifier implements INodeType {
 			discard: 'If there is not a very fitting category, select none of the categories.',
 		}[fallback];
 
-		const systemPromptTemplate = SystemMessagePromptTemplate.fromTemplate(
-			`${options.systemPromptTemplate ?? SYSTEM_PROMPT_TEMPLATE}
-{format_instructions}
-${multiClassPrompt}
-${fallbackPrompt}`,
-		);
-
 		const returnData: INodeExecutionData[][] = Array.from(
 			{ length: categories.length + (fallback === 'other' ? 1 : 0) },
 			(_) => [],
 		);
 		for (let itemIdx = 0; itemIdx < items.length; itemIdx++) {
+			const item = items[itemIdx];
+			item.pairedItem = { item: itemIdx };
 			const input = this.getNodeParameter('inputText', itemIdx) as string;
 			const inputPrompt = new HumanMessage(input);
+
+			const systemPromptTemplateOpt = this.getNodeParameter(
+				'options.systemPromptTemplate',
+				itemIdx,
+			) as string;
+			const systemPromptTemplate = SystemMessagePromptTemplate.fromTemplate(
+				`${systemPromptTemplateOpt ?? SYSTEM_PROMPT_TEMPLATE}
+{format_instructions}
+${multiClassPrompt}
+${fallbackPrompt}`,
+			);
+
 			const messages = [
 				await systemPromptTemplate.format({
 					categories: categories.map((cat) => cat.category).join(', '),
@@ -227,13 +234,27 @@ ${fallbackPrompt}`,
 			const prompt = ChatPromptTemplate.fromMessages(messages);
 			const chain = prompt.pipe(llm).pipe(parser).withConfig(getTracingConfig(this));
 
-			const output = await chain.invoke(messages);
-			categories.forEach((cat, idx) => {
-				if (output[cat.category]) returnData[idx].push(items[itemIdx]);
-			});
-			if (fallback === 'other' && output.fallback)
-				returnData[returnData.length - 1].push(items[itemIdx]);
+			try {
+				const output = await chain.invoke(messages);
+
+				categories.forEach((cat, idx) => {
+					if (output[cat.category]) returnData[idx].push(item);
+				});
+				if (fallback === 'other' && output.fallback) returnData[returnData.length - 1].push(item);
+			} catch (error) {
+				if (this.continueOnFail(error)) {
+					returnData[0].push({
+						json: { error: error.message },
+						pairedItem: { item: itemIdx },
+					});
+
+					continue;
+				}
+
+				throw error;
+			}
 		}
+
 		return returnData;
 	}
 }

From d719899223907b20a17883a35e4ef637a3453532 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Tue, 30 Jul 2024 17:05:48 +0200
Subject: [PATCH 033/168] feat(core): Allow filtering workflows by project and
 transferring workflows in Public API (#10231)

---
 packages/cli/src/PublicApi/types.ts           |  6 ++
 .../spec/paths/workflows.id.transfer.yml      | 31 ++++++++++
 .../workflows/spec/paths/workflows.yml        |  8 +++
 .../handlers/workflows/workflows.handler.ts   | 22 ++++++-
 packages/cli/src/PublicApi/v1/openapi.yml     |  2 +
 .../repositories/sharedWorkflow.repository.ts |  2 +-
 .../integration/publicApi/workflows.test.ts   | 62 +++++++++++++++++++
 7 files changed, 131 insertions(+), 2 deletions(-)
 create mode 100644 packages/cli/src/PublicApi/v1/handlers/workflows/spec/paths/workflows.id.transfer.yml

diff --git a/packages/cli/src/PublicApi/types.ts b/packages/cli/src/PublicApi/types.ts
index 2e80deb1afbf7..f58b521e04a88 100644
--- a/packages/cli/src/PublicApi/types.ts
+++ b/packages/cli/src/PublicApi/types.ts
@@ -72,6 +72,7 @@ export declare namespace WorkflowRequest {
 			workflowId?: number;
 			active: boolean;
 			name?: string;
+			projectId?: string;
 		}
 	>;
 
@@ -82,6 +83,11 @@ export declare namespace WorkflowRequest {
 	type Activate = Get;
 	type GetTags = Get;
 	type UpdateTags = AuthenticatedRequest<{ id: string }, {}, TagEntity[]>;
+	type Transfer = AuthenticatedRequest<
+		{ workflowId: string },
+		{},
+		{ destinationProjectId: string }
+	>;
 }
 
 export declare namespace UserRequest {
diff --git a/packages/cli/src/PublicApi/v1/handlers/workflows/spec/paths/workflows.id.transfer.yml b/packages/cli/src/PublicApi/v1/handlers/workflows/spec/paths/workflows.id.transfer.yml
new file mode 100644
index 0000000000000..3997647e1dafa
--- /dev/null
+++ b/packages/cli/src/PublicApi/v1/handlers/workflows/spec/paths/workflows.id.transfer.yml
@@ -0,0 +1,31 @@
+put:
+  x-eov-operation-id: transferWorkflow
+  x-eov-operation-handler: v1/handlers/workflows/workflows.handler
+  tags:
+    - Workflow
+  summary: Transfer a workflow to another project.
+  description: Transfer a workflow to another project.
+  parameters:
+    - $ref: '../schemas/parameters/workflowId.yml'
+  requestBody:
+    description: Destination project information for the workflow transfer.
+    content:
+      application/json:
+        schema:
+          type: object
+          properties:
+            destinationProjectId:
+              type: string
+              description: The ID of the project to transfer the workflow to.
+          required:
+            - destinationProjectId
+    required: true
+  responses:
+    '200':
+      description: Operation successful.
+    '400':
+      $ref: '../../../../shared/spec/responses/badRequest.yml'
+    '401':
+      $ref: '../../../../shared/spec/responses/unauthorized.yml'
+    '404':
+      $ref: '../../../../shared/spec/responses/notFound.yml'
diff --git a/packages/cli/src/PublicApi/v1/handlers/workflows/spec/paths/workflows.yml b/packages/cli/src/PublicApi/v1/handlers/workflows/spec/paths/workflows.yml
index 6db149195df26..1024e36cb5948 100644
--- a/packages/cli/src/PublicApi/v1/handlers/workflows/spec/paths/workflows.yml
+++ b/packages/cli/src/PublicApi/v1/handlers/workflows/spec/paths/workflows.yml
@@ -52,6 +52,14 @@ get:
       schema:
         type: string
         example: My Workflow
+    - name: projectId
+      in: query
+      required: false
+      explode: false
+      allowReserved: true
+      schema:
+        type: string
+        example: VmwOO9HeTEj20kxM
     - $ref: '../../../../shared/spec/parameters/limit.yml'
     - $ref: '../../../../shared/spec/parameters/cursor.yml'
   responses:
diff --git a/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.handler.ts b/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.handler.ts
index 5139cb686fd60..ea5eebdfdbe76 100644
--- a/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.handler.ts
+++ b/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.handler.ts
@@ -33,6 +33,8 @@ import { TagRepository } from '@/databases/repositories/tag.repository';
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
 import { ProjectRepository } from '@/databases/repositories/project.repository';
 import { EventService } from '@/eventbus/event.service';
+import { z } from 'zod';
+import { EnterpriseWorkflowService } from '@/workflows/workflow.service.ee';
 
 export = {
 	createWorkflow: [
@@ -67,6 +69,20 @@ export = {
 			return res.json(createdWorkflow);
 		},
 	],
+	transferWorkflow: [
+		projectScope('workflow:move', 'workflow'),
+		async (req: WorkflowRequest.Transfer, res: express.Response) => {
+			const body = z.object({ destinationProjectId: z.string() }).parse(req.body);
+
+			await Container.get(EnterpriseWorkflowService).transferOne(
+				req.user,
+				req.params.workflowId,
+				body.destinationProjectId,
+			);
+
+			res.status(204).send();
+		},
+	],
 	deleteWorkflow: [
 		projectScope('workflow:delete', 'workflow'),
 		async (req: WorkflowRequest.Get, res: express.Response): Promise<express.Response> => {
@@ -112,7 +128,7 @@ export = {
 	getWorkflows: [
 		validCursor,
 		async (req: WorkflowRequest.GetAll, res: express.Response): Promise<express.Response> => {
-			const { offset = 0, limit = 100, active, tags, name } = req.query;
+			const { offset = 0, limit = 100, active, tags, name, projectId } = req.query;
 
 			const where: FindOptionsWhere<WorkflowEntity> = {
 				...(active !== undefined && { active }),
@@ -145,6 +161,10 @@ export = {
 					workflows = workflows.filter((wf) => workflowIds.includes(wf.id));
 				}
 
+				if (projectId) {
+					workflows = workflows.filter((w) => w.projectId === projectId);
+				}
+
 				if (!workflows.length) {
 					return res.status(200).json({
 						data: [],
diff --git a/packages/cli/src/PublicApi/v1/openapi.yml b/packages/cli/src/PublicApi/v1/openapi.yml
index 91eacd53767ad..fd3b286a17fb5 100644
--- a/packages/cli/src/PublicApi/v1/openapi.yml
+++ b/packages/cli/src/PublicApi/v1/openapi.yml
@@ -58,6 +58,8 @@ paths:
     $ref: './handlers/workflows/spec/paths/workflows.id.activate.yml'
   /workflows/{id}/deactivate:
     $ref: './handlers/workflows/spec/paths/workflows.id.deactivate.yml'
+  /workflows/{id}/transfer:
+    $ref: './handlers/workflows/spec/paths/workflows.id.transfer.yml'
   /workflows/{id}/tags:
     $ref: './handlers/workflows/spec/paths/workflows.id.tags.yml'
   /users:
diff --git a/packages/cli/src/databases/repositories/sharedWorkflow.repository.ts b/packages/cli/src/databases/repositories/sharedWorkflow.repository.ts
index f8ff3523b2eab..4dc54935cb193 100644
--- a/packages/cli/src/databases/repositories/sharedWorkflow.repository.ts
+++ b/packages/cli/src/databases/repositories/sharedWorkflow.repository.ts
@@ -175,7 +175,7 @@ export class SharedWorkflowRepository extends Repository<SharedWorkflow> {
 			},
 		});
 
-		return sharedWorkflows.map((sw) => sw.workflow);
+		return sharedWorkflows.map((sw) => ({ ...sw.workflow, projectId: sw.projectId }));
 	}
 
 	/**
diff --git a/packages/cli/test/integration/publicApi/workflows.test.ts b/packages/cli/test/integration/publicApi/workflows.test.ts
index 10737a30f0b12..855e69e3df12a 100644
--- a/packages/cli/test/integration/publicApi/workflows.test.ts
+++ b/packages/cli/test/integration/publicApi/workflows.test.ts
@@ -21,6 +21,8 @@ import { createTag } from '../shared/db/tags';
 import { mockInstance } from '../../shared/mocking';
 import type { SuperAgentTest } from '../shared/types';
 import { Telemetry } from '@/telemetry';
+import { ProjectService } from '@/services/project.service';
+import { createTeamProject } from '@test-integration/db/projects';
 
 mockInstance(Telemetry);
 
@@ -265,6 +267,25 @@ describe('GET /workflows', () => {
 		}
 	});
 
+	test('should return all user-accessible workflows filtered by `projectId`', async () => {
+		license.setQuota('quota:maxTeamProjects', 2);
+		const otherProject = await Container.get(ProjectService).createTeamProject(
+			'Other project',
+			member,
+		);
+
+		await Promise.all([
+			createWorkflow({}, member),
+			createWorkflow({ name: 'Other workflow' }, otherProject),
+		]);
+
+		const response = await authMemberAgent.get(`/workflows?projectId=${otherProject.id}`);
+
+		expect(response.statusCode).toBe(200);
+		expect(response.body.data.length).toBe(1);
+		expect(response.body.data[0].name).toBe('Other workflow');
+	});
+
 	test('should return all owned workflows filtered by name', async () => {
 		const workflowName = 'Workflow 1';
 
@@ -1465,3 +1486,44 @@ describe('PUT /workflows/:id/tags', () => {
 		}
 	});
 });
+
+describe('PUT /workflows/:id/transfer', () => {
+	test('should transfer workflow to project', async () => {
+		/**
+		 * Arrange
+		 */
+		const firstProject = await createTeamProject('first-project', member);
+		const secondProject = await createTeamProject('secon-project', member);
+		const workflow = await createWorkflow({}, firstProject);
+
+		/**
+		 * Act
+		 */
+		const response = await authMemberAgent.put(`/workflows/${workflow.id}/transfer`).send({
+			destinationProjectId: secondProject.id,
+		});
+
+		/**
+		 * Assert
+		 */
+		expect(response.statusCode).toBe(204);
+	});
+
+	test('if no destination project, should reject', async () => {
+		/**
+		 * Arrange
+		 */
+		const firstProject = await createTeamProject('first-project', member);
+		const workflow = await createWorkflow({}, firstProject);
+
+		/**
+		 * Act
+		 */
+		const response = await authMemberAgent.put(`/workflows/${workflow.id}/transfer`).send({});
+
+		/**
+		 * Assert
+		 */
+		expect(response.statusCode).toBe(400);
+	});
+});

From 5b47c8b57b25528cd2d6f97bc6d98707d47f35bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Tue, 30 Jul 2024 17:41:26 +0200
Subject: [PATCH 034/168] fix(editor): Fix custom API call notice (#10227)

---
 .../__tests__/useNodeHelpers.test.ts          | 29 +++++++++++++++++++
 .../src/composables/useNodeHelpers.ts         |  8 +++--
 2 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/packages/editor-ui/src/composables/__tests__/useNodeHelpers.test.ts b/packages/editor-ui/src/composables/__tests__/useNodeHelpers.test.ts
index 1969b3d5b8192..732bf51f5e677 100644
--- a/packages/editor-ui/src/composables/__tests__/useNodeHelpers.test.ts
+++ b/packages/editor-ui/src/composables/__tests__/useNodeHelpers.test.ts
@@ -3,6 +3,7 @@ import { createTestingPinia } from '@pinia/testing';
 import { useNodeHelpers } from '@/composables/useNodeHelpers';
 import { createTestNode } from '@/__tests__/mocks';
 import { useWorkflowsStore } from '@/stores/workflows.store';
+import { CUSTOM_API_CALL_KEY } from '@/constants';
 
 vi.mock('@/stores/workflows.store', () => ({
 	useWorkflowsStore: vi.fn(),
@@ -17,6 +18,34 @@ describe('useNodeHelpers()', () => {
 		vi.clearAllMocks();
 	});
 
+	describe('isCustomApiCallSelected', () => {
+		test('should return `true` when resource includes `CUSTOM_API_CALL_KEY`', () => {
+			const nodeValues = {
+				parameters: { resource: CUSTOM_API_CALL_KEY },
+			};
+			expect(useNodeHelpers().isCustomApiCallSelected(nodeValues)).toBe(true);
+		});
+
+		test('should return `true` when operation includes `CUSTOM_API_CALL_KEY`', () => {
+			const nodeValues = {
+				parameters: {
+					operation: CUSTOM_API_CALL_KEY,
+				},
+			};
+			expect(useNodeHelpers().isCustomApiCallSelected(nodeValues)).toBe(true);
+		});
+
+		test('should return `false` when neither resource nor operation includes `CUSTOM_API_CALL_KEY`', () => {
+			const nodeValues = {
+				parameters: {
+					resource: 'users',
+					operation: 'get',
+				},
+			};
+			expect(useNodeHelpers().isCustomApiCallSelected(nodeValues)).toBe(false);
+		});
+	});
+
 	describe('getNodeInputData()', () => {
 		it('should return an empty array when node is null', () => {
 			const { getNodeInputData } = useNodeHelpers();
diff --git a/packages/editor-ui/src/composables/useNodeHelpers.ts b/packages/editor-ui/src/composables/useNodeHelpers.ts
index 00f18041b0225..19e46339bcdd2 100644
--- a/packages/editor-ui/src/composables/useNodeHelpers.ts
+++ b/packages/editor-ui/src/composables/useNodeHelpers.ts
@@ -97,11 +97,13 @@ export function useNodeHelpers() {
 
 		if (!isObject(parameters)) return false;
 
-		if ('resource' in parameters && 'operation' in parameters) {
+		if ('resource' in parameters || 'operation' in parameters) {
 			const { resource, operation } = parameters;
-			if (!isString(resource) || !isString(operation)) return false;
 
-			return resource.includes(CUSTOM_API_CALL_KEY) || operation.includes(CUSTOM_API_CALL_KEY);
+			return (
+				(isString(resource) && resource.includes(CUSTOM_API_CALL_KEY)) ||
+				(isString(operation) && operation.includes(CUSTOM_API_CALL_KEY))
+			);
 		}
 
 		return false;

From 3d23f2f333dff340ed2d48bc5fa4bd008fcfaca9 Mon Sep 17 00:00:00 2001
From: Tomi Turtiainen <10324676+tomi@users.noreply.github.com>
Date: Tue, 30 Jul 2024 21:24:01 +0300
Subject: [PATCH 035/168] test(core): Fix typing issues in tests (no-changelog)
 (#10244)

---
 package.json                                         |  2 +-
 packages/cli/src/InternalHooks.ts                    |  3 +++
 .../MessageEventBusLogWriterWorker.ts                |  3 +--
 packages/cli/src/middlewares/listQuery/index.ts      | 10 +++++++++-
 packages/cli/test/integration/eventbus.ee.test.ts    |  4 ++--
 .../test/integration/executions.controller.test.ts   |  5 ++++-
 .../integration/project.service.integration.test.ts  | 12 ++----------
 .../cli/test/integration/pruning.service.test.ts     |  2 --
 .../security-audit/InstanceRiskReporter.test.ts      |  3 ++-
 packages/cli/test/integration/shared/db/workflows.ts |  3 ++-
 packages/cli/test/integration/shared/utils/index.ts  |  5 +++--
 .../workflows/workflow.service.ee.test.ts            |  2 ++
 ...ontroller-with-active-workflow-manager.ee.test.ts |  2 --
 packages/cli/test/unit/ActiveExecutions.test.ts      |  5 ++++-
 packages/cli/test/unit/Telemetry.test.ts             |  5 -----
 .../test/unit/services/orchestration.service.test.ts |  8 ++++----
 .../services/workflow-statistics.service.test.ts     |  4 ++--
 packages/cli/tsconfig.json                           |  1 -
 18 files changed, 41 insertions(+), 38 deletions(-)

diff --git a/package.json b/package.json
index 0f32e0ea56dde..3dd939d9d30fa 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
     "build:backend": "turbo run build:backend",
     "build:frontend": "turbo run build:frontend",
     "build:nodes": "turbo run build:nodes",
-    "typecheck": "turbo --filter=!n8n typecheck",
+    "typecheck": "turbo typecheck",
     "dev": "turbo run dev --parallel --env-mode=loose --filter=!n8n-design-system --filter=!@n8n/chat",
     "dev:ai": "turbo run dev --parallel --env-mode=loose --filter=@n8n/nodes-langchain --filter=n8n --filter=n8n-core",
     "clean": "turbo run clean --parallel",
diff --git a/packages/cli/src/InternalHooks.ts b/packages/cli/src/InternalHooks.ts
index dedfb46b0cb3f..7912054085824 100644
--- a/packages/cli/src/InternalHooks.ts
+++ b/packages/cli/src/InternalHooks.ts
@@ -41,6 +41,9 @@ export class InternalHooks {
 		private readonly sharedWorkflowRepository: SharedWorkflowRepository,
 		workflowStatisticsService: WorkflowStatisticsService,
 		private readonly projectRelationRepository: ProjectRelationRepository,
+		// Can't use @ts-expect-error because only dev time tsconfig considers this as an error, but not build time
+		// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+		// @ts-ignore - needed until we decouple telemetry
 		private readonly _eventBus: MessageEventBus, // needed until we decouple telemetry
 	) {
 		workflowStatisticsService.on('telemetry.onFirstProductionWorkflowSuccess', (metrics) =>
diff --git a/packages/cli/src/eventbus/MessageEventBusWriter/MessageEventBusLogWriterWorker.ts b/packages/cli/src/eventbus/MessageEventBusWriter/MessageEventBusLogWriterWorker.ts
index 4686a1cf3c860..69d2e8ce26f73 100644
--- a/packages/cli/src/eventbus/MessageEventBusWriter/MessageEventBusLogWriterWorker.ts
+++ b/packages/cli/src/eventbus/MessageEventBusWriter/MessageEventBusLogWriterWorker.ts
@@ -6,7 +6,6 @@ import type { MessageEventBusLogWriterOptions } from './MessageEventBusLogWriter
 let logFileBasePath = '';
 let loggingPaused = true;
 let keepFiles = 10;
-let fileStatTimer: NodeJS.Timer;
 let maxLogFileSizeInKB = 102400;
 
 function setLogFileBasePath(basePath: string) {
@@ -117,7 +116,7 @@ if (!isMainThread) {
 					if (logFileBasePath) {
 						renameAndCreateLogs();
 						loggingPaused = false;
-						fileStatTimer = setInterval(async () => {
+						setInterval(async () => {
 							await checkFileSize(buildLogFileNameWithCounter());
 						}, 5000);
 					}
diff --git a/packages/cli/src/middlewares/listQuery/index.ts b/packages/cli/src/middlewares/listQuery/index.ts
index 0c8e2c7427c54..524dcb268e96d 100644
--- a/packages/cli/src/middlewares/listQuery/index.ts
+++ b/packages/cli/src/middlewares/listQuery/index.ts
@@ -1,8 +1,16 @@
 import { filterListQueryMiddleware } from './filter';
 import { selectListQueryMiddleware } from './select';
 import { paginationListQueryMiddleware } from './pagination';
+import type { ListQuery } from '@/requests';
+import type { NextFunction, Response } from 'express';
 
-export const listQueryMiddleware = [
+export type ListQueryMiddleware = (
+	req: ListQuery.Request,
+	res: Response,
+	next: NextFunction,
+) => void;
+
+export const listQueryMiddleware: ListQueryMiddleware[] = [
 	filterListQueryMiddleware,
 	selectListQueryMiddleware,
 	paginationListQueryMiddleware,
diff --git a/packages/cli/test/integration/eventbus.ee.test.ts b/packages/cli/test/integration/eventbus.ee.test.ts
index a79c1388b39ee..f21822683b854 100644
--- a/packages/cli/test/integration/eventbus.ee.test.ts
+++ b/packages/cli/test/integration/eventbus.ee.test.ts
@@ -200,7 +200,7 @@ test('should anonymize audit message to syslog ', async () => {
 			'message',
 			async function handler005(msg: { command: string; data: any }) {
 				if (msg.command === 'appendMessageToLog') {
-					const sent = await eventBus.getEventsAll();
+					await eventBus.getEventsAll();
 					await confirmIdInAll(testAuditMessage.id);
 					expect(mockedSyslogClientLog).toHaveBeenCalled();
 					eventBus.logWriter.worker?.removeListener('message', handler005);
@@ -217,7 +217,7 @@ test('should anonymize audit message to syslog ', async () => {
 			'message',
 			async function handler006(msg: { command: string; data: any }) {
 				if (msg.command === 'appendMessageToLog') {
-					const sent = await eventBus.getEventsAll();
+					await eventBus.getEventsAll();
 					await confirmIdInAll(testAuditMessage.id);
 					expect(mockedSyslogClientLog).toHaveBeenCalled();
 					syslogDestination.disable();
diff --git a/packages/cli/test/integration/executions.controller.test.ts b/packages/cli/test/integration/executions.controller.test.ts
index ef04dde99bd81..1e6d65a4f8368 100644
--- a/packages/cli/test/integration/executions.controller.test.ts
+++ b/packages/cli/test/integration/executions.controller.test.ts
@@ -12,7 +12,10 @@ import { WaitTracker } from '@/WaitTracker';
 import { createTeamProject, linkUserToProject } from './shared/db/projects';
 
 mockInstance(WaitTracker);
-mockInstance(ConcurrencyControlService, { isEnabled: false });
+mockInstance(ConcurrencyControlService, {
+	// @ts-expect-error Private property
+	isEnabled: false,
+});
 
 const testServer = setupTestServer({ endpointGroups: ['executions'] });
 
diff --git a/packages/cli/test/integration/project.service.integration.test.ts b/packages/cli/test/integration/project.service.integration.test.ts
index 77d388c1617d6..7fe55ade06747 100644
--- a/packages/cli/test/integration/project.service.integration.test.ts
+++ b/packages/cli/test/integration/project.service.integration.test.ts
@@ -31,7 +31,6 @@ describe('ProjectService', () => {
 		describe('when user has roles in projects where workflow is accessible', () => {
 			it('should return roles and project IDs', async () => {
 				const user = await createUser();
-				const secondUser = await createUser(); // @TODO: Needed only to satisfy index in legacy column
 
 				const firstProject = await createTeamProject('Project 1');
 				const secondProject = await createTeamProject('Project 2');
@@ -42,17 +41,15 @@ describe('ProjectService', () => {
 				const workflow = await createWorkflow();
 
 				await sharedWorkflowRepository.insert({
-					userId: user.id, // @TODO: Legacy column
 					projectId: firstProject.id,
 					workflowId: workflow.id,
 					role: 'workflow:owner',
 				});
 
 				await sharedWorkflowRepository.insert({
-					userId: secondUser.id, // @TODO: Legacy column
 					projectId: secondProject.id,
 					workflowId: workflow.id,
-					role: 'workflow:user',
+					role: 'workflow:owner',
 				});
 
 				const projectIds = await projectService.findProjectsWorkflowIsIn(workflow.id);
@@ -63,9 +60,6 @@ describe('ProjectService', () => {
 
 		describe('when user has no roles in projects where workflow is accessible', () => {
 			it('should return project IDs but no roles', async () => {
-				const user = await createUser();
-				const secondUser = await createUser(); // @TODO: Needed only to satisfy index in legacy column
-
 				const firstProject = await createTeamProject('Project 1');
 				const secondProject = await createTeamProject('Project 2');
 
@@ -74,17 +68,15 @@ describe('ProjectService', () => {
 				const workflow = await createWorkflow();
 
 				await sharedWorkflowRepository.insert({
-					userId: user.id, // @TODO: Legacy column
 					projectId: firstProject.id,
 					workflowId: workflow.id,
 					role: 'workflow:owner',
 				});
 
 				await sharedWorkflowRepository.insert({
-					userId: secondUser.id, // @TODO: Legacy column
 					projectId: secondProject.id,
 					workflowId: workflow.id,
-					role: 'workflow:user',
+					role: 'workflow:owner',
 				});
 
 				const projectIds = await projectService.findProjectsWorkflowIsIn(workflow.id);
diff --git a/packages/cli/test/integration/pruning.service.test.ts b/packages/cli/test/integration/pruning.service.test.ts
index a600b4aabdcab..09a43a5b5b123 100644
--- a/packages/cli/test/integration/pruning.service.test.ts
+++ b/packages/cli/test/integration/pruning.service.test.ts
@@ -98,7 +98,6 @@ describe('softDeleteOnPruningCycle()', () => {
 		});
 
 		test.each<[ExecutionStatus, Partial<ExecutionEntity>]>([
-			['warning', { startedAt: now, stoppedAt: now }],
 			['unknown', { startedAt: now, stoppedAt: now }],
 			['canceled', { startedAt: now, stoppedAt: now }],
 			['crashed', { startedAt: now, stoppedAt: now }],
@@ -191,7 +190,6 @@ describe('softDeleteOnPruningCycle()', () => {
 		});
 
 		test.each<[ExecutionStatus, Partial<ExecutionEntity>]>([
-			['warning', { startedAt: yesterday, stoppedAt: yesterday }],
 			['unknown', { startedAt: yesterday, stoppedAt: yesterday }],
 			['canceled', { startedAt: yesterday, stoppedAt: yesterday }],
 			['crashed', { startedAt: yesterday, stoppedAt: yesterday }],
diff --git a/packages/cli/test/integration/security-audit/InstanceRiskReporter.test.ts b/packages/cli/test/integration/security-audit/InstanceRiskReporter.test.ts
index 5d359e0dba52b..5f59206426a05 100644
--- a/packages/cli/test/integration/security-audit/InstanceRiskReporter.test.ts
+++ b/packages/cli/test/integration/security-audit/InstanceRiskReporter.test.ts
@@ -14,6 +14,7 @@ import config from '@/config';
 import { generateNanoId } from '@db/utils/generators';
 import { WorkflowRepository } from '@db/repositories/workflow.repository';
 import Container from 'typedi';
+import { NodeConnectionType } from 'n8n-workflow';
 
 let securityAuditService: SecurityAuditService;
 
@@ -156,7 +157,7 @@ test('should not report webhooks validated by direct children', async () => {
 						[
 							{
 								node: 'My Node',
-								type: 'main',
+								type: NodeConnectionType.Main,
 								index: 0,
 							},
 						],
diff --git a/packages/cli/test/integration/shared/db/workflows.ts b/packages/cli/test/integration/shared/db/workflows.ts
index f81ac044c3c1d..dc5490f9f3c61 100644
--- a/packages/cli/test/integration/shared/db/workflows.ts
+++ b/packages/cli/test/integration/shared/db/workflows.ts
@@ -9,6 +9,7 @@ import { WorkflowRepository } from '@db/repositories/workflow.repository';
 import type { SharedWorkflow, WorkflowSharingRole } from '@db/entities/SharedWorkflow';
 import { ProjectRepository } from '@/databases/repositories/project.repository';
 import { Project } from '@/databases/entities/Project';
+import { NodeConnectionType } from 'n8n-workflow';
 
 export async function createManyWorkflows(
 	amount: number,
@@ -157,7 +158,7 @@ export async function createWorkflowWithTrigger(
 					position: [780, 300],
 				},
 			],
-			connections: { Cron: { main: [[{ node: 'Set', type: 'main', index: 0 }]] } },
+			connections: { Cron: { main: [[{ node: 'Set', type: NodeConnectionType.Main, index: 0 }]] } },
 			...attributes,
 		},
 		user,
diff --git a/packages/cli/test/integration/shared/utils/index.ts b/packages/cli/test/integration/shared/utils/index.ts
index 96efb06039681..7abdb1a8e834d 100644
--- a/packages/cli/test/integration/shared/utils/index.ts
+++ b/packages/cli/test/integration/shared/utils/index.ts
@@ -96,9 +96,10 @@ export async function initBinaryDataService(mode: 'default' | 'filesystem' = 'de
  * Extract the value (token) of the auth cookie in a response.
  */
 export function getAuthToken(response: request.Response, authCookieName = AUTH_COOKIE_NAME) {
-	const cookies: string[] = response.headers['set-cookie'];
+	const cookiesHeader = response.headers['set-cookie'];
+	if (!cookiesHeader) return undefined;
 
-	if (!cookies) return undefined;
+	const cookies = Array.isArray(cookiesHeader) ? cookiesHeader : [cookiesHeader];
 
 	const authCookie = cookies.find((c) => c.startsWith(`${authCookieName}=`));
 
diff --git a/packages/cli/test/integration/workflows/workflow.service.ee.test.ts b/packages/cli/test/integration/workflows/workflow.service.ee.test.ts
index 55287c5f2210c..6e3b00bd58fcc 100644
--- a/packages/cli/test/integration/workflows/workflow.service.ee.test.ts
+++ b/packages/cli/test/integration/workflows/workflow.service.ee.test.ts
@@ -30,6 +30,8 @@ describe('EnterpriseWorkflowService', () => {
 			Container.get(CredentialsRepository),
 			mock(),
 			mock(),
+			mock(),
+			mock(),
 		);
 	});
 
diff --git a/packages/cli/test/integration/workflows/workflows.controller-with-active-workflow-manager.ee.test.ts b/packages/cli/test/integration/workflows/workflows.controller-with-active-workflow-manager.ee.test.ts
index 607639b091a12..d32722c23dd86 100644
--- a/packages/cli/test/integration/workflows/workflows.controller-with-active-workflow-manager.ee.test.ts
+++ b/packages/cli/test/integration/workflows/workflows.controller-with-active-workflow-manager.ee.test.ts
@@ -11,7 +11,6 @@ import { Telemetry } from '@/telemetry';
 mockInstance(Telemetry);
 
 let member: User;
-let anotherMember: User;
 
 const testServer = utils.setupTestServer({
 	endpointGroups: ['workflows'],
@@ -20,7 +19,6 @@ const testServer = utils.setupTestServer({
 
 beforeAll(async () => {
 	member = await createUser({ role: 'global:member' });
-	anotherMember = await createUser({ role: 'global:member' });
 
 	await utils.initNodeTypes();
 });
diff --git a/packages/cli/test/unit/ActiveExecutions.test.ts b/packages/cli/test/unit/ActiveExecutions.test.ts
index b2454de87c5e1..0cc70a10a4e61 100644
--- a/packages/cli/test/unit/ActiveExecutions.test.ts
+++ b/packages/cli/test/unit/ActiveExecutions.test.ts
@@ -20,7 +20,10 @@ const executionRepository = mock<ExecutionRepository>({
 	createNewExecution,
 });
 
-const concurrencyControl = mockInstance(ConcurrencyControlService, { isEnabled: false });
+const concurrencyControl = mockInstance(ConcurrencyControlService, {
+	// @ts-expect-error Private property
+	isEnabled: false,
+});
 
 describe('ActiveExecutions', () => {
 	let activeExecutions: ActiveExecutions;
diff --git a/packages/cli/test/unit/Telemetry.test.ts b/packages/cli/test/unit/Telemetry.test.ts
index e055abb1fdb74..af8445c814663 100644
--- a/packages/cli/test/unit/Telemetry.test.ts
+++ b/packages/cli/test/unit/Telemetry.test.ts
@@ -15,11 +15,6 @@ describe('Telemetry', () => {
 	const spyTrack = jest.spyOn(Telemetry.prototype, 'track').mockName('track');
 
 	const mockRudderStack = mock<RudderStack>();
-	mockRudderStack.track.mockImplementation(function (_, cb) {
-		cb?.();
-
-		return this;
-	});
 
 	let telemetry: Telemetry;
 	const instanceId = 'Telemetry unit test';
diff --git a/packages/cli/test/unit/services/orchestration.service.test.ts b/packages/cli/test/unit/services/orchestration.service.test.ts
index 0cdd73f605963..75c7c06e40bb6 100644
--- a/packages/cli/test/unit/services/orchestration.service.test.ts
+++ b/packages/cli/test/unit/services/orchestration.service.test.ts
@@ -33,7 +33,7 @@ function setDefaultConfig() {
 	config.set('generic.instanceType', 'main');
 }
 
-const workerRestartEventbusResponse: RedisServiceWorkerResponseObject = {
+const workerRestartEventBusResponse: RedisServiceWorkerResponseObject = {
 	senderId: 'test',
 	workerId: 'test',
 	command: 'restartEventBus',
@@ -88,7 +88,7 @@ describe('Orchestration Service', () => {
 
 	test('should handle worker responses', async () => {
 		const response = await handleWorkerResponseMessageMain(
-			JSON.stringify(workerRestartEventbusResponse),
+			JSON.stringify(workerRestartEventBusResponse),
 		);
 		expect(response.command).toEqual('restartEventBus');
 	});
@@ -108,7 +108,7 @@ describe('Orchestration Service', () => {
 
 	test('should reject command messages from itself', async () => {
 		const response = await handleCommandMessageMain(
-			JSON.stringify({ ...workerRestartEventbusResponse, senderId: queueModeId }),
+			JSON.stringify({ ...workerRestartEventBusResponse, senderId: queueModeId }),
 		);
 		expect(response).toBeDefined();
 		expect(response!.command).toEqual('restartEventBus');
@@ -141,7 +141,7 @@ describe('Orchestration Service', () => {
 		);
 		expect(helpers.debounceMessageReceiver).toHaveBeenCalledTimes(2);
 		expect(res1!.payload).toBeUndefined();
-		expect(res2!.payload!.result).toEqual('debounced');
+		expect((res2!.payload as { result: string }).result).toEqual('debounced');
 	});
 
 	describe('shouldAddWebhooks', () => {
diff --git a/packages/cli/test/unit/services/workflow-statistics.service.test.ts b/packages/cli/test/unit/services/workflow-statistics.service.test.ts
index 9bd9864bb0446..6d9baf49ea939 100644
--- a/packages/cli/test/unit/services/workflow-statistics.service.test.ts
+++ b/packages/cli/test/unit/services/workflow-statistics.service.test.ts
@@ -118,7 +118,7 @@ describe('WorkflowStatisticsService', () => {
 			};
 			const runData: IRun = {
 				finished: false,
-				status: 'failed',
+				status: 'error',
 				data: { resultData: { runData: {} } },
 				mode: 'internal' as WorkflowExecuteMode,
 				startedAt: new Date(),
@@ -206,7 +206,7 @@ describe('WorkflowStatisticsService', () => {
 
 		test('should not send metrics for entries that already have the flag set', async () => {
 			// Fetch data for workflow 2 which is set up to not be altered in the mocks
-			entityManager.insert.mockRejectedValueOnce(new QueryFailedError('', undefined, ''));
+			entityManager.insert.mockRejectedValueOnce(new QueryFailedError('', undefined, new Error()));
 			const workflowId = '1';
 			const node = {
 				id: 'abcde',
diff --git a/packages/cli/tsconfig.json b/packages/cli/tsconfig.json
index 008f1cb70d742..0efc9328610d8 100644
--- a/packages/cli/tsconfig.json
+++ b/packages/cli/tsconfig.json
@@ -2,7 +2,6 @@
 	"extends": ["../../tsconfig.json", "../../tsconfig.backend.json"],
 	"compilerOptions": {
 		"rootDir": ".",
-		"preserveSymlinks": true,
 		"emitDecoratorMetadata": true,
 		"experimentalDecorators": true,
 		"baseUrl": "src",

From 7e643589c67adc0218216ec4b89a95f0edfedbee Mon Sep 17 00:00:00 2001
From: Csaba Tuncsik <csaba@n8n.io>
Date: Wed, 31 Jul 2024 09:09:54 +0200
Subject: [PATCH 036/168] fix(editor): Fix workflow execution list scrolling
 after filter change (#10226)

---
 cypress/e2e/20-workflow-executions.cy.ts      | 44 +++++++++++++++++++
 .../workflow/WorkflowExecutionsSidebar.vue    |  3 ++
 2 files changed, 47 insertions(+)

diff --git a/cypress/e2e/20-workflow-executions.cy.ts b/cypress/e2e/20-workflow-executions.cy.ts
index 075923e940b4e..59f08c570b0ff 100644
--- a/cypress/e2e/20-workflow-executions.cy.ts
+++ b/cypress/e2e/20-workflow-executions.cy.ts
@@ -183,6 +183,50 @@ describe('Current Workflow Executions', () => {
 			.invoke('attr', 'title')
 			.should('eq', newWorkflowName);
 	});
+
+	it('should load items and auto scroll after filter change', () => {
+		createMockExecutions();
+		createMockExecutions();
+		cy.intercept('GET', '/rest/executions?filter=*').as('getExecutions');
+
+		executionsTab.actions.switchToExecutionsTab();
+
+		cy.wait(['@getExecutions']);
+
+		executionsTab.getters.executionsList().scrollTo(0, 500).wait(0);
+
+		executionsTab.getters.executionListItems().eq(10).click();
+
+		cy.getByTestId('executions-filter-button').click();
+		cy.getByTestId('executions-filter-status-select').should('be.visible').click();
+		getVisibleSelect().find('li:contains("Error")').click();
+
+		executionsTab.getters.executionListItems().should('have.length', 5);
+		executionsTab.getters.successfulExecutionListItems().should('have.length', 1);
+		executionsTab.getters.failedExecutionListItems().should('have.length', 4);
+
+		cy.getByTestId('executions-filter-button').click();
+		cy.getByTestId('executions-filter-status-select').should('be.visible').click();
+		getVisibleSelect().find('li:contains("Success")').click();
+
+		// check if the list is scrolled
+		executionsTab.getters.executionListItems().eq(10).should('be.visible');
+		executionsTab.getters.executionsList().then(($el) => {
+			const { scrollTop, scrollHeight, clientHeight } = $el[0];
+			expect(scrollTop).to.be.greaterThan(0);
+			expect(scrollTop + clientHeight).to.be.lessThan(scrollHeight);
+
+			// scroll to the bottom
+			$el[0].scrollTo(0, scrollHeight);
+			executionsTab.getters.executionListItems().should('have.length', 18);
+			executionsTab.getters.successfulExecutionListItems().should('have.length', 18);
+			executionsTab.getters.failedExecutionListItems().should('have.length', 0);
+		});
+
+		cy.getByTestId('executions-filter-button').click();
+		cy.getByTestId('executions-filter-reset-button').should('be.visible').click();
+		executionsTab.getters.executionListItems().eq(11).should('be.visible');
+	});
 });
 
 const createMockExecutions = () => {
diff --git a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsSidebar.vue b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsSidebar.vue
index df30fd0eb0438..0186ef4830a1a 100644
--- a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsSidebar.vue
+++ b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsSidebar.vue
@@ -186,6 +186,9 @@ export default defineComponent({
 			this.$emit('refresh');
 		},
 		onFilterChanged(filter: ExecutionFilterType) {
+			this.autoScrollDeps.activeExecutionSet = false;
+			this.autoScrollDeps.scroll = true;
+			this.mountedItems = [];
 			this.$emit('filterUpdated', filter);
 		},
 		reloadExecutions(): void {

From 519fc4d75325a80b84cc4dcacf52d6f4c02e3a44 Mon Sep 17 00:00:00 2001
From: Shireen Missi <94372015+ShireenMissi@users.noreply.github.com>
Date: Wed, 31 Jul 2024 08:39:37 +0100
Subject: [PATCH 037/168] fix(Postgres Node): Expressions in query parameters
 for Postgres executeQuery operation (#10217)

---
 .../nodes/Postgres/Postgres.node.ts           |  3 +-
 .../database/executeQuery.operation.ts        | 38 +++++++++++++++----
 .../Postgres/v2/actions/versionDescription.ts |  2 +-
 3 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/packages/nodes-base/nodes/Postgres/Postgres.node.ts b/packages/nodes-base/nodes/Postgres/Postgres.node.ts
index 05e09dff4dfcb..0e1760faeac94 100644
--- a/packages/nodes-base/nodes/Postgres/Postgres.node.ts
+++ b/packages/nodes-base/nodes/Postgres/Postgres.node.ts
@@ -11,7 +11,7 @@ export class Postgres extends VersionedNodeType {
 			name: 'postgres',
 			icon: 'file:postgres.svg',
 			group: ['input'],
-			defaultVersion: 2.4,
+			defaultVersion: 2.5,
 			description: 'Get, add and update data in Postgres',
 			parameterPane: 'wide',
 		};
@@ -23,6 +23,7 @@ export class Postgres extends VersionedNodeType {
 			2.2: new PostgresV2(baseDescription),
 			2.3: new PostgresV2(baseDescription),
 			2.4: new PostgresV2(baseDescription),
+			2.5: new PostgresV2(baseDescription),
 		};
 
 		super(nodeVersions, baseDescription);
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 2b8449e983ccb..4e6100e5755a2 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
@@ -3,6 +3,7 @@ import type {
 	IExecuteFunctions,
 	INodeExecutionData,
 	INodeProperties,
+	NodeParameterValueType,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
@@ -78,22 +79,45 @@ export async function execute(
 
 			const rawReplacements = (node.parameters.options as IDataObject)?.queryReplacement as string;
 
-			if (rawReplacements) {
-				const rawValues = rawReplacements
-					.replace(/^=+/, '')
+			const stringToArray = (str: NodeParameterValueType | undefined) => {
+				if (!str) return [];
+				return String(str)
 					.split(',')
 					.filter((entry) => entry)
 					.map((entry) => entry.trim());
+			};
 
-				for (const rawValue of rawValues) {
-					const resolvables = getResolvables(rawValue);
+			if (rawReplacements) {
+				const nodeVersion = nodeOptions.nodeVersion as number;
 
+				if (nodeVersion >= 2.5) {
+					const rawValues = rawReplacements.replace(/^=+/, '');
+					const resolvables = getResolvables(rawValues);
 					if (resolvables.length) {
 						for (const resolvable of resolvables) {
-							values.push(this.evaluateExpression(`${resolvable}`, i) as IDataObject);
+							const evaluatedValues = stringToArray(this.evaluateExpression(`${resolvable}`, i));
+							if (evaluatedValues.length) values.push(...evaluatedValues);
 						}
 					} else {
-						values.push(rawValue);
+						values.push(...stringToArray(rawValues));
+					}
+				} else {
+					const rawValues = rawReplacements
+						.replace(/^=+/, '')
+						.split(',')
+						.filter((entry) => entry)
+						.map((entry) => entry.trim());
+
+					for (const rawValue of rawValues) {
+						const resolvables = getResolvables(rawValue);
+
+						if (resolvables.length) {
+							for (const resolvable of resolvables) {
+								values.push(this.evaluateExpression(`${resolvable}`, i) as IDataObject);
+							}
+						} else {
+							values.push(rawValue);
+						}
 					}
 				}
 			}
diff --git a/packages/nodes-base/nodes/Postgres/v2/actions/versionDescription.ts b/packages/nodes-base/nodes/Postgres/v2/actions/versionDescription.ts
index 1687accf1cde4..de6047003de9e 100644
--- a/packages/nodes-base/nodes/Postgres/v2/actions/versionDescription.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/actions/versionDescription.ts
@@ -8,7 +8,7 @@ export const versionDescription: INodeTypeDescription = {
 	name: 'postgres',
 	icon: 'file:postgres.svg',
 	group: ['input'],
-	version: [2, 2.1, 2.2, 2.3, 2.4],
+	version: [2, 2.1, 2.2, 2.3, 2.4, 2.5],
 	subtitle: '={{ $parameter["operation"] }}',
 	description: 'Get, add and update data in Postgres',
 	defaults: {

From efee25ddaaf072713d56d956d57fc388cb427811 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Wed, 31 Jul 2024 11:53:26 +0200
Subject: [PATCH 038/168] test(core): Stop showing JWT warning during test runs
 (no-changelog) (#10255)

---
 packages/cli/src/config/index.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/cli/src/config/index.ts b/packages/cli/src/config/index.ts
index f743e7961dba5..dedc803839292 100644
--- a/packages/cli/src/config/index.ts
+++ b/packages/cli/src/config/index.ts
@@ -96,9 +96,10 @@ config.validate({
 });
 const userManagement = config.get('userManagement');
 if (userManagement.jwtRefreshTimeoutHours >= userManagement.jwtSessionDurationHours) {
-	console.warn(
-		'N8N_USER_MANAGEMENT_JWT_REFRESH_TIMEOUT_HOURS needs to smaller than N8N_USER_MANAGEMENT_JWT_DURATION_HOURS. Setting N8N_USER_MANAGEMENT_JWT_REFRESH_TIMEOUT_HOURS to 0 for now.',
-	);
+	if (!inTest)
+		console.warn(
+			'N8N_USER_MANAGEMENT_JWT_REFRESH_TIMEOUT_HOURS needs to smaller than N8N_USER_MANAGEMENT_JWT_DURATION_HOURS. Setting N8N_USER_MANAGEMENT_JWT_REFRESH_TIMEOUT_HOURS to 0 for now.',
+		);
 
 	config.set('userManagement.jwtRefreshTimeoutHours', 0);
 }

From 3e96b293329525c9d4b2fcef87b3803e458c8e7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Wed, 31 Jul 2024 12:22:52 +0200
Subject: [PATCH 039/168] fix(core): Restore log event `n8n.workflow.failed`
 (#10253)

---
 .../cli/src/WorkflowExecuteAdditionalData.ts  |  2 +
 packages/cli/src/WorkflowRunner.ts            |  1 +
 .../audit-event-relay.service.test.ts         | 69 ++++++++++++++++++-
 .../src/eventbus/audit-event-relay.service.ts | 23 ++++++-
 packages/cli/src/eventbus/event.types.ts      |  3 +-
 .../executions/execution-recovery.service.ts  |  1 +
 6 files changed, 94 insertions(+), 5 deletions(-)

diff --git a/packages/cli/src/WorkflowExecuteAdditionalData.ts b/packages/cli/src/WorkflowExecuteAdditionalData.ts
index 754cfea693c3d..98ad9acde2936 100644
--- a/packages/cli/src/WorkflowExecuteAdditionalData.ts
+++ b/packages/cli/src/WorkflowExecuteAdditionalData.ts
@@ -651,6 +651,7 @@ function hookFunctionsSaveWorker(): IWorkflowExecuteHooks {
 					executionId,
 					success: runData.status === 'success',
 					isManual: runData.mode === 'manual',
+					runData,
 				});
 			},
 			async function (this: WorkflowHooks, fullRunData: IRun) {
@@ -940,6 +941,7 @@ async function executeWorkflow(
 		success: data.status === 'success',
 		isManual: data.mode === 'manual',
 		userId: additionalData.userId,
+		runData: data,
 	});
 
 	// subworkflow either finished, or is in status waiting due to a wait node, both cases are considered successes here
diff --git a/packages/cli/src/WorkflowRunner.ts b/packages/cli/src/WorkflowRunner.ts
index f8faf55fbe49d..3318dd283cd60 100644
--- a/packages/cli/src/WorkflowRunner.ts
+++ b/packages/cli/src/WorkflowRunner.ts
@@ -173,6 +173,7 @@ export class WorkflowRunner {
 						success: executionData?.status === 'success',
 						isManual: data.executionMode === 'manual',
 						userId: data.userId,
+						runData: executionData,
 					});
 					if (this.externalHooks.exists('workflow.postExecute')) {
 						try {
diff --git a/packages/cli/src/eventbus/__tests__/audit-event-relay.service.test.ts b/packages/cli/src/eventbus/__tests__/audit-event-relay.service.test.ts
index 80392206079b7..145bf2929f07a 100644
--- a/packages/cli/src/eventbus/__tests__/audit-event-relay.service.test.ts
+++ b/packages/cli/src/eventbus/__tests__/audit-event-relay.service.test.ts
@@ -2,12 +2,14 @@ import { mock } from 'jest-mock-extended';
 import { AuditEventRelay } from '../audit-event-relay.service';
 import type { MessageEventBus } from '../MessageEventBus/MessageEventBus';
 import type { Event } from '../event.types';
-import type { EventService } from '../event.service';
+import { EventService } from '../event.service';
+import type { INode, IRun } from 'n8n-workflow';
 
 describe('AuditorService', () => {
 	const eventBus = mock<MessageEventBus>();
-	const eventService = mock<EventService>();
+	const eventService = new EventService();
 	const auditor = new AuditEventRelay(eventService, eventBus);
+	auditor.init();
 
 	afterEach(() => {
 		jest.clearAllMocks();
@@ -80,4 +82,67 @@ describe('AuditorService', () => {
 			},
 		});
 	});
+
+	it('should log on `workflow-post-execute` for successful execution', () => {
+		const payload = mock<Event['workflow-post-execute']>({
+			executionId: 'some-id',
+			success: true,
+			userId: 'some-id',
+			workflowId: 'some-id',
+			isManual: true,
+			workflowName: 'some-name',
+			metadata: {},
+			runData: mock<IRun>({ data: { resultData: {} } }),
+		});
+
+		eventService.emit('workflow-post-execute', payload);
+
+		const { runData: _, ...rest } = payload;
+
+		expect(eventBus.sendWorkflowEvent).toHaveBeenCalledWith({
+			eventName: 'n8n.workflow.success',
+			payload: rest,
+		});
+	});
+
+	it('should handle `workflow-post-execute` event for unsuccessful execution', () => {
+		const runData = mock<IRun>({
+			data: {
+				resultData: {
+					lastNodeExecuted: 'some-node',
+					// @ts-expect-error Partial mock
+					error: {
+						node: mock<INode>({ type: 'some-type' }),
+						message: 'some-message',
+					},
+					errorMessage: 'some-message',
+				},
+			},
+		}) as unknown as IRun;
+
+		const event = {
+			executionId: 'some-id',
+			success: false,
+			userId: 'some-id',
+			workflowId: 'some-id',
+			isManual: true,
+			workflowName: 'some-name',
+			metadata: {},
+			runData,
+		};
+
+		eventService.emit('workflow-post-execute', event);
+
+		const { runData: _, ...rest } = event;
+
+		expect(eventBus.sendWorkflowEvent).toHaveBeenCalledWith({
+			eventName: 'n8n.workflow.failed',
+			payload: {
+				...rest,
+				lastNodeExecuted: 'some-node',
+				errorNodeType: 'some-type',
+				errorMessage: 'some-message',
+			},
+		});
+	});
 });
diff --git a/packages/cli/src/eventbus/audit-event-relay.service.ts b/packages/cli/src/eventbus/audit-event-relay.service.ts
index 9c73494520dbe..56f4dd95cd1e6 100644
--- a/packages/cli/src/eventbus/audit-event-relay.service.ts
+++ b/packages/cli/src/eventbus/audit-event-relay.service.ts
@@ -122,9 +122,28 @@ export class AuditEventRelay {
 	}
 
 	private workflowPostExecute(event: Event['workflow-post-execute']) {
+		const { runData, ...rest } = event;
+
+		if (event.success) {
+			void this.eventBus.sendWorkflowEvent({
+				eventName: 'n8n.workflow.success',
+				payload: rest,
+			});
+
+			return;
+		}
+
 		void this.eventBus.sendWorkflowEvent({
-			eventName: 'n8n.workflow.success',
-			payload: event,
+			eventName: 'n8n.workflow.failed',
+			payload: {
+				...rest,
+				lastNodeExecuted: runData?.data.resultData.lastNodeExecuted,
+				errorNodeType:
+					runData?.data.resultData.error && 'node' in runData?.data.resultData.error
+						? runData?.data.resultData.error.node?.type
+						: undefined,
+				errorMessage: runData?.data.resultData.error?.message.toString(),
+			},
 		});
 	}
 
diff --git a/packages/cli/src/eventbus/event.types.ts b/packages/cli/src/eventbus/event.types.ts
index 225f9aca8c873..513c659d3e2a3 100644
--- a/packages/cli/src/eventbus/event.types.ts
+++ b/packages/cli/src/eventbus/event.types.ts
@@ -1,4 +1,4 @@
-import type { AuthenticationMethod, IWorkflowBase } from 'n8n-workflow';
+import type { AuthenticationMethod, IRun, IWorkflowBase } from 'n8n-workflow';
 import type { IWorkflowExecutionDataProcess } from '@/Interfaces';
 import type { ProjectRole } from '@/databases/entities/ProjectRelation';
 import type { GlobalRole } from '@/databases/entities/User';
@@ -46,6 +46,7 @@ export type Event = {
 		isManual: boolean;
 		workflowName: string;
 		metadata?: Record<string, string>;
+		runData?: IRun;
 	};
 
 	'node-pre-execute': {
diff --git a/packages/cli/src/executions/execution-recovery.service.ts b/packages/cli/src/executions/execution-recovery.service.ts
index 05431a6d9c9d5..b72fc490dddbb 100644
--- a/packages/cli/src/executions/execution-recovery.service.ts
+++ b/packages/cli/src/executions/execution-recovery.service.ts
@@ -296,6 +296,7 @@ export class ExecutionRecoveryService {
 			executionId: execution.id,
 			success: execution.status === 'success',
 			isManual: execution.mode === 'manual',
+			runData: execution,
 		});
 
 		const externalHooks = getWorkflowHooksMain(

From 8e960db16c28ad2b137120c3bf50b1c20eb1036b Mon Sep 17 00:00:00 2001
From: Ricardo Espinoza <ricardo@n8n.io>
Date: Wed, 31 Jul 2024 07:11:24 -0400
Subject: [PATCH 040/168] refactor(editor): Migrate
 `WorkflowExecutionsListView.vue` to composition API (no-changelog) (#10198)

---
 .../workflow/WorkflowExecutionsList.vue       | 253 ++++++------------
 .../src/views/WorkflowExecutionsView.vue      |   4 -
 2 files changed, 87 insertions(+), 170 deletions(-)

diff --git a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsList.vue b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsList.vue
index 22dd7c00e0fad..9e66df8117baa 100644
--- a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsList.vue
+++ b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsList.vue
@@ -5,10 +5,10 @@
 			:loading="loading && !executions.length"
 			:loading-more="loadingMore"
 			:temporary-execution="temporaryExecution"
-			@update:auto-refresh="$emit('update:auto-refresh', $event)"
-			@reload-executions="$emit('reload')"
-			@filter-updated="$emit('update:filters', $event)"
-			@load-more="$emit('load-more')"
+			@update:auto-refresh="emit('update:auto-refresh', $event)"
+			@reload-executions="emit('reload')"
+			@filter-updated="emit('update:filters', $event)"
+			@load-more="emit('load-more')"
 			@retry-execution="onRetryExecution"
 		/>
 		<div v-if="!hidePreview" :class="$style.content">
@@ -23,177 +23,98 @@
 	</div>
 </template>
 
-<script lang="ts">
-import type { PropType } from 'vue';
-import { defineComponent } from 'vue';
-import { mapStores } from 'pinia';
-import { useRouter } from 'vue-router';
+<script setup lang="ts">
+import { computed } from 'vue';
+import { onBeforeRouteLeave, useRouter } from 'vue-router';
 import WorkflowExecutionsSidebar from '@/components/executions/workflow/WorkflowExecutionsSidebar.vue';
-import {
-	MAIN_HEADER_TABS,
-	MODAL_CANCEL,
-	MODAL_CONFIRM,
-	PLACEHOLDER_EMPTY_WORKFLOW_ID,
-	VIEWS,
-} from '@/constants';
+import { MAIN_HEADER_TABS, VIEWS } from '@/constants';
 import type { ExecutionFilterType, IWorkflowDb } from '@/Interface';
-import type { ExecutionSummary, IDataObject } from 'n8n-workflow';
-import { useMessage } from '@/composables/useMessage';
-import { useToast } from '@/composables/useToast';
+import type { ExecutionSummary } from 'n8n-workflow';
 import { getNodeViewTab } from '@/utils/canvasUtils';
 import { useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
-import { useUIStore } from '@/stores/ui.store';
-import { useSettingsStore } from '@/stores/settings.store';
-import { useNodeTypesStore } from '@/stores/nodeTypes.store';
-import { useTagsStore } from '@/stores/tags.store';
-import { executionFilterToQueryFilter } from '@/utils/executionUtils';
-import { useExternalHooks } from '@/composables/useExternalHooks';
-import { useDebounce } from '@/composables/useDebounce';
-import { useNpsSurveyStore } from '@/stores/npsSurvey.store';
-
-export default defineComponent({
-	name: 'WorkflowExecutionsList',
-	components: {
-		WorkflowExecutionsSidebar,
+import { watch } from 'vue';
+
+const props = withDefaults(
+	defineProps<{
+		loading: boolean;
+		workflow: IWorkflowDb;
+		executions: ExecutionSummary[];
+		execution?: ExecutionSummary;
+		loadingMore: boolean;
+	}>(),
+	{
+		loading: false,
+		executions: () => [] as ExecutionSummary[],
+		loadingMore: false,
 	},
-	async beforeRouteLeave(to, _, next) {
-		if (getNodeViewTab(to) === MAIN_HEADER_TABS.WORKFLOW) {
-			next();
+);
+
+const emit = defineEmits<{
+	'execution:delete': [value: string];
+	'execution:stop': [value: string];
+	'execution:retry': [value: { id: string; loadWorkflow: boolean }];
+	'update:auto-refresh': [value: boolean];
+	'update:filters': [value: ExecutionFilterType];
+	'load-more': [];
+	reload: [];
+}>();
+
+const workflowHelpers = useWorkflowHelpers({ router: useRouter() });
+const router = useRouter();
+
+const temporaryExecution = computed(() => {
+	const isTemporary = !props.executions.find((execution) => execution.id === props.execution?.id);
+	return isTemporary ? props.execution : undefined;
+});
+
+const hidePreview = computed(() => {
+	return props.loading || (!props.execution && props.executions.length);
+});
+
+const onDeleteCurrentExecution = () => {
+	if (!props.execution?.id) return;
+
+	emit('execution:delete', props.execution.id);
+};
+
+const onStopExecution = () => {
+	if (!props.execution?.id) return;
+
+	emit('execution:stop', props.execution.id);
+};
+
+const onRetryExecution = (payload: { execution: ExecutionSummary; command: string }) => {
+	const loadWorkflow = payload.command === 'current-workflow';
+
+	emit('execution:retry', {
+		id: payload.execution.id,
+		loadWorkflow,
+	});
+};
+
+watch(
+	() => props.execution,
+	(value: ExecutionSummary | undefined) => {
+		if (!value) {
 			return;
 		}
 
-		if (this.uiStore.stateIsDirty) {
-			const confirmModal = await this.confirm(
-				this.$locale.baseText('generic.unsavedWork.confirmMessage.message'),
-				{
-					title: this.$locale.baseText('generic.unsavedWork.confirmMessage.headline'),
-					type: 'warning',
-					confirmButtonText: this.$locale.baseText(
-						'generic.unsavedWork.confirmMessage.confirmButtonText',
-					),
-					cancelButtonText: this.$locale.baseText(
-						'generic.unsavedWork.confirmMessage.cancelButtonText',
-					),
-					showClose: true,
-				},
-			);
-
-			if (confirmModal === MODAL_CONFIRM) {
-				const saved = await this.workflowHelpers.saveCurrentWorkflow({}, false);
-				if (saved) {
-					await this.npsSurveyStore.fetchPromptsData();
-				}
-				this.uiStore.stateIsDirty = false;
-				next();
-			} else if (confirmModal === MODAL_CANCEL) {
-				this.uiStore.stateIsDirty = false;
-				next();
-			}
-		} else {
-			next();
-		}
-	},
-	props: {
-		loading: {
-			type: Boolean,
-			default: false,
-		},
-		workflow: {
-			type: Object as PropType<IWorkflowDb>,
-			required: true,
-		},
-		executions: {
-			type: Array as PropType<ExecutionSummary[]>,
-			default: () => [],
-		},
-		filters: {
-			type: Object as PropType<ExecutionFilterType>,
-			default: () => ({}),
-		},
-		execution: {
-			type: Object as PropType<ExecutionSummary> | null,
-			default: null,
-		},
-		loadingMore: {
-			type: Boolean,
-			default: false,
-		},
-	},
-	emits: [
-		'execution:delete',
-		'execution:stop',
-		'execution:retry',
-		'update:auto-refresh',
-		'update:filters',
-		'load-more',
-		'reload',
-	],
-	setup() {
-		const externalHooks = useExternalHooks();
-		const router = useRouter();
-		const workflowHelpers = useWorkflowHelpers({ router });
-		const { callDebounced } = useDebounce();
-
-		return {
-			externalHooks,
-			workflowHelpers,
-			callDebounced,
-			...useToast(),
-			...useMessage(),
-		};
-	},
-	computed: {
-		...mapStores(useTagsStore, useNodeTypesStore, useSettingsStore, useUIStore, useNpsSurveyStore),
-		temporaryExecution(): ExecutionSummary | undefined {
-			const isTemporary = !this.executions.find((execution) => execution.id === this.execution?.id);
-			return isTemporary ? this.execution : undefined;
-		},
-		hidePreview(): boolean {
-			return this.loading || (!this.execution && this.executions.length);
-		},
-		filterApplied(): boolean {
-			return this.filters.status !== 'all';
-		},
-		workflowDataNotLoaded(): boolean {
-			return this.workflow.id === PLACEHOLDER_EMPTY_WORKFLOW_ID && this.workflow.name === '';
-		},
-		requestFilter(): IDataObject {
-			return executionFilterToQueryFilter({
-				...this.filters,
-				workflowId: this.workflow.id,
-			});
-		},
-	},
-	watch: {
-		execution(value: ExecutionSummary) {
-			if (!value) {
-				return;
-			}
-
-			this.$router
-				.push({
-					name: VIEWS.EXECUTION_PREVIEW,
-					params: { name: this.workflow.id, executionId: value.id },
-				})
-				.catch(() => {});
-		},
-	},
-	methods: {
-		async onDeleteCurrentExecution(): Promise<void> {
-			this.$emit('execution:delete', this.execution?.id);
-		},
-		async onStopExecution(): Promise<void> {
-			this.$emit('execution:stop', this.execution?.id);
-		},
-		async onRetryExecution(payload: { execution: ExecutionSummary; command: string }) {
-			const loadWorkflow = payload.command === 'current-workflow';
-
-			this.$emit('execution:retry', {
-				id: payload.execution.id,
-				loadWorkflow,
-			});
-		},
+		router
+			.push({
+				name: VIEWS.EXECUTION_PREVIEW,
+				params: { name: props.workflow.id, executionId: value.id },
+			})
+			.catch(() => {});
 	},
+);
+
+onBeforeRouteLeave(async (to, _, next) => {
+	if (getNodeViewTab(to) === MAIN_HEADER_TABS.WORKFLOW) {
+		next();
+		return;
+	}
+
+	await workflowHelpers.promptSaveUnsavedWorkflowChanges(next);
 });
 </script>
 
diff --git a/packages/editor-ui/src/views/WorkflowExecutionsView.vue b/packages/editor-ui/src/views/WorkflowExecutionsView.vue
index 3cca54466e02c..86a19f603ba20 100644
--- a/packages/editor-ui/src/views/WorkflowExecutionsView.vue
+++ b/packages/editor-ui/src/views/WorkflowExecutionsView.vue
@@ -12,7 +12,6 @@ import { PLACEHOLDER_EMPTY_WORKFLOW_ID, VIEWS } from '@/constants';
 import { useRoute, useRouter } from 'vue-router';
 import type { ExecutionSummary } from 'n8n-workflow';
 import { useDebounce } from '@/composables/useDebounce';
-import { storeToRefs } from 'pinia';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
 import { useNodeHelpers } from '@/composables/useNodeHelpers';
@@ -29,8 +28,6 @@ const { callDebounced } = useDebounce();
 const workflowHelpers = useWorkflowHelpers({ router });
 const nodeHelpers = useNodeHelpers();
 
-const { filters } = storeToRefs(executionsStore);
-
 const loading = ref(false);
 const loadingMore = ref(false);
 
@@ -311,7 +308,6 @@ async function loadMore(): Promise<void> {
 		v-if="workflow"
 		:executions="executions"
 		:execution="execution"
-		:filters="filters"
 		:workflow="workflow"
 		:loading="loading"
 		:loading-more="loadingMore"

From cf73e29b6151fdc390e9e06036654d6b69d91016 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Wed, 31 Jul 2024 13:40:01 +0200
Subject: [PATCH 041/168] test(core): Improve and expand log streaming tests
 (no-changelog) (#10261)

---
 .../audit-event-relay.service.test.ts         | 724 +++++++++++++++---
 1 file changed, 617 insertions(+), 107 deletions(-)

diff --git a/packages/cli/src/eventbus/__tests__/audit-event-relay.service.test.ts b/packages/cli/src/eventbus/__tests__/audit-event-relay.service.test.ts
index 145bf2929f07a..7196b9203c407 100644
--- a/packages/cli/src/eventbus/__tests__/audit-event-relay.service.test.ts
+++ b/packages/cli/src/eventbus/__tests__/audit-event-relay.service.test.ts
@@ -3,9 +3,9 @@ import { AuditEventRelay } from '../audit-event-relay.service';
 import type { MessageEventBus } from '../MessageEventBus/MessageEventBus';
 import type { Event } from '../event.types';
 import { EventService } from '../event.service';
-import type { INode, IRun } from 'n8n-workflow';
+import type { INode, IRun, IWorkflowBase } from 'n8n-workflow';
 
-describe('AuditorService', () => {
+describe('AuditEventRelay', () => {
 	const eventBus = mock<MessageEventBus>();
 	const eventService = new EventService();
 	const auditor = new AuditEventRelay(eventService, eventBus);
@@ -15,134 +15,644 @@ describe('AuditorService', () => {
 		jest.clearAllMocks();
 	});
 
-	it('should handle `user-deleted` event', () => {
-		const arg: Event['user-deleted'] = {
-			user: {
-				id: '123',
-				email: 'john@n8n.io',
-				firstName: 'John',
-				lastName: 'Doe',
-				role: 'some-role',
-			},
-		};
-
-		// @ts-expect-error Private method
-		auditor.userDeleted(arg);
-
-		expect(eventBus.sendAuditEvent).toHaveBeenCalledWith({
-			eventName: 'n8n.audit.user.deleted',
-			payload: {
-				userId: '123',
-				_email: 'john@n8n.io',
-				_firstName: 'John',
-				_lastName: 'Doe',
-				globalRole: 'some-role',
-			},
-		});
-	});
+	describe('workflow events', () => {
+		it('should log on `workflow-created` event', () => {
+			const event: Event['workflow-created'] = {
+				user: {
+					id: '123',
+					email: 'john@n8n.io',
+					firstName: 'John',
+					lastName: 'Doe',
+					role: 'owner',
+				},
+				workflow: mock<IWorkflowBase>({
+					id: 'wf123',
+					name: 'Test Workflow',
+				}),
+			};
 
-	it('should handle `user-invite-email-click` event', () => {
-		const arg: Event['user-invite-email-click'] = {
-			inviter: {
-				id: '123',
-				email: 'john@n8n.io',
-				firstName: 'John',
-				lastName: 'Doe',
-				role: 'some-role',
-			},
-			invitee: {
-				id: '456',
-				email: 'jane@n8n.io',
-				firstName: 'Jane',
-				lastName: 'Doe',
-				role: 'some-other-role',
-			},
-		};
-
-		// @ts-expect-error Private method
-		auditor.userInviteEmailClick(arg);
-
-		expect(eventBus.sendAuditEvent).toHaveBeenCalledWith({
-			eventName: 'n8n.audit.user.invitation.accepted',
-			payload: {
-				inviter: {
+			eventService.emit('workflow-created', event);
+
+			expect(eventBus.sendAuditEvent).toHaveBeenCalledWith({
+				eventName: 'n8n.audit.workflow.created',
+				payload: {
 					userId: '123',
 					_email: 'john@n8n.io',
 					_firstName: 'John',
 					_lastName: 'Doe',
-					globalRole: 'some-role',
+					globalRole: 'owner',
+					workflowId: 'wf123',
+					workflowName: 'Test Workflow',
 				},
-				invitee: {
+			});
+		});
+
+		it('should log on `workflow-deleted` event', () => {
+			const event: Event['workflow-deleted'] = {
+				user: {
+					id: '456',
+					email: 'jane@n8n.io',
+					firstName: 'Jane',
+					lastName: 'Smith',
+					role: 'user',
+				},
+				workflowId: 'wf789',
+			};
+
+			eventService.emit('workflow-deleted', event);
+
+			expect(eventBus.sendAuditEvent).toHaveBeenCalledWith({
+				eventName: 'n8n.audit.workflow.deleted',
+				payload: {
 					userId: '456',
 					_email: 'jane@n8n.io',
 					_firstName: 'Jane',
+					_lastName: 'Smith',
+					globalRole: 'user',
+					workflowId: 'wf789',
+				},
+			});
+		});
+
+		it('should log on `workflow-saved` event', () => {
+			const event: Event['workflow-saved'] = {
+				user: {
+					id: '789',
+					email: 'alex@n8n.io',
+					firstName: 'Alex',
+					lastName: 'Johnson',
+					role: 'editor',
+				},
+				workflowId: 'wf101',
+				workflowName: 'Updated Workflow',
+			};
+
+			eventService.emit('workflow-saved', event);
+
+			expect(eventBus.sendAuditEvent).toHaveBeenCalledWith({
+				eventName: 'n8n.audit.workflow.updated',
+				payload: {
+					userId: '789',
+					_email: 'alex@n8n.io',
+					_firstName: 'Alex',
+					_lastName: 'Johnson',
+					globalRole: 'editor',
+					workflowId: 'wf101',
+					workflowName: 'Updated Workflow',
+				},
+			});
+		});
+
+		it('should log on `workflow-pre-execute` event', () => {
+			const workflow = mock<IWorkflowBase>({
+				id: 'wf202',
+				name: 'Test Workflow',
+				active: true,
+				nodes: [],
+				connections: {},
+				staticData: undefined,
+				settings: {},
+			});
+
+			const event: Event['workflow-pre-execute'] = {
+				executionId: 'exec123',
+				data: workflow,
+			};
+
+			eventService.emit('workflow-pre-execute', event);
+
+			expect(eventBus.sendWorkflowEvent).toHaveBeenCalledWith({
+				eventName: 'n8n.workflow.started',
+				payload: {
+					executionId: 'exec123',
+					userId: undefined,
+					workflowId: 'wf202',
+					isManual: false,
+					workflowName: 'Test Workflow',
+				},
+			});
+		});
+
+		it('should log on `workflow-post-execute` for successful execution', () => {
+			const payload = mock<Event['workflow-post-execute']>({
+				executionId: 'some-id',
+				success: true,
+				userId: 'some-id',
+				workflowId: 'some-id',
+				isManual: true,
+				workflowName: 'some-name',
+				metadata: {},
+				runData: mock<IRun>({ data: { resultData: {} } }),
+			});
+
+			eventService.emit('workflow-post-execute', payload);
+
+			const { runData: _, ...rest } = payload;
+
+			expect(eventBus.sendWorkflowEvent).toHaveBeenCalledWith({
+				eventName: 'n8n.workflow.success',
+				payload: rest,
+			});
+		});
+
+		it('should handle `workflow-post-execute` event for unsuccessful execution', () => {
+			const runData = mock<IRun>({
+				data: {
+					resultData: {
+						lastNodeExecuted: 'some-node',
+						// @ts-expect-error Partial mock
+						error: {
+							node: mock<INode>({ type: 'some-type' }),
+							message: 'some-message',
+						},
+						errorMessage: 'some-message',
+					},
+				},
+			}) as unknown as IRun;
+
+			const event = {
+				executionId: 'some-id',
+				success: false,
+				userId: 'some-id',
+				workflowId: 'some-id',
+				isManual: true,
+				workflowName: 'some-name',
+				metadata: {},
+				runData,
+			};
+
+			eventService.emit('workflow-post-execute', event);
+
+			const { runData: _, ...rest } = event;
+
+			expect(eventBus.sendWorkflowEvent).toHaveBeenCalledWith({
+				eventName: 'n8n.workflow.failed',
+				payload: {
+					...rest,
+					lastNodeExecuted: 'some-node',
+					errorNodeType: 'some-type',
+					errorMessage: 'some-message',
+				},
+			});
+		});
+	});
+
+	describe('user events', () => {
+		it('should log on `user-updated` event', () => {
+			const event: Event['user-updated'] = {
+				user: {
+					id: 'user456',
+					email: 'updated@example.com',
+					firstName: 'Updated',
+					lastName: 'User',
+					role: 'global:member',
+				},
+				fieldsChanged: ['firstName', 'lastName', 'password'],
+			};
+
+			eventService.emit('user-updated', event);
+
+			expect(eventBus.sendAuditEvent).toHaveBeenCalledWith({
+				eventName: 'n8n.audit.user.updated',
+				payload: {
+					userId: 'user456',
+					_email: 'updated@example.com',
+					_firstName: 'Updated',
+					_lastName: 'User',
+					globalRole: 'global:member',
+					fieldsChanged: ['firstName', 'lastName', 'password'],
+				},
+			});
+		});
+
+		it('should log on `user-deleted` event', () => {
+			const event: Event['user-deleted'] = {
+				user: {
+					id: '123',
+					email: 'john@n8n.io',
+					firstName: 'John',
+					lastName: 'Doe',
+					role: 'some-role',
+				},
+			};
+
+			eventService.emit('user-deleted', event);
+
+			expect(eventBus.sendAuditEvent).toHaveBeenCalledWith({
+				eventName: 'n8n.audit.user.deleted',
+				payload: {
+					userId: '123',
+					_email: 'john@n8n.io',
+					_firstName: 'John',
 					_lastName: 'Doe',
-					globalRole: 'some-other-role',
+					globalRole: 'some-role',
 				},
-			},
+			});
 		});
 	});
 
-	it('should log on `workflow-post-execute` for successful execution', () => {
-		const payload = mock<Event['workflow-post-execute']>({
-			executionId: 'some-id',
-			success: true,
-			userId: 'some-id',
-			workflowId: 'some-id',
-			isManual: true,
-			workflowName: 'some-name',
-			metadata: {},
-			runData: mock<IRun>({ data: { resultData: {} } }),
+	describe('click events', () => {
+		it('should log on `user-password-reset-request-click` event', () => {
+			const event: Event['user-password-reset-request-click'] = {
+				user: {
+					id: 'user101',
+					email: 'user101@example.com',
+					firstName: 'John',
+					lastName: 'Doe',
+					role: 'global:member',
+				},
+			};
+
+			eventService.emit('user-password-reset-request-click', event);
+
+			expect(eventBus.sendAuditEvent).toHaveBeenCalledWith({
+				eventName: 'n8n.audit.user.reset.requested',
+				payload: {
+					userId: 'user101',
+					_email: 'user101@example.com',
+					_firstName: 'John',
+					_lastName: 'Doe',
+					globalRole: 'global:member',
+				},
+			});
 		});
 
-		eventService.emit('workflow-post-execute', payload);
+		it('should log on `user-invite-email-click` event', () => {
+			const event: Event['user-invite-email-click'] = {
+				inviter: {
+					id: '123',
+					email: 'john@n8n.io',
+					firstName: 'John',
+					lastName: 'Doe',
+					role: 'some-role',
+				},
+				invitee: {
+					id: '456',
+					email: 'jane@n8n.io',
+					firstName: 'Jane',
+					lastName: 'Doe',
+					role: 'some-other-role',
+				},
+			};
 
-		const { runData: _, ...rest } = payload;
+			eventService.emit('user-invite-email-click', event);
 
-		expect(eventBus.sendWorkflowEvent).toHaveBeenCalledWith({
-			eventName: 'n8n.workflow.success',
-			payload: rest,
+			expect(eventBus.sendAuditEvent).toHaveBeenCalledWith({
+				eventName: 'n8n.audit.user.invitation.accepted',
+				payload: {
+					inviter: {
+						userId: '123',
+						_email: 'john@n8n.io',
+						_firstName: 'John',
+						_lastName: 'Doe',
+						globalRole: 'some-role',
+					},
+					invitee: {
+						userId: '456',
+						_email: 'jane@n8n.io',
+						_firstName: 'Jane',
+						_lastName: 'Doe',
+						globalRole: 'some-other-role',
+					},
+				},
+			});
 		});
 	});
 
-	it('should handle `workflow-post-execute` event for unsuccessful execution', () => {
-		const runData = mock<IRun>({
-			data: {
-				resultData: {
-					lastNodeExecuted: 'some-node',
-					// @ts-expect-error Partial mock
-					error: {
-						node: mock<INode>({ type: 'some-type' }),
-						message: 'some-message',
+	describe('node events', () => {
+		it('should log on `node-pre-execute` event', () => {
+			const workflow = mock<IWorkflowBase>({
+				id: 'wf303',
+				name: 'Test Workflow with Nodes',
+				active: true,
+				nodes: [
+					{
+						id: 'node1',
+						name: 'Start Node',
+						type: 'n8n-nodes-base.start',
+						typeVersion: 1,
+						position: [100, 200],
 					},
-					errorMessage: 'some-message',
+					{
+						id: 'node2',
+						name: 'HTTP Request',
+						type: 'n8n-nodes-base.httpRequest',
+						typeVersion: 1,
+						position: [300, 200],
+					},
+				],
+				connections: {},
+				settings: {},
+			});
+
+			const event: Event['node-pre-execute'] = {
+				executionId: 'exec456',
+				nodeName: 'HTTP Request',
+				workflow,
+			};
+
+			eventService.emit('node-pre-execute', event);
+
+			expect(eventBus.sendNodeEvent).toHaveBeenCalledWith({
+				eventName: 'n8n.node.started',
+				payload: {
+					executionId: 'exec456',
+					nodeName: 'HTTP Request',
+					workflowId: 'wf303',
+					workflowName: 'Test Workflow with Nodes',
+					nodeType: 'n8n-nodes-base.httpRequest',
+				},
+			});
+		});
+
+		it('should log on `node-post-execute` event', () => {
+			const workflow = mock<IWorkflowBase>({
+				id: 'wf404',
+				name: 'Test Workflow with Completed Node',
+				active: true,
+				nodes: [
+					{
+						id: 'node1',
+						name: 'Start Node',
+						type: 'n8n-nodes-base.start',
+						typeVersion: 1,
+						position: [100, 200],
+					},
+					{
+						id: 'node2',
+						name: 'HTTP Response',
+						type: 'n8n-nodes-base.httpResponse',
+						typeVersion: 1,
+						position: [300, 200],
+					},
+				],
+				connections: {},
+				settings: {},
+			});
+
+			const event: Event['node-post-execute'] = {
+				executionId: 'exec789',
+				nodeName: 'HTTP Response',
+				workflow,
+			};
+
+			eventService.emit('node-post-execute', event);
+
+			expect(eventBus.sendNodeEvent).toHaveBeenCalledWith({
+				eventName: 'n8n.node.finished',
+				payload: {
+					executionId: 'exec789',
+					nodeName: 'HTTP Response',
+					workflowId: 'wf404',
+					workflowName: 'Test Workflow with Completed Node',
+					nodeType: 'n8n-nodes-base.httpResponse',
+				},
+			});
+		});
+	});
+
+	describe('credentials events', () => {
+		it('should log on `credentials-shared` event', () => {
+			const event: Event['credentials-shared'] = {
+				user: {
+					id: 'user123',
+					email: 'sharer@example.com',
+					firstName: 'Alice',
+					lastName: 'Sharer',
+					role: 'global:owner',
+				},
+				credentialId: 'cred789',
+				credentialType: 'githubApi',
+				userIdSharer: 'user123',
+				userIdsShareesAdded: ['user456', 'user789'],
+				shareesRemoved: null,
+			};
+
+			eventService.emit('credentials-shared', event);
+
+			expect(eventBus.sendAuditEvent).toHaveBeenCalledWith({
+				eventName: 'n8n.audit.user.credentials.shared',
+				payload: {
+					userId: 'user123',
+					_email: 'sharer@example.com',
+					_firstName: 'Alice',
+					_lastName: 'Sharer',
+					globalRole: 'global:owner',
+					credentialId: 'cred789',
+					credentialType: 'githubApi',
+					userIdSharer: 'user123',
+					userIdsShareesAdded: ['user456', 'user789'],
+					shareesRemoved: null,
+				},
+			});
+		});
+
+		it('should log on `credentials-created` event', () => {
+			const event: Event['credentials-created'] = {
+				user: {
+					id: 'user123',
+					email: 'user@example.com',
+					firstName: 'Test',
+					lastName: 'User',
+					role: 'global:owner',
+				},
+				credentialType: 'githubApi',
+				credentialId: 'cred456',
+				publicApi: false,
+				projectId: 'proj789',
+				projectType: 'Personal',
+			};
+
+			eventService.emit('credentials-created', event);
+
+			expect(eventBus.sendAuditEvent).toHaveBeenCalledWith({
+				eventName: 'n8n.audit.user.credentials.created',
+				payload: {
+					userId: 'user123',
+					_email: 'user@example.com',
+					_firstName: 'Test',
+					_lastName: 'User',
+					globalRole: 'global:owner',
+					credentialType: 'githubApi',
+					credentialId: 'cred456',
+					publicApi: false,
+					projectId: 'proj789',
+					projectType: 'Personal',
+				},
+			});
+		});
+	});
+
+	describe('auth events', () => {
+		it('should log on `user-login-failed` event', () => {
+			const event: Event['user-login-failed'] = {
+				userEmail: 'user@example.com',
+				authenticationMethod: 'email',
+				reason: 'Invalid password',
+			};
+
+			eventService.emit('user-login-failed', event);
+
+			expect(eventBus.sendAuditEvent).toHaveBeenCalledWith({
+				eventName: 'n8n.audit.user.login.failed',
+				payload: {
+					userEmail: 'user@example.com',
+					authenticationMethod: 'email',
+					reason: 'Invalid password',
+				},
+			});
+		});
+	});
+
+	describe('community package events', () => {
+		it('should log on `community-package-updated` event', () => {
+			const event: Event['community-package-updated'] = {
+				user: {
+					id: 'user202',
+					email: 'packageupdater@example.com',
+					firstName: 'Package',
+					lastName: 'Updater',
+					role: 'global:admin',
+				},
+				packageName: 'n8n-nodes-awesome-package',
+				packageVersionCurrent: '1.0.0',
+				packageVersionNew: '1.1.0',
+				packageNodeNames: ['AwesomeNode1', 'AwesomeNode2'],
+				packageAuthor: 'Jane Doe',
+				packageAuthorEmail: 'jane@example.com',
+			};
+
+			eventService.emit('community-package-updated', event);
+
+			expect(eventBus.sendAuditEvent).toHaveBeenCalledWith({
+				eventName: 'n8n.audit.package.updated',
+				payload: {
+					userId: 'user202',
+					_email: 'packageupdater@example.com',
+					_firstName: 'Package',
+					_lastName: 'Updater',
+					globalRole: 'global:admin',
+					packageName: 'n8n-nodes-awesome-package',
+					packageVersionCurrent: '1.0.0',
+					packageVersionNew: '1.1.0',
+					packageNodeNames: ['AwesomeNode1', 'AwesomeNode2'],
+					packageAuthor: 'Jane Doe',
+					packageAuthorEmail: 'jane@example.com',
+				},
+			});
+		});
+
+		it('should log on `community-package-installed` event', () => {
+			const event: Event['community-package-installed'] = {
+				user: {
+					id: 'user789',
+					email: 'admin@example.com',
+					firstName: 'Admin',
+					lastName: 'User',
+					role: 'global:admin',
+				},
+				inputString: 'n8n-nodes-custom-package',
+				packageName: 'n8n-nodes-custom-package',
+				success: true,
+				packageVersion: '1.0.0',
+				packageNodeNames: ['CustomNode1', 'CustomNode2'],
+				packageAuthor: 'John Doe',
+				packageAuthorEmail: 'john@example.com',
+			};
+
+			eventService.emit('community-package-installed', event);
+
+			expect(eventBus.sendAuditEvent).toHaveBeenCalledWith({
+				eventName: 'n8n.audit.package.installed',
+				payload: {
+					userId: 'user789',
+					_email: 'admin@example.com',
+					_firstName: 'Admin',
+					_lastName: 'User',
+					globalRole: 'global:admin',
+					inputString: 'n8n-nodes-custom-package',
+					packageName: 'n8n-nodes-custom-package',
+					success: true,
+					packageVersion: '1.0.0',
+					packageNodeNames: ['CustomNode1', 'CustomNode2'],
+					packageAuthor: 'John Doe',
+					packageAuthorEmail: 'john@example.com',
+				},
+			});
+		});
+	});
+
+	describe('email events', () => {
+		it('should log on `email-failed` event', () => {
+			const event: Event['email-failed'] = {
+				user: {
+					id: 'user789',
+					email: 'recipient@example.com',
+					firstName: 'Failed',
+					lastName: 'Recipient',
+					role: 'global:member',
+				},
+				messageType: 'New user invite',
+			};
+
+			eventService.emit('email-failed', event);
+
+			expect(eventBus.sendAuditEvent).toHaveBeenCalledWith({
+				eventName: 'n8n.audit.user.email.failed',
+				payload: {
+					userId: 'user789',
+					_email: 'recipient@example.com',
+					_firstName: 'Failed',
+					_lastName: 'Recipient',
+					globalRole: 'global:member',
+					messageType: 'New user invite',
+				},
+			});
+		});
+	});
+
+	describe('public API events', () => {
+		it('should log on `public-api-key-created` event', () => {
+			const event: Event['public-api-key-created'] = {
+				user: {
+					id: 'user101',
+					email: 'apiuser@example.com',
+					firstName: 'API',
+					lastName: 'User',
+					role: 'global:owner',
+				},
+				publicApi: true,
+			};
+
+			eventService.emit('public-api-key-created', event);
+
+			expect(eventBus.sendAuditEvent).toHaveBeenCalledWith({
+				eventName: 'n8n.audit.user.api.created',
+				payload: {
+					userId: 'user101',
+					_email: 'apiuser@example.com',
+					_firstName: 'API',
+					_lastName: 'User',
+					globalRole: 'global:owner',
+				},
+			});
+		});
+	});
+
+	describe('execution events', () => {
+		it('should log on `execution-throttled` event', () => {
+			const event: Event['execution-throttled'] = {
+				executionId: 'exec123456',
+			};
+
+			eventService.emit('execution-throttled', event);
+
+			expect(eventBus.sendExecutionEvent).toHaveBeenCalledWith({
+				eventName: 'n8n.execution.throttled',
+				payload: {
+					executionId: 'exec123456',
 				},
-			},
-		}) as unknown as IRun;
-
-		const event = {
-			executionId: 'some-id',
-			success: false,
-			userId: 'some-id',
-			workflowId: 'some-id',
-			isManual: true,
-			workflowName: 'some-name',
-			metadata: {},
-			runData,
-		};
-
-		eventService.emit('workflow-post-execute', event);
-
-		const { runData: _, ...rest } = event;
-
-		expect(eventBus.sendWorkflowEvent).toHaveBeenCalledWith({
-			eventName: 'n8n.workflow.failed',
-			payload: {
-				...rest,
-				lastNodeExecuted: 'some-node',
-				errorNodeType: 'some-type',
-				errorMessage: 'some-message',
-			},
+			});
 		});
 	});
 });

From 326c983915a2c382e32398358e7dcadd022c0b77 Mon Sep 17 00:00:00 2001
From: Oz Weiss <thewizarodofoz@gmail.com>
Date: Wed, 31 Jul 2024 15:26:24 +0300
Subject: [PATCH 042/168] feat(Calendly Trigger Node): Add OAuth Credentials
 Support (#10251)

---
 .../CalendlyOAuth2Api.credentials.ts          | 52 +++++++++++++++++
 .../nodes-base/credentials/icons/Calendly.svg |  1 +
 .../nodes/Calendly/CalendlyTrigger.node.ts    | 40 +++++++++++--
 .../nodes/Calendly/GenericFunctions.ts        | 57 +++++++------------
 packages/nodes-base/package.json              |  1 +
 5 files changed, 107 insertions(+), 44 deletions(-)
 create mode 100644 packages/nodes-base/credentials/CalendlyOAuth2Api.credentials.ts
 create mode 100644 packages/nodes-base/credentials/icons/Calendly.svg

diff --git a/packages/nodes-base/credentials/CalendlyOAuth2Api.credentials.ts b/packages/nodes-base/credentials/CalendlyOAuth2Api.credentials.ts
new file mode 100644
index 0000000000000..200d238c6d73f
--- /dev/null
+++ b/packages/nodes-base/credentials/CalendlyOAuth2Api.credentials.ts
@@ -0,0 +1,52 @@
+import type { ICredentialType, INodeProperties, Icon } from 'n8n-workflow';
+
+export class CalendlyOAuth2Api implements ICredentialType {
+	name = 'calendlyOAuth2Api';
+
+	extends = ['oAuth2Api'];
+
+	displayName = 'Calendly OAuth2 API';
+
+	documentationUrl = 'calendly';
+
+	icon: Icon = 'file:icons/Calendly.svg';
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'Grant Type',
+			name: 'grantType',
+			type: 'hidden',
+			default: 'authorizationCode',
+		},
+		{
+			displayName: 'Authorization URL',
+			name: 'authUrl',
+			type: 'hidden',
+			default: 'https://auth.calendly.com/oauth/authorize',
+		},
+		{
+			displayName: 'Access Token URL',
+			name: 'accessTokenUrl',
+			type: 'hidden',
+			default: 'https://auth.calendly.com/oauth/token',
+		},
+		{
+			displayName: 'Authentication',
+			name: 'authentication',
+			type: 'hidden',
+			default: 'header',
+		},
+		{
+			displayName: 'Auth URI Query Parameters',
+			name: 'authQueryParameters',
+			type: 'hidden',
+			default: '',
+		},
+		{
+			displayName: 'Scope',
+			name: 'scope',
+			type: 'hidden',
+			default: '',
+		},
+	];
+}
diff --git a/packages/nodes-base/credentials/icons/Calendly.svg b/packages/nodes-base/credentials/icons/Calendly.svg
new file mode 100644
index 0000000000000..195a7461e33b6
--- /dev/null
+++ b/packages/nodes-base/credentials/icons/Calendly.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 525.8 535.73"><defs><style>.cls-2{fill:#006bff}.cls-3{fill:#0ae9ef}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Logo_assets" data-name="Logo assets"><g id="Brand_mark" data-name="Brand mark"><path d="m443.74 337.62-27.16 47.05a139.52 139.52 0 0 1-120.82 69.75h-54.33a139.52 139.52 0 0 1-120.82-69.75l-27.16-47.05a139.52 139.52 0 0 1 0-139.51l27.16-47.05A139.53 139.53 0 0 1 241.43 81.3h54.33a139.53 139.53 0 0 1 120.82 69.76l27.16 47.05a139 139 0 0 1 8.55 17.55c0 .12.09.23.13.35a102.15 102.15 0 0 0 44.33-18.24c0-.14-.08-.28-.13-.43a237.8 237.8 0 0 0-33.29-67.58 240.7 240.7 0 0 0-52-53.48 239.3 239.3 0 0 0-312.68 360.8 239.43 239.43 0 0 0 398-98.69c.05-.15.09-.29.13-.43a102.15 102.15 0 0 0-44.33-18.24c0 .12-.09.23-.13.35a139 139 0 0 1-8.58 17.55" style="fill:none"/><path d="M360.4 347.4c-17 15.09-38.21 33.87-76.78 33.87h-23c-27.88 0-53.23-10.12-71.37-28.49-17.72-17.94-27.48-42.5-27.48-69.16v-31.51c0-26.66 9.76-51.22 27.48-69.16 18.14-18.37 43.49-28.49 71.37-28.49h23c38.57 0 59.76 18.78 76.78 33.87 17.65 15.65 32.9 29.16 73.52 29.16a116 116 0 0 0 18.5-1.48c0-.12-.08-.23-.13-.35a139 139 0 0 0-8.55-17.55l-27.16-47.05A139.53 139.53 0 0 0 295.76 81.3h-54.33a139.53 139.53 0 0 0-120.82 69.76l-27.16 47.05a139.52 139.52 0 0 0 0 139.51l27.16 47.05a139.52 139.52 0 0 0 120.82 69.75h54.33a139.52 139.52 0 0 0 120.82-69.75l27.16-47.05a139 139 0 0 0 8.55-17.55c0-.12.09-.23.13-.35a116 116 0 0 0-18.5-1.48c-40.62 0-55.87 13.51-73.52 29.16" class="cls-2"/><path d="M283.62 183h-23c-42.42 0-70.3 30.3-70.3 69.09v31.51c0 38.79 27.88 69.09 70.3 69.09h23c61.82 0 57-63 150.3-63a144 144 0 0 1 26.37 2.41 139.4 139.4 0 0 0 0-48.46 143.3 143.3 0 0 1-26.37 2.42c-93.33-.01-88.48-63.06-150.3-63.06" class="cls-2"/><path d="M513.91 315.13a130.2 130.2 0 0 0-53.62-23c0 .16-.05.32-.08.47a138.5 138.5 0 0 1-7.79 27.16A102.15 102.15 0 0 1 496.75 338c0 .14-.08.28-.13.43A237.8 237.8 0 0 1 463.33 406a240.7 240.7 0 0 1-52 53.48A239.3 239.3 0 0 1 98.65 98.65a239.43 239.43 0 0 1 398 98.69c.05.15.09.29.13.43A102.15 102.15 0 0 1 452.42 216a139.4 139.4 0 0 1 7.8 27.18c0 .15 0 .3.07.44a129.94 129.94 0 0 0 53.62-23c15.29-11.31 12.33-24.09 10-31.65C490.22 79.52 388.33 0 267.86 0 119.93 0 0 119.93 0 267.86s119.93 267.87 267.86 267.87c120.47 0 222.36-79.52 256-188.94 2.38-7.56 5.34-20.34-9.95-31.66" class="cls-2"/><path d="M452.42 216a116 116 0 0 1-18.5 1.48c-40.62 0-55.87-13.51-73.52-29.16-17-15.09-38.21-33.87-76.78-33.87h-23c-27.88 0-53.23 10.12-71.37 28.49-17.72 17.94-27.48 42.5-27.48 69.16v31.51c0 26.66 9.76 51.22 27.48 69.16 18.14 18.37 43.49 28.49 71.37 28.49h23c38.57 0 59.76-18.78 76.78-33.87 17.65-15.65 32.9-29.16 73.52-29.16a116 116 0 0 1 18.5 1.48 138.5 138.5 0 0 0 7.79-27.16c0-.15.06-.31.08-.47a144 144 0 0 0-26.37-2.41c-93.33 0-88.48 63-150.3 63h-23c-42.42 0-70.3-30.3-70.3-69.09v-31.47c0-38.79 27.88-69.09 70.3-69.09h23c61.82 0 57 63 150.3 63a143.3 143.3 0 0 0 26.37-2.42c0-.14 0-.29-.07-.44a139.4 139.4 0 0 0-7.8-27.16" class="cls-3"/><path d="M452.42 216a116 116 0 0 1-18.5 1.48c-40.62 0-55.87-13.51-73.52-29.16-17-15.09-38.21-33.87-76.78-33.87h-23c-27.88 0-53.23 10.12-71.37 28.49-17.72 17.94-27.48 42.5-27.48 69.16v31.51c0 26.66 9.76 51.22 27.48 69.16 18.14 18.37 43.49 28.49 71.37 28.49h23c38.57 0 59.76-18.78 76.78-33.87 17.65-15.65 32.9-29.16 73.52-29.16a116 116 0 0 1 18.5 1.48 138.5 138.5 0 0 0 7.79-27.16c0-.15.06-.31.08-.47a144 144 0 0 0-26.37-2.41c-93.33 0-88.48 63-150.3 63h-23c-42.42 0-70.3-30.3-70.3-69.09v-31.47c0-38.79 27.88-69.09 70.3-69.09h23c61.82 0 57 63 150.3 63a143.3 143.3 0 0 0 26.37-2.42c0-.14 0-.29-.07-.44a139.4 139.4 0 0 0-7.8-27.16" class="cls-3"/></g></g></g></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Calendly/CalendlyTrigger.node.ts b/packages/nodes-base/nodes/Calendly/CalendlyTrigger.node.ts
index d2e7b127237d2..40a10cab92cfa 100644
--- a/packages/nodes-base/nodes/Calendly/CalendlyTrigger.node.ts
+++ b/packages/nodes-base/nodes/Calendly/CalendlyTrigger.node.ts
@@ -26,6 +26,20 @@ export class CalendlyTrigger implements INodeType {
 			{
 				name: 'calendlyApi',
 				required: true,
+				displayOptions: {
+					show: {
+						authentication: ['apiKey'],
+					},
+				},
+			},
+			{
+				name: 'calendlyOAuth2Api',
+				required: true,
+				displayOptions: {
+					show: {
+						authentication: ['oAuth2'],
+					},
+				},
 			},
 		],
 		webhooks: [
@@ -37,6 +51,23 @@ export class CalendlyTrigger implements INodeType {
 			},
 		],
 		properties: [
+			{
+				displayName: 'Authentication',
+				name: 'authentication',
+				type: 'options',
+				options: [
+					{
+						// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+						name: 'OAuth2 (recommended)',
+						value: 'oAuth2',
+					},
+					{
+						name: 'API Key or Personal Access Token',
+						value: 'apiKey',
+					},
+				],
+				default: 'apiKey',
+			},
 			{
 				displayName: 'Scope',
 				name: 'scope',
@@ -86,9 +117,8 @@ export class CalendlyTrigger implements INodeType {
 				const webhookUrl = this.getNodeWebhookUrl('default');
 				const webhookData = this.getWorkflowStaticData('node');
 				const events = this.getNodeParameter('events') as string;
-				const { apiKey } = (await this.getCredentials('calendlyApi')) as { apiKey: string };
 
-				const authenticationType = getAuthenticationType(apiKey);
+				const authenticationType = await getAuthenticationType.call(this);
 
 				// remove condition once API Keys are deprecated
 				if (authenticationType === 'apiKey') {
@@ -149,9 +179,8 @@ export class CalendlyTrigger implements INodeType {
 				const webhookData = this.getWorkflowStaticData('node');
 				const webhookUrl = this.getNodeWebhookUrl('default');
 				const events = this.getNodeParameter('events') as string;
-				const { apiKey } = (await this.getCredentials('calendlyApi')) as { apiKey: string };
 
-				const authenticationType = getAuthenticationType(apiKey);
+				const authenticationType = await getAuthenticationType.call(this);
 
 				// remove condition once API Keys are deprecated
 				if (authenticationType === 'apiKey') {
@@ -201,8 +230,7 @@ export class CalendlyTrigger implements INodeType {
 			},
 			async delete(this: IHookFunctions): Promise<boolean> {
 				const webhookData = this.getWorkflowStaticData('node');
-				const { apiKey } = (await this.getCredentials('calendlyApi')) as { apiKey: string };
-				const authenticationType = getAuthenticationType(apiKey);
+				const authenticationType = await getAuthenticationType.call(this);
 
 				// remove condition once API Keys are deprecated
 				if (authenticationType === 'apiKey') {
diff --git a/packages/nodes-base/nodes/Calendly/GenericFunctions.ts b/packages/nodes-base/nodes/Calendly/GenericFunctions.ts
index 4befbb5ceed21..f39aa877618b2 100644
--- a/packages/nodes-base/nodes/Calendly/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Calendly/GenericFunctions.ts
@@ -1,6 +1,4 @@
 import type {
-	ICredentialDataDecryptedObject,
-	ICredentialTestFunctions,
 	IDataObject,
 	IExecuteFunctions,
 	ILoadOptionsFunctions,
@@ -10,12 +8,24 @@ import type {
 	IRequestOptions,
 } from 'n8n-workflow';
 
-export function getAuthenticationType(data: string): 'accessToken' | 'apiKey' {
+function getAuthenticationTypeFromApiKey(data: string): 'accessToken' | 'apiKey' {
 	// The access token is a JWT, so it will always include dots to separate
 	// header, payoload and signature.
 	return data.includes('.') ? 'accessToken' : 'apiKey';
 }
 
+export async function getAuthenticationType(
+	this: IExecuteFunctions | IWebhookFunctions | IHookFunctions | ILoadOptionsFunctions,
+): Promise<'accessToken' | 'apiKey'> {
+	const authentication = this.getNodeParameter('authentication', 0) as string;
+	if (authentication === 'apiKey') {
+		const { apiKey } = (await this.getCredentials('calendlyApi')) as { apiKey: string };
+		return getAuthenticationTypeFromApiKey(apiKey);
+	} else {
+		return 'accessToken';
+	}
+}
+
 export async function calendlyApiRequest(
 	this: IExecuteFunctions | IWebhookFunctions | IHookFunctions | ILoadOptionsFunctions,
 	method: IHttpRequestMethods,
@@ -26,9 +36,7 @@ export async function calendlyApiRequest(
 	uri?: string,
 	option: IDataObject = {},
 ): Promise<any> {
-	const { apiKey } = (await this.getCredentials('calendlyApi')) as { apiKey: string };
-
-	const authenticationType = getAuthenticationType(apiKey);
+	const authenticationType = await getAuthenticationType.call(this);
 
 	const headers: IDataObject = {
 		'Content-Type': 'application/json',
@@ -57,37 +65,10 @@ export async function calendlyApiRequest(
 		delete options.qs;
 	}
 	options = Object.assign({}, options, option);
-	return await this.helpers.requestWithAuthentication.call(this, 'calendlyApi', options);
-}
-
-export async function validateCredentials(
-	this: ICredentialTestFunctions,
-	decryptedCredentials: ICredentialDataDecryptedObject,
-): Promise<any> {
-	const credentials = decryptedCredentials;
 
-	const { apiKey } = credentials as {
-		apiKey: string;
-	};
-
-	const authenticationType = getAuthenticationType(apiKey);
-
-	const options: IRequestOptions = {
-		method: 'GET',
-		uri: '',
-		json: true,
-	};
-
-	if (authenticationType === 'accessToken') {
-		Object.assign(options, {
-			headers: { Authorization: `Bearer ${apiKey}` },
-			uri: 'https://api.calendly.com/users/me',
-		});
-	} else {
-		Object.assign(options, {
-			headers: { 'X-TOKEN': apiKey },
-			uri: 'https://calendly.com/api/v1/users/me',
-		});
-	}
-	return await this.helpers.request(options);
+	const credentialsType =
+		(this.getNodeParameter('authentication', 0) as string) === 'apiKey'
+			? 'calendlyApi'
+			: 'calendlyOAuth2Api';
+	return await this.helpers.requestWithAuthentication.call(this, credentialsType, options);
 }
diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index e512fb4ef89bc..85eca2fdcd1ff 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -52,6 +52,7 @@
       "dist/credentials/BubbleApi.credentials.js",
       "dist/credentials/CalApi.credentials.js",
       "dist/credentials/CalendlyApi.credentials.js",
+      "dist/credentials/CalendlyOAuth2Api.credentials.js",
       "dist/credentials/CarbonBlackApi.credentials.js",
       "dist/credentials/ChargebeeApi.credentials.js",
       "dist/credentials/CircleCiApi.credentials.js",

From 2a09a036d2e916acff7ee50904f1d011a93758e1 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: Wed, 31 Jul 2024 14:38:49 +0200
Subject: [PATCH 043/168] =?UTF-8?q?fix(core):=20Upgrade=20@n8n/vm2=20to=20?=
 =?UTF-8?q?address=20CVE=E2=80=912023=E2=80=9137466=20(#10265)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/@n8n/nodes-langchain/package.json |  2 +-
 packages/nodes-base/package.json           |  2 +-
 pnpm-lock.yaml                             | 52 ++++++++++------------
 3 files changed, 25 insertions(+), 31 deletions(-)

diff --git a/packages/@n8n/nodes-langchain/package.json b/packages/@n8n/nodes-langchain/package.json
index a52670e3e3faf..fdcf6d76f4dfa 100644
--- a/packages/@n8n/nodes-langchain/package.json
+++ b/packages/@n8n/nodes-langchain/package.json
@@ -153,7 +153,7 @@
     "@langchain/textsplitters": "0.0.3",
     "@mozilla/readability": "^0.5.0",
     "@n8n/typeorm": "0.3.20-10",
-    "@n8n/vm2": "3.9.20",
+    "@n8n/vm2": "3.9.24",
     "@pinecone-database/pinecone": "3.0.0",
     "@qdrant/js-client-rest": "1.9.0",
     "@supabase/supabase-js": "2.43.4",
diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index 85eca2fdcd1ff..118117ae4339c 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -830,7 +830,7 @@
   "dependencies": {
     "@kafkajs/confluent-schema-registry": "1.0.6",
     "@n8n/imap": "workspace:*",
-    "@n8n/vm2": "3.9.20",
+    "@n8n/vm2": "3.9.24",
     "amqplib": "0.10.3",
     "alasql": "^4.4.0",
     "aws4": "1.11.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 005cdc310122d..8c8ff04428456 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -390,8 +390,8 @@ importers:
         specifier: 0.3.20-10
         version: 0.3.20-10(@sentry/node@7.87.0)(ioredis@5.3.2)(mssql@10.0.2)(mysql2@3.10.0)(pg@8.11.3)(redis@4.6.12)(sqlite3@5.1.7)
       '@n8n/vm2':
-        specifier: 3.9.20
-        version: 3.9.20
+        specifier: 3.9.24
+        version: 3.9.24
       '@pinecone-database/pinecone':
         specifier: 3.0.0
         version: 3.0.0
@@ -1448,8 +1448,8 @@ importers:
         specifier: workspace:*
         version: link:../@n8n/imap
       '@n8n/vm2':
-        specifier: 3.9.20
-        version: 3.9.20
+        specifier: 3.9.24
+        version: 3.9.24
       alasql:
         specifier: ^4.4.0
         version: 4.4.0(encoding@0.1.13)
@@ -4211,9 +4211,9 @@ packages:
       typeorm-aurora-data-api-driver:
         optional: true
 
-  '@n8n/vm2@3.9.20':
-    resolution: {integrity: sha512-qk2oJYkuFRVSTxoro4obX/sv/wT1pViZjHh/isjOvFB93D52QIg3TCjMPsHOfHTmkxCKJffjLrUvjIwvWzSMCQ==}
-    engines: {node: '>=18.10', pnpm: '>=8.6.12'}
+  '@n8n/vm2@3.9.24':
+    resolution: {integrity: sha512-O4z67yVgUs2FHkcw3vbGnxdC1EglpzOj966kPkK4gtW+ZmTTFRfEB+2Ehq6PMthgg/Ou5JCLSR3wvQIZFFt4Pg==}
+    engines: {node: '>=18.10', pnpm: '>=9.6'}
     hasBin: true
 
   '@n8n_io/license-sdk@2.13.0':
@@ -5999,10 +5999,6 @@ packages:
     peerDependencies:
       acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
 
-  acorn-walk@8.2.0:
-    resolution: {integrity: sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==}
-    engines: {node: '>=0.4.0'}
-
   acorn-walk@8.3.2:
     resolution: {integrity: sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==}
     engines: {node: '>=0.4.0'}
@@ -16720,10 +16716,10 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@n8n/vm2@3.9.20':
+  '@n8n/vm2@3.9.24':
     dependencies:
-      acorn: 8.11.2
-      acorn-walk: 8.2.0
+      acorn: 8.12.1
+      acorn-walk: 8.3.2
 
   '@n8n_io/license-sdk@2.13.0':
     dependencies:
@@ -19367,15 +19363,13 @@ snapshots:
 
   acorn-globals@7.0.1:
     dependencies:
-      acorn: 8.11.2
+      acorn: 8.12.1
       acorn-walk: 8.3.2
 
   acorn-jsx@5.3.2(acorn@8.11.2):
     dependencies:
       acorn: 8.11.2
 
-  acorn-walk@8.2.0: {}
-
   acorn-walk@8.3.2: {}
 
   acorn@7.4.1: {}
@@ -21307,7 +21301,7 @@ snapshots:
 
   eslint-import-resolver-node@0.3.9:
     dependencies:
-      debug: 3.2.7(supports-color@8.1.1)
+      debug: 3.2.7(supports-color@5.5.0)
       is-core-module: 2.13.1
       resolve: 1.22.8
     transitivePeerDependencies:
@@ -21332,7 +21326,7 @@ snapshots:
 
   eslint-module-utils@2.8.0(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.2))(eslint-plugin-import@2.29.1)(eslint@8.57.0))(eslint@8.57.0):
     dependencies:
-      debug: 3.2.7(supports-color@8.1.1)
+      debug: 3.2.7(supports-color@5.5.0)
     optionalDependencies:
       '@typescript-eslint/parser': 7.2.0(eslint@8.57.0)(typescript@5.5.2)
       eslint: 8.57.0
@@ -21352,7 +21346,7 @@ snapshots:
       array.prototype.findlastindex: 1.2.3
       array.prototype.flat: 1.3.2
       array.prototype.flatmap: 1.3.2
-      debug: 3.2.7(supports-color@8.1.1)
+      debug: 3.2.7(supports-color@5.5.0)
       doctrine: 2.1.0
       eslint: 8.57.0
       eslint-import-resolver-node: 0.3.9
@@ -21882,7 +21876,7 @@ snapshots:
 
   follow-redirects@1.15.6(debug@3.2.7):
     optionalDependencies:
-      debug: 3.2.7(supports-color@8.1.1)
+      debug: 3.2.7(supports-color@5.5.0)
 
   follow-redirects@1.15.6(debug@4.3.4):
     optionalDependencies:
@@ -22223,7 +22217,7 @@ snapshots:
       array-parallel: 0.1.3
       array-series: 0.1.5
       cross-spawn: 4.0.2
-      debug: 3.2.7(supports-color@8.1.1)
+      debug: 3.2.7(supports-color@5.5.0)
     transitivePeerDependencies:
       - supports-color
 
@@ -23353,7 +23347,7 @@ snapshots:
   jsdom@20.0.2:
     dependencies:
       abab: 2.0.6
-      acorn: 8.11.2
+      acorn: 8.12.1
       acorn-globals: 7.0.1
       cssom: 0.5.0
       cssstyle: 2.3.0
@@ -24209,7 +24203,7 @@ snapshots:
 
   mlly@1.4.2:
     dependencies:
-      acorn: 8.11.2
+      acorn: 8.12.1
       pathe: 1.1.2
       pkg-types: 1.0.3
       ufo: 1.3.2
@@ -24916,7 +24910,7 @@ snapshots:
 
   pdf-parse@1.1.1:
     dependencies:
-      debug: 3.2.7(supports-color@8.1.1)
+      debug: 3.2.7(supports-color@5.5.0)
       node-ensure: 0.0.0
     transitivePeerDependencies:
       - supports-color
@@ -25828,7 +25822,7 @@ snapshots:
 
   rhea@1.0.24:
     dependencies:
-      debug: 3.2.7(supports-color@8.1.1)
+      debug: 3.2.7(supports-color@5.5.0)
     transitivePeerDependencies:
       - supports-color
 
@@ -26202,7 +26196,7 @@ snapshots:
       binascii: 0.0.2
       bn.js: 5.2.1
       browser-request: 0.3.3
-      debug: 3.2.7(supports-color@8.1.1)
+      debug: 3.2.7(supports-color@5.5.0)
       expand-tilde: 2.0.2
       extend: 3.0.2
       fast-xml-parser: 4.2.7
@@ -27190,7 +27184,7 @@ snapshots:
 
   unplugin@1.0.1:
     dependencies:
-      acorn: 8.11.2
+      acorn: 8.12.1
       chokidar: 3.5.2
       webpack-sources: 3.2.3
       webpack-virtual-modules: 0.5.0
@@ -27204,7 +27198,7 @@ snapshots:
 
   unplugin@1.5.1:
     dependencies:
-      acorn: 8.11.2
+      acorn: 8.12.1
       chokidar: 3.5.2
       webpack-sources: 3.2.3
       webpack-virtual-modules: 0.6.1

From 7ffaec03eaa77c0c812adee1a71f5e9aeb3724b3 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 31 Jul 2024 14:56:18 +0200
Subject: [PATCH 044/168] :rocket: Release 1.53.0 (#10266)

Co-authored-by: despairblue <despairblue@users.noreply.github.com>
---
 CHANGELOG.md                               | 45 ++++++++++++++++++++++
 package.json                               |  2 +-
 packages/@n8n/chat/package.json            |  2 +-
 packages/@n8n/client-oauth2/package.json   |  2 +-
 packages/@n8n/config/package.json          |  2 +-
 packages/@n8n/nodes-langchain/package.json |  2 +-
 packages/cli/package.json                  |  2 +-
 packages/core/package.json                 |  2 +-
 packages/design-system/package.json        |  2 +-
 packages/editor-ui/package.json            |  2 +-
 packages/node-dev/package.json             |  2 +-
 packages/nodes-base/package.json           |  2 +-
 packages/workflow/package.json             |  2 +-
 13 files changed, 57 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cc2a07dda09b1..986b85b0682ea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,48 @@
+# [1.53.0](https://github.com/n8n-io/n8n/compare/n8n@1.52.0...n8n@1.53.0) (2024-07-31)
+
+
+### Bug Fixes
+
+* Better error message when calling data transformation functions on a null value ([#10210](https://github.com/n8n-io/n8n/issues/10210)) ([1718125](https://github.com/n8n-io/n8n/commit/1718125c6d8589cf24dc8d34f6808dd6f1802691))
+* **core:** Fix missing successful items on continueErrorOutput with multiple outputs ([#10218](https://github.com/n8n-io/n8n/issues/10218)) ([1a7713e](https://github.com/n8n-io/n8n/commit/1a7713ef263680da43f08b6c8a15aee7a0341493))
+* **core:** Flush instance stopped event immediately ([#10238](https://github.com/n8n-io/n8n/issues/10238)) ([d6770b5](https://github.com/n8n-io/n8n/commit/d6770b5fcaec6438d677b918aaeb1669ad7424c2))
+* **core:** Restore log event `n8n.workflow.failed` ([#10253](https://github.com/n8n-io/n8n/issues/10253)) ([3e96b29](https://github.com/n8n-io/n8n/commit/3e96b293329525c9d4b2fcef87b3803e458c8e7f))
+* **core:** Upgrade @n8n/vm2 to address CVE‑2023‑37466 ([#10265](https://github.com/n8n-io/n8n/issues/10265)) ([2a09a03](https://github.com/n8n-io/n8n/commit/2a09a036d2e916acff7ee50904f1d011a93758e1))
+* **editor:** Defer `User saved credentials` telemetry event for OAuth credentials ([#10215](https://github.com/n8n-io/n8n/issues/10215)) ([40a5226](https://github.com/n8n-io/n8n/commit/40a5226e24448a4428143e69d80ebc78238365a1))
+* **editor:** Fix custom API call notice ([#10227](https://github.com/n8n-io/n8n/issues/10227)) ([5b47c8b](https://github.com/n8n-io/n8n/commit/5b47c8b57b25528cd2d6f97bc6d98707d47f35bc))
+* **editor:** Fix issue with existing credential not opening in HTTP agent tool ([#10167](https://github.com/n8n-io/n8n/issues/10167)) ([906b4c3](https://github.com/n8n-io/n8n/commit/906b4c3c7b2919111cf23eaa12b3c4d507969179))
+* **editor:** Fix parameter input glitch when there was an error loading remote options ([#10209](https://github.com/n8n-io/n8n/issues/10209)) ([c0e3743](https://github.com/n8n-io/n8n/commit/c0e37439a87105a0e66c8ebced42c06dab30dc5e))
+* **editor:** Fix workflow execution list scrolling after filter change ([#10226](https://github.com/n8n-io/n8n/issues/10226)) ([7e64358](https://github.com/n8n-io/n8n/commit/7e643589c67adc0218216ec4b89a95f0edfedbee))
+* **Google BigQuery Node:** Send timeoutMs in query, pagination support ([#10205](https://github.com/n8n-io/n8n/issues/10205)) ([f5722e8](https://github.com/n8n-io/n8n/commit/f5722e8823ccd2bc2b5f43ba3c849797d5690a93))
+* **Google Sheets Node:** Add column names row if sheet is empty ([#10200](https://github.com/n8n-io/n8n/issues/10200)) ([82eba9f](https://github.com/n8n-io/n8n/commit/82eba9fc5ff49b8e2a9db93c10b253fb67a8c644))
+* **Google Sheets Node:** Do not insert row_number as a new column, do not checkForSchemaChanges in update operation ([#10201](https://github.com/n8n-io/n8n/issues/10201)) ([5136d10](https://github.com/n8n-io/n8n/commit/5136d10ca3492f92af67d4a1d4abc774419580cc))
+* **Google Sheets Node:** Fix Google Sheet URL regex ([#10195](https://github.com/n8n-io/n8n/issues/10195)) ([e6fd996](https://github.com/n8n-io/n8n/commit/e6fd996973d4f40facf0ebf1eea3cc26acd0603d))
+* **HTTP Request Node:** Resolve max pages expression ([#10192](https://github.com/n8n-io/n8n/issues/10192)) ([bfc8e1b](https://github.com/n8n-io/n8n/commit/bfc8e1b56f7714e1f52aae747d58d686b86e60f0))
+* **LinkedIn Node:** Fix issue with some characters cutting off posts early ([#10185](https://github.com/n8n-io/n8n/issues/10185)) ([361b5e7](https://github.com/n8n-io/n8n/commit/361b5e7c37ba49b68dcf5b8122621aad4d8d96e0))
+* **Postgres Node:** Expressions in query parameters for Postgres executeQuery operation ([#10217](https://github.com/n8n-io/n8n/issues/10217)) ([519fc4d](https://github.com/n8n-io/n8n/commit/519fc4d75325a80b84cc4dcacf52d6f4c02e3a44))
+* **Postgres Node:** Option to treat query parameters enclosed in single quotas as text ([#10214](https://github.com/n8n-io/n8n/issues/10214)) ([00ec253](https://github.com/n8n-io/n8n/commit/00ec2533374d3def465efee718592fc4001d5602))
+* **Read/Write Files from Disk Node:** Notice update in file selector, replace backslashes with forward slashes if windows path ([#10186](https://github.com/n8n-io/n8n/issues/10186)) ([3eac673](https://github.com/n8n-io/n8n/commit/3eac673b17986c5c74bd2adb5ad589ba0ca55319))
+* **Text Classifier Node:** Use proper documentation URL and respect continueOnFail ([#10216](https://github.com/n8n-io/n8n/issues/10216)) ([452f52c](https://github.com/n8n-io/n8n/commit/452f52c124017e002e86c547ba42b1633b14beed))
+* **Trello Node:** Use body for POST requests ([#10189](https://github.com/n8n-io/n8n/issues/10189)) ([7775d50](https://github.com/n8n-io/n8n/commit/7775d5059b7f69d9af22e7ad7d12c6cf9092a4e5))
+* **Wait Node:** Authentication fix ([#10236](https://github.com/n8n-io/n8n/issues/10236)) ([f87854f](https://github.com/n8n-io/n8n/commit/f87854f8db360b7b870583753fcfb4af95adab8c))
+
+
+### Features
+
+* **Calendly Trigger Node:** Add OAuth Credentials Support ([#10251](https://github.com/n8n-io/n8n/issues/10251)) ([326c983](https://github.com/n8n-io/n8n/commit/326c983915a2c382e32398358e7dcadd022c0b77))
+* **core:** Allow filtering workflows by project and transferring workflows in Public API ([#10231](https://github.com/n8n-io/n8n/issues/10231)) ([d719899](https://github.com/n8n-io/n8n/commit/d719899223907b20a17883a35e4ef637a3453532))
+* **editor:** Show new executions as `Queued` in the UI, until they actually start ([#10204](https://github.com/n8n-io/n8n/issues/10204)) ([44728d7](https://github.com/n8n-io/n8n/commit/44728d72423f5549dda09589f4a618ebd80899cb))
+* **HTTP Request Node:** Add option to disable lowercase headers ([#10154](https://github.com/n8n-io/n8n/issues/10154)) ([5aba69b](https://github.com/n8n-io/n8n/commit/5aba69bcf4d232d9860f3cd9fe57cb8839a2f96f))
+* **Information Extractor Node:** Add new simplified AI-node for information extraction ([#10149](https://github.com/n8n-io/n8n/issues/10149)) ([3d235b0](https://github.com/n8n-io/n8n/commit/3d235b0b2df756df35ac60e3dcd87ad183a07167))
+* Introduce Google Cloud Platform as external secrets provider  ([#10146](https://github.com/n8n-io/n8n/issues/10146)) ([3ccb9df](https://github.com/n8n-io/n8n/commit/3ccb9df2f902e46f8cbb9c46c0727f29d752a773))
+* **n8n Form Trigger Node:** Improvements ([#10092](https://github.com/n8n-io/n8n/issues/10092)) ([711b667](https://github.com/n8n-io/n8n/commit/711b667ebefe55740e5eb39f1f0f24ceee10e7b0))
+* Recovery option for jsonParse helper ([#10182](https://github.com/n8n-io/n8n/issues/10182)) ([d165b33](https://github.com/n8n-io/n8n/commit/d165b33ceac4d24d0fc290bffe63b5f551204e38))
+* **Sentiment Analysis Node:** Implement Sentiment Analysis node ([#10184](https://github.com/n8n-io/n8n/issues/10184)) ([8ef0a0c](https://github.com/n8n-io/n8n/commit/8ef0a0c58ac2a84aad649ccbe72aa907d005cc44))
+* **Shopify Node:** Update Shopify API version ([#10155](https://github.com/n8n-io/n8n/issues/10155)) ([e2ee915](https://github.com/n8n-io/n8n/commit/e2ee91569a382bfbf787cf45204c72c821a860a0))
+* Support create, read, delete variables in Public API ([#10241](https://github.com/n8n-io/n8n/issues/10241)) ([af695eb](https://github.com/n8n-io/n8n/commit/af695ebf934526d926ea87fe87df61aa73d70979))
+
+
+
 # [1.52.0](https://github.com/n8n-io/n8n/compare/n8n@1.51.0...n8n@1.52.0) (2024-07-24)
 
 
diff --git a/package.json b/package.json
index 3dd939d9d30fa..e05eeb9845f1b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-monorepo",
-  "version": "1.52.0",
+  "version": "1.53.0",
   "private": true,
   "engines": {
     "node": ">=20.15",
diff --git a/packages/@n8n/chat/package.json b/packages/@n8n/chat/package.json
index 4f425b6fa8237..5ba8a1c39f201 100644
--- a/packages/@n8n/chat/package.json
+++ b/packages/@n8n/chat/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@n8n/chat",
-  "version": "0.21.0",
+  "version": "0.22.0",
   "scripts": {
     "dev": "pnpm run storybook",
     "build": "pnpm build:vite && pnpm build:bundle",
diff --git a/packages/@n8n/client-oauth2/package.json b/packages/@n8n/client-oauth2/package.json
index 83b858a2e9fa0..7ec91b98390b1 100644
--- a/packages/@n8n/client-oauth2/package.json
+++ b/packages/@n8n/client-oauth2/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@n8n/client-oauth2",
-  "version": "0.19.0",
+  "version": "0.20.0",
   "scripts": {
     "clean": "rimraf dist .turbo",
     "dev": "pnpm watch",
diff --git a/packages/@n8n/config/package.json b/packages/@n8n/config/package.json
index 66332540fa2e6..a4abfa677adc1 100644
--- a/packages/@n8n/config/package.json
+++ b/packages/@n8n/config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@n8n/config",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "scripts": {
     "clean": "rimraf dist .turbo",
     "dev": "pnpm watch",
diff --git a/packages/@n8n/nodes-langchain/package.json b/packages/@n8n/nodes-langchain/package.json
index fdcf6d76f4dfa..3a328af0ae880 100644
--- a/packages/@n8n/nodes-langchain/package.json
+++ b/packages/@n8n/nodes-langchain/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@n8n/n8n-nodes-langchain",
-  "version": "1.52.0",
+  "version": "1.53.0",
   "description": "",
   "main": "index.js",
   "scripts": {
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 60ace14d9bce8..ca8f192e40152 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n",
-  "version": "1.52.0",
+  "version": "1.53.0",
   "description": "n8n Workflow Automation Tool",
   "main": "dist/index",
   "types": "dist/index.d.ts",
diff --git a/packages/core/package.json b/packages/core/package.json
index 17f57cc99bad1..dfcc23db99d92 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-core",
-  "version": "1.52.0",
+  "version": "1.53.0",
   "description": "Core functionality of n8n",
   "main": "dist/index",
   "types": "dist/index.d.ts",
diff --git a/packages/design-system/package.json b/packages/design-system/package.json
index 150636a64c3f0..386a7e1e862c8 100644
--- a/packages/design-system/package.json
+++ b/packages/design-system/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-design-system",
-  "version": "1.42.0",
+  "version": "1.43.0",
   "main": "src/main.ts",
   "import": "src/main.ts",
   "scripts": {
diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json
index d4acc7843d1b2..caf156fa83c9e 100644
--- a/packages/editor-ui/package.json
+++ b/packages/editor-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-editor-ui",
-  "version": "1.52.0",
+  "version": "1.53.0",
   "description": "Workflow Editor UI for n8n",
   "main": "index.js",
   "scripts": {
diff --git a/packages/node-dev/package.json b/packages/node-dev/package.json
index 92db12b997737..d7b16155a1aa5 100644
--- a/packages/node-dev/package.json
+++ b/packages/node-dev/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-node-dev",
-  "version": "1.52.0",
+  "version": "1.53.0",
   "description": "CLI to simplify n8n credentials/node development",
   "main": "dist/src/index",
   "types": "dist/src/index.d.ts",
diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index 118117ae4339c..e9da85e9faf47 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-nodes-base",
-  "version": "1.52.0",
+  "version": "1.53.0",
   "description": "Base nodes of n8n",
   "main": "index.js",
   "scripts": {
diff --git a/packages/workflow/package.json b/packages/workflow/package.json
index 83de78636bf8c..179ae29311c11 100644
--- a/packages/workflow/package.json
+++ b/packages/workflow/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-workflow",
-  "version": "1.51.0",
+  "version": "1.52.0",
   "description": "Workflow base code of n8n",
   "main": "dist/index.js",
   "module": "src/index.ts",

From a8e2774f5382e202556b5506c7788265786aa973 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: Wed, 31 Jul 2024 15:03:37 +0200
Subject: [PATCH 045/168] fix(core): Make OAuth1/OAuth2 callback not require
 auth (#10263)

---
 packages/cli/src/auth/auth.service.ts             |  4 ----
 .../oauth/oAuth1Credential.controller.ts          | 15 +++++----------
 .../oauth/oAuth2Credential.controller.ts          | 10 ++++------
 packages/cli/src/requests.ts                      |  4 ++--
 4 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/packages/cli/src/auth/auth.service.ts b/packages/cli/src/auth/auth.service.ts
index ccf562e27e050..8cbb0c01cfa21 100644
--- a/packages/cli/src/auth/auth.service.ts
+++ b/packages/cli/src/auth/auth.service.ts
@@ -42,10 +42,6 @@ const skipBrowserIdCheckEndpoints = [
 
 	// We need to exclude binary-data downloading endpoint because we can't send custom headers on `<embed>` tags
 	`/${restEndpoint}/binary-data/`,
-
-	// oAuth callback urls aren't called by the frontend. therefore we can't send custom header on these requests
-	`/${restEndpoint}/oauth1-credential/callback`,
-	`/${restEndpoint}/oauth2-credential/callback`,
 ];
 
 @Service()
diff --git a/packages/cli/src/controllers/oauth/oAuth1Credential.controller.ts b/packages/cli/src/controllers/oauth/oAuth1Credential.controller.ts
index 578a209e3664f..d967d2f83435a 100644
--- a/packages/cli/src/controllers/oauth/oAuth1Credential.controller.ts
+++ b/packages/cli/src/controllers/oauth/oAuth1Credential.controller.ts
@@ -99,9 +99,8 @@ export class OAuth1CredentialController extends AbstractOAuthController {
 	}
 
 	/** Verify and store app code. Generate access tokens and store for respective credential */
-	@Get('/callback', { usesTemplates: true })
+	@Get('/callback', { usesTemplates: true, skipAuth: true })
 	async handleCallback(req: OAuthRequest.OAuth1Credential.Callback, res: Response) {
-		const userId = req.user?.id;
 		try {
 			const { oauth_verifier, oauth_token, state: encodedState } = req.query;
 
@@ -124,7 +123,7 @@ export class OAuth1CredentialController extends AbstractOAuthController {
 			const credential = await this.getCredentialWithoutUser(credentialId);
 			if (!credential) {
 				const errorMessage = 'OAuth1 callback failed because of insufficient permissions';
-				this.logger.error(errorMessage, { userId, credentialId });
+				this.logger.error(errorMessage, { credentialId });
 				return this.renderCallbackError(res, errorMessage);
 			}
 
@@ -138,7 +137,7 @@ export class OAuth1CredentialController extends AbstractOAuthController {
 
 			if (this.verifyCsrfState(decryptedDataOriginal, state)) {
 				const errorMessage = 'The OAuth1 callback state is invalid!';
-				this.logger.debug(errorMessage, { userId, credentialId });
+				this.logger.debug(errorMessage, { credentialId });
 				return this.renderCallbackError(res, errorMessage);
 			}
 
@@ -156,7 +155,7 @@ export class OAuth1CredentialController extends AbstractOAuthController {
 			try {
 				oauthToken = await axios.request(options);
 			} catch (error) {
-				this.logger.error('Unable to fetch tokens for OAuth1 callback', { userId, credentialId });
+				this.logger.error('Unable to fetch tokens for OAuth1 callback', { credentialId });
 				const errorResponse = new NotFoundError('Unable to get access tokens!');
 				return sendErrorResponse(res, errorResponse);
 			}
@@ -172,15 +171,11 @@ export class OAuth1CredentialController extends AbstractOAuthController {
 			await this.encryptAndSaveData(credential, decryptedDataOriginal);
 
 			this.logger.verbose('OAuth1 callback successful for new credential', {
-				userId,
 				credentialId,
 			});
 			return res.render('oauth-callback');
 		} catch (error) {
-			this.logger.error('OAuth1 callback failed because of insufficient user permissions', {
-				userId,
-			});
-			// Error response
+			this.logger.error('OAuth1 callback failed because of insufficient user permissions');
 			return sendErrorResponse(res, error as Error);
 		}
 	}
diff --git a/packages/cli/src/controllers/oauth/oAuth2Credential.controller.ts b/packages/cli/src/controllers/oauth/oAuth2Credential.controller.ts
index 71a0fe140c4c1..719043e9834b7 100644
--- a/packages/cli/src/controllers/oauth/oAuth2Credential.controller.ts
+++ b/packages/cli/src/controllers/oauth/oAuth2Credential.controller.ts
@@ -80,9 +80,8 @@ export class OAuth2CredentialController extends AbstractOAuthController {
 	}
 
 	/** Verify and store app code. Generate access tokens and store for respective credential */
-	@Get('/callback', { usesTemplates: true })
+	@Get('/callback', { usesTemplates: true, skipAuth: true })
 	async handleCallback(req: OAuthRequest.OAuth2Credential.Callback, res: Response) {
-		const userId = req.user?.id;
 		try {
 			const { code, state: encodedState } = req.query;
 			if (!code || !encodedState) {
@@ -104,7 +103,7 @@ export class OAuth2CredentialController extends AbstractOAuthController {
 			const credential = await this.getCredentialWithoutUser(credentialId);
 			if (!credential) {
 				const errorMessage = 'OAuth2 callback failed because of insufficient permissions';
-				this.logger.error(errorMessage, { userId, credentialId });
+				this.logger.error(errorMessage, { credentialId });
 				return this.renderCallbackError(res, errorMessage);
 			}
 
@@ -118,7 +117,7 @@ export class OAuth2CredentialController extends AbstractOAuthController {
 
 			if (this.verifyCsrfState(decryptedDataOriginal, state)) {
 				const errorMessage = 'The OAuth2 callback state is invalid!';
-				this.logger.debug(errorMessage, { userId, credentialId });
+				this.logger.debug(errorMessage, { credentialId });
 				return this.renderCallbackError(res, errorMessage);
 			}
 
@@ -157,7 +156,7 @@ export class OAuth2CredentialController extends AbstractOAuthController {
 
 			if (oauthToken === undefined) {
 				const errorMessage = 'Unable to get OAuth2 access tokens!';
-				this.logger.error(errorMessage, { userId, credentialId });
+				this.logger.error(errorMessage, { credentialId });
 				return this.renderCallbackError(res, errorMessage);
 			}
 
@@ -174,7 +173,6 @@ export class OAuth2CredentialController extends AbstractOAuthController {
 			await this.encryptAndSaveData(credential, decryptedDataOriginal);
 
 			this.logger.verbose('OAuth2 callback successful for credential', {
-				userId,
 				credentialId,
 			});
 
diff --git a/packages/cli/src/requests.ts b/packages/cli/src/requests.ts
index 1ff6537257529..02ef5acb6b015 100644
--- a/packages/cli/src/requests.ts
+++ b/packages/cli/src/requests.ts
@@ -371,7 +371,7 @@ export declare namespace MFA {
 export declare namespace OAuthRequest {
 	namespace OAuth1Credential {
 		type Auth = AuthenticatedRequest<{}, {}, {}, { id: string }>;
-		type Callback = AuthenticatedRequest<
+		type Callback = AuthlessRequest<
 			{},
 			{},
 			{},
@@ -383,7 +383,7 @@ export declare namespace OAuthRequest {
 
 	namespace OAuth2Credential {
 		type Auth = AuthenticatedRequest<{}, {}, {}, { id: string }>;
-		type Callback = AuthenticatedRequest<{}, {}, {}, { code: string; state: string }>;
+		type Callback = AuthlessRequest<{}, {}, {}, { code: string; state: string }>;
 	}
 }
 

From c8ee852159207be0cfe2c3e0ee8e7b29d838aa35 Mon Sep 17 00:00:00 2001
From: Michael Kret <88898367+michael-radency@users.noreply.github.com>
Date: Wed, 31 Jul 2024 16:11:42 +0300
Subject: [PATCH 046/168] fix: Loop node no input data shown (#10224)

---
 packages/editor-ui/src/composables/useNodeHelpers.ts | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/packages/editor-ui/src/composables/useNodeHelpers.ts b/packages/editor-ui/src/composables/useNodeHelpers.ts
index 19e46339bcdd2..a8c763b11f5a2 100644
--- a/packages/editor-ui/src/composables/useNodeHelpers.ts
+++ b/packages/editor-ui/src/composables/useNodeHelpers.ts
@@ -8,6 +8,7 @@ import {
 	FORM_TRIGGER_NODE_TYPE,
 	NODE_OUTPUT_DEFAULT_KEY,
 	PLACEHOLDER_FILLED_AT_EXECUTION_TIME,
+	SPLIT_IN_BATCHES_NODE_TYPE,
 	WEBHOOK_NODE_TYPE,
 } from '@/constants';
 
@@ -571,6 +572,16 @@ export function useNodeHelpers() {
 		paneType: NodePanelType = 'output',
 		connectionType: ConnectionTypes = NodeConnectionType.Main,
 	): INodeExecutionData[] {
+		//TODO: check if this needs to be fixed in different place
+		if (
+			node?.type === SPLIT_IN_BATCHES_NODE_TYPE &&
+			paneType === 'input' &&
+			runIndex !== 0 &&
+			outputIndex !== 0
+		) {
+			runIndex = runIndex - 1;
+		}
+
 		if (node === null) {
 			return [];
 		}

From d91eb2cdd50136b217c3423bfad53aaea707cbb6 Mon Sep 17 00:00:00 2001
From: Jon <jonathan.bennetts@gmail.com>
Date: Wed, 31 Jul 2024 16:19:25 +0100
Subject: [PATCH 047/168] feat(AWS Lambda Node): Add support for paired items
 (no-changelog) (#10270)

---
 packages/nodes-base/nodes/Aws/AwsLambda.node.ts | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/packages/nodes-base/nodes/Aws/AwsLambda.node.ts b/packages/nodes-base/nodes/Aws/AwsLambda.node.ts
index e1fd51f13086c..ed69ab35bd1b8 100644
--- a/packages/nodes-base/nodes/Aws/AwsLambda.node.ts
+++ b/packages/nodes-base/nodes/Aws/AwsLambda.node.ts
@@ -195,13 +195,21 @@ export class AwsLambda implements INodeType {
 
 					throw new NodeApiError(this.getNode(), responseData as JsonObject);
 				} else {
-					returnData.push({
-						result: responseData,
-					} as IDataObject);
+					const executionData = this.helpers.constructExecutionMetaData(
+						this.helpers.returnJsonArray({
+							result: responseData,
+						}),
+						{ itemData: { item: i } },
+					);
+					returnData.push(...executionData);
 				}
 			} catch (error) {
 				if (this.continueOnFail(error)) {
-					returnData.push({ error: (error as JsonObject).message });
+					const executionData = this.helpers.constructExecutionMetaData(
+						this.helpers.returnJsonArray({ error: (error as JsonObject).message }),
+						{ itemData: { item: i } },
+					);
+					returnData.push(...executionData);
 					continue;
 				}
 				throw error;

From 1608d2527b2ec0897d4a69cda7e576167c5ae3d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Wed, 31 Jul 2024 17:45:11 +0200
Subject: [PATCH 048/168] refactor(core): Port endpoints config (no-changelog)
 (#10268)

---
 packages/@n8n/config/src/configs/endpoints.ts | 102 +++++++++++++
 packages/@n8n/config/src/index.ts             |   4 +
 packages/@n8n/config/test/config.test.ts      |  34 ++++-
 packages/cli/src/AbstractServer.ts            |  27 ++--
 packages/cli/src/Server.ts                    |  15 +-
 .../cli/src/WorkflowExecuteAdditionalData.ts  |  16 +-
 packages/cli/src/auth/auth.service.ts         |   5 +-
 packages/cli/src/commands/BaseCommand.ts      |   2 +-
 packages/cli/src/commands/start.ts            |  10 +-
 packages/cli/src/config/schema.ts             | 143 ------------------
 .../oauth/abstractOAuth.controller.ts         |   5 +-
 .../cli/src/decorators/controller.registry.ts |   6 +-
 .../prometheus-metrics.service.test.ts        |  34 +++--
 .../src/metrics/prometheus-metrics.service.ts |  25 +--
 packages/cli/src/middlewares/bodyParser.ts    |   5 +-
 packages/cli/src/services/frontend.service.ts |  14 +-
 .../telemetry-event-relay.service.ts          |   5 +-
 .../integration/prometheus-metrics.test.ts    |  37 ++++-
 .../cli/test/integration/shared/constants.ts  |   3 +-
 .../decorators/controller.registry.test.ts    |   4 +-
 packages/cli/test/unit/webhooks.test.ts       |   7 +-
 21 files changed, 275 insertions(+), 228 deletions(-)
 create mode 100644 packages/@n8n/config/src/configs/endpoints.ts

diff --git a/packages/@n8n/config/src/configs/endpoints.ts b/packages/@n8n/config/src/configs/endpoints.ts
new file mode 100644
index 0000000000000..7a04a8249f692
--- /dev/null
+++ b/packages/@n8n/config/src/configs/endpoints.ts
@@ -0,0 +1,102 @@
+import { Config, Env, Nested } from '../decorators';
+
+@Config
+class PrometheusMetricsConfig {
+	/** Whether to enable the `/metrics` endpoint to expose Prometheus metrics. */
+	@Env('N8N_METRICS')
+	readonly enable: boolean = false;
+
+	/** Prefix for Prometheus metric names. */
+	@Env('N8N_METRICS_PREFIX')
+	readonly prefix: string = 'n8n_';
+
+	/** Whether to expose system and Node.js metrics. See: https://www.npmjs.com/package/prom-client */
+	@Env('N8N_METRICS_INCLUDE_DEFAULT_METRICS')
+	readonly includeDefaultMetrics = true;
+
+	/** Whether to include a label for workflow ID on workflow metrics. */
+	@Env('N8N_METRICS_INCLUDE_WORKFLOW_ID_LABEL')
+	readonly includeWorkflowIdLabel: boolean = false;
+
+	/** Whether to include a label for node type on node metrics. */
+	@Env('N8N_METRICS_INCLUDE_NODE_TYPE_LABEL')
+	readonly includeNodeTypeLabel: boolean = false;
+
+	/** Whether to include a label for credential type on credential metrics. */
+	@Env('N8N_METRICS_INCLUDE_CREDENTIAL_TYPE_LABEL')
+	readonly includeCredentialTypeLabel: boolean = false;
+
+	/** Whether to expose metrics for API endpoints. See: https://www.npmjs.com/package/express-prom-bundle */
+	@Env('N8N_METRICS_INCLUDE_API_ENDPOINTS')
+	readonly includeApiEndpoints: boolean = false;
+
+	/** Whether to include a label for the path of API endpoint calls. */
+	@Env('N8N_METRICS_INCLUDE_API_PATH_LABEL')
+	readonly includeApiPathLabel: boolean = false;
+
+	/** Whether to include a label for the HTTP method of API endpoint calls. */
+	@Env('N8N_METRICS_INCLUDE_API_METHOD_LABEL')
+	readonly includeApiMethodLabel: boolean = false;
+
+	/** Whether to include a label for the status code of API endpoint calls. */
+	@Env('N8N_METRICS_INCLUDE_API_STATUS_CODE_LABEL')
+	readonly includeApiStatusCodeLabel: boolean = false;
+
+	/** Whether to include metrics for cache hits and misses. */
+	@Env('N8N_METRICS_INCLUDE_CACHE_METRICS')
+	readonly includeCacheMetrics: boolean = false;
+
+	/** Whether to include metrics derived from n8n's internal events */
+	@Env('N8N_METRICS_INCLUDE_MESSAGE_EVENT_BUS_METRICS')
+	readonly includeMessageEventBusMetrics: boolean = false;
+}
+
+@Config
+export class EndpointsConfig {
+	/** Max payload size in MiB */
+	@Env('N8N_PAYLOAD_SIZE_MAX')
+	readonly payloadSizeMax: number = 16;
+
+	@Nested
+	readonly metrics: PrometheusMetricsConfig;
+
+	/** Path segment for REST API endpoints. */
+	@Env('N8N_ENDPOINT_REST')
+	readonly rest: string = 'rest';
+
+	/** Path segment for form endpoints. */
+	@Env('N8N_ENDPOINT_FORM')
+	readonly form: string = 'form';
+
+	/** Path segment for test form endpoints. */
+	@Env('N8N_ENDPOINT_FORM_TEST')
+	readonly formTest: string = 'form-test';
+
+	/** Path segment for waiting form endpoints. */
+	@Env('N8N_ENDPOINT_FORM_WAIT')
+	readonly formWaiting: string = 'form-waiting';
+
+	/** Path segment for webhook endpoints. */
+	@Env('N8N_ENDPOINT_WEBHOOK')
+	readonly webhook: string = 'webhook';
+
+	/** Path segment for test webhook endpoints. */
+	@Env('N8N_ENDPOINT_WEBHOOK_TEST')
+	readonly webhookTest: string = 'webhook-test';
+
+	/** Path segment for waiting webhook endpoints. */
+	@Env('N8N_ENDPOINT_WEBHOOK_WAIT')
+	readonly webhookWaiting: string = 'webhook-waiting';
+
+	/** Whether to disable n8n's UI (frontend). */
+	@Env('N8N_DISABLE_UI')
+	readonly disableUi: boolean = false;
+
+	/** Whether to disable production webhooks on the main process, when using webhook-specific processes. */
+	@Env('N8N_DISABLE_PRODUCTION_MAIN_PROCESS')
+	readonly disableProductionWebhooksOnMainProcess: boolean = false;
+
+	/** Colon-delimited list of additional endpoints to not open the UI on. */
+	@Env('N8N_ADDITIONAL_NON_UI_ROUTES')
+	readonly additionalNonUIRoutes: string = '';
+}
diff --git a/packages/@n8n/config/src/index.ts b/packages/@n8n/config/src/index.ts
index fee6718c6acdb..d7bb09889d5ab 100644
--- a/packages/@n8n/config/src/index.ts
+++ b/packages/@n8n/config/src/index.ts
@@ -10,6 +10,7 @@ import { EventBusConfig } from './configs/event-bus';
 import { NodesConfig } from './configs/nodes';
 import { ExternalStorageConfig } from './configs/external-storage';
 import { WorkflowsConfig } from './configs/workflows';
+import { EndpointsConfig } from './configs/endpoints';
 
 @Config
 class UserManagementConfig {
@@ -71,4 +72,7 @@ export class GlobalConfig {
 	/** HTTP Protocol via which n8n can be reached */
 	@Env('N8N_PROTOCOL')
 	readonly protocol: 'http' | 'https' = 'http';
+
+	@Nested
+	readonly endpoints: EndpointsConfig;
 }
diff --git a/packages/@n8n/config/test/config.test.ts b/packages/@n8n/config/test/config.test.ts
index 97afb0cda405e..a36a74d1e25c7 100644
--- a/packages/@n8n/config/test/config.test.ts
+++ b/packages/@n8n/config/test/config.test.ts
@@ -145,12 +145,44 @@ describe('GlobalConfig', () => {
 			onboardingFlowDisabled: false,
 			callerPolicyDefaultOption: 'workflowsFromSameOwner',
 		},
+		endpoints: {
+			metrics: {
+				enable: false,
+				prefix: 'n8n_',
+				includeWorkflowIdLabel: false,
+				includeDefaultMetrics: true,
+				includeMessageEventBusMetrics: false,
+				includeNodeTypeLabel: false,
+				includeCacheMetrics: false,
+				includeApiEndpoints: false,
+				includeApiPathLabel: false,
+				includeApiMethodLabel: false,
+				includeCredentialTypeLabel: false,
+				includeApiStatusCodeLabel: false,
+			},
+			additionalNonUIRoutes: '',
+			disableProductionWebhooksOnMainProcess: false,
+			disableUi: false,
+			form: 'form',
+			formTest: 'form-test',
+			formWaiting: 'form-waiting',
+			payloadSizeMax: 16,
+			rest: 'rest',
+			webhook: 'webhook',
+			webhookTest: 'webhook-test',
+			webhookWaiting: 'webhook-waiting',
+		},
 	};
 
 	it('should use all default values when no env variables are defined', () => {
 		process.env = {};
 		const config = Container.get(GlobalConfig);
-		expect(config).toEqual(defaultConfig);
+
+		// deepCopy for diff to show plain objects
+		// eslint-disable-next-line n8n-local-rules/no-json-parse-json-stringify
+		const deepCopy = <T>(obj: T): T => JSON.parse(JSON.stringify(obj));
+
+		expect(deepCopy(config)).toEqual(defaultConfig);
 		expect(mockFs.readFileSync).not.toHaveBeenCalled();
 	});
 
diff --git a/packages/cli/src/AbstractServer.ts b/packages/cli/src/AbstractServer.ts
index bef45bb1433d2..ab150e2947328 100644
--- a/packages/cli/src/AbstractServer.ts
+++ b/packages/cli/src/AbstractServer.ts
@@ -34,7 +34,7 @@ export abstract class AbstractServer {
 
 	protected externalHooks: ExternalHooks;
 
-	protected protocol = Container.get(GlobalConfig).protocol;
+	protected globalConfig = Container.get(GlobalConfig);
 
 	protected sslKey: string;
 
@@ -74,15 +74,15 @@ export abstract class AbstractServer {
 		this.sslKey = config.getEnv('ssl_key');
 		this.sslCert = config.getEnv('ssl_cert');
 
-		this.restEndpoint = config.getEnv('endpoints.rest');
+		this.restEndpoint = this.globalConfig.endpoints.rest;
 
-		this.endpointForm = config.getEnv('endpoints.form');
-		this.endpointFormTest = config.getEnv('endpoints.formTest');
-		this.endpointFormWaiting = config.getEnv('endpoints.formWaiting');
+		this.endpointForm = this.globalConfig.endpoints.form;
+		this.endpointFormTest = this.globalConfig.endpoints.formTest;
+		this.endpointFormWaiting = this.globalConfig.endpoints.formWaiting;
 
-		this.endpointWebhook = config.getEnv('endpoints.webhook');
-		this.endpointWebhookTest = config.getEnv('endpoints.webhookTest');
-		this.endpointWebhookWaiting = config.getEnv('endpoints.webhookWaiting');
+		this.endpointWebhook = this.globalConfig.endpoints.webhook;
+		this.endpointWebhookTest = this.globalConfig.endpoints.webhookTest;
+		this.endpointWebhookWaiting = this.globalConfig.endpoints.webhookWaiting;
 
 		this.uniqueInstanceId = generateHostInstanceId(instanceType);
 
@@ -134,7 +134,8 @@ export abstract class AbstractServer {
 	}
 
 	async init(): Promise<void> {
-		const { app, protocol, sslKey, sslCert } = this;
+		const { app, sslKey, sslCert } = this;
+		const { protocol } = this.globalConfig;
 
 		if (protocol === 'https' && sslKey && sslCert) {
 			const https = await import('https');
@@ -261,14 +262,16 @@ export abstract class AbstractServer {
 			return;
 		}
 
-		this.logger.debug(`Shutting down ${this.protocol} server`);
+		const { protocol } = this.globalConfig;
+
+		this.logger.debug(`Shutting down ${protocol} server`);
 
 		this.server.close((error) => {
 			if (error) {
-				this.logger.error(`Error while shutting down ${this.protocol} server`, { error });
+				this.logger.error(`Error while shutting down ${protocol} server`, { error });
 			}
 
-			this.logger.debug(`${this.protocol} server shut down`);
+			this.logger.debug(`${protocol} server shut down`);
 		});
 	}
 }
diff --git a/packages/cli/src/Server.ts b/packages/cli/src/Server.ts
index dc63d697e77b8..4c9628bc1bf1d 100644
--- a/packages/cli/src/Server.ts
+++ b/packages/cli/src/Server.ts
@@ -6,7 +6,6 @@ import { promisify } from 'util';
 import cookieParser from 'cookie-parser';
 import express from 'express';
 import helmet from 'helmet';
-import { GlobalConfig } from '@n8n/config';
 import { InstanceSettings } from 'n8n-core';
 import type { IN8nUISettings } from 'n8n-workflow';
 
@@ -81,17 +80,16 @@ export class Server extends AbstractServer {
 		private readonly loadNodesAndCredentials: LoadNodesAndCredentials,
 		private readonly orchestrationService: OrchestrationService,
 		private readonly postHogClient: PostHogClient,
-		private readonly globalConfig: GlobalConfig,
 		private readonly eventService: EventService,
 	) {
 		super('main');
 
 		this.testWebhooksEnabled = true;
-		this.webhooksEnabled = !config.getEnv('endpoints.disableProductionWebhooksOnMainProcess');
+		this.webhooksEnabled = !this.globalConfig.endpoints.disableProductionWebhooksOnMainProcess;
 	}
 
 	async start() {
-		if (!config.getEnv('endpoints.disableUi')) {
+		if (!this.globalConfig.endpoints.disableUi) {
 			const { FrontendService } = await import('@/services/frontend.service');
 			this.frontendService = Container.get(FrontendService);
 		}
@@ -133,7 +131,7 @@ export class Server extends AbstractServer {
 			await import('@/controllers/mfa.controller');
 		}
 
-		if (!config.getEnv('endpoints.disableUi')) {
+		if (!this.globalConfig.endpoints.disableUi) {
 			await import('@/controllers/cta.controller');
 		}
 
@@ -167,7 +165,7 @@ export class Server extends AbstractServer {
 	}
 
 	async configure(): Promise<void> {
-		if (config.getEnv('endpoints.metrics.enable')) {
+		if (this.globalConfig.endpoints.metrics.enable) {
 			const { PrometheusMetricsService } = await import('@/metrics/prometheus-metrics.service');
 			await Container.get(PrometheusMetricsService).init(this.app);
 		}
@@ -307,7 +305,8 @@ export class Server extends AbstractServer {
 			this.app.use('/icons/@:scope/:packageName/*/*.(svg|png)', serveIcons);
 			this.app.use('/icons/:packageName/*/*.(svg|png)', serveIcons);
 
-			const isTLSEnabled = this.protocol === 'https' && !!(this.sslKey && this.sslCert);
+			const isTLSEnabled =
+				this.globalConfig.protocol === 'https' && !!(this.sslKey && this.sslCert);
 			const isPreviewMode = process.env.N8N_PREVIEW_MODE === 'true';
 			const securityHeadersMiddleware = helmet({
 				contentSecurityPolicy: false,
@@ -341,7 +340,7 @@ export class Server extends AbstractServer {
 				this.restEndpoint,
 				this.endpointPresetCredentials,
 				isApiEnabled() ? '' : publicApiEndpoint,
-				...config.getEnv('endpoints.additionalNonUIRoutes').split(':'),
+				...this.globalConfig.endpoints.additionalNonUIRoutes.split(':'),
 			].filter((u) => !!u);
 			const nonUIRoutesRegex = new RegExp(`^/(${nonUIRoutes.join('|')})/?.*$`);
 			const historyApiHandler: express.RequestHandler = (req, res, next) => {
diff --git a/packages/cli/src/WorkflowExecuteAdditionalData.ts b/packages/cli/src/WorkflowExecuteAdditionalData.ts
index 98ad9acde2936..f4acd61b6aa55 100644
--- a/packages/cli/src/WorkflowExecuteAdditionalData.ts
+++ b/packages/cli/src/WorkflowExecuteAdditionalData.ts
@@ -1002,23 +1002,19 @@ export async function getBase(
 ): Promise<IWorkflowExecuteAdditionalData> {
 	const urlBaseWebhook = Container.get(UrlService).getWebhookBaseUrl();
 
-	const formWaitingBaseUrl = urlBaseWebhook + config.getEnv('endpoints.formWaiting');
-
-	const webhookBaseUrl = urlBaseWebhook + config.getEnv('endpoints.webhook');
-	const webhookTestBaseUrl = urlBaseWebhook + config.getEnv('endpoints.webhookTest');
-	const webhookWaitingBaseUrl = urlBaseWebhook + config.getEnv('endpoints.webhookWaiting');
+	const globalConfig = Container.get(GlobalConfig);
 
 	const variables = await WorkflowHelpers.getVariables();
 
 	return {
 		credentialsHelper: Container.get(CredentialsHelper),
 		executeWorkflow,
-		restApiUrl: urlBaseWebhook + config.getEnv('endpoints.rest'),
+		restApiUrl: urlBaseWebhook + globalConfig.endpoints.rest,
 		instanceBaseUrl: urlBaseWebhook,
-		formWaitingBaseUrl,
-		webhookBaseUrl,
-		webhookWaitingBaseUrl,
-		webhookTestBaseUrl,
+		formWaitingBaseUrl: globalConfig.endpoints.formWaiting,
+		webhookBaseUrl: globalConfig.endpoints.webhook,
+		webhookWaitingBaseUrl: globalConfig.endpoints.webhookWaiting,
+		webhookTestBaseUrl: globalConfig.endpoints.webhookTest,
 		currentNodeParameters,
 		executionTimeoutTimestamp,
 		userId,
diff --git a/packages/cli/src/auth/auth.service.ts b/packages/cli/src/auth/auth.service.ts
index 8cbb0c01cfa21..e2487e6f6f9a6 100644
--- a/packages/cli/src/auth/auth.service.ts
+++ b/packages/cli/src/auth/auth.service.ts
@@ -1,4 +1,4 @@
-import { Service } from 'typedi';
+import Container, { Service } from 'typedi';
 import type { NextFunction, Response } from 'express';
 import { createHash } from 'crypto';
 import { JsonWebTokenError, TokenExpiredError } from 'jsonwebtoken';
@@ -14,6 +14,7 @@ import { Logger } from '@/Logger';
 import type { AuthenticatedRequest } from '@/requests';
 import { JwtService } from '@/services/jwt.service';
 import { UrlService } from '@/services/url.service';
+import { GlobalConfig } from '@n8n/config';
 
 interface AuthJwtPayload {
 	/** User Id */
@@ -33,7 +34,7 @@ interface PasswordResetToken {
 	hash: string;
 }
 
-const restEndpoint = config.get('endpoints.rest');
+const restEndpoint = Container.get(GlobalConfig).endpoints.rest;
 // The browser-id check needs to be skipped on these endpoints
 const skipBrowserIdCheckEndpoints = [
 	// we need to exclude push endpoint because we can't send custom header on websocket requests
diff --git a/packages/cli/src/commands/BaseCommand.ts b/packages/cli/src/commands/BaseCommand.ts
index b00d314b91212..4cebc7fbb66f6 100644
--- a/packages/cli/src/commands/BaseCommand.ts
+++ b/packages/cli/src/commands/BaseCommand.ts
@@ -44,7 +44,7 @@ export abstract class BaseCommand extends Command {
 
 	protected license: License;
 
-	private globalConfig = Container.get(GlobalConfig);
+	protected globalConfig = Container.get(GlobalConfig);
 
 	/**
 	 * How long to wait for graceful shutdown before force killing the process.
diff --git a/packages/cli/src/commands/start.ts b/packages/cli/src/commands/start.ts
index c35344326e8e7..4d7cd888b4cc0 100644
--- a/packages/cli/src/commands/start.ts
+++ b/packages/cli/src/commands/start.ts
@@ -124,8 +124,8 @@ export class Start extends BaseCommand {
 
 	private async generateStaticAssets() {
 		// Read the index file and replace the path placeholder
-		const n8nPath = Container.get(GlobalConfig).path;
-		const restEndpoint = config.getEnv('endpoints.rest');
+		const n8nPath = this.globalConfig.path;
+
 		const hooksUrls = config.getEnv('externalFrontendHooksUrls');
 
 		let scriptsString = '';
@@ -151,7 +151,9 @@ export class Start extends BaseCommand {
 				];
 				if (filePath.endsWith('index.html')) {
 					streams.push(
-						replaceStream('{{REST_ENDPOINT}}', restEndpoint, { ignoreCase: false }),
+						replaceStream('{{REST_ENDPOINT}}', this.globalConfig.endpoints.rest, {
+							ignoreCase: false,
+						}),
 						replaceStream(closingTitleTag, closingTitleTag + scriptsString, {
 							ignoreCase: false,
 						}),
@@ -201,7 +203,7 @@ export class Start extends BaseCommand {
 		this.initWorkflowHistory();
 		this.logger.debug('Workflow history init complete');
 
-		if (!config.getEnv('endpoints.disableUi')) {
+		if (!this.globalConfig.endpoints.disableUi) {
 			await this.generateStaticAssets();
 		}
 	}
diff --git a/packages/cli/src/config/schema.ts b/packages/cli/src/config/schema.ts
index 0b689b8f4cfbe..068317e4918f6 100644
--- a/packages/cli/src/config/schema.ts
+++ b/packages/cli/src/config/schema.ts
@@ -355,149 +355,6 @@ export const schema = {
 		},
 	},
 
-	endpoints: {
-		payloadSizeMax: {
-			format: Number,
-			default: 16,
-			env: 'N8N_PAYLOAD_SIZE_MAX',
-			doc: 'Maximum payload size in MB.',
-		},
-		metrics: {
-			enable: {
-				format: Boolean,
-				default: false,
-				env: 'N8N_METRICS',
-				doc: 'Enable /metrics endpoint. Default: false',
-			},
-			prefix: {
-				format: String,
-				default: 'n8n_',
-				env: 'N8N_METRICS_PREFIX',
-				doc: 'An optional prefix for metric names. Default: n8n_',
-			},
-			includeDefaultMetrics: {
-				format: Boolean,
-				default: true,
-				env: 'N8N_METRICS_INCLUDE_DEFAULT_METRICS',
-				doc: 'Whether to expose default system and node.js metrics. Default: true',
-			},
-			includeWorkflowIdLabel: {
-				format: Boolean,
-				default: false,
-				env: 'N8N_METRICS_INCLUDE_WORKFLOW_ID_LABEL',
-				doc: 'Whether to include a label for the workflow ID on workflow metrics. Default: false',
-			},
-			includeNodeTypeLabel: {
-				format: Boolean,
-				default: false,
-				env: 'N8N_METRICS_INCLUDE_NODE_TYPE_LABEL',
-				doc: 'Whether to include a label for the node type on node metrics. Default: false',
-			},
-			includeCredentialTypeLabel: {
-				format: Boolean,
-				default: false,
-				env: 'N8N_METRICS_INCLUDE_CREDENTIAL_TYPE_LABEL',
-				doc: 'Whether to include a label for the credential type on credential metrics. Default: false',
-			},
-			includeApiEndpoints: {
-				format: Boolean,
-				default: false,
-				env: 'N8N_METRICS_INCLUDE_API_ENDPOINTS',
-				doc: 'Whether to expose metrics for API endpoints. Default: false',
-			},
-			includeApiPathLabel: {
-				format: Boolean,
-				default: false,
-				env: 'N8N_METRICS_INCLUDE_API_PATH_LABEL',
-				doc: 'Whether to include a label for the path of API invocations. Default: false',
-			},
-			includeApiMethodLabel: {
-				format: Boolean,
-				default: false,
-				env: 'N8N_METRICS_INCLUDE_API_METHOD_LABEL',
-				doc: 'Whether to include a label for the HTTP method (GET, POST, ...) of API invocations. Default: false',
-			},
-			includeApiStatusCodeLabel: {
-				format: Boolean,
-				default: false,
-				env: 'N8N_METRICS_INCLUDE_API_STATUS_CODE_LABEL',
-				doc: 'Whether to include a label for the HTTP status code (200, 404, ...) of API invocations. Default: false',
-			},
-			includeCacheMetrics: {
-				format: Boolean,
-				default: false,
-				env: 'N8N_METRICS_INCLUDE_CACHE_METRICS',
-				doc: 'Whether to include metrics for cache hits and misses. Default: false',
-			},
-			includeMessageEventBusMetrics: {
-				format: Boolean,
-				default: true,
-				env: 'N8N_METRICS_INCLUDE_MESSAGE_EVENT_BUS_METRICS',
-				doc: 'Whether to include metrics for events. Default: false',
-			},
-		},
-		rest: {
-			format: String,
-			default: 'rest',
-			env: 'N8N_ENDPOINT_REST',
-			doc: 'Path for rest endpoint',
-		},
-		form: {
-			format: String,
-			default: 'form',
-			env: 'N8N_ENDPOINT_FORM',
-			doc: 'Path for form endpoint',
-		},
-		formTest: {
-			format: String,
-			default: 'form-test',
-			env: 'N8N_ENDPOINT_FORM_TEST',
-			doc: 'Path for test form endpoint',
-		},
-		formWaiting: {
-			format: String,
-			default: 'form-waiting',
-			env: 'N8N_ENDPOINT_FORM_WAIT',
-			doc: 'Path for waiting form endpoint',
-		},
-		webhook: {
-			format: String,
-			default: 'webhook',
-			env: 'N8N_ENDPOINT_WEBHOOK',
-			doc: 'Path for webhook endpoint',
-		},
-		webhookWaiting: {
-			format: String,
-			default: 'webhook-waiting',
-			env: 'N8N_ENDPOINT_WEBHOOK_WAIT',
-			doc: 'Path for waiting-webhook endpoint',
-		},
-		webhookTest: {
-			format: String,
-			default: 'webhook-test',
-			env: 'N8N_ENDPOINT_WEBHOOK_TEST',
-			doc: 'Path for test-webhook endpoint',
-		},
-		disableUi: {
-			format: Boolean,
-			default: false,
-			env: 'N8N_DISABLE_UI',
-			doc: 'Disable N8N UI (Frontend).',
-		},
-		disableProductionWebhooksOnMainProcess: {
-			format: Boolean,
-			default: false,
-			env: 'N8N_DISABLE_PRODUCTION_MAIN_PROCESS',
-			doc: 'Disable production webhooks from main process. This helps ensures no http traffic load to main process when using webhook-specific processes.',
-		},
-		additionalNonUIRoutes: {
-			doc: 'Additional endpoints to not open the UI on. Multiple endpoints can be separated by colon (":")',
-			format: String,
-			default: '',
-			env: 'N8N_ADDITIONAL_NON_UI_ROUTES',
-		},
-	},
-
 	workflowTagsDisabled: {
 		format: Boolean,
 		default: false,
diff --git a/packages/cli/src/controllers/oauth/abstractOAuth.controller.ts b/packages/cli/src/controllers/oauth/abstractOAuth.controller.ts
index 9454b4ee7d1ce..f9ffd591feb22 100644
--- a/packages/cli/src/controllers/oauth/abstractOAuth.controller.ts
+++ b/packages/cli/src/controllers/oauth/abstractOAuth.controller.ts
@@ -5,7 +5,6 @@ import { Credentials } from 'n8n-core';
 import type { ICredentialDataDecryptedObject, IWorkflowExecuteAdditionalData } from 'n8n-workflow';
 import { jsonParse, ApplicationError } from 'n8n-workflow';
 
-import config from '@/config';
 import type { CredentialsEntity } from '@db/entities/CredentialsEntity';
 import type { User } from '@db/entities/User';
 import { CredentialsRepository } from '@db/repositories/credentials.repository';
@@ -20,6 +19,7 @@ import { ExternalHooks } from '@/ExternalHooks';
 import { UrlService } from '@/services/url.service';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 import { NotFoundError } from '@/errors/response-errors/not-found.error';
+import { GlobalConfig } from '@n8n/config';
 
 export interface CsrfStateParam {
 	cid: string;
@@ -37,10 +37,11 @@ export abstract class AbstractOAuthController {
 		private readonly credentialsRepository: CredentialsRepository,
 		private readonly sharedCredentialsRepository: SharedCredentialsRepository,
 		private readonly urlService: UrlService,
+		private readonly globalConfig: GlobalConfig,
 	) {}
 
 	get baseUrl() {
-		const restUrl = `${this.urlService.getInstanceBaseUrl()}/${config.getEnv('endpoints.rest')}`;
+		const restUrl = `${this.urlService.getInstanceBaseUrl()}/${this.globalConfig.endpoints.rest}`;
 		return `${restUrl}/oauth${this.oauthVersion}-credential`;
 	}
 
diff --git a/packages/cli/src/decorators/controller.registry.ts b/packages/cli/src/decorators/controller.registry.ts
index c012922c16728..4173f9309ef3c 100644
--- a/packages/cli/src/decorators/controller.registry.ts
+++ b/packages/cli/src/decorators/controller.registry.ts
@@ -4,7 +4,6 @@ import type { Application, Request, Response, RequestHandler } from 'express';
 import { rateLimit as expressRateLimit } from 'express-rate-limit';
 
 import { AuthService } from '@/auth/auth.service';
-import config from '@/config';
 import { UnauthenticatedError } from '@/errors/response-errors/unauthenticated.error';
 import { inProduction, RESPONSE_ERROR_MESSAGES } from '@/constants';
 import type { BooleanLicenseFeature } from '@/Interfaces';
@@ -12,7 +11,7 @@ import { License } from '@/License';
 import type { AuthenticatedRequest } from '@/requests';
 import { send } from '@/ResponseHelper'; // TODO: move `ResponseHelper.send` to this file
 import { userHasScope } from '@/permissions/checkAccess';
-
+import { GlobalConfig } from '@n8n/config';
 import type {
 	AccessScope,
 	Controller,
@@ -52,6 +51,7 @@ export class ControllerRegistry {
 	constructor(
 		private readonly license: License,
 		private readonly authService: AuthService,
+		private readonly globalConfig: GlobalConfig,
 	) {}
 
 	activate(app: Application) {
@@ -64,7 +64,7 @@ export class ControllerRegistry {
 		const metadata = registry.get(controllerClass)!;
 
 		const router = Router({ mergeParams: true });
-		const prefix = `/${config.getEnv('endpoints.rest')}/${metadata.basePath}`
+		const prefix = `/${this.globalConfig.endpoints.rest}/${metadata.basePath}`
 			.replace(/\/+/g, '/')
 			.replace(/\/$/, '');
 		app.use(prefix, router);
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 8b89878203ed5..219170ac085a8 100644
--- a/packages/cli/src/metrics/__tests__/prometheus-metrics.service.test.ts
+++ b/packages/cli/src/metrics/__tests__/prometheus-metrics.service.test.ts
@@ -5,6 +5,8 @@ import { mock } from 'jest-mock-extended';
 import { PrometheusMetricsService } from '../prometheus-metrics.service';
 import type express from 'express';
 import type { MessageEventBus } from '@/eventbus/MessageEventBus/MessageEventBus';
+import { mockInstance } from '@test/mocking';
+import { GlobalConfig } from '@n8n/config';
 
 const mockMiddleware = (
 	_req: express.Request,
@@ -16,13 +18,27 @@ jest.mock('prom-client');
 jest.mock('express-prom-bundle', () => jest.fn(() => mockMiddleware));
 
 describe('PrometheusMetricsService', () => {
-	beforeEach(() => {
-		config.load(config.default);
+	const globalConfig = mockInstance(GlobalConfig, {
+		endpoints: {
+			metrics: {
+				prefix: 'n8n_',
+				includeDefaultMetrics: true,
+				includeApiEndpoints: true,
+				includeCacheMetrics: true,
+				includeMessageEventBusMetrics: true,
+				includeCredentialTypeLabel: false,
+				includeNodeTypeLabel: false,
+				includeWorkflowIdLabel: false,
+				includeApiPathLabel: true,
+				includeApiMethodLabel: true,
+				includeApiStatusCodeLabel: true,
+			},
+		},
 	});
 
 	describe('init', () => {
 		it('should set up `n8n_version_info`', async () => {
-			const service = new PrometheusMetricsService(mock(), mock());
+			const service = new PrometheusMetricsService(mock(), mock(), globalConfig);
 
 			await service.init(mock<express.Application>());
 
@@ -34,7 +50,7 @@ describe('PrometheusMetricsService', () => {
 		});
 
 		it('should set up default metrics collection with `prom-client`', async () => {
-			const service = new PrometheusMetricsService(mock(), mock());
+			const service = new PrometheusMetricsService(mock(), mock(), globalConfig);
 
 			await service.init(mock<express.Application>());
 
@@ -43,7 +59,7 @@ describe('PrometheusMetricsService', () => {
 
 		it('should set up `n8n_cache_hits_total`', async () => {
 			config.set('endpoints.metrics.includeCacheMetrics', true);
-			const service = new PrometheusMetricsService(mock(), mock());
+			const service = new PrometheusMetricsService(mock(), mock(), globalConfig);
 
 			await service.init(mock<express.Application>());
 
@@ -58,7 +74,7 @@ describe('PrometheusMetricsService', () => {
 
 		it('should set up `n8n_cache_misses_total`', async () => {
 			config.set('endpoints.metrics.includeCacheMetrics', true);
-			const service = new PrometheusMetricsService(mock(), mock());
+			const service = new PrometheusMetricsService(mock(), mock(), globalConfig);
 
 			await service.init(mock<express.Application>());
 
@@ -73,7 +89,7 @@ describe('PrometheusMetricsService', () => {
 
 		it('should set up `n8n_cache_updates_total`', async () => {
 			config.set('endpoints.metrics.includeCacheMetrics', true);
-			const service = new PrometheusMetricsService(mock(), mock());
+			const service = new PrometheusMetricsService(mock(), mock(), globalConfig);
 
 			await service.init(mock<express.Application>());
 
@@ -91,7 +107,7 @@ describe('PrometheusMetricsService', () => {
 			config.set('endpoints.metrics.includeApiPathLabel', true);
 			config.set('endpoints.metrics.includeApiMethodLabel', true);
 			config.set('endpoints.metrics.includeApiStatusCodeLabel', true);
-			const service = new PrometheusMetricsService(mock(), mock());
+			const service = new PrometheusMetricsService(mock(), mock(), globalConfig);
 
 			const app = mock<express.Application>();
 
@@ -122,7 +138,7 @@ describe('PrometheusMetricsService', () => {
 
 		it('should set up event bus metrics', async () => {
 			const eventBus = mock<MessageEventBus>();
-			const service = new PrometheusMetricsService(mock(), eventBus);
+			const service = new PrometheusMetricsService(mock(), eventBus, globalConfig);
 
 			await service.init(mock<express.Application>());
 
diff --git a/packages/cli/src/metrics/prometheus-metrics.service.ts b/packages/cli/src/metrics/prometheus-metrics.service.ts
index b2d38424bccf7..1444f6f694bbd 100644
--- a/packages/cli/src/metrics/prometheus-metrics.service.ts
+++ b/packages/cli/src/metrics/prometheus-metrics.service.ts
@@ -1,4 +1,3 @@
-import config from '@/config';
 import { N8N_VERSION } from '@/constants';
 import type express from 'express';
 import promBundle from 'express-prom-bundle';
@@ -11,32 +10,34 @@ import { MessageEventBus } from '@/eventbus/MessageEventBus/MessageEventBus';
 import { EventMessageTypeNames } from 'n8n-workflow';
 import type { EventMessageTypes } from '@/eventbus';
 import type { Includes, MetricCategory, MetricLabel } from './types';
+import { GlobalConfig } from '@n8n/config';
 
 @Service()
 export class PrometheusMetricsService {
 	constructor(
 		private readonly cacheService: CacheService,
 		private readonly eventBus: MessageEventBus,
+		private readonly globalConfig: GlobalConfig,
 	) {}
 
 	private readonly counters: { [key: string]: Counter<string> | null } = {};
 
-	private readonly prefix = config.getEnv('endpoints.metrics.prefix');
+	private readonly prefix = this.globalConfig.endpoints.metrics.prefix;
 
 	private readonly includes: Includes = {
 		metrics: {
-			default: config.getEnv('endpoints.metrics.includeDefaultMetrics'),
-			routes: config.getEnv('endpoints.metrics.includeApiEndpoints'),
-			cache: config.getEnv('endpoints.metrics.includeCacheMetrics'),
-			logs: config.getEnv('endpoints.metrics.includeMessageEventBusMetrics'),
+			default: this.globalConfig.endpoints.metrics.includeDefaultMetrics,
+			routes: this.globalConfig.endpoints.metrics.includeApiEndpoints,
+			cache: this.globalConfig.endpoints.metrics.includeCacheMetrics,
+			logs: this.globalConfig.endpoints.metrics.includeMessageEventBusMetrics,
 		},
 		labels: {
-			credentialsType: config.getEnv('endpoints.metrics.includeCredentialTypeLabel'),
-			nodeType: config.getEnv('endpoints.metrics.includeNodeTypeLabel'),
-			workflowId: config.getEnv('endpoints.metrics.includeWorkflowIdLabel'),
-			apiPath: config.getEnv('endpoints.metrics.includeApiPathLabel'),
-			apiMethod: config.getEnv('endpoints.metrics.includeApiMethodLabel'),
-			apiStatusCode: config.getEnv('endpoints.metrics.includeApiStatusCodeLabel'),
+			credentialsType: this.globalConfig.endpoints.metrics.includeCredentialTypeLabel,
+			nodeType: this.globalConfig.endpoints.metrics.includeNodeTypeLabel,
+			workflowId: this.globalConfig.endpoints.metrics.includeWorkflowIdLabel,
+			apiPath: this.globalConfig.endpoints.metrics.includeApiPathLabel,
+			apiMethod: this.globalConfig.endpoints.metrics.includeApiMethodLabel,
+			apiStatusCode: this.globalConfig.endpoints.metrics.includeApiStatusCodeLabel,
 		},
 	};
 
diff --git a/packages/cli/src/middlewares/bodyParser.ts b/packages/cli/src/middlewares/bodyParser.ts
index d48bf593cceee..5efe388e6f1e1 100644
--- a/packages/cli/src/middlewares/bodyParser.ts
+++ b/packages/cli/src/middlewares/bodyParser.ts
@@ -6,8 +6,9 @@ import { parse as parseQueryString } from 'querystring';
 import { Parser as XmlParser } from 'xml2js';
 import { parseIncomingMessage } from 'n8n-core';
 import { jsonParse } from 'n8n-workflow';
-import config from '@/config';
 import { UnprocessableRequestError } from '@/errors/response-errors/unprocessable.error';
+import { GlobalConfig } from '@n8n/config';
+import Container from 'typedi';
 
 const xmlParser = new XmlParser({
 	async: true,
@@ -16,7 +17,7 @@ const xmlParser = new XmlParser({
 	explicitArray: false, // Only put properties in array if length > 1
 });
 
-const payloadSizeMax = config.getEnv('endpoints.payloadSizeMax');
+const payloadSizeMax = Container.get(GlobalConfig).endpoints.payloadSizeMax;
 export const rawBodyReader: RequestHandler = async (req, _res, next) => {
 	parseIncomingMessage(req);
 
diff --git a/packages/cli/src/services/frontend.service.ts b/packages/cli/src/services/frontend.service.ts
index 4ada98a9cf7d7..7cd9843c1d97f 100644
--- a/packages/cli/src/services/frontend.service.ts
+++ b/packages/cli/src/services/frontend.service.ts
@@ -66,7 +66,7 @@ export class FrontendService {
 
 	private initSettings() {
 		const instanceBaseUrl = this.urlService.getInstanceBaseUrl();
-		const restEndpoint = config.getEnv('endpoints.rest');
+		const restEndpoint = this.globalConfig.endpoints.rest;
 
 		const telemetrySettings: ITelemetrySettings = {
 			enabled: config.getEnv('diagnostics.enabled'),
@@ -88,11 +88,11 @@ export class FrontendService {
 			isDocker: this.isDocker(),
 			databaseType: this.globalConfig.database.type,
 			previewMode: process.env.N8N_PREVIEW_MODE === 'true',
-			endpointForm: config.getEnv('endpoints.form'),
-			endpointFormTest: config.getEnv('endpoints.formTest'),
-			endpointFormWaiting: config.getEnv('endpoints.formWaiting'),
-			endpointWebhook: config.getEnv('endpoints.webhook'),
-			endpointWebhookTest: config.getEnv('endpoints.webhookTest'),
+			endpointForm: this.globalConfig.endpoints.form,
+			endpointFormTest: this.globalConfig.endpoints.formTest,
+			endpointFormWaiting: this.globalConfig.endpoints.formWaiting,
+			endpointWebhook: this.globalConfig.endpoints.webhook,
+			endpointWebhookTest: this.globalConfig.endpoints.webhookTest,
 			saveDataErrorExecution: config.getEnv('executions.saveDataOnError'),
 			saveDataSuccessExecution: config.getEnv('executions.saveDataOnSuccess'),
 			saveManualExecutions: config.getEnv('executions.saveDataManualExecutions'),
@@ -246,7 +246,7 @@ export class FrontendService {
 	getSettings(pushRef?: string): IN8nUISettings {
 		this.internalHooks.onFrontendSettingsAPI(pushRef);
 
-		const restEndpoint = config.getEnv('endpoints.rest');
+		const restEndpoint = this.globalConfig.endpoints.rest;
 
 		// Update all urls, in case `WEBHOOK_URL` was updated by `--tunnel`
 		const instanceBaseUrl = this.urlService.getInstanceBaseUrl();
diff --git a/packages/cli/src/telemetry/telemetry-event-relay.service.ts b/packages/cli/src/telemetry/telemetry-event-relay.service.ts
index bb1d4b8d560a2..97c30cae40920 100644
--- a/packages/cli/src/telemetry/telemetry-event-relay.service.ts
+++ b/packages/cli/src/telemetry/telemetry-event-relay.service.ts
@@ -444,9 +444,8 @@ export class TelemetryEventRelay {
 			version_cli: N8N_VERSION,
 			db_type: this.globalConfig.database.type,
 			n8n_version_notifications_enabled: this.globalConfig.versionNotifications.enabled,
-			n8n_disable_production_main_process: config.getEnv(
-				'endpoints.disableProductionWebhooksOnMainProcess',
-			),
+			n8n_disable_production_main_process:
+				this.globalConfig.endpoints.disableProductionWebhooksOnMainProcess,
 			system_info: {
 				os: {
 					type: os.type(),
diff --git a/packages/cli/test/integration/prometheus-metrics.test.ts b/packages/cli/test/integration/prometheus-metrics.test.ts
index 68c8756a86ec0..4c00a98f74a49 100644
--- a/packages/cli/test/integration/prometheus-metrics.test.ts
+++ b/packages/cli/test/integration/prometheus-metrics.test.ts
@@ -2,17 +2,48 @@ import { Container } from 'typedi';
 import { parse as semverParse } from 'semver';
 import request, { type Response } from 'supertest';
 
-import config from '@/config';
 import { N8N_VERSION } from '@/constants';
 import { PrometheusMetricsService } from '@/metrics/prometheus-metrics.service';
 import { setupTestServer } from './shared/utils';
+import { mockInstance } from '@test/mocking';
+import { GlobalConfig } from '@n8n/config';
 
 jest.unmock('@/eventbus/MessageEventBus/MessageEventBus');
 
 const toLines = (response: Response) => response.text.trim().split('\n');
 
-config.set('endpoints.metrics.enable', true);
-config.set('endpoints.metrics.prefix', 'n8n_test_');
+mockInstance(GlobalConfig, {
+	database: {
+		type: 'sqlite',
+		sqlite: {
+			database: 'database.sqlite',
+			enableWAL: false,
+			executeVacuumOnStartup: false,
+			poolSize: 0,
+		},
+		logging: {
+			enabled: false,
+			maxQueryExecutionTime: 0,
+			options: 'error',
+		},
+		tablePrefix: '',
+	},
+	endpoints: {
+		metrics: {
+			prefix: 'n8n_test_',
+			includeDefaultMetrics: true,
+			includeApiEndpoints: true,
+			includeCacheMetrics: true,
+			includeMessageEventBusMetrics: true,
+			includeCredentialTypeLabel: false,
+			includeNodeTypeLabel: false,
+			includeWorkflowIdLabel: false,
+			includeApiPathLabel: true,
+			includeApiMethodLabel: true,
+			includeApiStatusCodeLabel: true,
+		},
+	},
+});
 
 const server = setupTestServer({ endpointGroups: ['metrics'] });
 const agent = request.agent(server.app);
diff --git a/packages/cli/test/integration/shared/constants.ts b/packages/cli/test/integration/shared/constants.ts
index caa3667c23012..5fffacbd11788 100644
--- a/packages/cli/test/integration/shared/constants.ts
+++ b/packages/cli/test/integration/shared/constants.ts
@@ -1,8 +1,7 @@
-import config from '@/config';
 import { GlobalConfig } from '@n8n/config';
 import Container from 'typedi';
 
-export const REST_PATH_SEGMENT = config.getEnv('endpoints.rest');
+export const REST_PATH_SEGMENT = Container.get(GlobalConfig).endpoints.rest;
 
 export const PUBLIC_API_REST_PATH_SEGMENT = Container.get(GlobalConfig).publicApi.path;
 
diff --git a/packages/cli/test/unit/decorators/controller.registry.test.ts b/packages/cli/test/unit/decorators/controller.registry.test.ts
index 04b4884dcc331..05a97aab5378e 100644
--- a/packages/cli/test/unit/decorators/controller.registry.test.ts
+++ b/packages/cli/test/unit/decorators/controller.registry.test.ts
@@ -10,16 +10,18 @@ import { ControllerRegistry, Get, Licensed, RestController } from '@/decorators'
 import type { AuthService } from '@/auth/auth.service';
 import type { License } from '@/License';
 import type { SuperAgentTest } from '@test-integration/types';
+import type { GlobalConfig } from '@n8n/config';
 
 describe('ControllerRegistry', () => {
 	const license = mock<License>();
 	const authService = mock<AuthService>();
+	const globalConfig = mock<GlobalConfig>({ endpoints: { rest: 'rest' } });
 	let agent: SuperAgentTest;
 
 	beforeEach(() => {
 		jest.resetAllMocks();
 		const app = express();
-		new ControllerRegistry(license, authService).activate(app);
+		new ControllerRegistry(license, authService, globalConfig).activate(app);
 		agent = testAgent(app);
 	});
 
diff --git a/packages/cli/test/unit/webhooks.test.ts b/packages/cli/test/unit/webhooks.test.ts
index 5fe8f937de660..c891588597ac5 100644
--- a/packages/cli/test/unit/webhooks.test.ts
+++ b/packages/cli/test/unit/webhooks.test.ts
@@ -2,7 +2,6 @@ import type SuperAgentTest from 'supertest/lib/agent';
 import { agent as testAgent } from 'supertest';
 import { mock } from 'jest-mock-extended';
 
-import config from '@/config';
 import { AbstractServer } from '@/AbstractServer';
 import { ActiveWebhooks } from '@/ActiveWebhooks';
 import { ExternalHooks } from '@/ExternalHooks';
@@ -13,6 +12,8 @@ import { WaitingForms } from '@/WaitingForms';
 import type { IResponseCallbackData } from '@/Interfaces';
 
 import { mockInstance } from '../shared/mocking';
+import { GlobalConfig } from '@n8n/config';
+import Container from 'typedi';
 
 let agent: SuperAgentTest;
 
@@ -46,7 +47,7 @@ describe('WebhookServer', () => {
 		for (const [key, manager] of tests) {
 			describe(`for ${key}`, () => {
 				it('should handle preflight requests', async () => {
-					const pathPrefix = config.getEnv(`endpoints.${key}`);
+					const pathPrefix = Container.get(GlobalConfig).endpoints[key];
 					manager.getWebhookMethods.mockResolvedValueOnce(['GET']);
 
 					const response = await agent
@@ -60,7 +61,7 @@ describe('WebhookServer', () => {
 				});
 
 				it('should handle regular requests', async () => {
-					const pathPrefix = config.getEnv(`endpoints.${key}`);
+					const pathPrefix = Container.get(GlobalConfig).endpoints[key];
 					manager.getWebhookMethods.mockResolvedValueOnce(['GET']);
 					manager.executeWebhook.mockResolvedValueOnce(
 						mockResponse({ test: true }, { key: 'value ' }),

From 88a170176a3447e7f847e9cf145aeb867b1c5fcf Mon Sep 17 00:00:00 2001
From: Michael Kret <88898367+michael-radency@users.noreply.github.com>
Date: Thu, 1 Aug 2024 11:21:58 +0300
Subject: [PATCH 049/168] fix(core): Fix expressions in webhook nodes(Form,
 Webhook) to access previous node's data (#10247)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: कारतोफ्फेलस्क्रिप्ट™ <aditya@netroy.in>
---
 packages/cli/src/WebhookHelpers.ts        |  5 +++++
 packages/core/src/NodeExecuteFunctions.ts | 24 +++++++++++++++++------
 packages/workflow/src/Interfaces.ts       |  1 +
 packages/workflow/src/Workflow.ts         |  2 ++
 4 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/packages/cli/src/WebhookHelpers.ts b/packages/cli/src/WebhookHelpers.ts
index 9342a97cda69c..eafec28133326 100644
--- a/packages/cli/src/WebhookHelpers.ts
+++ b/packages/cli/src/WebhookHelpers.ts
@@ -256,6 +256,10 @@ export async function executeWebhook(
 	// Prepare everything that is needed to run the workflow
 	const additionalData = await WorkflowExecuteAdditionalData.getBase();
 
+	if (executionId) {
+		additionalData.executionId = executionId;
+	}
+
 	// Get the responseMode
 	const responseMode = workflow.expression.getSimpleParameterValue(
 		workflowStartNode,
@@ -359,6 +363,7 @@ export async function executeWebhook(
 				additionalData,
 				NodeExecuteFunctions,
 				executionMode,
+				runExecutionData ?? null,
 			);
 			Container.get(WorkflowStatisticsService).emit('nodeFetchedData', {
 				workflowId: workflow.id,
diff --git a/packages/core/src/NodeExecuteFunctions.ts b/packages/core/src/NodeExecuteFunctions.ts
index f9e27cc15c0ac..cf677ba5bd036 100644
--- a/packages/core/src/NodeExecuteFunctions.ts
+++ b/packages/core/src/NodeExecuteFunctions.ts
@@ -4212,8 +4212,9 @@ export function getExecuteWebhookFunctions(
 	mode: WorkflowExecuteMode,
 	webhookData: IWebhookData,
 	closeFunctions: CloseFunction[],
+	runExecutionData: IRunExecutionData | null,
 ): IWebhookFunctions {
-	return ((workflow: Workflow, node: INode) => {
+	return ((workflow: Workflow, node: INode, runExecutionData: IRunExecutionData | null) => {
 		return {
 			...getCommonWorkflowFunctions(workflow, node, additionalData),
 			getBodyData(): IDataObject {
@@ -4274,10 +4275,21 @@ export function getExecuteWebhookFunctions(
 				fallbackValue?: any,
 				options?: IGetNodeParameterOptions,
 			): NodeParameterValueType | object => {
-				const runExecutionData: IRunExecutionData | null = null;
 				const itemIndex = 0;
 				const runIndex = 0;
-				const connectionInputData: INodeExecutionData[] = [];
+
+				let connectionInputData: INodeExecutionData[] = [];
+				let executionData: IExecuteData | undefined;
+
+				if (runExecutionData?.executionData !== undefined) {
+					executionData = runExecutionData.executionData.nodeExecutionStack[0];
+
+					if (executionData !== undefined) {
+						connectionInputData = executionData.data.main[0]!;
+					}
+				}
+
+				const additionalKeys = getAdditionalKeys(additionalData, mode, runExecutionData);
 
 				return getNodeParameter(
 					workflow,
@@ -4288,8 +4300,8 @@ export function getExecuteWebhookFunctions(
 					parameterName,
 					itemIndex,
 					mode,
-					getAdditionalKeys(additionalData, mode, null),
-					undefined,
+					additionalKeys,
+					executionData,
 					fallbackValue,
 					options,
 				);
@@ -4336,5 +4348,5 @@ export function getExecuteWebhookFunctions(
 			},
 			nodeHelpers: getNodeHelperFunctions(additionalData, workflow.id),
 		};
-	})(workflow, node);
+	})(workflow, node, runExecutionData);
 }
diff --git a/packages/workflow/src/Interfaces.ts b/packages/workflow/src/Interfaces.ts
index ea31b06fef34b..39b4d06b47d98 100644
--- a/packages/workflow/src/Interfaces.ts
+++ b/packages/workflow/src/Interfaces.ts
@@ -466,6 +466,7 @@ export interface IGetExecuteWebhookFunctions {
 		mode: WorkflowExecuteMode,
 		webhookData: IWebhookData,
 		closeFunctions: CloseFunction[],
+		runExecutionData: IRunExecutionData | null,
 	): IWebhookFunctions;
 }
 
diff --git a/packages/workflow/src/Workflow.ts b/packages/workflow/src/Workflow.ts
index 3c74480b3864f..ef0539db28a97 100644
--- a/packages/workflow/src/Workflow.ts
+++ b/packages/workflow/src/Workflow.ts
@@ -1237,6 +1237,7 @@ export class Workflow {
 		additionalData: IWorkflowExecuteAdditionalData,
 		nodeExecuteFunctions: INodeExecuteFunctions,
 		mode: WorkflowExecuteMode,
+		runExecutionData: IRunExecutionData | null,
 	): Promise<IWebhookResponseData> {
 		const nodeType = this.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
 		if (nodeType === undefined) {
@@ -1258,6 +1259,7 @@ export class Workflow {
 			mode,
 			webhookData,
 			closeFunctions,
+			runExecutionData,
 		);
 		return nodeType instanceof Node
 			? await nodeType.webhook(context)

From 785c82cfece04322ba4586fc463e17c18d27720b Mon Sep 17 00:00:00 2001
From: Giulio Andreini <g.andreini@gmail.com>
Date: Thu, 1 Aug 2024 10:57:05 +0200
Subject: [PATCH 050/168] fix(n8n Form Trigger Node): Improve copy and a few
 tweaks (no-changelog) (#10243)

Co-authored-by: Michael Kret <michael.k@radency.com>
---
 packages/cli/templates/form-trigger.handlebars      | 13 ++++++++-----
 .../nodes-base/nodes/Form/common.descriptions.ts    |  9 +++++----
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/packages/cli/templates/form-trigger.handlebars b/packages/cli/templates/form-trigger.handlebars
index a1abca87b81a4..67818629f57db 100644
--- a/packages/cli/templates/form-trigger.handlebars
+++ b/packages/cli/templates/form-trigger.handlebars
@@ -282,7 +282,10 @@
 					display: inline-block;
 			}
 
-			@media only screen and (max-width: 400px) {
+			@media only screen and (max-width: 500px) {
+				body {
+					background-color: white;
+				}
 				hr {
 					display: block;
 				}
@@ -291,16 +294,16 @@
 					min-height: 100vh;
 					padding: 24px;
 					background-color: white;
-					border: 1px solid #dbdfe7;
-					border-radius: 8px;
-					box-shadow: 0px 4px 16px 0px #634dff0f;
+					border: 0px solid #dbdfe7;
+					border-radius: 0px;
+					box-shadow: 0px 0px 0px 0px white;
 				}
 				.card {
 					padding: 0px;
 					background-color: white;
 					border: 0px solid #dbdfe7;
 					border-radius: 0px;
-					box-shadow: 0px 0px 10px 0px #634dff0f;
+					box-shadow: 0px 0px 0px 0px white;
 					margin-bottom: 0px;
 				}
 			}
diff --git a/packages/nodes-base/nodes/Form/common.descriptions.ts b/packages/nodes-base/nodes/Form/common.descriptions.ts
index 8ab9cc0927a53..c3505e9509f86 100644
--- a/packages/nodes-base/nodes/Form/common.descriptions.ts
+++ b/packages/nodes-base/nodes/Form/common.descriptions.ts
@@ -54,7 +54,7 @@ export const formFields: INodeProperties = {
 					type: 'string',
 					default: '',
 					placeholder: 'e.g. What is your name?',
-					description: 'Label appears above the input field',
+					description: 'Label that appears above the input field',
 					required: true,
 				},
 				{
@@ -102,6 +102,7 @@ export const formFields: INodeProperties = {
 				{
 					displayName: 'Placeholder',
 					name: 'placeholder',
+					description: 'Sample text to display inside the field',
 					type: 'string',
 					default: '',
 					displayOptions: {
@@ -169,11 +170,11 @@ export const formFields: INodeProperties = {
 					},
 				},
 				{
-					displayName: 'Accept File Types',
+					displayName: 'Accepted File Types',
 					name: 'acceptFileTypes',
 					type: 'string',
 					default: '',
-					description: 'List of file types that can be uploaded, separated by commas',
+					description: 'Comma-separated list of allowed file extensions',
 					hint: 'Leave empty to allow all file types',
 					placeholder: 'e.g. .jpg, .png',
 					displayOptions: {
@@ -188,7 +189,7 @@ export const formFields: INodeProperties = {
 					type: 'string',
 					default: '',
 					description:
-						'Returns a string representation of this field formatted according to the specified format string. For a table of tokens and their interpretations, see <a href="https://moment.github.io/luxon/#/formatting?ID=table-of-tokens" target="_blank">here</a>.',
+						'How to format the date in the output data. For a table of tokens and their interpretations, see <a href="https://moment.github.io/luxon/#/formatting?ID=table-of-tokens" target="_blank">here</a>.',
 					placeholder: 'e.g. dd/mm/yyyy',
 					hint: 'Leave empty to use the default format',
 					displayOptions: {

From efb71dd9adfe33ed21e16ff94ba322443d8eadbd 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, 1 Aug 2024 11:02:36 +0200
Subject: [PATCH 051/168] fix(core): Fix oauth2 callback and add integration
 tests (no-changelog) (#10272)

---
 .../oauth/abstractOAuth.controller.ts         |   7 +-
 .../oauth/oAuth1Credential.controller.ts      |   4 +-
 .../oauth/oAuth2Credential.controller.ts      |   4 +-
 packages/cli/src/requests.ts                  |   4 +-
 .../controllers/oauth/oauth2.api.test.ts      | 107 ++++++++++++++++++
 packages/cli/test/integration/shared/types.ts |   1 +
 .../integration/shared/utils/testServer.ts    |   4 +
 7 files changed, 120 insertions(+), 11 deletions(-)
 create mode 100644 packages/cli/test/integration/controllers/oauth/oauth2.api.test.ts

diff --git a/packages/cli/src/controllers/oauth/abstractOAuth.controller.ts b/packages/cli/src/controllers/oauth/abstractOAuth.controller.ts
index f9ffd591feb22..b9f0d64446ad5 100644
--- a/packages/cli/src/controllers/oauth/abstractOAuth.controller.ts
+++ b/packages/cli/src/controllers/oauth/abstractOAuth.controller.ts
@@ -6,7 +6,6 @@ import type { ICredentialDataDecryptedObject, IWorkflowExecuteAdditionalData } f
 import { jsonParse, ApplicationError } from 'n8n-workflow';
 
 import type { CredentialsEntity } from '@db/entities/CredentialsEntity';
-import type { User } from '@db/entities/User';
 import { CredentialsRepository } from '@db/repositories/credentials.repository';
 import { SharedCredentialsRepository } from '@db/repositories/sharedCredentials.repository';
 import type { ICredentialsDb } from '@/Interfaces';
@@ -71,8 +70,8 @@ export abstract class AbstractOAuthController {
 		return credential;
 	}
 
-	protected async getAdditionalData(user: User) {
-		return await WorkflowExecuteAdditionalData.getBase(user.id);
+	protected async getAdditionalData() {
+		return await WorkflowExecuteAdditionalData.getBase();
 	}
 
 	protected async getDecryptedData(
@@ -119,7 +118,7 @@ export abstract class AbstractOAuthController {
 		return await this.credentialsRepository.findOneBy({ id: credentialId });
 	}
 
-	protected createCsrfState(credentialsId: string): [string, string] {
+	createCsrfState(credentialsId: string): [string, string] {
 		const token = new Csrf();
 		const csrfSecret = token.secretSync();
 		const state: CsrfStateParam = {
diff --git a/packages/cli/src/controllers/oauth/oAuth1Credential.controller.ts b/packages/cli/src/controllers/oauth/oAuth1Credential.controller.ts
index d967d2f83435a..2a50b00bf9d57 100644
--- a/packages/cli/src/controllers/oauth/oAuth1Credential.controller.ts
+++ b/packages/cli/src/controllers/oauth/oAuth1Credential.controller.ts
@@ -33,7 +33,7 @@ export class OAuth1CredentialController extends AbstractOAuthController {
 	@Get('/auth')
 	async getAuthUri(req: OAuthRequest.OAuth1Credential.Auth): Promise<string> {
 		const credential = await this.getCredential(req);
-		const additionalData = await this.getAdditionalData(req.user);
+		const additionalData = await this.getAdditionalData();
 		const decryptedDataOriginal = await this.getDecryptedData(credential, additionalData);
 		const oauthCredentials = this.applyDefaultsAndOverwrites<OAuth1CredentialData>(
 			credential,
@@ -127,7 +127,7 @@ export class OAuth1CredentialController extends AbstractOAuthController {
 				return this.renderCallbackError(res, errorMessage);
 			}
 
-			const additionalData = await this.getAdditionalData(req.user);
+			const additionalData = await this.getAdditionalData();
 			const decryptedDataOriginal = await this.getDecryptedData(credential, additionalData);
 			const oauthCredentials = this.applyDefaultsAndOverwrites<OAuth1CredentialData>(
 				credential,
diff --git a/packages/cli/src/controllers/oauth/oAuth2Credential.controller.ts b/packages/cli/src/controllers/oauth/oAuth2Credential.controller.ts
index 719043e9834b7..5b7929495fd42 100644
--- a/packages/cli/src/controllers/oauth/oAuth2Credential.controller.ts
+++ b/packages/cli/src/controllers/oauth/oAuth2Credential.controller.ts
@@ -20,7 +20,7 @@ export class OAuth2CredentialController extends AbstractOAuthController {
 	@Get('/auth')
 	async getAuthUri(req: OAuthRequest.OAuth2Credential.Auth): Promise<string> {
 		const credential = await this.getCredential(req);
-		const additionalData = await this.getAdditionalData(req.user);
+		const additionalData = await this.getAdditionalData();
 		const decryptedDataOriginal = await this.getDecryptedData(credential, additionalData);
 
 		// At some point in the past we saved hidden scopes to credentials (but shouldn't)
@@ -107,7 +107,7 @@ export class OAuth2CredentialController extends AbstractOAuthController {
 				return this.renderCallbackError(res, errorMessage);
 			}
 
-			const additionalData = await this.getAdditionalData(req.user);
+			const additionalData = await this.getAdditionalData();
 			const decryptedDataOriginal = await this.getDecryptedData(credential, additionalData);
 			const oauthCredentials = this.applyDefaultsAndOverwrites<OAuth2CredentialData>(
 				credential,
diff --git a/packages/cli/src/requests.ts b/packages/cli/src/requests.ts
index 02ef5acb6b015..1ea265f2394e7 100644
--- a/packages/cli/src/requests.ts
+++ b/packages/cli/src/requests.ts
@@ -76,9 +76,7 @@ export type AuthlessRequest<
 	ResponseBody = {},
 	RequestBody = {},
 	RequestQuery = {},
-> = APIRequest<RouteParams, ResponseBody, RequestBody, RequestQuery> & {
-	user: never;
-};
+> = APIRequest<RouteParams, ResponseBody, RequestBody, RequestQuery>;
 
 export type AuthenticatedRequest<
 	RouteParams = {},
diff --git a/packages/cli/test/integration/controllers/oauth/oauth2.api.test.ts b/packages/cli/test/integration/controllers/oauth/oauth2.api.test.ts
new file mode 100644
index 0000000000000..970727c2c8c64
--- /dev/null
+++ b/packages/cli/test/integration/controllers/oauth/oauth2.api.test.ts
@@ -0,0 +1,107 @@
+import { Container } from 'typedi';
+import { response as Response } from 'express';
+import nock from 'nock';
+import { parse as parseQs } from 'querystring';
+
+import type { CredentialsEntity } from '@db/entities/CredentialsEntity';
+import type { User } from '@db/entities/User';
+import { CredentialsHelper } from '@/CredentialsHelper';
+import { OAuth2CredentialController } from '@/controllers/oauth/oAuth2Credential.controller';
+
+import { createOwner } from '@test-integration/db/users';
+import { saveCredential } from '@test-integration/db/credentials';
+import * as testDb from '@test-integration/testDb';
+import { setupTestServer } from '@test-integration/utils';
+import type { SuperAgentTest } from '@test-integration/types';
+
+describe('OAuth2 API', () => {
+	const testServer = setupTestServer({ endpointGroups: ['oauth2'] });
+
+	let owner: User;
+	let ownerAgent: SuperAgentTest;
+	let credential: CredentialsEntity;
+	const credentialData = {
+		clientId: 'client_id',
+		clientSecret: 'client_secret',
+		authUrl: 'https://test.domain/oauth2/auth',
+		accessTokenUrl: 'https://test.domain/oauth2/token',
+		authQueryParameters: 'access_type=offline',
+	};
+
+	CredentialsHelper.prototype.applyDefaultsAndOverwrites = (_, decryptedDataOriginal) =>
+		decryptedDataOriginal;
+
+	beforeAll(async () => {
+		owner = await createOwner();
+		ownerAgent = testServer.authAgentFor(owner);
+	});
+
+	beforeEach(async () => {
+		await testDb.truncate(['SharedCredentials', 'Credentials']);
+		credential = await saveCredential(
+			{
+				name: 'Test',
+				type: 'testOAuth2Api',
+				data: credentialData,
+			},
+			{
+				user: owner,
+				role: 'credential:owner',
+			},
+		);
+	});
+
+	it('should return a valid auth URL when the auth flow is initiated', async () => {
+		const controller = Container.get(OAuth2CredentialController);
+		const csrfSpy = jest.spyOn(controller, 'createCsrfState').mockClear();
+
+		const response = await ownerAgent
+			.get('/oauth2-credential/auth')
+			.query({ id: credential.id })
+			.expect(200);
+		const authUrl = new URL(response.body.data);
+		expect(authUrl.hostname).toBe('test.domain');
+		expect(authUrl.pathname).toBe('/oauth2/auth');
+
+		expect(csrfSpy).toHaveBeenCalled();
+		const [_, state] = csrfSpy.mock.results[0].value;
+		expect(parseQs(authUrl.search.slice(1))).toEqual({
+			access_type: 'offline',
+			client_id: 'client_id',
+			redirect_uri: 'http://localhost:5678/rest/oauth2-credential/callback',
+			response_type: 'code',
+			state,
+			scope: 'openid',
+		});
+	});
+
+	it('should handle a valid callback without auth', async () => {
+		const controller = Container.get(OAuth2CredentialController);
+		const csrfSpy = jest.spyOn(controller, 'createCsrfState').mockClear();
+		const renderSpy = (Response.render = jest.fn(function () {
+			this.end();
+		}));
+
+		await ownerAgent.get('/oauth2-credential/auth').query({ id: credential.id }).expect(200);
+
+		const [_, state] = csrfSpy.mock.results[0].value;
+
+		nock('https://test.domain').post('/oauth2/token').reply(200, { access_token: 'updated_token' });
+
+		await testServer.authlessAgent
+			.get('/oauth2-credential/callback')
+			.query({ code: 'auth_code', state })
+			.expect(200);
+
+		expect(renderSpy).toHaveBeenCalledWith('oauth-callback');
+
+		const updatedCredential = await Container.get(CredentialsHelper).getCredentials(
+			credential,
+			credential.type,
+		);
+		expect(updatedCredential.getData()).toEqual({
+			...credentialData,
+			oauthTokenData: { access_token: 'updated_token' },
+		});
+	});
+});
diff --git a/packages/cli/test/integration/shared/types.ts b/packages/cli/test/integration/shared/types.ts
index 0352386590a3d..cb794d0f95b92 100644
--- a/packages/cli/test/integration/shared/types.ts
+++ b/packages/cli/test/integration/shared/types.ts
@@ -13,6 +13,7 @@ type EndpointGroup =
 	| 'me'
 	| 'users'
 	| 'auth'
+	| 'oauth2'
 	| 'owner'
 	| 'passwordReset'
 	| 'credentials'
diff --git a/packages/cli/test/integration/shared/utils/testServer.ts b/packages/cli/test/integration/shared/utils/testServer.ts
index 3fc4cb5642b49..7776b7e669415 100644
--- a/packages/cli/test/integration/shared/utils/testServer.ts
+++ b/packages/cli/test/integration/shared/utils/testServer.ts
@@ -159,6 +159,10 @@ export const setupTestServer = ({
 						await import('@/controllers/auth.controller');
 						break;
 
+					case 'oauth2':
+						await import('@/controllers/oauth/oAuth2Credential.controller');
+						break;
+
 					case 'mfa':
 						await import('@/controllers/mfa.controller');
 						break;

From d8688bd463a22ba417ed99553f21742eedc4db87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Thu, 1 Aug 2024 13:44:23 +0200
Subject: [PATCH 052/168] refactor(core): Decouple workflow created, saved,
 deleted events from internal hooks (no-changelog) (#10264)

---
 packages/cli/src/InternalHooks.ts             | 82 +----------------
 .../handlers/workflows/workflows.handler.ts   |  9 +-
 .../audit-event-relay.service.test.ts         |  9 +-
 .../src/eventbus/audit-event-relay.service.ts |  8 +-
 packages/cli/src/eventbus/event.types.ts      | 10 ++-
 .../telemetry-event-relay.service.ts          | 90 +++++++++++++++++++
 .../cli/src/workflows/workflow.service.ts     | 11 +--
 .../cli/src/workflows/workflows.controller.ts |  9 +-
 8 files changed, 125 insertions(+), 103 deletions(-)

diff --git a/packages/cli/src/InternalHooks.ts b/packages/cli/src/InternalHooks.ts
index 7912054085824..fda2c3f21dfc7 100644
--- a/packages/cli/src/InternalHooks.ts
+++ b/packages/cli/src/InternalHooks.ts
@@ -10,22 +10,15 @@ import type {
 } from 'n8n-workflow';
 import { TelemetryHelpers } from 'n8n-workflow';
 
-import config from '@/config';
 import { N8N_VERSION } from '@/constants';
 import type { AuthProviderType } from '@db/entities/AuthIdentity';
 import type { User } from '@db/entities/User';
 import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
 import { determineFinalExecutionStatus } from '@/executionLifecycleHooks/shared/sharedHookFunctions';
-import type {
-	ITelemetryUserDeletionData,
-	IWorkflowDb,
-	IExecutionTrackProperties,
-} from '@/Interfaces';
+import type { ITelemetryUserDeletionData, IExecutionTrackProperties } from '@/Interfaces';
 import { WorkflowStatisticsService } from '@/services/workflow-statistics.service';
 import { NodeTypes } from '@/NodeTypes';
 import { Telemetry } from '@/telemetry';
-import type { Project } from '@db/entities/Project';
-import { ProjectRelationRepository } from './databases/repositories/projectRelation.repository';
 import { MessageEventBus } from './eventbus/MessageEventBus/MessageEventBus';
 
 /**
@@ -40,7 +33,6 @@ export class InternalHooks {
 		private readonly nodeTypes: NodeTypes,
 		private readonly sharedWorkflowRepository: SharedWorkflowRepository,
 		workflowStatisticsService: WorkflowStatisticsService,
-		private readonly projectRelationRepository: ProjectRelationRepository,
 		// Can't use @ts-expect-error because only dev time tsconfig considers this as an error, but not build time
 		// eslint-disable-next-line @typescript-eslint/ban-ts-comment
 		// @ts-ignore - needed until we decouple telemetry
@@ -72,78 +64,6 @@ export class InternalHooks {
 		this.telemetry.track('User responded to personalization questions', personalizationSurveyData);
 	}
 
-	onWorkflowCreated(
-		user: User,
-		workflow: IWorkflowBase,
-		project: Project,
-		publicApi: boolean,
-	): void {
-		const { nodeGraph } = TelemetryHelpers.generateNodesGraph(workflow, this.nodeTypes);
-
-		this.telemetry.track('User created workflow', {
-			user_id: user.id,
-			workflow_id: workflow.id,
-			node_graph_string: JSON.stringify(nodeGraph),
-			public_api: publicApi,
-			project_id: project.id,
-			project_type: project.type,
-		});
-	}
-
-	onWorkflowDeleted(user: User, workflowId: string, publicApi: boolean): void {
-		this.telemetry.track('User deleted workflow', {
-			user_id: user.id,
-			workflow_id: workflowId,
-			public_api: publicApi,
-		});
-	}
-
-	async onWorkflowSaved(user: User, workflow: IWorkflowDb, publicApi: boolean): Promise<void> {
-		const isCloudDeployment = config.getEnv('deployment.type') === 'cloud';
-
-		const { nodeGraph } = TelemetryHelpers.generateNodesGraph(workflow, this.nodeTypes, {
-			isCloudDeployment,
-		});
-
-		let userRole: 'owner' | 'sharee' | 'member' | undefined = undefined;
-		const role = await this.sharedWorkflowRepository.findSharingRole(user.id, workflow.id);
-		if (role) {
-			userRole = role === 'workflow:owner' ? 'owner' : 'sharee';
-		} else {
-			const workflowOwner = await this.sharedWorkflowRepository.getWorkflowOwningProject(
-				workflow.id,
-			);
-
-			if (workflowOwner) {
-				const projectRole = await this.projectRelationRepository.findProjectRole({
-					userId: user.id,
-					projectId: workflowOwner.id,
-				});
-
-				if (projectRole && projectRole !== 'project:personalOwner') {
-					userRole = 'member';
-				}
-			}
-		}
-
-		const notesCount = Object.keys(nodeGraph.notes).length;
-		const overlappingCount = Object.values(nodeGraph.notes).filter(
-			(note) => note.overlapping,
-		).length;
-
-		this.telemetry.track('User saved workflow', {
-			user_id: user.id,
-			workflow_id: workflow.id,
-			node_graph_string: JSON.stringify(nodeGraph),
-			notes_count_overlapping: overlappingCount,
-			notes_count_non_overlapping: notesCount - overlappingCount,
-			version_cli: N8N_VERSION,
-			num_tags: workflow.tags?.length ?? 0,
-			public_api: publicApi,
-			sharing_role: userRole,
-		});
-	}
-
 	// eslint-disable-next-line complexity
 	async onWorkflowPostExecute(
 		_executionId: string,
diff --git a/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.handler.ts b/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.handler.ts
index ea5eebdfdbe76..4063d0b611d35 100644
--- a/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.handler.ts
+++ b/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.handler.ts
@@ -60,10 +60,12 @@ export = {
 			);
 
 			await Container.get(ExternalHooks).run('workflow.afterCreate', [createdWorkflow]);
-			Container.get(InternalHooks).onWorkflowCreated(req.user, createdWorkflow, project, true);
 			Container.get(EventService).emit('workflow-created', {
 				workflow: createdWorkflow,
 				user: req.user,
+				publicApi: true,
+				projectId: project.id,
+				projectType: project.type,
 			});
 
 			return res.json(createdWorkflow);
@@ -259,11 +261,10 @@ export = {
 			}
 
 			await Container.get(ExternalHooks).run('workflow.afterUpdate', [updateData]);
-			void Container.get(InternalHooks).onWorkflowSaved(req.user, updateData, true);
 			Container.get(EventService).emit('workflow-saved', {
 				user: req.user,
-				workflowId: updateData.id,
-				workflowName: updateData.name,
+				workflow: updateData,
+				publicApi: true,
 			});
 
 			return res.json(updatedWorkflow);
diff --git a/packages/cli/src/eventbus/__tests__/audit-event-relay.service.test.ts b/packages/cli/src/eventbus/__tests__/audit-event-relay.service.test.ts
index 7196b9203c407..52b86b58e1b6b 100644
--- a/packages/cli/src/eventbus/__tests__/audit-event-relay.service.test.ts
+++ b/packages/cli/src/eventbus/__tests__/audit-event-relay.service.test.ts
@@ -4,6 +4,7 @@ import type { MessageEventBus } from '../MessageEventBus/MessageEventBus';
 import type { Event } from '../event.types';
 import { EventService } from '../event.service';
 import type { INode, IRun, IWorkflowBase } from 'n8n-workflow';
+import type { IWorkflowDb } from '@/Interfaces';
 
 describe('AuditEventRelay', () => {
 	const eventBus = mock<MessageEventBus>();
@@ -29,6 +30,9 @@ describe('AuditEventRelay', () => {
 					id: 'wf123',
 					name: 'Test Workflow',
 				}),
+				publicApi: false,
+				projectId: 'proj123',
+				projectType: 'personal',
 			};
 
 			eventService.emit('workflow-created', event);
@@ -57,6 +61,7 @@ describe('AuditEventRelay', () => {
 					role: 'user',
 				},
 				workflowId: 'wf789',
+				publicApi: false,
 			};
 
 			eventService.emit('workflow-deleted', event);
@@ -83,8 +88,8 @@ describe('AuditEventRelay', () => {
 					lastName: 'Johnson',
 					role: 'editor',
 				},
-				workflowId: 'wf101',
-				workflowName: 'Updated Workflow',
+				workflow: mock<IWorkflowDb>({ id: 'wf101', name: 'Updated Workflow' }),
+				publicApi: false,
 			};
 
 			eventService.emit('workflow-saved', event);
diff --git a/packages/cli/src/eventbus/audit-event-relay.service.ts b/packages/cli/src/eventbus/audit-event-relay.service.ts
index 56f4dd95cd1e6..f8a95a3ebf359 100644
--- a/packages/cli/src/eventbus/audit-event-relay.service.ts
+++ b/packages/cli/src/eventbus/audit-event-relay.service.ts
@@ -86,13 +86,13 @@ export class AuditEventRelay {
 	}
 
 	@Redactable()
-	private workflowSaved({ user, workflowId, workflowName }: Event['workflow-saved']) {
+	private workflowSaved({ user, workflow }: Event['workflow-saved']) {
 		void this.eventBus.sendAuditEvent({
 			eventName: 'n8n.audit.workflow.updated',
 			payload: {
 				...user,
-				workflowId,
-				workflowName,
+				workflowId: workflow.id,
+				workflowName: workflow.name,
 			},
 		});
 	}
@@ -272,7 +272,7 @@ export class AuditEventRelay {
 	}
 
 	/**
-	 * API key
+	 * Public API
 	 */
 
 	@Redactable()
diff --git a/packages/cli/src/eventbus/event.types.ts b/packages/cli/src/eventbus/event.types.ts
index 513c659d3e2a3..b62d3bc141031 100644
--- a/packages/cli/src/eventbus/event.types.ts
+++ b/packages/cli/src/eventbus/event.types.ts
@@ -1,5 +1,5 @@
 import type { AuthenticationMethod, IRun, IWorkflowBase } from 'n8n-workflow';
-import type { IWorkflowExecutionDataProcess } from '@/Interfaces';
+import type { IWorkflowDb, IWorkflowExecutionDataProcess } from '@/Interfaces';
 import type { ProjectRole } from '@/databases/entities/ProjectRelation';
 import type { GlobalRole } from '@/databases/entities/User';
 
@@ -20,17 +20,21 @@ export type Event = {
 	'workflow-created': {
 		user: UserLike;
 		workflow: IWorkflowBase;
+		publicApi: boolean;
+		projectId: string;
+		projectType: string;
 	};
 
 	'workflow-deleted': {
 		user: UserLike;
 		workflowId: string;
+		publicApi: boolean;
 	};
 
 	'workflow-saved': {
 		user: UserLike;
-		workflowId: string;
-		workflowName: string;
+		workflow: IWorkflowDb;
+		publicApi: boolean;
 	};
 
 	'workflow-pre-execute': {
diff --git a/packages/cli/src/telemetry/telemetry-event-relay.service.ts b/packages/cli/src/telemetry/telemetry-event-relay.service.ts
index 97c30cae40920..9077abdf9ce23 100644
--- a/packages/cli/src/telemetry/telemetry-event-relay.service.ts
+++ b/packages/cli/src/telemetry/telemetry-event-relay.service.ts
@@ -8,6 +8,10 @@ import { License } from '@/License';
 import { GlobalConfig } from '@n8n/config';
 import { N8N_VERSION } from '@/constants';
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
+import { TelemetryHelpers } from 'n8n-workflow';
+import { NodeTypes } from '@/NodeTypes';
+import { SharedWorkflowRepository } from '@/databases/repositories/sharedWorkflow.repository';
+import { ProjectRelationRepository } from '@/databases/repositories/projectRelation.repository';
 
 @Service()
 export class TelemetryEventRelay {
@@ -17,6 +21,9 @@ export class TelemetryEventRelay {
 		private readonly license: License,
 		private readonly globalConfig: GlobalConfig,
 		private readonly workflowRepository: WorkflowRepository,
+		private readonly nodeTypes: NodeTypes,
+		private readonly sharedWorkflowRepository: SharedWorkflowRepository,
+		private readonly projectRelationRepository: ProjectRelationRepository,
 	) {}
 
 	async init() {
@@ -101,6 +108,16 @@ export class TelemetryEventRelay {
 		this.eventService.on('login-failed-due-to-ldap-disabled', (event) => {
 			this.loginFailedDueToLdapDisabled(event);
 		});
+
+		this.eventService.on('workflow-created', (event) => {
+			this.workflowCreated(event);
+		});
+		this.eventService.on('workflow-deleted', (event) => {
+			this.workflowDeleted(event);
+		});
+		this.eventService.on('workflow-saved', async (event) => {
+			await this.workflowSaved(event);
+		});
 	}
 
 	private teamProjectUpdated({ userId, role, members, projectId }: Event['team-project-updated']) {
@@ -431,6 +448,79 @@ export class TelemetryEventRelay {
 		this.telemetry.track('User login failed since ldap disabled', { user_ud: userId });
 	}
 
+	private workflowCreated({
+		user,
+		workflow,
+		publicApi,
+		projectId,
+		projectType,
+	}: Event['workflow-created']) {
+		const { nodeGraph } = TelemetryHelpers.generateNodesGraph(workflow, this.nodeTypes);
+
+		this.telemetry.track('User created workflow', {
+			user_id: user.id,
+			workflow_id: workflow.id,
+			node_graph_string: JSON.stringify(nodeGraph),
+			public_api: publicApi,
+			project_id: projectId,
+			project_type: projectType,
+		});
+	}
+
+	private workflowDeleted({ user, workflowId, publicApi }: Event['workflow-deleted']) {
+		this.telemetry.track('User deleted workflow', {
+			user_id: user.id,
+			workflow_id: workflowId,
+			public_api: publicApi,
+		});
+	}
+
+	private async workflowSaved({ user, workflow, publicApi }: Event['workflow-saved']) {
+		const isCloudDeployment = config.getEnv('deployment.type') === 'cloud';
+
+		const { nodeGraph } = TelemetryHelpers.generateNodesGraph(workflow, this.nodeTypes, {
+			isCloudDeployment,
+		});
+
+		let userRole: 'owner' | 'sharee' | 'member' | undefined = undefined;
+		const role = await this.sharedWorkflowRepository.findSharingRole(user.id, workflow.id);
+		if (role) {
+			userRole = role === 'workflow:owner' ? 'owner' : 'sharee';
+		} else {
+			const workflowOwner = await this.sharedWorkflowRepository.getWorkflowOwningProject(
+				workflow.id,
+			);
+
+			if (workflowOwner) {
+				const projectRole = await this.projectRelationRepository.findProjectRole({
+					userId: user.id,
+					projectId: workflowOwner.id,
+				});
+
+				if (projectRole && projectRole !== 'project:personalOwner') {
+					userRole = 'member';
+				}
+			}
+		}
+
+		const notesCount = Object.keys(nodeGraph.notes).length;
+		const overlappingCount = Object.values(nodeGraph.notes).filter(
+			(note) => note.overlapping,
+		).length;
+
+		this.telemetry.track('User saved workflow', {
+			user_id: user.id,
+			workflow_id: workflow.id,
+			node_graph_string: JSON.stringify(nodeGraph),
+			notes_count_overlapping: overlappingCount,
+			notes_count_non_overlapping: notesCount - overlappingCount,
+			version_cli: N8N_VERSION,
+			num_tags: workflow.tags?.length ?? 0,
+			public_api: publicApi,
+			sharing_role: userRole,
+		});
+	}
+
 	private async serverStarted() {
 		const cpus = os.cpus();
 		const binaryDataConfig = config.getEnv('binaryDataManager');
diff --git a/packages/cli/src/workflows/workflow.service.ts b/packages/cli/src/workflows/workflow.service.ts
index 7c0cbfc242e1b..4f59f8238fe68 100644
--- a/packages/cli/src/workflows/workflow.service.ts
+++ b/packages/cli/src/workflows/workflow.service.ts
@@ -1,4 +1,4 @@
-import Container, { Service } from 'typedi';
+import { Service } from 'typedi';
 import { NodeApiError } from 'n8n-workflow';
 import pick from 'lodash/pick';
 import omit from 'lodash/omit';
@@ -17,7 +17,6 @@ import { validateEntity } from '@/GenericHelpers';
 import { ExternalHooks } from '@/ExternalHooks';
 import { hasSharing, type ListQuery } from '@/requests';
 import { TagService } from '@/services/tag.service';
-import { InternalHooks } from '@/InternalHooks';
 import { OwnershipService } from '@/services/ownership.service';
 import { WorkflowHistoryService } from './workflowHistory/workflowHistory.service.ee';
 import { Logger } from '@/Logger';
@@ -219,11 +218,10 @@ export class WorkflowService {
 		}
 
 		await this.externalHooks.run('workflow.afterUpdate', [updatedWorkflow]);
-		void Container.get(InternalHooks).onWorkflowSaved(user, updatedWorkflow, false);
 		this.eventService.emit('workflow-saved', {
 			user,
-			workflowId: updatedWorkflow.id,
-			workflowName: updatedWorkflow.name,
+			workflow: updatedWorkflow,
+			publicApi: false,
 		});
 
 		if (updatedWorkflow.active) {
@@ -282,8 +280,7 @@ export class WorkflowService {
 		await this.workflowRepository.delete(workflowId);
 		await this.binaryDataService.deleteMany(idsForDeletion);
 
-		Container.get(InternalHooks).onWorkflowDeleted(user, workflowId, false);
-		this.eventService.emit('workflow-deleted', { user, workflowId });
+		this.eventService.emit('workflow-deleted', { user, workflowId, publicApi: false });
 		await this.externalHooks.run('workflow.afterDelete', [workflowId]);
 
 		return workflow;
diff --git a/packages/cli/src/workflows/workflows.controller.ts b/packages/cli/src/workflows/workflows.controller.ts
index 05863edb84c04..c774b21917c98 100644
--- a/packages/cli/src/workflows/workflows.controller.ts
+++ b/packages/cli/src/workflows/workflows.controller.ts
@@ -179,8 +179,13 @@ export class WorkflowsController {
 		delete savedWorkflowWithMetaData.shared;
 
 		await this.externalHooks.run('workflow.afterCreate', [savedWorkflow]);
-		this.internalHooks.onWorkflowCreated(req.user, newWorkflow, project!, false);
-		this.eventService.emit('workflow-created', { user: req.user, workflow: newWorkflow });
+		this.eventService.emit('workflow-created', {
+			user: req.user,
+			workflow: newWorkflow,
+			publicApi: false,
+			projectId: project!.id,
+			projectType: project!.type,
+		});
 
 		const scopes = await this.workflowService.getWorkflowScopes(req.user, savedWorkflow.id);
 

From 43ae159ea40c574f8e41bdfd221ab2bf3268eee7 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, 1 Aug 2024 17:19:31 +0200
Subject: [PATCH 053/168] fix(core): Upgrade tournament to address some XSS
 vulnerabilities (#10277)

---
 packages/workflow/package.json |  2 +-
 pnpm-lock.yaml                 | 27 ++++++---------------------
 2 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/packages/workflow/package.json b/packages/workflow/package.json
index 179ae29311c11..77348f2a945e1 100644
--- a/packages/workflow/package.json
+++ b/packages/workflow/package.json
@@ -39,7 +39,7 @@
     "@types/xml2js": "catalog:"
   },
   "dependencies": {
-    "@n8n/tournament": "1.0.2",
+    "@n8n/tournament": "1.0.3",
     "@n8n_io/riot-tmpl": "4.0.0",
     "ast-types": "0.15.2",
     "axios": "catalog:",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 8c8ff04428456..8287287e22db9 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1710,8 +1710,8 @@ importers:
   packages/workflow:
     dependencies:
       '@n8n/tournament':
-        specifier: 1.0.2
-        version: 1.0.2
+        specifier: 1.0.3
+        version: 1.0.3
       '@n8n_io/riot-tmpl':
         specifier: 4.0.0
         version: 4.0.0
@@ -4143,8 +4143,8 @@ packages:
     resolution: {integrity: sha512-rbnMnSdEwq2yuYMgzOQ4jTXm+oH7yjN/0ISfB/7O6pUcEPsZt9UW60BYfQ1WWHkKa/evI8vgER2zV5/RC1BupQ==}
     engines: {node: '>=18.10'}
 
-  '@n8n/tournament@1.0.2':
-    resolution: {integrity: sha512-fTpi7F8ra5flGSVfRzohPyG7czAAKCZPlLjdKdwbLJivLoI/Ekhgodov1jfVSCVFVbwQ06gRQRxLEDzl2jl8ig==}
+  '@n8n/tournament@1.0.3':
+    resolution: {integrity: sha512-GnmDD5wKAxKfxnSzhENHPn5n91/1c3/psnuT7D+jHHVQdMe8qaCcSq15rcGRfDfTf2v+BZBT0yeyK8Cfexr9yw==}
     engines: {node: '>=18.10', pnpm: '>=8.6'}
 
   '@n8n/typeorm@0.3.20-10':
@@ -6231,9 +6231,6 @@ packages:
     resolution: {integrity: sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==}
     engines: {node: '>=0.8'}
 
-  assert@2.0.0:
-    resolution: {integrity: sha512-se5Cd+js9dXJnu6Ag2JFc00t+HmHOen+8Q+L7O9zI0PqQXr20uk2J0XQqMxZEeo5U50o8Nvmmx7dZrl+Ufr35A==}
-
   assert@2.1.0:
     resolution: {integrity: sha512-eLHpSK/Y4nhMJ07gDaAzoX/XAKS8PSaojml3M0DM4JpV1LAi5JOJ/p6H/XWrl8L+DzVEvVCW1z3vWAaB9oTsQw==}
 
@@ -7557,9 +7554,6 @@ packages:
     resolution: {integrity: sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==}
     engines: {node: '>= 0.4'}
 
-  es6-object-assign@1.1.0:
-    resolution: {integrity: sha512-MEl9uirslVwqQU369iHNWZXsI8yaZYGg/D65aOgZkeyFJwHYSxilf7rQzXKI7DdDuBPrBXbfk3sl9hJhmd5AUw==}
-
   es6-promise@3.3.1:
     resolution: {integrity: sha512-SOp9Phqvqn7jtEUxPWdWfWoLmyt2VaJ6MpvP9Comy1MceMXqE6bxvaTu4iaxpYYPzhny28Lc+M87/c2cPK6lDg==}
 
@@ -16649,7 +16643,7 @@ snapshots:
       '@types/retry': 0.12.5
       retry: 0.13.1
 
-  '@n8n/tournament@1.0.2':
+  '@n8n/tournament@1.0.3':
     dependencies:
       '@n8n_io/riot-tmpl': 4.0.1
       ast-types: 0.16.1
@@ -19612,13 +19606,6 @@ snapshots:
 
   assert-plus@1.0.0: {}
 
-  assert@2.0.0:
-    dependencies:
-      es6-object-assign: 1.1.0
-      is-nan: 1.3.2
-      object-is: 1.1.5
-      util: 0.12.5
-
   assert@2.1.0:
     dependencies:
       call-bind: 1.0.7
@@ -21208,8 +21195,6 @@ snapshots:
       is-date-object: 1.0.5
       is-symbol: 1.0.4
 
-  es6-object-assign@1.1.0: {}
-
   es6-promise@3.3.1: {}
 
   esbuild-plugin-alias@0.2.1: {}
@@ -25579,7 +25564,7 @@ snapshots:
 
   recast@0.22.0:
     dependencies:
-      assert: 2.0.0
+      assert: 2.1.0
       ast-types: 0.15.2
       esprima: 4.0.1
       source-map: 0.6.1

From 42ba8841c401126c77158a53dc8fcbb45dfce8fd Mon Sep 17 00:00:00 2001
From: Csaba Tuncsik <csaba@n8n.io>
Date: Thu, 1 Aug 2024 17:33:10 +0200
Subject: [PATCH 054/168] fix(editor): Enable moving resources only if team
 projects are available by the license (#10271)

---
 .../editor-ui/src/components/CredentialCard.test.ts    |  8 ++++----
 packages/editor-ui/src/components/CredentialCard.vue   |  4 +---
 .../src/components/Projects/ProjectNavigation.vue      |  8 +++++---
 packages/editor-ui/src/components/WorkflowCard.test.ts | 10 +++++-----
 packages/editor-ui/src/components/WorkflowCard.vue     |  2 +-
 packages/editor-ui/src/stores/projects.store.ts        |  8 ++++----
 6 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/packages/editor-ui/src/components/CredentialCard.test.ts b/packages/editor-ui/src/components/CredentialCard.test.ts
index 06760c75da7c5..9ca589923d59e 100644
--- a/packages/editor-ui/src/components/CredentialCard.test.ts
+++ b/packages/editor-ui/src/components/CredentialCard.test.ts
@@ -6,7 +6,7 @@ import { createComponentRenderer } from '@/__tests__/render';
 import CredentialCard from '@/components/CredentialCard.vue';
 import type { ICredentialsResponse } from '@/Interface';
 import type { ProjectSharingData } from '@/types/projects.types';
-import { useSettingsStore } from '@/stores/settings.store';
+import { useProjectsStore } from '@/stores/projects.store';
 
 const renderComponent = createComponentRenderer(CredentialCard);
 
@@ -22,12 +22,12 @@ const createCredential = (overrides = {}): ICredentialsResponse => ({
 });
 
 describe('CredentialCard', () => {
-	let settingsStore: ReturnType<typeof useSettingsStore>;
+	let projectsStore: ReturnType<typeof useProjectsStore>;
 
 	beforeEach(() => {
 		const pinia = createTestingPinia();
 		setActivePinia(pinia);
-		settingsStore = useSettingsStore();
+		projectsStore = useProjectsStore();
 	});
 
 	it('should render name and home project name', () => {
@@ -63,7 +63,7 @@ describe('CredentialCard', () => {
 	});
 
 	it('should show Move action only if there is resource permission and not on community plan', async () => {
-		vi.spyOn(settingsStore, 'isCommunityPlan', 'get').mockReturnValue(false);
+		vi.spyOn(projectsStore, 'isTeamProjectFeatureEnabled', 'get').mockReturnValue(true);
 
 		const data = createCredential({
 			scopes: ['credential:move'],
diff --git a/packages/editor-ui/src/components/CredentialCard.vue b/packages/editor-ui/src/components/CredentialCard.vue
index f36926a19b09d..d9ac12ffd9a54 100644
--- a/packages/editor-ui/src/components/CredentialCard.vue
+++ b/packages/editor-ui/src/components/CredentialCard.vue
@@ -14,7 +14,6 @@ import { useProjectsStore } from '@/stores/projects.store';
 import ProjectCardBadge from '@/components/Projects/ProjectCardBadge.vue';
 import { useI18n } from '@/composables/useI18n';
 import { ResourceType } from '@/utils/projects.utils';
-import { useSettingsStore } from '@/stores/settings.store';
 
 const CREDENTIAL_LIST_ITEM_ACTIONS = {
 	OPEN: 'open',
@@ -46,7 +45,6 @@ const message = useMessage();
 const uiStore = useUIStore();
 const credentialsStore = useCredentialsStore();
 const projectsStore = useProjectsStore();
-const settingsStore = useSettingsStore();
 
 const resourceTypeLabel = computed(() => locale.baseText('generic.credential').toLowerCase());
 const credentialType = computed(() => credentialsStore.getCredentialTypeByName(props.data.type));
@@ -66,7 +64,7 @@ const actions = computed(() => {
 		});
 	}
 
-	if (credentialPermissions.value.move && !settingsStore.isCommunityPlan) {
+	if (credentialPermissions.value.move && projectsStore.isTeamProjectFeatureEnabled) {
 		items.push({
 			label: locale.baseText('credentials.item.move'),
 			value: CREDENTIAL_LIST_ITEM_ACTIONS.MOVE,
diff --git a/packages/editor-ui/src/components/Projects/ProjectNavigation.vue b/packages/editor-ui/src/components/Projects/ProjectNavigation.vue
index d1f5bac9ce60a..2b4909e0f2f95 100644
--- a/packages/editor-ui/src/components/Projects/ProjectNavigation.vue
+++ b/packages/editor-ui/src/components/Projects/ProjectNavigation.vue
@@ -116,7 +116,7 @@ onMounted(async () => {
 		<hr
 			v-if="
 				displayProjects.length ||
-				(projectsStore.hasPermissionToCreateProjects && projectsStore.teamProjectsAvailable)
+				(projectsStore.hasPermissionToCreateProjects && projectsStore.isTeamProjectFeatureEnabled)
 			"
 			class="mt-m mb-m"
 		/>
@@ -137,7 +137,9 @@ onMounted(async () => {
 		</ElMenu>
 		<N8nTooltip placement="right" :disabled="projectsStore.canCreateProjects">
 			<ElMenu
-				v-if="projectsStore.hasPermissionToCreateProjects && projectsStore.teamProjectsAvailable"
+				v-if="
+					projectsStore.hasPermissionToCreateProjects && projectsStore.isTeamProjectFeatureEnabled
+				"
 				:collapse="props.collapsed"
 				class="pl-xs pr-xs"
 			>
@@ -171,7 +173,7 @@ onMounted(async () => {
 		<hr
 			v-if="
 				displayProjects.length ||
-				(projectsStore.hasPermissionToCreateProjects && projectsStore.teamProjectsAvailable)
+				(projectsStore.hasPermissionToCreateProjects && projectsStore.isTeamProjectFeatureEnabled)
 			"
 			class="mt-m mb-m"
 		/>
diff --git a/packages/editor-ui/src/components/WorkflowCard.test.ts b/packages/editor-ui/src/components/WorkflowCard.test.ts
index 97be0e7fd4536..735b20ada5f0b 100644
--- a/packages/editor-ui/src/components/WorkflowCard.test.ts
+++ b/packages/editor-ui/src/components/WorkflowCard.test.ts
@@ -7,7 +7,7 @@ import { VIEWS } from '@/constants';
 import WorkflowCard from '@/components/WorkflowCard.vue';
 import type { IWorkflowDb } from '@/Interface';
 import { useRouter } from 'vue-router';
-import { useSettingsStore } from '@/stores/settings.store';
+import { useProjectsStore } from '@/stores/projects.store';
 
 vi.mock('vue-router', () => {
 	const push = vi.fn();
@@ -40,13 +40,13 @@ describe('WorkflowCard', () => {
 	let pinia: ReturnType<typeof createPinia>;
 	let windowOpenSpy: MockInstance;
 	let router: ReturnType<typeof useRouter>;
-	let settingsStore: ReturnType<typeof useSettingsStore>;
+	let projectsStore: ReturnType<typeof useProjectsStore>;
 
 	beforeEach(async () => {
 		pinia = createPinia();
 		setActivePinia(pinia);
 		router = useRouter();
-		settingsStore = useSettingsStore();
+		projectsStore = useProjectsStore();
 		windowOpenSpy = vi.spyOn(window, 'open').mockImplementation(() => null);
 	});
 
@@ -143,8 +143,8 @@ describe('WorkflowCard', () => {
 		expect(badge).toHaveTextContent('John Doe');
 	});
 
-	it('should show Move action only if there is resource permission and not on community plan', async () => {
-		vi.spyOn(settingsStore, 'isCommunityPlan', 'get').mockReturnValue(false);
+	it('should show Move action only if there is resource permission and team projects available', async () => {
+		vi.spyOn(projectsStore, 'isTeamProjectFeatureEnabled', 'get').mockReturnValue(true);
 
 		const data = createWorkflow({
 			scopes: ['workflow:move'],
diff --git a/packages/editor-ui/src/components/WorkflowCard.vue b/packages/editor-ui/src/components/WorkflowCard.vue
index 21220e94924dc..6cc73db627817 100644
--- a/packages/editor-ui/src/components/WorkflowCard.vue
+++ b/packages/editor-ui/src/components/WorkflowCard.vue
@@ -95,7 +95,7 @@ const actions = computed(() => {
 		});
 	}
 
-	if (workflowPermissions.value.move && !settingsStore.isCommunityPlan) {
+	if (workflowPermissions.value.move && projectsStore.isTeamProjectFeatureEnabled) {
 		items.push({
 			label: locale.baseText('workflows.item.move'),
 			value: WORKFLOW_LIST_ITEM_ACTIONS.MOVE,
diff --git a/packages/editor-ui/src/stores/projects.store.ts b/packages/editor-ui/src/stores/projects.store.ts
index f5fbaf6200762..6bc61d246c7c9 100644
--- a/packages/editor-ui/src/stores/projects.store.ts
+++ b/packages/editor-ui/src/stores/projects.store.ts
@@ -49,19 +49,19 @@ export const useProjectsStore = defineStore('projects', () => {
 	);
 	const teamProjects = computed(() => projects.value.filter((p) => p.type === ProjectTypes.Team));
 	const teamProjectsLimit = computed(() => settingsStore.settings.enterprise.projects.team.limit);
-	const teamProjectsAvailable = computed<boolean>(
+	const isTeamProjectFeatureEnabled = computed<boolean>(
 		() => settingsStore.settings.enterprise.projects.team.limit !== 0,
 	);
 	const hasUnlimitedProjects = computed<boolean>(
 		() => settingsStore.settings.enterprise.projects.team.limit === -1,
 	);
-	const teamProjectLimitExceeded = computed<boolean>(
+	const isTeamProjectLimitExceeded = computed<boolean>(
 		() => projectsCount.value.team >= teamProjectsLimit.value,
 	);
 	const canCreateProjects = computed<boolean>(
 		() =>
 			hasUnlimitedProjects.value ||
-			(teamProjectsAvailable.value && !teamProjectLimitExceeded.value),
+			(isTeamProjectFeatureEnabled.value && !isTeamProjectLimitExceeded.value),
 	);
 	const hasPermissionToCreateProjects = computed(() =>
 		hasPermission(['rbac'], { rbac: { scope: 'project:create' } }),
@@ -199,7 +199,7 @@ export const useProjectsStore = defineStore('projects', () => {
 		hasUnlimitedProjects,
 		canCreateProjects,
 		hasPermissionToCreateProjects,
-		teamProjectsAvailable,
+		isTeamProjectFeatureEnabled,
 		projectNavActiveId,
 		setCurrentProject,
 		getAllProjects,

From 432ac1da59e173ce4c0f2abbc416743d9953ba70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Fri, 2 Aug 2024 12:01:10 +0200
Subject: [PATCH 055/168] fix(core): Surface enterprise trial error message
 (#10267)

---
 packages/cli/src/license/license.controller.ts | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/packages/cli/src/license/license.controller.ts b/packages/cli/src/license/license.controller.ts
index 1c0ca8c0d68ed..945f3650ea340 100644
--- a/packages/cli/src/license/license.controller.ts
+++ b/packages/cli/src/license/license.controller.ts
@@ -1,6 +1,8 @@
 import { Get, Post, RestController, GlobalScope } from '@/decorators';
 import { AuthenticatedRequest, LicenseRequest } from '@/requests';
 import { LicenseService } from './license.service';
+import { BadRequestError } from '@/errors/response-errors/bad-request.error';
+import type { AxiosError } from 'axios';
 
 @RestController('/license')
 export class LicenseController {
@@ -14,7 +16,18 @@ export class LicenseController {
 	@Post('/enterprise/request_trial')
 	@GlobalScope('license:manage')
 	async requestEnterpriseTrial(req: AuthenticatedRequest) {
-		await this.licenseService.requestEnterpriseTrial(req.user);
+		try {
+			await this.licenseService.requestEnterpriseTrial(req.user);
+		} catch (error: unknown) {
+			if (error instanceof Error) {
+				const errorMsg =
+					(error as AxiosError<{ message: string }>).response?.data?.message ?? error.message;
+
+				throw new BadRequestError(errorMsg);
+			} else {
+				throw new BadRequestError('Failed to request trial');
+			}
+		}
 	}
 
 	@Post('/activate')

From dc8c94d036ca6ee5f3fbed839770ce5a902cca11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Fri, 2 Aug 2024 12:01:42 +0200
Subject: [PATCH 056/168] ci: Introduce lint rule
 `no-type-unsafe-event-emitter` (no-changelog) (#10254)

---
 packages/@n8n_io/eslint-config/local-rules.js | 30 +++++++++++++++++++
 packages/cli/.eslintrc.js                     |  7 +++++
 .../MessageEventBus/MessageEventBus.ts        |  2 ++
 3 files changed, 39 insertions(+)

diff --git a/packages/@n8n_io/eslint-config/local-rules.js b/packages/@n8n_io/eslint-config/local-rules.js
index c9b533a032e1e..152415e14c8d0 100644
--- a/packages/@n8n_io/eslint-config/local-rules.js
+++ b/packages/@n8n_io/eslint-config/local-rules.js
@@ -448,6 +448,36 @@ module.exports = {
 			};
 		},
 	},
+
+	'no-type-unsafe-event-emitter': {
+		meta: {
+			type: 'problem',
+			docs: {
+				description: 'Disallow extending from `EventEmitter`, which is not type-safe.',
+				recommended: 'error',
+			},
+			messages: {
+				noExtendsEventEmitter: 'Extend from the type-safe `TypedEmitter` class instead.',
+			},
+		},
+		create(context) {
+			return {
+				ClassDeclaration(node) {
+					if (
+						node.superClass &&
+						node.superClass.type === 'Identifier' &&
+						node.superClass.name === 'EventEmitter' &&
+						node.id.name !== 'TypedEmitter'
+					) {
+						context.report({
+							node: node.superClass,
+							messageId: 'noExtendsEventEmitter',
+						});
+					}
+				},
+			};
+		},
+	},
 };
 
 const isJsonParseCall = (node) =>
diff --git a/packages/cli/.eslintrc.js b/packages/cli/.eslintrc.js
index ac66574887551..bb1041607ddcd 100644
--- a/packages/cli/.eslintrc.js
+++ b/packages/cli/.eslintrc.js
@@ -21,6 +21,7 @@ module.exports = {
 	rules: {
 		'n8n-local-rules/no-dynamic-import-template': 'error',
 		'n8n-local-rules/misplaced-n8n-typeorm-import': 'error',
+		'n8n-local-rules/no-type-unsafe-event-emitter': 'error',
 		complexity: 'error',
 
 		// TODO: Remove this
@@ -44,6 +45,12 @@ module.exports = {
 				'n8n-local-rules/misplaced-n8n-typeorm-import': 'off',
 			},
 		},
+		{
+			files: ['./test/**/*.ts'],
+			rules: {
+				'n8n-local-rules/no-type-unsafe-event-emitter': 'off',
+			},
+		},
 		{
 			files: ['./src/decorators/**/*.ts'],
 			rules: {
diff --git a/packages/cli/src/eventbus/MessageEventBus/MessageEventBus.ts b/packages/cli/src/eventbus/MessageEventBus/MessageEventBus.ts
index 758eeb5ae590f..eeb868798bf6b 100644
--- a/packages/cli/src/eventbus/MessageEventBus/MessageEventBus.ts
+++ b/packages/cli/src/eventbus/MessageEventBus/MessageEventBus.ts
@@ -52,6 +52,8 @@ export interface MessageEventBusInitializeOptions {
 }
 
 @Service()
+// TODO: Convert to TypedEventEmitter
+// eslint-disable-next-line n8n-local-rules/no-type-unsafe-event-emitter
 export class MessageEventBus extends EventEmitter {
 	private isInitialized = false;
 

From 489ce100634c3af678fb300e9a39d273042542e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Fri, 2 Aug 2024 12:02:05 +0200
Subject: [PATCH 057/168] feat(core): Support create, read, update, delete
 projects in Public API (#10269)

---
 .../v1/handlers/projects/projects.handler.ts  |  65 +++
 .../spec/paths/projects.projectId.yml         |  43 ++
 .../handlers/projects/spec/paths/projects.yml |  40 ++
 .../spec/schemas/parameters/projectId.yml     |   6 +
 .../projects/spec/schemas/project.yml         |  13 +
 .../projects/spec/schemas/projectList.yml     |  11 +
 packages/cli/src/PublicApi/v1/openapi.yml     |   6 +
 .../integration/publicApi/projects.test.ts    | 401 ++++++++++++++++++
 .../test/integration/shared/db/projects.ts    |   4 +
 .../cli/test/integration/shared/db/users.ts   |   6 +-
 10 files changed, 594 insertions(+), 1 deletion(-)
 create mode 100644 packages/cli/src/PublicApi/v1/handlers/projects/projects.handler.ts
 create mode 100644 packages/cli/src/PublicApi/v1/handlers/projects/spec/paths/projects.projectId.yml
 create mode 100644 packages/cli/src/PublicApi/v1/handlers/projects/spec/paths/projects.yml
 create mode 100644 packages/cli/src/PublicApi/v1/handlers/projects/spec/schemas/parameters/projectId.yml
 create mode 100644 packages/cli/src/PublicApi/v1/handlers/projects/spec/schemas/project.yml
 create mode 100644 packages/cli/src/PublicApi/v1/handlers/projects/spec/schemas/projectList.yml
 create mode 100644 packages/cli/test/integration/publicApi/projects.test.ts

diff --git a/packages/cli/src/PublicApi/v1/handlers/projects/projects.handler.ts b/packages/cli/src/PublicApi/v1/handlers/projects/projects.handler.ts
new file mode 100644
index 0000000000000..e61e808daf301
--- /dev/null
+++ b/packages/cli/src/PublicApi/v1/handlers/projects/projects.handler.ts
@@ -0,0 +1,65 @@
+import { globalScope, isLicensed, validCursor } from '../../shared/middlewares/global.middleware';
+import type { Response } from 'express';
+import type { ProjectRequest } from '@/requests';
+import type { PaginatedRequest } from '@/PublicApi/types';
+import Container from 'typedi';
+import { ProjectController } from '@/controllers/project.controller';
+import { ProjectRepository } from '@/databases/repositories/project.repository';
+import { encodeNextCursor } from '../../shared/services/pagination.service';
+
+type Create = ProjectRequest.Create;
+type Update = ProjectRequest.Update;
+type Delete = ProjectRequest.Delete;
+type GetAll = PaginatedRequest;
+
+export = {
+	createProject: [
+		isLicensed('feat:projectRole:admin'),
+		globalScope('project:create'),
+		async (req: Create, res: Response) => {
+			const project = await Container.get(ProjectController).createProject(req);
+
+			return res.status(201).json(project);
+		},
+	],
+	updateProject: [
+		isLicensed('feat:projectRole:admin'),
+		globalScope('project:update'),
+		async (req: Update, res: Response) => {
+			await Container.get(ProjectController).updateProject(req);
+
+			return res.status(204).send();
+		},
+	],
+	deleteProject: [
+		isLicensed('feat:projectRole:admin'),
+		globalScope('project:delete'),
+		async (req: Delete, res: Response) => {
+			await Container.get(ProjectController).deleteProject(req);
+
+			return res.status(204).send();
+		},
+	],
+	getProjects: [
+		isLicensed('feat:projectRole:admin'),
+		globalScope('project:list'),
+		validCursor,
+		async (req: GetAll, res: Response) => {
+			const { offset = 0, limit = 100 } = req.query;
+
+			const [projects, count] = await Container.get(ProjectRepository).findAndCount({
+				skip: offset,
+				take: limit,
+			});
+
+			return res.json({
+				data: projects,
+				nextCursor: encodeNextCursor({
+					offset,
+					limit,
+					numberOfTotalRecords: count,
+				}),
+			});
+		},
+	],
+};
diff --git a/packages/cli/src/PublicApi/v1/handlers/projects/spec/paths/projects.projectId.yml b/packages/cli/src/PublicApi/v1/handlers/projects/spec/paths/projects.projectId.yml
new file mode 100644
index 0000000000000..a5aab19b3d6ed
--- /dev/null
+++ b/packages/cli/src/PublicApi/v1/handlers/projects/spec/paths/projects.projectId.yml
@@ -0,0 +1,43 @@
+delete:
+  x-eov-operation-id: deleteProject
+  x-eov-operation-handler: v1/handlers/projects/projects.handler
+  tags:
+    - Projects
+  summary: Delete a project
+  description: Delete a project from your instance.
+  parameters:
+    - $ref: '../schemas/parameters/projectId.yml'
+  responses:
+    '204':
+      description: Operation successful.
+    '401':
+      $ref: '../../../../shared/spec/responses/unauthorized.yml'
+    '403':
+      $ref: '../../../../shared/spec/responses/forbidden.yml'
+    '404':
+      $ref: '../../../../shared/spec/responses/notFound.yml'
+put:
+  x-eov-operation-id: updateProject
+  x-eov-operation-handler: v1/handlers/projects/projects.handler
+  tags:
+    - Project
+  summary: Update a project
+  description: Update a project.
+  requestBody:
+    description: Updated project object.
+    content:
+      application/json:
+        schema:
+          $ref: '../schemas/project.yml'
+    required: true
+  responses:
+    '204':
+      description: Operation successful.
+    '400':
+      $ref: '../../../../shared/spec/responses/badRequest.yml'
+    '401':
+      $ref: '../../../../shared/spec/responses/unauthorized.yml'
+    '403':
+      $ref: '../../../../shared/spec/responses/forbidden.yml'
+    '404':
+      $ref: '../../../../shared/spec/responses/notFound.yml'
diff --git a/packages/cli/src/PublicApi/v1/handlers/projects/spec/paths/projects.yml b/packages/cli/src/PublicApi/v1/handlers/projects/spec/paths/projects.yml
new file mode 100644
index 0000000000000..1babd3dd6ea03
--- /dev/null
+++ b/packages/cli/src/PublicApi/v1/handlers/projects/spec/paths/projects.yml
@@ -0,0 +1,40 @@
+post:
+  x-eov-operation-id: createProject
+  x-eov-operation-handler: v1/handlers/projects/projects.handler
+  tags:
+    - Projects
+  summary: Create a project
+  description: Create a project in your instance.
+  requestBody:
+    description: Payload for project to create.
+    content:
+      application/json:
+        schema:
+          $ref: '../schemas/project.yml'
+    required: true
+  responses:
+    '201':
+      description: Operation successful.
+    '400':
+      $ref: '../../../../shared/spec/responses/badRequest.yml'
+    '401':
+      $ref: '../../../../shared/spec/responses/unauthorized.yml'
+get:
+  x-eov-operation-id: getProjects
+  x-eov-operation-handler: v1/handlers/projects/projects.handler
+  tags:
+    - Projects
+  summary: Retrieve projects
+  description: Retrieve projects from your instance.
+  parameters:
+    - $ref: '../../../../shared/spec/parameters/limit.yml'
+    - $ref: '../../../../shared/spec/parameters/cursor.yml'
+  responses:
+    '200':
+      description: Operation successful.
+      content:
+        application/json:
+          schema:
+            $ref: '../schemas/projectList.yml'
+    '401':
+      $ref: '../../../../shared/spec/responses/unauthorized.yml'
diff --git a/packages/cli/src/PublicApi/v1/handlers/projects/spec/schemas/parameters/projectId.yml b/packages/cli/src/PublicApi/v1/handlers/projects/spec/schemas/parameters/projectId.yml
new file mode 100644
index 0000000000000..32961f46016f9
--- /dev/null
+++ b/packages/cli/src/PublicApi/v1/handlers/projects/spec/schemas/parameters/projectId.yml
@@ -0,0 +1,6 @@
+name: projectId
+in: path
+description: The ID of the project.
+required: true
+schema:
+  type: string
diff --git a/packages/cli/src/PublicApi/v1/handlers/projects/spec/schemas/project.yml b/packages/cli/src/PublicApi/v1/handlers/projects/spec/schemas/project.yml
new file mode 100644
index 0000000000000..7a4d2ec432bdd
--- /dev/null
+++ b/packages/cli/src/PublicApi/v1/handlers/projects/spec/schemas/project.yml
@@ -0,0 +1,13 @@
+type: object
+additionalProperties: false
+required:
+  - name
+properties:
+  id:
+    type: string
+    readOnly: true
+  name:
+    type: string
+  type:
+    type: string
+    readOnly: true
diff --git a/packages/cli/src/PublicApi/v1/handlers/projects/spec/schemas/projectList.yml b/packages/cli/src/PublicApi/v1/handlers/projects/spec/schemas/projectList.yml
new file mode 100644
index 0000000000000..7d88be72fb008
--- /dev/null
+++ b/packages/cli/src/PublicApi/v1/handlers/projects/spec/schemas/projectList.yml
@@ -0,0 +1,11 @@
+type: object
+properties:
+  data:
+    type: array
+    items:
+      $ref: './project.yml'
+  nextCursor:
+    type: string
+    description: Paginate through projects by setting the cursor parameter to a nextCursor attribute returned by a previous request. Default value fetches the first "page" of the collection.
+    nullable: true
+    example: MTIzZTQ1NjctZTg5Yi0xMmQzLWE0NTYtNDI2NjE0MTc0MDA
diff --git a/packages/cli/src/PublicApi/v1/openapi.yml b/packages/cli/src/PublicApi/v1/openapi.yml
index fd3b286a17fb5..e49bfb71c5668 100644
--- a/packages/cli/src/PublicApi/v1/openapi.yml
+++ b/packages/cli/src/PublicApi/v1/openapi.yml
@@ -32,6 +32,8 @@ tags:
     description: Operations about source control
   - name: Variables
     description: Operations about variables
+  - name: Projects
+    description: Operations about projects
 
 paths:
   /audit:
@@ -72,6 +74,10 @@ paths:
     $ref: './handlers/variables/spec/paths/variables.yml'
   /variables/{id}:
     $ref: './handlers/variables/spec/paths/variables.id.yml'
+  /projects:
+    $ref: './handlers/projects/spec/paths/projects.yml'
+  /projects/{projectId}:
+    $ref: './handlers/projects/spec/paths/projects.projectId.yml'
 components:
   schemas:
     $ref: './shared/spec/schemas/_index.yml'
diff --git a/packages/cli/test/integration/publicApi/projects.test.ts b/packages/cli/test/integration/publicApi/projects.test.ts
new file mode 100644
index 0000000000000..0554fd6f4116f
--- /dev/null
+++ b/packages/cli/test/integration/publicApi/projects.test.ts
@@ -0,0 +1,401 @@
+import { setupTestServer } from '@test-integration/utils';
+import { createMember, createOwner } from '@test-integration/db/users';
+import * as testDb from '../shared/testDb';
+import { FeatureNotLicensedError } from '@/errors/feature-not-licensed.error';
+import { createTeamProject, getProjectByNameOrFail } from '@test-integration/db/projects';
+import { mockInstance } from '@test/mocking';
+import { Telemetry } from '@/telemetry';
+
+describe('Projects in Public API', () => {
+	const testServer = setupTestServer({ endpointGroups: ['publicApi'] });
+	mockInstance(Telemetry);
+
+	beforeAll(async () => {
+		await testDb.init();
+	});
+
+	beforeEach(async () => {
+		await testDb.truncate(['Project', 'User']);
+	});
+
+	describe('GET /projects', () => {
+		it('if licensed, should return all projects with pagination', async () => {
+			/**
+			 * Arrange
+			 */
+			testServer.license.setQuota('quota:maxTeamProjects', -1);
+			testServer.license.enable('feat:projectRole:admin');
+			const owner = await createOwner({ withApiKey: true });
+			const projects = await Promise.all([
+				createTeamProject(),
+				createTeamProject(),
+				createTeamProject(),
+			]);
+
+			/**
+			 * Act
+			 */
+			const response = await testServer.publicApiAgentFor(owner).get('/projects');
+
+			/**
+			 * Assert
+			 */
+			expect(response.status).toBe(200);
+			expect(response.body).toHaveProperty('data');
+			expect(response.body).toHaveProperty('nextCursor');
+			expect(Array.isArray(response.body.data)).toBe(true);
+			expect(response.body.data.length).toBe(projects.length + 1); // +1 for the owner's personal project
+
+			projects.forEach(({ id, name }) => {
+				expect(response.body.data).toContainEqual(expect.objectContaining({ id, name }));
+			});
+		});
+
+		it('if not authenticated, should reject', async () => {
+			/**
+			 * Arrange
+			 */
+			const owner = await createOwner({ withApiKey: false });
+
+			/**
+			 * Act
+			 */
+			const response = await testServer.publicApiAgentFor(owner).get('/projects');
+
+			/**
+			 * Assert
+			 */
+			expect(response.status).toBe(401);
+			expect(response.body).toHaveProperty('message', "'X-N8N-API-KEY' header required");
+		});
+
+		it('if not licensed, should reject', async () => {
+			/**
+			 * Arrange
+			 */
+			const owner = await createOwner({ withApiKey: true });
+
+			/**
+			 * Act
+			 */
+			const response = await testServer.publicApiAgentFor(owner).get('/projects');
+
+			/**
+			 * Assert
+			 */
+			expect(response.status).toBe(403);
+			expect(response.body).toHaveProperty(
+				'message',
+				new FeatureNotLicensedError('feat:projectRole:admin').message,
+			);
+		});
+
+		it('if missing scope, should reject', async () => {
+			/**
+			 * Arrange
+			 */
+			testServer.license.setQuota('quota:maxTeamProjects', -1);
+			testServer.license.enable('feat:projectRole:admin');
+			const owner = await createMember({ withApiKey: true });
+
+			/**
+			 * Act
+			 */
+			const response = await testServer.publicApiAgentFor(owner).get('/projects');
+
+			/**
+			 * Assert
+			 */
+			expect(response.status).toBe(403);
+			expect(response.body).toHaveProperty('message', 'Forbidden');
+		});
+	});
+
+	describe('POST /projects', () => {
+		it('if licensed, should create a new project', async () => {
+			/**
+			 * Arrange
+			 */
+			testServer.license.setQuota('quota:maxTeamProjects', -1);
+			testServer.license.enable('feat:projectRole:admin');
+			const owner = await createOwner({ withApiKey: true });
+			const projectPayload = { name: 'some-project' };
+
+			/**
+			 * Act
+			 */
+			const response = await testServer
+				.publicApiAgentFor(owner)
+				.post('/projects')
+				.send(projectPayload);
+
+			/**
+			 * Assert
+			 */
+			expect(response.status).toBe(201);
+			expect(response.body).toEqual({
+				name: 'some-project',
+				type: 'team',
+				id: expect.any(String),
+				createdAt: expect.any(String),
+				updatedAt: expect.any(String),
+				role: 'project:admin',
+				scopes: expect.any(Array),
+			});
+			await expect(getProjectByNameOrFail(projectPayload.name)).resolves.not.toThrow();
+		});
+
+		it('if not authenticated, should reject', async () => {
+			/**
+			 * Arrange
+			 */
+			const owner = await createOwner({ withApiKey: false });
+			const projectPayload = { name: 'some-project' };
+
+			/**
+			 * Act
+			 */
+			const response = await testServer
+				.publicApiAgentFor(owner)
+				.post('/projects')
+				.send(projectPayload);
+
+			/**
+			 * Assert
+			 */
+			expect(response.status).toBe(401);
+			expect(response.body).toHaveProperty('message', "'X-N8N-API-KEY' header required");
+		});
+
+		it('if not licensed, should reject', async () => {
+			/**
+			 * Arrange
+			 */
+			const owner = await createOwner({ withApiKey: true });
+			const projectPayload = { name: 'some-project' };
+
+			/**
+			 * Act
+			 */
+			const response = await testServer
+				.publicApiAgentFor(owner)
+				.post('/projects')
+				.send(projectPayload);
+
+			/**
+			 * Assert
+			 */
+			expect(response.status).toBe(403);
+			expect(response.body).toHaveProperty(
+				'message',
+				new FeatureNotLicensedError('feat:projectRole:admin').message,
+			);
+		});
+
+		it('if missing scope, should reject', async () => {
+			/**
+			 * Arrange
+			 */
+			testServer.license.setQuota('quota:maxTeamProjects', -1);
+			testServer.license.enable('feat:projectRole:admin');
+			const member = await createMember({ withApiKey: true });
+			const projectPayload = { name: 'some-project' };
+
+			/**
+			 * Act
+			 */
+			const response = await testServer
+				.publicApiAgentFor(member)
+				.post('/projects')
+				.send(projectPayload);
+
+			/**
+			 * Assert
+			 */
+			expect(response.status).toBe(403);
+			expect(response.body).toHaveProperty('message', 'Forbidden');
+		});
+	});
+
+	describe('DELETE /projects/:id', () => {
+		it('if licensed, should delete a project', async () => {
+			/**
+			 * Arrange
+			 */
+			testServer.license.setQuota('quota:maxTeamProjects', -1);
+			testServer.license.enable('feat:projectRole:admin');
+			const owner = await createOwner({ withApiKey: true });
+			const project = await createTeamProject();
+
+			/**
+			 * Act
+			 */
+			const response = await testServer.publicApiAgentFor(owner).delete(`/projects/${project.id}`);
+
+			/**
+			 * Assert
+			 */
+			expect(response.status).toBe(204);
+			await expect(getProjectByNameOrFail(project.id)).rejects.toThrow();
+		});
+
+		it('if not authenticated, should reject', async () => {
+			/**
+			 * Arrange
+			 */
+			const owner = await createOwner({ withApiKey: false });
+			const project = await createTeamProject();
+
+			/**
+			 * Act
+			 */
+			const response = await testServer.publicApiAgentFor(owner).delete(`/projects/${project.id}`);
+
+			/**
+			 * Assert
+			 */
+			expect(response.status).toBe(401);
+			expect(response.body).toHaveProperty('message', "'X-N8N-API-KEY' header required");
+		});
+
+		it('if not licensed, should reject', async () => {
+			/**
+			 * Arrange
+			 */
+			const owner = await createOwner({ withApiKey: true });
+			const project = await createTeamProject();
+
+			/**
+			 * Act
+			 */
+			const response = await testServer.publicApiAgentFor(owner).delete(`/projects/${project.id}`);
+
+			/**
+			 * Assert
+			 */
+			expect(response.status).toBe(403);
+			expect(response.body).toHaveProperty(
+				'message',
+				new FeatureNotLicensedError('feat:projectRole:admin').message,
+			);
+		});
+
+		it('if missing scope, should reject', async () => {
+			/**
+			 * Arrange
+			 */
+			testServer.license.setQuota('quota:maxTeamProjects', -1);
+			testServer.license.enable('feat:projectRole:admin');
+			const member = await createMember({ withApiKey: true });
+			const project = await createTeamProject();
+
+			/**
+			 * Act
+			 */
+			const response = await testServer.publicApiAgentFor(member).delete(`/projects/${project.id}`);
+
+			/**
+			 * Assert
+			 */
+			expect(response.status).toBe(403);
+			expect(response.body).toHaveProperty('message', 'Forbidden');
+		});
+	});
+
+	describe('PUT /projects/:id', () => {
+		it('if licensed, should update a project', async () => {
+			/**
+			 * Arrange
+			 */
+			testServer.license.setQuota('quota:maxTeamProjects', -1);
+			testServer.license.enable('feat:projectRole:admin');
+			const owner = await createOwner({ withApiKey: true });
+			const project = await createTeamProject('old-name');
+
+			/**
+			 * Act
+			 */
+			const response = await testServer
+				.publicApiAgentFor(owner)
+				.put(`/projects/${project.id}`)
+				.send({ name: 'new-name' });
+
+			/**
+			 * Assert
+			 */
+			expect(response.status).toBe(204);
+			await expect(getProjectByNameOrFail('new-name')).resolves.not.toThrow();
+		});
+
+		it('if not authenticated, should reject', async () => {
+			/**
+			 * Arrange
+			 */
+			const owner = await createOwner({ withApiKey: false });
+			const project = await createTeamProject();
+
+			/**
+			 * Act
+			 */
+			const response = await testServer
+				.publicApiAgentFor(owner)
+				.put(`/projects/${project.id}`)
+				.send({ name: 'new-name' });
+
+			/**
+			 * Assert
+			 */
+			expect(response.status).toBe(401);
+			expect(response.body).toHaveProperty('message', "'X-N8N-API-KEY' header required");
+		});
+
+		it('if not licensed, should reject', async () => {
+			/**
+			 * Arrange
+			 */
+			const owner = await createOwner({ withApiKey: true });
+			const project = await createTeamProject();
+
+			/**
+			 * Act
+			 */
+			const response = await testServer
+				.publicApiAgentFor(owner)
+				.put(`/projects/${project.id}`)
+				.send({ name: 'new-name' });
+
+			/**
+			 * Assert
+			 */
+			expect(response.status).toBe(403);
+			expect(response.body).toHaveProperty(
+				'message',
+				new FeatureNotLicensedError('feat:projectRole:admin').message,
+			);
+		});
+
+		it('if missing scope, should reject', async () => {
+			/**
+			 * Arrange
+			 */
+			testServer.license.setQuota('quota:maxTeamProjects', -1);
+			testServer.license.enable('feat:projectRole:admin');
+			const member = await createMember({ withApiKey: true });
+			const project = await createTeamProject();
+
+			/**
+			 * Act
+			 */
+			const response = await testServer
+				.publicApiAgentFor(member)
+				.put(`/projects/${project.id}`)
+				.send({ name: 'new-name' });
+
+			/**
+			 * Assert
+			 */
+			expect(response.status).toBe(403);
+			expect(response.body).toHaveProperty('message', 'Forbidden');
+		});
+	});
+});
diff --git a/packages/cli/test/integration/shared/db/projects.ts b/packages/cli/test/integration/shared/db/projects.ts
index 60548575b362b..3de7de5bb95f9 100644
--- a/packages/cli/test/integration/shared/db/projects.ts
+++ b/packages/cli/test/integration/shared/db/projects.ts
@@ -34,6 +34,10 @@ export const linkUserToProject = async (user: User, project: Project, role: Proj
 	);
 };
 
+export async function getProjectByNameOrFail(name: string) {
+	return await Container.get(ProjectRepository).findOneOrFail({ where: { name } });
+}
+
 export const getPersonalProject = async (user: User): Promise<Project> => {
 	return await Container.get(ProjectRepository).findOneOrFail({
 		where: {
diff --git a/packages/cli/test/integration/shared/db/users.ts b/packages/cli/test/integration/shared/db/users.ts
index f125f5ccded4f..98626bc549d9e 100644
--- a/packages/cli/test/integration/shared/db/users.ts
+++ b/packages/cli/test/integration/shared/db/users.ts
@@ -86,7 +86,11 @@ export async function createOwner({ withApiKey } = { withApiKey: false }) {
 	return await createUser({ role: 'global:owner' });
 }
 
-export async function createMember() {
+export async function createMember({ withApiKey } = { withApiKey: false }) {
+	if (withApiKey) {
+		return await addApiKey(await createUser({ role: 'global:member' }));
+	}
+
 	return await createUser({ role: 'global:member' });
 }
 

From 07d7b247f02a9d7185beca7817deb779a3d665dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Fri, 2 Aug 2024 12:02:38 +0200
Subject: [PATCH 058/168] feat(core): Allow transferring credentials in Public
 API (#10259)

---
 packages/cli/src/PublicApi/types.ts           |  6 +++
 .../credentials/credentials.handler.ts        | 16 ++++++
 .../spec/paths/credentials.id.transfer.yml    | 31 ++++++++++++
 .../spec/schemas/parameters/credentialId.yml  |  6 +++
 packages/cli/src/PublicApi/v1/openapi.yml     |  2 +
 .../integration/publicApi/credentials.test.ts | 50 ++++++++++++++++++-
 .../integration/publicApi/workflows.test.ts   |  2 +-
 .../test/integration/shared/db/credentials.ts | 19 +++++--
 8 files changed, 127 insertions(+), 5 deletions(-)
 create mode 100644 packages/cli/src/PublicApi/v1/handlers/credentials/spec/paths/credentials.id.transfer.yml
 create mode 100644 packages/cli/src/PublicApi/v1/handlers/credentials/spec/schemas/parameters/credentialId.yml

diff --git a/packages/cli/src/PublicApi/types.ts b/packages/cli/src/PublicApi/types.ts
index f58b521e04a88..831dd03ebfb9c 100644
--- a/packages/cli/src/PublicApi/types.ts
+++ b/packages/cli/src/PublicApi/types.ts
@@ -142,6 +142,12 @@ export declare namespace CredentialRequest {
 	>;
 
 	type Delete = AuthenticatedRequest<{ id: string }, {}, {}, Record<string, string>>;
+
+	type Transfer = AuthenticatedRequest<
+		{ workflowId: string },
+		{},
+		{ destinationProjectId: string }
+	>;
 }
 
 export type OperationID = 'getUsers' | 'getUser';
diff --git a/packages/cli/src/PublicApi/v1/handlers/credentials/credentials.handler.ts b/packages/cli/src/PublicApi/v1/handlers/credentials/credentials.handler.ts
index 4da7635831340..57b6bd66f6841 100644
--- a/packages/cli/src/PublicApi/v1/handlers/credentials/credentials.handler.ts
+++ b/packages/cli/src/PublicApi/v1/handlers/credentials/credentials.handler.ts
@@ -19,6 +19,8 @@ import {
 	toJsonSchema,
 } from './credentials.service';
 import { Container } from 'typedi';
+import { z } from 'zod';
+import { EnterpriseCredentialsService } from '@/credentials/credentials.service.ee';
 
 export = {
 	createCredential: [
@@ -44,6 +46,20 @@ export = {
 			}
 		},
 	],
+	transferCredential: [
+		projectScope('credential:move', 'credential'),
+		async (req: CredentialRequest.Transfer, res: express.Response) => {
+			const body = z.object({ destinationProjectId: z.string() }).parse(req.body);
+
+			await Container.get(EnterpriseCredentialsService).transferOne(
+				req.user,
+				req.params.workflowId,
+				body.destinationProjectId,
+			);
+
+			res.status(204).send();
+		},
+	],
 	deleteCredential: [
 		projectScope('credential:delete', 'credential'),
 		async (
diff --git a/packages/cli/src/PublicApi/v1/handlers/credentials/spec/paths/credentials.id.transfer.yml b/packages/cli/src/PublicApi/v1/handlers/credentials/spec/paths/credentials.id.transfer.yml
new file mode 100644
index 0000000000000..a9e9c5cf7c229
--- /dev/null
+++ b/packages/cli/src/PublicApi/v1/handlers/credentials/spec/paths/credentials.id.transfer.yml
@@ -0,0 +1,31 @@
+put:
+  x-eov-operation-id: transferCredential
+  x-eov-operation-handler: v1/handlers/credentials/credentials.handler
+  tags:
+    - Workflow
+  summary: Transfer a credential to another project.
+  description: Transfer a credential to another project.
+  parameters:
+    - $ref: '../schemas/parameters/credentialId.yml'
+  requestBody:
+    description: Destination project for the credential transfer.
+    content:
+      application/json:
+        schema:
+          type: object
+          properties:
+            destinationProjectId:
+              type: string
+              description: The ID of the project to transfer the credential to.
+          required:
+            - destinationProjectId
+    required: true
+  responses:
+    '200':
+      description: Operation successful.
+    '400':
+      $ref: '../../../../shared/spec/responses/badRequest.yml'
+    '401':
+      $ref: '../../../../shared/spec/responses/unauthorized.yml'
+    '404':
+      $ref: '../../../../shared/spec/responses/notFound.yml'
diff --git a/packages/cli/src/PublicApi/v1/handlers/credentials/spec/schemas/parameters/credentialId.yml b/packages/cli/src/PublicApi/v1/handlers/credentials/spec/schemas/parameters/credentialId.yml
new file mode 100644
index 0000000000000..f16676ce0b96c
--- /dev/null
+++ b/packages/cli/src/PublicApi/v1/handlers/credentials/spec/schemas/parameters/credentialId.yml
@@ -0,0 +1,6 @@
+name: id
+in: path
+description: The ID of the credential.
+required: true
+schema:
+  type: string
diff --git a/packages/cli/src/PublicApi/v1/openapi.yml b/packages/cli/src/PublicApi/v1/openapi.yml
index e49bfb71c5668..1d4e14079f541 100644
--- a/packages/cli/src/PublicApi/v1/openapi.yml
+++ b/packages/cli/src/PublicApi/v1/openapi.yml
@@ -62,6 +62,8 @@ paths:
     $ref: './handlers/workflows/spec/paths/workflows.id.deactivate.yml'
   /workflows/{id}/transfer:
     $ref: './handlers/workflows/spec/paths/workflows.id.transfer.yml'
+  /credentials/{id}/transfer:
+    $ref: './handlers/credentials/spec/paths/credentials.id.transfer.yml'
   /workflows/{id}/tags:
     $ref: './handlers/workflows/spec/paths/workflows.id.tags.yml'
   /users:
diff --git a/packages/cli/test/integration/publicApi/credentials.test.ts b/packages/cli/test/integration/publicApi/credentials.test.ts
index dfa6c44dd4037..b5ed2bfb31d82 100644
--- a/packages/cli/test/integration/publicApi/credentials.test.ts
+++ b/packages/cli/test/integration/publicApi/credentials.test.ts
@@ -9,9 +9,10 @@ import { randomApiKey, randomName } from '../shared/random';
 import * as utils from '../shared/utils/';
 import type { CredentialPayload, SaveCredentialFunction } from '../shared/types';
 import * as testDb from '../shared/testDb';
-import { affixRoleToSaveCredential } from '../shared/db/credentials';
+import { affixRoleToSaveCredential, createCredentials } from '../shared/db/credentials';
 import { addApiKey, createUser, createUserShell } from '../shared/db/users';
 import type { SuperAgentTest } from '../shared/types';
+import { createTeamProject } from '@test-integration/db/projects';
 
 let owner: User;
 let member: User;
@@ -256,6 +257,53 @@ describe('GET /credentials/schema/:credentialType', () => {
 	});
 });
 
+describe('PUT /credentials/:id/transfer', () => {
+	test('should transfer credential to project', async () => {
+		/**
+		 * Arrange
+		 */
+		const [firstProject, secondProject] = await Promise.all([
+			createTeamProject('first-project', owner),
+			createTeamProject('second-project', owner),
+		]);
+
+		const credentials = await createCredentials(
+			{ name: 'Test', type: 'test', data: '' },
+			firstProject,
+		);
+
+		/**
+		 * Act
+		 */
+		const response = await authOwnerAgent.put(`/credentials/${credentials.id}/transfer`).send({
+			destinationProjectId: secondProject.id,
+		});
+
+		/**
+		 * Assert
+		 */
+		expect(response.statusCode).toBe(204);
+	});
+
+	test('if no destination project, should reject', async () => {
+		/**
+		 * Arrange
+		 */
+		const project = await createTeamProject('first-project', member);
+		const credentials = await createCredentials({ name: 'Test', type: 'test', data: '' }, project);
+
+		/**
+		 * Act
+		 */
+		const response = await authOwnerAgent.put(`/credentials/${credentials.id}/transfer`).send({});
+
+		/**
+		 * Assert
+		 */
+		expect(response.statusCode).toBe(400);
+	});
+});
+
 const credentialPayload = (): CredentialPayload => ({
 	name: randomName(),
 	type: 'githubApi',
diff --git a/packages/cli/test/integration/publicApi/workflows.test.ts b/packages/cli/test/integration/publicApi/workflows.test.ts
index 855e69e3df12a..1e292af64d92f 100644
--- a/packages/cli/test/integration/publicApi/workflows.test.ts
+++ b/packages/cli/test/integration/publicApi/workflows.test.ts
@@ -1493,7 +1493,7 @@ describe('PUT /workflows/:id/transfer', () => {
 		 * Arrange
 		 */
 		const firstProject = await createTeamProject('first-project', member);
-		const secondProject = await createTeamProject('secon-project', member);
+		const secondProject = await createTeamProject('second-project', member);
 		const workflow = await createWorkflow({}, firstProject);
 
 		/**
diff --git a/packages/cli/test/integration/shared/db/credentials.ts b/packages/cli/test/integration/shared/db/credentials.ts
index 046d27db261a0..588fee6b51196 100644
--- a/packages/cli/test/integration/shared/db/credentials.ts
+++ b/packages/cli/test/integration/shared/db/credentials.ts
@@ -38,11 +38,24 @@ export async function createManyCredentials(
 	);
 }
 
-export async function createCredentials(attributes: Partial<CredentialsEntity> = emptyAttributes) {
+export async function createCredentials(
+	attributes: Partial<CredentialsEntity> = emptyAttributes,
+	project?: Project,
+) {
 	const credentialsRepository = Container.get(CredentialsRepository);
-	const entity = credentialsRepository.create(attributes);
+	const credentials = await credentialsRepository.save(credentialsRepository.create(attributes));
+
+	if (project) {
+		await Container.get(SharedCredentialsRepository).save(
+			Container.get(SharedCredentialsRepository).create({
+				project,
+				credentials,
+				role: 'credential:owner',
+			}),
+		);
+	}
 
-	return await credentialsRepository.save(entity);
+	return credentials;
 }
 
 /**

From a5339166285b896a8ac2723723ca9544e0d2e6cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Fri, 2 Aug 2024 12:05:06 +0200
Subject: [PATCH 059/168] refactor(core): Decouple post workflow execute event
 from internal hooks (no-changelog) (#10280)

---
 packages/cli/src/InternalHooks.ts             | 158 +-----------------
 .../cli/src/WorkflowExecuteAdditionalData.ts  |  15 +-
 packages/cli/src/WorkflowRunner.ts            |  12 +-
 .../audit-event-relay.service.test.ts         |  34 ++--
 .../src/eventbus/audit-event-relay.service.ts |  16 +-
 packages/cli/src/eventbus/event.types.ts      |   6 +-
 .../executions/execution-recovery.service.ts  |  16 +-
 .../telemetry-event-relay.service.ts          | 141 ++++++++++++++++
 8 files changed, 179 insertions(+), 219 deletions(-)

diff --git a/packages/cli/src/InternalHooks.ts b/packages/cli/src/InternalHooks.ts
index fda2c3f21dfc7..46637106b7a47 100644
--- a/packages/cli/src/InternalHooks.ts
+++ b/packages/cli/src/InternalHooks.ts
@@ -1,23 +1,10 @@
 import { Service } from 'typedi';
 import { snakeCase } from 'change-case';
-import { get as pslGet } from 'psl';
-import type {
-	ExecutionStatus,
-	INodesGraphResult,
-	IRun,
-	ITelemetryTrackProperties,
-	IWorkflowBase,
-} from 'n8n-workflow';
-import { TelemetryHelpers } from 'n8n-workflow';
-
-import { N8N_VERSION } from '@/constants';
+import type { ITelemetryTrackProperties } from 'n8n-workflow';
 import type { AuthProviderType } from '@db/entities/AuthIdentity';
 import type { User } from '@db/entities/User';
-import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
-import { determineFinalExecutionStatus } from '@/executionLifecycleHooks/shared/sharedHookFunctions';
-import type { ITelemetryUserDeletionData, IExecutionTrackProperties } from '@/Interfaces';
+import type { ITelemetryUserDeletionData } from '@/Interfaces';
 import { WorkflowStatisticsService } from '@/services/workflow-statistics.service';
-import { NodeTypes } from '@/NodeTypes';
 import { Telemetry } from '@/telemetry';
 import { MessageEventBus } from './eventbus/MessageEventBus/MessageEventBus';
 
@@ -30,8 +17,6 @@ import { MessageEventBus } from './eventbus/MessageEventBus/MessageEventBus';
 export class InternalHooks {
 	constructor(
 		private readonly telemetry: Telemetry,
-		private readonly nodeTypes: NodeTypes,
-		private readonly sharedWorkflowRepository: SharedWorkflowRepository,
 		workflowStatisticsService: WorkflowStatisticsService,
 		// Can't use @ts-expect-error because only dev time tsconfig considers this as an error, but not build time
 		// eslint-disable-next-line @typescript-eslint/ban-ts-comment
@@ -64,145 +49,6 @@ export class InternalHooks {
 		this.telemetry.track('User responded to personalization questions', personalizationSurveyData);
 	}
 
-	// eslint-disable-next-line complexity
-	async onWorkflowPostExecute(
-		_executionId: string,
-		workflow: IWorkflowBase,
-		runData?: IRun,
-		userId?: string,
-	) {
-		if (!workflow.id) {
-			return;
-		}
-
-		if (runData?.status === 'waiting') {
-			// No need to send telemetry or logs when the workflow hasn't finished yet.
-			return;
-		}
-
-		const telemetryProperties: IExecutionTrackProperties = {
-			workflow_id: workflow.id,
-			is_manual: false,
-			version_cli: N8N_VERSION,
-			success: false,
-		};
-
-		if (userId) {
-			telemetryProperties.user_id = userId;
-		}
-
-		if (runData?.data.resultData.error?.message?.includes('canceled')) {
-			runData.status = 'canceled';
-		}
-
-		telemetryProperties.success = !!runData?.finished;
-
-		// const executionStatus: ExecutionStatus = runData?.status ?? 'unknown';
-		const executionStatus: ExecutionStatus = runData
-			? determineFinalExecutionStatus(runData)
-			: 'unknown';
-
-		if (runData !== undefined) {
-			telemetryProperties.execution_mode = runData.mode;
-			telemetryProperties.is_manual = runData.mode === 'manual';
-
-			let nodeGraphResult: INodesGraphResult | null = null;
-
-			if (!telemetryProperties.success && runData?.data.resultData.error) {
-				telemetryProperties.error_message = runData?.data.resultData.error.message;
-				let errorNodeName =
-					'node' in runData?.data.resultData.error
-						? runData?.data.resultData.error.node?.name
-						: undefined;
-				telemetryProperties.error_node_type =
-					'node' in runData?.data.resultData.error
-						? runData?.data.resultData.error.node?.type
-						: undefined;
-
-				if (runData.data.resultData.lastNodeExecuted) {
-					const lastNode = TelemetryHelpers.getNodeTypeForName(
-						workflow,
-						runData.data.resultData.lastNodeExecuted,
-					);
-
-					if (lastNode !== undefined) {
-						telemetryProperties.error_node_type = lastNode.type;
-						errorNodeName = lastNode.name;
-					}
-				}
-
-				if (telemetryProperties.is_manual) {
-					nodeGraphResult = TelemetryHelpers.generateNodesGraph(workflow, this.nodeTypes);
-					telemetryProperties.node_graph = nodeGraphResult.nodeGraph;
-					telemetryProperties.node_graph_string = JSON.stringify(nodeGraphResult.nodeGraph);
-
-					if (errorNodeName) {
-						telemetryProperties.error_node_id = nodeGraphResult.nameIndices[errorNodeName];
-					}
-				}
-			}
-
-			if (telemetryProperties.is_manual) {
-				if (!nodeGraphResult) {
-					nodeGraphResult = TelemetryHelpers.generateNodesGraph(workflow, this.nodeTypes);
-				}
-
-				let userRole: 'owner' | 'sharee' | undefined = undefined;
-				if (userId) {
-					const role = await this.sharedWorkflowRepository.findSharingRole(userId, workflow.id);
-					if (role) {
-						userRole = role === 'workflow:owner' ? 'owner' : 'sharee';
-					}
-				}
-
-				const manualExecEventProperties: ITelemetryTrackProperties = {
-					user_id: userId,
-					workflow_id: workflow.id,
-					status: executionStatus,
-					executionStatus: runData?.status ?? 'unknown',
-					error_message: telemetryProperties.error_message as string,
-					error_node_type: telemetryProperties.error_node_type,
-					node_graph_string: telemetryProperties.node_graph_string as string,
-					error_node_id: telemetryProperties.error_node_id as string,
-					webhook_domain: null,
-					sharing_role: userRole,
-				};
-
-				if (!manualExecEventProperties.node_graph_string) {
-					nodeGraphResult = TelemetryHelpers.generateNodesGraph(workflow, this.nodeTypes);
-					manualExecEventProperties.node_graph_string = JSON.stringify(nodeGraphResult.nodeGraph);
-				}
-
-				if (runData.data.startData?.destinationNode) {
-					const telemetryPayload = {
-						...manualExecEventProperties,
-						node_type: TelemetryHelpers.getNodeTypeForName(
-							workflow,
-							runData.data.startData?.destinationNode,
-						)?.type,
-						node_id: nodeGraphResult.nameIndices[runData.data.startData?.destinationNode],
-					};
-
-					this.telemetry.track('Manual node exec finished', telemetryPayload);
-				} else {
-					nodeGraphResult.webhookNodeNames.forEach((name: string) => {
-						const execJson = runData.data.resultData.runData[name]?.[0]?.data?.main?.[0]?.[0]
-							?.json as { headers?: { origin?: string } };
-						if (execJson?.headers?.origin && execJson.headers.origin !== '') {
-							manualExecEventProperties.webhook_domain = pslGet(
-								execJson.headers.origin.replace(/^https?:\/\//, ''),
-							);
-						}
-					});
-
-					this.telemetry.track('Manual workflow exec finished', manualExecEventProperties);
-				}
-			}
-		}
-
-		this.telemetry.trackWorkflowExecution(telemetryProperties);
-	}
-
 	onWorkflowSharingUpdate(workflowId: string, userId: string, userList: string[]) {
 		const properties: ITelemetryTrackProperties = {
 			workflow_id: workflowId,
diff --git a/packages/cli/src/WorkflowExecuteAdditionalData.ts b/packages/cli/src/WorkflowExecuteAdditionalData.ts
index f4acd61b6aa55..9538ec91988fd 100644
--- a/packages/cli/src/WorkflowExecuteAdditionalData.ts
+++ b/packages/cli/src/WorkflowExecuteAdditionalData.ts
@@ -52,7 +52,6 @@ import { Push } from '@/push';
 import * as WorkflowHelpers from '@/WorkflowHelpers';
 import { findSubworkflowStart, isWorkflowIdValid } from '@/utils';
 import { PermissionChecker } from './UserManagement/PermissionChecker';
-import { InternalHooks } from '@/InternalHooks';
 import { ExecutionRepository } from '@db/repositories/execution.repository';
 import { WorkflowStatisticsService } from '@/services/workflow-statistics.service';
 import { SecretsHelper } from './SecretsHelpers';
@@ -548,7 +547,6 @@ function hookFunctionsSave(): IWorkflowExecuteHooks {
  */
 function hookFunctionsSaveWorker(): IWorkflowExecuteHooks {
 	const logger = Container.get(Logger);
-	const internalHooks = Container.get(InternalHooks);
 	const workflowStatisticsService = Container.get(WorkflowStatisticsService);
 	const eventService = Container.get(EventService);
 	return {
@@ -644,13 +642,9 @@ function hookFunctionsSaveWorker(): IWorkflowExecuteHooks {
 			async function (this: WorkflowHooks, runData: IRun): Promise<void> {
 				const { executionId, workflowData: workflow } = this;
 
-				void internalHooks.onWorkflowPostExecute(executionId, workflow, runData);
 				eventService.emit('workflow-post-execute', {
-					workflowId: workflow.id,
-					workflowName: workflow.name,
+					workflow,
 					executionId,
-					success: runData.status === 'success',
-					isManual: runData.mode === 'manual',
 					runData,
 				});
 			},
@@ -787,7 +781,6 @@ async function executeWorkflow(
 		parentCallbackManager?: CallbackManager;
 	},
 ): Promise<Array<INodeExecutionData[] | null> | IWorkflowExecuteProcess> {
-	const internalHooks = Container.get(InternalHooks);
 	const externalHooks = Container.get(ExternalHooks);
 	await externalHooks.init();
 
@@ -933,13 +926,9 @@ async function executeWorkflow(
 
 	await externalHooks.run('workflow.postExecute', [data, workflowData, executionId]);
 
-	void internalHooks.onWorkflowPostExecute(executionId, workflowData, data, additionalData.userId);
 	eventService.emit('workflow-post-execute', {
-		workflowId: workflowData.id,
-		workflowName: workflowData.name,
+		workflow: workflowData,
 		executionId,
-		success: data.status === 'success',
-		isManual: data.mode === 'manual',
 		userId: additionalData.userId,
 		runData: data,
 	});
diff --git a/packages/cli/src/WorkflowRunner.ts b/packages/cli/src/WorkflowRunner.ts
index 3318dd283cd60..f51a44cc4d2a3 100644
--- a/packages/cli/src/WorkflowRunner.ts
+++ b/packages/cli/src/WorkflowRunner.ts
@@ -34,7 +34,6 @@ import * as WorkflowHelpers from '@/WorkflowHelpers';
 import * as WorkflowExecuteAdditionalData from '@/WorkflowExecuteAdditionalData';
 import { generateFailedExecutionFromError } from '@/WorkflowHelpers';
 import { PermissionChecker } from '@/UserManagement/PermissionChecker';
-import { InternalHooks } from '@/InternalHooks';
 import { Logger } from '@/Logger';
 import { WorkflowStaticDataService } from '@/workflows/workflowStaticData.service';
 import { EventService } from './eventbus/event.service';
@@ -160,18 +159,9 @@ export class WorkflowRunner {
 			const postExecutePromise = this.activeExecutions.getPostExecutePromise(executionId);
 			postExecutePromise
 				.then(async (executionData) => {
-					void Container.get(InternalHooks).onWorkflowPostExecute(
-						executionId,
-						data.workflowData,
-						executionData,
-						data.userId,
-					);
 					this.eventService.emit('workflow-post-execute', {
-						workflowId: data.workflowData.id,
-						workflowName: data.workflowData.name,
+						workflow: data.workflowData,
 						executionId,
-						success: executionData?.status === 'success',
-						isManual: data.executionMode === 'manual',
 						userId: data.userId,
 						runData: executionData,
 					});
diff --git a/packages/cli/src/eventbus/__tests__/audit-event-relay.service.test.ts b/packages/cli/src/eventbus/__tests__/audit-event-relay.service.test.ts
index 52b86b58e1b6b..44277f1de4d0d 100644
--- a/packages/cli/src/eventbus/__tests__/audit-event-relay.service.test.ts
+++ b/packages/cli/src/eventbus/__tests__/audit-event-relay.service.test.ts
@@ -141,27 +141,31 @@ describe('AuditEventRelay', () => {
 		it('should log on `workflow-post-execute` for successful execution', () => {
 			const payload = mock<Event['workflow-post-execute']>({
 				executionId: 'some-id',
-				success: true,
 				userId: 'some-id',
-				workflowId: 'some-id',
-				isManual: true,
-				workflowName: 'some-name',
-				metadata: {},
-				runData: mock<IRun>({ data: { resultData: {} } }),
+				workflow: mock<IWorkflowBase>({ id: 'some-id', name: 'some-name' }),
+				runData: mock<IRun>({ status: 'success', mode: 'manual', data: { resultData: {} } }),
 			});
 
 			eventService.emit('workflow-post-execute', payload);
 
-			const { runData: _, ...rest } = payload;
+			const { runData: _, workflow: __, ...rest } = payload;
 
 			expect(eventBus.sendWorkflowEvent).toHaveBeenCalledWith({
 				eventName: 'n8n.workflow.success',
-				payload: rest,
+				payload: {
+					...rest,
+					success: true,
+					isManual: true,
+					workflowName: 'some-name',
+					workflowId: 'some-id',
+				},
 			});
 		});
 
-		it('should handle `workflow-post-execute` event for unsuccessful execution', () => {
+		it('should log on `workflow-post-execute` event for unsuccessful execution', () => {
 			const runData = mock<IRun>({
+				status: 'error',
+				mode: 'manual',
 				data: {
 					resultData: {
 						lastNodeExecuted: 'some-node',
@@ -177,23 +181,23 @@ describe('AuditEventRelay', () => {
 
 			const event = {
 				executionId: 'some-id',
-				success: false,
 				userId: 'some-id',
-				workflowId: 'some-id',
-				isManual: true,
-				workflowName: 'some-name',
-				metadata: {},
+				workflow: mock<IWorkflowBase>({ id: 'some-id', name: 'some-name' }),
 				runData,
 			};
 
 			eventService.emit('workflow-post-execute', event);
 
-			const { runData: _, ...rest } = event;
+			const { runData: _, workflow: __, ...rest } = event;
 
 			expect(eventBus.sendWorkflowEvent).toHaveBeenCalledWith({
 				eventName: 'n8n.workflow.failed',
 				payload: {
 					...rest,
+					success: false,
+					isManual: true,
+					workflowName: 'some-name',
+					workflowId: 'some-id',
 					lastNodeExecuted: 'some-node',
 					errorNodeType: 'some-type',
 					errorMessage: 'some-message',
diff --git a/packages/cli/src/eventbus/audit-event-relay.service.ts b/packages/cli/src/eventbus/audit-event-relay.service.ts
index f8a95a3ebf359..dcefeac0bd317 100644
--- a/packages/cli/src/eventbus/audit-event-relay.service.ts
+++ b/packages/cli/src/eventbus/audit-event-relay.service.ts
@@ -122,12 +122,20 @@ export class AuditEventRelay {
 	}
 
 	private workflowPostExecute(event: Event['workflow-post-execute']) {
-		const { runData, ...rest } = event;
+		const { runData, workflow, ...rest } = event;
 
-		if (event.success) {
+		const payload = {
+			...rest,
+			success: runData?.status === 'success',
+			isManual: runData?.mode === 'manual',
+			workflowId: workflow.id,
+			workflowName: workflow.name,
+		};
+
+		if (payload.success) {
 			void this.eventBus.sendWorkflowEvent({
 				eventName: 'n8n.workflow.success',
-				payload: rest,
+				payload,
 			});
 
 			return;
@@ -136,7 +144,7 @@ export class AuditEventRelay {
 		void this.eventBus.sendWorkflowEvent({
 			eventName: 'n8n.workflow.failed',
 			payload: {
-				...rest,
+				...payload,
 				lastNodeExecuted: runData?.data.resultData.lastNodeExecuted,
 				errorNodeType:
 					runData?.data.resultData.error && 'node' in runData?.data.resultData.error
diff --git a/packages/cli/src/eventbus/event.types.ts b/packages/cli/src/eventbus/event.types.ts
index b62d3bc141031..bcca98b919637 100644
--- a/packages/cli/src/eventbus/event.types.ts
+++ b/packages/cli/src/eventbus/event.types.ts
@@ -44,12 +44,8 @@ export type Event = {
 
 	'workflow-post-execute': {
 		executionId: string;
-		success: boolean;
 		userId?: string;
-		workflowId: string;
-		isManual: boolean;
-		workflowName: string;
-		metadata?: Record<string, string>;
+		workflow: IWorkflowBase;
 		runData?: IRun;
 	};
 
diff --git a/packages/cli/src/executions/execution-recovery.service.ts b/packages/cli/src/executions/execution-recovery.service.ts
index b72fc490dddbb..615c65ea6ef5f 100644
--- a/packages/cli/src/executions/execution-recovery.service.ts
+++ b/packages/cli/src/executions/execution-recovery.service.ts
@@ -3,7 +3,6 @@ import { Push } from '@/push';
 import { jsonStringify, sleep } from 'n8n-workflow';
 import { ExecutionRepository } from '@db/repositories/execution.repository';
 import { getWorkflowHooksMain } from '@/WorkflowExecuteAdditionalData'; // @TODO: Dependency cycle
-import { InternalHooks } from '@/InternalHooks'; // @TODO: Dependency cycle if injected
 import type { DateTime } from 'luxon';
 import type { IRun, ITaskData } from 'n8n-workflow';
 import type { EventMessageTypes } from '../eventbus/EventMessageClasses';
@@ -280,22 +279,9 @@ export class ExecutionRecoveryService {
 	private async runHooks(execution: IExecutionResponse) {
 		execution.data ??= { resultData: { runData: {} } };
 
-		await Container.get(InternalHooks).onWorkflowPostExecute(execution.id, execution.workflowData, {
-			data: execution.data,
-			finished: false,
-			mode: execution.mode,
-			waitTill: execution.waitTill,
-			startedAt: execution.startedAt,
-			stoppedAt: execution.stoppedAt,
-			status: execution.status,
-		});
-
 		this.eventService.emit('workflow-post-execute', {
-			workflowId: execution.workflowData.id,
-			workflowName: execution.workflowData.name,
+			workflow: execution.workflowData,
 			executionId: execution.id,
-			success: execution.status === 'success',
-			isManual: execution.mode === 'manual',
 			runData: execution,
 		});
 
diff --git a/packages/cli/src/telemetry/telemetry-event-relay.service.ts b/packages/cli/src/telemetry/telemetry-event-relay.service.ts
index 9077abdf9ce23..f92b38987b1e3 100644
--- a/packages/cli/src/telemetry/telemetry-event-relay.service.ts
+++ b/packages/cli/src/telemetry/telemetry-event-relay.service.ts
@@ -8,10 +8,14 @@ import { License } from '@/License';
 import { GlobalConfig } from '@n8n/config';
 import { N8N_VERSION } from '@/constants';
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
+import type { ExecutionStatus, INodesGraphResult, ITelemetryTrackProperties } from 'n8n-workflow';
+import { get as pslGet } from 'psl';
 import { TelemetryHelpers } from 'n8n-workflow';
 import { NodeTypes } from '@/NodeTypes';
 import { SharedWorkflowRepository } from '@/databases/repositories/sharedWorkflow.repository';
 import { ProjectRelationRepository } from '@/databases/repositories/projectRelation.repository';
+import type { IExecutionTrackProperties } from '@/Interfaces';
+import { determineFinalExecutionStatus } from '@/executionLifecycleHooks/shared/sharedHookFunctions';
 
 @Service()
 export class TelemetryEventRelay {
@@ -118,6 +122,9 @@ export class TelemetryEventRelay {
 		this.eventService.on('workflow-saved', async (event) => {
 			await this.workflowSaved(event);
 		});
+		this.eventService.on('workflow-post-execute', async (event) => {
+			await this.workflowPostExecute(event);
+		});
 	}
 
 	private teamProjectUpdated({ userId, role, members, projectId }: Event['team-project-updated']) {
@@ -584,4 +591,138 @@ export class TelemetryEventRelay {
 			earliest_workflow_created: firstWorkflow?.createdAt,
 		});
 	}
+
+	// eslint-disable-next-line complexity
+	private async workflowPostExecute({ workflow, runData, userId }: Event['workflow-post-execute']) {
+		if (!workflow.id) {
+			return;
+		}
+
+		if (runData?.status === 'waiting') {
+			// No need to send telemetry or logs when the workflow hasn't finished yet.
+			return;
+		}
+
+		const telemetryProperties: IExecutionTrackProperties = {
+			workflow_id: workflow.id,
+			is_manual: false,
+			version_cli: N8N_VERSION,
+			success: false,
+		};
+
+		if (userId) {
+			telemetryProperties.user_id = userId;
+		}
+
+		if (runData?.data.resultData.error?.message?.includes('canceled')) {
+			runData.status = 'canceled';
+		}
+
+		telemetryProperties.success = !!runData?.finished;
+
+		// const executionStatus: ExecutionStatus = runData?.status ?? 'unknown';
+		const executionStatus: ExecutionStatus = runData
+			? determineFinalExecutionStatus(runData)
+			: 'unknown';
+
+		if (runData !== undefined) {
+			telemetryProperties.execution_mode = runData.mode;
+			telemetryProperties.is_manual = runData.mode === 'manual';
+
+			let nodeGraphResult: INodesGraphResult | null = null;
+
+			if (!telemetryProperties.success && runData?.data.resultData.error) {
+				telemetryProperties.error_message = runData?.data.resultData.error.message;
+				let errorNodeName =
+					'node' in runData?.data.resultData.error
+						? runData?.data.resultData.error.node?.name
+						: undefined;
+				telemetryProperties.error_node_type =
+					'node' in runData?.data.resultData.error
+						? runData?.data.resultData.error.node?.type
+						: undefined;
+
+				if (runData.data.resultData.lastNodeExecuted) {
+					const lastNode = TelemetryHelpers.getNodeTypeForName(
+						workflow,
+						runData.data.resultData.lastNodeExecuted,
+					);
+
+					if (lastNode !== undefined) {
+						telemetryProperties.error_node_type = lastNode.type;
+						errorNodeName = lastNode.name;
+					}
+				}
+
+				if (telemetryProperties.is_manual) {
+					nodeGraphResult = TelemetryHelpers.generateNodesGraph(workflow, this.nodeTypes);
+					telemetryProperties.node_graph = nodeGraphResult.nodeGraph;
+					telemetryProperties.node_graph_string = JSON.stringify(nodeGraphResult.nodeGraph);
+
+					if (errorNodeName) {
+						telemetryProperties.error_node_id = nodeGraphResult.nameIndices[errorNodeName];
+					}
+				}
+			}
+
+			if (telemetryProperties.is_manual) {
+				if (!nodeGraphResult) {
+					nodeGraphResult = TelemetryHelpers.generateNodesGraph(workflow, this.nodeTypes);
+				}
+
+				let userRole: 'owner' | 'sharee' | undefined = undefined;
+				if (userId) {
+					const role = await this.sharedWorkflowRepository.findSharingRole(userId, workflow.id);
+					if (role) {
+						userRole = role === 'workflow:owner' ? 'owner' : 'sharee';
+					}
+				}
+
+				const manualExecEventProperties: ITelemetryTrackProperties = {
+					user_id: userId,
+					workflow_id: workflow.id,
+					status: executionStatus,
+					executionStatus: runData?.status ?? 'unknown',
+					error_message: telemetryProperties.error_message as string,
+					error_node_type: telemetryProperties.error_node_type,
+					node_graph_string: telemetryProperties.node_graph_string as string,
+					error_node_id: telemetryProperties.error_node_id as string,
+					webhook_domain: null,
+					sharing_role: userRole,
+				};
+
+				if (!manualExecEventProperties.node_graph_string) {
+					nodeGraphResult = TelemetryHelpers.generateNodesGraph(workflow, this.nodeTypes);
+					manualExecEventProperties.node_graph_string = JSON.stringify(nodeGraphResult.nodeGraph);
+				}
+
+				if (runData.data.startData?.destinationNode) {
+					const telemetryPayload = {
+						...manualExecEventProperties,
+						node_type: TelemetryHelpers.getNodeTypeForName(
+							workflow,
+							runData.data.startData?.destinationNode,
+						)?.type,
+						node_id: nodeGraphResult.nameIndices[runData.data.startData?.destinationNode],
+					};
+
+					this.telemetry.track('Manual node exec finished', telemetryPayload);
+				} else {
+					nodeGraphResult.webhookNodeNames.forEach((name: string) => {
+						const execJson = runData.data.resultData.runData[name]?.[0]?.data?.main?.[0]?.[0]
+							?.json as { headers?: { origin?: string } };
+						if (execJson?.headers?.origin && execJson.headers.origin !== '') {
+							manualExecEventProperties.webhook_domain = pslGet(
+								execJson.headers.origin.replace(/^https?:\/\//, ''),
+							);
+						}
+					});
+
+					this.telemetry.track('Manual workflow exec finished', manualExecEventProperties);
+				}
+			}
+		}
+
+		this.telemetry.trackWorkflowExecution(telemetryProperties);
+	}
 }

From 84efbd9b9c51f536b21a4f969ab607d277bef692 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Fri, 2 Aug 2024 12:06:17 +0200
Subject: [PATCH 060/168] feat(core): Support create, delete, edit role for
 users in Public API (#10279)

---
 .../users/spec/paths/users.id.role.yml        |  31 +++
 .../v1/handlers/users/spec/paths/users.id.yml |  18 ++
 .../v1/handlers/users/spec/paths/users.yml    |  50 ++++
 .../v1/handlers/users/users.handler.ee.ts     |  33 +++
 packages/cli/src/PublicApi/v1/openapi.yml     |   2 +
 .../test/integration/publicApi/users.test.ts  | 252 ++++++++++++++++++
 6 files changed, 386 insertions(+)
 create mode 100644 packages/cli/src/PublicApi/v1/handlers/users/spec/paths/users.id.role.yml
 create mode 100644 packages/cli/test/integration/publicApi/users.test.ts

diff --git a/packages/cli/src/PublicApi/v1/handlers/users/spec/paths/users.id.role.yml b/packages/cli/src/PublicApi/v1/handlers/users/spec/paths/users.id.role.yml
new file mode 100644
index 0000000000000..92993adf7f9d4
--- /dev/null
+++ b/packages/cli/src/PublicApi/v1/handlers/users/spec/paths/users.id.role.yml
@@ -0,0 +1,31 @@
+patch:
+  x-eov-operation-id: changeRole
+  x-eov-operation-handler: v1/handlers/users/users.handler.ee
+  tags:
+    - User
+  summary: Change a user's global role
+  description: Change a user's global role
+  parameters:
+    - $ref: '../schemas/parameters/userIdentifier.yml'
+  requestBody:
+    description: New role for the user
+    required: true
+    content:
+      application/json:
+        schema:
+          type: object
+          properties:
+            newRoleName:
+              type: string
+              enum: [global:admin, global:member]
+          required:
+            - newRoleName
+  responses:
+    '200':
+      description: Operation successful.
+    '401':
+      $ref: '../../../../shared/spec/responses/unauthorized.yml'
+    '403':
+      $ref: '../../../../shared/spec/responses/forbidden.yml'
+    '404':
+      $ref: '../../../../shared/spec/responses/notFound.yml'
diff --git a/packages/cli/src/PublicApi/v1/handlers/users/spec/paths/users.id.yml b/packages/cli/src/PublicApi/v1/handlers/users/spec/paths/users.id.yml
index 0d3c86c4cef97..f3dcae00534c4 100644
--- a/packages/cli/src/PublicApi/v1/handlers/users/spec/paths/users.id.yml
+++ b/packages/cli/src/PublicApi/v1/handlers/users/spec/paths/users.id.yml
@@ -17,3 +17,21 @@ get:
             $ref: '../schemas/user.yml'
     '401':
       $ref: '../../../../shared/spec/responses/unauthorized.yml'
+delete:
+  x-eov-operation-id: deleteUser
+  x-eov-operation-handler: v1/handlers/users/users.handler.ee
+  tags:
+    - User
+  summary: Delete a user
+  description: Delete a user from your instance.
+  parameters:
+    - $ref: '../schemas/parameters/userIdentifier.yml'
+  responses:
+    '204':
+      description: Operation successful.
+    '401':
+      $ref: '../../../../shared/spec/responses/unauthorized.yml'
+    '403':
+      $ref: '../../../../shared/spec/responses/forbidden.yml'
+    '404':
+      $ref: '../../../../shared/spec/responses/notFound.yml'
diff --git a/packages/cli/src/PublicApi/v1/handlers/users/spec/paths/users.yml b/packages/cli/src/PublicApi/v1/handlers/users/spec/paths/users.yml
index 1d618435531b5..7778a08e35c60 100644
--- a/packages/cli/src/PublicApi/v1/handlers/users/spec/paths/users.yml
+++ b/packages/cli/src/PublicApi/v1/handlers/users/spec/paths/users.yml
@@ -18,3 +18,53 @@ get:
             $ref: '../schemas/userList.yml'
     '401':
       $ref: '../../../../shared/spec/responses/unauthorized.yml'
+post:
+  x-eov-operation-id: createUser
+  x-eov-operation-handler: v1/handlers/users/users.handler.ee
+  tags:
+    - User
+  summary: Create multiple users
+  description: Create one or more users.
+  requestBody:
+    description: Array of users to be created.
+    required: true
+    content:
+      application/json:
+        schema:
+          type: array
+          items:
+            type: object
+            properties:
+              email:
+                type: string
+                format: email
+              role:
+                type: string
+                enum: [global:admin, global:member]
+            required:
+              - email
+  responses:
+    '200':
+      description: Operation successful.
+      content:
+        application/json:
+          schema:
+            type: object
+            properties:
+              user:
+                type: object
+                properties:
+                  id:
+                    type: string
+                  email:
+                    type: string
+                  inviteAcceptUrl:
+                    type: string
+                  emailSent:
+                    type: boolean
+              error:
+                type: string
+    '401':
+      $ref: '../../../../shared/spec/responses/unauthorized.yml'
+    '403':
+      $ref: '../../../../shared/spec/responses/forbidden.yml'
diff --git a/packages/cli/src/PublicApi/v1/handlers/users/users.handler.ee.ts b/packages/cli/src/PublicApi/v1/handlers/users/users.handler.ee.ts
index 0df22ec4aa9ef..cbfc43c0d100f 100644
--- a/packages/cli/src/PublicApi/v1/handlers/users/users.handler.ee.ts
+++ b/packages/cli/src/PublicApi/v1/handlers/users/users.handler.ee.ts
@@ -6,11 +6,19 @@ import { clean, getAllUsersAndCount, getUser } from './users.service.ee';
 import { encodeNextCursor } from '../../shared/services/pagination.service';
 import {
 	globalScope,
+	isLicensed,
 	validCursor,
 	validLicenseWithUserQuota,
 } from '../../shared/middlewares/global.middleware';
 import type { UserRequest } from '@/requests';
 import { InternalHooks } from '@/InternalHooks';
+import type { Response } from 'express';
+import { InvitationController } from '@/controllers/invitation.controller';
+import { UsersController } from '@/controllers/users.controller';
+
+type Create = UserRequest.Invite;
+type Delete = UserRequest.Delete;
+type ChangeRole = UserRequest.ChangeRole;
 
 export = {
 	getUser: [
@@ -68,4 +76,29 @@ export = {
 			});
 		},
 	],
+	createUser: [
+		globalScope('user:create'),
+		async (req: Create, res: Response) => {
+			const usersInvited = await Container.get(InvitationController).inviteUser(req);
+
+			return res.status(201).json(usersInvited);
+		},
+	],
+	deleteUser: [
+		globalScope('user:delete'),
+		async (req: Delete, res: Response) => {
+			await Container.get(UsersController).deleteUser(req);
+
+			return res.status(204).send();
+		},
+	],
+	changeRole: [
+		isLicensed('feat:advancedPermissions'),
+		globalScope('user:changeRole'),
+		async (req: ChangeRole, res: Response) => {
+			await Container.get(UsersController).changeGlobalRole(req);
+
+			return res.status(204).send();
+		},
+	],
 };
diff --git a/packages/cli/src/PublicApi/v1/openapi.yml b/packages/cli/src/PublicApi/v1/openapi.yml
index 1d4e14079f541..30c3a73bde0c7 100644
--- a/packages/cli/src/PublicApi/v1/openapi.yml
+++ b/packages/cli/src/PublicApi/v1/openapi.yml
@@ -70,6 +70,8 @@ paths:
     $ref: './handlers/users/spec/paths/users.yml'
   /users/{id}:
     $ref: './handlers/users/spec/paths/users.id.yml'
+  /users/{id}/role:
+    $ref: './handlers/users/spec/paths/users.id.role.yml'
   /source-control/pull:
     $ref: './handlers/sourceControl/spec/paths/sourceControl.yml'
   /variables:
diff --git a/packages/cli/test/integration/publicApi/users.test.ts b/packages/cli/test/integration/publicApi/users.test.ts
new file mode 100644
index 0000000000000..6021ae01a35f5
--- /dev/null
+++ b/packages/cli/test/integration/publicApi/users.test.ts
@@ -0,0 +1,252 @@
+import { setupTestServer } from '@test-integration/utils';
+import * as testDb from '../shared/testDb';
+import { createMember, createOwner, getUserById } from '@test-integration/db/users';
+import { mockInstance } from '@test/mocking';
+import { Telemetry } from '@/telemetry';
+import { FeatureNotLicensedError } from '@/errors/feature-not-licensed.error';
+
+describe('Users in Public API', () => {
+	const testServer = setupTestServer({ endpointGroups: ['publicApi'] });
+	mockInstance(Telemetry);
+
+	beforeAll(async () => {
+		await testDb.init();
+	});
+
+	beforeEach(async () => {
+		await testDb.truncate(['User']);
+	});
+
+	describe('POST /users', () => {
+		it('if not authenticated, should reject', async () => {
+			/**
+			 * Arrange
+			 */
+			const owner = await createOwner({ withApiKey: false });
+			const payload = { email: 'test@test.com', role: 'global:admin' };
+
+			/**
+			 * Act
+			 */
+			const response = await testServer.publicApiAgentFor(owner).post('/users').send(payload);
+
+			/**
+			 * Assert
+			 */
+			expect(response.status).toBe(401);
+		});
+
+		it('if missing scope, should reject', async () => {
+			/**
+			 * Arrange
+			 */
+			testServer.license.enable('feat:advancedPermissions');
+			const member = await createMember({ withApiKey: true });
+			const payload = [{ email: 'test@test.com', role: 'global:admin' }];
+
+			/**
+			 * Act
+			 */
+			const response = await testServer.publicApiAgentFor(member).post('/users').send(payload);
+
+			/**
+			 * Assert
+			 */
+			expect(response.status).toBe(403);
+			expect(response.body).toHaveProperty('message', 'Forbidden');
+		});
+
+		it('should create a user', async () => {
+			/**
+			 * Arrange
+			 */
+			testServer.license.enable('feat:advancedPermissions');
+			const owner = await createOwner({ withApiKey: true });
+			const payload = [{ email: 'test@test.com', role: 'global:admin' }];
+
+			/**
+			 * Act
+			 */
+			const response = await testServer.publicApiAgentFor(owner).post('/users').send(payload);
+
+			/**
+			 * Assert
+			 */
+			expect(response.status).toBe(201);
+
+			expect(response.body).toHaveLength(1);
+
+			const [result] = response.body;
+			const { user: returnedUser, error } = result;
+			const payloadUser = payload[0];
+
+			expect(returnedUser).toHaveProperty('email', payload[0].email);
+			expect(typeof returnedUser.inviteAcceptUrl).toBe('string');
+			expect(typeof returnedUser.emailSent).toBe('boolean');
+			expect(error).toBe('');
+
+			const storedUser = await getUserById(returnedUser.id);
+			expect(returnedUser.id).toBe(storedUser.id);
+			expect(returnedUser.email).toBe(storedUser.email);
+			expect(returnedUser.email).toBe(payloadUser.email);
+			expect(storedUser.role).toBe(payloadUser.role);
+		});
+	});
+
+	describe('DELETE /users/:id', () => {
+		it('if not authenticated, should reject', async () => {
+			/**
+			 * Arrange
+			 */
+			const owner = await createOwner({ withApiKey: false });
+			const member = await createMember();
+
+			/**
+			 * Act
+			 */
+			const response = await testServer.publicApiAgentFor(owner).delete(`/users/${member.id}`);
+
+			/**
+			 * Assert
+			 */
+			expect(response.status).toBe(401);
+		});
+
+		it('if missing scope, should reject', async () => {
+			/**
+			 * Arrange
+			 */
+			testServer.license.enable('feat:advancedPermissions');
+			const firstMember = await createMember({ withApiKey: true });
+			const secondMember = await createMember();
+
+			/**
+			 * Act
+			 */
+			const response = await testServer
+				.publicApiAgentFor(firstMember)
+				.delete(`/users/${secondMember.id}`);
+
+			/**
+			 * Assert
+			 */
+			expect(response.status).toBe(403);
+			expect(response.body).toHaveProperty('message', 'Forbidden');
+		});
+
+		it('should delete a user', async () => {
+			/**
+			 * Arrange
+			 */
+			testServer.license.enable('feat:advancedPermissions');
+			const owner = await createOwner({ withApiKey: true });
+			const member = await createMember();
+
+			/**
+			 * Act
+			 */
+			const response = await testServer.publicApiAgentFor(owner).delete(`/users/${member.id}`);
+
+			/**
+			 * Assert
+			 */
+			expect(response.status).toBe(204);
+			await expect(getUserById(member.id)).rejects.toThrow();
+		});
+	});
+
+	describe('PATCH /users/:id/role', () => {
+		it('if not authenticated, should reject', async () => {
+			/**
+			 * Arrange
+			 */
+			const owner = await createOwner({ withApiKey: false });
+			const member = await createMember();
+
+			/**
+			 * Act
+			 */
+			const response = await testServer.publicApiAgentFor(owner).patch(`/users/${member.id}/role`);
+
+			/**
+			 * Assert
+			 */
+			expect(response.status).toBe(401);
+		});
+
+		it('if not licensed, should reject', async () => {
+			/**
+			 * Arrange
+			 */
+			const owner = await createOwner({ withApiKey: true });
+			const member = await createMember();
+			const payload = { newRoleName: 'global:admin' };
+
+			/**
+			 * Act
+			 */
+			const response = await testServer
+				.publicApiAgentFor(owner)
+				.patch(`/users/${member.id}/role`)
+				.send(payload);
+
+			/**
+			 * Assert
+			 */
+			expect(response.status).toBe(403);
+			expect(response.body).toHaveProperty(
+				'message',
+				new FeatureNotLicensedError('feat:advancedPermissions').message,
+			);
+		});
+
+		it('if missing scope, should reject', async () => {
+			/**
+			 * Arrange
+			 */
+			testServer.license.enable('feat:advancedPermissions');
+			const firstMember = await createMember({ withApiKey: true });
+			const secondMember = await createMember();
+			const payload = { newRoleName: 'global:admin' };
+
+			/**
+			 * Act
+			 */
+			const response = await testServer
+				.publicApiAgentFor(firstMember)
+				.patch(`/users/${secondMember.id}/role`)
+				.send(payload);
+
+			/**
+			 * Assert
+			 */
+			expect(response.status).toBe(403);
+			expect(response.body).toHaveProperty('message', 'Forbidden');
+		});
+
+		it("should change a user's role", async () => {
+			/**
+			 * Arrange
+			 */
+			testServer.license.enable('feat:advancedPermissions');
+			const owner = await createOwner({ withApiKey: true });
+			const member = await createMember();
+			const payload = { newRoleName: 'global:admin' };
+
+			/**
+			 * Act
+			 */
+			const response = await testServer
+				.publicApiAgentFor(owner)
+				.patch(`/users/${member.id}/role`)
+				.send(payload);
+
+			/**
+			 * Assert
+			 */
+			expect(response.status).toBe(204);
+			const storedUser = await getUserById(member.id);
+			expect(storedUser.role).toBe(payload.newRoleName);
+		});
+	});
+});

From 47a68b0220ce3e908e1e353b9e275dbc84a62402 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: Fri, 2 Aug 2024 12:20:34 +0200
Subject: [PATCH 061/168] ci: Fix DB tests (no-changelog) (#10282)

---
 .../integration/prometheus-metrics.test.ts    | 48 ++++++-------------
 1 file changed, 15 insertions(+), 33 deletions(-)

diff --git a/packages/cli/test/integration/prometheus-metrics.test.ts b/packages/cli/test/integration/prometheus-metrics.test.ts
index 4c00a98f74a49..9f6a0fad6e89d 100644
--- a/packages/cli/test/integration/prometheus-metrics.test.ts
+++ b/packages/cli/test/integration/prometheus-metrics.test.ts
@@ -5,45 +5,27 @@ import request, { type Response } from 'supertest';
 import { N8N_VERSION } from '@/constants';
 import { PrometheusMetricsService } from '@/metrics/prometheus-metrics.service';
 import { setupTestServer } from './shared/utils';
-import { mockInstance } from '@test/mocking';
 import { GlobalConfig } from '@n8n/config';
 
 jest.unmock('@/eventbus/MessageEventBus/MessageEventBus');
 
 const toLines = (response: Response) => response.text.trim().split('\n');
 
-mockInstance(GlobalConfig, {
-	database: {
-		type: 'sqlite',
-		sqlite: {
-			database: 'database.sqlite',
-			enableWAL: false,
-			executeVacuumOnStartup: false,
-			poolSize: 0,
-		},
-		logging: {
-			enabled: false,
-			maxQueryExecutionTime: 0,
-			options: 'error',
-		},
-		tablePrefix: '',
-	},
-	endpoints: {
-		metrics: {
-			prefix: 'n8n_test_',
-			includeDefaultMetrics: true,
-			includeApiEndpoints: true,
-			includeCacheMetrics: true,
-			includeMessageEventBusMetrics: true,
-			includeCredentialTypeLabel: false,
-			includeNodeTypeLabel: false,
-			includeWorkflowIdLabel: false,
-			includeApiPathLabel: true,
-			includeApiMethodLabel: true,
-			includeApiStatusCodeLabel: true,
-		},
-	},
-});
+const globalConfig = Container.get(GlobalConfig);
+// @ts-expect-error `metrics` is a readonly property
+globalConfig.endpoints.metrics = {
+	prefix: 'n8n_test_',
+	includeDefaultMetrics: true,
+	includeApiEndpoints: true,
+	includeCacheMetrics: true,
+	includeMessageEventBusMetrics: true,
+	includeCredentialTypeLabel: false,
+	includeNodeTypeLabel: false,
+	includeWorkflowIdLabel: false,
+	includeApiPathLabel: true,
+	includeApiMethodLabel: true,
+	includeApiStatusCodeLabel: true,
+};
 
 const server = setupTestServer({ endpointGroups: ['metrics'] });
 const agent = request.agent(server.app);

From c3e2e84065d6a5e55439450070243881b83c6aa6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Fri, 2 Aug 2024 12:25:57 +0200
Subject: [PATCH 062/168] refactor(core): Mark schema env vars used by cloud
 hooks (no-changelog) (#10283)

---
 packages/cli/src/config/schema.ts | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/packages/cli/src/config/schema.ts b/packages/cli/src/config/schema.ts
index 068317e4918f6..dc63f53099659 100644
--- a/packages/cli/src/config/schema.ts
+++ b/packages/cli/src/config/schema.ts
@@ -4,6 +4,7 @@ import { Container } from 'typedi';
 import { InstanceSettings } from 'n8n-core';
 import { LOG_LEVELS } from 'n8n-workflow';
 import { ensureStringArray } from './utils';
+import { GlobalConfig } from '@n8n/config';
 
 convict.addFormat({
 	name: 'comma-separated-list',
@@ -381,12 +382,17 @@ export const schema = {
 			default: 0,
 			env: 'N8N_USER_MANAGEMENT_JWT_REFRESH_TIMEOUT_HOURS',
 		},
+
+		/**
+		 * @important Do not remove until after cloud hooks are updated to stop using convict config.
+		 */
 		isInstanceOwnerSetUp: {
 			// n8n loads this setting from DB on startup
 			doc: "Whether the instance owner's account has been set up",
 			format: Boolean,
 			default: false,
 		},
+
 		authenticationMethod: {
 			doc: 'How to authenticate users (e.g. "email", "ldap", "saml")',
 			format: ['email', 'ldap', 'saml'] as const,
@@ -691,6 +697,19 @@ export const schema = {
 		},
 	},
 
+	/**
+	 * @important Do not remove until after cloud hooks are updated to stop using convict config.
+	 */
+	endpoints: {
+		rest: {
+			format: String,
+			default: Container.get(GlobalConfig).endpoints.rest,
+		},
+	},
+
+	/**
+	 * @important Do not remove until after cloud hooks are updated to stop using convict config.
+	 */
 	ai: {
 		enabled: {
 			doc: 'Whether AI features are enabled',

From ae50bb95a8e5bf1cdbf9483da54b84094b82e260 Mon Sep 17 00:00:00 2001
From: Tomi Turtiainen <10324676+tomi@users.noreply.github.com>
Date: Fri, 2 Aug 2024 13:46:35 +0300
Subject: [PATCH 063/168] fix(core): Make execution and its data creation
 atomic (#10276)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: कारतोफ्फेलस्क्रिप्ट™ <aditya@netroy.in>
---
 packages/cli/src/ActiveExecutions.ts          |  5 ++--
 .../repositories/execution.repository.ts      | 28 ++++++++++++------
 .../repositories/executionData.repository.ts  | 19 ++++++++++++
 .../repositories/execution.repository.test.ts | 29 +++++++++++++++++++
 4 files changed, 69 insertions(+), 12 deletions(-)

diff --git a/packages/cli/src/ActiveExecutions.ts b/packages/cli/src/ActiveExecutions.ts
index 97313d5cb2f07..c1a6e8ffd65a9 100644
--- a/packages/cli/src/ActiveExecutions.ts
+++ b/packages/cli/src/ActiveExecutions.ts
@@ -12,6 +12,7 @@ import {
 	ExecutionCancelledError,
 	sleep,
 } from 'n8n-workflow';
+import { strict as assert } from 'node:assert';
 
 import type {
 	ExecutionPayload,
@@ -74,9 +75,7 @@ export class ActiveExecutions {
 			}
 
 			executionId = await this.executionRepository.createNewExecution(fullExecutionData);
-			if (executionId === undefined) {
-				throw new ApplicationError('There was an issue assigning an execution id to the execution');
-			}
+			assert(executionId);
 
 			await this.concurrencyControl.throttle({ mode, executionId });
 			executionStatus = 'running';
diff --git a/packages/cli/src/databases/repositories/execution.repository.ts b/packages/cli/src/databases/repositories/execution.repository.ts
index 1ebb22d8eb4bc..a8605147aa751 100644
--- a/packages/cli/src/databases/repositories/execution.repository.ts
+++ b/packages/cli/src/databases/repositories/execution.repository.ts
@@ -270,17 +270,27 @@ export class ExecutionRepository extends Repository<ExecutionEntity> {
 		return rest;
 	}
 
+	/**
+	 * Insert a new execution and its execution data using a transaction.
+	 */
 	async createNewExecution(execution: ExecutionPayload): Promise<string> {
-		const { data, workflowData, ...rest } = execution;
-		const { identifiers: inserted } = await this.insert(rest);
-		const { id: executionId } = inserted[0] as { id: string };
-		const { connections, nodes, name, settings } = workflowData ?? {};
-		await this.executionDataRepository.insert({
-			executionId,
-			workflowData: { connections, nodes, name, settings, id: workflowData.id },
-			data: stringify(data),
+		return await this.manager.transaction(async (transactionManager) => {
+			const { data, workflowData, ...rest } = execution;
+			const insertResult = await transactionManager.insert(ExecutionEntity, rest);
+			const { id: executionId } = insertResult.identifiers[0] as { id: string };
+
+			const { connections, nodes, name, settings } = workflowData ?? {};
+			await this.executionDataRepository.createExecutionDataForExecution(
+				{
+					executionId,
+					workflowData: { connections, nodes, name, settings, id: workflowData.id },
+					data: stringify(data),
+				},
+				transactionManager,
+			);
+
+			return String(executionId);
 		});
-		return String(executionId);
 	}
 
 	async markAsCrashed(executionIds: string | string[]) {
diff --git a/packages/cli/src/databases/repositories/executionData.repository.ts b/packages/cli/src/databases/repositories/executionData.repository.ts
index 5872f9888cd66..013453d998e42 100644
--- a/packages/cli/src/databases/repositories/executionData.repository.ts
+++ b/packages/cli/src/databases/repositories/executionData.repository.ts
@@ -1,13 +1,32 @@
 import { Service } from 'typedi';
+import type { EntityManager } from '@n8n/typeorm';
+import type { IWorkflowBase } from 'n8n-workflow';
 import { DataSource, In, Repository } from '@n8n/typeorm';
 import { ExecutionData } from '../entities/ExecutionData';
 
+export interface CreateExecutionDataOpts extends Pick<ExecutionData, 'data' | 'executionId'> {
+	workflowData: Pick<IWorkflowBase, 'connections' | 'nodes' | 'name' | 'settings' | 'id'>;
+}
+
 @Service()
 export class ExecutionDataRepository extends Repository<ExecutionData> {
 	constructor(dataSource: DataSource) {
 		super(ExecutionData, dataSource.manager);
 	}
 
+	async createExecutionDataForExecution(
+		executionData: CreateExecutionDataOpts,
+		transactionManager: EntityManager,
+	) {
+		const { data, executionId, workflowData } = executionData;
+
+		return await transactionManager.insert(ExecutionData, {
+			executionId,
+			data,
+			workflowData,
+		});
+	}
+
 	async findByExecutionIds(executionIds: string[]) {
 		return await this.find({
 			select: ['workflowData'],
diff --git a/packages/cli/test/integration/database/repositories/execution.repository.test.ts b/packages/cli/test/integration/database/repositories/execution.repository.test.ts
index cfb897d627a56..e777f624299aa 100644
--- a/packages/cli/test/integration/database/repositories/execution.repository.test.ts
+++ b/packages/cli/test/integration/database/repositories/execution.repository.test.ts
@@ -52,5 +52,34 @@ describe('ExecutionRepository', () => {
 			});
 			expect(executionData?.data).toEqual('[{"resultData":"1"},{}]');
 		});
+
+		it('should not create execution if execution data insert fails', async () => {
+			const executionRepo = Container.get(ExecutionRepository);
+			const executionDataRepo = Container.get(ExecutionDataRepository);
+
+			const workflow = await createWorkflow({ settings: { executionOrder: 'v1' } });
+			jest
+				.spyOn(executionDataRepo, 'createExecutionDataForExecution')
+				.mockRejectedValueOnce(new Error());
+
+			await expect(
+				async () =>
+					await executionRepo.createNewExecution({
+						workflowId: workflow.id,
+						data: {
+							//@ts-expect-error This is not needed for tests
+							resultData: {},
+						},
+						workflowData: workflow,
+						mode: 'manual',
+						startedAt: new Date(),
+						status: 'new',
+						finished: false,
+					}),
+			).rejects.toThrow();
+
+			const executionEntities = await executionRepo.find();
+			expect(executionEntities).toBeEmptyArray();
+		});
 	});
 });

From 7056e50b006bda665f64ce6234c5c1967891c415 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Fri, 2 Aug 2024 14:16:17 +0200
Subject: [PATCH 064/168] feat(core): Allow filtering executions and users by
 project in Public API  (#10250)

---
 packages/cli/src/PublicApi/types.ts           |  1 +
 .../handlers/executions/executions.handler.ts |  3 +-
 .../executions/spec/paths/executions.yml      |  8 ++++
 .../v1/handlers/users/spec/paths/users.yml    |  8 ++++
 .../v1/handlers/users/users.handler.ee.ts     |  8 +++-
 .../v1/handlers/users/users.service.ee.ts     |  7 ++-
 .../handlers/workflows/workflows.service.ts   |  8 +++-
 .../projectRelation.repository.ts             |  9 ++++
 packages/cli/src/requests.ts                  |  2 +-
 .../src/workflows/workflowSharing.service.ts  | 11 +++--
 .../integration/publicApi/executions.test.ts  | 38 ++++++++++++++++
 .../integration/publicApi/users.ee.test.ts    | 44 ++++++++++++++++++-
 12 files changed, 138 insertions(+), 9 deletions(-)

diff --git a/packages/cli/src/PublicApi/types.ts b/packages/cli/src/PublicApi/types.ts
index 831dd03ebfb9c..631a8c09d7236 100644
--- a/packages/cli/src/PublicApi/types.ts
+++ b/packages/cli/src/PublicApi/types.ts
@@ -29,6 +29,7 @@ export declare namespace ExecutionRequest {
 			includeData?: boolean;
 			workflowId?: string;
 			lastId?: string;
+			projectId?: string;
 		}
 	>;
 
diff --git a/packages/cli/src/PublicApi/v1/handlers/executions/executions.handler.ts b/packages/cli/src/PublicApi/v1/handlers/executions/executions.handler.ts
index 16ca8093cb325..ed078b52d5249 100644
--- a/packages/cli/src/PublicApi/v1/handlers/executions/executions.handler.ts
+++ b/packages/cli/src/PublicApi/v1/handlers/executions/executions.handler.ts
@@ -95,9 +95,10 @@ export = {
 				status = undefined,
 				includeData = false,
 				workflowId = undefined,
+				projectId,
 			} = req.query;
 
-			const sharedWorkflowsIds = await getSharedWorkflowIds(req.user, ['workflow:read']);
+			const sharedWorkflowsIds = await getSharedWorkflowIds(req.user, ['workflow:read'], projectId);
 
 			// user does not have workflows hence no executions
 			// or the execution they are trying to access belongs to a workflow they do not own
diff --git a/packages/cli/src/PublicApi/v1/handlers/executions/spec/paths/executions.yml b/packages/cli/src/PublicApi/v1/handlers/executions/spec/paths/executions.yml
index 8d26492ec30bf..6fcdaf356e4bb 100644
--- a/packages/cli/src/PublicApi/v1/handlers/executions/spec/paths/executions.yml
+++ b/packages/cli/src/PublicApi/v1/handlers/executions/spec/paths/executions.yml
@@ -21,6 +21,14 @@ get:
       schema:
         type: string
         example: '1000'
+    - name: projectId
+      in: query
+      required: false
+      explode: false
+      allowReserved: true
+      schema:
+        type: string
+        example: VmwOO9HeTEj20kxM
     - $ref: '../../../../shared/spec/parameters/limit.yml'
     - $ref: '../../../../shared/spec/parameters/cursor.yml'
   responses:
diff --git a/packages/cli/src/PublicApi/v1/handlers/users/spec/paths/users.yml b/packages/cli/src/PublicApi/v1/handlers/users/spec/paths/users.yml
index 7778a08e35c60..e767ab33cc16b 100644
--- a/packages/cli/src/PublicApi/v1/handlers/users/spec/paths/users.yml
+++ b/packages/cli/src/PublicApi/v1/handlers/users/spec/paths/users.yml
@@ -9,6 +9,14 @@ get:
     - $ref: '../../../../shared/spec/parameters/limit.yml'
     - $ref: '../../../../shared/spec/parameters/cursor.yml'
     - $ref: '../schemas/parameters/includeRole.yml'
+    - name: projectId
+      in: query
+      required: false
+      explode: false
+      allowReserved: true
+      schema:
+        type: string
+        example: VmwOO9HeTEj20kxM
   responses:
     '200':
       description: Operation successful.
diff --git a/packages/cli/src/PublicApi/v1/handlers/users/users.handler.ee.ts b/packages/cli/src/PublicApi/v1/handlers/users/users.handler.ee.ts
index cbfc43c0d100f..53c568ee69acd 100644
--- a/packages/cli/src/PublicApi/v1/handlers/users/users.handler.ee.ts
+++ b/packages/cli/src/PublicApi/v1/handlers/users/users.handler.ee.ts
@@ -12,6 +12,7 @@ import {
 } from '../../shared/middlewares/global.middleware';
 import type { UserRequest } from '@/requests';
 import { InternalHooks } from '@/InternalHooks';
+import { ProjectRelationRepository } from '@/databases/repositories/projectRelation.repository';
 import type { Response } from 'express';
 import { InvitationController } from '@/controllers/invitation.controller';
 import { UsersController } from '@/controllers/users.controller';
@@ -51,12 +52,17 @@ export = {
 		validCursor,
 		globalScope(['user:list', 'user:read']),
 		async (req: UserRequest.Get, res: express.Response) => {
-			const { offset = 0, limit = 100, includeRole = false } = req.query;
+			const { offset = 0, limit = 100, includeRole = false, projectId } = req.query;
+
+			const _in = projectId
+				? await Container.get(ProjectRelationRepository).findUserIdsByProjectId(projectId)
+				: undefined;
 
 			const [users, count] = await getAllUsersAndCount({
 				includeRole,
 				limit,
 				offset,
+				in: _in,
 			});
 
 			const telemetryData = {
diff --git a/packages/cli/src/PublicApi/v1/handlers/users/users.service.ee.ts b/packages/cli/src/PublicApi/v1/handlers/users/users.service.ee.ts
index f7bf6618168f0..e62c9465747ed 100644
--- a/packages/cli/src/PublicApi/v1/handlers/users/users.service.ee.ts
+++ b/packages/cli/src/PublicApi/v1/handlers/users/users.service.ee.ts
@@ -3,6 +3,8 @@ import { UserRepository } from '@db/repositories/user.repository';
 import type { User } from '@db/entities/User';
 import pick from 'lodash/pick';
 import { validate as uuidValidate } from 'uuid';
+// eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
+import { In } from '@n8n/typeorm';
 
 export async function getUser(data: {
 	withIdentifier: string;
@@ -25,9 +27,12 @@ export async function getAllUsersAndCount(data: {
 	includeRole?: boolean;
 	limit?: number;
 	offset?: number;
+	in?: string[];
 }): Promise<[User[], number]> {
+	const { in: _in } = data;
+
 	const users = await Container.get(UserRepository).find({
-		where: {},
+		where: { ...(_in && { id: In(_in) }) },
 		skip: data.offset,
 		take: data.limit,
 	});
diff --git a/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.service.ts b/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.service.ts
index d301e61c93966..3e3afc078ed92 100644
--- a/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.service.ts
+++ b/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.service.ts
@@ -17,15 +17,21 @@ function insertIf(condition: boolean, elements: string[]): string[] {
 	return condition ? elements : [];
 }
 
-export async function getSharedWorkflowIds(user: User, scopes: Scope[]): Promise<string[]> {
+export async function getSharedWorkflowIds(
+	user: User,
+	scopes: Scope[],
+	projectId?: string,
+): Promise<string[]> {
 	if (Container.get(License).isSharingEnabled()) {
 		return await Container.get(WorkflowSharingService).getSharedWorkflowIds(user, {
 			scopes,
+			projectId,
 		});
 	} else {
 		return await Container.get(WorkflowSharingService).getSharedWorkflowIds(user, {
 			workflowRoles: ['workflow:owner'],
 			projectRoles: ['project:personalOwner'],
+			projectId,
 		});
 	}
 }
diff --git a/packages/cli/src/databases/repositories/projectRelation.repository.ts b/packages/cli/src/databases/repositories/projectRelation.repository.ts
index bddfd6e38d66f..00fc4de34a195 100644
--- a/packages/cli/src/databases/repositories/projectRelation.repository.ts
+++ b/packages/cli/src/databases/repositories/projectRelation.repository.ts
@@ -52,4 +52,13 @@ export class ProjectRelationRepository extends Repository<ProjectRelation> {
 			{} as Record<ProjectRole, number>,
 		);
 	}
+
+	async findUserIdsByProjectId(projectId: string): Promise<string[]> {
+		const rows = await this.find({
+			select: ['userId'],
+			where: { projectId },
+		});
+
+		return [...new Set(rows.map((r) => r.userId))];
+	}
 }
diff --git a/packages/cli/src/requests.ts b/packages/cli/src/requests.ts
index 1ea265f2394e7..4fe369857eb7a 100644
--- a/packages/cli/src/requests.ts
+++ b/packages/cli/src/requests.ts
@@ -306,7 +306,7 @@ export declare namespace UserRequest {
 		{ id: string; email: string; identifier: string },
 		{},
 		{},
-		{ limit?: number; offset?: number; cursor?: string; includeRole?: boolean }
+		{ limit?: number; offset?: number; cursor?: string; includeRole?: boolean; projectId?: string }
 	>;
 
 	export type PasswordResetLink = AuthenticatedRequest<{ id: string }, {}, {}, {}>;
diff --git a/packages/cli/src/workflows/workflowSharing.service.ts b/packages/cli/src/workflows/workflowSharing.service.ts
index 93ef76438f7b0..add5bb31b8fc9 100644
--- a/packages/cli/src/workflows/workflowSharing.service.ts
+++ b/packages/cli/src/workflows/workflowSharing.service.ts
@@ -27,11 +27,16 @@ export class WorkflowSharingService {
 	async getSharedWorkflowIds(
 		user: User,
 		options:
-			| { scopes: Scope[] }
-			| { projectRoles: ProjectRole[]; workflowRoles: WorkflowSharingRole[] },
+			| { scopes: Scope[]; projectId?: string }
+			| { projectRoles: ProjectRole[]; workflowRoles: WorkflowSharingRole[]; projectId?: string },
 	): Promise<string[]> {
+		const { projectId } = options;
+
 		if (user.hasGlobalScope('workflow:read')) {
-			const sharedWorkflows = await this.sharedWorkflowRepository.find({ select: ['workflowId'] });
+			const sharedWorkflows = await this.sharedWorkflowRepository.find({
+				select: ['workflowId'],
+				...(projectId && { where: { projectId } }),
+			});
 			return sharedWorkflows.map(({ workflowId }) => workflowId);
 		}
 
diff --git a/packages/cli/test/integration/publicApi/executions.test.ts b/packages/cli/test/integration/publicApi/executions.test.ts
index 9961dac545036..8dac97fc22381 100644
--- a/packages/cli/test/integration/publicApi/executions.test.ts
+++ b/packages/cli/test/integration/publicApi/executions.test.ts
@@ -20,6 +20,8 @@ import {
 import type { SuperAgentTest } from '../shared/types';
 import { mockInstance } from '@test/mocking';
 import { Telemetry } from '@/telemetry';
+import { createTeamProject } from '@test-integration/db/projects';
+import type { ExecutionEntity } from '@/databases/entities/ExecutionEntity';
 
 let owner: User;
 let user1: User;
@@ -447,6 +449,42 @@ describe('GET /executions', () => {
 		}
 	});
 
+	test('should return executions filtered by project ID', async () => {
+		/**
+		 * Arrange
+		 */
+		const [firstProject, secondProject] = await Promise.all([
+			createTeamProject(),
+			createTeamProject(),
+		]);
+		const [firstWorkflow, secondWorkflow] = await Promise.all([
+			createWorkflow({}, firstProject),
+			createWorkflow({}, secondProject),
+		]);
+		const [firstExecution, secondExecution, _] = await Promise.all([
+			createExecution({}, firstWorkflow),
+			createExecution({}, firstWorkflow),
+			createExecution({}, secondWorkflow),
+		]);
+
+		/**
+		 * Act
+		 */
+		const response = await authOwnerAgent.get('/executions').query({
+			projectId: firstProject.id,
+		});
+
+		/**
+		 * Assert
+		 */
+		expect(response.statusCode).toBe(200);
+		expect(response.body.data.length).toBe(2);
+		expect(response.body.nextCursor).toBeNull();
+		expect(response.body.data.map((execution: ExecutionEntity) => execution.id)).toEqual(
+			expect.arrayContaining([firstExecution.id, secondExecution.id]),
+		);
+	});
+
 	test('owner should retrieve all executions regardless of ownership', async () => {
 		const [firstWorkflowForUser1, secondWorkflowForUser1] = await createManyWorkflows(2, {}, user1);
 		await createManyExecutions(2, firstWorkflowForUser1, createSuccessfulExecution);
diff --git a/packages/cli/test/integration/publicApi/users.ee.test.ts b/packages/cli/test/integration/publicApi/users.ee.test.ts
index 6e57a629d7dc7..be23d8f45a519 100644
--- a/packages/cli/test/integration/publicApi/users.ee.test.ts
+++ b/packages/cli/test/integration/publicApi/users.ee.test.ts
@@ -7,8 +7,10 @@ import { mockInstance } from '../../shared/mocking';
 import { randomApiKey } from '../shared/random';
 import * as utils from '../shared/utils/';
 import * as testDb from '../shared/testDb';
-import { createUser, createUserShell } from '../shared/db/users';
+import { createOwner, createUser, createUserShell } from '../shared/db/users';
 import type { SuperAgentTest } from '../shared/types';
+import { createTeamProject, linkUserToProject } from '@test-integration/db/projects';
+import type { User } from '@/databases/entities/User';
 
 mockInstance(License, {
 	getUsersLimit: jest.fn().mockReturnValue(-1),
@@ -84,6 +86,46 @@ describe('With license unlimited quota:users', () => {
 				expect(updatedAt).toBeDefined();
 			}
 		});
+
+		it('should return users filtered by project ID', async () => {
+			/**
+			 * Arrange
+			 */
+			const [owner, firstMember, secondMember, thirdMember] = await Promise.all([
+				createOwner({ withApiKey: true }),
+				createUser({ role: 'global:member' }),
+				createUser({ role: 'global:member' }),
+				createUser({ role: 'global:member' }),
+			]);
+
+			const [firstProject, secondProject] = await Promise.all([
+				createTeamProject(),
+				createTeamProject(),
+			]);
+
+			await Promise.all([
+				linkUserToProject(firstMember, firstProject, 'project:admin'),
+				linkUserToProject(secondMember, firstProject, 'project:viewer'),
+				linkUserToProject(thirdMember, secondProject, 'project:admin'),
+			]);
+
+			/**
+			 * Act
+			 */
+			const response = await testServer.publicApiAgentFor(owner).get('/users').query({
+				projectId: firstProject.id,
+			});
+
+			/**
+			 * Assert
+			 */
+			expect(response.status).toBe(200);
+			expect(response.body.data.length).toBe(2);
+			expect(response.body.nextCursor).toBeNull();
+			expect(response.body.data.map((user: User) => user.id)).toEqual(
+				expect.arrayContaining([firstMember.id, secondMember.id]),
+			);
+		});
 	});
 
 	describe('GET /users/:id', () => {

From 0faf46f4f87bc35406392f735e794e7aeceb6ead 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: Fri, 2 Aug 2024 15:18:33 +0200
Subject: [PATCH 065/168] refactor(core): Move instanceRole to InstanceSettings
 (no-changelog) (#10242)

---
 packages/cli/src/License.ts                   |  2 +-
 packages/cli/src/commands/start.ts            |  4 ++--
 packages/cli/src/config/schema.ts             |  6 -----
 .../execution-recovery.service.test.ts        | 23 +++++++++----------
 .../executions/execution-recovery.service.ts  | 10 ++++----
 .../cli/src/services/orchestration.service.ts | 10 +++++---
 .../orchestration/main/MultiMainSetup.ee.ts   | 14 ++++++-----
 packages/cli/src/services/pruning.service.ts  |  5 ++--
 .../test/integration/pruning.service.test.ts  |  8 ++++---
 packages/cli/test/unit/WaitTracker.test.ts    |  2 +-
 .../services/orchestration.service.test.ts    | 20 +++++++++-------
 packages/core/src/InstanceSettings.ts         | 21 +++++++++++++++++
 12 files changed, 77 insertions(+), 48 deletions(-)

diff --git a/packages/cli/src/License.ts b/packages/cli/src/License.ts
index 9a2740ce7cbb7..643da18fd26e9 100644
--- a/packages/cli/src/License.ts
+++ b/packages/cli/src/License.ts
@@ -55,7 +55,7 @@ export class License {
 		 * This ensures the mains do not cause a 429 (too many requests) on license init.
 		 */
 		if (config.getEnv('multiMainSetup.enabled')) {
-			return autoRenewEnabled && config.getEnv('instanceRole') === 'leader';
+			return autoRenewEnabled && this.instanceSettings.isLeader;
 		}
 
 		return autoRenewEnabled;
diff --git a/packages/cli/src/commands/start.ts b/packages/cli/src/commands/start.ts
index 4d7cd888b4cc0..63349ab6d1f0e 100644
--- a/packages/cli/src/commands/start.ts
+++ b/packages/cli/src/commands/start.ts
@@ -186,7 +186,7 @@ export class Start extends BaseCommand {
 		await this.initOrchestration();
 		this.logger.debug('Orchestration init complete');
 
-		if (!config.getEnv('license.autoRenewEnabled') && config.getEnv('instanceRole') === 'leader') {
+		if (!config.getEnv('license.autoRenewEnabled') && this.instanceSettings.isLeader) {
 			this.logger.warn(
 				'Automatic license renewal is disabled. The license will not renew automatically, and access to licensed features may be lost!',
 			);
@@ -210,7 +210,7 @@ export class Start extends BaseCommand {
 
 	async initOrchestration() {
 		if (config.getEnv('executions.mode') === 'regular') {
-			config.set('instanceRole', 'leader');
+			this.instanceSettings.markAsLeader();
 			return;
 		}
 
diff --git a/packages/cli/src/config/schema.ts b/packages/cli/src/config/schema.ts
index dc63f53099659..f99c14885ddf9 100644
--- a/packages/cli/src/config/schema.ts
+++ b/packages/cli/src/config/schema.ts
@@ -759,12 +759,6 @@ export const schema = {
 		},
 	},
 
-	instanceRole: {
-		doc: 'Always `leader` in single-main setup. `leader` or `follower` in multi-main setup.',
-		format: ['unset', 'leader', 'follower'] as const,
-		default: 'unset', // only until Start.initOrchestration
-	},
-
 	multiMainSetup: {
 		enabled: {
 			doc: 'Whether to enable multi-main setup for queue mode (license required)',
diff --git a/packages/cli/src/executions/__tests__/execution-recovery.service.test.ts b/packages/cli/src/executions/__tests__/execution-recovery.service.test.ts
index 7e33c6ac74a8a..39a84d27a78c1 100644
--- a/packages/cli/src/executions/__tests__/execution-recovery.service.test.ts
+++ b/packages/cli/src/executions/__tests__/execution-recovery.service.test.ts
@@ -1,6 +1,7 @@
 import Container from 'typedi';
 import { stringify } from 'flatted';
 import { randomInt } from 'n8n-workflow';
+import { InstanceSettings } from 'n8n-core';
 
 import { mockInstance } from '@test/mocking';
 import { createWorkflow } from '@test-integration/db/workflows';
@@ -21,38 +22,37 @@ import { EventMessageNode } from '@/eventbus/EventMessageClasses/EventMessageNod
 import { IN_PROGRESS_EXECUTION_DATA, OOM_WORKFLOW } from './constants';
 import { setupMessages } from './utils';
 
-import type { EventService } from '@/eventbus/event.service';
 import type { EventMessageTypes as EventMessage } from '@/eventbus/EventMessageClasses';
-import type { Logger } from '@/Logger';
 
 describe('ExecutionRecoveryService', () => {
-	let push: Push;
+	const push = mockInstance(Push);
+	mockInstance(InternalHooks);
+	const instanceSettings = new InstanceSettings();
+
 	let executionRecoveryService: ExecutionRecoveryService;
 	let orchestrationService: OrchestrationService;
 	let executionRepository: ExecutionRepository;
 
 	beforeAll(async () => {
 		await testDb.init();
-		push = mockInstance(Push);
 		executionRepository = Container.get(ExecutionRepository);
 		orchestrationService = Container.get(OrchestrationService);
 
-		mockInstance(InternalHooks);
 		executionRecoveryService = new ExecutionRecoveryService(
-			mock<Logger>(),
+			mock(),
+			instanceSettings,
 			push,
 			executionRepository,
 			orchestrationService,
-			mock<EventService>(),
+			mock(),
 		);
 	});
 
 	beforeEach(() => {
-		config.set('instanceRole', 'leader');
+		instanceSettings.markAsLeader();
 	});
 
 	afterEach(async () => {
-		config.load(config.default);
 		jest.restoreAllMocks();
 		await testDb.truncate(['Execution', 'ExecutionData', 'Workflow']);
 		executionRecoveryService.shutdown();
@@ -69,7 +69,6 @@ describe('ExecutionRecoveryService', () => {
 				 * Arrange
 				 */
 				config.set('executions.mode', 'queue');
-				jest.spyOn(orchestrationService, 'isLeader', 'get').mockReturnValue(true);
 				const scheduleSpy = jest.spyOn(executionRecoveryService, 'scheduleQueueRecovery');
 
 				/**
@@ -88,7 +87,7 @@ describe('ExecutionRecoveryService', () => {
 				 * Arrange
 				 */
 				config.set('executions.mode', 'queue');
-				jest.spyOn(orchestrationService, 'isLeader', 'get').mockReturnValue(false);
+				instanceSettings.markAsFollower();
 				const scheduleSpy = jest.spyOn(executionRecoveryService, 'scheduleQueueRecovery');
 
 				/**
@@ -130,7 +129,7 @@ describe('ExecutionRecoveryService', () => {
 				/**
 				 * Arrange
 				 */
-				config.set('instanceRole', 'follower');
+				instanceSettings.markAsFollower();
 				// @ts-expect-error Private method
 				const amendSpy = jest.spyOn(executionRecoveryService, 'amend');
 				const messages = setupMessages('123', 'Some workflow');
diff --git a/packages/cli/src/executions/execution-recovery.service.ts b/packages/cli/src/executions/execution-recovery.service.ts
index 615c65ea6ef5f..152d4ad4f2964 100644
--- a/packages/cli/src/executions/execution-recovery.service.ts
+++ b/packages/cli/src/executions/execution-recovery.service.ts
@@ -5,6 +5,7 @@ import { ExecutionRepository } from '@db/repositories/execution.repository';
 import { getWorkflowHooksMain } from '@/WorkflowExecuteAdditionalData'; // @TODO: Dependency cycle
 import type { DateTime } from 'luxon';
 import type { IRun, ITaskData } from 'n8n-workflow';
+import { InstanceSettings } from 'n8n-core';
 import type { EventMessageTypes } from '../eventbus/EventMessageClasses';
 import type { IExecutionResponse } from '@/Interfaces';
 import { NodeCrashedError } from '@/errors/node-crashed.error';
@@ -24,6 +25,7 @@ import { EventService } from '@/eventbus/event.service';
 export class ExecutionRecoveryService {
 	constructor(
 		private readonly logger: Logger,
+		private readonly instanceSettings: InstanceSettings,
 		private readonly push: Push,
 		private readonly executionRepository: ExecutionRepository,
 		private readonly orchestrationService: OrchestrationService,
@@ -36,10 +38,10 @@ export class ExecutionRecoveryService {
 	init() {
 		if (config.getEnv('executions.mode') === 'regular') return;
 
-		const { isLeader, isMultiMainSetupEnabled } = this.orchestrationService;
-
+		const { isLeader } = this.instanceSettings;
 		if (isLeader) this.scheduleQueueRecovery();
 
+		const { isMultiMainSetupEnabled } = this.orchestrationService;
 		if (isMultiMainSetupEnabled) {
 			this.orchestrationService.multiMainSetup
 				.on('leader-takeover', () => this.scheduleQueueRecovery())
@@ -58,7 +60,7 @@ export class ExecutionRecoveryService {
 	 * Recover key properties of a truncated execution using event logs.
 	 */
 	async recoverFromLogs(executionId: string, messages: EventMessageTypes[]) {
-		if (this.orchestrationService.isFollower) return;
+		if (this.instanceSettings.isFollower) return;
 
 		const amendedExecution = await this.amend(executionId, messages);
 
@@ -319,7 +321,7 @@ export class ExecutionRecoveryService {
 	private shouldScheduleQueueRecovery() {
 		return (
 			config.getEnv('executions.mode') === 'queue' &&
-			config.getEnv('instanceRole') === 'leader' &&
+			this.instanceSettings.isLeader &&
 			!this.isShuttingDown
 		);
 	}
diff --git a/packages/cli/src/services/orchestration.service.ts b/packages/cli/src/services/orchestration.service.ts
index bfc1d140fc6fa..283470f4d2114 100644
--- a/packages/cli/src/services/orchestration.service.ts
+++ b/packages/cli/src/services/orchestration.service.ts
@@ -7,11 +7,13 @@ import type { RedisServiceBaseCommand, RedisServiceCommand } from './redis/Redis
 import { RedisService } from './redis.service';
 import { MultiMainSetup } from './orchestration/main/MultiMainSetup.ee';
 import type { WorkflowActivateMode } from 'n8n-workflow';
+import { InstanceSettings } from 'n8n-core';
 
 @Service()
 export class OrchestrationService {
 	constructor(
 		private readonly logger: Logger,
+		private readonly instanceSettings: InstanceSettings,
 		private readonly redisService: RedisService,
 		readonly multiMainSetup: MultiMainSetup,
 	) {}
@@ -43,12 +45,14 @@ export class OrchestrationService {
 		return config.getEnv('redis.queueModeId');
 	}
 
+	/** @deprecated use InstanceSettings.isLeader */
 	get isLeader() {
-		return config.getEnv('instanceRole') === 'leader';
+		return this.instanceSettings.isLeader;
 	}
 
+	/** @deprecated use InstanceSettings.isFollower */
 	get isFollower() {
-		return config.getEnv('instanceRole') !== 'leader';
+		return this.instanceSettings.isFollower;
 	}
 
 	sanityCheck() {
@@ -63,7 +67,7 @@ export class OrchestrationService {
 		if (this.isMultiMainSetupEnabled) {
 			await this.multiMainSetup.init();
 		} else {
-			config.set('instanceRole', 'leader');
+			this.instanceSettings.markAsLeader();
 		}
 
 		this.isInitialized = true;
diff --git a/packages/cli/src/services/orchestration/main/MultiMainSetup.ee.ts b/packages/cli/src/services/orchestration/main/MultiMainSetup.ee.ts
index cabcf5996bc08..89c6ef725ab45 100644
--- a/packages/cli/src/services/orchestration/main/MultiMainSetup.ee.ts
+++ b/packages/cli/src/services/orchestration/main/MultiMainSetup.ee.ts
@@ -1,6 +1,7 @@
 import config from '@/config';
 import { Service } from 'typedi';
 import { TIME } from '@/constants';
+import { InstanceSettings } from 'n8n-core';
 import { ErrorReporterProxy as EventReporter } from 'n8n-workflow';
 import { Logger } from '@/Logger';
 import { RedisServicePubSubPublisher } from '@/services/redis/RedisServicePubSubPublisher';
@@ -16,6 +17,7 @@ type MultiMainEvents = {
 export class MultiMainSetup extends TypedEmitter<MultiMainEvents> {
 	constructor(
 		private readonly logger: Logger,
+		private readonly instanceSettings: InstanceSettings,
 		private readonly redisPublisher: RedisServicePubSubPublisher,
 		private readonly redisClientService: RedisClientService,
 	) {
@@ -50,7 +52,7 @@ export class MultiMainSetup extends TypedEmitter<MultiMainEvents> {
 	async shutdown() {
 		clearInterval(this.leaderCheckInterval);
 
-		const isLeader = config.getEnv('instanceRole') === 'leader';
+		const { isLeader } = this.instanceSettings;
 
 		if (isLeader) await this.redisPublisher.clear(this.leaderKey);
 	}
@@ -69,8 +71,8 @@ export class MultiMainSetup extends TypedEmitter<MultiMainEvents> {
 		if (leaderId && leaderId !== this.instanceId) {
 			this.logger.debug(`[Instance ID ${this.instanceId}] Leader is other instance "${leaderId}"`);
 
-			if (config.getEnv('instanceRole') === 'leader') {
-				config.set('instanceRole', 'follower');
+			if (this.instanceSettings.isLeader) {
+				this.instanceSettings.markAsFollower();
 
 				this.emit('leader-stepdown'); // lost leadership - stop triggers, pollers, pruning, wait-tracking, queue recovery
 
@@ -85,7 +87,7 @@ export class MultiMainSetup extends TypedEmitter<MultiMainEvents> {
 				`[Instance ID ${this.instanceId}] Leadership vacant, attempting to become leader...`,
 			);
 
-			config.set('instanceRole', 'follower');
+			this.instanceSettings.markAsFollower();
 
 			/**
 			 * Lost leadership - stop triggers, pollers, pruning, wait tracking, license renewal, queue recovery
@@ -106,7 +108,7 @@ export class MultiMainSetup extends TypedEmitter<MultiMainEvents> {
 		if (keySetSuccessfully) {
 			this.logger.debug(`[Instance ID ${this.instanceId}] Leader is now this instance`);
 
-			config.set('instanceRole', 'leader');
+			this.instanceSettings.markAsLeader();
 
 			await this.redisPublisher.setExpiration(this.leaderKey, this.leaderKeyTtl);
 
@@ -115,7 +117,7 @@ export class MultiMainSetup extends TypedEmitter<MultiMainEvents> {
 			 */
 			this.emit('leader-takeover');
 		} else {
-			config.set('instanceRole', 'follower');
+			this.instanceSettings.markAsFollower();
 		}
 	}
 
diff --git a/packages/cli/src/services/pruning.service.ts b/packages/cli/src/services/pruning.service.ts
index 78c0aad03750c..7f824836ae4ee 100644
--- a/packages/cli/src/services/pruning.service.ts
+++ b/packages/cli/src/services/pruning.service.ts
@@ -1,5 +1,5 @@
 import { Service } from 'typedi';
-import { BinaryDataService } from 'n8n-core';
+import { BinaryDataService, InstanceSettings } from 'n8n-core';
 import { inTest, TIME } from '@/constants';
 import config from '@/config';
 import { ExecutionRepository } from '@db/repositories/execution.repository';
@@ -25,6 +25,7 @@ export class PruningService {
 
 	constructor(
 		private readonly logger: Logger,
+		private readonly instanceSettings: InstanceSettings,
 		private readonly executionRepository: ExecutionRepository,
 		private readonly binaryDataService: BinaryDataService,
 		private readonly orchestrationService: OrchestrationService,
@@ -56,7 +57,7 @@ export class PruningService {
 		if (
 			config.getEnv('multiMainSetup.enabled') &&
 			config.getEnv('generic.instanceType') === 'main' &&
-			config.getEnv('instanceRole') === 'follower'
+			this.instanceSettings.isFollower
 		) {
 			return false;
 		}
diff --git a/packages/cli/test/integration/pruning.service.test.ts b/packages/cli/test/integration/pruning.service.test.ts
index 09a43a5b5b123..37d218c09d438 100644
--- a/packages/cli/test/integration/pruning.service.test.ts
+++ b/packages/cli/test/integration/pruning.service.test.ts
@@ -1,5 +1,5 @@
 import config from '@/config';
-import { BinaryDataService } from 'n8n-core';
+import { BinaryDataService, InstanceSettings } from 'n8n-core';
 import type { ExecutionStatus } from 'n8n-workflow';
 import Container from 'typedi';
 
@@ -15,10 +15,11 @@ import { mockInstance } from '../shared/mocking';
 import { createWorkflow } from './shared/db/workflows';
 import { createExecution, createSuccessfulExecution } from './shared/db/executions';
 import { mock } from 'jest-mock-extended';
-import type { OrchestrationService } from '@/services/orchestration.service';
 
 describe('softDeleteOnPruningCycle()', () => {
 	let pruningService: PruningService;
+	const instanceSettings = new InstanceSettings();
+	instanceSettings.markAsLeader();
 
 	const now = new Date();
 	const yesterday = new Date(Date.now() - TIME.DAY);
@@ -29,9 +30,10 @@ describe('softDeleteOnPruningCycle()', () => {
 
 		pruningService = new PruningService(
 			mockInstance(Logger),
+			instanceSettings,
 			Container.get(ExecutionRepository),
 			mockInstance(BinaryDataService),
-			mock<OrchestrationService>(),
+			mock(),
 		);
 
 		workflow = await createWorkflow();
diff --git a/packages/cli/test/unit/WaitTracker.test.ts b/packages/cli/test/unit/WaitTracker.test.ts
index 0f8464e18d14d..fb51d2e25bd30 100644
--- a/packages/cli/test/unit/WaitTracker.test.ts
+++ b/packages/cli/test/unit/WaitTracker.test.ts
@@ -10,7 +10,7 @@ jest.useFakeTimers();
 describe('WaitTracker', () => {
 	const executionRepository = mock<ExecutionRepository>();
 	const multiMainSetup = mock<MultiMainSetup>();
-	const orchestrationService = new OrchestrationService(mock(), mock(), multiMainSetup);
+	const orchestrationService = new OrchestrationService(mock(), mock(), mock(), multiMainSetup);
 
 	const execution = mock<IExecutionResponse>({
 		id: '123',
diff --git a/packages/cli/test/unit/services/orchestration.service.test.ts b/packages/cli/test/unit/services/orchestration.service.test.ts
index 75c7c06e40bb6..0b63f74344b57 100644
--- a/packages/cli/test/unit/services/orchestration.service.test.ts
+++ b/packages/cli/test/unit/services/orchestration.service.test.ts
@@ -1,4 +1,9 @@
 import Container from 'typedi';
+import type Redis from 'ioredis';
+import { mock } from 'jest-mock-extended';
+import { InstanceSettings } from 'n8n-core';
+import type { WorkflowActivateMode } from 'n8n-workflow';
+
 import config from '@/config';
 import { OrchestrationService } from '@/services/orchestration.service';
 import type { RedisServiceWorkerResponseObject } from '@/services/redis/RedisServiceCommands';
@@ -13,11 +18,9 @@ import { Logger } from '@/Logger';
 import { Push } from '@/push';
 import { ActiveWorkflowManager } from '@/ActiveWorkflowManager';
 import { mockInstance } from '../../shared/mocking';
-import type { WorkflowActivateMode } from 'n8n-workflow';
 import { RedisClientService } from '@/services/redis/redis-client.service';
-import type Redis from 'ioredis';
-import { mock } from 'jest-mock-extended';
 
+const instanceSettings = Container.get(InstanceSettings);
 const redisClientService = mockInstance(RedisClientService);
 const mockRedisClient = mock<Redis>();
 redisClientService.createClient.mockReturnValue(mockRedisClient);
@@ -72,6 +75,10 @@ describe('Orchestration Service', () => {
 		queueModeId = config.get('redis.queueModeId');
 	});
 
+	beforeEach(() => {
+		instanceSettings.markAsLeader();
+	});
+
 	afterAll(async () => {
 		jest.mock('@/services/redis/RedisServicePubSubPublisher').restoreAllMocks();
 		jest.mock('@/services/redis/RedisServicePubSubSubscriber').restoreAllMocks();
@@ -141,13 +148,10 @@ describe('Orchestration Service', () => {
 		);
 		expect(helpers.debounceMessageReceiver).toHaveBeenCalledTimes(2);
 		expect(res1!.payload).toBeUndefined();
-		expect((res2!.payload as { result: string }).result).toEqual('debounced');
+		expect(res2!.payload).toEqual({ result: 'debounced' });
 	});
 
 	describe('shouldAddWebhooks', () => {
-		beforeEach(() => {
-			config.set('instanceRole', 'leader');
-		});
 		test('should return true for init', () => {
 			// We want to ensure that webhooks are populated on init
 			// more https://github.com/n8n-io/n8n/pull/8830
@@ -169,7 +173,7 @@ describe('Orchestration Service', () => {
 		});
 
 		test('should return false for update or activate when not leader', () => {
-			config.set('instanceRole', 'follower');
+			instanceSettings.markAsFollower();
 			const modes = ['update', 'activate'] as WorkflowActivateMode[];
 			for (const mode of modes) {
 				const result = os.shouldAddWebhooks(mode);
diff --git a/packages/core/src/InstanceSettings.ts b/packages/core/src/InstanceSettings.ts
index e8ab9aa553223..f75e1df712108 100644
--- a/packages/core/src/InstanceSettings.ts
+++ b/packages/core/src/InstanceSettings.ts
@@ -14,6 +14,8 @@ interface WritableSettings {
 
 type Settings = ReadOnlySettings & WritableSettings;
 
+type InstanceRole = 'unset' | 'leader' | 'follower';
+
 const inTest = process.env.NODE_ENV === 'test';
 
 @Service()
@@ -38,6 +40,25 @@ export class InstanceSettings {
 
 	readonly instanceId = this.generateInstanceId();
 
+	/** Always `leader` in single-main setup. `leader` or `follower` in multi-main setup. */
+	private instanceRole: InstanceRole = 'unset';
+
+	get isLeader() {
+		return this.instanceRole === 'leader';
+	}
+
+	markAsLeader() {
+		this.instanceRole = 'leader';
+	}
+
+	get isFollower() {
+		return this.instanceRole === 'follower';
+	}
+
+	markAsFollower() {
+		this.instanceRole = 'follower';
+	}
+
 	get encryptionKey() {
 		return this.settings.encryptionKey;
 	}

From 57d1c9a99e97308f2f1b8ae05ac3861a835e8e5a Mon Sep 17 00:00:00 2001
From: Eugene <eugene@n8n.io>
Date: Fri, 2 Aug 2024 16:00:09 +0200
Subject: [PATCH 066/168] feat(core): Show sub-node error on the logs pane.
 Open logs pane on sub-node error (#10248)

---
 cypress/constants.ts                          |   2 +
 .../e2e/233-AI-switch-to-logs-on-error.cy.ts  | 279 ++++++++++++++++++
 cypress/pages/ndv.ts                          |   1 +
 .../nodes/tools/ToolCode/ToolCode.node.ts     |   4 +-
 .../src/components/Error/NodeErrorView.vue    |   3 +-
 .../editor-ui/src/components/OutputPanel.vue  |  32 +-
 packages/editor-ui/src/components/RunData.vue |  19 +-
 7 files changed, 333 insertions(+), 7 deletions(-)
 create mode 100644 cypress/e2e/233-AI-switch-to-logs-on-error.cy.ts

diff --git a/cypress/constants.ts b/cypress/constants.ts
index 8439952ac7b81..8fdb03ef9cfba 100644
--- a/cypress/constants.ts
+++ b/cypress/constants.ts
@@ -37,6 +37,7 @@ export const INSTANCE_MEMBERS = [
 export const MANUAL_TRIGGER_NODE_NAME = 'Manual Trigger';
 export const MANUAL_TRIGGER_NODE_DISPLAY_NAME = 'When clicking ‘Test workflow’';
 export const MANUAL_CHAT_TRIGGER_NODE_NAME = 'Chat Trigger';
+export const MANUAL_CHAT_TRIGGER_NODE_DISPLAY_NAME = 'When chat message received';
 export const SCHEDULE_TRIGGER_NODE_NAME = 'Schedule Trigger';
 export const CODE_NODE_NAME = 'Code';
 export const SET_NODE_NAME = 'Set';
@@ -57,6 +58,7 @@ export const AI_TOOL_CODE_NODE_NAME = 'Code Tool';
 export const AI_TOOL_WIKIPEDIA_NODE_NAME = 'Wikipedia';
 export const AI_TOOL_HTTP_NODE_NAME = 'HTTP Request Tool';
 export const AI_LANGUAGE_MODEL_OPENAI_CHAT_MODEL_NODE_NAME = 'OpenAI Chat Model';
+export const AI_MEMORY_POSTGRES_NODE_NAME = 'Postgres Chat Memory';
 export const AI_OUTPUT_PARSER_AUTO_FIXING_NODE_NAME = 'Auto-fixing Output Parser';
 export const WEBHOOK_NODE_NAME = 'Webhook';
 
diff --git a/cypress/e2e/233-AI-switch-to-logs-on-error.cy.ts b/cypress/e2e/233-AI-switch-to-logs-on-error.cy.ts
new file mode 100644
index 0000000000000..78d4b61449c23
--- /dev/null
+++ b/cypress/e2e/233-AI-switch-to-logs-on-error.cy.ts
@@ -0,0 +1,279 @@
+import type { ExecutionError } from 'n8n-workflow/src';
+import { NDV, WorkflowPage as WorkflowPageClass } from '../pages';
+import {
+	addLanguageModelNodeToParent,
+	addMemoryNodeToParent,
+	addNodeToCanvas,
+	addToolNodeToParent,
+	navigateToNewWorkflowPage,
+	openNode,
+} from '../composables/workflow';
+import {
+	AGENT_NODE_NAME,
+	AI_LANGUAGE_MODEL_OPENAI_CHAT_MODEL_NODE_NAME,
+	AI_MEMORY_POSTGRES_NODE_NAME,
+	AI_TOOL_CALCULATOR_NODE_NAME,
+	MANUAL_CHAT_TRIGGER_NODE_DISPLAY_NAME,
+	MANUAL_CHAT_TRIGGER_NODE_NAME,
+	MANUAL_TRIGGER_NODE_DISPLAY_NAME,
+	MANUAL_TRIGGER_NODE_NAME,
+} from '../constants';
+import {
+	clickCreateNewCredential,
+	clickExecuteNode,
+	clickGetBackToCanvas,
+} from '../composables/ndv';
+import { setCredentialValues } from '../composables/modals/credential-modal';
+import {
+	closeManualChatModal,
+	getManualChatMessages,
+	getManualChatModalLogs,
+	getManualChatModalLogsEntries,
+	sendManualChatMessage,
+} from '../composables/modals/chat-modal';
+import { createMockNodeExecutionData, getVisibleSelect, runMockWorkflowExecution } from '../utils';
+
+const ndv = new NDV();
+const WorkflowPage = new WorkflowPageClass();
+
+function createRunDataWithError(inputMessage: string) {
+	return [
+		createMockNodeExecutionData(MANUAL_CHAT_TRIGGER_NODE_NAME, {
+			jsonData: {
+				main: { input: inputMessage },
+			},
+		}),
+		createMockNodeExecutionData(AI_MEMORY_POSTGRES_NODE_NAME, {
+			jsonData: {
+				ai_memory: {
+					json: {
+						action: 'loadMemoryVariables',
+						values: {
+							input: inputMessage,
+							system_message: 'You are a helpful assistant',
+							formatting_instructions:
+								'IMPORTANT: Always call `format_final_response` to format your final response!',
+						},
+					},
+				},
+			},
+			inputOverride: {
+				ai_memory: [
+					[
+						{
+							json: {
+								action: 'loadMemoryVariables',
+								values: {
+									input: inputMessage,
+									system_message: 'You are a helpful assistant',
+									formatting_instructions:
+										'IMPORTANT: Always call `format_final_response` to format your final response!',
+								},
+							},
+						},
+					],
+				],
+			},
+			error: {
+				message: 'Internal error',
+				timestamp: 1722591723244,
+				name: 'NodeOperationError',
+				description: 'Internal error',
+				context: {},
+				cause: {
+					name: 'error',
+					severity: 'FATAL',
+					code: '3D000',
+					file: 'postinit.c',
+					line: '885',
+					routine: 'InitPostgres',
+				} as unknown as Error,
+			} as ExecutionError,
+		}),
+		createMockNodeExecutionData(AGENT_NODE_NAME, {
+			executionStatus: 'error',
+			error: {
+				level: 'error',
+				tags: {
+					packageName: 'workflow',
+				},
+				context: {},
+				functionality: 'configuration-node',
+				name: 'NodeOperationError',
+				timestamp: 1722591723244,
+				node: {
+					parameters: {
+						notice: '',
+						sessionIdType: 'fromInput',
+						tableName: 'n8n_chat_histories',
+					},
+					id: '6b9141da-0135-4e9d-94d1-2d658cbf48b5',
+					name: 'Postgres Chat Memory',
+					type: '@n8n/n8n-nodes-langchain.memoryPostgresChat',
+					typeVersion: 1,
+					position: [1140, 500],
+					credentials: {
+						postgres: {
+							id: 'RkyZetVpGsSfEAhQ',
+							name: 'Postgres account',
+						},
+					},
+				},
+				messages: ['database "chat11" does not exist'],
+				description: 'Internal error',
+				message: 'Internal error',
+			} as unknown as ExecutionError,
+			metadata: {
+				subRun: [
+					{
+						node: 'Postgres Chat Memory',
+						runIndex: 0,
+					},
+				],
+			},
+		}),
+	];
+}
+
+function setupTestWorkflow(chatTrigger: boolean = false) {
+	// Setup test workflow with AI Agent, Postgres Memory Node (source of error), Calculator Tool, and OpenAI Chat Model
+	if (chatTrigger) {
+		addNodeToCanvas(MANUAL_CHAT_TRIGGER_NODE_NAME, true);
+	} else {
+		addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME, true);
+	}
+
+	addNodeToCanvas(AGENT_NODE_NAME, true);
+
+	if (!chatTrigger) {
+		// Remove chat trigger
+		WorkflowPage.getters
+			.canvasNodeByName(MANUAL_CHAT_TRIGGER_NODE_DISPLAY_NAME)
+			.find('[data-test-id="delete-node-button"]')
+			.click({ force: true });
+
+		// Set manual trigger to output standard pinned data
+		openNode(MANUAL_TRIGGER_NODE_DISPLAY_NAME);
+		ndv.actions.editPinnedData();
+		ndv.actions.savePinnedData();
+		ndv.actions.close();
+	}
+
+	// Calculator is added just to make OpenAI Chat Model work (tools can not be empty with OpenAI model)
+	addToolNodeToParent(AI_TOOL_CALCULATOR_NODE_NAME, AGENT_NODE_NAME);
+	clickGetBackToCanvas();
+
+	addMemoryNodeToParent(AI_MEMORY_POSTGRES_NODE_NAME, AGENT_NODE_NAME);
+
+	clickCreateNewCredential();
+	setCredentialValues({
+		password: 'testtesttest',
+	});
+
+	ndv.getters.parameterInput('sessionIdType').click();
+	getVisibleSelect().contains('Define below').click();
+	ndv.getters.parameterInput('sessionKey').type('asdasd');
+
+	clickGetBackToCanvas();
+
+	addLanguageModelNodeToParent(
+		AI_LANGUAGE_MODEL_OPENAI_CHAT_MODEL_NODE_NAME,
+		AGENT_NODE_NAME,
+		true,
+	);
+
+	clickCreateNewCredential();
+	setCredentialValues({
+		apiKey: 'sk_test_123',
+	});
+	clickGetBackToCanvas();
+
+	WorkflowPage.actions.zoomToFit();
+}
+
+function checkMessages(inputMessage: string, outputMessage: string) {
+	const messages = getManualChatMessages();
+	messages.should('have.length', 2);
+	messages.should('contain', inputMessage);
+	messages.should('contain', outputMessage);
+
+	getManualChatModalLogs().should('exist');
+	getManualChatModalLogsEntries()
+		.should('have.length', 1)
+		.should('contain', AI_MEMORY_POSTGRES_NODE_NAME);
+}
+
+describe("AI-233 Make root node's logs pane active in case of an error in sub-nodes", () => {
+	beforeEach(() => {
+		navigateToNewWorkflowPage();
+	});
+
+	it('should open logs tab by default when there was an error', () => {
+		setupTestWorkflow(true);
+
+		openNode(AGENT_NODE_NAME);
+
+		const inputMessage = 'Test the code tool';
+
+		clickExecuteNode();
+		runMockWorkflowExecution({
+			trigger: () => sendManualChatMessage(inputMessage),
+			runData: createRunDataWithError(inputMessage),
+			lastNodeExecuted: AGENT_NODE_NAME,
+		});
+
+		checkMessages(inputMessage, '[ERROR: Internal error]');
+		closeManualChatModal();
+
+		// Open the AI Agent node to see the logs
+		openNode(AGENT_NODE_NAME);
+
+		// Finally check that logs pane is opened by default
+		ndv.getters.outputDataContainer().should('be.visible');
+
+		ndv.getters.aiOutputModeToggle().should('be.visible');
+		ndv.getters
+			.aiOutputModeToggle()
+			.find('[role="radio"]')
+			.should('have.length', 2)
+			.eq(1)
+			.should('have.attr', 'aria-checked', 'true');
+
+		ndv.getters
+			.outputPanel()
+			.findChildByTestId('node-error-message')
+			.should('be.visible')
+			.should('contain', 'Error in sub-node');
+	});
+
+	it('should switch to logs tab on error, when NDV is already opened', () => {
+		setupTestWorkflow(false);
+
+		openNode(AGENT_NODE_NAME);
+
+		const inputMessage = 'Test the code tool';
+
+		runMockWorkflowExecution({
+			trigger: () => clickExecuteNode(),
+			runData: createRunDataWithError(inputMessage),
+			lastNodeExecuted: AGENT_NODE_NAME,
+		});
+
+		// Check that logs pane is opened by default
+		ndv.getters.outputDataContainer().should('be.visible');
+
+		ndv.getters.aiOutputModeToggle().should('be.visible');
+		ndv.getters
+			.aiOutputModeToggle()
+			.find('[role="radio"]')
+			.should('have.length', 2)
+			.eq(1)
+			.should('have.attr', 'aria-checked', 'true');
+
+		ndv.getters
+			.outputPanel()
+			.findChildByTestId('node-error-message')
+			.should('be.visible')
+			.should('contain', 'Error in sub-node');
+	});
+});
diff --git a/cypress/pages/ndv.ts b/cypress/pages/ndv.ts
index 018ec43a5de9c..24e1922663371 100644
--- a/cypress/pages/ndv.ts
+++ b/cypress/pages/ndv.ts
@@ -24,6 +24,7 @@ export class NDV extends BasePage {
 		editPinnedDataButton: () => cy.getByTestId('ndv-edit-pinned-data'),
 		pinnedDataEditor: () => this.getters.outputPanel().find('.cm-editor .cm-scroller .cm-content'),
 		runDataPaneHeader: () => cy.getByTestId('run-data-pane-header'),
+		aiOutputModeToggle: () => cy.getByTestId('ai-output-mode-select'),
 		nodeOutputHint: () => cy.getByTestId('ndv-output-run-node-hint'),
 		savePinnedDataButton: () =>
 			this.getters.runDataPaneHeader().find('button').filter(':visible').contains('Save'),
diff --git a/packages/@n8n/nodes-langchain/nodes/tools/ToolCode/ToolCode.node.ts b/packages/@n8n/nodes-langchain/nodes/tools/ToolCode/ToolCode.node.ts
index 492284b190c78..6ae5a8807539b 100644
--- a/packages/@n8n/nodes-langchain/nodes/tools/ToolCode/ToolCode.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolCode/ToolCode.node.ts
@@ -6,6 +6,7 @@ import type {
 	SupplyData,
 	ExecutionError,
 } from 'n8n-workflow';
+
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 import type { Sandbox } from 'n8n-nodes-base/dist/nodes/Code/Sandbox';
 import { getSandboxContext } from 'n8n-nodes-base/dist/nodes/Code/Sandbox';
@@ -208,7 +209,7 @@ export class ToolCode implements INodeType {
 					try {
 						response = await runFunction(query);
 					} catch (error: unknown) {
-						executionError = error as ExecutionError;
+						executionError = new NodeOperationError(this.getNode(), error as ExecutionError);
 						response = `There was an error: "${executionError.message}"`;
 					}
 
@@ -229,6 +230,7 @@ export class ToolCode implements INodeType {
 					} else {
 						void this.addOutputData(NodeConnectionType.AiTool, index, [[{ json: { response } }]]);
 					}
+
 					return response;
 				},
 			}),
diff --git a/packages/editor-ui/src/components/Error/NodeErrorView.vue b/packages/editor-ui/src/components/Error/NodeErrorView.vue
index 5244371d0fc47..a0d6396df1416 100644
--- a/packages/editor-ui/src/components/Error/NodeErrorView.vue
+++ b/packages/editor-ui/src/components/Error/NodeErrorView.vue
@@ -21,6 +21,7 @@ import type { BaseTextKey } from '@/plugins/i18n';
 
 type Props = {
 	error: NodeError | NodeApiError | NodeOperationError;
+	compact?: boolean;
 };
 
 const props = defineProps<Props>();
@@ -377,7 +378,7 @@ function copySuccess() {
 			></div>
 		</div>
 
-		<div class="node-error-view__info">
+		<div v-if="!compact" class="node-error-view__info">
 			<div class="node-error-view__info-header">
 				<p class="node-error-view__info-title">
 					{{ i18n.baseText('nodeErrorView.details.title') }}
diff --git a/packages/editor-ui/src/components/OutputPanel.vue b/packages/editor-ui/src/components/OutputPanel.vue
index 6d76c34295978..af1a7801f6652 100644
--- a/packages/editor-ui/src/components/OutputPanel.vue
+++ b/packages/editor-ui/src/components/OutputPanel.vue
@@ -28,6 +28,7 @@
 			<div :class="$style.titleSection">
 				<template v-if="hasAiMetadata">
 					<n8n-radio-buttons
+						data-test-id="ai-output-mode-select"
 						v-model="outputMode"
 						:options="outputTypes"
 						@update:model-value="onUpdateOutputMode"
@@ -83,6 +84,7 @@
 		<template v-if="outputMode === 'logs' && node" #content>
 			<RunDataAi :node="node" :run-index="runIndex" />
 		</template>
+
 		<template #recovered-artificial-output-data>
 			<div :class="$style.recoveredOutputData">
 				<n8n-text tag="div" :bold="true" color="text-dark" size="large">{{
@@ -101,8 +103,8 @@
 </template>
 
 <script setup lang="ts">
-import { ref, computed } from 'vue';
-import type { IRunData, IRunExecutionData, Workflow } from 'n8n-workflow';
+import { ref, computed, onMounted, watch } from 'vue';
+import type { IRunData, IRunExecutionData, NodeError, Workflow } from 'n8n-workflow';
 import RunData from './RunData.vue';
 import RunInfo from './RunInfo.vue';
 import { storeToRefs } from 'pinia';
@@ -183,7 +185,7 @@ const pinnedData = usePinnedData(activeNode, {
 
 // Data
 
-const outputMode = ref<OutputType>('regular');
+const outputMode = ref<OutputType>(OUTPUT_TYPE.REGULAR);
 const outputTypes = ref([
 	{ label: i18n.baseText('ndv.output.outType.regular'), value: OUTPUT_TYPE.REGULAR },
 	{ label: i18n.baseText('ndv.output.outType.logs'), value: OUTPUT_TYPE.LOGS },
@@ -213,6 +215,16 @@ const hasAiMetadata = computed(() => {
 	return false;
 });
 
+// Determine the initial output mode to logs if the node has an error and the logs are available
+const defaultOutputMode = computed<OutputType>(() => {
+	const hasError =
+		workflowRunData.value &&
+		node.value &&
+		(workflowRunData.value[node.value.name]?.[props.runIndex]?.error as NodeError);
+
+	return Boolean(hasError) && hasAiMetadata.value ? OUTPUT_TYPE.LOGS : OUTPUT_TYPE.REGULAR;
+});
+
 const isNodeRunning = computed(() => {
 	return !!node.value && workflowsStore.isNodeExecuting(node.value.name);
 });
@@ -351,6 +363,20 @@ const onUpdateOutputMode = (outputMode: OutputType) => {
 	}
 };
 
+// Set the initial output mode when the component is mounted
+onMounted(() => {
+	outputMode.value = defaultOutputMode.value;
+});
+
+// In case the output panel was opened when the node has not run yet,
+// defaultOutputMode will be "regular" at the time of mounting.
+// This is why we need to watch the defaultOutputMode and change the outputMode to "logs" if the node has run and criteria are met.
+watch(defaultOutputMode, (newValue: OutputType, oldValue: OutputType) => {
+	if (newValue === OUTPUT_TYPE.LOGS && oldValue === OUTPUT_TYPE.REGULAR && hasNodeRun.value) {
+		outputMode.value = defaultOutputMode.value;
+	}
+});
+
 const activatePane = () => {
 	emit('activatePane');
 };
diff --git a/packages/editor-ui/src/components/RunData.vue b/packages/editor-ui/src/components/RunData.vue
index c858cc34aa54b..d1de4c2b3ec51 100644
--- a/packages/editor-ui/src/components/RunData.vue
+++ b/packages/editor-ui/src/components/RunData.vue
@@ -281,7 +281,15 @@
 						})
 					}}
 				</n8n-text>
-				<slot v-else-if="$slots['content']" name="content"></slot>
+				<div v-else-if="$slots['content']">
+					<NodeErrorView
+						v-if="workflowRunErrorAsNodeError"
+						:error="workflowRunErrorAsNodeError"
+						:class="$style.inlineError"
+						compact
+					/>
+					<slot name="content"></slot>
+				</div>
 				<NodeErrorView
 					v-else-if="workflowRunErrorAsNodeError"
 					:error="workflowRunErrorAsNodeError"
@@ -1147,7 +1155,7 @@ export default defineComponent({
 			const error = this.workflowRunData?.[this.node.name]?.[this.runIndex]?.error;
 			const errorsToTrack = ['unknown error'];
 
-			if (error && errorsToTrack.some((e) => error.message.toLowerCase().includes(e))) {
+			if (error && errorsToTrack.some((e) => error.message?.toLowerCase().includes(e))) {
 				this.$telemetry.track(
 					`User encountered an error: "${error.message}"`,
 					{
@@ -1776,6 +1784,13 @@ export default defineComponent({
 	height: 100%;
 }
 
+.inlineError {
+	line-height: var(--font-line-height-xloose);
+	padding-left: var(--spacing-s);
+	padding-right: var(--spacing-s);
+	padding-bottom: var(--spacing-s);
+}
+
 .outputs {
 	display: flex;
 	flex-direction: column;

From 55f2ffe256c91a028cee95c3bbb37a093a1c0f81 Mon Sep 17 00:00:00 2001
From: Csaba Tuncsik <csaba@n8n.io>
Date: Fri, 2 Aug 2024 16:05:17 +0200
Subject: [PATCH 067/168] fix(editor): Fix execution retry button (#10275)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: कारतोफ्फेलस्क्रिप्ट™ <aditya@netroy.in>
---
 .../workflow/WorkflowExecutionsCard.test.ts   |  2 +-
 .../__tests__/useExecutionHelpers.test.ts     | 21 +++++++++++++++++++
 .../src/composables/useExecutionHelpers.ts    |  6 +-----
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsCard.test.ts b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsCard.test.ts
index ec850664740ea..2d5449e93d2fa 100644
--- a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsCard.test.ts
+++ b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsCard.test.ts
@@ -51,7 +51,7 @@ describe('WorkflowExecutionsCard', () => {
 				retryOf: '2',
 				retrySuccessId: null,
 			},
-			false,
+			true,
 		],
 		[
 			{
diff --git a/packages/editor-ui/src/composables/__tests__/useExecutionHelpers.test.ts b/packages/editor-ui/src/composables/__tests__/useExecutionHelpers.test.ts
index 29bd64ea4243e..465abeb173fbf 100644
--- a/packages/editor-ui/src/composables/__tests__/useExecutionHelpers.test.ts
+++ b/packages/editor-ui/src/composables/__tests__/useExecutionHelpers.test.ts
@@ -47,4 +47,25 @@ describe('useExecutionHelpers()', () => {
 			);
 		});
 	});
+
+	describe('isExecutionRetriable', () => {
+		const { isExecutionRetriable } = useExecutionHelpers();
+
+		it.each(['crashed', 'error'])('returns true when execution status is %s', (status) => {
+			expect(isExecutionRetriable({ status } as ExecutionSummary)).toEqual(true);
+		});
+
+		it.each(['canceled', 'new', 'running', 'success', 'unknown', 'waiting'])(
+			'returns false when execution status is %s',
+			(status) => {
+				expect(isExecutionRetriable({ status } as ExecutionSummary)).toEqual(false);
+			},
+		);
+
+		it('should return false if retrySuccessId is set', () => {
+			expect(
+				isExecutionRetriable({ status: 'crashed', retrySuccessId: '123' } as ExecutionSummary),
+			).toEqual(false);
+		});
+	});
 });
diff --git a/packages/editor-ui/src/composables/useExecutionHelpers.ts b/packages/editor-ui/src/composables/useExecutionHelpers.ts
index a00f5b639a1fa..9740f8dc06639 100644
--- a/packages/editor-ui/src/composables/useExecutionHelpers.ts
+++ b/packages/editor-ui/src/composables/useExecutionHelpers.ts
@@ -62,11 +62,7 @@ export function useExecutionHelpers() {
 	}
 
 	function isExecutionRetriable(execution: ExecutionSummary): boolean {
-		return (
-			['crashed', 'error'].includes(execution.status) &&
-			!execution.retryOf &&
-			!execution.retrySuccessId
-		);
+		return ['crashed', 'error'].includes(execution.status) && !execution.retrySuccessId;
 	}
 
 	return {

From aa0a470dceb696e53d5d9cba3098886f59c4f4dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Fri, 2 Aug 2024 16:52:49 +0200
Subject: [PATCH 068/168] refactor(core): Clean up event relays (no-changelog)
 (#10284)

---
 .../ExternalSecretsManager.ee.ts              |   2 +-
 packages/cli/src/InternalHooks.ts             |   4 +-
 packages/cli/src/Ldap/ldap.controller.ee.ts   |   2 +-
 packages/cli/src/Ldap/ldap.service.ee.ts      |   2 +-
 packages/cli/src/PublicApi/index.ts           |   2 +-
 .../credentials/credentials.service.ts        |   2 +-
 .../sourceControl/sourceControl.handler.ts    |   2 +-
 .../handlers/workflows/workflows.handler.ts   |   2 +-
 packages/cli/src/Server.ts                    |   6 +-
 .../email/UserManagementMailer.ts             |   2 +-
 .../cli/src/WorkflowExecuteAdditionalData.ts  |   2 +-
 packages/cli/src/WorkflowRunner.ts            |   2 +-
 packages/cli/src/auth/methods/email.ts        |   2 +-
 packages/cli/src/auth/methods/ldap.ts         |   2 +-
 packages/cli/src/commands/BaseCommand.ts      |   2 +-
 packages/cli/src/commands/start.ts            |   2 +-
 packages/cli/src/commands/worker.ts           |   4 +-
 .../concurrency-control.service.test.ts       |   2 +-
 .../concurrency-control.service.ts            |   2 +-
 .../cli/src/controllers/auth.controller.ts    |   2 +-
 .../communityPackages.controller.ts           |   2 +-
 .../src/controllers/invitation.controller.ts  |   2 +-
 packages/cli/src/controllers/me.controller.ts |   2 +-
 .../controllers/passwordReset.controller.ts   |   2 +-
 .../cli/src/controllers/project.controller.ts |   2 +-
 .../cli/src/controllers/users.controller.ts   |   2 +-
 .../src/credentials/credentials.controller.ts |   2 +-
 packages/cli/src/decorators/Redactable.ts     |   4 +-
 .../sourceControl.controller.ee.ts            |   2 +-
 .../sourceControl/sourceControl.service.ee.ts |   2 +-
 .../variables/variables.service.ee.ts         |   2 +-
 packages/cli/src/errors/redactable.error.ts   |   2 +-
 packages/cli/src/eventbus/event.service.ts    |   6 -
 .../log-streaming-event-relay.test.ts}        |  51 ++-
 packages/cli/src/events/event-relay.ts        |  20 +
 packages/cli/src/events/event.service.ts      |   6 +
 .../log-streaming-event-relay.ts}             | 217 +++++-----
 .../relay-event-map.ts}                       |  91 +++-
 .../telemetry-event-relay.ts}                 | 401 +++++++++---------
 .../executions/execution-recovery.service.ts  |   2 +-
 packages/cli/src/license/license.service.ts   |   2 +-
 packages/cli/src/services/user.service.ts     |   2 +-
 .../src/sso/saml/routes/saml.controller.ee.ts |   2 +-
 .../cli/src/workflows/workflow.service.ts     |   2 +-
 .../cli/src/workflows/workflows.controller.ts |   2 +-
 .../externalSecrets.api.test.ts               |   2 +-
 .../integration/commands/worker.cmd.test.ts   |   6 +-
 .../integration/shared/utils/testCommand.ts   |   2 +-
 .../test/unit/license/license.service.test.ts |   2 +-
 49 files changed, 490 insertions(+), 400 deletions(-)
 delete mode 100644 packages/cli/src/eventbus/event.service.ts
 rename packages/cli/src/{eventbus/__tests__/audit-event-relay.service.test.ts => events/__tests__/log-streaming-event-relay.test.ts} (91%)
 create mode 100644 packages/cli/src/events/event-relay.ts
 create mode 100644 packages/cli/src/events/event.service.ts
 rename packages/cli/src/{eventbus/audit-event-relay.service.ts => events/log-streaming-event-relay.ts} (51%)
 rename packages/cli/src/{eventbus/event.types.ts => events/relay-event-map.ts} (88%)
 rename packages/cli/src/{telemetry/telemetry-event-relay.service.ts => events/telemetry-event-relay.ts} (75%)

diff --git a/packages/cli/src/ExternalSecrets/ExternalSecretsManager.ee.ts b/packages/cli/src/ExternalSecrets/ExternalSecretsManager.ee.ts
index 03436f3d7acaf..2ae33be62aa9e 100644
--- a/packages/cli/src/ExternalSecrets/ExternalSecretsManager.ee.ts
+++ b/packages/cli/src/ExternalSecrets/ExternalSecretsManager.ee.ts
@@ -13,7 +13,7 @@ import { Logger } from '@/Logger';
 import { jsonParse, type IDataObject, ApplicationError } from 'n8n-workflow';
 import { EXTERNAL_SECRETS_INITIAL_BACKOFF, EXTERNAL_SECRETS_MAX_BACKOFF } from './constants';
 import { License } from '@/License';
-import { EventService } from '@/eventbus/event.service';
+import { EventService } from '@/events/event.service';
 import { updateIntervalTime } from './externalSecretsHelper.ee';
 import { ExternalSecretsProviders } from './ExternalSecretsProviders.ee';
 import { OrchestrationService } from '@/services/orchestration.service';
diff --git a/packages/cli/src/InternalHooks.ts b/packages/cli/src/InternalHooks.ts
index 46637106b7a47..af72d6bfece78 100644
--- a/packages/cli/src/InternalHooks.ts
+++ b/packages/cli/src/InternalHooks.ts
@@ -9,8 +9,8 @@ import { Telemetry } from '@/telemetry';
 import { MessageEventBus } from './eventbus/MessageEventBus/MessageEventBus';
 
 /**
- * @deprecated Do not add to this class. To add audit or telemetry events, use
- * `EventService` to emit the event and then use the `AuditEventRelay` or
+ * @deprecated Do not add to this class. To add log streaming or telemetry events, use
+ * `EventService` to emit the event and then use the `LogStreamingEventRelay` or
  * `TelemetryEventRelay` to forward them to the event bus or telemetry.
  */
 @Service()
diff --git a/packages/cli/src/Ldap/ldap.controller.ee.ts b/packages/cli/src/Ldap/ldap.controller.ee.ts
index 9bdbea39b2d99..7a56d8049d9ca 100644
--- a/packages/cli/src/Ldap/ldap.controller.ee.ts
+++ b/packages/cli/src/Ldap/ldap.controller.ee.ts
@@ -6,7 +6,7 @@ import { NON_SENSIBLE_LDAP_CONFIG_PROPERTIES } from './constants';
 import { getLdapSynchronizations } from './helpers.ee';
 import { LdapConfiguration } from './types';
 import { LdapService } from './ldap.service.ee';
-import { EventService } from '@/eventbus/event.service';
+import { EventService } from '@/events/event.service';
 
 @RestController('/ldap')
 export class LdapController {
diff --git a/packages/cli/src/Ldap/ldap.service.ee.ts b/packages/cli/src/Ldap/ldap.service.ee.ts
index 85c8c6c636ea6..32c3152fb5f47 100644
--- a/packages/cli/src/Ldap/ldap.service.ee.ts
+++ b/packages/cli/src/Ldap/ldap.service.ee.ts
@@ -44,7 +44,7 @@ import {
 	LDAP_LOGIN_ENABLED,
 	LDAP_LOGIN_LABEL,
 } from './constants';
-import { EventService } from '@/eventbus/event.service';
+import { EventService } from '@/events/event.service';
 
 @Service()
 export class LdapService {
diff --git a/packages/cli/src/PublicApi/index.ts b/packages/cli/src/PublicApi/index.ts
index d484a34e36941..af4fc97fc7907 100644
--- a/packages/cli/src/PublicApi/index.ts
+++ b/packages/cli/src/PublicApi/index.ts
@@ -15,7 +15,7 @@ import { UserRepository } from '@db/repositories/user.repository';
 import { UrlService } from '@/services/url.service';
 import type { AuthenticatedRequest } from '@/requests';
 import { GlobalConfig } from '@n8n/config';
-import { EventService } from '@/eventbus/event.service';
+import { EventService } from '@/events/event.service';
 
 async function createApiRouter(
 	version: string,
diff --git a/packages/cli/src/PublicApi/v1/handlers/credentials/credentials.service.ts b/packages/cli/src/PublicApi/v1/handlers/credentials/credentials.service.ts
index 668424530a516..2c4a35a6aa177 100644
--- a/packages/cli/src/PublicApi/v1/handlers/credentials/credentials.service.ts
+++ b/packages/cli/src/PublicApi/v1/handlers/credentials/credentials.service.ts
@@ -17,7 +17,7 @@ import { Container } from 'typedi';
 import { CredentialsRepository } from '@db/repositories/credentials.repository';
 import { SharedCredentialsRepository } from '@db/repositories/sharedCredentials.repository';
 import { ProjectRepository } from '@/databases/repositories/project.repository';
-import { EventService } from '@/eventbus/event.service';
+import { EventService } from '@/events/event.service';
 
 export async function getCredentials(credentialId: string): Promise<ICredentialsDb | null> {
 	return await Container.get(CredentialsRepository).findOneBy({ id: credentialId });
diff --git a/packages/cli/src/PublicApi/v1/handlers/sourceControl/sourceControl.handler.ts b/packages/cli/src/PublicApi/v1/handlers/sourceControl/sourceControl.handler.ts
index f54e8bd95d8e2..7a3cf08ec0eb5 100644
--- a/packages/cli/src/PublicApi/v1/handlers/sourceControl/sourceControl.handler.ts
+++ b/packages/cli/src/PublicApi/v1/handlers/sourceControl/sourceControl.handler.ts
@@ -10,7 +10,7 @@ import {
 	getTrackingInformationFromPullResult,
 	isSourceControlLicensed,
 } from '@/environments/sourceControl/sourceControlHelper.ee';
-import { EventService } from '@/eventbus/event.service';
+import { EventService } from '@/events/event.service';
 
 export = {
 	pull: [
diff --git a/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.handler.ts b/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.handler.ts
index 4063d0b611d35..16434ef4e9a1e 100644
--- a/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.handler.ts
+++ b/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.handler.ts
@@ -32,7 +32,7 @@ import { SharedWorkflowRepository } from '@/databases/repositories/sharedWorkflo
 import { TagRepository } from '@/databases/repositories/tag.repository';
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
 import { ProjectRepository } from '@/databases/repositories/project.repository';
-import { EventService } from '@/eventbus/event.service';
+import { EventService } from '@/events/event.service';
 import { z } from 'zod';
 import { EnterpriseWorkflowService } from '@/workflows/workflow.service.ee';
 
diff --git a/packages/cli/src/Server.ts b/packages/cli/src/Server.ts
index 4c9628bc1bf1d..0eb2040e7f1bb 100644
--- a/packages/cli/src/Server.ts
+++ b/packages/cli/src/Server.ts
@@ -35,7 +35,7 @@ import { MessageEventBus } from '@/eventbus/MessageEventBus/MessageEventBus';
 import { handleMfaDisable, isMfaFeatureEnabled } from '@/Mfa/helpers';
 import type { FrontendService } from '@/services/frontend.service';
 import { OrchestrationService } from '@/services/orchestration.service';
-import { AuditEventRelay } from './eventbus/audit-event-relay.service';
+import { LogStreamingEventRelay } from '@/events/log-streaming-event-relay';
 
 import '@/controllers/activeWorkflows.controller';
 import '@/controllers/auth.controller';
@@ -64,7 +64,7 @@ import '@/ExternalSecrets/ExternalSecrets.controller.ee';
 import '@/license/license.controller';
 import '@/workflows/workflowHistory/workflowHistory.controller.ee';
 import '@/workflows/workflows.controller';
-import { EventService } from './eventbus/event.service';
+import { EventService } from './events/event.service';
 
 const exec = promisify(callbackExec);
 
@@ -250,7 +250,7 @@ export class Server extends AbstractServer {
 		// ----------------------------------------
 		const eventBus = Container.get(MessageEventBus);
 		await eventBus.initialize();
-		Container.get(AuditEventRelay).init();
+		Container.get(LogStreamingEventRelay).init();
 
 		if (this.endpointPresetCredentials !== '') {
 			// POST endpoint to set preset credentials
diff --git a/packages/cli/src/UserManagement/email/UserManagementMailer.ts b/packages/cli/src/UserManagement/email/UserManagementMailer.ts
index 6d60c3b4907e1..1e092077b10de 100644
--- a/packages/cli/src/UserManagement/email/UserManagementMailer.ts
+++ b/packages/cli/src/UserManagement/email/UserManagementMailer.ts
@@ -16,7 +16,7 @@ import { toError } from '@/utils';
 
 import type { InviteEmailData, PasswordResetData, SendEmailResult } from './Interfaces';
 import { NodeMailer } from './NodeMailer';
-import { EventService } from '@/eventbus/event.service';
+import { EventService } from '@/events/event.service';
 
 type Template = HandlebarsTemplateDelegate<unknown>;
 type TemplateName = 'invite' | 'passwordReset' | 'workflowShared' | 'credentialsShared';
diff --git a/packages/cli/src/WorkflowExecuteAdditionalData.ts b/packages/cli/src/WorkflowExecuteAdditionalData.ts
index 9538ec91988fd..74c469284a7eb 100644
--- a/packages/cli/src/WorkflowExecuteAdditionalData.ts
+++ b/packages/cli/src/WorkflowExecuteAdditionalData.ts
@@ -70,7 +70,7 @@ import { WorkflowRepository } from './databases/repositories/workflow.repository
 import { UrlService } from './services/url.service';
 import { WorkflowExecutionService } from './workflows/workflowExecution.service';
 import { MessageEventBus } from '@/eventbus/MessageEventBus/MessageEventBus';
-import { EventService } from './eventbus/event.service';
+import { EventService } from './events/event.service';
 import { GlobalConfig } from '@n8n/config';
 import { SubworkflowPolicyChecker } from './subworkflows/subworkflow-policy-checker.service';
 
diff --git a/packages/cli/src/WorkflowRunner.ts b/packages/cli/src/WorkflowRunner.ts
index f51a44cc4d2a3..2f7976a073b30 100644
--- a/packages/cli/src/WorkflowRunner.ts
+++ b/packages/cli/src/WorkflowRunner.ts
@@ -36,7 +36,7 @@ import { generateFailedExecutionFromError } from '@/WorkflowHelpers';
 import { PermissionChecker } from '@/UserManagement/PermissionChecker';
 import { Logger } from '@/Logger';
 import { WorkflowStaticDataService } from '@/workflows/workflowStaticData.service';
-import { EventService } from './eventbus/event.service';
+import { EventService } from './events/event.service';
 
 @Service()
 export class WorkflowRunner {
diff --git a/packages/cli/src/auth/methods/email.ts b/packages/cli/src/auth/methods/email.ts
index a88d00186b06a..f954991974570 100644
--- a/packages/cli/src/auth/methods/email.ts
+++ b/packages/cli/src/auth/methods/email.ts
@@ -4,7 +4,7 @@ import { Container } from 'typedi';
 import { isLdapLoginEnabled } from '@/Ldap/helpers.ee';
 import { UserRepository } from '@db/repositories/user.repository';
 import { AuthError } from '@/errors/response-errors/auth.error';
-import { EventService } from '@/eventbus/event.service';
+import { EventService } from '@/events/event.service';
 
 export const handleEmailLogin = async (
 	email: string,
diff --git a/packages/cli/src/auth/methods/ldap.ts b/packages/cli/src/auth/methods/ldap.ts
index c8946aec9321e..c632557c95c85 100644
--- a/packages/cli/src/auth/methods/ldap.ts
+++ b/packages/cli/src/auth/methods/ldap.ts
@@ -12,7 +12,7 @@ import {
 	updateLdapUserOnLocalDb,
 } from '@/Ldap/helpers.ee';
 import type { User } from '@db/entities/User';
-import { EventService } from '@/eventbus/event.service';
+import { EventService } from '@/events/event.service';
 
 export const handleLdapLogin = async (
 	loginId: string,
diff --git a/packages/cli/src/commands/BaseCommand.ts b/packages/cli/src/commands/BaseCommand.ts
index 4cebc7fbb66f6..9828e6207b525 100644
--- a/packages/cli/src/commands/BaseCommand.ts
+++ b/packages/cli/src/commands/BaseCommand.ts
@@ -23,7 +23,7 @@ import { initExpressionEvaluator } from '@/ExpressionEvaluator';
 import { generateHostInstanceId } from '@db/utils/generators';
 import { WorkflowHistoryManager } from '@/workflows/workflowHistory/workflowHistoryManager.ee';
 import { ShutdownService } from '@/shutdown/Shutdown.service';
-import { TelemetryEventRelay } from '@/telemetry/telemetry-event-relay.service';
+import { TelemetryEventRelay } from '@/events/telemetry-event-relay';
 
 export abstract class BaseCommand extends Command {
 	protected logger = Container.get(Logger);
diff --git a/packages/cli/src/commands/start.ts b/packages/cli/src/commands/start.ts
index 63349ab6d1f0e..76d8b4c7e9273 100644
--- a/packages/cli/src/commands/start.ts
+++ b/packages/cli/src/commands/start.ts
@@ -33,7 +33,7 @@ import { ExecutionService } from '@/executions/execution.service';
 import { OwnershipService } from '@/services/ownership.service';
 import { WorkflowRunner } from '@/WorkflowRunner';
 import { ExecutionRecoveryService } from '@/executions/execution-recovery.service';
-import { EventService } from '@/eventbus/event.service';
+import { EventService } from '@/events/event.service';
 
 // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-var-requires
 const open = require('open');
diff --git a/packages/cli/src/commands/worker.ts b/packages/cli/src/commands/worker.ts
index 4f582904cddbb..cf4c23a0859a7 100644
--- a/packages/cli/src/commands/worker.ts
+++ b/packages/cli/src/commands/worker.ts
@@ -30,7 +30,7 @@ import type { WorkerJobStatusSummary } from '@/services/orchestration/worker/typ
 import { ServiceUnavailableError } from '@/errors/response-errors/service-unavailable.error';
 import { BaseCommand } from './BaseCommand';
 import { MaxStalledCountError } from '@/errors/max-stalled-count.error';
-import { AuditEventRelay } from '@/eventbus/audit-event-relay.service';
+import { LogStreamingEventRelay } from '@/events/log-streaming-event-relay';
 
 export class Worker extends BaseCommand {
 	static description = '\nStarts a n8n worker';
@@ -286,7 +286,7 @@ export class Worker extends BaseCommand {
 		await Container.get(MessageEventBus).initialize({
 			workerId: this.queueModeId,
 		});
-		Container.get(AuditEventRelay).init();
+		Container.get(LogStreamingEventRelay).init();
 	}
 
 	/**
diff --git a/packages/cli/src/concurrency/__tests__/concurrency-control.service.test.ts b/packages/cli/src/concurrency/__tests__/concurrency-control.service.test.ts
index c694ab29406a3..08f58ac600324 100644
--- a/packages/cli/src/concurrency/__tests__/concurrency-control.service.test.ts
+++ b/packages/cli/src/concurrency/__tests__/concurrency-control.service.test.ts
@@ -12,7 +12,7 @@ import type { WorkflowExecuteMode as ExecutionMode } from 'n8n-workflow';
 import type { ExecutionRepository } from '@/databases/repositories/execution.repository';
 import type { IExecutingWorkflowData } from '@/Interfaces';
 import type { Telemetry } from '@/telemetry';
-import type { EventService } from '@/eventbus/event.service';
+import type { EventService } from '@/events/event.service';
 
 describe('ConcurrencyControlService', () => {
 	const logger = mock<Logger>();
diff --git a/packages/cli/src/concurrency/concurrency-control.service.ts b/packages/cli/src/concurrency/concurrency-control.service.ts
index 50c73fa668b4e..6e62e9b78df54 100644
--- a/packages/cli/src/concurrency/concurrency-control.service.ts
+++ b/packages/cli/src/concurrency/concurrency-control.service.ts
@@ -8,7 +8,7 @@ import { ExecutionRepository } from '@/databases/repositories/execution.reposito
 import type { WorkflowExecuteMode as ExecutionMode } from 'n8n-workflow';
 import type { IExecutingWorkflowData } from '@/Interfaces';
 import { Telemetry } from '@/telemetry';
-import { EventService } from '@/eventbus/event.service';
+import { EventService } from '@/events/event.service';
 
 export const CLOUD_TEMP_PRODUCTION_LIMIT = 999;
 export const CLOUD_TEMP_REPORTABLE_THRESHOLDS = [5, 10, 20, 50, 100, 200];
diff --git a/packages/cli/src/controllers/auth.controller.ts b/packages/cli/src/controllers/auth.controller.ts
index 7711d95177e0f..e2a481fae9fe0 100644
--- a/packages/cli/src/controllers/auth.controller.ts
+++ b/packages/cli/src/controllers/auth.controller.ts
@@ -24,7 +24,7 @@ import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 import { ForbiddenError } from '@/errors/response-errors/forbidden.error';
 import { ApplicationError } from 'n8n-workflow';
 import { UserRepository } from '@/databases/repositories/user.repository';
-import { EventService } from '@/eventbus/event.service';
+import { EventService } from '@/events/event.service';
 
 @RestController()
 export class AuthController {
diff --git a/packages/cli/src/controllers/communityPackages.controller.ts b/packages/cli/src/controllers/communityPackages.controller.ts
index 1860e1df86652..e6323c728cb40 100644
--- a/packages/cli/src/controllers/communityPackages.controller.ts
+++ b/packages/cli/src/controllers/communityPackages.controller.ts
@@ -13,7 +13,7 @@ import { Push } from '@/push';
 import { CommunityPackagesService } from '@/services/communityPackages.service';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 import { InternalServerError } from '@/errors/response-errors/internal-server.error';
-import { EventService } from '@/eventbus/event.service';
+import { EventService } from '@/events/event.service';
 
 const {
 	PACKAGE_NOT_INSTALLED,
diff --git a/packages/cli/src/controllers/invitation.controller.ts b/packages/cli/src/controllers/invitation.controller.ts
index c32bf543002fd..edf3b5c151fcc 100644
--- a/packages/cli/src/controllers/invitation.controller.ts
+++ b/packages/cli/src/controllers/invitation.controller.ts
@@ -18,7 +18,7 @@ import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 import { ForbiddenError } from '@/errors/response-errors/forbidden.error';
 import { InternalHooks } from '@/InternalHooks';
 import { ExternalHooks } from '@/ExternalHooks';
-import { EventService } from '@/eventbus/event.service';
+import { EventService } from '@/events/event.service';
 
 @RestController('/invitations')
 export class InvitationController {
diff --git a/packages/cli/src/controllers/me.controller.ts b/packages/cli/src/controllers/me.controller.ts
index 3f9366b441260..39dfc93ab7406 100644
--- a/packages/cli/src/controllers/me.controller.ts
+++ b/packages/cli/src/controllers/me.controller.ts
@@ -23,7 +23,7 @@ import { InternalHooks } from '@/InternalHooks';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 import { UserRepository } from '@/databases/repositories/user.repository';
 import { isApiEnabled } from '@/PublicApi';
-import { EventService } from '@/eventbus/event.service';
+import { EventService } from '@/events/event.service';
 
 export const API_KEY_PREFIX = 'n8n_api_';
 
diff --git a/packages/cli/src/controllers/passwordReset.controller.ts b/packages/cli/src/controllers/passwordReset.controller.ts
index e17a0f15efe63..84d3b40124ad8 100644
--- a/packages/cli/src/controllers/passwordReset.controller.ts
+++ b/packages/cli/src/controllers/passwordReset.controller.ts
@@ -21,7 +21,7 @@ import { ForbiddenError } from '@/errors/response-errors/forbidden.error';
 import { NotFoundError } from '@/errors/response-errors/not-found.error';
 import { UnprocessableRequestError } from '@/errors/response-errors/unprocessable.error';
 import { UserRepository } from '@/databases/repositories/user.repository';
-import { EventService } from '@/eventbus/event.service';
+import { EventService } from '@/events/event.service';
 
 @RestController()
 export class PasswordResetController {
diff --git a/packages/cli/src/controllers/project.controller.ts b/packages/cli/src/controllers/project.controller.ts
index 848ba4b84c6eb..e93b919ecb8e3 100644
--- a/packages/cli/src/controllers/project.controller.ts
+++ b/packages/cli/src/controllers/project.controller.ts
@@ -23,7 +23,7 @@ import { ProjectRepository } from '@/databases/repositories/project.repository';
 // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
 import { In, Not } from '@n8n/typeorm';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
-import { EventService } from '@/eventbus/event.service';
+import { EventService } from '@/events/event.service';
 
 @RestController('/projects')
 export class ProjectController {
diff --git a/packages/cli/src/controllers/users.controller.ts b/packages/cli/src/controllers/users.controller.ts
index f0815aa54d405..aee2fd28c2a27 100644
--- a/packages/cli/src/controllers/users.controller.ts
+++ b/packages/cli/src/controllers/users.controller.ts
@@ -28,7 +28,7 @@ import { Project } from '@/databases/entities/Project';
 import { WorkflowService } from '@/workflows/workflow.service';
 import { CredentialsService } from '@/credentials/credentials.service';
 import { ProjectService } from '@/services/project.service';
-import { EventService } from '@/eventbus/event.service';
+import { EventService } from '@/events/event.service';
 
 @RestController('/users')
 export class UsersController {
diff --git a/packages/cli/src/credentials/credentials.controller.ts b/packages/cli/src/credentials/credentials.controller.ts
index 1587fbd1ca426..9ac57bb2e3af3 100644
--- a/packages/cli/src/credentials/credentials.controller.ts
+++ b/packages/cli/src/credentials/credentials.controller.ts
@@ -30,7 +30,7 @@ import { SharedCredentialsRepository } from '@/databases/repositories/sharedCred
 import { SharedCredentials } from '@/databases/entities/SharedCredentials';
 import { ProjectRelationRepository } from '@/databases/repositories/projectRelation.repository';
 import { z } from 'zod';
-import { EventService } from '@/eventbus/event.service';
+import { EventService } from '@/events/event.service';
 
 @RestController('/credentials')
 export class CredentialsController {
diff --git a/packages/cli/src/decorators/Redactable.ts b/packages/cli/src/decorators/Redactable.ts
index e5debeb7a1507..51d02c5c3d6fc 100644
--- a/packages/cli/src/decorators/Redactable.ts
+++ b/packages/cli/src/decorators/Redactable.ts
@@ -1,5 +1,5 @@
 import { RedactableError } from '@/errors/redactable.error';
-import type { UserLike } from '@/eventbus/event.types';
+import type { UserLike } from '@/events/relay-event-map';
 
 function toRedactable(userLike: UserLike) {
 	return {
@@ -14,7 +14,7 @@ function toRedactable(userLike: UserLike) {
 type FieldName = 'user' | 'inviter' | 'invitee';
 
 /**
- * Mark redactable properties in a `{ user: UserLike }` field in an `AuditEventRelay`
+ * Mark redactable properties in a `{ user: UserLike }` field in an `LogStreamingEventRelay`
  * method arg. These properties will be later redacted by the log streaming
  * destination based on user prefs. Only for `n8n.audit.*` logs.
  *
diff --git a/packages/cli/src/environments/sourceControl/sourceControl.controller.ee.ts b/packages/cli/src/environments/sourceControl/sourceControl.controller.ee.ts
index 0a1db892f60c9..f92b0bfb1f02f 100644
--- a/packages/cli/src/environments/sourceControl/sourceControl.controller.ee.ts
+++ b/packages/cli/src/environments/sourceControl/sourceControl.controller.ee.ts
@@ -12,7 +12,7 @@ import type { SourceControlPreferences } from './types/sourceControlPreferences'
 import type { SourceControlledFile } from './types/sourceControlledFile';
 import { SOURCE_CONTROL_DEFAULT_BRANCH } from './constants';
 import type { ImportResult } from './types/importResult';
-import { EventService } from '@/eventbus/event.service';
+import { EventService } from '@/events/event.service';
 import { getRepoType } from './sourceControlHelper.ee';
 import { SourceControlGetStatus } from './types/sourceControlGetStatus';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
diff --git a/packages/cli/src/environments/sourceControl/sourceControl.service.ee.ts b/packages/cli/src/environments/sourceControl/sourceControl.service.ee.ts
index ac226a1b2eacc..0c9279ffbe7a3 100644
--- a/packages/cli/src/environments/sourceControl/sourceControl.service.ee.ts
+++ b/packages/cli/src/environments/sourceControl/sourceControl.service.ee.ts
@@ -30,7 +30,7 @@ import type { TagEntity } from '@db/entities/TagEntity';
 import type { Variables } from '@db/entities/Variables';
 import type { SourceControlWorkflowVersionId } from './types/sourceControlWorkflowVersionId';
 import type { ExportableCredential } from './types/exportableCredential';
-import { EventService } from '@/eventbus/event.service';
+import { EventService } from '@/events/event.service';
 import { TagRepository } from '@db/repositories/tag.repository';
 import { Logger } from '@/Logger';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
diff --git a/packages/cli/src/environments/variables/variables.service.ee.ts b/packages/cli/src/environments/variables/variables.service.ee.ts
index 94233da065839..78a3d23fbe55d 100644
--- a/packages/cli/src/environments/variables/variables.service.ee.ts
+++ b/packages/cli/src/environments/variables/variables.service.ee.ts
@@ -6,7 +6,7 @@ import { CacheService } from '@/services/cache/cache.service';
 import { VariablesRepository } from '@db/repositories/variables.repository';
 import { VariableCountLimitReachedError } from '@/errors/variable-count-limit-reached.error';
 import { VariableValidationError } from '@/errors/variable-validation.error';
-import { EventService } from '@/eventbus/event.service';
+import { EventService } from '@/events/event.service';
 
 @Service()
 export class VariablesService {
diff --git a/packages/cli/src/errors/redactable.error.ts b/packages/cli/src/errors/redactable.error.ts
index 0f6697a0652d6..0d5b07ac504fb 100644
--- a/packages/cli/src/errors/redactable.error.ts
+++ b/packages/cli/src/errors/redactable.error.ts
@@ -3,7 +3,7 @@ import { ApplicationError } from 'n8n-workflow';
 export class RedactableError extends ApplicationError {
 	constructor(fieldName: string, args: string) {
 		super(
-			`Failed to find "${fieldName}" property in argument "${args.toString()}". Please set the decorator \`@Redactable()\` only on \`AuditEventRelay\` methods where the argument contains a "${fieldName}" property.`,
+			`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/eventbus/event.service.ts b/packages/cli/src/eventbus/event.service.ts
deleted file mode 100644
index 2b16ff06ab40c..0000000000000
--- a/packages/cli/src/eventbus/event.service.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { Service } from 'typedi';
-import { TypedEmitter } from '@/TypedEmitter';
-import type { Event } from './event.types';
-
-@Service()
-export class EventService extends TypedEmitter<Event> {}
diff --git a/packages/cli/src/eventbus/__tests__/audit-event-relay.service.test.ts b/packages/cli/src/events/__tests__/log-streaming-event-relay.test.ts
similarity index 91%
rename from packages/cli/src/eventbus/__tests__/audit-event-relay.service.test.ts
rename to packages/cli/src/events/__tests__/log-streaming-event-relay.test.ts
index 44277f1de4d0d..4084bebeb228f 100644
--- a/packages/cli/src/eventbus/__tests__/audit-event-relay.service.test.ts
+++ b/packages/cli/src/events/__tests__/log-streaming-event-relay.test.ts
@@ -1,16 +1,15 @@
 import { mock } from 'jest-mock-extended';
-import { AuditEventRelay } from '../audit-event-relay.service';
-import type { MessageEventBus } from '../MessageEventBus/MessageEventBus';
-import type { Event } from '../event.types';
-import { EventService } from '../event.service';
+import { LogStreamingEventRelay } from '@/events/log-streaming-event-relay';
+import { EventService } from '@/events/event.service';
 import type { INode, IRun, IWorkflowBase } from 'n8n-workflow';
 import type { IWorkflowDb } from '@/Interfaces';
+import type { MessageEventBus } from '@/eventbus/MessageEventBus/MessageEventBus';
+import type { RelayEventMap } from '@/events/relay-event-map';
 
-describe('AuditEventRelay', () => {
+describe('LogStreamingEventRelay', () => {
 	const eventBus = mock<MessageEventBus>();
 	const eventService = new EventService();
-	const auditor = new AuditEventRelay(eventService, eventBus);
-	auditor.init();
+	new LogStreamingEventRelay(eventService, eventBus).init();
 
 	afterEach(() => {
 		jest.clearAllMocks();
@@ -18,7 +17,7 @@ describe('AuditEventRelay', () => {
 
 	describe('workflow events', () => {
 		it('should log on `workflow-created` event', () => {
-			const event: Event['workflow-created'] = {
+			const event: RelayEventMap['workflow-created'] = {
 				user: {
 					id: '123',
 					email: 'john@n8n.io',
@@ -52,7 +51,7 @@ describe('AuditEventRelay', () => {
 		});
 
 		it('should log on `workflow-deleted` event', () => {
-			const event: Event['workflow-deleted'] = {
+			const event: RelayEventMap['workflow-deleted'] = {
 				user: {
 					id: '456',
 					email: 'jane@n8n.io',
@@ -80,7 +79,7 @@ describe('AuditEventRelay', () => {
 		});
 
 		it('should log on `workflow-saved` event', () => {
-			const event: Event['workflow-saved'] = {
+			const event: RelayEventMap['workflow-saved'] = {
 				user: {
 					id: '789',
 					email: 'alex@n8n.io',
@@ -119,7 +118,7 @@ describe('AuditEventRelay', () => {
 				settings: {},
 			});
 
-			const event: Event['workflow-pre-execute'] = {
+			const event: RelayEventMap['workflow-pre-execute'] = {
 				executionId: 'exec123',
 				data: workflow,
 			};
@@ -139,7 +138,7 @@ describe('AuditEventRelay', () => {
 		});
 
 		it('should log on `workflow-post-execute` for successful execution', () => {
-			const payload = mock<Event['workflow-post-execute']>({
+			const payload = mock<RelayEventMap['workflow-post-execute']>({
 				executionId: 'some-id',
 				userId: 'some-id',
 				workflow: mock<IWorkflowBase>({ id: 'some-id', name: 'some-name' }),
@@ -208,7 +207,7 @@ describe('AuditEventRelay', () => {
 
 	describe('user events', () => {
 		it('should log on `user-updated` event', () => {
-			const event: Event['user-updated'] = {
+			const event: RelayEventMap['user-updated'] = {
 				user: {
 					id: 'user456',
 					email: 'updated@example.com',
@@ -235,7 +234,7 @@ describe('AuditEventRelay', () => {
 		});
 
 		it('should log on `user-deleted` event', () => {
-			const event: Event['user-deleted'] = {
+			const event: RelayEventMap['user-deleted'] = {
 				user: {
 					id: '123',
 					email: 'john@n8n.io',
@@ -262,7 +261,7 @@ describe('AuditEventRelay', () => {
 
 	describe('click events', () => {
 		it('should log on `user-password-reset-request-click` event', () => {
-			const event: Event['user-password-reset-request-click'] = {
+			const event: RelayEventMap['user-password-reset-request-click'] = {
 				user: {
 					id: 'user101',
 					email: 'user101@example.com',
@@ -287,7 +286,7 @@ describe('AuditEventRelay', () => {
 		});
 
 		it('should log on `user-invite-email-click` event', () => {
-			const event: Event['user-invite-email-click'] = {
+			const event: RelayEventMap['user-invite-email-click'] = {
 				inviter: {
 					id: '123',
 					email: 'john@n8n.io',
@@ -354,7 +353,7 @@ describe('AuditEventRelay', () => {
 				settings: {},
 			});
 
-			const event: Event['node-pre-execute'] = {
+			const event: RelayEventMap['node-pre-execute'] = {
 				executionId: 'exec456',
 				nodeName: 'HTTP Request',
 				workflow,
@@ -399,7 +398,7 @@ describe('AuditEventRelay', () => {
 				settings: {},
 			});
 
-			const event: Event['node-post-execute'] = {
+			const event: RelayEventMap['node-post-execute'] = {
 				executionId: 'exec789',
 				nodeName: 'HTTP Response',
 				workflow,
@@ -422,7 +421,7 @@ describe('AuditEventRelay', () => {
 
 	describe('credentials events', () => {
 		it('should log on `credentials-shared` event', () => {
-			const event: Event['credentials-shared'] = {
+			const event: RelayEventMap['credentials-shared'] = {
 				user: {
 					id: 'user123',
 					email: 'sharer@example.com',
@@ -457,7 +456,7 @@ describe('AuditEventRelay', () => {
 		});
 
 		it('should log on `credentials-created` event', () => {
-			const event: Event['credentials-created'] = {
+			const event: RelayEventMap['credentials-created'] = {
 				user: {
 					id: 'user123',
 					email: 'user@example.com',
@@ -494,7 +493,7 @@ describe('AuditEventRelay', () => {
 
 	describe('auth events', () => {
 		it('should log on `user-login-failed` event', () => {
-			const event: Event['user-login-failed'] = {
+			const event: RelayEventMap['user-login-failed'] = {
 				userEmail: 'user@example.com',
 				authenticationMethod: 'email',
 				reason: 'Invalid password',
@@ -515,7 +514,7 @@ describe('AuditEventRelay', () => {
 
 	describe('community package events', () => {
 		it('should log on `community-package-updated` event', () => {
-			const event: Event['community-package-updated'] = {
+			const event: RelayEventMap['community-package-updated'] = {
 				user: {
 					id: 'user202',
 					email: 'packageupdater@example.com',
@@ -552,7 +551,7 @@ describe('AuditEventRelay', () => {
 		});
 
 		it('should log on `community-package-installed` event', () => {
-			const event: Event['community-package-installed'] = {
+			const event: RelayEventMap['community-package-installed'] = {
 				user: {
 					id: 'user789',
 					email: 'admin@example.com',
@@ -593,7 +592,7 @@ describe('AuditEventRelay', () => {
 
 	describe('email events', () => {
 		it('should log on `email-failed` event', () => {
-			const event: Event['email-failed'] = {
+			const event: RelayEventMap['email-failed'] = {
 				user: {
 					id: 'user789',
 					email: 'recipient@example.com',
@@ -622,7 +621,7 @@ describe('AuditEventRelay', () => {
 
 	describe('public API events', () => {
 		it('should log on `public-api-key-created` event', () => {
-			const event: Event['public-api-key-created'] = {
+			const event: RelayEventMap['public-api-key-created'] = {
 				user: {
 					id: 'user101',
 					email: 'apiuser@example.com',
@@ -650,7 +649,7 @@ describe('AuditEventRelay', () => {
 
 	describe('execution events', () => {
 		it('should log on `execution-throttled` event', () => {
-			const event: Event['execution-throttled'] = {
+			const event: RelayEventMap['execution-throttled'] = {
 				executionId: 'exec123456',
 			};
 
diff --git a/packages/cli/src/events/event-relay.ts b/packages/cli/src/events/event-relay.ts
new file mode 100644
index 0000000000000..1a8a17b8930f2
--- /dev/null
+++ b/packages/cli/src/events/event-relay.ts
@@ -0,0 +1,20 @@
+import { EventService } from './event.service';
+import { Service } from 'typedi';
+import type { RelayEventMap } from '@/events/relay-event-map';
+
+@Service()
+export class EventRelay {
+	constructor(readonly eventService: EventService) {}
+
+	protected setupListeners<EventNames extends keyof RelayEventMap>(map: {
+		[EventName in EventNames]?: (event: RelayEventMap[EventName]) => void | Promise<void>;
+	}) {
+		for (const [eventName, handler] of Object.entries(map) as Array<
+			[EventNames, (event: RelayEventMap[EventNames]) => void | Promise<void>]
+		>) {
+			this.eventService.on(eventName, async (event) => {
+				await handler(event);
+			});
+		}
+	}
+}
diff --git a/packages/cli/src/events/event.service.ts b/packages/cli/src/events/event.service.ts
new file mode 100644
index 0000000000000..6744103a07799
--- /dev/null
+++ b/packages/cli/src/events/event.service.ts
@@ -0,0 +1,6 @@
+import { Service } from 'typedi';
+import { TypedEmitter } from '@/TypedEmitter';
+import type { RelayEventMap } from './relay-event-map';
+
+@Service()
+export class EventService extends TypedEmitter<RelayEventMap> {}
diff --git a/packages/cli/src/eventbus/audit-event-relay.service.ts b/packages/cli/src/events/log-streaming-event-relay.ts
similarity index 51%
rename from packages/cli/src/eventbus/audit-event-relay.service.ts
rename to packages/cli/src/events/log-streaming-event-relay.ts
index dcefeac0bd317..85d5a8cb8fb3c 100644
--- a/packages/cli/src/eventbus/audit-event-relay.service.ts
+++ b/packages/cli/src/events/log-streaming-event-relay.ts
@@ -1,72 +1,58 @@
 import { Service } from 'typedi';
-import { MessageEventBus } from './MessageEventBus/MessageEventBus';
+import { MessageEventBus } from '@/eventbus/MessageEventBus/MessageEventBus';
 import { Redactable } from '@/decorators/Redactable';
-import { EventService } from './event.service';
-import type { Event } from './event.types';
+import { EventRelay } from '@/events/event-relay';
+import type { RelayEventMap } from '@/events/relay-event-map';
 import type { IWorkflowBase } from 'n8n-workflow';
+import { EventService } from './event.service';
 
 @Service()
-export class AuditEventRelay {
+export class LogStreamingEventRelay extends EventRelay {
 	constructor(
-		private readonly eventService: EventService,
+		readonly eventService: EventService,
 		private readonly eventBus: MessageEventBus,
-	) {}
-
-	init() {
-		this.setupHandlers();
+	) {
+		super(eventService);
 	}
 
-	private setupHandlers() {
-		this.eventService.on('workflow-created', (event) => this.workflowCreated(event));
-		this.eventService.on('workflow-deleted', (event) => this.workflowDeleted(event));
-		this.eventService.on('workflow-saved', (event) => this.workflowSaved(event));
-		this.eventService.on('workflow-pre-execute', (event) => this.workflowPreExecute(event));
-		this.eventService.on('workflow-post-execute', (event) => this.workflowPostExecute(event));
-		this.eventService.on('node-pre-execute', (event) => this.nodePreExecute(event));
-		this.eventService.on('node-post-execute', (event) => this.nodePostExecute(event));
-		this.eventService.on('user-deleted', (event) => this.userDeleted(event));
-		this.eventService.on('user-invited', (event) => this.userInvited(event));
-		this.eventService.on('user-reinvited', (event) => this.userReinvited(event));
-		this.eventService.on('user-updated', (event) => this.userUpdated(event));
-		this.eventService.on('user-signed-up', (event) => this.userSignedUp(event));
-		this.eventService.on('user-logged-in', (event) => this.userLoggedIn(event));
-		this.eventService.on('user-login-failed', (event) => this.userLoginFailed(event));
-		this.eventService.on('user-invite-email-click', (event) => this.userInviteEmailClick(event));
-		this.eventService.on('user-password-reset-email-click', (event) =>
-			this.userPasswordResetEmailClick(event),
-		);
-		this.eventService.on('user-password-reset-request-click', (event) =>
-			this.userPasswordResetRequestClick(event),
-		);
-		this.eventService.on('public-api-key-created', (event) => this.publicApiKeyCreated(event));
-		this.eventService.on('public-api-key-deleted', (event) => this.publicApiKeyDeleted(event));
-		this.eventService.on('email-failed', (event) => this.emailFailed(event));
-		this.eventService.on('credentials-created', (event) => this.credentialsCreated(event));
-		this.eventService.on('credentials-deleted', (event) => this.credentialsDeleted(event));
-		this.eventService.on('credentials-shared', (event) => this.credentialsShared(event));
-		this.eventService.on('credentials-updated', (event) => this.credentialsUpdated(event));
-		this.eventService.on('credentials-deleted', (event) => this.credentialsDeleted(event));
-		this.eventService.on('community-package-installed', (event) =>
-			this.communityPackageInstalled(event),
-		);
-		this.eventService.on('community-package-updated', (event) =>
-			this.communityPackageUpdated(event),
-		);
-		this.eventService.on('community-package-deleted', (event) =>
-			this.communityPackageDeleted(event),
-		);
-		this.eventService.on('execution-throttled', (event) => this.executionThrottled(event));
-		this.eventService.on('execution-started-during-bootup', (event) =>
-			this.executionStartedDuringBootup(event),
-		);
+	init() {
+		this.setupListeners({
+			'workflow-created': (event) => this.workflowCreated(event),
+			'workflow-deleted': (event) => this.workflowDeleted(event),
+			'workflow-saved': (event) => this.workflowSaved(event),
+			'workflow-pre-execute': (event) => this.workflowPreExecute(event),
+			'workflow-post-execute': (event) => this.workflowPostExecute(event),
+			'node-pre-execute': (event) => this.nodePreExecute(event),
+			'node-post-execute': (event) => this.nodePostExecute(event),
+			'user-deleted': (event) => this.userDeleted(event),
+			'user-invited': (event) => this.userInvited(event),
+			'user-reinvited': (event) => this.userReinvited(event),
+			'user-updated': (event) => this.userUpdated(event),
+			'user-signed-up': (event) => this.userSignedUp(event),
+			'user-logged-in': (event) => this.userLoggedIn(event),
+			'user-login-failed': (event) => this.userLoginFailed(event),
+			'user-invite-email-click': (event) => this.userInviteEmailClick(event),
+			'user-password-reset-email-click': (event) => this.userPasswordResetEmailClick(event),
+			'user-password-reset-request-click': (event) => this.userPasswordResetRequestClick(event),
+			'public-api-key-created': (event) => this.publicApiKeyCreated(event),
+			'public-api-key-deleted': (event) => this.publicApiKeyDeleted(event),
+			'email-failed': (event) => this.emailFailed(event),
+			'credentials-created': (event) => this.credentialsCreated(event),
+			'credentials-deleted': (event) => this.credentialsDeleted(event),
+			'credentials-shared': (event) => this.credentialsShared(event),
+			'credentials-updated': (event) => this.credentialsUpdated(event),
+			'community-package-installed': (event) => this.communityPackageInstalled(event),
+			'community-package-updated': (event) => this.communityPackageUpdated(event),
+			'community-package-deleted': (event) => this.communityPackageDeleted(event),
+			'execution-throttled': (event) => this.executionThrottled(event),
+			'execution-started-during-bootup': (event) => this.executionStartedDuringBootup(event),
+		});
 	}
 
-	/**
-	 * Workflow
-	 */
+	// #region Workflow
 
 	@Redactable()
-	private workflowCreated({ user, workflow }: Event['workflow-created']) {
+	private workflowCreated({ user, workflow }: RelayEventMap['workflow-created']) {
 		void this.eventBus.sendAuditEvent({
 			eventName: 'n8n.audit.workflow.created',
 			payload: {
@@ -78,7 +64,7 @@ export class AuditEventRelay {
 	}
 
 	@Redactable()
-	private workflowDeleted({ user, workflowId }: Event['workflow-deleted']) {
+	private workflowDeleted({ user, workflowId }: RelayEventMap['workflow-deleted']) {
 		void this.eventBus.sendAuditEvent({
 			eventName: 'n8n.audit.workflow.deleted',
 			payload: { ...user, workflowId },
@@ -86,7 +72,7 @@ export class AuditEventRelay {
 	}
 
 	@Redactable()
-	private workflowSaved({ user, workflow }: Event['workflow-saved']) {
+	private workflowSaved({ user, workflow }: RelayEventMap['workflow-saved']) {
 		void this.eventBus.sendAuditEvent({
 			eventName: 'n8n.audit.workflow.updated',
 			payload: {
@@ -97,7 +83,7 @@ export class AuditEventRelay {
 		});
 	}
 
-	private workflowPreExecute({ data, executionId }: Event['workflow-pre-execute']) {
+	private workflowPreExecute({ data, executionId }: RelayEventMap['workflow-pre-execute']) {
 		const payload =
 			'executionData' in data
 				? {
@@ -121,7 +107,7 @@ export class AuditEventRelay {
 		});
 	}
 
-	private workflowPostExecute(event: Event['workflow-post-execute']) {
+	private workflowPostExecute(event: RelayEventMap['workflow-post-execute']) {
 		const { runData, workflow, ...rest } = event;
 
 		const payload = {
@@ -155,11 +141,11 @@ export class AuditEventRelay {
 		});
 	}
 
-	/**
-	 * Node
-	 */
+	// #endregion
 
-	private nodePreExecute({ workflow, executionId, nodeName }: Event['node-pre-execute']) {
+	// #region Node
+
+	private nodePreExecute({ workflow, executionId, nodeName }: RelayEventMap['node-pre-execute']) {
 		void this.eventBus.sendNodeEvent({
 			eventName: 'n8n.node.started',
 			payload: {
@@ -172,7 +158,7 @@ export class AuditEventRelay {
 		});
 	}
 
-	private nodePostExecute({ workflow, executionId, nodeName }: Event['node-post-execute']) {
+	private nodePostExecute({ workflow, executionId, nodeName }: RelayEventMap['node-post-execute']) {
 		void this.eventBus.sendNodeEvent({
 			eventName: 'n8n.node.finished',
 			payload: {
@@ -185,12 +171,12 @@ export class AuditEventRelay {
 		});
 	}
 
-	/**
-	 * User
-	 */
+	// #endregion
+
+	// #region User
 
 	@Redactable()
-	private userDeleted({ user }: Event['user-deleted']) {
+	private userDeleted({ user }: RelayEventMap['user-deleted']) {
 		void this.eventBus.sendAuditEvent({
 			eventName: 'n8n.audit.user.deleted',
 			payload: user,
@@ -198,7 +184,7 @@ export class AuditEventRelay {
 	}
 
 	@Redactable()
-	private userInvited({ user, targetUserId }: Event['user-invited']) {
+	private userInvited({ user, targetUserId }: RelayEventMap['user-invited']) {
 		void this.eventBus.sendAuditEvent({
 			eventName: 'n8n.audit.user.invited',
 			payload: { ...user, targetUserId },
@@ -206,7 +192,7 @@ export class AuditEventRelay {
 	}
 
 	@Redactable()
-	private userReinvited({ user, targetUserId }: Event['user-reinvited']) {
+	private userReinvited({ user, targetUserId }: RelayEventMap['user-reinvited']) {
 		void this.eventBus.sendAuditEvent({
 			eventName: 'n8n.audit.user.reinvited',
 			payload: { ...user, targetUserId },
@@ -214,19 +200,19 @@ export class AuditEventRelay {
 	}
 
 	@Redactable()
-	private userUpdated({ user, fieldsChanged }: Event['user-updated']) {
+	private userUpdated({ user, fieldsChanged }: RelayEventMap['user-updated']) {
 		void this.eventBus.sendAuditEvent({
 			eventName: 'n8n.audit.user.updated',
 			payload: { ...user, fieldsChanged },
 		});
 	}
 
-	/**
-	 * Auth
-	 */
+	// #endregion
+
+	// #region Auth
 
 	@Redactable()
-	private userSignedUp({ user }: Event['user-signed-up']) {
+	private userSignedUp({ user }: RelayEventMap['user-signed-up']) {
 		void this.eventBus.sendAuditEvent({
 			eventName: 'n8n.audit.user.signedup',
 			payload: user,
@@ -234,7 +220,7 @@ export class AuditEventRelay {
 	}
 
 	@Redactable()
-	private userLoggedIn({ user, authenticationMethod }: Event['user-logged-in']) {
+	private userLoggedIn({ user, authenticationMethod }: RelayEventMap['user-logged-in']) {
 		void this.eventBus.sendAuditEvent({
 			eventName: 'n8n.audit.user.login.success',
 			payload: { ...user, authenticationMethod },
@@ -242,7 +228,7 @@ export class AuditEventRelay {
 	}
 
 	private userLoginFailed(
-		event: Event['user-login-failed'] /* exception: no `UserLike` to redact */,
+		event: RelayEventMap['user-login-failed'] /* exception: no `UserLike` to redact */,
 	) {
 		void this.eventBus.sendAuditEvent({
 			eventName: 'n8n.audit.user.login.failed',
@@ -250,13 +236,13 @@ export class AuditEventRelay {
 		});
 	}
 
-	/**
-	 * Click
-	 */
+	// #endregion
+
+	// #region Click
 
 	@Redactable('inviter')
 	@Redactable('invitee')
-	private userInviteEmailClick(event: Event['user-invite-email-click']) {
+	private userInviteEmailClick(event: RelayEventMap['user-invite-email-click']) {
 		void this.eventBus.sendAuditEvent({
 			eventName: 'n8n.audit.user.invitation.accepted',
 			payload: event,
@@ -264,7 +250,7 @@ export class AuditEventRelay {
 	}
 
 	@Redactable()
-	private userPasswordResetEmailClick({ user }: Event['user-password-reset-email-click']) {
+	private userPasswordResetEmailClick({ user }: RelayEventMap['user-password-reset-email-click']) {
 		void this.eventBus.sendAuditEvent({
 			eventName: 'n8n.audit.user.reset',
 			payload: user,
@@ -272,19 +258,21 @@ export class AuditEventRelay {
 	}
 
 	@Redactable()
-	private userPasswordResetRequestClick({ user }: Event['user-password-reset-request-click']) {
+	private userPasswordResetRequestClick({
+		user,
+	}: RelayEventMap['user-password-reset-request-click']) {
 		void this.eventBus.sendAuditEvent({
 			eventName: 'n8n.audit.user.reset.requested',
 			payload: user,
 		});
 	}
 
-	/**
-	 * Public API
-	 */
+	// #endregion
+
+	// #region Public API
 
 	@Redactable()
-	private publicApiKeyCreated({ user }: Event['public-api-key-created']) {
+	private publicApiKeyCreated({ user }: RelayEventMap['public-api-key-created']) {
 		void this.eventBus.sendAuditEvent({
 			eventName: 'n8n.audit.user.api.created',
 			payload: user,
@@ -292,31 +280,31 @@ export class AuditEventRelay {
 	}
 
 	@Redactable()
-	private publicApiKeyDeleted({ user }: Event['public-api-key-deleted']) {
+	private publicApiKeyDeleted({ user }: RelayEventMap['public-api-key-deleted']) {
 		void this.eventBus.sendAuditEvent({
 			eventName: 'n8n.audit.user.api.deleted',
 			payload: user,
 		});
 	}
 
-	/**
-	 * Emailing
-	 */
+	// #endregion
+
+	// #region Email
 
 	@Redactable()
-	private emailFailed({ user, messageType }: Event['email-failed']) {
+	private emailFailed({ user, messageType }: RelayEventMap['email-failed']) {
 		void this.eventBus.sendAuditEvent({
 			eventName: 'n8n.audit.user.email.failed',
 			payload: { ...user, messageType },
 		});
 	}
 
-	/**
-	 * Credentials
-	 */
+	// #endregion
+
+	// #region Credentials
 
 	@Redactable()
-	private credentialsCreated({ user, ...rest }: Event['credentials-created']) {
+	private credentialsCreated({ user, ...rest }: RelayEventMap['credentials-created']) {
 		void this.eventBus.sendAuditEvent({
 			eventName: 'n8n.audit.user.credentials.created',
 			payload: { ...user, ...rest },
@@ -324,7 +312,7 @@ export class AuditEventRelay {
 	}
 
 	@Redactable()
-	private credentialsDeleted({ user, ...rest }: Event['credentials-deleted']) {
+	private credentialsDeleted({ user, ...rest }: RelayEventMap['credentials-deleted']) {
 		void this.eventBus.sendAuditEvent({
 			eventName: 'n8n.audit.user.credentials.deleted',
 			payload: { ...user, ...rest },
@@ -332,7 +320,7 @@ export class AuditEventRelay {
 	}
 
 	@Redactable()
-	private credentialsShared({ user, ...rest }: Event['credentials-shared']) {
+	private credentialsShared({ user, ...rest }: RelayEventMap['credentials-shared']) {
 		void this.eventBus.sendAuditEvent({
 			eventName: 'n8n.audit.user.credentials.shared',
 			payload: { ...user, ...rest },
@@ -340,19 +328,22 @@ export class AuditEventRelay {
 	}
 
 	@Redactable()
-	private credentialsUpdated({ user, ...rest }: Event['credentials-updated']) {
+	private credentialsUpdated({ user, ...rest }: RelayEventMap['credentials-updated']) {
 		void this.eventBus.sendAuditEvent({
 			eventName: 'n8n.audit.user.credentials.updated',
 			payload: { ...user, ...rest },
 		});
 	}
 
-	/**
-	 * Community package
-	 */
+	// #endregion
+
+	// #region Community package
 
 	@Redactable()
-	private communityPackageInstalled({ user, ...rest }: Event['community-package-installed']) {
+	private communityPackageInstalled({
+		user,
+		...rest
+	}: RelayEventMap['community-package-installed']) {
 		void this.eventBus.sendAuditEvent({
 			eventName: 'n8n.audit.package.installed',
 			payload: { ...user, ...rest },
@@ -360,7 +351,7 @@ export class AuditEventRelay {
 	}
 
 	@Redactable()
-	private communityPackageUpdated({ user, ...rest }: Event['community-package-updated']) {
+	private communityPackageUpdated({ user, ...rest }: RelayEventMap['community-package-updated']) {
 		void this.eventBus.sendAuditEvent({
 			eventName: 'n8n.audit.package.updated',
 			payload: { ...user, ...rest },
@@ -368,28 +359,32 @@ export class AuditEventRelay {
 	}
 
 	@Redactable()
-	private communityPackageDeleted({ user, ...rest }: Event['community-package-deleted']) {
+	private communityPackageDeleted({ user, ...rest }: RelayEventMap['community-package-deleted']) {
 		void this.eventBus.sendAuditEvent({
 			eventName: 'n8n.audit.package.deleted',
 			payload: { ...user, ...rest },
 		});
 	}
 
-	/**
-	 * Execution
-	 */
+	// #endregion
 
-	private executionThrottled({ executionId }: Event['execution-throttled']) {
+	// #region Execution
+
+	private executionThrottled({ executionId }: RelayEventMap['execution-throttled']) {
 		void this.eventBus.sendExecutionEvent({
 			eventName: 'n8n.execution.throttled',
 			payload: { executionId },
 		});
 	}
 
-	private executionStartedDuringBootup({ executionId }: Event['execution-started-during-bootup']) {
+	private executionStartedDuringBootup({
+		executionId,
+	}: RelayEventMap['execution-started-during-bootup']) {
 		void this.eventBus.sendExecutionEvent({
 			eventName: 'n8n.execution.started-during-bootup',
 			payload: { executionId },
 		});
 	}
+
+	// #endregion
 }
diff --git a/packages/cli/src/eventbus/event.types.ts b/packages/cli/src/events/relay-event-map.ts
similarity index 88%
rename from packages/cli/src/eventbus/event.types.ts
rename to packages/cli/src/events/relay-event-map.ts
index bcca98b919637..193e85c9a4ed8 100644
--- a/packages/cli/src/eventbus/event.types.ts
+++ b/packages/cli/src/events/relay-event-map.ts
@@ -11,12 +11,15 @@ export type UserLike = {
 	role: string;
 };
 
-/**
- * Events sent by `EventService` and forwarded by relays, e.g. `AuditEventRelay` and `TelemetryEventRelay`.
- */
-export type Event = {
+export type RelayEventMap = {
+	// #region Server
+
 	'server-started': {};
 
+	// #endregion
+
+	// #region Workflow
+
 	'workflow-created': {
 		user: UserLike;
 		workflow: IWorkflowBase;
@@ -49,6 +52,10 @@ export type Event = {
 		runData?: IRun;
 	};
 
+	// #endregion
+
+	// #region Node
+
 	'node-pre-execute': {
 		executionId: string;
 		workflow: IWorkflowBase;
@@ -61,6 +68,10 @@ export type Event = {
 		nodeName: string;
 	};
 
+	// #endregion
+
+	// #region User
+
 	'user-deleted': {
 		user: UserLike;
 	};
@@ -95,6 +106,10 @@ export type Event = {
 		reason?: string;
 	};
 
+	// #endregion
+
+	// #region Click
+
 	'user-invite-email-click': {
 		inviter: UserLike;
 		invitee: UserLike;
@@ -108,6 +123,20 @@ export type Event = {
 		user: UserLike;
 	};
 
+	// #endregion
+
+	// #region Public API
+
+	'public-api-key-created': {
+		user: UserLike;
+		publicApi: boolean;
+	};
+
+	'public-api-key-deleted': {
+		user: UserLike;
+		publicApi: boolean;
+	};
+
 	'public-api-invoked': {
 		userId: string;
 		path: string;
@@ -115,6 +144,10 @@ export type Event = {
 		apiVersion: string;
 	};
 
+	// #endregion
+
+	// #region Email
+
 	'email-failed': {
 		user: UserLike;
 		messageType:
@@ -125,6 +158,10 @@ export type Event = {
 			| 'Credentials shared';
 	};
 
+	// #endregion
+
+	// #region Credentials
+
 	'credentials-created': {
 		user: UserLike;
 		credentialType: string;
@@ -155,6 +192,10 @@ export type Event = {
 		credentialId: string;
 	};
 
+	// #endregion
+
+	// #region Community package
+
 	'community-package-installed': {
 		user: UserLike;
 		inputString: string;
@@ -186,6 +227,10 @@ export type Event = {
 		packageAuthorEmail?: string;
 	};
 
+	// #endregion
+
+	// #region Execution
+
 	'execution-throttled': {
 		executionId: string;
 	};
@@ -194,6 +239,10 @@ export type Event = {
 		executionId: string;
 	};
 
+	// #endregion
+
+	// #region Project
+
 	'team-project-updated': {
 		userId: string;
 		role: GlobalRole;
@@ -217,6 +266,10 @@ export type Event = {
 		role: GlobalRole;
 	};
 
+	// #endregion
+
+	// #region Source control
+
 	'source-control-settings-updated': {
 		branchName: string;
 		readOnlyInstance: boolean;
@@ -254,12 +307,24 @@ export type Event = {
 		variablesPushed: number;
 	};
 
+	// #endregion
+
+	// #region License
+
 	'license-renewal-attempted': {
 		success: boolean;
 	};
 
+	// #endregion
+
+	// #region Variable
+
 	'variable-created': {};
 
+	// #endregion
+
+	// #region External secrets
+
 	'external-secrets-provider-settings-saved': {
 		userId?: string;
 		vaultType: string;
@@ -268,6 +333,10 @@ export type Event = {
 		errorMessage?: string;
 	};
 
+	// #endregion
+
+	// #region LDAP
+
 	'ldap-general-sync-finished': {
 		type: string;
 		succeeded: boolean;
@@ -298,17 +367,5 @@ export type Event = {
 		userId: string;
 	};
 
-	/**
-	 * Events listened to by more than one relay
-	 */
-
-	'public-api-key-created': {
-		user: UserLike; // audit and telemetry
-		publicApi: boolean; // telemetry only
-	};
-
-	'public-api-key-deleted': {
-		user: UserLike; // audit and telemetry
-		publicApi: boolean; // telemetry only
-	};
+	// #endregion
 };
diff --git a/packages/cli/src/telemetry/telemetry-event-relay.service.ts b/packages/cli/src/events/telemetry-event-relay.ts
similarity index 75%
rename from packages/cli/src/telemetry/telemetry-event-relay.service.ts
rename to packages/cli/src/events/telemetry-event-relay.ts
index f92b38987b1e3..91f82a0c127a5 100644
--- a/packages/cli/src/telemetry/telemetry-event-relay.service.ts
+++ b/packages/cli/src/events/telemetry-event-relay.ts
@@ -1,7 +1,7 @@
 import { Service } from 'typedi';
-import { EventService } from '@/eventbus/event.service';
-import type { Event } from '@/eventbus/event.types';
-import { Telemetry } from '.';
+import { EventService } from '@/events/event.service';
+import type { RelayEventMap } from '@/events/relay-event-map';
+import { Telemetry } from '../telemetry';
 import config from '@/config';
 import os from 'node:os';
 import { License } from '@/License';
@@ -16,11 +16,12 @@ import { SharedWorkflowRepository } from '@/databases/repositories/sharedWorkflo
 import { ProjectRelationRepository } from '@/databases/repositories/projectRelation.repository';
 import type { IExecutionTrackProperties } from '@/Interfaces';
 import { determineFinalExecutionStatus } from '@/executionLifecycleHooks/shared/sharedHookFunctions';
+import { EventRelay } from './event-relay';
 
 @Service()
-export class TelemetryEventRelay {
+export class TelemetryEventRelay extends EventRelay {
 	constructor(
-		private readonly eventService: EventService,
+		readonly eventService: EventService,
 		private readonly telemetry: Telemetry,
 		private readonly license: License,
 		private readonly globalConfig: GlobalConfig,
@@ -28,106 +29,63 @@ export class TelemetryEventRelay {
 		private readonly nodeTypes: NodeTypes,
 		private readonly sharedWorkflowRepository: SharedWorkflowRepository,
 		private readonly projectRelationRepository: ProjectRelationRepository,
-	) {}
+	) {
+		super(eventService);
+	}
 
 	async init() {
 		if (!config.getEnv('diagnostics.enabled')) return;
 
 		await this.telemetry.init();
 
-		this.setupHandlers();
-	}
-
-	private setupHandlers() {
-		this.eventService.on('server-started', async () => await this.serverStarted());
-
-		this.eventService.on('team-project-updated', (event) => this.teamProjectUpdated(event));
-		this.eventService.on('team-project-deleted', (event) => this.teamProjectDeleted(event));
-		this.eventService.on('team-project-created', (event) => this.teamProjectCreated(event));
-		this.eventService.on('source-control-settings-updated', (event) =>
-			this.sourceControlSettingsUpdated(event),
-		);
-		this.eventService.on('source-control-user-started-pull-ui', (event) =>
-			this.sourceControlUserStartedPullUi(event),
-		);
-		this.eventService.on('source-control-user-finished-pull-ui', (event) =>
-			this.sourceControlUserFinishedPullUi(event),
-		);
-		this.eventService.on('source-control-user-pulled-api', (event) =>
-			this.sourceControlUserPulledApi(event),
-		);
-		this.eventService.on('source-control-user-started-push-ui', (event) =>
-			this.sourceControlUserStartedPushUi(event),
-		);
-		this.eventService.on('source-control-user-finished-push-ui', (event) =>
-			this.sourceControlUserFinishedPushUi(event),
-		);
-		this.eventService.on('license-renewal-attempted', (event) => {
-			this.licenseRenewalAttempted(event);
-		});
-		this.eventService.on('variable-created', () => this.variableCreated());
-		this.eventService.on('external-secrets-provider-settings-saved', (event) => {
-			this.externalSecretsProviderSettingsSaved(event);
-		});
-		this.eventService.on('public-api-invoked', (event) => {
-			this.publicApiInvoked(event);
-		});
-		this.eventService.on('public-api-key-created', (event) => {
-			this.publicApiKeyCreated(event);
-		});
-		this.eventService.on('public-api-key-deleted', (event) => {
-			this.publicApiKeyDeleted(event);
-		});
-		this.eventService.on('community-package-installed', (event) => {
-			this.communityPackageInstalled(event);
-		});
-		this.eventService.on('community-package-updated', (event) => {
-			this.communityPackageUpdated(event);
-		});
-		this.eventService.on('community-package-deleted', (event) => {
-			this.communityPackageDeleted(event);
-		});
-
-		this.eventService.on('credentials-created', (event) => {
-			this.credentialsCreated(event);
-		});
-		this.eventService.on('credentials-shared', (event) => {
-			this.credentialsShared(event);
-		});
-		this.eventService.on('credentials-updated', (event) => {
-			this.credentialsUpdated(event);
-		});
-		this.eventService.on('credentials-deleted', (event) => {
-			this.credentialsDeleted(event);
-		});
-		this.eventService.on('ldap-general-sync-finished', (event) => {
-			this.ldapGeneralSyncFinished(event);
-		});
-		this.eventService.on('ldap-settings-updated', (event) => {
-			this.ldapSettingsUpdated(event);
-		});
-		this.eventService.on('ldap-login-sync-failed', (event) => {
-			this.ldapLoginSyncFailed(event);
-		});
-		this.eventService.on('login-failed-due-to-ldap-disabled', (event) => {
-			this.loginFailedDueToLdapDisabled(event);
-		});
-
-		this.eventService.on('workflow-created', (event) => {
-			this.workflowCreated(event);
-		});
-		this.eventService.on('workflow-deleted', (event) => {
-			this.workflowDeleted(event);
-		});
-		this.eventService.on('workflow-saved', async (event) => {
-			await this.workflowSaved(event);
-		});
-		this.eventService.on('workflow-post-execute', async (event) => {
-			await this.workflowPostExecute(event);
-		});
-	}
-
-	private teamProjectUpdated({ userId, role, members, projectId }: Event['team-project-updated']) {
+		this.setupListeners({
+			'team-project-updated': (event) => this.teamProjectUpdated(event),
+			'team-project-deleted': (event) => this.teamProjectDeleted(event),
+			'team-project-created': (event) => this.teamProjectCreated(event),
+			'source-control-settings-updated': (event) => this.sourceControlSettingsUpdated(event),
+			'source-control-user-started-pull-ui': (event) => this.sourceControlUserStartedPullUi(event),
+			'source-control-user-finished-pull-ui': (event) =>
+				this.sourceControlUserFinishedPullUi(event),
+			'source-control-user-pulled-api': (event) => this.sourceControlUserPulledApi(event),
+			'source-control-user-started-push-ui': (event) => this.sourceControlUserStartedPushUi(event),
+			'source-control-user-finished-push-ui': (event) =>
+				this.sourceControlUserFinishedPushUi(event),
+			'license-renewal-attempted': (event) => this.licenseRenewalAttempted(event),
+			'variable-created': () => this.variableCreated(),
+			'external-secrets-provider-settings-saved': (event) =>
+				this.externalSecretsProviderSettingsSaved(event),
+			'public-api-invoked': (event) => this.publicApiInvoked(event),
+			'public-api-key-created': (event) => this.publicApiKeyCreated(event),
+			'public-api-key-deleted': (event) => this.publicApiKeyDeleted(event),
+			'community-package-installed': (event) => this.communityPackageInstalled(event),
+			'community-package-updated': (event) => this.communityPackageUpdated(event),
+			'community-package-deleted': (event) => this.communityPackageDeleted(event),
+			'credentials-created': (event) => this.credentialsCreated(event),
+			'credentials-shared': (event) => this.credentialsShared(event),
+			'credentials-updated': (event) => this.credentialsUpdated(event),
+			'credentials-deleted': (event) => this.credentialsDeleted(event),
+			'ldap-general-sync-finished': (event) => this.ldapGeneralSyncFinished(event),
+			'ldap-settings-updated': (event) => this.ldapSettingsUpdated(event),
+			'ldap-login-sync-failed': (event) => this.ldapLoginSyncFailed(event),
+			'login-failed-due-to-ldap-disabled': (event) => this.loginFailedDueToLdapDisabled(event),
+			'workflow-created': (event) => this.workflowCreated(event),
+			'workflow-deleted': (event) => this.workflowDeleted(event),
+			'workflow-saved': async (event) => await this.workflowSaved(event),
+			'server-started': async () => await this.serverStarted(),
+			'workflow-post-execute': async (event) => await this.workflowPostExecute(event),
+		});
+	}
+
+	// #endregion
+
+	// #region Team
+
+	private teamProjectUpdated({
+		userId,
+		role,
+		members,
+		projectId,
+	}: RelayEventMap['team-project-updated']) {
 		this.telemetry.track('Project settings updated', {
 			user_id: userId,
 			role,
@@ -143,7 +101,7 @@ export class TelemetryEventRelay {
 		projectId,
 		removalType,
 		targetProjectId,
-	}: Event['team-project-deleted']) {
+	}: RelayEventMap['team-project-deleted']) {
 		this.telemetry.track('User deleted project', {
 			user_id: userId,
 			role,
@@ -153,19 +111,23 @@ export class TelemetryEventRelay {
 		});
 	}
 
-	private teamProjectCreated({ userId, role }: Event['team-project-created']) {
+	private teamProjectCreated({ userId, role }: RelayEventMap['team-project-created']) {
 		this.telemetry.track('User created project', {
 			user_id: userId,
 			role,
 		});
 	}
 
+	// #endregion
+
+	// #region Source control
+
 	private sourceControlSettingsUpdated({
 		branchName,
 		readOnlyInstance,
 		repoType,
 		connected,
-	}: Event['source-control-settings-updated']) {
+	}: RelayEventMap['source-control-settings-updated']) {
 		this.telemetry.track('User updated source control settings', {
 			branch_name: branchName,
 			read_only_instance: readOnlyInstance,
@@ -178,7 +140,7 @@ export class TelemetryEventRelay {
 		workflowUpdates,
 		workflowConflicts,
 		credConflicts,
-	}: Event['source-control-user-started-pull-ui']) {
+	}: RelayEventMap['source-control-user-started-pull-ui']) {
 		this.telemetry.track('User started pull via UI', {
 			workflow_updates: workflowUpdates,
 			workflow_conflicts: workflowConflicts,
@@ -188,7 +150,7 @@ export class TelemetryEventRelay {
 
 	private sourceControlUserFinishedPullUi({
 		workflowUpdates,
-	}: Event['source-control-user-finished-pull-ui']) {
+	}: RelayEventMap['source-control-user-finished-pull-ui']) {
 		this.telemetry.track('User finished pull via UI', {
 			workflow_updates: workflowUpdates,
 		});
@@ -197,7 +159,7 @@ export class TelemetryEventRelay {
 	private sourceControlUserPulledApi({
 		workflowUpdates,
 		forced,
-	}: Event['source-control-user-pulled-api']) {
+	}: RelayEventMap['source-control-user-pulled-api']) {
 		console.log('source-control-user-pulled-api', {
 			workflow_updates: workflowUpdates,
 			forced,
@@ -214,7 +176,7 @@ export class TelemetryEventRelay {
 		credsEligible,
 		credsEligibleWithConflicts,
 		variablesEligible,
-	}: Event['source-control-user-started-push-ui']) {
+	}: RelayEventMap['source-control-user-started-push-ui']) {
 		this.telemetry.track('User started push via UI', {
 			workflows_eligible: workflowsEligible,
 			workflows_eligible_with_conflicts: workflowsEligibleWithConflicts,
@@ -229,7 +191,7 @@ export class TelemetryEventRelay {
 		workflowsPushed,
 		credsPushed,
 		variablesPushed,
-	}: Event['source-control-user-finished-push-ui']) {
+	}: RelayEventMap['source-control-user-finished-push-ui']) {
 		this.telemetry.track('User finished push via UI', {
 			workflows_eligible: workflowsEligible,
 			workflows_pushed: workflowsPushed,
@@ -238,23 +200,35 @@ export class TelemetryEventRelay {
 		});
 	}
 
-	private licenseRenewalAttempted({ success }: Event['license-renewal-attempted']) {
+	// #endregion
+
+	// #region License
+
+	private licenseRenewalAttempted({ success }: RelayEventMap['license-renewal-attempted']) {
 		this.telemetry.track('Instance attempted to refresh license', {
 			success,
 		});
 	}
 
+	// #endregion
+
+	// #region Variable
+
 	private variableCreated() {
 		this.telemetry.track('User created variable');
 	}
 
+	// #endregion
+
+	// #region External secrets
+
 	private externalSecretsProviderSettingsSaved({
 		userId,
 		vaultType,
 		isValid,
 		isNew,
 		errorMessage,
-	}: Event['external-secrets-provider-settings-saved']) {
+	}: RelayEventMap['external-secrets-provider-settings-saved']) {
 		this.telemetry.track('User updated external secrets settings', {
 			user_id: userId,
 			vault_type: vaultType,
@@ -264,7 +238,16 @@ export class TelemetryEventRelay {
 		});
 	}
 
-	private publicApiInvoked({ userId, path, method, apiVersion }: Event['public-api-invoked']) {
+	// #endregion
+
+	// #region Public API
+
+	private publicApiInvoked({
+		userId,
+		path,
+		method,
+		apiVersion,
+	}: RelayEventMap['public-api-invoked']) {
 		this.telemetry.track('User invoked API', {
 			user_id: userId,
 			path,
@@ -273,7 +256,7 @@ export class TelemetryEventRelay {
 		});
 	}
 
-	private publicApiKeyCreated(event: Event['public-api-key-created']) {
+	private publicApiKeyCreated(event: RelayEventMap['public-api-key-created']) {
 		const { user, publicApi } = event;
 
 		this.telemetry.track('API key created', {
@@ -282,7 +265,7 @@ export class TelemetryEventRelay {
 		});
 	}
 
-	private publicApiKeyDeleted(event: Event['public-api-key-deleted']) {
+	private publicApiKeyDeleted(event: RelayEventMap['public-api-key-deleted']) {
 		const { user, publicApi } = event;
 
 		this.telemetry.track('API key deleted', {
@@ -291,6 +274,10 @@ export class TelemetryEventRelay {
 		});
 	}
 
+	// #endregion
+
+	// #region Community package
+
 	private communityPackageInstalled({
 		user,
 		inputString,
@@ -301,7 +288,7 @@ export class TelemetryEventRelay {
 		packageAuthor,
 		packageAuthorEmail,
 		failureReason,
-	}: Event['community-package-installed']) {
+	}: RelayEventMap['community-package-installed']) {
 		this.telemetry.track('cnr package install finished', {
 			user_id: user.id,
 			input_string: inputString,
@@ -323,7 +310,7 @@ export class TelemetryEventRelay {
 		packageNodeNames,
 		packageAuthor,
 		packageAuthorEmail,
-	}: Event['community-package-updated']) {
+	}: RelayEventMap['community-package-updated']) {
 		this.telemetry.track('cnr package updated', {
 			user_id: user.id,
 			package_name: packageName,
@@ -342,7 +329,7 @@ export class TelemetryEventRelay {
 		packageNodeNames,
 		packageAuthor,
 		packageAuthorEmail,
-	}: Event['community-package-deleted']) {
+	}: RelayEventMap['community-package-deleted']) {
 		this.telemetry.track('cnr package deleted', {
 			user_id: user.id,
 			package_name: packageName,
@@ -353,13 +340,17 @@ export class TelemetryEventRelay {
 		});
 	}
 
+	// #endregion
+
+	// #region Credentials
+
 	private credentialsCreated({
 		user,
 		credentialType,
 		credentialId,
 		projectId,
 		projectType,
-	}: Event['credentials-created']) {
+	}: RelayEventMap['credentials-created']) {
 		this.telemetry.track('User created credentials', {
 			user_id: user.id,
 			credential_type: credentialType,
@@ -376,7 +367,7 @@ export class TelemetryEventRelay {
 		userIdSharer,
 		userIdsShareesAdded,
 		shareesRemoved,
-	}: Event['credentials-shared']) {
+	}: RelayEventMap['credentials-shared']) {
 		this.telemetry.track('User updated cred sharing', {
 			user_id: user.id,
 			credential_type: credentialType,
@@ -387,7 +378,11 @@ export class TelemetryEventRelay {
 		});
 	}
 
-	private credentialsUpdated({ user, credentialId, credentialType }: Event['credentials-updated']) {
+	private credentialsUpdated({
+		user,
+		credentialId,
+		credentialType,
+	}: RelayEventMap['credentials-updated']) {
 		this.telemetry.track('User updated credentials', {
 			user_id: user.id,
 			credential_type: credentialType,
@@ -395,7 +390,11 @@ export class TelemetryEventRelay {
 		});
 	}
 
-	private credentialsDeleted({ user, credentialId, credentialType }: Event['credentials-deleted']) {
+	private credentialsDeleted({
+		user,
+		credentialId,
+		credentialType,
+	}: RelayEventMap['credentials-deleted']) {
 		this.telemetry.track('User deleted credentials', {
 			user_id: user.id,
 			credential_type: credentialType,
@@ -403,12 +402,16 @@ export class TelemetryEventRelay {
 		});
 	}
 
+	// #endregion
+
+	// #region LDAP
+
 	private ldapGeneralSyncFinished({
 		type,
 		succeeded,
 		usersSynced,
 		error,
-	}: Event['ldap-general-sync-finished']) {
+	}: RelayEventMap['ldap-general-sync-finished']) {
 		this.telemetry.track('Ldap general sync finished', {
 			type,
 			succeeded,
@@ -430,7 +433,7 @@ export class TelemetryEventRelay {
 		synchronizationInterval,
 		loginLabel,
 		loginEnabled,
-	}: Event['ldap-settings-updated']) {
+	}: RelayEventMap['ldap-settings-updated']) {
 		this.telemetry.track('User updated Ldap settings', {
 			user_id: userId,
 			loginIdAttribute,
@@ -447,21 +450,27 @@ export class TelemetryEventRelay {
 		});
 	}
 
-	private ldapLoginSyncFailed({ error }: Event['ldap-login-sync-failed']) {
+	private ldapLoginSyncFailed({ error }: RelayEventMap['ldap-login-sync-failed']) {
 		this.telemetry.track('Ldap login sync failed', { error });
 	}
 
-	private loginFailedDueToLdapDisabled({ userId }: Event['login-failed-due-to-ldap-disabled']) {
+	private loginFailedDueToLdapDisabled({
+		userId,
+	}: RelayEventMap['login-failed-due-to-ldap-disabled']) {
 		this.telemetry.track('User login failed since ldap disabled', { user_ud: userId });
 	}
 
+	// #endregion
+
+	// #region Workflow
+
 	private workflowCreated({
 		user,
 		workflow,
 		publicApi,
 		projectId,
 		projectType,
-	}: Event['workflow-created']) {
+	}: RelayEventMap['workflow-created']) {
 		const { nodeGraph } = TelemetryHelpers.generateNodesGraph(workflow, this.nodeTypes);
 
 		this.telemetry.track('User created workflow', {
@@ -474,7 +483,7 @@ export class TelemetryEventRelay {
 		});
 	}
 
-	private workflowDeleted({ user, workflowId, publicApi }: Event['workflow-deleted']) {
+	private workflowDeleted({ user, workflowId, publicApi }: RelayEventMap['workflow-deleted']) {
 		this.telemetry.track('User deleted workflow', {
 			user_id: user.id,
 			workflow_id: workflowId,
@@ -482,7 +491,7 @@ export class TelemetryEventRelay {
 		});
 	}
 
-	private async workflowSaved({ user, workflow, publicApi }: Event['workflow-saved']) {
+	private async workflowSaved({ user, workflow, publicApi }: RelayEventMap['workflow-saved']) {
 		const isCloudDeployment = config.getEnv('deployment.type') === 'cloud';
 
 		const { nodeGraph } = TelemetryHelpers.generateNodesGraph(workflow, this.nodeTypes, {
@@ -528,72 +537,12 @@ export class TelemetryEventRelay {
 		});
 	}
 
-	private async serverStarted() {
-		const cpus = os.cpus();
-		const binaryDataConfig = config.getEnv('binaryDataManager');
-
-		const isS3Selected = config.getEnv('binaryDataManager.mode') === 's3';
-		const isS3Available = config.getEnv('binaryDataManager.availableModes').includes('s3');
-		const isS3Licensed = this.license.isBinaryDataS3Licensed();
-		const authenticationMethod = config.getEnv('userManagement.authenticationMethod');
-
-		const info = {
-			version_cli: N8N_VERSION,
-			db_type: this.globalConfig.database.type,
-			n8n_version_notifications_enabled: this.globalConfig.versionNotifications.enabled,
-			n8n_disable_production_main_process:
-				this.globalConfig.endpoints.disableProductionWebhooksOnMainProcess,
-			system_info: {
-				os: {
-					type: os.type(),
-					version: os.version(),
-				},
-				memory: os.totalmem() / 1024,
-				cpus: {
-					count: cpus.length,
-					model: cpus[0].model,
-					speed: cpus[0].speed,
-				},
-			},
-			execution_variables: {
-				executions_mode: config.getEnv('executions.mode'),
-				executions_timeout: config.getEnv('executions.timeout'),
-				executions_timeout_max: config.getEnv('executions.maxTimeout'),
-				executions_data_save_on_error: config.getEnv('executions.saveDataOnError'),
-				executions_data_save_on_success: config.getEnv('executions.saveDataOnSuccess'),
-				executions_data_save_on_progress: config.getEnv('executions.saveExecutionProgress'),
-				executions_data_save_manual_executions: config.getEnv(
-					'executions.saveDataManualExecutions',
-				),
-				executions_data_prune: config.getEnv('executions.pruneData'),
-				executions_data_max_age: config.getEnv('executions.pruneDataMaxAge'),
-			},
-			n8n_deployment_type: config.getEnv('deployment.type'),
-			n8n_binary_data_mode: binaryDataConfig.mode,
-			smtp_set_up: this.globalConfig.userManagement.emails.mode === 'smtp',
-			ldap_allowed: authenticationMethod === 'ldap',
-			saml_enabled: authenticationMethod === 'saml',
-			license_plan_name: this.license.getPlanName(),
-			license_tenant_id: config.getEnv('license.tenantId'),
-			binary_data_s3: isS3Available && isS3Selected && isS3Licensed,
-			multi_main_setup_enabled: config.getEnv('multiMainSetup.enabled'),
-		};
-
-		const firstWorkflow = await this.workflowRepository.findOne({
-			select: ['createdAt'],
-			order: { createdAt: 'ASC' },
-			where: {},
-		});
-
-		this.telemetry.identify(info);
-		this.telemetry.track('Instance started', {
-			...info,
-			earliest_workflow_created: firstWorkflow?.createdAt,
-		});
-	}
-
 	// eslint-disable-next-line complexity
-	private async workflowPostExecute({ workflow, runData, userId }: Event['workflow-post-execute']) {
+	private async workflowPostExecute({
+		workflow,
+		runData,
+		userId,
+	}: RelayEventMap['workflow-post-execute']) {
 		if (!workflow.id) {
 			return;
 		}
@@ -725,4 +674,74 @@ export class TelemetryEventRelay {
 
 		this.telemetry.trackWorkflowExecution(telemetryProperties);
 	}
+
+	// #endregion
+
+	// #region Server
+
+	private async serverStarted() {
+		const cpus = os.cpus();
+		const binaryDataConfig = config.getEnv('binaryDataManager');
+
+		const isS3Selected = config.getEnv('binaryDataManager.mode') === 's3';
+		const isS3Available = config.getEnv('binaryDataManager.availableModes').includes('s3');
+		const isS3Licensed = this.license.isBinaryDataS3Licensed();
+		const authenticationMethod = config.getEnv('userManagement.authenticationMethod');
+
+		const info = {
+			version_cli: N8N_VERSION,
+			db_type: this.globalConfig.database.type,
+			n8n_version_notifications_enabled: this.globalConfig.versionNotifications.enabled,
+			n8n_disable_production_main_process:
+				this.globalConfig.endpoints.disableProductionWebhooksOnMainProcess,
+			system_info: {
+				os: {
+					type: os.type(),
+					version: os.version(),
+				},
+				memory: os.totalmem() / 1024,
+				cpus: {
+					count: cpus.length,
+					model: cpus[0].model,
+					speed: cpus[0].speed,
+				},
+			},
+			execution_variables: {
+				executions_mode: config.getEnv('executions.mode'),
+				executions_timeout: config.getEnv('executions.timeout'),
+				executions_timeout_max: config.getEnv('executions.maxTimeout'),
+				executions_data_save_on_error: config.getEnv('executions.saveDataOnError'),
+				executions_data_save_on_success: config.getEnv('executions.saveDataOnSuccess'),
+				executions_data_save_on_progress: config.getEnv('executions.saveExecutionProgress'),
+				executions_data_save_manual_executions: config.getEnv(
+					'executions.saveDataManualExecutions',
+				),
+				executions_data_prune: config.getEnv('executions.pruneData'),
+				executions_data_max_age: config.getEnv('executions.pruneDataMaxAge'),
+			},
+			n8n_deployment_type: config.getEnv('deployment.type'),
+			n8n_binary_data_mode: binaryDataConfig.mode,
+			smtp_set_up: this.globalConfig.userManagement.emails.mode === 'smtp',
+			ldap_allowed: authenticationMethod === 'ldap',
+			saml_enabled: authenticationMethod === 'saml',
+			license_plan_name: this.license.getPlanName(),
+			license_tenant_id: config.getEnv('license.tenantId'),
+			binary_data_s3: isS3Available && isS3Selected && isS3Licensed,
+			multi_main_setup_enabled: config.getEnv('multiMainSetup.enabled'),
+		};
+
+		const firstWorkflow = await this.workflowRepository.findOne({
+			select: ['createdAt'],
+			order: { createdAt: 'ASC' },
+			where: {},
+		});
+
+		this.telemetry.identify(info);
+		this.telemetry.track('Instance started', {
+			...info,
+			earliest_workflow_created: firstWorkflow?.createdAt,
+		});
+	}
+
+	// #endregion
 }
diff --git a/packages/cli/src/executions/execution-recovery.service.ts b/packages/cli/src/executions/execution-recovery.service.ts
index 152d4ad4f2964..435145545ab16 100644
--- a/packages/cli/src/executions/execution-recovery.service.ts
+++ b/packages/cli/src/executions/execution-recovery.service.ts
@@ -16,7 +16,7 @@ import config from '@/config';
 import { OnShutdown } from '@/decorators/OnShutdown';
 import type { QueueRecoverySettings } from './execution.types';
 import { OrchestrationService } from '@/services/orchestration.service';
-import { EventService } from '@/eventbus/event.service';
+import { EventService } from '@/events/event.service';
 
 /**
  * Service for recovering key properties in executions.
diff --git a/packages/cli/src/license/license.service.ts b/packages/cli/src/license/license.service.ts
index 01d2a73c48941..0555597a9d3b3 100644
--- a/packages/cli/src/license/license.service.ts
+++ b/packages/cli/src/license/license.service.ts
@@ -3,7 +3,7 @@ import axios from 'axios';
 
 import { Logger } from '@/Logger';
 import { License } from '@/License';
-import { EventService } from '@/eventbus/event.service';
+import { EventService } from '@/events/event.service';
 import type { User } from '@db/entities/User';
 import { WorkflowRepository } from '@db/repositories/workflow.repository';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
diff --git a/packages/cli/src/services/user.service.ts b/packages/cli/src/services/user.service.ts
index 007054c6aa980..25be080ca05bf 100644
--- a/packages/cli/src/services/user.service.ts
+++ b/packages/cli/src/services/user.service.ts
@@ -12,7 +12,7 @@ import { InternalHooks } from '@/InternalHooks';
 import { UrlService } from '@/services/url.service';
 import type { UserRequest } from '@/requests';
 import { InternalServerError } from '@/errors/response-errors/internal-server.error';
-import { EventService } from '@/eventbus/event.service';
+import { EventService } from '@/events/event.service';
 
 @Service()
 export class UserService {
diff --git a/packages/cli/src/sso/saml/routes/saml.controller.ee.ts b/packages/cli/src/sso/saml/routes/saml.controller.ee.ts
index 344bd34e92b72..8169ee317bfee 100644
--- a/packages/cli/src/sso/saml/routes/saml.controller.ee.ts
+++ b/packages/cli/src/sso/saml/routes/saml.controller.ee.ts
@@ -27,7 +27,7 @@ import {
 import { SamlService } from '../saml.service.ee';
 import { SamlConfiguration } from '../types/requests';
 import { getInitSSOFormView } from '../views/initSsoPost';
-import { EventService } from '@/eventbus/event.service';
+import { EventService } from '@/events/event.service';
 
 @RestController('/sso/saml')
 export class SamlController {
diff --git a/packages/cli/src/workflows/workflow.service.ts b/packages/cli/src/workflows/workflow.service.ts
index 4f59f8238fe68..20917e60cbc16 100644
--- a/packages/cli/src/workflows/workflow.service.ts
+++ b/packages/cli/src/workflows/workflow.service.ts
@@ -33,7 +33,7 @@ import type { EntityManager } from '@n8n/typeorm';
 // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
 import { In } from '@n8n/typeorm';
 import { SharedWorkflow } from '@/databases/entities/SharedWorkflow';
-import { EventService } from '@/eventbus/event.service';
+import { EventService } from '@/events/event.service';
 
 @Service()
 export class WorkflowService {
diff --git a/packages/cli/src/workflows/workflows.controller.ts b/packages/cli/src/workflows/workflows.controller.ts
index c774b21917c98..60dbbf8191c4f 100644
--- a/packages/cli/src/workflows/workflows.controller.ts
+++ b/packages/cli/src/workflows/workflows.controller.ts
@@ -42,7 +42,7 @@ import { In, type FindOptionsRelations } from '@n8n/typeorm';
 import type { Project } from '@/databases/entities/Project';
 import { ProjectRelationRepository } from '@/databases/repositories/projectRelation.repository';
 import { z } from 'zod';
-import { EventService } from '@/eventbus/event.service';
+import { EventService } from '@/events/event.service';
 import { GlobalConfig } from '@n8n/config';
 
 @RestController('/workflows')
diff --git a/packages/cli/test/integration/ExternalSecrets/externalSecrets.api.test.ts b/packages/cli/test/integration/ExternalSecrets/externalSecrets.api.test.ts
index 7a49e61fa1b01..190ab437fa5f6 100644
--- a/packages/cli/test/integration/ExternalSecrets/externalSecrets.api.test.ts
+++ b/packages/cli/test/integration/ExternalSecrets/externalSecrets.api.test.ts
@@ -21,7 +21,7 @@ import {
 	TestFailProvider,
 } from '../../shared/ExternalSecrets/utils';
 import type { SuperAgentTest } from '../shared/types';
-import type { EventService } from '@/eventbus/event.service';
+import type { EventService } from '@/events/event.service';
 
 let authOwnerAgent: SuperAgentTest;
 let authMemberAgent: SuperAgentTest;
diff --git a/packages/cli/test/integration/commands/worker.cmd.test.ts b/packages/cli/test/integration/commands/worker.cmd.test.ts
index 0ffad7bc056ec..54c15d381de95 100644
--- a/packages/cli/test/integration/commands/worker.cmd.test.ts
+++ b/packages/cli/test/integration/commands/worker.cmd.test.ts
@@ -15,7 +15,7 @@ import { type JobQueue, Queue } from '@/Queue';
 
 import { setupTestCommand } from '@test-integration/utils/testCommand';
 import { mockInstance } from '../../shared/mocking';
-import { AuditEventRelay } from '@/eventbus/audit-event-relay.service';
+import { LogStreamingEventRelay } from '@/events/log-streaming-event-relay';
 
 config.set('executions.mode', 'queue');
 config.set('binaryDataManager.availableModes', 'filesystem');
@@ -26,7 +26,7 @@ const externalHooks = mockInstance(ExternalHooks);
 const externalSecretsManager = mockInstance(ExternalSecretsManager);
 const license = mockInstance(License);
 const messageEventBus = mockInstance(MessageEventBus);
-const auditEventRelay = mockInstance(AuditEventRelay);
+const logStreamingEventRelay = mockInstance(LogStreamingEventRelay);
 const orchestrationHandlerWorkerService = mockInstance(OrchestrationHandlerWorkerService);
 const queue = mockInstance(Queue);
 const orchestrationWorkerService = mockInstance(OrchestrationWorkerService);
@@ -45,7 +45,7 @@ test('worker initializes all its components', async () => {
 	expect(externalHooks.init).toHaveBeenCalledTimes(1);
 	expect(externalSecretsManager.init).toHaveBeenCalledTimes(1);
 	expect(messageEventBus.initialize).toHaveBeenCalledTimes(1);
-	expect(auditEventRelay.init).toHaveBeenCalledTimes(1);
+	expect(logStreamingEventRelay.init).toHaveBeenCalledTimes(1);
 	expect(queue.init).toHaveBeenCalledTimes(1);
 	expect(queue.process).toHaveBeenCalledTimes(1);
 	expect(orchestrationWorkerService.init).toHaveBeenCalledTimes(1);
diff --git a/packages/cli/test/integration/shared/utils/testCommand.ts b/packages/cli/test/integration/shared/utils/testCommand.ts
index 7a8477c4dd1b8..2d25d837cc928 100644
--- a/packages/cli/test/integration/shared/utils/testCommand.ts
+++ b/packages/cli/test/integration/shared/utils/testCommand.ts
@@ -4,7 +4,7 @@ import { mock } from 'jest-mock-extended';
 
 import type { BaseCommand } from '@/commands/BaseCommand';
 import * as testDb from '../testDb';
-import { TelemetryEventRelay } from '@/telemetry/telemetry-event-relay.service';
+import { TelemetryEventRelay } from '@/events/telemetry-event-relay';
 import { mockInstance } from '@test/mocking';
 
 export const setupTestCommand = <T extends BaseCommand>(Command: Class<T>) => {
diff --git a/packages/cli/test/unit/license/license.service.test.ts b/packages/cli/test/unit/license/license.service.test.ts
index e28895025ffbe..fb75c6a27d692 100644
--- a/packages/cli/test/unit/license/license.service.test.ts
+++ b/packages/cli/test/unit/license/license.service.test.ts
@@ -1,6 +1,6 @@
 import { LicenseErrors, LicenseService } from '@/license/license.service';
 import type { License } from '@/License';
-import type { EventService } from '@/eventbus/event.service';
+import type { EventService } from '@/events/event.service';
 import type { WorkflowRepository } from '@db/repositories/workflow.repository';
 import type { TEntitlement } from '@n8n_io/license-sdk';
 import { mock } from 'jest-mock-extended';

From acbae928f21295a32b30c3faf55d541fa1c7de90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Fri, 2 Aug 2024 17:10:03 +0200
Subject: [PATCH 069/168] refactor(core): Port cache config (no-changelog)
 (#10286)

---
 packages/@n8n/config/src/configs/cache.ts     | 36 +++++++++++
 .../@n8n/config/src/configs/credentials.ts    |  8 +--
 packages/@n8n/config/src/configs/database.ts  | 60 +++++++++----------
 packages/@n8n/config/src/configs/email.ts     | 34 +++++------
 packages/@n8n/config/src/configs/endpoints.ts | 48 +++++++--------
 packages/@n8n/config/src/configs/event-bus.ts | 14 ++---
 .../config/src/configs/external-secrets.ts    |  4 +-
 .../config/src/configs/external-storage.ts    | 16 ++---
 packages/@n8n/config/src/configs/nodes.ts     |  8 +--
 .../@n8n/config/src/configs/public-api.ts     |  6 +-
 packages/@n8n/config/src/configs/templates.ts |  4 +-
 .../src/configs/version-notifications.ts      |  6 +-
 packages/@n8n/config/src/configs/workflows.ts | 11 ++--
 packages/@n8n/config/src/index.ts             |  4 ++
 packages/@n8n/config/test/config.test.ts      | 11 ++++
 packages/cli/src/config/schema.ts             | 37 ------------
 .../cli/src/services/cache/cache.service.ts   | 19 ++++--
 .../activation-errors.service.test.ts         |  7 ++-
 .../integration/prometheus-metrics.test.ts    |  2 +-
 .../test/unit/services/cache.service.test.ts  | 17 ++++--
 20 files changed, 190 insertions(+), 162 deletions(-)
 create mode 100644 packages/@n8n/config/src/configs/cache.ts

diff --git a/packages/@n8n/config/src/configs/cache.ts b/packages/@n8n/config/src/configs/cache.ts
new file mode 100644
index 0000000000000..8a24bdc18beff
--- /dev/null
+++ b/packages/@n8n/config/src/configs/cache.ts
@@ -0,0 +1,36 @@
+import { Config, Env, Nested } from '../decorators';
+
+@Config
+class MemoryConfig {
+	/** Max size of memory cache in bytes */
+	@Env('N8N_CACHE_MEMORY_MAX_SIZE')
+	maxSize = 3 * 1024 * 1024; // 3 MiB
+
+	/** Time to live (in milliseconds) for data cached in memory. */
+	@Env('N8N_CACHE_MEMORY_TTL')
+	ttl = 3600 * 1000; // 1 hour
+}
+
+@Config
+class RedisConfig {
+	/** Prefix for cache keys in Redis. */
+	@Env('N8N_CACHE_REDIS_KEY_PREFIX')
+	prefix = 'redis';
+
+	/** Time to live (in milliseconds) for data cached in Redis. 0 for no TTL. */
+	@Env('N8N_CACHE_REDIS_TTL')
+	ttl = 3600 * 1000; // 1 hour
+}
+
+@Config
+export class CacheConfig {
+	/** Backend to use for caching. */
+	@Env('N8N_CACHE_BACKEND')
+	backend: 'memory' | 'redis' | 'auto' = 'auto';
+
+	@Nested
+	memory: MemoryConfig;
+
+	@Nested
+	redis: RedisConfig;
+}
diff --git a/packages/@n8n/config/src/configs/credentials.ts b/packages/@n8n/config/src/configs/credentials.ts
index 9659061c05e20..ee5f78a681ae6 100644
--- a/packages/@n8n/config/src/configs/credentials.ts
+++ b/packages/@n8n/config/src/configs/credentials.ts
@@ -7,19 +7,19 @@ class CredentialsOverwrite {
 	 * Format: { CREDENTIAL_NAME: { PARAMETER: VALUE }}
 	 */
 	@Env('CREDENTIALS_OVERWRITE_DATA')
-	readonly data: string = '{}';
+	data = '{}';
 
 	/** Internal API endpoint to fetch overwritten credential types from. */
 	@Env('CREDENTIALS_OVERWRITE_ENDPOINT')
-	readonly endpoint: string = '';
+	endpoint = '';
 }
 
 @Config
 export class CredentialsConfig {
 	/** Default name for credentials */
 	@Env('CREDENTIALS_DEFAULT_NAME')
-	readonly defaultName: string = 'My credentials';
+	defaultName = 'My credentials';
 
 	@Nested
-	readonly overwrite: CredentialsOverwrite;
+	overwrite: CredentialsOverwrite;
 }
diff --git a/packages/@n8n/config/src/configs/database.ts b/packages/@n8n/config/src/configs/database.ts
index 384ecb1fb065c..06a3f85465929 100644
--- a/packages/@n8n/config/src/configs/database.ts
+++ b/packages/@n8n/config/src/configs/database.ts
@@ -4,19 +4,19 @@ import { Config, Env, Nested } from '../decorators';
 class LoggingConfig {
 	/** Whether database logging is enabled. */
 	@Env('DB_LOGGING_ENABLED')
-	readonly enabled: boolean = false;
+	enabled = false;
 
 	/**
 	 * Database logging level. Requires `DB_LOGGING_MAX_EXECUTION_TIME` to be higher than `0`.
 	 */
 	@Env('DB_LOGGING_OPTIONS')
-	readonly options: 'query' | 'error' | 'schema' | 'warn' | 'info' | 'log' | 'all' = 'error';
+	options: 'query' | 'error' | 'schema' | 'warn' | 'info' | 'log' | 'all' = 'error';
 
 	/**
 	 * Only queries that exceed this time (ms) will be logged. Set `0` to disable.
 	 */
 	@Env('DB_LOGGING_MAX_EXECUTION_TIME')
-	readonly maxQueryExecutionTime: number = 0;
+	maxQueryExecutionTime = 0;
 }
 
 @Config
@@ -26,97 +26,97 @@ class PostgresSSLConfig {
 	 * If `DB_POSTGRESDB_SSL_CA`, `DB_POSTGRESDB_SSL_CERT`, or `DB_POSTGRESDB_SSL_KEY` are defined, `DB_POSTGRESDB_SSL_ENABLED` defaults to `true`.
 	 */
 	@Env('DB_POSTGRESDB_SSL_ENABLED')
-	readonly enabled: boolean = false;
+	enabled = false;
 
 	/** SSL certificate authority */
 	@Env('DB_POSTGRESDB_SSL_CA')
-	readonly ca: string = '';
+	ca = '';
 
 	/** SSL certificate */
 	@Env('DB_POSTGRESDB_SSL_CERT')
-	readonly cert: string = '';
+	cert = '';
 
 	/** SSL key */
 	@Env('DB_POSTGRESDB_SSL_KEY')
-	readonly key: string = '';
+	key = '';
 
 	/** If unauthorized SSL connections should be rejected */
 	@Env('DB_POSTGRESDB_SSL_REJECT_UNAUTHORIZED')
-	readonly rejectUnauthorized: boolean = true;
+	rejectUnauthorized = true;
 }
 
 @Config
 class PostgresConfig {
 	/** Postgres database name */
 	@Env('DB_POSTGRESDB_DATABASE')
-	database: string = 'n8n';
+	database = 'n8n';
 
 	/** Postgres database host */
 	@Env('DB_POSTGRESDB_HOST')
-	readonly host: string = 'localhost';
+	host = 'localhost';
 
 	/** Postgres database password */
 	@Env('DB_POSTGRESDB_PASSWORD')
-	readonly password: string = '';
+	password = '';
 
 	/** Postgres database port */
 	@Env('DB_POSTGRESDB_PORT')
-	readonly port: number = 5432;
+	port: number = 5432;
 
 	/** Postgres database user */
 	@Env('DB_POSTGRESDB_USER')
-	readonly user: string = 'postgres';
+	user = 'postgres';
 
 	/** Postgres database schema */
 	@Env('DB_POSTGRESDB_SCHEMA')
-	readonly schema: string = 'public';
+	schema = 'public';
 
 	/** Postgres database pool size */
 	@Env('DB_POSTGRESDB_POOL_SIZE')
-	readonly poolSize = 2;
+	poolSize = 2;
 
 	@Nested
-	readonly ssl: PostgresSSLConfig;
+	ssl: PostgresSSLConfig;
 }
 
 @Config
 class MysqlConfig {
 	/** @deprecated MySQL database name */
 	@Env('DB_MYSQLDB_DATABASE')
-	database: string = 'n8n';
+	database = 'n8n';
 
 	/** MySQL database host */
 	@Env('DB_MYSQLDB_HOST')
-	readonly host: string = 'localhost';
+	host = 'localhost';
 
 	/** MySQL database password */
 	@Env('DB_MYSQLDB_PASSWORD')
-	readonly password: string = '';
+	password = '';
 
 	/** MySQL database port */
 	@Env('DB_MYSQLDB_PORT')
-	readonly port: number = 3306;
+	port: number = 3306;
 
 	/** MySQL database user */
 	@Env('DB_MYSQLDB_USER')
-	readonly user: string = 'root';
+	user = 'root';
 }
 
 @Config
 class SqliteConfig {
 	/** SQLite database file name */
 	@Env('DB_SQLITE_DATABASE')
-	readonly database: string = 'database.sqlite';
+	database = 'database.sqlite';
 
 	/** SQLite database pool size. Set to `0` to disable pooling. */
 	@Env('DB_SQLITE_POOL_SIZE')
-	readonly poolSize: number = 0;
+	poolSize: number = 0;
 
 	/**
 	 * Enable SQLite WAL mode.
 	 */
 	@Env('DB_SQLITE_ENABLE_WAL')
-	readonly enableWAL: boolean = this.poolSize > 1;
+	enableWAL = this.poolSize > 1;
 
 	/**
 	 * Run `VACUUM` on startup to rebuild the database, reducing file size and optimizing indexes.
@@ -124,7 +124,7 @@ class SqliteConfig {
 	 * @warning Long-running blocking operation that will increase startup time.
 	 */
 	@Env('DB_SQLITE_VACUUM_ON_STARTUP')
-	readonly executeVacuumOnStartup: boolean = false;
+	executeVacuumOnStartup = false;
 }
 
 @Config
@@ -135,17 +135,17 @@ export class DatabaseConfig {
 
 	/** Prefix for table names */
 	@Env('DB_TABLE_PREFIX')
-	readonly tablePrefix: string = '';
+	tablePrefix = '';
 
 	@Nested
-	readonly logging: LoggingConfig;
+	logging: LoggingConfig;
 
 	@Nested
-	readonly postgresdb: PostgresConfig;
+	postgresdb: PostgresConfig;
 
 	@Nested
-	readonly mysqldb: MysqlConfig;
+	mysqldb: MysqlConfig;
 
 	@Nested
-	readonly sqlite: SqliteConfig;
+	sqlite: SqliteConfig;
 }
diff --git a/packages/@n8n/config/src/configs/email.ts b/packages/@n8n/config/src/configs/email.ts
index 318c35238070f..f0e130c3b48be 100644
--- a/packages/@n8n/config/src/configs/email.ts
+++ b/packages/@n8n/config/src/configs/email.ts
@@ -4,75 +4,75 @@ import { Config, Env, Nested } from '../decorators';
 export class SmtpAuth {
 	/** SMTP login username */
 	@Env('N8N_SMTP_USER')
-	readonly user: string = '';
+	user = '';
 
 	/** SMTP login password */
 	@Env('N8N_SMTP_PASS')
-	readonly pass: string = '';
+	pass = '';
 
 	/** SMTP OAuth Service Client */
 	@Env('N8N_SMTP_OAUTH_SERVICE_CLIENT')
-	readonly serviceClient: string = '';
+	serviceClient = '';
 
 	/** SMTP OAuth Private Key */
 	@Env('N8N_SMTP_OAUTH_PRIVATE_KEY')
-	readonly privateKey: string = '';
+	privateKey = '';
 }
 
 @Config
 export class SmtpConfig {
 	/** SMTP server host */
 	@Env('N8N_SMTP_HOST')
-	readonly host: string = '';
+	host = '';
 
 	/** SMTP server port */
 	@Env('N8N_SMTP_PORT')
-	readonly port: number = 465;
+	port: number = 465;
 
 	/** Whether to use SSL for SMTP */
 	@Env('N8N_SMTP_SSL')
-	readonly secure: boolean = true;
+	secure: boolean = true;
 
 	/** Whether to use STARTTLS for SMTP when SSL is disabled */
 	@Env('N8N_SMTP_STARTTLS')
-	readonly startTLS: boolean = true;
+	startTLS: boolean = true;
 
 	/** How to display sender name */
 	@Env('N8N_SMTP_SENDER')
-	readonly sender: string = '';
+	sender = '';
 
 	@Nested
-	readonly auth: SmtpAuth;
+	auth: SmtpAuth;
 }
 
 @Config
 export class TemplateConfig {
 	/** Overrides default HTML template for inviting new people (use full path) */
 	@Env('N8N_UM_EMAIL_TEMPLATES_INVITE')
-	readonly invite: string = '';
+	invite = '';
 
 	/** Overrides default HTML template for resetting password (use full path) */
 	@Env('N8N_UM_EMAIL_TEMPLATES_PWRESET')
-	readonly passwordReset: string = '';
+	passwordReset = '';
 
 	/** Overrides default HTML template for notifying that a workflow was shared (use full path) */
 	@Env('N8N_UM_EMAIL_TEMPLATES_WORKFLOW_SHARED')
-	readonly workflowShared: string = '';
+	workflowShared = '';
 
 	/** Overrides default HTML template for notifying that credentials were shared (use full path) */
 	@Env('N8N_UM_EMAIL_TEMPLATES_CREDENTIALS_SHARED')
-	readonly credentialsShared: string = '';
+	credentialsShared = '';
 }
 
 @Config
 export class EmailConfig {
 	/** How to send emails */
 	@Env('N8N_EMAIL_MODE')
-	readonly mode: '' | 'smtp' = 'smtp';
+	mode: '' | 'smtp' = 'smtp';
 
 	@Nested
-	readonly smtp: SmtpConfig;
+	smtp: SmtpConfig;
 
 	@Nested
-	readonly template: TemplateConfig;
+	template: TemplateConfig;
 }
diff --git a/packages/@n8n/config/src/configs/endpoints.ts b/packages/@n8n/config/src/configs/endpoints.ts
index 7a04a8249f692..4957c5afa58d6 100644
--- a/packages/@n8n/config/src/configs/endpoints.ts
+++ b/packages/@n8n/config/src/configs/endpoints.ts
@@ -4,99 +4,99 @@ import { Config, Env, Nested } from '../decorators';
 class PrometheusMetricsConfig {
 	/** Whether to enable the `/metrics` endpoint to expose Prometheus metrics. */
 	@Env('N8N_METRICS')
-	readonly enable: boolean = false;
+	enable = false;
 
 	/** Prefix for Prometheus metric names. */
 	@Env('N8N_METRICS_PREFIX')
-	readonly prefix: string = 'n8n_';
+	prefix = 'n8n_';
 
 	/** Whether to expose system and Node.js metrics. See: https://www.npmjs.com/package/prom-client */
 	@Env('N8N_METRICS_INCLUDE_DEFAULT_METRICS')
-	readonly includeDefaultMetrics = true;
+	includeDefaultMetrics = true;
 
 	/** Whether to include a label for workflow ID on workflow metrics. */
 	@Env('N8N_METRICS_INCLUDE_WORKFLOW_ID_LABEL')
-	readonly includeWorkflowIdLabel: boolean = false;
+	includeWorkflowIdLabel = false;
 
 	/** Whether to include a label for node type on node metrics. */
 	@Env('N8N_METRICS_INCLUDE_NODE_TYPE_LABEL')
-	readonly includeNodeTypeLabel: boolean = false;
+	includeNodeTypeLabel = false;
 
 	/** Whether to include a label for credential type on credential metrics. */
 	@Env('N8N_METRICS_INCLUDE_CREDENTIAL_TYPE_LABEL')
-	readonly includeCredentialTypeLabel: boolean = false;
+	includeCredentialTypeLabel = false;
 
 	/** Whether to expose metrics for API endpoints. See: https://www.npmjs.com/package/express-prom-bundle */
 	@Env('N8N_METRICS_INCLUDE_API_ENDPOINTS')
-	readonly includeApiEndpoints: boolean = false;
+	includeApiEndpoints = false;
 
 	/** Whether to include a label for the path of API endpoint calls. */
 	@Env('N8N_METRICS_INCLUDE_API_PATH_LABEL')
-	readonly includeApiPathLabel: boolean = false;
+	includeApiPathLabel = false;
 
 	/** Whether to include a label for the HTTP method of API endpoint calls. */
 	@Env('N8N_METRICS_INCLUDE_API_METHOD_LABEL')
-	readonly includeApiMethodLabel: boolean = false;
+	includeApiMethodLabel = false;
 
 	/** Whether to include a label for the status code of API endpoint calls. */
 	@Env('N8N_METRICS_INCLUDE_API_STATUS_CODE_LABEL')
-	readonly includeApiStatusCodeLabel: boolean = false;
+	includeApiStatusCodeLabel = false;
 
 	/** Whether to include metrics for cache hits and misses. */
 	@Env('N8N_METRICS_INCLUDE_CACHE_METRICS')
-	readonly includeCacheMetrics: boolean = false;
+	includeCacheMetrics = false;
 
 	/** Whether to include metrics derived from n8n's internal events */
 	@Env('N8N_METRICS_INCLUDE_MESSAGE_EVENT_BUS_METRICS')
-	readonly includeMessageEventBusMetrics: boolean = false;
+	includeMessageEventBusMetrics = false;
 }
 
 @Config
 export class EndpointsConfig {
 	/** Max payload size in MiB */
 	@Env('N8N_PAYLOAD_SIZE_MAX')
-	readonly payloadSizeMax: number = 16;
+	payloadSizeMax: number = 16;
 
 	@Nested
-	readonly metrics: PrometheusMetricsConfig;
+	metrics: PrometheusMetricsConfig;
 
 	/** Path segment for REST API endpoints. */
 	@Env('N8N_ENDPOINT_REST')
-	readonly rest: string = 'rest';
+	rest = 'rest';
 
 	/** Path segment for form endpoints. */
 	@Env('N8N_ENDPOINT_FORM')
-	readonly form: string = 'form';
+	form = 'form';
 
 	/** Path segment for test form endpoints. */
 	@Env('N8N_ENDPOINT_FORM_TEST')
-	readonly formTest: string = 'form-test';
+	formTest = 'form-test';
 
 	/** Path segment for waiting form endpoints. */
 	@Env('N8N_ENDPOINT_FORM_WAIT')
-	readonly formWaiting: string = 'form-waiting';
+	formWaiting = 'form-waiting';
 
 	/** Path segment for webhook endpoints. */
 	@Env('N8N_ENDPOINT_WEBHOOK')
-	readonly webhook: string = 'webhook';
+	webhook = 'webhook';
 
 	/** Path segment for test webhook endpoints. */
 	@Env('N8N_ENDPOINT_WEBHOOK_TEST')
-	readonly webhookTest: string = 'webhook-test';
+	webhookTest = 'webhook-test';
 
 	/** Path segment for waiting webhook endpoints. */
 	@Env('N8N_ENDPOINT_WEBHOOK_WAIT')
-	readonly webhookWaiting: string = 'webhook-waiting';
+	webhookWaiting = 'webhook-waiting';
 
 	/** Whether to disable n8n's UI (frontend). */
 	@Env('N8N_DISABLE_UI')
-	readonly disableUi: boolean = false;
+	disableUi = false;
 
 	/** Whether to disable production webhooks on the main process, when using webhook-specific processes. */
 	@Env('N8N_DISABLE_PRODUCTION_MAIN_PROCESS')
-	readonly disableProductionWebhooksOnMainProcess: boolean = false;
+	disableProductionWebhooksOnMainProcess = false;
 
 	/** Colon-delimited list of additional endpoints to not open the UI on. */
 	@Env('N8N_ADDITIONAL_NON_UI_ROUTES')
-	readonly additionalNonUIRoutes: string = '';
+	additionalNonUIRoutes = '';
 }
diff --git a/packages/@n8n/config/src/configs/event-bus.ts b/packages/@n8n/config/src/configs/event-bus.ts
index ed1226fa923ac..87db613e63968 100644
--- a/packages/@n8n/config/src/configs/event-bus.ts
+++ b/packages/@n8n/config/src/configs/event-bus.ts
@@ -2,30 +2,30 @@ import { Config, Env, Nested } from '../decorators';
 
 @Config
 class LogWriterConfig {
-	/** Number of event log files to keep */
+	/* of event log files to keep */
 	@Env('N8N_EVENTBUS_LOGWRITER_KEEPLOGCOUNT')
-	readonly keepLogCount: number = 3;
+	keepLogCount = 3;
 
 	/** Max size (in KB) of an event log file before a new one is started */
 	@Env('N8N_EVENTBUS_LOGWRITER_MAXFILESIZEINKB')
-	readonly maxFileSizeInKB: number = 10240; // 10 MB
+	maxFileSizeInKB = 10240; // 10 MB
 
 	/** Basename of event log file */
 	@Env('N8N_EVENTBUS_LOGWRITER_LOGBASENAME')
-	readonly logBaseName: string = 'n8nEventLog';
+	logBaseName = 'n8nEventLog';
 }
 
 @Config
 export class EventBusConfig {
 	/** How often (in ms) to check for unsent event messages. Can in rare cases cause a message to be sent twice. `0` to disable */
 	@Env('N8N_EVENTBUS_CHECKUNSENTINTERVAL')
-	readonly checkUnsentInterval: number = 0;
+	checkUnsentInterval = 0;
 
 	/** Endpoint to retrieve n8n version information from */
 	@Nested
-	readonly logWriter: LogWriterConfig;
+	logWriter: LogWriterConfig;
 
 	/** Whether to recover execution details after a crash or only mark status executions as crashed. */
 	@Env('N8N_EVENTBUS_RECOVERY_MODE')
-	readonly crashRecoveryMode: 'simple' | 'extensive' = 'extensive';
+	crashRecoveryMode: 'simple' | 'extensive' = 'extensive';
 }
diff --git a/packages/@n8n/config/src/configs/external-secrets.ts b/packages/@n8n/config/src/configs/external-secrets.ts
index a5310d675e373..2e51be87bc6c0 100644
--- a/packages/@n8n/config/src/configs/external-secrets.ts
+++ b/packages/@n8n/config/src/configs/external-secrets.ts
@@ -4,9 +4,9 @@ import { Config, Env } from '../decorators';
 export class ExternalSecretsConfig {
 	/** How often (in seconds) to check for secret updates */
 	@Env('N8N_EXTERNAL_SECRETS_UPDATE_INTERVAL')
-	readonly updateInterval: number = 300;
+	updateInterval = 300;
 
 	/** Whether to prefer GET over LIST when fetching secrets from Hashicorp Vault */
 	@Env('N8N_EXTERNAL_SECRETS_PREFER_GET')
-	readonly preferGet: boolean = false;
+	preferGet = false;
 }
diff --git a/packages/@n8n/config/src/configs/external-storage.ts b/packages/@n8n/config/src/configs/external-storage.ts
index c876e0ee34465..3dd1448b44e38 100644
--- a/packages/@n8n/config/src/configs/external-storage.ts
+++ b/packages/@n8n/config/src/configs/external-storage.ts
@@ -4,39 +4,39 @@ import { Config, Env, Nested } from '../decorators';
 class S3BucketConfig {
 	/** Name of the n8n bucket in S3-compatible external storage */
 	@Env('N8N_EXTERNAL_STORAGE_S3_BUCKET_NAME')
-	readonly name: string = '';
+	name = '';
 
 	/** Region of the n8n bucket in S3-compatible external storage @example "us-east-1" */
 	@Env('N8N_EXTERNAL_STORAGE_S3_BUCKET_REGION')
-	readonly region: string = '';
+	region = '';
 }
 
 @Config
 class S3CredentialsConfig {
 	/** Access key in S3-compatible external storage */
 	@Env('N8N_EXTERNAL_STORAGE_S3_ACCESS_KEY')
-	readonly accessKey: string = '';
+	accessKey = '';
 
 	/** Access secret in S3-compatible external storage */
 	@Env('N8N_EXTERNAL_STORAGE_S3_ACCESS_SECRET')
-	readonly accessSecret: string = '';
+	accessSecret = '';
 }
 
 @Config
 class S3Config {
 	/** Host of the n8n bucket in S3-compatible external storage @example "s3.us-east-1.amazonaws.com" */
 	@Env('N8N_EXTERNAL_STORAGE_S3_HOST')
-	readonly host: string = '';
+	host = '';
 
 	@Nested
-	readonly bucket: S3BucketConfig;
+	bucket: S3BucketConfig;
 
 	@Nested
-	readonly credentials: S3CredentialsConfig;
+	credentials: S3CredentialsConfig;
 }
 
 @Config
 export class ExternalStorageConfig {
 	@Nested
-	readonly s3: S3Config;
+	s3: S3Config;
 }
diff --git a/packages/@n8n/config/src/configs/nodes.ts b/packages/@n8n/config/src/configs/nodes.ts
index f845607a8c0f0..dbe3705c6f99f 100644
--- a/packages/@n8n/config/src/configs/nodes.ts
+++ b/packages/@n8n/config/src/configs/nodes.ts
@@ -31,16 +31,16 @@ class CommunityPackagesConfig {
 export class NodesConfig {
 	/** Node types to load. Includes all if unspecified. @example '["n8n-nodes-base.hackerNews"]' */
 	@Env('NODES_INCLUDE')
-	readonly include: JsonStringArray = [];
+	include: JsonStringArray = [];
 
 	/** Node types not to load. Excludes none if unspecified. @example '["n8n-nodes-base.hackerNews"]' */
 	@Env('NODES_EXCLUDE')
-	readonly exclude: JsonStringArray = [];
+	exclude: JsonStringArray = [];
 
 	/** Node type to use as error trigger */
 	@Env('NODES_ERROR_TRIGGER_TYPE')
-	readonly errorTriggerType: string = 'n8n-nodes-base.errorTrigger';
+	errorTriggerType = 'n8n-nodes-base.errorTrigger';
 
 	@Nested
-	readonly communityPackages: CommunityPackagesConfig;
+	communityPackages: CommunityPackagesConfig;
 }
diff --git a/packages/@n8n/config/src/configs/public-api.ts b/packages/@n8n/config/src/configs/public-api.ts
index 33e3bf3fc38bc..b62cac68c7834 100644
--- a/packages/@n8n/config/src/configs/public-api.ts
+++ b/packages/@n8n/config/src/configs/public-api.ts
@@ -4,13 +4,13 @@ import { Config, Env } from '../decorators';
 export class PublicApiConfig {
 	/** Whether to disable the Public API */
 	@Env('N8N_PUBLIC_API_DISABLED')
-	readonly disabled: boolean = false;
+	disabled = false;
 
 	/** Path segment for the Public API */
 	@Env('N8N_PUBLIC_API_ENDPOINT')
-	readonly path: string = 'api';
+	path = 'api';
 
 	/** Whether to disable the Swagger UI for the Public API */
 	@Env('N8N_PUBLIC_API_SWAGGERUI_DISABLED')
-	readonly swaggerUiDisabled: boolean = false;
+	swaggerUiDisabled = false;
 }
diff --git a/packages/@n8n/config/src/configs/templates.ts b/packages/@n8n/config/src/configs/templates.ts
index 3e10c892b3469..3b05048b36301 100644
--- a/packages/@n8n/config/src/configs/templates.ts
+++ b/packages/@n8n/config/src/configs/templates.ts
@@ -4,9 +4,9 @@ import { Config, Env } from '../decorators';
 export class TemplatesConfig {
 	/** Whether to load workflow templates. */
 	@Env('N8N_TEMPLATES_ENABLED')
-	readonly enabled: boolean = true;
+	enabled = true;
 
 	/** Host to retrieve workflow templates from endpoints. */
 	@Env('N8N_TEMPLATES_HOST')
-	readonly host: string = 'https://api.n8n.io/api/';
+	host = 'https://api.n8n.io/api/';
 }
diff --git a/packages/@n8n/config/src/configs/version-notifications.ts b/packages/@n8n/config/src/configs/version-notifications.ts
index 1aa693228d494..5fe495ed6c02e 100644
--- a/packages/@n8n/config/src/configs/version-notifications.ts
+++ b/packages/@n8n/config/src/configs/version-notifications.ts
@@ -4,13 +4,13 @@ import { Config, Env } from '../decorators';
 export class VersionNotificationsConfig {
 	/** Whether to request notifications about new n8n versions */
 	@Env('N8N_VERSION_NOTIFICATIONS_ENABLED')
-	readonly enabled: boolean = true;
+	enabled = true;
 
 	/** Endpoint to retrieve n8n version information from */
 	@Env('N8N_VERSION_NOTIFICATIONS_ENDPOINT')
-	readonly endpoint: string = 'https://api.n8n.io/api/versions/';
+	endpoint = 'https://api.n8n.io/api/versions/';
 
 	/** URL for versions panel to page instructing user on how to update n8n instance */
 	@Env('N8N_VERSION_NOTIFICATIONS_INFO_URL')
-	readonly infoUrl: string = 'https://docs.n8n.io/hosting/installation/updating/';
+	infoUrl = 'https://docs.n8n.io/hosting/installation/updating/';
 }
diff --git a/packages/@n8n/config/src/configs/workflows.ts b/packages/@n8n/config/src/configs/workflows.ts
index b19f4bc95d7e0..9ca004c886b58 100644
--- a/packages/@n8n/config/src/configs/workflows.ts
+++ b/packages/@n8n/config/src/configs/workflows.ts
@@ -4,17 +4,14 @@ import { Config, Env } from '../decorators';
 export class WorkflowsConfig {
 	/** Default name for workflow */
 	@Env('WORKFLOWS_DEFAULT_NAME')
-	readonly defaultName: string = 'My workflow';
+	defaultName = 'My workflow';
 
 	/** Show onboarding flow in new workflow */
 	@Env('N8N_ONBOARDING_FLOW_DISABLED')
-	readonly onboardingFlowDisabled: boolean = false;
+	onboardingFlowDisabled = false;
 
 	/** Default option for which workflows may call the current workflow */
 	@Env('N8N_WORKFLOW_CALLER_POLICY_DEFAULT_OPTION')
-	readonly callerPolicyDefaultOption:
-		| 'any'
-		| 'none'
-		| 'workflowsFromAList'
-		| 'workflowsFromSameOwner' = 'workflowsFromSameOwner';
+	callerPolicyDefaultOption: 'any' | 'none' | 'workflowsFromAList' | 'workflowsFromSameOwner' =
+		'workflowsFromSameOwner';
 }
diff --git a/packages/@n8n/config/src/index.ts b/packages/@n8n/config/src/index.ts
index d7bb09889d5ab..33d3e676550ba 100644
--- a/packages/@n8n/config/src/index.ts
+++ b/packages/@n8n/config/src/index.ts
@@ -11,6 +11,7 @@ import { NodesConfig } from './configs/nodes';
 import { ExternalStorageConfig } from './configs/external-storage';
 import { WorkflowsConfig } from './configs/workflows';
 import { EndpointsConfig } from './configs/endpoints';
+import { CacheConfig } from './configs/cache';
 
 @Config
 class UserManagementConfig {
@@ -75,4 +76,7 @@ export class GlobalConfig {
 
 	@Nested
 	readonly endpoints: EndpointsConfig;
+
+	@Nested
+	readonly cache: CacheConfig;
 }
diff --git a/packages/@n8n/config/test/config.test.ts b/packages/@n8n/config/test/config.test.ts
index a36a74d1e25c7..db27b280edeae 100644
--- a/packages/@n8n/config/test/config.test.ts
+++ b/packages/@n8n/config/test/config.test.ts
@@ -172,6 +172,17 @@ describe('GlobalConfig', () => {
 			webhookTest: 'webhook-test',
 			webhookWaiting: 'webhook-waiting',
 		},
+		cache: {
+			backend: 'auto',
+			memory: {
+				maxSize: 3145728,
+				ttl: 3600000,
+			},
+			redis: {
+				prefix: 'redis',
+				ttl: 3600000,
+			},
+		},
 	};
 
 	it('should use all default values when no env variables are defined', () => {
diff --git a/packages/cli/src/config/schema.ts b/packages/cli/src/config/schema.ts
index f99c14885ddf9..c424066c8554f 100644
--- a/packages/cli/src/config/schema.ts
+++ b/packages/cli/src/config/schema.ts
@@ -660,43 +660,6 @@ export const schema = {
 		},
 	},
 
-	cache: {
-		backend: {
-			doc: 'Backend to use for caching',
-			format: ['memory', 'redis', 'auto'] as const,
-			default: 'auto',
-			env: 'N8N_CACHE_BACKEND',
-		},
-		memory: {
-			maxSize: {
-				doc: 'Maximum size of memory cache in bytes',
-				format: Number,
-				default: 3 * 1024 * 1024, // 3 MB
-				env: 'N8N_CACHE_MEMORY_MAX_SIZE',
-			},
-			ttl: {
-				doc: 'Time to live for cached items in memory (in ms)',
-				format: Number,
-				default: 3600 * 1000, // 1 hour
-				env: 'N8N_CACHE_MEMORY_TTL',
-			},
-		},
-		redis: {
-			prefix: {
-				doc: 'Prefix for all cache keys',
-				format: String,
-				default: 'cache',
-				env: 'N8N_CACHE_REDIS_KEY_PREFIX',
-			},
-			ttl: {
-				doc: 'Time to live for cached items in redis (in ms), 0 for no TTL',
-				format: Number,
-				default: 3600 * 1000, // 1 hour
-				env: 'N8N_CACHE_REDIS_TTL',
-			},
-		},
-	},
-
 	/**
 	 * @important Do not remove until after cloud hooks are updated to stop using convict config.
 	 */
diff --git a/packages/cli/src/services/cache/cache.service.ts b/packages/cli/src/services/cache/cache.service.ts
index 75dad03b49d26..daf51911ff362 100644
--- a/packages/cli/src/services/cache/cache.service.ts
+++ b/packages/cli/src/services/cache/cache.service.ts
@@ -13,6 +13,7 @@ import type {
 } from '@/services/cache/cache.types';
 import { TIME } from '@/constants';
 import { TypedEmitter } from '@/TypedEmitter';
+import { GlobalConfig } from '@n8n/config';
 
 type CacheEvents = {
 	'metrics.cache.hit': never;
@@ -22,12 +23,15 @@ type CacheEvents = {
 
 @Service()
 export class CacheService extends TypedEmitter<CacheEvents> {
+	constructor(private readonly globalConfig: GlobalConfig) {
+		super();
+	}
+
 	private cache: TaggedRedisCache | TaggedMemoryCache;
 
 	async init() {
-		const backend = config.getEnv('cache.backend');
+		const { backend } = this.globalConfig.cache;
 		const mode = config.getEnv('executions.mode');
-		const ttl = config.getEnv('cache.redis.ttl');
 
 		const useRedis = backend === 'redis' || (backend === 'auto' && mode === 'queue');
 
@@ -36,8 +40,9 @@ export class CacheService extends TypedEmitter<CacheEvents> {
 			const redisClientService = Container.get(RedisClientService);
 
 			const prefixBase = config.getEnv('redis.prefix');
-			const cachePrefix = config.getEnv('cache.redis.prefix');
-			const prefix = redisClientService.toValidPrefix(`${prefixBase}:${cachePrefix}:`);
+			const prefix = redisClientService.toValidPrefix(
+				`${prefixBase}:${this.globalConfig.cache.redis.prefix}:`,
+			);
 
 			const redisClient = redisClientService.createClient({
 				type: 'client(cache)',
@@ -45,7 +50,9 @@ export class CacheService extends TypedEmitter<CacheEvents> {
 			});
 
 			const { redisStoreUsingClient } = await import('@/services/cache/redis.cache-manager');
-			const redisStore = redisStoreUsingClient(redisClient, { ttl });
+			const redisStore = redisStoreUsingClient(redisClient, {
+				ttl: this.globalConfig.cache.redis.ttl,
+			});
 
 			const redisCache = await caching(redisStore);
 
@@ -54,7 +61,7 @@ export class CacheService extends TypedEmitter<CacheEvents> {
 			return;
 		}
 
-		const maxSize = config.getEnv('cache.memory.maxSize');
+		const { maxSize, ttl } = this.globalConfig.cache.memory;
 
 		const sizeCalculation = (item: unknown) => {
 			const str = jsonStringify(item, { replaceCircularRefs: true });
diff --git a/packages/cli/test/integration/activation-errors.service.test.ts b/packages/cli/test/integration/activation-errors.service.test.ts
index 7635660db3aca..5d56f0dc90d6a 100644
--- a/packages/cli/test/integration/activation-errors.service.test.ts
+++ b/packages/cli/test/integration/activation-errors.service.test.ts
@@ -1,8 +1,13 @@
 import { ActivationErrorsService } from '@/ActivationErrors.service';
 import { CacheService } from '@/services/cache/cache.service';
+import { GlobalConfig } from '@n8n/config';
+import { mockInstance } from '@test/mocking';
 
 describe('ActivationErrorsService', () => {
-	const cacheService = new CacheService();
+	const globalConfig = mockInstance(GlobalConfig, {
+		cache: { backend: 'memory', memory: { maxSize: 3 * 1024 * 1024, ttl: 3600 * 1000 } },
+	});
+	const cacheService = new CacheService(globalConfig);
 	const activationErrorsService = new ActivationErrorsService(cacheService);
 
 	const firstWorkflowId = 'GSG0etbfTA2CNPDX';
diff --git a/packages/cli/test/integration/prometheus-metrics.test.ts b/packages/cli/test/integration/prometheus-metrics.test.ts
index 9f6a0fad6e89d..1eccb9b7d0ce2 100644
--- a/packages/cli/test/integration/prometheus-metrics.test.ts
+++ b/packages/cli/test/integration/prometheus-metrics.test.ts
@@ -12,8 +12,8 @@ jest.unmock('@/eventbus/MessageEventBus/MessageEventBus');
 const toLines = (response: Response) => response.text.trim().split('\n');
 
 const globalConfig = Container.get(GlobalConfig);
-// @ts-expect-error `metrics` is a readonly property
 globalConfig.endpoints.metrics = {
+	enable: true,
 	prefix: 'n8n_test_',
 	includeDefaultMetrics: true,
 	includeApiEndpoints: true,
diff --git a/packages/cli/test/unit/services/cache.service.test.ts b/packages/cli/test/unit/services/cache.service.test.ts
index a742b20698d46..5c024b2903cc7 100644
--- a/packages/cli/test/unit/services/cache.service.test.ts
+++ b/packages/cli/test/unit/services/cache.service.test.ts
@@ -1,6 +1,8 @@
 import { CacheService } from '@/services/cache/cache.service';
 import config from '@/config';
 import { sleep } from 'n8n-workflow';
+import { GlobalConfig } from '@n8n/config';
+import Container from 'typedi';
 
 jest.mock('ioredis', () => {
 	const Redis = require('ioredis-mock');
@@ -13,10 +15,12 @@ jest.mock('ioredis', () => {
 for (const backend of ['memory', 'redis'] as const) {
 	describe(backend, () => {
 		let cacheService: CacheService;
+		let globalConfig: GlobalConfig;
 
 		beforeAll(async () => {
-			config.set('cache.backend', backend);
-			cacheService = new CacheService();
+			globalConfig = Container.get(GlobalConfig);
+			globalConfig.cache.backend = backend;
+			cacheService = new CacheService(globalConfig);
 			await cacheService.init();
 		});
 
@@ -43,7 +47,7 @@ for (const backend of ['memory', 'redis'] as const) {
 
 			if (backend === 'memory') {
 				test('should honor max size when enough', async () => {
-					config.set('cache.memory.maxSize', 16); // enough bytes for "withoutUnicode"
+					globalConfig.cache.memory.maxSize = 16; // enough bytes for "withoutUnicode"
 
 					await cacheService.init();
 					await cacheService.set('key', 'withoutUnicode');
@@ -51,12 +55,12 @@ for (const backend of ['memory', 'redis'] as const) {
 					await expect(cacheService.get('key')).resolves.toBe('withoutUnicode');
 
 					// restore
-					config.set('cache.memory.maxSize', 3 * 1024 * 1024);
+					globalConfig.cache.memory.maxSize = 3 * 1024 * 1024;
 					await cacheService.init();
 				});
 
 				test('should honor max size when not enough', async () => {
-					config.set('cache.memory.maxSize', 16); // not enough bytes for "withUnicodeԱԲԳ"
+					globalConfig.cache.memory.maxSize = 16; // not enough bytes for "withUnicodeԱԲԳ"
 
 					await cacheService.init();
 					await cacheService.set('key', 'withUnicodeԱԲԳ');
@@ -64,7 +68,8 @@ for (const backend of ['memory', 'redis'] as const) {
 					await expect(cacheService.get('key')).resolves.toBeUndefined();
 
 					// restore
-					config.set('cache.memory.maxSize', 3 * 1024 * 1024);
+					globalConfig.cache.memory.maxSize = 3 * 1024 * 1024;
+					// restore
 					await cacheService.init();
 				});
 			}

From 8131d66f8ca1b1da00597a12859ee4372148a0c9 Mon Sep 17 00:00:00 2001
From: Michael Kret <88898367+michael-radency@users.noreply.github.com>
Date: Mon, 5 Aug 2024 11:04:47 +0300
Subject: [PATCH 070/168] fix(core): Webhook and form baseUrl missing (#10290)

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

diff --git a/packages/cli/src/WorkflowExecuteAdditionalData.ts b/packages/cli/src/WorkflowExecuteAdditionalData.ts
index 74c469284a7eb..ddb8c24818667 100644
--- a/packages/cli/src/WorkflowExecuteAdditionalData.ts
+++ b/packages/cli/src/WorkflowExecuteAdditionalData.ts
@@ -1000,10 +1000,10 @@ export async function getBase(
 		executeWorkflow,
 		restApiUrl: urlBaseWebhook + globalConfig.endpoints.rest,
 		instanceBaseUrl: urlBaseWebhook,
-		formWaitingBaseUrl: globalConfig.endpoints.formWaiting,
-		webhookBaseUrl: globalConfig.endpoints.webhook,
-		webhookWaitingBaseUrl: globalConfig.endpoints.webhookWaiting,
-		webhookTestBaseUrl: globalConfig.endpoints.webhookTest,
+		formWaitingBaseUrl: urlBaseWebhook + globalConfig.endpoints.formWaiting,
+		webhookBaseUrl: urlBaseWebhook + globalConfig.endpoints.webhook,
+		webhookWaitingBaseUrl: urlBaseWebhook + globalConfig.endpoints.webhookWaiting,
+		webhookTestBaseUrl: urlBaseWebhook + globalConfig.endpoints.webhookTest,
 		currentNodeParameters,
 		executionTimeoutTimestamp,
 		userId,

From afa43e75f64412c008c1c6c4e55932e8fcf21644 Mon Sep 17 00:00:00 2001
From: Tomi Turtiainen <10324676+tomi@users.noreply.github.com>
Date: Mon, 5 Aug 2024 12:12:25 +0300
Subject: [PATCH 071/168] test(core): Move unit tests closer to testable
 components (no-changelog) (#10287)

---
 packages/cli/.eslintrc.js                     |  4 +-
 packages/cli/src/ActiveWebhooks.ts            |  2 -
 .../ExternalSecretsManager.ee.test.ts}        |  4 +-
 .../Ldap/__tests__}/helpers.test.ts           |  2 +-
 .../__tests__}/UserManagementMailer.test.ts   |  0
 .../cli/src/WorkflowExecuteAdditionalData.ts  |  1 -
 .../__tests__}/ActiveExecutions.test.ts       |  0
 .../__tests__}/CredentialTypes.test.ts        |  2 +-
 .../__tests__}/CredentialsHelper.test.ts      |  2 +-
 .../unit => src/__tests__}/License.test.ts    |  2 +-
 .../__tests__}/TestWebhooks.test.ts           |  0
 .../__tests__}/WaitTracker.test.ts            |  0
 .../__tests__}/WebhookHelpers.test.ts         |  0
 .../WorkflowExecuteAdditionalData.test.ts     |  2 +-
 .../__tests__}/WorkflowHelpers.test.ts        |  0
 .../__tests__}/WorkflowRunner.test.ts         | 10 ++---
 .../auth/__tests__}/auth.service.test.ts      |  0
 .../commands/db/__tests__}/revert.test.ts     |  2 +-
 .../config/__tests__}/index.test.ts           |  0
 .../__tests__}/curl.controller.test.ts        |  0
 ...dynamic-node-parameters.controller.test.ts |  0
 .../__tests__}/me.controller.test.ts          |  4 +-
 .../__tests__}/owner.controller.test.ts       |  4 +-
 .../__tests__}/translation.controller.test.ts |  0
 .../userSettings.controller.test.ts           |  4 +-
 .../oAuth1Credential.controller.test.ts       |  2 +-
 .../oAuth2Credential.controller.test.ts       |  2 +-
 .../__tests__/credentials.service.test.ts     |  2 +-
 .../entities/__tests__}/user.entity.test.ts   |  0
 .../__tests__}/execution.repository.test.ts   |  3 +-
 .../sharedCredentials.repository.test.ts      |  2 +-
 .../__tests__}/workflowStatistics.test.ts     |  2 +-
 .../utils/__tests__}/customValidators.test.ts |  0
 .../utils/__tests__}/migrationHelpers.test.ts |  0
 .../decorators/__tests__}/OnShutdown.test.ts  |  0
 .../__tests__}/controller.registry.test.ts    |  0
 .../sourceControlGit.service.test.ts}         |  0
 .../__tests__/sourceControlHelper.ee.test.ts} |  2 +-
 .../webhook-not-found.error.test.ts}          |  0
 .../__tests__}/restoreBinaryDataId.test.ts    |  4 +-
 .../__tests__}/saveExecutionProgress.test.ts  |  2 +-
 .../__tests__}/toSaveSettings.test.ts         |  2 +-
 .../__tests__}/executions.controller.test.ts  |  0
 .../parse-range-query.middleware.test.ts      |  0
 .../__tests__}/license.service.test.ts        |  0
 .../listQuery/__tests__}/listQuery.test.ts    |  0
 .../posthog/__tests__}/PostHog.test.ts        |  2 +-
 .../push => src/push/__tests__}/index.test.ts |  2 +-
 .../push/__tests__}/websocket.push.test.ts    |  2 +-
 .../ExecutionMetadataService.test.ts          |  2 +-
 .../activeWorkflows.service.test.ts           |  0
 .../communityPackages.service.test.ts         | 11 ++----
 .../credentials-tester.service.test.ts}       |  0
 .../services/__tests__}/curl.service.test.ts  |  0
 .../services/__tests__}/hooks.service.test.ts |  0
 .../services/__tests__}/jwt.service.test.ts   |  0
 .../__tests__}/naming.service.test.ts         |  2 +-
 .../__tests__}/orchestration.service.test.ts  |  2 +-
 .../__tests__}/ownership.service.test.ts      |  4 +-
 .../__tests__}/password.utility.test.ts       |  0
 .../services/__tests__}/redis.service.test.ts |  4 +-
 ...test-webhook-registrations.service.test.ts |  0
 .../services/__tests__}/user.service.test.ts  |  2 +-
 .../__tests__}/webhook.service.test.ts        |  2 +-
 .../workflow-statistics.service.test.ts       |  2 +-
 .../__tests__}/cache-mock.service.test.ts     |  0
 .../cache/__tests__}/cache.service.test.ts    |  0
 .../__tests__}/Shutdown.service.test.ts       |  0
 .../saml/__tests__}/saml.service.ee.test.ts   |  2 +-
 .../sso/saml/__tests__}/samlHelpers.test.ts   |  2 +-
 .../telemetry/__tests__/telemetry.test.ts}    |  4 +-
 .../workflow-execution.service.test.ts        |  0
 .../workflowHistory.service.ee.test.ts        |  4 +-
 .../workflowHistoryHelper.ee.test.ts}         |  2 +-
 .../integration/PermissionChecker.test.ts     | 33 +++++++++++++++-
 .../{unit => integration}/webhooks.test.ts    |  2 +-
 packages/cli/test/shared/flushPromises.ts     |  6 +++
 .../cli/test/{unit => }/shared/mockObjects.ts |  2 +-
 .../cli/test/{unit => }/shared/testData.ts    |  0
 packages/cli/test/unit/Helpers.ts             | 38 -------------------
 80 files changed, 95 insertions(+), 105 deletions(-)
 rename packages/cli/{test/unit/ExternalSecrets/ExternalSecretsManager.test.ts => src/ExternalSecrets/__tests__/ExternalSecretsManager.ee.test.ts} (97%)
 rename packages/cli/{test/unit/Ldap => src/Ldap/__tests__}/helpers.test.ts (96%)
 rename packages/cli/{test/unit => src/UserManagement/email/__tests__}/UserManagementMailer.test.ts (100%)
 rename packages/cli/{test/unit => src/__tests__}/ActiveExecutions.test.ts (100%)
 rename packages/cli/{test/unit => src/__tests__}/CredentialTypes.test.ts (95%)
 rename packages/cli/{test/unit => src/__tests__}/CredentialsHelper.test.ts (99%)
 rename packages/cli/{test/unit => src/__tests__}/License.test.ts (99%)
 rename packages/cli/{test/unit => src/__tests__}/TestWebhooks.test.ts (100%)
 rename packages/cli/{test/unit => src/__tests__}/WaitTracker.test.ts (100%)
 rename packages/cli/{test/unit => src/__tests__}/WebhookHelpers.test.ts (100%)
 rename packages/cli/{test/unit => src/__tests__}/WorkflowExecuteAdditionalData.test.ts (96%)
 rename packages/cli/{test/unit => src/__tests__}/WorkflowHelpers.test.ts (100%)
 rename packages/cli/{test/unit => src/__tests__}/WorkflowRunner.test.ts (86%)
 rename packages/cli/{test/unit/auth => src/auth/__tests__}/auth.service.test.ts (100%)
 rename packages/cli/{test/unit/commands/db => src/commands/db/__tests__}/revert.test.ts (98%)
 rename packages/cli/{test/unit/config => src/config/__tests__}/index.test.ts (100%)
 rename packages/cli/{test/unit/controllers => src/controllers/__tests__}/curl.controller.test.ts (100%)
 rename packages/cli/{test/unit/controllers => src/controllers/__tests__}/dynamic-node-parameters.controller.test.ts (100%)
 rename packages/cli/{test/unit/controllers => src/controllers/__tests__}/me.controller.test.ts (98%)
 rename packages/cli/{test/unit/controllers => src/controllers/__tests__}/owner.controller.test.ts (97%)
 rename packages/cli/{test/unit/controllers => src/controllers/__tests__}/translation.controller.test.ts (100%)
 rename packages/cli/{test/unit/controllers => src/controllers/__tests__}/userSettings.controller.test.ts (96%)
 rename packages/cli/{test/unit/controllers/oauth => src/controllers/oauth/__tests__}/oAuth1Credential.controller.test.ts (99%)
 rename packages/cli/{test/unit/controllers/oauth => src/controllers/oauth/__tests__}/oAuth2Credential.controller.test.ts (99%)
 rename packages/cli/{test/unit/databases/entities => src/databases/entities/__tests__}/user.entity.test.ts (100%)
 rename packages/cli/{test/unit/repositories => src/databases/repositories/__tests__}/execution.repository.test.ts (95%)
 rename packages/cli/{test/unit/repositories => src/databases/repositories/__tests__}/sharedCredentials.repository.test.ts (98%)
 rename packages/cli/{test/unit/repositories => src/databases/repositories/__tests__}/workflowStatistics.test.ts (96%)
 rename packages/cli/{test/unit/databases/utils => src/databases/utils/__tests__}/customValidators.test.ts (100%)
 rename packages/cli/{test/unit/databases/utils => src/databases/utils/__tests__}/migrationHelpers.test.ts (100%)
 rename packages/cli/{test/unit/decorators => src/decorators/__tests__}/OnShutdown.test.ts (100%)
 rename packages/cli/{test/unit/decorators => src/decorators/__tests__}/controller.registry.test.ts (100%)
 rename packages/cli/{test/unit/GitService.test.ts => src/environments/sourceControl/__tests__/sourceControlGit.service.test.ts} (100%)
 rename packages/cli/{test/unit/SourceControl.test.ts => src/environments/sourceControl/__tests__/sourceControlHelper.ee.test.ts} (99%)
 rename packages/cli/{test/unit/utils.test.ts => src/errors/response-errors/__tests__/webhook-not-found.error.test.ts} (100%)
 rename packages/cli/{test/unit/execution-lifecyle => src/executionLifecycleHooks/__tests__}/restoreBinaryDataId.test.ts (97%)
 rename packages/cli/{test/unit/execution-lifecyle => src/executionLifecycleHooks/__tests__}/saveExecutionProgress.test.ts (98%)
 rename packages/cli/{test/unit/execution-lifecyle => src/executionLifecycleHooks/__tests__}/toSaveSettings.test.ts (98%)
 rename packages/cli/{test/unit/controllers => src/executions/__tests__}/executions.controller.test.ts (100%)
 rename packages/cli/{test/unit/middleware/executions => src/executions/__tests__}/parse-range-query.middleware.test.ts (100%)
 rename packages/cli/{test/unit/license => src/license/__tests__}/license.service.test.ts (100%)
 rename packages/cli/{test/unit/middleware => src/middlewares/listQuery/__tests__}/listQuery.test.ts (100%)
 rename packages/cli/{test/unit => src/posthog/__tests__}/PostHog.test.ts (97%)
 rename packages/cli/{test/unit/push => src/push/__tests__}/index.test.ts (96%)
 rename packages/cli/{test/unit/push => src/push/__tests__}/websocket.push.test.ts (98%)
 rename packages/cli/{test/unit => src/services/__tests__}/ExecutionMetadataService.test.ts (94%)
 rename packages/cli/{test/unit/services => src/services/__tests__}/activeWorkflows.service.test.ts (100%)
 rename packages/cli/{test/unit/services => src/services/__tests__}/communityPackages.service.test.ts (97%)
 rename packages/cli/{test/unit/credentials-tester.unit.test.ts => src/services/__tests__/credentials-tester.service.test.ts} (100%)
 rename packages/cli/{test/unit/services => src/services/__tests__}/curl.service.test.ts (100%)
 rename packages/cli/{test/unit/services => src/services/__tests__}/hooks.service.test.ts (100%)
 rename packages/cli/{test/unit/services => src/services/__tests__}/jwt.service.test.ts (100%)
 rename packages/cli/{test/unit/services => src/services/__tests__}/naming.service.test.ts (98%)
 rename packages/cli/{test/unit/services => src/services/__tests__}/orchestration.service.test.ts (99%)
 rename packages/cli/{test/unit/services => src/services/__tests__}/ownership.service.test.ts (98%)
 rename packages/cli/{test/unit/utilities => src/services/__tests__}/password.utility.test.ts (100%)
 rename packages/cli/{test/unit/services => src/services/__tests__}/redis.service.test.ts (94%)
 rename packages/cli/{test/unit/services => src/services/__tests__}/test-webhook-registrations.service.test.ts (100%)
 rename packages/cli/{test/unit/services => src/services/__tests__}/user.service.test.ts (98%)
 rename packages/cli/{test/unit/services => src/services/__tests__}/webhook.service.test.ts (99%)
 rename packages/cli/{test/unit/services => src/services/__tests__}/workflow-statistics.service.test.ts (99%)
 rename packages/cli/{test/unit/services => src/services/cache/__tests__}/cache-mock.service.test.ts (100%)
 rename packages/cli/{test/unit/services => src/services/cache/__tests__}/cache.service.test.ts (100%)
 rename packages/cli/{test/unit/shutdown => src/shutdown/__tests__}/Shutdown.service.test.ts (100%)
 rename packages/cli/{test/unit/sso/saml => src/sso/saml/__tests__}/saml.service.ee.test.ts (97%)
 rename packages/cli/{test/unit/sso/saml => src/sso/saml/__tests__}/samlHelpers.test.ts (96%)
 rename packages/cli/{test/unit/Telemetry.test.ts => src/telemetry/__tests__/telemetry.test.ts} (99%)
 rename packages/cli/{test/unit => src/workflows/__tests__}/workflow-execution.service.test.ts (100%)
 rename packages/cli/{test/unit/services => src/workflows/workflowHistory/__tests__}/workflowHistory.service.ee.test.ts (96%)
 rename packages/cli/{test/unit/workflowHistoryHelper.test.ts => src/workflows/workflowHistory/__tests__/workflowHistoryHelper.ee.test.ts} (96%)
 rename packages/cli/test/{unit => integration}/webhooks.test.ts (98%)
 create mode 100644 packages/cli/test/shared/flushPromises.ts
 rename packages/cli/test/{unit => }/shared/mockObjects.ts (94%)
 rename packages/cli/test/{unit => }/shared/testData.ts (100%)
 delete mode 100644 packages/cli/test/unit/Helpers.ts

diff --git a/packages/cli/.eslintrc.js b/packages/cli/.eslintrc.js
index bb1041607ddcd..17ecfee499ae9 100644
--- a/packages/cli/.eslintrc.js
+++ b/packages/cli/.eslintrc.js
@@ -40,13 +40,13 @@ module.exports = {
 
 	overrides: [
 		{
-			files: ['./src/databases/**/*.ts', './test/**/*.ts'],
+			files: ['./src/databases/**/*.ts', './test/**/*.ts', './src/**/__tests__/**/*.ts'],
 			rules: {
 				'n8n-local-rules/misplaced-n8n-typeorm-import': 'off',
 			},
 		},
 		{
-			files: ['./test/**/*.ts'],
+			files: ['./test/**/*.ts', './src/**/__tests__/**/*.ts'],
 			rules: {
 				'n8n-local-rules/no-type-unsafe-event-emitter': 'off',
 			},
diff --git a/packages/cli/src/ActiveWebhooks.ts b/packages/cli/src/ActiveWebhooks.ts
index 79626df025f75..43136e75d384a 100644
--- a/packages/cli/src/ActiveWebhooks.ts
+++ b/packages/cli/src/ActiveWebhooks.ts
@@ -72,11 +72,9 @@ export class ActiveWebhooks implements IWebhookManager {
 			const pathElements = path.split('/').slice(1);
 
 			// extracting params from path
-			// @ts-ignore
 			webhook.webhookPath.split('/').forEach((ele, index) => {
 				if (ele.startsWith(':')) {
 					// write params to req.params
-					// @ts-ignore
 					request.params[ele.slice(1)] = pathElements[index];
 				}
 			});
diff --git a/packages/cli/test/unit/ExternalSecrets/ExternalSecretsManager.test.ts b/packages/cli/src/ExternalSecrets/__tests__/ExternalSecretsManager.ee.test.ts
similarity index 97%
rename from packages/cli/test/unit/ExternalSecrets/ExternalSecretsManager.test.ts
rename to packages/cli/src/ExternalSecrets/__tests__/ExternalSecretsManager.ee.test.ts
index cf72688d24397..92475c93115e9 100644
--- a/packages/cli/test/unit/ExternalSecrets/ExternalSecretsManager.test.ts
+++ b/packages/cli/src/ExternalSecrets/__tests__/ExternalSecretsManager.ee.test.ts
@@ -6,13 +6,13 @@ import { License } from '@/License';
 import { ExternalSecretsManager } from '@/ExternalSecrets/ExternalSecretsManager.ee';
 import { ExternalSecretsProviders } from '@/ExternalSecrets/ExternalSecretsProviders.ee';
 import { InternalHooks } from '@/InternalHooks';
-import { mockInstance } from '../../shared/mocking';
+import { mockInstance } from '@test/mocking';
 import {
 	DummyProvider,
 	ErrorProvider,
 	FailedProvider,
 	MockProviders,
-} from '../../shared/ExternalSecrets/utils';
+} from '@test/ExternalSecrets/utils';
 import { mock } from 'jest-mock-extended';
 
 describe('External Secrets Manager', () => {
diff --git a/packages/cli/test/unit/Ldap/helpers.test.ts b/packages/cli/src/Ldap/__tests__/helpers.test.ts
similarity index 96%
rename from packages/cli/test/unit/Ldap/helpers.test.ts
rename to packages/cli/src/Ldap/__tests__/helpers.test.ts
index debb96da382d1..719adea76c5a7 100644
--- a/packages/cli/test/unit/Ldap/helpers.test.ts
+++ b/packages/cli/src/Ldap/__tests__/helpers.test.ts
@@ -1,5 +1,5 @@
 import { UserRepository } from '@/databases/repositories/user.repository';
-import { mockInstance } from '../../shared/mocking';
+import { mockInstance } from '@test/mocking';
 import * as helpers from '@/Ldap/helpers.ee';
 import { AuthIdentity } from '@/databases/entities/AuthIdentity';
 import { User } from '@/databases/entities/User';
diff --git a/packages/cli/test/unit/UserManagementMailer.test.ts b/packages/cli/src/UserManagement/email/__tests__/UserManagementMailer.test.ts
similarity index 100%
rename from packages/cli/test/unit/UserManagementMailer.test.ts
rename to packages/cli/src/UserManagement/email/__tests__/UserManagementMailer.test.ts
diff --git a/packages/cli/src/WorkflowExecuteAdditionalData.ts b/packages/cli/src/WorkflowExecuteAdditionalData.ts
index ddb8c24818667..127e0cc817393 100644
--- a/packages/cli/src/WorkflowExecuteAdditionalData.ts
+++ b/packages/cli/src/WorkflowExecuteAdditionalData.ts
@@ -717,7 +717,6 @@ export async function getRunData(
 	const runData: IWorkflowExecutionDataProcess = {
 		executionMode: mode,
 		executionData: runExecutionData,
-		// @ts-ignore
 		workflowData,
 	};
 
diff --git a/packages/cli/test/unit/ActiveExecutions.test.ts b/packages/cli/src/__tests__/ActiveExecutions.test.ts
similarity index 100%
rename from packages/cli/test/unit/ActiveExecutions.test.ts
rename to packages/cli/src/__tests__/ActiveExecutions.test.ts
diff --git a/packages/cli/test/unit/CredentialTypes.test.ts b/packages/cli/src/__tests__/CredentialTypes.test.ts
similarity index 95%
rename from packages/cli/test/unit/CredentialTypes.test.ts
rename to packages/cli/src/__tests__/CredentialTypes.test.ts
index 0ee99c9f8ae6e..2a8e6a939a045 100644
--- a/packages/cli/test/unit/CredentialTypes.test.ts
+++ b/packages/cli/src/__tests__/CredentialTypes.test.ts
@@ -1,7 +1,7 @@
 import { CredentialTypes } from '@/CredentialTypes';
 import { Container } from 'typedi';
 import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
-import { mockInstance } from '../shared/mocking';
+import { mockInstance } from '@test/mocking';
 
 describe('CredentialTypes', () => {
 	const mockNodesAndCredentials = mockInstance(LoadNodesAndCredentials, {
diff --git a/packages/cli/test/unit/CredentialsHelper.test.ts b/packages/cli/src/__tests__/CredentialsHelper.test.ts
similarity index 99%
rename from packages/cli/test/unit/CredentialsHelper.test.ts
rename to packages/cli/src/__tests__/CredentialsHelper.test.ts
index 19be100b02b84..88cd19ad3dc5d 100644
--- a/packages/cli/test/unit/CredentialsHelper.test.ts
+++ b/packages/cli/src/__tests__/CredentialsHelper.test.ts
@@ -14,7 +14,7 @@ import { NodeTypes } from '@/NodeTypes';
 import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
 import { CredentialsRepository } from '@db/repositories/credentials.repository';
 import { SharedCredentialsRepository } from '@db/repositories/sharedCredentials.repository';
-import { mockInstance } from '../shared/mocking';
+import { mockInstance } from '@test/mocking';
 
 describe('CredentialsHelper', () => {
 	mockInstance(CredentialsRepository);
diff --git a/packages/cli/test/unit/License.test.ts b/packages/cli/src/__tests__/License.test.ts
similarity index 99%
rename from packages/cli/test/unit/License.test.ts
rename to packages/cli/src/__tests__/License.test.ts
index 6d7311656c961..31effecc0eba4 100644
--- a/packages/cli/test/unit/License.test.ts
+++ b/packages/cli/src/__tests__/License.test.ts
@@ -5,7 +5,7 @@ import config from '@/config';
 import { License } from '@/License';
 import { Logger } from '@/Logger';
 import { N8N_VERSION } from '@/constants';
-import { mockInstance } from '../shared/mocking';
+import { mockInstance } from '@test/mocking';
 import { OrchestrationService } from '@/services/orchestration.service';
 
 jest.mock('@n8n_io/license-sdk');
diff --git a/packages/cli/test/unit/TestWebhooks.test.ts b/packages/cli/src/__tests__/TestWebhooks.test.ts
similarity index 100%
rename from packages/cli/test/unit/TestWebhooks.test.ts
rename to packages/cli/src/__tests__/TestWebhooks.test.ts
diff --git a/packages/cli/test/unit/WaitTracker.test.ts b/packages/cli/src/__tests__/WaitTracker.test.ts
similarity index 100%
rename from packages/cli/test/unit/WaitTracker.test.ts
rename to packages/cli/src/__tests__/WaitTracker.test.ts
diff --git a/packages/cli/test/unit/WebhookHelpers.test.ts b/packages/cli/src/__tests__/WebhookHelpers.test.ts
similarity index 100%
rename from packages/cli/test/unit/WebhookHelpers.test.ts
rename to packages/cli/src/__tests__/WebhookHelpers.test.ts
diff --git a/packages/cli/test/unit/WorkflowExecuteAdditionalData.test.ts b/packages/cli/src/__tests__/WorkflowExecuteAdditionalData.test.ts
similarity index 96%
rename from packages/cli/test/unit/WorkflowExecuteAdditionalData.test.ts
rename to packages/cli/src/__tests__/WorkflowExecuteAdditionalData.test.ts
index 2984220637aae..eca60e56c5216 100644
--- a/packages/cli/test/unit/WorkflowExecuteAdditionalData.test.ts
+++ b/packages/cli/src/__tests__/WorkflowExecuteAdditionalData.test.ts
@@ -1,5 +1,5 @@
 import { VariablesService } from '@/environments/variables/variables.service.ee';
-import { mockInstance } from '../shared/mocking';
+import { mockInstance } from '@test/mocking';
 import { MessageEventBus } from '@/eventbus/MessageEventBus/MessageEventBus';
 import { getBase } from '@/WorkflowExecuteAdditionalData';
 import Container from 'typedi';
diff --git a/packages/cli/test/unit/WorkflowHelpers.test.ts b/packages/cli/src/__tests__/WorkflowHelpers.test.ts
similarity index 100%
rename from packages/cli/test/unit/WorkflowHelpers.test.ts
rename to packages/cli/src/__tests__/WorkflowHelpers.test.ts
diff --git a/packages/cli/test/unit/WorkflowRunner.test.ts b/packages/cli/src/__tests__/WorkflowRunner.test.ts
similarity index 86%
rename from packages/cli/test/unit/WorkflowRunner.test.ts
rename to packages/cli/src/__tests__/WorkflowRunner.test.ts
index c972d6bb73933..668150092f60a 100644
--- a/packages/cli/test/unit/WorkflowRunner.test.ts
+++ b/packages/cli/src/__tests__/WorkflowRunner.test.ts
@@ -4,11 +4,11 @@ import type { User } from '@db/entities/User';
 import { WorkflowRunner } from '@/WorkflowRunner';
 import config from '@/config';
 
-import * as testDb from '../integration/shared/testDb';
-import { setupTestServer } from '../integration/shared/utils';
-import { createUser } from '../integration/shared/db/users';
-import { createWorkflow } from '../integration/shared/db/workflows';
-import { createExecution } from '../integration/shared/db/executions';
+import * as testDb from '@test-integration/testDb';
+import { setupTestServer } from '@test-integration/utils';
+import { createUser } from '@test-integration/db/users';
+import { createWorkflow } from '@test-integration/db/workflows';
+import { createExecution } from '@test-integration/db/executions';
 import { mockInstance } from '@test/mocking';
 import { Telemetry } from '@/telemetry';
 
diff --git a/packages/cli/test/unit/auth/auth.service.test.ts b/packages/cli/src/auth/__tests__/auth.service.test.ts
similarity index 100%
rename from packages/cli/test/unit/auth/auth.service.test.ts
rename to packages/cli/src/auth/__tests__/auth.service.test.ts
diff --git a/packages/cli/test/unit/commands/db/revert.test.ts b/packages/cli/src/commands/db/__tests__/revert.test.ts
similarity index 98%
rename from packages/cli/test/unit/commands/db/revert.test.ts
rename to packages/cli/src/commands/db/__tests__/revert.test.ts
index cea3f89253383..13c554a786ad3 100644
--- a/packages/cli/test/unit/commands/db/revert.test.ts
+++ b/packages/cli/src/commands/db/__tests__/revert.test.ts
@@ -1,5 +1,5 @@
 import { main } from '@/commands/db/revert';
-import { mockInstance } from '../../../shared/mocking';
+import { mockInstance } from '@test/mocking';
 import { Logger } from '@/Logger';
 import type { IrreversibleMigration, ReversibleMigration } from '@/databases/types';
 import type { Migration, MigrationExecutor } from '@n8n/typeorm';
diff --git a/packages/cli/test/unit/config/index.test.ts b/packages/cli/src/config/__tests__/index.test.ts
similarity index 100%
rename from packages/cli/test/unit/config/index.test.ts
rename to packages/cli/src/config/__tests__/index.test.ts
diff --git a/packages/cli/test/unit/controllers/curl.controller.test.ts b/packages/cli/src/controllers/__tests__/curl.controller.test.ts
similarity index 100%
rename from packages/cli/test/unit/controllers/curl.controller.test.ts
rename to packages/cli/src/controllers/__tests__/curl.controller.test.ts
diff --git a/packages/cli/test/unit/controllers/dynamic-node-parameters.controller.test.ts b/packages/cli/src/controllers/__tests__/dynamic-node-parameters.controller.test.ts
similarity index 100%
rename from packages/cli/test/unit/controllers/dynamic-node-parameters.controller.test.ts
rename to packages/cli/src/controllers/__tests__/dynamic-node-parameters.controller.test.ts
diff --git a/packages/cli/test/unit/controllers/me.controller.test.ts b/packages/cli/src/controllers/__tests__/me.controller.test.ts
similarity index 98%
rename from packages/cli/test/unit/controllers/me.controller.test.ts
rename to packages/cli/src/controllers/__tests__/me.controller.test.ts
index 2416ecafbddb4..9fd165be80c5d 100644
--- a/packages/cli/test/unit/controllers/me.controller.test.ts
+++ b/packages/cli/src/controllers/__tests__/me.controller.test.ts
@@ -13,8 +13,8 @@ import { InternalHooks } from '@/InternalHooks';
 import { License } from '@/License';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 import { UserRepository } from '@/databases/repositories/user.repository';
-import { badPasswords } from '../shared/testData';
-import { mockInstance } from '../../shared/mocking';
+import { badPasswords } from '@test/testData';
+import { mockInstance } from '@test/mocking';
 
 const browserId = 'test-browser-id';
 
diff --git a/packages/cli/test/unit/controllers/owner.controller.test.ts b/packages/cli/src/controllers/__tests__/owner.controller.test.ts
similarity index 97%
rename from packages/cli/test/unit/controllers/owner.controller.test.ts
rename to packages/cli/src/controllers/__tests__/owner.controller.test.ts
index 0057c2370896b..3aabc87cade9a 100644
--- a/packages/cli/test/unit/controllers/owner.controller.test.ts
+++ b/packages/cli/src/controllers/__tests__/owner.controller.test.ts
@@ -16,8 +16,8 @@ import type { OwnerRequest } from '@/requests';
 import type { UserService } from '@/services/user.service';
 import { PasswordUtility } from '@/services/password.utility';
 
-import { mockInstance } from '../../shared/mocking';
-import { badPasswords } from '../shared/testData';
+import { mockInstance } from '@test/mocking';
+import { badPasswords } from '@test/testData';
 
 describe('OwnerController', () => {
 	const configGetSpy = jest.spyOn(config, 'getEnv');
diff --git a/packages/cli/test/unit/controllers/translation.controller.test.ts b/packages/cli/src/controllers/__tests__/translation.controller.test.ts
similarity index 100%
rename from packages/cli/test/unit/controllers/translation.controller.test.ts
rename to packages/cli/src/controllers/__tests__/translation.controller.test.ts
diff --git a/packages/cli/test/unit/controllers/userSettings.controller.test.ts b/packages/cli/src/controllers/__tests__/userSettings.controller.test.ts
similarity index 96%
rename from packages/cli/test/unit/controllers/userSettings.controller.test.ts
rename to packages/cli/src/controllers/__tests__/userSettings.controller.test.ts
index e29afb74ccc29..3794008641fa5 100644
--- a/packages/cli/test/unit/controllers/userSettings.controller.test.ts
+++ b/packages/cli/src/controllers/__tests__/userSettings.controller.test.ts
@@ -60,7 +60,7 @@ describe('UserSettingsController', () => {
 				[],
 			],
 			[
-				'updates user settings, reseting to waiting state',
+				'updates user settings, resetting to waiting state',
 				{
 					waitingForResponse: true,
 					ignoredCount: 0,
@@ -137,7 +137,7 @@ describe('UserSettingsController', () => {
 				'is waitingForResponse but missing ignoredCount',
 				{ lastShownAt: 123, waitingForResponse: true },
 			],
-		])('thows error when request payload is %s', async (_, payload) => {
+		])('throws error when request payload is %s', async (_, payload) => {
 			const req = mock<NpsSurveyRequest.NpsSurveyUpdate>();
 			req.user.id = '1';
 			req.body = payload;
diff --git a/packages/cli/test/unit/controllers/oauth/oAuth1Credential.controller.test.ts b/packages/cli/src/controllers/oauth/__tests__/oAuth1Credential.controller.test.ts
similarity index 99%
rename from packages/cli/test/unit/controllers/oauth/oAuth1Credential.controller.test.ts
rename to packages/cli/src/controllers/oauth/__tests__/oAuth1Credential.controller.test.ts
index cbadc1cf87716..fae443b4ce9a2 100644
--- a/packages/cli/test/unit/controllers/oauth/oAuth1Credential.controller.test.ts
+++ b/packages/cli/src/controllers/oauth/__tests__/oAuth1Credential.controller.test.ts
@@ -19,7 +19,7 @@ import { CredentialsHelper } from '@/CredentialsHelper';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 import { NotFoundError } from '@/errors/response-errors/not-found.error';
 
-import { mockInstance } from '../../../shared/mocking';
+import { mockInstance } from '@test/mocking';
 
 describe('OAuth1CredentialController', () => {
 	mockInstance(Logger);
diff --git a/packages/cli/test/unit/controllers/oauth/oAuth2Credential.controller.test.ts b/packages/cli/src/controllers/oauth/__tests__/oAuth2Credential.controller.test.ts
similarity index 99%
rename from packages/cli/test/unit/controllers/oauth/oAuth2Credential.controller.test.ts
rename to packages/cli/src/controllers/oauth/__tests__/oAuth2Credential.controller.test.ts
index f2b718fda0090..f354a1ec024e7 100644
--- a/packages/cli/test/unit/controllers/oauth/oAuth2Credential.controller.test.ts
+++ b/packages/cli/src/controllers/oauth/__tests__/oAuth2Credential.controller.test.ts
@@ -19,7 +19,7 @@ import { CredentialsHelper } from '@/CredentialsHelper';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 import { NotFoundError } from '@/errors/response-errors/not-found.error';
 
-import { mockInstance } from '../../../shared/mocking';
+import { mockInstance } from '@test/mocking';
 
 describe('OAuth2CredentialController', () => {
 	mockInstance(Logger);
diff --git a/packages/cli/src/credentials/__tests__/credentials.service.test.ts b/packages/cli/src/credentials/__tests__/credentials.service.test.ts
index 18216df8674ce..a5fa3ca183cb7 100644
--- a/packages/cli/src/credentials/__tests__/credentials.service.test.ts
+++ b/packages/cli/src/credentials/__tests__/credentials.service.test.ts
@@ -3,7 +3,7 @@ import { mock } from 'jest-mock-extended';
 import { CREDENTIAL_BLANKING_VALUE } from '@/constants';
 import type { CredentialsEntity } from '@db/entities/CredentialsEntity';
 import type { CredentialTypes } from '@/CredentialTypes';
-import { CredentialsService } from '../credentials.service';
+import { CredentialsService } from '@/credentials/credentials.service';
 
 describe('CredentialsService', () => {
 	const credType = mock<ICredentialType>({
diff --git a/packages/cli/test/unit/databases/entities/user.entity.test.ts b/packages/cli/src/databases/entities/__tests__/user.entity.test.ts
similarity index 100%
rename from packages/cli/test/unit/databases/entities/user.entity.test.ts
rename to packages/cli/src/databases/entities/__tests__/user.entity.test.ts
diff --git a/packages/cli/test/unit/repositories/execution.repository.test.ts b/packages/cli/src/databases/repositories/__tests__/execution.repository.test.ts
similarity index 95%
rename from packages/cli/test/unit/repositories/execution.repository.test.ts
rename to packages/cli/src/databases/repositories/__tests__/execution.repository.test.ts
index f8aba2e8a1228..1a4929f5cdf6e 100644
--- a/packages/cli/test/unit/repositories/execution.repository.test.ts
+++ b/packages/cli/src/databases/repositories/__tests__/execution.repository.test.ts
@@ -8,8 +8,7 @@ import { mock } from 'jest-mock-extended';
 
 import { ExecutionEntity } from '@db/entities/ExecutionEntity';
 import { ExecutionRepository } from '@db/repositories/execution.repository';
-import { mockEntityManager } from '../../shared/mocking';
-import { mockInstance } from '../../shared/mocking';
+import { mockInstance, mockEntityManager } from '@test/mocking';
 
 describe('ExecutionRepository', () => {
 	const entityManager = mockEntityManager(ExecutionEntity);
diff --git a/packages/cli/test/unit/repositories/sharedCredentials.repository.test.ts b/packages/cli/src/databases/repositories/__tests__/sharedCredentials.repository.test.ts
similarity index 98%
rename from packages/cli/test/unit/repositories/sharedCredentials.repository.test.ts
rename to packages/cli/src/databases/repositories/__tests__/sharedCredentials.repository.test.ts
index 8eb8b498145ef..6fb4bad4eacf3 100644
--- a/packages/cli/test/unit/repositories/sharedCredentials.repository.test.ts
+++ b/packages/cli/src/databases/repositories/__tests__/sharedCredentials.repository.test.ts
@@ -8,7 +8,7 @@ import type { CredentialsEntity } from '@db/entities/CredentialsEntity';
 import { SharedCredentials } from '@db/entities/SharedCredentials';
 import { SharedCredentialsRepository } from '@db/repositories/sharedCredentials.repository';
 import { GLOBAL_MEMBER_SCOPES, GLOBAL_OWNER_SCOPES } from '@/permissions/global-roles';
-import { mockEntityManager } from '../../shared/mocking';
+import { mockEntityManager } from '@test/mocking';
 
 describe('SharedCredentialsRepository', () => {
 	const entityManager = mockEntityManager(SharedCredentials);
diff --git a/packages/cli/test/unit/repositories/workflowStatistics.test.ts b/packages/cli/src/databases/repositories/__tests__/workflowStatistics.test.ts
similarity index 96%
rename from packages/cli/test/unit/repositories/workflowStatistics.test.ts
rename to packages/cli/src/databases/repositories/__tests__/workflowStatistics.test.ts
index 86e0ee1c92bd1..7bed056549751 100644
--- a/packages/cli/test/unit/repositories/workflowStatistics.test.ts
+++ b/packages/cli/src/databases/repositories/__tests__/workflowStatistics.test.ts
@@ -5,7 +5,7 @@ import { mock, mockClear } from 'jest-mock-extended';
 import { StatisticsNames, WorkflowStatistics } from '@db/entities/WorkflowStatistics';
 import { WorkflowStatisticsRepository } from '@db/repositories/workflowStatistics.repository';
 
-import { mockEntityManager } from '../../shared/mocking';
+import { mockEntityManager } from '@test/mocking';
 
 describe('insertWorkflowStatistics', () => {
 	const entityManager = mockEntityManager(WorkflowStatistics);
diff --git a/packages/cli/test/unit/databases/utils/customValidators.test.ts b/packages/cli/src/databases/utils/__tests__/customValidators.test.ts
similarity index 100%
rename from packages/cli/test/unit/databases/utils/customValidators.test.ts
rename to packages/cli/src/databases/utils/__tests__/customValidators.test.ts
diff --git a/packages/cli/test/unit/databases/utils/migrationHelpers.test.ts b/packages/cli/src/databases/utils/__tests__/migrationHelpers.test.ts
similarity index 100%
rename from packages/cli/test/unit/databases/utils/migrationHelpers.test.ts
rename to packages/cli/src/databases/utils/__tests__/migrationHelpers.test.ts
diff --git a/packages/cli/test/unit/decorators/OnShutdown.test.ts b/packages/cli/src/decorators/__tests__/OnShutdown.test.ts
similarity index 100%
rename from packages/cli/test/unit/decorators/OnShutdown.test.ts
rename to packages/cli/src/decorators/__tests__/OnShutdown.test.ts
diff --git a/packages/cli/test/unit/decorators/controller.registry.test.ts b/packages/cli/src/decorators/__tests__/controller.registry.test.ts
similarity index 100%
rename from packages/cli/test/unit/decorators/controller.registry.test.ts
rename to packages/cli/src/decorators/__tests__/controller.registry.test.ts
diff --git a/packages/cli/test/unit/GitService.test.ts b/packages/cli/src/environments/sourceControl/__tests__/sourceControlGit.service.test.ts
similarity index 100%
rename from packages/cli/test/unit/GitService.test.ts
rename to packages/cli/src/environments/sourceControl/__tests__/sourceControlGit.service.test.ts
diff --git a/packages/cli/test/unit/SourceControl.test.ts b/packages/cli/src/environments/sourceControl/__tests__/sourceControlHelper.ee.test.ts
similarity index 99%
rename from packages/cli/test/unit/SourceControl.test.ts
rename to packages/cli/src/environments/sourceControl/__tests__/sourceControlHelper.ee.test.ts
index 5eeccbb1b97f4..5141d36f2f7dd 100644
--- a/packages/cli/test/unit/SourceControl.test.ts
+++ b/packages/cli/src/environments/sourceControl/__tests__/sourceControlHelper.ee.test.ts
@@ -18,7 +18,7 @@ import {
 import { constants as fsConstants, accessSync } from 'fs';
 import type { SourceControlledFile } from '@/environments/sourceControl/types/sourceControlledFile';
 import type { SourceControlPreferences } from '@/environments/sourceControl/types/sourceControlPreferences';
-import { mockInstance } from '../shared/mocking';
+import { mockInstance } from '@test/mocking';
 
 const pushResult: SourceControlledFile[] = [
 	{
diff --git a/packages/cli/test/unit/utils.test.ts b/packages/cli/src/errors/response-errors/__tests__/webhook-not-found.error.test.ts
similarity index 100%
rename from packages/cli/test/unit/utils.test.ts
rename to packages/cli/src/errors/response-errors/__tests__/webhook-not-found.error.test.ts
diff --git a/packages/cli/test/unit/execution-lifecyle/restoreBinaryDataId.test.ts b/packages/cli/src/executionLifecycleHooks/__tests__/restoreBinaryDataId.test.ts
similarity index 97%
rename from packages/cli/test/unit/execution-lifecyle/restoreBinaryDataId.test.ts
rename to packages/cli/src/executionLifecycleHooks/__tests__/restoreBinaryDataId.test.ts
index 3fcdb79c72c7e..ea962882bd782 100644
--- a/packages/cli/test/unit/execution-lifecyle/restoreBinaryDataId.test.ts
+++ b/packages/cli/src/executionLifecycleHooks/__tests__/restoreBinaryDataId.test.ts
@@ -1,6 +1,6 @@
 import { restoreBinaryDataId } from '@/executionLifecycleHooks/restoreBinaryDataId';
 import { BinaryDataService } from 'n8n-core';
-import { mockInstance } from '../../shared/mocking';
+import { mockInstance } from '@test/mocking';
 
 import type { IRun } from 'n8n-workflow';
 import config from '@/config';
@@ -24,7 +24,7 @@ function toIRun(item?: object) {
 }
 
 function getDataId(run: IRun, kind: 'binary' | 'json') {
-	// @ts-ignore
+	// @ts-expect-error The type doesn't have the correct structure
 	return run.data.resultData.runData.myNode[0].data.main[0][0][kind].data.id;
 }
 
diff --git a/packages/cli/test/unit/execution-lifecyle/saveExecutionProgress.test.ts b/packages/cli/src/executionLifecycleHooks/__tests__/saveExecutionProgress.test.ts
similarity index 98%
rename from packages/cli/test/unit/execution-lifecyle/saveExecutionProgress.test.ts
rename to packages/cli/src/executionLifecycleHooks/__tests__/saveExecutionProgress.test.ts
index 4235e56ecbad3..9b1faa7f60540 100644
--- a/packages/cli/test/unit/execution-lifecyle/saveExecutionProgress.test.ts
+++ b/packages/cli/src/executionLifecycleHooks/__tests__/saveExecutionProgress.test.ts
@@ -1,5 +1,5 @@
 import { ExecutionRepository } from '@/databases/repositories/execution.repository';
-import { mockInstance } from '../../shared/mocking';
+import { mockInstance } from '@test/mocking';
 import { Logger } from '@/Logger';
 import { saveExecutionProgress } from '@/executionLifecycleHooks/saveExecutionProgress';
 import * as fnModule from '@/executionLifecycleHooks/toSaveSettings';
diff --git a/packages/cli/test/unit/execution-lifecyle/toSaveSettings.test.ts b/packages/cli/src/executionLifecycleHooks/__tests__/toSaveSettings.test.ts
similarity index 98%
rename from packages/cli/test/unit/execution-lifecyle/toSaveSettings.test.ts
rename to packages/cli/src/executionLifecycleHooks/__tests__/toSaveSettings.test.ts
index 6fc516a0ea214..57379e0e73055 100644
--- a/packages/cli/test/unit/execution-lifecyle/toSaveSettings.test.ts
+++ b/packages/cli/src/executionLifecycleHooks/__tests__/toSaveSettings.test.ts
@@ -35,7 +35,7 @@ describe('failed production executions', () => {
 	});
 });
 
-describe('sucessful production executions', () => {
+describe('successful production executions', () => {
 	it('should favor workflow settings over defaults', () => {
 		config.set('executions.saveDataOnSuccess', 'none');
 
diff --git a/packages/cli/test/unit/controllers/executions.controller.test.ts b/packages/cli/src/executions/__tests__/executions.controller.test.ts
similarity index 100%
rename from packages/cli/test/unit/controllers/executions.controller.test.ts
rename to packages/cli/src/executions/__tests__/executions.controller.test.ts
diff --git a/packages/cli/test/unit/middleware/executions/parse-range-query.middleware.test.ts b/packages/cli/src/executions/__tests__/parse-range-query.middleware.test.ts
similarity index 100%
rename from packages/cli/test/unit/middleware/executions/parse-range-query.middleware.test.ts
rename to packages/cli/src/executions/__tests__/parse-range-query.middleware.test.ts
diff --git a/packages/cli/test/unit/license/license.service.test.ts b/packages/cli/src/license/__tests__/license.service.test.ts
similarity index 100%
rename from packages/cli/test/unit/license/license.service.test.ts
rename to packages/cli/src/license/__tests__/license.service.test.ts
diff --git a/packages/cli/test/unit/middleware/listQuery.test.ts b/packages/cli/src/middlewares/listQuery/__tests__/listQuery.test.ts
similarity index 100%
rename from packages/cli/test/unit/middleware/listQuery.test.ts
rename to packages/cli/src/middlewares/listQuery/__tests__/listQuery.test.ts
diff --git a/packages/cli/test/unit/PostHog.test.ts b/packages/cli/src/posthog/__tests__/PostHog.test.ts
similarity index 97%
rename from packages/cli/test/unit/PostHog.test.ts
rename to packages/cli/src/posthog/__tests__/PostHog.test.ts
index 5798c0cce2217..f1604f7253df1 100644
--- a/packages/cli/test/unit/PostHog.test.ts
+++ b/packages/cli/src/posthog/__tests__/PostHog.test.ts
@@ -2,7 +2,7 @@ import { PostHog } from 'posthog-node';
 import { InstanceSettings } from 'n8n-core';
 import { PostHogClient } from '@/posthog';
 import config from '@/config';
-import { mockInstance } from '../shared/mocking';
+import { mockInstance } from '@test/mocking';
 
 jest.mock('posthog-node');
 
diff --git a/packages/cli/test/unit/push/index.test.ts b/packages/cli/src/push/__tests__/index.test.ts
similarity index 96%
rename from packages/cli/test/unit/push/index.test.ts
rename to packages/cli/src/push/__tests__/index.test.ts
index 1736693509374..a61496b0c9248 100644
--- a/packages/cli/test/unit/push/index.test.ts
+++ b/packages/cli/src/push/__tests__/index.test.ts
@@ -9,7 +9,7 @@ import { WebSocketPush } from '@/push/websocket.push';
 import type { WebSocketPushRequest, SSEPushRequest } from '@/push/types';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 
-import { mockInstance } from '../../shared/mocking';
+import { mockInstance } from '@test/mocking';
 
 jest.unmock('@/push');
 
diff --git a/packages/cli/test/unit/push/websocket.push.test.ts b/packages/cli/src/push/__tests__/websocket.push.test.ts
similarity index 98%
rename from packages/cli/test/unit/push/websocket.push.test.ts
rename to packages/cli/src/push/__tests__/websocket.push.test.ts
index 7531e43776c2c..f1a0e577f9ad8 100644
--- a/packages/cli/test/unit/push/websocket.push.test.ts
+++ b/packages/cli/src/push/__tests__/websocket.push.test.ts
@@ -6,7 +6,7 @@ import { WebSocketPush } from '@/push/websocket.push';
 import { Logger } from '@/Logger';
 import type { PushDataExecutionRecovered } from '@/Interfaces';
 
-import { mockInstance } from '../../shared/mocking';
+import { mockInstance } from '@test/mocking';
 
 jest.useFakeTimers();
 
diff --git a/packages/cli/test/unit/ExecutionMetadataService.test.ts b/packages/cli/src/services/__tests__/ExecutionMetadataService.test.ts
similarity index 94%
rename from packages/cli/test/unit/ExecutionMetadataService.test.ts
rename to packages/cli/src/services/__tests__/ExecutionMetadataService.test.ts
index 826aae5e25324..8b77b8b1681d4 100644
--- a/packages/cli/test/unit/ExecutionMetadataService.test.ts
+++ b/packages/cli/src/services/__tests__/ExecutionMetadataService.test.ts
@@ -1,7 +1,7 @@
 import { Container } from 'typedi';
 import { ExecutionMetadataRepository } from '@db/repositories/executionMetadata.repository';
 import { ExecutionMetadataService } from '@/services/executionMetadata.service';
-import { mockInstance } from '../shared/mocking';
+import { mockInstance } from '@test/mocking';
 
 describe('ExecutionMetadataService', () => {
 	const repository = mockInstance(ExecutionMetadataRepository);
diff --git a/packages/cli/test/unit/services/activeWorkflows.service.test.ts b/packages/cli/src/services/__tests__/activeWorkflows.service.test.ts
similarity index 100%
rename from packages/cli/test/unit/services/activeWorkflows.service.test.ts
rename to packages/cli/src/services/__tests__/activeWorkflows.service.test.ts
diff --git a/packages/cli/test/unit/services/communityPackages.service.test.ts b/packages/cli/src/services/__tests__/communityPackages.service.test.ts
similarity index 97%
rename from packages/cli/test/unit/services/communityPackages.service.test.ts
rename to packages/cli/src/services/__tests__/communityPackages.service.test.ts
index 2b0d8bf0d452a..acfecc8171ba0 100644
--- a/packages/cli/test/unit/services/communityPackages.service.test.ts
+++ b/packages/cli/src/services/__tests__/communityPackages.service.test.ts
@@ -20,13 +20,10 @@ import { InstalledPackagesRepository } from '@db/repositories/installedPackages.
 import { InstalledNodes } from '@db/entities/InstalledNodes';
 import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
 
-import { mockInstance } from '../../shared/mocking';
-import {
-	COMMUNITY_NODE_VERSION,
-	COMMUNITY_PACKAGE_VERSION,
-} from '../../integration/shared/constants';
-import { randomName } from '../../integration/shared/random';
-import { mockPackageName, mockPackagePair } from '../../integration/shared/utils';
+import { mockInstance } from '@test/mocking';
+import { COMMUNITY_NODE_VERSION, COMMUNITY_PACKAGE_VERSION } from '@test-integration/constants';
+import { randomName } from '@test-integration/random';
+import { mockPackageName, mockPackagePair } from '@test-integration/utils';
 import { InstanceSettings, PackageDirectoryLoader } from 'n8n-core';
 import { Logger } from '@/Logger';
 
diff --git a/packages/cli/test/unit/credentials-tester.unit.test.ts b/packages/cli/src/services/__tests__/credentials-tester.service.test.ts
similarity index 100%
rename from packages/cli/test/unit/credentials-tester.unit.test.ts
rename to packages/cli/src/services/__tests__/credentials-tester.service.test.ts
diff --git a/packages/cli/test/unit/services/curl.service.test.ts b/packages/cli/src/services/__tests__/curl.service.test.ts
similarity index 100%
rename from packages/cli/test/unit/services/curl.service.test.ts
rename to packages/cli/src/services/__tests__/curl.service.test.ts
diff --git a/packages/cli/test/unit/services/hooks.service.test.ts b/packages/cli/src/services/__tests__/hooks.service.test.ts
similarity index 100%
rename from packages/cli/test/unit/services/hooks.service.test.ts
rename to packages/cli/src/services/__tests__/hooks.service.test.ts
diff --git a/packages/cli/test/unit/services/jwt.service.test.ts b/packages/cli/src/services/__tests__/jwt.service.test.ts
similarity index 100%
rename from packages/cli/test/unit/services/jwt.service.test.ts
rename to packages/cli/src/services/__tests__/jwt.service.test.ts
diff --git a/packages/cli/test/unit/services/naming.service.test.ts b/packages/cli/src/services/__tests__/naming.service.test.ts
similarity index 98%
rename from packages/cli/test/unit/services/naming.service.test.ts
rename to packages/cli/src/services/__tests__/naming.service.test.ts
index ea2c34fb8c1ee..1ca216734630e 100644
--- a/packages/cli/test/unit/services/naming.service.test.ts
+++ b/packages/cli/src/services/__tests__/naming.service.test.ts
@@ -1,6 +1,6 @@
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
 import { CredentialsRepository } from '@/databases/repositories/credentials.repository';
-import { mockInstance } from '../../shared/mocking';
+import { mockInstance } from '@test/mocking';
 import { NamingService } from '@/services/naming.service';
 import type { WorkflowEntity } from '@/databases/entities/WorkflowEntity';
 import type { CredentialsEntity } from '@/databases/entities/CredentialsEntity';
diff --git a/packages/cli/test/unit/services/orchestration.service.test.ts b/packages/cli/src/services/__tests__/orchestration.service.test.ts
similarity index 99%
rename from packages/cli/test/unit/services/orchestration.service.test.ts
rename to packages/cli/src/services/__tests__/orchestration.service.test.ts
index 0b63f74344b57..c69e674613e25 100644
--- a/packages/cli/test/unit/services/orchestration.service.test.ts
+++ b/packages/cli/src/services/__tests__/orchestration.service.test.ts
@@ -17,7 +17,7 @@ import { ExternalSecretsManager } from '@/ExternalSecrets/ExternalSecretsManager
 import { Logger } from '@/Logger';
 import { Push } from '@/push';
 import { ActiveWorkflowManager } from '@/ActiveWorkflowManager';
-import { mockInstance } from '../../shared/mocking';
+import { mockInstance } from '@test/mocking';
 import { RedisClientService } from '@/services/redis/redis-client.service';
 
 const instanceSettings = Container.get(InstanceSettings);
diff --git a/packages/cli/test/unit/services/ownership.service.test.ts b/packages/cli/src/services/__tests__/ownership.service.test.ts
similarity index 98%
rename from packages/cli/test/unit/services/ownership.service.test.ts
rename to packages/cli/src/services/__tests__/ownership.service.test.ts
index d1a722da19625..8a3d40eb60f8d 100644
--- a/packages/cli/test/unit/services/ownership.service.test.ts
+++ b/packages/cli/src/services/__tests__/ownership.service.test.ts
@@ -3,14 +3,14 @@ import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.reposi
 import { SharedWorkflow } from '@db/entities/SharedWorkflow';
 import { User } from '@db/entities/User';
 import type { SharedCredentials } from '@db/entities/SharedCredentials';
-import { mockInstance } from '../../shared/mocking';
+import { mockInstance } from '@test/mocking';
 import { WorkflowEntity } from '@/databases/entities/WorkflowEntity';
 import { UserRepository } from '@/databases/repositories/user.repository';
 import { mock } from 'jest-mock-extended';
 import { Project } from '@/databases/entities/Project';
 import { ProjectRelationRepository } from '@/databases/repositories/projectRelation.repository';
 import { ProjectRelation } from '@/databases/entities/ProjectRelation';
-import { mockCredential, mockProject } from '../shared/mockObjects';
+import { mockCredential, mockProject } from '@test/mockObjects';
 
 describe('OwnershipService', () => {
 	const userRepository = mockInstance(UserRepository);
diff --git a/packages/cli/test/unit/utilities/password.utility.test.ts b/packages/cli/src/services/__tests__/password.utility.test.ts
similarity index 100%
rename from packages/cli/test/unit/utilities/password.utility.test.ts
rename to packages/cli/src/services/__tests__/password.utility.test.ts
diff --git a/packages/cli/test/unit/services/redis.service.test.ts b/packages/cli/src/services/__tests__/redis.service.test.ts
similarity index 94%
rename from packages/cli/test/unit/services/redis.service.test.ts
rename to packages/cli/src/services/__tests__/redis.service.test.ts
index cb963ad535567..1d9652983735c 100644
--- a/packages/cli/test/unit/services/redis.service.test.ts
+++ b/packages/cli/src/services/__tests__/redis.service.test.ts
@@ -2,7 +2,7 @@ import Container from 'typedi';
 import { Logger } from '@/Logger';
 import config from '@/config';
 import { RedisService } from '@/services/redis.service';
-import { mockInstance } from '../../shared/mocking';
+import { mockInstance } from '@test/mocking';
 
 jest.mock('ioredis', () => {
 	const Redis = require('ioredis-mock');
@@ -14,7 +14,7 @@ jest.mock('ioredis', () => {
 		};
 	}
 	// second mock for our code
-	return function (...args: any) {
+	return function (...args: unknown[]) {
 		return new Redis(args);
 	};
 });
diff --git a/packages/cli/test/unit/services/test-webhook-registrations.service.test.ts b/packages/cli/src/services/__tests__/test-webhook-registrations.service.test.ts
similarity index 100%
rename from packages/cli/test/unit/services/test-webhook-registrations.service.test.ts
rename to packages/cli/src/services/__tests__/test-webhook-registrations.service.test.ts
diff --git a/packages/cli/test/unit/services/user.service.test.ts b/packages/cli/src/services/__tests__/user.service.test.ts
similarity index 98%
rename from packages/cli/test/unit/services/user.service.test.ts
rename to packages/cli/src/services/__tests__/user.service.test.ts
index 89929f57b0b89..5aeb919220c23 100644
--- a/packages/cli/test/unit/services/user.service.test.ts
+++ b/packages/cli/src/services/__tests__/user.service.test.ts
@@ -4,7 +4,7 @@ import { v4 as uuid } from 'uuid';
 import { User } from '@db/entities/User';
 import { UserService } from '@/services/user.service';
 import { UrlService } from '@/services/url.service';
-import { mockInstance } from '../../shared/mocking';
+import { mockInstance } from '@test/mocking';
 import { UserRepository } from '@/databases/repositories/user.repository';
 import { GlobalConfig } from '@n8n/config';
 
diff --git a/packages/cli/test/unit/services/webhook.service.test.ts b/packages/cli/src/services/__tests__/webhook.service.test.ts
similarity index 99%
rename from packages/cli/test/unit/services/webhook.service.test.ts
rename to packages/cli/src/services/__tests__/webhook.service.test.ts
index adb18de4b309b..181bc60752956 100644
--- a/packages/cli/test/unit/services/webhook.service.test.ts
+++ b/packages/cli/src/services/__tests__/webhook.service.test.ts
@@ -4,7 +4,7 @@ import { WebhookRepository } from '@db/repositories/webhook.repository';
 import { CacheService } from '@/services/cache/cache.service';
 import { WebhookService } from '@/services/webhook.service';
 import { WebhookEntity } from '@db/entities/WebhookEntity';
-import { mockInstance } from '../../shared/mocking';
+import { mockInstance } from '@test/mocking';
 
 const createWebhook = (method: string, path: string, webhookId?: string, pathSegments?: number) =>
 	Object.assign(new WebhookEntity(), {
diff --git a/packages/cli/test/unit/services/workflow-statistics.service.test.ts b/packages/cli/src/services/__tests__/workflow-statistics.service.test.ts
similarity index 99%
rename from packages/cli/test/unit/services/workflow-statistics.service.test.ts
rename to packages/cli/src/services/__tests__/workflow-statistics.service.test.ts
index 6d9baf49ea939..24c3bce560d32 100644
--- a/packages/cli/test/unit/services/workflow-statistics.service.test.ts
+++ b/packages/cli/src/services/__tests__/workflow-statistics.service.test.ts
@@ -17,7 +17,7 @@ import { WorkflowStatisticsRepository } from '@db/repositories/workflowStatistic
 import { WorkflowStatisticsService } from '@/services/workflow-statistics.service';
 import { UserService } from '@/services/user.service';
 import { OwnershipService } from '@/services/ownership.service';
-import { mockInstance } from '../../shared/mocking';
+import { mockInstance } from '@test/mocking';
 import type { Project } from '@/databases/entities/Project';
 
 describe('WorkflowStatisticsService', () => {
diff --git a/packages/cli/test/unit/services/cache-mock.service.test.ts b/packages/cli/src/services/cache/__tests__/cache-mock.service.test.ts
similarity index 100%
rename from packages/cli/test/unit/services/cache-mock.service.test.ts
rename to packages/cli/src/services/cache/__tests__/cache-mock.service.test.ts
diff --git a/packages/cli/test/unit/services/cache.service.test.ts b/packages/cli/src/services/cache/__tests__/cache.service.test.ts
similarity index 100%
rename from packages/cli/test/unit/services/cache.service.test.ts
rename to packages/cli/src/services/cache/__tests__/cache.service.test.ts
diff --git a/packages/cli/test/unit/shutdown/Shutdown.service.test.ts b/packages/cli/src/shutdown/__tests__/Shutdown.service.test.ts
similarity index 100%
rename from packages/cli/test/unit/shutdown/Shutdown.service.test.ts
rename to packages/cli/src/shutdown/__tests__/Shutdown.service.test.ts
diff --git a/packages/cli/test/unit/sso/saml/saml.service.ee.test.ts b/packages/cli/src/sso/saml/__tests__/saml.service.ee.test.ts
similarity index 97%
rename from packages/cli/test/unit/sso/saml/saml.service.ee.test.ts
rename to packages/cli/src/sso/saml/__tests__/saml.service.ee.test.ts
index 9ba6ddaf2a6bd..89d693fc98037 100644
--- a/packages/cli/test/unit/sso/saml/saml.service.ee.test.ts
+++ b/packages/cli/src/sso/saml/__tests__/saml.service.ee.test.ts
@@ -1,7 +1,7 @@
 import { mock } from 'jest-mock-extended';
 import type express from 'express';
 import { SamlService } from '@/sso/saml/saml.service.ee';
-import { mockInstance } from '../../../shared/mocking';
+import { mockInstance } from '@test/mocking';
 import { UrlService } from '@/services/url.service';
 import { Logger } from '@/Logger';
 import type { IdentityProviderInstance, ServiceProviderInstance } from 'samlify';
diff --git a/packages/cli/test/unit/sso/saml/samlHelpers.test.ts b/packages/cli/src/sso/saml/__tests__/samlHelpers.test.ts
similarity index 96%
rename from packages/cli/test/unit/sso/saml/samlHelpers.test.ts
rename to packages/cli/src/sso/saml/__tests__/samlHelpers.test.ts
index f6c35ff67e514..778b1a0857156 100644
--- a/packages/cli/test/unit/sso/saml/samlHelpers.test.ts
+++ b/packages/cli/src/sso/saml/__tests__/samlHelpers.test.ts
@@ -2,7 +2,7 @@ import { User } from '@/databases/entities/User';
 import { generateNanoId } from '@/databases/utils/generators';
 import * as helpers from '@/sso/saml/samlHelpers';
 import type { SamlUserAttributes } from '@/sso/saml/types/samlUserAttributes';
-import { mockInstance } from '../../../shared/mocking';
+import { mockInstance } from '@test/mocking';
 import { UserRepository } from '@/databases/repositories/user.repository';
 import type { AuthIdentity } from '@/databases/entities/AuthIdentity';
 import { AuthIdentityRepository } from '@/databases/repositories/authIdentity.repository';
diff --git a/packages/cli/test/unit/Telemetry.test.ts b/packages/cli/src/telemetry/__tests__/telemetry.test.ts
similarity index 99%
rename from packages/cli/test/unit/Telemetry.test.ts
rename to packages/cli/src/telemetry/__tests__/telemetry.test.ts
index af8445c814663..a0441519eaf6f 100644
--- a/packages/cli/test/unit/Telemetry.test.ts
+++ b/packages/cli/src/telemetry/__tests__/telemetry.test.ts
@@ -1,11 +1,11 @@
 import type RudderStack from '@rudderstack/rudder-sdk-node';
 import { Telemetry } from '@/telemetry';
 import config from '@/config';
-import { flushPromises } from './Helpers';
+import { flushPromises } from '@test/flushPromises';
 import { PostHogClient } from '@/posthog';
 import { mock } from 'jest-mock-extended';
 import { InstanceSettings } from 'n8n-core';
-import { mockInstance } from '../shared/mocking';
+import { mockInstance } from '@test/mocking';
 
 jest.unmock('@/telemetry');
 jest.mock('@/posthog');
diff --git a/packages/cli/test/unit/workflow-execution.service.test.ts b/packages/cli/src/workflows/__tests__/workflow-execution.service.test.ts
similarity index 100%
rename from packages/cli/test/unit/workflow-execution.service.test.ts
rename to packages/cli/src/workflows/__tests__/workflow-execution.service.test.ts
diff --git a/packages/cli/test/unit/services/workflowHistory.service.ee.test.ts b/packages/cli/src/workflows/workflowHistory/__tests__/workflowHistory.service.ee.test.ts
similarity index 96%
rename from packages/cli/test/unit/services/workflowHistory.service.ee.test.ts
rename to packages/cli/src/workflows/workflowHistory/__tests__/workflowHistory.service.ee.test.ts
index 05ccae70051a2..5b28b8d171468 100644
--- a/packages/cli/test/unit/services/workflowHistory.service.ee.test.ts
+++ b/packages/cli/src/workflows/workflowHistory/__tests__/workflowHistory.service.ee.test.ts
@@ -4,8 +4,8 @@ import { WorkflowHistoryRepository } from '@db/repositories/workflowHistory.repo
 import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
 import { WorkflowHistoryService } from '@/workflows/workflowHistory/workflowHistory.service.ee';
 import { Logger } from '@/Logger';
-import { mockInstance } from '../../shared/mocking';
-import { getWorkflow } from '../../integration/shared/workflow';
+import { mockInstance } from '@test/mocking';
+import { getWorkflow } from '@test-integration/workflow';
 
 const workflowHistoryRepository = mockInstance(WorkflowHistoryRepository);
 const logger = mockInstance(Logger);
diff --git a/packages/cli/test/unit/workflowHistoryHelper.test.ts b/packages/cli/src/workflows/workflowHistory/__tests__/workflowHistoryHelper.ee.test.ts
similarity index 96%
rename from packages/cli/test/unit/workflowHistoryHelper.test.ts
rename to packages/cli/src/workflows/workflowHistory/__tests__/workflowHistoryHelper.ee.test.ts
index 32a6cdd6f0d52..427f98188495b 100644
--- a/packages/cli/test/unit/workflowHistoryHelper.test.ts
+++ b/packages/cli/src/workflows/workflowHistory/__tests__/workflowHistoryHelper.ee.test.ts
@@ -1,7 +1,7 @@
 import { License } from '@/License';
 import config from '@/config';
 import { getWorkflowHistoryPruneTime } from '@/workflows/workflowHistory/workflowHistoryHelper.ee';
-import { mockInstance } from '../shared/mocking';
+import { mockInstance } from '@test/mocking';
 
 let licensePruneTime = -1;
 
diff --git a/packages/cli/test/integration/PermissionChecker.test.ts b/packages/cli/test/integration/PermissionChecker.test.ts
index d5262a50d0672..ff10d0497439a 100644
--- a/packages/cli/test/integration/PermissionChecker.test.ts
+++ b/packages/cli/test/integration/PermissionChecker.test.ts
@@ -1,6 +1,6 @@
 import { v4 as uuid } from 'uuid';
 import { Container } from 'typedi';
-import type { INode } from 'n8n-workflow';
+import type { INode, INodeTypeData } from 'n8n-workflow';
 import { randomInt } from 'n8n-workflow';
 import type { User } from '@db/entities/User';
 import { WorkflowRepository } from '@db/repositories/workflow.repository';
@@ -14,7 +14,6 @@ import { mockInstance } from '../shared/mocking';
 import { randomCredentialPayload as randomCred } from '../integration/shared/random';
 import * as testDb from '../integration/shared/testDb';
 import type { SaveCredentialFunction } from '../integration/shared/types';
-import { mockNodeTypesData } from '../unit/Helpers';
 import { affixRoleToSaveCredential } from '../integration/shared/db/credentials';
 import { createOwner, createUser } from '../integration/shared/db/users';
 import { SharedCredentialsRepository } from '@/databases/repositories/sharedCredentials.repository';
@@ -25,6 +24,36 @@ import { ProjectRepository } from '@/databases/repositories/project.repository';
 
 const ownershipService = mockInstance(OwnershipService);
 
+function mockNodeTypesData(
+	nodeNames: string[],
+	options?: {
+		addTrigger?: boolean;
+	},
+) {
+	return nodeNames.reduce<INodeTypeData>((acc, nodeName) => {
+		return (
+			(acc[`n8n-nodes-base.${nodeName}`] = {
+				sourcePath: '',
+				type: {
+					description: {
+						displayName: nodeName,
+						name: nodeName,
+						group: [],
+						description: '',
+						version: 1,
+						defaults: {},
+						inputs: [],
+						outputs: [],
+						properties: [],
+					},
+					trigger: options?.addTrigger ? async () => undefined : undefined,
+				},
+			}),
+			acc
+		);
+	}, {});
+}
+
 const createWorkflow = async (nodes: INode[], workflowOwner?: User): Promise<WorkflowEntity> => {
 	const workflowDetails = {
 		id: randomInt(1, 10).toString(),
diff --git a/packages/cli/test/unit/webhooks.test.ts b/packages/cli/test/integration/webhooks.test.ts
similarity index 98%
rename from packages/cli/test/unit/webhooks.test.ts
rename to packages/cli/test/integration/webhooks.test.ts
index c891588597ac5..9bd1977ed53d2 100644
--- a/packages/cli/test/unit/webhooks.test.ts
+++ b/packages/cli/test/integration/webhooks.test.ts
@@ -11,7 +11,7 @@ import { WaitingWebhooks } from '@/WaitingWebhooks';
 import { WaitingForms } from '@/WaitingForms';
 import type { IResponseCallbackData } from '@/Interfaces';
 
-import { mockInstance } from '../shared/mocking';
+import { mockInstance } from '@test/mocking';
 import { GlobalConfig } from '@n8n/config';
 import Container from 'typedi';
 
diff --git a/packages/cli/test/shared/flushPromises.ts b/packages/cli/test/shared/flushPromises.ts
new file mode 100644
index 0000000000000..405b9e98dca26
--- /dev/null
+++ b/packages/cli/test/shared/flushPromises.ts
@@ -0,0 +1,6 @@
+/**
+ * Ensure all pending promises settle. The promise's `resolve` is placed in
+ * the macrotask queue and so called at the next iteration of the event loop
+ * after all promises in the microtask queue have settled first.
+ */
+export const flushPromises = async () => await new Promise(setImmediate);
diff --git a/packages/cli/test/unit/shared/mockObjects.ts b/packages/cli/test/shared/mockObjects.ts
similarity index 94%
rename from packages/cli/test/unit/shared/mockObjects.ts
rename to packages/cli/test/shared/mockObjects.ts
index e7a165977301f..a8795e8e1013f 100644
--- a/packages/cli/test/unit/shared/mockObjects.ts
+++ b/packages/cli/test/shared/mockObjects.ts
@@ -8,7 +8,7 @@ import {
 	randomEmail,
 	randomName,
 	uniqueId,
-} from '../../integration/shared/random';
+} from '../integration/shared/random';
 
 export const mockCredential = (): CredentialsEntity =>
 	Object.assign(new CredentialsEntity(), randomCredentialPayload());
diff --git a/packages/cli/test/unit/shared/testData.ts b/packages/cli/test/shared/testData.ts
similarity index 100%
rename from packages/cli/test/unit/shared/testData.ts
rename to packages/cli/test/shared/testData.ts
diff --git a/packages/cli/test/unit/Helpers.ts b/packages/cli/test/unit/Helpers.ts
deleted file mode 100644
index 50b9f43489076..0000000000000
--- a/packages/cli/test/unit/Helpers.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import type { INodeTypeData } from 'n8n-workflow';
-
-/**
- * Ensure all pending promises settle. The promise's `resolve` is placed in
- * the macrotask queue and so called at the next iteration of the event loop
- * after all promises in the microtask queue have settled first.
- */
-export const flushPromises = async () => await new Promise(setImmediate);
-
-export function mockNodeTypesData(
-	nodeNames: string[],
-	options?: {
-		addTrigger?: boolean;
-	},
-) {
-	return nodeNames.reduce<INodeTypeData>((acc, nodeName) => {
-		return (
-			(acc[`n8n-nodes-base.${nodeName}`] = {
-				sourcePath: '',
-				type: {
-					description: {
-						displayName: nodeName,
-						name: nodeName,
-						group: [],
-						description: '',
-						version: 1,
-						defaults: {},
-						inputs: [],
-						outputs: [],
-						properties: [],
-					},
-					trigger: options?.addTrigger ? async () => undefined : undefined,
-				},
-			}),
-			acc
-		);
-	}, {});
-}

From 88086a41ff5b804b35aa9d9503dc2d48836fe4ec 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: Mon, 5 Aug 2024 11:52:06 +0200
Subject: [PATCH 072/168] feat(core): Support community packages in
 scaling-mode  (#10228)

---
 packages/@n8n/config/src/configs/nodes.ts     |  4 +
 packages/@n8n/config/test/config.test.ts      |  1 +
 packages/cli/src/commands/BaseCommand.ts      | 11 ++-
 packages/cli/src/commands/execute.ts          |  2 +
 packages/cli/src/commands/executeBatch.ts     |  2 +
 packages/cli/src/commands/start.ts            | 35 +++++----
 packages/cli/src/commands/webhook.ts          |  2 +
 packages/cli/src/commands/worker.ts           |  6 +-
 .../communityPackages.controller.ts           | 21 +----
 .../communityPackages.service.test.ts         | 59 ++++++--------
 .../src/services/communityPackages.service.ts | 78 ++++++++++++-------
 .../main/handleCommandMessageMain.ts          | 15 ++++
 .../webhook/handleCommandMessageWebhook.ts    | 15 ++++
 .../worker/handleCommandMessageWorker.ts      | 13 ++++
 .../services/redis/RedisServiceCommands.ts    | 17 +++-
 .../community-packages.api.test.ts            |  6 +-
 packages/editor-ui/src/constants.ts           |  1 -
 .../src/plugins/i18n/locales/en.json          |  1 -
 .../src/views/SettingsCommunityNodesView.vue  | 27 +------
 19 files changed, 187 insertions(+), 129 deletions(-)

diff --git a/packages/@n8n/config/src/configs/nodes.ts b/packages/@n8n/config/src/configs/nodes.ts
index dbe3705c6f99f..3837b0a99b258 100644
--- a/packages/@n8n/config/src/configs/nodes.ts
+++ b/packages/@n8n/config/src/configs/nodes.ts
@@ -25,6 +25,10 @@ class CommunityPackagesConfig {
 	/** Whether to enable community packages */
 	@Env('N8N_COMMUNITY_PACKAGES_ENABLED')
 	enabled: boolean = true;
+
+	/** Whether to reinstall any missing community packages */
+	@Env('N8N_REINSTALL_MISSING_PACKAGES')
+	reinstallMissing: boolean = false;
 }
 
 @Config
diff --git a/packages/@n8n/config/test/config.test.ts b/packages/@n8n/config/test/config.test.ts
index db27b280edeae..e077e233b7494 100644
--- a/packages/@n8n/config/test/config.test.ts
+++ b/packages/@n8n/config/test/config.test.ts
@@ -108,6 +108,7 @@ describe('GlobalConfig', () => {
 		nodes: {
 			communityPackages: {
 				enabled: true,
+				reinstallMissing: false,
 			},
 			errorTriggerType: 'n8n-nodes-base.errorTrigger',
 			include: [],
diff --git a/packages/cli/src/commands/BaseCommand.ts b/packages/cli/src/commands/BaseCommand.ts
index 9828e6207b525..62ff002e43298 100644
--- a/packages/cli/src/commands/BaseCommand.ts
+++ b/packages/cli/src/commands/BaseCommand.ts
@@ -44,13 +44,16 @@ export abstract class BaseCommand extends Command {
 
 	protected license: License;
 
-	protected globalConfig = Container.get(GlobalConfig);
+	protected readonly globalConfig = Container.get(GlobalConfig);
 
 	/**
 	 * How long to wait for graceful shutdown before force killing the process.
 	 */
 	protected gracefulShutdownTimeoutInS = config.getEnv('generic.gracefulShutdownTimeout');
 
+	/** Whether to init community packages (if enabled) */
+	protected needsCommunityPackages = false;
+
 	async init(): Promise<void> {
 		await initErrorHandling();
 		initExpressionEvaluator();
@@ -111,6 +114,12 @@ export abstract class BaseCommand extends Command {
 			);
 		}
 
+		const { communityPackages } = this.globalConfig.nodes;
+		if (communityPackages.enabled && this.needsCommunityPackages) {
+			const { CommunityPackagesService } = await import('@/services/communityPackages.service');
+			await Container.get(CommunityPackagesService).checkForMissingPackages();
+		}
+
 		await Container.get(PostHogClient).init();
 		await Container.get(InternalHooks).init();
 		await Container.get(TelemetryEventRelay).init();
diff --git a/packages/cli/src/commands/execute.ts b/packages/cli/src/commands/execute.ts
index a375d19c31034..cdf949e87ceda 100644
--- a/packages/cli/src/commands/execute.ts
+++ b/packages/cli/src/commands/execute.ts
@@ -27,6 +27,8 @@ export class Execute extends BaseCommand {
 		}),
 	};
 
+	override needsCommunityPackages = true;
+
 	async init() {
 		await super.init();
 		await this.initBinaryDataService();
diff --git a/packages/cli/src/commands/executeBatch.ts b/packages/cli/src/commands/executeBatch.ts
index d8fdbeb8a201c..227dd962efb1b 100644
--- a/packages/cli/src/commands/executeBatch.ts
+++ b/packages/cli/src/commands/executeBatch.ts
@@ -108,6 +108,8 @@ export class ExecuteBatch extends BaseCommand {
 		}),
 	};
 
+	override needsCommunityPackages = true;
+
 	/**
 	 * Gracefully handles exit.
 	 * @param {boolean} skipExit Whether to skip exit or number according to received signal
diff --git a/packages/cli/src/commands/start.ts b/packages/cli/src/commands/start.ts
index 76d8b4c7e9273..98e8e5b98141c 100644
--- a/packages/cli/src/commands/start.ts
+++ b/packages/cli/src/commands/start.ts
@@ -8,7 +8,6 @@ import { createReadStream, createWriteStream, existsSync } from 'fs';
 import { pipeline } from 'stream/promises';
 import replaceStream from 'replacestream';
 import glob from 'fast-glob';
-import { GlobalConfig } from '@n8n/config';
 import { jsonParse, randomString } from 'n8n-workflow';
 
 import config from '@/config';
@@ -68,6 +67,8 @@ export class Start extends BaseCommand {
 
 	protected server = Container.get(Server);
 
+	override needsCommunityPackages = true;
+
 	constructor(argv: string[], cmdConfig: Config) {
 		super(argv, cmdConfig);
 		this.setInstanceType('main');
@@ -125,7 +126,6 @@ export class Start extends BaseCommand {
 	private async generateStaticAssets() {
 		// Read the index file and replace the path placeholder
 		const n8nPath = this.globalConfig.path;
-
 		const hooksUrls = config.getEnv('externalFrontendHooksUrls');
 
 		let scriptsString = '';
@@ -178,6 +178,22 @@ export class Start extends BaseCommand {
 			this.logger.debug(`Queue mode id: ${this.queueModeId}`);
 		}
 
+		const { flags } = await this.parse(Start);
+		const { communityPackages } = this.globalConfig.nodes;
+		// cli flag overrides the config env variable
+		if (flags.reinstallMissingPackages) {
+			if (communityPackages.enabled) {
+				this.logger.warn(
+					'`--reinstallMissingPackages` is deprecated: Please use the env variable `N8N_REINSTALL_MISSING_PACKAGES` instead',
+				);
+				communityPackages.reinstallMissing = true;
+			} else {
+				this.logger.warn(
+					'`--reinstallMissingPackages` was passed, but community packages are disabled',
+				);
+			}
+		}
+
 		await super.init();
 		this.activeWorkflowManager = Container.get(ActiveWorkflowManager);
 
@@ -251,18 +267,9 @@ export class Start extends BaseCommand {
 			config.set(setting.key, jsonParse(setting.value, { fallbackValue: setting.value }));
 		});
 
-		const globalConfig = Container.get(GlobalConfig);
-
-		if (globalConfig.nodes.communityPackages.enabled) {
-			const { CommunityPackagesService } = await import('@/services/communityPackages.service');
-			await Container.get(CommunityPackagesService).setMissingPackages({
-				reinstallMissingPackages: flags.reinstallMissingPackages,
-			});
-		}
-
-		const { type: dbType } = globalConfig.database;
+		const { type: dbType } = this.globalConfig.database;
 		if (dbType === 'sqlite') {
-			const shouldRunVacuum = globalConfig.database.sqlite.executeVacuumOnStartup;
+			const shouldRunVacuum = this.globalConfig.database.sqlite.executeVacuumOnStartup;
 			if (shouldRunVacuum) {
 				await Container.get(ExecutionRepository).query('VACUUM;');
 			}
@@ -282,7 +289,7 @@ export class Start extends BaseCommand {
 			}
 
 			const { default: localtunnel } = await import('@n8n/localtunnel');
-			const { port } = Container.get(GlobalConfig);
+			const { port } = this.globalConfig;
 
 			const webhookTunnel = await localtunnel(port, {
 				host: 'https://hooks.n8n.cloud',
diff --git a/packages/cli/src/commands/webhook.ts b/packages/cli/src/commands/webhook.ts
index 5b72c1eb86a9b..e76ac358170c1 100644
--- a/packages/cli/src/commands/webhook.ts
+++ b/packages/cli/src/commands/webhook.ts
@@ -22,6 +22,8 @@ export class Webhook extends BaseCommand {
 
 	protected server = Container.get(WebhookServer);
 
+	override needsCommunityPackages = true;
+
 	constructor(argv: string[], cmdConfig: Config) {
 		super(argv, cmdConfig);
 		this.setInstanceType('webhook');
diff --git a/packages/cli/src/commands/worker.ts b/packages/cli/src/commands/worker.ts
index cf4c23a0859a7..151ecfdf90d12 100644
--- a/packages/cli/src/commands/worker.ts
+++ b/packages/cli/src/commands/worker.ts
@@ -3,7 +3,6 @@ import { Flags, type Config } from '@oclif/core';
 import express from 'express';
 import http from 'http';
 import type PCancelable from 'p-cancelable';
-import { GlobalConfig } from '@n8n/config';
 import { WorkflowExecute } from 'n8n-core';
 import type { ExecutionStatus, IExecuteResponsePromiseData, INodeTypes, IRun } from 'n8n-workflow';
 import { Workflow, sleep, ApplicationError } from 'n8n-workflow';
@@ -57,6 +56,8 @@ export class Worker extends BaseCommand {
 
 	redisSubscriber: RedisServicePubSubSubscriber;
 
+	override needsCommunityPackages = true;
+
 	/**
 	 * Stop n8n in a graceful way.
 	 * Make for example sure that all the webhooks from third party services
@@ -429,8 +430,7 @@ export class Worker extends BaseCommand {
 
 		let presetCredentialsLoaded = false;
 
-		const globalConfig = Container.get(GlobalConfig);
-		const endpointPresetCredentials = globalConfig.credentials.overwrite.endpoint;
+		const endpointPresetCredentials = this.globalConfig.credentials.overwrite.endpoint;
 		if (endpointPresetCredentials !== '') {
 			// POST endpoint to set preset credentials
 			app.post(
diff --git a/packages/cli/src/controllers/communityPackages.controller.ts b/packages/cli/src/controllers/communityPackages.controller.ts
index e6323c728cb40..d9e7f49719679 100644
--- a/packages/cli/src/controllers/communityPackages.controller.ts
+++ b/packages/cli/src/controllers/communityPackages.controller.ts
@@ -1,11 +1,9 @@
-import { Request, Response, NextFunction } from 'express';
-import config from '@/config';
 import {
 	RESPONSE_ERROR_MESSAGES,
 	STARTER_TEMPLATE_NAME,
 	UNKNOWN_FAILURE_REASON,
 } from '@/constants';
-import { Delete, Get, Middleware, Patch, Post, RestController, GlobalScope } from '@/decorators';
+import { Delete, Get, Patch, Post, RestController, GlobalScope } from '@/decorators';
 import { NodeRequest } from '@/requests';
 import type { InstalledPackages } from '@db/entities/InstalledPackages';
 import type { CommunityPackages } from '@/Interfaces';
@@ -40,17 +38,6 @@ export class CommunityPackagesController {
 		private readonly eventService: EventService,
 	) {}
 
-	// TODO: move this into a new decorator `@IfConfig('executions.mode', 'queue')`
-	@Middleware()
-	checkIfCommunityNodesEnabled(req: Request, res: Response, next: NextFunction) {
-		if (config.getEnv('executions.mode') === 'queue' && req.method !== 'GET')
-			res.status(400).json({
-				status: 'error',
-				message: 'Package management is disabled when running in "queue" mode',
-			});
-		else next();
-	}
-
 	@Post('/')
 	@GlobalScope('communityPackage:install')
 	async installPackage(req: NodeRequest.Post) {
@@ -99,7 +86,7 @@ export class CommunityPackagesController {
 
 		let installedPackage: InstalledPackages;
 		try {
-			installedPackage = await this.communityPackagesService.installNpmModule(
+			installedPackage = await this.communityPackagesService.installPackage(
 				parsed.packageName,
 				parsed.version,
 			);
@@ -207,7 +194,7 @@ export class CommunityPackagesController {
 		}
 
 		try {
-			await this.communityPackagesService.removeNpmModule(name, installedPackage);
+			await this.communityPackagesService.removePackage(name, installedPackage);
 		} catch (error) {
 			const message = [
 				`Error removing package "${name}"`,
@@ -252,7 +239,7 @@ export class CommunityPackagesController {
 		}
 
 		try {
-			const newInstalledPackage = await this.communityPackagesService.updateNpmModule(
+			const newInstalledPackage = await this.communityPackagesService.updatePackage(
 				this.communityPackagesService.parseNpmPackageName(name).packageName,
 				previouslyInstalledPackage,
 			);
diff --git a/packages/cli/src/services/__tests__/communityPackages.service.test.ts b/packages/cli/src/services/__tests__/communityPackages.service.test.ts
index acfecc8171ba0..8d3289a8695b2 100644
--- a/packages/cli/src/services/__tests__/communityPackages.service.test.ts
+++ b/packages/cli/src/services/__tests__/communityPackages.service.test.ts
@@ -2,8 +2,10 @@ import { exec } from 'child_process';
 import { access as fsAccess, mkdir as fsMkdir } from 'fs/promises';
 import axios from 'axios';
 import { mocked } from 'jest-mock';
-import Container from 'typedi';
+import { mock } from 'jest-mock-extended';
+import type { GlobalConfig } from '@n8n/config';
 import type { PublicInstalledPackage } from 'n8n-workflow';
+import type { PackageDirectoryLoader } from 'n8n-core';
 
 import {
 	NODE_PACKAGE_PREFIX,
@@ -11,21 +13,18 @@ import {
 	NPM_PACKAGE_STATUS_GOOD,
 	RESPONSE_ERROR_MESSAGES,
 } from '@/constants';
-import config from '@/config';
 import { InstalledPackages } from '@db/entities/InstalledPackages';
 import type { CommunityPackages } from '@/Interfaces';
 import { CommunityPackagesService } from '@/services/communityPackages.service';
 import { InstalledNodesRepository } from '@db/repositories/installedNodes.repository';
 import { InstalledPackagesRepository } from '@db/repositories/installedPackages.repository';
 import { InstalledNodes } from '@db/entities/InstalledNodes';
-import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
+import type { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
 
 import { mockInstance } from '@test/mocking';
 import { COMMUNITY_NODE_VERSION, COMMUNITY_PACKAGE_VERSION } from '@test-integration/constants';
 import { randomName } from '@test-integration/random';
 import { mockPackageName, mockPackagePair } from '@test-integration/utils';
-import { InstanceSettings, PackageDirectoryLoader } from 'n8n-core';
-import { Logger } from '@/Logger';
 
 jest.mock('fs/promises');
 jest.mock('child_process');
@@ -40,6 +39,15 @@ const execMock = ((...args) => {
 }) as typeof exec;
 
 describe('CommunityPackagesService', () => {
+	const globalConfig = mock<GlobalConfig>({
+		nodes: {
+			communityPackages: {
+				reinstallMissing: false,
+			},
+		},
+	});
+	const loadNodesAndCredentials = mock<LoadNodesAndCredentials>();
+
 	const installedNodesRepository = mockInstance(InstalledNodesRepository);
 	installedNodesRepository.create.mockImplementation(() => {
 		const nodeName = randomName();
@@ -60,13 +68,14 @@ describe('CommunityPackagesService', () => {
 		});
 	});
 
-	mockInstance(LoadNodesAndCredentials);
-
-	const communityPackagesService = Container.get(CommunityPackagesService);
-
-	beforeEach(() => {
-		config.load(config.default);
-	});
+	const communityPackagesService = new CommunityPackagesService(
+		mock(),
+		mock(),
+		mock(),
+		loadNodesAndCredentials,
+		mock(),
+		globalConfig,
+	);
 
 	describe('parseNpmPackageName()', () => {
 		test('should fail with empty package name', () => {
@@ -365,29 +374,12 @@ describe('CommunityPackagesService', () => {
 	};
 
 	describe('updateNpmModule', () => {
-		let packageDirectoryLoader: PackageDirectoryLoader;
-		let communityPackagesService: CommunityPackagesService;
+		const packageDirectoryLoader = mock<PackageDirectoryLoader>();
 
 		beforeEach(async () => {
-			jest.restoreAllMocks();
+			jest.clearAllMocks();
 
-			packageDirectoryLoader = mockInstance(PackageDirectoryLoader);
-			const loadNodesAndCredentials = mockInstance(LoadNodesAndCredentials);
 			loadNodesAndCredentials.loadPackage.mockResolvedValue(packageDirectoryLoader);
-			const instanceSettings = mockInstance(InstanceSettings);
-			const logger = mockInstance(Logger);
-			const installedPackagesRepository = mockInstance(InstalledPackagesRepository);
-
-			communityPackagesService = new CommunityPackagesService(
-				instanceSettings,
-				logger,
-				installedPackagesRepository,
-				loadNodesAndCredentials,
-			);
-		});
-
-		afterEach(async () => {
-			jest.restoreAllMocks();
 		});
 
 		test('should call `exec` with the correct command ', async () => {
@@ -405,10 +397,7 @@ describe('CommunityPackagesService', () => {
 			//
 			// ACT
 			//
-			await communityPackagesService.updateNpmModule(
-				installedPackage.packageName,
-				installedPackage,
-			);
+			await communityPackagesService.updatePackage(installedPackage.packageName, installedPackage);
 
 			//
 			// ASSERT
diff --git a/packages/cli/src/services/communityPackages.service.ts b/packages/cli/src/services/communityPackages.service.ts
index 23bf9461d697d..b1f46d52fb434 100644
--- a/packages/cli/src/services/communityPackages.service.ts
+++ b/packages/cli/src/services/communityPackages.service.ts
@@ -5,6 +5,7 @@ import { Service } from 'typedi';
 import { promisify } from 'util';
 import axios from 'axios';
 
+import { GlobalConfig } from '@n8n/config';
 import { ApplicationError, type PublicInstalledPackage } from 'n8n-workflow';
 import { InstanceSettings } from 'n8n-core';
 import type { PackageDirectoryLoader } from 'n8n-core';
@@ -22,6 +23,7 @@ import {
 import type { CommunityPackages } from '@/Interfaces';
 import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
 import { Logger } from '@/Logger';
+import { OrchestrationService } from './orchestration.service';
 
 const {
 	PACKAGE_NAME_NOT_PROVIDED,
@@ -45,6 +47,8 @@ const INVALID_OR_SUSPICIOUS_PACKAGE_NAME = /[^0-9a-z@\-./]/;
 
 @Service()
 export class CommunityPackagesService {
+	reinstallMissingPackages = false;
+
 	missingPackages: string[] = [];
 
 	constructor(
@@ -52,7 +56,11 @@ export class CommunityPackagesService {
 		private readonly logger: Logger,
 		private readonly installedPackageRepository: InstalledPackagesRepository,
 		private readonly loadNodesAndCredentials: LoadNodesAndCredentials,
-	) {}
+		private readonly orchestrationService: OrchestrationService,
+		globalConfig: GlobalConfig,
+	) {
+		this.reinstallMissingPackages = globalConfig.nodes.communityPackages.reinstallMissing;
+	}
 
 	get hasMissingPackages() {
 		return this.missingPackages.length > 0;
@@ -73,11 +81,11 @@ export class CommunityPackagesService {
 		return await this.installedPackageRepository.find({ relations: ['installedNodes'] });
 	}
 
-	async removePackageFromDatabase(packageName: InstalledPackages) {
+	private async removePackageFromDatabase(packageName: InstalledPackages) {
 		return await this.installedPackageRepository.remove(packageName);
 	}
 
-	async persistInstalledPackage(packageLoader: PackageDirectoryLoader) {
+	private async persistInstalledPackage(packageLoader: PackageDirectoryLoader) {
 		try {
 			return await this.installedPackageRepository.saveInstalledPackageWithNodes(packageLoader);
 		} catch (maybeError) {
@@ -251,7 +259,7 @@ export class CommunityPackagesService {
 		}
 	}
 
-	async setMissingPackages({ reinstallMissingPackages }: { reinstallMissingPackages: boolean }) {
+	async checkForMissingPackages() {
 		const installedPackages = await this.getAllInstalledPackages();
 		const missingPackages = new Set<{ packageName: string; version: string }>();
 
@@ -271,24 +279,24 @@ export class CommunityPackagesService {
 
 		if (missingPackages.size === 0) return;
 
-		this.logger.error(
-			'n8n detected that some packages are missing. For more information, visit https://docs.n8n.io/integrations/community-nodes/troubleshooting/',
-		);
-
-		if (reinstallMissingPackages || process.env.N8N_REINSTALL_MISSING_PACKAGES) {
+		if (this.reinstallMissingPackages) {
 			this.logger.info('Attempting to reinstall missing packages', { missingPackages });
 			try {
 				// Optimistic approach - stop if any installation fails
-
 				for (const missingPackage of missingPackages) {
-					await this.installNpmModule(missingPackage.packageName, missingPackage.version);
+					await this.installPackage(missingPackage.packageName, missingPackage.version);
 
 					missingPackages.delete(missingPackage);
 				}
 				this.logger.info('Packages reinstalled successfully. Resuming regular initialization.');
+				await this.loadNodesAndCredentials.postProcessLoaders();
 			} catch (error) {
 				this.logger.error('n8n was unable to install the missing packages.');
 			}
+		} else {
+			this.logger.warn(
+				'n8n detected that some packages are missing. For more information, visit https://docs.n8n.io/integrations/community-nodes/troubleshooting/',
+			);
 		}
 
 		this.missingPackages = [...missingPackages].map(
@@ -296,32 +304,30 @@ export class CommunityPackagesService {
 		);
 	}
 
-	async installNpmModule(packageName: string, version?: string): Promise<InstalledPackages> {
-		return await this.installOrUpdateNpmModule(packageName, { version });
+	async installPackage(packageName: string, version?: string): Promise<InstalledPackages> {
+		return await this.installOrUpdatePackage(packageName, { version });
 	}
 
-	async updateNpmModule(
+	async updatePackage(
 		packageName: string,
 		installedPackage: InstalledPackages,
 	): Promise<InstalledPackages> {
-		return await this.installOrUpdateNpmModule(packageName, { installedPackage });
+		return await this.installOrUpdatePackage(packageName, { installedPackage });
 	}
 
-	async removeNpmModule(packageName: string, installedPackage: InstalledPackages): Promise<void> {
-		await this.executeNpmCommand(`npm remove ${packageName}`);
+	async removePackage(packageName: string, installedPackage: InstalledPackages): Promise<void> {
+		await this.removeNpmPackage(packageName);
 		await this.removePackageFromDatabase(installedPackage);
-		await this.loadNodesAndCredentials.unloadPackage(packageName);
-		await this.loadNodesAndCredentials.postProcessLoaders();
+		await this.orchestrationService.publish('community-package-uninstall', { packageName });
 	}
 
-	private async installOrUpdateNpmModule(
+	private async installOrUpdatePackage(
 		packageName: string,
 		options: { version?: string } | { installedPackage: InstalledPackages },
 	) {
 		const isUpdate = 'installedPackage' in options;
-		const command = isUpdate
-			? `npm install ${packageName}@latest`
-			: `npm install ${packageName}${options.version ? `@${options.version}` : ''}`;
+		const packageVersion = isUpdate || !options.version ? 'latest' : options.version;
+		const command = `npm install ${packageName}@${packageVersion}`;
 
 		try {
 			await this.executeNpmCommand(command);
@@ -337,9 +343,8 @@ export class CommunityPackagesService {
 			loader = await this.loadNodesAndCredentials.loadPackage(packageName);
 		} catch (error) {
 			// Remove this package since loading it failed
-			const removeCommand = `npm remove ${packageName}`;
 			try {
-				await this.executeNpmCommand(removeCommand);
+				await this.executeNpmCommand(`npm remove ${packageName}`);
 			} catch {}
 			throw new ApplicationError(RESPONSE_ERROR_MESSAGES.PACKAGE_LOADING_FAILED, { cause: error });
 		}
@@ -351,7 +356,12 @@ export class CommunityPackagesService {
 					await this.removePackageFromDatabase(options.installedPackage);
 				}
 				const installedPackage = await this.persistInstalledPackage(loader);
+				await this.orchestrationService.publish(
+					isUpdate ? 'community-package-update' : 'community-package-install',
+					{ packageName, packageVersion },
+				);
 				await this.loadNodesAndCredentials.postProcessLoaders();
+				this.logger.info(`Community package installed: ${packageName}`);
 				return installedPackage;
 			} catch (error) {
 				throw new ApplicationError('Failed to save installed package', {
@@ -361,12 +371,24 @@ export class CommunityPackagesService {
 			}
 		} else {
 			// Remove this package since it contains no loadable nodes
-			const removeCommand = `npm remove ${packageName}`;
 			try {
-				await this.executeNpmCommand(removeCommand);
+				await this.executeNpmCommand(`npm remove ${packageName}`);
 			} catch {}
-
 			throw new ApplicationError(RESPONSE_ERROR_MESSAGES.PACKAGE_DOES_NOT_CONTAIN_NODES);
 		}
 	}
+
+	async installOrUpdateNpmPackage(packageName: string, packageVersion: string) {
+		await this.executeNpmCommand(`npm install ${packageName}@${packageVersion}`);
+		await this.loadNodesAndCredentials.loadPackage(packageName);
+		await this.loadNodesAndCredentials.postProcessLoaders();
+		this.logger.info(`Community package installed: ${packageName}`);
+	}
+
+	async removeNpmPackage(packageName: string) {
+		await this.executeNpmCommand(`npm remove ${packageName}`);
+		await this.loadNodesAndCredentials.unloadPackage(packageName);
+		await this.loadNodesAndCredentials.postProcessLoaders();
+		this.logger.info(`Community package uninstalled: ${packageName}`);
+	}
 }
diff --git a/packages/cli/src/services/orchestration/main/handleCommandMessageMain.ts b/packages/cli/src/services/orchestration/main/handleCommandMessageMain.ts
index 8abcbe78b2c47..7945f59bc35f8 100644
--- a/packages/cli/src/services/orchestration/main/handleCommandMessageMain.ts
+++ b/packages/cli/src/services/orchestration/main/handleCommandMessageMain.ts
@@ -10,6 +10,7 @@ import { Push } from '@/push';
 import { TestWebhooks } from '@/TestWebhooks';
 import { OrchestrationService } from '@/services/orchestration.service';
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
+import { CommunityPackagesService } from '@/services/communityPackages.service';
 
 // eslint-disable-next-line complexity
 export async function handleCommandMessageMain(messageString: string) {
@@ -77,6 +78,20 @@ export async function handleCommandMessageMain(messageString: string) {
 				}
 				await Container.get(ExternalSecretsManager).reloadAllProviders();
 				break;
+			case 'community-package-install':
+			case 'community-package-update':
+			case 'community-package-uninstall':
+				if (!debounceMessageReceiver(message, 200)) {
+					return message;
+				}
+				const { packageName, packageVersion } = message.payload;
+				const communityPackagesService = Container.get(CommunityPackagesService);
+				if (message.command === 'community-package-uninstall') {
+					await communityPackagesService.removeNpmPackage(packageName);
+				} else {
+					await communityPackagesService.installOrUpdateNpmPackage(packageName, packageVersion);
+				}
+				break;
 
 			case 'add-webhooks-triggers-and-pollers': {
 				if (!debounceMessageReceiver(message, 100)) {
diff --git a/packages/cli/src/services/orchestration/webhook/handleCommandMessageWebhook.ts b/packages/cli/src/services/orchestration/webhook/handleCommandMessageWebhook.ts
index 9dc326978d803..e6f6e656280a8 100644
--- a/packages/cli/src/services/orchestration/webhook/handleCommandMessageWebhook.ts
+++ b/packages/cli/src/services/orchestration/webhook/handleCommandMessageWebhook.ts
@@ -5,6 +5,7 @@ import Container from 'typedi';
 import { Logger } from 'winston';
 import { messageToRedisServiceCommandObject, debounceMessageReceiver } from '../helpers';
 import config from '@/config';
+import { CommunityPackagesService } from '@/services/communityPackages.service';
 
 export async function handleCommandMessageWebhook(messageString: string) {
 	const queueModeId = config.getEnv('redis.queueModeId');
@@ -63,6 +64,20 @@ export async function handleCommandMessageWebhook(messageString: string) {
 				}
 				await Container.get(ExternalSecretsManager).reloadAllProviders();
 				break;
+			case 'community-package-install':
+			case 'community-package-update':
+			case 'community-package-uninstall':
+				if (!debounceMessageReceiver(message, 200)) {
+					return message;
+				}
+				const { packageName, packageVersion } = message.payload;
+				const communityPackagesService = Container.get(CommunityPackagesService);
+				if (message.command === 'community-package-uninstall') {
+					await communityPackagesService.removeNpmPackage(packageName);
+				} else {
+					await communityPackagesService.installOrUpdateNpmPackage(packageName, packageVersion);
+				}
+				break;
 
 			default:
 				break;
diff --git a/packages/cli/src/services/orchestration/worker/handleCommandMessageWorker.ts b/packages/cli/src/services/orchestration/worker/handleCommandMessageWorker.ts
index fa9ee67675e83..23c96e1a41cd9 100644
--- a/packages/cli/src/services/orchestration/worker/handleCommandMessageWorker.ts
+++ b/packages/cli/src/services/orchestration/worker/handleCommandMessageWorker.ts
@@ -10,6 +10,7 @@ import { debounceMessageReceiver, getOsCpuString } from '../helpers';
 import type { WorkerCommandReceivedHandlerOptions } from './types';
 import { Logger } from '@/Logger';
 import { N8N_VERSION } from '@/constants';
+import { CommunityPackagesService } from '@/services/communityPackages.service';
 
 export function getWorkerCommandReceivedHandler(options: WorkerCommandReceivedHandlerOptions) {
 	// eslint-disable-next-line complexity
@@ -112,6 +113,18 @@ export function getWorkerCommandReceivedHandler(options: WorkerCommandReceivedHa
 							});
 						}
 						break;
+					case 'community-package-install':
+					case 'community-package-update':
+					case 'community-package-uninstall':
+						if (!debounceMessageReceiver(message, 500)) return;
+						const { packageName, packageVersion } = message.payload;
+						const communityPackagesService = Container.get(CommunityPackagesService);
+						if (message.command === 'community-package-uninstall') {
+							await communityPackagesService.removeNpmPackage(packageName);
+						} else {
+							await communityPackagesService.installOrUpdateNpmPackage(packageName, packageVersion);
+						}
+						break;
 					case 'reloadLicense':
 						if (!debounceMessageReceiver(message, 500)) return;
 						await Container.get(License).reload();
diff --git a/packages/cli/src/services/redis/RedisServiceCommands.ts b/packages/cli/src/services/redis/RedisServiceCommands.ts
index 009f39ef650eb..a8ae41c11390b 100644
--- a/packages/cli/src/services/redis/RedisServiceCommands.ts
+++ b/packages/cli/src/services/redis/RedisServiceCommands.ts
@@ -7,6 +7,9 @@ export type RedisServiceCommand =
 	| 'stopWorker'
 	| 'reloadLicense'
 	| 'reloadExternalSecretsProviders'
+	| 'community-package-install'
+	| 'community-package-update'
+	| 'community-package-uninstall'
 	| 'display-workflow-activation' // multi-main only
 	| 'display-workflow-deactivation' // multi-main only
 	| 'add-webhooks-triggers-and-pollers' // multi-main only
@@ -26,7 +29,11 @@ export type RedisServiceBaseCommand =
 			senderId: string;
 			command: Exclude<
 				RedisServiceCommand,
-				'relay-execution-lifecycle-event' | 'clear-test-webhooks'
+				| 'relay-execution-lifecycle-event'
+				| 'clear-test-webhooks'
+				| 'community-package-install'
+				| 'community-package-update'
+				| 'community-package-uninstall'
 			>;
 			payload?: {
 				[key: string]: string | number | boolean | string[] | number[] | boolean[];
@@ -41,6 +48,14 @@ export type RedisServiceBaseCommand =
 			senderId: string;
 			command: 'clear-test-webhooks';
 			payload: { webhookKey: string; workflowEntity: IWorkflowDb; pushRef: string };
+	  }
+	| {
+			senderId: string;
+			command:
+				| 'community-package-install'
+				| 'community-package-update'
+				| 'community-package-uninstall';
+			payload: { packageName: string; packageVersion: string };
 	  };
 
 export type RedisServiceWorkerResponseObject = {
diff --git a/packages/cli/test/integration/community-packages.api.test.ts b/packages/cli/test/integration/community-packages.api.test.ts
index 661dbcd0fe4e9..46c7efad03434 100644
--- a/packages/cli/test/integration/community-packages.api.test.ts
+++ b/packages/cli/test/integration/community-packages.api.test.ts
@@ -179,7 +179,7 @@ describe('POST /community-packages', () => {
 		communityPackagesService.hasPackageLoaded.mockReturnValue(false);
 		communityPackagesService.checkNpmPackageStatus.mockResolvedValue({ status: 'OK' });
 		communityPackagesService.parseNpmPackageName.mockReturnValue(parsedNpmPackageName);
-		communityPackagesService.installNpmModule.mockResolvedValue(mockPackage());
+		communityPackagesService.installPackage.mockResolvedValue(mockPackage());
 
 		await authAgent.post('/community-packages').send({ name: mockPackageName() }).expect(200);
 
@@ -219,7 +219,7 @@ describe('DELETE /community-packages', () => {
 
 		await authAgent.delete('/community-packages').query({ name: mockPackageName() }).expect(200);
 
-		expect(communityPackagesService.removeNpmModule).toHaveBeenCalledTimes(1);
+		expect(communityPackagesService.removePackage).toHaveBeenCalledTimes(1);
 	});
 });
 
@@ -242,6 +242,6 @@ describe('PATCH /community-packages', () => {
 
 		await authAgent.patch('/community-packages').send({ name: mockPackageName() });
 
-		expect(communityPackagesService.updateNpmModule).toHaveBeenCalledTimes(1);
+		expect(communityPackagesService.updatePackage).toHaveBeenCalledTimes(1);
 	});
 });
diff --git a/packages/editor-ui/src/constants.ts b/packages/editor-ui/src/constants.ts
index 8b30c972c8af0..acf94fcc3c0dd 100644
--- a/packages/editor-ui/src/constants.ts
+++ b/packages/editor-ui/src/constants.ts
@@ -92,7 +92,6 @@ export const NPM_KEYWORD_SEARCH_URL =
 	'https://www.npmjs.com/search?q=keywords%3An8n-community-node-package';
 export const N8N_QUEUE_MODE_DOCS_URL = `https://${DOCS_DOMAIN}/hosting/scaling/queue-mode/`;
 export const COMMUNITY_NODES_INSTALLATION_DOCS_URL = `https://${DOCS_DOMAIN}/integrations/community-nodes/installation/gui-install/`;
-export const COMMUNITY_NODES_MANUAL_INSTALLATION_DOCS_URL = `https://${DOCS_DOMAIN}/integrations/community-nodes/installation/manual-install/`;
 export const COMMUNITY_NODES_NPM_INSTALLATION_URL =
 	'https://docs.npmjs.com/downloading-and-installing-node-js-and-npm';
 export const COMMUNITY_NODES_RISKS_DOCS_URL = `https://${DOCS_DOMAIN}/integrations/community-nodes/risks/`;
diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json
index e5ee0088590c8..2acf1cfd3554b 100644
--- a/packages/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/editor-ui/src/plugins/i18n/locales/en.json
@@ -1562,7 +1562,6 @@
 	"settings.communityNodes.empty.description": "Install over {count} node packages contributed by our community.",
 	"settings.communityNodes.empty.description.no-packages": "Install node packages contributed by our community.",
 	"settings.communityNodes.empty.installPackageLabel": "Install a community node",
-	"settings.communityNodes.queueMode.warning": "You need to install community nodes manually because your instance is running in queue mode. <a href=\"{docURL}\" target=\"_blank\" title=\"Read the n8n docs\">More info</a>",
 	"settings.communityNodes.npmUnavailable.warning": "To use this feature, please <a href=\"{npmUrl}\" target=\"_blank\" title=\"How to install npm\">install npm</a> and restart n8n.",
 	"settings.communityNodes.notAvailableOnDesktop": "Feature unavailable on desktop. Please self-host to use community nodes.",
 	"settings.communityNodes.packageNodes.label": "{count} node | {count} nodes",
diff --git a/packages/editor-ui/src/views/SettingsCommunityNodesView.vue b/packages/editor-ui/src/views/SettingsCommunityNodesView.vue
index fcfb3742383c6..194a289eb1b9b 100644
--- a/packages/editor-ui/src/views/SettingsCommunityNodesView.vue
+++ b/packages/editor-ui/src/views/SettingsCommunityNodesView.vue
@@ -3,25 +3,13 @@
 		<div :class="$style.headingContainer">
 			<n8n-heading size="2xlarge">{{ $locale.baseText('settings.communityNodes') }}</n8n-heading>
 			<n8n-button
-				v-if="
-					!settingsStore.isQueueModeEnabled &&
-					communityNodesStore.getInstalledPackages.length > 0 &&
-					!loading
-				"
+				v-if="communityNodesStore.getInstalledPackages.length > 0 && !loading"
 				:label="$locale.baseText('settings.communityNodes.installModal.installButton.label')"
 				size="large"
 				@click="openInstallModal"
 			/>
 		</div>
-		<div v-if="settingsStore.isQueueModeEnabled" :class="$style.actionBoxContainer">
-			<n8n-action-box
-				:heading="$locale.baseText('settings.communityNodes.empty.title')"
-				:description="getEmptyStateDescription"
-				:callout-text="actionBoxConfig.calloutText"
-				:callout-theme="actionBoxConfig.calloutTheme"
-			/>
-		</div>
-		<div v-else-if="loading" :class="$style.cardsContainer">
+		<div v-if="loading" :class="$style.cardsContainer">
 			<CommunityPackageCard
 				v-for="n in 2"
 				:key="'index-' + n"
@@ -55,7 +43,6 @@
 import {
 	COMMUNITY_PACKAGE_INSTALL_MODAL_KEY,
 	COMMUNITY_NODES_INSTALLATION_DOCS_URL,
-	COMMUNITY_NODES_MANUAL_INSTALLATION_DOCS_URL,
 	COMMUNITY_NODES_NPM_INSTALLATION_URL,
 } from '@/constants';
 import CommunityPackageCard from '@/components/CommunityPackageCard.vue';
@@ -144,16 +131,6 @@ export default defineComponent({
 				};
 			}
 
-			if (this.settingsStore.isQueueModeEnabled) {
-				return {
-					calloutText: this.$locale.baseText('settings.communityNodes.queueMode.warning', {
-						interpolate: { docURL: COMMUNITY_NODES_MANUAL_INSTALLATION_DOCS_URL },
-					}),
-					calloutTheme: 'warning',
-					hideButton: true,
-				};
-			}
-
 			return {
 				calloutText: '',
 				calloutTheme: '',

From c0f3693e8afdadfb5984d71967fcc2597913158f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Mon, 5 Aug 2024 12:07:42 +0200
Subject: [PATCH 073/168] refactor(core): Decouple user events from internal
 hooks (no-changelog) (#10292)

---
 packages/cli/src/Interfaces.ts                |   8 -
 packages/cli/src/InternalHooks.ts             |  96 ------------
 .../handlers/executions/executions.handler.ts |  14 +-
 .../v1/handlers/users/users.handler.ee.ts     |  22 ++-
 .../handlers/workflows/workflows.handler.ts   |  13 +-
 packages/cli/src/auth/methods/ldap.ts         |   9 +-
 .../__tests__/me.controller.test.ts           |   8 +-
 .../src/controllers/invitation.controller.ts  |  10 +-
 packages/cli/src/controllers/me.controller.ts |   9 +-
 .../controllers/passwordReset.controller.ts   |  11 +-
 .../cli/src/controllers/users.controller.ts   |  31 ++--
 .../log-streaming-event-relay.test.ts         |   5 +
 packages/cli/src/events/relay-event-map.ts    |  53 +++++++
 .../cli/src/events/telemetry-event-relay.ts   | 142 ++++++++++++++++++
 packages/cli/src/services/user.service.ts     |  10 +-
 15 files changed, 260 insertions(+), 181 deletions(-)

diff --git a/packages/cli/src/Interfaces.ts b/packages/cli/src/Interfaces.ts
index 25f758185aea9..8ddbd10fb29c1 100644
--- a/packages/cli/src/Interfaces.ts
+++ b/packages/cli/src/Interfaces.ts
@@ -267,14 +267,6 @@ export interface IWebhookManager {
 	executeWebhook(req: WebhookRequest, res: Response): Promise<IResponseCallbackData>;
 }
 
-export interface ITelemetryUserDeletionData {
-	user_id: string;
-	target_user_old_status: 'active' | 'invited';
-	migration_strategy?: 'transfer_data' | 'delete_data';
-	target_user_id?: string;
-	migration_user_id?: string;
-}
-
 export interface IVersionNotificationSettings {
 	enabled: boolean;
 	endpoint: string;
diff --git a/packages/cli/src/InternalHooks.ts b/packages/cli/src/InternalHooks.ts
index af72d6bfece78..031a7fe3a6259 100644
--- a/packages/cli/src/InternalHooks.ts
+++ b/packages/cli/src/InternalHooks.ts
@@ -1,9 +1,6 @@
 import { Service } from 'typedi';
-import { snakeCase } from 'change-case';
 import type { ITelemetryTrackProperties } from 'n8n-workflow';
-import type { AuthProviderType } from '@db/entities/AuthIdentity';
 import type { User } from '@db/entities/User';
-import type { ITelemetryUserDeletionData } from '@/Interfaces';
 import { WorkflowStatisticsService } from '@/services/workflow-statistics.service';
 import { Telemetry } from '@/telemetry';
 import { MessageEventBus } from './eventbus/MessageEventBus/MessageEventBus';
@@ -39,16 +36,6 @@ export class InternalHooks {
 		this.telemetry.track('Session started', { session_id: pushRef });
 	}
 
-	onPersonalizationSurveySubmitted(userId: string, answers: Record<string, string>): void {
-		const camelCaseKeys = Object.keys(answers);
-		const personalizationSurveyData = { user_id: userId } as Record<string, string | string[]>;
-		camelCaseKeys.forEach((camelCaseKey) => {
-			personalizationSurveyData[snakeCase(camelCaseKey)] = answers[camelCaseKey];
-		});
-
-		this.telemetry.track('User responded to personalization questions', personalizationSurveyData);
-	}
-
 	onWorkflowSharingUpdate(workflowId: string, userId: string, userList: string[]) {
 		const properties: ITelemetryTrackProperties = {
 			workflow_id: workflowId,
@@ -67,76 +54,6 @@ export class InternalHooks {
 		return await Promise.race([timeoutPromise, this.telemetry.trackN8nStop()]);
 	}
 
-	onUserDeletion(userDeletionData: {
-		user: User;
-		telemetryData: ITelemetryUserDeletionData;
-		publicApi: boolean;
-	}) {
-		this.telemetry.track('User deleted user', {
-			...userDeletionData.telemetryData,
-			user_id: userDeletionData.user.id,
-			public_api: userDeletionData.publicApi,
-		});
-	}
-
-	onUserInvite(userInviteData: {
-		user: User;
-		target_user_id: string[];
-		public_api: boolean;
-		email_sent: boolean;
-		invitee_role: string;
-	}) {
-		this.telemetry.track('User invited new user', {
-			user_id: userInviteData.user.id,
-			target_user_id: userInviteData.target_user_id,
-			public_api: userInviteData.public_api,
-			email_sent: userInviteData.email_sent,
-			invitee_role: userInviteData.invitee_role,
-		});
-	}
-
-	onUserRoleChange(userRoleChangeData: {
-		user: User;
-		target_user_id: string;
-		public_api: boolean;
-		target_user_new_role: string;
-	}) {
-		const { user, ...rest } = userRoleChangeData;
-
-		this.telemetry.track('User changed role', { user_id: user.id, ...rest });
-	}
-
-	onUserRetrievedUser(userRetrievedData: { user_id: string; public_api: boolean }) {
-		this.telemetry.track('User retrieved user', userRetrievedData);
-	}
-
-	onUserRetrievedAllUsers(userRetrievedData: { user_id: string; public_api: boolean }) {
-		this.telemetry.track('User retrieved all users', userRetrievedData);
-	}
-
-	onUserRetrievedExecution(userRetrievedData: { user_id: string; public_api: boolean }) {
-		this.telemetry.track('User retrieved execution', userRetrievedData);
-	}
-
-	onUserRetrievedAllExecutions(userRetrievedData: { user_id: string; public_api: boolean }) {
-		this.telemetry.track('User retrieved all executions', userRetrievedData);
-	}
-
-	onUserRetrievedWorkflow(userRetrievedData: { user_id: string; public_api: boolean }) {
-		this.telemetry.track('User retrieved workflow', userRetrievedData);
-	}
-
-	onUserRetrievedAllWorkflows(userRetrievedData: { user_id: string; public_api: boolean }) {
-		this.telemetry.track('User retrieved all workflows', userRetrievedData);
-	}
-
-	onUserUpdate(userUpdateData: { user: User; fields_changed: string[] }) {
-		this.telemetry.track('User changed personal settings', {
-			user_id: userUpdateData.user.id,
-			fields_changed: userUpdateData.fields_changed,
-		});
-	}
-
 	onUserInviteEmailClick(userInviteClickData: { inviter: User; invitee: User }) {
 		this.telemetry.track('User clicked invite link from email', {
 			user_id: userInviteClickData.invitee.id,
@@ -172,19 +89,6 @@ export class InternalHooks {
 		this.telemetry.track('Owner finished instance setup', instanceOwnerSetupData);
 	}
 
-	onUserSignup(
-		user: User,
-		userSignupData: {
-			user_type: AuthProviderType;
-			was_disabled_ldap_user: boolean;
-		},
-	) {
-		this.telemetry.track('User signed up', {
-			user_id: user.id,
-			...userSignupData,
-		});
-	}
-
 	onEmailFailed(failedEmailData: {
 		user: User;
 		message_type:
diff --git a/packages/cli/src/PublicApi/v1/handlers/executions/executions.handler.ts b/packages/cli/src/PublicApi/v1/handlers/executions/executions.handler.ts
index ed078b52d5249..ab6927724c1aa 100644
--- a/packages/cli/src/PublicApi/v1/handlers/executions/executions.handler.ts
+++ b/packages/cli/src/PublicApi/v1/handlers/executions/executions.handler.ts
@@ -7,7 +7,7 @@ import { validCursor } from '../../shared/middlewares/global.middleware';
 import type { ExecutionRequest } from '../../../types';
 import { getSharedWorkflowIds } from '../workflows/workflows.service';
 import { encodeNextCursor } from '../../shared/services/pagination.service';
-import { InternalHooks } from '@/InternalHooks';
+import { EventService } from '@/events/event.service';
 import { ExecutionRepository } from '@db/repositories/execution.repository';
 import { ConcurrencyControlService } from '@/concurrency/concurrency-control.service';
 
@@ -78,9 +78,9 @@ export = {
 				return res.status(404).json({ message: 'Not Found' });
 			}
 
-			Container.get(InternalHooks).onUserRetrievedExecution({
-				user_id: req.user.id,
-				public_api: true,
+			Container.get(EventService).emit('user-retrieved-execution', {
+				userId: req.user.id,
+				publicApi: true,
 			});
 
 			return res.json(replaceCircularReferences(execution));
@@ -130,9 +130,9 @@ export = {
 			const count =
 				await Container.get(ExecutionRepository).getExecutionsCountForPublicApi(filters);
 
-			Container.get(InternalHooks).onUserRetrievedAllExecutions({
-				user_id: req.user.id,
-				public_api: true,
+			Container.get(EventService).emit('user-retrieved-all-executions', {
+				userId: req.user.id,
+				publicApi: true,
 			});
 
 			return res.json({
diff --git a/packages/cli/src/PublicApi/v1/handlers/users/users.handler.ee.ts b/packages/cli/src/PublicApi/v1/handlers/users/users.handler.ee.ts
index 53c568ee69acd..59a7a4c3e3f42 100644
--- a/packages/cli/src/PublicApi/v1/handlers/users/users.handler.ee.ts
+++ b/packages/cli/src/PublicApi/v1/handlers/users/users.handler.ee.ts
@@ -11,7 +11,7 @@ import {
 	validLicenseWithUserQuota,
 } from '../../shared/middlewares/global.middleware';
 import type { UserRequest } from '@/requests';
-import { InternalHooks } from '@/InternalHooks';
+import { EventService } from '@/events/event.service';
 import { ProjectRelationRepository } from '@/databases/repositories/projectRelation.repository';
 import type { Response } from 'express';
 import { InvitationController } from '@/controllers/invitation.controller';
@@ -37,12 +37,10 @@ export = {
 				});
 			}
 
-			const telemetryData = {
-				user_id: req.user.id,
-				public_api: true,
-			};
-
-			Container.get(InternalHooks).onUserRetrievedUser(telemetryData);
+			Container.get(EventService).emit('user-retrieved-user', {
+				userId: req.user.id,
+				publicApi: true,
+			});
 
 			return res.json(clean(user, { includeRole }));
 		},
@@ -65,12 +63,10 @@ export = {
 				in: _in,
 			});
 
-			const telemetryData = {
-				user_id: req.user.id,
-				public_api: true,
-			};
-
-			Container.get(InternalHooks).onUserRetrievedAllUsers(telemetryData);
+			Container.get(EventService).emit('user-retrieved-all-users', {
+				userId: req.user.id,
+				publicApi: true,
+			});
 
 			return res.json({
 				data: clean(users, { includeRole }),
diff --git a/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.handler.ts b/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.handler.ts
index 16434ef4e9a1e..d5abac95a1787 100644
--- a/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.handler.ts
+++ b/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.handler.ts
@@ -26,7 +26,6 @@ import {
 	updateTags,
 } from './workflows.service';
 import { WorkflowService } from '@/workflows/workflow.service';
-import { InternalHooks } from '@/InternalHooks';
 import { WorkflowHistoryService } from '@/workflows/workflowHistory/workflowHistory.service.ee';
 import { SharedWorkflowRepository } from '@/databases/repositories/sharedWorkflow.repository';
 import { TagRepository } from '@/databases/repositories/tag.repository';
@@ -119,9 +118,9 @@ export = {
 				return res.status(404).json({ message: 'Not Found' });
 			}
 
-			Container.get(InternalHooks).onUserRetrievedWorkflow({
-				user_id: req.user.id,
-				public_api: true,
+			Container.get(EventService).emit('user-retrieved-workflow', {
+				userId: req.user.id,
+				publicApi: true,
 			});
 
 			return res.json(workflow);
@@ -185,9 +184,9 @@ export = {
 				...(!config.getEnv('workflowTagsDisabled') && { relations: ['tags'] }),
 			});
 
-			Container.get(InternalHooks).onUserRetrievedAllWorkflows({
-				user_id: req.user.id,
-				public_api: true,
+			Container.get(EventService).emit('user-retrieved-all-workflows', {
+				userId: req.user.id,
+				publicApi: true,
 			});
 
 			return res.json({
diff --git a/packages/cli/src/auth/methods/ldap.ts b/packages/cli/src/auth/methods/ldap.ts
index c632557c95c85..66f6f6dcd9ffe 100644
--- a/packages/cli/src/auth/methods/ldap.ts
+++ b/packages/cli/src/auth/methods/ldap.ts
@@ -1,6 +1,5 @@
 import { Container } from 'typedi';
 
-import { InternalHooks } from '@/InternalHooks';
 import { LdapService } from '@/Ldap/ldap.service.ee';
 import {
 	createLdapUserOnLocalDb,
@@ -51,11 +50,11 @@ export const handleLdapLogin = async (
 			await updateLdapUserOnLocalDb(identity, ldapAttributesValues);
 		} else {
 			const user = await createLdapUserOnLocalDb(ldapAttributesValues, ldapId);
-			Container.get(InternalHooks).onUserSignup(user, {
-				user_type: 'ldap',
-				was_disabled_ldap_user: false,
+			Container.get(EventService).emit('user-signed-up', {
+				user,
+				userType: 'ldap',
+				wasDisabledLdapUser: false,
 			});
-			Container.get(EventService).emit('user-signed-up', { user });
 			return user;
 		}
 	} else {
diff --git a/packages/cli/src/controllers/__tests__/me.controller.test.ts b/packages/cli/src/controllers/__tests__/me.controller.test.ts
index 9fd165be80c5d..6e187f9cd5e2e 100644
--- a/packages/cli/src/controllers/__tests__/me.controller.test.ts
+++ b/packages/cli/src/controllers/__tests__/me.controller.test.ts
@@ -13,6 +13,7 @@ import { InternalHooks } from '@/InternalHooks';
 import { License } from '@/License';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 import { UserRepository } from '@/databases/repositories/user.repository';
+import { EventService } from '@/events/event.service';
 import { badPasswords } from '@test/testData';
 import { mockInstance } from '@test/mocking';
 
@@ -20,7 +21,8 @@ const browserId = 'test-browser-id';
 
 describe('MeController', () => {
 	const externalHooks = mockInstance(ExternalHooks);
-	const internalHooks = mockInstance(InternalHooks);
+	mockInstance(InternalHooks);
+	const eventService = mockInstance(EventService);
 	const userService = mockInstance(UserService);
 	const userRepository = mockInstance(UserRepository);
 	mockInstance(License).isWithinUsersLimit.mockReturnValue(true);
@@ -202,9 +204,9 @@ describe('MeController', () => {
 				req.user.password,
 			]);
 
-			expect(internalHooks.onUserUpdate).toHaveBeenCalledWith({
+			expect(eventService.emit).toHaveBeenCalledWith('user-updated', {
 				user: req.user,
-				fields_changed: ['password'],
+				fieldsChanged: ['password'],
 			});
 		});
 	});
diff --git a/packages/cli/src/controllers/invitation.controller.ts b/packages/cli/src/controllers/invitation.controller.ts
index edf3b5c151fcc..19bd803c5e6c0 100644
--- a/packages/cli/src/controllers/invitation.controller.ts
+++ b/packages/cli/src/controllers/invitation.controller.ts
@@ -16,7 +16,6 @@ import type { User } from '@/databases/entities/User';
 import { UserRepository } from '@db/repositories/user.repository';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 import { ForbiddenError } from '@/errors/response-errors/forbidden.error';
-import { InternalHooks } from '@/InternalHooks';
 import { ExternalHooks } from '@/ExternalHooks';
 import { EventService } from '@/events/event.service';
 
@@ -24,7 +23,6 @@ import { EventService } from '@/events/event.service';
 export class InvitationController {
 	constructor(
 		private readonly logger: Logger,
-		private readonly internalHooks: InternalHooks,
 		private readonly externalHooks: ExternalHooks,
 		private readonly authService: AuthService,
 		private readonly userService: UserService,
@@ -168,11 +166,11 @@ export class InvitationController {
 
 		this.authService.issueCookie(res, updatedUser, req.browserId);
 
-		this.internalHooks.onUserSignup(updatedUser, {
-			user_type: 'email',
-			was_disabled_ldap_user: false,
+		this.eventService.emit('user-signed-up', {
+			user: updatedUser,
+			userType: 'email',
+			wasDisabledLdapUser: false,
 		});
-		this.eventService.emit('user-signed-up', { user: updatedUser });
 
 		const publicInvitee = await this.userService.toPublic(invitee);
 
diff --git a/packages/cli/src/controllers/me.controller.ts b/packages/cli/src/controllers/me.controller.ts
index 39dfc93ab7406..2073f737c47a6 100644
--- a/packages/cli/src/controllers/me.controller.ts
+++ b/packages/cli/src/controllers/me.controller.ts
@@ -19,7 +19,6 @@ import { isSamlLicensedAndEnabled } from '@/sso/saml/samlHelpers';
 import { UserService } from '@/services/user.service';
 import { Logger } from '@/Logger';
 import { ExternalHooks } from '@/ExternalHooks';
-import { InternalHooks } from '@/InternalHooks';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 import { UserRepository } from '@/databases/repositories/user.repository';
 import { isApiEnabled } from '@/PublicApi';
@@ -40,7 +39,6 @@ export class MeController {
 	constructor(
 		private readonly logger: Logger,
 		private readonly externalHooks: ExternalHooks,
-		private readonly internalHooks: InternalHooks,
 		private readonly authService: AuthService,
 		private readonly userService: UserService,
 		private readonly passwordUtility: PasswordUtility,
@@ -101,7 +99,6 @@ export class MeController {
 		this.authService.issueCookie(res, user, req.browserId);
 
 		const fieldsChanged = Object.keys(payload);
-		this.internalHooks.onUserUpdate({ user, fields_changed: fieldsChanged });
 		this.eventService.emit('user-updated', { user, fieldsChanged });
 
 		const publicUser = await this.userService.toPublic(user);
@@ -151,7 +148,6 @@ export class MeController {
 
 		this.authService.issueCookie(res, updatedUser, req.browserId);
 
-		this.internalHooks.onUserUpdate({ user: updatedUser, fields_changed: ['password'] });
 		this.eventService.emit('user-updated', { user: updatedUser, fieldsChanged: ['password'] });
 
 		await this.externalHooks.run('user.password.update', [updatedUser.email, updatedUser.password]);
@@ -186,7 +182,10 @@ export class MeController {
 
 		this.logger.info('User survey updated successfully', { userId: req.user.id });
 
-		this.internalHooks.onPersonalizationSurveySubmitted(req.user.id, personalizationAnswers);
+		this.eventService.emit('user-submitted-personalization-survey', {
+			userId: req.user.id,
+			answers: personalizationAnswers,
+		});
 
 		return { success: true };
 	}
diff --git a/packages/cli/src/controllers/passwordReset.controller.ts b/packages/cli/src/controllers/passwordReset.controller.ts
index 84d3b40124ad8..82506e952bc32 100644
--- a/packages/cli/src/controllers/passwordReset.controller.ts
+++ b/packages/cli/src/controllers/passwordReset.controller.ts
@@ -215,17 +215,16 @@ export class PasswordResetController {
 
 		this.authService.issueCookie(res, user, req.browserId);
 
-		this.internalHooks.onUserUpdate({ user, fields_changed: ['password'] });
 		this.eventService.emit('user-updated', { user, fieldsChanged: ['password'] });
 
-		// if this user used to be an LDAP users
+		// if this user used to be an LDAP user
 		const ldapIdentity = user?.authIdentities?.find((i) => i.providerType === 'ldap');
 		if (ldapIdentity) {
-			this.internalHooks.onUserSignup(user, {
-				user_type: 'email',
-				was_disabled_ldap_user: true,
+			this.eventService.emit('user-signed-up', {
+				user,
+				userType: 'email',
+				wasDisabledLdapUser: true,
 			});
-			this.eventService.emit('user-signed-up', { user });
 		}
 
 		await this.externalHooks.run('user.password.update', [user.email, passwordHash]);
diff --git a/packages/cli/src/controllers/users.controller.ts b/packages/cli/src/controllers/users.controller.ts
index aee2fd28c2a27..c834d2cc237bc 100644
--- a/packages/cli/src/controllers/users.controller.ts
+++ b/packages/cli/src/controllers/users.controller.ts
@@ -9,7 +9,7 @@ import {
 	UserRoleChangePayload,
 	UserSettingsUpdatePayload,
 } from '@/requests';
-import type { PublicUser, ITelemetryUserDeletionData } from '@/Interfaces';
+import type { PublicUser } from '@/Interfaces';
 import { AuthIdentity } from '@db/entities/AuthIdentity';
 import { SharedCredentialsRepository } from '@db/repositories/sharedCredentials.repository';
 import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
@@ -21,7 +21,6 @@ import { ForbiddenError } from '@/errors/response-errors/forbidden.error';
 import { NotFoundError } from '@/errors/response-errors/not-found.error';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 import { ExternalHooks } from '@/ExternalHooks';
-import { InternalHooks } from '@/InternalHooks';
 import { validateEntity } from '@/GenericHelpers';
 import { ProjectRepository } from '@/databases/repositories/project.repository';
 import { Project } from '@/databases/entities/Project';
@@ -35,7 +34,6 @@ export class UsersController {
 	constructor(
 		private readonly logger: Logger,
 		private readonly externalHooks: ExternalHooks,
-		private readonly internalHooks: InternalHooks,
 		private readonly sharedCredentialsRepository: SharedCredentialsRepository,
 		private readonly sharedWorkflowRepository: SharedWorkflowRepository,
 		private readonly userRepository: UserRepository,
@@ -183,12 +181,7 @@ export class UsersController {
 			);
 		}
 
-		const telemetryData: ITelemetryUserDeletionData = {
-			user_id: req.user.id,
-			target_user_old_status: userToDelete.isPending ? 'invited' : 'active',
-			target_user_id: idToDelete,
-			migration_strategy: transferId ? 'transfer_data' : 'delete_data',
-		};
+		let transfereeId;
 
 		if (transferId) {
 			const transfereePersonalProject = await this.projectRepository.findOneBy({ id: transferId });
@@ -206,7 +199,7 @@ export class UsersController {
 				},
 			});
 
-			telemetryData.migration_user_id = transferee.id;
+			transfereeId = transferee.id;
 
 			await this.userService.getManager().transaction(async (trx) => {
 				await this.workflowService.transferAll(
@@ -253,12 +246,14 @@ export class UsersController {
 			await trx.delete(User, { id: userToDelete.id });
 		});
 
-		this.internalHooks.onUserDeletion({
+		this.eventService.emit('user-deleted', {
 			user: req.user,
-			telemetryData,
 			publicApi: false,
+			targetUserOldStatus: userToDelete.isPending ? 'invited' : 'active',
+			targetUserId: idToDelete,
+			migrationStrategy: transferId ? 'transfer_data' : 'delete_data',
+			migrationUserId: transfereeId,
 		});
-		this.eventService.emit('user-deleted', { user: req.user });
 
 		await this.externalHooks.run('user.deleted', [await this.userService.toPublic(userToDelete)]);
 
@@ -294,11 +289,11 @@ export class UsersController {
 
 		await this.userService.update(targetUser.id, { role: payload.newRoleName });
 
-		this.internalHooks.onUserRoleChange({
-			user: req.user,
-			target_user_id: targetUser.id,
-			target_user_new_role: ['global', payload.newRoleName].join(' '),
-			public_api: false,
+		this.eventService.emit('user-changed-role', {
+			userId: req.user.id,
+			targetUserId: targetUser.id,
+			targetUserNewRole: ['global', payload.newRoleName].join(' '),
+			publicApi: false,
 		});
 
 		const projects = await this.projectService.getUserOwnedOrAdminProjects(targetUser.id);
diff --git a/packages/cli/src/events/__tests__/log-streaming-event-relay.test.ts b/packages/cli/src/events/__tests__/log-streaming-event-relay.test.ts
index 4084bebeb228f..ebd56ee514c7e 100644
--- a/packages/cli/src/events/__tests__/log-streaming-event-relay.test.ts
+++ b/packages/cli/src/events/__tests__/log-streaming-event-relay.test.ts
@@ -242,6 +242,11 @@ describe('LogStreamingEventRelay', () => {
 					lastName: 'Doe',
 					role: 'some-role',
 				},
+				targetUserOldStatus: 'active',
+				publicApi: false,
+				migrationStrategy: 'transfer_data',
+				targetUserId: '456',
+				migrationUserId: '789',
 			};
 
 			eventService.emit('user-deleted', event);
diff --git a/packages/cli/src/events/relay-event-map.ts b/packages/cli/src/events/relay-event-map.ts
index 193e85c9a4ed8..0d329508b413e 100644
--- a/packages/cli/src/events/relay-event-map.ts
+++ b/packages/cli/src/events/relay-event-map.ts
@@ -2,6 +2,7 @@ import type { AuthenticationMethod, IRun, IWorkflowBase } from 'n8n-workflow';
 import type { IWorkflowDb, IWorkflowExecutionDataProcess } from '@/Interfaces';
 import type { ProjectRole } from '@/databases/entities/ProjectRelation';
 import type { GlobalRole } from '@/databases/entities/User';
+import type { AuthProviderType } from '@/databases/entities/AuthIdentity';
 
 export type UserLike = {
 	id: string;
@@ -72,13 +73,26 @@ export type RelayEventMap = {
 
 	// #region User
 
+	'user-submitted-personalization-survey': {
+		userId: string;
+		answers: Record<string, string>;
+	};
+
 	'user-deleted': {
 		user: UserLike;
+		publicApi: boolean;
+		targetUserOldStatus: 'active' | 'invited';
+		migrationStrategy?: 'transfer_data' | 'delete_data';
+		targetUserId?: string;
+		migrationUserId?: string;
 	};
 
 	'user-invited': {
 		user: UserLike;
 		targetUserId: string[];
+		publicApi: boolean;
+		emailSent: boolean;
+		inviteeRole: string;
 	};
 
 	'user-reinvited': {
@@ -93,6 +107,8 @@ export type RelayEventMap = {
 
 	'user-signed-up': {
 		user: UserLike;
+		userType: AuthProviderType;
+		wasDisabledLdapUser: boolean;
 	};
 
 	'user-logged-in': {
@@ -106,6 +122,43 @@ export type RelayEventMap = {
 		reason?: string;
 	};
 
+	'user-changed-role': {
+		userId: string;
+		targetUserId: string;
+		publicApi: boolean;
+		targetUserNewRole: string;
+	};
+
+	'user-retrieved-user': {
+		userId: string;
+		publicApi: boolean;
+	};
+
+	'user-retrieved-all-users': {
+		userId: string;
+		publicApi: boolean;
+	};
+
+	'user-retrieved-execution': {
+		userId: string;
+		publicApi: boolean;
+	};
+
+	'user-retrieved-all-executions': {
+		userId: string;
+		publicApi: boolean;
+	};
+
+	'user-retrieved-workflow': {
+		userId: string;
+		publicApi: boolean;
+	};
+
+	'user-retrieved-all-workflows': {
+		userId: string;
+		publicApi: boolean;
+	};
+
 	// #endregion
 
 	// #region Click
diff --git a/packages/cli/src/events/telemetry-event-relay.ts b/packages/cli/src/events/telemetry-event-relay.ts
index 91f82a0c127a5..df4e577acfb50 100644
--- a/packages/cli/src/events/telemetry-event-relay.ts
+++ b/packages/cli/src/events/telemetry-event-relay.ts
@@ -17,6 +17,7 @@ import { ProjectRelationRepository } from '@/databases/repositories/projectRelat
 import type { IExecutionTrackProperties } from '@/Interfaces';
 import { determineFinalExecutionStatus } from '@/executionLifecycleHooks/shared/sharedHookFunctions';
 import { EventRelay } from './event-relay';
+import { snakeCase } from 'change-case';
 
 @Service()
 export class TelemetryEventRelay extends EventRelay {
@@ -73,6 +74,19 @@ export class TelemetryEventRelay extends EventRelay {
 			'workflow-saved': async (event) => await this.workflowSaved(event),
 			'server-started': async () => await this.serverStarted(),
 			'workflow-post-execute': async (event) => await this.workflowPostExecute(event),
+			'user-changed-role': (event) => this.userChangedRole(event),
+			'user-retrieved-user': (event) => this.userRetrievedUser(event),
+			'user-retrieved-all-users': (event) => this.userRetrievedAllUsers(event),
+			'user-retrieved-execution': (event) => this.userRetrievedExecution(event),
+			'user-retrieved-all-executions': (event) => this.userRetrievedAllExecutions(event),
+			'user-retrieved-workflow': (event) => this.userRetrievedWorkflow(event),
+			'user-retrieved-all-workflows': (event) => this.userRetrievedAllWorkflows(event),
+			'user-updated': (event) => this.userUpdated(event),
+			'user-deleted': (event) => this.userDeleted(event),
+			'user-invited': (event) => this.userInvited(event),
+			'user-signed-up': (event) => this.userSignedUp(event),
+			'user-submitted-personalization-survey': (event) =>
+				this.userSubmittedPersonalizationSurvey(event),
 		});
 	}
 
@@ -744,4 +758,132 @@ export class TelemetryEventRelay extends EventRelay {
 	}
 
 	// #endregion
+
+	// #region User
+
+	private userChangedRole({
+		userId,
+		targetUserId,
+		targetUserNewRole,
+		publicApi,
+	}: RelayEventMap['user-changed-role']) {
+		this.telemetry.track('User changed role', {
+			user_id: userId,
+			target_user_id: targetUserId,
+			target_user_new_role: targetUserNewRole,
+			public_api: publicApi,
+		});
+	}
+
+	private userRetrievedUser({ userId, publicApi }: RelayEventMap['user-retrieved-user']) {
+		this.telemetry.track('User retrieved user', {
+			user_id: userId,
+			public_api: publicApi,
+		});
+	}
+
+	private userRetrievedAllUsers({ userId, publicApi }: RelayEventMap['user-retrieved-all-users']) {
+		this.telemetry.track('User retrieved all users', {
+			user_id: userId,
+			public_api: publicApi,
+		});
+	}
+
+	private userRetrievedExecution({ userId, publicApi }: RelayEventMap['user-retrieved-execution']) {
+		this.telemetry.track('User retrieved execution', {
+			user_id: userId,
+			public_api: publicApi,
+		});
+	}
+
+	private userRetrievedAllExecutions({
+		userId,
+		publicApi,
+	}: RelayEventMap['user-retrieved-all-executions']) {
+		this.telemetry.track('User retrieved all executions', {
+			user_id: userId,
+			public_api: publicApi,
+		});
+	}
+
+	private userRetrievedWorkflow({ userId, publicApi }: RelayEventMap['user-retrieved-workflow']) {
+		this.telemetry.track('User retrieved workflow', {
+			user_id: userId,
+			public_api: publicApi,
+		});
+	}
+
+	private userRetrievedAllWorkflows({
+		userId,
+		publicApi,
+	}: RelayEventMap['user-retrieved-all-workflows']) {
+		this.telemetry.track('User retrieved all workflows', {
+			user_id: userId,
+			public_api: publicApi,
+		});
+	}
+
+	private userUpdated({ user, fieldsChanged }: RelayEventMap['user-updated']) {
+		this.telemetry.track('User changed personal settings', {
+			user_id: user.id,
+			fields_changed: fieldsChanged,
+		});
+	}
+
+	private userDeleted({
+		user,
+		publicApi,
+		targetUserOldStatus,
+		migrationStrategy,
+		targetUserId,
+		migrationUserId,
+	}: RelayEventMap['user-deleted']) {
+		this.telemetry.track('User deleted user', {
+			user_id: user.id,
+			public_api: publicApi,
+			target_user_old_status: targetUserOldStatus,
+			migration_strategy: migrationStrategy,
+			target_user_id: targetUserId,
+			migration_user_id: migrationUserId,
+		});
+	}
+
+	private userInvited({
+		user,
+		targetUserId,
+		publicApi,
+		emailSent,
+		inviteeRole,
+	}: RelayEventMap['user-invited']) {
+		this.telemetry.track('User invited new user', {
+			user_id: user.id,
+			target_user_id: targetUserId,
+			public_api: publicApi,
+			email_sent: emailSent,
+			invitee_role: inviteeRole,
+		});
+	}
+
+	private userSignedUp({ user, userType, wasDisabledLdapUser }: RelayEventMap['user-signed-up']) {
+		this.telemetry.track('User signed up', {
+			user_id: user.id,
+			user_type: userType,
+			was_disabled_ldap_user: wasDisabledLdapUser,
+		});
+	}
+
+	private userSubmittedPersonalizationSurvey({
+		userId,
+		answers,
+	}: RelayEventMap['user-submitted-personalization-survey']) {
+		const camelCaseKeys = Object.keys(answers);
+		const personalizationSurveyData = { user_id: userId } as Record<string, string | string[]>;
+		camelCaseKeys.forEach((camelCaseKey) => {
+			personalizationSurveyData[snakeCase(camelCaseKey)] = answers[camelCaseKey];
+		});
+
+		this.telemetry.track('User responded to personalization questions', personalizationSurveyData);
+	}
+
+	// #endregion
 }
diff --git a/packages/cli/src/services/user.service.ts b/packages/cli/src/services/user.service.ts
index 25be080ca05bf..61f76bd596d2f 100644
--- a/packages/cli/src/services/user.service.ts
+++ b/packages/cli/src/services/user.service.ts
@@ -151,16 +151,12 @@ export class UserService {
 						});
 					}
 
-					Container.get(InternalHooks).onUserInvite({
-						user: owner,
-						target_user_id: Object.values(toInviteUsers),
-						public_api: false,
-						email_sent: result.emailSent,
-						invitee_role: role, // same role for all invited users
-					});
 					this.eventService.emit('user-invited', {
 						user: owner,
 						targetUserId: Object.values(toInviteUsers),
+						publicApi: false,
+						emailSent: result.emailSent,
+						inviteeRole: role, // same role for all invited users
 					});
 				} catch (e) {
 					if (e instanceof Error) {

From 7fb3f62a3640576ca1528e40ef8db13d9e99d8cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Mon, 5 Aug 2024 12:59:27 +0200
Subject: [PATCH 074/168] refactor(core): Remove stray log from telemetry event
 relay (no-changelog) (#10295)

---
 packages/cli/src/events/telemetry-event-relay.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/cli/src/events/telemetry-event-relay.ts b/packages/cli/src/events/telemetry-event-relay.ts
index df4e577acfb50..bc7a19479e721 100644
--- a/packages/cli/src/events/telemetry-event-relay.ts
+++ b/packages/cli/src/events/telemetry-event-relay.ts
@@ -174,10 +174,6 @@ export class TelemetryEventRelay extends EventRelay {
 		workflowUpdates,
 		forced,
 	}: RelayEventMap['source-control-user-pulled-api']) {
-		console.log('source-control-user-pulled-api', {
-			workflow_updates: workflowUpdates,
-			forced,
-		});
 		this.telemetry.track('User pulled via API', {
 			workflow_updates: workflowUpdates,
 			forced,

From 42a0b594d6ea2527c55a2aa9976c904cf70ecf92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Mon, 5 Aug 2024 13:24:26 +0200
Subject: [PATCH 075/168] fix(core): Fix user telemetry bugs (#10293)

---
 .../__tests__/me.controller.test.ts           |  7 ++-
 .../__tests__/users.controller.test.ts        | 52 +++++++++++++++++++
 packages/cli/src/controllers/me.controller.ts |  6 ++-
 .../cli/src/controllers/users.controller.ts   |  2 +-
 4 files changed, 64 insertions(+), 3 deletions(-)
 create mode 100644 packages/cli/src/controllers/__tests__/users.controller.test.ts

diff --git a/packages/cli/src/controllers/__tests__/me.controller.test.ts b/packages/cli/src/controllers/__tests__/me.controller.test.ts
index 6e187f9cd5e2e..4a313552af497 100644
--- a/packages/cli/src/controllers/__tests__/me.controller.test.ts
+++ b/packages/cli/src/controllers/__tests__/me.controller.test.ts
@@ -46,6 +46,7 @@ describe('MeController', () => {
 		it('should update the user in the DB, and issue a new cookie', async () => {
 			const user = mock<User>({
 				id: '123',
+				email: 'valid@email.com',
 				password: 'password',
 				authIdentities: [],
 				role: 'global:owner',
@@ -53,6 +54,7 @@ describe('MeController', () => {
 			const reqBody = { email: 'valid@email.com', firstName: 'John', lastName: 'Potato' };
 			const req = mock<MeRequest.UserUpdate>({ user, body: reqBody, browserId });
 			const res = mock<Response>();
+			userRepository.findOneByOrFail.mockResolvedValue(user);
 			userRepository.findOneOrFail.mockResolvedValue(user);
 			jest.spyOn(jwt, 'sign').mockImplementation(() => 'signed-token');
 			userService.toPublic.mockResolvedValue({} as unknown as PublicUser);
@@ -66,7 +68,10 @@ describe('MeController', () => {
 			]);
 
 			expect(userService.update).toHaveBeenCalled();
-
+			expect(eventService.emit).toHaveBeenCalledWith('user-updated', {
+				user,
+				fieldsChanged: ['firstName', 'lastName'], // email did not change
+			});
 			expect(res.cookie).toHaveBeenCalledWith(
 				AUTH_COOKIE_NAME,
 				'signed-token',
diff --git a/packages/cli/src/controllers/__tests__/users.controller.test.ts b/packages/cli/src/controllers/__tests__/users.controller.test.ts
new file mode 100644
index 0000000000000..38a4399cab2ba
--- /dev/null
+++ b/packages/cli/src/controllers/__tests__/users.controller.test.ts
@@ -0,0 +1,52 @@
+import { mock } from 'jest-mock-extended';
+import { UsersController } from '../users.controller';
+import type { UserRequest } from '@/requests';
+import type { EventService } from '@/events/event.service';
+import type { User } from '@/databases/entities/User';
+import type { UserRepository } from '@/databases/repositories/user.repository';
+import type { ProjectService } from '@/services/project.service';
+
+describe('UsersController', () => {
+	const eventService = mock<EventService>();
+	const userRepository = mock<UserRepository>();
+	const projectService = mock<ProjectService>();
+	const controller = new UsersController(
+		mock(),
+		mock(),
+		mock(),
+		mock(),
+		userRepository,
+		mock(),
+		mock(),
+		mock(),
+		mock(),
+		mock(),
+		projectService,
+		eventService,
+	);
+
+	beforeEach(() => {
+		jest.restoreAllMocks();
+	});
+
+	describe('changeGlobalRole', () => {
+		it('should emit event user-changed-role', async () => {
+			const request = mock<UserRequest.ChangeRole>({
+				user: { id: '123' },
+				params: { id: '456' },
+				body: { newRoleName: 'global:member' },
+			});
+			userRepository.findOne.mockResolvedValue(mock<User>({ id: '456' }));
+			projectService.getUserOwnedOrAdminProjects.mockResolvedValue([]);
+
+			await controller.changeGlobalRole(request);
+
+			expect(eventService.emit).toHaveBeenCalledWith('user-changed-role', {
+				userId: '123',
+				targetUserId: '456',
+				targetUserNewRole: 'global:member',
+				publicApi: false,
+			});
+		});
+	});
+});
diff --git a/packages/cli/src/controllers/me.controller.ts b/packages/cli/src/controllers/me.controller.ts
index 2073f737c47a6..2a0526b3cc8bb 100644
--- a/packages/cli/src/controllers/me.controller.ts
+++ b/packages/cli/src/controllers/me.controller.ts
@@ -89,6 +89,7 @@ export class MeController {
 
 		await this.externalHooks.run('user.profile.beforeUpdate', [userId, currentEmail, payload]);
 
+		const preUpdateUser = await this.userRepository.findOneByOrFail({ id: userId });
 		await this.userService.update(userId, payload);
 		const user = await this.userRepository.findOneOrFail({
 			where: { id: userId },
@@ -98,7 +99,10 @@ export class MeController {
 
 		this.authService.issueCookie(res, user, req.browserId);
 
-		const fieldsChanged = Object.keys(payload);
+		const fieldsChanged = (Object.keys(payload) as Array<keyof UserUpdatePayload>).filter(
+			(key) => payload[key] !== preUpdateUser[key],
+		);
+
 		this.eventService.emit('user-updated', { user, fieldsChanged });
 
 		const publicUser = await this.userService.toPublic(user);
diff --git a/packages/cli/src/controllers/users.controller.ts b/packages/cli/src/controllers/users.controller.ts
index c834d2cc237bc..f3055ee4dc179 100644
--- a/packages/cli/src/controllers/users.controller.ts
+++ b/packages/cli/src/controllers/users.controller.ts
@@ -292,7 +292,7 @@ export class UsersController {
 		this.eventService.emit('user-changed-role', {
 			userId: req.user.id,
 			targetUserId: targetUser.id,
-			targetUserNewRole: ['global', payload.newRoleName].join(' '),
+			targetUserNewRole: payload.newRoleName,
 			publicApi: false,
 		});
 

From 06419d9483ae916e79aace6d8c17e265b419b15d Mon Sep 17 00:00:00 2001
From: oleg <me@olegivaniv.com>
Date: Mon, 5 Aug 2024 13:59:02 +0200
Subject: [PATCH 076/168] feat(editor): Auto-add LLM chain for new LLM nodes on
 empty canvas (#10245)

Co-authored-by: JP van Oosten <jp@n8n.io>
---
 cypress/constants.ts                          |  2 +-
 .../e2e/233-AI-switch-to-logs-on-error.cy.ts  |  4 +--
 cypress/e2e/30-langchain.cy.ts                | 26 +++++++++++++++
 .../LMChatAnthropic/LmChatAnthropic.node.ts   |  2 +-
 .../llms/LMChatOllama/LmChatOllama.node.ts    |  2 +-
 .../llms/LMChatOpenAi/LmChatOpenAi.node.ts    |  2 +-
 .../nodes/llms/LMCohere/LmCohere.node.ts      |  2 +-
 .../nodes/llms/LMOllama/LmOllama.node.ts      |  2 +-
 .../nodes/llms/LMOpenAi/LmOpenAi.node.ts      |  2 +-
 .../LmOpenHuggingFaceInference.node.ts        |  2 +-
 .../LmChatAwsBedrock/LmChatAwsBedrock.node.ts |  2 +-
 .../LmChatAzureOpenAi.node.ts                 |  2 +-
 .../LmChatGoogleGemini.node.ts                |  2 +-
 .../LmChatGooglePalm/LmChatGooglePalm.node.ts |  2 +-
 .../LmChatGoogleVertex.node.ts                |  2 +-
 .../nodes/llms/LmChatGroq/LmChatGroq.node.ts  |  2 +-
 .../LmChatMistralCloud.node.ts                |  2 +-
 .../llms/LmGooglePalm/LmGooglePalm.node.ts    |  2 +-
 packages/editor-ui/src/Interface.ts           |  4 +--
 .../NodeCreator/composables/useActions.ts     | 33 +++++++++++++++++--
 packages/editor-ui/src/views/NodeView.vue     | 20 +++++++++--
 21 files changed, 94 insertions(+), 25 deletions(-)

diff --git a/cypress/constants.ts b/cypress/constants.ts
index 8fdb03ef9cfba..6f7e7b978d317 100644
--- a/cypress/constants.ts
+++ b/cypress/constants.ts
@@ -37,7 +37,7 @@ export const INSTANCE_MEMBERS = [
 export const MANUAL_TRIGGER_NODE_NAME = 'Manual Trigger';
 export const MANUAL_TRIGGER_NODE_DISPLAY_NAME = 'When clicking ‘Test workflow’';
 export const MANUAL_CHAT_TRIGGER_NODE_NAME = 'Chat Trigger';
-export const MANUAL_CHAT_TRIGGER_NODE_DISPLAY_NAME = 'When chat message received';
+export const CHAT_TRIGGER_NODE_DISPLAY_NAME = 'When chat message received';
 export const SCHEDULE_TRIGGER_NODE_NAME = 'Schedule Trigger';
 export const CODE_NODE_NAME = 'Code';
 export const SET_NODE_NAME = 'Set';
diff --git a/cypress/e2e/233-AI-switch-to-logs-on-error.cy.ts b/cypress/e2e/233-AI-switch-to-logs-on-error.cy.ts
index 78d4b61449c23..4c733df90dc48 100644
--- a/cypress/e2e/233-AI-switch-to-logs-on-error.cy.ts
+++ b/cypress/e2e/233-AI-switch-to-logs-on-error.cy.ts
@@ -13,7 +13,7 @@ import {
 	AI_LANGUAGE_MODEL_OPENAI_CHAT_MODEL_NODE_NAME,
 	AI_MEMORY_POSTGRES_NODE_NAME,
 	AI_TOOL_CALCULATOR_NODE_NAME,
-	MANUAL_CHAT_TRIGGER_NODE_DISPLAY_NAME,
+	CHAT_TRIGGER_NODE_DISPLAY_NAME,
 	MANUAL_CHAT_TRIGGER_NODE_NAME,
 	MANUAL_TRIGGER_NODE_DISPLAY_NAME,
 	MANUAL_TRIGGER_NODE_NAME,
@@ -148,7 +148,7 @@ function setupTestWorkflow(chatTrigger: boolean = false) {
 	if (!chatTrigger) {
 		// Remove chat trigger
 		WorkflowPage.getters
-			.canvasNodeByName(MANUAL_CHAT_TRIGGER_NODE_DISPLAY_NAME)
+			.canvasNodeByName(CHAT_TRIGGER_NODE_DISPLAY_NAME)
 			.find('[data-test-id="delete-node-button"]')
 			.click({ force: true });
 
diff --git a/cypress/e2e/30-langchain.cy.ts b/cypress/e2e/30-langchain.cy.ts
index c1409a34f379b..c6d0f4ab4d3e7 100644
--- a/cypress/e2e/30-langchain.cy.ts
+++ b/cypress/e2e/30-langchain.cy.ts
@@ -10,7 +10,9 @@ import {
 	disableNode,
 	getExecuteWorkflowButton,
 	navigateToNewWorkflowPage,
+	getNodes,
 	openNode,
+	getConnectionBySourceAndTarget,
 } from '../composables/workflow';
 import {
 	clickCreateNewCredential,
@@ -41,6 +43,7 @@ import {
 	AI_TOOL_WIKIPEDIA_NODE_NAME,
 	BASIC_LLM_CHAIN_NODE_NAME,
 	EDIT_FIELDS_SET_NODE_NAME,
+	CHAT_TRIGGER_NODE_DISPLAY_NAME,
 } from './../constants';
 
 describe('Langchain Integration', () => {
@@ -331,4 +334,27 @@ describe('Langchain Integration', () => {
 
 		closeManualChatModal();
 	});
+
+	it('should auto-add chat trigger and basic LLM chain when adding LLM node', () => {
+		addNodeToCanvas(AI_LANGUAGE_MODEL_OPENAI_CHAT_MODEL_NODE_NAME, true);
+
+		getConnectionBySourceAndTarget(
+			CHAT_TRIGGER_NODE_DISPLAY_NAME,
+			BASIC_LLM_CHAIN_NODE_NAME,
+		).should('exist');
+
+		getConnectionBySourceAndTarget(
+			AI_LANGUAGE_MODEL_OPENAI_CHAT_MODEL_NODE_NAME,
+			BASIC_LLM_CHAIN_NODE_NAME,
+		).should('exist');
+		getNodes().should('have.length', 3);
+	});
+
+	it('should not auto-add nodes if AI nodes are already present', () => {
+		addNodeToCanvas(AGENT_NODE_NAME, true);
+
+		addNodeToCanvas(AI_LANGUAGE_MODEL_OPENAI_CHAT_MODEL_NODE_NAME, true);
+		getConnectionBySourceAndTarget(CHAT_TRIGGER_NODE_DISPLAY_NAME, AGENT_NODE_NAME).should('exist');
+		getNodes().should('have.length', 3);
+	});
 });
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 241efadb6d392..ecc14e1344341 100644
--- a/packages/@n8n/nodes-langchain/nodes/llms/LMChatAnthropic/LmChatAnthropic.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LMChatAnthropic/LmChatAnthropic.node.ts
@@ -74,7 +74,7 @@ export class LmChatAnthropic implements INodeType {
 		codex: {
 			categories: ['AI'],
 			subcategories: {
-				AI: ['Language Models'],
+				AI: ['Language Models', 'Root Nodes'],
 				'Language Models': ['Chat Models (Recommended)'],
 			},
 			resources: {
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LMChatOllama/LmChatOllama.node.ts b/packages/@n8n/nodes-langchain/nodes/llms/LMChatOllama/LmChatOllama.node.ts
index f0f9e5f630e29..b4fc474dd2ecf 100644
--- a/packages/@n8n/nodes-langchain/nodes/llms/LMChatOllama/LmChatOllama.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LMChatOllama/LmChatOllama.node.ts
@@ -28,7 +28,7 @@ export class LmChatOllama implements INodeType {
 		codex: {
 			categories: ['AI'],
 			subcategories: {
-				AI: ['Language Models'],
+				AI: ['Language Models', 'Root Nodes'],
 				'Language Models': ['Chat Models (Recommended)'],
 			},
 			resources: {
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LMChatOpenAi/LmChatOpenAi.node.ts b/packages/@n8n/nodes-langchain/nodes/llms/LMChatOpenAi/LmChatOpenAi.node.ts
index 264c594d1bd87..1f39c082290e4 100644
--- a/packages/@n8n/nodes-langchain/nodes/llms/LMChatOpenAi/LmChatOpenAi.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LMChatOpenAi/LmChatOpenAi.node.ts
@@ -26,7 +26,7 @@ export class LmChatOpenAi implements INodeType {
 		codex: {
 			categories: ['AI'],
 			subcategories: {
-				AI: ['Language Models'],
+				AI: ['Language Models', 'Root Nodes'],
 				'Language Models': ['Chat Models (Recommended)'],
 			},
 			resources: {
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LMCohere/LmCohere.node.ts b/packages/@n8n/nodes-langchain/nodes/llms/LMCohere/LmCohere.node.ts
index ee5163a78f1a3..191209bb3363b 100644
--- a/packages/@n8n/nodes-langchain/nodes/llms/LMCohere/LmCohere.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LMCohere/LmCohere.node.ts
@@ -26,7 +26,7 @@ export class LmCohere implements INodeType {
 		codex: {
 			categories: ['AI'],
 			subcategories: {
-				AI: ['Language Models'],
+				AI: ['Language Models', 'Root Nodes'],
 				'Language Models': ['Text Completion Models'],
 			},
 			resources: {
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LMOllama/LmOllama.node.ts b/packages/@n8n/nodes-langchain/nodes/llms/LMOllama/LmOllama.node.ts
index 95024ad4b2f39..5492a51a97914 100644
--- a/packages/@n8n/nodes-langchain/nodes/llms/LMOllama/LmOllama.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LMOllama/LmOllama.node.ts
@@ -27,7 +27,7 @@ export class LmOllama implements INodeType {
 		codex: {
 			categories: ['AI'],
 			subcategories: {
-				AI: ['Language Models'],
+				AI: ['Language Models', 'Root Nodes'],
 				'Language Models': ['Text Completion Models'],
 			},
 			resources: {
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LMOpenAi/LmOpenAi.node.ts b/packages/@n8n/nodes-langchain/nodes/llms/LMOpenAi/LmOpenAi.node.ts
index 2f0e3480d8701..a46ad429a2963 100644
--- a/packages/@n8n/nodes-langchain/nodes/llms/LMOpenAi/LmOpenAi.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LMOpenAi/LmOpenAi.node.ts
@@ -38,7 +38,7 @@ export class LmOpenAi implements INodeType {
 		codex: {
 			categories: ['AI'],
 			subcategories: {
-				AI: ['Language Models'],
+				AI: ['Language Models', 'Root Nodes'],
 				'Language Models': ['Text Completion Models'],
 			},
 			resources: {
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LMOpenHuggingFaceInference/LmOpenHuggingFaceInference.node.ts b/packages/@n8n/nodes-langchain/nodes/llms/LMOpenHuggingFaceInference/LmOpenHuggingFaceInference.node.ts
index 9a30ef74d73ae..7b2c821f9c34c 100644
--- a/packages/@n8n/nodes-langchain/nodes/llms/LMOpenHuggingFaceInference/LmOpenHuggingFaceInference.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LMOpenHuggingFaceInference/LmOpenHuggingFaceInference.node.ts
@@ -26,7 +26,7 @@ export class LmOpenHuggingFaceInference implements INodeType {
 		codex: {
 			categories: ['AI'],
 			subcategories: {
-				AI: ['Language Models'],
+				AI: ['Language Models', 'Root Nodes'],
 				'Language Models': ['Text Completion Models'],
 			},
 			resources: {
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LmChatAwsBedrock/LmChatAwsBedrock.node.ts b/packages/@n8n/nodes-langchain/nodes/llms/LmChatAwsBedrock/LmChatAwsBedrock.node.ts
index d313ba53b54e4..4e1c27bfde8c2 100644
--- a/packages/@n8n/nodes-langchain/nodes/llms/LmChatAwsBedrock/LmChatAwsBedrock.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LmChatAwsBedrock/LmChatAwsBedrock.node.ts
@@ -29,7 +29,7 @@ export class LmChatAwsBedrock implements INodeType {
 		codex: {
 			categories: ['AI'],
 			subcategories: {
-				AI: ['Language Models'],
+				AI: ['Language Models', 'Root Nodes'],
 				'Language Models': ['Chat Models (Recommended)'],
 			},
 			resources: {
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LmChatAzureOpenAi/LmChatAzureOpenAi.node.ts b/packages/@n8n/nodes-langchain/nodes/llms/LmChatAzureOpenAi/LmChatAzureOpenAi.node.ts
index 2e05b4770d99d..5770387158b1e 100644
--- a/packages/@n8n/nodes-langchain/nodes/llms/LmChatAzureOpenAi/LmChatAzureOpenAi.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LmChatAzureOpenAi/LmChatAzureOpenAi.node.ts
@@ -27,7 +27,7 @@ export class LmChatAzureOpenAi implements INodeType {
 		codex: {
 			categories: ['AI'],
 			subcategories: {
-				AI: ['Language Models'],
+				AI: ['Language Models', 'Root Nodes'],
 				'Language Models': ['Chat Models (Recommended)'],
 			},
 			resources: {
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LmChatGoogleGemini/LmChatGoogleGemini.node.ts b/packages/@n8n/nodes-langchain/nodes/llms/LmChatGoogleGemini/LmChatGoogleGemini.node.ts
index d3d3d1ea2c218..ce08a650f203f 100644
--- a/packages/@n8n/nodes-langchain/nodes/llms/LmChatGoogleGemini/LmChatGoogleGemini.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LmChatGoogleGemini/LmChatGoogleGemini.node.ts
@@ -27,7 +27,7 @@ export class LmChatGoogleGemini implements INodeType {
 		codex: {
 			categories: ['AI'],
 			subcategories: {
-				AI: ['Language Models'],
+				AI: ['Language Models', 'Root Nodes'],
 				'Language Models': ['Chat Models (Recommended)'],
 			},
 			resources: {
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LmChatGooglePalm/LmChatGooglePalm.node.ts b/packages/@n8n/nodes-langchain/nodes/llms/LmChatGooglePalm/LmChatGooglePalm.node.ts
index a32a5e959cdb5..6195d4d98763b 100644
--- a/packages/@n8n/nodes-langchain/nodes/llms/LmChatGooglePalm/LmChatGooglePalm.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LmChatGooglePalm/LmChatGooglePalm.node.ts
@@ -25,7 +25,7 @@ export class LmChatGooglePalm implements INodeType {
 		codex: {
 			categories: ['AI'],
 			subcategories: {
-				AI: ['Language Models'],
+				AI: ['Language Models', 'Root Nodes'],
 				'Language Models': ['Chat Models (Recommended)'],
 			},
 			resources: {
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LmChatGoogleVertex/LmChatGoogleVertex.node.ts b/packages/@n8n/nodes-langchain/nodes/llms/LmChatGoogleVertex/LmChatGoogleVertex.node.ts
index 1e3837818fb5b..044428c01adc3 100644
--- a/packages/@n8n/nodes-langchain/nodes/llms/LmChatGoogleVertex/LmChatGoogleVertex.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LmChatGoogleVertex/LmChatGoogleVertex.node.ts
@@ -32,7 +32,7 @@ export class LmChatGoogleVertex implements INodeType {
 		codex: {
 			categories: ['AI'],
 			subcategories: {
-				AI: ['Language Models'],
+				AI: ['Language Models', 'Root Nodes'],
 				'Language Models': ['Chat Models (Recommended)'],
 			},
 			resources: {
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LmChatGroq/LmChatGroq.node.ts b/packages/@n8n/nodes-langchain/nodes/llms/LmChatGroq/LmChatGroq.node.ts
index 3354ac030f404..d0a28715e1010 100644
--- a/packages/@n8n/nodes-langchain/nodes/llms/LmChatGroq/LmChatGroq.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LmChatGroq/LmChatGroq.node.ts
@@ -26,7 +26,7 @@ export class LmChatGroq implements INodeType {
 		codex: {
 			categories: ['AI'],
 			subcategories: {
-				AI: ['Language Models'],
+				AI: ['Language Models', 'Root Nodes'],
 				'Language Models': ['Chat Models (Recommended)'],
 			},
 			resources: {
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LmChatMistralCloud/LmChatMistralCloud.node.ts b/packages/@n8n/nodes-langchain/nodes/llms/LmChatMistralCloud/LmChatMistralCloud.node.ts
index 32364545d2073..129beeadfe5eb 100644
--- a/packages/@n8n/nodes-langchain/nodes/llms/LmChatMistralCloud/LmChatMistralCloud.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LmChatMistralCloud/LmChatMistralCloud.node.ts
@@ -27,7 +27,7 @@ export class LmChatMistralCloud implements INodeType {
 		codex: {
 			categories: ['AI'],
 			subcategories: {
-				AI: ['Language Models'],
+				AI: ['Language Models', 'Root Nodes'],
 				'Language Models': ['Chat Models (Recommended)'],
 			},
 			resources: {
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LmGooglePalm/LmGooglePalm.node.ts b/packages/@n8n/nodes-langchain/nodes/llms/LmGooglePalm/LmGooglePalm.node.ts
index d79f74be02fe6..e4681803fe59a 100644
--- a/packages/@n8n/nodes-langchain/nodes/llms/LmGooglePalm/LmGooglePalm.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LmGooglePalm/LmGooglePalm.node.ts
@@ -25,7 +25,7 @@ export class LmGooglePalm implements INodeType {
 		codex: {
 			categories: ['AI'],
 			subcategories: {
-				AI: ['Language Models'],
+				AI: ['Language Models', 'Root Nodes'],
 				'Language Models': ['Text Completion Models'],
 			},
 			resources: {
diff --git a/packages/editor-ui/src/Interface.ts b/packages/editor-ui/src/Interface.ts
index 770cfe2298238..8c93c847ba540 100644
--- a/packages/editor-ui/src/Interface.ts
+++ b/packages/editor-ui/src/Interface.ts
@@ -1808,8 +1808,8 @@ export type AddedNode = {
 } & Partial<INodeUi>;
 
 export type AddedNodeConnection = {
-	from: { nodeIndex: number; outputIndex?: number };
-	to: { nodeIndex: number; inputIndex?: number };
+	from: { nodeIndex: number; outputIndex?: number; type?: NodeConnectionType };
+	to: { nodeIndex: number; inputIndex?: number; type?: NodeConnectionType };
 };
 
 export type AddedNodesAndConnections = {
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/composables/useActions.ts b/packages/editor-ui/src/components/Node/NodeCreator/composables/useActions.ts
index 2346968f798ab..e9f7917385eec 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/composables/useActions.ts
+++ b/packages/editor-ui/src/components/Node/NodeCreator/composables/useActions.ts
@@ -1,5 +1,10 @@
 import { computed } from 'vue';
-import type { IDataObject, INodeParameters } from 'n8n-workflow';
+import {
+	CHAIN_LLM_LANGCHAIN_NODE_TYPE,
+	NodeConnectionType,
+	type IDataObject,
+	type INodeParameters,
+} from 'n8n-workflow';
 import type {
 	ActionTypeDescription,
 	AddedNode,
@@ -11,6 +16,7 @@ import type {
 } from '@/Interface';
 import {
 	AGENT_NODE_TYPE,
+	AI_CATEGORY_LANGUAGE_MODELS,
 	BASIC_CHAIN_NODE_TYPE,
 	CHAT_TRIGGER_NODE_TYPE,
 	MANUAL_CHAT_TRIGGER_NODE_TYPE,
@@ -37,11 +43,12 @@ import { useExternalHooks } from '@/composables/useExternalHooks';
 
 import { sortNodeCreateElements, transformNodeType } from '../utils';
 import { useI18n } from '@/composables/useI18n';
+import { useCanvasStore } from '@/stores/canvas.store';
 
 export const useActions = () => {
 	const nodeCreatorStore = useNodeCreatorStore();
+	const nodeTypesStore = useNodeTypesStore();
 	const i18n = useI18n();
-
 	const singleNodeOpenSources = [
 		NODE_CREATOR_OPEN_SOURCES.PLUS_ENDPOINT,
 		NODE_CREATOR_OPEN_SOURCES.NODE_CONNECTION_ACTION,
@@ -216,6 +223,19 @@ export const useActions = () => {
 		return isCompatibleNode && isChatTriggerMissing;
 	}
 
+	// AI-226: Prepend LLM Chain node when adding a language model
+	function shouldPrependLLMChain(addedNodes: AddedNode[]): boolean {
+		const canvasHasAINodes = useCanvasStore().aiNodes.length > 0;
+		if (canvasHasAINodes) return false;
+
+		return addedNodes.some((node) => {
+			const nodeType = nodeTypesStore.getNodeType(node.type);
+			return Object.keys(nodeType?.codex?.subcategories ?? {}).includes(
+				AI_CATEGORY_LANGUAGE_MODELS,
+			);
+		});
+	}
+
 	function getAddedNodesAndConnections(addedNodes: AddedNode[]): AddedNodesAndConnections {
 		if (addedNodes.length === 0) {
 			return { nodes: [], connections: [] };
@@ -230,7 +250,14 @@ export const useActions = () => {
 			nodeToAutoOpen.openDetail = true;
 		}
 
-		if (shouldPrependChatTrigger(addedNodes)) {
+		if (shouldPrependLLMChain(addedNodes) || shouldPrependChatTrigger(addedNodes)) {
+			if (shouldPrependLLMChain(addedNodes)) {
+				addedNodes.unshift({ type: CHAIN_LLM_LANGCHAIN_NODE_TYPE, isAutoAdd: true });
+				connections.push({
+					from: { nodeIndex: 2, type: NodeConnectionType.AiLanguageModel },
+					to: { nodeIndex: 1 },
+				});
+			}
 			addedNodes.unshift({ type: CHAT_TRIGGER_NODE_TYPE, isAutoAdd: true });
 			connections.push({
 				from: { nodeIndex: 0 },
diff --git a/packages/editor-ui/src/views/NodeView.vue b/packages/editor-ui/src/views/NodeView.vue
index 91ebdf1228b9f..5650be3b7acae 100644
--- a/packages/editor-ui/src/views/NodeView.vue
+++ b/packages/editor-ui/src/views/NodeView.vue
@@ -610,7 +610,7 @@ export default defineComponent({
 			return this.workflowsStore.getWorkflowExecution;
 		},
 		workflowRunning(): boolean {
-			return this.uiStore.isActionActive['workflowRunning'];
+			return this.uiStore.isActionActive.workflowRunning;
 		},
 		currentWorkflow(): string {
 			return this.$route.params.name?.toString() || this.workflowsStore.workflowId;
@@ -4428,7 +4428,7 @@ export default defineComponent({
 					from.outputIndex ?? 0,
 					toNode.name,
 					to.inputIndex ?? 0,
-					NodeConnectionType.Main,
+					from.type ?? NodeConnectionType.Main,
 				);
 			}
 
@@ -4449,6 +4449,22 @@ export default defineComponent({
 				});
 			}
 
+			const lastNodeType = this.nodeTypesStore.getNodeType(lastAddedNode.type);
+			const isSubNode = NodeHelpers.isSubNodeType(lastNodeType);
+
+			// When adding a sub-node and there's more than one node added at the time, it must mean that it's
+			// connected to a root node, so we adjust the position of the sub-node to make it appear in the correct
+			// in relation to the root node
+			if (isSubNode && nodes.length > 1) {
+				this.onMoveNode({
+					nodeName: lastAddedNode.name,
+					position: [
+						lastAddedNode.position[0] - NodeViewUtils.NODE_SIZE * 2.5,
+						lastAddedNode.position[1] + NodeViewUtils.NODE_SIZE * 1.5,
+					],
+				});
+			}
+
 			this.nodeHelpers.addPinDataConnections(this.workflowsStore.pinnedWorkflowData);
 		},
 

From c0bdf3b7199a35efb614b62d4e5230b5020542cb Mon Sep 17 00:00:00 2001
From: Michael Kret <88898367+michael-radency@users.noreply.github.com>
Date: Mon, 5 Aug 2024 16:42:06 +0300
Subject: [PATCH 077/168] fix(core): Move error obfuscation to FE
 (no-changelog) (#10237)

---
 packages/core/src/WorkflowExecute.ts          | 26 ++++++++++++++++---
 .../src/components/Error/NodeErrorView.vue    |  4 +++
 .../src/plugins/i18n/locales/en.json          |  1 +
 .../src/errors/node-operation.error.ts        |  7 ++---
 .../workflow/test/errors/node.error.test.ts   |  8 ++++--
 5 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/packages/core/src/WorkflowExecute.ts b/packages/core/src/WorkflowExecute.ts
index ce17eafa9bb0d..303b46b20aa2f 100644
--- a/packages/core/src/WorkflowExecute.ts
+++ b/packages/core/src/WorkflowExecute.ts
@@ -44,7 +44,7 @@ import {
 	ApplicationError,
 	NodeExecutionOutput,
 	sleep,
-	OBFUSCATED_ERROR_MESSAGE,
+	ErrorReporterProxy,
 } from 'n8n-workflow';
 import get from 'lodash/get';
 import * as NodeExecuteFunctions from './NodeExecuteFunctions';
@@ -1318,12 +1318,30 @@ export class WorkflowExecute {
 						} catch (error) {
 							this.runExecutionData.resultData.lastNodeExecuted = executionData.node.name;
 
-							const message =
-								error instanceof ApplicationError ? error.message : OBFUSCATED_ERROR_MESSAGE;
+							let toReport: Error | undefined;
+							if (error instanceof ApplicationError) {
+								// Report any unhandled errors that were wrapped in by one of our error classes
+								if (error.cause instanceof Error) toReport = error.cause;
+							} else {
+								// Report any unhandled and non-wrapped errors to Sentry
+								toReport = error;
+								// Set obfuscate to true so that the error would be obfuscated in th UI
+								error.obfuscate = true;
+							}
+							if (toReport) {
+								ErrorReporterProxy.error(toReport, {
+									extra: {
+										nodeName: executionNode.name,
+										nodeType: executionNode.type,
+										nodeVersion: executionNode.typeVersion,
+										workflowId: workflow.id,
+									},
+								});
+							}
 
 							const e = error as unknown as ExecutionBaseError;
 
-							executionError = { ...e, message, stack: e.stack };
+							executionError = { ...e, message: e.message, stack: e.stack };
 
 							Logger.debug(`Running node "${executionNode.name}" finished with error`, {
 								node: executionNode.name,
diff --git a/packages/editor-ui/src/components/Error/NodeErrorView.vue b/packages/editor-ui/src/components/Error/NodeErrorView.vue
index a0d6396df1416..6b6238338d25e 100644
--- a/packages/editor-ui/src/components/Error/NodeErrorView.vue
+++ b/packages/editor-ui/src/components/Error/NodeErrorView.vue
@@ -179,6 +179,10 @@ function addItemIndexSuffix(message: string): string {
 }
 
 function getErrorMessage(): string {
+	if ('obfuscate' in props.error && props.error.obfuscate === true) {
+		return i18n.baseText('nodeErrorView.showMessage.obfuscate');
+	}
+
 	let message = '';
 
 	const isSubNodeError =
diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json
index 2acf1cfd3554b..e4b312f77ff4b 100644
--- a/packages/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/editor-ui/src/plugins/i18n/locales/en.json
@@ -1125,6 +1125,7 @@
 	"nodeErrorView.itemIndex": "Item Index",
 	"nodeErrorView.runIndex": "Run Index",
 	"nodeErrorView.showMessage.title": "Copied to clipboard",
+	"nodeErrorView.showMessage.obfuscate": "Internal error",
 	"nodeErrorView.stack": "Stack",
 	"nodeErrorView.theErrorCauseIsTooLargeToBeDisplayed": "The error cause is too large to be displayed",
 	"nodeErrorView.time": "Time",
diff --git a/packages/workflow/src/errors/node-operation.error.ts b/packages/workflow/src/errors/node-operation.error.ts
index b0167250dcbef..8f6cd7a028cc1 100644
--- a/packages/workflow/src/errors/node-operation.error.ts
+++ b/packages/workflow/src/errors/node-operation.error.ts
@@ -2,7 +2,6 @@ import type { INode, JsonObject } from '@/Interfaces';
 import type { NodeOperationErrorOptions } from './node-api.error';
 import { NodeError } from './abstract/node.error';
 import { ApplicationError } from './application.error';
-import { OBFUSCATED_ERROR_MESSAGE } from '../Constants';
 
 /**
  * Class for instantiating an operational error, e.g. an invalid credentials error.
@@ -10,6 +9,8 @@ import { OBFUSCATED_ERROR_MESSAGE } from '../Constants';
 export class NodeOperationError extends NodeError {
 	type: string | undefined;
 
+	obfuscate: boolean = false;
+
 	constructor(
 		node: INode,
 		error: Error | string | JsonObject,
@@ -22,7 +23,7 @@ export class NodeOperationError extends NodeError {
 		let obfuscateErrorMessage = false;
 
 		if (typeof error === 'string') {
-			error = new Error(error);
+			error = new ApplicationError(error);
 		} else if (!(error instanceof ApplicationError)) {
 			// this error was no processed by n8n, obfuscate error message
 			obfuscateErrorMessage = true;
@@ -37,7 +38,7 @@ export class NodeOperationError extends NodeError {
 		if (obfuscateErrorMessage && !options.description) {
 			const originalMessage = typeof error === 'string' ? error : (error.message as string);
 			this.addToMessages(originalMessage);
-			this.message = OBFUSCATED_ERROR_MESSAGE;
+			this.obfuscate = true;
 		}
 		if (options.message) this.message = options.message;
 		if (options.level) this.level = options.level;
diff --git a/packages/workflow/test/errors/node.error.test.ts b/packages/workflow/test/errors/node.error.test.ts
index 357314c347bb3..4ec8c1d611c2a 100644
--- a/packages/workflow/test/errors/node.error.test.ts
+++ b/packages/workflow/test/errors/node.error.test.ts
@@ -3,7 +3,6 @@ import type { INode } from '@/Interfaces';
 import { NodeApiError } from '@/errors/node-api.error';
 import { NodeOperationError } from '@/errors/node-operation.error';
 import { ApplicationError } from '@/errors/application.error';
-import { OBFUSCATED_ERROR_MESSAGE } from '@/Constants';
 
 describe('NodeError', () => {
 	const node = mock<INode>();
@@ -22,7 +21,8 @@ describe('NodeError', () => {
 		const error = new Error('Original error message');
 		const nodeOpError = new NodeOperationError(node, error);
 
-		expect(nodeOpError.message).toBe(OBFUSCATED_ERROR_MESSAGE);
+		expect(nodeOpError.obfuscate).toBe(true);
+		expect(nodeOpError.message).toBe('Original error message');
 		expect(nodeOpError.messages).toContain('Original error message');
 	});
 
@@ -30,6 +30,7 @@ describe('NodeError', () => {
 		const appError = new ApplicationError('Processed error message');
 		const nodeOpError = new NodeOperationError(node, appError);
 
+		expect(nodeOpError.obfuscate).toBe(false);
 		expect(nodeOpError.message).toBe('Processed error message');
 		expect(nodeOpError.messages).not.toContain('Processed error message');
 	});
@@ -38,6 +39,7 @@ describe('NodeError', () => {
 		const errorMessage = 'String error message';
 		const nodeOpError = new NodeOperationError(node, errorMessage);
 
+		expect(nodeOpError.obfuscate).toBe(false);
 		expect(nodeOpError.message).toBe(errorMessage);
 		expect(nodeOpError.messages).toHaveLength(0);
 	});
@@ -47,6 +49,7 @@ describe('NodeError', () => {
 		const options = { description: 'Error description' };
 		const nodeOpError = new NodeOperationError(node, error, options);
 
+		expect(nodeOpError.obfuscate).toBe(false);
 		expect(nodeOpError.message).toBe('Initial error message');
 	});
 
@@ -55,6 +58,7 @@ describe('NodeError', () => {
 		const options = { message: 'Overridden message', description: 'Error description' };
 		const nodeOpError = new NodeOperationError(node, error, options);
 
+		expect(nodeOpError.obfuscate).toBe(false);
 		expect(nodeOpError.message).toBe('Overridden message');
 		expect(nodeOpError.description).toBe('Error description');
 	});

From 74e154b130bf6018659b17bf7688ff62d4269368 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Mon, 5 Aug 2024 17:52:46 +0200
Subject: [PATCH 078/168] refactor(editor): Boost n8n Form Trigger in
 nodes-panel search results (#10294)

---
 packages/editor-ui/src/utils/sortUtils.ts            | 10 ++++++----
 packages/nodes-base/nodes/Form/FormTrigger.node.json |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/packages/editor-ui/src/utils/sortUtils.ts b/packages/editor-ui/src/utils/sortUtils.ts
index 7dbc780634ae6..3d92d7a5e1d2a 100644
--- a/packages/editor-ui/src/utils/sortUtils.ts
+++ b/packages/editor-ui/src/utils/sortUtils.ts
@@ -139,10 +139,12 @@ function fuzzyMatchRecursive(
 	if (matched) {
 		outScore = 100;
 
-		// Apply leading letter penalty
-		let penalty = LEADING_LETTER_PENALTY * matches[0];
-		penalty = penalty < MAX_LEADING_LETTER_PENALTY ? MAX_LEADING_LETTER_PENALTY : penalty;
-		outScore += penalty;
+		// Apply leading letter penalty (if not n8n-prefixed)
+		if (!target.toLowerCase().startsWith('n8n')) {
+			let penalty = LEADING_LETTER_PENALTY * matches[0];
+			penalty = penalty < MAX_LEADING_LETTER_PENALTY ? MAX_LEADING_LETTER_PENALTY : penalty;
+			outScore += penalty;
+		}
 
 		//Apply unmatched penalty
 		const unmatched = target.length - nextMatch;
diff --git a/packages/nodes-base/nodes/Form/FormTrigger.node.json b/packages/nodes-base/nodes/Form/FormTrigger.node.json
index 8fb0763a34595..6531f1e8c6b4e 100644
--- a/packages/nodes-base/nodes/Form/FormTrigger.node.json
+++ b/packages/nodes-base/nodes/Form/FormTrigger.node.json
@@ -3,7 +3,7 @@
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
 	"categories": ["Core Nodes"],
-	"alias": ["_Form", "form", "table", "submit", "post"],
+	"alias": ["table", "submit", "post"],
 	"resources": {
 		"primaryDocumentation": [
 			{

From 1eba7c3c763ac5b6b28c1c6fc43fc8c215249292 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: Mon, 5 Aug 2024 18:10:16 +0200
Subject: [PATCH 079/168] fix(core): Revert transactions until we remove the
 legacy sqlite driver  (#10299)

---
 .github/workflows/test-workflows.yml          |  1 +
 .../repositories/execution.repository.ts      | 25 ++++++----------
 .../repositories/executionData.repository.ts  | 19 ------------
 .../repositories/execution.repository.test.ts | 29 -------------------
 4 files changed, 10 insertions(+), 64 deletions(-)

diff --git a/.github/workflows/test-workflows.yml b/.github/workflows/test-workflows.yml
index 8ba22b590cb62..2bb91dd065eb7 100644
--- a/.github/workflows/test-workflows.yml
+++ b/.github/workflows/test-workflows.yml
@@ -73,6 +73,7 @@ jobs:
         env:
           N8N_ENCRYPTION_KEY: ${{secrets.ENCRYPTION_KEY}}
           SKIP_STATISTICS_EVENTS: true
+          DB_SQLITE_POOL_SIZE: 4
       # -
       #   name: Export credentials
       #   if: always()
diff --git a/packages/cli/src/databases/repositories/execution.repository.ts b/packages/cli/src/databases/repositories/execution.repository.ts
index a8605147aa751..5b4e515af6da3 100644
--- a/packages/cli/src/databases/repositories/execution.repository.ts
+++ b/packages/cli/src/databases/repositories/execution.repository.ts
@@ -274,23 +274,16 @@ export class ExecutionRepository extends Repository<ExecutionEntity> {
 	 * Insert a new execution and its execution data using a transaction.
 	 */
 	async createNewExecution(execution: ExecutionPayload): Promise<string> {
-		return await this.manager.transaction(async (transactionManager) => {
-			const { data, workflowData, ...rest } = execution;
-			const insertResult = await transactionManager.insert(ExecutionEntity, rest);
-			const { id: executionId } = insertResult.identifiers[0] as { id: string };
-
-			const { connections, nodes, name, settings } = workflowData ?? {};
-			await this.executionDataRepository.createExecutionDataForExecution(
-				{
-					executionId,
-					workflowData: { connections, nodes, name, settings, id: workflowData.id },
-					data: stringify(data),
-				},
-				transactionManager,
-			);
-
-			return String(executionId);
+		const { data, workflowData, ...rest } = execution;
+		const { identifiers: inserted } = await this.insert(rest);
+		const { id: executionId } = inserted[0] as { id: string };
+		const { connections, nodes, name, settings } = workflowData ?? {};
+		await this.executionDataRepository.insert({
+			executionId,
+			workflowData: { connections, nodes, name, settings, id: workflowData.id },
+			data: stringify(data),
 		});
+		return String(executionId);
 	}
 
 	async markAsCrashed(executionIds: string | string[]) {
diff --git a/packages/cli/src/databases/repositories/executionData.repository.ts b/packages/cli/src/databases/repositories/executionData.repository.ts
index 013453d998e42..5872f9888cd66 100644
--- a/packages/cli/src/databases/repositories/executionData.repository.ts
+++ b/packages/cli/src/databases/repositories/executionData.repository.ts
@@ -1,32 +1,13 @@
 import { Service } from 'typedi';
-import type { EntityManager } from '@n8n/typeorm';
-import type { IWorkflowBase } from 'n8n-workflow';
 import { DataSource, In, Repository } from '@n8n/typeorm';
 import { ExecutionData } from '../entities/ExecutionData';
 
-export interface CreateExecutionDataOpts extends Pick<ExecutionData, 'data' | 'executionId'> {
-	workflowData: Pick<IWorkflowBase, 'connections' | 'nodes' | 'name' | 'settings' | 'id'>;
-}
-
 @Service()
 export class ExecutionDataRepository extends Repository<ExecutionData> {
 	constructor(dataSource: DataSource) {
 		super(ExecutionData, dataSource.manager);
 	}
 
-	async createExecutionDataForExecution(
-		executionData: CreateExecutionDataOpts,
-		transactionManager: EntityManager,
-	) {
-		const { data, executionId, workflowData } = executionData;
-
-		return await transactionManager.insert(ExecutionData, {
-			executionId,
-			data,
-			workflowData,
-		});
-	}
-
 	async findByExecutionIds(executionIds: string[]) {
 		return await this.find({
 			select: ['workflowData'],
diff --git a/packages/cli/test/integration/database/repositories/execution.repository.test.ts b/packages/cli/test/integration/database/repositories/execution.repository.test.ts
index e777f624299aa..cfb897d627a56 100644
--- a/packages/cli/test/integration/database/repositories/execution.repository.test.ts
+++ b/packages/cli/test/integration/database/repositories/execution.repository.test.ts
@@ -52,34 +52,5 @@ describe('ExecutionRepository', () => {
 			});
 			expect(executionData?.data).toEqual('[{"resultData":"1"},{}]');
 		});
-
-		it('should not create execution if execution data insert fails', async () => {
-			const executionRepo = Container.get(ExecutionRepository);
-			const executionDataRepo = Container.get(ExecutionDataRepository);
-
-			const workflow = await createWorkflow({ settings: { executionOrder: 'v1' } });
-			jest
-				.spyOn(executionDataRepo, 'createExecutionDataForExecution')
-				.mockRejectedValueOnce(new Error());
-
-			await expect(
-				async () =>
-					await executionRepo.createNewExecution({
-						workflowId: workflow.id,
-						data: {
-							//@ts-expect-error This is not needed for tests
-							resultData: {},
-						},
-						workflowData: workflow,
-						mode: 'manual',
-						startedAt: new Date(),
-						status: 'new',
-						finished: false,
-					}),
-			).rejects.toThrow();
-
-			const executionEntities = await executionRepo.find();
-			expect(executionEntities).toBeEmptyArray();
-		});
 	});
 });

From e3edeaa03526f041d15d1099ea91869e38a0decc Mon Sep 17 00:00:00 2001
From: jeanpaul <jeanpaul@users.noreply.github.com>
Date: Tue, 6 Aug 2024 10:42:18 +0200
Subject: [PATCH 080/168] feat(Postgres Chat Memory, Redis Chat Memory, Xata):
 Add support for context window length (#10203)

---
 .../MemoryBufferWindow.node.ts                | 10 ++--------
 .../MemoryPostgresChat.node.ts                | 19 +++++++++++++++----
 .../MemoryRedisChat/MemoryRedisChat.node.ts   | 19 +++++++++++++++----
 .../memory/MemoryXata/MemoryXata.node.ts      | 19 +++++++++++++++----
 .../nodes/memory/descriptions.ts              |  8 ++++++++
 5 files changed, 55 insertions(+), 20 deletions(-)

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 2b7e205de63fb..b8eea7a5e2c82 100644
--- a/packages/@n8n/nodes-langchain/nodes/memory/MemoryBufferWindow/MemoryBufferWindow.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/memory/MemoryBufferWindow/MemoryBufferWindow.node.ts
@@ -10,7 +10,7 @@ import type { BufferWindowMemoryInput } from 'langchain/memory';
 import { BufferWindowMemory } from 'langchain/memory';
 import { logWrapper } from '../../../utils/logWrapper';
 import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
-import { sessionIdOption, sessionKeyProperty } from '../descriptions';
+import { sessionIdOption, sessionKeyProperty, contextWindowLengthProperty } from '../descriptions';
 import { getSessionId } from '../../../utils/helpers';
 
 class MemoryChatBufferSingleton {
@@ -130,13 +130,7 @@ export class MemoryBufferWindow implements INodeType {
 				},
 			},
 			sessionKeyProperty,
-			{
-				displayName: 'Context Window Length',
-				name: 'contextWindowLength',
-				type: 'number',
-				default: 5,
-				description: 'The number of previous messages to consider for context',
-			},
+			contextWindowLengthProperty,
 		],
 	};
 
diff --git a/packages/@n8n/nodes-langchain/nodes/memory/MemoryPostgresChat/MemoryPostgresChat.node.ts b/packages/@n8n/nodes-langchain/nodes/memory/MemoryPostgresChat/MemoryPostgresChat.node.ts
index ea3ed3c33ea6b..b1a9cd7aeaec5 100644
--- a/packages/@n8n/nodes-langchain/nodes/memory/MemoryPostgresChat/MemoryPostgresChat.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/memory/MemoryPostgresChat/MemoryPostgresChat.node.ts
@@ -1,7 +1,7 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
 import type { IExecuteFunctions, INodeType, INodeTypeDescription, SupplyData } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
-import { BufferMemory } from 'langchain/memory';
+import { BufferMemory, BufferWindowMemory } from 'langchain/memory';
 import { PostgresChatMessageHistory } from '@langchain/community/stores/message/postgres';
 import type pg from 'pg';
 import { configurePostgres } from 'n8n-nodes-base/dist/nodes/Postgres/v2/transport';
@@ -9,7 +9,7 @@ import type { PostgresNodeCredentials } from 'n8n-nodes-base/dist/nodes/Postgres
 import { postgresConnectionTest } from 'n8n-nodes-base/dist/nodes/Postgres/v2/methods/credentialTest';
 import { logWrapper } from '../../../utils/logWrapper';
 import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
-import { sessionIdOption, sessionKeyProperty } from '../descriptions';
+import { sessionIdOption, sessionKeyProperty, contextWindowLengthProperty } from '../descriptions';
 import { getSessionId } from '../../../utils/helpers';
 
 export class MemoryPostgresChat implements INodeType {
@@ -18,7 +18,7 @@ export class MemoryPostgresChat implements INodeType {
 		name: 'memoryPostgresChat',
 		icon: 'file:postgres.svg',
 		group: ['transform'],
-		version: [1],
+		version: [1, 1.1],
 		description: 'Stores the chat history in Postgres table.',
 		defaults: {
 			name: 'Postgres Chat Memory',
@@ -60,6 +60,10 @@ export class MemoryPostgresChat implements INodeType {
 				description:
 					'The table name to store the chat history in. If table does not exist, it will be created.',
 			},
+			{
+				...contextWindowLengthProperty,
+				displayOptions: { hide: { '@version': [{ _cnd: { lt: 1.1 } }] } },
+			},
 		],
 	};
 
@@ -83,12 +87,19 @@ export class MemoryPostgresChat implements INodeType {
 			tableName,
 		});
 
-		const memory = new BufferMemory({
+		const memClass = this.getNode().typeVersion < 1.1 ? BufferMemory : BufferWindowMemory;
+		const kOptions =
+			this.getNode().typeVersion < 1.1
+				? {}
+				: { k: this.getNodeParameter('contextWindowLength', itemIndex) };
+
+		const memory = new memClass({
 			memoryKey: 'chat_history',
 			chatHistory: pgChatHistory,
 			returnMessages: true,
 			inputKey: 'input',
 			outputKey: 'output',
+			...kOptions,
 		});
 
 		async function closeFunction() {
diff --git a/packages/@n8n/nodes-langchain/nodes/memory/MemoryRedisChat/MemoryRedisChat.node.ts b/packages/@n8n/nodes-langchain/nodes/memory/MemoryRedisChat/MemoryRedisChat.node.ts
index d139bd31e365a..da57ede1d2315 100644
--- a/packages/@n8n/nodes-langchain/nodes/memory/MemoryRedisChat/MemoryRedisChat.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/memory/MemoryRedisChat/MemoryRedisChat.node.ts
@@ -7,14 +7,14 @@ import {
 	type SupplyData,
 	NodeConnectionType,
 } from 'n8n-workflow';
-import { BufferMemory } from 'langchain/memory';
+import { BufferMemory, BufferWindowMemory } from 'langchain/memory';
 import type { RedisChatMessageHistoryInput } from '@langchain/redis';
 import { RedisChatMessageHistory } from '@langchain/redis';
 import type { RedisClientOptions } from 'redis';
 import { createClient } from 'redis';
 import { logWrapper } from '../../../utils/logWrapper';
 import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
-import { sessionIdOption, sessionKeyProperty } from '../descriptions';
+import { sessionIdOption, sessionKeyProperty, contextWindowLengthProperty } from '../descriptions';
 import { getSessionId } from '../../../utils/helpers';
 
 export class MemoryRedisChat implements INodeType {
@@ -23,7 +23,7 @@ export class MemoryRedisChat implements INodeType {
 		name: 'memoryRedisChat',
 		icon: 'file:redis.svg',
 		group: ['transform'],
-		version: [1, 1.1, 1.2],
+		version: [1, 1.1, 1.2, 1.3],
 		description: 'Stores the chat history in Redis.',
 		defaults: {
 			name: 'Redis Chat Memory',
@@ -95,6 +95,10 @@ export class MemoryRedisChat implements INodeType {
 				description:
 					'For how long the session should be stored in seconds. If set to 0 it will not expire.',
 			},
+			{
+				...contextWindowLengthProperty,
+				displayOptions: { hide: { '@version': [{ _cnd: { lt: 1.3 } }] } },
+			},
 		],
 	};
 
@@ -143,12 +147,19 @@ export class MemoryRedisChat implements INodeType {
 		}
 		const redisChatHistory = new RedisChatMessageHistory(redisChatConfig);
 
-		const memory = new BufferMemory({
+		const memClass = this.getNode().typeVersion < 1.3 ? BufferMemory : BufferWindowMemory;
+		const kOptions =
+			this.getNode().typeVersion < 1.3
+				? {}
+				: { k: this.getNodeParameter('contextWindowLength', itemIndex) };
+
+		const memory = new memClass({
 			memoryKey: 'chat_history',
 			chatHistory: redisChatHistory,
 			returnMessages: true,
 			inputKey: 'input',
 			outputKey: 'output',
+			...kOptions,
 		});
 
 		async function closeFunction() {
diff --git a/packages/@n8n/nodes-langchain/nodes/memory/MemoryXata/MemoryXata.node.ts b/packages/@n8n/nodes-langchain/nodes/memory/MemoryXata/MemoryXata.node.ts
index e5c9dc4c35611..f0177d9e75e8b 100644
--- a/packages/@n8n/nodes-langchain/nodes/memory/MemoryXata/MemoryXata.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/memory/MemoryXata/MemoryXata.node.ts
@@ -2,11 +2,11 @@
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 import type { IExecuteFunctions, INodeType, INodeTypeDescription, SupplyData } from 'n8n-workflow';
 import { XataChatMessageHistory } from '@langchain/community/stores/message/xata';
-import { BufferMemory } from 'langchain/memory';
+import { BufferMemory, BufferWindowMemory } from 'langchain/memory';
 import { BaseClient } from '@xata.io/client';
 import { logWrapper } from '../../../utils/logWrapper';
 import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
-import { sessionIdOption, sessionKeyProperty } from '../descriptions';
+import { sessionIdOption, sessionKeyProperty, contextWindowLengthProperty } from '../descriptions';
 import { getSessionId } from '../../../utils/helpers';
 
 export class MemoryXata implements INodeType {
@@ -15,7 +15,7 @@ export class MemoryXata implements INodeType {
 		name: 'memoryXata',
 		icon: 'file:xata.svg',
 		group: ['transform'],
-		version: [1, 1.1, 1.2],
+		version: [1, 1.1, 1.2, 1.3],
 		description: 'Use Xata Memory',
 		defaults: {
 			name: 'Xata',
@@ -81,6 +81,10 @@ export class MemoryXata implements INodeType {
 				},
 			},
 			sessionKeyProperty,
+			{
+				...contextWindowLengthProperty,
+				displayOptions: { hide: { '@version': [{ _cnd: { lt: 1.3 } }] } },
+			},
 		],
 	};
 
@@ -120,12 +124,19 @@ export class MemoryXata implements INodeType {
 			apiKey: credentials.apiKey as string,
 		});
 
-		const memory = new BufferMemory({
+		const memClass = this.getNode().typeVersion < 1.3 ? BufferMemory : BufferWindowMemory;
+		const kOptions =
+			this.getNode().typeVersion < 1.3
+				? {}
+				: { k: this.getNodeParameter('contextWindowLength', itemIndex) };
+
+		const memory = new memClass({
 			chatHistory,
 			memoryKey: 'chat_history',
 			returnMessages: true,
 			inputKey: 'input',
 			outputKey: 'output',
+			...kOptions,
 		});
 
 		return {
diff --git a/packages/@n8n/nodes-langchain/nodes/memory/descriptions.ts b/packages/@n8n/nodes-langchain/nodes/memory/descriptions.ts
index 5f722c4647828..354d134fb7c42 100644
--- a/packages/@n8n/nodes-langchain/nodes/memory/descriptions.ts
+++ b/packages/@n8n/nodes-langchain/nodes/memory/descriptions.ts
@@ -33,3 +33,11 @@ export const sessionKeyProperty: INodeProperties = {
 		},
 	},
 };
+
+export const contextWindowLengthProperty: INodeProperties = {
+	displayName: 'Context Window Length',
+	name: 'contextWindowLength',
+	type: 'number',
+	default: 5,
+	hint: 'How many past interactions the model receives as context',
+};

From 98115e95df8289a8ec400a570a7f256382f8e286 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Tue, 6 Aug 2024 10:56:02 +0200
Subject: [PATCH 081/168] fix(core): Ensure OAuth token data is not stubbed in
 source control (#10302)

---
 .../source-control-export.service.test.ts     | 85 +++++++++++++++++++
 .../sourceControlExport.service.ee.ts         |  9 +-
 .../sourceControlImport.service.ee.ts         |  7 +-
 packages/core/src/NodeExecuteFunctions.ts     |  4 +-
 4 files changed, 102 insertions(+), 3 deletions(-)
 create mode 100644 packages/cli/src/environments/sourceControl/__tests__/source-control-export.service.test.ts

diff --git a/packages/cli/src/environments/sourceControl/__tests__/source-control-export.service.test.ts b/packages/cli/src/environments/sourceControl/__tests__/source-control-export.service.test.ts
new file mode 100644
index 0000000000000..7746875f6386e
--- /dev/null
+++ b/packages/cli/src/environments/sourceControl/__tests__/source-control-export.service.test.ts
@@ -0,0 +1,85 @@
+import mock from 'jest-mock-extended/lib/Mock';
+import { SourceControlExportService } from '../sourceControlExport.service.ee';
+import type { SourceControlledFile } from '../types/sourceControlledFile';
+import { Cipher, type InstanceSettings } from 'n8n-core';
+import { SharedCredentialsRepository } from '@/databases/repositories/sharedCredentials.repository';
+import { mockInstance } from '@test/mocking';
+
+import type { SharedCredentials } from '@/databases/entities/SharedCredentials';
+import type { CredentialsEntity } from '@/databases/entities/CredentialsEntity';
+import Container from 'typedi';
+import { ApplicationError, deepCopy } from 'n8n-workflow';
+
+// https://github.com/jestjs/jest/issues/4715
+function deepSpyOn<O extends object, M extends keyof O>(object: O, methodName: M) {
+	const spy = jest.fn();
+	// eslint-disable-next-line @typescript-eslint/ban-types
+	const originalMethod = object[methodName];
+
+	if (typeof originalMethod !== 'function') {
+		throw new ApplicationError(`${methodName.toString()} is not a function`, { level: 'warning' });
+	}
+
+	object[methodName] = function (...args: unknown[]) {
+		const clonedArgs = deepCopy(args);
+		spy(...clonedArgs);
+		return originalMethod.apply(this, args);
+	} as O[M];
+
+	return spy;
+}
+
+describe('SourceControlExportService', () => {
+	const service = new SourceControlExportService(
+		mock(),
+		mock(),
+		mock(),
+		mock<InstanceSettings>({ n8nFolder: '' }),
+	);
+
+	describe('exportCredentialsToWorkFolder', () => {
+		it('should export credentials to work folder', async () => {
+			/**
+			 * Arrange
+			 */
+			// @ts-expect-error Private method
+			const replaceSpy = deepSpyOn(service, 'replaceCredentialData');
+
+			mockInstance(SharedCredentialsRepository).findByCredentialIds.mockResolvedValue([
+				mock<SharedCredentials>({
+					credentials: mock<CredentialsEntity>({
+						data: Container.get(Cipher).encrypt(
+							JSON.stringify({
+								authUrl: 'test',
+								accessTokenUrl: 'test',
+								clientId: 'test',
+								clientSecret: 'test',
+								oauthTokenData: {
+									access_token: 'test',
+									token_type: 'test',
+									expires_in: 123,
+									refresh_token: 'test',
+								},
+							}),
+						),
+					}),
+				}),
+			]);
+
+			/**
+			 * Act
+			 */
+			await service.exportCredentialsToWorkFolder([mock<SourceControlledFile>()]);
+
+			/**
+			 * Assert
+			 */
+			expect(replaceSpy).toHaveBeenCalledWith({
+				authUrl: 'test',
+				accessTokenUrl: 'test',
+				clientId: 'test',
+				clientSecret: 'test',
+			});
+		});
+	});
+});
diff --git a/packages/cli/src/environments/sourceControl/sourceControlExport.service.ee.ts b/packages/cli/src/environments/sourceControl/sourceControlExport.service.ee.ts
index e586357093a41..65886a6d6d0d2 100644
--- a/packages/cli/src/environments/sourceControl/sourceControlExport.service.ee.ts
+++ b/packages/cli/src/environments/sourceControl/sourceControlExport.service.ee.ts
@@ -293,11 +293,18 @@ export class SourceControlExportService {
 						};
 					}
 
+					/**
+					 * Edge case: Do not export `oauthTokenData`, so that that the
+					 * pulling instance reconnects instead of trying to use stubbed values.
+					 */
+					const credentialData = credentials.getData();
+					const { oauthTokenData, ...rest } = credentialData;
+
 					const stub: ExportableCredential = {
 						id,
 						name,
 						type,
-						data: this.replaceCredentialData(credentials.getData()),
+						data: this.replaceCredentialData(rest),
 						ownedBy: owner,
 					};
 
diff --git a/packages/cli/src/environments/sourceControl/sourceControlImport.service.ee.ts b/packages/cli/src/environments/sourceControl/sourceControlImport.service.ee.ts
index d9a366b6f053e..7ff77ca7f8b44 100644
--- a/packages/cli/src/environments/sourceControl/sourceControlImport.service.ee.ts
+++ b/packages/cli/src/environments/sourceControl/sourceControlImport.service.ee.ts
@@ -326,7 +326,12 @@ export class SourceControlImportService {
 				if (existingCredential?.data) {
 					newCredentialObject.data = existingCredential.data;
 				} else {
-					newCredentialObject.setData(data);
+					/**
+					 * Edge case: Do not import `oauthTokenData`, so that that the
+					 * pulling instance reconnects instead of trying to use stubbed values.
+					 */
+					const { oauthTokenData, ...rest } = data;
+					newCredentialObject.setData(rest);
 				}
 
 				this.logger.debug(`Updating credential id ${newCredentialObject.id as string}`);
diff --git a/packages/core/src/NodeExecuteFunctions.ts b/packages/core/src/NodeExecuteFunctions.ts
index cf677ba5bd036..5426ce94ab221 100644
--- a/packages/core/src/NodeExecuteFunctions.ts
+++ b/packages/core/src/NodeExecuteFunctions.ts
@@ -1342,7 +1342,9 @@ export async function requestOAuth2(
 	// if it's the first time using the credentials, get the access token and save it into the DB.
 	if (
 		credentials.grantType === 'clientCredentials' &&
-		(oauthTokenData === undefined || Object.keys(oauthTokenData).length === 0)
+		(oauthTokenData === undefined ||
+			Object.keys(oauthTokenData).length === 0 ||
+			oauthTokenData.access_token === '') // stub
 	) {
 		const { data } = await oAuthClient.credentials.getToken();
 		// Find the credentials

From f6fc287cc7bbca33c47a399bb97365e91e4bfbae Mon Sep 17 00:00:00 2001
From: aya <15815271+ayatnkw@users.noreply.github.com>
Date: Tue, 6 Aug 2024 12:09:51 +0200
Subject: [PATCH 082/168] docs(Slack Node): Get user operation typo fix in ui
 (#10307)

---
 packages/nodes-base/nodes/Slack/V2/UserDescription.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nodes-base/nodes/Slack/V2/UserDescription.ts b/packages/nodes-base/nodes/Slack/V2/UserDescription.ts
index fc69e0eeb2fe0..bda7c46dac01e 100644
--- a/packages/nodes-base/nodes/Slack/V2/UserDescription.ts
+++ b/packages/nodes-base/nodes/Slack/V2/UserDescription.ts
@@ -27,7 +27,7 @@ export const userOperations: INodeProperties[] = [
 			{
 				name: "Get User's Profile",
 				value: 'getProfile',
-				description: "Get a user's",
+				description: "Get a user's profile",
 				action: "Get a user's profile",
 			},
 			{

From 7e95f9e2e40a99871f1b6abcdacb39ac5f857332 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: Tue, 6 Aug 2024 15:16:33 +0200
Subject: [PATCH 083/168] fix(core): VM2 sandbox should not throw on `new
 Promise` (#10298)

---
 packages/@n8n/nodes-langchain/package.json    |  2 +-
 .../nodes/Code/test/Code.workflow.json        | 66 +++++++++++++++++++
 packages/nodes-base/package.json              |  2 +-
 pnpm-lock.yaml                                | 29 ++++----
 4 files changed, 79 insertions(+), 20 deletions(-)

diff --git a/packages/@n8n/nodes-langchain/package.json b/packages/@n8n/nodes-langchain/package.json
index 3a328af0ae880..899f5d016ff4d 100644
--- a/packages/@n8n/nodes-langchain/package.json
+++ b/packages/@n8n/nodes-langchain/package.json
@@ -153,7 +153,7 @@
     "@langchain/textsplitters": "0.0.3",
     "@mozilla/readability": "^0.5.0",
     "@n8n/typeorm": "0.3.20-10",
-    "@n8n/vm2": "3.9.24",
+    "@n8n/vm2": "3.9.25",
     "@pinecone-database/pinecone": "3.0.0",
     "@qdrant/js-client-rest": "1.9.0",
     "@supabase/supabase-js": "2.43.4",
diff --git a/packages/nodes-base/nodes/Code/test/Code.workflow.json b/packages/nodes-base/nodes/Code/test/Code.workflow.json
index 07933b0f824a9..fbb4199956213 100644
--- a/packages/nodes-base/nodes/Code/test/Code.workflow.json
+++ b/packages/nodes-base/nodes/Code/test/Code.workflow.json
@@ -59,6 +59,34 @@
 			"type": "n8n-nodes-base.code",
 			"typeVersion": 1,
 			"position": [460, 860]
+		},
+		{
+			"parameters": {
+				"mode": "runOnceForEachItem",
+				"jsCode": "const json = $input.item.json\njson.myNewField = await (async () => json.value)();\n\nreturn $input.item;"
+			},
+			"id": "3cff4a64-c3fd-47d3-a33e-3c446846138f",
+			"name": "With Async Functions",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [
+				460,
+				1200
+			]
+		},
+		{
+			"parameters": {
+				"mode": "runOnceForEachItem",
+				"jsCode": "const json = $input.item.json\njson.myNewField = await new Promise((resolve) => resolve(json.value));\n\nreturn $input.item;"
+			},
+			"id": "947e4e3e-2da3-40c5-97da-830c4572fc05",
+			"name": "With Promises",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [
+				460,
+				1380
+			]
 		}
 	],
 	"pinData": {
@@ -103,6 +131,34 @@
 					"myNewField": 2
 				}
 			}
+		],
+		"With Async Functions": [
+			{
+				"json": {
+					"value": 1,
+					"myNewField": 1
+				}
+			},
+			{
+				"json": {
+					"value": 2,
+					"myNewField": 2
+				}
+			}
+		],
+		"With Promises": [
+			{
+				"json": {
+					"value": 1,
+					"myNewField": 1
+				}
+			},
+			{
+				"json": {
+					"value": 2,
+					"myNewField": 2
+				}
+			}
 		]
 	},
 	"connections": {
@@ -139,6 +195,16 @@
 						"node": "Run Once for Each Item  (Legacy Syntax)",
 						"type": "main",
 						"index": 0
+					},
+					{
+						"node": "With Async Functions",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "With Promises",
+						"type": "main",
+						"index": 0
 					}
 				]
 			]
diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index e9da85e9faf47..d3c73d1f04ed0 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -830,7 +830,7 @@
   "dependencies": {
     "@kafkajs/confluent-schema-registry": "1.0.6",
     "@n8n/imap": "workspace:*",
-    "@n8n/vm2": "3.9.24",
+    "@n8n/vm2": "3.9.25",
     "amqplib": "0.10.3",
     "alasql": "^4.4.0",
     "aws4": "1.11.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 8287287e22db9..a392d7c5672fc 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -390,8 +390,8 @@ importers:
         specifier: 0.3.20-10
         version: 0.3.20-10(@sentry/node@7.87.0)(ioredis@5.3.2)(mssql@10.0.2)(mysql2@3.10.0)(pg@8.11.3)(redis@4.6.12)(sqlite3@5.1.7)
       '@n8n/vm2':
-        specifier: 3.9.24
-        version: 3.9.24
+        specifier: 3.9.25
+        version: 3.9.25
       '@pinecone-database/pinecone':
         specifier: 3.0.0
         version: 3.0.0
@@ -1448,8 +1448,8 @@ importers:
         specifier: workspace:*
         version: link:../@n8n/imap
       '@n8n/vm2':
-        specifier: 3.9.24
-        version: 3.9.24
+        specifier: 3.9.25
+        version: 3.9.25
       alasql:
         specifier: ^4.4.0
         version: 4.4.0(encoding@0.1.13)
@@ -4211,8 +4211,8 @@ packages:
       typeorm-aurora-data-api-driver:
         optional: true
 
-  '@n8n/vm2@3.9.24':
-    resolution: {integrity: sha512-O4z67yVgUs2FHkcw3vbGnxdC1EglpzOj966kPkK4gtW+ZmTTFRfEB+2Ehq6PMthgg/Ou5JCLSR3wvQIZFFt4Pg==}
+  '@n8n/vm2@3.9.25':
+    resolution: {integrity: sha512-qoGLFzyHBW7HKpwXkl05QKsIh3GkDw6lOiTOWYlUDnOIQ1b7EgM+O5EMjrMGy7r+kz52+Q7o6GLxBIcxVI8rEg==}
     engines: {node: '>=18.10', pnpm: '>=9.6'}
     hasBin: true
 
@@ -6008,11 +6008,6 @@ packages:
     engines: {node: '>=0.4.0'}
     hasBin: true
 
-  acorn@8.11.2:
-    resolution: {integrity: sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==}
-    engines: {node: '>=0.4.0'}
-    hasBin: true
-
   acorn@8.12.1:
     resolution: {integrity: sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==}
     engines: {node: '>=0.4.0'}
@@ -16710,7 +16705,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@n8n/vm2@3.9.24':
+  '@n8n/vm2@3.9.25':
     dependencies:
       acorn: 8.12.1
       acorn-walk: 8.3.2
@@ -19360,16 +19355,14 @@ snapshots:
       acorn: 8.12.1
       acorn-walk: 8.3.2
 
-  acorn-jsx@5.3.2(acorn@8.11.2):
+  acorn-jsx@5.3.2(acorn@8.12.1):
     dependencies:
-      acorn: 8.11.2
+      acorn: 8.12.1
 
   acorn-walk@8.3.2: {}
 
   acorn@7.4.1: {}
 
-  acorn@8.11.2: {}
-
   acorn@8.12.1: {}
 
   address@1.2.2: {}
@@ -21481,8 +21474,8 @@ snapshots:
 
   espree@9.6.1:
     dependencies:
-      acorn: 8.11.2
-      acorn-jsx: 5.3.2(acorn@8.11.2)
+      acorn: 8.12.1
+      acorn-jsx: 5.3.2(acorn@8.12.1)
       eslint-visitor-keys: 3.4.3
 
   esprima-next@5.8.4: {}

From 74554d21d78292992fd8bb51d80d511ce840f695 Mon Sep 17 00:00:00 2001
From: Csaba Tuncsik <csaba@n8n.io>
Date: Tue, 6 Aug 2024 15:28:00 +0200
Subject: [PATCH 084/168] fix(editor): Update project tabs test (no-changelog)
 (#10300)

---
 .../src/components/N8nTabs/Tabs.vue           |  8 +--
 .../components/Projects/ProjectTabs.test.ts   | 56 +++++++------------
 2 files changed, 24 insertions(+), 40 deletions(-)

diff --git a/packages/design-system/src/components/N8nTabs/Tabs.vue b/packages/design-system/src/components/N8nTabs/Tabs.vue
index 1cd2792c9957f..967f08a430701 100644
--- a/packages/design-system/src/components/N8nTabs/Tabs.vue
+++ b/packages/design-system/src/components/N8nTabs/Tabs.vue
@@ -13,7 +13,7 @@
 				:key="option.value"
 				:class="{ [$style.alignRight]: option.align === 'right' }"
 			>
-				<n8n-tooltip :disabled="!option.tooltip" placement="bottom">
+				<N8nTooltip :disabled="!option.tooltip" placement="bottom">
 					<template #content>
 						<div @click="handleTooltipClick(option.value, $event)" v-html="option.tooltip" />
 					</template>
@@ -31,14 +31,14 @@
 							</span>
 						</div>
 					</a>
-					<RouterLink
+					<router-link
 						v-else-if="option.to"
 						:to="option.to"
 						:class="[$style.tab, { [$style.activeTab]: modelValue === option.value }]"
 					>
 						<N8nIcon v-if="option.icon" :icon="option.icon" size="medium" />
 						<span v-if="option.label">{{ option.label }}</span>
-					</RouterLink>
+					</router-link>
 					<div
 						v-else
 						:class="{ [$style.tab]: true, [$style.activeTab]: modelValue === option.value }"
@@ -48,7 +48,7 @@
 						<N8nIcon v-if="option.icon" :icon="option.icon" size="small" />
 						<span v-if="option.label">{{ option.label }}</span>
 					</div>
-				</n8n-tooltip>
+				</N8nTooltip>
 			</div>
 		</div>
 	</div>
diff --git a/packages/editor-ui/src/components/Projects/ProjectTabs.test.ts b/packages/editor-ui/src/components/Projects/ProjectTabs.test.ts
index 91c197a794ace..e31e7caeefbfc 100644
--- a/packages/editor-ui/src/components/Projects/ProjectTabs.test.ts
+++ b/packages/editor-ui/src/components/Projects/ProjectTabs.test.ts
@@ -1,7 +1,8 @@
-import { createComponentRenderer } from '@/__tests__/render';
-import ProjectTabs from '@/components/Projects/ProjectTabs.vue';
+import { createPinia, setActivePinia } from 'pinia';
 import { useRoute } from 'vue-router';
+import { createComponentRenderer } from '@/__tests__/render';
 import { createTestProject } from '@/__tests__/data/projects';
+import ProjectTabs from '@/components/Projects/ProjectTabs.vue';
 import { useProjectsStore } from '@/stores/projects.store';
 
 vi.mock('vue-router', () => {
@@ -17,28 +18,25 @@ vi.mock('vue-router', () => {
 		RouterLink: vi.fn(),
 	};
 });
-
-vi.mock('@/stores/users.store', () => ({
-	useUsersStore: vi.fn().mockImplementation(() => ({
-		currentUser: {},
-	})),
-}));
-
-vi.mock('@/stores/projects.store', () => ({
-	useProjectsStore: vi.fn().mockReturnValue({}),
-}));
-
-vi.mock('@/utils/rbac/permissions', () => ({
-	hasPermission: vi.fn().mockReturnValue(false),
-}));
-
-const renderComponent = createComponentRenderer(ProjectTabs);
+const renderComponent = createComponentRenderer(ProjectTabs, {
+	global: {
+		stubs: {
+			'router-link': {
+				template: '<div><slot /></div>',
+			},
+		},
+	},
+});
 
 let route: ReturnType<typeof useRoute>;
+let projectsStore: ReturnType<typeof useProjectsStore>;
 
 describe('ProjectTabs', () => {
 	beforeEach(() => {
+		const pinia = createPinia();
+		setActivePinia(pinia);
 		route = useRoute();
+		projectsStore = useProjectsStore();
 	});
 
 	it('should render home tabs', async () => {
@@ -49,16 +47,9 @@ describe('ProjectTabs', () => {
 		expect(queryByText('Project settings')).not.toBeInTheDocument();
 	});
 
-	it('should render project tabs if use has permissions', () => {
+	it('should render project tab Settings if user has permissions', () => {
 		route.params.projectId = '123';
-		vi.mocked(useProjectsStore).mockImplementationOnce(
-			() =>
-				({
-					currentProject: createTestProject({
-						scopes: ['project:update'],
-					}),
-				}) as ReturnType<typeof useProjectsStore>,
-		);
+		projectsStore.setCurrentProject(createTestProject({ scopes: ['project:update'] }));
 		const { getByText } = renderComponent();
 
 		expect(getByText('Workflows')).toBeInTheDocument();
@@ -66,16 +57,9 @@ describe('ProjectTabs', () => {
 		expect(getByText('Project settings')).toBeInTheDocument();
 	});
 
-	it('should render project tabs', () => {
+	it('should render project tabs without Settings if no permission', () => {
 		route.params.projectId = '123';
-		vi.mocked(useProjectsStore).mockImplementationOnce(
-			() =>
-				({
-					currentProject: createTestProject({
-						scopes: ['project:read'],
-					}),
-				}) as ReturnType<typeof useProjectsStore>,
-		);
+		projectsStore.setCurrentProject(createTestProject({ scopes: ['project:read'] }));
 		const { queryByText, getByText } = renderComponent();
 
 		expect(getByText('Workflows')).toBeInTheDocument();

From 557a76ec2326de72fb7a8b46fc4353f8fd9b591d Mon Sep 17 00:00:00 2001
From: Csaba Tuncsik <csaba@n8n.io>
Date: Tue, 6 Aug 2024 15:29:55 +0200
Subject: [PATCH 085/168] fix(editor): Update tags filter/editor to not show
 non existing tag as a selectable option (#10297)

---
 cypress/e2e/17-workflow-tags.cy.ts              | 17 +++++++++++++++++
 .../components/MainHeader/WorkflowDetails.vue   |  1 -
 .../editor-ui/src/components/TagsDropdown.vue   | 13 ++++---------
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/cypress/e2e/17-workflow-tags.cy.ts b/cypress/e2e/17-workflow-tags.cy.ts
index 88a2c9973dd66..fc889aead29c2 100644
--- a/cypress/e2e/17-workflow-tags.cy.ts
+++ b/cypress/e2e/17-workflow-tags.cy.ts
@@ -1,4 +1,5 @@
 import { WorkflowPage } from '../pages';
+import { getVisibleSelect } from '../utils';
 
 const wf = new WorkflowPage();
 
@@ -70,4 +71,20 @@ describe('Workflow tags', () => {
 		wf.getters.workflowTags().click();
 		wf.getters.tagPills().should('have.length', TEST_TAGS.length - 1);
 	});
+
+	it('should not show non existing tag as a selectable option', () => {
+		const NON_EXISTING_TAG = 'My Test Tag';
+
+		wf.getters.createTagButton().click();
+		wf.actions.addTags(TEST_TAGS);
+		cy.get('body').click(0, 0);
+		wf.getters.workflowTags().click();
+		wf.getters.tagsDropdown().find('input:focus').type(NON_EXISTING_TAG);
+
+		getVisibleSelect()
+			.find('li')
+			.should('have.length', 2)
+			.filter(`:contains("${NON_EXISTING_TAG}")`)
+			.should('not.have.length');
+	});
 });
diff --git a/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue b/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue
index fb103720206e5..9a5eb14dfbb5c 100644
--- a/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue
+++ b/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue
@@ -639,7 +639,6 @@ function showCreateWorkflowSuccessToast(id?: string) {
 				v-if="isTagsEditEnabled && !readOnly"
 				ref="dropdown"
 				v-model="appliedTagIds"
-				:create-enabled="true"
 				:event-bus="tagsEventBus"
 				:placeholder="$locale.baseText('workflowDetails.chooseOrCreateATag')"
 				class="tags-edit"
diff --git a/packages/editor-ui/src/components/TagsDropdown.vue b/packages/editor-ui/src/components/TagsDropdown.vue
index 0a5ac3b4933a3..bcd02fd6fa482 100644
--- a/packages/editor-ui/src/components/TagsDropdown.vue
+++ b/packages/editor-ui/src/components/TagsDropdown.vue
@@ -13,7 +13,6 @@
 			:filter-method="filterOptions"
 			filterable
 			multiple
-			:allow-create="createEnabled"
 			:reserve-keyword="false"
 			loading-text="..."
 			popper-class="tags-dropdown"
@@ -23,7 +22,7 @@
 			@remove-tag="onRemoveTag"
 		>
 			<n8n-option
-				v-if="options.length === 0 && filter && createEnabled"
+				v-if="options.length === 0 && filter"
 				:key="CREATE_KEY"
 				ref="createRef"
 				:value="CREATE_KEY"
@@ -35,11 +34,11 @@
 				</span>
 			</n8n-option>
 			<n8n-option v-else-if="options.length === 0" value="message" disabled>
-				<span v-if="createEnabled">{{ i18n.baseText('tagsDropdown.typeToCreateATag') }}</span>
-				<span v-else-if="allTags.length > 0">{{
+				<span>{{ i18n.baseText('tagsDropdown.typeToCreateATag') }}</span>
+				<span v-if="allTags.length > 0">{{
 					i18n.baseText('tagsDropdown.noMatchingTagsExist')
 				}}</span>
-				<span v-else>{{ i18n.baseText('tagsDropdown.noTagsExist') }}</span>
+				<span v-else-if="filter">{{ i18n.baseText('tagsDropdown.noTagsExist') }}</span>
 			</n8n-option>
 
 			<!-- key is id+index for keyboard navigation to work well with filter -->
@@ -90,10 +89,6 @@ export default defineComponent({
 			type: Array as PropType<string[]>,
 			default: () => [],
 		},
-		createEnabled: {
-			type: Boolean,
-			default: false,
-		},
 		eventBus: {
 			type: Object as PropType<EventBus>,
 			default: null,

From 46bbf09beacad12472d91786b91d845fe2afb26d Mon Sep 17 00:00:00 2001
From: Csaba Tuncsik <csaba@n8n.io>
Date: Tue, 6 Aug 2024 15:31:03 +0200
Subject: [PATCH 086/168] fix(editor): Update design system Avatar component to
 show initials also when only firstName or lastName is given (#10308)

---
 .../src/components/N8nAvatar/Avatar.vue       | 15 ++++++-----
 .../N8nAvatar/__tests__/Avatar.test.ts        | 25 +++++++++++++++++++
 2 files changed, 34 insertions(+), 6 deletions(-)
 create mode 100644 packages/design-system/src/components/N8nAvatar/__tests__/Avatar.test.ts

diff --git a/packages/design-system/src/components/N8nAvatar/Avatar.vue b/packages/design-system/src/components/N8nAvatar/Avatar.vue
index f7993a84a0038..348af6ed4784a 100644
--- a/packages/design-system/src/components/N8nAvatar/Avatar.vue
+++ b/packages/design-system/src/components/N8nAvatar/Avatar.vue
@@ -1,14 +1,14 @@
 <template>
 	<span :class="['n8n-avatar', $style.container]" v-bind="$attrs">
 		<Avatar
-			v-if="firstName"
+			v-if="name"
 			:size="getSize(size)"
-			:name="firstName + ' ' + lastName"
+			:name="name"
 			variant="marble"
 			:colors="getColors(colors)"
 		/>
-		<div v-else :class="[$style.empty, $style[size]]"></div>
-		<span v-if="firstName" :class="$style.initials">{{ initials }}</span>
+		<span v-else :class="[$style.empty, $style[size]]" />
+		<span v-if="name" :class="$style.initials">{{ initials }}</span>
 	</span>
 </template>
 
@@ -38,7 +38,8 @@ const props = withDefaults(defineProps<AvatarProps>(), {
 	],
 });
 
-const initials = computed(() => getInitials(`${props.firstName} ${props.lastName}`));
+const name = computed(() => `${props.firstName} ${props.lastName}`.trim());
+const initials = computed(() => getInitials(name.value));
 
 const getColors = (colors: string[]): string[] => {
 	const style = getComputedStyle(document.body);
@@ -62,6 +63,7 @@ const getSize = (size: string): number => sizes[size];
 }
 
 .empty {
+	display: block;
 	border-radius: 50%;
 	background-color: var(--color-foreground-dark);
 	opacity: 0.3;
@@ -72,7 +74,8 @@ const getSize = (size: string): number => sizes[size];
 	font-size: var(--font-size-2xs);
 	font-weight: var(--font-weight-bold);
 	color: var(--color-avatar-font);
-	text-shadow: 0px 1px 6px rgba(25, 11, 9, 0.3);
+	text-shadow: 0 1px 6px rgba(25, 11, 9, 0.3);
+	text-transform: uppercase;
 }
 
 .small {
diff --git a/packages/design-system/src/components/N8nAvatar/__tests__/Avatar.test.ts b/packages/design-system/src/components/N8nAvatar/__tests__/Avatar.test.ts
new file mode 100644
index 0000000000000..4fdeef6229795
--- /dev/null
+++ b/packages/design-system/src/components/N8nAvatar/__tests__/Avatar.test.ts
@@ -0,0 +1,25 @@
+import { render } from '@testing-library/vue';
+import N8nAvatar from '../Avatar.vue';
+
+describe('components', () => {
+	describe('N8nAlert', () => {
+		test.each([
+			['Firstname', 'Lastname', 'FL'],
+			['Firstname', undefined, 'Fi'],
+			[undefined, 'Lastname', 'La'],
+			[undefined, undefined, ''],
+			['', '', ''],
+		])('should render initials for name "%s %s" as %s', (firstName, lastName, initials) => {
+			const { container, getByText } = render(N8nAvatar, {
+				props: { firstName, lastName },
+			});
+
+			if (firstName || lastName) {
+				expect(container.querySelector('svg')).toBeVisible();
+				expect(getByText(initials)).toBeVisible();
+			} else {
+				expect(container.querySelector('svg')).not.toBeInTheDocument();
+			}
+		});
+	});
+});

From 2a8f1753e832158106d6201b21a366a8d4d12bfe Mon Sep 17 00:00:00 2001
From: Jon <jonathan.bennetts@gmail.com>
Date: Tue, 6 Aug 2024 15:21:57 +0100
Subject: [PATCH 087/168] docs: Fix links to license files in readme
 (no-changelog) (#10257)

---
 README.md                                        | 4 ++--
 docker/images/n8n/README.md                      | 4 +---
 packages/@n8n/chat/README.md                     | 7 +------
 packages/@n8n/nodes-langchain/README.md          | 4 +---
 packages/cli/README.md                           | 6 +-----
 packages/cli/src/PublicApi/v1/openapi.yml        | 2 +-
 packages/core/README.md                          | 6 +-----
 packages/design-system/README.md                 | 6 +-----
 packages/editor-ui/README.md                     | 6 +-----
 packages/editor-ui/src/components/AboutModal.vue | 2 +-
 packages/node-dev/README.md                      | 6 +-----
 packages/nodes-base/README.md                    | 6 +-----
 packages/workflow/README.md                      | 6 +-----
 13 files changed, 14 insertions(+), 51 deletions(-)

diff --git a/README.md b/README.md
index 145ecab8c62d6..d51ac596cad65 100644
--- a/README.md
+++ b/README.md
@@ -95,8 +95,8 @@ development environment ready in minutes.
 ## License
 
 n8n is [fair-code](https://faircode.io) distributed under the
-[**Sustainable Use License**](https://github.com/n8n-io/n8n/blob/master/packages/cli/LICENSE.md) and the
-[**n8n Enterprise License**](https://github.com/n8n-io/n8n/blob/master/packages/cli/LICENSE_EE.md).
+[**Sustainable Use License**](https://github.com/n8n-io/n8n/blob/master/LICENSE.md) and the
+[**n8n Enterprise License**](https://github.com/n8n-io/n8n/blob/master/LICENSE_EE.md).
 
 Proprietary licenses are available for enterprise customers. [Get in touch](mailto:license@n8n.io)
 
diff --git a/docker/images/n8n/README.md b/docker/images/n8n/README.md
index d65459615086e..f7b45f9467502 100644
--- a/docker/images/n8n/README.md
+++ b/docker/images/n8n/README.md
@@ -230,6 +230,4 @@ Before you upgrade to the latest version make sure to check here if there are an
 
 ## License
 
-n8n is [fair-code](https://faircode.io) distributed under the [**Sustainable Use License**](https://github.com/n8n-io/n8n/blob/master/packages/cli/LICENSE.md).
-
-Additional information about the license can be found in the [docs](https://docs.n8n.io/reference/license/).
+You can find the license information [here](https://github.com/n8n-io/n8n/blob/master/README.md#license)
diff --git a/packages/@n8n/chat/README.md b/packages/@n8n/chat/README.md
index 538d72ce0af91..0ed53a5774082 100644
--- a/packages/@n8n/chat/README.md
+++ b/packages/@n8n/chat/README.md
@@ -260,10 +260,5 @@ body,
 ```
 
 ## License
-n8n Chat is [fair-code](https://faircode.io) distributed under the
-[**Sustainable Use License**](https://github.com/n8n-io/n8n/blob/master/packages/cli/LICENSE.md).
 
-Proprietary licenses are available for enterprise customers. [Get in touch](mailto:license@n8n.io)
-
-Additional information about the license model can be found in the
-[docs](https://docs.n8n.io/reference/license/).
+You can find the license information [here](https://github.com/n8n-io/n8n/blob/master/README.md#license)
diff --git a/packages/@n8n/nodes-langchain/README.md b/packages/@n8n/nodes-langchain/README.md
index e5761628cf67b..03a23d21865d8 100644
--- a/packages/@n8n/nodes-langchain/README.md
+++ b/packages/@n8n/nodes-langchain/README.md
@@ -8,6 +8,4 @@ These nodes are still in Beta state and are only compatible with the Docker imag
 
 ## License
 
-n8n is [fair-code](https://faircode.io) distributed under the [**Sustainable Use License**](https://github.com/n8n-io/n8n/blob/master/packages/cli/LICENSE.md).
-
-Additional information about the license can be found in the [docs](https://docs.n8n.io/reference/license/).
+You can find the license information [here](https://github.com/n8n-io/n8n/blob/master/README.md#license)
diff --git a/packages/cli/README.md b/packages/cli/README.md
index beeac69369b2f..526f4631676de 100644
--- a/packages/cli/README.md
+++ b/packages/cli/README.md
@@ -147,8 +147,4 @@ You can also find breaking changes here: [Breaking Changes](./BREAKING-CHANGES.m
 
 ## License
 
-n8n is [fair-code](https://faircode.io) distributed under the [**Sustainable Use License**](https://github.com/n8n-io/n8n/blob/master/packages/cli/LICENSE.md).
-
-Proprietary licenses are available for enterprise customers. [Get in touch](mailto:license@n8n.io)
-
-Additional information about the license can be found in the [docs](https://docs.n8n.io/reference/license/).
+You can find the license information [here](https://github.com/n8n-io/n8n/blob/master/README.md#license)
diff --git a/packages/cli/src/PublicApi/v1/openapi.yml b/packages/cli/src/PublicApi/v1/openapi.yml
index 30c3a73bde0c7..0a84925734c7b 100644
--- a/packages/cli/src/PublicApi/v1/openapi.yml
+++ b/packages/cli/src/PublicApi/v1/openapi.yml
@@ -8,7 +8,7 @@ info:
     email: hello@n8n.io
   license:
     name: Sustainable Use License
-    url: https://github.com/n8n-io/n8n/blob/master/packages/cli/LICENSE.md
+    url: https://github.com/n8n-io/n8n/blob/master/LICENSE.md
   version: 1.1.1
 externalDocs:
   description: n8n API documentation
diff --git a/packages/core/README.md b/packages/core/README.md
index 0518567fc9bce..ad67d1a3798d6 100644
--- a/packages/core/README.md
+++ b/packages/core/README.md
@@ -10,8 +10,4 @@ npm install n8n-core
 
 ## License
 
-n8n is [fair-code](https://faircode.io) distributed under the [**Sustainable Use License**](https://github.com/n8n-io/n8n/blob/master/packages/cli/LICENSE.md).
-
-Proprietary licenses are available for enterprise customers. [Get in touch](mailto:license@n8n.io)
-
-Additional information about the license can be found in the [docs](https://docs.n8n.io/reference/license/).
+You can find the license information [here](https://github.com/n8n-io/n8n/blob/master/README.md#license)
diff --git a/packages/design-system/README.md b/packages/design-system/README.md
index ea69f24524a5b..c43317d077334 100644
--- a/packages/design-system/README.md
+++ b/packages/design-system/README.md
@@ -48,8 +48,4 @@ pnpm watch:theme
 
 ## License
 
-n8n is [fair-code](https://faircode.io) distributed under the [**Sustainable Use License**](https://github.com/n8n-io/n8n/blob/master/packages/cli/LICENSE.md).
-
-Proprietary licenses are available for enterprise customers. [Get in touch](mailto:license@n8n.io)
-
-Additional information about the license can be found in the [docs](https://docs.n8n.io/reference/license/).
+You can find the license information [here](https://github.com/n8n-io/n8n/blob/master/README.md#license)
diff --git a/packages/editor-ui/README.md b/packages/editor-ui/README.md
index c8583ffbbdd31..75b8026fb8bae 100644
--- a/packages/editor-ui/README.md
+++ b/packages/editor-ui/README.md
@@ -56,8 +56,4 @@ See [Configuration Reference](https://cli.vuejs.org/config/).
 
 ## License
 
-n8n is [fair-code](https://faircode.io) distributed under the [**Sustainable Use License**](https://github.com/n8n-io/n8n/blob/master/packages/cli/LICENSE.md).
-
-Proprietary licenses are available for enterprise customers. [Get in touch](mailto:license@n8n.io)
-
-Additional information about the license can be found in the [docs](https://docs.n8n.io/reference/license/).
+You can find the license information [here](https://github.com/n8n-io/n8n/blob/master/README.md#license)
diff --git a/packages/editor-ui/src/components/AboutModal.vue b/packages/editor-ui/src/components/AboutModal.vue
index 1aeeed0fb5715..8552044e4b30b 100644
--- a/packages/editor-ui/src/components/AboutModal.vue
+++ b/packages/editor-ui/src/components/AboutModal.vue
@@ -29,7 +29,7 @@
 						<n8n-text>{{ $locale.baseText('about.license') }}</n8n-text>
 					</el-col>
 					<el-col :span="16">
-						<n8n-link to="https://github.com/n8n-io/n8n/blob/master/packages/cli/LICENSE.md">
+						<n8n-link to="https://github.com/n8n-io/n8n/blob/master/LICENSE.md">
 							{{ $locale.baseText('about.n8nLicense') }}
 						</n8n-link>
 					</el-col>
diff --git a/packages/node-dev/README.md b/packages/node-dev/README.md
index d650716a0a284..bbb999de1ba99 100644
--- a/packages/node-dev/README.md
+++ b/packages/node-dev/README.md
@@ -215,8 +215,4 @@ All properties are optional. However, most only work when the node-property is o
 
 ## License
 
-n8n is [fair-code](https://faircode.io) distributed under the [**Sustainable Use License**](https://github.com/n8n-io/n8n/blob/master/packages/cli/LICENSE.md).
-
-Proprietary licenses are available for enterprise customers. [Get in touch](mailto:license@n8n.io)
-
-Additional information about the license can be found in the [docs](https://docs.n8n.io/reference/license/).
+You can find the license information [here](https://github.com/n8n-io/n8n/blob/master/README.md#license)
diff --git a/packages/nodes-base/README.md b/packages/nodes-base/README.md
index 3dc74130378f4..fec5cc3db06cf 100644
--- a/packages/nodes-base/README.md
+++ b/packages/nodes-base/README.md
@@ -10,8 +10,4 @@ npm install n8n-nodes-base -g
 
 ## License
 
-n8n is [fair-code](https://faircode.io) distributed under the [**Sustainable Use License**](https://github.com/n8n-io/n8n/blob/master/packages/cli/LICENSE.md).
-
-Proprietary licenses are available for enterprise customers. [Get in touch](mailto:license@n8n.io)
-
-Additional information about the license can be found in the [docs](https://docs.n8n.io/reference/license/).
+You can find the license information [here](https://github.com/n8n-io/n8n/blob/master/README.md#license)
diff --git a/packages/workflow/README.md b/packages/workflow/README.md
index da80c579206e4..e76b4283e91e1 100644
--- a/packages/workflow/README.md
+++ b/packages/workflow/README.md
@@ -10,8 +10,4 @@ npm install n8n-workflow
 
 ## License
 
-n8n is [fair-code](https://faircode.io) distributed under the [**Sustainable Use License**](https://github.com/n8n-io/n8n/blob/master/packages/cli/LICENSE.md).
-
-Proprietary licenses are available for enterprise customers. [Get in touch](mailto:license@n8n.io)
-
-Additional information about the license can be found in the [docs](https://docs.n8n.io/reference/license/).
+You can find the license information [here](https://github.com/n8n-io/n8n/blob/master/README.md#license)

From c8d322a9ba02bfe6392b5164adcbcff18fab38ec Mon Sep 17 00:00:00 2001
From: Tomi Turtiainen <10324676+tomi@users.noreply.github.com>
Date: Wed, 7 Aug 2024 11:23:44 +0300
Subject: [PATCH 088/168] refactor(core): Reorganize webhook related components
 under src/webhooks (no-changelog) (#10296)

---
 packages/cli/src/AbstractServer.ts            |  8 ++--
 packages/cli/src/ActiveWorkflowManager.ts     |  4 +-
 packages/cli/src/Interfaces.ts                | 38 +------------------
 packages/cli/src/WaitingForms.ts              |  2 +-
 packages/cli/src/commands/webhook.ts          |  4 +-
 packages/cli/src/commands/worker.ts           |  2 +-
 .../main/handleCommandMessageMain.ts          |  2 +-
 .../cli/src/{ => webhooks}/ActiveWebhooks.ts  | 15 +++++---
 .../cli/src/{ => webhooks}/TestWebhooks.ts    | 22 ++++++-----
 .../cli/src/{ => webhooks}/WaitingWebhooks.ts | 22 ++++++-----
 .../cli/src/{ => webhooks}/WebhookHelpers.ts  | 26 ++++++-------
 .../cli/src/{ => webhooks}/WebhookServer.ts   |  0
 .../__tests__/TestWebhooks.test.ts            |  9 +++--
 .../__tests__/WebhookHelpers.test.ts          |  4 +-
 ...test-webhook-registrations.service.test.ts |  4 +-
 .../__tests__/waiting-webhooks.test.ts        |  5 ++-
 .../__tests__/webhook.service.test.ts         |  2 +-
 .../test-webhook-registrations.service.ts     |  2 +-
 .../{services => webhooks}/webhook.service.ts |  0
 packages/cli/src/webhooks/webhook.types.ts    | 37 ++++++++++++++++++
 .../workflows/workflowExecution.service.ts    |  2 +-
 .../active-workflow-manager.test.ts           |  4 +-
 .../cli/test/integration/webhooks.test.ts     | 10 ++---
 23 files changed, 119 insertions(+), 105 deletions(-)
 rename packages/cli/src/{ => webhooks}/ActiveWebhooks.ts (91%)
 rename packages/cli/src/{ => webhooks}/TestWebhooks.ts (94%)
 rename packages/cli/src/{ => webhooks}/WaitingWebhooks.ts (88%)
 rename packages/cli/src/{ => webhooks}/WebhookHelpers.ts (97%)
 rename packages/cli/src/{ => webhooks}/WebhookServer.ts (100%)
 rename packages/cli/src/{ => webhooks}/__tests__/TestWebhooks.test.ts (93%)
 rename packages/cli/src/{ => webhooks}/__tests__/WebhookHelpers.test.ts (97%)
 rename packages/cli/src/{services => webhooks}/__tests__/test-webhook-registrations.service.test.ts (95%)
 rename packages/cli/src/{ => webhooks}/__tests__/waiting-webhooks.test.ts (90%)
 rename packages/cli/src/{services => webhooks}/__tests__/webhook.service.test.ts (99%)
 rename packages/cli/src/{services => webhooks}/test-webhook-registrations.service.ts (97%)
 rename packages/cli/src/{services => webhooks}/webhook.service.ts (100%)
 create mode 100644 packages/cli/src/webhooks/webhook.types.ts

diff --git a/packages/cli/src/AbstractServer.ts b/packages/cli/src/AbstractServer.ts
index ab150e2947328..38cc327831c16 100644
--- a/packages/cli/src/AbstractServer.ts
+++ b/packages/cli/src/AbstractServer.ts
@@ -13,15 +13,15 @@ import { N8nInstanceType } from '@/Interfaces';
 import { ExternalHooks } from '@/ExternalHooks';
 import { send, sendErrorResponse } from '@/ResponseHelper';
 import { rawBodyReader, bodyParser, corsMiddleware } from '@/middlewares';
-import { TestWebhooks } from '@/TestWebhooks';
 import { WaitingForms } from '@/WaitingForms';
-import { WaitingWebhooks } from '@/WaitingWebhooks';
-import { webhookRequestHandler } from '@/WebhookHelpers';
+import { TestWebhooks } from '@/webhooks/TestWebhooks';
+import { WaitingWebhooks } from '@/webhooks/WaitingWebhooks';
+import { webhookRequestHandler } from '@/webhooks/WebhookHelpers';
+import { ActiveWebhooks } from '@/webhooks/ActiveWebhooks';
 import { generateHostInstanceId } from './databases/utils/generators';
 import { Logger } from '@/Logger';
 import { ServiceUnavailableError } from './errors/response-errors/service-unavailable.error';
 import { OnShutdown } from '@/decorators/OnShutdown';
-import { ActiveWebhooks } from '@/ActiveWebhooks';
 import { GlobalConfig } from '@n8n/config';
 
 @Service()
diff --git a/packages/cli/src/ActiveWorkflowManager.ts b/packages/cli/src/ActiveWorkflowManager.ts
index 1d5050e4d1ca5..fac6e9d9faa2e 100644
--- a/packages/cli/src/ActiveWorkflowManager.ts
+++ b/packages/cli/src/ActiveWorkflowManager.ts
@@ -27,7 +27,7 @@ import {
 } from 'n8n-workflow';
 
 import type { IWorkflowDb } from '@/Interfaces';
-import * as WebhookHelpers from '@/WebhookHelpers';
+import * as WebhookHelpers from '@/webhooks/WebhookHelpers';
 import * as WorkflowExecuteAdditionalData from '@/WorkflowExecuteAdditionalData';
 
 import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
@@ -40,7 +40,7 @@ import {
 } from '@/constants';
 import { NodeTypes } from '@/NodeTypes';
 import { ExternalHooks } from '@/ExternalHooks';
-import { WebhookService } from './services/webhook.service';
+import { WebhookService } from '@/webhooks/webhook.service';
 import { Logger } from './Logger';
 import { WorkflowRepository } from '@db/repositories/workflow.repository';
 import { OrchestrationService } from '@/services/orchestration.service';
diff --git a/packages/cli/src/Interfaces.ts b/packages/cli/src/Interfaces.ts
index 8ddbd10fb29c1..9a1fdc367f4b5 100644
--- a/packages/cli/src/Interfaces.ts
+++ b/packages/cli/src/Interfaces.ts
@@ -1,4 +1,4 @@
-import type { Application, Request, Response } from 'express';
+import type { Application } from 'express';
 import type {
 	ExecutionError,
 	ICredentialDataDecryptedObject,
@@ -22,7 +22,6 @@ import type {
 	FeatureFlags,
 	INodeProperties,
 	IUserSettings,
-	IHttpRequestMethods,
 	StartNodeData,
 } from 'n8n-workflow';
 
@@ -239,34 +238,6 @@ export interface IExternalHooksFunctions {
 	};
 }
 
-export type WebhookCORSRequest = Request & { method: 'OPTIONS' };
-
-export type WebhookRequest = Request<{ path: string }> & {
-	method: IHttpRequestMethods;
-	params: Record<string, string>;
-};
-
-export type WaitingWebhookRequest = WebhookRequest & {
-	params: WebhookRequest['path'] & { suffix?: string };
-};
-
-export interface WebhookAccessControlOptions {
-	allowedOrigins?: string;
-}
-
-export interface IWebhookManager {
-	/** Gets all request methods associated with a webhook path*/
-	getWebhookMethods?: (path: string) => Promise<IHttpRequestMethods[]>;
-
-	/** Find the CORS options matching a path and method */
-	findAccessControlOptions?: (
-		path: string,
-		httpMethod: IHttpRequestMethods,
-	) => Promise<WebhookAccessControlOptions | undefined>;
-
-	executeWebhook(req: WebhookRequest, res: Response): Promise<IResponseCallbackData>;
-}
-
 export interface IVersionNotificationSettings {
 	enabled: boolean;
 	endpoint: string;
@@ -466,13 +437,6 @@ export interface IPushDataWorkerStatusPayload {
 	version: string;
 }
 
-export interface IResponseCallbackData {
-	data?: IDataObject | IDataObject[];
-	headers?: object;
-	noWebhookResponse?: boolean;
-	responseCode?: number;
-}
-
 export interface INodesTypeData {
 	[key: string]: {
 		className: string;
diff --git a/packages/cli/src/WaitingForms.ts b/packages/cli/src/WaitingForms.ts
index 0625acd7e40c4..bf0ab7dedb161 100644
--- a/packages/cli/src/WaitingForms.ts
+++ b/packages/cli/src/WaitingForms.ts
@@ -1,7 +1,7 @@
 import { Service } from 'typedi';
 
 import type { IExecutionResponse } from '@/Interfaces';
-import { WaitingWebhooks } from '@/WaitingWebhooks';
+import { WaitingWebhooks } from '@/webhooks/WaitingWebhooks';
 
 @Service()
 export class WaitingForms extends WaitingWebhooks {
diff --git a/packages/cli/src/commands/webhook.ts b/packages/cli/src/commands/webhook.ts
index e76ac358170c1..2c8532ec76342 100644
--- a/packages/cli/src/commands/webhook.ts
+++ b/packages/cli/src/commands/webhook.ts
@@ -4,7 +4,7 @@ import { ApplicationError } from 'n8n-workflow';
 
 import config from '@/config';
 import { ActiveExecutions } from '@/ActiveExecutions';
-import { WebhookServer } from '@/WebhookServer';
+import { WebhookServer } from '@/webhooks/WebhookServer';
 import { Queue } from '@/Queue';
 import { BaseCommand } from './BaseCommand';
 
@@ -86,7 +86,7 @@ export class Webhook extends BaseCommand {
 		await this.initExternalHooks();
 		this.logger.debug('External hooks init complete');
 		await this.initExternalSecrets();
-		this.logger.debug('External seecrets init complete');
+		this.logger.debug('External secrets init complete');
 	}
 
 	async run() {
diff --git a/packages/cli/src/commands/worker.ts b/packages/cli/src/commands/worker.ts
index 151ecfdf90d12..5681b417273d6 100644
--- a/packages/cli/src/commands/worker.ts
+++ b/packages/cli/src/commands/worker.ts
@@ -9,7 +9,7 @@ import { Workflow, sleep, ApplicationError } from 'n8n-workflow';
 
 import * as Db from '@/Db';
 import * as ResponseHelper from '@/ResponseHelper';
-import * as WebhookHelpers from '@/WebhookHelpers';
+import * as WebhookHelpers from '@/webhooks/WebhookHelpers';
 import * as WorkflowExecuteAdditionalData from '@/WorkflowExecuteAdditionalData';
 import config from '@/config';
 import type { Job, JobId, JobResponse, WebhookResponse } from '@/Queue';
diff --git a/packages/cli/src/services/orchestration/main/handleCommandMessageMain.ts b/packages/cli/src/services/orchestration/main/handleCommandMessageMain.ts
index 7945f59bc35f8..9a7b6b5640dd0 100644
--- a/packages/cli/src/services/orchestration/main/handleCommandMessageMain.ts
+++ b/packages/cli/src/services/orchestration/main/handleCommandMessageMain.ts
@@ -7,7 +7,7 @@ import { License } from '@/License';
 import { Logger } from '@/Logger';
 import { ActiveWorkflowManager } from '@/ActiveWorkflowManager';
 import { Push } from '@/push';
-import { TestWebhooks } from '@/TestWebhooks';
+import { TestWebhooks } from '@/webhooks/TestWebhooks';
 import { OrchestrationService } from '@/services/orchestration.service';
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
 import { CommunityPackagesService } from '@/services/communityPackages.service';
diff --git a/packages/cli/src/ActiveWebhooks.ts b/packages/cli/src/webhooks/ActiveWebhooks.ts
similarity index 91%
rename from packages/cli/src/ActiveWebhooks.ts
rename to packages/cli/src/webhooks/ActiveWebhooks.ts
index 43136e75d384a..c18f949b88cca 100644
--- a/packages/cli/src/ActiveWebhooks.ts
+++ b/packages/cli/src/webhooks/ActiveWebhooks.ts
@@ -5,20 +5,25 @@ import type { INode, IWebhookData, IHttpRequestMethods } from 'n8n-workflow';
 
 import { WorkflowRepository } from '@db/repositories/workflow.repository';
 import type {
-	IResponseCallbackData,
+	IWebhookResponseCallbackData,
 	IWebhookManager,
 	WebhookAccessControlOptions,
 	WebhookRequest,
-} from '@/Interfaces';
+} from './webhook.types';
 import { Logger } from '@/Logger';
 import { NodeTypes } from '@/NodeTypes';
-import { WebhookService } from '@/services/webhook.service';
+import { WebhookService } from '@/webhooks/webhook.service';
 import { WebhookNotFoundError } from '@/errors/response-errors/webhook-not-found.error';
 import { NotFoundError } from '@/errors/response-errors/not-found.error';
 import * as WorkflowExecuteAdditionalData from '@/WorkflowExecuteAdditionalData';
-import * as WebhookHelpers from '@/WebhookHelpers';
+import * as WebhookHelpers from '@/webhooks/WebhookHelpers';
 import { WorkflowStaticDataService } from '@/workflows/workflowStaticData.service';
 
+/**
+ * Service for handling the execution of production webhooks, i.e. webhooks
+ * that belong to activated workflows and use the production URL
+ * (https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.webhook/#webhook-urls)
+ */
 @Service()
 export class ActiveWebhooks implements IWebhookManager {
 	constructor(
@@ -57,7 +62,7 @@ export class ActiveWebhooks implements IWebhookManager {
 	async executeWebhook(
 		request: WebhookRequest,
 		response: Response,
-	): Promise<IResponseCallbackData> {
+	): Promise<IWebhookResponseCallbackData> {
 		const httpMethod = request.method;
 		const path = request.params.path;
 
diff --git a/packages/cli/src/TestWebhooks.ts b/packages/cli/src/webhooks/TestWebhooks.ts
similarity index 94%
rename from packages/cli/src/TestWebhooks.ts
rename to packages/cli/src/webhooks/TestWebhooks.ts
index 827226ee546be..8cf1b4292989b 100644
--- a/packages/cli/src/TestWebhooks.ts
+++ b/packages/cli/src/webhooks/TestWebhooks.ts
@@ -8,26 +8,30 @@ import type {
 	IRunData,
 } from 'n8n-workflow';
 import type {
-	IResponseCallbackData,
+	IWebhookResponseCallbackData,
 	IWebhookManager,
-	IWorkflowDb,
 	WebhookAccessControlOptions,
 	WebhookRequest,
-} from '@/Interfaces';
+} from './webhook.types';
 import { Push } from '@/push';
 import { NodeTypes } from '@/NodeTypes';
-import * as WebhookHelpers from '@/WebhookHelpers';
+import * as WebhookHelpers from '@/webhooks/WebhookHelpers';
 import { TEST_WEBHOOK_TIMEOUT } from '@/constants';
 import { NotFoundError } from '@/errors/response-errors/not-found.error';
 import { WorkflowMissingIdError } from '@/errors/workflow-missing-id.error';
 import { WebhookNotFoundError } from '@/errors/response-errors/webhook-not-found.error';
 import * as NodeExecuteFunctions from 'n8n-core';
-import { removeTrailingSlash } from './utils';
-import type { TestWebhookRegistration } from '@/services/test-webhook-registrations.service';
-import { TestWebhookRegistrationsService } from '@/services/test-webhook-registrations.service';
+import { removeTrailingSlash } from '@/utils';
+import type { TestWebhookRegistration } from '@/webhooks/test-webhook-registrations.service';
+import { TestWebhookRegistrationsService } from '@/webhooks/test-webhook-registrations.service';
 import { OrchestrationService } from '@/services/orchestration.service';
 import * as WorkflowExecuteAdditionalData from '@/WorkflowExecuteAdditionalData';
+import type { IWorkflowDb } from '@/Interfaces';
 
+/**
+ * Service for handling the execution of webhooks of manual executions
+ * that use the [Test URL](https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.webhook/#webhook-urls).
+ */
 @Service()
 export class TestWebhooks implements IWebhookManager {
 	constructor(
@@ -46,7 +50,7 @@ export class TestWebhooks implements IWebhookManager {
 	async executeWebhook(
 		request: WebhookRequest,
 		response: express.Response,
-	): Promise<IResponseCallbackData> {
+	): Promise<IWebhookResponseCallbackData> {
 		const httpMethod = request.method;
 
 		let path = removeTrailingSlash(request.params.path);
@@ -117,7 +121,7 @@ export class TestWebhooks implements IWebhookManager {
 					undefined, // executionId
 					request,
 					response,
-					(error: Error | null, data: IResponseCallbackData) => {
+					(error: Error | null, data: IWebhookResponseCallbackData) => {
 						if (error !== null) reject(error);
 						else resolve(data);
 					},
diff --git a/packages/cli/src/WaitingWebhooks.ts b/packages/cli/src/webhooks/WaitingWebhooks.ts
similarity index 88%
rename from packages/cli/src/WaitingWebhooks.ts
rename to packages/cli/src/webhooks/WaitingWebhooks.ts
index d795c948f142f..367635c45ec64 100644
--- a/packages/cli/src/WaitingWebhooks.ts
+++ b/packages/cli/src/webhooks/WaitingWebhooks.ts
@@ -2,21 +2,25 @@ import { NodeHelpers, Workflow } from 'n8n-workflow';
 import { Service } from 'typedi';
 import type express from 'express';
 
-import * as WebhookHelpers from '@/WebhookHelpers';
+import * as WebhookHelpers from '@/webhooks/WebhookHelpers';
 import { NodeTypes } from '@/NodeTypes';
 import type {
-	IExecutionResponse,
-	IResponseCallbackData,
+	IWebhookResponseCallbackData,
 	IWebhookManager,
-	IWorkflowDb,
 	WaitingWebhookRequest,
-} from '@/Interfaces';
+} from './webhook.types';
 import * as WorkflowExecuteAdditionalData from '@/WorkflowExecuteAdditionalData';
 import { ExecutionRepository } from '@db/repositories/execution.repository';
 import { Logger } from '@/Logger';
-import { ConflictError } from './errors/response-errors/conflict.error';
-import { NotFoundError } from './errors/response-errors/not-found.error';
-
+import { ConflictError } from '@/errors/response-errors/conflict.error';
+import { NotFoundError } from '@/errors/response-errors/not-found.error';
+import type { IExecutionResponse, IWorkflowDb } from '@/Interfaces';
+
+/**
+ * Service for handling the execution of webhooks of Wait nodes that use the
+ * [Resume On Webhook Call](https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.wait/#on-webhook-call)
+ * feature.
+ */
 @Service()
 export class WaitingWebhooks implements IWebhookManager {
 	protected includeForms = false;
@@ -40,7 +44,7 @@ export class WaitingWebhooks implements IWebhookManager {
 	async executeWebhook(
 		req: WaitingWebhookRequest,
 		res: express.Response,
-	): Promise<IResponseCallbackData> {
+	): Promise<IWebhookResponseCallbackData> {
 		const { path: executionId, suffix } = req.params;
 
 		this.logReceivedWebhook(req.method, executionId);
diff --git a/packages/cli/src/WebhookHelpers.ts b/packages/cli/src/webhooks/WebhookHelpers.ts
similarity index 97%
rename from packages/cli/src/WebhookHelpers.ts
rename to packages/cli/src/webhooks/WebhookHelpers.ts
index eafec28133326..8a98c74047985 100644
--- a/packages/cli/src/WebhookHelpers.ts
+++ b/packages/cli/src/webhooks/WebhookHelpers.ts
@@ -43,27 +43,25 @@ import {
 } from 'n8n-workflow';
 
 import type {
-	IExecutionDb,
-	IResponseCallbackData,
+	IWebhookResponseCallbackData,
 	IWebhookManager,
-	IWorkflowDb,
-	IWorkflowExecutionDataProcess,
 	WebhookCORSRequest,
 	WebhookRequest,
-} from '@/Interfaces';
+} from './webhook.types';
 import * as ResponseHelper from '@/ResponseHelper';
 import * as WorkflowHelpers from '@/WorkflowHelpers';
 import { WorkflowRunner } from '@/WorkflowRunner';
 import * as WorkflowExecuteAdditionalData from '@/WorkflowExecuteAdditionalData';
 import { ActiveExecutions } from '@/ActiveExecutions';
 import { WorkflowStatisticsService } from '@/services/workflow-statistics.service';
-import { OwnershipService } from './services/ownership.service';
-import { parseBody } from './middlewares';
-import { Logger } from './Logger';
-import { NotFoundError } from './errors/response-errors/not-found.error';
-import { InternalServerError } from './errors/response-errors/internal-server.error';
-import { UnprocessableRequestError } from './errors/response-errors/unprocessable.error';
-import type { Project } from './databases/entities/Project';
+import { OwnershipService } from '@/services/ownership.service';
+import { parseBody } from '@/middlewares';
+import { Logger } from '@/Logger';
+import { NotFoundError } from '@/errors/response-errors/not-found.error';
+import { InternalServerError } from '@/errors/response-errors/internal-server.error';
+import { UnprocessableRequestError } from '@/errors/response-errors/unprocessable.error';
+import type { Project } from '@/databases/entities/Project';
+import type { IExecutionDb, IWorkflowDb, IWorkflowExecutionDataProcess } from '@/Interfaces';
 
 export const WEBHOOK_METHODS: IHttpRequestMethods[] = [
 	'DELETE',
@@ -137,7 +135,7 @@ export const webhookRequestHandler =
 			return ResponseHelper.sendSuccessResponse(res, {}, true, 204);
 		}
 
-		let response;
+		let response: IWebhookResponseCallbackData;
 		try {
 			response = await webhookManager.executeWebhook(req, res);
 		} catch (error) {
@@ -228,7 +226,7 @@ export async function executeWebhook(
 	executionId: string | undefined,
 	req: WebhookRequest,
 	res: express.Response,
-	responseCallback: (error: Error | null, data: IResponseCallbackData) => void,
+	responseCallback: (error: Error | null, data: IWebhookResponseCallbackData) => void,
 	destinationNode?: string,
 ): Promise<string | undefined> {
 	// Get the nodeType to know which responseMode is set
diff --git a/packages/cli/src/WebhookServer.ts b/packages/cli/src/webhooks/WebhookServer.ts
similarity index 100%
rename from packages/cli/src/WebhookServer.ts
rename to packages/cli/src/webhooks/WebhookServer.ts
diff --git a/packages/cli/src/__tests__/TestWebhooks.test.ts b/packages/cli/src/webhooks/__tests__/TestWebhooks.test.ts
similarity index 93%
rename from packages/cli/src/__tests__/TestWebhooks.test.ts
rename to packages/cli/src/webhooks/__tests__/TestWebhooks.test.ts
index 6c7ae555b3b52..deb6930b96e14 100644
--- a/packages/cli/src/__tests__/TestWebhooks.test.ts
+++ b/packages/cli/src/webhooks/__tests__/TestWebhooks.test.ts
@@ -1,20 +1,21 @@
 import { mock } from 'jest-mock-extended';
-import { TestWebhooks } from '@/TestWebhooks';
+import { TestWebhooks } from '@/webhooks/TestWebhooks';
 import { WebhookNotFoundError } from '@/errors/response-errors/webhook-not-found.error';
 import { v4 as uuid } from 'uuid';
 import { generateNanoId } from '@/databases/utils/generators';
 import { NotFoundError } from '@/errors/response-errors/not-found.error';
-import * as WebhookHelpers from '@/WebhookHelpers';
+import * as WebhookHelpers from '@/webhooks/WebhookHelpers';
 import type * as express from 'express';
 
-import type { IWorkflowDb, WebhookRequest } from '@/Interfaces';
+import type { IWorkflowDb } from '@/Interfaces';
 import type { IWebhookData, IWorkflowExecuteAdditionalData, Workflow } from 'n8n-workflow';
 import type {
 	TestWebhookRegistrationsService,
 	TestWebhookRegistration,
-} from '@/services/test-webhook-registrations.service';
+} from '@/webhooks/test-webhook-registrations.service';
 
 import * as AdditionalData from '@/WorkflowExecuteAdditionalData';
+import type { WebhookRequest } from '@/webhooks/webhook.types';
 
 jest.mock('@/WorkflowExecuteAdditionalData');
 
diff --git a/packages/cli/src/__tests__/WebhookHelpers.test.ts b/packages/cli/src/webhooks/__tests__/WebhookHelpers.test.ts
similarity index 97%
rename from packages/cli/src/__tests__/WebhookHelpers.test.ts
rename to packages/cli/src/webhooks/__tests__/WebhookHelpers.test.ts
index 391d01b6fcfe4..9f86fbc549fcf 100644
--- a/packages/cli/src/__tests__/WebhookHelpers.test.ts
+++ b/packages/cli/src/webhooks/__tests__/WebhookHelpers.test.ts
@@ -3,8 +3,8 @@ import { mock } from 'jest-mock-extended';
 import { randomString } from 'n8n-workflow';
 import type { IHttpRequestMethods } from 'n8n-workflow';
 
-import type { IWebhookManager, WebhookCORSRequest, WebhookRequest } from '@/Interfaces';
-import { webhookRequestHandler } from '@/WebhookHelpers';
+import type { IWebhookManager, WebhookCORSRequest, WebhookRequest } from '@/webhooks/webhook.types';
+import { webhookRequestHandler } from '@/webhooks/WebhookHelpers';
 
 describe('WebhookHelpers', () => {
 	describe('webhookRequestHandler', () => {
diff --git a/packages/cli/src/services/__tests__/test-webhook-registrations.service.test.ts b/packages/cli/src/webhooks/__tests__/test-webhook-registrations.service.test.ts
similarity index 95%
rename from packages/cli/src/services/__tests__/test-webhook-registrations.service.test.ts
rename to packages/cli/src/webhooks/__tests__/test-webhook-registrations.service.test.ts
index c93540938c1bd..95502e3611e7c 100644
--- a/packages/cli/src/services/__tests__/test-webhook-registrations.service.test.ts
+++ b/packages/cli/src/webhooks/__tests__/test-webhook-registrations.service.test.ts
@@ -1,7 +1,7 @@
 import type { CacheService } from '@/services/cache/cache.service';
 import type { OrchestrationService } from '@/services/orchestration.service';
-import type { TestWebhookRegistration } from '@/services/test-webhook-registrations.service';
-import { TestWebhookRegistrationsService } from '@/services/test-webhook-registrations.service';
+import type { TestWebhookRegistration } from '@/webhooks/test-webhook-registrations.service';
+import { TestWebhookRegistrationsService } from '@/webhooks/test-webhook-registrations.service';
 import { mock } from 'jest-mock-extended';
 
 describe('TestWebhookRegistrationsService', () => {
diff --git a/packages/cli/src/__tests__/waiting-webhooks.test.ts b/packages/cli/src/webhooks/__tests__/waiting-webhooks.test.ts
similarity index 90%
rename from packages/cli/src/__tests__/waiting-webhooks.test.ts
rename to packages/cli/src/webhooks/__tests__/waiting-webhooks.test.ts
index 6748c7233566f..31f64eb198432 100644
--- a/packages/cli/src/__tests__/waiting-webhooks.test.ts
+++ b/packages/cli/src/webhooks/__tests__/waiting-webhooks.test.ts
@@ -1,10 +1,11 @@
 import { mock } from 'jest-mock-extended';
-import { WaitingWebhooks } from '@/WaitingWebhooks';
+import { WaitingWebhooks } from '@/webhooks/WaitingWebhooks';
 import { ConflictError } from '@/errors/response-errors/conflict.error';
 import { NotFoundError } from '@/errors/response-errors/not-found.error';
-import type { IExecutionResponse, WaitingWebhookRequest } from '@/Interfaces';
+import type { IExecutionResponse } from '@/Interfaces';
 import type express from 'express';
 import type { ExecutionRepository } from '@/databases/repositories/execution.repository';
+import type { WaitingWebhookRequest } from '@/webhooks/webhook.types';
 
 describe('WaitingWebhooks', () => {
 	const executionRepository = mock<ExecutionRepository>();
diff --git a/packages/cli/src/services/__tests__/webhook.service.test.ts b/packages/cli/src/webhooks/__tests__/webhook.service.test.ts
similarity index 99%
rename from packages/cli/src/services/__tests__/webhook.service.test.ts
rename to packages/cli/src/webhooks/__tests__/webhook.service.test.ts
index 181bc60752956..5a8e19e84c809 100644
--- a/packages/cli/src/services/__tests__/webhook.service.test.ts
+++ b/packages/cli/src/webhooks/__tests__/webhook.service.test.ts
@@ -2,7 +2,7 @@ import { v4 as uuid } from 'uuid';
 import config from '@/config';
 import { WebhookRepository } from '@db/repositories/webhook.repository';
 import { CacheService } from '@/services/cache/cache.service';
-import { WebhookService } from '@/services/webhook.service';
+import { WebhookService } from '@/webhooks/webhook.service';
 import { WebhookEntity } from '@db/entities/WebhookEntity';
 import { mockInstance } from '@test/mocking';
 
diff --git a/packages/cli/src/services/test-webhook-registrations.service.ts b/packages/cli/src/webhooks/test-webhook-registrations.service.ts
similarity index 97%
rename from packages/cli/src/services/test-webhook-registrations.service.ts
rename to packages/cli/src/webhooks/test-webhook-registrations.service.ts
index e2abae5605f98..94e7e7d826dbf 100644
--- a/packages/cli/src/services/test-webhook-registrations.service.ts
+++ b/packages/cli/src/webhooks/test-webhook-registrations.service.ts
@@ -3,7 +3,7 @@ import { CacheService } from '@/services/cache/cache.service';
 import type { IWebhookData } from 'n8n-workflow';
 import type { IWorkflowDb } from '@/Interfaces';
 import { TEST_WEBHOOK_TIMEOUT, TEST_WEBHOOK_TIMEOUT_BUFFER } from '@/constants';
-import { OrchestrationService } from './orchestration.service';
+import { OrchestrationService } from '@/services/orchestration.service';
 
 export type TestWebhookRegistration = {
 	pushRef?: string;
diff --git a/packages/cli/src/services/webhook.service.ts b/packages/cli/src/webhooks/webhook.service.ts
similarity index 100%
rename from packages/cli/src/services/webhook.service.ts
rename to packages/cli/src/webhooks/webhook.service.ts
diff --git a/packages/cli/src/webhooks/webhook.types.ts b/packages/cli/src/webhooks/webhook.types.ts
new file mode 100644
index 0000000000000..7602ed1871bb0
--- /dev/null
+++ b/packages/cli/src/webhooks/webhook.types.ts
@@ -0,0 +1,37 @@
+import type { Request, Response } from 'express';
+import type { IDataObject, IHttpRequestMethods } from 'n8n-workflow';
+
+export type WebhookCORSRequest = Request & { method: 'OPTIONS' };
+
+export type WebhookRequest = Request<{ path: string }> & {
+	method: IHttpRequestMethods;
+	params: Record<string, string>;
+};
+
+export type WaitingWebhookRequest = WebhookRequest & {
+	params: WebhookRequest['path'] & { suffix?: string };
+};
+
+export interface WebhookAccessControlOptions {
+	allowedOrigins?: string;
+}
+
+export interface IWebhookManager {
+	/** Gets all request methods associated with a webhook path*/
+	getWebhookMethods?: (path: string) => Promise<IHttpRequestMethods[]>;
+
+	/** Find the CORS options matching a path and method */
+	findAccessControlOptions?: (
+		path: string,
+		httpMethod: IHttpRequestMethods,
+	) => Promise<WebhookAccessControlOptions | undefined>;
+
+	executeWebhook(req: WebhookRequest, res: Response): Promise<IWebhookResponseCallbackData>;
+}
+
+export interface IWebhookResponseCallbackData {
+	data?: IDataObject | IDataObject[];
+	headers?: object;
+	noWebhookResponse?: boolean;
+	responseCode?: number;
+}
diff --git a/packages/cli/src/workflows/workflowExecution.service.ts b/packages/cli/src/workflows/workflowExecution.service.ts
index 8ebe7aed0c142..9ddce37d2f207 100644
--- a/packages/cli/src/workflows/workflowExecution.service.ts
+++ b/packages/cli/src/workflows/workflowExecution.service.ts
@@ -30,7 +30,7 @@ import type {
 import { NodeTypes } from '@/NodeTypes';
 import { WorkflowRunner } from '@/WorkflowRunner';
 import * as WorkflowExecuteAdditionalData from '@/WorkflowExecuteAdditionalData';
-import { TestWebhooks } from '@/TestWebhooks';
+import { TestWebhooks } from '@/webhooks/TestWebhooks';
 import { Logger } from '@/Logger';
 import type { Project } from '@/databases/entities/Project';
 import { GlobalConfig } from '@n8n/config';
diff --git a/packages/cli/test/integration/active-workflow-manager.test.ts b/packages/cli/test/integration/active-workflow-manager.test.ts
index 03ce58e7ef6bc..de586b643a468 100644
--- a/packages/cli/test/integration/active-workflow-manager.test.ts
+++ b/packages/cli/test/integration/active-workflow-manager.test.ts
@@ -8,8 +8,8 @@ import { ActiveWorkflowManager } from '@/ActiveWorkflowManager';
 import { ExternalHooks } from '@/ExternalHooks';
 import { Push } from '@/push';
 import { SecretsHelper } from '@/SecretsHelpers';
-import { WebhookService } from '@/services/webhook.service';
-import * as WebhookHelpers from '@/WebhookHelpers';
+import { WebhookService } from '@/webhooks/webhook.service';
+import * as WebhookHelpers from '@/webhooks/WebhookHelpers';
 import * as AdditionalData from '@/WorkflowExecuteAdditionalData';
 import type { WebhookEntity } from '@db/entities/WebhookEntity';
 import { NodeTypes } from '@/NodeTypes';
diff --git a/packages/cli/test/integration/webhooks.test.ts b/packages/cli/test/integration/webhooks.test.ts
index 9bd1977ed53d2..280edb370d286 100644
--- a/packages/cli/test/integration/webhooks.test.ts
+++ b/packages/cli/test/integration/webhooks.test.ts
@@ -3,13 +3,13 @@ import { agent as testAgent } from 'supertest';
 import { mock } from 'jest-mock-extended';
 
 import { AbstractServer } from '@/AbstractServer';
-import { ActiveWebhooks } from '@/ActiveWebhooks';
+import { ActiveWebhooks } from '@/webhooks/ActiveWebhooks';
 import { ExternalHooks } from '@/ExternalHooks';
 import { InternalHooks } from '@/InternalHooks';
-import { TestWebhooks } from '@/TestWebhooks';
-import { WaitingWebhooks } from '@/WaitingWebhooks';
+import { TestWebhooks } from '@/webhooks/TestWebhooks';
+import { WaitingWebhooks } from '@/webhooks/WaitingWebhooks';
 import { WaitingForms } from '@/WaitingForms';
-import type { IResponseCallbackData } from '@/Interfaces';
+import type { IWebhookResponseCallbackData } from '@/webhooks/webhook.types';
 
 import { mockInstance } from '@test/mocking';
 import { GlobalConfig } from '@n8n/config';
@@ -80,7 +80,7 @@ describe('WebhookServer', () => {
 		}
 
 		const mockResponse = (data = {}, headers = {}, status = 200) => {
-			const response = mock<IResponseCallbackData>();
+			const response = mock<IWebhookResponseCallbackData>();
 			response.responseCode = status;
 			response.data = data;
 			response.headers = headers;

From c9b3d34a5416c107434eb6f9df6a3cbd6d2e657c Mon Sep 17 00:00:00 2001
From: Oz Weiss <thewizarodofoz@gmail.com>
Date: Wed, 7 Aug 2024 12:17:01 +0300
Subject: [PATCH 089/168] feat(Calendly Trigger Node): Update event names
 (no-changelog) (#10129)

---
 packages/nodes-base/nodes/Calendly/CalendlyTrigger.node.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/nodes-base/nodes/Calendly/CalendlyTrigger.node.ts b/packages/nodes-base/nodes/Calendly/CalendlyTrigger.node.ts
index 40a10cab92cfa..e272caee9360e 100644
--- a/packages/nodes-base/nodes/Calendly/CalendlyTrigger.node.ts
+++ b/packages/nodes-base/nodes/Calendly/CalendlyTrigger.node.ts
@@ -95,12 +95,12 @@ export class CalendlyTrigger implements INodeType {
 				type: 'multiOptions',
 				options: [
 					{
-						name: 'invitee.created',
+						name: 'Event Created',
 						value: 'invitee.created',
 						description: 'Receive notifications when a new Calendly event is created',
 					},
 					{
-						name: 'invitee.canceled',
+						name: 'Event Canceled',
 						value: 'invitee.canceled',
 						description: 'Receive notifications when a Calendly event is canceled',
 					},

From 15f10ec325cb5eda0f952bed3a5f171dd91bc639 Mon Sep 17 00:00:00 2001
From: Jon <jonathan.bennetts@gmail.com>
Date: Wed, 7 Aug 2024 10:17:29 +0100
Subject: [PATCH 090/168] feat(Lemlist Trigger Node): Update Trigger events
 (#10311)

---
 .../nodes/Lemlist/GenericFunctions.ts         | 49 ++++++++++++++++---
 .../nodes/Lemlist/LemlistTrigger.node.ts      |  2 +-
 2 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/packages/nodes-base/nodes/Lemlist/GenericFunctions.ts b/packages/nodes-base/nodes/Lemlist/GenericFunctions.ts
index 8a587a939044f..e95bebe507cde 100644
--- a/packages/nodes-base/nodes/Lemlist/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Lemlist/GenericFunctions.ts
@@ -71,16 +71,53 @@ export async function lemlistApiRequestAllItems(
 export function getEvents() {
 	const events = [
 		'*',
-		'emailsBounced',
-		'emailsClicked',
-		'emailsFailed',
-		'emailsInterested',
-		'emailsNotInterested',
+		'contacted',
+		'hooked',
+		'attracted',
+		'warmed',
+		'interested',
+		'skipped',
+		'notInterested',
+		'emailsSent',
 		'emailsOpened',
+		'emailsClicked',
 		'emailsReplied',
+		'emailsBounced',
 		'emailsSendFailed',
-		'emailsSent',
+		'emailsFailed',
 		'emailsUnsubscribed',
+		'emailsInterested',
+		'emailsNotInterested',
+		'opportunitiesDone',
+		'aircallCreated',
+		'aircallEnded',
+		'aircallDone',
+		'aircallInterested',
+		'aircallNotInterested',
+		'apiDone',
+		'apiInterested',
+		'apiNotInterested',
+		'apiFailed',
+		'linkedinVisitDone',
+		'linkedinVisitFailed',
+		'linkedinInviteDone',
+		'linkedinInviteFailed',
+		'linkedinInviteAccepted',
+		'linkedinReplied',
+		'linkedinSent',
+		'linkedinVoiceNoteDone',
+		'linkedinVoiceNoteFailed',
+		'linkedinInterested',
+		'linkedinNotInterested',
+		'linkedinSendFailed',
+		'manualInterested',
+		'manualNotInterested',
+		'paused',
+		'resumed',
+		'customDomainErrors',
+		'connectionIssue',
+		'sendLimitReached',
+		'lemwarmPaused',
 	];
 
 	return events.map((event: string) => ({
diff --git a/packages/nodes-base/nodes/Lemlist/LemlistTrigger.node.ts b/packages/nodes-base/nodes/Lemlist/LemlistTrigger.node.ts
index a9306c21c5604..bd1a20cf8fdea 100644
--- a/packages/nodes-base/nodes/Lemlist/LemlistTrigger.node.ts
+++ b/packages/nodes-base/nodes/Lemlist/LemlistTrigger.node.ts
@@ -55,7 +55,7 @@ export class LemlistTrigger implements INodeType {
 				default: {},
 				options: [
 					{
-						displayName: 'Campaing Name or ID',
+						displayName: 'Campaign Name or ID',
 						name: 'campaignId',
 						type: 'options',
 						typeOptions: {

From 6d8323fadea8af04483eb1a873df0cf3ccc2a891 Mon Sep 17 00:00:00 2001
From: Jon <jonathan.bennetts@gmail.com>
Date: Wed, 7 Aug 2024 10:18:05 +0100
Subject: [PATCH 091/168] feat(Webflow Node): Update to use the v2 API (#9996)

---
 .../WebflowOAuth2Api.credentials.ts           |   9 +-
 .../nodes/Webflow/GenericFunctions.ts         |  75 ++++-
 .../nodes/Webflow/{ => V1}/ItemDescription.ts |   0
 .../nodes/Webflow/V1/WebflowTriggerV1.node.ts | 209 ++++++++++++
 .../nodes/Webflow/V1/WebflowV1.node.ts        | 258 ++++++++++++++
 .../nodes/Webflow/V2/WebflowTriggerV2.node.ts | 179 ++++++++++
 .../nodes/Webflow/V2/WebflowV2.node.ts        |  32 ++
 .../Webflow/V2/actions/Item/Item.resource.ts  |  56 ++++
 .../V2/actions/Item/create.operation.ts       | 139 ++++++++
 .../V2/actions/Item/delete.operation.ts       |  94 ++++++
 .../Webflow/V2/actions/Item/get.operation.ts  |  88 +++++
 .../V2/actions/Item/getAll.operation.ts       | 118 +++++++
 .../V2/actions/Item/update.operation.ts       | 148 +++++++++
 .../nodes/Webflow/V2/actions/node.type.ts     |   7 +
 .../nodes/Webflow/V2/actions/router.ts        |  35 ++
 .../Webflow/V2/actions/versionDescription.ts  |  41 +++
 .../nodes-base/nodes/Webflow/Webflow.node.ts  | 314 ++----------------
 .../nodes/Webflow/WebflowTrigger.node.ts      | 289 ++--------------
 18 files changed, 1518 insertions(+), 573 deletions(-)
 rename packages/nodes-base/nodes/Webflow/{ => V1}/ItemDescription.ts (100%)
 create mode 100644 packages/nodes-base/nodes/Webflow/V1/WebflowTriggerV1.node.ts
 create mode 100644 packages/nodes-base/nodes/Webflow/V1/WebflowV1.node.ts
 create mode 100644 packages/nodes-base/nodes/Webflow/V2/WebflowTriggerV2.node.ts
 create mode 100644 packages/nodes-base/nodes/Webflow/V2/WebflowV2.node.ts
 create mode 100644 packages/nodes-base/nodes/Webflow/V2/actions/Item/Item.resource.ts
 create mode 100644 packages/nodes-base/nodes/Webflow/V2/actions/Item/create.operation.ts
 create mode 100644 packages/nodes-base/nodes/Webflow/V2/actions/Item/delete.operation.ts
 create mode 100644 packages/nodes-base/nodes/Webflow/V2/actions/Item/get.operation.ts
 create mode 100644 packages/nodes-base/nodes/Webflow/V2/actions/Item/getAll.operation.ts
 create mode 100644 packages/nodes-base/nodes/Webflow/V2/actions/Item/update.operation.ts
 create mode 100644 packages/nodes-base/nodes/Webflow/V2/actions/node.type.ts
 create mode 100644 packages/nodes-base/nodes/Webflow/V2/actions/router.ts
 create mode 100644 packages/nodes-base/nodes/Webflow/V2/actions/versionDescription.ts

diff --git a/packages/nodes-base/credentials/WebflowOAuth2Api.credentials.ts b/packages/nodes-base/credentials/WebflowOAuth2Api.credentials.ts
index 09c5dd63d3d05..8c754995f8401 100644
--- a/packages/nodes-base/credentials/WebflowOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/WebflowOAuth2Api.credentials.ts
@@ -16,6 +16,13 @@ export class WebflowOAuth2Api implements ICredentialType {
 			type: 'hidden',
 			default: 'authorizationCode',
 		},
+		{
+			displayName: 'Legacy',
+			name: 'legacy',
+			type: 'boolean',
+			default: true,
+			description: 'If the legacy API should be used',
+		},
 		{
 			displayName: 'Authorization URL',
 			name: 'authUrl',
@@ -34,7 +41,7 @@ export class WebflowOAuth2Api implements ICredentialType {
 			displayName: 'Scope',
 			name: 'scope',
 			type: 'hidden',
-			default: '',
+			default: '={{$self["legacy"] ? "" : "cms:read cms:write sites:read"}}',
 		},
 		{
 			displayName: 'Auth URI Query Parameters',
diff --git a/packages/nodes-base/nodes/Webflow/GenericFunctions.ts b/packages/nodes-base/nodes/Webflow/GenericFunctions.ts
index 4cbf8c277520b..49d02bcf04da6 100644
--- a/packages/nodes-base/nodes/Webflow/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Webflow/GenericFunctions.ts
@@ -6,6 +6,7 @@ import type {
 	IWebhookFunctions,
 	IHttpRequestMethods,
 	IRequestOptions,
+	INodePropertyOptions,
 } from 'n8n-workflow';
 
 export async function webflowApiRequest(
@@ -17,21 +18,9 @@ export async function webflowApiRequest(
 	uri?: string,
 	option: IDataObject = {},
 ) {
-	const authenticationMethod = this.getNodeParameter('authentication', 0, 'accessToken');
-	let credentialsType = '';
-
-	if (authenticationMethod === 'accessToken') {
-		credentialsType = 'webflowApi';
-	}
-
-	if (authenticationMethod === 'oAuth2') {
-		credentialsType = 'webflowOAuth2Api';
-	}
+	let credentialsType = 'webflowOAuth2Api';
 
 	let options: IRequestOptions = {
-		headers: {
-			'accept-version': '1.0.0',
-		},
 		method,
 		qs,
 		body,
@@ -40,6 +29,19 @@ export async function webflowApiRequest(
 	};
 	options = Object.assign({}, options, option);
 
+	// Keep support for v1 node
+	if (this.getNode().typeVersion === 1) {
+		console.log('v1');
+		const authenticationMethod = this.getNodeParameter('authentication', 0, 'accessToken');
+		if (authenticationMethod === 'accessToken') {
+			credentialsType = 'webflowApi';
+		}
+		options.headers = { 'accept-version': '1.0.0' };
+	} else {
+		options.resolveWithFullResponse = true;
+		options.uri = `https://api.webflow.com/v2${resource}`;
+	}
+
 	if (Object.keys(options.qs as IDataObject).length === 0) {
 		delete options.qs;
 	}
@@ -74,3 +76,50 @@ export async function webflowApiRequestAllItems(
 
 	return returnData;
 }
+// Load Options
+export async function getSites(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+	const returnData: INodePropertyOptions[] = [];
+	const response = await webflowApiRequest.call(this, 'GET', '/sites');
+
+	console.log(response);
+
+	const sites = response.body?.sites || response;
+
+	for (const site of sites) {
+		returnData.push({
+			name: site.displayName || site.name,
+			value: site.id || site._id,
+		});
+	}
+	return returnData;
+}
+export async function getCollections(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+	const returnData: INodePropertyOptions[] = [];
+	const siteId = this.getCurrentNodeParameter('siteId');
+	const response = await webflowApiRequest.call(this, 'GET', `/sites/${siteId}/collections`);
+
+	const collections = response.body?.collections || response;
+
+	for (const collection of collections) {
+		returnData.push({
+			name: collection.displayName || collection.name,
+			value: collection.id || collection._id,
+		});
+	}
+	return returnData;
+}
+export async function getFields(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+	const returnData: INodePropertyOptions[] = [];
+	const collectionId = this.getCurrentNodeParameter('collectionId');
+	const response = await webflowApiRequest.call(this, 'GET', `/collections/${collectionId}`);
+
+	const fields = response.body?.fields || response;
+
+	for (const field of fields) {
+		returnData.push({
+			name: `${field.displayName || field.name} (${field.type}) ${field.isRequired || field.required ? ' (required)' : ''}`,
+			value: field.slug,
+		});
+	}
+	return returnData;
+}
diff --git a/packages/nodes-base/nodes/Webflow/ItemDescription.ts b/packages/nodes-base/nodes/Webflow/V1/ItemDescription.ts
similarity index 100%
rename from packages/nodes-base/nodes/Webflow/ItemDescription.ts
rename to packages/nodes-base/nodes/Webflow/V1/ItemDescription.ts
diff --git a/packages/nodes-base/nodes/Webflow/V1/WebflowTriggerV1.node.ts b/packages/nodes-base/nodes/Webflow/V1/WebflowTriggerV1.node.ts
new file mode 100644
index 0000000000000..9163fd495e5c3
--- /dev/null
+++ b/packages/nodes-base/nodes/Webflow/V1/WebflowTriggerV1.node.ts
@@ -0,0 +1,209 @@
+/* eslint-disable n8n-nodes-base/node-filename-against-convention */
+import type {
+	IHookFunctions,
+	IWebhookFunctions,
+	IDataObject,
+	INodeType,
+	INodeTypeDescription,
+	IWebhookResponseData,
+	INodeTypeBaseDescription,
+} from 'n8n-workflow';
+
+import { getSites, webflowApiRequest } from '../GenericFunctions';
+
+export class WebflowTriggerV1 implements INodeType {
+	description: INodeTypeDescription;
+
+	constructor(baseDescription: INodeTypeBaseDescription) {
+		this.description = {
+			...baseDescription,
+			displayName: 'Webflow Trigger',
+			name: 'webflowTrigger',
+			icon: 'file:webflow.svg',
+			group: ['trigger'],
+			version: 1,
+			description: 'Handle Webflow events via webhooks',
+			defaults: {
+				name: 'Webflow Trigger',
+			},
+			// eslint-disable-next-line n8n-nodes-base/node-class-description-inputs-wrong-regular-node
+			inputs: [],
+			outputs: ['main'],
+			credentials: [
+				{
+					name: 'webflowApi',
+					required: true,
+					displayOptions: {
+						show: {
+							authentication: ['accessToken'],
+						},
+					},
+				},
+				{
+					name: 'webflowOAuth2Api',
+					required: true,
+					displayOptions: {
+						show: {
+							authentication: ['oAuth2'],
+						},
+					},
+				},
+			],
+			webhooks: [
+				{
+					name: 'default',
+					httpMethod: 'POST',
+					responseMode: 'onReceived',
+					path: 'webhook',
+				},
+			],
+			properties: [
+				{
+					displayName: 'Authentication',
+					name: 'authentication',
+					type: 'options',
+					options: [
+						{
+							name: 'Access Token',
+							value: 'accessToken',
+						},
+						{
+							name: 'OAuth2',
+							value: 'oAuth2',
+						},
+					],
+					default: 'accessToken',
+				},
+				{
+					displayName: 'Site Name or ID',
+					name: 'site',
+					type: 'options',
+					required: true,
+					default: '',
+					typeOptions: {
+						loadOptionsMethod: 'getSites',
+					},
+					description:
+						'Site that will trigger the events. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+				},
+				{
+					displayName: 'Event',
+					name: 'event',
+					type: 'options',
+					required: true,
+					options: [
+						{
+							name: 'Collection Item Created',
+							value: 'collection_item_created',
+						},
+						{
+							name: 'Collection Item Deleted',
+							value: 'collection_item_deleted',
+						},
+						{
+							name: 'Collection Item Updated',
+							value: 'collection_item_changed',
+						},
+						{
+							name: 'Ecomm Inventory Changed',
+							value: 'ecomm_inventory_changed',
+						},
+						{
+							name: 'Ecomm New Order',
+							value: 'ecomm_new_order',
+						},
+						{
+							name: 'Ecomm Order Changed',
+							value: 'ecomm_order_changed',
+						},
+						{
+							name: 'Form Submission',
+							value: 'form_submission',
+						},
+						{
+							name: 'Site Publish',
+							value: 'site_publish',
+						},
+					],
+					default: 'form_submission',
+				},
+			],
+		};
+	}
+
+	methods = {
+		loadOptions: {
+			getSites,
+		},
+	};
+
+	webhookMethods = {
+		default: {
+			async checkExists(this: IHookFunctions): Promise<boolean> {
+				const webhookData = this.getWorkflowStaticData('node');
+				const webhookUrl = this.getNodeWebhookUrl('default');
+				const siteId = this.getNodeParameter('site') as string;
+
+				const event = this.getNodeParameter('event') as string;
+				const registeredWebhooks = await webflowApiRequest.call(
+					this,
+					'GET',
+					`/sites/${siteId}/webhooks`,
+				);
+
+				const webhooks = registeredWebhooks.body?.webhooks || registeredWebhooks;
+
+				for (const webhook of webhooks) {
+					if (webhook.url === webhookUrl && webhook.triggerType === event) {
+						webhookData.webhookId = webhook._id;
+						return true;
+					}
+				}
+
+				return false;
+			},
+
+			async create(this: IHookFunctions): Promise<boolean> {
+				const webhookUrl = this.getNodeWebhookUrl('default');
+				const webhookData = this.getWorkflowStaticData('node');
+				const siteId = this.getNodeParameter('site') as string;
+				const event = this.getNodeParameter('event') as string;
+				const endpoint = `/sites/${siteId}/webhooks`;
+				const body: IDataObject = {
+					site_id: siteId,
+					triggerType: event,
+					url: webhookUrl,
+				};
+
+				const response = await webflowApiRequest.call(this, 'POST', endpoint, body);
+				const _id = response.body?._id || response._id;
+				webhookData.webhookId = _id;
+				return true;
+			},
+			async delete(this: IHookFunctions): Promise<boolean> {
+				let responseData;
+				const webhookData = this.getWorkflowStaticData('node');
+				const siteId = this.getNodeParameter('site') as string;
+				const endpoint = `/sites/${siteId}/webhooks/${webhookData.webhookId}`;
+				try {
+					responseData = await webflowApiRequest.call(this, 'DELETE', endpoint);
+				} catch (error) {
+					return false;
+				}
+				const deleted = responseData.body?.deleted || responseData.deleted;
+				if (!deleted) {
+					return false;
+				}
+				delete webhookData.webhookId;
+				return true;
+			},
+		},
+	};
+
+	async webhook(this: IWebhookFunctions): Promise<IWebhookResponseData> {
+		const req = this.getRequestObject();
+		return {
+			workflowData: [this.helpers.returnJsonArray(req.body as IDataObject[])],
+		};
+	}
+}
diff --git a/packages/nodes-base/nodes/Webflow/V1/WebflowV1.node.ts b/packages/nodes-base/nodes/Webflow/V1/WebflowV1.node.ts
new file mode 100644
index 0000000000000..d4392c2174839
--- /dev/null
+++ b/packages/nodes-base/nodes/Webflow/V1/WebflowV1.node.ts
@@ -0,0 +1,258 @@
+import type {
+	IExecuteFunctions,
+	IDataObject,
+	INodeTypeBaseDescription,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+
+import {
+	webflowApiRequest,
+	webflowApiRequestAllItems,
+	getSites,
+	getCollections,
+	getFields,
+} from '../GenericFunctions';
+
+import { itemFields, itemOperations } from './ItemDescription';
+
+export class WebflowV1 implements INodeType {
+	description: INodeTypeDescription;
+
+	constructor(baseDescription: INodeTypeBaseDescription) {
+		this.description = {
+			...baseDescription,
+			version: 1,
+			description: 'Consume the Webflow API',
+			subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
+			defaults: {
+				name: 'Webflow',
+			},
+			inputs: ['main'],
+			outputs: ['main'],
+			credentials: [
+				{
+					name: 'webflowApi',
+					required: true,
+					displayOptions: {
+						show: {
+							authentication: ['accessToken'],
+						},
+					},
+				},
+				{
+					name: 'webflowOAuth2Api',
+					required: true,
+					displayOptions: {
+						show: {
+							authentication: ['oAuth2'],
+						},
+					},
+				},
+			],
+			properties: [
+				{
+					displayName: 'Authentication',
+					name: 'authentication',
+					type: 'options',
+					options: [
+						{
+							name: 'Access Token',
+							value: 'accessToken',
+						},
+						{
+							name: 'OAuth2',
+							value: 'oAuth2',
+						},
+					],
+					default: 'accessToken',
+				},
+				{
+					displayName: 'Resource',
+					name: 'resource',
+					type: 'options',
+					noDataExpression: true,
+					options: [
+						{
+							name: 'Item',
+							value: 'item',
+						},
+					],
+					default: 'item',
+				},
+				...itemOperations,
+				...itemFields,
+			],
+		};
+	}
+
+	methods = {
+		loadOptions: {
+			getSites,
+			getCollections,
+			getFields,
+		},
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const items = this.getInputData();
+
+		const resource = this.getNodeParameter('resource', 0);
+		const operation = this.getNodeParameter('operation', 0);
+		let responseData;
+		const returnData: INodeExecutionData[] = [];
+
+		for (let i = 0; i < items.length; i++) {
+			try {
+				if (resource === 'item') {
+					// *********************************************************************
+					//                             item
+					// *********************************************************************
+
+					// https://developers.webflow.com/#item-model
+
+					if (operation === 'create') {
+						// ----------------------------------
+						//         item: create
+						// ----------------------------------
+
+						// https://developers.webflow.com/#create-new-collection-item
+
+						const collectionId = this.getNodeParameter('collectionId', i) as string;
+
+						const properties = this.getNodeParameter(
+							'fieldsUi.fieldValues',
+							i,
+							[],
+						) as IDataObject[];
+
+						const live = this.getNodeParameter('live', i) as boolean;
+
+						const fields = {} as IDataObject;
+
+						properties.forEach((data) => (fields[data.fieldId as string] = data.fieldValue));
+
+						const body: IDataObject = {
+							fields,
+						};
+
+						responseData = await webflowApiRequest.call(
+							this,
+							'POST',
+							`/collections/${collectionId}/items`,
+							body,
+							{ live },
+						);
+					} else if (operation === 'delete') {
+						// ----------------------------------
+						//         item: delete
+						// ----------------------------------
+
+						// https://developers.webflow.com/#remove-collection-item
+
+						const collectionId = this.getNodeParameter('collectionId', i) as string;
+						const itemId = this.getNodeParameter('itemId', i) as string;
+						responseData = await webflowApiRequest.call(
+							this,
+							'DELETE',
+							`/collections/${collectionId}/items/${itemId}`,
+						);
+					} else if (operation === 'get') {
+						// ----------------------------------
+						//         item: get
+						// ----------------------------------
+
+						// https://developers.webflow.com/#get-single-item
+
+						const collectionId = this.getNodeParameter('collectionId', i) as string;
+						const itemId = this.getNodeParameter('itemId', i) as string;
+						responseData = await webflowApiRequest.call(
+							this,
+							'GET',
+							`/collections/${collectionId}/items/${itemId}`,
+						);
+						responseData = responseData.items;
+					} else if (operation === 'getAll') {
+						// ----------------------------------
+						//         item: getAll
+						// ----------------------------------
+
+						// https://developers.webflow.com/#get-all-items-for-a-collection
+
+						const returnAll = this.getNodeParameter('returnAll', 0);
+						const collectionId = this.getNodeParameter('collectionId', i) as string;
+						const qs: IDataObject = {};
+
+						if (returnAll) {
+							responseData = await webflowApiRequestAllItems.call(
+								this,
+								'GET',
+								`/collections/${collectionId}/items`,
+								{},
+								qs,
+							);
+						} else {
+							qs.limit = this.getNodeParameter('limit', 0);
+							responseData = await webflowApiRequest.call(
+								this,
+								'GET',
+								`/collections/${collectionId}/items`,
+								{},
+								qs,
+							);
+							responseData = responseData.items;
+						}
+					} else if (operation === 'update') {
+						// ----------------------------------
+						//         item: update
+						// ----------------------------------
+
+						// https://developers.webflow.com/#update-collection-item
+
+						const collectionId = this.getNodeParameter('collectionId', i) as string;
+
+						const itemId = this.getNodeParameter('itemId', i) as string;
+
+						const properties = this.getNodeParameter(
+							'fieldsUi.fieldValues',
+							i,
+							[],
+						) as IDataObject[];
+
+						const live = this.getNodeParameter('live', i) as boolean;
+
+						const fields = {} as IDataObject;
+
+						properties.forEach((data) => (fields[data.fieldId as string] = data.fieldValue));
+
+						const body: IDataObject = {
+							fields,
+						};
+
+						responseData = await webflowApiRequest.call(
+							this,
+							'PUT',
+							`/collections/${collectionId}/items/${itemId}`,
+							body,
+							{ live },
+						);
+					}
+				}
+				const executionData = this.helpers.constructExecutionMetaData(
+					this.helpers.returnJsonArray(responseData as IDataObject[]),
+					{ itemData: { item: i } },
+				);
+				returnData.push(...executionData);
+			} catch (error) {
+				if (this.continueOnFail()) {
+					returnData.push({ json: { error: error.message } });
+					continue;
+				}
+				throw error;
+			}
+		}
+
+		return [returnData];
+	}
+}
diff --git a/packages/nodes-base/nodes/Webflow/V2/WebflowTriggerV2.node.ts b/packages/nodes-base/nodes/Webflow/V2/WebflowTriggerV2.node.ts
new file mode 100644
index 0000000000000..560f7390abf8d
--- /dev/null
+++ b/packages/nodes-base/nodes/Webflow/V2/WebflowTriggerV2.node.ts
@@ -0,0 +1,179 @@
+/* eslint-disable n8n-nodes-base/node-filename-against-convention */
+import type {
+	IHookFunctions,
+	IDataObject,
+	INodeType,
+	INodeTypeDescription,
+	INodeTypeBaseDescription,
+	IWebhookFunctions,
+	IWebhookResponseData,
+} from 'n8n-workflow';
+
+import { getSites, webflowApiRequest } from '../GenericFunctions';
+
+export class WebflowTriggerV2 implements INodeType {
+	description: INodeTypeDescription;
+
+	constructor(baseDescription: INodeTypeBaseDescription) {
+		this.description = {
+			...baseDescription,
+			displayName: 'Webflow Trigger',
+			name: 'webflowTrigger',
+			icon: 'file:webflow.svg',
+			group: ['trigger'],
+			version: 2,
+			description: 'Handle Webflow events via webhooks',
+			defaults: {
+				name: 'Webflow Trigger',
+			},
+			// eslint-disable-next-line n8n-nodes-base/node-class-description-inputs-wrong-regular-node
+			inputs: [],
+			outputs: ['main'],
+			credentials: [
+				{
+					name: 'webflowOAuth2Api',
+					required: true,
+				},
+			],
+			webhooks: [
+				{
+					name: 'default',
+					httpMethod: 'POST',
+					responseMode: 'onReceived',
+					path: 'webhook',
+				},
+			],
+			properties: [
+				{
+					displayName: 'Site Name or ID',
+					name: 'site',
+					type: 'options',
+					required: true,
+					default: '',
+					typeOptions: {
+						loadOptionsMethod: 'getSites',
+					},
+					description:
+						'Site that will trigger the events. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+				},
+				{
+					displayName: 'Event',
+					name: 'event',
+					type: 'options',
+					required: true,
+					options: [
+						{
+							name: 'Collection Item Created',
+							value: 'collection_item_created',
+						},
+						{
+							name: 'Collection Item Deleted',
+							value: 'collection_item_deleted',
+						},
+						{
+							name: 'Collection Item Updated',
+							value: 'collection_item_changed',
+						},
+						{
+							name: 'Ecomm Inventory Changed',
+							value: 'ecomm_inventory_changed',
+						},
+						{
+							name: 'Ecomm New Order',
+							value: 'ecomm_new_order',
+						},
+						{
+							name: 'Ecomm Order Changed',
+							value: 'ecomm_order_changed',
+						},
+						{
+							name: 'Form Submission',
+							value: 'form_submission',
+						},
+						{
+							name: 'Site Publish',
+							value: 'site_publish',
+						},
+					],
+					default: 'form_submission',
+				},
+			],
+		};
+	}
+
+	methods = {
+		loadOptions: {
+			getSites,
+		},
+	};
+
+	webhookMethods = {
+		default: {
+			async checkExists(this: IHookFunctions): Promise<boolean> {
+				const webhookData = this.getWorkflowStaticData('node');
+				const webhookUrl = this.getNodeWebhookUrl('default');
+				const siteId = this.getNodeParameter('site') as string;
+
+				const event = this.getNodeParameter('event') as string;
+				const registeredWebhooks = await webflowApiRequest.call(
+					this,
+					'GET',
+					`/sites/${siteId}/webhooks`,
+				);
+
+				const webhooks = registeredWebhooks.body?.webhooks || registeredWebhooks;
+
+				for (const webhook of webhooks) {
+					if (webhook.url === webhookUrl && webhook.triggerType === event) {
+						webhookData.webhookId = webhook._id;
+						return true;
+					}
+				}
+
+				return false;
+			},
+
+			async create(this: IHookFunctions): Promise<boolean> {
+				const webhookUrl = this.getNodeWebhookUrl('default');
+				const webhookData = this.getWorkflowStaticData('node');
+				const siteId = this.getNodeParameter('site') as string;
+				const event = this.getNodeParameter('event') as string;
+				const endpoint = `/sites/${siteId}/webhooks`;
+				const body: IDataObject = {
+					site_id: siteId,
+					triggerType: event,
+					url: webhookUrl,
+				};
+
+				const response = await webflowApiRequest.call(this, 'POST', endpoint, body);
+				const _id = response.body?._id || response._id;
+				webhookData.webhookId = _id;
+				return true;
+			},
+			async delete(this: IHookFunctions): Promise<boolean> {
+				let responseData;
+				const webhookData = this.getWorkflowStaticData('node');
+				const siteId = this.getNodeParameter('site') as string;
+				const endpoint = `/sites/${siteId}/webhooks/${webhookData.webhookId}`;
+				try {
+					responseData = await webflowApiRequest.call(this, 'DELETE', endpoint);
+				} catch (error) {
+					return false;
+				}
+				const deleted = responseData.body?.deleted || responseData.deleted;
+				if (!deleted) {
+					return false;
+				}
+				delete webhookData.webhookId;
+				return true;
+			},
+		},
+	};
+
+	async webhook(this: IWebhookFunctions): Promise<IWebhookResponseData> {
+		const req = this.getRequestObject();
+		return {
+			workflowData: [this.helpers.returnJsonArray(req.body as IDataObject[])],
+		};
+	}
+}
diff --git a/packages/nodes-base/nodes/Webflow/V2/WebflowV2.node.ts b/packages/nodes-base/nodes/Webflow/V2/WebflowV2.node.ts
new file mode 100644
index 0000000000000..ad17ff9e05e13
--- /dev/null
+++ b/packages/nodes-base/nodes/Webflow/V2/WebflowV2.node.ts
@@ -0,0 +1,32 @@
+import type {
+	IExecuteFunctions,
+	INodeType,
+	INodeTypeBaseDescription,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+import { getSites, getCollections, getFields } from '../GenericFunctions';
+import { versionDescription } from './actions/versionDescription';
+import { router } from './actions/router';
+
+export class WebflowV2 implements INodeType {
+	description: INodeTypeDescription;
+
+	constructor(baseDescription: INodeTypeBaseDescription) {
+		this.description = {
+			...baseDescription,
+			...versionDescription,
+		};
+	}
+
+	methods = {
+		loadOptions: {
+			getSites,
+			getCollections,
+			getFields,
+		},
+	};
+
+	async execute(this: IExecuteFunctions) {
+		return await router.call(this);
+	}
+}
diff --git a/packages/nodes-base/nodes/Webflow/V2/actions/Item/Item.resource.ts b/packages/nodes-base/nodes/Webflow/V2/actions/Item/Item.resource.ts
new file mode 100644
index 0000000000000..420d2d8490327
--- /dev/null
+++ b/packages/nodes-base/nodes/Webflow/V2/actions/Item/Item.resource.ts
@@ -0,0 +1,56 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+import * as create from './create.operation';
+import * as deleteItem from './delete.operation';
+import * as get from './get.operation';
+import * as getAll from './getAll.operation';
+import * as update from './update.operation';
+
+export { create, deleteItem, get, getAll, update };
+
+export const description: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		default: 'get',
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				action: 'Create an item',
+			},
+			{
+				name: 'Delete',
+				value: 'deleteItem',
+				action: 'Delete an item',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				action: 'Get an item',
+			},
+			{
+				name: 'Get Many',
+				value: 'getAll',
+				action: 'Get many items',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				action: 'Update an item',
+			},
+		],
+		displayOptions: {
+			show: {
+				resource: ['item'],
+			},
+		},
+	},
+	...create.description,
+	...deleteItem.description,
+	...get.description,
+	...getAll.description,
+	...update.description,
+];
diff --git a/packages/nodes-base/nodes/Webflow/V2/actions/Item/create.operation.ts b/packages/nodes-base/nodes/Webflow/V2/actions/Item/create.operation.ts
new file mode 100644
index 0000000000000..8eeeb9cb6646a
--- /dev/null
+++ b/packages/nodes-base/nodes/Webflow/V2/actions/Item/create.operation.ts
@@ -0,0 +1,139 @@
+import type {
+	IDataObject,
+	INodeExecutionData,
+	INodeProperties,
+	IExecuteFunctions,
+} from 'n8n-workflow';
+
+import { updateDisplayOptions, wrapData } from '../../../../../utils/utilities';
+import { webflowApiRequest } from '../../../GenericFunctions';
+
+const properties: INodeProperties[] = [
+	{
+		displayName: 'Site Name or ID',
+		name: 'siteId',
+		type: 'options',
+		required: true,
+		typeOptions: {
+			loadOptionsMethod: 'getSites',
+		},
+		default: '',
+		description:
+			'ID of the site containing the collection whose items to add to. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+	},
+	{
+		displayName: 'Collection Name or ID',
+		name: 'collectionId',
+		type: 'options',
+		required: true,
+		typeOptions: {
+			loadOptionsMethod: 'getCollections',
+			loadOptionsDependsOn: ['siteId'],
+		},
+		default: '',
+		description:
+			'ID of the collection to add an item to. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+	},
+	{
+		displayName: 'Live',
+		name: 'live',
+		type: 'boolean',
+		required: true,
+		default: false,
+		description: 'Whether the item should be published on the live site',
+	},
+	{
+		displayName: 'Fields',
+		name: 'fieldsUi',
+		placeholder: 'Add Field',
+		type: 'fixedCollection',
+		typeOptions: {
+			multipleValues: true,
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Field',
+				name: 'fieldValues',
+				values: [
+					{
+						displayName: 'Field Name or ID',
+						name: 'fieldId',
+						type: 'options',
+						typeOptions: {
+							loadOptionsMethod: 'getFields',
+							loadOptionsDependsOn: ['collectionId'],
+						},
+						default: '',
+						description:
+							'Field to set for the item to create. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+					},
+					{
+						displayName: 'Field Value',
+						name: 'fieldValue',
+						type: 'string',
+						default: '',
+						description: 'Value to set for the item to create',
+					},
+				],
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['item'],
+		operation: ['create'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	items: INodeExecutionData[],
+): Promise<INodeExecutionData[]> {
+	const returnData: INodeExecutionData[] = [];
+	let responseData;
+	for (let i = 0; i < items.length; i++) {
+		try {
+			const collectionId = this.getNodeParameter('collectionId', i) as string;
+
+			const uiFields = this.getNodeParameter('fieldsUi.fieldValues', i, []) as IDataObject[];
+
+			const live = this.getNodeParameter('live', i) as boolean;
+
+			const fieldData = {} as IDataObject;
+
+			uiFields.forEach((data) => (fieldData[data.fieldId as string] = data.fieldValue));
+
+			const body: IDataObject = {
+				fieldData,
+			};
+
+			responseData = await webflowApiRequest.call(
+				this,
+				'POST',
+				`/collections/${collectionId}/items`,
+				body,
+				{ live },
+			);
+
+			const executionData = this.helpers.constructExecutionMetaData(
+				wrapData(responseData.body as IDataObject[]),
+				{ itemData: { item: i } },
+			);
+
+			returnData.push(...executionData);
+		} catch (error) {
+			if (this.continueOnFail()) {
+				returnData.push({ json: { message: error.message, error } });
+				continue;
+			}
+			throw error;
+		}
+	}
+
+	return returnData;
+}
diff --git a/packages/nodes-base/nodes/Webflow/V2/actions/Item/delete.operation.ts b/packages/nodes-base/nodes/Webflow/V2/actions/Item/delete.operation.ts
new file mode 100644
index 0000000000000..632a8e6e93d43
--- /dev/null
+++ b/packages/nodes-base/nodes/Webflow/V2/actions/Item/delete.operation.ts
@@ -0,0 +1,94 @@
+import type {
+	IDataObject,
+	INodeExecutionData,
+	INodeProperties,
+	IExecuteFunctions,
+} from 'n8n-workflow';
+
+import { updateDisplayOptions, wrapData } from '../../../../../utils/utilities';
+import { webflowApiRequest } from '../../../GenericFunctions';
+
+const properties: INodeProperties[] = [
+	{
+		displayName: 'Site Name or ID',
+		name: 'siteId',
+		type: 'options',
+		required: true,
+		typeOptions: {
+			loadOptionsMethod: 'getSites',
+		},
+		default: '',
+		description:
+			'ID of the site containing the collection whose items to operate on. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+	},
+	{
+		displayName: 'Collection Name or ID',
+		name: 'collectionId',
+		type: 'options',
+		required: true,
+		typeOptions: {
+			loadOptionsMethod: 'getCollections',
+			loadOptionsDependsOn: ['siteId'],
+		},
+		default: '',
+		description:
+			'ID of the collection whose items to operate on. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+	},
+	{
+		displayName: 'Item ID',
+		name: 'itemId',
+		type: 'string',
+		required: true,
+		default: '',
+		description: 'ID of the item to operate on',
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['item'],
+		operation: ['deleteItem'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	items: INodeExecutionData[],
+): Promise<INodeExecutionData[]> {
+	const returnData: INodeExecutionData[] = [];
+
+	for (let i = 0; i < items.length; i++) {
+		try {
+			const collectionId = this.getNodeParameter('collectionId', i) as string;
+			const itemId = this.getNodeParameter('itemId', i) as string;
+			let responseData = await webflowApiRequest.call(
+				this,
+				'DELETE',
+				`/collections/${collectionId}/items/${itemId}`,
+			);
+
+			if (responseData.statusCode === 204) {
+				responseData = { success: true };
+			} else {
+				responseData = { success: false };
+			}
+
+			const executionData = this.helpers.constructExecutionMetaData(
+				wrapData(responseData as IDataObject[]),
+				{ itemData: { item: i } },
+			);
+
+			returnData.push(...executionData);
+		} catch (error) {
+			if (this.continueOnFail()) {
+				returnData.push({ json: { message: error.message, error } });
+				continue;
+			}
+			throw error;
+		}
+	}
+
+	return returnData;
+}
diff --git a/packages/nodes-base/nodes/Webflow/V2/actions/Item/get.operation.ts b/packages/nodes-base/nodes/Webflow/V2/actions/Item/get.operation.ts
new file mode 100644
index 0000000000000..c02b3fc26e7ff
--- /dev/null
+++ b/packages/nodes-base/nodes/Webflow/V2/actions/Item/get.operation.ts
@@ -0,0 +1,88 @@
+import type {
+	IDataObject,
+	INodeExecutionData,
+	INodeProperties,
+	IExecuteFunctions,
+} from 'n8n-workflow';
+
+import { updateDisplayOptions, wrapData } from '../../../../../utils/utilities';
+import { webflowApiRequest } from '../../../GenericFunctions';
+
+const properties: INodeProperties[] = [
+	{
+		displayName: 'Site Name or ID',
+		name: 'siteId',
+		type: 'options',
+		required: true,
+		typeOptions: {
+			loadOptionsMethod: 'getSites',
+		},
+		default: '',
+		description:
+			'ID of the site containing the collection whose items to operate on. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+	},
+	{
+		displayName: 'Collection Name or ID',
+		name: 'collectionId',
+		type: 'options',
+		required: true,
+		typeOptions: {
+			loadOptionsMethod: 'getCollections',
+			loadOptionsDependsOn: ['siteId'],
+		},
+		default: '',
+		description:
+			'ID of the collection whose items to operate on. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+	},
+	{
+		displayName: 'Item ID',
+		name: 'itemId',
+		type: 'string',
+		required: true,
+		default: '',
+		description: 'ID of the item to operate on',
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['item'],
+		operation: ['get'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	items: INodeExecutionData[],
+): Promise<INodeExecutionData[]> {
+	const returnData: INodeExecutionData[] = [];
+	let responseData;
+	for (let i = 0; i < items.length; i++) {
+		try {
+			const collectionId = this.getNodeParameter('collectionId', i) as string;
+			const itemId = this.getNodeParameter('itemId', i) as string;
+			responseData = await webflowApiRequest.call(
+				this,
+				'GET',
+				`/collections/${collectionId}/items/${itemId}`,
+			);
+
+			const executionData = this.helpers.constructExecutionMetaData(
+				wrapData(responseData.body as IDataObject[]),
+				{ itemData: { item: i } },
+			);
+
+			returnData.push(...executionData);
+		} catch (error) {
+			if (this.continueOnFail()) {
+				returnData.push({ json: { message: error.message, error } });
+				continue;
+			}
+			throw error;
+		}
+	}
+
+	return returnData;
+}
diff --git a/packages/nodes-base/nodes/Webflow/V2/actions/Item/getAll.operation.ts b/packages/nodes-base/nodes/Webflow/V2/actions/Item/getAll.operation.ts
new file mode 100644
index 0000000000000..6f9bd0f5b1949
--- /dev/null
+++ b/packages/nodes-base/nodes/Webflow/V2/actions/Item/getAll.operation.ts
@@ -0,0 +1,118 @@
+import type {
+	IDataObject,
+	INodeExecutionData,
+	INodeProperties,
+	IExecuteFunctions,
+} from 'n8n-workflow';
+
+import { updateDisplayOptions, wrapData } from '../../../../../utils/utilities';
+import { webflowApiRequest, webflowApiRequestAllItems } from '../../../GenericFunctions';
+
+const properties: INodeProperties[] = [
+	{
+		displayName: 'Site Name or ID',
+		name: 'siteId',
+		type: 'options',
+		required: true,
+		typeOptions: {
+			loadOptionsMethod: 'getSites',
+		},
+		default: '',
+		description:
+			'ID of the site containing the collection whose items to operate on. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+	},
+	{
+		displayName: 'Collection Name or ID',
+		name: 'collectionId',
+		type: 'options',
+		required: true,
+		typeOptions: {
+			loadOptionsMethod: 'getCollections',
+			loadOptionsDependsOn: ['siteId'],
+		},
+		default: '',
+		description:
+			'ID of the collection whose items to operate on. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+	},
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		default: false,
+		description: 'Whether to return all results or only up to a given limit',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		typeOptions: {
+			minValue: 1,
+			maxValue: 100,
+		},
+		displayOptions: {
+			show: {
+				returnAll: [false],
+			},
+		},
+		default: 100,
+		description: 'Max number of results to return',
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['item'],
+		operation: ['getAll'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	items: INodeExecutionData[],
+): Promise<INodeExecutionData[]> {
+	const returnData: INodeExecutionData[] = [];
+	let responseData;
+	for (let i = 0; i < items.length; i++) {
+		try {
+			const returnAll = this.getNodeParameter('returnAll', i) as boolean;
+			const collectionId = this.getNodeParameter('collectionId', i) as string;
+			const qs: IDataObject = {};
+
+			if (returnAll) {
+				responseData = await webflowApiRequestAllItems.call(
+					this,
+					'GET',
+					`/collections/${collectionId}/items`,
+					{},
+				);
+			} else {
+				qs.limit = this.getNodeParameter('limit', i);
+				responseData = await webflowApiRequest.call(
+					this,
+					'GET',
+					`/collections/${collectionId}/items`,
+					{},
+					qs,
+				);
+				responseData = responseData.body.items;
+			}
+
+			const executionData = this.helpers.constructExecutionMetaData(
+				wrapData(responseData as IDataObject[]),
+				{ itemData: { item: i } },
+			);
+
+			returnData.push(...executionData);
+		} catch (error) {
+			if (this.continueOnFail()) {
+				returnData.push({ json: { message: error.message, error } });
+				continue;
+			}
+			throw error;
+		}
+	}
+
+	return returnData;
+}
diff --git a/packages/nodes-base/nodes/Webflow/V2/actions/Item/update.operation.ts b/packages/nodes-base/nodes/Webflow/V2/actions/Item/update.operation.ts
new file mode 100644
index 0000000000000..e4f94ad17d83f
--- /dev/null
+++ b/packages/nodes-base/nodes/Webflow/V2/actions/Item/update.operation.ts
@@ -0,0 +1,148 @@
+import type {
+	IDataObject,
+	INodeExecutionData,
+	INodeProperties,
+	IExecuteFunctions,
+} from 'n8n-workflow';
+
+import { updateDisplayOptions, wrapData } from '../../../../../utils/utilities';
+import { webflowApiRequest } from '../../../GenericFunctions';
+
+const properties: INodeProperties[] = [
+	{
+		displayName: 'Site Name or ID',
+		name: 'siteId',
+		type: 'options',
+		required: true,
+		typeOptions: {
+			loadOptionsMethod: 'getSites',
+		},
+		default: '',
+		description:
+			'ID of the site containing the collection whose items to add to. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+	},
+	{
+		displayName: 'Collection Name or ID',
+		name: 'collectionId',
+		type: 'options',
+		required: true,
+		typeOptions: {
+			loadOptionsMethod: 'getCollections',
+			loadOptionsDependsOn: ['siteId'],
+		},
+		default: '',
+		description:
+			'ID of the collection to add an item to. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+	},
+	{
+		displayName: 'Item ID',
+		name: 'itemId',
+		type: 'string',
+		required: true,
+		default: '',
+		description: 'ID of the item to update',
+	},
+	{
+		displayName: 'Live',
+		name: 'live',
+		type: 'boolean',
+		required: true,
+		default: false,
+		description: 'Whether the item should be published on the live site',
+	},
+	{
+		displayName: 'Fields',
+		name: 'fieldsUi',
+		placeholder: 'Add Field',
+		type: 'fixedCollection',
+		typeOptions: {
+			multipleValues: true,
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Field',
+				name: 'fieldValues',
+				values: [
+					{
+						displayName: 'Field Name or ID',
+						name: 'fieldId',
+						type: 'options',
+						typeOptions: {
+							loadOptionsMethod: 'getFields',
+							loadOptionsDependsOn: ['collectionId'],
+						},
+						default: '',
+						description:
+							'Field to set for the item to create. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+					},
+					{
+						displayName: 'Field Value',
+						name: 'fieldValue',
+						type: 'string',
+						default: '',
+						description: 'Value to set for the item to create',
+					},
+				],
+			},
+		],
+	},
+];
+
+const displayOptions = {
+	show: {
+		resource: ['item'],
+		operation: ['update'],
+	},
+};
+
+export const description = updateDisplayOptions(displayOptions, properties);
+
+export async function execute(
+	this: IExecuteFunctions,
+	items: INodeExecutionData[],
+): Promise<INodeExecutionData[]> {
+	const returnData: INodeExecutionData[] = [];
+	let responseData;
+	for (let i = 0; i < items.length; i++) {
+		try {
+			const collectionId = this.getNodeParameter('collectionId', i) as string;
+			const itemId = this.getNodeParameter('itemId', i) as string;
+
+			const uiFields = this.getNodeParameter('fieldsUi.fieldValues', i, []) as IDataObject[];
+
+			const live = this.getNodeParameter('live', i) as boolean;
+
+			const fieldData = {} as IDataObject;
+
+			uiFields.forEach((data) => (fieldData[data.fieldId as string] = data.fieldValue));
+
+			const body: IDataObject = {
+				fieldData,
+			};
+
+			responseData = await webflowApiRequest.call(
+				this,
+				'PATCH',
+				`/collections/${collectionId}/items/${itemId}`,
+				body,
+				{ live },
+			);
+
+			const executionData = this.helpers.constructExecutionMetaData(
+				wrapData(responseData.body as IDataObject[]),
+				{ itemData: { item: i } },
+			);
+
+			returnData.push(...executionData);
+		} catch (error) {
+			if (this.continueOnFail()) {
+				returnData.push({ json: { message: error.message, error } });
+				continue;
+			}
+			throw error;
+		}
+	}
+
+	return returnData;
+}
diff --git a/packages/nodes-base/nodes/Webflow/V2/actions/node.type.ts b/packages/nodes-base/nodes/Webflow/V2/actions/node.type.ts
new file mode 100644
index 0000000000000..150a5684b6d52
--- /dev/null
+++ b/packages/nodes-base/nodes/Webflow/V2/actions/node.type.ts
@@ -0,0 +1,7 @@
+import type { AllEntities } from 'n8n-workflow';
+
+type NodeMap = {
+	item: 'create' | 'deleteItem' | 'get' | 'getAll' | 'update';
+};
+
+export type WebflowType = AllEntities<NodeMap>;
diff --git a/packages/nodes-base/nodes/Webflow/V2/actions/router.ts b/packages/nodes-base/nodes/Webflow/V2/actions/router.ts
new file mode 100644
index 0000000000000..371a9df3c6df7
--- /dev/null
+++ b/packages/nodes-base/nodes/Webflow/V2/actions/router.ts
@@ -0,0 +1,35 @@
+import type { IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
+import { NodeOperationError } from 'n8n-workflow';
+import type { WebflowType } from './node.type';
+
+import * as item from './Item/Item.resource';
+
+export async function router(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+	let returnData: INodeExecutionData[] = [];
+
+	const items = this.getInputData();
+	const resource = this.getNodeParameter<WebflowType>('resource', 0);
+	const operation = this.getNodeParameter('operation', 0);
+
+	const webflowNodeData = {
+		resource,
+		operation,
+	} as WebflowType;
+
+	try {
+		switch (webflowNodeData.resource) {
+			case 'item':
+				returnData = await item[webflowNodeData.operation].execute.call(this, items);
+				break;
+			default:
+				throw new NodeOperationError(
+					this.getNode(),
+					`The operation "${operation}" is not supported!`,
+				);
+		}
+	} catch (error) {
+		throw error;
+	}
+
+	return [returnData];
+}
diff --git a/packages/nodes-base/nodes/Webflow/V2/actions/versionDescription.ts b/packages/nodes-base/nodes/Webflow/V2/actions/versionDescription.ts
new file mode 100644
index 0000000000000..1f93d9493ddee
--- /dev/null
+++ b/packages/nodes-base/nodes/Webflow/V2/actions/versionDescription.ts
@@ -0,0 +1,41 @@
+/* eslint-disable n8n-nodes-base/node-filename-against-convention */
+import type { INodeTypeDescription } from 'n8n-workflow';
+
+import * as item from './Item/Item.resource';
+
+export const versionDescription: INodeTypeDescription = {
+	displayName: 'Webflow',
+	name: 'webflow',
+	icon: 'file:webflow.svg',
+	group: ['transform'],
+	subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
+	description: 'Consume the Webflow API',
+	version: [2],
+	defaults: {
+		name: 'Webflow',
+	},
+	inputs: ['main'],
+	outputs: ['main'],
+	credentials: [
+		{
+			name: 'webflowOAuth2Api',
+			required: true,
+		},
+	],
+	properties: [
+		{
+			displayName: 'Resource',
+			name: 'resource',
+			type: 'options',
+			noDataExpression: true,
+			options: [
+				{
+					name: 'Item',
+					value: 'item',
+				},
+			],
+			default: 'item',
+		},
+		...item.description,
+	],
+};
diff --git a/packages/nodes-base/nodes/Webflow/Webflow.node.ts b/packages/nodes-base/nodes/Webflow/Webflow.node.ts
index 3f799cbf09eaa..4239c8c810abb 100644
--- a/packages/nodes-base/nodes/Webflow/Webflow.node.ts
+++ b/packages/nodes-base/nodes/Webflow/Webflow.node.ts
@@ -1,292 +1,26 @@
-import type {
-	IExecuteFunctions,
-	IDataObject,
-	ILoadOptionsFunctions,
-	INodeExecutionData,
-	INodePropertyOptions,
-	INodeType,
-	INodeTypeDescription,
-} from 'n8n-workflow';
-
-import { webflowApiRequest, webflowApiRequestAllItems } from './GenericFunctions';
-
-import { itemFields, itemOperations } from './ItemDescription';
-
-export class Webflow implements INodeType {
-	description: INodeTypeDescription = {
-		displayName: 'Webflow',
-		name: 'webflow',
-		icon: 'file:webflow.svg',
-		group: ['transform'],
-		version: 1,
-		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume the Webflow API',
-		defaults: {
-			name: 'Webflow',
-		},
-		inputs: ['main'],
-		outputs: ['main'],
-		credentials: [
-			{
-				name: 'webflowApi',
-				required: true,
-				displayOptions: {
-					show: {
-						authentication: ['accessToken'],
-					},
-				},
-			},
-			{
-				name: 'webflowOAuth2Api',
-				required: true,
-				displayOptions: {
-					show: {
-						authentication: ['oAuth2'],
-					},
-				},
-			},
-		],
-		properties: [
-			{
-				displayName: 'Authentication',
-				name: 'authentication',
-				type: 'options',
-				options: [
-					{
-						name: 'Access Token',
-						value: 'accessToken',
-					},
-					{
-						name: 'OAuth2',
-						value: 'oAuth2',
-					},
-				],
-				default: 'accessToken',
-			},
-			{
-				displayName: 'Resource',
-				name: 'resource',
-				type: 'options',
-				noDataExpression: true,
-				options: [
-					{
-						name: 'Item',
-						value: 'item',
-					},
-				],
-				default: 'item',
-			},
-			...itemOperations,
-			...itemFields,
-		],
-	};
-
-	methods = {
-		loadOptions: {
-			async getSites(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const sites = await webflowApiRequest.call(this, 'GET', '/sites');
-				for (const site of sites) {
-					returnData.push({
-						name: site.name,
-						value: site._id,
-					});
-				}
-				return returnData;
-			},
-			async getCollections(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const siteId = this.getCurrentNodeParameter('siteId');
-				const collections = await webflowApiRequest.call(
-					this,
-					'GET',
-					`/sites/${siteId}/collections`,
-				);
-				for (const collection of collections) {
-					returnData.push({
-						name: collection.name,
-						value: collection._id,
-					});
-				}
-				return returnData;
-			},
-			async getFields(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const collectionId = this.getCurrentNodeParameter('collectionId');
-				const { fields } = await webflowApiRequest.call(
-					this,
-					'GET',
-					`/collections/${collectionId}`,
-				);
-				for (const field of fields) {
-					returnData.push({
-						name: `${field.name} (${field.type}) ${field.required ? ' (required)' : ''}`,
-						value: field.slug,
-					});
-				}
-				return returnData;
-			},
-		},
-	};
-
-	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
-		const items = this.getInputData();
-
-		const resource = this.getNodeParameter('resource', 0);
-		const operation = this.getNodeParameter('operation', 0);
-		let responseData;
-		const returnData: INodeExecutionData[] = [];
-
-		for (let i = 0; i < items.length; i++) {
-			try {
-				if (resource === 'item') {
-					// *********************************************************************
-					//                             item
-					// *********************************************************************
-
-					// https://developers.webflow.com/#item-model
-
-					if (operation === 'create') {
-						// ----------------------------------
-						//         item: create
-						// ----------------------------------
-
-						// https://developers.webflow.com/#create-new-collection-item
-
-						const collectionId = this.getNodeParameter('collectionId', i) as string;
-
-						const properties = this.getNodeParameter(
-							'fieldsUi.fieldValues',
-							i,
-							[],
-						) as IDataObject[];
-
-						const live = this.getNodeParameter('live', i) as boolean;
-
-						const fields = {} as IDataObject;
-
-						properties.forEach((data) => (fields[data.fieldId as string] = data.fieldValue));
-
-						const body: IDataObject = {
-							fields,
-						};
-
-						responseData = await webflowApiRequest.call(
-							this,
-							'POST',
-							`/collections/${collectionId}/items`,
-							body,
-							{ live },
-						);
-					} else if (operation === 'delete') {
-						// ----------------------------------
-						//         item: delete
-						// ----------------------------------
-
-						// https://developers.webflow.com/#remove-collection-item
-
-						const collectionId = this.getNodeParameter('collectionId', i) as string;
-						const itemId = this.getNodeParameter('itemId', i) as string;
-						responseData = await webflowApiRequest.call(
-							this,
-							'DELETE',
-							`/collections/${collectionId}/items/${itemId}`,
-						);
-					} else if (operation === 'get') {
-						// ----------------------------------
-						//         item: get
-						// ----------------------------------
-
-						// https://developers.webflow.com/#get-single-item
-
-						const collectionId = this.getNodeParameter('collectionId', i) as string;
-						const itemId = this.getNodeParameter('itemId', i) as string;
-						responseData = await webflowApiRequest.call(
-							this,
-							'GET',
-							`/collections/${collectionId}/items/${itemId}`,
-						);
-						responseData = responseData.items;
-					} else if (operation === 'getAll') {
-						// ----------------------------------
-						//         item: getAll
-						// ----------------------------------
-
-						// https://developers.webflow.com/#get-all-items-for-a-collection
-
-						const returnAll = this.getNodeParameter('returnAll', 0);
-						const collectionId = this.getNodeParameter('collectionId', i) as string;
-						const qs: IDataObject = {};
-
-						if (returnAll) {
-							responseData = await webflowApiRequestAllItems.call(
-								this,
-								'GET',
-								`/collections/${collectionId}/items`,
-								{},
-								qs,
-							);
-						} else {
-							qs.limit = this.getNodeParameter('limit', 0);
-							responseData = await webflowApiRequest.call(
-								this,
-								'GET',
-								`/collections/${collectionId}/items`,
-								{},
-								qs,
-							);
-							responseData = responseData.items;
-						}
-					} else if (operation === 'update') {
-						// ----------------------------------
-						//         item: update
-						// ----------------------------------
-
-						// https://developers.webflow.com/#update-collection-item
-
-						const collectionId = this.getNodeParameter('collectionId', i) as string;
-
-						const itemId = this.getNodeParameter('itemId', i) as string;
-
-						const properties = this.getNodeParameter(
-							'fieldsUi.fieldValues',
-							i,
-							[],
-						) as IDataObject[];
-
-						const live = this.getNodeParameter('live', i) as boolean;
-
-						const fields = {} as IDataObject;
-
-						properties.forEach((data) => (fields[data.fieldId as string] = data.fieldValue));
-
-						const body: IDataObject = {
-							fields,
-						};
-
-						responseData = await webflowApiRequest.call(
-							this,
-							'PUT',
-							`/collections/${collectionId}/items/${itemId}`,
-							body,
-							{ live },
-						);
-					}
-				}
-				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData as IDataObject[]),
-					{ itemData: { item: i } },
-				);
-				returnData.push(...executionData);
-			} catch (error) {
-				if (this.continueOnFail(error)) {
-					returnData.push({ json: { error: error.message } });
-					continue;
-				}
-				throw error;
-			}
-		}
-
-		return [returnData];
+import type { INodeTypeBaseDescription, IVersionedNodeType } from 'n8n-workflow';
+import { VersionedNodeType } from 'n8n-workflow';
+
+import { WebflowV1 } from './V1/WebflowV1.node';
+import { WebflowV2 } from './V2/WebflowV2.node';
+
+export class Webflow extends VersionedNodeType {
+	constructor() {
+		const baseDescription: INodeTypeBaseDescription = {
+			displayName: 'Webflow',
+			name: 'webflow',
+			icon: 'file:webflow.svg',
+			group: ['transform'],
+			subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
+			description: 'Consume the Webflow API',
+			defaultVersion: 2,
+		};
+
+		const nodeVersions: IVersionedNodeType['nodeVersions'] = {
+			1: new WebflowV1(baseDescription),
+			2: new WebflowV2(baseDescription),
+		};
+
+		super(nodeVersions, baseDescription);
 	}
 }
diff --git a/packages/nodes-base/nodes/Webflow/WebflowTrigger.node.ts b/packages/nodes-base/nodes/Webflow/WebflowTrigger.node.ts
index 632bfb9534bd4..cdd2ee3814626 100644
--- a/packages/nodes-base/nodes/Webflow/WebflowTrigger.node.ts
+++ b/packages/nodes-base/nodes/Webflow/WebflowTrigger.node.ts
@@ -1,273 +1,24 @@
-import type {
-	IHookFunctions,
-	IWebhookFunctions,
-	IDataObject,
-	ILoadOptionsFunctions,
-	INodePropertyOptions,
-	INodeType,
-	INodeTypeDescription,
-	IWebhookResponseData,
-} from 'n8n-workflow';
-
-import { webflowApiRequest } from './GenericFunctions';
-
-export class WebflowTrigger implements INodeType {
-	description: INodeTypeDescription = {
-		displayName: 'Webflow Trigger',
-		name: 'webflowTrigger',
-		icon: 'file:webflow.svg',
-		group: ['trigger'],
-		version: 1,
-		description: 'Handle Webflow events via webhooks',
-		defaults: {
-			name: 'Webflow Trigger',
-		},
-		inputs: [],
-		outputs: ['main'],
-		credentials: [
-			{
-				name: 'webflowApi',
-				required: true,
-				displayOptions: {
-					show: {
-						authentication: ['accessToken'],
-					},
-				},
-			},
-			{
-				name: 'webflowOAuth2Api',
-				required: true,
-				displayOptions: {
-					show: {
-						authentication: ['oAuth2'],
-					},
-				},
-			},
-		],
-		webhooks: [
-			{
-				name: 'default',
-				httpMethod: 'POST',
-				responseMode: 'onReceived',
-				path: 'webhook',
-			},
-		],
-		properties: [
-			{
-				displayName: 'Authentication',
-				name: 'authentication',
-				type: 'options',
-				options: [
-					{
-						name: 'Access Token',
-						value: 'accessToken',
-					},
-					{
-						name: 'OAuth2',
-						value: 'oAuth2',
-					},
-				],
-				default: 'accessToken',
-			},
-			{
-				displayName: 'Site Name or ID',
-				name: 'site',
-				type: 'options',
-				required: true,
-				default: '',
-				typeOptions: {
-					loadOptionsMethod: 'getSites',
-				},
-				description:
-					'Site that will trigger the events. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
-			},
-			{
-				displayName: 'Event',
-				name: 'event',
-				type: 'options',
-				required: true,
-				options: [
-					{
-						name: 'Collection Item Created',
-						value: 'collection_item_created',
-					},
-					{
-						name: 'Collection Item Deleted',
-						value: 'collection_item_deleted',
-					},
-					{
-						name: 'Collection Item Updated',
-						value: 'collection_item_changed',
-					},
-					{
-						name: 'Ecomm Inventory Changed',
-						value: 'ecomm_inventory_changed',
-					},
-					{
-						name: 'Ecomm New Order',
-						value: 'ecomm_new_order',
-					},
-					{
-						name: 'Ecomm Order Changed',
-						value: 'ecomm_order_changed',
-					},
-					{
-						name: 'Form Submission',
-						value: 'form_submission',
-					},
-					{
-						name: 'Site Publish',
-						value: 'site_publish',
-					},
-				],
-				default: 'form_submission',
-			},
-			// {
-			// 	displayName: 'All collections',
-			// 	name: 'allCollections',
-			// 	type: 'boolean',
-			// 	displayOptions: {
-			// 		show: {
-			// 			event: [
-			// 				'collection_item_created',
-			// 				'collection_item_changed',
-			// 				'collection_item_deleted',
-			// 			],
-			// 		},
-			// 	},
-			// 	required: false,
-			// 	default: true,
-			// 	description: 'Receive events from all collections',
-			// },
-			// {
-			// 	displayName: 'Collection',
-			// 	name: 'collection',
-			// 	type: 'options',
-			// 	required: false,
-			// 	default: '',
-			// 	typeOptions: {
-			// 		loadOptionsMethod: 'getCollections',
-			// 		loadOptionsDependsOn: [
-			// 			'site',
-			// 		],
-			// 	},
-			// 	description: 'Collection that will trigger the events',
-			// 	displayOptions: {
-			// 		show: {
-			// 			allCollections: [
-			// 				false,
-			// 			],
-			// 		},
-			// 	},
-			// },
-		],
-	};
-
-	methods = {
-		loadOptions: {
-			// Get all the sites to display them to user so that they can
-			// select them easily
-			async getSites(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const sites = await webflowApiRequest.call(this, 'GET', '/sites');
-				for (const site of sites) {
-					const siteName = site.name;
-					const siteId = site._id;
-					returnData.push({
-						name: siteName,
-						value: siteId,
-					});
-				}
-				return returnData;
-			},
-			// async getCollections(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-			// 	const returnData: INodePropertyOptions[] = [];
-			// 	const siteId = this.getCurrentNodeParameter('site');
-			// 	const collections = await webflowApiRequest.call(this, 'GET', `/sites/${siteId}/collections`);
-			// 	for (const collection of collections) {
-			// 		returnData.push({
-			// 			name: collection.name,
-			// 			value: collection._id,
-			// 		});
-			// 	}
-			// 	return returnData;
-			// },
-		},
-	};
-
-	webhookMethods = {
-		default: {
-			async checkExists(this: IHookFunctions): Promise<boolean> {
-				const webhookData = this.getWorkflowStaticData('node');
-				const webhookUrl = this.getNodeWebhookUrl('default');
-				const siteId = this.getNodeParameter('site') as string;
-
-				const event = this.getNodeParameter('event') as string;
-				const registeredWebhooks = (await webflowApiRequest.call(
-					this,
-					'GET',
-					`/sites/${siteId}/webhooks`,
-				)) as IDataObject[];
-
-				for (const webhook of registeredWebhooks) {
-					if (webhook.url === webhookUrl && webhook.triggerType === event) {
-						webhookData.webhookId = webhook._id;
-						return true;
-					}
-				}
-
-				return false;
-			},
-
-			async create(this: IHookFunctions): Promise<boolean> {
-				const webhookUrl = this.getNodeWebhookUrl('default');
-				const webhookData = this.getWorkflowStaticData('node');
-				const siteId = this.getNodeParameter('site') as string;
-				const event = this.getNodeParameter('event') as string;
-				const endpoint = `/sites/${siteId}/webhooks`;
-				const body: IDataObject = {
-					site_id: siteId,
-					triggerType: event,
-					url: webhookUrl,
-				};
-
-				// if (event.startsWith('collection')) {
-				// 	const allCollections = this.getNodeParameter('allCollections') as boolean;
-
-				// 	if (allCollections === false) {
-				// 		body.filter = {
-				// 			'cid': this.getNodeParameter('collection') as string,
-				// 		};
-				// 	}
-				// }
-
-				const { _id } = await webflowApiRequest.call(this, 'POST', endpoint, body);
-				webhookData.webhookId = _id;
-				return true;
-			},
-			async delete(this: IHookFunctions): Promise<boolean> {
-				let responseData;
-				const webhookData = this.getWorkflowStaticData('node');
-				const siteId = this.getNodeParameter('site') as string;
-				const endpoint = `/sites/${siteId}/webhooks/${webhookData.webhookId}`;
-				try {
-					responseData = await webflowApiRequest.call(this, 'DELETE', endpoint);
-				} catch (error) {
-					return false;
-				}
-				if (!responseData.deleted) {
-					return false;
-				}
-				delete webhookData.webhookId;
-				return true;
-			},
-		},
-	};
+import type { INodeTypeBaseDescription, IVersionedNodeType } from 'n8n-workflow';
+import { VersionedNodeType } from 'n8n-workflow';
+import { WebflowTriggerV1 } from './V1/WebflowTriggerV1.node';
+import { WebflowTriggerV2 } from './V2/WebflowTriggerV2.node';
+
+export class WebflowTrigger extends VersionedNodeType {
+	constructor() {
+		const baseDescription: INodeTypeBaseDescription = {
+			displayName: 'Webflow Trigger',
+			name: 'webflowTrigger',
+			icon: 'file:webflow.svg',
+			group: ['trigger'],
+			description: 'Handle Webflow events via webhooks',
+			defaultVersion: 2,
+		};
 
-	async webhook(this: IWebhookFunctions): Promise<IWebhookResponseData> {
-		const req = this.getRequestObject();
-		return {
-			workflowData: [this.helpers.returnJsonArray(req.body as IDataObject[])],
+		const nodeVersions: IVersionedNodeType['nodeVersions'] = {
+			1: new WebflowTriggerV1(baseDescription),
+			2: new WebflowTriggerV2(baseDescription),
 		};
+
+		super(nodeVersions, baseDescription);
 	}
 }

From fa17391dbd1d6902682fda1f90d3e9437912dedf Mon Sep 17 00:00:00 2001
From: Val <68596159+valya@users.noreply.github.com>
Date: Wed, 7 Aug 2024 10:19:09 +0100
Subject: [PATCH 092/168] feat: Return scopes on executions (no-changelog)
 (#10310)

---
 .../projectRelation.repository.ts             |  8 ++++++
 .../repositories/sharedWorkflow.repository.ts |  9 +++++++
 .../__tests__/execution.service.test.ts       |  1 +
 .../__tests__/executions.controller.test.ts   |  2 ++
 .../cli/src/executions/execution.service.ts   | 15 +++++++++++
 .../cli/src/executions/execution.types.ts     | 10 ++++++-
 .../src/executions/executions.controller.ts   | 16 +++++++++---
 .../src/workflows/workflowSharing.service.ts  | 26 +++++++++++++++++++
 .../execution.service.integration.test.ts     |  1 +
 .../integration/executions.controller.test.ts | 10 +++++++
 10 files changed, 94 insertions(+), 4 deletions(-)

diff --git a/packages/cli/src/databases/repositories/projectRelation.repository.ts b/packages/cli/src/databases/repositories/projectRelation.repository.ts
index 00fc4de34a195..1f875d011fe06 100644
--- a/packages/cli/src/databases/repositories/projectRelation.repository.ts
+++ b/packages/cli/src/databases/repositories/projectRelation.repository.ts
@@ -61,4 +61,12 @@ export class ProjectRelationRepository extends Repository<ProjectRelation> {
 
 		return [...new Set(rows.map((r) => r.userId))];
 	}
+
+	async findAllByUser(userId: string) {
+		return await this.find({
+			where: {
+				userId,
+			},
+		});
+	}
 }
diff --git a/packages/cli/src/databases/repositories/sharedWorkflow.repository.ts b/packages/cli/src/databases/repositories/sharedWorkflow.repository.ts
index 4dc54935cb193..d8e224fee2280 100644
--- a/packages/cli/src/databases/repositories/sharedWorkflow.repository.ts
+++ b/packages/cli/src/databases/repositories/sharedWorkflow.repository.ts
@@ -200,4 +200,13 @@ export class SharedWorkflowRepository extends Repository<SharedWorkflow> {
 			})
 		)?.project;
 	}
+
+	async getRelationsByWorkflowIdsAndProjectIds(workflowIds: string[], projectIds: string[]) {
+		return await this.find({
+			where: {
+				workflowId: In(workflowIds),
+				projectId: In(projectIds),
+			},
+		});
+	}
 }
diff --git a/packages/cli/src/executions/__tests__/execution.service.test.ts b/packages/cli/src/executions/__tests__/execution.service.test.ts
index 567e0c9758a6f..04c266a4d071e 100644
--- a/packages/cli/src/executions/__tests__/execution.service.test.ts
+++ b/packages/cli/src/executions/__tests__/execution.service.test.ts
@@ -31,6 +31,7 @@ describe('ExecutionService', () => {
 		mock(),
 		concurrencyControl,
 		mock(),
+		mock(),
 	);
 
 	beforeEach(() => {
diff --git a/packages/cli/src/executions/__tests__/executions.controller.test.ts b/packages/cli/src/executions/__tests__/executions.controller.test.ts
index 2a4c733c5ab3c..decb88d59854e 100644
--- a/packages/cli/src/executions/__tests__/executions.controller.test.ts
+++ b/packages/cli/src/executions/__tests__/executions.controller.test.ts
@@ -74,6 +74,8 @@ describe('ExecutionsController', () => {
 			},
 		];
 
+		executionService.findRangeWithCount.mockResolvedValue(NO_EXECUTIONS);
+
 		describe('if either status or range provided', () => {
 			test.each(QUERIES_WITH_EITHER_STATUS_OR_RANGE)(
 				'should fetch executions per query',
diff --git a/packages/cli/src/executions/execution.service.ts b/packages/cli/src/executions/execution.service.ts
index bb8650e99f1d6..0823bde36fe7a 100644
--- a/packages/cli/src/executions/execution.service.ts
+++ b/packages/cli/src/executions/execution.service.ts
@@ -40,6 +40,8 @@ import { QueuedExecutionRetryError } from '@/errors/queued-execution-retry.error
 import { ConcurrencyControlService } from '@/concurrency/concurrency-control.service';
 import { AbortedExecutionRetryError } from '@/errors/aborted-execution-retry.error';
 import { License } from '@/License';
+import type { User } from '@/databases/entities/User';
+import { WorkflowSharingService } from '@/workflows/workflowSharing.service';
 
 export const schemaGetExecutionsQueryFilter = {
 	$id: '/IGetExecutionsQueryFilter',
@@ -92,6 +94,7 @@ export class ExecutionService {
 		private readonly workflowRunner: WorkflowRunner,
 		private readonly concurrencyControl: ConcurrencyControlService,
 		private readonly license: License,
+		private readonly workflowSharingService: WorkflowSharingService,
 	) {}
 
 	async findOne(
@@ -478,4 +481,16 @@ export class ExecutionService {
 
 		return await this.executionRepository.stopDuringRun(execution);
 	}
+
+	async addScopes(user: User, summaries: ExecutionSummaries.ExecutionSummaryWithScopes[]) {
+		const workflowIds = [...new Set(summaries.map((s) => s.workflowId))];
+
+		const scopes = Object.fromEntries(
+			await this.workflowSharingService.getSharedWorkflowScopes(workflowIds, user),
+		);
+
+		for (const s of summaries) {
+			s.scopes = scopes[s.workflowId] ?? [];
+		}
+	}
 }
diff --git a/packages/cli/src/executions/execution.types.ts b/packages/cli/src/executions/execution.types.ts
index 7e8872bf1b305..fd5024adbd718 100644
--- a/packages/cli/src/executions/execution.types.ts
+++ b/packages/cli/src/executions/execution.types.ts
@@ -1,6 +1,12 @@
 import type { ExecutionEntity } from '@/databases/entities/ExecutionEntity';
 import type { AuthenticatedRequest } from '@/requests';
-import type { ExecutionStatus, IDataObject, WorkflowExecuteMode } from 'n8n-workflow';
+import type { Scope } from '@n8n/permissions';
+import type {
+	ExecutionStatus,
+	ExecutionSummary,
+	IDataObject,
+	WorkflowExecuteMode,
+} from 'n8n-workflow';
 
 export declare namespace ExecutionRequest {
 	namespace QueryParams {
@@ -83,6 +89,8 @@ export namespace ExecutionSummaries {
 			stoppedAt?: 'DESC';
 		};
 	};
+
+	export type ExecutionSummaryWithScopes = ExecutionSummary & { scopes: Scope[] };
 }
 
 export type QueueRecoverySettings = {
diff --git a/packages/cli/src/executions/executions.controller.ts b/packages/cli/src/executions/executions.controller.ts
index 64b6a5427429f..c68c8cb7d5c48 100644
--- a/packages/cli/src/executions/executions.controller.ts
+++ b/packages/cli/src/executions/executions.controller.ts
@@ -1,4 +1,4 @@
-import { ExecutionRequest } from './execution.types';
+import { ExecutionRequest, type ExecutionSummaries } from './execution.types';
 import { ExecutionService } from './execution.service';
 import { Get, Post, RestController } from '@/decorators';
 import { EnterpriseExecutionsService } from './execution.service.ee';
@@ -53,10 +53,20 @@ export class ExecutionsController {
 		const noRange = !query.range.lastId || !query.range.firstId;
 
 		if (noStatus && noRange) {
-			return await this.executionService.findLatestCurrentAndCompleted(query);
+			const executions = await this.executionService.findLatestCurrentAndCompleted(query);
+			await this.executionService.addScopes(
+				req.user,
+				executions.results as ExecutionSummaries.ExecutionSummaryWithScopes[],
+			);
+			return executions;
 		}
 
-		return await this.executionService.findRangeWithCount(query);
+		const executions = await this.executionService.findRangeWithCount(query);
+		await this.executionService.addScopes(
+			req.user,
+			executions.results as ExecutionSummaries.ExecutionSummaryWithScopes[],
+		);
+		return executions;
 	}
 
 	@Get('/:id')
diff --git a/packages/cli/src/workflows/workflowSharing.service.ts b/packages/cli/src/workflows/workflowSharing.service.ts
index add5bb31b8fc9..111e50b58103f 100644
--- a/packages/cli/src/workflows/workflowSharing.service.ts
+++ b/packages/cli/src/workflows/workflowSharing.service.ts
@@ -8,12 +8,14 @@ import { RoleService } from '@/services/role.service';
 import type { Scope } from '@n8n/permissions';
 import type { ProjectRole } from '@/databases/entities/ProjectRelation';
 import type { WorkflowSharingRole } from '@/databases/entities/SharedWorkflow';
+import { ProjectRelationRepository } from '@/databases/repositories/projectRelation.repository';
 
 @Service()
 export class WorkflowSharingService {
 	constructor(
 		private readonly sharedWorkflowRepository: SharedWorkflowRepository,
 		private readonly roleService: RoleService,
+		private readonly projectRelationRepository: ProjectRelationRepository,
 	) {}
 
 	/**
@@ -64,4 +66,28 @@ export class WorkflowSharingService {
 
 		return sharedWorkflows.map(({ workflowId }) => workflowId);
 	}
+
+	async getSharedWorkflowScopes(
+		workflowIds: string[],
+		user: User,
+	): Promise<Array<[string, Scope[]]>> {
+		const projectRelations = await this.projectRelationRepository.findAllByUser(user.id);
+		const sharedWorkflows =
+			await this.sharedWorkflowRepository.getRelationsByWorkflowIdsAndProjectIds(
+				workflowIds,
+				projectRelations.map((p) => p.projectId),
+			);
+
+		return workflowIds.map((workflowId) => {
+			return [
+				workflowId,
+				this.roleService.combineResourceScopes(
+					'workflow',
+					user,
+					sharedWorkflows.filter((s) => s.workflowId === workflowId),
+					projectRelations,
+				),
+			];
+		});
+	}
 }
diff --git a/packages/cli/test/integration/execution.service.integration.test.ts b/packages/cli/test/integration/execution.service.integration.test.ts
index e30d55602af95..6f29950bf48d4 100644
--- a/packages/cli/test/integration/execution.service.integration.test.ts
+++ b/packages/cli/test/integration/execution.service.integration.test.ts
@@ -30,6 +30,7 @@ describe('ExecutionService', () => {
 			mock(),
 			mock(),
 			mock(),
+			mock(),
 		);
 	});
 
diff --git a/packages/cli/test/integration/executions.controller.test.ts b/packages/cli/test/integration/executions.controller.test.ts
index 1e6d65a4f8368..94faa32351764 100644
--- a/packages/cli/test/integration/executions.controller.test.ts
+++ b/packages/cli/test/integration/executions.controller.test.ts
@@ -48,6 +48,16 @@ describe('GET /executions', () => {
 		const response2 = await testServer.authAgentFor(member).get('/executions').expect(200);
 		expect(response2.body.data.count).toBe(1);
 	});
+
+	test('should return a scopes array for each execution', async () => {
+		testServer.license.enable('feat:sharing');
+		const workflow = await createWorkflow({}, owner);
+		await shareWorkflowWithUsers(workflow, [member]);
+		await createSuccessfulExecution(workflow);
+
+		const response = await testServer.authAgentFor(member).get('/executions').expect(200);
+		expect(response.body.data.results[0].scopes).toContain('workflow:execute');
+	});
 });
 
 describe('GET /executions/:id', () => {

From a93668076893a1ee824fe99c01a4737b7ee919a4 Mon Sep 17 00:00:00 2001
From: Eugene <eugene@n8n.io>
Date: Wed, 7 Aug 2024 11:20:17 +0200
Subject: [PATCH 093/168] feat(HTTP Request Tool Node): Use
 DynamicStructuredTool with models supporting it (no-changelog) (#10246)

---
 .../agents/OpenAiFunctionsAgent/execute.ts    |   2 +-
 .../agents/Agent/agents/ToolsAgent/execute.ts |   2 +-
 .../OpenAiAssistant/OpenAiAssistant.node.ts   |   2 +-
 .../ToolHttpRequest/ToolHttpRequest.node.ts   |  23 ++-
 .../nodes/tools/ToolHttpRequest/utils.ts      |  67 +++++--
 .../tools/ToolWorkflow/ToolWorkflow.node.ts   |   2 +-
 .../actions/assistant/message.operation.ts    |   2 +-
 .../OpenAi/actions/text/message.operation.ts  |   2 +-
 .../nodes-langchain/utils/N8nTool.test.ts     | 169 ++++++++++++++++++
 .../@n8n/nodes-langchain/utils/N8nTool.ts     | 113 ++++++++++++
 .../@n8n/nodes-langchain/utils/helpers.ts     |  24 ++-
 11 files changed, 382 insertions(+), 26 deletions(-)
 create mode 100644 packages/@n8n/nodes-langchain/utils/N8nTool.test.ts
 create mode 100644 packages/@n8n/nodes-langchain/utils/N8nTool.ts

diff --git a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/OpenAiFunctionsAgent/execute.ts b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/OpenAiFunctionsAgent/execute.ts
index a027829e3a7d8..3c4ff28f06a10 100644
--- a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/OpenAiFunctionsAgent/execute.ts
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/OpenAiFunctionsAgent/execute.ts
@@ -38,7 +38,7 @@ export async function openAiFunctionsAgentExecute(
 	const memory = (await this.getInputConnectionData(NodeConnectionType.AiMemory, 0)) as
 		| BaseChatMemory
 		| undefined;
-	const tools = await getConnectedTools(this, nodeVersion >= 1.5);
+	const tools = await getConnectedTools(this, nodeVersion >= 1.5, false);
 	const outputParsers = await getOptionalOutputParsers(this);
 	const options = this.getNodeParameter('options', 0, {}) as {
 		systemMessage?: string;
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 81ac6bad5db43..e0da7f1e315f9 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
@@ -90,7 +90,7 @@ export async function toolsAgentExecute(this: IExecuteFunctions): Promise<INodeE
 		| BaseChatMemory
 		| undefined;
 
-	const tools = (await getConnectedTools(this, true)) as Array<DynamicStructuredTool | Tool>;
+	const tools = (await getConnectedTools(this, true, false)) as Array<DynamicStructuredTool | Tool>;
 	const outputParser = (await getOptionalOutputParsers(this))?.[0];
 	let structuredOutputParserTool: DynamicStructuredTool | undefined;
 
diff --git a/packages/@n8n/nodes-langchain/nodes/agents/OpenAiAssistant/OpenAiAssistant.node.ts b/packages/@n8n/nodes-langchain/nodes/agents/OpenAiAssistant/OpenAiAssistant.node.ts
index f56ce7c5c4484..8f05faccb0274 100644
--- a/packages/@n8n/nodes-langchain/nodes/agents/OpenAiAssistant/OpenAiAssistant.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/agents/OpenAiAssistant/OpenAiAssistant.node.ts
@@ -313,7 +313,7 @@ export class OpenAiAssistant implements INodeType {
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 		const nodeVersion = this.getNode().typeVersion;
-		const tools = await getConnectedTools(this, nodeVersion > 1);
+		const tools = await getConnectedTools(this, nodeVersion > 1, false);
 		const credentials = await this.getCredentials('openAiApi');
 
 		const items = this.getInputData();
diff --git a/packages/@n8n/nodes-langchain/nodes/tools/ToolHttpRequest/ToolHttpRequest.node.ts b/packages/@n8n/nodes-langchain/nodes/tools/ToolHttpRequest/ToolHttpRequest.node.ts
index 1d391f313ef36..421e85e1b5b8c 100644
--- a/packages/@n8n/nodes-langchain/nodes/tools/ToolHttpRequest/ToolHttpRequest.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolHttpRequest/ToolHttpRequest.node.ts
@@ -12,6 +12,7 @@ import { NodeConnectionType, NodeOperationError, tryToParseAlphanumericString }
 import { DynamicTool } from '@langchain/core/tools';
 import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
 
+import { N8nTool } from '../../../utils/N8nTool';
 import {
 	configureHttpRequestFunction,
 	configureResponseOptimizer,
@@ -19,6 +20,7 @@ import {
 	prepareToolDescription,
 	configureToolFunction,
 	updateParametersAndOptions,
+	makeToolInputSchema,
 } from './utils';
 
 import {
@@ -38,7 +40,7 @@ export class ToolHttpRequest implements INodeType {
 		name: 'toolHttpRequest',
 		icon: { light: 'file:httprequest.svg', dark: 'file:httprequest.dark.svg' },
 		group: ['output'],
-		version: 1,
+		version: [1, 1.1],
 		description: 'Makes an HTTP request and returns the response data',
 		subtitle: '={{ $parameter.toolDescription }}',
 		defaults: {
@@ -394,9 +396,24 @@ export class ToolHttpRequest implements INodeType {
 			optimizeResponse,
 		);
 
-		const description = prepareToolDescription(toolDescription, toolParameters);
+		let tool: DynamicTool | N8nTool;
 
-		const tool = new DynamicTool({ name, description, func });
+		// If the node version is 1.1 or higher, we use the N8nTool wrapper:
+		// it allows to use tool as a DynamicStructuredTool and have a fallback to DynamicTool
+		if (this.getNode().typeVersion >= 1.1) {
+			const schema = makeToolInputSchema(toolParameters);
+
+			tool = new N8nTool(this, {
+				name,
+				description: toolDescription,
+				func,
+				schema,
+			});
+		} else {
+			// Keep the old behavior for nodes with version 1.0
+			const description = prepareToolDescription(toolDescription, toolParameters);
+			tool = new DynamicTool({ name, description, func });
+		}
 
 		return {
 			response: tool,
diff --git a/packages/@n8n/nodes-langchain/nodes/tools/ToolHttpRequest/utils.ts b/packages/@n8n/nodes-langchain/nodes/tools/ToolHttpRequest/utils.ts
index 28015b588a101..96ae0d8492a33 100644
--- a/packages/@n8n/nodes-langchain/nodes/tools/ToolHttpRequest/utils.ts
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolHttpRequest/utils.ts
@@ -27,6 +27,8 @@ import type {
 	SendIn,
 	ToolParameter,
 } from './interfaces';
+import type { DynamicZodObject } from '../../../types/zod.types';
+import { z } from 'zod';
 
 const genericCredentialRequest = async (ctx: IExecuteFunctions, itemIndex: number) => {
 	const genericType = ctx.getNodeParameter('genericAuthType', itemIndex) as string;
@@ -566,7 +568,7 @@ export const configureToolFunction = (
 	httpRequest: (options: IHttpRequestOptions) => Promise<any>,
 	optimizeResponse: (response: string) => string,
 ) => {
-	return async (query: string): Promise<string> => {
+	return async (query: string | IDataObject): Promise<string> => {
 		const { index } = ctx.addInputData(NodeConnectionType.AiTool, [[{ json: { query } }]]);
 
 		let response: string = '';
@@ -581,18 +583,22 @@ export const configureToolFunction = (
 			if (query) {
 				let dataFromModel;
 
-				try {
-					dataFromModel = jsonParse<IDataObject>(query);
-				} catch (error) {
-					if (toolParameters.length === 1) {
-						dataFromModel = { [toolParameters[0].name]: query };
-					} else {
-						throw new NodeOperationError(
-							ctx.getNode(),
-							`Input is not a valid JSON: ${error.message}`,
-							{ itemIndex },
-						);
+				if (typeof query === 'string') {
+					try {
+						dataFromModel = jsonParse<IDataObject>(query);
+					} catch (error) {
+						if (toolParameters.length === 1) {
+							dataFromModel = { [toolParameters[0].name]: query };
+						} else {
+							throw new NodeOperationError(
+								ctx.getNode(),
+								`Input is not a valid JSON: ${error.message}`,
+								{ itemIndex },
+							);
+						}
 					}
+				} else {
+					dataFromModel = query;
 				}
 
 				for (const parameter of toolParameters) {
@@ -727,6 +733,8 @@ export const configureToolFunction = (
 				}
 			}
 		} catch (error) {
+			console.error(error);
+
 			const errorMessage = 'Input provided by model is not valid';
 
 			if (error instanceof NodeOperationError) {
@@ -765,3 +773,38 @@ export const configureToolFunction = (
 		return response;
 	};
 };
+
+function makeParameterZodSchema(parameter: ToolParameter) {
+	let schema: z.ZodTypeAny;
+
+	if (parameter.type === 'string') {
+		schema = z.string();
+	} else if (parameter.type === 'number') {
+		schema = z.number();
+	} else if (parameter.type === 'boolean') {
+		schema = z.boolean();
+	} else if (parameter.type === 'json') {
+		schema = z.record(z.any());
+	} else {
+		schema = z.string();
+	}
+
+	if (!parameter.required) {
+		schema = schema.optional();
+	}
+
+	if (parameter.description) {
+		schema = schema.describe(parameter.description);
+	}
+
+	return schema;
+}
+
+export function makeToolInputSchema(parameters: ToolParameter[]): DynamicZodObject {
+	const schemaEntries = parameters.map((parameter) => [
+		parameter.name,
+		makeParameterZodSchema(parameter),
+	]);
+
+	return z.object(Object.fromEntries(schemaEntries));
+}
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 54b8318f5b8b8..5ed96cbd60123 100644
--- a/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/ToolWorkflow.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/ToolWorkflow.node.ts
@@ -493,7 +493,7 @@ export class ToolWorkflow implements INodeType {
 		if (useSchema) {
 			try {
 				// We initialize these even though one of them will always be empty
-				// it makes it easer to navigate the ternary operator
+				// it makes it easier to navigate the ternary operator
 				const jsonExample = this.getNodeParameter('jsonSchemaExample', itemIndex, '') as string;
 				const inputSchema = this.getNodeParameter('inputSchema', itemIndex, '') as string;
 
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/assistant/message.operation.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/assistant/message.operation.ts
index da2770d05f2eb..134e8a1167924 100644
--- a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/assistant/message.operation.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/assistant/message.operation.ts
@@ -163,7 +163,7 @@ export async function execute(this: IExecuteFunctions, i: number): Promise<INode
 
 	const agent = new OpenAIAssistantRunnable({ assistantId, client, asAgent: true });
 
-	const tools = await getConnectedTools(this, nodeVersion > 1);
+	const tools = await getConnectedTools(this, nodeVersion > 1, false);
 	let assistantTools;
 
 	if (tools.length) {
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/text/message.operation.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/text/message.operation.ts
index 4cf72e9f5f48c..d37be5a065e6d 100644
--- a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/text/message.operation.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/text/message.operation.ts
@@ -219,7 +219,7 @@ export async function execute(this: IExecuteFunctions, i: number): Promise<INode
 
 	if (hideTools !== 'hide') {
 		const enforceUniqueNames = nodeVersion > 1;
-		externalTools = await getConnectedTools(this, enforceUniqueNames);
+		externalTools = await getConnectedTools(this, enforceUniqueNames, false);
 	}
 
 	if (externalTools.length) {
diff --git a/packages/@n8n/nodes-langchain/utils/N8nTool.test.ts b/packages/@n8n/nodes-langchain/utils/N8nTool.test.ts
new file mode 100644
index 0000000000000..6f12b18079551
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/utils/N8nTool.test.ts
@@ -0,0 +1,169 @@
+import { N8nTool } from './N8nTool';
+import { createMockExecuteFunction } from 'n8n-nodes-base/test/nodes/Helpers';
+import { z } from 'zod';
+import type { INode } from 'n8n-workflow';
+import { DynamicStructuredTool, DynamicTool } from '@langchain/core/tools';
+
+const mockNode: INode = {
+	id: '1',
+	name: 'Mock node',
+	typeVersion: 2,
+	type: 'n8n-nodes-base.mock',
+	position: [60, 760],
+	parameters: {
+		operation: 'test',
+	},
+};
+
+describe('Test N8nTool wrapper as DynamicStructuredTool', () => {
+	it('should wrap a tool', () => {
+		const func = jest.fn();
+
+		const ctx = createMockExecuteFunction({}, mockNode);
+
+		const tool = new N8nTool(ctx, {
+			name: 'Dummy Tool',
+			description: 'A dummy tool for testing',
+			func,
+			schema: z.object({
+				foo: z.string(),
+			}),
+		});
+
+		expect(tool).toBeInstanceOf(DynamicStructuredTool);
+	});
+});
+
+describe('Test N8nTool wrapper - DynamicTool fallback', () => {
+	it('should convert the tool to a dynamic tool', () => {
+		const func = jest.fn();
+
+		const ctx = createMockExecuteFunction({}, mockNode);
+
+		const tool = new N8nTool(ctx, {
+			name: 'Dummy Tool',
+			description: 'A dummy tool for testing',
+			func,
+			schema: z.object({
+				foo: z.string(),
+			}),
+		});
+
+		const dynamicTool = tool.asDynamicTool();
+
+		expect(dynamicTool).toBeInstanceOf(DynamicTool);
+	});
+
+	it('should format fallback description correctly', () => {
+		const func = jest.fn();
+
+		const ctx = createMockExecuteFunction({}, mockNode);
+
+		const tool = new N8nTool(ctx, {
+			name: 'Dummy Tool',
+			description: 'A dummy tool for testing',
+			func,
+			schema: z.object({
+				foo: z.string(),
+				bar: z.number().optional(),
+				qwe: z.boolean().describe('Boolean description'),
+			}),
+		});
+
+		const dynamicTool = tool.asDynamicTool();
+
+		expect(dynamicTool.description).toContain('foo: (description: , type: string, required: true)');
+		expect(dynamicTool.description).toContain(
+			'bar: (description: , type: number, required: false)',
+		);
+
+		expect(dynamicTool.description).toContain(
+			'qwe: (description: Boolean description, type: boolean, required: true)',
+		);
+	});
+
+	it('should handle empty parameter list correctly', () => {
+		const func = jest.fn();
+
+		const ctx = createMockExecuteFunction({}, mockNode);
+
+		const tool = new N8nTool(ctx, {
+			name: 'Dummy Tool',
+			description: 'A dummy tool for testing',
+			func,
+			schema: z.object({}),
+		});
+
+		const dynamicTool = tool.asDynamicTool();
+
+		expect(dynamicTool.description).toEqual('A dummy tool for testing');
+	});
+
+	it('should parse correct parameters', async () => {
+		const func = jest.fn();
+
+		const ctx = createMockExecuteFunction({}, mockNode);
+
+		const tool = new N8nTool(ctx, {
+			name: 'Dummy Tool',
+			description: 'A dummy tool for testing',
+			func,
+			schema: z.object({
+				foo: z.string().describe('Foo description'),
+				bar: z.number().optional(),
+			}),
+		});
+
+		const dynamicTool = tool.asDynamicTool();
+
+		const testParameters = { foo: 'some value' };
+
+		await dynamicTool.func(JSON.stringify(testParameters));
+
+		expect(func).toHaveBeenCalledWith(testParameters);
+	});
+
+	it('should recover when 1 parameter is passed directly', async () => {
+		const func = jest.fn();
+
+		const ctx = createMockExecuteFunction({}, mockNode);
+
+		const tool = new N8nTool(ctx, {
+			name: 'Dummy Tool',
+			description: 'A dummy tool for testing',
+			func,
+			schema: z.object({
+				foo: z.string().describe('Foo description'),
+			}),
+		});
+
+		const dynamicTool = tool.asDynamicTool();
+
+		const testParameter = 'some value';
+
+		await dynamicTool.func(testParameter);
+
+		expect(func).toHaveBeenCalledWith({ foo: testParameter });
+	});
+
+	it('should recover when JS object is passed instead of JSON', async () => {
+		const func = jest.fn();
+
+		const ctx = createMockExecuteFunction({}, mockNode);
+
+		const tool = new N8nTool(ctx, {
+			name: 'Dummy Tool',
+			description: 'A dummy tool for testing',
+			func,
+			schema: z.object({
+				foo: z.string().describe('Foo description'),
+			}),
+		});
+
+		const dynamicTool = tool.asDynamicTool();
+
+		await dynamicTool.func('{ foo: "some value" }');
+
+		expect(func).toHaveBeenCalledWith({ foo: 'some value' });
+	});
+});
diff --git a/packages/@n8n/nodes-langchain/utils/N8nTool.ts b/packages/@n8n/nodes-langchain/utils/N8nTool.ts
new file mode 100644
index 0000000000000..bb8bab08bd4fb
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/utils/N8nTool.ts
@@ -0,0 +1,113 @@
+import type { DynamicStructuredToolInput } from '@langchain/core/tools';
+import { DynamicStructuredTool, DynamicTool } from '@langchain/core/tools';
+import type { IExecuteFunctions, IDataObject } from 'n8n-workflow';
+import { NodeConnectionType, jsonParse, NodeOperationError } from 'n8n-workflow';
+import { StructuredOutputParser } from 'langchain/output_parsers';
+import type { ZodTypeAny } from 'zod';
+import { ZodBoolean, ZodNullable, ZodNumber, ZodObject, ZodOptional } from 'zod';
+
+const getSimplifiedType = (schema: ZodTypeAny) => {
+	if (schema instanceof ZodObject) {
+		return 'object';
+	} else if (schema instanceof ZodNumber) {
+		return 'number';
+	} else if (schema instanceof ZodBoolean) {
+		return 'boolean';
+	} else if (schema instanceof ZodNullable || schema instanceof ZodOptional) {
+		return getSimplifiedType(schema.unwrap());
+	}
+
+	return 'string';
+};
+
+const getParametersDescription = (parameters: Array<[string, ZodTypeAny]>) =>
+	parameters
+		.map(
+			([name, schema]) =>
+				`${name}: (description: ${schema.description ?? ''}, type: ${getSimplifiedType(schema)}, required: ${!schema.isOptional()})`,
+		)
+		.join(',\n ');
+
+export const prepareFallbackToolDescription = (toolDescription: string, schema: ZodObject<any>) => {
+	let description = `${toolDescription}`;
+
+	const toolParameters = Object.entries<ZodTypeAny>(schema.shape);
+
+	if (toolParameters.length) {
+		description += `
+Tool expects valid stringified JSON object with ${toolParameters.length} properties.
+Property names with description, type and required status:
+${getParametersDescription(toolParameters)}
+ALL parameters marked as required must be provided`;
+	}
+
+	return description;
+};
+
+export class N8nTool extends DynamicStructuredTool {
+	private context: IExecuteFunctions;
+
+	constructor(context: IExecuteFunctions, fields: DynamicStructuredToolInput) {
+		super(fields);
+
+		this.context = context;
+	}
+
+	asDynamicTool(): DynamicTool {
+		const { name, func, schema, context, description } = this;
+
+		const parser = new StructuredOutputParser(schema);
+
+		const wrappedFunc = async function (query: string) {
+			let parsedQuery: object;
+
+			// First we try to parse the query using the structured parser (Zod schema)
+			try {
+				parsedQuery = await parser.parse(query);
+			} catch (e) {
+				// If we were unable to parse the query using the schema, we try to gracefully handle it
+				let dataFromModel;
+
+				try {
+					// First we try to parse a JSON with more relaxed rules
+					dataFromModel = jsonParse<IDataObject>(query, { acceptJSObject: true });
+				} catch (error) {
+					// In case of error,
+					// If model supplied a simple string instead of an object AND only one parameter expected, we try to recover the object structure
+					if (Object.keys(schema.shape).length === 1) {
+						const parameterName = Object.keys(schema.shape)[0];
+						dataFromModel = { [parameterName]: query };
+					} else {
+						// Finally throw an error if we were unable to parse the query
+						throw new NodeOperationError(
+							context.getNode(),
+							`Input is not a valid JSON: ${error.message}`,
+						);
+					}
+				}
+
+				// If we were able to parse the query with a fallback, we try to validate it using the schema
+				// Here we will throw an error if the data still does not match the schema
+				parsedQuery = schema.parse(dataFromModel);
+			}
+
+			try {
+				// Call tool function with parsed query
+				const result = await func(parsedQuery);
+
+				return result;
+			} catch (e) {
+				const { index } = context.addInputData(NodeConnectionType.AiTool, [[{ json: { query } }]]);
+				void context.addOutputData(NodeConnectionType.AiTool, index, e);
+
+				return e.toString();
+			}
+		};
+
+		return new DynamicTool({
+			name,
+			description: prepareFallbackToolDescription(description, schema),
+			func: wrappedFunc,
+		});
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/utils/helpers.ts b/packages/@n8n/nodes-langchain/utils/helpers.ts
index c6d27ee2f69f3..673fa0402c483 100644
--- a/packages/@n8n/nodes-langchain/utils/helpers.ts
+++ b/packages/@n8n/nodes-langchain/utils/helpers.ts
@@ -1,17 +1,19 @@
-import { NodeConnectionType, NodeOperationError, jsonStringify } from 'n8n-workflow';
 import type {
 	EventNamesAiNodesType,
 	IDataObject,
 	IExecuteFunctions,
 	IWebhookFunctions,
 } from 'n8n-workflow';
+import { NodeConnectionType, NodeOperationError, jsonStringify } from 'n8n-workflow';
 import type { BaseChatModel } from '@langchain/core/language_models/chat_models';
 import type { BaseOutputParser } from '@langchain/core/output_parsers';
 import type { BaseMessage } from '@langchain/core/messages';
-import { DynamicTool, type Tool } from '@langchain/core/tools';
+import type { Tool } from '@langchain/core/tools';
 import type { BaseLLM } from '@langchain/core/language_models/llms';
 import type { BaseChatMemory } from 'langchain/memory';
 import type { BaseChatMessageHistory } from '@langchain/core/chat_history';
+import { N8nTool } from './N8nTool';
+import { DynamicTool } from '@langchain/core/tools';
 
 function hasMethods<T>(obj: unknown, ...methodNames: Array<string | symbol>): obj is T {
 	return methodNames.every(
@@ -178,7 +180,11 @@ export function serializeChatHistory(chatHistory: BaseMessage[]): string {
 		.join('\n');
 }
 
-export const getConnectedTools = async (ctx: IExecuteFunctions, enforceUniqueNames: boolean) => {
+export const getConnectedTools = async (
+	ctx: IExecuteFunctions,
+	enforceUniqueNames: boolean,
+	convertStructuredTool: boolean = true,
+) => {
 	const connectedTools =
 		((await ctx.getInputConnectionData(NodeConnectionType.AiTool, 0)) as Tool[]) || [];
 
@@ -186,8 +192,10 @@ export const getConnectedTools = async (ctx: IExecuteFunctions, enforceUniqueNam
 
 	const seenNames = new Set<string>();
 
+	const finalTools = [];
+
 	for (const tool of connectedTools) {
-		if (!(tool instanceof DynamicTool)) continue;
+		if (!(tool instanceof DynamicTool) && !(tool instanceof N8nTool)) continue;
 
 		const { name } = tool;
 		if (seenNames.has(name)) {
@@ -197,7 +205,13 @@ export const getConnectedTools = async (ctx: IExecuteFunctions, enforceUniqueNam
 			);
 		}
 		seenNames.add(name);
+
+		if (convertStructuredTool && tool instanceof N8nTool) {
+			finalTools.push(tool.asDynamicTool());
+		} else {
+			finalTools.push(tool);
+		}
 	}
 
-	return connectedTools;
+	return finalTools;
 };

From c5acbb7ec0d24ec9b30c221fa3b2fb615fb9ec7f Mon Sep 17 00:00:00 2001
From: CodeShakingSheep <19874562+CodeShakingSheep@users.noreply.github.com>
Date: Wed, 7 Aug 2024 04:38:50 -0500
Subject: [PATCH 094/168] fix(Invoice Ninja Node): Fix payment types (#10196)

---
 .../nodes/InvoiceNinja/ExpenseDescription.ts  | 206 ++++++++++++++++++
 .../nodes/InvoiceNinja/PaymentDescription.ts  | 206 ++++++++++++++++++
 2 files changed, 412 insertions(+)

diff --git a/packages/nodes-base/nodes/InvoiceNinja/ExpenseDescription.ts b/packages/nodes-base/nodes/InvoiceNinja/ExpenseDescription.ts
index 310c66b9c18ac..729c6a8b77a4b 100644
--- a/packages/nodes-base/nodes/InvoiceNinja/ExpenseDescription.ts
+++ b/packages/nodes-base/nodes/InvoiceNinja/ExpenseDescription.ts
@@ -120,6 +120,11 @@ export const expenseFields: INodeProperties[] = [
 				displayName: 'Payment Type',
 				name: 'paymentType',
 				type: 'options',
+				displayOptions: {
+					show: {
+						apiVersion: ['v4'],
+					},
+				},
 				options: [
 					{
 						name: 'ACH',
@@ -252,6 +257,207 @@ export const expenseFields: INodeProperties[] = [
 				],
 				default: 1,
 			},
+			{
+				displayName: 'Payment Type',
+				name: 'paymentType',
+				type: 'options',
+				displayOptions: {
+					show: {
+						apiVersion: ['v5'],
+					},
+				},
+				options: [
+					{
+						name: 'Bank Transfer',
+						value: 1,
+					},
+					{
+						name: 'Cash',
+						value: 2,
+					},
+					{
+						name: 'ACH',
+						value: 4,
+					},
+					{
+						name: 'Visa',
+						value: 5,
+					},
+					{
+						name: 'Mastercard',
+						value: 6,
+					},
+					{
+						name: 'American Express',
+						value: 7,
+					},
+					{
+						name: 'Discover',
+						value: 8,
+					},
+					{
+						name: 'Diners',
+						value: 9,
+					},
+					{
+						name: 'Eurocard',
+						value: 10,
+					},
+					{
+						name: 'Nova',
+						value: 11,
+					},
+					{
+						name: 'Credit Card Other',
+						value: 12,
+					},
+					{
+						name: 'PayPal',
+						value: 13,
+					},
+					{
+						name: 'Check',
+						value: 15,
+					},
+					{
+						name: 'Carte Blanche',
+						value: 16,
+					},
+					{
+						name: 'UnionPay',
+						value: 17,
+					},
+					{
+						name: 'JCB',
+						value: 18,
+					},
+					{
+						name: 'Laser',
+						value: 19,
+					},
+					{
+						name: 'Maestro',
+						value: 20,
+					},
+					{
+						name: 'Solo',
+						value: 21,
+					},
+					{
+						name: 'Switch',
+						value: 22,
+					},
+					{
+						name: 'Venmo',
+						value: 24,
+					},
+					{
+						name: 'Alipay',
+						value: 27,
+					},
+					{
+						name: 'Sofort',
+						value: 28,
+					},
+					{
+						name: 'SEPA',
+						value: 29,
+					},
+					{
+						name: 'GoCardless',
+						value: 30,
+					},
+					{
+						name: 'Crypto',
+						value: 31,
+					},
+					{
+						name: 'Credit',
+						value: 32,
+					},
+					{
+						name: 'Zelle',
+						value: 33,
+					},
+					{
+						name: 'Mollie Bank Transfer',
+						value: 34,
+					},
+					{
+						name: 'KBC',
+						value: 35,
+					},
+					{
+						name: 'Bancontact',
+						value: 36,
+					},
+					{
+						name: 'iDEAL',
+						value: 37,
+					},
+					{
+						name: 'Hosted Page',
+						value: 38,
+					},
+					{
+						name: 'Giropay',
+						value: 39,
+					},
+					{
+						name: 'Przelewy24',
+						value: 40,
+					},
+					{
+						name: 'EPS',
+						value: 41,
+					},
+					{
+						name: 'Direct Debit',
+						value: 42,
+					},
+					{
+						name: 'BECS',
+						value: 43,
+					},
+					{
+						name: 'ACSS',
+						value: 44,
+					},
+					{
+						name: 'Instant Bank Pay',
+						value: 45,
+					},
+					{
+						name: 'FPX',
+						value: 46,
+					},
+					{
+						name: 'Klarna',
+						value: 47,
+					},
+					{
+						name: 'Interac E-Transfer',
+						value: 48,
+					},
+					{
+						name: 'BACS',
+						value: 49,
+					},
+					{
+						name: 'Stripe Bank Transfer',
+						value: 50,
+					},
+					{
+						name: 'Cash App',
+						value: 51,
+					},
+					{
+						name: 'Pay Later',
+						value: 52,
+					},
+				],
+				default: 1,
+			},
 			{
 				displayName: 'Private Notes',
 				name: 'privateNotes',
diff --git a/packages/nodes-base/nodes/InvoiceNinja/PaymentDescription.ts b/packages/nodes-base/nodes/InvoiceNinja/PaymentDescription.ts
index ff1a4562598ef..17ae0938e99c5 100644
--- a/packages/nodes-base/nodes/InvoiceNinja/PaymentDescription.ts
+++ b/packages/nodes-base/nodes/InvoiceNinja/PaymentDescription.ts
@@ -94,6 +94,11 @@ export const paymentFields: INodeProperties[] = [
 				displayName: 'Payment Type',
 				name: 'paymentType',
 				type: 'options',
+				displayOptions: {
+					show: {
+						apiVersion: ['v4'],
+					},
+				},
 				options: [
 					{
 						name: 'ACH',
@@ -226,6 +231,207 @@ export const paymentFields: INodeProperties[] = [
 				],
 				default: 1,
 			},
+			{
+				displayName: 'Payment Type',
+				name: 'paymentType',
+				type: 'options',
+				displayOptions: {
+					show: {
+						apiVersion: ['v5'],
+					},
+				},
+				options: [
+					{
+						name: 'Bank Transfer',
+						value: 1,
+					},
+					{
+						name: 'Cash',
+						value: 2,
+					},
+					{
+						name: 'ACH',
+						value: 4,
+					},
+					{
+						name: 'Visa',
+						value: 5,
+					},
+					{
+						name: 'Mastercard',
+						value: 6,
+					},
+					{
+						name: 'American Express',
+						value: 7,
+					},
+					{
+						name: 'Discover',
+						value: 8,
+					},
+					{
+						name: 'Diners',
+						value: 9,
+					},
+					{
+						name: 'Eurocard',
+						value: 10,
+					},
+					{
+						name: 'Nova',
+						value: 11,
+					},
+					{
+						name: 'Credit Card Other',
+						value: 12,
+					},
+					{
+						name: 'PayPal',
+						value: 13,
+					},
+					{
+						name: 'Check',
+						value: 15,
+					},
+					{
+						name: 'Carte Blanche',
+						value: 16,
+					},
+					{
+						name: 'UnionPay',
+						value: 17,
+					},
+					{
+						name: 'JCB',
+						value: 18,
+					},
+					{
+						name: 'Laser',
+						value: 19,
+					},
+					{
+						name: 'Maestro',
+						value: 20,
+					},
+					{
+						name: 'Solo',
+						value: 21,
+					},
+					{
+						name: 'Switch',
+						value: 22,
+					},
+					{
+						name: 'Venmo',
+						value: 24,
+					},
+					{
+						name: 'Alipay',
+						value: 27,
+					},
+					{
+						name: 'Sofort',
+						value: 28,
+					},
+					{
+						name: 'SEPA',
+						value: 29,
+					},
+					{
+						name: 'GoCardless',
+						value: 30,
+					},
+					{
+						name: 'Crypto',
+						value: 31,
+					},
+					{
+						name: 'Credit',
+						value: 32,
+					},
+					{
+						name: 'Zelle',
+						value: 33,
+					},
+					{
+						name: 'Mollie Bank Transfer',
+						value: 34,
+					},
+					{
+						name: 'KBC',
+						value: 35,
+					},
+					{
+						name: 'Bancontact',
+						value: 36,
+					},
+					{
+						name: 'iDEAL',
+						value: 37,
+					},
+					{
+						name: 'Hosted Page',
+						value: 38,
+					},
+					{
+						name: 'Giropay',
+						value: 39,
+					},
+					{
+						name: 'Przelewy24',
+						value: 40,
+					},
+					{
+						name: 'EPS',
+						value: 41,
+					},
+					{
+						name: 'Direct Debit',
+						value: 42,
+					},
+					{
+						name: 'BECS',
+						value: 43,
+					},
+					{
+						name: 'ACSS',
+						value: 44,
+					},
+					{
+						name: 'Instant Bank Pay',
+						value: 45,
+					},
+					{
+						name: 'FPX',
+						value: 46,
+					},
+					{
+						name: 'Klarna',
+						value: 47,
+					},
+					{
+						name: 'Interac E-Transfer',
+						value: 48,
+					},
+					{
+						name: 'BACS',
+						value: 49,
+					},
+					{
+						name: 'Stripe Bank Transfer',
+						value: 50,
+					},
+					{
+						name: 'Cash App',
+						value: 51,
+					},
+					{
+						name: 'Pay Later',
+						value: 52,
+					},
+				],
+				default: 1,
+			},
 			{
 				displayName: 'Transfer Reference',
 				name: 'transferReference',

From 0a84e0d8b047669f5cf023c21383d01c929c5b4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20Andrieu?= <mickael.andrieu@solvolabs.com>
Date: Wed, 7 Aug 2024 11:39:44 +0200
Subject: [PATCH 095/168] feat(MongoDB Node): Add projection to query options
 on Find (#9972)

Co-authored-by: Jonathan Bennetts <jonathan.bennetts@gmail.com>
---
 packages/nodes-base/nodes/MongoDb/MongoDb.node.ts  |  6 ++++++
 .../nodes-base/nodes/MongoDb/MongoDbProperties.ts  | 14 +++++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/packages/nodes-base/nodes/MongoDb/MongoDb.node.ts b/packages/nodes-base/nodes/MongoDb/MongoDb.node.ts
index 1a200d9bd9e1d..8d5de2ea41aa5 100644
--- a/packages/nodes-base/nodes/MongoDb/MongoDb.node.ts
+++ b/packages/nodes-base/nodes/MongoDb/MongoDb.node.ts
@@ -196,6 +196,8 @@ export class MongoDb implements INodeType {
 					const options = this.getNodeParameter('options', i);
 					const limit = options.limit as number;
 					const skip = options.skip as number;
+					const projection =
+						options.projection && (JSON.parse(options.projection as string) as Document);
 					const sort = options.sort && (JSON.parse(options.sort as string) as Sort);
 
 					if (skip > 0) {
@@ -208,6 +210,10 @@ export class MongoDb implements INodeType {
 						query = query.sort(sort);
 					}
 
+					if (projection && projection instanceof Document) {
+						query = query.project(projection);
+					}
+
 					const queryResult = await query.toArray();
 
 					for (const entry of queryResult) {
diff --git a/packages/nodes-base/nodes/MongoDb/MongoDbProperties.ts b/packages/nodes-base/nodes/MongoDb/MongoDbProperties.ts
index a831bd57fa305..95b7fb93a5db9 100644
--- a/packages/nodes-base/nodes/MongoDb/MongoDbProperties.ts
+++ b/packages/nodes-base/nodes/MongoDb/MongoDbProperties.ts
@@ -151,6 +151,18 @@ export const nodeProperties: INodeProperties[] = [
 				placeholder: '{ "field": -1 }',
 				description: 'A JSON that defines the sort order of the result set',
 			},
+			{
+				displayName: 'Projection (JSON Format)',
+				name: 'projection',
+				type: 'json',
+				typeOptions: {
+					rows: 4,
+				},
+				default: '{}',
+				placeholder: '{ "_id": 0, "field": 1 }',
+				description:
+					'A JSON that defines a selection of fields to retrieve or exclude from the result set',
+			},
 		],
 	},
 	{
@@ -248,7 +260,7 @@ export const nodeProperties: INodeProperties[] = [
 				name: 'dateFields',
 				type: 'string',
 				default: '',
-				description: 'Comma separeted list of fields that will be parsed as Mongo Date type',
+				description: 'Comma-separated list of fields that will be parsed as Mongo Date type',
 			},
 			{
 				displayName: 'Use Dot Notation',

From 34334651e0e6874736a437a894176bed4590e5a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Ferrer=20Gonz=C3=A1lez?= <javier.ferrer@codely.com>
Date: Wed, 7 Aug 2024 11:40:04 +0200
Subject: [PATCH 096/168] feat(Stripe Trigger Node): Add Stripe webhook
 descriptions based on the workflow ID and name (#9956)

---
 packages/nodes-base/nodes/Stripe/StripeTrigger.node.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/nodes-base/nodes/Stripe/StripeTrigger.node.ts b/packages/nodes-base/nodes/Stripe/StripeTrigger.node.ts
index 6d2837237e4fb..fb9b3fb563b8d 100644
--- a/packages/nodes-base/nodes/Stripe/StripeTrigger.node.ts
+++ b/packages/nodes-base/nodes/Stripe/StripeTrigger.node.ts
@@ -865,12 +865,15 @@ export class StripeTrigger implements INodeType {
 			async create(this: IHookFunctions): Promise<boolean> {
 				const webhookUrl = this.getNodeWebhookUrl('default');
 
+				const webhookDescription = `Created by n8n for workflow ID: ${this.getWorkflow().id}`;
+
 				const events = this.getNodeParameter('events', []);
 
 				const endpoint = '/webhook_endpoints';
 
 				const body = {
 					url: webhookUrl,
+					description: webhookDescription,
 					enabled_events: events,
 				};
 

From bf8f848645dfd31527713a55bd1fc93865327017 Mon Sep 17 00:00:00 2001
From: pemontto <939704+pemontto@users.noreply.github.com>
Date: Wed, 7 Aug 2024 10:42:07 +0100
Subject: [PATCH 097/168] feat(Elasticsearch Node): Add bulk operations for
 Elasticsearch (#9940)

---
 .../Elasticsearch/Elasticsearch.node.ts       | 137 +++++++++++++++---
 .../Elastic/Elasticsearch/GenericFunctions.ts |  50 ++++++-
 .../descriptions/DocumentDescription.ts       |  36 +++++
 3 files changed, 202 insertions(+), 21 deletions(-)

diff --git a/packages/nodes-base/nodes/Elastic/Elasticsearch/Elasticsearch.node.ts b/packages/nodes-base/nodes/Elastic/Elasticsearch/Elasticsearch.node.ts
index c209b84538bff..d94ac77725464 100644
--- a/packages/nodes-base/nodes/Elastic/Elasticsearch/Elasticsearch.node.ts
+++ b/packages/nodes-base/nodes/Elastic/Elasticsearch/Elasticsearch.node.ts
@@ -4,11 +4,16 @@ import type {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	JsonObject,
 } from 'n8n-workflow';
-import { jsonParse } from 'n8n-workflow';
+import { jsonParse, NodeApiError } from 'n8n-workflow';
 
 import omit from 'lodash/omit';
-import { elasticsearchApiRequest, elasticsearchApiRequestAllItems } from './GenericFunctions';
+import {
+	elasticsearchApiRequest,
+	elasticsearchApiRequestAllItems,
+	elasticsearchBulkApiRequest,
+} from './GenericFunctions';
 
 import { documentFields, documentOperations, indexFields, indexOperations } from './descriptions';
 
@@ -68,12 +73,14 @@ export class Elasticsearch implements INodeType {
 
 		let responseData;
 
+		let bulkBody: IDataObject = {};
+
 		for (let i = 0; i < items.length; i++) {
+			const bulkOperation = this.getNodeParameter('options.bulkOperation', i, false);
 			if (resource === 'document') {
 				// **********************************************************************
 				//                                document
 				// **********************************************************************
-
 				if (operation === 'delete') {
 					// ----------------------------------------
 					//             document: delete
@@ -84,8 +91,17 @@ export class Elasticsearch implements INodeType {
 					const indexId = this.getNodeParameter('indexId', i);
 					const documentId = this.getNodeParameter('documentId', i);
 
-					const endpoint = `/${indexId}/_doc/${documentId}`;
-					responseData = await elasticsearchApiRequest.call(this, 'DELETE', endpoint);
+					if (bulkOperation) {
+						bulkBody[i] = JSON.stringify({
+							delete: {
+								_index: indexId,
+								_id: documentId,
+							},
+						});
+					} else {
+						const endpoint = `/${indexId}/_doc/${documentId}`;
+						responseData = await elasticsearchApiRequest.call(this, 'DELETE', endpoint);
+					}
 				} else if (operation === 'get') {
 					// ----------------------------------------
 					//              document: get
@@ -223,12 +239,22 @@ export class Elasticsearch implements INodeType {
 					const indexId = this.getNodeParameter('indexId', i);
 					const { documentId } = additionalFields;
 
-					if (documentId) {
-						const endpoint = `/${indexId}/_doc/${documentId}`;
-						responseData = await elasticsearchApiRequest.call(this, 'PUT', endpoint, body);
+					if (bulkOperation) {
+						bulkBody[i] = JSON.stringify({
+							index: {
+								_index: indexId,
+								_id: documentId,
+							},
+						});
+						bulkBody[i] += `\n${JSON.stringify(body)}`;
 					} else {
-						const endpoint = `/${indexId}/_doc`;
-						responseData = await elasticsearchApiRequest.call(this, 'POST', endpoint, body);
+						if (documentId) {
+							const endpoint = `/${indexId}/_doc/${documentId}`;
+							responseData = await elasticsearchApiRequest.call(this, 'PUT', endpoint, body);
+						} else {
+							const endpoint = `/${indexId}/_doc`;
+							responseData = await elasticsearchApiRequest.call(this, 'POST', endpoint, body);
+						}
 					}
 				} else if (operation === 'update') {
 					// ----------------------------------------
@@ -261,7 +287,17 @@ export class Elasticsearch implements INodeType {
 					const documentId = this.getNodeParameter('documentId', i);
 
 					const endpoint = `/${indexId}/_update/${documentId}`;
-					responseData = await elasticsearchApiRequest.call(this, 'POST', endpoint, body);
+					if (bulkOperation) {
+						bulkBody[i] = JSON.stringify({
+							update: {
+								_index: indexId,
+								_id: documentId,
+							},
+						});
+						bulkBody[i] += `\n${JSON.stringify(body)}`;
+					} else {
+						responseData = await elasticsearchApiRequest.call(this, 'POST', endpoint, body);
+					}
 				}
 			} else if (resource === 'index') {
 				// **********************************************************************
@@ -341,13 +377,80 @@ export class Elasticsearch implements INodeType {
 					}
 				}
 			}
-			const executionData = this.helpers.constructExecutionMetaData(
-				this.helpers.returnJsonArray(responseData as IDataObject[]),
-				{ itemData: { item: i } },
-			);
-			returnData.push(...executionData);
-		}
 
+			if (!bulkOperation) {
+				const executionData = this.helpers.constructExecutionMetaData(
+					this.helpers.returnJsonArray(responseData as IDataObject[]),
+					{ itemData: { item: i } },
+				);
+				returnData.push(...executionData);
+			}
+			if (Object.keys(bulkBody).length >= 50) {
+				responseData = (await elasticsearchBulkApiRequest.call(this, bulkBody)) as IDataObject[];
+				for (let j = 0; j < responseData.length; j++) {
+					const itemData = responseData[j];
+					if (itemData.error) {
+						const errorData = itemData.error as IDataObject;
+						const message = errorData.type as string;
+						const description = errorData.reason as string;
+						const itemIndex = parseInt(Object.keys(bulkBody)[j]);
+						if (this.continueOnFail()) {
+							returnData.push(
+								...this.helpers.constructExecutionMetaData(
+									this.helpers.returnJsonArray({ error: message, message: itemData.error }),
+									{ itemData: { item: itemIndex } },
+								),
+							);
+							continue;
+						} else {
+							throw new NodeApiError(this.getNode(), {
+								message,
+								description,
+								itemIndex,
+							} as JsonObject);
+						}
+					}
+					const executionData = this.helpers.constructExecutionMetaData(
+						this.helpers.returnJsonArray(itemData),
+						{ itemData: { item: parseInt(Object.keys(bulkBody)[j]) } },
+					);
+					returnData.push(...executionData);
+				}
+				bulkBody = {};
+			}
+		}
+		if (Object.keys(bulkBody).length) {
+			responseData = (await elasticsearchBulkApiRequest.call(this, bulkBody)) as IDataObject[];
+			for (let j = 0; j < responseData.length; j++) {
+				const itemData = responseData[j];
+				if (itemData.error) {
+					const errorData = itemData.error as IDataObject;
+					const message = errorData.type as string;
+					const description = errorData.reason as string;
+					const itemIndex = parseInt(Object.keys(bulkBody)[j]);
+					if (this.continueOnFail()) {
+						returnData.push(
+							...this.helpers.constructExecutionMetaData(
+								this.helpers.returnJsonArray({ error: message, message: itemData.error }),
+								{ itemData: { item: itemIndex } },
+							),
+						);
+						continue;
+					} else {
+						throw new NodeApiError(this.getNode(), {
+							message,
+							description,
+							itemIndex,
+						} as JsonObject);
+					}
+				}
+				const executionData = this.helpers.constructExecutionMetaData(
+					this.helpers.returnJsonArray(itemData),
+					{ itemData: { item: parseInt(Object.keys(bulkBody)[j]) } },
+				);
+				returnData.push(...executionData);
+			}
+		}
 		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Elastic/Elasticsearch/GenericFunctions.ts b/packages/nodes-base/nodes/Elastic/Elasticsearch/GenericFunctions.ts
index ed013079f8cc6..642ce1484fe4f 100644
--- a/packages/nodes-base/nodes/Elastic/Elasticsearch/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Elastic/Elasticsearch/GenericFunctions.ts
@@ -2,13 +2,55 @@ import type {
 	IExecuteFunctions,
 	IDataObject,
 	JsonObject,
-	IRequestOptions,
+	IHttpRequestOptions,
 	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import type { ElasticsearchApiCredentials } from './types';
 
+export async function elasticsearchBulkApiRequest(this: IExecuteFunctions, body: IDataObject) {
+	const { baseUrl, ignoreSSLIssues } = (await this.getCredentials(
+		'elasticsearchApi',
+	)) as ElasticsearchApiCredentials;
+
+	const bulkBody = Object.values(body).flat().join('\n') + '\n';
+
+	const options: IHttpRequestOptions = {
+		method: 'POST',
+		headers: { 'Content-Type': 'application/x-ndjson' },
+		body: bulkBody,
+		url: `${baseUrl}/_bulk`,
+		skipSslCertificateValidation: ignoreSSLIssues,
+		returnFullResponse: true,
+		ignoreHttpStatusErrors: true,
+	};
+
+	const response = await this.helpers.httpRequestWithAuthentication.call(
+		this,
+		'elasticsearchApi',
+		options,
+	);
+
+	if (response.statusCode > 299) {
+		if (this.continueOnFail()) {
+			return Object.values(body).map((_) => ({ error: response.body.error }));
+		} else {
+			throw new NodeApiError(this.getNode(), { error: response.body.error } as JsonObject);
+		}
+	}
+
+	return response.body.items.map((item: IDataObject) => {
+		return {
+			...(item.index as IDataObject),
+			...(item.update as IDataObject),
+			...(item.create as IDataObject),
+			...(item.delete as IDataObject),
+			...(item.error as IDataObject),
+		};
+	});
+}
+
 export async function elasticsearchApiRequest(
 	this: IExecuteFunctions,
 	method: IHttpRequestMethods,
@@ -20,13 +62,13 @@ export async function elasticsearchApiRequest(
 		'elasticsearchApi',
 	)) as ElasticsearchApiCredentials;
 
-	const options: IRequestOptions = {
+	const options: IHttpRequestOptions = {
 		method,
 		body,
 		qs,
-		uri: `${baseUrl}${endpoint}`,
+		url: `${baseUrl}${endpoint}`,
 		json: true,
-		rejectUnauthorized: !ignoreSSLIssues,
+		skipSslCertificateValidation: ignoreSSLIssues,
 	};
 
 	if (!Object.keys(body).length) {
diff --git a/packages/nodes-base/nodes/Elastic/Elasticsearch/descriptions/DocumentDescription.ts b/packages/nodes-base/nodes/Elastic/Elasticsearch/descriptions/DocumentDescription.ts
index 86cefdf4bd16a..3a446243ace73 100644
--- a/packages/nodes-base/nodes/Elastic/Elasticsearch/descriptions/DocumentDescription.ts
+++ b/packages/nodes-base/nodes/Elastic/Elasticsearch/descriptions/DocumentDescription.ts
@@ -81,6 +81,28 @@ export const documentFields: INodeProperties[] = [
 			},
 		},
 	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['document'],
+				operation: ['delete'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Bulk Delete',
+				name: 'bulkOperation',
+				type: 'boolean',
+				default: false,
+				description: 'Whether to use the bulk operation to delete the document/s',
+			},
+		],
+	},
 
 	// ----------------------------------------
 	//              document: get
@@ -644,6 +666,13 @@ export const documentFields: INodeProperties[] = [
 			},
 		},
 		options: [
+			{
+				displayName: 'Bulk Create',
+				name: 'bulkOperation',
+				type: 'boolean',
+				default: false,
+				description: 'Whether to use the bulk operation to create the document/s',
+			},
 			{
 				displayName: 'Pipeline ID',
 				name: 'pipeline',
@@ -802,6 +831,13 @@ export const documentFields: INodeProperties[] = [
 			},
 		},
 		options: [
+			{
+				displayName: 'Bulk Update',
+				name: 'bulkOperation',
+				type: 'boolean',
+				default: false,
+				description: 'Whether to use the bulk operation to update the document/s',
+			},
 			{
 				displayName: 'Refresh',
 				name: 'refresh',

From 89cd12bb6cc0b914e015401c0a2f583f3a971b1d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 7 Aug 2024 13:17:18 +0300
Subject: [PATCH 098/168] :rocket: Release 1.54.0 (#10315)

Co-authored-by: tomi <tomi@users.noreply.github.com>
---
 CHANGELOG.md                               | 41 ++++++++++++++++++++++
 package.json                               |  2 +-
 packages/@n8n/chat/package.json            |  2 +-
 packages/@n8n/config/package.json          |  2 +-
 packages/@n8n/nodes-langchain/package.json |  2 +-
 packages/cli/package.json                  |  2 +-
 packages/core/package.json                 |  2 +-
 packages/design-system/package.json        |  2 +-
 packages/editor-ui/package.json            |  2 +-
 packages/node-dev/package.json             |  2 +-
 packages/nodes-base/package.json           |  2 +-
 packages/workflow/package.json             |  2 +-
 12 files changed, 52 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 986b85b0682ea..99120642fe416 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,44 @@
+# [1.54.0](https://github.com/n8n-io/n8n/compare/n8n@1.53.0...n8n@1.54.0) (2024-08-07)
+
+
+### Bug Fixes
+
+* **core:** Ensure OAuth token data is not stubbed in source control ([#10302](https://github.com/n8n-io/n8n/issues/10302)) ([98115e9](https://github.com/n8n-io/n8n/commit/98115e95df8289a8ec400a570a7f256382f8e286))
+* **core:** Fix expressions in webhook nodes(Form, Webhook) to access previous node's data ([#10247](https://github.com/n8n-io/n8n/issues/10247)) ([88a1701](https://github.com/n8n-io/n8n/commit/88a170176a3447e7f847e9cf145aeb867b1c5fcf))
+* **core:** Fix user telemetry bugs ([#10293](https://github.com/n8n-io/n8n/issues/10293)) ([42a0b59](https://github.com/n8n-io/n8n/commit/42a0b594d6ea2527c55a2aa9976c904cf70ecf92))
+* **core:** Make execution and its data creation atomic ([#10276](https://github.com/n8n-io/n8n/issues/10276)) ([ae50bb9](https://github.com/n8n-io/n8n/commit/ae50bb95a8e5bf1cdbf9483da54b84094b82e260))
+* **core:** Make OAuth1/OAuth2 callback not require auth ([#10263](https://github.com/n8n-io/n8n/issues/10263)) ([a8e2774](https://github.com/n8n-io/n8n/commit/a8e2774f5382e202556b5506c7788265786aa973))
+* **core:** Revert transactions until we remove the legacy sqlite driver  ([#10299](https://github.com/n8n-io/n8n/issues/10299)) ([1eba7c3](https://github.com/n8n-io/n8n/commit/1eba7c3c763ac5b6b28c1c6fc43fc8c215249292))
+* **core:** Surface enterprise trial error message ([#10267](https://github.com/n8n-io/n8n/issues/10267)) ([432ac1d](https://github.com/n8n-io/n8n/commit/432ac1da59e173ce4c0f2abbc416743d9953ba70))
+* **core:** Upgrade tournament to address some XSS vulnerabilities ([#10277](https://github.com/n8n-io/n8n/issues/10277)) ([43ae159](https://github.com/n8n-io/n8n/commit/43ae159ea40c574f8e41bdfd221ab2bf3268eee7))
+* **core:** VM2 sandbox should not throw on `new Promise` ([#10298](https://github.com/n8n-io/n8n/issues/10298)) ([7e95f9e](https://github.com/n8n-io/n8n/commit/7e95f9e2e40a99871f1b6abcdacb39ac5f857332))
+* **core:** Webhook and form baseUrl missing ([#10290](https://github.com/n8n-io/n8n/issues/10290)) ([8131d66](https://github.com/n8n-io/n8n/commit/8131d66f8ca1b1da00597a12859ee4372148a0c9))
+* **editor:** Enable moving resources only if team projects are available by the license ([#10271](https://github.com/n8n-io/n8n/issues/10271)) ([42ba884](https://github.com/n8n-io/n8n/commit/42ba8841c401126c77158a53dc8fcbb45dfce8fd))
+* **editor:** Fix execution retry button ([#10275](https://github.com/n8n-io/n8n/issues/10275)) ([55f2ffe](https://github.com/n8n-io/n8n/commit/55f2ffe256c91a028cee95c3bbb37a093a1c0f81))
+* **editor:** Update design system Avatar component to show initials also when only firstName or lastName is given ([#10308](https://github.com/n8n-io/n8n/issues/10308)) ([46bbf09](https://github.com/n8n-io/n8n/commit/46bbf09beacad12472d91786b91d845fe2afb26d))
+* **editor:** Update tags filter/editor to not show non existing tag as a selectable option ([#10297](https://github.com/n8n-io/n8n/issues/10297)) ([557a76e](https://github.com/n8n-io/n8n/commit/557a76ec2326de72fb7a8b46fc4353f8fd9b591d))
+* **Invoice Ninja Node:** Fix payment types ([#10196](https://github.com/n8n-io/n8n/issues/10196)) ([c5acbb7](https://github.com/n8n-io/n8n/commit/c5acbb7ec0d24ec9b30c221fa3b2fb615fb9ec7f))
+* Loop node no input data shown ([#10224](https://github.com/n8n-io/n8n/issues/10224)) ([c8ee852](https://github.com/n8n-io/n8n/commit/c8ee852159207be0cfe2c3e0ee8e7b29d838aa35))
+
+
+### Features
+
+* **core:** Allow filtering executions and users by project in Public API  ([#10250](https://github.com/n8n-io/n8n/issues/10250)) ([7056e50](https://github.com/n8n-io/n8n/commit/7056e50b006bda665f64ce6234c5c1967891c415))
+* **core:** Allow transferring credentials in Public API ([#10259](https://github.com/n8n-io/n8n/issues/10259)) ([07d7b24](https://github.com/n8n-io/n8n/commit/07d7b247f02a9d7185beca7817deb779a3d665dd))
+* **core:** Show sub-node error on the logs pane. Open logs pane on sub-node error ([#10248](https://github.com/n8n-io/n8n/issues/10248)) ([57d1c9a](https://github.com/n8n-io/n8n/commit/57d1c9a99e97308f2f1b8ae05ac3861a835e8e5a))
+* **core:** Support community packages in scaling-mode  ([#10228](https://github.com/n8n-io/n8n/issues/10228)) ([88086a4](https://github.com/n8n-io/n8n/commit/88086a41ff5b804b35aa9d9503dc2d48836fe4ec))
+* **core:** Support create, delete, edit role for users in Public API ([#10279](https://github.com/n8n-io/n8n/issues/10279)) ([84efbd9](https://github.com/n8n-io/n8n/commit/84efbd9b9c51f536b21a4f969ab607d277bef692))
+* **core:** Support create, read, update, delete projects in Public API ([#10269](https://github.com/n8n-io/n8n/issues/10269)) ([489ce10](https://github.com/n8n-io/n8n/commit/489ce100634c3af678fb300e9a39d273042542e6))
+* **editor:** Auto-add LLM chain for new LLM nodes on empty canvas ([#10245](https://github.com/n8n-io/n8n/issues/10245)) ([06419d9](https://github.com/n8n-io/n8n/commit/06419d9483ae916e79aace6d8c17e265b419b15d))
+* **Elasticsearch Node:** Add bulk operations for Elasticsearch ([#9940](https://github.com/n8n-io/n8n/issues/9940)) ([bf8f848](https://github.com/n8n-io/n8n/commit/bf8f848645dfd31527713a55bd1fc93865327017))
+* **Lemlist Trigger Node:** Update Trigger events ([#10311](https://github.com/n8n-io/n8n/issues/10311)) ([15f10ec](https://github.com/n8n-io/n8n/commit/15f10ec325cb5eda0f952bed3a5f171dd91bc639))
+* **MongoDB Node:** Add projection to query options on Find ([#9972](https://github.com/n8n-io/n8n/issues/9972)) ([0a84e0d](https://github.com/n8n-io/n8n/commit/0a84e0d8b047669f5cf023c21383d01c929c5b4f))
+* **Postgres Chat Memory, Redis Chat Memory, Xata:** Add support for context window length ([#10203](https://github.com/n8n-io/n8n/issues/10203)) ([e3edeaa](https://github.com/n8n-io/n8n/commit/e3edeaa03526f041d15d1099ea91869e38a0decc))
+* **Stripe Trigger Node:** Add Stripe webhook descriptions based on the workflow ID and name ([#9956](https://github.com/n8n-io/n8n/issues/9956)) ([3433465](https://github.com/n8n-io/n8n/commit/34334651e0e6874736a437a894176bed4590e5a7))
+* **Webflow Node:** Update to use the v2 API ([#9996](https://github.com/n8n-io/n8n/issues/9996)) ([6d8323f](https://github.com/n8n-io/n8n/commit/6d8323fadea8af04483eb1a873df0cf3ccc2a891))
+
+
+
 # [1.53.0](https://github.com/n8n-io/n8n/compare/n8n@1.52.0...n8n@1.53.0) (2024-07-31)
 
 
diff --git a/package.json b/package.json
index e05eeb9845f1b..d4a208385b4cd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-monorepo",
-  "version": "1.53.0",
+  "version": "1.54.0",
   "private": true,
   "engines": {
     "node": ">=20.15",
diff --git a/packages/@n8n/chat/package.json b/packages/@n8n/chat/package.json
index 5ba8a1c39f201..f960f16783bb7 100644
--- a/packages/@n8n/chat/package.json
+++ b/packages/@n8n/chat/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@n8n/chat",
-  "version": "0.22.0",
+  "version": "0.23.0",
   "scripts": {
     "dev": "pnpm run storybook",
     "build": "pnpm build:vite && pnpm build:bundle",
diff --git a/packages/@n8n/config/package.json b/packages/@n8n/config/package.json
index a4abfa677adc1..e28090e49b9d2 100644
--- a/packages/@n8n/config/package.json
+++ b/packages/@n8n/config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@n8n/config",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "scripts": {
     "clean": "rimraf dist .turbo",
     "dev": "pnpm watch",
diff --git a/packages/@n8n/nodes-langchain/package.json b/packages/@n8n/nodes-langchain/package.json
index 899f5d016ff4d..b5d73d1862501 100644
--- a/packages/@n8n/nodes-langchain/package.json
+++ b/packages/@n8n/nodes-langchain/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@n8n/n8n-nodes-langchain",
-  "version": "1.53.0",
+  "version": "1.54.0",
   "description": "",
   "main": "index.js",
   "scripts": {
diff --git a/packages/cli/package.json b/packages/cli/package.json
index ca8f192e40152..fb6983f4b407a 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n",
-  "version": "1.53.0",
+  "version": "1.54.0",
   "description": "n8n Workflow Automation Tool",
   "main": "dist/index",
   "types": "dist/index.d.ts",
diff --git a/packages/core/package.json b/packages/core/package.json
index dfcc23db99d92..1f857b47e5ea5 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-core",
-  "version": "1.53.0",
+  "version": "1.54.0",
   "description": "Core functionality of n8n",
   "main": "dist/index",
   "types": "dist/index.d.ts",
diff --git a/packages/design-system/package.json b/packages/design-system/package.json
index 386a7e1e862c8..694aa546d54ee 100644
--- a/packages/design-system/package.json
+++ b/packages/design-system/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-design-system",
-  "version": "1.43.0",
+  "version": "1.44.0",
   "main": "src/main.ts",
   "import": "src/main.ts",
   "scripts": {
diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json
index caf156fa83c9e..51507fe73eaae 100644
--- a/packages/editor-ui/package.json
+++ b/packages/editor-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-editor-ui",
-  "version": "1.53.0",
+  "version": "1.54.0",
   "description": "Workflow Editor UI for n8n",
   "main": "index.js",
   "scripts": {
diff --git a/packages/node-dev/package.json b/packages/node-dev/package.json
index d7b16155a1aa5..cd77936f1376d 100644
--- a/packages/node-dev/package.json
+++ b/packages/node-dev/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-node-dev",
-  "version": "1.53.0",
+  "version": "1.54.0",
   "description": "CLI to simplify n8n credentials/node development",
   "main": "dist/src/index",
   "types": "dist/src/index.d.ts",
diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index d3c73d1f04ed0..4287724cf1076 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-nodes-base",
-  "version": "1.53.0",
+  "version": "1.54.0",
   "description": "Base nodes of n8n",
   "main": "index.js",
   "scripts": {
diff --git a/packages/workflow/package.json b/packages/workflow/package.json
index 77348f2a945e1..96ad730e0fbfa 100644
--- a/packages/workflow/package.json
+++ b/packages/workflow/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-workflow",
-  "version": "1.52.0",
+  "version": "1.53.0",
   "description": "Workflow base code of n8n",
   "main": "dist/index.js",
   "module": "src/index.ts",

From f744d7c100be68669d9a3efd0033dd371a3cfaf7 Mon Sep 17 00:00:00 2001
From: Ria Scholz <123465523+mariaremote@users.noreply.github.com>
Date: Wed, 7 Aug 2024 12:48:14 +0200
Subject: [PATCH 099/168] feat(MySQL Node): Return decimal types as numbers
 (#10313)

---
 .../nodes/MySql/v2/actions/common.descriptions.ts      | 10 ++++++++++
 packages/nodes-base/nodes/MySql/v2/transport/index.ts  |  5 +++++
 2 files changed, 15 insertions(+)

diff --git a/packages/nodes-base/nodes/MySql/v2/actions/common.descriptions.ts b/packages/nodes-base/nodes/MySql/v2/actions/common.descriptions.ts
index 67a1eda87eb5f..12f8ffd2427ef 100644
--- a/packages/nodes-base/nodes/MySql/v2/actions/common.descriptions.ts
+++ b/packages/nodes-base/nodes/MySql/v2/actions/common.descriptions.ts
@@ -134,6 +134,16 @@ export const optionsCollection: INodeProperties = {
 				show: { '/operation': ['select', 'executeQuery'] },
 			},
 		},
+		{
+			displayName: 'Output Decimals as Numbers',
+			name: 'decimalNumbers',
+			type: 'boolean',
+			default: false,
+			description: 'Whether to output DECIMAL types as numbers instead of strings',
+			displayOptions: {
+				show: { '/operation': ['select', 'executeQuery'] },
+			},
+		},
 		{
 			displayName: 'Priority',
 			name: 'priority',
diff --git a/packages/nodes-base/nodes/MySql/v2/transport/index.ts b/packages/nodes-base/nodes/MySql/v2/transport/index.ts
index cbb373a52436e..f9e50fcb8f6e2 100644
--- a/packages/nodes-base/nodes/MySql/v2/transport/index.ts
+++ b/packages/nodes-base/nodes/MySql/v2/transport/index.ts
@@ -24,6 +24,7 @@ export async function createPool(
 		password: credentials.password,
 		multipleStatements: true,
 		supportBigNumbers: true,
+		decimalNumbers: false,
 	};
 
 	if (credentials.ssl) {
@@ -55,6 +56,10 @@ export async function createPool(
 		connectionOptions.bigNumberStrings = true;
 	}
 
+	if (options?.decimalNumbers === true) {
+		connectionOptions.decimalNumbers = true;
+	}
+
 	if (!credentials.sshTunnel) {
 		return mysql2.createPool(connectionOptions);
 	} else {

From ee968b71635a120dd85b2e88b5508ee059d26204 Mon Sep 17 00:00:00 2001
From: Mutasem Aldmour <4711238+mutdmour@users.noreply.github.com>
Date: Wed, 7 Aug 2024 12:52:42 +0200
Subject: [PATCH 100/168] fix(editor): Remove body padding from storybook
 previews (no-changelog) (#10317)

---
 packages/design-system/.storybook/storybook.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/design-system/.storybook/storybook.scss b/packages/design-system/.storybook/storybook.scss
index 86a675f90cff2..16aaf700f403e 100644
--- a/packages/design-system/.storybook/storybook.scss
+++ b/packages/design-system/.storybook/storybook.scss
@@ -15,3 +15,7 @@
 #storybook-root > * {
 	margin: var(--spacing-5xs);
 }
+
+body {
+	padding: 0 !important;
+}

From e31d017bddac88c46a462811cb74a782bb6ffb61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Wed, 7 Aug 2024 13:50:46 +0200
Subject: [PATCH 101/168] refactor(core): Centralize scaling mode
 (no-changelog) (#9835)

---
 packages/cli/src/Interfaces.ts                |   4 +-
 packages/cli/src/Queue.ts                     | 166 -----------
 packages/cli/src/Server.ts                    |   4 +-
 packages/cli/src/WorkflowRunner.ts            |  23 +-
 packages/cli/src/commands/webhook.ts          |   4 +-
 packages/cli/src/commands/worker.ts           | 257 ++----------------
 .../cli/src/errors/max-stalled-count.error.ts |   2 +-
 .../__tests__/execution.service.test.ts       |  24 +-
 .../executions/execution-recovery.service.ts  |   6 +-
 .../cli/src/executions/execution.service.ts   |  10 +-
 packages/cli/src/scaling/constants.ts         |   3 +
 packages/cli/src/scaling/job-processor.ts     | 182 +++++++++++++
 packages/cli/src/scaling/scaling.service.ts   | 213 +++++++++++++++
 packages/cli/src/scaling/types.ts             |  55 ++++
 .../services/orchestration/worker/types.ts    |   5 +-
 packages/cli/src/webhooks/WebhookHelpers.ts   |  13 -
 .../integration/commands/worker.cmd.test.ts   |  11 +-
 17 files changed, 529 insertions(+), 453 deletions(-)
 delete mode 100644 packages/cli/src/Queue.ts
 create mode 100644 packages/cli/src/scaling/constants.ts
 create mode 100644 packages/cli/src/scaling/job-processor.ts
 create mode 100644 packages/cli/src/scaling/scaling.service.ts
 create mode 100644 packages/cli/src/scaling/types.ts

diff --git a/packages/cli/src/Interfaces.ts b/packages/cli/src/Interfaces.ts
index 9a1fdc367f4b5..73b1e99ec6559 100644
--- a/packages/cli/src/Interfaces.ts
+++ b/packages/cli/src/Interfaces.ts
@@ -42,7 +42,7 @@ import type { WorkflowRepository } from '@db/repositories/workflow.repository';
 import type { ExternalHooks } from './ExternalHooks';
 import type { LICENSE_FEATURES, LICENSE_QUOTAS } from './constants';
 import type { WorkflowWithSharingsAndCredentials } from './workflows/workflows.types';
-import type { WorkerJobStatusSummary } from './services/orchestration/worker/types';
+import type { RunningJobSummary } from './scaling/types';
 import type { Scope } from '@n8n/permissions';
 
 export interface ICredentialsTypeData {
@@ -420,7 +420,7 @@ export interface IPushDataWorkerStatusMessage {
 
 export interface IPushDataWorkerStatusPayload {
 	workerId: string;
-	runningJobsSummary: WorkerJobStatusSummary[];
+	runningJobsSummary: RunningJobSummary[];
 	freeMem: number;
 	totalMem: number;
 	uptime: number;
diff --git a/packages/cli/src/Queue.ts b/packages/cli/src/Queue.ts
deleted file mode 100644
index 11cfed839bee7..0000000000000
--- a/packages/cli/src/Queue.ts
+++ /dev/null
@@ -1,166 +0,0 @@
-import type Bull from 'bull';
-import Container, { Service } from 'typedi';
-import {
-	ApplicationError,
-	BINARY_ENCODING,
-	type IDataObject,
-	type ExecutionError,
-	type IExecuteResponsePromiseData,
-} from 'n8n-workflow';
-import { ActiveExecutions } from '@/ActiveExecutions';
-import config from '@/config';
-import { OnShutdown } from './decorators/OnShutdown';
-import { HIGHEST_SHUTDOWN_PRIORITY } from './constants';
-
-export type JobId = Bull.JobId;
-export type Job = Bull.Job<JobData>;
-export type JobQueue = Bull.Queue<JobData>;
-
-export interface JobData {
-	executionId: string;
-	loadStaticData: boolean;
-}
-
-export interface JobResponse {
-	success: boolean;
-	error?: ExecutionError;
-}
-
-export interface WebhookResponse {
-	executionId: string;
-	response: IExecuteResponsePromiseData;
-}
-
-@Service()
-export class Queue {
-	private jobQueue: JobQueue;
-
-	/**
-	 * The number of jobs a single server can process concurrently
-	 * Any worker that wants to process executions must first set this to a non-zero value
-	 */
-	private concurrency = 0;
-
-	setConcurrency(concurrency: number) {
-		this.concurrency = concurrency;
-		// This sets the max event listeners on the jobQueue EventEmitter to prevent the logs getting flooded with MaxListenersExceededWarning
-		// see: https://github.com/OptimalBits/bull/blob/develop/lib/job.js#L497-L521
-		this.jobQueue.setMaxListeners(
-			4 + // `close`
-				2 + // `error`
-				2 + // `global:progress`
-				concurrency * 2, // 2 global events for every call to `job.finished()`
-		);
-	}
-
-	constructor(private activeExecutions: ActiveExecutions) {}
-
-	async init() {
-		const { default: Bull } = await import('bull');
-		const { RedisClientService } = await import('@/services/redis/redis-client.service');
-
-		const redisClientService = Container.get(RedisClientService);
-
-		const bullPrefix = config.getEnv('queue.bull.prefix');
-		const prefix = redisClientService.toValidPrefix(bullPrefix);
-
-		this.jobQueue = new Bull('jobs', {
-			prefix,
-			settings: config.get('queue.bull.settings'),
-			createClient: (type) => redisClientService.createClient({ type: `${type}(bull)` }),
-		});
-
-		this.jobQueue.on('global:progress', (_jobId, progress: WebhookResponse) => {
-			this.activeExecutions.resolveResponsePromise(
-				progress.executionId,
-				this.decodeWebhookResponse(progress.response),
-			);
-		});
-	}
-
-	async findRunningJobBy({ executionId }: { executionId: string }) {
-		const activeOrWaitingJobs = await this.getJobs(['active', 'waiting']);
-
-		return activeOrWaitingJobs.find(({ data }) => data.executionId === executionId) ?? null;
-	}
-
-	decodeWebhookResponse(response: IExecuteResponsePromiseData): IExecuteResponsePromiseData {
-		if (
-			typeof response === 'object' &&
-			typeof response.body === 'object' &&
-			(response.body as IDataObject)['__@N8nEncodedBuffer@__']
-		) {
-			response.body = Buffer.from(
-				(response.body as IDataObject)['__@N8nEncodedBuffer@__'] as string,
-				BINARY_ENCODING,
-			);
-		}
-
-		return response;
-	}
-
-	async add(jobData: JobData, jobOptions: object): Promise<Job> {
-		return await this.jobQueue.add(jobData, jobOptions);
-	}
-
-	async getJob(jobId: JobId): Promise<Job | null> {
-		return await this.jobQueue.getJob(jobId);
-	}
-
-	async getJobs(jobTypes: Bull.JobStatus[]): Promise<Job[]> {
-		return await this.jobQueue.getJobs(jobTypes);
-	}
-
-	/**
-	 * Get IDs of executions that are currently in progress in the queue.
-	 */
-	async getInProgressExecutionIds() {
-		const inProgressJobs = await this.getJobs(['active', 'waiting']);
-
-		return new Set(inProgressJobs.map((job) => job.data.executionId));
-	}
-
-	async process(fn: Bull.ProcessCallbackFunction<JobData>): Promise<void> {
-		return await this.jobQueue.process(this.concurrency, fn);
-	}
-
-	async ping(): Promise<string> {
-		return await this.jobQueue.client.ping();
-	}
-
-	@OnShutdown(HIGHEST_SHUTDOWN_PRIORITY)
-	// Stop accepting new jobs, `doNotWaitActive` allows reporting progress
-	async pause(): Promise<void> {
-		return await this.jobQueue?.pause(true, true);
-	}
-
-	getBullObjectInstance(): JobQueue {
-		if (this.jobQueue === undefined) {
-			// if queue is not initialized yet throw an error, since we do not want to hand around an undefined queue
-			throw new ApplicationError('Queue is not initialized yet!');
-		}
-		return this.jobQueue;
-	}
-
-	/**
-	 *
-	 * @param job A Job instance
-	 * @returns boolean true if we were able to securely stop the job
-	 */
-	async stopJob(job: Job): Promise<boolean> {
-		if (await job.isActive()) {
-			// Job is already running so tell it to stop
-			await job.progress(-1);
-			return true;
-		}
-		// Job did not get started yet so remove from queue
-		try {
-			await job.remove();
-			return true;
-		} catch (e) {
-			await job.progress(-1);
-		}
-
-		return false;
-	}
-}
diff --git a/packages/cli/src/Server.ts b/packages/cli/src/Server.ts
index 0eb2040e7f1bb..777472b99fa42 100644
--- a/packages/cli/src/Server.ts
+++ b/packages/cli/src/Server.ts
@@ -211,8 +211,8 @@ export class Server extends AbstractServer {
 		setupPushHandler(restEndpoint, app);
 
 		if (config.getEnv('executions.mode') === 'queue') {
-			const { Queue } = await import('@/Queue');
-			await Container.get(Queue).init();
+			const { ScalingService } = await import('@/scaling/scaling.service');
+			await Container.get(ScalingService).setupQueue();
 		}
 
 		await handleMfaDisable();
diff --git a/packages/cli/src/WorkflowRunner.ts b/packages/cli/src/WorkflowRunner.ts
index 2f7976a073b30..ac5f586b0ad43 100644
--- a/packages/cli/src/WorkflowRunner.ts
+++ b/packages/cli/src/WorkflowRunner.ts
@@ -28,8 +28,8 @@ import { ExecutionRepository } from '@db/repositories/execution.repository';
 import { ExternalHooks } from '@/ExternalHooks';
 import type { IExecutionResponse, IWorkflowExecutionDataProcess } from '@/Interfaces';
 import { NodeTypes } from '@/NodeTypes';
-import type { Job, JobData, JobResponse } from '@/Queue';
-import { Queue } from '@/Queue';
+import type { Job, JobData, JobResult } from '@/scaling/types';
+import { ScalingService } from '@/scaling/scaling.service';
 import * as WorkflowHelpers from '@/WorkflowHelpers';
 import * as WorkflowExecuteAdditionalData from '@/WorkflowExecuteAdditionalData';
 import { generateFailedExecutionFromError } from '@/WorkflowHelpers';
@@ -40,7 +40,7 @@ import { EventService } from './events/event.service';
 
 @Service()
 export class WorkflowRunner {
-	private jobQueue: Queue;
+	private readonly scalingService: ScalingService;
 
 	private executionsMode = config.getEnv('executions.mode');
 
@@ -55,7 +55,7 @@ export class WorkflowRunner {
 		private readonly eventService: EventService,
 	) {
 		if (this.executionsMode === 'queue') {
-			this.jobQueue = Container.get(Queue);
+			this.scalingService = Container.get(ScalingService);
 		}
 	}
 
@@ -375,9 +375,7 @@ export class WorkflowRunner {
 		let job: Job;
 		let hooks: WorkflowHooks;
 		try {
-			job = await this.jobQueue.add(jobData, jobOptions);
-
-			this.logger.info(`Started with job ID: ${job.id.toString()} (Execution ID: ${executionId})`);
+			job = await this.scalingService.addJob(jobData, jobOptions);
 
 			hooks = WorkflowExecuteAdditionalData.getWorkflowHooksWorkerMain(
 				data.executionMode,
@@ -406,8 +404,7 @@ export class WorkflowRunner {
 			async (resolve, reject, onCancel) => {
 				onCancel.shouldReject = false;
 				onCancel(async () => {
-					const queue = Container.get(Queue);
-					await queue.stopJob(job);
+					await Container.get(ScalingService).stopJob(job);
 
 					// We use "getWorkflowHooksWorkerExecuter" as "getWorkflowHooksWorkerMain" does not contain the
 					// "workflowExecuteAfter" which we require.
@@ -424,11 +421,11 @@ export class WorkflowRunner {
 					reject(error);
 				});
 
-				const jobData: Promise<JobResponse> = job.finished();
+				const jobData: Promise<JobResult> = job.finished();
 
 				const queueRecoveryInterval = config.getEnv('queue.bull.queueRecoveryInterval');
 
-				const racingPromises: Array<Promise<JobResponse>> = [jobData];
+				const racingPromises: Array<Promise<JobResult>> = [jobData];
 
 				let clearWatchdogInterval;
 				if (queueRecoveryInterval > 0) {
@@ -446,9 +443,9 @@ export class WorkflowRunner {
 					 ************************************************ */
 					let watchDogInterval: NodeJS.Timeout | undefined;
 
-					const watchDog: Promise<JobResponse> = new Promise((res) => {
+					const watchDog: Promise<JobResult> = new Promise((res) => {
 						watchDogInterval = setInterval(async () => {
-							const currentJob = await this.jobQueue.getJob(job.id);
+							const currentJob = await this.scalingService.getJob(job.id);
 							// When null means job is finished (not found in queue)
 							if (currentJob === null) {
 								// Mimic worker's success message
diff --git a/packages/cli/src/commands/webhook.ts b/packages/cli/src/commands/webhook.ts
index 2c8532ec76342..505e2e216170d 100644
--- a/packages/cli/src/commands/webhook.ts
+++ b/packages/cli/src/commands/webhook.ts
@@ -4,8 +4,8 @@ import { ApplicationError } from 'n8n-workflow';
 
 import config from '@/config';
 import { ActiveExecutions } from '@/ActiveExecutions';
+import { ScalingService } from '@/scaling/scaling.service';
 import { WebhookServer } from '@/webhooks/WebhookServer';
-import { Queue } from '@/Queue';
 import { BaseCommand } from './BaseCommand';
 
 import { OrchestrationWebhookService } from '@/services/orchestration/webhook/orchestration.webhook.service';
@@ -96,7 +96,7 @@ export class Webhook extends BaseCommand {
 			);
 		}
 
-		await Container.get(Queue).init();
+		await Container.get(ScalingService).setupQueue();
 		await this.server.start();
 		this.logger.debug(`Webhook listener ID: ${this.server.uniqueInstanceId}`);
 		this.logger.info('Webhook listener waiting for requests.');
diff --git a/packages/cli/src/commands/worker.ts b/packages/cli/src/commands/worker.ts
index 5681b417273d6..18f039029c020 100644
--- a/packages/cli/src/commands/worker.ts
+++ b/packages/cli/src/commands/worker.ts
@@ -2,21 +2,13 @@ import { Container } from 'typedi';
 import { Flags, type Config } from '@oclif/core';
 import express from 'express';
 import http from 'http';
-import type PCancelable from 'p-cancelable';
-import { WorkflowExecute } from 'n8n-core';
-import type { ExecutionStatus, IExecuteResponsePromiseData, INodeTypes, IRun } from 'n8n-workflow';
-import { Workflow, sleep, ApplicationError } from 'n8n-workflow';
+import { sleep, ApplicationError } from 'n8n-workflow';
 
 import * as Db from '@/Db';
 import * as ResponseHelper from '@/ResponseHelper';
-import * as WebhookHelpers from '@/webhooks/WebhookHelpers';
-import * as WorkflowExecuteAdditionalData from '@/WorkflowExecuteAdditionalData';
 import config from '@/config';
-import type { Job, JobId, JobResponse, WebhookResponse } from '@/Queue';
-import { Queue } from '@/Queue';
+import { ScalingService } from '@/scaling/scaling.service';
 import { N8N_VERSION, inTest } from '@/constants';
-import { ExecutionRepository } from '@db/repositories/execution.repository';
-import { WorkflowRepository } from '@db/repositories/workflow.repository';
 import type { ICredentialsOverwrite } from '@/Interfaces';
 import { CredentialsOverwrites } from '@/CredentialsOverwrites';
 import { rawBodyReader, bodyParser } from '@/middlewares';
@@ -25,10 +17,9 @@ import type { RedisServicePubSubSubscriber } from '@/services/redis/RedisService
 import { EventMessageGeneric } from '@/eventbus/EventMessageClasses/EventMessageGeneric';
 import { OrchestrationHandlerWorkerService } from '@/services/orchestration/worker/orchestration.handler.worker.service';
 import { OrchestrationWorkerService } from '@/services/orchestration/worker/orchestration.worker.service';
-import type { WorkerJobStatusSummary } from '@/services/orchestration/worker/types';
 import { ServiceUnavailableError } from '@/errors/response-errors/service-unavailable.error';
 import { BaseCommand } from './BaseCommand';
-import { MaxStalledCountError } from '@/errors/max-stalled-count.error';
+import { JobProcessor } from '@/scaling/job-processor';
 import { LogStreamingEventRelay } from '@/events/log-streaming-event-relay';
 
 export class Worker extends BaseCommand {
@@ -44,15 +35,17 @@ export class Worker extends BaseCommand {
 		}),
 	};
 
-	static runningJobs: {
-		[key: string]: PCancelable<IRun>;
-	} = {};
+	/**
+	 * How many jobs this worker may run concurrently.
+	 *
+	 * Taken from env var `N8N_CONCURRENCY_PRODUCTION_LIMIT` if set to a value
+	 * other than -1, else taken from `--concurrency` flag.
+	 */
+	concurrency: number;
 
-	static runningJobsSummary: {
-		[jobId: string]: WorkerJobStatusSummary;
-	} = {};
+	scalingService: ScalingService;
 
-	static jobQueue: Queue;
+	jobProcessor: JobProcessor;
 
 	redisSubscriber: RedisServicePubSubSubscriber;
 
@@ -73,12 +66,12 @@ export class Worker extends BaseCommand {
 
 			// Wait for active workflow executions to finish
 			let count = 0;
-			while (Object.keys(Worker.runningJobs).length !== 0) {
+			while (this.jobProcessor.getRunningJobIds().length !== 0) {
 				if (count++ % 4 === 0) {
 					const waitLeft = Math.ceil((hardStopTimeMs - Date.now()) / 1000);
 					this.logger.info(
 						`Waiting for ${
-							Object.keys(Worker.runningJobs).length
+							Object.keys(this.jobProcessor.getRunningJobIds()).length
 						} active executions to finish... (max wait ${waitLeft} more seconds)`,
 					);
 				}
@@ -92,143 +85,6 @@ export class Worker extends BaseCommand {
 		await this.exitSuccessFully();
 	}
 
-	async runJob(job: Job, nodeTypes: INodeTypes): Promise<JobResponse> {
-		const { executionId, loadStaticData } = job.data;
-		const executionRepository = Container.get(ExecutionRepository);
-		const fullExecutionData = await executionRepository.findSingleExecution(executionId, {
-			includeData: true,
-			unflattenData: true,
-		});
-
-		if (!fullExecutionData) {
-			this.logger.error(
-				`Worker failed to find data of execution "${executionId}" in database. Cannot continue.`,
-				{ executionId },
-			);
-			throw new ApplicationError(
-				'Unable to find data of execution in database. Aborting execution.',
-				{ extra: { executionId } },
-			);
-		}
-		const workflowId = fullExecutionData.workflowData.id;
-
-		this.logger.info(
-			`Start job: ${job.id} (Workflow ID: ${workflowId} | Execution: ${executionId})`,
-		);
-		await executionRepository.updateStatus(executionId, 'running');
-
-		let { staticData } = fullExecutionData.workflowData;
-		if (loadStaticData) {
-			const workflowData = await Container.get(WorkflowRepository).findOne({
-				select: ['id', 'staticData'],
-				where: {
-					id: workflowId,
-				},
-			});
-			if (workflowData === null) {
-				this.logger.error(
-					'Worker execution failed because workflow could not be found in database.',
-					{ workflowId, executionId },
-				);
-				throw new ApplicationError('Workflow could not be found', { extra: { workflowId } });
-			}
-			staticData = workflowData.staticData;
-		}
-
-		const workflowSettings = fullExecutionData.workflowData.settings ?? {};
-
-		let workflowTimeout = workflowSettings.executionTimeout ?? config.getEnv('executions.timeout'); // initialize with default
-
-		let executionTimeoutTimestamp: number | undefined;
-		if (workflowTimeout > 0) {
-			workflowTimeout = Math.min(workflowTimeout, config.getEnv('executions.maxTimeout'));
-			executionTimeoutTimestamp = Date.now() + workflowTimeout * 1000;
-		}
-
-		const workflow = new Workflow({
-			id: workflowId,
-			name: fullExecutionData.workflowData.name,
-			nodes: fullExecutionData.workflowData.nodes,
-			connections: fullExecutionData.workflowData.connections,
-			active: fullExecutionData.workflowData.active,
-			nodeTypes,
-			staticData,
-			settings: fullExecutionData.workflowData.settings,
-		});
-
-		const additionalData = await WorkflowExecuteAdditionalData.getBase(
-			undefined,
-			undefined,
-			executionTimeoutTimestamp,
-		);
-		additionalData.hooks = WorkflowExecuteAdditionalData.getWorkflowHooksWorkerExecuter(
-			fullExecutionData.mode,
-			job.data.executionId,
-			fullExecutionData.workflowData,
-			{
-				retryOf: fullExecutionData.retryOf as string,
-			},
-		);
-
-		additionalData.hooks.hookFunctions.sendResponse = [
-			async (response: IExecuteResponsePromiseData): Promise<void> => {
-				const progress: WebhookResponse = {
-					executionId,
-					response: WebhookHelpers.encodeWebhookResponse(response),
-				};
-				await job.progress(progress);
-			},
-		];
-
-		additionalData.executionId = executionId;
-
-		additionalData.setExecutionStatus = (status: ExecutionStatus) => {
-			// Can't set the status directly in the queued worker, but it will happen in InternalHook.onWorkflowPostExecute
-			this.logger.debug(`Queued worker execution status for ${executionId} is "${status}"`);
-		};
-
-		let workflowExecute: WorkflowExecute;
-		let workflowRun: PCancelable<IRun>;
-		if (fullExecutionData.data !== undefined) {
-			workflowExecute = new WorkflowExecute(
-				additionalData,
-				fullExecutionData.mode,
-				fullExecutionData.data,
-			);
-			workflowRun = workflowExecute.processRunExecutionData(workflow);
-		} else {
-			// Execute all nodes
-			// Can execute without webhook so go on
-			workflowExecute = new WorkflowExecute(additionalData, fullExecutionData.mode);
-			workflowRun = workflowExecute.run(workflow);
-		}
-
-		Worker.runningJobs[job.id] = workflowRun;
-		Worker.runningJobsSummary[job.id] = {
-			jobId: job.id.toString(),
-			executionId,
-			workflowId: fullExecutionData.workflowId ?? '',
-			workflowName: fullExecutionData.workflowData.name,
-			mode: fullExecutionData.mode,
-			startedAt: fullExecutionData.startedAt,
-			retryOf: fullExecutionData.retryOf ?? '',
-			status: fullExecutionData.status,
-		};
-
-		// Wait till the execution is finished
-		await workflowRun;
-
-		delete Worker.runningJobs[job.id];
-		delete Worker.runningJobsSummary[job.id];
-
-		// do NOT call workflowExecuteAfter hook here, since it is being called from processSuccessExecution()
-		// already!
-
-		return {
-			success: true,
-		};
-	}
-
 	constructor(argv: string[], cmdConfig: Config) {
 		super(argv, cmdConfig);
 
@@ -256,6 +112,7 @@ export class Worker extends BaseCommand {
 		this.logger.debug('Starting n8n worker...');
 		this.logger.debug(`Queue mode id: ${this.queueModeId}`);
 
+		await this.setConcurrency();
 		await super.init();
 
 		await this.initLicense();
@@ -268,8 +125,7 @@ export class Worker extends BaseCommand {
 		this.logger.debug('External secrets init complete');
 		await this.initEventBus();
 		this.logger.debug('Event bus init complete');
-		await this.initQueue();
-		this.logger.debug('Queue init complete');
+		await this.initScalingService();
 		await this.initOrchestration();
 		this.logger.debug('Orchestration init complete');
 
@@ -301,80 +157,27 @@ export class Worker extends BaseCommand {
 		await Container.get(OrchestrationHandlerWorkerService).initWithOptions({
 			queueModeId: this.queueModeId,
 			redisPublisher: Container.get(OrchestrationWorkerService).redisPublisher,
-			getRunningJobIds: () => Object.keys(Worker.runningJobs),
-			getRunningJobsSummary: () => Object.values(Worker.runningJobsSummary),
+			getRunningJobIds: () => this.jobProcessor.getRunningJobIds(),
+			getRunningJobsSummary: () => this.jobProcessor.getRunningJobsSummary(),
 		});
 	}
 
-	async initQueue() {
+	async setConcurrency() {
 		const { flags } = await this.parse(Worker);
 
-		const redisConnectionTimeoutLimit = config.getEnv('queue.bull.redis.timeoutThreshold');
-
-		this.logger.debug(
-			`Opening Redis connection to listen to messages with timeout ${redisConnectionTimeoutLimit}`,
-		);
-
-		Worker.jobQueue = Container.get(Queue);
-		await Worker.jobQueue.init();
-		this.logger.debug('Queue singleton ready');
-
 		const envConcurrency = config.getEnv('executions.concurrency.productionLimit');
-		const concurrency = envConcurrency !== -1 ? envConcurrency : flags.concurrency;
-		Worker.jobQueue.setConcurrency(concurrency);
 
-		void Worker.jobQueue.process(async (job) => await this.runJob(job, this.nodeTypes));
+		this.concurrency = envConcurrency !== -1 ? envConcurrency : flags.concurrency;
+	}
 
-		Worker.jobQueue.getBullObjectInstance().on('global:progress', (jobId: JobId, progress) => {
-			// Progress of a job got updated which does get used
-			// to communicate that a job got canceled.
+	async initScalingService() {
+		this.scalingService = Container.get(ScalingService);
 
-			if (progress === -1) {
-				// Job has to get canceled
-				if (Worker.runningJobs[jobId] !== undefined) {
-					// Job is processed by current worker so cancel
-					Worker.runningJobs[jobId].cancel();
-					delete Worker.runningJobs[jobId];
-				}
-			}
-		});
+		await this.scalingService.setupQueue();
 
-		let lastTimer = 0;
-		let cumulativeTimeout = 0;
-		Worker.jobQueue.getBullObjectInstance().on('error', (error: Error) => {
-			if (error.toString().includes('ECONNREFUSED')) {
-				const now = Date.now();
-				if (now - lastTimer > 30000) {
-					// Means we had no timeout at all or last timeout was temporary and we recovered
-					lastTimer = now;
-					cumulativeTimeout = 0;
-				} else {
-					cumulativeTimeout += now - lastTimer;
-					lastTimer = now;
-					if (cumulativeTimeout > redisConnectionTimeoutLimit) {
-						this.logger.error(
-							`Unable to connect to Redis after ${redisConnectionTimeoutLimit}. Exiting process.`,
-						);
-						process.exit(1);
-					}
-				}
-				this.logger.warn('Redis unavailable - trying to reconnect...');
-			} else if (error.toString().includes('Error initializing Lua scripts')) {
-				// This is a non-recoverable error
-				// Happens when worker starts and Redis is unavailable
-				// Even if Redis comes back online, worker will be zombie
-				this.logger.error('Error initializing worker.');
-				process.exit(2);
-			} else {
-				this.logger.error('Error from queue: ', error);
-
-				if (error.message.includes('job stalled more than maxStalledCount')) {
-					throw new MaxStalledCountError(error);
-				}
+		this.scalingService.setupWorker(this.concurrency);
 
-				throw error;
-			}
-		});
+		this.jobProcessor = Container.get(JobProcessor);
 	}
 
 	async setupHealthMonitor() {
@@ -410,7 +213,7 @@ export class Worker extends BaseCommand {
 				// if it loses the connection to redis
 				try {
 					// Redis ping
-					await Worker.jobQueue.ping();
+					await this.scalingService.pingQueue();
 				} catch (e) {
 					this.logger.error('No Redis connection!', e as Error);
 					const error = new ServiceUnavailableError('No Redis connection!');
@@ -476,18 +279,16 @@ export class Worker extends BaseCommand {
 	}
 
 	async run() {
-		const { flags } = await this.parse(Worker);
-
 		this.logger.info('\nn8n worker is now ready');
 		this.logger.info(` * Version: ${N8N_VERSION}`);
-		this.logger.info(` * Concurrency: ${flags.concurrency}`);
+		this.logger.info(` * Concurrency: ${this.concurrency}`);
 		this.logger.info('');
 
 		if (config.getEnv('queue.health.active')) {
 			await this.setupHealthMonitor();
 		}
 
-		if (process.stdout.isTTY) {
+		if (!inTest && process.stdout.isTTY) {
 			process.stdin.setRawMode(true);
 			process.stdin.resume();
 			process.stdin.setEncoding('utf8');
diff --git a/packages/cli/src/errors/max-stalled-count.error.ts b/packages/cli/src/errors/max-stalled-count.error.ts
index 6715de0ade837..653ca18eacac7 100644
--- a/packages/cli/src/errors/max-stalled-count.error.ts
+++ b/packages/cli/src/errors/max-stalled-count.error.ts
@@ -1,7 +1,7 @@
 import { ApplicationError } from 'n8n-workflow';
 
 /**
- * See https://github.com/OptimalBits/bull/blob/60fa88f08637f0325639988a3f054880a04ce402/docs/README.md?plain=1#L133
+ * @docs https://docs.bullmq.io/guide/workers/stalled-jobs
  */
 export class MaxStalledCountError extends ApplicationError {
 	constructor(cause: Error) {
diff --git a/packages/cli/src/executions/__tests__/execution.service.test.ts b/packages/cli/src/executions/__tests__/execution.service.test.ts
index 04c266a4d071e..879ee707cdc8d 100644
--- a/packages/cli/src/executions/__tests__/execution.service.test.ts
+++ b/packages/cli/src/executions/__tests__/execution.service.test.ts
@@ -6,14 +6,15 @@ import { AbortedExecutionRetryError } from '@/errors/aborted-execution-retry.err
 import { MissingExecutionStopError } from '@/errors/missing-execution-stop.error';
 import type { ActiveExecutions } from '@/ActiveExecutions';
 import type { IExecutionResponse } from '@/Interfaces';
-import type { Job, Queue } from '@/Queue';
+import type { ScalingService } from '@/scaling/scaling.service';
 import type { WaitTracker } from '@/WaitTracker';
 import type { ExecutionRepository } from '@/databases/repositories/execution.repository';
 import type { ExecutionRequest } from '@/executions/execution.types';
 import type { ConcurrencyControlService } from '@/concurrency/concurrency-control.service';
+import type { Job } from '@/scaling/types';
 
 describe('ExecutionService', () => {
-	const queue = mock<Queue>();
+	const scalingService = mock<ScalingService>();
 	const activeExecutions = mock<ActiveExecutions>();
 	const executionRepository = mock<ExecutionRepository>();
 	const waitTracker = mock<WaitTracker>();
@@ -22,7 +23,7 @@ describe('ExecutionService', () => {
 	const executionService = new ExecutionService(
 		mock(),
 		mock(),
-		queue,
+		scalingService,
 		activeExecutions,
 		executionRepository,
 		mock(),
@@ -211,7 +212,7 @@ describe('ExecutionService', () => {
 
 					expect(concurrencyControl.remove).not.toHaveBeenCalled();
 					expect(waitTracker.stopExecution).not.toHaveBeenCalled();
-					expect(queue.stopJob).not.toHaveBeenCalled();
+					expect(scalingService.stopJob).not.toHaveBeenCalled();
 				});
 			});
 
@@ -224,7 +225,8 @@ describe('ExecutionService', () => {
 					const execution = mock<IExecutionResponse>({ id: '123', status: 'running' });
 					executionRepository.findSingleExecution.mockResolvedValue(execution);
 					waitTracker.has.mockReturnValue(false);
-					queue.findRunningJobBy.mockResolvedValue(mock<Job>());
+					const job = mock<Job>({ data: { executionId: '123' } });
+					scalingService.findJobsByStatus.mockResolvedValue([job]);
 					executionRepository.stopDuringRun.mockResolvedValue(mock<IExecutionResponse>());
 
 					/**
@@ -237,8 +239,8 @@ describe('ExecutionService', () => {
 					 */
 					expect(waitTracker.stopExecution).not.toHaveBeenCalled();
 					expect(activeExecutions.stopExecution).toHaveBeenCalled();
-					expect(queue.findRunningJobBy).toBeCalledWith({ executionId: execution.id });
-					expect(queue.stopJob).toHaveBeenCalled();
+					expect(scalingService.findJobsByStatus).toHaveBeenCalled();
+					expect(scalingService.stopJob).toHaveBeenCalled();
 					expect(executionRepository.stopDuringRun).toHaveBeenCalled();
 				});
 
@@ -250,7 +252,8 @@ describe('ExecutionService', () => {
 					const execution = mock<IExecutionResponse>({ id: '123', status: 'waiting' });
 					executionRepository.findSingleExecution.mockResolvedValue(execution);
 					waitTracker.has.mockReturnValue(true);
-					queue.findRunningJobBy.mockResolvedValue(mock<Job>());
+					const job = mock<Job>({ data: { executionId: '123' } });
+					scalingService.findJobsByStatus.mockResolvedValue([job]);
 					executionRepository.stopDuringRun.mockResolvedValue(mock<IExecutionResponse>());
 
 					/**
@@ -262,9 +265,8 @@ describe('ExecutionService', () => {
 					 * Assert
 					 */
 					expect(waitTracker.stopExecution).toHaveBeenCalledWith(execution.id);
-					expect(activeExecutions.stopExecution).toHaveBeenCalled();
-					expect(queue.findRunningJobBy).toBeCalledWith({ executionId: execution.id });
-					expect(queue.stopJob).toHaveBeenCalled();
+					expect(scalingService.findJobsByStatus).toHaveBeenCalled();
+					expect(scalingService.stopJob).toHaveBeenCalled();
 					expect(executionRepository.stopDuringRun).toHaveBeenCalled();
 				});
 			});
diff --git a/packages/cli/src/executions/execution-recovery.service.ts b/packages/cli/src/executions/execution-recovery.service.ts
index 435145545ab16..d691df1b3ce36 100644
--- a/packages/cli/src/executions/execution-recovery.service.ts
+++ b/packages/cli/src/executions/execution-recovery.service.ts
@@ -135,9 +135,11 @@ export class ExecutionRecoveryService {
 			return waitMs;
 		}
 
-		const { Queue } = await import('@/Queue');
+		const { ScalingService } = await import('@/scaling/scaling.service');
 
-		const queuedIds = await Container.get(Queue).getInProgressExecutionIds();
+		const runningJobs = await Container.get(ScalingService).findJobsByStatus(['active', 'waiting']);
+
+		const queuedIds = new Set(runningJobs.map((job) => job.data.executionId));
 
 		if (queuedIds.size === 0) {
 			this.logger.debug('[Recovery] Completed queue recovery check, no dangling executions');
diff --git a/packages/cli/src/executions/execution.service.ts b/packages/cli/src/executions/execution.service.ts
index 0823bde36fe7a..849d06c968c7e 100644
--- a/packages/cli/src/executions/execution.service.ts
+++ b/packages/cli/src/executions/execution.service.ts
@@ -24,7 +24,7 @@ import type {
 	IWorkflowExecutionDataProcess,
 } from '@/Interfaces';
 import { NodeTypes } from '@/NodeTypes';
-import { Queue } from '@/Queue';
+import { ScalingService } from '@/scaling/scaling.service';
 import type { ExecutionRequest, ExecutionSummaries, StopResult } from './execution.types';
 import { WorkflowRunner } from '@/WorkflowRunner';
 import type { IGetExecutionsQueryFilter } from '@db/repositories/execution.repository';
@@ -85,7 +85,7 @@ export class ExecutionService {
 	constructor(
 		private readonly globalConfig: GlobalConfig,
 		private readonly logger: Logger,
-		private readonly queue: Queue,
+		private readonly scalingService: ScalingService,
 		private readonly activeExecutions: ActiveExecutions,
 		private readonly executionRepository: ExecutionRepository,
 		private readonly workflowRepository: WorkflowRepository,
@@ -471,10 +471,12 @@ export class ExecutionService {
 			this.waitTracker.stopExecution(execution.id);
 		}
 
-		const job = await this.queue.findRunningJobBy({ executionId: execution.id });
+		const jobs = await this.scalingService.findJobsByStatus(['active', 'waiting']);
+
+		const job = jobs.find(({ data }) => data.executionId === execution.id);
 
 		if (job) {
-			await this.queue.stopJob(job);
+			await this.scalingService.stopJob(job);
 		} else {
 			this.logger.debug('Job to stop not in queue', { executionId: execution.id });
 		}
diff --git a/packages/cli/src/scaling/constants.ts b/packages/cli/src/scaling/constants.ts
new file mode 100644
index 0000000000000..8ef5f716b17aa
--- /dev/null
+++ b/packages/cli/src/scaling/constants.ts
@@ -0,0 +1,3 @@
+export const QUEUE_NAME = 'jobs';
+
+export const JOB_TYPE_NAME = 'job';
diff --git a/packages/cli/src/scaling/job-processor.ts b/packages/cli/src/scaling/job-processor.ts
new file mode 100644
index 0000000000000..6057a1937db76
--- /dev/null
+++ b/packages/cli/src/scaling/job-processor.ts
@@ -0,0 +1,182 @@
+import { Service } from 'typedi';
+import { BINARY_ENCODING, ApplicationError, Workflow } from 'n8n-workflow';
+import { WorkflowExecute } from 'n8n-core';
+import { Logger } from '@/Logger';
+import config from '@/config';
+import { ExecutionRepository } from '@/databases/repositories/execution.repository';
+import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
+import * as WorkflowExecuteAdditionalData from '@/WorkflowExecuteAdditionalData';
+import { NodeTypes } from '@/NodeTypes';
+import type { ExecutionStatus, IExecuteResponsePromiseData, IRun } from 'n8n-workflow';
+import type { Job, JobId, JobResult, RunningJob, RunningJobSummary } from './types';
+import type PCancelable from 'p-cancelable';
+
+/**
+ * Responsible for processing jobs from the queue, i.e. running enqueued executions.
+ */
+@Service()
+export class JobProcessor {
+	private readonly runningJobs: { [jobId: JobId]: RunningJob } = {};
+
+	constructor(
+		private readonly logger: Logger,
+		private readonly executionRepository: ExecutionRepository,
+		private readonly workflowRepository: WorkflowRepository,
+		private readonly nodeTypes: NodeTypes,
+	) {}
+
+	async processJob(job: Job): Promise<JobResult> {
+		const { executionId, loadStaticData } = job.data;
+
+		const execution = await this.executionRepository.findSingleExecution(executionId, {
+			includeData: true,
+			unflattenData: true,
+		});
+
+		if (!execution) {
+			this.logger.error('[JobProcessor] Failed to find execution data', { executionId });
+			throw new ApplicationError('Failed to find execution data. Aborting execution.', {
+				extra: { executionId },
+			});
+		}
+
+		const workflowId = execution.workflowData.id;
+
+		this.logger.info(`[JobProcessor] Starting job ${job.id} (execution ${executionId})`);
+
+		await this.executionRepository.updateStatus(executionId, 'running');
+
+		let { staticData } = execution.workflowData;
+
+		if (loadStaticData) {
+			const workflowData = await this.workflowRepository.findOne({
+				select: ['id', 'staticData'],
+				where: { id: workflowId },
+			});
+
+			if (workflowData === null) {
+				this.logger.error('[JobProcessor] Failed to find workflow', { workflowId, executionId });
+				throw new ApplicationError('Failed to find workflow', { extra: { workflowId } });
+			}
+
+			staticData = workflowData.staticData;
+		}
+
+		const workflowSettings = execution.workflowData.settings ?? {};
+
+		let workflowTimeout = workflowSettings.executionTimeout ?? config.getEnv('executions.timeout');
+
+		let executionTimeoutTimestamp: number | undefined;
+
+		if (workflowTimeout > 0) {
+			workflowTimeout = Math.min(workflowTimeout, config.getEnv('executions.maxTimeout'));
+			executionTimeoutTimestamp = Date.now() + workflowTimeout * 1000;
+		}
+
+		const workflow = new Workflow({
+			id: workflowId,
+			name: execution.workflowData.name,
+			nodes: execution.workflowData.nodes,
+			connections: execution.workflowData.connections,
+			active: execution.workflowData.active,
+			nodeTypes: this.nodeTypes,
+			staticData,
+			settings: execution.workflowData.settings,
+		});
+
+		const additionalData = await WorkflowExecuteAdditionalData.getBase(
+			undefined,
+			undefined,
+			executionTimeoutTimestamp,
+		);
+
+		additionalData.hooks = WorkflowExecuteAdditionalData.getWorkflowHooksWorkerExecuter(
+			execution.mode,
+			job.data.executionId,
+			execution.workflowData,
+			{ retryOf: execution.retryOf as string },
+		);
+
+		additionalData.hooks.hookFunctions.sendResponse = [
+			async (response: IExecuteResponsePromiseData): Promise<void> => {
+				await job.progress({
+					kind: 'respond-to-webhook',
+					executionId,
+					response: this.encodeWebhookResponse(response),
+				});
+			},
+		];
+
+		additionalData.executionId = executionId;
+
+		additionalData.setExecutionStatus = (status: ExecutionStatus) => {
+			// Can't set the status directly in the queued worker, but it will happen in InternalHook.onWorkflowPostExecute
+			this.logger.debug(
+				`[JobProcessor] Queued worker execution status for ${executionId} is "${status}"`,
+			);
+		};
+
+		let workflowExecute: WorkflowExecute;
+		let workflowRun: PCancelable<IRun>;
+		if (execution.data !== undefined) {
+			workflowExecute = new WorkflowExecute(additionalData, execution.mode, execution.data);
+			workflowRun = workflowExecute.processRunExecutionData(workflow);
+		} else {
+			// Execute all nodes
+			// Can execute without webhook so go on
+			workflowExecute = new WorkflowExecute(additionalData, execution.mode);
+			workflowRun = workflowExecute.run(workflow);
+		}
+
+		const runningJob: RunningJob = {
+			run: workflowRun,
+			executionId,
+			workflowId: execution.workflowId,
+			workflowName: execution.workflowData.name,
+			mode: execution.mode,
+			startedAt: execution.startedAt,
+			retryOf: execution.retryOf ?? '',
+			status: execution.status,
+		};
+
+		this.runningJobs[job.id] = runningJob;
+
+		await workflowRun;
+
+		delete this.runningJobs[job.id];
+
+		this.logger.debug('[JobProcessor] Job finished running', { jobId: job.id, executionId });
+
+		/**
+		 * @important Do NOT call `workflowExecuteAfter` hook here.
+		 * It is being called from processSuccessExecution() already.
+		 */
+
+		return { success: true };
+	}
+
+	stopJob(jobId: JobId) {
+		this.runningJobs[jobId]?.run.cancel();
+		delete this.runningJobs[jobId];
+	}
+
+	getRunningJobIds(): JobId[] {
+		return Object.keys(this.runningJobs);
+	}
+
+	getRunningJobsSummary(): RunningJobSummary[] {
+		return Object.values(this.runningJobs).map(({ run, ...summary }) => summary);
+	}
+
+	private encodeWebhookResponse(
+		response: IExecuteResponsePromiseData,
+	): IExecuteResponsePromiseData {
+		if (typeof response === 'object' && Buffer.isBuffer(response.body)) {
+			response.body = {
+				'__@N8nEncodedBuffer@__': response.body.toString(BINARY_ENCODING),
+			};
+		}
+
+		return response;
+	}
+}
diff --git a/packages/cli/src/scaling/scaling.service.ts b/packages/cli/src/scaling/scaling.service.ts
new file mode 100644
index 0000000000000..c52a82e8a0da6
--- /dev/null
+++ b/packages/cli/src/scaling/scaling.service.ts
@@ -0,0 +1,213 @@
+import Container, { Service } from 'typedi';
+import { ApplicationError, BINARY_ENCODING } from 'n8n-workflow';
+import { ActiveExecutions } from '@/ActiveExecutions';
+import config from '@/config';
+import { Logger } from '@/Logger';
+import { MaxStalledCountError } from '@/errors/max-stalled-count.error';
+import { HIGHEST_SHUTDOWN_PRIORITY } from '@/constants';
+import { OnShutdown } from '@/decorators/OnShutdown';
+import { JOB_TYPE_NAME, QUEUE_NAME } from './constants';
+import { JobProcessor } from './job-processor';
+import type { JobQueue, Job, JobData, JobOptions, JobMessage, JobStatus, JobId } from './types';
+import type { IExecuteResponsePromiseData } from 'n8n-workflow';
+
+@Service()
+export class ScalingService {
+	private queue: JobQueue;
+
+	private readonly instanceType = config.getEnv('generic.instanceType');
+
+	constructor(
+		private readonly logger: Logger,
+		private readonly activeExecutions: ActiveExecutions,
+		private readonly jobProcessor: JobProcessor,
+	) {}
+
+	// #region Lifecycle
+
+	async setupQueue() {
+		const { default: BullQueue } = await import('bull');
+		const { RedisClientService } = await import('@/services/redis/redis-client.service');
+		const service = Container.get(RedisClientService);
+
+		const bullPrefix = config.getEnv('queue.bull.prefix');
+		const prefix = service.toValidPrefix(bullPrefix);
+
+		this.queue = new BullQueue(QUEUE_NAME, {
+			prefix,
+			settings: config.get('queue.bull.settings'),
+			createClient: (type) => service.createClient({ type: `${type}(bull)` }),
+		});
+
+		this.registerListeners();
+
+		this.logger.debug('[ScalingService] Queue setup completed');
+	}
+
+	setupWorker(concurrency: number) {
+		this.assertWorker();
+
+		void this.queue.process(
+			JOB_TYPE_NAME,
+			concurrency,
+			async (job: Job) => await this.jobProcessor.processJob(job),
+		);
+
+		this.logger.debug('[ScalingService] Worker setup completed');
+	}
+
+	@OnShutdown(HIGHEST_SHUTDOWN_PRIORITY)
+	async pauseQueue() {
+		await this.queue.pause(true, true);
+
+		this.logger.debug('[ScalingService] Queue paused');
+	}
+
+	async pingQueue() {
+		await this.queue.client.ping();
+	}
+
+	// #endregion
+
+	// #region Jobs
+
+	async addJob(jobData: JobData, jobOptions: JobOptions) {
+		const { executionId } = jobData;
+
+		const job = await this.queue.add(JOB_TYPE_NAME, jobData, jobOptions);
+
+		this.logger.info(`[ScalingService] Added job ${job.id} (execution ${executionId})`);
+
+		return job;
+	}
+
+	async getJob(jobId: JobId) {
+		return await this.queue.getJob(jobId);
+	}
+
+	async findJobsByStatus(statuses: JobStatus[]) {
+		return await this.queue.getJobs(statuses);
+	}
+
+	async stopJob(job: Job) {
+		const props = { jobId: job.id, executionId: job.data.executionId };
+
+		try {
+			if (await job.isActive()) {
+				await job.progress({ kind: 'abort-job' });
+				this.logger.debug('[ScalingService] Stopped active job', props);
+				return true;
+			}
+
+			await job.remove();
+			this.logger.debug('[ScalingService] Stopped inactive job', props);
+			return true;
+		} catch (error: unknown) {
+			await job.progress({ kind: 'abort-job' });
+			this.logger.error('[ScalingService] Failed to stop job', { ...props, error });
+			return false;
+		}
+	}
+
+	// #endregion
+
+	// #region Listeners
+
+	private registerListeners() {
+		this.queue.on('global:progress', (_jobId: JobId, msg: JobMessage) => {
+			if (msg.kind === 'respond-to-webhook') {
+				const { executionId, response } = msg;
+				this.activeExecutions.resolveResponsePromise(
+					executionId,
+					this.decodeWebhookResponse(response),
+				);
+			}
+		});
+
+		this.queue.on('global:progress', (jobId: JobId, msg: JobMessage) => {
+			if (msg.kind === 'abort-job') {
+				this.jobProcessor.stopJob(jobId);
+			}
+		});
+
+		let latestAttemptTs = 0;
+		let cumulativeTimeoutMs = 0;
+
+		const MAX_TIMEOUT_MS = config.getEnv('queue.bull.redis.timeoutThreshold');
+		const RESET_LENGTH_MS = 30_000;
+
+		this.queue.on('error', (error: Error) => {
+			this.logger.error('[ScalingService] Queue errored', { error });
+
+			/**
+			 * On Redis connection failure, try to reconnect. On every failed attempt,
+			 * increment a cumulative timeout - if this exceeds a limit, exit the
+			 * process. Reset the cumulative timeout if >30s between retries.
+			 */
+			if (error.message.includes('ECONNREFUSED')) {
+				const nowTs = Date.now();
+				if (nowTs - latestAttemptTs > RESET_LENGTH_MS) {
+					latestAttemptTs = nowTs;
+					cumulativeTimeoutMs = 0;
+				} else {
+					cumulativeTimeoutMs += nowTs - latestAttemptTs;
+					latestAttemptTs = nowTs;
+					if (cumulativeTimeoutMs > MAX_TIMEOUT_MS) {
+						this.logger.error('[ScalingService] Redis unavailable after max timeout');
+						this.logger.error('[ScalingService] Exiting process...');
+						process.exit(1);
+					}
+				}
+
+				this.logger.warn('[ScalingService] Redis unavailable - retrying to connect...');
+				return;
+			}
+
+			if (
+				this.instanceType === 'worker' &&
+				error.message.includes('job stalled more than maxStalledCount')
+			) {
+				throw new MaxStalledCountError(error);
+			}
+
+			/**
+			 * Non-recoverable error on worker start with Redis unavailable.
+			 * Even if Redis recovers, worker will remain unable to process jobs.
+			 */
+			if (
+				this.instanceType === 'worker' &&
+				error.message.includes('Error initializing Lua scripts')
+			) {
+				this.logger.error('[ScalingService] Fatal error initializing worker', { error });
+				this.logger.error('[ScalingService] Exiting process...');
+				process.exit(1);
+			}
+
+			throw error;
+		});
+	}
+
+	// #endregion
+
+	private decodeWebhookResponse(
+		response: IExecuteResponsePromiseData,
+	): IExecuteResponsePromiseData {
+		if (
+			typeof response === 'object' &&
+			typeof response.body === 'object' &&
+			response.body !== null &&
+			'__@N8nEncodedBuffer@__' in response.body &&
+			typeof response.body['__@N8nEncodedBuffer@__'] === 'string'
+		) {
+			response.body = Buffer.from(response.body['__@N8nEncodedBuffer@__'], BINARY_ENCODING);
+		}
+
+		return response;
+	}
+
+	private assertWorker() {
+		if (this.instanceType === 'worker') return;
+
+		throw new ApplicationError('This method must be called on a `worker` instance');
+	}
+}
diff --git a/packages/cli/src/scaling/types.ts b/packages/cli/src/scaling/types.ts
new file mode 100644
index 0000000000000..55d49b8c48487
--- /dev/null
+++ b/packages/cli/src/scaling/types.ts
@@ -0,0 +1,55 @@
+import type {
+	ExecutionError,
+	ExecutionStatus,
+	IExecuteResponsePromiseData,
+	IRun,
+	WorkflowExecuteMode as WorkflowExecutionMode,
+} from 'n8n-workflow';
+import type Bull from 'bull';
+import type PCancelable from 'p-cancelable';
+
+export type JobQueue = Bull.Queue<JobData>;
+
+export type Job = Bull.Job<JobData>;
+
+export type JobId = Job['id'];
+
+export type JobData = {
+	executionId: string;
+	loadStaticData: boolean;
+};
+
+export type JobResult = {
+	success: boolean;
+	error?: ExecutionError;
+};
+
+export type JobStatus = Bull.JobStatus;
+
+export type JobOptions = Bull.JobOptions;
+
+/** Message sent by worker to queue or by queue to worker. */
+export type JobMessage = RepondToWebhookMessage | AbortJobMessage;
+
+export type RepondToWebhookMessage = {
+	kind: 'respond-to-webhook';
+	executionId: string;
+	response: IExecuteResponsePromiseData;
+};
+
+export type AbortJobMessage = {
+	kind: 'abort-job';
+};
+
+export type RunningJob = {
+	executionId: string;
+	workflowId: string;
+	workflowName: string;
+	mode: WorkflowExecutionMode;
+	startedAt: Date;
+	retryOf: string;
+	status: ExecutionStatus;
+	run: PCancelable<IRun>;
+};
+
+export type RunningJobSummary = Omit<RunningJob, 'run'>;
diff --git a/packages/cli/src/services/orchestration/worker/types.ts b/packages/cli/src/services/orchestration/worker/types.ts
index 351c56394a31c..84c515466e2c2 100644
--- a/packages/cli/src/services/orchestration/worker/types.ts
+++ b/packages/cli/src/services/orchestration/worker/types.ts
@@ -1,11 +1,12 @@
 import type { ExecutionStatus, WorkflowExecuteMode } from 'n8n-workflow';
 import type { RedisServicePubSubPublisher } from '../../redis/RedisServicePubSubPublisher';
+import type { RunningJobSummary } from '@/scaling/types';
 
 export interface WorkerCommandReceivedHandlerOptions {
 	queueModeId: string;
 	redisPublisher: RedisServicePubSubPublisher;
-	getRunningJobIds: () => string[];
-	getRunningJobsSummary: () => WorkerJobStatusSummary[];
+	getRunningJobIds: () => Array<string | number>;
+	getRunningJobsSummary: () => RunningJobSummary[];
 }
 
 export interface WorkerJobStatusSummary {
diff --git a/packages/cli/src/webhooks/WebhookHelpers.ts b/packages/cli/src/webhooks/WebhookHelpers.ts
index 8a98c74047985..f090a7ea7e318 100644
--- a/packages/cli/src/webhooks/WebhookHelpers.ts
+++ b/packages/cli/src/webhooks/WebhookHelpers.ts
@@ -20,7 +20,6 @@ import type {
 	IDataObject,
 	IDeferredPromise,
 	IExecuteData,
-	IExecuteResponsePromiseData,
 	IHttpRequestMethods,
 	IN8nHttpFullResponse,
 	INode,
@@ -190,18 +189,6 @@ export function getWorkflowWebhooks(
 	return returnData;
 }
 
-export function encodeWebhookResponse(
-	response: IExecuteResponsePromiseData,
-): IExecuteResponsePromiseData {
-	if (typeof response === 'object' && Buffer.isBuffer(response.body)) {
-		response.body = {
-			'__@N8nEncodedBuffer@__': response.body.toString(BINARY_ENCODING),
-		};
-	}
-
-	return response;
-}
-
 const normalizeFormData = <T>(values: Record<string, T | T[]>) => {
 	for (const key in values) {
 		const value = values[key];
diff --git a/packages/cli/test/integration/commands/worker.cmd.test.ts b/packages/cli/test/integration/commands/worker.cmd.test.ts
index 54c15d381de95..205a60307c643 100644
--- a/packages/cli/test/integration/commands/worker.cmd.test.ts
+++ b/packages/cli/test/integration/commands/worker.cmd.test.ts
@@ -1,5 +1,4 @@
 import { BinaryDataService } from 'n8n-core';
-import { mock } from 'jest-mock-extended';
 
 import { Worker } from '@/commands/worker';
 import config from '@/config';
@@ -11,7 +10,7 @@ import { OrchestrationHandlerWorkerService } from '@/services/orchestration/work
 import { OrchestrationWorkerService } from '@/services/orchestration/worker/orchestration.worker.service';
 import { License } from '@/License';
 import { ExternalHooks } from '@/ExternalHooks';
-import { type JobQueue, Queue } from '@/Queue';
+import { ScalingService } from '@/scaling/scaling.service';
 
 import { setupTestCommand } from '@test-integration/utils/testCommand';
 import { mockInstance } from '../../shared/mocking';
@@ -28,12 +27,10 @@ const license = mockInstance(License);
 const messageEventBus = mockInstance(MessageEventBus);
 const logStreamingEventRelay = mockInstance(LogStreamingEventRelay);
 const orchestrationHandlerWorkerService = mockInstance(OrchestrationHandlerWorkerService);
-const queue = mockInstance(Queue);
+const scalingService = mockInstance(ScalingService);
 const orchestrationWorkerService = mockInstance(OrchestrationWorkerService);
 const command = setupTestCommand(Worker);
 
-queue.getBullObjectInstance.mockReturnValue(mock<JobQueue>({ on: jest.fn() }));
-
 test('worker initializes all its components', async () => {
 	const worker = await command.run();
 
@@ -45,9 +42,9 @@ test('worker initializes all its components', async () => {
 	expect(externalHooks.init).toHaveBeenCalledTimes(1);
 	expect(externalSecretsManager.init).toHaveBeenCalledTimes(1);
 	expect(messageEventBus.initialize).toHaveBeenCalledTimes(1);
+	expect(scalingService.setupQueue).toHaveBeenCalledTimes(1);
+	expect(scalingService.setupWorker).toHaveBeenCalledTimes(1);
 	expect(logStreamingEventRelay.init).toHaveBeenCalledTimes(1);
-	expect(queue.init).toHaveBeenCalledTimes(1);
-	expect(queue.process).toHaveBeenCalledTimes(1);
 	expect(orchestrationWorkerService.init).toHaveBeenCalledTimes(1);
 	expect(orchestrationHandlerWorkerService.initWithOptions).toHaveBeenCalledTimes(1);
 	expect(messageEventBus.send).toHaveBeenCalledTimes(1);

From b232831f1826337e14c3a80e50447f8904790f0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Wed, 7 Aug 2024 15:11:22 +0200
Subject: [PATCH 102/168] refactor(core): Remove skipped telemetry tests
 (no-changelog) (#10319)

---
 packages/@n8n_io/eslint-config/local-rules.js |  14 ++
 .../src/telemetry/__tests__/telemetry.test.ts | 157 ------------------
 packages/cli/test/shared/flushPromises.ts     |   6 -
 3 files changed, 14 insertions(+), 163 deletions(-)
 delete mode 100644 packages/cli/test/shared/flushPromises.ts

diff --git a/packages/@n8n_io/eslint-config/local-rules.js b/packages/@n8n_io/eslint-config/local-rules.js
index 152415e14c8d0..09a9c00f0f852 100644
--- a/packages/@n8n_io/eslint-config/local-rules.js
+++ b/packages/@n8n_io/eslint-config/local-rules.js
@@ -182,12 +182,14 @@ module.exports = {
 			messages: {
 				removeSkip: 'Remove `.skip()` call',
 				removeOnly: 'Remove `.only()` call',
+				removeXPrefix: 'Remove `x` prefix',
 			},
 			fixable: 'code',
 		},
 		create(context) {
 			const TESTING_FUNCTIONS = new Set(['test', 'it', 'describe']);
 			const SKIPPING_METHODS = new Set(['skip', 'only']);
+			const PREFIXED_TESTING_FUNCTIONS = new Set(['xtest', 'xit', 'xdescribe']);
 			const toMessageId = (s) => 'remove' + s.charAt(0).toUpperCase() + s.slice(1);
 
 			return {
@@ -208,6 +210,18 @@ module.exports = {
 						});
 					}
 				},
+				CallExpression(node) {
+					if (
+						node.callee.type === 'Identifier' &&
+						PREFIXED_TESTING_FUNCTIONS.has(node.callee.name)
+					) {
+						context.report({
+							messageId: 'removeXPrefix',
+							node,
+							fix: (fixer) => fixer.replaceText(node.callee, 'test'),
+						});
+					}
+				},
 			};
 		},
 	},
diff --git a/packages/cli/src/telemetry/__tests__/telemetry.test.ts b/packages/cli/src/telemetry/__tests__/telemetry.test.ts
index a0441519eaf6f..e701301d58802 100644
--- a/packages/cli/src/telemetry/__tests__/telemetry.test.ts
+++ b/packages/cli/src/telemetry/__tests__/telemetry.test.ts
@@ -1,7 +1,6 @@
 import type RudderStack from '@rudderstack/rudder-sdk-node';
 import { Telemetry } from '@/telemetry';
 import config from '@/config';
-import { flushPromises } from '@test/flushPromises';
 import { PostHogClient } from '@/posthog';
 import { mock } from 'jest-mock-extended';
 import { InstanceSettings } from 'n8n-core';
@@ -266,162 +265,6 @@ describe('Telemetry', () => {
 			expect(execBuffer['2'].prod_success?.first).toEqual(execTime1);
 		});
 	});
-
-	describe('pulse', () => {
-		let pulseSpy: jest.SpyInstance;
-		beforeAll(() => {
-			startPulseSpy.mockRestore();
-		});
-
-		beforeEach(() => {
-			fakeJestSystemTime(testDateTime);
-			pulseSpy = jest.spyOn(Telemetry.prototype as any, 'pulse').mockName('pulseSpy');
-		});
-
-		afterEach(() => {
-			pulseSpy.mockClear();
-		});
-
-		xtest('should trigger pulse in intervals', async () => {
-			expect(pulseSpy).toBeCalledTimes(0);
-
-			jest.advanceTimersToNextTimer();
-			await flushPromises();
-
-			expect(pulseSpy).toBeCalledTimes(1);
-			expect(spyTrack).toHaveBeenCalledTimes(1);
-			expect(spyTrack).toHaveBeenCalledWith('pulse', {
-				plan_name_current: 'Community',
-				quota: -1,
-				usage: 0,
-			});
-
-			jest.advanceTimersToNextTimer();
-
-			await flushPromises();
-
-			expect(pulseSpy).toBeCalledTimes(2);
-			expect(spyTrack).toHaveBeenCalledTimes(2);
-			expect(spyTrack).toHaveBeenCalledWith('pulse', {
-				plan_name_current: 'Community',
-				quota: -1,
-				usage: 0,
-			});
-		});
-
-		xtest('should track workflow counts correctly', async () => {
-			expect(pulseSpy).toBeCalledTimes(0);
-
-			let execBuffer = telemetry.getCountsBuffer();
-
-			// expect clear counters on start
-			expect(Object.keys(execBuffer).length).toBe(0);
-
-			const payload = {
-				workflow_id: '1',
-				is_manual: true,
-				success: true,
-				error_node_type: 'custom-nodes-base.node-type',
-			};
-
-			telemetry.trackWorkflowExecution(payload);
-			telemetry.trackWorkflowExecution(payload);
-
-			payload.is_manual = false;
-			payload.success = true;
-			telemetry.trackWorkflowExecution(payload);
-			telemetry.trackWorkflowExecution(payload);
-
-			payload.is_manual = true;
-			payload.success = false;
-			telemetry.trackWorkflowExecution(payload);
-			telemetry.trackWorkflowExecution(payload);
-
-			payload.is_manual = false;
-			payload.success = false;
-			telemetry.trackWorkflowExecution(payload);
-			telemetry.trackWorkflowExecution(payload);
-
-			payload.workflow_id = '2';
-			telemetry.trackWorkflowExecution(payload);
-			telemetry.trackWorkflowExecution(payload);
-
-			expect(spyTrack).toHaveBeenCalledTimes(0);
-			expect(pulseSpy).toBeCalledTimes(0);
-
-			jest.advanceTimersToNextTimer();
-
-			execBuffer = telemetry.getCountsBuffer();
-
-			await flushPromises();
-
-			expect(pulseSpy).toBeCalledTimes(1);
-			expect(spyTrack).toHaveBeenCalledTimes(3);
-			expect(spyTrack).toHaveBeenNthCalledWith(
-				1,
-				'Workflow execution count',
-				{
-					event_version: '2',
-					workflow_id: '1',
-					user_id: undefined,
-					manual_error: {
-						count: 2,
-						first: testDateTime,
-					},
-					manual_success: {
-						count: 2,
-						first: testDateTime,
-					},
-					prod_error: {
-						count: 2,
-						first: testDateTime,
-					},
-					prod_success: {
-						count: 2,
-						first: testDateTime,
-					},
-				},
-				{ withPostHog: true },
-			);
-			expect(spyTrack).toHaveBeenNthCalledWith(
-				2,
-				'Workflow execution count',
-				{
-					event_version: '2',
-					workflow_id: '2',
-					user_id: undefined,
-					prod_error: {
-						count: 2,
-						first: testDateTime,
-					},
-				},
-				{ withPostHog: true },
-			);
-			expect(spyTrack).toHaveBeenNthCalledWith(3, 'pulse', {
-				plan_name_current: 'Community',
-				quota: -1,
-				usage: 0,
-			});
-			expect(Object.keys(execBuffer).length).toBe(0);
-
-			// Adding a second step here because we believe PostHog may use timers for sending data
-			// and adding posthog to the above metric was causing the pulseSpy timer to not be ran
-			jest.advanceTimersToNextTimer();
-
-			execBuffer = telemetry.getCountsBuffer();
-			expect(Object.keys(execBuffer).length).toBe(0);
-
-			// @TODO: Flushing promises here is not working
-
-			// expect(pulseSpy).toBeCalledTimes(2);
-			// expect(spyTrack).toHaveBeenCalledTimes(4);
-			// expect(spyTrack).toHaveBeenNthCalledWith(4, 'pulse', {
-			// 	plan_name_current: 'Community',
-			// 	quota: -1,
-			// 	usage: 0,
-			// });
-		});
-	});
 });
 
 const fakeJestSystemTime = (dateTime: string | Date): Date => {
diff --git a/packages/cli/test/shared/flushPromises.ts b/packages/cli/test/shared/flushPromises.ts
deleted file mode 100644
index 405b9e98dca26..0000000000000
--- a/packages/cli/test/shared/flushPromises.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * Ensure all pending promises settle. The promise's `resolve` is placed in
- * the macrotask queue and so called at the next iteration of the event loop
- * after all promises in the microtask queue have settled first.
- */
-export const flushPromises = async () => await new Promise(setImmediate);

From 9b977e80f6df47684bc2f2aad5b037437eefb90b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Wed, 7 Aug 2024 16:09:42 +0200
Subject: [PATCH 103/168] refactor(core): Decouple lifecycle events from
 internal hooks (no-changelog) (#10305)

---
 packages/cli/src/InternalHooks.ts             | 45 +--------------
 packages/cli/src/commands/start.ts            |  3 +-
 .../__tests__/owner.controller.test.ts        |  4 +-
 .../cli/src/controllers/owner.controller.ts   |  6 +-
 packages/cli/src/events/relay-event-map.ts    | 27 ++++++++-
 .../cli/src/events/telemetry-event-relay.ts   | 50 ++++++++++++++++-
 .../workflow-statistics.service.test.ts       | 56 ++++++++-----------
 packages/cli/src/services/frontend.service.ts |  6 +-
 .../services/workflow-statistics.service.ts   | 32 +++++------
 .../src/telemetry/__tests__/telemetry.test.ts | 11 +---
 packages/cli/src/telemetry/index.ts           |  8 +--
 11 files changed, 129 insertions(+), 119 deletions(-)

diff --git a/packages/cli/src/InternalHooks.ts b/packages/cli/src/InternalHooks.ts
index 031a7fe3a6259..c264bb2fbebda 100644
--- a/packages/cli/src/InternalHooks.ts
+++ b/packages/cli/src/InternalHooks.ts
@@ -1,7 +1,6 @@
 import { Service } from 'typedi';
 import type { ITelemetryTrackProperties } from 'n8n-workflow';
 import type { User } from '@db/entities/User';
-import { WorkflowStatisticsService } from '@/services/workflow-statistics.service';
 import { Telemetry } from '@/telemetry';
 import { MessageEventBus } from './eventbus/MessageEventBus/MessageEventBus';
 
@@ -14,28 +13,16 @@ import { MessageEventBus } from './eventbus/MessageEventBus/MessageEventBus';
 export class InternalHooks {
 	constructor(
 		private readonly telemetry: Telemetry,
-		workflowStatisticsService: WorkflowStatisticsService,
 		// Can't use @ts-expect-error because only dev time tsconfig considers this as an error, but not build time
 		// eslint-disable-next-line @typescript-eslint/ban-ts-comment
 		// @ts-ignore - needed until we decouple telemetry
 		private readonly _eventBus: MessageEventBus, // needed until we decouple telemetry
-	) {
-		workflowStatisticsService.on('telemetry.onFirstProductionWorkflowSuccess', (metrics) =>
-			this.onFirstProductionWorkflowSuccess(metrics),
-		);
-		workflowStatisticsService.on('telemetry.onFirstWorkflowDataLoad', (metrics) =>
-			this.onFirstWorkflowDataLoad(metrics),
-		);
-	}
+	) {}
 
 	async init() {
 		await this.telemetry.init();
 	}
 
-	onFrontendSettingsAPI(pushRef?: string): void {
-		this.telemetry.track('Session started', { session_id: pushRef });
-	}
-
 	onWorkflowSharingUpdate(workflowId: string, userId: string, userList: string[]) {
 		const properties: ITelemetryTrackProperties = {
 			workflow_id: workflowId,
@@ -46,14 +33,6 @@ export class InternalHooks {
 		this.telemetry.track('User updated workflow sharing', properties);
 	}
 
-	async onN8nStop(): Promise<void> {
-		const timeoutPromise = new Promise<void>((resolve) => {
-			setTimeout(resolve, 3000);
-		});
-
-		return await Promise.race([timeoutPromise, this.telemetry.trackN8nStop()]);
-	}
-
 	onUserInviteEmailClick(userInviteClickData: { inviter: User; invitee: User }) {
 		this.telemetry.track('User clicked invite link from email', {
 			user_id: userInviteClickData.invitee.id,
@@ -85,10 +64,6 @@ export class InternalHooks {
 		});
 	}
 
-	onInstanceOwnerSetup(instanceOwnerSetupData: { user_id: string }) {
-		this.telemetry.track('Owner finished instance setup', instanceOwnerSetupData);
-	}
-
 	onEmailFailed(failedEmailData: {
 		user: User;
 		message_type:
@@ -103,22 +78,4 @@ export class InternalHooks {
 			user_id: failedEmailData.user.id,
 		});
 	}
-
-	/*
-	 * Execution Statistics
-	 */
-	onFirstProductionWorkflowSuccess(data: { user_id: string; workflow_id: string }) {
-		this.telemetry.track('Workflow first prod success', data);
-	}
-
-	onFirstWorkflowDataLoad(data: {
-		user_id: string;
-		workflow_id: string;
-		node_type: string;
-		node_id: string;
-		credential_type?: string;
-		credential_id?: string;
-	}) {
-		this.telemetry.track('Workflow first data fetched', data);
-	}
 }
diff --git a/packages/cli/src/commands/start.ts b/packages/cli/src/commands/start.ts
index 98e8e5b98141c..99df74fabd6cd 100644
--- a/packages/cli/src/commands/start.ts
+++ b/packages/cli/src/commands/start.ts
@@ -16,7 +16,6 @@ import { ActiveWorkflowManager } from '@/ActiveWorkflowManager';
 import { Server } from '@/Server';
 import { EDITOR_UI_DIST_DIR, LICENSE_FEATURES } from '@/constants';
 import { MessageEventBus } from '@/eventbus/MessageEventBus/MessageEventBus';
-import { InternalHooks } from '@/InternalHooks';
 import { License } from '@/License';
 import { OrchestrationService } from '@/services/orchestration.service';
 import { OrchestrationHandlerMainService } from '@/services/orchestration/main/orchestration.handler.main.service';
@@ -110,7 +109,7 @@ export class Start extends BaseCommand {
 				await Container.get(OrchestrationService).shutdown();
 			}
 
-			await Container.get(InternalHooks).onN8nStop();
+			Container.get(EventService).emit('instance-stopped');
 
 			await Container.get(ActiveExecutions).shutdown();
 
diff --git a/packages/cli/src/controllers/__tests__/owner.controller.test.ts b/packages/cli/src/controllers/__tests__/owner.controller.test.ts
index 3aabc87cade9a..8c4f00abeeab0 100644
--- a/packages/cli/src/controllers/__tests__/owner.controller.test.ts
+++ b/packages/cli/src/controllers/__tests__/owner.controller.test.ts
@@ -10,7 +10,6 @@ import type { User } from '@db/entities/User';
 import type { SettingsRepository } from '@db/repositories/settings.repository';
 import type { UserRepository } from '@db/repositories/user.repository';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
-import type { InternalHooks } from '@/InternalHooks';
 import { License } from '@/License';
 import type { OwnerRequest } from '@/requests';
 import type { UserService } from '@/services/user.service';
@@ -21,7 +20,6 @@ import { badPasswords } from '@test/testData';
 
 describe('OwnerController', () => {
 	const configGetSpy = jest.spyOn(config, 'getEnv');
-	const internalHooks = mock<InternalHooks>();
 	const authService = mock<AuthService>();
 	const userService = mock<UserService>();
 	const userRepository = mock<UserRepository>();
@@ -29,7 +27,7 @@ describe('OwnerController', () => {
 	mockInstance(License).isWithinUsersLimit.mockReturnValue(true);
 	const controller = new OwnerController(
 		mock(),
-		internalHooks,
+		mock(),
 		settingsRepository,
 		authService,
 		userService,
diff --git a/packages/cli/src/controllers/owner.controller.ts b/packages/cli/src/controllers/owner.controller.ts
index 9b86ac41ab313..c0c2e7308d311 100644
--- a/packages/cli/src/controllers/owner.controller.ts
+++ b/packages/cli/src/controllers/owner.controller.ts
@@ -13,13 +13,13 @@ import { PostHogClient } from '@/posthog';
 import { UserService } from '@/services/user.service';
 import { Logger } from '@/Logger';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
-import { InternalHooks } from '@/InternalHooks';
+import { EventService } from '@/events/event.service';
 
 @RestController('/owner')
 export class OwnerController {
 	constructor(
 		private readonly logger: Logger,
-		private readonly internalHooks: InternalHooks,
+		private readonly eventService: EventService,
 		private readonly settingsRepository: SettingsRepository,
 		private readonly authService: AuthService,
 		private readonly userService: UserService,
@@ -85,7 +85,7 @@ export class OwnerController {
 
 		this.authService.issueCookie(res, owner, req.browserId);
 
-		this.internalHooks.onInstanceOwnerSetup({ user_id: owner.id });
+		this.eventService.emit('instance-owner-setup', { userId: owner.id });
 
 		return await this.userService.toPublic(owner, { posthog: this.postHog, withScopes: true });
 	}
diff --git a/packages/cli/src/events/relay-event-map.ts b/packages/cli/src/events/relay-event-map.ts
index 0d329508b413e..0081bf6c4288b 100644
--- a/packages/cli/src/events/relay-event-map.ts
+++ b/packages/cli/src/events/relay-event-map.ts
@@ -13,10 +13,35 @@ export type UserLike = {
 };
 
 export type RelayEventMap = {
-	// #region Server
+	// #region Lifecycle
 
 	'server-started': {};
 
+	'session-started': {
+		pushRef?: string;
+	};
+
+	'instance-stopped': {};
+
+	'instance-owner-setup': {
+		userId: string;
+	};
+
+	'first-production-workflow-succeeded': {
+		projectId: string;
+		workflowId: string;
+		userId: string;
+	};
+
+	'first-workflow-data-loaded': {
+		userId: string;
+		workflowId: string;
+		nodeType: string;
+		nodeId: string;
+		credentialType?: string;
+		credentialId?: string;
+	};
+
 	// #endregion
 
 	// #region Workflow
diff --git a/packages/cli/src/events/telemetry-event-relay.ts b/packages/cli/src/events/telemetry-event-relay.ts
index bc7a19479e721..77e1878e0b04d 100644
--- a/packages/cli/src/events/telemetry-event-relay.ts
+++ b/packages/cli/src/events/telemetry-event-relay.ts
@@ -73,6 +73,12 @@ export class TelemetryEventRelay extends EventRelay {
 			'workflow-deleted': (event) => this.workflowDeleted(event),
 			'workflow-saved': async (event) => await this.workflowSaved(event),
 			'server-started': async () => await this.serverStarted(),
+			'session-started': (event) => this.sessionStarted(event),
+			'instance-stopped': () => this.instanceStopped(),
+			'instance-owner-setup': async (event) => await this.instanceOwnerSetup(event),
+			'first-production-workflow-succeeded': (event) =>
+				this.firstProductionWorkflowSucceeded(event),
+			'first-workflow-data-loaded': (event) => this.firstWorkflowDataLoaded(event),
 			'workflow-post-execute': async (event) => await this.workflowPostExecute(event),
 			'user-changed-role': (event) => this.userChangedRole(event),
 			'user-retrieved-user': (event) => this.userRetrievedUser(event),
@@ -687,7 +693,7 @@ export class TelemetryEventRelay extends EventRelay {
 
 	// #endregion
 
-	// #region Server
+	// #region Lifecycle
 
 	private async serverStarted() {
 		const cpus = os.cpus();
@@ -753,6 +759,48 @@ export class TelemetryEventRelay extends EventRelay {
 		});
 	}
 
+	private sessionStarted({ pushRef }: RelayEventMap['session-started']) {
+		this.telemetry.track('Session started', { session_id: pushRef });
+	}
+
+	private instanceStopped() {
+		this.telemetry.track('User instance stopped');
+	}
+
+	private async instanceOwnerSetup({ userId }: RelayEventMap['instance-owner-setup']) {
+		this.telemetry.track('Owner finished instance setup', { user_id: userId });
+	}
+
+	private firstProductionWorkflowSucceeded({
+		projectId,
+		workflowId,
+		userId,
+	}: RelayEventMap['first-production-workflow-succeeded']) {
+		this.telemetry.track('Workflow first prod success', {
+			project_id: projectId,
+			workflow_id: workflowId,
+			user_id: userId,
+		});
+	}
+
+	private firstWorkflowDataLoaded({
+		userId,
+		workflowId,
+		nodeType,
+		nodeId,
+		credentialType,
+		credentialId,
+	}: RelayEventMap['first-workflow-data-loaded']) {
+		this.telemetry.track('Workflow first data fetched', {
+			user_id: userId,
+			workflow_id: workflowId,
+			node_type: nodeType,
+			node_id: nodeId,
+			credential_type: credentialType,
+			credential_id: credentialId,
+		});
+	}
+
 	// #endregion
 
 	// #region User
diff --git a/packages/cli/src/services/__tests__/workflow-statistics.service.test.ts b/packages/cli/src/services/__tests__/workflow-statistics.service.test.ts
index 24c3bce560d32..b3cc6b7998db8 100644
--- a/packages/cli/src/services/__tests__/workflow-statistics.service.test.ts
+++ b/packages/cli/src/services/__tests__/workflow-statistics.service.test.ts
@@ -19,6 +19,7 @@ import { UserService } from '@/services/user.service';
 import { OwnershipService } from '@/services/ownership.service';
 import { mockInstance } from '@test/mocking';
 import type { Project } from '@/databases/entities/Project';
+import type { EventService } from '@/events/event.service';
 
 describe('WorkflowStatisticsService', () => {
 	const fakeUser = mock<User>({ id: 'abcde-fghij' });
@@ -44,21 +45,15 @@ describe('WorkflowStatisticsService', () => {
 	mocked(ownershipService.getProjectOwnerCached).mockResolvedValue(fakeUser);
 	const updateSettingsMock = jest.spyOn(userService, 'updateSettings').mockImplementation();
 
+	const eventService = mock<EventService>();
 	const workflowStatisticsService = new WorkflowStatisticsService(
 		mock(),
 		new WorkflowStatisticsRepository(dataSource, globalConfig),
 		ownershipService,
 		userService,
+		eventService,
 	);
 
-	const onFirstProductionWorkflowSuccess = jest.fn();
-	const onFirstWorkflowDataLoad = jest.fn();
-	workflowStatisticsService.on(
-		'telemetry.onFirstProductionWorkflowSuccess',
-		onFirstProductionWorkflowSuccess,
-	);
-	workflowStatisticsService.on('telemetry.onFirstWorkflowDataLoad', onFirstWorkflowDataLoad);
-
 	beforeEach(() => {
 		jest.clearAllMocks();
 	});
@@ -97,11 +92,10 @@ describe('WorkflowStatisticsService', () => {
 
 			await workflowStatisticsService.workflowExecutionCompleted(workflow, runData);
 			expect(updateSettingsMock).toHaveBeenCalledTimes(1);
-			expect(onFirstProductionWorkflowSuccess).toBeCalledTimes(1);
-			expect(onFirstProductionWorkflowSuccess).toHaveBeenNthCalledWith(1, {
-				project_id: fakeProject.id,
-				user_id: fakeUser.id,
-				workflow_id: workflow.id,
+			expect(eventService.emit).toHaveBeenCalledWith('first-production-workflow-succeeded', {
+				projectId: fakeProject.id,
+				workflowId: workflow.id,
+				userId: fakeUser.id,
 			});
 		});
 
@@ -124,7 +118,7 @@ describe('WorkflowStatisticsService', () => {
 				startedAt: new Date(),
 			};
 			await workflowStatisticsService.workflowExecutionCompleted(workflow, runData);
-			expect(onFirstProductionWorkflowSuccess).toBeCalledTimes(0);
+			expect(eventService.emit).not.toHaveBeenCalled();
 		});
 
 		test('should not send metrics for updated entries', async () => {
@@ -147,7 +141,7 @@ describe('WorkflowStatisticsService', () => {
 			};
 			mockDBCall(2);
 			await workflowStatisticsService.workflowExecutionCompleted(workflow, runData);
-			expect(onFirstProductionWorkflowSuccess).toBeCalledTimes(0);
+			expect(eventService.emit).not.toHaveBeenCalled();
 		});
 	});
 
@@ -164,13 +158,12 @@ describe('WorkflowStatisticsService', () => {
 				parameters: {},
 			};
 			await workflowStatisticsService.nodeFetchedData(workflowId, node);
-			expect(onFirstWorkflowDataLoad).toBeCalledTimes(1);
-			expect(onFirstWorkflowDataLoad).toHaveBeenNthCalledWith(1, {
-				user_id: fakeUser.id,
-				project_id: fakeProject.id,
-				workflow_id: workflowId,
-				node_type: node.type,
-				node_id: node.id,
+			expect(eventService.emit).toHaveBeenCalledWith('first-workflow-data-loaded', {
+				userId: fakeUser.id,
+				project: fakeProject.id,
+				workflowId,
+				nodeType: node.type,
+				nodeId: node.id,
 			});
 		});
 
@@ -192,15 +185,14 @@ describe('WorkflowStatisticsService', () => {
 				},
 			};
 			await workflowStatisticsService.nodeFetchedData(workflowId, node);
-			expect(onFirstWorkflowDataLoad).toBeCalledTimes(1);
-			expect(onFirstWorkflowDataLoad).toHaveBeenNthCalledWith(1, {
-				user_id: fakeUser.id,
-				project_id: fakeProject.id,
-				workflow_id: workflowId,
-				node_type: node.type,
-				node_id: node.id,
-				credential_type: 'testCredentials',
-				credential_id: node.credentials.testCredentials.id,
+			expect(eventService.emit).toHaveBeenCalledWith('first-workflow-data-loaded', {
+				userId: fakeUser.id,
+				project: fakeProject.id,
+				workflowId,
+				nodeType: node.type,
+				nodeId: node.id,
+				credentialType: 'testCredentials',
+				credentialId: node.credentials.testCredentials.id,
 			});
 		});
 
@@ -217,7 +209,7 @@ describe('WorkflowStatisticsService', () => {
 				parameters: {},
 			};
 			await workflowStatisticsService.nodeFetchedData(workflowId, node);
-			expect(onFirstWorkflowDataLoad).toBeCalledTimes(0);
+			expect(eventService.emit).not.toHaveBeenCalled();
 		});
 	});
 });
diff --git a/packages/cli/src/services/frontend.service.ts b/packages/cli/src/services/frontend.service.ts
index 7cd9843c1d97f..fc38eb992e154 100644
--- a/packages/cli/src/services/frontend.service.ts
+++ b/packages/cli/src/services/frontend.service.ts
@@ -31,7 +31,7 @@ import { UserManagementMailer } from '@/UserManagement/email';
 import type { CommunityPackagesService } from '@/services/communityPackages.service';
 import { Logger } from '@/Logger';
 import { UrlService } from './url.service';
-import { InternalHooks } from '@/InternalHooks';
+import { EventService } from '@/events/event.service';
 import { isApiEnabled } from '@/PublicApi';
 
 @Service()
@@ -50,7 +50,7 @@ export class FrontendService {
 		private readonly mailer: UserManagementMailer,
 		private readonly instanceSettings: InstanceSettings,
 		private readonly urlService: UrlService,
-		private readonly internalHooks: InternalHooks,
+		private readonly eventService: EventService,
 	) {
 		loadNodesAndCredentials.addPostProcessor(async () => await this.generateTypes());
 		void this.generateTypes();
@@ -244,7 +244,7 @@ export class FrontendService {
 	}
 
 	getSettings(pushRef?: string): IN8nUISettings {
-		this.internalHooks.onFrontendSettingsAPI(pushRef);
+		this.eventService.emit('session-started', { pushRef });
 
 		const restEndpoint = this.globalConfig.endpoints.rest;
 
diff --git a/packages/cli/src/services/workflow-statistics.service.ts b/packages/cli/src/services/workflow-statistics.service.ts
index 9311ef885dfbd..262dae4f1c545 100644
--- a/packages/cli/src/services/workflow-statistics.service.ts
+++ b/packages/cli/src/services/workflow-statistics.service.ts
@@ -6,6 +6,7 @@ import { UserService } from '@/services/user.service';
 import { Logger } from '@/Logger';
 import { OwnershipService } from './ownership.service';
 import { TypedEmitter } from '@/TypedEmitter';
+import { EventService } from '@/events/event.service';
 
 type WorkflowStatisticsEvents = {
 	nodeFetchedData: { workflowId: string; node: INode };
@@ -31,6 +32,7 @@ export class WorkflowStatisticsService extends TypedEmitter<WorkflowStatisticsEv
 		private readonly repository: WorkflowStatisticsRepository,
 		private readonly ownershipService: OwnershipService,
 		private readonly userService: UserService,
+		private readonly eventService: EventService,
 	) {
 		super({ captureRejections: true });
 		if ('SKIP_STATISTICS_EVENTS' in process.env) return;
@@ -72,12 +74,6 @@ export class WorkflowStatisticsService extends TypedEmitter<WorkflowStatisticsEv
 				if (project.type === 'personal') {
 					const owner = await this.ownershipService.getProjectOwnerCached(project.id);
 
-					const metrics = {
-						project_id: project.id,
-						workflow_id: workflowId,
-						user_id: owner!.id,
-					};
-
 					if (owner && !owner.settings?.userActivated) {
 						await this.userService.updateSettings(owner.id, {
 							firstSuccessfulWorkflowId: workflowId,
@@ -86,8 +82,11 @@ export class WorkflowStatisticsService extends TypedEmitter<WorkflowStatisticsEv
 						});
 					}
 
-					// Send the metrics
-					this.emit('telemetry.onFirstProductionWorkflowSuccess', metrics);
+					this.eventService.emit('first-production-workflow-succeeded', {
+						projectId: project.id,
+						workflowId,
+						userId: owner!.id,
+					});
 				}
 			}
 		} catch (error) {
@@ -109,24 +108,23 @@ export class WorkflowStatisticsService extends TypedEmitter<WorkflowStatisticsEv
 		const owner = await this.ownershipService.getProjectOwnerCached(project.id);
 
 		let metrics = {
-			user_id: owner!.id,
-			project_id: project.id,
-			workflow_id: workflowId,
-			node_type: node.type,
-			node_id: node.id,
+			userId: owner!.id,
+			project: project.id,
+			workflowId,
+			nodeType: node.type,
+			nodeId: node.id,
 		};
 
 		// This is probably naive but I can't see a way for a node to have multiple credentials attached so..
 		if (node.credentials) {
 			Object.entries(node.credentials).forEach(([credName, credDetails]) => {
 				metrics = Object.assign(metrics, {
-					credential_type: credName,
-					credential_id: credDetails.id,
+					credentialType: credName,
+					credentialId: credDetails.id,
 				});
 			});
 		}
 
-		// Send metrics to posthog
-		this.emit('telemetry.onFirstWorkflowDataLoad', metrics);
+		this.eventService.emit('first-workflow-data-loaded', metrics);
 	}
 }
diff --git a/packages/cli/src/telemetry/__tests__/telemetry.test.ts b/packages/cli/src/telemetry/__tests__/telemetry.test.ts
index e701301d58802..ca30c86ec4ade 100644
--- a/packages/cli/src/telemetry/__tests__/telemetry.test.ts
+++ b/packages/cli/src/telemetry/__tests__/telemetry.test.ts
@@ -34,7 +34,7 @@ describe('Telemetry', () => {
 		jest.clearAllTimers();
 		jest.useRealTimers();
 		startPulseSpy.mockRestore();
-		await telemetry.trackN8nStop();
+		await telemetry.stopTracking();
 	});
 
 	beforeEach(async () => {
@@ -49,14 +49,7 @@ describe('Telemetry', () => {
 	});
 
 	afterEach(async () => {
-		await telemetry.trackN8nStop();
-	});
-
-	describe('trackN8nStop', () => {
-		test('should call track method', async () => {
-			await telemetry.trackN8nStop();
-			expect(spyTrack).toHaveBeenCalledTimes(1);
-		});
+		await telemetry.stopTracking();
 	});
 
 	describe('trackWorkflowExecution', () => {
diff --git a/packages/cli/src/telemetry/index.ts b/packages/cli/src/telemetry/index.ts
index 2d762297304cc..e2b93cdd0d7a9 100644
--- a/packages/cli/src/telemetry/index.ts
+++ b/packages/cli/src/telemetry/index.ts
@@ -9,12 +9,13 @@ import config from '@/config';
 import type { IExecutionTrackProperties } from '@/Interfaces';
 import { Logger } from '@/Logger';
 import { License } from '@/License';
-import { N8N_VERSION } from '@/constants';
+import { LOWEST_SHUTDOWN_PRIORITY, N8N_VERSION } from '@/constants';
 import { WorkflowRepository } from '@db/repositories/workflow.repository';
 import { SourceControlPreferencesService } from '../environments/sourceControl/sourceControlPreferences.service.ee';
 import { UserRepository } from '@db/repositories/user.repository';
 import { ProjectRepository } from '@/databases/repositories/project.repository';
 import { ProjectRelationRepository } from '@/databases/repositories/projectRelation.repository';
+import { OnShutdown } from '@/decorators/OnShutdown';
 
 type ExecutionTrackDataKey = 'manual_error' | 'manual_success' | 'prod_error' | 'prod_success';
 
@@ -167,11 +168,10 @@ export class Telemetry {
 		}
 	}
 
-	async trackN8nStop(): Promise<void> {
+	@OnShutdown(LOWEST_SHUTDOWN_PRIORITY)
+	async stopTracking(): Promise<void> {
 		clearInterval(this.pulseIntervalReference);
 
-		this.track('User instance stopped');
-
 		await Promise.all([this.postHog.stop(), this.rudderStack?.flush()]);
 	}
 

From 0de9d56619ed1c055407353046b8a9ebe78da527 Mon Sep 17 00:00:00 2001
From: Michael Kret <88898367+michael-radency@users.noreply.github.com>
Date: Wed, 7 Aug 2024 18:07:48 +0300
Subject: [PATCH 104/168] feat(AI Transform Node): New node (#9990)

Co-authored-by: Giulio Andreini <g.andreini@gmail.com>
Co-authored-by: Shireen Missi <94372015+ShireenMissi@users.noreply.github.com>
---
 .../ManualChatTrigger.node.ts                 |   4 +-
 .../dynamicNodeParameters.controller.ts       |  26 +-
 packages/cli/src/requests.ts                  |   6 +
 .../services/dynamicNodeParameters.service.ts |  27 +-
 packages/editor-ui/src/Interface.ts           |   5 +
 packages/editor-ui/src/api/nodeTypes.ts       |  13 +
 .../ButtonParameter/ButtonParameter.vue       | 281 ++++++++++++++++++
 .../src/components/ButtonParameter/utils.ts   |  46 +++
 .../CodeNodeEditor/CodeNodeEditor.vue         |  12 +-
 .../src/components/JsEditor/JsEditor.vue      |  32 +-
 .../src/components/Node/NodeCreator/utils.ts  |   8 +
 .../components/Node/NodeCreator/viewsData.ts  |  11 +-
 .../src/components/ParameterInput.vue         |   9 +-
 .../src/components/ParameterInputList.vue     |  26 +-
 .../__tests__/ButtonParameter.test.ts         | 136 +++++++++
 packages/editor-ui/src/constants.ts           |   7 +-
 .../editor-ui/src/stores/nodeTypes.store.ts   |   7 +
 .../editor-ui/src/stores/posthog.store.ts     |  15 +-
 .../nodes/AiTransform/AiTransform.node.json   |  18 ++
 .../nodes/AiTransform/AiTransform.node.ts     | 148 +++++++++
 .../nodes/AiTransform/aitransform.svg         |  10 +
 packages/nodes-base/package.json              |   1 +
 packages/workflow/src/Interfaces.ts           |  21 +-
 23 files changed, 831 insertions(+), 38 deletions(-)
 create mode 100644 packages/editor-ui/src/components/ButtonParameter/ButtonParameter.vue
 create mode 100644 packages/editor-ui/src/components/ButtonParameter/utils.ts
 create mode 100644 packages/editor-ui/src/components/__tests__/ButtonParameter.test.ts
 create mode 100644 packages/nodes-base/nodes/AiTransform/AiTransform.node.json
 create mode 100644 packages/nodes-base/nodes/AiTransform/AiTransform.node.ts
 create mode 100644 packages/nodes-base/nodes/AiTransform/aitransform.svg

diff --git a/packages/@n8n/nodes-langchain/nodes/trigger/ManualChatTrigger/ManualChatTrigger.node.ts b/packages/@n8n/nodes-langchain/nodes/trigger/ManualChatTrigger/ManualChatTrigger.node.ts
index 272213d5390c2..816b56b59ad40 100644
--- a/packages/@n8n/nodes-langchain/nodes/trigger/ManualChatTrigger/ManualChatTrigger.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/trigger/ManualChatTrigger/ManualChatTrigger.node.ts
@@ -50,7 +50,9 @@ export class ManualChatTrigger implements INodeType {
 				name: 'openChat',
 				type: 'button',
 				typeOptions: {
-					action: 'openChat',
+					buttonConfig: {
+						action: 'openChat',
+					},
 				},
 				default: '',
 			},
diff --git a/packages/cli/src/controllers/dynamicNodeParameters.controller.ts b/packages/cli/src/controllers/dynamicNodeParameters.controller.ts
index c6a46aa3d4eed..bfd1cf651b875 100644
--- a/packages/cli/src/controllers/dynamicNodeParameters.controller.ts
+++ b/packages/cli/src/controllers/dynamicNodeParameters.controller.ts
@@ -1,4 +1,4 @@
-import type { INodePropertyOptions } from 'n8n-workflow';
+import type { INodePropertyOptions, NodeParameterValueType } from 'n8n-workflow';
 
 import { Post, RestController } from '@/decorators';
 import { getBase } from '@/WorkflowExecuteAdditionalData';
@@ -92,4 +92,28 @@ export class DynamicNodeParametersController {
 			credentials,
 		);
 	}
+
+	@Post('/action-result')
+	async getActionResult(
+		req: DynamicNodeParametersRequest.ActionResult,
+	): Promise<NodeParameterValueType> {
+		const { currentNodeParameters, nodeTypeAndVersion, path, credentials, handler, payload } =
+			req.body;
+
+		const additionalData = await getBase(req.user.id, currentNodeParameters);
+
+		if (handler) {
+			return await this.service.getActionResult(
+				handler,
+				path,
+				additionalData,
+				nodeTypeAndVersion,
+				currentNodeParameters,
+				payload,
+				credentials,
+			);
+		}
+
+		return;
+	}
 }
diff --git a/packages/cli/src/requests.ts b/packages/cli/src/requests.ts
index 4fe369857eb7a..5f5daa589e5f6 100644
--- a/packages/cli/src/requests.ts
+++ b/packages/cli/src/requests.ts
@@ -418,6 +418,12 @@ export declare namespace DynamicNodeParametersRequest {
 	type ResourceMapperFields = BaseRequest<{
 		methodName: string;
 	}>;
+
+	/** POST /dynamic-node-parameters/action-result */
+	type ActionResult = BaseRequest<{
+		handler: string;
+		payload: IDataObject | string | undefined;
+	}>;
 }
 
 // ----------------------------------
diff --git a/packages/cli/src/services/dynamicNodeParameters.service.ts b/packages/cli/src/services/dynamicNodeParameters.service.ts
index 1788bac6e1877..f3b0f7e192ba3 100644
--- a/packages/cli/src/services/dynamicNodeParameters.service.ts
+++ b/packages/cli/src/services/dynamicNodeParameters.service.ts
@@ -15,6 +15,8 @@ import type {
 	INodeCredentials,
 	INodeParameters,
 	INodeTypeNameVersion,
+	NodeParameterValueType,
+	IDataObject,
 } from 'n8n-workflow';
 import { Workflow, RoutingNode, ApplicationError } from 'n8n-workflow';
 import { NodeExecuteFunctions } from 'n8n-core';
@@ -156,6 +158,24 @@ export class DynamicNodeParametersService {
 		return method.call(thisArgs);
 	}
 
+	/** Returns the result of the action handler */
+	async getActionResult(
+		handler: string,
+		path: string,
+		additionalData: IWorkflowExecuteAdditionalData,
+		nodeTypeAndVersion: INodeTypeNameVersion,
+		currentNodeParameters: INodeParameters,
+		payload: IDataObject | string | undefined,
+		credentials?: INodeCredentials,
+	): Promise<NodeParameterValueType> {
+		const nodeType = this.getNodeType(nodeTypeAndVersion);
+		const method = this.getMethod('actionHandler', handler, nodeType);
+		const workflow = this.getWorkflow(nodeTypeAndVersion, currentNodeParameters, credentials);
+		const thisArgs = this.getThisArg(path, additionalData, workflow);
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-return
+		return method.call(thisArgs, payload);
+	}
+
 	private getMethod(
 		type: 'resourceMapping',
 		methodName: string,
@@ -175,9 +195,14 @@ export class DynamicNodeParametersService {
 		methodName: string,
 		nodeType: INodeType,
 	): (this: ILoadOptionsFunctions) => Promise<INodePropertyOptions[]>;
+	private getMethod(
+		type: 'actionHandler',
+		methodName: string,
+		nodeType: INodeType,
+	): (this: ILoadOptionsFunctions, payload?: string) => Promise<NodeParameterValueType>;
 
 	private getMethod(
-		type: 'resourceMapping' | 'listSearch' | 'loadOptions',
+		type: 'resourceMapping' | 'listSearch' | 'loadOptions' | 'actionHandler',
 		methodName: string,
 		nodeType: INodeType,
 	) {
diff --git a/packages/editor-ui/src/Interface.ts b/packages/editor-ui/src/Interface.ts
index 8c93c847ba540..f7d683e2789bc 100644
--- a/packages/editor-ui/src/Interface.ts
+++ b/packages/editor-ui/src/Interface.ts
@@ -1564,6 +1564,11 @@ export declare namespace DynamicNodeParameters {
 	interface ResourceMapperFieldsRequest extends BaseRequest {
 		methodName: string;
 	}
+
+	interface ActionResultRequest extends BaseRequest {
+		handler: string;
+		payload: IDataObject | string | undefined;
+	}
 }
 
 export interface EnvironmentVariable {
diff --git a/packages/editor-ui/src/api/nodeTypes.ts b/packages/editor-ui/src/api/nodeTypes.ts
index 300b25390d121..f4d516aaeff82 100644
--- a/packages/editor-ui/src/api/nodeTypes.ts
+++ b/packages/editor-ui/src/api/nodeTypes.ts
@@ -5,6 +5,7 @@ import type {
 	INodePropertyOptions,
 	INodeTypeDescription,
 	INodeTypeNameVersion,
+	NodeParameterValueType,
 	ResourceMapperFields,
 } from 'n8n-workflow';
 import axios from 'axios';
@@ -57,3 +58,15 @@ export async function getResourceMapperFields(
 		sendData,
 	);
 }
+
+export async function getNodeParameterActionResult(
+	context: IRestApiContext,
+	sendData: DynamicNodeParameters.ActionResultRequest,
+): Promise<NodeParameterValueType> {
+	return await makeRestApiRequest(
+		context,
+		'POST',
+		'/dynamic-node-parameters/action-result',
+		sendData,
+	);
+}
diff --git a/packages/editor-ui/src/components/ButtonParameter/ButtonParameter.vue b/packages/editor-ui/src/components/ButtonParameter/ButtonParameter.vue
new file mode 100644
index 0000000000000..d7e05b0f5bf85
--- /dev/null
+++ b/packages/editor-ui/src/components/ButtonParameter/ButtonParameter.vue
@@ -0,0 +1,281 @@
+<script setup lang="ts">
+import { ApplicationError, 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 { useI18n } from '@/composables/useI18n';
+import { useToast } from '@/composables/useToast';
+import { useNDVStore } from '@/stores/ndv.store';
+import { getSchemas, getParentNodes } from './utils';
+import { ASK_AI_EXPERIMENT } from '@/constants';
+import { usePostHog } from '@/stores/posthog.store';
+import { useRootStore } from '@/stores/root.store';
+import { generateCodeForPrompt } from '@/api/ai';
+
+import { format } from 'prettier';
+import jsParser from 'prettier/plugins/babel';
+import * as estree from 'prettier/plugins/estree';
+
+const emit = defineEmits<{
+	valueChanged: [value: IUpdateInformation];
+}>();
+
+const props = defineProps<{
+	parameter: INodeProperties;
+	value: string;
+	path: string;
+}>();
+
+const posthog = usePostHog();
+const rootStore = useRootStore();
+
+const i18n = useI18n();
+
+const isLoading = ref(false);
+const prompt = ref(props.value);
+const parentNodes = ref<INodeUi[]>([]);
+
+const hasExecutionData = computed(() => (useNDVStore().ndvInputData || []).length > 0);
+const hasInputField = computed(() => props.parameter.typeOptions?.buttonConfig?.hasInputField);
+const inputFieldMaxLength = computed(
+	() => props.parameter.typeOptions?.buttonConfig?.inputFieldMaxLength,
+);
+const buttonLabel = computed(
+	() => props.parameter.typeOptions?.buttonConfig?.label ?? props.parameter.displayName,
+);
+const isSubmitEnabled = computed(() => {
+	if (!hasExecutionData.value) return false;
+	if (!prompt.value) return false;
+
+	const maxlength = inputFieldMaxLength.value;
+	if (maxlength && prompt.value.length > maxlength) return false;
+
+	return true;
+});
+
+function startLoading() {
+	isLoading.value = true;
+}
+
+function stopLoading() {
+	setTimeout(() => {
+		isLoading.value = false;
+	}, 200);
+}
+
+function getPath(parameter: string) {
+	return (props.path ? `${props.path}.` : '') + parameter;
+}
+
+function createPrompt(prompt: string) {
+	return `
+Important! The original input must remain unchanged. If there is a risk of modifying the original input, create a copy of it before making any changes. Use appropriate methods to ensure that the properties of objects are not directly altered.
+
+Always return an array
+
+${prompt}
+`;
+}
+
+async function onSubmit() {
+	const { activeNode } = useNDVStore();
+	const { showMessage } = useToast();
+	const action: string | NodePropertyAction | undefined =
+		props.parameter.typeOptions?.buttonConfig?.action;
+
+	if (!action || !activeNode) return;
+
+	if (typeof action === 'string') {
+		switch (action) {
+			default:
+				return;
+		}
+	}
+
+	emit('valueChanged', {
+		name: getPath(props.parameter.name),
+		value: prompt.value,
+	});
+
+	const { type, target } = action;
+
+	startLoading();
+
+	try {
+		const schemas = getSchemas();
+		const version = rootStore.versionCli;
+		const model =
+			usePostHog().getVariant(ASK_AI_EXPERIMENT.name) === ASK_AI_EXPERIMENT.gpt4
+				? 'gpt-4'
+				: 'gpt-3.5-turbo-16k';
+
+		const payload = {
+			question: createPrompt(prompt.value),
+			context: {
+				schema: schemas.parentNodesSchemas,
+				inputSchema: schemas.inputSchema!,
+				ndvPushRef: useNDVStore().pushRef,
+				pushRef: rootStore.pushRef,
+			},
+			model,
+			n8nVersion: version,
+		};
+		switch (type) {
+			case 'askAiCodeGeneration':
+				let value;
+				if (posthog.isAiEnabled()) {
+					const { restApiContext } = useRootStore();
+					const { code } = await generateCodeForPrompt(restApiContext, payload);
+					value = code;
+				} else {
+					throw new ApplicationError('AI code generation is not enabled');
+				}
+
+				if (value === undefined) return;
+
+				const formattedCode = await format(String(value), {
+					parser: 'babel',
+					plugins: [jsParser, estree],
+				});
+
+				const updateInformation = {
+					name: getPath(target as string),
+					value: formattedCode,
+				};
+
+				emit('valueChanged', updateInformation);
+				break;
+			default:
+				return;
+		}
+
+		showMessage({
+			type: 'success',
+			title: i18n.baseText('codeNodeEditor.askAi.generationCompleted'),
+		});
+
+		stopLoading();
+	} catch (error) {
+		showMessage({
+			type: 'error',
+			title: i18n.baseText('codeNodeEditor.askAi.generationFailed'),
+			message: error.message,
+		});
+		stopLoading();
+	}
+}
+
+function onPromptInput(inputValue: string) {
+	prompt.value = inputValue;
+	emit('valueChanged', {
+		name: getPath(props.parameter.name),
+		value: inputValue,
+	});
+}
+
+onMounted(() => {
+	parentNodes.value = getParentNodes();
+});
+</script>
+
+<template>
+	<div>
+		<n8n-input-label
+			v-if="hasInputField"
+			:label="i18n.nodeText().inputLabelDisplayName(parameter, path)"
+			:tooltip-text="i18n.nodeText().inputLabelDescription(parameter, path)"
+			:bold="false"
+			size="small"
+			color="text-dark"
+		>
+		</n8n-input-label>
+		<div :class="$style.inputContainer" :hidden="!hasInputField">
+			<div :class="$style.meta">
+				<span
+					v-if="inputFieldMaxLength"
+					v-show="prompt.length > 1"
+					:class="$style.counter"
+					v-text="`${prompt.length} / ${inputFieldMaxLength}`"
+				/>
+			</div>
+			<N8nInput
+				v-model="prompt"
+				:class="$style.input"
+				style="border: 1px solid var(--color-foreground-base)"
+				type="textarea"
+				:rows="6"
+				:maxlength="inputFieldMaxLength"
+				:placeholder="parameter.placeholder"
+				@input="onPromptInput"
+			/>
+		</div>
+		<div :class="$style.controls">
+			<N8nTooltip :disabled="isSubmitEnabled">
+				<div>
+					<N8nButton
+						:disabled="!isSubmitEnabled"
+						size="small"
+						:loading="isLoading"
+						type="secondary"
+						@click="onSubmit"
+					>
+						{{ buttonLabel }}
+					</N8nButton>
+				</div>
+				<template #content>
+					<span
+						v-if="!hasExecutionData"
+						v-text="i18n.baseText('codeNodeEditor.askAi.noInputData')"
+					/>
+					<span
+						v-else-if="prompt.length === 0"
+						v-text="i18n.baseText('codeNodeEditor.askAi.noPrompt')"
+					/>
+				</template>
+			</N8nTooltip>
+		</div>
+	</div>
+</template>
+
+<style module lang="scss">
+.input * {
+	border: 0 !important;
+}
+.input textarea {
+	font-size: var(--font-size-2xs);
+	padding-bottom: var(--spacing-2xl);
+	font-family: var(--font-family);
+	resize: none;
+}
+.intro {
+	font-weight: var(--font-weight-bold);
+	font-size: var(--font-size-2xs);
+	color: var(--color-text-dark);
+	padding: var(--spacing-2xs) 0 0;
+}
+.inputContainer {
+	position: relative;
+}
+.meta {
+	display: flex;
+	justify-content: space-between;
+	position: absolute;
+	bottom: var(--spacing-2xs);
+	left: var(--spacing-xs);
+	right: var(--spacing-xs);
+	z-index: 1;
+
+	* {
+		font-size: var(--font-size-2xs);
+		line-height: 1;
+	}
+}
+.counter {
+	color: var(--color-text-light);
+}
+.controls {
+	padding: var(--spacing-2xs) 0;
+	display: flex;
+	justify-content: flex-end;
+}
+</style>
diff --git a/packages/editor-ui/src/components/ButtonParameter/utils.ts b/packages/editor-ui/src/components/ButtonParameter/utils.ts
new file mode 100644
index 0000000000000..14d3ca4d78334
--- /dev/null
+++ b/packages/editor-ui/src/components/ButtonParameter/utils.ts
@@ -0,0 +1,46 @@
+import type { Schema } from '@/Interface';
+import type { INodeExecutionData } from 'n8n-workflow';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useNDVStore } from '@/stores/ndv.store';
+import { useDataSchema } from '@/composables/useDataSchema';
+import { executionDataToJson } from '@/utils/nodeTypesUtils';
+
+export function getParentNodes() {
+	const activeNode = useNDVStore().activeNode;
+	const { getCurrentWorkflow, getNodeByName } = useWorkflowsStore();
+	const workflow = getCurrentWorkflow();
+
+	if (!activeNode || !workflow) return [];
+
+	return workflow
+		.getParentNodesByDepth(activeNode?.name)
+		.filter(({ name }, i, nodes) => {
+			return name !== activeNode.name && nodes.findIndex((node) => node.name === name) === i;
+		})
+		.map((n) => getNodeByName(n.name))
+		.filter((n) => n !== null);
+}
+
+export function getSchemas() {
+	const parentNodes = getParentNodes();
+	const parentNodesNames = parentNodes.map((node) => node?.name);
+	const { getSchemaForExecutionData, getInputDataWithPinned } = useDataSchema();
+	const parentNodesSchemas: Array<{ nodeName: string; schema: Schema }> = parentNodes
+		.map((node) => {
+			const inputData: INodeExecutionData[] = getInputDataWithPinned(node);
+
+			return {
+				nodeName: node?.name || '',
+				schema: getSchemaForExecutionData(executionDataToJson(inputData), true),
+			};
+		})
+		.filter((node) => node.schema?.value.length > 0);
+
+	const inputSchema = parentNodesSchemas.shift();
+
+	return {
+		parentNodesNames,
+		inputSchema,
+		parentNodesSchemas,
+	};
+}
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue b/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
index d59a13e98ee60..f4ba1febf2471 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
+++ b/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
@@ -60,13 +60,12 @@ import jsParser from 'prettier/plugins/babel';
 import * as estree from 'prettier/plugins/estree';
 import { type Ref, computed, nextTick, onBeforeUnmount, onMounted, ref, watch } from 'vue';
 
-import { ASK_AI_EXPERIMENT, CODE_NODE_TYPE } from '@/constants';
+import { CODE_NODE_TYPE } from '@/constants';
 import { codeNodeEditorEventBus } from '@/event-bus';
 import { useRootStore } from '@/stores/root.store';
 import { usePostHog } from '@/stores/posthog.store';
 
 import { useMessage } from '@/composables/useMessage';
-import { useSettingsStore } from '@/stores/settings.store';
 import AskAI from './AskAI/AskAI.vue';
 import { readOnlyEditorExtensions, writableEditorExtensions } from './baseExtensions';
 import { useCompleter } from './completer';
@@ -114,7 +113,6 @@ const { autocompletionExtension } = useCompleter(() => props.mode, editor);
 const { createLinter } = useLinter(() => props.mode, editor);
 
 const rootStore = useRootStore();
-const settingsStore = useSettingsStore();
 const posthog = usePostHog();
 const i18n = useI18n();
 const telemetry = useTelemetry();
@@ -191,13 +189,7 @@ onBeforeUnmount(() => {
 });
 
 const aiEnabled = computed(() => {
-	const isAiExperimentEnabled = [ASK_AI_EXPERIMENT.gpt3, ASK_AI_EXPERIMENT.gpt4].includes(
-		(posthog.getVariant(ASK_AI_EXPERIMENT.name) ?? '') as string,
-	);
-
-	return (
-		isAiExperimentEnabled && settingsStore.settings.ai.enabled && props.language === 'javaScript'
-	);
+	return posthog.isAiEnabled() && props.language === 'javaScript';
 });
 
 const placeholder = computed(() => {
diff --git a/packages/editor-ui/src/components/JsEditor/JsEditor.vue b/packages/editor-ui/src/components/JsEditor/JsEditor.vue
index 40692ab32392c..5a5f2cb411878 100644
--- a/packages/editor-ui/src/components/JsEditor/JsEditor.vue
+++ b/packages/editor-ui/src/components/JsEditor/JsEditor.vue
@@ -1,5 +1,5 @@
 <template>
-	<div :class="$style.editor">
+	<div :class="$style.editor" :style="isReadOnly ? 'opacity: 0.7' : ''">
 		<div ref="jsEditorRef" class="ph-no-capture js-editor"></div>
 		<slot name="suffix" />
 	</div>
@@ -21,7 +21,7 @@ import {
 	keymap,
 	lineNumbers,
 } from '@codemirror/view';
-import { computed, onMounted, ref } from 'vue';
+import { computed, onMounted, ref, watch } from 'vue';
 
 import {
 	autocompleteKeyMap,
@@ -45,11 +45,37 @@ const emit = defineEmits<{
 }>();
 
 onMounted(() => {
+	createEditor();
+});
+
+watch(
+	() => props.modelValue,
+	(newValue: string) => {
+		const editorValue = editor.value?.state?.doc.toString();
+
+		// If model value changes from outside the component
+		if (
+			editorValue !== undefined &&
+			editorValue.length !== newValue.length &&
+			editorValue !== newValue
+		) {
+			destroyEditor();
+			createEditor();
+		}
+	},
+);
+
+function createEditor() {
 	const state = EditorState.create({ doc: props.modelValue, extensions: extensions.value });
 	const parent = jsEditorRef.value;
+
 	editor.value = new EditorView({ parent, state });
 	editorState.value = editor.value.state;
-});
+}
+
+function destroyEditor() {
+	editor.value?.destroy();
+}
 
 const jsEditorRef = ref<HTMLDivElement>();
 const editor = ref<EditorView | null>(null);
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/utils.ts b/packages/editor-ui/src/components/Node/NodeCreator/utils.ts
index a76c62a7ca97c..7bacf6b701abf 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/utils.ts
+++ b/packages/editor-ui/src/components/Node/NodeCreator/utils.ts
@@ -9,6 +9,7 @@ import type {
 import {
 	AI_CATEGORY_AGENTS,
 	AI_SUBCATEGORY,
+	AI_TRANSFORM_NODE_TYPE,
 	CORE_NODES_CATEGORY,
 	DEFAULT_SUBCATEGORY,
 } from '@/constants';
@@ -19,6 +20,8 @@ import type { NodeViewItemSection } from './viewsData';
 import { i18n } from '@/plugins/i18n';
 import { sortBy } from 'lodash-es';
 
+import { usePostHog } from '@/stores/posthog.store';
+
 export function transformNodeType(
 	node: SimplifiedNodeType,
 	subcategory?: string,
@@ -74,6 +77,11 @@ export function sortNodeCreateElements(nodes: INodeCreateElement[]) {
 }
 
 export function searchNodes(searchFilter: string, items: INodeCreateElement[]) {
+	const aiEnabled = usePostHog().isAiEnabled();
+	if (!aiEnabled) {
+		items = items.filter((item) => item.key !== AI_TRANSFORM_NODE_TYPE);
+	}
+
 	// In order to support the old search we need to remove the 'trigger' part
 	const trimmedFilter = searchFilter.toLowerCase().replace('trigger', '').trimEnd();
 
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/viewsData.ts b/packages/editor-ui/src/components/Node/NodeCreator/viewsData.ts
index ba9cb59c3aa05..479a85f644739 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/viewsData.ts
+++ b/packages/editor-ui/src/components/Node/NodeCreator/viewsData.ts
@@ -1,4 +1,5 @@
 import {
+	AI_TRANSFORM_NODE_TYPE,
 	CORE_NODES_CATEGORY,
 	WEBHOOK_NODE_TYPE,
 	OTHER_TRIGGER_NODES_SUBCATEGORY,
@@ -63,6 +64,7 @@ import { NodeConnectionType } from 'n8n-workflow';
 import { useTemplatesStore } from '@/stores/templates.store';
 import type { BaseTextKey } from '@/plugins/i18n';
 import { camelCase } from 'lodash-es';
+import { usePostHog } from '@/stores/posthog.store';
 
 export interface NodeViewItemSection {
 	key: string;
@@ -429,6 +431,13 @@ export function TriggerView() {
 export function RegularView(nodes: SimplifiedNodeType[]) {
 	const i18n = useI18n();
 
+	const popularItemsSubcategory = [SET_NODE_TYPE, CODE_NODE_TYPE, DATETIME_NODE_TYPE];
+	const aiEnabled = usePostHog().isAiEnabled();
+
+	if (aiEnabled) {
+		popularItemsSubcategory.push(AI_TRANSFORM_NODE_TYPE);
+	}
+
 	const view: NodeView = {
 		value: REGULAR_NODE_CREATOR_VIEW,
 		title: i18n.baseText('nodeCreator.triggerHelperPanel.whatHappensNext'),
@@ -453,7 +462,7 @@ export function RegularView(nodes: SimplifiedNodeType[]) {
 						{
 							key: 'popular',
 							title: i18n.baseText('nodeCreator.sectionNames.popular'),
-							items: [SET_NODE_TYPE, CODE_NODE_TYPE, DATETIME_NODE_TYPE],
+							items: popularItemsSubcategory,
 						},
 						{
 							key: 'addOrRemove',
diff --git a/packages/editor-ui/src/components/ParameterInput.vue b/packages/editor-ui/src/components/ParameterInput.vue
index 588cf2bc3957c..0e6517ced65c5 100644
--- a/packages/editor-ui/src/components/ParameterInput.vue
+++ b/packages/editor-ui/src/components/ParameterInput.vue
@@ -134,13 +134,14 @@
 					:model-value="modelValueString"
 					:default-value="parameter.default"
 					:language="editorLanguage"
-					:is-read-only="isReadOnly"
+					:is-read-only="isReadOnly || editorIsReadOnly"
 					:rows="editorRows"
 					:ai-button-enabled="settingsStore.isCloudDeployment"
 					@update:model-value="valueChangedDebounced"
 				>
 					<template #suffix>
 						<n8n-icon
+							v-if="!editorIsReadOnly"
 							data-test-id="code-editor-fullscreen-button"
 							icon="external-link-alt"
 							size="xsmall"
@@ -198,12 +199,13 @@
 					v-else-if="editorType === 'jsEditor'"
 					:key="'js-' + codeEditDialogVisible.toString()"
 					:model-value="modelValueString"
-					:is-read-only="isReadOnly"
+					:is-read-only="isReadOnly || editorIsReadOnly"
 					:rows="editorRows"
 					@update:model-value="valueChangedDebounced"
 				>
 					<template #suffix>
 						<n8n-icon
+							v-if="!editorIsReadOnly"
 							data-test-id="code-editor-fullscreen-button"
 							icon="external-link-alt"
 							size="xsmall"
@@ -859,6 +861,9 @@ const getIssues = computed<string[]>(() => {
 const editorType = computed<EditorType | 'json' | 'code'>(() => {
 	return getArgument<EditorType>('editor');
 });
+const editorIsReadOnly = computed<boolean>(() => {
+	return getArgument<boolean>('editorIsReadOnly') ?? false;
+});
 
 const editorLanguage = computed<CodeNodeEditorLanguage>(() => {
 	if (editorType.value === 'json' || props.parameter.type === 'json')
diff --git a/packages/editor-ui/src/components/ParameterInputList.vue b/packages/editor-ui/src/components/ParameterInputList.vue
index 1ff04da89cbfc..3e27b8c96cd7b 100644
--- a/packages/editor-ui/src/components/ParameterInputList.vue
+++ b/packages/editor-ui/src/components/ParameterInputList.vue
@@ -35,14 +35,15 @@
 				@action="onNoticeAction"
 			/>
 
-			<n8n-button
-				v-else-if="parameter.type === 'button'"
-				class="parameter-item"
-				block
-				@click="onButtonAction(parameter)"
-			>
-				{{ $locale.nodeText().inputLabelDisplayName(parameter, path) }}
-			</n8n-button>
+			<div v-else-if="parameter.type === 'button'" class="parameter-item">
+				<ButtonParameter
+					:parameter="parameter"
+					:path="path"
+					:value="getParameterValue(parameter.name)"
+					:is-read-only="isReadOnly"
+					@value-changed="valueChanged"
+				/>
+			</div>
 
 			<div
 				v-else-if="['collection', 'fixedCollection'].includes(parameter.type)"
@@ -177,6 +178,7 @@ import AssignmentCollection from '@/components/AssignmentCollection/AssignmentCo
 import FilterConditions from '@/components/FilterConditions/FilterConditions.vue';
 import ImportCurlParameter from '@/components/ImportCurlParameter.vue';
 import MultipleParameter from '@/components/MultipleParameter.vue';
+import ButtonParameter from '@/components/ButtonParameter/ButtonParameter.vue';
 import ParameterInputFull from '@/components/ParameterInputFull.vue';
 import ResourceMapper from '@/components/ResourceMapper/ResourceMapper.vue';
 import { useNodeHelpers } from '@/composables/useNodeHelpers';
@@ -483,14 +485,6 @@ function onNoticeAction(action: string) {
  * Handles default node button parameter type actions
  * @param parameter
  */
-function onButtonAction(parameter: INodeProperties) {
-	const action: string | undefined = parameter.typeOptions?.action;
-
-	switch (action) {
-		default:
-			return;
-	}
-}
 
 function shouldHideAuthRelatedParameter(parameter: INodeProperties): boolean {
 	// TODO: For now, hide all fields that are used in authentication fields displayOptions
diff --git a/packages/editor-ui/src/components/__tests__/ButtonParameter.test.ts b/packages/editor-ui/src/components/__tests__/ButtonParameter.test.ts
new file mode 100644
index 0000000000000..28e80091e5f19
--- /dev/null
+++ b/packages/editor-ui/src/components/__tests__/ButtonParameter.test.ts
@@ -0,0 +1,136 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { mount } from '@vue/test-utils';
+import { createTestingPinia } from '@pinia/testing';
+import ButtonParameter from '@/components/ButtonParameter/ButtonParameter.vue';
+import { useNDVStore } from '@/stores/ndv.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { usePostHog } from '@/stores/posthog.store';
+import { useRootStore } from '@/stores/root.store';
+import { useI18n } from '@/composables/useI18n';
+import { useToast } from '@/composables/useToast';
+import type { INodeProperties } from 'n8n-workflow';
+
+vi.mock('@/stores/ndv.store');
+vi.mock('@/stores/workflows.store');
+vi.mock('@/stores/posthog.store');
+vi.mock('@/stores/root.store');
+vi.mock('@/api/ai');
+vi.mock('@/composables/useI18n');
+vi.mock('@/composables/useToast');
+
+describe('ButtonParameter', () => {
+	const defaultProps = {
+		parameter: {
+			name: 'testParam',
+			displayName: 'Test Parameter',
+			type: 'string',
+			default: '',
+			typeOptions: {
+				buttonConfig: {
+					label: 'Generate',
+					action: {
+						type: 'askAiCodeGeneration',
+						target: 'targetParam',
+					},
+					hasInputField: true,
+				},
+			},
+		} as INodeProperties,
+		value: '',
+		path: 'testPath',
+	};
+
+	beforeEach(() => {
+		vi.mocked(useNDVStore).mockReturnValue({
+			ndvInputData: [{}],
+			activeNode: { name: 'TestNode' },
+		} as any);
+
+		vi.mocked(useWorkflowsStore).mockReturnValue({
+			getCurrentWorkflow: vi.fn().mockReturnValue({
+				getParentNodesByDepth: vi.fn().mockReturnValue([]),
+			}),
+			getNodeByName: vi.fn().mockReturnValue({}),
+		} as any);
+
+		vi.mocked(usePostHog).mockReturnValue({
+			isAiEnabled: vi.fn().mockReturnValue(true),
+			getVariant: vi.fn().mockReturnValue('gpt-3.5-turbo-16k'),
+		} as any);
+
+		vi.mocked(useRootStore).mockReturnValue({
+			versionCli: '1.0.0',
+			pushRef: 'testPushRef',
+		} as any);
+
+		vi.mocked(useI18n).mockReturnValue({
+			baseText: vi.fn().mockReturnValue('Mocked Text'),
+			nodeText: () => ({
+				inputLabelDisplayName: vi.fn().mockReturnValue('Mocked Display Name'),
+				inputLabelDescription: vi.fn().mockReturnValue('Mocked Description'),
+			}),
+		} as any);
+
+		vi.mocked(useToast).mockReturnValue({
+			showMessage: vi.fn(),
+		} as any);
+	});
+
+	const mountComponent = (props = defaultProps) => {
+		return mount(ButtonParameter, {
+			props,
+			global: {
+				plugins: [createTestingPinia()],
+			},
+		});
+	};
+
+	it('renders correctly', () => {
+		const wrapper = mountComponent();
+		expect(wrapper.find('textarea').exists()).toBe(true);
+		expect(wrapper.find('button').text()).toBe('Generate');
+	});
+
+	it('emits valueChanged event on input', async () => {
+		const wrapper = mountComponent();
+		const input = wrapper.find('textarea');
+		await input.setValue('Test prompt');
+		expect(wrapper.emitted('valueChanged')).toBeTruthy();
+		expect(wrapper.emitted('valueChanged')![0][0]).toEqual({
+			name: 'testPath.testParam',
+			value: 'Test prompt',
+		});
+	});
+
+	it('disables submit button when there is no execution data', async () => {
+		vi.mocked(useNDVStore).mockReturnValue({
+			ndvInputData: [],
+		} as any);
+		const wrapper = mountComponent();
+		expect(wrapper.find('button').attributes('disabled')).toBeDefined();
+	});
+
+	it('disables submit button when prompt is empty', async () => {
+		const wrapper = mountComponent();
+		expect(wrapper.find('button').attributes('disabled')).toBeDefined();
+	});
+
+	it('enables submit button when there is execution data and prompt', async () => {
+		const wrapper = mountComponent();
+		await wrapper.find('textarea').setValue('Test prompt');
+		expect(wrapper.find('button').attributes('disabled')).toBeUndefined();
+	});
+
+	it('calls onSubmit when button is clicked', async () => {
+		const wrapper = mountComponent();
+		await wrapper.find('textarea').setValue('Test prompt');
+
+		const submitButton = wrapper.find('button');
+		expect(submitButton.attributes('disabled')).toBeUndefined();
+
+		await submitButton.trigger('click');
+
+		expect(useToast().showMessage).toHaveBeenCalled();
+	});
+});
diff --git a/packages/editor-ui/src/constants.ts b/packages/editor-ui/src/constants.ts
index acf94fcc3c0dd..ddcaf44efacd7 100644
--- a/packages/editor-ui/src/constants.ts
+++ b/packages/editor-ui/src/constants.ts
@@ -190,6 +190,7 @@ export const CHAIN_SUMMARIZATION_LANGCHAIN_NODE_TYPE =
 	'@n8n/n8n-nodes-langchain.chainSummarization';
 export const SIMULATE_NODE_TYPE = 'n8n-nodes-base.simulate';
 export const SIMULATE_TRIGGER_NODE_TYPE = 'n8n-nodes-base.simulateTrigger';
+export const AI_TRANSFORM_NODE_TYPE = 'n8n-nodes-base.aiTransform';
 
 export const CREDENTIAL_ONLY_NODE_PREFIX = 'n8n-creds-base';
 export const CREDENTIAL_ONLY_HTTP_NODE_VERSION = 4.1;
@@ -209,7 +210,11 @@ export const NON_ACTIVATABLE_TRIGGER_NODE_TYPES = [
 	MANUAL_CHAT_TRIGGER_NODE_TYPE,
 ];
 
-export const NODES_USING_CODE_NODE_EDITOR = [CODE_NODE_TYPE, AI_CODE_NODE_TYPE];
+export const NODES_USING_CODE_NODE_EDITOR = [
+	CODE_NODE_TYPE,
+	AI_CODE_NODE_TYPE,
+	AI_TRANSFORM_NODE_TYPE,
+];
 
 export const PIN_DATA_NODE_TYPES_DENYLIST = [SPLIT_IN_BATCHES_NODE_TYPE, STICKY_NODE_TYPE];
 
diff --git a/packages/editor-ui/src/stores/nodeTypes.store.ts b/packages/editor-ui/src/stores/nodeTypes.store.ts
index 8a5152d30deef..e8260fdedb8ae 100644
--- a/packages/editor-ui/src/stores/nodeTypes.store.ts
+++ b/packages/editor-ui/src/stores/nodeTypes.store.ts
@@ -303,6 +303,12 @@ export const useNodeTypesStore = defineStore(STORES.NODE_TYPES, () => {
 		}
 	};
 
+	const getNodeParameterActionResult = async (
+		sendData: DynamicNodeParameters.ActionResultRequest,
+	) => {
+		return await nodeTypesApi.getNodeParameterActionResult(rootStore.restApiContext, sendData);
+	};
+
 	// #endregion
 
 	return {
@@ -321,6 +327,7 @@ export const useNodeTypesStore = defineStore(STORES.NODE_TYPES, () => {
 		visibleNodeTypesByInputConnectionTypeNames,
 		isConfigurableNode,
 		getResourceMapperFields,
+		getNodeParameterActionResult,
 		getResourceLocatorResults,
 		getNodeParameterOptions,
 		getNodesInformation,
diff --git a/packages/editor-ui/src/stores/posthog.store.ts b/packages/editor-ui/src/stores/posthog.store.ts
index b3c1f228af184..6a25ca5520fd9 100644
--- a/packages/editor-ui/src/stores/posthog.store.ts
+++ b/packages/editor-ui/src/stores/posthog.store.ts
@@ -6,7 +6,11 @@ import { useUsersStore } from '@/stores/users.store';
 import { useRootStore } from '@/stores/root.store';
 import { useSettingsStore } from '@/stores/settings.store';
 import type { FeatureFlags, IDataObject } from 'n8n-workflow';
-import { EXPERIMENTS_TO_TRACK, LOCAL_STORAGE_EXPERIMENT_OVERRIDES } from '@/constants';
+import {
+	ASK_AI_EXPERIMENT,
+	EXPERIMENTS_TO_TRACK,
+	LOCAL_STORAGE_EXPERIMENT_OVERRIDES,
+} from '@/constants';
 import { useTelemetryStore } from './telemetry.store';
 import { useDebounce } from '@/composables/useDebounce';
 
@@ -38,6 +42,14 @@ export const usePostHog = defineStore('posthog', () => {
 		return overrides.value[experiment] ?? featureFlags.value?.[experiment];
 	};
 
+	const isAiEnabled = () => {
+		const isAiExperimentEnabled = [ASK_AI_EXPERIMENT.gpt3, ASK_AI_EXPERIMENT.gpt4].includes(
+			(getVariant(ASK_AI_EXPERIMENT.name) ?? '') as string,
+		);
+
+		return isAiExperimentEnabled && settingsStore.settings.ai.enabled;
+	};
+
 	const isVariantEnabled = (experiment: string, variant: string) => {
 		return getVariant(experiment) === variant;
 	};
@@ -183,6 +195,7 @@ export const usePostHog = defineStore('posthog', () => {
 
 	return {
 		init,
+		isAiEnabled,
 		isFeatureEnabled,
 		isVariantEnabled,
 		getVariant,
diff --git a/packages/nodes-base/nodes/AiTransform/AiTransform.node.json b/packages/nodes-base/nodes/AiTransform/AiTransform.node.json
new file mode 100644
index 0000000000000..0d13c13877fc5
--- /dev/null
+++ b/packages/nodes-base/nodes/AiTransform/AiTransform.node.json
@@ -0,0 +1,18 @@
+{
+	"node": "n8n-nodes-base.aiTransform",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
+	"details": "Modify data by writing a prompt",
+	"categories": ["Development", "Core Nodes"],
+	"resources": {
+		"primaryDocumentation": [
+			{
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.aitransform/"
+			}
+		]
+	},
+	"alias": ["code", "Javascript", "JS", "Script", "Custom Code", "Function", "AI", "LLM"],
+	"subcategories": {
+		"Core Nodes": ["Data Transformation"]
+	}
+}
diff --git a/packages/nodes-base/nodes/AiTransform/AiTransform.node.ts b/packages/nodes-base/nodes/AiTransform/AiTransform.node.ts
new file mode 100644
index 0000000000000..8c41635555ca3
--- /dev/null
+++ b/packages/nodes-base/nodes/AiTransform/AiTransform.node.ts
@@ -0,0 +1,148 @@
+/* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import {
+	NodeOperationError,
+	type IExecuteFunctions,
+	type INodeExecutionData,
+	type INodeType,
+	type INodeTypeDescription,
+} from 'n8n-workflow';
+
+import set from 'lodash/set';
+
+import { JavaScriptSandbox } from '../Code/JavaScriptSandbox';
+import { getSandboxContext } from '../Code/Sandbox';
+import { standardizeOutput } from '../Code/utils';
+
+const { CODE_ENABLE_STDOUT } = process.env;
+
+export class AiTransform implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'AI Transform',
+		name: 'aiTransform',
+		icon: 'file:aitransform.svg',
+		group: ['transform'],
+		version: 1,
+		description: 'Modify data based on instructions written in plain english',
+		defaults: {
+			name: 'AI Transform',
+		},
+		inputs: ['main'],
+		outputs: ['main'],
+		parameterPane: 'wide',
+		properties: [
+			{
+				displayName: 'Instructions',
+				name: 'generate',
+				type: 'button',
+				default: '',
+				description:
+					"Provide instructions on how you want to transform the data, then click 'Generate code'. Use dot notation to refer to nested fields (e.g. address.street).",
+				placeholder:
+					"Example: Merge 'firstname' and 'lastname' into a field 'details.name' and sort by 'email'",
+				typeOptions: {
+					buttonConfig: {
+						label: 'Generate code',
+						hasInputField: true,
+						inputFieldMaxLength: 500,
+						action: {
+							type: 'askAiCodeGeneration',
+							target: 'jsCode',
+						},
+					},
+				},
+			},
+			{
+				displayName: 'Transformation Code',
+				name: 'jsCode',
+				type: 'string',
+				typeOptions: {
+					editor: 'jsEditor',
+					editorIsReadOnly: true,
+				},
+				default: '',
+				description:
+					'Read-only. To edit this code, adjust the prompt or copy and paste it into a Code node.',
+				noDataExpression: true,
+			},
+			{
+				displayName:
+					"Click on 'Test step' to run the transformation code. Further executions will use the generated code (and not invoke AI again).",
+				name: 'hint',
+				type: 'notice',
+				default: '',
+				displayOptions: {
+					show: {
+						jsCode: [{ _cnd: { exists: true } }],
+					},
+				},
+			},
+		],
+	};
+
+	async execute(this: IExecuteFunctions) {
+		const workflowMode = this.getMode();
+
+		const node = this.getNode();
+
+		const codeParameterName = 'jsCode';
+
+		const getSandbox = (index = 0) => {
+			let code = '';
+			try {
+				code = this.getNodeParameter(codeParameterName, index) as string;
+
+				if (!code) {
+					const instructions = this.getNodeParameter('generate', index) as string;
+					if (!instructions) {
+						throw new NodeOperationError(node, 'Missing instructions to generate code', {
+							description:
+								"Enter your prompt in the 'Instructions' parameter and click 'Generate code'",
+						});
+					}
+					throw new NodeOperationError(node, 'Missing code for data transformation', {
+						description: "Click the 'Generate code' button to create the code",
+					});
+				}
+			} catch (error) {
+				if (error instanceof NodeOperationError) throw error;
+
+				throw new NodeOperationError(node, error);
+			}
+
+			const context = getSandboxContext.call(this, index);
+
+			context.items = context.$input.all();
+
+			const Sandbox = JavaScriptSandbox;
+			const sandbox = new Sandbox(context, code, index, this.helpers);
+			sandbox.on(
+				'output',
+				workflowMode === 'manual'
+					? this.sendMessageToUI
+					: CODE_ENABLE_STDOUT === 'true'
+						? (...args) =>
+								console.log(`[Workflow "${this.getWorkflow().id}"][Node "${node.name}"]`, ...args)
+						: () => {},
+			);
+			return sandbox;
+		};
+
+		const sandbox = getSandbox();
+		let items: INodeExecutionData[];
+		try {
+			items = (await sandbox.runCodeAllItems()) as INodeExecutionData[];
+		} catch (error) {
+			if (!this.continueOnFail(error)) {
+				set(error, 'node', node);
+				throw error;
+			}
+			items = [{ json: { error: error.message } }];
+		}
+
+		for (const item of items) {
+			standardizeOutput(item.json);
+		}
+
+		return [items];
+	}
+}
diff --git a/packages/nodes-base/nodes/AiTransform/aitransform.svg b/packages/nodes-base/nodes/AiTransform/aitransform.svg
new file mode 100644
index 0000000000000..699be8f28ed8e
--- /dev/null
+++ b/packages/nodes-base/nodes/AiTransform/aitransform.svg
@@ -0,0 +1,10 @@
+<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M39.4956 19.5195L34.8 18.006C31.7965 17.015 30.0369 14.5846 29.2111 11.5306L27.1447 1.46518C27.0908 1.2663 26.9593 1 26.5548 1C26.2144 1 26.0188 1.2663 25.9649 1.46518L23.8986 11.534C23.0693 14.588 21.3131 17.0184 18.3097 18.0094L13.6141 19.5229C12.95 19.7386 12.9399 20.6757 13.6006 20.9016L18.3299 22.5297C21.3232 23.5241 23.0693 25.9512 23.8986 28.9917L25.9683 38.9458C26.0222 39.1447 26.1335 39.502 26.5582 39.502C26.9977 39.502 27.0906 39.1585 27.1449 38.9577L27.1481 38.9458L29.2178 28.9917C30.047 25.9478 31.7931 23.5208 34.7865 22.5297L39.5158 20.9016C40.1697 20.6724 40.1596 19.7353 39.4956 19.5195ZM12.6028 28.277C9.82036 27.3584 9.54358 26.324 9.07959 24.5899L9.06681 24.5421L7.89038 20.4162C7.81959 20.1499 7.12519 20.1499 7.05103 20.4162L6.25214 24.2286C5.77684 25.9848 4.76558 27.3804 3.0397 27.9501L0.289074 29.1433C-0.0918337 29.2681 -0.0985755 29.8074 0.282332 29.9355L3.05318 30.9164C4.77233 31.4861 5.77684 32.8816 6.25551 34.6311L7.0544 38.2784C7.12856 38.5447 7.81959 38.5447 7.89038 38.2784L8.82748 34.648C9.30277 32.8884 10.0309 31.4895 12.3669 30.9164L14.9692 29.9355C15.3501 29.804 15.3467 29.2647 14.9625 29.14L12.6028 28.277ZM13.3255 2.03231C13.4169 1.65456 13.954 1.64852 14.0473 2.02833L14.0475 2.02889L15.0714 6.25591C15.2111 6.74054 15.5906 7.11618 16.0783 7.2487L18.6822 7.95026C19.0346 8.04918 19.0457 8.54279 18.7009 8.65979L18.7004 8.65996L15.97 9.57684C15.531 9.72415 15.1905 10.0756 15.0538 10.5179L14.0473 14.4327L14.0471 14.4337C13.9524 14.8153 13.4207 14.7996 13.3291 14.4333L12.3559 10.5303C12.2222 10.0878 11.8845 9.73333 11.4489 9.58314L8.72013 8.63869C8.37299 8.51471 8.40082 8.02141 8.75078 7.92932L8.75135 7.92917L11.3368 7.25837C11.8372 7.12876 12.2283 6.74382 12.3616 6.24505L13.3255 2.03231Z" fill="url(#paint0_linear_1373_20357)"/>
+<defs>
+<linearGradient id="paint0_linear_1373_20357" x1="0" y1="1" x2="47.0035" y2="13.8158" gradientUnits="userSpaceOnUse">
+<stop stop-color="#5B60E8"/>
+<stop offset="0.5" stop-color="#AA7BEC"/>
+<stop offset="1" stop-color="#EC7B8E"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index 4287724cf1076..61f940d5cd353 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -390,6 +390,7 @@
       "dist/nodes/AgileCrm/AgileCrm.node.js",
       "dist/nodes/Airtable/Airtable.node.js",
       "dist/nodes/Airtable/AirtableTrigger.node.js",
+      "dist/nodes/AiTransform/AiTransform.node.js",
       "dist/nodes/Amqp/Amqp.node.js",
       "dist/nodes/Amqp/AmqpTrigger.node.js",
       "dist/nodes/ApiTemplateIo/ApiTemplateIo.node.js",
diff --git a/packages/workflow/src/Interfaces.ts b/packages/workflow/src/Interfaces.ts
index 39b4d06b47d98..c4607563db7f4 100644
--- a/packages/workflow/src/Interfaces.ts
+++ b/packages/workflow/src/Interfaces.ts
@@ -1228,12 +1228,25 @@ export interface ILoadOptions {
 	};
 }
 
+export type NodePropertyAction = {
+	type: 'askAiCodeGeneration';
+	handler?: string;
+	target?: string;
+};
+
 export interface INodePropertyTypeOptions {
-	action?: string; // Supported by: button
+	// Supported by: button
+	buttonConfig?: {
+		action?: string | NodePropertyAction;
+		label?: string; // otherwise "displayName" is used
+		hasInputField?: boolean;
+		inputFieldMaxLength?: number; // Supported if hasInputField is true
+	};
 	containerClass?: string; // Supported by: notice
 	alwaysOpenEditWindow?: boolean; // Supported by: json
 	codeAutocomplete?: CodeAutocompleteTypes; // Supported by: string
 	editor?: EditorType; // Supported by: string
+	editorIsReadOnly?: boolean; // Supported by: string
 	sqlDialect?: SQLDialect; // Supported by: sqlEditor
 	loadOptionsDependsOn?: string[]; // Supported by: options
 	loadOptionsMethod?: string; // Supported by: options
@@ -1525,6 +1538,12 @@ export interface INodeType {
 		resourceMapping?: {
 			[functionName: string]: (this: ILoadOptionsFunctions) => Promise<ResourceMapperFields>;
 		};
+		actionHandler?: {
+			[functionName: string]: (
+				this: ILoadOptionsFunctions,
+				payload: IDataObject | string | undefined,
+			) => Promise<NodeParameterValueType>;
+		};
 	};
 	webhookMethods?: {
 		[name in IWebhookDescription['name']]?: {

From a0b021bbe7142338275c1e9a24b90a078b761a85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Thu, 8 Aug 2024 09:36:25 +0200
Subject: [PATCH 105/168] test(core): Expand log streaming event relay tests
 (no-changelog) (#10322)

---
 .../log-streaming-event-relay.test.ts         | 270 ++++++++++++++++++
 1 file changed, 270 insertions(+)

diff --git a/packages/cli/src/events/__tests__/log-streaming-event-relay.test.ts b/packages/cli/src/events/__tests__/log-streaming-event-relay.test.ts
index ebd56ee514c7e..c06289d9f816c 100644
--- a/packages/cli/src/events/__tests__/log-streaming-event-relay.test.ts
+++ b/packages/cli/src/events/__tests__/log-streaming-event-relay.test.ts
@@ -262,6 +262,117 @@ describe('LogStreamingEventRelay', () => {
 				},
 			});
 		});
+
+		it('should log on `user-invited` event', () => {
+			const event: RelayEventMap['user-invited'] = {
+				user: {
+					id: 'user101',
+					email: 'inviter@example.com',
+					firstName: 'Inviter',
+					lastName: 'User',
+					role: 'global:owner',
+				},
+				targetUserId: ['newUser123'],
+				publicApi: false,
+				emailSent: true,
+				inviteeRole: 'global:member',
+			};
+
+			eventService.emit('user-invited', event);
+
+			expect(eventBus.sendAuditEvent).toHaveBeenCalledWith({
+				eventName: 'n8n.audit.user.invited',
+				payload: {
+					userId: 'user101',
+					_email: 'inviter@example.com',
+					_firstName: 'Inviter',
+					_lastName: 'User',
+					globalRole: 'global:owner',
+					targetUserId: ['newUser123'],
+				},
+			});
+		});
+
+		it('should log on `user-reinvited` event', () => {
+			const event: RelayEventMap['user-reinvited'] = {
+				user: {
+					id: 'user202',
+					email: 'reinviter@example.com',
+					firstName: 'Reinviter',
+					lastName: 'User',
+					role: 'global:admin',
+				},
+				targetUserId: ['existingUser456'],
+			};
+
+			eventService.emit('user-reinvited', event);
+
+			expect(eventBus.sendAuditEvent).toHaveBeenCalledWith({
+				eventName: 'n8n.audit.user.reinvited',
+				payload: {
+					userId: 'user202',
+					_email: 'reinviter@example.com',
+					_firstName: 'Reinviter',
+					_lastName: 'User',
+					globalRole: 'global:admin',
+					targetUserId: ['existingUser456'],
+				},
+			});
+		});
+
+		it('should log on `user-signed-up` event', () => {
+			const event: RelayEventMap['user-signed-up'] = {
+				user: {
+					id: 'user303',
+					email: 'newuser@example.com',
+					firstName: 'New',
+					lastName: 'User',
+					role: 'global:member',
+				},
+				userType: 'email',
+				wasDisabledLdapUser: false,
+			};
+
+			eventService.emit('user-signed-up', event);
+
+			expect(eventBus.sendAuditEvent).toHaveBeenCalledWith({
+				eventName: 'n8n.audit.user.signedup',
+				payload: {
+					userId: 'user303',
+					_email: 'newuser@example.com',
+					_firstName: 'New',
+					_lastName: 'User',
+					globalRole: 'global:member',
+				},
+			});
+		});
+
+		it('should log on `user-logged-in` event', () => {
+			const event: RelayEventMap['user-logged-in'] = {
+				user: {
+					id: 'user404',
+					email: 'loggedin@example.com',
+					firstName: 'Logged',
+					lastName: 'In',
+					role: 'global:owner',
+				},
+				authenticationMethod: 'email',
+			};
+
+			eventService.emit('user-logged-in', event);
+
+			expect(eventBus.sendAuditEvent).toHaveBeenCalledWith({
+				eventName: 'n8n.audit.user.login.success',
+				payload: {
+					userId: 'user404',
+					_email: 'loggedin@example.com',
+					_firstName: 'Logged',
+					_lastName: 'In',
+					globalRole: 'global:owner',
+					authenticationMethod: 'email',
+				},
+			});
+		});
 	});
 
 	describe('click events', () => {
@@ -330,6 +441,31 @@ describe('LogStreamingEventRelay', () => {
 				},
 			});
 		});
+
+		it('should log on `user-password-reset-email-click` event', () => {
+			const event: RelayEventMap['user-password-reset-email-click'] = {
+				user: {
+					id: 'user505',
+					email: 'resetuser@example.com',
+					firstName: 'Reset',
+					lastName: 'User',
+					role: 'global:member',
+				},
+			};
+
+			eventService.emit('user-password-reset-email-click', event);
+
+			expect(eventBus.sendAuditEvent).toHaveBeenCalledWith({
+				eventName: 'n8n.audit.user.reset',
+				payload: {
+					userId: 'user505',
+					_email: 'resetuser@example.com',
+					_firstName: 'Reset',
+					_lastName: 'User',
+					globalRole: 'global:member',
+				},
+			});
+		});
 	});
 
 	describe('node events', () => {
@@ -494,6 +630,64 @@ describe('LogStreamingEventRelay', () => {
 				},
 			});
 		});
+
+		it('should log on `credentials-deleted` event', () => {
+			const event: RelayEventMap['credentials-deleted'] = {
+				user: {
+					id: 'user707',
+					email: 'creduser@example.com',
+					firstName: 'Cred',
+					lastName: 'User',
+					role: 'global:owner',
+				},
+				credentialId: 'cred789',
+				credentialType: 'githubApi',
+			};
+
+			eventService.emit('credentials-deleted', event);
+
+			expect(eventBus.sendAuditEvent).toHaveBeenCalledWith({
+				eventName: 'n8n.audit.user.credentials.deleted',
+				payload: {
+					userId: 'user707',
+					_email: 'creduser@example.com',
+					_firstName: 'Cred',
+					_lastName: 'User',
+					globalRole: 'global:owner',
+					credentialId: 'cred789',
+					credentialType: 'githubApi',
+				},
+			});
+		});
+
+		it('should log on `credentials-updated` event', () => {
+			const event: RelayEventMap['credentials-updated'] = {
+				user: {
+					id: 'user808',
+					email: 'updatecred@example.com',
+					firstName: 'Update',
+					lastName: 'Cred',
+					role: 'global:owner',
+				},
+				credentialId: 'cred101',
+				credentialType: 'slackApi',
+			};
+
+			eventService.emit('credentials-updated', event);
+
+			expect(eventBus.sendAuditEvent).toHaveBeenCalledWith({
+				eventName: 'n8n.audit.user.credentials.updated',
+				payload: {
+					userId: 'user808',
+					_email: 'updatecred@example.com',
+					_firstName: 'Update',
+					_lastName: 'Cred',
+					globalRole: 'global:owner',
+					credentialId: 'cred101',
+					credentialType: 'slackApi',
+				},
+			});
+		});
 	});
 
 	describe('auth events', () => {
@@ -593,6 +787,41 @@ describe('LogStreamingEventRelay', () => {
 				},
 			});
 		});
+
+		it('should log on `community-package-deleted` event', () => {
+			const event: RelayEventMap['community-package-deleted'] = {
+				user: {
+					id: 'user909',
+					email: 'packagedeleter@example.com',
+					firstName: 'Package',
+					lastName: 'Deleter',
+					role: 'global:admin',
+				},
+				packageName: 'n8n-nodes-awesome-package',
+				packageVersion: '1.0.0',
+				packageNodeNames: ['AwesomeNode1', 'AwesomeNode2'],
+				packageAuthor: 'John Doe',
+				packageAuthorEmail: 'john@example.com',
+			};
+
+			eventService.emit('community-package-deleted', event);
+
+			expect(eventBus.sendAuditEvent).toHaveBeenCalledWith({
+				eventName: 'n8n.audit.package.deleted',
+				payload: {
+					userId: 'user909',
+					_email: 'packagedeleter@example.com',
+					_firstName: 'Package',
+					_lastName: 'Deleter',
+					globalRole: 'global:admin',
+					packageName: 'n8n-nodes-awesome-package',
+					packageVersion: '1.0.0',
+					packageNodeNames: ['AwesomeNode1', 'AwesomeNode2'],
+					packageAuthor: 'John Doe',
+					packageAuthorEmail: 'john@example.com',
+				},
+			});
+		});
 	});
 
 	describe('email events', () => {
@@ -650,9 +879,50 @@ describe('LogStreamingEventRelay', () => {
 				},
 			});
 		});
+
+		it('should log on `public-api-key-deleted` event', () => {
+			const event: RelayEventMap['public-api-key-deleted'] = {
+				user: {
+					id: 'user606',
+					email: 'apiuser@example.com',
+					firstName: 'API',
+					lastName: 'User',
+					role: 'global:owner',
+				},
+				publicApi: true,
+			};
+
+			eventService.emit('public-api-key-deleted', event);
+
+			expect(eventBus.sendAuditEvent).toHaveBeenCalledWith({
+				eventName: 'n8n.audit.user.api.deleted',
+				payload: {
+					userId: 'user606',
+					_email: 'apiuser@example.com',
+					_firstName: 'API',
+					_lastName: 'User',
+					globalRole: 'global:owner',
+				},
+			});
+		});
 	});
 
 	describe('execution events', () => {
+		it('should log on `execution-started-during-bootup` event', () => {
+			const event: RelayEventMap['execution-started-during-bootup'] = {
+				executionId: 'exec101010',
+			};
+
+			eventService.emit('execution-started-during-bootup', event);
+
+			expect(eventBus.sendExecutionEvent).toHaveBeenCalledWith({
+				eventName: 'n8n.execution.started-during-bootup',
+				payload: {
+					executionId: 'exec101010',
+				},
+			});
+		});
+
 		it('should log on `execution-throttled` event', () => {
 			const event: RelayEventMap['execution-throttled'] = {
 				executionId: 'exec123456',

From aa95059cf05d07e2310fa1cb899a4ec1993e6fc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Thu, 8 Aug 2024 09:42:16 +0200
Subject: [PATCH 106/168] test(core): Add tests for scaling service
 (no-changelog) (#10320)

---
 .../scaling/__tests__/scaling.service.test.ts | 259 ++++++++++++++++++
 packages/cli/src/scaling/job-processor.ts     |   2 +-
 packages/cli/src/scaling/scaling.service.ts   |   4 +-
 3 files changed, 262 insertions(+), 3 deletions(-)
 create mode 100644 packages/cli/src/scaling/__tests__/scaling.service.test.ts

diff --git a/packages/cli/src/scaling/__tests__/scaling.service.test.ts b/packages/cli/src/scaling/__tests__/scaling.service.test.ts
new file mode 100644
index 0000000000000..d0cb038884f64
--- /dev/null
+++ b/packages/cli/src/scaling/__tests__/scaling.service.test.ts
@@ -0,0 +1,259 @@
+import { mock } from 'jest-mock-extended';
+import { ScalingService } from '../scaling.service';
+import { JOB_TYPE_NAME, QUEUE_NAME } from '../constants';
+import config from '@/config';
+import * as BullModule from 'bull';
+import type { Job, JobData, JobOptions, JobQueue } from '../types';
+import { ApplicationError } from 'n8n-workflow';
+
+const queue = mock<JobQueue>({
+	client: { ping: jest.fn() },
+});
+
+jest.mock('bull', () => ({
+	__esModule: true,
+	default: jest.fn(() => queue),
+}));
+
+describe('ScalingService', () => {
+	beforeEach(() => {
+		jest.clearAllMocks();
+		config.set('generic.instanceType', 'main');
+	});
+
+	describe('setupQueue', () => {
+		it('should set up the queue', async () => {
+			/**
+			 * Arrange
+			 */
+			const scalingService = new ScalingService(mock(), mock(), mock());
+			const { prefix, settings } = config.get('queue.bull');
+			const Bull = jest.mocked(BullModule.default);
+
+			/**
+			 * Act
+			 */
+			await scalingService.setupQueue();
+
+			/**
+			 * Assert
+			 */
+			expect(Bull).toHaveBeenCalledWith(QUEUE_NAME, {
+				prefix,
+				settings,
+				createClient: expect.any(Function),
+			});
+			expect(queue.on).toHaveBeenCalledWith('global:progress', expect.any(Function));
+			expect(queue.on).toHaveBeenCalledWith('error', expect.any(Function));
+		});
+	});
+
+	describe('setupWorker', () => {
+		it('should set up a worker with concurrency', async () => {
+			/**
+			 * Arrange
+			 */
+			config.set('generic.instanceType', 'worker');
+			const scalingService = new ScalingService(mock(), mock(), mock());
+			await scalingService.setupQueue();
+			const concurrency = 5;
+
+			/**
+			 * Act
+			 */
+			scalingService.setupWorker(concurrency);
+
+			/**
+			 * Assert
+			 */
+			expect(queue.process).toHaveBeenCalledWith(JOB_TYPE_NAME, concurrency, expect.any(Function));
+		});
+
+		it('should throw if called on a non-worker instance', async () => {
+			/**
+			 * Arrange
+			 */
+			const scalingService = new ScalingService(mock(), mock(), mock());
+			await scalingService.setupQueue();
+
+			/**
+			 * Act and Assert
+			 */
+			expect(() => scalingService.setupWorker(5)).toThrow();
+		});
+	});
+
+	describe('pauseQueue', () => {
+		it('should pause the queue', async () => {
+			/**
+			 * Arrange
+			 */
+			const scalingService = new ScalingService(mock(), mock(), mock());
+			await scalingService.setupQueue();
+
+			/**
+			 * Act
+			 */
+			await scalingService.pauseQueue();
+
+			/**
+			 * Assert
+			 */
+			expect(queue.pause).toHaveBeenCalledWith(true, true);
+		});
+	});
+
+	describe('pingQueue', () => {
+		it('should ping the queue', async () => {
+			/**
+			 * Arrange
+			 */
+			const scalingService = new ScalingService(mock(), mock(), mock());
+			await scalingService.setupQueue();
+
+			/**
+			 * Act
+			 */
+			await scalingService.pingQueue();
+
+			/**
+			 * Assert
+			 */
+			expect(queue.client.ping).toHaveBeenCalled();
+		});
+	});
+
+	describe('addJob', () => {
+		it('should add a job', async () => {
+			/**
+			 * Arrange
+			 */
+			const scalingService = new ScalingService(mock(), mock(), mock());
+			await scalingService.setupQueue();
+			queue.add.mockResolvedValue(mock<Job>({ id: '456' }));
+
+			/**
+			 * Act
+			 */
+			const jobData = mock<JobData>({ executionId: '123' });
+			const jobOptions = mock<JobOptions>();
+			await scalingService.addJob(jobData, jobOptions);
+
+			/**
+			 * Assert
+			 */
+			expect(queue.add).toHaveBeenCalledWith(JOB_TYPE_NAME, jobData, jobOptions);
+		});
+	});
+
+	describe('getJob', () => {
+		it('should get a job', async () => {
+			/**
+			 * Arrange
+			 */
+			const scalingService = new ScalingService(mock(), mock(), mock());
+			await scalingService.setupQueue();
+			const jobId = '123';
+			queue.getJob.mockResolvedValue(mock<Job>({ id: jobId }));
+
+			/**
+			 * Act
+			 */
+			const job = await scalingService.getJob(jobId);
+
+			/**
+			 * Assert
+			 */
+			expect(queue.getJob).toHaveBeenCalledWith(jobId);
+			expect(job?.id).toBe(jobId);
+		});
+	});
+
+	describe('findJobsByStatus', () => {
+		it('should find jobs by status', async () => {
+			/**
+			 * Arrange
+			 */
+			const scalingService = new ScalingService(mock(), mock(), mock());
+			await scalingService.setupQueue();
+			queue.getJobs.mockResolvedValue([mock<Job>({ id: '123' })]);
+
+			/**
+			 * Act
+			 */
+			const jobs = await scalingService.findJobsByStatus(['active']);
+
+			/**
+			 * Assert
+			 */
+			expect(queue.getJobs).toHaveBeenCalledWith(['active']);
+			expect(jobs).toHaveLength(1);
+			expect(jobs.at(0)?.id).toBe('123');
+		});
+	});
+
+	describe('stopJob', () => {
+		it('should stop an active job', async () => {
+			/**
+			 * Arrange
+			 */
+			const scalingService = new ScalingService(mock(), mock(), mock());
+			await scalingService.setupQueue();
+			const job = mock<Job>({ isActive: jest.fn().mockResolvedValue(true) });
+
+			/**
+			 * Act
+			 */
+			const result = await scalingService.stopJob(job);
+
+			/**
+			 * Assert
+			 */
+			expect(job.progress).toHaveBeenCalledWith({ kind: 'abort-job' });
+			expect(result).toBe(true);
+		});
+
+		it('should stop an inactive job', async () => {
+			/**
+			 * Arrange
+			 */
+			const scalingService = new ScalingService(mock(), mock(), mock());
+			await scalingService.setupQueue();
+			const job = mock<Job>({ isActive: jest.fn().mockResolvedValue(false) });
+
+			/**
+			 * Act
+			 */
+			const result = await scalingService.stopJob(job);
+
+			/**
+			 * Assert
+			 */
+			expect(job.remove).toHaveBeenCalled();
+			expect(result).toBe(true);
+		});
+
+		it('should report failure to stop a job', async () => {
+			/**
+			 * Arrange
+			 */
+			const scalingService = new ScalingService(mock(), mock(), mock());
+			await scalingService.setupQueue();
+			const job = mock<Job>({
+				isActive: jest.fn().mockImplementation(() => {
+					throw new ApplicationError('Something went wrong');
+				}),
+			});
+
+			/**
+			 * Act
+			 */
+			const result = await scalingService.stopJob(job);
+
+			/**
+			 * Assert
+			 */
+			expect(result).toBe(false);
+		});
+	});
+});
diff --git a/packages/cli/src/scaling/job-processor.ts b/packages/cli/src/scaling/job-processor.ts
index 6057a1937db76..693c9e3a74fb7 100644
--- a/packages/cli/src/scaling/job-processor.ts
+++ b/packages/cli/src/scaling/job-processor.ts
@@ -16,7 +16,7 @@ import type PCancelable from 'p-cancelable';
  */
 @Service()
 export class JobProcessor {
-	private readonly runningJobs: { [jobId: JobId]: RunningJob } = {};
+	private readonly runningJobs: Record<JobId, RunningJob> = {};
 
 	constructor(
 		private readonly logger: Logger,
diff --git a/packages/cli/src/scaling/scaling.service.ts b/packages/cli/src/scaling/scaling.service.ts
index c52a82e8a0da6..21d05fceff850 100644
--- a/packages/cli/src/scaling/scaling.service.ts
+++ b/packages/cli/src/scaling/scaling.service.ts
@@ -94,12 +94,12 @@ export class ScalingService {
 
 		try {
 			if (await job.isActive()) {
-				await job.progress({ kind: 'abort-job' });
+				await job.progress({ kind: 'abort-job' }); // being processed by worker
 				this.logger.debug('[ScalingService] Stopped active job', props);
 				return true;
 			}
 
-			await job.remove();
+			await job.remove(); // not yet picked up, or waiting for next pickup (stalled)
 			this.logger.debug('[ScalingService] Stopped inactive job', props);
 			return true;
 		} catch (error: unknown) {

From ee8c9a5b245c62ad6f7b2c3a1fb8b1695f922505 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Thu, 8 Aug 2024 12:04:34 +0200
Subject: [PATCH 107/168] refactor(core): Stop reporting disk I/O error to
 Sentry (no-changelog) (#10324)

---
 packages/cli/src/ErrorReporting.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/cli/src/ErrorReporting.ts b/packages/cli/src/ErrorReporting.ts
index ceb67fe7fb7cc..a8b25c891dbe2 100644
--- a/packages/cli/src/ErrorReporting.ts
+++ b/packages/cli/src/ErrorReporting.ts
@@ -69,7 +69,7 @@ export const initErrorHandling = async () => {
 
 		if (
 			originalException instanceof QueryFailedError &&
-			originalException.message.includes('SQLITE_FULL')
+			['SQLITE_FULL', 'SQLITE_IOERR'].some((errMsg) => originalException.message.includes(errMsg))
 		) {
 			return null;
 		}

From ee03400c25ba1f3b53367229fdc2b0f14b034405 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Thu, 8 Aug 2024 12:33:18 +0200
Subject: [PATCH 108/168] refactor(core): Decouple emailing and workflow
 sharing from internal hooks (no-changelog) (#10326)

---
 packages/cli/src/InternalHooks.ts             | 26 -------------------
 .../email/UserManagementMailer.ts             | 12 ++-------
 .../controllers/passwordReset.controller.ts   |  7 +++--
 .../log-streaming-event-relay.test.ts         |  1 +
 packages/cli/src/events/relay-event-map.ts    |  7 +++++
 .../cli/src/events/telemetry-event-relay.ts   | 26 +++++++++++++++++++
 packages/cli/src/services/user.service.ts     |  7 +++--
 .../cli/src/workflows/workflows.controller.ts |  8 +++---
 8 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/packages/cli/src/InternalHooks.ts b/packages/cli/src/InternalHooks.ts
index c264bb2fbebda..26954a0472c0f 100644
--- a/packages/cli/src/InternalHooks.ts
+++ b/packages/cli/src/InternalHooks.ts
@@ -1,5 +1,4 @@
 import { Service } from 'typedi';
-import type { ITelemetryTrackProperties } from 'n8n-workflow';
 import type { User } from '@db/entities/User';
 import { Telemetry } from '@/telemetry';
 import { MessageEventBus } from './eventbus/MessageEventBus/MessageEventBus';
@@ -23,16 +22,6 @@ export class InternalHooks {
 		await this.telemetry.init();
 	}
 
-	onWorkflowSharingUpdate(workflowId: string, userId: string, userList: string[]) {
-		const properties: ITelemetryTrackProperties = {
-			workflow_id: workflowId,
-			user_id_sharer: userId,
-			user_id_list: userList,
-		};
-
-		this.telemetry.track('User updated workflow sharing', properties);
-	}
-
 	onUserInviteEmailClick(userInviteClickData: { inviter: User; invitee: User }) {
 		this.telemetry.track('User clicked invite link from email', {
 			user_id: userInviteClickData.invitee.id,
@@ -63,19 +52,4 @@ export class InternalHooks {
 			user_id: userPasswordResetData.user.id,
 		});
 	}
-
-	onEmailFailed(failedEmailData: {
-		user: User;
-		message_type:
-			| 'Reset password'
-			| 'New user invite'
-			| 'Resend invite'
-			| 'Workflow shared'
-			| 'Credentials shared';
-		public_api: boolean;
-	}) {
-		this.telemetry.track('Instance failed to send transactional email to user', {
-			user_id: failedEmailData.user.id,
-		});
-	}
 }
diff --git a/packages/cli/src/UserManagement/email/UserManagementMailer.ts b/packages/cli/src/UserManagement/email/UserManagementMailer.ts
index 1e092077b10de..459d8ec1c2668 100644
--- a/packages/cli/src/UserManagement/email/UserManagementMailer.ts
+++ b/packages/cli/src/UserManagement/email/UserManagementMailer.ts
@@ -120,14 +120,10 @@ export class UserManagementMailer {
 
 			return result;
 		} catch (e) {
-			Container.get(InternalHooks).onEmailFailed({
-				user: sharer,
-				message_type: 'Workflow shared',
-				public_api: false,
-			});
 			Container.get(EventService).emit('email-failed', {
 				user: sharer,
 				messageType: 'Workflow shared',
+				publicApi: false,
 			});
 
 			const error = toError(e);
@@ -179,14 +175,10 @@ export class UserManagementMailer {
 
 			return result;
 		} catch (e) {
-			Container.get(InternalHooks).onEmailFailed({
-				user: sharer,
-				message_type: 'Credentials shared',
-				public_api: false,
-			});
 			Container.get(EventService).emit('email-failed', {
 				user: sharer,
 				messageType: 'Credentials shared',
+				publicApi: false,
 			});
 
 			const error = toError(e);
diff --git a/packages/cli/src/controllers/passwordReset.controller.ts b/packages/cli/src/controllers/passwordReset.controller.ts
index 82506e952bc32..458593d228a33 100644
--- a/packages/cli/src/controllers/passwordReset.controller.ts
+++ b/packages/cli/src/controllers/passwordReset.controller.ts
@@ -120,12 +120,11 @@ export class PasswordResetController {
 				domain: this.urlService.getInstanceBaseUrl(),
 			});
 		} catch (error) {
-			this.internalHooks.onEmailFailed({
+			this.eventService.emit('email-failed', {
 				user,
-				message_type: 'Reset password',
-				public_api: false,
+				messageType: 'Reset password',
+				publicApi: false,
 			});
-			this.eventService.emit('email-failed', { user, messageType: 'Reset password' });
 			if (error instanceof Error) {
 				throw new InternalServerError(`Please contact your administrator: ${error.message}`);
 			}
diff --git a/packages/cli/src/events/__tests__/log-streaming-event-relay.test.ts b/packages/cli/src/events/__tests__/log-streaming-event-relay.test.ts
index c06289d9f816c..7254f5a09bfc6 100644
--- a/packages/cli/src/events/__tests__/log-streaming-event-relay.test.ts
+++ b/packages/cli/src/events/__tests__/log-streaming-event-relay.test.ts
@@ -835,6 +835,7 @@ describe('LogStreamingEventRelay', () => {
 					role: 'global:member',
 				},
 				messageType: 'New user invite',
+				publicApi: false,
 			};
 
 			eventService.emit('email-failed', event);
diff --git a/packages/cli/src/events/relay-event-map.ts b/packages/cli/src/events/relay-event-map.ts
index 0081bf6c4288b..8d6463defbe29 100644
--- a/packages/cli/src/events/relay-event-map.ts
+++ b/packages/cli/src/events/relay-event-map.ts
@@ -78,6 +78,12 @@ export type RelayEventMap = {
 		runData?: IRun;
 	};
 
+	'workflow-sharing-updated': {
+		workflowId: string;
+		userIdSharer: string;
+		userIdList: string[];
+	};
+
 	// #endregion
 
 	// #region Node
@@ -234,6 +240,7 @@ export type RelayEventMap = {
 			| 'Resend invite'
 			| 'Workflow shared'
 			| 'Credentials shared';
+		publicApi: boolean;
 	};
 
 	// #endregion
diff --git a/packages/cli/src/events/telemetry-event-relay.ts b/packages/cli/src/events/telemetry-event-relay.ts
index 77e1878e0b04d..a7eaf5ef2c27c 100644
--- a/packages/cli/src/events/telemetry-event-relay.ts
+++ b/packages/cli/src/events/telemetry-event-relay.ts
@@ -71,6 +71,7 @@ export class TelemetryEventRelay extends EventRelay {
 			'login-failed-due-to-ldap-disabled': (event) => this.loginFailedDueToLdapDisabled(event),
 			'workflow-created': (event) => this.workflowCreated(event),
 			'workflow-deleted': (event) => this.workflowDeleted(event),
+			'workflow-sharing-updated': (event) => this.workflowSharingUpdated(event),
 			'workflow-saved': async (event) => await this.workflowSaved(event),
 			'server-started': async () => await this.serverStarted(),
 			'session-started': (event) => this.sessionStarted(event),
@@ -93,6 +94,7 @@ export class TelemetryEventRelay extends EventRelay {
 			'user-signed-up': (event) => this.userSignedUp(event),
 			'user-submitted-personalization-survey': (event) =>
 				this.userSubmittedPersonalizationSurvey(event),
+			'email-failed': (event) => this.emailFailed(event),
 		});
 	}
 
@@ -507,6 +509,18 @@ export class TelemetryEventRelay extends EventRelay {
 		});
 	}
 
+	private workflowSharingUpdated({
+		workflowId,
+		userIdSharer,
+		userIdList,
+	}: RelayEventMap['workflow-sharing-updated']) {
+		this.telemetry.track('User updated workflow sharing', {
+			workflow_id: workflowId,
+			user_id_sharer: userIdSharer,
+			user_id_list: userIdList,
+		});
+	}
+
 	private async workflowSaved({ user, workflow, publicApi }: RelayEventMap['workflow-saved']) {
 		const isCloudDeployment = config.getEnv('deployment.type') === 'cloud';
 
@@ -930,4 +944,16 @@ export class TelemetryEventRelay extends EventRelay {
 	}
 
 	// #endregion
+
+	// #region Email
+
+	private emailFailed({ user, messageType, publicApi }: RelayEventMap['email-failed']) {
+		this.telemetry.track('Instance failed to send transactional email to user', {
+			user_id: user.id,
+			message_type: messageType,
+			public_api: publicApi,
+		});
+	}
+
+	// #endregion
 }
diff --git a/packages/cli/src/services/user.service.ts b/packages/cli/src/services/user.service.ts
index 61f76bd596d2f..6b17530b7cf57 100644
--- a/packages/cli/src/services/user.service.ts
+++ b/packages/cli/src/services/user.service.ts
@@ -160,12 +160,11 @@ export class UserService {
 					});
 				} catch (e) {
 					if (e instanceof Error) {
-						Container.get(InternalHooks).onEmailFailed({
+						this.eventService.emit('email-failed', {
 							user: owner,
-							message_type: 'New user invite',
-							public_api: false,
+							messageType: 'New user invite',
+							publicApi: false,
 						});
-						this.eventService.emit('email-failed', { user: owner, messageType: 'New user invite' });
 						this.logger.error('Failed to send email', {
 							userId: owner.id,
 							inviteAcceptUrl,
diff --git a/packages/cli/src/workflows/workflows.controller.ts b/packages/cli/src/workflows/workflows.controller.ts
index 60dbbf8191c4f..4c03dd9e246c4 100644
--- a/packages/cli/src/workflows/workflows.controller.ts
+++ b/packages/cli/src/workflows/workflows.controller.ts
@@ -17,7 +17,6 @@ import { validateEntity } from '@/GenericHelpers';
 import { ExternalHooks } from '@/ExternalHooks';
 import { WorkflowService } from './workflow.service';
 import { License } from '@/License';
-import { InternalHooks } from '@/InternalHooks';
 import * as utils from '@/utils';
 import { listQueryMiddleware } from '@/middlewares';
 import { TagService } from '@/services/tag.service';
@@ -49,7 +48,6 @@ import { GlobalConfig } from '@n8n/config';
 export class WorkflowsController {
 	constructor(
 		private readonly logger: Logger,
-		private readonly internalHooks: InternalHooks,
 		private readonly externalHooks: ExternalHooks,
 		private readonly tagRepository: TagRepository,
 		private readonly enterpriseWorkflowService: EnterpriseWorkflowService,
@@ -459,7 +457,11 @@ export class WorkflowsController {
 			newShareeIds = toShare;
 		});
 
-		this.internalHooks.onWorkflowSharingUpdate(workflowId, req.user.id, shareWithIds);
+		this.eventService.emit('workflow-sharing-updated', {
+			workflowId,
+			userIdSharer: req.user.id,
+			userIdList: shareWithIds,
+		});
 
 		const projectsRelations = await this.projectRelationRepository.findBy({
 			projectId: In(newShareeIds),

From b6c47c0e3214878d42980d5c9535df52b3984b3c 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, 8 Aug 2024 15:01:07 +0200
Subject: [PATCH 109/168] fix(core): Rate limit MFA activation and verification
 endpoints (#10330)

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

diff --git a/packages/cli/src/controllers/mfa.controller.ts b/packages/cli/src/controllers/mfa.controller.ts
index 3c58b944d57d0..4d3c6c0d9f50c 100644
--- a/packages/cli/src/controllers/mfa.controller.ts
+++ b/packages/cli/src/controllers/mfa.controller.ts
@@ -47,7 +47,7 @@ export class MFAController {
 		};
 	}
 
-	@Post('/enable')
+	@Post('/enable', { rateLimit: true })
 	async activateMFA(req: MFA.Activate) {
 		const { token = null } = req.body;
 		const { id, mfaEnabled } = req.user;
@@ -78,7 +78,7 @@ export class MFAController {
 		await this.mfaService.disableMfa(id);
 	}
 
-	@Post('/verify')
+	@Post('/verify', { rateLimit: true })
 	async verifyMFA(req: MFA.Verify) {
 		const { id } = req.user;
 		const { token } = req.body;

From 38bdd9f5d0d9ca06fab1a7e1a3e7a4a648a6a89a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milorad=20FIlipovi=C4=87?= <milorad@n8n.io>
Date: Thu, 8 Aug 2024 16:28:51 +0200
Subject: [PATCH 110/168] fix(editor): Fixing XSS vulnerability in toast
 messages (#10329)

Co-authored-by: Adi <aditya@netroy.in>
---
 .../editor-ui/src/components/NpsSurvey.vue    |  1 +
 .../src/composables/useExecutionDebugging.ts  |  3 +-
 .../src/composables/usePushConnection.ts      |  2 +-
 .../editor-ui/src/composables/useToast.ts     | 35 ++++++++++---------
 packages/editor-ui/src/utils/htmlUtils.ts     |  4 +++
 5 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/packages/editor-ui/src/components/NpsSurvey.vue b/packages/editor-ui/src/components/NpsSurvey.vue
index 8efe8ef8a1d28..41b69b110d6b6 100644
--- a/packages/editor-ui/src/components/NpsSurvey.vue
+++ b/packages/editor-ui/src/components/NpsSurvey.vue
@@ -94,6 +94,7 @@ async function send() {
 			message: Number(form.value.value) >= 8 ? i18n.baseText('prompts.npsSurvey.reviewUs') : '',
 			type: 'success',
 			duration: 15000,
+			dangerouslyUseHTMLString: true,
 		});
 
 		setTimeout(() => {
diff --git a/packages/editor-ui/src/composables/useExecutionDebugging.ts b/packages/editor-ui/src/composables/useExecutionDebugging.ts
index 05d7144fef369..b13a22dfa020a 100644
--- a/packages/editor-ui/src/composables/useExecutionDebugging.ts
+++ b/packages/editor-ui/src/composables/useExecutionDebugging.ts
@@ -16,6 +16,7 @@ import { useUIStore } from '@/stores/ui.store';
 import { useTelemetry } from './useTelemetry';
 import { useRootStore } from '@/stores/root.store';
 import { isFullExecutionResponse } from '@/utils/typeGuards';
+import { sanitizeHtml } from '@/utils/htmlUtils';
 
 export const useExecutionDebugging = () => {
 	const telemetry = useTelemetry();
@@ -61,7 +62,7 @@ export const useExecutionDebugging = () => {
 				h(
 					'ul',
 					{ class: 'mt-l ml-l' },
-					matchingPinnedNodeNames.map((name) => h('li', name)),
+					matchingPinnedNodeNames.map((name) => h('li', sanitizeHtml(name))),
 				),
 			]);
 
diff --git a/packages/editor-ui/src/composables/usePushConnection.ts b/packages/editor-ui/src/composables/usePushConnection.ts
index 18449197253d4..8018f1bfed7da 100644
--- a/packages/editor-ui/src/composables/usePushConnection.ts
+++ b/packages/editor-ui/src/composables/usePushConnection.ts
@@ -328,6 +328,7 @@ export function usePushConnection({ router }: { router: ReturnType<typeof useRou
 					message: `${action} <a href="https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.wait/" target="_blank">More info</a>`,
 					type: 'success',
 					duration: 0,
+					dangerouslyUseHTMLString: true,
 				});
 			} else if (runDataExecuted.finished !== true) {
 				titleChange.titleSet(workflow.name as string, 'ERROR');
@@ -438,7 +439,6 @@ export function usePushConnection({ router }: { router: ReturnType<typeof useRou
 							message: runDataExecutedErrorMessage,
 							type: 'error',
 							duration: 0,
-							dangerouslyUseHTMLString: true,
 						});
 					}
 				}
diff --git a/packages/editor-ui/src/composables/useToast.ts b/packages/editor-ui/src/composables/useToast.ts
index 657fec955c0a4..f7b6df0f80575 100644
--- a/packages/editor-ui/src/composables/useToast.ts
+++ b/packages/editor-ui/src/composables/useToast.ts
@@ -18,7 +18,7 @@ export interface NotificationErrorWithNodeAndDescription extends ApplicationErro
 }
 
 const messageDefaults: Partial<Omit<NotificationOptions, 'message'>> = {
-	dangerouslyUseHTMLString: true,
+	dangerouslyUseHTMLString: false,
 	position: 'bottom-right',
 };
 
@@ -32,28 +32,28 @@ export function useToast() {
 	const i18n = useI18n();
 
 	function showMessage(messageData: Partial<NotificationOptions>, track = true) {
-		messageData = { ...messageDefaults, ...messageData };
-
-		Object.defineProperty(messageData, 'message', {
-			value:
-				typeof messageData.message === 'string'
-					? sanitizeHtml(messageData.message)
-					: messageData.message,
-			writable: true,
-			enumerable: true,
-		});
+		const { message, title } = messageData;
+		const params = { ...messageDefaults, ...messageData };
+
+		if (typeof message === 'string') {
+			params.message = sanitizeHtml(message);
+		}
+
+		if (typeof title === 'string') {
+			params.title = sanitizeHtml(title);
+		}
 
-		const notification = Notification(messageData);
+		const notification = Notification(params);
 
-		if (messageData.duration === 0) {
+		if (params.duration === 0) {
 			stickyNotificationQueue.push(notification);
 		}
 
-		if (messageData.type === 'error' && track) {
+		if (params.type === 'error' && track) {
 			telemetry.track('Instance FE emitted error', {
-				error_title: messageData.title,
-				error_message: messageData.message,
-				caused_by_credential: causedByCredential(messageData.message as string),
+				error_title: params.title,
+				error_message: params.message,
+				caused_by_credential: causedByCredential(params.message as string),
 				workflow_id: workflowsStore.workflowId,
 			});
 		}
@@ -133,6 +133,7 @@ export function useToast() {
 					${collapsableDetails(error)}`,
 				type: 'error',
 				duration: 0,
+				dangerouslyUseHTMLString: true,
 			},
 			false,
 		);
diff --git a/packages/editor-ui/src/utils/htmlUtils.ts b/packages/editor-ui/src/utils/htmlUtils.ts
index f8b8f40f90891..5da34b396526b 100644
--- a/packages/editor-ui/src/utils/htmlUtils.ts
+++ b/packages/editor-ui/src/utils/htmlUtils.ts
@@ -18,6 +18,10 @@ export function sanitizeHtml(dirtyHtml: string) {
 			}
 
 			if (ALLOWED_HTML_ATTRIBUTES.includes(name) || name.startsWith('data-')) {
+				// href is allowed but we need to sanitize certain protocols
+				if (name === 'href' && !value.match(/^https?:\/\//gm)) {
+					return '';
+				}
 				return `${name}="${friendlyAttrValue(value)}"`;
 			}
 

From eef4fb8bb42b7d0606c4881ec601a8f483342dd2 Mon Sep 17 00:00:00 2001
From: Jon <jonathan.bennetts@gmail.com>
Date: Thu, 8 Aug 2024 15:44:19 +0100
Subject: [PATCH 111/168] docs: Update wording in X credentials (#10327)

---
 .../nodes-base/credentials/TwitterOAuth1Api.credentials.ts    | 4 ++--
 .../nodes-base/credentials/TwitterOAuth2Api.credentials.ts    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/nodes-base/credentials/TwitterOAuth1Api.credentials.ts b/packages/nodes-base/credentials/TwitterOAuth1Api.credentials.ts
index 218e312be7be7..1fcce3028f8c6 100644
--- a/packages/nodes-base/credentials/TwitterOAuth1Api.credentials.ts
+++ b/packages/nodes-base/credentials/TwitterOAuth1Api.credentials.ts
@@ -36,8 +36,8 @@ export class TwitterOAuth1Api implements ICredentialType {
 		},
 		{
 			displayName:
-				'Some operations requires a Basic or a Pro API for more informations see <a href="https://developer.twitter.com/en/products/twitter-api" target="_blank">X API Docs</a>',
-			name: 'apiPermissioms',
+				'Some operations require a Basic or Pro API. Refer to <a href="https://developer.x.com/en/docs/twitter-api" target="_blank">X API Docs</a> for more information.',
+			name: 'apiPermissions',
 			type: 'notice',
 			default: '',
 		},
diff --git a/packages/nodes-base/credentials/TwitterOAuth2Api.credentials.ts b/packages/nodes-base/credentials/TwitterOAuth2Api.credentials.ts
index 5850d1409de13..53f1f218e06aa 100644
--- a/packages/nodes-base/credentials/TwitterOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/TwitterOAuth2Api.credentials.ts
@@ -28,8 +28,8 @@ export class TwitterOAuth2Api implements ICredentialType {
 	properties: INodeProperties[] = [
 		{
 			displayName:
-				'Some operations requires a Basic or a Pro API for more informations see <a href="https://developer.twitter.com/en/products/twitter-api" target="_blank">X API Docs</a>',
-			name: 'apiPermissioms',
+				'Some operations require a Basic or Pro API. Refer to <a href="https://developer.x.com/en/docs/twitter-api" target="_blank">X API Docs</a> for more information.',
+			name: 'apiPermissions',
 			type: 'notice',
 			default: '',
 		},

From 1869c396f3196026f14e5b3be9ae4c78db8d7a9e 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, 8 Aug 2024 17:35:17 +0200
Subject: [PATCH 112/168] fix(core): Do not load ScalingService in regular mode
 (no-changelog) (#10333)

---
 packages/cli/src/WorkflowRunner.ts              | 17 +++++++++--------
 packages/cli/src/commands/webhook.ts            |  2 +-
 packages/cli/src/commands/worker.ts             |  3 ++-
 .../__tests__/execution.service.test.ts         |  6 +++---
 .../cli/src/executions/execution.service.ts     | 10 +++++-----
 .../execution.service.integration.test.ts       |  1 -
 6 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/packages/cli/src/WorkflowRunner.ts b/packages/cli/src/WorkflowRunner.ts
index ac5f586b0ad43..1be878c165dfd 100644
--- a/packages/cli/src/WorkflowRunner.ts
+++ b/packages/cli/src/WorkflowRunner.ts
@@ -29,7 +29,7 @@ import { ExternalHooks } from '@/ExternalHooks';
 import type { IExecutionResponse, IWorkflowExecutionDataProcess } from '@/Interfaces';
 import { NodeTypes } from '@/NodeTypes';
 import type { Job, JobData, JobResult } from '@/scaling/types';
-import { ScalingService } from '@/scaling/scaling.service';
+import type { ScalingService } from '@/scaling/scaling.service';
 import * as WorkflowHelpers from '@/WorkflowHelpers';
 import * as WorkflowExecuteAdditionalData from '@/WorkflowExecuteAdditionalData';
 import { generateFailedExecutionFromError } from '@/WorkflowHelpers';
@@ -40,7 +40,7 @@ import { EventService } from './events/event.service';
 
 @Service()
 export class WorkflowRunner {
-	private readonly scalingService: ScalingService;
+	private scalingService: ScalingService;
 
 	private executionsMode = config.getEnv('executions.mode');
 
@@ -53,11 +53,7 @@ export class WorkflowRunner {
 		private readonly nodeTypes: NodeTypes,
 		private readonly permissionChecker: PermissionChecker,
 		private readonly eventService: EventService,
-	) {
-		if (this.executionsMode === 'queue') {
-			this.scalingService = Container.get(ScalingService);
-		}
-	}
+	) {}
 
 	/** The process did error */
 	async processError(
@@ -360,6 +356,11 @@ export class WorkflowRunner {
 			loadStaticData: !!loadStaticData,
 		};
 
+		if (!this.scalingService) {
+			const { ScalingService } = await import('@/scaling/scaling.service');
+			this.scalingService = Container.get(ScalingService);
+		}
+
 		let priority = 100;
 		if (realtime === true) {
 			// Jobs which require a direct response get a higher priority
@@ -404,7 +405,7 @@ export class WorkflowRunner {
 			async (resolve, reject, onCancel) => {
 				onCancel.shouldReject = false;
 				onCancel(async () => {
-					await Container.get(ScalingService).stopJob(job);
+					await this.scalingService.stopJob(job);
 
 					// We use "getWorkflowHooksWorkerExecuter" as "getWorkflowHooksWorkerMain" does not contain the
 					// "workflowExecuteAfter" which we require.
diff --git a/packages/cli/src/commands/webhook.ts b/packages/cli/src/commands/webhook.ts
index 505e2e216170d..d9c197c850385 100644
--- a/packages/cli/src/commands/webhook.ts
+++ b/packages/cli/src/commands/webhook.ts
@@ -4,7 +4,6 @@ import { ApplicationError } from 'n8n-workflow';
 
 import config from '@/config';
 import { ActiveExecutions } from '@/ActiveExecutions';
-import { ScalingService } from '@/scaling/scaling.service';
 import { WebhookServer } from '@/webhooks/WebhookServer';
 import { BaseCommand } from './BaseCommand';
 
@@ -96,6 +95,7 @@ export class Webhook extends BaseCommand {
 			);
 		}
 
+		const { ScalingService } = await import('@/scaling/scaling.service');
 		await Container.get(ScalingService).setupQueue();
 		await this.server.start();
 		this.logger.debug(`Webhook listener ID: ${this.server.uniqueInstanceId}`);
diff --git a/packages/cli/src/commands/worker.ts b/packages/cli/src/commands/worker.ts
index 18f039029c020..cadf4f708a8bb 100644
--- a/packages/cli/src/commands/worker.ts
+++ b/packages/cli/src/commands/worker.ts
@@ -7,7 +7,7 @@ import { sleep, ApplicationError } from 'n8n-workflow';
 import * as Db from '@/Db';
 import * as ResponseHelper from '@/ResponseHelper';
 import config from '@/config';
-import { ScalingService } from '@/scaling/scaling.service';
+import type { ScalingService } from '@/scaling/scaling.service';
 import { N8N_VERSION, inTest } from '@/constants';
 import type { ICredentialsOverwrite } from '@/Interfaces';
 import { CredentialsOverwrites } from '@/CredentialsOverwrites';
@@ -171,6 +171,7 @@ export class Worker extends BaseCommand {
 	}
 
 	async initScalingService() {
+		const { ScalingService } = await import('@/scaling/scaling.service');
 		this.scalingService = Container.get(ScalingService);
 
 		await this.scalingService.setupQueue();
diff --git a/packages/cli/src/executions/__tests__/execution.service.test.ts b/packages/cli/src/executions/__tests__/execution.service.test.ts
index 879ee707cdc8d..28c76e1c58faf 100644
--- a/packages/cli/src/executions/__tests__/execution.service.test.ts
+++ b/packages/cli/src/executions/__tests__/execution.service.test.ts
@@ -6,15 +6,16 @@ import { AbortedExecutionRetryError } from '@/errors/aborted-execution-retry.err
 import { MissingExecutionStopError } from '@/errors/missing-execution-stop.error';
 import type { ActiveExecutions } from '@/ActiveExecutions';
 import type { IExecutionResponse } from '@/Interfaces';
-import type { ScalingService } from '@/scaling/scaling.service';
+import { ScalingService } from '@/scaling/scaling.service';
 import type { WaitTracker } from '@/WaitTracker';
 import type { ExecutionRepository } from '@/databases/repositories/execution.repository';
 import type { ExecutionRequest } from '@/executions/execution.types';
 import type { ConcurrencyControlService } from '@/concurrency/concurrency-control.service';
 import type { Job } from '@/scaling/types';
+import { mockInstance } from '@test/mocking';
 
 describe('ExecutionService', () => {
-	const scalingService = mock<ScalingService>();
+	const scalingService = mockInstance(ScalingService);
 	const activeExecutions = mock<ActiveExecutions>();
 	const executionRepository = mock<ExecutionRepository>();
 	const waitTracker = mock<WaitTracker>();
@@ -23,7 +24,6 @@ describe('ExecutionService', () => {
 	const executionService = new ExecutionService(
 		mock(),
 		mock(),
-		scalingService,
 		activeExecutions,
 		executionRepository,
 		mock(),
diff --git a/packages/cli/src/executions/execution.service.ts b/packages/cli/src/executions/execution.service.ts
index 849d06c968c7e..b4e8b335739be 100644
--- a/packages/cli/src/executions/execution.service.ts
+++ b/packages/cli/src/executions/execution.service.ts
@@ -1,4 +1,4 @@
-import { Service } from 'typedi';
+import { Container, Service } from 'typedi';
 import { GlobalConfig } from '@n8n/config';
 import { validate as jsonSchemaValidate } from 'jsonschema';
 import type {
@@ -24,7 +24,6 @@ import type {
 	IWorkflowExecutionDataProcess,
 } from '@/Interfaces';
 import { NodeTypes } from '@/NodeTypes';
-import { ScalingService } from '@/scaling/scaling.service';
 import type { ExecutionRequest, ExecutionSummaries, StopResult } from './execution.types';
 import { WorkflowRunner } from '@/WorkflowRunner';
 import type { IGetExecutionsQueryFilter } from '@db/repositories/execution.repository';
@@ -85,7 +84,6 @@ export class ExecutionService {
 	constructor(
 		private readonly globalConfig: GlobalConfig,
 		private readonly logger: Logger,
-		private readonly scalingService: ScalingService,
 		private readonly activeExecutions: ActiveExecutions,
 		private readonly executionRepository: ExecutionRepository,
 		private readonly workflowRepository: WorkflowRepository,
@@ -471,12 +469,14 @@ export class ExecutionService {
 			this.waitTracker.stopExecution(execution.id);
 		}
 
-		const jobs = await this.scalingService.findJobsByStatus(['active', 'waiting']);
+		const { ScalingService } = await import('@/scaling/scaling.service');
+		const scalingService = Container.get(ScalingService);
+		const jobs = await scalingService.findJobsByStatus(['active', 'waiting']);
 
 		const job = jobs.find(({ data }) => data.executionId === execution.id);
 
 		if (job) {
-			await this.scalingService.stopJob(job);
+			await scalingService.stopJob(job);
 		} else {
 			this.logger.debug('Job to stop not in queue', { executionId: execution.id });
 		}
diff --git a/packages/cli/test/integration/execution.service.integration.test.ts b/packages/cli/test/integration/execution.service.integration.test.ts
index 6f29950bf48d4..41dcec3ce60e6 100644
--- a/packages/cli/test/integration/execution.service.integration.test.ts
+++ b/packages/cli/test/integration/execution.service.integration.test.ts
@@ -22,7 +22,6 @@ describe('ExecutionService', () => {
 			mock(),
 			mock(),
 			mock(),
-			mock(),
 			executionRepository,
 			Container.get(WorkflowRepository),
 			mock(),

From d720fdf324364c154c2e9a9775f4078533026e7e Mon Sep 17 00:00:00 2001
From: Jon <jonathan.bennetts@gmail.com>
Date: Fri, 9 Aug 2024 09:48:48 +0100
Subject: [PATCH 113/168] docs: Change display name for WhatsApp Trigger API
 Credential (#10334)

---
 packages/nodes-base/credentials/WhatsAppApi.credentials.ts      | 2 +-
 .../nodes-base/credentials/WhatsAppTriggerApi.credentials.ts    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/nodes-base/credentials/WhatsAppApi.credentials.ts b/packages/nodes-base/credentials/WhatsAppApi.credentials.ts
index 34473518b1f3f..c676c40f3df52 100644
--- a/packages/nodes-base/credentials/WhatsAppApi.credentials.ts
+++ b/packages/nodes-base/credentials/WhatsAppApi.credentials.ts
@@ -22,7 +22,7 @@ export class WhatsAppApi implements ICredentialType {
 			required: true,
 		},
 		{
-			displayName: 'Bussiness Account ID',
+			displayName: 'Business Account ID',
 			type: 'string',
 			name: 'businessAccountId',
 			default: '',
diff --git a/packages/nodes-base/credentials/WhatsAppTriggerApi.credentials.ts b/packages/nodes-base/credentials/WhatsAppTriggerApi.credentials.ts
index d339b36a2be48..09e2fca7e3a08 100644
--- a/packages/nodes-base/credentials/WhatsAppTriggerApi.credentials.ts
+++ b/packages/nodes-base/credentials/WhatsAppTriggerApi.credentials.ts
@@ -3,7 +3,7 @@ import type { ICredentialTestRequest, ICredentialType, INodeProperties } from 'n
 export class WhatsAppTriggerApi implements ICredentialType {
 	name = 'whatsAppTriggerApi';
 
-	displayName = 'WhatsApp API';
+	displayName = 'WhatsApp OAuth API';
 
 	documentationUrl = 'whatsApp';
 

From c9d9245451940151890bd773428ba13049d7efe8 Mon Sep 17 00:00:00 2001
From: Tomi Turtiainen <10324676+tomi@users.noreply.github.com>
Date: Fri, 9 Aug 2024 12:00:33 +0300
Subject: [PATCH 114/168] refactor(editor): Convert ChangePasswordModal to
 composition api (no-changelog) (#10337)

---
 .../src/components/ChangePasswordModal.vue    | 205 ++++++++----------
 1 file changed, 95 insertions(+), 110 deletions(-)

diff --git a/packages/editor-ui/src/components/ChangePasswordModal.vue b/packages/editor-ui/src/components/ChangePasswordModal.vue
index 978ec9cedb830..493a77e16599e 100644
--- a/packages/editor-ui/src/components/ChangePasswordModal.vue
+++ b/packages/editor-ui/src/components/ChangePasswordModal.vue
@@ -1,7 +1,7 @@
 <template>
 	<Modal
 		:name="CHANGE_PASSWORD_MODAL_KEY"
-		:title="$locale.baseText('auth.changePassword')"
+		:title="i18n.baseText('auth.changePassword')"
 		:center="true"
 		width="460px"
 		:event-bus="modalBus"
@@ -19,7 +19,7 @@
 		<template #footer>
 			<n8n-button
 				:loading="loading"
-				:label="$locale.baseText('auth.changePassword')"
+				:label="i18n.baseText('auth.changePassword')"
 				float="right"
 				data-test-id="change-password-button"
 				@click="onSubmitClick"
@@ -28,127 +28,112 @@
 	</Modal>
 </template>
 
-<script lang="ts">
-import { defineComponent } from 'vue';
-
-import { CHANGE_PASSWORD_MODAL_KEY } from '../constants';
+<script setup lang="ts">
+import { ref, onMounted } from 'vue';
 import { useToast } from '@/composables/useToast';
+import { CHANGE_PASSWORD_MODAL_KEY } from '../constants';
 import Modal from '@/components/Modal.vue';
-import type { IFormInputs } from '@/Interface';
-import { mapStores } from 'pinia';
 import { useUsersStore } from '@/stores/users.store';
 import { createEventBus } from 'n8n-design-system/utils';
+import type { IFormInputs } from '@/Interface';
+import { useI18n } from '@/composables/useI18n';
 
-export default defineComponent({
-	name: 'ChangePasswordModal',
-	components: { Modal },
-	props: {
-		modalName: {
-			type: String,
-		},
-	},
-	setup() {
-		return {
-			...useToast(),
-		};
-	},
-	data() {
+const config = ref<IFormInputs | null>(null);
+const formBus = createEventBus();
+const modalBus = createEventBus();
+const password = ref('');
+const loading = ref(false);
+
+const i18n = useI18n();
+const { showMessage, showError } = useToast();
+const usersStore = useUsersStore();
+
+const passwordsMatch = (value: string | number | boolean | null | undefined) => {
+	if (typeof value !== 'string') {
+		return false;
+	}
+
+	if (value !== password.value) {
 		return {
-			config: null as null | IFormInputs,
-			formBus: createEventBus(),
-			modalBus: createEventBus(),
-			password: '',
-			loading: false,
-			CHANGE_PASSWORD_MODAL_KEY,
+			messageKey: 'auth.changePassword.passwordsMustMatchError',
 		};
-	},
-	computed: {
-		...mapStores(useUsersStore),
-	},
-	mounted() {
-		const form: IFormInputs = [
-			{
-				name: 'currentPassword',
-				properties: {
-					label: this.$locale.baseText('auth.changePassword.currentPassword'),
-					type: 'password',
-					required: true,
-					autocomplete: 'current-password',
-					capitalize: true,
-					focusInitially: true,
-				},
-			},
-			{
-				name: 'password',
-				properties: {
-					label: this.$locale.baseText('auth.newPassword'),
-					type: 'password',
-					required: true,
-					validationRules: [{ name: 'DEFAULT_PASSWORD_RULES' }],
-					infoText: this.$locale.baseText('auth.defaultPasswordRequirements'),
-					autocomplete: 'new-password',
-					capitalize: true,
-				},
-			},
-			{
-				name: 'password2',
-				properties: {
-					label: this.$locale.baseText('auth.changePassword.reenterNewPassword'),
-					type: 'password',
-					required: true,
-					validators: {
-						TWO_PASSWORDS_MATCH: {
-							validate: this.passwordsMatch,
-						},
-					},
-					validationRules: [{ name: 'TWO_PASSWORDS_MATCH' }],
-					autocomplete: 'new-password',
-					capitalize: true,
-				},
-			},
-		];
+	}
 
-		this.config = form;
-	},
-	methods: {
-		passwordsMatch(value: string | number | boolean | null | undefined) {
-			if (typeof value !== 'string') {
-				return false;
-			}
+	return false;
+};
 
-			if (value !== this.password) {
-				return {
-					messageKey: 'auth.changePassword.passwordsMustMatchError',
-				};
-			}
+const onInput = (e: { name: string; value: string }) => {
+	if (e.name === 'password') {
+		password.value = e.value;
+	}
+};
 
-			return false;
-		},
-		onInput(e: { name: string; value: string }) {
-			if (e.name === 'password') {
-				this.password = e.value;
-			}
-		},
-		async onSubmit(values: { currentPassword: string; password: string }) {
-			try {
-				this.loading = true;
-				await this.usersStore.updateCurrentUserPassword(values);
+const onSubmit = async (values: { currentPassword: string; password: string }) => {
+	try {
+		loading.value = true;
+		await usersStore.updateCurrentUserPassword(values);
+
+		showMessage({
+			type: 'success',
+			title: i18n.baseText('auth.changePassword.passwordUpdated'),
+			message: i18n.baseText('auth.changePassword.passwordUpdatedMessage'),
+		});
+
+		modalBus.emit('close');
+	} catch (error) {
+		showError(error, i18n.baseText('auth.changePassword.error'));
+	} finally {
+		loading.value = false;
+	}
+};
 
-				this.showMessage({
-					type: 'success',
-					title: this.$locale.baseText('auth.changePassword.passwordUpdated'),
-					message: this.$locale.baseText('auth.changePassword.passwordUpdatedMessage'),
-				});
+const onSubmitClick = () => {
+	formBus.emit('submit');
+};
 
-				this.modalBus.emit('close');
-			} catch (error) {
-				this.showError(error, this.$locale.baseText('auth.changePassword.error'));
-			}
-			this.loading = false;
+onMounted(() => {
+	const form: IFormInputs = [
+		{
+			name: 'currentPassword',
+			properties: {
+				label: i18n.baseText('auth.changePassword.currentPassword'),
+				type: 'password',
+				required: true,
+				autocomplete: 'current-password',
+				capitalize: true,
+				focusInitially: true,
+			},
 		},
-		onSubmitClick() {
-			this.formBus.emit('submit');
+		{
+			name: 'password',
+			properties: {
+				label: i18n.baseText('auth.newPassword'),
+				type: 'password',
+				required: true,
+				validationRules: [{ name: 'DEFAULT_PASSWORD_RULES' }],
+				infoText: i18n.baseText('auth.defaultPasswordRequirements'),
+				autocomplete: 'new-password',
+				capitalize: true,
+			},
 		},
-	},
+		{
+			name: 'password2',
+			properties: {
+				label: i18n.baseText('auth.changePassword.reenterNewPassword'),
+				type: 'password',
+				required: true,
+				validators: {
+					TWO_PASSWORDS_MATCH: {
+						validate: passwordsMatch,
+					},
+				},
+				validationRules: [{ name: 'TWO_PASSWORDS_MATCH' }],
+				autocomplete: 'new-password',
+				capitalize: true,
+			},
+		},
+	];
+
+	config.value = form;
 });
 </script>

From 697bc90b0be4f960314bba1e2d5bb579ad446b5b Mon Sep 17 00:00:00 2001
From: Val <68596159+valya@users.noreply.github.com>
Date: Fri, 9 Aug 2024 11:59:28 +0100
Subject: [PATCH 115/168] feat: Allow sharing to and from team projects
 (no-changelog) (#10144)

---
 .../src/credentials/credentials.controller.ts |  15 +--
 .../src/credentials/credentials.service.ee.ts |  41 ++++--
 .../src/credentials/credentials.service.ts    |  27 ++++
 .../sharedCredentials.repository.ts           |   9 ++
 packages/cli/src/permissions/project-roles.ts |   1 +
 .../credentials/credentials.api.ee.test.ts    | 124 ++++++++++++++++++
 .../credentials/credentials.api.test.ts       |  23 +++-
 7 files changed, 219 insertions(+), 21 deletions(-)

diff --git a/packages/cli/src/credentials/credentials.controller.ts b/packages/cli/src/credentials/credentials.controller.ts
index 9ac57bb2e3af3..40f2aa8d43219 100644
--- a/packages/cli/src/credentials/credentials.controller.ts
+++ b/packages/cli/src/credentials/credentials.controller.ts
@@ -291,25 +291,22 @@ export class CredentialsController {
 		let newShareeIds: string[] = [];
 
 		await Db.transaction(async (trx) => {
-			const currentPersonalProjectIDs = credential.shared
+			const currentProjectIds = credential.shared
 				.filter((sc) => sc.role === 'credential:user')
 				.map((sc) => sc.projectId);
-			const newPersonalProjectIds = shareWithIds;
+			const newProjectIds = shareWithIds;
 
-			const toShare = utils.rightDiff(
-				[currentPersonalProjectIDs, (id) => id],
-				[newPersonalProjectIds, (id) => id],
-			);
+			const toShare = utils.rightDiff([currentProjectIds, (id) => id], [newProjectIds, (id) => id]);
 			const toUnshare = utils.rightDiff(
-				[newPersonalProjectIds, (id) => id],
-				[currentPersonalProjectIDs, (id) => id],
+				[newProjectIds, (id) => id],
+				[currentProjectIds, (id) => id],
 			);
 
 			const deleteResult = await trx.delete(SharedCredentials, {
 				credentialsId: credentialId,
 				projectId: In(toUnshare),
 			});
-			await this.enterpriseCredentialsService.shareWithProjects(credential, toShare, trx);
+			await this.enterpriseCredentialsService.shareWithProjects(req.user, credential, toShare, trx);
 
 			if (deleteResult.affected) {
 				amountRemoved = deleteResult.affected;
diff --git a/packages/cli/src/credentials/credentials.service.ee.ts b/packages/cli/src/credentials/credentials.service.ee.ts
index 981ecc5d59fc9..44fc614cbd63d 100644
--- a/packages/cli/src/credentials/credentials.service.ee.ts
+++ b/packages/cli/src/credentials/credentials.service.ee.ts
@@ -12,6 +12,7 @@ import { Project } from '@/databases/entities/Project';
 import { ProjectService } from '@/services/project.service';
 import { TransferCredentialError } from '@/errors/response-errors/transfer-credential.error';
 import { SharedCredentials } from '@/databases/entities/SharedCredentials';
+import { RoleService } from '@/services/role.service';
 
 @Service()
 export class EnterpriseCredentialsService {
@@ -20,9 +21,11 @@ export class EnterpriseCredentialsService {
 		private readonly ownershipService: OwnershipService,
 		private readonly credentialsService: CredentialsService,
 		private readonly projectService: ProjectService,
+		private readonly roleService: RoleService,
 	) {}
 
 	async shareWithProjects(
+		user: User,
 		credential: CredentialsEntity,
 		shareWithIds: string[],
 		entityManager?: EntityManager,
@@ -30,19 +33,35 @@ export class EnterpriseCredentialsService {
 		const em = entityManager ?? this.sharedCredentialsRepository.manager;
 
 		const projects = await em.find(Project, {
-			where: { id: In(shareWithIds), type: 'personal' },
+			where: [
+				{
+					id: In(shareWithIds),
+					type: 'team',
+					// if user can see all projects, don't check project access
+					// if they can't, find projects they can list
+					...(user.hasGlobalScope('project:list')
+						? {}
+						: {
+								projectRelations: {
+									userId: user.id,
+									role: In(this.roleService.rolesWithScope('project', 'project:list')),
+								},
+							}),
+				},
+				{
+					id: In(shareWithIds),
+					type: 'personal',
+				},
+			],
 		});
 
-		const newSharedCredentials = projects
-			// We filter by role === 'project:personalOwner' above and there should
-			// always only be one owner.
-			.map((project) =>
-				this.sharedCredentialsRepository.create({
-					credentialsId: credential.id,
-					role: 'credential:user',
-					projectId: project.id,
-				}),
-			);
+		const newSharedCredentials = projects.map((project) =>
+			this.sharedCredentialsRepository.create({
+				credentialsId: credential.id,
+				role: 'credential:user',
+				projectId: project.id,
+			}),
+		);
 
 		return await em.save(newSharedCredentials);
 	}
diff --git a/packages/cli/src/credentials/credentials.service.ts b/packages/cli/src/credentials/credentials.service.ts
index 0ecfd31877bf2..01517c960adad 100644
--- a/packages/cli/src/credentials/credentials.service.ts
+++ b/packages/cli/src/credentials/credentials.service.ts
@@ -90,6 +90,19 @@ export class CredentialsService {
 			let credentials = await this.credentialsRepository.findMany(options.listQueryOptions);
 
 			if (isDefaultSelect) {
+				// Since we're filtering using project ID as part of the relation,
+				// we end up filtering out all the other relations, meaning that if
+				// it's shared to a project, it won't be able to find the home project.
+				// To solve this, we have to get all the relation now, even though
+				// we're deleting them later.
+				if ((options.listQueryOptions?.filter?.shared as { projectId?: string })?.projectId) {
+					const relations = await this.sharedCredentialsRepository.getAllRelationsForCredentials(
+						credentials.map((c) => c.id),
+					);
+					credentials.forEach((c) => {
+						c.shared = relations.filter((r) => r.credentialsId === c.id);
+					});
+				}
 				credentials = credentials.map((c) => this.ownershipService.addOwnedByAndSharedWith(c));
 			}
 
@@ -130,6 +143,20 @@ export class CredentialsService {
 		);
 
 		if (isDefaultSelect) {
+			// Since we're filtering using project ID as part of the relation,
+			// we end up filtering out all the other relations, meaning that if
+			// it's shared to a project, it won't be able to find the home project.
+			// To solve this, we have to get all the relation now, even though
+			// we're deleting them later.
+			if ((options.listQueryOptions?.filter?.shared as { projectId?: string })?.projectId) {
+				const relations = await this.sharedCredentialsRepository.getAllRelationsForCredentials(
+					credentials.map((c) => c.id),
+				);
+				credentials.forEach((c) => {
+					c.shared = relations.filter((r) => r.credentialsId === c.id);
+				});
+			}
+
 			credentials = credentials.map((c) => this.ownershipService.addOwnedByAndSharedWith(c));
 		}
 
diff --git a/packages/cli/src/databases/repositories/sharedCredentials.repository.ts b/packages/cli/src/databases/repositories/sharedCredentials.repository.ts
index 8d2d1fa7af586..03acc24823ac5 100644
--- a/packages/cli/src/databases/repositories/sharedCredentials.repository.ts
+++ b/packages/cli/src/databases/repositories/sharedCredentials.repository.ts
@@ -151,4 +151,13 @@ export class SharedCredentialsRepository extends Repository<SharedCredentials> {
 			})
 		)?.project;
 	}
+
+	async getAllRelationsForCredentials(credentialIds: string[]) {
+		return await this.find({
+			where: {
+				credentialsId: In(credentialIds),
+			},
+			relations: ['project'],
+		});
+	}
 }
diff --git a/packages/cli/src/permissions/project-roles.ts b/packages/cli/src/permissions/project-roles.ts
index 96e4dfff8a475..d05507c47c46c 100644
--- a/packages/cli/src/permissions/project-roles.ts
+++ b/packages/cli/src/permissions/project-roles.ts
@@ -20,6 +20,7 @@ export const REGULAR_PROJECT_ADMIN_SCOPES: Scope[] = [
 	'credential:delete',
 	'credential:list',
 	'credential:move',
+	'credential:share',
 	'project:list',
 	'project:read',
 	'project:update',
diff --git a/packages/cli/test/integration/credentials/credentials.api.ee.test.ts b/packages/cli/test/integration/credentials/credentials.api.ee.test.ts
index df8a562a76768..6b74dd843c303 100644
--- a/packages/cli/test/integration/credentials/credentials.api.ee.test.ts
+++ b/packages/cli/test/integration/credentials/credentials.api.ee.test.ts
@@ -48,6 +48,7 @@ let memberPersonalProject: Project;
 let anotherMember: User;
 let anotherMemberPersonalProject: Project;
 let authOwnerAgent: SuperAgentTest;
+let authMemberAgent: SuperAgentTest;
 let authAnotherMemberAgent: SuperAgentTest;
 let saveCredential: SaveCredentialFunction;
 const mailer = mockInstance(UserManagementMailer);
@@ -73,6 +74,7 @@ beforeEach(async () => {
 	);
 
 	authOwnerAgent = testServer.authAgentFor(owner);
+	authMemberAgent = testServer.authAgentFor(member);
 	authAnotherMemberAgent = testServer.authAgentFor(anotherMember);
 
 	saveCredential = affixRoleToSaveCredential('credential:owner');
@@ -978,6 +980,128 @@ describe('PUT /credentials/:id/share', () => {
 
 		config.set('userManagement.emails.mode', 'smtp');
 	});
+
+	test('member should be able to share from personal project to team project that member has access to', async () => {
+		const savedCredential = await saveCredential(randomCredentialPayload(), { user: member });
+
+		const testProject = await createTeamProject();
+		await linkUserToProject(member, testProject, 'project:editor');
+
+		const response = await authMemberAgent
+			.put(`/credentials/${savedCredential.id}/share`)
+			.send({ shareWithIds: [testProject.id] });
+
+		expect(response.statusCode).toBe(200);
+		expect(response.body.data).toBeUndefined();
+
+		const shares = await getCredentialSharings(savedCredential);
+		const testShare = shares.find((s) => s.projectId === testProject.id);
+		expect(testShare).not.toBeUndefined();
+		expect(testShare?.role).toBe('credential:user');
+	});
+
+	test('member should be able to share from team project to personal project', async () => {
+		const testProject = await createTeamProject(undefined, member);
+
+		const savedCredential = await saveCredential(randomCredentialPayload(), {
+			project: testProject,
+		});
+
+		const response = await authMemberAgent
+			.put(`/credentials/${savedCredential.id}/share`)
+			.send({ shareWithIds: [anotherMemberPersonalProject.id] });
+
+		expect(response.statusCode).toBe(200);
+		expect(response.body.data).toBeUndefined();
+
+		const shares = await getCredentialSharings(savedCredential);
+		const testShare = shares.find((s) => s.projectId === anotherMemberPersonalProject.id);
+		expect(testShare).not.toBeUndefined();
+		expect(testShare?.role).toBe('credential:user');
+	});
+
+	test('member should be able to share from team project to team project that member has access to', async () => {
+		const testProject = await createTeamProject(undefined, member);
+		const testProject2 = await createTeamProject();
+		await linkUserToProject(member, testProject2, 'project:editor');
+
+		const savedCredential = await saveCredential(randomCredentialPayload(), {
+			project: testProject,
+		});
+
+		const response = await authMemberAgent
+			.put(`/credentials/${savedCredential.id}/share`)
+			.send({ shareWithIds: [testProject2.id] });
+
+		expect(response.statusCode).toBe(200);
+		expect(response.body.data).toBeUndefined();
+
+		const shares = await getCredentialSharings(savedCredential);
+		const testShare = shares.find((s) => s.projectId === testProject2.id);
+		expect(testShare).not.toBeUndefined();
+		expect(testShare?.role).toBe('credential:user');
+	});
+
+	test('admins should be able to share from any team project to any team project ', async () => {
+		const testProject = await createTeamProject();
+		const testProject2 = await createTeamProject();
+
+		const savedCredential = await saveCredential(randomCredentialPayload(), {
+			project: testProject,
+		});
+
+		const response = await authOwnerAgent
+			.put(`/credentials/${savedCredential.id}/share`)
+			.send({ shareWithIds: [testProject2.id] });
+
+		expect(response.statusCode).toBe(200);
+		expect(response.body.data).toBeUndefined();
+
+		const shares = await getCredentialSharings(savedCredential);
+		const testShare = shares.find((s) => s.projectId === testProject2.id);
+		expect(testShare).not.toBeUndefined();
+		expect(testShare?.role).toBe('credential:user');
+	});
+
+	test("admins should be able to share from any team project to any user's personal project ", async () => {
+		const testProject = await createTeamProject();
+
+		const savedCredential = await saveCredential(randomCredentialPayload(), {
+			project: testProject,
+		});
+
+		const response = await authOwnerAgent
+			.put(`/credentials/${savedCredential.id}/share`)
+			.send({ shareWithIds: [memberPersonalProject.id] });
+
+		expect(response.statusCode).toBe(200);
+		expect(response.body.data).toBeUndefined();
+
+		const shares = await getCredentialSharings(savedCredential);
+		const testShare = shares.find((s) => s.projectId === memberPersonalProject.id);
+		expect(testShare).not.toBeUndefined();
+		expect(testShare?.role).toBe('credential:user');
+	});
+
+	test('admins should be able to share from any personal project to any team project ', async () => {
+		const testProject = await createTeamProject();
+
+		const savedCredential = await saveCredential(randomCredentialPayload(), {
+			user: member,
+		});
+
+		const response = await authOwnerAgent
+			.put(`/credentials/${savedCredential.id}/share`)
+			.send({ shareWithIds: [testProject.id] });
+
+		expect(response.statusCode).toBe(200);
+		expect(response.body.data).toBeUndefined();
+
+		const shares = await getCredentialSharings(savedCredential);
+		const testShare = shares.find((s) => s.projectId === testProject.id);
+		expect(testShare).not.toBeUndefined();
+		expect(testShare?.role).toBe('credential:user');
+	});
 });
 
 describe('PUT /:credentialId/transfer', () => {
diff --git a/packages/cli/test/integration/credentials/credentials.api.test.ts b/packages/cli/test/integration/credentials/credentials.api.test.ts
index 54de47b16e948..cd461b3dafe66 100644
--- a/packages/cli/test/integration/credentials/credentials.api.test.ts
+++ b/packages/cli/test/integration/credentials/credentials.api.test.ts
@@ -142,7 +142,13 @@ describe('GET /credentials', () => {
 			// Team cred
 			expect(cred1.id).toBe(savedCredential1.id);
 			expect(cred1.scopes).toEqual(
-				['credential:move', 'credential:read', 'credential:update', 'credential:delete'].sort(),
+				[
+					'credential:move',
+					'credential:read',
+					'credential:update',
+					'credential:share',
+					'credential:delete',
+				].sort(),
 			);
 
 			// Shared cred
@@ -389,6 +395,21 @@ describe('GET /credentials', () => {
 			expect(response2.body.data).toHaveLength(0);
 		});
 
+		test('should return homeProject when filtering credentials by projectId', async () => {
+			const project = await createTeamProject(undefined, member);
+			const credential = await saveCredential(payload(), { user: owner, role: 'credential:owner' });
+			await shareCredentialWithProjects(credential, [project]);
+
+			const response: GetAllResponse = await testServer
+				.authAgentFor(member)
+				.get('/credentials')
+				.query(`filter={ "projectId": "${project.id}" }`)
+				.expect(200);
+
+			expect(response.body.data).toHaveLength(1);
+			expect(response.body.data[0].homeProject).not.toBeNull();
+		});
+
 		test('should return all credentials in a team project that member is part of', async () => {
 			const teamProjectWithMember = await createTeamProject('Team Project With member', owner);
 			void (await linkUserToProject(member, teamProjectWithMember, 'project:editor'));

From 484737735a35f8b6c066153ba4b3a4ca91c603c4 Mon Sep 17 00:00:00 2001
From: Tomi Turtiainen <10324676+tomi@users.noreply.github.com>
Date: Fri, 9 Aug 2024 17:08:15 +0300
Subject: [PATCH 116/168] refactor(core): Extract webhook request handler to
 own file (#10301)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Iván Ovejero <ivov.src@gmail.com>
---
 packages/cli/src/AbstractServer.ts            |  19 +-
 packages/cli/src/webhooks/WebhookHelpers.ts   | 100 +-------
 .../cli/src/webhooks/WebhookRequestHandler.ts | 119 ++++++++++
 .../webhooks/__tests__/WebhookHelpers.test.ts | 142 -----------
 .../__tests__/WebhookRequestHandler.test.ts   | 220 ++++++++++++++++++
 packages/cli/src/webhooks/webhook.types.ts    |   2 +-
 6 files changed, 350 insertions(+), 252 deletions(-)
 create mode 100644 packages/cli/src/webhooks/WebhookRequestHandler.ts
 delete mode 100644 packages/cli/src/webhooks/__tests__/WebhookHelpers.test.ts
 create mode 100644 packages/cli/src/webhooks/__tests__/WebhookRequestHandler.test.ts

diff --git a/packages/cli/src/AbstractServer.ts b/packages/cli/src/AbstractServer.ts
index 38cc327831c16..676db8db0aa03 100644
--- a/packages/cli/src/AbstractServer.ts
+++ b/packages/cli/src/AbstractServer.ts
@@ -16,7 +16,7 @@ import { rawBodyReader, bodyParser, corsMiddleware } from '@/middlewares';
 import { WaitingForms } from '@/WaitingForms';
 import { TestWebhooks } from '@/webhooks/TestWebhooks';
 import { WaitingWebhooks } from '@/webhooks/WaitingWebhooks';
-import { webhookRequestHandler } from '@/webhooks/WebhookHelpers';
+import { createWebhookHandlerFor } from '@/webhooks/WebhookRequestHandler';
 import { ActiveWebhooks } from '@/webhooks/ActiveWebhooks';
 import { generateHostInstanceId } from './databases/utils/generators';
 import { Logger } from '@/Logger';
@@ -181,33 +181,32 @@ export abstract class AbstractServer {
 
 		// Setup webhook handlers before bodyParser, to let the Webhook node handle binary data in requests
 		if (this.webhooksEnabled) {
-			const activeWebhooks = Container.get(ActiveWebhooks);
-
+			const activeWebhooksRequestHandler = createWebhookHandlerFor(Container.get(ActiveWebhooks));
 			// Register a handler for active forms
-			this.app.all(`/${this.endpointForm}/:path(*)`, webhookRequestHandler(activeWebhooks));
+			this.app.all(`/${this.endpointForm}/:path(*)`, activeWebhooksRequestHandler);
 
 			// Register a handler for active webhooks
-			this.app.all(`/${this.endpointWebhook}/:path(*)`, webhookRequestHandler(activeWebhooks));
+			this.app.all(`/${this.endpointWebhook}/:path(*)`, activeWebhooksRequestHandler);
 
 			// Register a handler for waiting forms
 			this.app.all(
 				`/${this.endpointFormWaiting}/:path/:suffix?`,
-				webhookRequestHandler(Container.get(WaitingForms)),
+				createWebhookHandlerFor(Container.get(WaitingForms)),
 			);
 
 			// Register a handler for waiting webhooks
 			this.app.all(
 				`/${this.endpointWebhookWaiting}/:path/:suffix?`,
-				webhookRequestHandler(Container.get(WaitingWebhooks)),
+				createWebhookHandlerFor(Container.get(WaitingWebhooks)),
 			);
 		}
 
 		if (this.testWebhooksEnabled) {
-			const testWebhooks = Container.get(TestWebhooks);
+			const testWebhooksRequestHandler = createWebhookHandlerFor(Container.get(TestWebhooks));
 
 			// Register a handler
-			this.app.all(`/${this.endpointFormTest}/:path(*)`, webhookRequestHandler(testWebhooks));
-			this.app.all(`/${this.endpointWebhookTest}/:path(*)`, webhookRequestHandler(testWebhooks));
+			this.app.all(`/${this.endpointFormTest}/:path(*)`, testWebhooksRequestHandler);
+			this.app.all(`/${this.endpointWebhookTest}/:path(*)`, testWebhooksRequestHandler);
 		}
 
 		// Block bots from scanning the application
diff --git a/packages/cli/src/webhooks/WebhookHelpers.ts b/packages/cli/src/webhooks/WebhookHelpers.ts
index f090a7ea7e318..1b8bc2b7e986d 100644
--- a/packages/cli/src/webhooks/WebhookHelpers.ts
+++ b/packages/cli/src/webhooks/WebhookHelpers.ts
@@ -20,7 +20,6 @@ import type {
 	IDataObject,
 	IDeferredPromise,
 	IExecuteData,
-	IHttpRequestMethods,
 	IN8nHttpFullResponse,
 	INode,
 	IPinData,
@@ -41,13 +40,7 @@ import {
 	NodeHelpers,
 } from 'n8n-workflow';
 
-import type {
-	IWebhookResponseCallbackData,
-	IWebhookManager,
-	WebhookCORSRequest,
-	WebhookRequest,
-} from './webhook.types';
-import * as ResponseHelper from '@/ResponseHelper';
+import type { IWebhookResponseCallbackData, WebhookRequest } from './webhook.types';
 import * as WorkflowHelpers from '@/WorkflowHelpers';
 import { WorkflowRunner } from '@/WorkflowRunner';
 import * as WorkflowExecuteAdditionalData from '@/WorkflowExecuteAdditionalData';
@@ -62,97 +55,6 @@ import { UnprocessableRequestError } from '@/errors/response-errors/unprocessabl
 import type { Project } from '@/databases/entities/Project';
 import type { IExecutionDb, IWorkflowDb, IWorkflowExecutionDataProcess } from '@/Interfaces';
 
-export const WEBHOOK_METHODS: IHttpRequestMethods[] = [
-	'DELETE',
-	'GET',
-	'HEAD',
-	'PATCH',
-	'POST',
-	'PUT',
-];
-
-export const webhookRequestHandler =
-	(webhookManager: IWebhookManager) =>
-	async (req: WebhookRequest | WebhookCORSRequest, res: express.Response) => {
-		const { path } = req.params;
-		const method = req.method;
-
-		if (method !== 'OPTIONS' && !WEBHOOK_METHODS.includes(method)) {
-			return ResponseHelper.sendErrorResponse(
-				res,
-				new Error(`The method ${method} is not supported.`),
-			);
-		}
-
-		// Setup CORS headers only if the incoming request has an `origin` header
-		if ('origin' in req.headers) {
-			if (webhookManager.getWebhookMethods) {
-				try {
-					const allowedMethods = await webhookManager.getWebhookMethods(path);
-					res.header('Access-Control-Allow-Methods', ['OPTIONS', ...allowedMethods].join(', '));
-				} catch (error) {
-					return ResponseHelper.sendErrorResponse(res, error as Error);
-				}
-			}
-
-			const requestedMethod =
-				method === 'OPTIONS'
-					? (req.headers['access-control-request-method'] as IHttpRequestMethods)
-					: method;
-			if (webhookManager.findAccessControlOptions && requestedMethod) {
-				const options = await webhookManager.findAccessControlOptions(path, requestedMethod);
-				const { allowedOrigins } = options ?? {};
-
-				if (allowedOrigins && allowedOrigins !== '*' && allowedOrigins !== req.headers.origin) {
-					const originsList = allowedOrigins.split(',');
-					const defaultOrigin = originsList[0];
-
-					if (originsList.length === 1) {
-						res.header('Access-Control-Allow-Origin', defaultOrigin);
-					}
-
-					if (originsList.includes(req.headers.origin as string)) {
-						res.header('Access-Control-Allow-Origin', req.headers.origin);
-					} else {
-						res.header('Access-Control-Allow-Origin', defaultOrigin);
-					}
-				} else {
-					res.header('Access-Control-Allow-Origin', req.headers.origin);
-				}
-
-				if (method === 'OPTIONS') {
-					res.header('Access-Control-Max-Age', '300');
-					const requestedHeaders = req.headers['access-control-request-headers'];
-					if (requestedHeaders?.length) {
-						res.header('Access-Control-Allow-Headers', requestedHeaders);
-					}
-				}
-			}
-		}
-
-		if (method === 'OPTIONS') {
-			return ResponseHelper.sendSuccessResponse(res, {}, true, 204);
-		}
-
-		let response: IWebhookResponseCallbackData;
-		try {
-			response = await webhookManager.executeWebhook(req, res);
-		} catch (error) {
-			return ResponseHelper.sendErrorResponse(res, error as Error);
-		}
-
-		// Don't respond, if already responded
-		if (response.noWebhookResponse !== true) {
-			ResponseHelper.sendSuccessResponse(
-				res,
-				response.data,
-				true,
-				response.responseCode,
-				response.headers,
-			);
-		}
-	};
-
 /**
  * Returns all the webhooks which should be created for the given workflow
  */
diff --git a/packages/cli/src/webhooks/WebhookRequestHandler.ts b/packages/cli/src/webhooks/WebhookRequestHandler.ts
new file mode 100644
index 0000000000000..289175ac0541c
--- /dev/null
+++ b/packages/cli/src/webhooks/WebhookRequestHandler.ts
@@ -0,0 +1,119 @@
+import type express from 'express';
+import type { IHttpRequestMethods } from 'n8n-workflow';
+import type {
+	IWebhookManager,
+	WebhookOptionsRequest,
+	WebhookRequest,
+} from '@/webhooks/webhook.types';
+import * as ResponseHelper from '@/ResponseHelper';
+
+const WEBHOOK_METHODS: IHttpRequestMethods[] = ['DELETE', 'GET', 'HEAD', 'PATCH', 'POST', 'PUT'];
+
+class WebhookRequestHandler {
+	constructor(private readonly webhookManager: IWebhookManager) {}
+
+	/**
+	 * Handles an incoming webhook request. Handles CORS and delegates the
+	 * request to the webhook manager to execute the webhook.
+	 */
+	async handleRequest(req: WebhookRequest | WebhookOptionsRequest, res: express.Response) {
+		const method = req.method;
+
+		if (method !== 'OPTIONS' && !WEBHOOK_METHODS.includes(method)) {
+			return ResponseHelper.sendErrorResponse(
+				res,
+				new Error(`The method ${method} is not supported.`),
+			);
+		}
+
+		// Setup CORS headers only if the incoming request has an `origin` header
+		if ('origin' in req.headers) {
+			const corsSetupError = await this.setupCorsHeaders(req, res);
+			if (corsSetupError) {
+				return ResponseHelper.sendErrorResponse(res, corsSetupError);
+			}
+		}
+
+		if (method === 'OPTIONS') {
+			return ResponseHelper.sendSuccessResponse(res, {}, true, 204);
+		}
+
+		try {
+			const response = await this.webhookManager.executeWebhook(req, res);
+
+			// Don't respond, if already responded
+			if (response.noWebhookResponse !== true) {
+				ResponseHelper.sendSuccessResponse(
+					res,
+					response.data,
+					true,
+					response.responseCode,
+					response.headers,
+				);
+			}
+		} catch (error) {
+			return ResponseHelper.sendErrorResponse(res, error as Error);
+		}
+	}
+
+	private async setupCorsHeaders(
+		req: WebhookRequest | WebhookOptionsRequest,
+		res: express.Response,
+	): Promise<Error | null> {
+		const method = req.method;
+		const { path } = req.params;
+
+		if (this.webhookManager.getWebhookMethods) {
+			try {
+				const allowedMethods = await this.webhookManager.getWebhookMethods(path);
+				res.header('Access-Control-Allow-Methods', ['OPTIONS', ...allowedMethods].join(', '));
+			} catch (error) {
+				return error as Error;
+			}
+		}
+
+		const requestedMethod =
+			method === 'OPTIONS'
+				? (req.headers['access-control-request-method'] as IHttpRequestMethods)
+				: method;
+		if (this.webhookManager.findAccessControlOptions && requestedMethod) {
+			const options = await this.webhookManager.findAccessControlOptions(path, requestedMethod);
+			const { allowedOrigins } = options ?? {};
+
+			if (allowedOrigins && allowedOrigins !== '*' && allowedOrigins !== req.headers.origin) {
+				const originsList = allowedOrigins.split(',');
+				const defaultOrigin = originsList[0];
+
+				if (originsList.length === 1) {
+					res.header('Access-Control-Allow-Origin', defaultOrigin);
+				}
+
+				if (originsList.includes(req.headers.origin as string)) {
+					res.header('Access-Control-Allow-Origin', req.headers.origin);
+				} else {
+					res.header('Access-Control-Allow-Origin', defaultOrigin);
+				}
+			} else {
+				res.header('Access-Control-Allow-Origin', req.headers.origin);
+			}
+
+			if (method === 'OPTIONS') {
+				res.header('Access-Control-Max-Age', '300');
+				const requestedHeaders = req.headers['access-control-request-headers'];
+				if (requestedHeaders?.length) {
+					res.header('Access-Control-Allow-Headers', requestedHeaders);
+				}
+			}
+		}
+
+		return null;
+	}
+}
+
+export function createWebhookHandlerFor(webhookManager: IWebhookManager) {
+	const handler = new WebhookRequestHandler(webhookManager);
+
+	return async (req: WebhookRequest | WebhookOptionsRequest, res: express.Response) => {
+		await handler.handleRequest(req, res);
+	};
+}
diff --git a/packages/cli/src/webhooks/__tests__/WebhookHelpers.test.ts b/packages/cli/src/webhooks/__tests__/WebhookHelpers.test.ts
deleted file mode 100644
index 9f86fbc549fcf..0000000000000
--- a/packages/cli/src/webhooks/__tests__/WebhookHelpers.test.ts
+++ /dev/null
@@ -1,142 +0,0 @@
-import { type Response } from 'express';
-import { mock } from 'jest-mock-extended';
-import { randomString } from 'n8n-workflow';
-import type { IHttpRequestMethods } from 'n8n-workflow';
-
-import type { IWebhookManager, WebhookCORSRequest, WebhookRequest } from '@/webhooks/webhook.types';
-import { webhookRequestHandler } from '@/webhooks/WebhookHelpers';
-
-describe('WebhookHelpers', () => {
-	describe('webhookRequestHandler', () => {
-		const webhookManager = mock<Required<IWebhookManager>>();
-		const handler = webhookRequestHandler(webhookManager);
-
-		beforeEach(() => {
-			jest.resetAllMocks();
-		});
-
-		it('should throw for unsupported methods', async () => {
-			const req = mock<WebhookRequest | WebhookCORSRequest>({
-				method: 'CONNECT' as IHttpRequestMethods,
-			});
-			const res = mock<Response>();
-			res.status.mockReturnValue(res);
-
-			await handler(req, res);
-
-			expect(res.status).toHaveBeenCalledWith(500);
-			expect(res.json).toHaveBeenCalledWith({
-				code: 0,
-				message: 'The method CONNECT is not supported.',
-			});
-		});
-
-		describe('preflight requests', () => {
-			it('should handle missing header for requested method', async () => {
-				const req = mock<WebhookRequest | WebhookCORSRequest>({
-					method: 'OPTIONS',
-					headers: {
-						origin: 'https://example.com',
-						'access-control-request-method': undefined,
-					},
-					params: { path: 'test' },
-				});
-				const res = mock<Response>();
-				res.status.mockReturnValue(res);
-
-				webhookManager.getWebhookMethods.mockResolvedValue(['GET', 'PATCH']);
-
-				await handler(req, res);
-
-				expect(res.status).toHaveBeenCalledWith(204);
-				expect(res.header).toHaveBeenCalledWith(
-					'Access-Control-Allow-Methods',
-					'OPTIONS, GET, PATCH',
-				);
-			});
-
-			it('should handle default origin and max-age', async () => {
-				const req = mock<WebhookRequest | WebhookCORSRequest>({
-					method: 'OPTIONS',
-					headers: {
-						origin: 'https://example.com',
-						'access-control-request-method': 'GET',
-					},
-					params: { path: 'test' },
-				});
-				const res = mock<Response>();
-				res.status.mockReturnValue(res);
-
-				webhookManager.getWebhookMethods.mockResolvedValue(['GET', 'PATCH']);
-
-				await handler(req, res);
-
-				expect(res.status).toHaveBeenCalledWith(204);
-				expect(res.header).toHaveBeenCalledWith(
-					'Access-Control-Allow-Methods',
-					'OPTIONS, GET, PATCH',
-				);
-				expect(res.header).toHaveBeenCalledWith(
-					'Access-Control-Allow-Origin',
-					'https://example.com',
-				);
-				expect(res.header).toHaveBeenCalledWith('Access-Control-Max-Age', '300');
-			});
-
-			it('should handle wildcard origin', async () => {
-				const randomOrigin = randomString(10);
-				const req = mock<WebhookRequest | WebhookCORSRequest>({
-					method: 'OPTIONS',
-					headers: {
-						origin: randomOrigin,
-						'access-control-request-method': 'GET',
-					},
-					params: { path: 'test' },
-				});
-				const res = mock<Response>();
-				res.status.mockReturnValue(res);
-
-				webhookManager.getWebhookMethods.mockResolvedValue(['GET', 'PATCH']);
-				webhookManager.findAccessControlOptions.mockResolvedValue({
-					allowedOrigins: '*',
-				});
-
-				await handler(req, res);
-
-				expect(res.status).toHaveBeenCalledWith(204);
-				expect(res.header).toHaveBeenCalledWith(
-					'Access-Control-Allow-Methods',
-					'OPTIONS, GET, PATCH',
-				);
-				expect(res.header).toHaveBeenCalledWith('Access-Control-Allow-Origin', randomOrigin);
-			});
-
-			it('should handle custom origin', async () => {
-				const req = mock<WebhookRequest | WebhookCORSRequest>({
-					method: 'OPTIONS',
-					headers: {
-						origin: 'https://example.com',
-						'access-control-request-method': 'GET',
-					},
-					params: { path: 'test' },
-				});
-				const res = mock<Response>();
-				res.status.mockReturnValue(res);
-
-				webhookManager.getWebhookMethods.mockResolvedValue(['GET', 'PATCH']);
-				webhookManager.findAccessControlOptions.mockResolvedValue({
-					allowedOrigins: 'https://test.com',
-				});
-
-				await handler(req, res);
-
-				expect(res.status).toHaveBeenCalledWith(204);
-				expect(res.header).toHaveBeenCalledWith(
-					'Access-Control-Allow-Methods',
-					'OPTIONS, GET, PATCH',
-				);
-				expect(res.header).toHaveBeenCalledWith('Access-Control-Allow-Origin', 'https://test.com');
-			});
-		});
-	});
-});
diff --git a/packages/cli/src/webhooks/__tests__/WebhookRequestHandler.test.ts b/packages/cli/src/webhooks/__tests__/WebhookRequestHandler.test.ts
new file mode 100644
index 0000000000000..aff310241958f
--- /dev/null
+++ b/packages/cli/src/webhooks/__tests__/WebhookRequestHandler.test.ts
@@ -0,0 +1,220 @@
+import { type Response } from 'express';
+import { mock } from 'jest-mock-extended';
+import { randomString } from 'n8n-workflow';
+import type { IHttpRequestMethods } from 'n8n-workflow';
+
+import type {
+	IWebhookManager,
+	IWebhookResponseCallbackData,
+	WebhookOptionsRequest,
+	WebhookRequest,
+} from '@/webhooks/webhook.types';
+import { createWebhookHandlerFor } from '@/webhooks/WebhookRequestHandler';
+import { ResponseError } from '@/errors/response-errors/abstract/response.error';
+
+describe('WebhookRequestHandler', () => {
+	const webhookManager = mock<Required<IWebhookManager>>();
+	const handler = createWebhookHandlerFor(webhookManager);
+
+	beforeEach(() => {
+		jest.resetAllMocks();
+	});
+
+	it('should throw for unsupported methods', async () => {
+		const req = mock<WebhookRequest | WebhookOptionsRequest>({
+			method: 'CONNECT' as IHttpRequestMethods,
+		});
+		const res = mock<Response>();
+		res.status.mockReturnValue(res);
+
+		await handler(req, res);
+
+		expect(res.status).toHaveBeenCalledWith(500);
+		expect(res.json).toHaveBeenCalledWith({
+			code: 0,
+			message: 'The method CONNECT is not supported.',
+		});
+	});
+
+	describe('preflight requests', () => {
+		it('should handle missing header for requested method', async () => {
+			const req = mock<WebhookRequest | WebhookOptionsRequest>({
+				method: 'OPTIONS',
+				headers: {
+					origin: 'https://example.com',
+					'access-control-request-method': undefined,
+				},
+				params: { path: 'test' },
+			});
+			const res = mock<Response>();
+			res.status.mockReturnValue(res);
+
+			webhookManager.getWebhookMethods.mockResolvedValue(['GET', 'PATCH']);
+
+			await handler(req, res);
+
+			expect(res.status).toHaveBeenCalledWith(204);
+			expect(res.header).toHaveBeenCalledWith(
+				'Access-Control-Allow-Methods',
+				'OPTIONS, GET, PATCH',
+			);
+		});
+
+		it('should handle default origin and max-age', async () => {
+			const req = mock<WebhookRequest | WebhookOptionsRequest>({
+				method: 'OPTIONS',
+				headers: {
+					origin: 'https://example.com',
+					'access-control-request-method': 'GET',
+				},
+				params: { path: 'test' },
+			});
+			const res = mock<Response>();
+			res.status.mockReturnValue(res);
+
+			webhookManager.getWebhookMethods.mockResolvedValue(['GET', 'PATCH']);
+
+			await handler(req, res);
+
+			expect(res.status).toHaveBeenCalledWith(204);
+			expect(res.header).toHaveBeenCalledWith(
+				'Access-Control-Allow-Methods',
+				'OPTIONS, GET, PATCH',
+			);
+			expect(res.header).toHaveBeenCalledWith('Access-Control-Allow-Origin', 'https://example.com');
+			expect(res.header).toHaveBeenCalledWith('Access-Control-Max-Age', '300');
+		});
+
+		it('should handle wildcard origin', async () => {
+			const randomOrigin = randomString(10);
+			const req = mock<WebhookRequest | WebhookOptionsRequest>({
+				method: 'OPTIONS',
+				headers: {
+					origin: randomOrigin,
+					'access-control-request-method': 'GET',
+				},
+				params: { path: 'test' },
+			});
+			const res = mock<Response>();
+			res.status.mockReturnValue(res);
+
+			webhookManager.getWebhookMethods.mockResolvedValue(['GET', 'PATCH']);
+			webhookManager.findAccessControlOptions.mockResolvedValue({
+				allowedOrigins: '*',
+			});
+
+			await handler(req, res);
+
+			expect(res.status).toHaveBeenCalledWith(204);
+			expect(res.header).toHaveBeenCalledWith(
+				'Access-Control-Allow-Methods',
+				'OPTIONS, GET, PATCH',
+			);
+			expect(res.header).toHaveBeenCalledWith('Access-Control-Allow-Origin', randomOrigin);
+		});
+
+		it('should handle custom origin', async () => {
+			const req = mock<WebhookRequest | WebhookOptionsRequest>({
+				method: 'OPTIONS',
+				headers: {
+					origin: 'https://example.com',
+					'access-control-request-method': 'GET',
+				},
+				params: { path: 'test' },
+			});
+			const res = mock<Response>();
+			res.status.mockReturnValue(res);
+
+			webhookManager.getWebhookMethods.mockResolvedValue(['GET', 'PATCH']);
+			webhookManager.findAccessControlOptions.mockResolvedValue({
+				allowedOrigins: 'https://test.com',
+			});
+
+			await handler(req, res);
+
+			expect(res.status).toHaveBeenCalledWith(204);
+			expect(res.header).toHaveBeenCalledWith(
+				'Access-Control-Allow-Methods',
+				'OPTIONS, GET, PATCH',
+			);
+			expect(res.header).toHaveBeenCalledWith('Access-Control-Allow-Origin', 'https://test.com');
+		});
+	});
+
+	describe('webhook requests', () => {
+		it('should delegate the request to the webhook manager and send the response', async () => {
+			const req = mock<WebhookRequest>({
+				method: 'GET',
+				params: { path: 'test' },
+			});
+
+			const res = mock<Response>();
+
+			const executeWebhookResponse: IWebhookResponseCallbackData = {
+				responseCode: 200,
+				data: {},
+				headers: {
+					'x-custom-header': 'test',
+				},
+			};
+			webhookManager.executeWebhook.mockResolvedValueOnce(executeWebhookResponse);
+
+			await handler(req, res);
+
+			expect(webhookManager.executeWebhook).toHaveBeenCalledWith(req, res);
+			expect(res.status).toHaveBeenCalledWith(200);
+			expect(res.header).toHaveBeenCalledWith({
+				'x-custom-header': 'test',
+			});
+			expect(res.json).toHaveBeenCalledWith(executeWebhookResponse.data);
+		});
+
+		it('should send an error response if webhook execution throws', async () => {
+			class TestError extends ResponseError {}
+			const req = mock<WebhookRequest>({
+				method: 'GET',
+				params: { path: 'test' },
+			});
+
+			const res = mock<Response>();
+			res.status.mockReturnValue(res);
+
+			webhookManager.executeWebhook.mockRejectedValueOnce(
+				new TestError('Test error', 500, 100, 'Test hint'),
+			);
+
+			await handler(req, res);
+
+			expect(webhookManager.executeWebhook).toHaveBeenCalledWith(req, res);
+			expect(res.status).toHaveBeenCalledWith(500);
+			expect(res.json).toHaveBeenCalledWith({
+				code: 100,
+				message: 'Test error',
+				hint: 'Test hint',
+			});
+		});
+
+		test.each<IHttpRequestMethods>(['DELETE', 'GET', 'HEAD', 'PATCH', 'POST', 'PUT'])(
+			"should handle '%s' method",
+			async (method) => {
+				const req = mock<WebhookRequest>({
+					method,
+					params: { path: 'test' },
+				});
+
+				const res = mock<Response>();
+
+				const executeWebhookResponse: IWebhookResponseCallbackData = {
+					responseCode: 200,
+				};
+				webhookManager.executeWebhook.mockResolvedValueOnce(executeWebhookResponse);
+
+				await handler(req, res);
+
+				expect(webhookManager.executeWebhook).toHaveBeenCalledWith(req, res);
+				expect(res.status).toHaveBeenCalledWith(200);
+				expect(res.json).toHaveBeenCalledWith(executeWebhookResponse.data);
+			},
+		);
+	});
+});
diff --git a/packages/cli/src/webhooks/webhook.types.ts b/packages/cli/src/webhooks/webhook.types.ts
index 7602ed1871bb0..4d34b00d04c2c 100644
--- a/packages/cli/src/webhooks/webhook.types.ts
+++ b/packages/cli/src/webhooks/webhook.types.ts
@@ -1,7 +1,7 @@
 import type { Request, Response } from 'express';
 import type { IDataObject, IHttpRequestMethods } from 'n8n-workflow';
 
-export type WebhookCORSRequest = Request & { method: 'OPTIONS' };
+export type WebhookOptionsRequest = Request & { method: 'OPTIONS' };
 
 export type WebhookRequest = Request<{ path: string }> & {
 	method: IHttpRequestMethods;

From 1cf48cc3019c1cf27e2f3c9affd18426237e9064 Mon Sep 17 00:00:00 2001
From: Csaba Tuncsik <csaba@n8n.io>
Date: Fri, 9 Aug 2024 16:31:02 +0200
Subject: [PATCH 117/168] fix(editor): Enable credential sharing between all
 types of projects (#10233)

---
 cypress/composables/projects.ts               | 20 ++---
 cypress/e2e/17-sharing.cy.ts                  | 73 ++++++++++++++++++-
 cypress/e2e/39-projects.cy.ts                 |  2 +-
 .../CredentialEdit/CredentialEdit.vue         | 15 +++-
 .../CredentialEdit/CredentialSharing.ee.vue   | 69 ++++++------------
 .../src/components/DeleteUserModal.vue        |  4 +-
 .../components/Projects/ProjectCardBadge.vue  | 12 +++
 .../components/Projects/ProjectSharing.vue    |  6 +-
 .../src/plugins/i18n/locales/en.json          | 29 ++++----
 .../editor-ui/src/stores/credentials.store.ts | 16 +++-
 .../src/views/ProjectSettings.test.ts         | 10 ++-
 .../editor-ui/src/views/ProjectSettings.vue   |  3 +-
 .../{__tests__ => }/SettingsUsersView.test.ts | 10 ++-
 13 files changed, 173 insertions(+), 96 deletions(-)
 rename packages/editor-ui/src/views/{__tests__ => }/SettingsUsersView.test.ts (95%)

diff --git a/cypress/composables/projects.ts b/cypress/composables/projects.ts
index 6fa2c6f502a3e..ed280b462f328 100644
--- a/cypress/composables/projects.ts
+++ b/cypress/composables/projects.ts
@@ -5,7 +5,8 @@ const credentialsModal = new CredentialsModal();
 
 export const getHomeButton = () => cy.getByTestId('project-home-menu-item');
 export const getMenuItems = () => cy.getByTestId('project-menu-item');
-export const getAddProjectButton = () => cy.getByTestId('add-project-menu-item');
+export const getAddProjectButton = () =>
+	cy.getByTestId('add-project-menu-item').should('contain', 'Add project').should('be.visible');
 export const getProjectTabs = () => cy.getByTestId('project-tabs').find('a');
 export const getProjectTabWorkflows = () => getProjectTabs().filter('a[href$="/workflows"]');
 export const getProjectTabCredentials = () => getProjectTabs().filter('a[href$="/credentials"]');
@@ -28,7 +29,7 @@ export const getResourceMoveConfirmModal = () =>
 export const getProjectMoveSelect = () => cy.getByTestId('project-move-resource-modal-select');
 
 export function createProject(name: string) {
-	getAddProjectButton().should('be.visible').click();
+	getAddProjectButton().click();
 
 	getProjectNameInput()
 		.should('be.visible')
@@ -46,7 +47,7 @@ export function createWorkflow(fixtureKey: string, name: string) {
 	workflowPage.actions.zoomToFit();
 }
 
-export function createCredential(name: string) {
+export function createCredential(name: string, closeModal = true) {
 	credentialsModal.getters.newCredentialModal().should('be.visible');
 	credentialsModal.getters.newCredentialTypeSelect().should('be.visible');
 	credentialsModal.getters.newCredentialTypeOption('Notion API').click();
@@ -54,13 +55,8 @@ export function createCredential(name: string) {
 	credentialsModal.getters.connectionParameter('Internal Integration Secret').type('1234567890');
 	credentialsModal.actions.setName(name);
 	credentialsModal.actions.save();
-	credentialsModal.actions.close();
-}
 
-export const actions = {
-	createProject: (name: string) => {
-		getAddProjectButton().click();
-		getProjectSettingsNameInput().type(name);
-		getProjectSettingsSaveButton().click();
-	},
-};
+	if (closeModal) {
+		credentialsModal.actions.close();
+	}
+}
diff --git a/cypress/e2e/17-sharing.cy.ts b/cypress/e2e/17-sharing.cy.ts
index 54c5e6efe202c..ab1ee3955b1ac 100644
--- a/cypress/e2e/17-sharing.cy.ts
+++ b/cypress/e2e/17-sharing.cy.ts
@@ -7,7 +7,7 @@ import {
 	WorkflowSharingModal,
 	WorkflowsPage,
 } from '../pages';
-import { getVisibleSelect } from '../utils';
+import { getVisibleDropdown, getVisibleSelect } from '../utils';
 import * as projects from '../composables/projects';
 
 /**
@@ -192,6 +192,73 @@ describe('Sharing', { disableAutoLogin: true }, () => {
 		credentialsModal.actions.saveSharing();
 		credentialsModal.actions.close();
 	});
+
+	it('credentials should work between team and personal projects', () => {
+		cy.resetDatabase();
+		cy.enableFeature('sharing');
+		cy.enableFeature('advancedPermissions');
+		cy.enableFeature('projectRole:admin');
+		cy.enableFeature('projectRole:editor');
+		cy.changeQuota('maxTeamProjects', -1);
+
+		cy.signinAsOwner();
+		cy.visit('/');
+
+		projects.createProject('Development');
+
+		projects.getHomeButton().click();
+		workflowsPage.getters.newWorkflowButtonCard().click();
+		projects.createWorkflow('Test_workflow_1.json', 'Test workflow');
+
+		projects.getHomeButton().click();
+		projects.getProjectTabCredentials().click();
+		credentialsPage.getters.emptyListCreateCredentialButton().click();
+		projects.createCredential('Notion API');
+
+		credentialsPage.getters.credentialCard('Notion API').click();
+		credentialsModal.actions.changeTab('Sharing');
+		credentialsModal.getters.usersSelect().click();
+		getVisibleSelect()
+			.find('li')
+			.should('have.length', 4)
+			.filter(':contains("Development")')
+			.should('have.length', 1)
+			.click();
+		credentialsModal.getters.saveButton().click();
+		credentialsModal.actions.close();
+
+		projects.getProjectTabWorkflows().click();
+		workflowsPage.getters.workflowCardActions('Test workflow').click();
+		getVisibleDropdown().find('li').contains('Share').click();
+
+		workflowSharingModal.getters.usersSelect().filter(':visible').click();
+		getVisibleSelect().find('li').should('have.length', 3).first().click();
+		workflowSharingModal.getters.saveButton().click();
+
+		projects.getMenuItems().first().click();
+		workflowsPage.getters.newWorkflowButtonCard().click();
+		projects.createWorkflow('Test_workflow_1.json', 'Test workflow 2');
+		workflowPage.actions.openShareModal();
+		workflowSharingModal.getters.usersSelect().should('not.exist');
+
+		cy.get('body').type('{esc}');
+
+		projects.getMenuItems().first().click();
+		projects.getProjectTabCredentials().click();
+		credentialsPage.getters.createCredentialButton().click();
+		projects.createCredential('Notion API 2', false);
+		credentialsModal.actions.changeTab('Sharing');
+		credentialsModal.getters.usersSelect().click();
+		getVisibleSelect().find('li').should('have.length', 4).first().click();
+		credentialsModal.getters.saveButton().click();
+		credentialsModal.actions.close();
+
+		credentialsPage.getters
+			.credentialCards()
+			.should('have.length', 2)
+			.filter(':contains("Owned by me")')
+			.should('have.length', 1);
+	});
 });
 
 describe('Credential Usage in Cross Shared Workflows', () => {
@@ -217,13 +284,13 @@ describe('Credential Usage in Cross Shared Workflows', () => {
 		credentialsModal.actions.createNewCredential('Notion API');
 
 		// Create a notion credential in one project
-		projects.actions.createProject('Development');
+		projects.createProject('Development');
 		projects.getProjectTabCredentials().click();
 		credentialsPage.getters.emptyListCreateCredentialButton().click();
 		credentialsModal.actions.createNewCredential('Notion API');
 
 		// Create a notion credential in another project
-		projects.actions.createProject('Test');
+		projects.createProject('Test');
 		projects.getProjectTabCredentials().click();
 		credentialsPage.getters.emptyListCreateCredentialButton().click();
 		credentialsModal.actions.createNewCredential('Notion API');
diff --git a/cypress/e2e/39-projects.cy.ts b/cypress/e2e/39-projects.cy.ts
index 94a6384233c2c..cbf7324e4b6b3 100644
--- a/cypress/e2e/39-projects.cy.ts
+++ b/cypress/e2e/39-projects.cy.ts
@@ -237,7 +237,7 @@ describe('Projects', { disableAutoLogin: true }, () => {
 		cy.signinAsMember(1);
 		cy.visit(workflowsPage.url);
 
-		projects.getAddProjectButton().should('not.exist');
+		cy.getByTestId('add-project-menu-item').should('not.exist');
 		projects.getMenuItems().should('not.exist');
 	});
 
diff --git a/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue b/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue
index fd539fed7554f..bfeab0737ceb5 100644
--- a/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue
+++ b/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue
@@ -446,6 +446,11 @@ const showSaveButton = computed(() => {
 
 const showSharingContent = computed(() => activeTab.value === 'sharing' && !!credentialType.value);
 
+const homeProject = computed(() => {
+	const { currentProject, personalProject } = projectsStore;
+	return currentProject ?? personalProject;
+});
+
 onMounted(async () => {
 	requiredCredentials.value =
 		isCredentialModalState(uiStore.modalsById[CREDENTIAL_EDIT_MODAL_KEY]) &&
@@ -456,14 +461,12 @@ onMounted(async () => {
 			credentialTypeName: defaultCredentialTypeName.value,
 		});
 
-		const { currentProject, personalProject } = projectsStore;
-		const scopes = currentProject?.scopes ?? personalProject?.scopes ?? [];
-		const homeProject = currentProject ?? personalProject ?? {};
+		const scopes = homeProject.value?.scopes ?? [];
 
 		credentialData.value = {
 			...credentialData.value,
 			scopes,
-			homeProject,
+			...(homeProject.value ? { homeProject: homeProject.value } : {}),
 		};
 	} else {
 		await loadCurrentCredential();
@@ -793,6 +796,10 @@ async function saveCredential(): Promise<ICredentialsResponse | null> {
 			.sharedWithProjects as ProjectSharingData[];
 	}
 
+	if (credentialData.value.homeProject) {
+		credentialDetails.homeProject = credentialData.value.homeProject as ProjectSharingData;
+	}
+
 	let credential: ICredentialsResponse | null = null;
 
 	const isNewCredential = props.mode === 'new' && !credentialId.value;
diff --git a/packages/editor-ui/src/components/CredentialEdit/CredentialSharing.ee.vue b/packages/editor-ui/src/components/CredentialEdit/CredentialSharing.ee.vue
index 133b00ca4d46e..0d19cc3b4b191 100644
--- a/packages/editor-ui/src/components/CredentialEdit/CredentialSharing.ee.vue
+++ b/packages/editor-ui/src/components/CredentialEdit/CredentialSharing.ee.vue
@@ -1,7 +1,7 @@
 <template>
 	<div :class="$style.container">
 		<div v-if="!isSharingEnabled">
-			<n8n-action-box
+			<N8nActionBox
 				:heading="
 					$locale.baseText(
 						uiStore.contextBasedTranslationKeys.credentials.sharing.unavailable.title,
@@ -21,52 +21,28 @@
 			/>
 		</div>
 		<div v-else>
-			<n8n-info-tip
-				v-if="!credentialPermissions.share && !isHomeTeamProject"
-				:bold="false"
-				class="mb-s"
-			>
+			<N8nInfoTip v-if="credentialPermissions.share" :bold="false" class="mb-s">
+				{{ $locale.baseText('credentialEdit.credentialSharing.info.owner') }}
+			</N8nInfoTip>
+			<N8nInfoTip v-else-if="isHomeTeamProject" :bold="false" class="mb-s">
+				{{ $locale.baseText('credentialEdit.credentialSharing.info.sharee.team') }}
+			</N8nInfoTip>
+			<N8nInfoTip v-else :bold="false" class="mb-s">
 				{{
-					$locale.baseText('credentialEdit.credentialSharing.info.sharee', {
+					$locale.baseText('credentialEdit.credentialSharing.info.sharee.personal', {
 						interpolate: { credentialOwnerName },
 					})
 				}}
-			</n8n-info-tip>
-			<n8n-info-tip
-				v-if="credentialPermissions.share && !isHomeTeamProject"
-				:bold="false"
-				class="mb-s"
-			>
-				{{ $locale.baseText('credentialEdit.credentialSharing.info.owner') }}
-			</n8n-info-tip>
+			</N8nInfoTip>
 			<ProjectSharing
 				v-model="sharedWithProjects"
 				:projects="projects"
 				:roles="credentialRoles"
 				:home-project="homeProject"
 				:readonly="!credentialPermissions.share"
-				:static="isHomeTeamProject || !credentialPermissions.share"
-				:placeholder="$locale.baseText('workflows.shareModal.select.placeholder')"
+				:static="!credentialPermissions.share"
+				:placeholder="sharingSelectPlaceholder"
 			/>
-			<n8n-info-tip v-if="isHomeTeamProject" :bold="false" class="mt-s">
-				<i18n-t keypath="credentials.shareModal.info.members" tag="span">
-					<template #projectName>
-						{{ homeProject?.name }}
-					</template>
-					<template #members>
-						<strong>
-							{{
-								$locale.baseText('credentials.shareModal.info.members.number', {
-									interpolate: {
-										number: String(numberOfMembersInHomeTeamProject),
-									},
-									adjustToNumber: numberOfMembersInHomeTeamProject,
-								})
-							}}
-						</strong>
-					</template>
-				</i18n-t>
-			</n8n-info-tip>
 		</div>
 	</div>
 </template>
@@ -89,7 +65,7 @@ import { useUsageStore } from '@/stores/usage.store';
 import { EnterpriseEditionFeature } from '@/constants';
 import ProjectSharing from '@/components/Projects/ProjectSharing.vue';
 import { useProjectsStore } from '@/stores/projects.store';
-import type { ProjectListItem, ProjectSharingData, Project } from '@/types/projects.types';
+import type { ProjectListItem, ProjectSharingData } from '@/types/projects.types';
 import { ProjectTypes } from '@/types/projects.types';
 import type { ICredentialDataDecryptedObject } from 'n8n-workflow';
 import type { PermissionsMap } from '@/permissions';
@@ -97,6 +73,7 @@ import type { CredentialScope } from '@n8n/permissions';
 import type { EventBus } from 'n8n-design-system/utils';
 import { useRolesStore } from '@/stores/roles.store';
 import type { RoleMap } from '@/types/roles.types';
+import { splitName } from '@/utils/projects.utils';
 
 export default defineComponent({
 	name: 'CredentialSharing',
@@ -134,7 +111,6 @@ export default defineComponent({
 	data() {
 		return {
 			sharedWithProjects: [...(this.credential?.sharedWithProjects ?? [])] as ProjectSharingData[],
-			teamProject: null as Project | null,
 		};
 	},
 	computed: {
@@ -159,7 +135,8 @@ export default defineComponent({
 			return this.settingsStore.isEnterpriseFeatureEnabled[EnterpriseEditionFeature.Sharing];
 		},
 		credentialOwnerName(): string {
-			return this.credentialsStore.getCredentialOwnerNameById(`${this.credentialId}`);
+			const { firstName, lastName, email } = splitName(this.credential?.homeProject?.name ?? '');
+			return firstName || lastName ? `${firstName}${lastName ? ' ' + lastName : ''}` : email ?? '';
 		},
 		credentialDataHomeProject(): ProjectSharingData | undefined {
 			const credentialContainsProjectSharingData = (
@@ -182,7 +159,7 @@ export default defineComponent({
 			});
 		},
 		projects(): ProjectListItem[] {
-			return this.projectsStore.personalProjects.filter(
+			return this.projectsStore.projects.filter(
 				(project) =>
 					project.id !== this.credential?.homeProject?.id &&
 					project.id !== this.credentialDataHomeProject?.id,
@@ -194,9 +171,6 @@ export default defineComponent({
 		isHomeTeamProject(): boolean {
 			return this.homeProject?.type === ProjectTypes.Team;
 		},
-		numberOfMembersInHomeTeamProject(): number {
-			return this.teamProject?.relations.length ?? 0;
-		},
 		credentialRoleTranslations(): Record<string, string> {
 			return {
 				'credential:user': this.$locale.baseText('credentialEdit.credentialSharing.role.user'),
@@ -210,6 +184,11 @@ export default defineComponent({
 				licensed,
 			}));
 		},
+		sharingSelectPlaceholder() {
+			return this.projectsStore.teamProjects.length
+				? this.$locale.baseText('projects.sharing.select.placeholder.project')
+				: this.$locale.baseText('projects.sharing.select.placeholder.user');
+		},
 	},
 	watch: {
 		sharedWithProjects: {
@@ -221,10 +200,6 @@ export default defineComponent({
 	},
 	async mounted() {
 		await Promise.all([this.usersStore.fetchUsers(), this.projectsStore.getAllProjects()]);
-
-		if (this.homeProject && this.isHomeTeamProject) {
-			this.teamProject = await this.projectsStore.fetchProject(this.homeProject.id);
-		}
 	},
 	methods: {
 		goToUpgrade() {
diff --git a/packages/editor-ui/src/components/DeleteUserModal.vue b/packages/editor-ui/src/components/DeleteUserModal.vue
index 7516466a340b6..2fdb0ad73468f 100644
--- a/packages/editor-ui/src/components/DeleteUserModal.vue
+++ b/packages/editor-ui/src/components/DeleteUserModal.vue
@@ -3,7 +3,7 @@
 		:name="modalName"
 		:title="title"
 		:center="true"
-		width="460px"
+		width="520"
 		:event-bus="modalBus"
 		@enter="onSubmit"
 	>
@@ -147,7 +147,7 @@ export default defineComponent({
 			return false;
 		},
 		projects(): ProjectListItem[] {
-			return this.projectsStore.personalProjects.filter(
+			return this.projectsStore.projects.filter(
 				(project) =>
 					project.name !==
 					`${this.userToDelete?.firstName} ${this.userToDelete?.lastName} <${this.userToDelete?.email}>`,
diff --git a/packages/editor-ui/src/components/Projects/ProjectCardBadge.vue b/packages/editor-ui/src/components/Projects/ProjectCardBadge.vue
index 832c329f26284..6bcd1aade75b2 100644
--- a/packages/editor-ui/src/components/Projects/ProjectCardBadge.vue
+++ b/packages/editor-ui/src/components/Projects/ProjectCardBadge.vue
@@ -20,6 +20,7 @@ const enum ProjectState {
 	Owned = 'owned',
 	Personal = 'personal',
 	Team = 'team',
+	SharedTeam = 'shared-team',
 	Unknown = 'unknown',
 }
 
@@ -44,6 +45,9 @@ const projectState = computed(() => {
 		}
 		return ProjectState.Personal;
 	} else if (props.resource.homeProject?.type === ProjectTypes.Team) {
+		if (props.resource.sharedWithProjects?.length) {
+			return ProjectState.SharedTeam;
+		}
 		return ProjectState.Team;
 	}
 	return ProjectState.Unknown;
@@ -65,6 +69,7 @@ const badgeIcon = computed(() => {
 		case ProjectState.SharedOwned:
 			return 'user-friends';
 		case ProjectState.Team:
+		case ProjectState.SharedTeam:
 			return 'archive';
 		default:
 			return '';
@@ -99,6 +104,13 @@ const badgeTooltip = computed(() => {
 					name: badgeText.value,
 				},
 			});
+		case ProjectState.SharedTeam:
+			return i18n.baseText('projects.badge.tooltip.sharedTeam', {
+				interpolate: {
+					resourceTypeLabel: props.resourceTypeLabel,
+					name: badgeText.value,
+				},
+			});
 		default:
 			return '';
 	}
diff --git a/packages/editor-ui/src/components/Projects/ProjectSharing.vue b/packages/editor-ui/src/components/Projects/ProjectSharing.vue
index 0166f43615057..b8a3ba9fefce0 100644
--- a/packages/editor-ui/src/components/Projects/ProjectSharing.vue
+++ b/packages/editor-ui/src/components/Projects/ProjectSharing.vue
@@ -29,11 +29,7 @@ const emit = defineEmits<{
 const selectedProject = ref(Array.isArray(model.value) ? '' : model.value?.id ?? '');
 const filter = ref('');
 const selectPlaceholder = computed(
-	() =>
-		props.placeholder ??
-		(Array.isArray(model.value)
-			? locale.baseText('projects.sharing.placeholder')
-			: locale.baseText('projects.sharing.placeholder.single')),
+	() => props.placeholder ?? locale.baseText('projects.sharing.select.placeholder'),
 );
 const noDataText = computed(
 	() => props.emptyOptionsText ?? locale.baseText('projects.sharing.noMatchingUsers'),
diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json
index e4b312f77ff4b..772f4c2d5833e 100644
--- a/packages/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/editor-ui/src/plugins/i18n/locales/en.json
@@ -532,7 +532,8 @@
 	"credentialEdit.oAuthButton.connectMyAccount": "Connect my account",
 	"credentialEdit.oAuthButton.signInWithGoogle": "Sign in with Google",
 	"credentialEdit.credentialSharing.info.owner": "Sharing a credential allows people to use it in their workflows. They cannot access credential details.",
-	"credentialEdit.credentialSharing.info.sharee": "Only {credentialOwnerName} can change who this credential is shared with",
+	"credentialEdit.credentialSharing.info.sharee.team": "Only users with credential sharing permission can change who this credential is shared with",
+	"credentialEdit.credentialSharing.info.sharee.personal": "Only {credentialOwnerName} or users with credential sharing permission can change who this credential is shared with",
 	"credentialEdit.credentialSharing.info.sharee.fallback": "the owner",
 	"credentialEdit.credentialSharing.list.delete": "Remove",
 	"credentialEdit.credentialSharing.list.delete.confirm.title": "Remove access?",
@@ -593,8 +594,6 @@
 	"credentials.create.personal.toast.text": "This credential is currently private to you.",
 	"credentials.create.project.toast.title": "Credential successfully created in {projectName}",
 	"credentials.create.project.toast.text": "All members from {projectName} will have access to this credential.",
-	"credentials.shareModal.info.members": "This credential is owned by the {projectName} project which currently has {members} with access to this credential.",
-	"credentials.shareModal.info.members.number": "{number} member | {number} members",
 	"dataDisplay.needHelp": "Need help?",
 	"dataDisplay.nodeDocumentation": "Node Documentation",
 	"dataDisplay.openDocumentationFor": "Open {nodeTypeDisplayName} documentation",
@@ -1653,9 +1652,9 @@
 	"settings.users.setupToInviteUsers": "To invite users, set up your own account",
 	"settings.users.setupToInviteUsersInfo": "Invited users won’t be able to see workflows and credentials of other users unless you upgrade. <a href=\"https://docs.n8n.io/user-management/\" target=\"_blank\">More info</a> <br /> <br />",
 	"settings.users.smtpToAddUsersWarning": "Set up SMTP before adding users (so that n8n can send them invitation emails). <a target=\"_blank\" href=\"https://docs.n8n.io/hosting/authentication/user-management-self-hosted/\">Instructions</a>",
-	"settings.users.transferWorkflowsAndCredentials": "Transfer their workflows and credentials to another user",
-	"settings.users.transferWorkflowsAndCredentials.user": "User to transfer to",
-	"settings.users.transferWorkflowsAndCredentials.placeholder": "Select user",
+	"settings.users.transferWorkflowsAndCredentials": "Transfer their workflows and credentials to another user or project",
+	"settings.users.transferWorkflowsAndCredentials.user": "User or project to transfer to",
+	"settings.users.transferWorkflowsAndCredentials.placeholder": "Select project or user",
 	"settings.users.transferredToUser": "Data transferred to {projectName}",
 	"settings.users.userDeleted": "User deleted",
 	"settings.users.userDeletedError": "Problem while deleting user",
@@ -2459,8 +2458,8 @@
 	"projects.settings.role.editor": "Editor",
 	"projects.settings.delete.title": "Delete {projectName}",
 	"projects.settings.delete.message": "What should we do with the project data?",
-	"projects.settings.delete.question.transfer.label": "Transfer its workflows and credentials to another project",
-	"projects.settings.delete.question.transfer.title": "Project to transfer to",
+	"projects.settings.delete.question.transfer.label": "Transfer its workflows and credentials to another project or user",
+	"projects.settings.delete.question.transfer.title": "Project or user to transfer to",
 	"projects.settings.delete.question.wipe.label": "Delete its workflows and credentials",
 	"projects.settings.delete.question.wipe.title": "Type \"delete all data\" to confirm",
 	"projects.settings.delete.question.wipe.placeholder": "delete all data",
@@ -2473,9 +2472,10 @@
 	"projects.settings.role.upgrade.title": "Upgrade to unlock additional roles",
 	"projects.settings.role.upgrade.message": "You're currently limited to {limit} on the {planName} plan and can only assign the admin role to users within this project. To create more projects and unlock additional roles, upgrade your plan.",
 	"projects.sharing.noMatchingProjects": "There are no available projects",
-	"projects.sharing.noMatchingUsers": "No matching users",
-	"projects.sharing.placeholder": "Add projects...",
-	"projects.sharing.placeholder.single": "Select project",
+	"projects.sharing.noMatchingUsers": "No matching users or projects",
+	"projects.sharing.select.placeholder": "Select project or user",
+	"projects.sharing.select.placeholder.user": "Share with user(s)",
+	"projects.sharing.select.placeholder.project": "Share with projects or users",
 	"projects.error.title": "Project error",
 	"projects.create.limit": "{num} project | {num} projects",
 	"projects.create.limitReached": "You have reached the {planName} plan limit of {limit}. Upgrade your plan to unlock more projects. {link}",
@@ -2492,10 +2492,11 @@
 	"projects.move.resource.success.title": "Successfully moved {resourceTypeLabel}",
 	"projects.move.resource.success.message": "{resourceName} {resourceTypeLabel} was moved to {targetProjectName} {link}",
 	"projects.move.resource.success.link": "View {targetProjectName}",
-	"projects.badge.tooltip.sharedOwned": "This {resourceTypeLabel} is owned by you and shared with one or more other users",
-	"projects.badge.tooltip.sharedPersonal": "This {resourceTypeLabel} is owned by {name} and shared with one or more other users",
+	"projects.badge.tooltip.sharedOwned": "This {resourceTypeLabel} is owned by you and shared with one or more projects or users",
+	"projects.badge.tooltip.sharedPersonal": "This {resourceTypeLabel} is owned by {name} and shared with one or more projects or users",
 	"projects.badge.tooltip.personal": "This {resourceTypeLabel} is owned by {name}",
-	"projects.badge.tooltip.team": "This {resourceTypeLabel} is owned by the {name} project. All users in this project have access to this.",
+	"projects.badge.tooltip.team": "This {resourceTypeLabel} is owned and accessible by the {name} project.",
+	"projects.badge.tooltip.sharedTeam": "This {resourceTypeLabel} is owned and accessible by the {name} project and shared with one or more projects or users",
 	"mfa.setup.invalidAuthenticatorCode": "{code} is not a valid number",
 	"mfa.setup.invalidCode": "Two-factor code failed. Please try again.",
 	"mfa.code.modal.title": "Two-factor authentication",
diff --git a/packages/editor-ui/src/stores/credentials.store.ts b/packages/editor-ui/src/stores/credentials.store.ts
index e6759466145c9..e5be582ea2b4c 100644
--- a/packages/editor-ui/src/stores/credentials.store.ts
+++ b/packages/editor-ui/src/stores/credentials.store.ts
@@ -185,9 +185,15 @@ export const useCredentialsStore = defineStore(STORES.CREDENTIALS, () => {
 		return (credential: ICredentialsResponse | IUsedCredential | undefined): string => {
 			const { firstName, lastName, email } = splitName(credential?.homeProject?.name ?? '');
 
-			return credential?.homeProject?.name
-				? `${firstName} ${lastName} (${email})`
-				: i18n.baseText('credentialEdit.credentialSharing.info.sharee.fallback');
+			if (credential?.homeProject?.name) {
+				if (lastName && email) {
+					return `${firstName} ${lastName} (${email})`;
+				} else {
+					return firstName;
+				}
+			} else {
+				return i18n.baseText('credentialEdit.credentialSharing.info.sharee.fallback');
+			}
 		};
 	});
 
@@ -314,6 +320,10 @@ export const useCredentialsStore = defineStore(STORES.CREDENTIALS, () => {
 			projectId,
 		);
 
+		if (data?.homeProject && !credential.homeProject) {
+			credential.homeProject = data.homeProject as ProjectSharingData;
+		}
+
 		if (settingsStore.isEnterpriseFeatureEnabled[EnterpriseEditionFeature.Sharing]) {
 			upsertCredential(credential);
 			if (data.sharedWithProjects) {
diff --git a/packages/editor-ui/src/views/ProjectSettings.test.ts b/packages/editor-ui/src/views/ProjectSettings.test.ts
index 594db154d5339..13a8707109a4f 100644
--- a/packages/editor-ui/src/views/ProjectSettings.test.ts
+++ b/packages/editor-ui/src/views/ProjectSettings.test.ts
@@ -11,6 +11,7 @@ import { useUsersStore } from '@/stores/users.store';
 import { createProjectListItem } from '@/__tests__/data/projects';
 import { useSettingsStore } from '@/stores/settings.store';
 import type { IN8nUISettings } from 'n8n-workflow';
+import { ProjectTypes } from '@/types/projects.types';
 
 vi.mock('vue-router', () => {
 	const params = {};
@@ -28,7 +29,12 @@ vi.mock('vue-router', () => {
 
 const renderComponent = createComponentRenderer(ProjectSettings);
 
-const teamProjects = Array.from({ length: 3 }, () => createProjectListItem('team'));
+const projects = [
+	ProjectTypes.Personal,
+	ProjectTypes.Personal,
+	ProjectTypes.Team,
+	ProjectTypes.Team,
+].map(createProjectListItem);
 
 let router: ReturnType<typeof useRouter>;
 let projectsStore: ReturnType<typeof useProjectsStore>;
@@ -48,7 +54,7 @@ describe('ProjectSettings', () => {
 		vi.spyOn(projectsStore, 'getAllProjects').mockImplementation(
 			async () => await Promise.resolve(),
 		);
-		vi.spyOn(projectsStore, 'teamProjects', 'get').mockReturnValue(teamProjects);
+		vi.spyOn(projectsStore, 'projects', 'get').mockReturnValue(projects);
 		vi.spyOn(settingsStore, 'settings', 'get').mockReturnValue({
 			enterprise: {
 				projects: {
diff --git a/packages/editor-ui/src/views/ProjectSettings.vue b/packages/editor-ui/src/views/ProjectSettings.vue
index 31db1d66890a3..b9e3a77314bb6 100644
--- a/packages/editor-ui/src/views/ProjectSettings.vue
+++ b/packages/editor-ui/src/views/ProjectSettings.vue
@@ -59,7 +59,7 @@ const usersList = computed(() =>
 );
 
 const projects = computed(() =>
-	projectsStore.teamProjects.filter((project) => project.id !== projectsStore.currentProjectId),
+	projectsStore.projects.filter((project) => project.id !== projectsStore.currentProjectId),
 );
 const projectRoles = computed(() =>
 	rolesStore.processedProjectRoles.map((role) => ({
@@ -302,6 +302,7 @@ onMounted(() => {
 								class="mr-2xs"
 								:model-value="user?.role || projectRoles[0].role"
 								size="small"
+								data-test-id="projects-settings-user-role-select"
 								@update:model-value="onRoleAction(user, $event)"
 							>
 								<N8nOption
diff --git a/packages/editor-ui/src/views/__tests__/SettingsUsersView.test.ts b/packages/editor-ui/src/views/SettingsUsersView.test.ts
similarity index 95%
rename from packages/editor-ui/src/views/__tests__/SettingsUsersView.test.ts
rename to packages/editor-ui/src/views/SettingsUsersView.test.ts
index d67cd3502af7f..ac16df6e487fa 100644
--- a/packages/editor-ui/src/views/__tests__/SettingsUsersView.test.ts
+++ b/packages/editor-ui/src/views/SettingsUsersView.test.ts
@@ -15,6 +15,7 @@ import { DELETE_USER_MODAL_KEY, EnterpriseEditionFeature } from '@/constants';
 import * as usersApi from '@/api/users';
 import { useSettingsStore } from '@/stores/settings.store';
 import { defaultSettings } from '@/__tests__/defaults';
+import { ProjectTypes } from '@/types/projects.types';
 
 const wrapperComponentWithModal = {
 	components: { SettingsUsersView, ModalRoot, DeleteUserModal },
@@ -34,7 +35,12 @@ const renderComponent = createComponentRenderer(wrapperComponentWithModal);
 
 const loggedInUser = createUser();
 const users = Array.from({ length: 3 }, createUser);
-const personalProjects = Array.from({ length: 3 }, createProjectListItem);
+const projects = [
+	ProjectTypes.Personal,
+	ProjectTypes.Personal,
+	ProjectTypes.Team,
+	ProjectTypes.Team,
+].map(createProjectListItem);
 
 let pinia: ReturnType<typeof createPinia>;
 let projectsStore: ReturnType<typeof useProjectsStore>;
@@ -60,7 +66,7 @@ describe('SettingsUsersView', () => {
 		vi.spyOn(projectsStore, 'getAllProjects').mockImplementation(
 			async () => await Promise.resolve(),
 		);
-		vi.spyOn(projectsStore, 'personalProjects', 'get').mockReturnValue(personalProjects);
+		vi.spyOn(projectsStore, 'projects', 'get').mockReturnValue(projects);
 
 		usersStore.currentUserId = loggedInUser.id;
 	});

From 4f392b5e3e0ee166e85a2e060b3ec7fcf145229b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Fri, 9 Aug 2024 16:40:50 +0200
Subject: [PATCH 118/168] fix(core): Prevent XSS via static cache dir (#10339)

---
 packages/cli/BREAKING-CHANGES.md                | 10 ++++++++++
 packages/cli/src/config/schema.ts               |  2 +-
 packages/core/src/NodeExecuteFunctions.ts       |  8 ++++----
 packages/core/test/NodeExecuteFunctions.test.ts | 10 ++++++++++
 4 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/packages/cli/BREAKING-CHANGES.md b/packages/cli/BREAKING-CHANGES.md
index 4797def42288b..869ace642e35b 100644
--- a/packages/cli/BREAKING-CHANGES.md
+++ b/packages/cli/BREAKING-CHANGES.md
@@ -2,6 +2,16 @@
 
 This list shows all the versions which include breaking changes and how to upgrade.
 
+## 1.55.0
+
+### What changed?
+
+The `N8N_BLOCK_FILE_ACCESS_TO_N8N_FILES` environment variable now also blocks access to n8n's static cache directory at `~/.cache/n8n/public`.
+
+### When is action necessary?
+
+If you are writing to or reading from a file at n8n's static cache directory via a node, e.g. `Read/Write Files from Disk`, please update your node to use a different path.
+
 ## 1.52.0
 
 ### What changed?
diff --git a/packages/cli/src/config/schema.ts b/packages/cli/src/config/schema.ts
index c424066c8554f..90043ee20e110 100644
--- a/packages/cli/src/config/schema.ts
+++ b/packages/cli/src/config/schema.ts
@@ -341,7 +341,7 @@ export const schema = {
 			env: 'N8N_RESTRICT_FILE_ACCESS_TO',
 		},
 		blockFileAccessToN8nFiles: {
-			doc: 'If set to true it will block access to all files in the ".n8n" directory and user defined config files.',
+			doc: 'If set to true it will block access to all files in the ".n8n" directory, the static cache dir at ~/.cache/n8n/public, and user defined config files.',
 			format: Boolean,
 			default: true,
 			env: 'N8N_BLOCK_FILE_ACCESS_TO_N8N_FILES',
diff --git a/packages/core/src/NodeExecuteFunctions.ts b/packages/core/src/NodeExecuteFunctions.ts
index 5426ce94ab221..f97d86805911f 100644
--- a/packages/core/src/NodeExecuteFunctions.ts
+++ b/packages/core/src/NodeExecuteFunctions.ts
@@ -3326,7 +3326,7 @@ const getAllowedPaths = () => {
 	return allowedPaths;
 };
 
-function isFilePathBlocked(filePath: string): boolean {
+export function isFilePathBlocked(filePath: string): boolean {
 	const allowedPaths = getAllowedPaths();
 	const resolvedFilePath = path.resolve(filePath);
 	const blockFileAccessToN8nFiles = process.env[BLOCK_FILE_ACCESS_TO_N8N_FILES] !== 'false';
@@ -3342,10 +3342,10 @@ function isFilePathBlocked(filePath: string): boolean {
 		return true;
 	}
 
-	//restrict access to .n8n folder and other .env config related paths
+	//restrict access to .n8n folder, ~/.cache/n8n/public, and other .env config related paths
 	if (blockFileAccessToN8nFiles) {
-		const { n8nFolder } = Container.get(InstanceSettings);
-		const restrictedPaths = [n8nFolder];
+		const { n8nFolder, staticCacheDir } = Container.get(InstanceSettings);
+		const restrictedPaths = [n8nFolder, staticCacheDir];
 
 		if (process.env[CONFIG_FILES]) {
 			restrictedPaths.push(...process.env[CONFIG_FILES].split(','));
diff --git a/packages/core/test/NodeExecuteFunctions.test.ts b/packages/core/test/NodeExecuteFunctions.test.ts
index 8ff4ca22e59a8..3af9c752f67d1 100644
--- a/packages/core/test/NodeExecuteFunctions.test.ts
+++ b/packages/core/test/NodeExecuteFunctions.test.ts
@@ -4,6 +4,7 @@ import {
 	copyInputItems,
 	ensureType,
 	getBinaryDataBuffer,
+	isFilePathBlocked,
 	parseIncomingMessage,
 	parseRequestObject,
 	proxyRequestToAxios,
@@ -34,6 +35,7 @@ import { join } from 'path';
 import Container from 'typedi';
 import type { Agent } from 'https';
 import toPlainObject from 'lodash/toPlainObject';
+import { InstanceSettings } from '@/InstanceSettings';
 
 const temporaryDir = mkdtempSync(join(tmpdir(), 'n8n'));
 
@@ -663,3 +665,11 @@ describe('NodeExecuteFunctions', () => {
 		});
 	});
 });
+
+describe('isFilePathBlocked', () => {
+	test('should return true for static cache dir', () => {
+		const filePath = Container.get(InstanceSettings).staticCacheDir;
+
+		expect(isFilePathBlocked(filePath)).toBe(true);
+	});
+});

From 78984986a6b4add89df9743b94c113046f1d5ee8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Mon, 12 Aug 2024 10:06:15 +0200
Subject: [PATCH 119/168] fix(core): Prevent XSS in user update endpoints
 (#10338)

---
 packages/cli/src/GenericHelpers.ts            | 46 +++++++++++++++++--
 .../__tests__/me.controller.test.ts           | 20 ++++++++
 packages/cli/src/controllers/me.controller.ts |  7 ++-
 3 files changed, 69 insertions(+), 4 deletions(-)

diff --git a/packages/cli/src/GenericHelpers.ts b/packages/cli/src/GenericHelpers.ts
index 13762e5dfd672..300f24f9f9355 100644
--- a/packages/cli/src/GenericHelpers.ts
+++ b/packages/cli/src/GenericHelpers.ts
@@ -1,10 +1,15 @@
-import { validate } from 'class-validator';
+import { ValidationError, validate } from 'class-validator';
 import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
 import type { CredentialsEntity } from '@db/entities/CredentialsEntity';
 import type { TagEntity } from '@db/entities/TagEntity';
 import type { User } from '@db/entities/User';
-import type { UserRoleChangePayload, UserUpdatePayload } from '@/requests';
+import type {
+	UserRoleChangePayload,
+	UserSettingsUpdatePayload,
+	UserUpdatePayload,
+} from '@/requests';
 import { BadRequestError } from './errors/response-errors/bad-request.error';
+import { NoXss } from './databases/utils/customValidators';
 
 export async function validateEntity(
 	entity:
@@ -13,7 +18,8 @@ export async function validateEntity(
 		| TagEntity
 		| User
 		| UserUpdatePayload
-		| UserRoleChangePayload,
+		| UserRoleChangePayload
+		| UserSettingsUpdatePayload,
 ): Promise<void> {
 	const errors = await validate(entity);
 
@@ -31,3 +37,37 @@ export async function validateEntity(
 }
 
 export const DEFAULT_EXECUTIONS_GET_ALL_LIMIT = 20;
+
+class StringWithNoXss {
+	@NoXss()
+	value: string;
+
+	constructor(value: string) {
+		this.value = value;
+	}
+}
+
+// Temporary solution until we implement payload validation middleware
+export async function validateRecordNoXss(record: Record<string, string>) {
+	const errors: ValidationError[] = [];
+
+	for (const [key, value] of Object.entries(record)) {
+		const stringWithNoXss = new StringWithNoXss(value);
+		const validationErrors = await validate(stringWithNoXss);
+
+		if (validationErrors.length > 0) {
+			const error = new ValidationError();
+			error.property = key;
+			error.constraints = validationErrors[0].constraints;
+			errors.push(error);
+		}
+	}
+
+	if (errors.length > 0) {
+		const errorMessages = errors
+			.map((error) => `${error.property}: ${Object.values(error.constraints ?? {}).join(', ')}`)
+			.join(' | ');
+
+		throw new BadRequestError(errorMessages);
+	}
+}
diff --git a/packages/cli/src/controllers/__tests__/me.controller.test.ts b/packages/cli/src/controllers/__tests__/me.controller.test.ts
index 4a313552af497..8bde87b3b842a 100644
--- a/packages/cli/src/controllers/__tests__/me.controller.test.ts
+++ b/packages/cli/src/controllers/__tests__/me.controller.test.ts
@@ -225,6 +225,26 @@ describe('MeController', () => {
 				new BadRequestError('Personalization answers are mandatory'),
 			);
 		});
+
+		it('should throw BadRequestError on XSS attempt', async () => {
+			const req = mock<MeRequest.SurveyAnswers>({
+				body: { 'test-answer': '<script>alert("XSS")</script>' },
+			});
+
+			await expect(controller.storeSurveyAnswers(req)).rejects.toThrowError(BadRequestError);
+		});
+	});
+
+	describe('updateCurrentUserSettings', () => {
+		it('should throw BadRequestError on XSS attempt', async () => {
+			const req = mock<AuthenticatedRequest>({
+				body: {
+					userActivated: '<script>alert("XSS")</script>',
+				},
+			});
+
+			await expect(controller.updateCurrentUserSettings(req)).rejects.toThrowError(BadRequestError);
+		});
 	});
 
 	describe('API Key methods', () => {
diff --git a/packages/cli/src/controllers/me.controller.ts b/packages/cli/src/controllers/me.controller.ts
index 2a0526b3cc8bb..bbdac4bf02fc7 100644
--- a/packages/cli/src/controllers/me.controller.ts
+++ b/packages/cli/src/controllers/me.controller.ts
@@ -6,7 +6,7 @@ import { randomBytes } from 'crypto';
 import { AuthService } from '@/auth/auth.service';
 import { Delete, Get, Patch, Post, RestController } from '@/decorators';
 import { PasswordUtility } from '@/services/password.utility';
-import { validateEntity } from '@/GenericHelpers';
+import { validateEntity, validateRecordNoXss } from '@/GenericHelpers';
 import type { User } from '@db/entities/User';
 import {
 	AuthenticatedRequest,
@@ -176,6 +176,8 @@ export class MeController {
 			throw new BadRequestError('Personalization answers are mandatory');
 		}
 
+		await validateRecordNoXss(personalizationAnswers);
+
 		await this.userRepository.save(
 			{
 				id: req.user.id,
@@ -237,6 +239,9 @@ export class MeController {
 		const payload = plainToInstance(UserSettingsUpdatePayload, req.body, {
 			excludeExtraneousValues: true,
 		});
+
+		await validateEntity(payload);
+
 		const { id } = req.user;
 
 		await this.userService.updateSettings(id, payload);

From 6b52bebf5295860c8b522e3f0a56d4fd6aab93b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Mon, 12 Aug 2024 10:13:15 +0200
Subject: [PATCH 120/168] refactor(core): Tear down internal hooks
 (no-changelog) (#10340)

---
 .../ExternalSecretsManager.ee.test.ts         |  2 -
 packages/cli/src/InternalHooks.ts             | 35 +---------------
 .../email/UserManagementMailer.ts             | 17 ++++----
 packages/cli/src/commands/BaseCommand.ts      |  2 +-
 .../__tests__/me.controller.test.ts           |  2 -
 .../cli/src/controllers/auth.controller.ts    |  3 --
 .../controllers/passwordReset.controller.ts   | 12 ++----
 packages/cli/src/events/relay-event-map.ts    | 11 +++++
 .../cli/src/events/telemetry-event-relay.ts   | 40 +++++++++++++++++++
 .../execution-recovery.service.test.ts        |  2 -
 packages/cli/src/services/user.service.ts     | 12 +++---
 .../commands/credentials.cmd.test.ts          |  2 -
 .../integration/commands/import.cmd.test.ts   |  2 -
 .../integration/commands/ldap/reset.test.ts   |  2 -
 .../integration/commands/license.cmd.test.ts  |  2 -
 .../integration/commands/reset.cmd.test.ts    |  2 -
 .../commands/update/workflow.test.ts          |  2 -
 .../integration/commands/worker.cmd.test.ts   |  2 -
 .../invitation.controller.integration.test.ts | 32 +++++++++------
 .../integration/shared/utils/testCommand.ts   |  3 ++
 .../integration/shared/utils/testServer.ts    |  2 -
 .../cli/test/integration/webhooks.api.test.ts |  2 -
 .../cli/test/integration/webhooks.test.ts     |  2 -
 23 files changed, 95 insertions(+), 98 deletions(-)

diff --git a/packages/cli/src/ExternalSecrets/__tests__/ExternalSecretsManager.ee.test.ts b/packages/cli/src/ExternalSecrets/__tests__/ExternalSecretsManager.ee.test.ts
index 92475c93115e9..7df8d6d323558 100644
--- a/packages/cli/src/ExternalSecrets/__tests__/ExternalSecretsManager.ee.test.ts
+++ b/packages/cli/src/ExternalSecrets/__tests__/ExternalSecretsManager.ee.test.ts
@@ -5,7 +5,6 @@ import type { ExternalSecretsSettings } from '@/Interfaces';
 import { License } from '@/License';
 import { ExternalSecretsManager } from '@/ExternalSecrets/ExternalSecretsManager.ee';
 import { ExternalSecretsProviders } from '@/ExternalSecrets/ExternalSecretsProviders.ee';
-import { InternalHooks } from '@/InternalHooks';
 import { mockInstance } from '@test/mocking';
 import {
 	DummyProvider,
@@ -22,7 +21,6 @@ describe('External Secrets Manager', () => {
 	const mockProvidersInstance = new MockProviders();
 	const license = mockInstance(License);
 	const settingsRepo = mockInstance(SettingsRepository);
-	mockInstance(InternalHooks);
 	const cipher = Container.get(Cipher);
 
 	let providersMock: ExternalSecretsProviders;
diff --git a/packages/cli/src/InternalHooks.ts b/packages/cli/src/InternalHooks.ts
index 26954a0472c0f..b3d45b67c0acd 100644
--- a/packages/cli/src/InternalHooks.ts
+++ b/packages/cli/src/InternalHooks.ts
@@ -1,10 +1,10 @@
 import { Service } from 'typedi';
-import type { User } from '@db/entities/User';
 import { Telemetry } from '@/telemetry';
 import { MessageEventBus } from './eventbus/MessageEventBus/MessageEventBus';
 
 /**
- * @deprecated Do not add to this class. To add log streaming or telemetry events, use
+ * @deprecated Do not add to this class. It will be removed once we remove
+ * further dep cycles. To add log streaming or telemetry events, use
  * `EventService` to emit the event and then use the `LogStreamingEventRelay` or
  * `TelemetryEventRelay` to forward them to the event bus or telemetry.
  */
@@ -21,35 +21,4 @@ export class InternalHooks {
 	async init() {
 		await this.telemetry.init();
 	}
-
-	onUserInviteEmailClick(userInviteClickData: { inviter: User; invitee: User }) {
-		this.telemetry.track('User clicked invite link from email', {
-			user_id: userInviteClickData.invitee.id,
-		});
-	}
-
-	onUserPasswordResetEmailClick(userPasswordResetData: { user: User }) {
-		this.telemetry.track('User clicked password reset link from email', {
-			user_id: userPasswordResetData.user.id,
-		});
-	}
-
-	onUserTransactionalEmail(userTransactionalEmailData: {
-		user_id: string;
-		message_type:
-			| 'Reset password'
-			| 'New user invite'
-			| 'Resend invite'
-			| 'Workflow shared'
-			| 'Credentials shared';
-		public_api: boolean;
-	}) {
-		this.telemetry.track('Instance sent transactional email to user', userTransactionalEmailData);
-	}
-
-	onUserPasswordResetRequestClick(userPasswordResetData: { user: User }) {
-		this.telemetry.track('User requested password reset while logged out', {
-			user_id: userPasswordResetData.user.id,
-		});
-	}
 }
diff --git a/packages/cli/src/UserManagement/email/UserManagementMailer.ts b/packages/cli/src/UserManagement/email/UserManagementMailer.ts
index 459d8ec1c2668..7d5e8d254865e 100644
--- a/packages/cli/src/UserManagement/email/UserManagementMailer.ts
+++ b/packages/cli/src/UserManagement/email/UserManagementMailer.ts
@@ -8,7 +8,6 @@ import { GlobalConfig } from '@n8n/config';
 import type { User } from '@db/entities/User';
 import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
 import { UserRepository } from '@db/repositories/user.repository';
-import { InternalHooks } from '@/InternalHooks';
 import { Logger } from '@/Logger';
 import { UrlService } from '@/services/url.service';
 import { InternalServerError } from '@/errors/response-errors/internal-server.error';
@@ -112,10 +111,10 @@ export class UserManagementMailer {
 
 			this.logger.info('Sent workflow shared email successfully', { sharerId: sharer.id });
 
-			Container.get(InternalHooks).onUserTransactionalEmail({
-				user_id: sharer.id,
-				message_type: 'Workflow shared',
-				public_api: false,
+			Container.get(EventService).emit('user-transactional-email-sent', {
+				userId: sharer.id,
+				messageType: 'Workflow shared',
+				publicApi: false,
 			});
 
 			return result;
@@ -167,10 +166,10 @@ export class UserManagementMailer {
 
 			this.logger.info('Sent credentials shared email successfully', { sharerId: sharer.id });
 
-			Container.get(InternalHooks).onUserTransactionalEmail({
-				user_id: sharer.id,
-				message_type: 'Credentials shared',
-				public_api: false,
+			Container.get(EventService).emit('user-transactional-email-sent', {
+				userId: sharer.id,
+				messageType: 'Credentials shared',
+				publicApi: false,
 			});
 
 			return result;
diff --git a/packages/cli/src/commands/BaseCommand.ts b/packages/cli/src/commands/BaseCommand.ts
index 62ff002e43298..d0c34dac0a86d 100644
--- a/packages/cli/src/commands/BaseCommand.ts
+++ b/packages/cli/src/commands/BaseCommand.ts
@@ -15,8 +15,8 @@ import { ExternalHooks } from '@/ExternalHooks';
 import { NodeTypes } from '@/NodeTypes';
 import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
 import type { N8nInstanceType } from '@/Interfaces';
-import { InternalHooks } from '@/InternalHooks';
 import { PostHogClient } from '@/posthog';
+import { InternalHooks } from '@/InternalHooks';
 import { License } from '@/License';
 import { ExternalSecretsManager } from '@/ExternalSecrets/ExternalSecretsManager.ee';
 import { initExpressionEvaluator } from '@/ExpressionEvaluator';
diff --git a/packages/cli/src/controllers/__tests__/me.controller.test.ts b/packages/cli/src/controllers/__tests__/me.controller.test.ts
index 8bde87b3b842a..bfde0bcc0e4a2 100644
--- a/packages/cli/src/controllers/__tests__/me.controller.test.ts
+++ b/packages/cli/src/controllers/__tests__/me.controller.test.ts
@@ -9,7 +9,6 @@ import { AUTH_COOKIE_NAME } from '@/constants';
 import type { AuthenticatedRequest, MeRequest } from '@/requests';
 import { UserService } from '@/services/user.service';
 import { ExternalHooks } from '@/ExternalHooks';
-import { InternalHooks } from '@/InternalHooks';
 import { License } from '@/License';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 import { UserRepository } from '@/databases/repositories/user.repository';
@@ -21,7 +20,6 @@ const browserId = 'test-browser-id';
 
 describe('MeController', () => {
 	const externalHooks = mockInstance(ExternalHooks);
-	mockInstance(InternalHooks);
 	const eventService = mockInstance(EventService);
 	const userService = mockInstance(UserService);
 	const userRepository = mockInstance(UserRepository);
diff --git a/packages/cli/src/controllers/auth.controller.ts b/packages/cli/src/controllers/auth.controller.ts
index e2a481fae9fe0..99b5c523207a1 100644
--- a/packages/cli/src/controllers/auth.controller.ts
+++ b/packages/cli/src/controllers/auth.controller.ts
@@ -14,7 +14,6 @@ import {
 	isLdapCurrentAuthenticationMethod,
 	isSamlCurrentAuthenticationMethod,
 } from '@/sso/ssoHelpers';
-import { InternalHooks } from '../InternalHooks';
 import { License } from '@/License';
 import { UserService } from '@/services/user.service';
 import { MfaService } from '@/Mfa/mfa.service';
@@ -30,7 +29,6 @@ import { EventService } from '@/events/event.service';
 export class AuthController {
 	constructor(
 		private readonly logger: Logger,
-		private readonly internalHooks: InternalHooks,
 		private readonly authService: AuthService,
 		private readonly mfaService: MfaService,
 		private readonly userService: UserService,
@@ -179,7 +177,6 @@ export class AuthController {
 			throw new BadRequestError('Invalid request');
 		}
 
-		this.internalHooks.onUserInviteEmailClick({ inviter, invitee });
 		this.eventService.emit('user-invite-email-click', { inviter, invitee });
 
 		const { firstName, lastName } = inviter;
diff --git a/packages/cli/src/controllers/passwordReset.controller.ts b/packages/cli/src/controllers/passwordReset.controller.ts
index 458593d228a33..0cfe7cac19e12 100644
--- a/packages/cli/src/controllers/passwordReset.controller.ts
+++ b/packages/cli/src/controllers/passwordReset.controller.ts
@@ -13,7 +13,6 @@ import { RESPONSE_ERROR_MESSAGES } from '@/constants';
 import { MfaService } from '@/Mfa/mfa.service';
 import { Logger } from '@/Logger';
 import { ExternalHooks } from '@/ExternalHooks';
-import { InternalHooks } from '@/InternalHooks';
 import { UrlService } from '@/services/url.service';
 import { InternalServerError } from '@/errors/response-errors/internal-server.error';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
@@ -28,7 +27,6 @@ export class PasswordResetController {
 	constructor(
 		private readonly logger: Logger,
 		private readonly externalHooks: ExternalHooks,
-		private readonly internalHooks: InternalHooks,
 		private readonly mailer: UserManagementMailer,
 		private readonly authService: AuthService,
 		private readonly userService: UserService,
@@ -131,13 +129,12 @@ export class PasswordResetController {
 		}
 
 		this.logger.info('Sent password reset email successfully', { userId: user.id, email });
-		this.internalHooks.onUserTransactionalEmail({
-			user_id: id,
-			message_type: 'Reset password',
-			public_api: false,
+		this.eventService.emit('user-transactional-email-sent', {
+			userId: id,
+			messageType: 'Reset password',
+			publicApi: false,
 		});
 
-		this.internalHooks.onUserPasswordResetRequestClick({ user });
 		this.eventService.emit('user-password-reset-request-click', { user });
 	}
 
@@ -170,7 +167,6 @@ export class PasswordResetController {
 		}
 
 		this.logger.info('Reset-password token resolved successfully', { userId: user.id });
-		this.internalHooks.onUserPasswordResetEmailClick({ user });
 		this.eventService.emit('user-password-reset-email-click', { user });
 	}
 
diff --git a/packages/cli/src/events/relay-event-map.ts b/packages/cli/src/events/relay-event-map.ts
index 8d6463defbe29..8f0efc2fedf8c 100644
--- a/packages/cli/src/events/relay-event-map.ts
+++ b/packages/cli/src/events/relay-event-map.ts
@@ -207,6 +207,17 @@ export type RelayEventMap = {
 		user: UserLike;
 	};
 
+	'user-transactional-email-sent': {
+		userId: string;
+		messageType:
+			| 'Reset password'
+			| 'New user invite'
+			| 'Resend invite'
+			| 'Workflow shared'
+			| 'Credentials shared';
+		publicApi: boolean;
+	};
+
 	// #endregion
 
 	// #region Public API
diff --git a/packages/cli/src/events/telemetry-event-relay.ts b/packages/cli/src/events/telemetry-event-relay.ts
index a7eaf5ef2c27c..6b0ae37a44307 100644
--- a/packages/cli/src/events/telemetry-event-relay.ts
+++ b/packages/cli/src/events/telemetry-event-relay.ts
@@ -95,6 +95,10 @@ export class TelemetryEventRelay extends EventRelay {
 			'user-submitted-personalization-survey': (event) =>
 				this.userSubmittedPersonalizationSurvey(event),
 			'email-failed': (event) => this.emailFailed(event),
+			'user-transactional-email-sent': (event) => this.userTransactionalEmailSent(event),
+			'user-invite-email-click': (event) => this.userInviteEmailClick(event),
+			'user-password-reset-email-click': (event) => this.userPasswordResetEmailClick(event),
+			'user-password-reset-request-click': (event) => this.userPasswordResetRequestClick(event),
 		});
 	}
 
@@ -955,5 +959,41 @@ export class TelemetryEventRelay extends EventRelay {
 		});
 	}
 
+	private userTransactionalEmailSent({
+		userId,
+		messageType,
+		publicApi,
+	}: RelayEventMap['user-transactional-email-sent']) {
+		this.telemetry.track('User sent transactional email', {
+			user_id: userId,
+			message_type: messageType,
+			public_api: publicApi,
+		});
+	}
+
+	// #endregion
+
+	// #region Click
+
+	private userInviteEmailClick({ invitee }: RelayEventMap['user-invite-email-click']) {
+		this.telemetry.track('User clicked invite link from email', {
+			user_id: invitee.id,
+		});
+	}
+
+	private userPasswordResetEmailClick({ user }: RelayEventMap['user-password-reset-email-click']) {
+		this.telemetry.track('User clicked password reset link from email', {
+			user_id: user.id,
+		});
+	}
+
+	private userPasswordResetRequestClick({
+		user,
+	}: RelayEventMap['user-password-reset-request-click']) {
+		this.telemetry.track('User requested password reset while logged out', {
+			user_id: user.id,
+		});
+	}
+
 	// #endregion
 }
diff --git a/packages/cli/src/executions/__tests__/execution-recovery.service.test.ts b/packages/cli/src/executions/__tests__/execution-recovery.service.test.ts
index 39a84d27a78c1..965e7da6fecda 100644
--- a/packages/cli/src/executions/__tests__/execution-recovery.service.test.ts
+++ b/packages/cli/src/executions/__tests__/execution-recovery.service.test.ts
@@ -13,7 +13,6 @@ import { OrchestrationService } from '@/services/orchestration.service';
 import config from '@/config';
 import { ExecutionRecoveryService } from '@/executions/execution-recovery.service';
 import { ExecutionRepository } from '@/databases/repositories/execution.repository';
-import { InternalHooks } from '@/InternalHooks';
 import { Push } from '@/push';
 import { ARTIFICIAL_TASK_DATA } from '@/constants';
 import { NodeCrashedError } from '@/errors/node-crashed.error';
@@ -26,7 +25,6 @@ import type { EventMessageTypes as EventMessage } from '@/eventbus/EventMessageC
 
 describe('ExecutionRecoveryService', () => {
 	const push = mockInstance(Push);
-	mockInstance(InternalHooks);
 	const instanceSettings = new InstanceSettings();
 
 	let executionRecoveryService: ExecutionRecoveryService;
diff --git a/packages/cli/src/services/user.service.ts b/packages/cli/src/services/user.service.ts
index 6b17530b7cf57..19b49fdb1927e 100644
--- a/packages/cli/src/services/user.service.ts
+++ b/packages/cli/src/services/user.service.ts
@@ -1,4 +1,4 @@
-import { Container, Service } from 'typedi';
+import { Service } from 'typedi';
 import type { IUserSettings } from 'n8n-workflow';
 import { ApplicationError, ErrorReporterProxy as ErrorReporter } from 'n8n-workflow';
 
@@ -8,7 +8,6 @@ import type { Invitation, PublicUser } from '@/Interfaces';
 import type { PostHogClient } from '@/posthog';
 import { Logger } from '@/Logger';
 import { UserManagementMailer } from '@/UserManagement/email';
-import { InternalHooks } from '@/InternalHooks';
 import { UrlService } from '@/services/url.service';
 import type { UserRequest } from '@/requests';
 import { InternalServerError } from '@/errors/response-errors/internal-server.error';
@@ -144,10 +143,11 @@ export class UserService {
 					if (result.emailSent) {
 						invitedUser.user.emailSent = true;
 						delete invitedUser.user?.inviteAcceptUrl;
-						Container.get(InternalHooks).onUserTransactionalEmail({
-							user_id: id,
-							message_type: 'New user invite',
-							public_api: false,
+
+						this.eventService.emit('user-transactional-email-sent', {
+							userId: id,
+							messageType: 'New user invite',
+							publicApi: false,
 						});
 					}
 
diff --git a/packages/cli/test/integration/commands/credentials.cmd.test.ts b/packages/cli/test/integration/commands/credentials.cmd.test.ts
index 386f3a41b20de..bcb6f0173b262 100644
--- a/packages/cli/test/integration/commands/credentials.cmd.test.ts
+++ b/packages/cli/test/integration/commands/credentials.cmd.test.ts
@@ -1,6 +1,5 @@
 import { nanoid } from 'nanoid';
 
-import { InternalHooks } from '@/InternalHooks';
 import { ImportCredentialsCommand } from '@/commands/import/credentials';
 import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
 
@@ -11,7 +10,6 @@ import { getAllCredentials, getAllSharedCredentials } from '../shared/db/credent
 import { createMember, createOwner } from '../shared/db/users';
 import { getPersonalProject } from '../shared/db/projects';
 
-mockInstance(InternalHooks);
 mockInstance(LoadNodesAndCredentials);
 const command = setupTestCommand(ImportCredentialsCommand);
 
diff --git a/packages/cli/test/integration/commands/import.cmd.test.ts b/packages/cli/test/integration/commands/import.cmd.test.ts
index 3295f0de27b1c..ba72d64d775fe 100644
--- a/packages/cli/test/integration/commands/import.cmd.test.ts
+++ b/packages/cli/test/integration/commands/import.cmd.test.ts
@@ -1,6 +1,5 @@
 import { nanoid } from 'nanoid';
 
-import { InternalHooks } from '@/InternalHooks';
 import { ImportWorkflowsCommand } from '@/commands/import/workflow';
 import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
 
@@ -11,7 +10,6 @@ import { getAllSharedWorkflows, getAllWorkflows } from '../shared/db/workflows';
 import { createMember, createOwner } from '../shared/db/users';
 import { getPersonalProject } from '../shared/db/projects';
 
-mockInstance(InternalHooks);
 mockInstance(LoadNodesAndCredentials);
 const command = setupTestCommand(ImportWorkflowsCommand);
 
diff --git a/packages/cli/test/integration/commands/ldap/reset.test.ts b/packages/cli/test/integration/commands/ldap/reset.test.ts
index 12833b633f018..720c98c401063 100644
--- a/packages/cli/test/integration/commands/ldap/reset.test.ts
+++ b/packages/cli/test/integration/commands/ldap/reset.test.ts
@@ -4,7 +4,6 @@ import { EntityNotFoundError } from '@n8n/typeorm';
 
 import { Reset } from '@/commands/ldap/reset';
 import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
-import { InternalHooks } from '@/InternalHooks';
 import { WorkflowRepository } from '@db/repositories/workflow.repository';
 import { CredentialsRepository } from '@db/repositories/credentials.repository';
 import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
@@ -26,7 +25,6 @@ import { createTeamProject, findProject, getPersonalProject } from '../../shared
 mockInstance(Telemetry);
 
 mockInstance(Push);
-mockInstance(InternalHooks);
 mockInstance(LoadNodesAndCredentials);
 const command = setupTestCommand(Reset);
 
diff --git a/packages/cli/test/integration/commands/license.cmd.test.ts b/packages/cli/test/integration/commands/license.cmd.test.ts
index 8637d2d02017d..1717e1a5ff185 100644
--- a/packages/cli/test/integration/commands/license.cmd.test.ts
+++ b/packages/cli/test/integration/commands/license.cmd.test.ts
@@ -1,4 +1,3 @@
-import { InternalHooks } from '@/InternalHooks';
 import { License } from '@/License';
 import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
 import { ClearLicenseCommand } from '@/commands/license/clear';
@@ -6,7 +5,6 @@ import { ClearLicenseCommand } from '@/commands/license/clear';
 import { setupTestCommand } from '@test-integration/utils/testCommand';
 import { mockInstance } from '../../shared/mocking';
 
-mockInstance(InternalHooks);
 mockInstance(LoadNodesAndCredentials);
 const license = mockInstance(License);
 const command = setupTestCommand(ClearLicenseCommand);
diff --git a/packages/cli/test/integration/commands/reset.cmd.test.ts b/packages/cli/test/integration/commands/reset.cmd.test.ts
index f38ea789d71b7..573e85043ea3c 100644
--- a/packages/cli/test/integration/commands/reset.cmd.test.ts
+++ b/packages/cli/test/integration/commands/reset.cmd.test.ts
@@ -1,7 +1,6 @@
 import { Container } from 'typedi';
 
 import { Reset } from '@/commands/user-management/reset';
-import { InternalHooks } from '@/InternalHooks';
 import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
 import { NodeTypes } from '@/NodeTypes';
 import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
@@ -20,7 +19,6 @@ import { getPersonalProject } from '../shared/db/projects';
 import { encryptCredentialData, saveCredential } from '../shared/db/credentials';
 import { randomCredentialPayload } from '../shared/random';
 
-mockInstance(InternalHooks);
 mockInstance(LoadNodesAndCredentials);
 mockInstance(NodeTypes);
 const command = setupTestCommand(Reset);
diff --git a/packages/cli/test/integration/commands/update/workflow.test.ts b/packages/cli/test/integration/commands/update/workflow.test.ts
index 315e64c5263af..95a25bc4f647e 100644
--- a/packages/cli/test/integration/commands/update/workflow.test.ts
+++ b/packages/cli/test/integration/commands/update/workflow.test.ts
@@ -1,4 +1,3 @@
-import { InternalHooks } from '@/InternalHooks';
 import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
 import { UpdateWorkflowCommand } from '@/commands/update/workflow';
 
@@ -7,7 +6,6 @@ import * as testDb from '../../shared/testDb';
 import { createWorkflowWithTrigger, getAllWorkflows } from '../../shared/db/workflows';
 import { mockInstance } from '../../../shared/mocking';
 
-mockInstance(InternalHooks);
 mockInstance(LoadNodesAndCredentials);
 const command = setupTestCommand(UpdateWorkflowCommand);
 
diff --git a/packages/cli/test/integration/commands/worker.cmd.test.ts b/packages/cli/test/integration/commands/worker.cmd.test.ts
index 205a60307c643..e7f783bf94126 100644
--- a/packages/cli/test/integration/commands/worker.cmd.test.ts
+++ b/packages/cli/test/integration/commands/worker.cmd.test.ts
@@ -5,7 +5,6 @@ import config from '@/config';
 import { ExternalSecretsManager } from '@/ExternalSecrets/ExternalSecretsManager.ee';
 import { MessageEventBus } from '@/eventbus/MessageEventBus/MessageEventBus';
 import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
-import { InternalHooks } from '@/InternalHooks';
 import { OrchestrationHandlerWorkerService } from '@/services/orchestration/worker/orchestration.handler.worker.service';
 import { OrchestrationWorkerService } from '@/services/orchestration/worker/orchestration.worker.service';
 import { License } from '@/License';
@@ -18,7 +17,6 @@ import { LogStreamingEventRelay } from '@/events/log-streaming-event-relay';
 
 config.set('executions.mode', 'queue');
 config.set('binaryDataManager.availableModes', 'filesystem');
-mockInstance(InternalHooks);
 mockInstance(LoadNodesAndCredentials);
 const binaryDataService = mockInstance(BinaryDataService);
 const externalHooks = mockInstance(ExternalHooks);
diff --git a/packages/cli/test/integration/controllers/invitation/invitation.controller.integration.test.ts b/packages/cli/test/integration/controllers/invitation/invitation.controller.integration.test.ts
index 00e480f86f6f6..8b1048267da20 100644
--- a/packages/cli/test/integration/controllers/invitation/invitation.controller.integration.test.ts
+++ b/packages/cli/test/integration/controllers/invitation/invitation.controller.integration.test.ts
@@ -1,8 +1,6 @@
-import { mocked } from 'jest-mock';
 import Container from 'typedi';
 import { Not } from '@n8n/typeorm';
-
-import { InternalHooks } from '@/InternalHooks';
+import { EventService } from '@/events/event.service';
 import { ExternalHooks } from '@/ExternalHooks';
 import { UserManagementMailer } from '@/UserManagement/email';
 import { UserRepository } from '@/databases/repositories/user.repository';
@@ -31,7 +29,7 @@ import { ProjectRelationRepository } from '@/databases/repositories/projectRelat
 describe('InvitationController', () => {
 	const mailer = mockInstance(UserManagementMailer);
 	const externalHooks = mockInstance(ExternalHooks);
-	const internalHooks = mockInstance(InternalHooks);
+	const eventService = mockInstance(EventService);
 
 	const testServer = utils.setupTestServer({ endpointGroups: ['invitations'] });
 
@@ -413,14 +411,24 @@ describe('InvitationController', () => {
 			expect(externalHookName).toBe('user.invited');
 			expect(externalHookArg?.[0]).toStrictEqual([newUserEmail]);
 
-			// internal hooks
-
-			const calls = mocked(internalHooks).onUserTransactionalEmail.mock.calls;
-
-			for (const [onUserTransactionalEmailArg] of calls) {
-				expect(onUserTransactionalEmailArg.user_id).toBeDefined();
-				expect(onUserTransactionalEmailArg.message_type).toBe('New user invite');
-				expect(onUserTransactionalEmailArg.public_api).toBe(false);
+			for (const [eventName, payload] of eventService.emit.mock.calls) {
+				if (eventName === 'user-invited') {
+					expect(payload).toEqual({
+						user: expect.objectContaining({ id: expect.any(String) }),
+						targetUserId: expect.arrayContaining([expect.any(String), expect.any(String)]),
+						publicApi: false,
+						emailSent: true,
+						inviteeRole: 'global:member',
+					});
+				} else if (eventName === 'user-transactional-email-sent') {
+					expect(payload).toEqual({
+						userId: expect.any(String),
+						messageType: 'New user invite',
+						publicApi: false,
+					});
+				} else {
+					fail(`Unexpected event name: ${eventName}`);
+				}
 			}
 		});
 
diff --git a/packages/cli/test/integration/shared/utils/testCommand.ts b/packages/cli/test/integration/shared/utils/testCommand.ts
index 2d25d837cc928..9592b806c3c75 100644
--- a/packages/cli/test/integration/shared/utils/testCommand.ts
+++ b/packages/cli/test/integration/shared/utils/testCommand.ts
@@ -6,6 +6,9 @@ import type { BaseCommand } from '@/commands/BaseCommand';
 import * as testDb from '../testDb';
 import { TelemetryEventRelay } from '@/events/telemetry-event-relay';
 import { mockInstance } from '@test/mocking';
+import { InternalHooks } from '@/InternalHooks';
+
+mockInstance(InternalHooks);
 
 export const setupTestCommand = <T extends BaseCommand>(Command: Class<T>) => {
 	const config = mock<Config>();
diff --git a/packages/cli/test/integration/shared/utils/testServer.ts b/packages/cli/test/integration/shared/utils/testServer.ts
index 7776b7e669415..319c4e2b588db 100644
--- a/packages/cli/test/integration/shared/utils/testServer.ts
+++ b/packages/cli/test/integration/shared/utils/testServer.ts
@@ -14,7 +14,6 @@ import { PostHogClient } from '@/posthog';
 import { Push } from '@/push';
 import { License } from '@/License';
 import { Logger } from '@/Logger';
-import { InternalHooks } from '@/InternalHooks';
 import { AuthService } from '@/auth/auth.service';
 import type { APIRequest } from '@/requests';
 
@@ -82,7 +81,6 @@ export const setupTestServer = ({
 
 	// Mock all telemetry and logging
 	mockInstance(Logger);
-	mockInstance(InternalHooks);
 	mockInstance(PostHogClient);
 	mockInstance(Push);
 
diff --git a/packages/cli/test/integration/webhooks.api.test.ts b/packages/cli/test/integration/webhooks.api.test.ts
index 64cb760c8ec69..5b61dd98611ac 100644
--- a/packages/cli/test/integration/webhooks.api.test.ts
+++ b/packages/cli/test/integration/webhooks.api.test.ts
@@ -4,7 +4,6 @@ import type { INodeType, INodeTypeDescription, IWebhookFunctions } from 'n8n-wor
 
 import { AbstractServer } from '@/AbstractServer';
 import { ExternalHooks } from '@/ExternalHooks';
-import { InternalHooks } from '@/InternalHooks';
 import { NodeTypes } from '@/NodeTypes';
 import { Push } from '@/push';
 import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
@@ -21,7 +20,6 @@ mockInstance(Telemetry);
 
 describe('Webhook API', () => {
 	mockInstance(ExternalHooks);
-	mockInstance(InternalHooks);
 	mockInstance(Push);
 
 	let agent: SuperAgentTest;
diff --git a/packages/cli/test/integration/webhooks.test.ts b/packages/cli/test/integration/webhooks.test.ts
index 280edb370d286..44bc32c1b5a62 100644
--- a/packages/cli/test/integration/webhooks.test.ts
+++ b/packages/cli/test/integration/webhooks.test.ts
@@ -5,7 +5,6 @@ import { mock } from 'jest-mock-extended';
 import { AbstractServer } from '@/AbstractServer';
 import { ActiveWebhooks } from '@/webhooks/ActiveWebhooks';
 import { ExternalHooks } from '@/ExternalHooks';
-import { InternalHooks } from '@/InternalHooks';
 import { TestWebhooks } from '@/webhooks/TestWebhooks';
 import { WaitingWebhooks } from '@/webhooks/WaitingWebhooks';
 import { WaitingForms } from '@/WaitingForms';
@@ -19,7 +18,6 @@ let agent: SuperAgentTest;
 
 describe('WebhookServer', () => {
 	mockInstance(ExternalHooks);
-	mockInstance(InternalHooks);
 
 	describe('CORS', () => {
 		const corsOrigin = 'https://example.com';

From 8728b63aeb46d0ca1d42e046fff522df4ec148eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Mon, 12 Aug 2024 11:03:37 +0200
Subject: [PATCH 121/168] refactor(core): Port scaling mode config
 (no-changelog) (#10321)

---
 .../config/src/configs/scaling-mode.config.ts |  96 +++++++++++++++
 packages/@n8n/config/src/index.ts             |   4 +
 packages/@n8n/config/test/config.test.ts      |  27 +++++
 packages/cli/src/WorkflowRunner.ts            |   3 +-
 packages/cli/src/commands/worker.ts           |   6 +-
 packages/cli/src/config/schema.ts             | 113 ------------------
 packages/cli/src/scaling/scaling.service.ts   |   8 +-
 .../services/redis/redis-client.service.ts    |  16 +--
 8 files changed, 146 insertions(+), 127 deletions(-)
 create mode 100644 packages/@n8n/config/src/configs/scaling-mode.config.ts

diff --git a/packages/@n8n/config/src/configs/scaling-mode.config.ts b/packages/@n8n/config/src/configs/scaling-mode.config.ts
new file mode 100644
index 0000000000000..6ff331eedd8c2
--- /dev/null
+++ b/packages/@n8n/config/src/configs/scaling-mode.config.ts
@@ -0,0 +1,96 @@
+import { Config, Env, Nested } from '../decorators';
+
+@Config
+class HealthConfig {
+	/** Whether to enable the worker health check endpoint `/healthz`. */
+	@Env('QUEUE_HEALTH_CHECK_ACTIVE')
+	active = false;
+
+	/** Port for worker to respond to health checks requests on, if enabled. */
+	@Env('QUEUE_HEALTH_CHECK_PORT')
+	port = 5678;
+}
+
+@Config
+class RedisConfig {
+	/** Redis database for Bull queue. */
+	@Env('QUEUE_BULL_REDIS_DB')
+	db = 0;
+
+	/** Redis host for Bull queue. */
+	@Env('QUEUE_BULL_REDIS_HOST')
+	host = 'localhost';
+
+	/** Password to authenticate with Redis. */
+	@Env('QUEUE_BULL_REDIS_PASSWORD')
+	password = '';
+
+	/** Port for Redis to listen on. */
+	@Env('QUEUE_BULL_REDIS_PORT')
+	port = 6379;
+
+	/** Max cumulative timeout (in milliseconds) of connection retries before process exit. */
+	@Env('QUEUE_BULL_REDIS_TIMEOUT_THRESHOLD')
+	timeoutThreshold = 10_000;
+
+	/** Redis username. Redis 6.0 or higher required. */
+	@Env('QUEUE_BULL_REDIS_USERNAME')
+	username = '';
+
+	/** Redis cluster startup nodes, as comma-separated list of `{host}:{port}` pairs. @example 'redis-1:6379,redis-2:6379' */
+	@Env('QUEUE_BULL_REDIS_CLUSTER_NODES')
+	clusterNodes = '';
+
+	/** Whether to enable TLS on Redis connections. */
+	@Env('QUEUE_BULL_REDIS_TLS')
+	tls = false;
+}
+
+@Config
+class SettingsConfig {
+	/** How long (in milliseconds) is the lease period for a worker processing a job. */
+	@Env('QUEUE_WORKER_LOCK_DURATION')
+	lockDuration = 30_000;
+
+	/** How often (in milliseconds) a worker must renew the lease. */
+	@Env('QUEUE_WORKER_LOCK_RENEW_TIME')
+	lockRenewTime = 15_000;
+
+	/** How often (in milliseconds) Bull must check for stalled jobs. `0` to disable. */
+	@Env('QUEUE_WORKER_STALLED_INTERVAL')
+	stalledInterval = 30_000;
+
+	/** Max number of times a stalled job will be re-processed. See Bull's [documentation](https://docs.bullmq.io/guide/workers/stalled-jobs). */
+	@Env('QUEUE_WORKER_MAX_STALLED_COUNT')
+	maxStalledCount = 1;
+}
+
+@Config
+class BullConfig {
+	/** Prefix for Bull keys on Redis. @example 'bull:jobs:23' */
+	@Env('QUEUE_BULL_PREFIX')
+	prefix = 'bull';
+
+	@Nested
+	redis: RedisConfig;
+
+	/** How often (in seconds) to poll the Bull queue to identify executions finished during a Redis crash. `0` to disable. May increase Redis traffic significantly. */
+	@Env('QUEUE_RECOVERY_INTERVAL')
+	queueRecoveryInterval = 60; // watchdog interval
+
+	/** @deprecated How long (in seconds) a worker must wait for active executions to finish before exiting. Use `N8N_GRACEFUL_SHUTDOWN_TIMEOUT` instead */
+	@Env('QUEUE_WORKER_TIMEOUT')
+	gracefulShutdownTimeout = 30;
+
+	@Nested
+	settings: SettingsConfig;
+}
+
+@Config
+export class ScalingModeConfig {
+	@Nested
+	health: HealthConfig;
+
+	@Nested
+	bull: BullConfig;
+}
diff --git a/packages/@n8n/config/src/index.ts b/packages/@n8n/config/src/index.ts
index 33d3e676550ba..88e6fb01170d8 100644
--- a/packages/@n8n/config/src/index.ts
+++ b/packages/@n8n/config/src/index.ts
@@ -12,6 +12,7 @@ import { ExternalStorageConfig } from './configs/external-storage';
 import { WorkflowsConfig } from './configs/workflows';
 import { EndpointsConfig } from './configs/endpoints';
 import { CacheConfig } from './configs/cache';
+import { ScalingModeConfig } from './configs/scaling-mode.config';
 
 @Config
 class UserManagementConfig {
@@ -79,4 +80,7 @@ export class GlobalConfig {
 
 	@Nested
 	readonly cache: CacheConfig;
+
+	@Nested
+	queue: ScalingModeConfig;
 }
diff --git a/packages/@n8n/config/test/config.test.ts b/packages/@n8n/config/test/config.test.ts
index e077e233b7494..83edcc25afc43 100644
--- a/packages/@n8n/config/test/config.test.ts
+++ b/packages/@n8n/config/test/config.test.ts
@@ -184,6 +184,33 @@ describe('GlobalConfig', () => {
 				ttl: 3600000,
 			},
 		},
+		queue: {
+			health: {
+				active: false,
+				port: 5678,
+			},
+			bull: {
+				redis: {
+					db: 0,
+					host: 'localhost',
+					password: '',
+					port: 6379,
+					timeoutThreshold: 10_000,
+					username: '',
+					clusterNodes: '',
+					tls: false,
+				},
+				queueRecoveryInterval: 60,
+				gracefulShutdownTimeout: 30,
+				prefix: 'bull',
+				settings: {
+					lockDuration: 30_000,
+					lockRenewTime: 15_000,
+					stalledInterval: 30_000,
+					maxStalledCount: 1,
+				},
+			},
+		},
 	};
 
 	it('should use all default values when no env variables are defined', () => {
diff --git a/packages/cli/src/WorkflowRunner.ts b/packages/cli/src/WorkflowRunner.ts
index 1be878c165dfd..9ff1de8f35242 100644
--- a/packages/cli/src/WorkflowRunner.ts
+++ b/packages/cli/src/WorkflowRunner.ts
@@ -37,6 +37,7 @@ import { PermissionChecker } from '@/UserManagement/PermissionChecker';
 import { Logger } from '@/Logger';
 import { WorkflowStaticDataService } from '@/workflows/workflowStaticData.service';
 import { EventService } from './events/event.service';
+import { GlobalConfig } from '@n8n/config';
 
 @Service()
 export class WorkflowRunner {
@@ -424,7 +425,7 @@ export class WorkflowRunner {
 
 				const jobData: Promise<JobResult> = job.finished();
 
-				const queueRecoveryInterval = config.getEnv('queue.bull.queueRecoveryInterval');
+				const { queueRecoveryInterval } = Container.get(GlobalConfig).queue.bull;
 
 				const racingPromises: Array<Promise<JobResult>> = [jobData];
 
diff --git a/packages/cli/src/commands/worker.ts b/packages/cli/src/commands/worker.ts
index cadf4f708a8bb..1473ed13ffe16 100644
--- a/packages/cli/src/commands/worker.ts
+++ b/packages/cli/src/commands/worker.ts
@@ -102,7 +102,7 @@ export class Worker extends BaseCommand {
 		const { QUEUE_WORKER_TIMEOUT } = process.env;
 		if (QUEUE_WORKER_TIMEOUT) {
 			this.gracefulShutdownTimeoutInS =
-				parseInt(QUEUE_WORKER_TIMEOUT, 10) || config.default('queue.bull.gracefulShutdownTimeout');
+				parseInt(QUEUE_WORKER_TIMEOUT, 10) || this.globalConfig.queue.bull.gracefulShutdownTimeout;
 			this.logger.warn(
 				'QUEUE_WORKER_TIMEOUT has been deprecated. Rename it to N8N_GRACEFUL_SHUTDOWN_TIMEOUT.',
 			);
@@ -182,7 +182,7 @@ export class Worker extends BaseCommand {
 	}
 
 	async setupHealthMonitor() {
-		const port = config.getEnv('queue.health.port');
+		const { port } = this.globalConfig.queue.health;
 
 		const app = express();
 		app.disable('x-powered-by');
@@ -285,7 +285,7 @@ export class Worker extends BaseCommand {
 		this.logger.info(` * Concurrency: ${this.concurrency}`);
 		this.logger.info('');
 
-		if (config.getEnv('queue.health.active')) {
+		if (this.globalConfig.queue.health.active) {
 			await this.setupHealthMonitor();
 		}
 
diff --git a/packages/cli/src/config/schema.ts b/packages/cli/src/config/schema.ts
index 90043ee20e110..a0db9a4c36d16 100644
--- a/packages/cli/src/config/schema.ts
+++ b/packages/cli/src/config/schema.ts
@@ -162,119 +162,6 @@ export const schema = {
 		},
 	},
 
-	queue: {
-		health: {
-			active: {
-				doc: 'If health checks should be enabled',
-				format: Boolean,
-				default: false,
-				env: 'QUEUE_HEALTH_CHECK_ACTIVE',
-			},
-			port: {
-				doc: 'Port to serve health check on if activated',
-				format: Number,
-				default: 5678,
-				env: 'QUEUE_HEALTH_CHECK_PORT',
-			},
-		},
-		bull: {
-			prefix: {
-				doc: 'Prefix for all bull queue keys',
-				format: String,
-				default: 'bull',
-				env: 'QUEUE_BULL_PREFIX',
-			},
-			redis: {
-				db: {
-					doc: 'Redis DB',
-					format: Number,
-					default: 0,
-					env: 'QUEUE_BULL_REDIS_DB',
-				},
-				host: {
-					doc: 'Redis Host',
-					format: String,
-					default: 'localhost',
-					env: 'QUEUE_BULL_REDIS_HOST',
-				},
-				password: {
-					doc: 'Redis Password',
-					format: String,
-					default: '',
-					env: 'QUEUE_BULL_REDIS_PASSWORD',
-				},
-				port: {
-					doc: 'Redis Port',
-					format: Number,
-					default: 6379,
-					env: 'QUEUE_BULL_REDIS_PORT',
-				},
-				timeoutThreshold: {
-					doc: 'Max cumulative timeout (in milliseconds) of connection retries before process exit',
-					format: Number,
-					default: 10000,
-					env: 'QUEUE_BULL_REDIS_TIMEOUT_THRESHOLD',
-				},
-				username: {
-					doc: 'Redis Username (needs Redis >= 6)',
-					format: String,
-					default: '',
-					env: 'QUEUE_BULL_REDIS_USERNAME',
-				},
-				clusterNodes: {
-					doc: 'Redis Cluster startup nodes (comma separated list of host:port pairs)',
-					format: String,
-					default: '',
-					env: 'QUEUE_BULL_REDIS_CLUSTER_NODES',
-				},
-				tls: {
-					format: Boolean,
-					default: false,
-					env: 'QUEUE_BULL_REDIS_TLS',
-					doc: 'Enable TLS on Redis connections. Default: false',
-				},
-			},
-			queueRecoveryInterval: {
-				doc: 'If > 0 enables an active polling to the queue that can recover for Redis crashes. Given in seconds; 0 is disabled. May increase Redis traffic significantly.',
-				format: Number,
-				default: 60,
-				env: 'QUEUE_RECOVERY_INTERVAL',
-			},
-			gracefulShutdownTimeout: {
-				doc: '[DEPRECATED] (Use N8N_GRACEFUL_SHUTDOWN_TIMEOUT instead) How long should n8n wait for running executions before exiting worker process (seconds)',
-				format: Number,
-				default: 30,
-				env: 'QUEUE_WORKER_TIMEOUT',
-			},
-			settings: {
-				lockDuration: {
-					doc: 'How long (ms) is the lease period for a worker to work on a message',
-					format: Number,
-					default: 30000,
-					env: 'QUEUE_WORKER_LOCK_DURATION',
-				},
-				lockRenewTime: {
-					doc: 'How frequently (ms) should a worker renew the lease time',
-					format: Number,
-					default: 15000,
-					env: 'QUEUE_WORKER_LOCK_RENEW_TIME',
-				},
-				stalledInterval: {
-					doc: 'How often check for stalled jobs (use 0 for never checking)',
-					format: Number,
-					default: 30000,
-					env: 'QUEUE_WORKER_STALLED_INTERVAL',
-				},
-				maxStalledCount: {
-					doc: 'Max amount of times a stalled job will be re-processed',
-					format: Number,
-					default: 1,
-					env: 'QUEUE_WORKER_MAX_STALLED_COUNT',
-				},
-			},
-		},
-	},
-
 	generic: {
 		// The timezone to use. Is important for nodes like "Cron" which start the
 		// workflow automatically at a specified time. This setting can also be
diff --git a/packages/cli/src/scaling/scaling.service.ts b/packages/cli/src/scaling/scaling.service.ts
index 21d05fceff850..73b072af6c888 100644
--- a/packages/cli/src/scaling/scaling.service.ts
+++ b/packages/cli/src/scaling/scaling.service.ts
@@ -10,6 +10,7 @@ import { JOB_TYPE_NAME, QUEUE_NAME } from './constants';
 import { JobProcessor } from './job-processor';
 import type { JobQueue, Job, JobData, JobOptions, JobMessage, JobStatus, JobId } from './types';
 import type { IExecuteResponsePromiseData } from 'n8n-workflow';
+import { GlobalConfig } from '@n8n/config';
 
 @Service()
 export class ScalingService {
@@ -21,6 +22,7 @@ export class ScalingService {
 		private readonly logger: Logger,
 		private readonly activeExecutions: ActiveExecutions,
 		private readonly jobProcessor: JobProcessor,
+		private readonly globalConfig: GlobalConfig,
 	) {}
 
 	// #region Lifecycle
@@ -30,12 +32,12 @@ export class ScalingService {
 		const { RedisClientService } = await import('@/services/redis/redis-client.service');
 		const service = Container.get(RedisClientService);
 
-		const bullPrefix = config.getEnv('queue.bull.prefix');
+		const bullPrefix = this.globalConfig.queue.bull.prefix;
 		const prefix = service.toValidPrefix(bullPrefix);
 
 		this.queue = new BullQueue(QUEUE_NAME, {
 			prefix,
-			settings: config.get('queue.bull.settings'),
+			settings: this.globalConfig.queue.bull.settings,
 			createClient: (type) => service.createClient({ type: `${type}(bull)` }),
 		});
 
@@ -133,7 +135,7 @@ export class ScalingService {
 		let latestAttemptTs = 0;
 		let cumulativeTimeoutMs = 0;
 
-		const MAX_TIMEOUT_MS = config.getEnv('queue.bull.redis.timeoutThreshold');
+		const MAX_TIMEOUT_MS = this.globalConfig.queue.bull.redis.timeoutThreshold;
 		const RESET_LENGTH_MS = 30_000;
 
 		this.queue.on('error', (error: Error) => {
diff --git a/packages/cli/src/services/redis/redis-client.service.ts b/packages/cli/src/services/redis/redis-client.service.ts
index 7363a9c9b7ec8..b5c86523e006a 100644
--- a/packages/cli/src/services/redis/redis-client.service.ts
+++ b/packages/cli/src/services/redis/redis-client.service.ts
@@ -1,17 +1,20 @@
 import { Service } from 'typedi';
-import config from '@/config';
 import { Logger } from '@/Logger';
 import ioRedis from 'ioredis';
 import type { Cluster, RedisOptions } from 'ioredis';
 import type { RedisClientType } from './RedisServiceBaseClasses';
 import { OnShutdown } from '@/decorators/OnShutdown';
 import { LOWEST_SHUTDOWN_PRIORITY } from '@/constants';
+import { GlobalConfig } from '@n8n/config';
 
 @Service()
 export class RedisClientService {
 	private readonly clients = new Set<ioRedis | Cluster>();
 
-	constructor(private readonly logger: Logger) {}
+	constructor(
+		private readonly logger: Logger,
+		private readonly globalConfig: GlobalConfig,
+	) {}
 
 	createClient(arg: { type: RedisClientType; extraOptions?: RedisOptions }) {
 		const client =
@@ -57,7 +60,7 @@ export class RedisClientService {
 	}) {
 		const options = this.getOptions({ extraOptions });
 
-		const { host, port } = config.getEnv('queue.bull.redis');
+		const { host, port } = this.globalConfig.queue.bull.redis;
 
 		options.host = host;
 		options.port = port;
@@ -87,7 +90,7 @@ export class RedisClientService {
 	}
 
 	private getOptions({ extraOptions }: { extraOptions?: RedisOptions }) {
-		const { username, password, db, tls } = config.getEnv('queue.bull.redis');
+		const { username, password, db, tls } = this.globalConfig.queue.bull.redis;
 
 		/**
 		 * Disabling ready check allows quick reconnection to Redis if Redis becomes
@@ -124,7 +127,7 @@ export class RedisClientService {
 	private retryStrategy() {
 		const RETRY_INTERVAL = 500; // ms
 		const RESET_LENGTH = 30_000; // ms
-		const MAX_TIMEOUT = config.getEnv('queue.bull.redis.timeoutThreshold');
+		const MAX_TIMEOUT = this.globalConfig.queue.bull.redis.timeoutThreshold;
 
 		let lastAttemptTs = 0;
 		let cumulativeTimeout = 0;
@@ -152,8 +155,7 @@ export class RedisClientService {
 	}
 
 	private clusterNodes() {
-		return config
-			.getEnv('queue.bull.redis.clusterNodes')
+		return this.globalConfig.queue.bull.redis.clusterNodes
 			.split(',')
 			.filter((pair) => pair.trim().length > 0)
 			.map((pair) => {

From b044e783e73a499dbd7532a5d489a782d3d021da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Mon, 12 Aug 2024 11:03:51 +0200
Subject: [PATCH 122/168] fix(core): Account for cancelling an execution with
 no workers available (#10343)

---
 .../scaling/__tests__/scaling.service.test.ts | 20 +++++++++++++++++++
 packages/cli/src/scaling/scaling.service.ts   |  4 +++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/packages/cli/src/scaling/__tests__/scaling.service.test.ts b/packages/cli/src/scaling/__tests__/scaling.service.test.ts
index d0cb038884f64..0a798fae3e8a6 100644
--- a/packages/cli/src/scaling/__tests__/scaling.service.test.ts
+++ b/packages/cli/src/scaling/__tests__/scaling.service.test.ts
@@ -190,6 +190,26 @@ describe('ScalingService', () => {
 			expect(jobs).toHaveLength(1);
 			expect(jobs.at(0)?.id).toBe('123');
 		});
+
+		it('should filter out `null` in Redis response', async () => {
+			/**
+			 * Arrange
+			 */
+			const scalingService = new ScalingService(mock(), mock(), mock());
+			await scalingService.setupQueue();
+			// @ts-expect-error - Untyped but possible Redis response
+			queue.getJobs.mockResolvedValue([mock<Job>(), null]);
+
+			/**
+			 * Act
+			 */
+			const jobs = await scalingService.findJobsByStatus(['waiting']);
+
+			/**
+			 * Assert
+			 */
+			expect(jobs).toHaveLength(1);
+		});
 	});
 
 	describe('stopJob', () => {
diff --git a/packages/cli/src/scaling/scaling.service.ts b/packages/cli/src/scaling/scaling.service.ts
index 73b072af6c888..f26feebc58fd5 100644
--- a/packages/cli/src/scaling/scaling.service.ts
+++ b/packages/cli/src/scaling/scaling.service.ts
@@ -88,7 +88,9 @@ export class ScalingService {
 	}
 
 	async findJobsByStatus(statuses: JobStatus[]) {
-		return await this.queue.getJobs(statuses);
+		const jobs = await this.queue.getJobs(statuses);
+
+		return jobs.filter((job) => job !== null);
 	}
 
 	async stopJob(job: Job) {

From 5255793afee5653d8356b8e4d2e1009d5cf36164 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Mon, 12 Aug 2024 11:41:21 +0200
Subject: [PATCH 123/168] fix(core): Enforce shutdown timer and sequence on
 `SIGINT` for main (#10346)

---
 packages/cli/src/commands/BaseCommand.ts | 2 +-
 packages/cli/src/commands/start.ts       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/cli/src/commands/BaseCommand.ts b/packages/cli/src/commands/BaseCommand.ts
index d0c34dac0a86d..d2cf986af23b8 100644
--- a/packages/cli/src/commands/BaseCommand.ts
+++ b/packages/cli/src/commands/BaseCommand.ts
@@ -315,7 +315,7 @@ export abstract class BaseCommand extends Command {
 		this.exit(exitCode);
 	}
 
-	private onTerminationSignal(signal: string) {
+	protected onTerminationSignal(signal: string) {
 		return async () => {
 			if (this.shutdownService.isShuttingDown()) {
 				this.logger.info(`Received ${signal}. Already shutting down...`);
diff --git a/packages/cli/src/commands/start.ts b/packages/cli/src/commands/start.ts
index 99df74fabd6cd..0ebfbbc1a6dae 100644
--- a/packages/cli/src/commands/start.ts
+++ b/packages/cli/src/commands/start.ts
@@ -332,7 +332,7 @@ export class Start extends BaseCommand {
 					this.openBrowser();
 				} else if (key.charCodeAt(0) === 3) {
 					// Ctrl + c got pressed
-					void this.stopProcess();
+					void this.onTerminationSignal('SIGINT')();
 				} else {
 					// When anything else got pressed, record it and send it on enter into the child process
 

From 021d9981b6c089ab2b7123e4aa07eeba9d06ec86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Mon, 12 Aug 2024 13:34:37 +0200
Subject: [PATCH 124/168] ci: Fix scaling mode tests (no-changelog) (#10351)

---
 .../scaling/__tests__/scaling.service.test.ts | 43 +++++++++++++------
 1 file changed, 30 insertions(+), 13 deletions(-)

diff --git a/packages/cli/src/scaling/__tests__/scaling.service.test.ts b/packages/cli/src/scaling/__tests__/scaling.service.test.ts
index 0a798fae3e8a6..6883a96ffd69c 100644
--- a/packages/cli/src/scaling/__tests__/scaling.service.test.ts
+++ b/packages/cli/src/scaling/__tests__/scaling.service.test.ts
@@ -5,6 +5,8 @@ import config from '@/config';
 import * as BullModule from 'bull';
 import type { Job, JobData, JobOptions, JobQueue } from '../types';
 import { ApplicationError } from 'n8n-workflow';
+import { mockInstance } from '@test/mocking';
+import { GlobalConfig } from '@n8n/config';
 
 const queue = mock<JobQueue>({
 	client: { ping: jest.fn() },
@@ -16,6 +18,21 @@ jest.mock('bull', () => ({
 }));
 
 describe('ScalingService', () => {
+	const globalConfig = mockInstance(GlobalConfig, {
+		queue: {
+			bull: {
+				prefix: 'bull',
+				redis: {
+					clusterNodes: '',
+					host: 'localhost',
+					password: '',
+					port: 6379,
+					tls: false,
+				},
+			},
+		},
+	});
+
 	beforeEach(() => {
 		jest.clearAllMocks();
 		config.set('generic.instanceType', 'main');
@@ -26,8 +43,8 @@ describe('ScalingService', () => {
 			/**
 			 * Arrange
 			 */
-			const scalingService = new ScalingService(mock(), mock(), mock());
-			const { prefix, settings } = config.get('queue.bull');
+			const scalingService = new ScalingService(mock(), mock(), mock(), globalConfig);
+			const { prefix, settings } = globalConfig.queue.bull;
 			const Bull = jest.mocked(BullModule.default);
 
 			/**
@@ -54,7 +71,7 @@ describe('ScalingService', () => {
 			 * Arrange
 			 */
 			config.set('generic.instanceType', 'worker');
-			const scalingService = new ScalingService(mock(), mock(), mock());
+			const scalingService = new ScalingService(mock(), mock(), mock(), globalConfig);
 			await scalingService.setupQueue();
 			const concurrency = 5;
 
@@ -73,7 +90,7 @@ describe('ScalingService', () => {
 			/**
 			 * Arrange
 			 */
-			const scalingService = new ScalingService(mock(), mock(), mock());
+			const scalingService = new ScalingService(mock(), mock(), mock(), globalConfig);
 			await scalingService.setupQueue();
 
 			/**
@@ -88,7 +105,7 @@ describe('ScalingService', () => {
 			/**
 			 * Arrange
 			 */
-			const scalingService = new ScalingService(mock(), mock(), mock());
+			const scalingService = new ScalingService(mock(), mock(), mock(), globalConfig);
 			await scalingService.setupQueue();
 
 			/**
@@ -108,7 +125,7 @@ describe('ScalingService', () => {
 			/**
 			 * Arrange
 			 */
-			const scalingService = new ScalingService(mock(), mock(), mock());
+			const scalingService = new ScalingService(mock(), mock(), mock(), globalConfig);
 			await scalingService.setupQueue();
 
 			/**
@@ -128,7 +145,7 @@ describe('ScalingService', () => {
 			/**
 			 * Arrange
 			 */
-			const scalingService = new ScalingService(mock(), mock(), mock());
+			const scalingService = new ScalingService(mock(), mock(), mock(), globalConfig);
 			await scalingService.setupQueue();
 			queue.add.mockResolvedValue(mock<Job>({ id: '456' }));
 
@@ -151,7 +168,7 @@ describe('ScalingService', () => {
 			/**
 			 * Arrange
 			 */
-			const scalingService = new ScalingService(mock(), mock(), mock());
+			const scalingService = new ScalingService(mock(), mock(), mock(), globalConfig);
 			await scalingService.setupQueue();
 			const jobId = '123';
 			queue.getJob.mockResolvedValue(mock<Job>({ id: jobId }));
@@ -174,7 +191,7 @@ describe('ScalingService', () => {
 			/**
 			 * Arrange
 			 */
-			const scalingService = new ScalingService(mock(), mock(), mock());
+			const scalingService = new ScalingService(mock(), mock(), mock(), globalConfig);
 			await scalingService.setupQueue();
 			queue.getJobs.mockResolvedValue([mock<Job>({ id: '123' })]);
 
@@ -195,7 +212,7 @@ describe('ScalingService', () => {
 			/**
 			 * Arrange
 			 */
-			const scalingService = new ScalingService(mock(), mock(), mock());
+			const scalingService = new ScalingService(mock(), mock(), mock(), globalConfig);
 			await scalingService.setupQueue();
 			// @ts-expect-error - Untyped but possible Redis response
 			queue.getJobs.mockResolvedValue([mock<Job>(), null]);
@@ -217,7 +234,7 @@ describe('ScalingService', () => {
 			/**
 			 * Arrange
 			 */
-			const scalingService = new ScalingService(mock(), mock(), mock());
+			const scalingService = new ScalingService(mock(), mock(), mock(), globalConfig);
 			await scalingService.setupQueue();
 			const job = mock<Job>({ isActive: jest.fn().mockResolvedValue(true) });
 
@@ -237,7 +254,7 @@ describe('ScalingService', () => {
 			/**
 			 * Arrange
 			 */
-			const scalingService = new ScalingService(mock(), mock(), mock());
+			const scalingService = new ScalingService(mock(), mock(), mock(), globalConfig);
 			await scalingService.setupQueue();
 			const job = mock<Job>({ isActive: jest.fn().mockResolvedValue(false) });
 
@@ -257,7 +274,7 @@ describe('ScalingService', () => {
 			/**
 			 * Arrange
 			 */
-			const scalingService = new ScalingService(mock(), mock(), mock());
+			const scalingService = new ScalingService(mock(), mock(), mock(), globalConfig);
 			await scalingService.setupQueue();
 			const job = mock<Job>({
 				isActive: jest.fn().mockImplementation(() => {

From 2580a5e19e8b50ab5741d3da79b7be6839737a8f Mon Sep 17 00:00:00 2001
From: Alex Grozav <alex@grozav.com>
Date: Mon, 12 Aug 2024 16:14:40 +0300
Subject: [PATCH 125/168] feat(editor): Enable NodeView version switcher by
 default on internal (no-changelog) (#10356)

---
 .../src/components/MainHeader/WorkflowDetails.vue    | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue b/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue
index 9a5eb14dfbb5c..c5a209fec9c59 100644
--- a/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue
+++ b/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue
@@ -96,9 +96,17 @@ const importFileRef = ref<HTMLInputElement | undefined>();
 const tagsEventBus = createEventBus();
 const sourceControlModalEventBus = createEventBus();
 
-const nodeViewSwitcher = useLocalStorage('NodeView.switcher', import.meta.env.DEV ? 'true' : '');
+const nodeViewSwitcher = useLocalStorage('NodeView.switcher', '');
 const nodeViewVersion = useLocalStorage('NodeView.version', '1');
 
+const isNodeViewSwitcherEnabled = computed(() => {
+	return (
+		import.meta.env.DEV ||
+		nodeViewSwitcher.value === 'true' ||
+		settingsStore.deploymentType === 'n8n-internal'
+	);
+});
+
 const hasChanged = (prev: string[], curr: string[]) => {
 	if (prev.length !== curr.length) {
 		return true;
@@ -184,7 +192,7 @@ const workflowMenuItems = computed<ActionDropdownItem[]>(() => {
 		disabled: !onWorkflowPage.value || isNewWorkflow.value,
 	});
 
-	if (nodeViewSwitcher.value === 'true') {
+	if (isNodeViewSwitcherEnabled.value) {
 		actions.push({
 			id: WORKFLOW_MENU_ACTIONS.SWITCH_NODE_VIEW_VERSION,
 			label:

From 9d7caacc699f10962783393925a980ec6f1ca975 Mon Sep 17 00:00:00 2001
From: Tomi Turtiainen <10324676+tomi@users.noreply.github.com>
Date: Mon, 12 Aug 2024 17:08:55 +0300
Subject: [PATCH 126/168] fix: Require mfa code for password change if its
 enabled (#10341)

---
 packages/cli/src/Mfa/mfa.service.ts           |  5 +-
 .../__tests__/me.controller.test.ts           | 53 ++++++++++++++++++-
 packages/cli/src/controllers/me.controller.ts | 20 +++++--
 packages/cli/src/requests.ts                  |  2 +-
 packages/editor-ui/src/api/users.ts           |  8 ++-
 .../src/components/ChangePasswordModal.vue    | 39 +++++++++++---
 .../__tests__/ChangePasswordModal.test.ts     | 20 +++++++
 .../ChangePasswordModal.test.ts.snap          |  6 +++
 .../src/plugins/i18n/locales/en.json          |  1 +
 packages/editor-ui/src/stores/users.store.ts  | 13 +----
 10 files changed, 141 insertions(+), 26 deletions(-)
 create mode 100644 packages/editor-ui/src/components/__tests__/ChangePasswordModal.test.ts
 create mode 100644 packages/editor-ui/src/components/__tests__/__snapshots__/ChangePasswordModal.test.ts.snap

diff --git a/packages/cli/src/Mfa/mfa.service.ts b/packages/cli/src/Mfa/mfa.service.ts
index 91270cf4ab27d..43b1d3438b22b 100644
--- a/packages/cli/src/Mfa/mfa.service.ts
+++ b/packages/cli/src/Mfa/mfa.service.ts
@@ -60,7 +60,9 @@ export class MfaService {
 		if (mfaToken) {
 			const decryptedSecret = this.cipher.decrypt(user.mfaSecret!);
 			return this.totp.verifySecret({ secret: decryptedSecret, token: mfaToken });
-		} else if (mfaRecoveryCode) {
+		}
+
+		if (mfaRecoveryCode) {
 			const validCodes = user.mfaRecoveryCodes.map((code) => this.cipher.decrypt(code));
 			const index = validCodes.indexOf(mfaRecoveryCode);
 			if (index === -1) return false;
@@ -70,6 +72,7 @@ export class MfaService {
 			await this.authUserRepository.save(user);
 			return true;
 		}
+
 		return false;
 	}
 
diff --git a/packages/cli/src/controllers/__tests__/me.controller.test.ts b/packages/cli/src/controllers/__tests__/me.controller.test.ts
index bfde0bcc0e4a2..df22c377bca9b 100644
--- a/packages/cli/src/controllers/__tests__/me.controller.test.ts
+++ b/packages/cli/src/controllers/__tests__/me.controller.test.ts
@@ -15,6 +15,9 @@ import { UserRepository } from '@/databases/repositories/user.repository';
 import { EventService } from '@/events/event.service';
 import { badPasswords } from '@test/testData';
 import { mockInstance } from '@test/mocking';
+import { AuthUserRepository } from '@/databases/repositories/authUser.repository';
+import { MfaService } from '@/Mfa/mfa.service';
+import { ForbiddenError } from '@/errors/response-errors/forbidden.error';
 
 const browserId = 'test-browser-id';
 
@@ -23,6 +26,8 @@ describe('MeController', () => {
 	const eventService = mockInstance(EventService);
 	const userService = mockInstance(UserService);
 	const userRepository = mockInstance(UserRepository);
+	const mockMfaService = mockInstance(MfaService);
+	mockInstance(AuthUserRepository);
 	mockInstance(License).isWithinUsersLimit.mockReturnValue(true);
 	const controller = Container.get(MeController);
 
@@ -179,7 +184,7 @@ describe('MeController', () => {
 
 		it('should update the password in the DB, and issue a new cookie', async () => {
 			const req = mock<MeRequest.Password>({
-				user: mock({ password: passwordHash }),
+				user: mock({ password: passwordHash, mfaEnabled: false }),
 				body: { currentPassword: 'old_password', newPassword: 'NewPassword123' },
 				browserId,
 			});
@@ -212,6 +217,52 @@ describe('MeController', () => {
 				fieldsChanged: ['password'],
 			});
 		});
+
+		describe('mfa enabled', () => {
+			it('should throw BadRequestError if mfa code is missing', async () => {
+				const req = mock<MeRequest.Password>({
+					user: mock({ password: passwordHash, mfaEnabled: true }),
+					body: { currentPassword: 'old_password', newPassword: 'NewPassword123' },
+				});
+
+				await expect(controller.updatePassword(req, mock())).rejects.toThrowError(
+					new BadRequestError('Two-factor code is required to change password.'),
+				);
+			});
+
+			it('should throw ForbiddenError if invalid mfa code is given', async () => {
+				const req = mock<MeRequest.Password>({
+					user: mock({ password: passwordHash, mfaEnabled: true }),
+					body: { currentPassword: 'old_password', newPassword: 'NewPassword123', mfaCode: '123' },
+				});
+				mockMfaService.validateMfa.mockResolvedValue(false);
+
+				await expect(controller.updatePassword(req, mock())).rejects.toThrowError(
+					new ForbiddenError('Invalid two-factor code.'),
+				);
+			});
+
+			it('should succeed when mfa code is correct', async () => {
+				const req = mock<MeRequest.Password>({
+					user: mock({ password: passwordHash, mfaEnabled: true }),
+					body: {
+						currentPassword: 'old_password',
+						newPassword: 'NewPassword123',
+						mfaCode: 'valid',
+					},
+					browserId,
+				});
+				const res = mock<Response>();
+				userRepository.save.calledWith(req.user).mockResolvedValue(req.user);
+				jest.spyOn(jwt, 'sign').mockImplementation(() => 'new-signed-token');
+				mockMfaService.validateMfa.mockResolvedValue(true);
+
+				const result = await controller.updatePassword(req, res);
+
+				expect(result).toEqual({ success: true });
+				expect(req.user.password).not.toBe(passwordHash);
+			});
+		});
 	});
 
 	describe('storeSurveyAnswers', () => {
diff --git a/packages/cli/src/controllers/me.controller.ts b/packages/cli/src/controllers/me.controller.ts
index bbdac4bf02fc7..4089cd3523310 100644
--- a/packages/cli/src/controllers/me.controller.ts
+++ b/packages/cli/src/controllers/me.controller.ts
@@ -23,6 +23,8 @@ import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 import { UserRepository } from '@/databases/repositories/user.repository';
 import { isApiEnabled } from '@/PublicApi';
 import { EventService } from '@/events/event.service';
+import { MfaService } from '@/Mfa/mfa.service';
+import { ForbiddenError } from '@/errors/response-errors/forbidden.error';
 
 export const API_KEY_PREFIX = 'n8n_api_';
 
@@ -44,6 +46,7 @@ export class MeController {
 		private readonly passwordUtility: PasswordUtility,
 		private readonly userRepository: UserRepository,
 		private readonly eventService: EventService,
+		private readonly mfaService: MfaService,
 	) {}
 
 	/**
@@ -115,12 +118,12 @@ export class MeController {
 	/**
 	 * Update the logged-in user's password.
 	 */
-	@Patch('/password')
+	@Patch('/password', { rateLimit: true })
 	async updatePassword(req: MeRequest.Password, res: Response) {
 		const { user } = req;
-		const { currentPassword, newPassword } = req.body;
+		const { currentPassword, newPassword, mfaCode } = req.body;
 
-		// If SAML is enabled, we don't allow the user to change their email address
+		// If SAML is enabled, we don't allow the user to change their password
 		if (isSamlLicensedAndEnabled()) {
 			this.logger.debug('Attempted to change password for user, while SAML is enabled', {
 				userId: user.id,
@@ -145,6 +148,17 @@ export class MeController {
 
 		const validPassword = this.passwordUtility.validate(newPassword);
 
+		if (user.mfaEnabled) {
+			if (typeof mfaCode !== 'string') {
+				throw new BadRequestError('Two-factor code is required to change password.');
+			}
+
+			const isMfaTokenValid = await this.mfaService.validateMfa(user.id, mfaCode, undefined);
+			if (!isMfaTokenValid) {
+				throw new ForbiddenError('Invalid two-factor code.');
+			}
+		}
+
 		user.password = await this.passwordUtility.hash(validPassword);
 
 		const updatedUser = await this.userRepository.save(user, { transaction: false });
diff --git a/packages/cli/src/requests.ts b/packages/cli/src/requests.ts
index 5f5daa589e5f6..5301351c770df 100644
--- a/packages/cli/src/requests.ts
+++ b/packages/cli/src/requests.ts
@@ -224,7 +224,7 @@ export declare namespace MeRequest {
 	export type Password = AuthenticatedRequest<
 		{},
 		{},
-		{ currentPassword: string; newPassword: string; token?: string }
+		{ currentPassword: string; newPassword: string; mfaCode?: string }
 	>;
 	export type SurveyAnswers = AuthenticatedRequest<{}, {}, Record<string, string> | {}>;
 }
diff --git a/packages/editor-ui/src/api/users.ts b/packages/editor-ui/src/api/users.ts
index 0085baadc1a99..bb730c671c70a 100644
--- a/packages/editor-ui/src/api/users.ts
+++ b/packages/editor-ui/src/api/users.ts
@@ -116,9 +116,15 @@ export async function updateOtherUserSettings(
 	return await makeRestApiRequest(context, 'PATCH', `/users/${userId}/settings`, settings);
 }
 
+export type UpdateUserPasswordParams = {
+	newPassword: string;
+	currentPassword: string;
+	mfaCode?: string;
+};
+
 export async function updateCurrentUserPassword(
 	context: IRestApiContext,
-	params: { newPassword: string; currentPassword: string },
+	params: UpdateUserPasswordParams,
 ): Promise<void> {
 	return await makeRestApiRequest(context, 'PATCH', '/me/password', params);
 }
diff --git a/packages/editor-ui/src/components/ChangePasswordModal.vue b/packages/editor-ui/src/components/ChangePasswordModal.vue
index 493a77e16599e..24de3b5dfb18c 100644
--- a/packages/editor-ui/src/components/ChangePasswordModal.vue
+++ b/packages/editor-ui/src/components/ChangePasswordModal.vue
@@ -35,7 +35,7 @@ import { CHANGE_PASSWORD_MODAL_KEY } from '../constants';
 import Modal from '@/components/Modal.vue';
 import { useUsersStore } from '@/stores/users.store';
 import { createEventBus } from 'n8n-design-system/utils';
-import type { IFormInputs } from '@/Interface';
+import type { IFormInputs, IFormInput } from '@/Interface';
 import { useI18n } from '@/composables/useI18n';
 
 const config = ref<IFormInputs | null>(null);
@@ -68,10 +68,18 @@ const onInput = (e: { name: string; value: string }) => {
 	}
 };
 
-const onSubmit = async (values: { currentPassword: string; password: string }) => {
+const onSubmit = async (values: {
+	currentPassword: string;
+	password: string;
+	mfaCode?: string;
+}) => {
 	try {
 		loading.value = true;
-		await usersStore.updateCurrentUserPassword(values);
+		await usersStore.updateCurrentUserPassword({
+			currentPassword: values.currentPassword,
+			newPassword: values.password,
+			mfaCode: values.mfaCode,
+		});
 
 		showMessage({
 			type: 'success',
@@ -92,8 +100,8 @@ const onSubmitClick = () => {
 };
 
 onMounted(() => {
-	const form: IFormInputs = [
-		{
+	const inputs: Record<string, IFormInput> = {
+		currentPassword: {
 			name: 'currentPassword',
 			properties: {
 				label: i18n.baseText('auth.changePassword.currentPassword'),
@@ -104,7 +112,16 @@ onMounted(() => {
 				focusInitially: true,
 			},
 		},
-		{
+		mfaCode: {
+			name: 'mfaCode',
+			properties: {
+				label: i18n.baseText('auth.changePassword.mfaCode'),
+				type: 'text',
+				required: true,
+				capitalize: true,
+			},
+		},
+		newPassword: {
 			name: 'password',
 			properties: {
 				label: i18n.baseText('auth.newPassword'),
@@ -116,7 +133,7 @@ onMounted(() => {
 				capitalize: true,
 			},
 		},
-		{
+		newPasswordAgain: {
 			name: 'password2',
 			properties: {
 				label: i18n.baseText('auth.changePassword.reenterNewPassword'),
@@ -132,7 +149,13 @@ onMounted(() => {
 				capitalize: true,
 			},
 		},
-	];
+	};
+
+	const { currentUser } = usersStore;
+
+	const form: IFormInputs = currentUser?.mfaEnabled
+		? [inputs.currentPassword, inputs.mfaCode, inputs.newPassword, inputs.newPasswordAgain]
+		: [inputs.currentPassword, inputs.newPassword, inputs.newPasswordAgain];
 
 	config.value = form;
 });
diff --git a/packages/editor-ui/src/components/__tests__/ChangePasswordModal.test.ts b/packages/editor-ui/src/components/__tests__/ChangePasswordModal.test.ts
new file mode 100644
index 0000000000000..7248774c81e24
--- /dev/null
+++ b/packages/editor-ui/src/components/__tests__/ChangePasswordModal.test.ts
@@ -0,0 +1,20 @@
+import { createTestingPinia } from '@pinia/testing';
+import ChangePasswordModal from '@/components/ChangePasswordModal.vue';
+import type { createPinia } from 'pinia';
+import { createComponentRenderer } from '@/__tests__/render';
+
+const renderComponent = createComponentRenderer(ChangePasswordModal);
+
+describe('ChangePasswordModal', () => {
+	let pinia: ReturnType<typeof createPinia>;
+
+	beforeEach(() => {
+		pinia = createTestingPinia({});
+	});
+
+	it('should render correctly', () => {
+		const wrapper = renderComponent({ pinia });
+
+		expect(wrapper.html()).toMatchSnapshot();
+	});
+});
diff --git a/packages/editor-ui/src/components/__tests__/__snapshots__/ChangePasswordModal.test.ts.snap b/packages/editor-ui/src/components/__tests__/__snapshots__/ChangePasswordModal.test.ts.snap
new file mode 100644
index 0000000000000..db656032b2c0b
--- /dev/null
+++ b/packages/editor-ui/src/components/__tests__/__snapshots__/ChangePasswordModal.test.ts.snap
@@ -0,0 +1,6 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`ChangePasswordModal > should render correctly 1`] = `
+"<!--teleport start-->
+<!--teleport end-->"
+`;
diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json
index 772f4c2d5833e..48081770ad6e0 100644
--- a/packages/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/editor-ui/src/plugins/i18n/locales/en.json
@@ -98,6 +98,7 @@
 	"activationModal.yourWorkflowWillNowRegularlyCheck": "Your workflow will now regularly check {serviceName} for events and trigger executions for them.",
 	"auth.changePassword": "Change password",
 	"auth.changePassword.currentPassword": "Current password",
+	"auth.changePassword.mfaCode": "Two-factor code",
 	"auth.changePassword.error": "Problem changing the password",
 	"auth.changePassword.missingTokenError": "Missing token",
 	"auth.changePassword.missingUserIdError": "Missing user ID",
diff --git a/packages/editor-ui/src/stores/users.store.ts b/packages/editor-ui/src/stores/users.store.ts
index 0c6963819c5b6..d0145b2cb03be 100644
--- a/packages/editor-ui/src/stores/users.store.ts
+++ b/packages/editor-ui/src/stores/users.store.ts
@@ -258,17 +258,8 @@ export const useUsersStore = defineStore(STORES.USERS, () => {
 		addUsers([usersById.value[userId]]);
 	};
 
-	const updateCurrentUserPassword = async ({
-		password,
-		currentPassword,
-	}: {
-		password: string;
-		currentPassword: string;
-	}) => {
-		await usersApi.updateCurrentUserPassword(rootStore.restApiContext, {
-			newPassword: password,
-			currentPassword,
-		});
+	const updateCurrentUserPassword = async (params: usersApi.UpdateUserPasswordParams) => {
+		await usersApi.updateCurrentUserPassword(rootStore.restApiContext, params);
 	};
 
 	const deleteUser = async (params: { id: string; transferId?: string }) => {

From 71b6c671797024d7b516352fa9b7ecda101ce3b2 Mon Sep 17 00:00:00 2001
From: Elias Meire <elias@meire.dev>
Date: Mon, 12 Aug 2024 16:47:14 +0200
Subject: [PATCH 127/168] feat(editor): Add schema view to expression modal
 (#9976)

---
 cypress/e2e/14-mapping.cy.ts                  |  43 +-
 cypress/pages/ndv.ts                          |   4 +-
 cypress/support/commands.ts                   |   4 +-
 cypress/support/index.ts                      |  10 +-
 .../design-system/src/css/_tokens.dark.scss   |   1 +
 packages/design-system/src/css/_tokens.scss   |   1 +
 packages/editor-ui/src/Interface.ts           |  13 -
 .../src/components/DraggableTarget.vue        |   6 +-
 .../src/components/ExpressionEdit.vue         | 388 --------
 .../src/components/ExpressionEditModal.vue    | 336 +++++++
 .../ExpressionEditorModalInput.vue            |  59 +-
 .../components/ExpressionEditorModal/theme.ts |  16 +-
 .../components/ExpressionParameterInput.vue   | 101 +-
 .../InlineExpressionEditorInput.vue           |  57 +-
 .../InlineExpressionEditorOutput.vue          | 108 +--
 .../OutputItemSelect.vue                      | 114 +++
 .../InlineExpressionEditor/theme.ts           |   3 +
 .../src/components/ParameterInput.vue         |   8 +-
 .../src/components/ParameterInputFull.vue     |  12 +-
 packages/editor-ui/src/components/RunData.vue |   5 +
 .../src/components/RunDataSchema.vue          |  33 +-
 .../src/components/VariableSelector.vue       | 889 ------------------
 .../src/components/VariableSelectorItem.vue   | 185 ----
 .../codemirror/__tests__/dragAndDrop.test.ts  |  68 ++
 .../src/plugins/codemirror/dragAndDrop.ts     | 153 +++
 .../src/plugins/i18n/locales/en.json          |  13 -
 packages/editor-ui/src/types/externalHooks.ts |  14 +-
 .../src/utils/__tests__/expressions.test.ts   |  64 +-
 packages/editor-ui/src/utils/expressions.ts   |   4 +
 29 files changed, 923 insertions(+), 1789 deletions(-)
 delete mode 100644 packages/editor-ui/src/components/ExpressionEdit.vue
 create mode 100644 packages/editor-ui/src/components/ExpressionEditModal.vue
 create mode 100644 packages/editor-ui/src/components/InlineExpressionEditor/OutputItemSelect.vue
 delete mode 100644 packages/editor-ui/src/components/VariableSelector.vue
 delete mode 100644 packages/editor-ui/src/components/VariableSelectorItem.vue
 create mode 100644 packages/editor-ui/src/plugins/codemirror/__tests__/dragAndDrop.test.ts
 create mode 100644 packages/editor-ui/src/plugins/codemirror/dragAndDrop.ts

diff --git a/cypress/e2e/14-mapping.cy.ts b/cypress/e2e/14-mapping.cy.ts
index 2a33aee5c0ee1..2e405e69e88c4 100644
--- a/cypress/e2e/14-mapping.cy.ts
+++ b/cypress/e2e/14-mapping.cy.ts
@@ -44,7 +44,7 @@ describe('Data mapping', () => {
 		ndv.actions.mapDataFromHeader(2, 'value');
 		ndv.getters
 			.inlineExpressionEditorInput()
-			.should('have.text', "{{ $json.timestamp }} {{ $json['Readable date'] }}");
+			.should('have.text', "{{ $json['Readable date'] }}{{ $json.timestamp }}");
 	});
 
 	it('maps expressions from table json, and resolves value based on hover', () => {
@@ -145,8 +145,8 @@ describe('Data mapping', () => {
 		ndv.actions.mapToParameter('value');
 		ndv.getters
 			.inlineExpressionEditorInput()
-			.should('have.text', '{{ $json.input[0].count }} {{ $json.input }}');
-		ndv.actions.validateExpressionPreview('value', '0 [object Object]');
+			.should('have.text', '{{ $json.input }}{{ $json.input[0].count }}');
+		ndv.actions.validateExpressionPreview('value', '[object Object]0');
 	});
 
 	it('maps expressions from schema view', () => {
@@ -170,8 +170,8 @@ describe('Data mapping', () => {
 		ndv.actions.mapToParameter('value');
 		ndv.getters
 			.inlineExpressionEditorInput()
-			.should('have.text', '{{ $json.input[0].count }} {{ $json.input }}');
-		ndv.actions.validateExpressionPreview('value', '0 [object Object]');
+			.should('have.text', '{{ $json.input }}{{ $json.input[0].count }}');
+		ndv.actions.validateExpressionPreview('value', '[object Object]0');
 	});
 
 	it('maps expressions from previous nodes', () => {
@@ -200,17 +200,17 @@ describe('Data mapping', () => {
 			.inlineExpressionEditorInput()
 			.should(
 				'have.text',
-				`{{ $('${SCHEDULE_TRIGGER_NODE_NAME}').item.json.input[0].count }} {{ $('${SCHEDULE_TRIGGER_NODE_NAME}').item.json.input }}`,
+				`{{ $('${SCHEDULE_TRIGGER_NODE_NAME}').item.json.input }}{{ $('${SCHEDULE_TRIGGER_NODE_NAME}').item.json.input[0].count }}`,
 			);
 
 		ndv.actions.selectInputNode('Set');
 
 		ndv.getters.executingLoader().should('not.exist');
 		ndv.getters.inputDataContainer().should('exist');
-		ndv.actions.validateExpressionPreview('value', '0 [object Object]');
+		ndv.actions.validateExpressionPreview('value', '[object Object]0');
 
 		ndv.getters.inputTbodyCell(2, 0).realHover();
-		ndv.actions.validateExpressionPreview('value', '1 [object Object]');
+		ndv.actions.validateExpressionPreview('value', '[object Object]1');
 	});
 
 	it('maps keys to path', () => {
@@ -284,8 +284,8 @@ describe('Data mapping', () => {
 		ndv.actions.mapToParameter('value');
 		ndv.getters
 			.inlineExpressionEditorInput()
-			.should('have.text', '{{ $json.input[0].count }} {{ $json.input }}');
-		ndv.actions.validateExpressionPreview('value', '0 [object Object]');
+			.should('have.text', '{{ $json.input }}{{ $json.input[0].count }}');
+		ndv.actions.validateExpressionPreview('value', '[object Object]0');
 	});
 
 	it('renders expression preview when a previous node is selected', () => {
@@ -342,4 +342,27 @@ describe('Data mapping', () => {
 			.invoke('css', 'border')
 			.should('include', 'dashed rgb(90, 76, 194)');
 	});
+
+	it('maps expressions to a specific location in the editor', () => {
+		cy.fixture('Test_workflow_3.json').then((data) => {
+			cy.get('body').paste(JSON.stringify(data));
+		});
+		workflowPage.actions.zoomToFit();
+
+		workflowPage.actions.openNode('Set');
+		ndv.actions.clearParameterInput('value');
+		ndv.actions.typeIntoParameterInput('value', '=');
+		ndv.actions.typeIntoParameterInput('value', 'hello world{enter}{enter}newline');
+
+		ndv.getters.inputDataContainer().should('exist').find('span').contains('count').realMouseDown();
+
+		ndv.actions.mapToParameter('value');
+
+		ndv.getters.inputDataContainer().find('span').contains('input').realMouseDown();
+		ndv.actions.mapToParameter('value', 'bottom');
+
+		ndv.getters
+			.inlineExpressionEditorInput()
+			.should('have.text', '{{ $json.input[0].count }}hello worldnewline{{ $json.input }}');
+	});
 });
diff --git a/cypress/pages/ndv.ts b/cypress/pages/ndv.ts
index 24e1922663371..1a80d79707c6d 100644
--- a/cypress/pages/ndv.ts
+++ b/cypress/pages/ndv.ts
@@ -205,9 +205,9 @@ export class NDV extends BasePage {
 			const droppable = `[data-test-id="parameter-input-${parameterName}"]`;
 			cy.draganddrop(draggable, droppable);
 		},
-		mapToParameter: (parameterName: string) => {
+		mapToParameter: (parameterName: string, position?: 'top' | 'center' | 'bottom') => {
 			const droppable = `[data-test-id="parameter-input-${parameterName}"]`;
-			cy.draganddrop('', droppable);
+			cy.draganddrop('', droppable, { position });
 		},
 		switchInputMode: (type: 'Schema' | 'Table' | 'JSON' | 'Binary') => {
 			this.getters.inputDisplayMode().find('label').contains(type).click({ force: true });
diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts
index a7fa994289029..1f353ab7c51ce 100644
--- a/cypress/support/commands.ts
+++ b/cypress/support/commands.ts
@@ -175,7 +175,7 @@ Cypress.Commands.add('drag', (selector, pos, options) => {
 	});
 });
 
-Cypress.Commands.add('draganddrop', (draggableSelector, droppableSelector) => {
+Cypress.Commands.add('draganddrop', (draggableSelector, droppableSelector, options) => {
 	if (draggableSelector) {
 		cy.get(draggableSelector).should('exist');
 	}
@@ -197,7 +197,7 @@ Cypress.Commands.add('draganddrop', (draggableSelector, droppableSelector) => {
 			cy.get(droppableSelector).realMouseMove(0, 0);
 			cy.get(droppableSelector).realMouseMove(pageX, pageY);
 			cy.get(droppableSelector).realHover();
-			cy.get(droppableSelector).realMouseUp();
+			cy.get(droppableSelector).realMouseUp({ position: options?.position ?? 'top' });
 			if (draggableSelector) {
 				cy.get(draggableSelector).realMouseUp();
 			}
diff --git a/cypress/support/index.ts b/cypress/support/index.ts
index 9819e7c3a1d6b..7c1897b11f27e 100644
--- a/cypress/support/index.ts
+++ b/cypress/support/index.ts
@@ -12,6 +12,10 @@ interface SigninPayload {
 	password: string;
 }
 
+interface DragAndDropOptions {
+	position: 'top' | 'center' | 'bottom';
+}
+
 declare global {
 	namespace Cypress {
 		interface SuiteConfigOverrides {
@@ -56,7 +60,11 @@ declare global {
 				target: [number, number],
 				options?: { abs?: boolean; index?: number; realMouse?: boolean; clickToFinish?: boolean },
 			): void;
-			draganddrop(draggableSelector: string, droppableSelector: string): void;
+			draganddrop(
+				draggableSelector: string,
+				droppableSelector: string,
+				options?: Partial<DragAndDropOptions>,
+			): void;
 			push(type: string, data: unknown): void;
 			shouldNotHaveConsoleErrors(): void;
 			window(): Chainable<
diff --git a/packages/design-system/src/css/_tokens.dark.scss b/packages/design-system/src/css/_tokens.dark.scss
index 4c3c078384bd3..15930499e4097 100644
--- a/packages/design-system/src/css/_tokens.dark.scss
+++ b/packages/design-system/src/css/_tokens.dark.scss
@@ -101,6 +101,7 @@
 	--color-pending-resolvable-foreground: var(--color-text-base);
 	--color-pending-resolvable-background: var(--prim-gray-70-alpha-01);
 	--color-expression-editor-background: var(--prim-gray-800);
+	--color-expression-editor-modal-background: var(--prim-gray-800);
 	--color-expression-syntax-example: var(--prim-gray-670);
 	--color-autocomplete-item-selected: var(--prim-color-secondary-tint-200);
 	--color-autocomplete-section-header-border: var(--prim-gray-540);
diff --git a/packages/design-system/src/css/_tokens.scss b/packages/design-system/src/css/_tokens.scss
index 40bf465cfa786..c63c5eb64baf5 100644
--- a/packages/design-system/src/css/_tokens.scss
+++ b/packages/design-system/src/css/_tokens.scss
@@ -135,6 +135,7 @@
 	--color-pending-resolvable-foreground: var(--color-text-base);
 	--color-pending-resolvable-background: var(--prim-gray-40);
 	--color-expression-editor-background: var(--prim-gray-0);
+	--color-expression-editor-modal-background: var(--color-background-base);
 	--color-expression-syntax-example: var(--prim-gray-40);
 	--color-autocomplete-item-selected: var(--color-secondary);
 	--color-autocomplete-section-header-border: var(--color-foreground-light);
diff --git a/packages/editor-ui/src/Interface.ts b/packages/editor-ui/src/Interface.ts
index f7d683e2789bc..986336a396d64 100644
--- a/packages/editor-ui/src/Interface.ts
+++ b/packages/editor-ui/src/Interface.ts
@@ -207,19 +207,6 @@ export interface ITableData {
 	hasJson: { [key: string]: boolean };
 }
 
-export interface IVariableItemSelected {
-	variable: string;
-}
-
-export interface IVariableSelectorOption {
-	name: string;
-	key?: string;
-	value?: string;
-	options?: IVariableSelectorOption[] | null;
-	allowParentSelect?: boolean;
-	dataType?: string;
-}
-
 // Simple version of n8n-workflow.Workflow
 export interface IWorkflowData {
 	id?: string;
diff --git a/packages/editor-ui/src/components/DraggableTarget.vue b/packages/editor-ui/src/components/DraggableTarget.vue
index 0dcadd856ef0c..6197d3c347837 100644
--- a/packages/editor-ui/src/components/DraggableTarget.vue
+++ b/packages/editor-ui/src/components/DraggableTarget.vue
@@ -26,7 +26,7 @@ const props = withDefaults(defineProps<Props>(), {
 });
 
 const emit = defineEmits<{
-	drop: [value: string];
+	drop: [value: string, event: MouseEvent];
 }>();
 
 const hovering = ref(false);
@@ -60,10 +60,10 @@ function onMouseLeave() {
 	hovering.value = false;
 }
 
-function onMouseUp() {
+function onMouseUp(event: MouseEvent) {
 	if (activeDrop.value) {
 		const data = ndvStore.draggableData;
-		emit('drop', data);
+		emit('drop', data, event);
 	}
 }
 
diff --git a/packages/editor-ui/src/components/ExpressionEdit.vue b/packages/editor-ui/src/components/ExpressionEdit.vue
deleted file mode 100644
index e61b4dbe052c8..0000000000000
--- a/packages/editor-ui/src/components/ExpressionEdit.vue
+++ /dev/null
@@ -1,388 +0,0 @@
-<template>
-	<div v-if="dialogVisible" class="expression-edit" @keydown.stop>
-		<el-dialog
-			:model-value="dialogVisible"
-			class="expression-dialog classic"
-			width="80%"
-			:title="$locale.baseText('expressionEdit.editExpression')"
-			:before-close="closeDialog"
-		>
-			<el-row>
-				<el-col :span="8">
-					<div class="header-side-menu">
-						<div class="headline">
-							{{ $locale.baseText('expressionEdit.editExpression') }}
-						</div>
-						<div class="sub-headline">
-							{{ $locale.baseText('expressionEdit.variableSelector') }}
-						</div>
-					</div>
-
-					<div class="variable-selector">
-						<VariableSelector
-							:path="path"
-							:redact-values="redactValues"
-							@item-selected="itemSelected"
-						></VariableSelector>
-					</div>
-				</el-col>
-				<el-col :span="16" class="right-side">
-					<div class="expression-editor-wrapper">
-						<div class="editor-description">
-							<div>
-								{{ $locale.baseText('expressionEdit.expression') }}
-							</div>
-							<div class="hint">
-								<span>
-									{{ $locale.baseText('expressionEdit.anythingInside') }}
-								</span>
-								<div class="expression-syntax-example" v-text="`{{ }}`"></div>
-								<span>
-									{{ $locale.baseText('expressionEdit.isJavaScript') }}
-								</span>
-								{{ ' ' }}
-								<n8n-link size="medium" :to="expressionsDocsUrl">
-									{{ $locale.baseText('expressionEdit.learnMore') }}
-								</n8n-link>
-							</div>
-						</div>
-						<div class="expression-editor">
-							<ExpressionEditorModalInput
-								ref="inputFieldExpression"
-								:model-value="modelValue"
-								:is-read-only="isReadOnly"
-								:path="path"
-								:class="{ 'ph-no-capture': redactValues }"
-								data-test-id="expression-modal-input"
-								@change="valueChanged"
-								@close="closeDialog"
-							/>
-						</div>
-					</div>
-
-					<div class="expression-result-wrapper">
-						<div class="editor-description">
-							{{ $locale.baseText('expressionEdit.resultOfItem1') }}
-						</div>
-						<div :class="{ 'ph-no-capture': redactValues }">
-							<ExpressionOutput
-								ref="expressionResult"
-								:segments="segments"
-								:extensions="theme"
-								data-test-id="expression-modal-output"
-							/>
-						</div>
-					</div>
-				</el-col>
-			</el-row>
-		</el-dialog>
-	</div>
-</template>
-
-<script lang="ts">
-import { type PropType, defineComponent } from 'vue';
-import { mapStores } from 'pinia';
-import ExpressionEditorModalInput from '@/components/ExpressionEditorModal/ExpressionEditorModalInput.vue';
-import VariableSelector from '@/components/VariableSelector.vue';
-
-import type { IVariableItemSelected } from '@/Interface';
-
-import { EXPRESSIONS_DOCS_URL } from '@/constants';
-
-import { useWorkflowsStore } from '@/stores/workflows.store';
-import { useNDVStore } from '@/stores/ndv.store';
-import { useExternalHooks } from '@/composables/useExternalHooks';
-import { createExpressionTelemetryPayload } from '@/utils/telemetryUtils';
-import { useDebounce } from '@/composables/useDebounce';
-
-import type { Segment } from '@/types/expressions';
-import ExpressionOutput from './InlineExpressionEditor/ExpressionOutput.vue';
-import { outputTheme } from './ExpressionEditorModal/theme';
-import type { INodeProperties } from 'n8n-workflow';
-
-export default defineComponent({
-	name: 'ExpressionEdit',
-	components: {
-		ExpressionEditorModalInput,
-		ExpressionOutput,
-		VariableSelector,
-	},
-	props: {
-		dialogVisible: {
-			type: Boolean,
-			default: false,
-		},
-		parameter: {
-			type: Object as PropType<INodeProperties>,
-			default: () => ({}),
-		},
-		path: {
-			type: String,
-			default: '',
-		},
-		modelValue: {
-			type: String,
-			default: '',
-		},
-		eventSource: {
-			type: String,
-			default: '',
-		},
-		redactValues: {
-			type: Boolean,
-			default: false,
-		},
-		isReadOnly: {
-			type: Boolean,
-			default: false,
-		},
-	},
-	setup() {
-		const externalHooks = useExternalHooks();
-		const { callDebounced } = useDebounce();
-
-		return {
-			callDebounced,
-			externalHooks,
-		};
-	},
-	data() {
-		return {
-			displayValue: '',
-			latestValue: '',
-			segments: [] as Segment[],
-			expressionsDocsUrl: EXPRESSIONS_DOCS_URL,
-			theme: outputTheme(),
-		};
-	},
-	computed: {
-		...mapStores(useNDVStore, useWorkflowsStore),
-	},
-	watch: {
-		dialogVisible(newValue) {
-			this.displayValue = this.modelValue;
-			this.latestValue = this.modelValue;
-
-			const resolvedExpressionValue =
-				(this.$refs.expressionResult as InstanceType<typeof ExpressionOutput>)?.getValue() || '';
-			void this.externalHooks.run('expressionEdit.dialogVisibleChanged', {
-				dialogVisible: newValue,
-				parameter: this.parameter,
-				value: this.modelValue,
-				resolvedExpressionValue,
-			});
-
-			if (!newValue) {
-				const telemetryPayload = createExpressionTelemetryPayload(
-					this.segments,
-					this.modelValue,
-					this.workflowsStore.workflowId,
-					this.ndvStore.pushRef,
-					this.ndvStore.activeNode?.type ?? '',
-				);
-
-				this.$telemetry.track('User closed Expression Editor', telemetryPayload);
-				void this.externalHooks.run('expressionEdit.closeDialog', telemetryPayload);
-			}
-		},
-	},
-	methods: {
-		valueChanged({ value, segments }: { value: string; segments: Segment[] }, forceUpdate = false) {
-			this.latestValue = value;
-			this.segments = segments;
-
-			if (forceUpdate) {
-				this.updateDisplayValue();
-				this.$emit('update:modelValue', this.latestValue);
-			} else {
-				void this.callDebounced(this.updateDisplayValue, {
-					debounceTime: 500,
-				});
-			}
-		},
-
-		updateDisplayValue() {
-			this.displayValue = this.latestValue;
-		},
-
-		closeDialog() {
-			if (this.latestValue !== this.modelValue) {
-				// Handle the close externally as the visible parameter is an external prop
-				// and is so not allowed to be changed here.
-				this.$emit('update:modelValue', this.latestValue);
-			}
-			this.$emit('closeDialog');
-			return false;
-		},
-
-		itemSelected(eventData: IVariableItemSelected) {
-			(
-				this.$refs.inputFieldExpression as {
-					itemSelected: (variable: IVariableItemSelected) => void;
-				}
-			).itemSelected(eventData);
-			void this.externalHooks.run('expressionEdit.itemSelected', {
-				parameter: this.parameter,
-				value: this.modelValue,
-				selectedItem: eventData,
-			});
-
-			const trackProperties: {
-				event_version: string;
-				node_type_dest: string;
-				node_type_source?: string;
-				parameter_name_dest: string;
-				parameter_name_source?: string;
-				variable_type?: string;
-				is_immediate_input: boolean;
-				variable_expression: string;
-				node_name: string;
-			} = {
-				event_version: '2',
-				node_type_dest: this.ndvStore.activeNode ? this.ndvStore.activeNode.type : '',
-				parameter_name_dest: this.parameter.displayName,
-				is_immediate_input: false,
-				variable_expression: eventData.variable,
-				node_name: this.ndvStore.activeNode ? this.ndvStore.activeNode.name : '',
-			};
-
-			if (eventData.variable) {
-				let splitVar = eventData.variable.split('.');
-
-				if (eventData.variable.startsWith('Object.keys')) {
-					splitVar = eventData.variable.split('(')[1].split(')')[0].split('.');
-					trackProperties.variable_type = 'Keys';
-				} else if (eventData.variable.startsWith('Object.values')) {
-					splitVar = eventData.variable.split('(')[1].split(')')[0].split('.');
-					trackProperties.variable_type = 'Values';
-				} else {
-					trackProperties.variable_type = 'Raw value';
-				}
-
-				if (splitVar[0].startsWith("$('")) {
-					const match = /\$\('(.*?)'\)/.exec(splitVar[0]);
-					if (match && match.length > 1) {
-						const sourceNodeName = match[1];
-						trackProperties.node_type_source =
-							this.workflowsStore.getNodeByName(sourceNodeName)?.type;
-						const nodeConnections: Array<Array<{ node: string }>> =
-							this.workflowsStore.outgoingConnectionsByNodeName(sourceNodeName).main;
-						trackProperties.is_immediate_input =
-							nodeConnections &&
-							nodeConnections[0] &&
-							nodeConnections[0].some(({ node }) => node === this.ndvStore.activeNode?.name || '');
-
-						if (splitVar[1].startsWith('parameter')) {
-							trackProperties.parameter_name_source = splitVar[1].split('"')[1];
-						}
-					}
-				} else {
-					trackProperties.is_immediate_input = true;
-
-					if (splitVar[0].startsWith('$parameter')) {
-						trackProperties.parameter_name_source = splitVar[0].split('"')[1];
-					}
-				}
-			}
-
-			this.$telemetry.track(
-				'User inserted item from Expression Editor variable selector',
-				trackProperties,
-			);
-		},
-	},
-});
-</script>
-
-<style scoped lang="scss">
-.expression-edit {
-	:deep(.expression-dialog) {
-		.el-dialog__header {
-			padding: 0;
-		}
-		.el-dialog__title {
-			display: none;
-		}
-
-		.el-dialog__body {
-			padding: 0;
-			font-size: var(--font-size-s);
-		}
-
-		.right-side {
-			background-color: var(--color-background-light);
-			border-top-right-radius: 8px;
-			border-bottom-right-radius: 8px;
-		}
-	}
-}
-
-.editor-description {
-	line-height: 1.5;
-	font-weight: bold;
-	padding: 0 0 0.5em 0.2em;
-	display: flex;
-	justify-content: space-between;
-
-	.hint {
-		color: var(--color-text-base);
-		font-weight: normal;
-		display: flex;
-
-		@media (max-width: $breakpoint-xs) {
-			display: none;
-		}
-
-		span {
-			margin-right: var(--spacing-4xs);
-		}
-		.expression-syntax-example {
-			display: inline-block;
-			margin-top: 3px;
-			height: 16px;
-			line-height: 1;
-			background-color: var(--color-expression-syntax-example);
-			color: var(--color-text-dark);
-			margin-right: var(--spacing-4xs);
-		}
-	}
-}
-
-.expression-result-wrapper,
-.expression-editor-wrapper {
-	padding: 10px;
-}
-
-.expression-result-wrapper {
-	margin-top: 1em;
-}
-
-.header-side-menu {
-	padding: 1em 0 0.5em var(--spacing-s);
-	border-top-left-radius: 8px;
-
-	background-color: var(--color-background-base);
-	color: var(--color-text-dark);
-	border-bottom: 1px solid $color-primary;
-	margin-bottom: 1em;
-
-	.headline {
-		font-size: 1.35em;
-		font-weight: 600;
-		line-height: 1.5;
-	}
-
-	.sub-headline {
-		font-weight: 600;
-		font-size: 1.1em;
-		text-align: center;
-		line-height: 1.5;
-		padding-top: 1.5em;
-		color: $color-primary;
-	}
-}
-
-.variable-selector {
-	margin: 0 var(--spacing-s);
-}
-</style>
diff --git a/packages/editor-ui/src/components/ExpressionEditModal.vue b/packages/editor-ui/src/components/ExpressionEditModal.vue
new file mode 100644
index 0000000000000..cb58f67a58217
--- /dev/null
+++ b/packages/editor-ui/src/components/ExpressionEditModal.vue
@@ -0,0 +1,336 @@
+<template>
+	<el-dialog
+		width="calc(100vw - var(--spacing-3xl))"
+		append-to-body
+		:class="$style.modal"
+		:model-value="dialogVisible"
+		:before-close="closeDialog"
+	>
+		<button :class="$style.close" @click="closeDialog">
+			<Close height="18" width="18" />
+		</button>
+		<div :class="$style.container">
+			<div :class="$style.sidebar">
+				<N8nInput
+					v-model="search"
+					size="small"
+					:class="$style.search"
+					:placeholder="i18n.baseText('ndv.search.placeholder.input.schema')"
+				>
+					<template #prefix>
+						<N8nIcon :class="$style.ioSearchIcon" icon="search" />
+					</template>
+				</N8nInput>
+
+				<RunDataSchema
+					:class="$style.schema"
+					:search="appliedSearch"
+					:nodes="parentNodes"
+					mapping-enabled
+					pane-type="input"
+					connection-type="main"
+				/>
+			</div>
+
+			<div :class="$style.io">
+				<div :class="$style.input">
+					<div :class="$style.header">
+						<N8nText bold size="large">
+							{{ i18n.baseText('expressionEdit.expression') }}
+						</N8nText>
+						<N8nText
+							:class="$style.tip"
+							size="small"
+							v-html="i18n.baseText('expressionTip.javascript')"
+						/>
+					</div>
+
+					<DraggableTarget :class="$style.editorContainer" type="mapping" @drop="onDrop">
+						<template #default>
+							<ExpressionEditorModalInput
+								ref="expressionInputRef"
+								:model-value="modelValue"
+								:is-read-only="isReadOnly"
+								:path="path"
+								:class="[
+									$style.editor,
+									{
+										'ph-no-capture': redactValues,
+									},
+								]"
+								data-test-id="expression-modal-input"
+								@change="valueChanged"
+								@close="closeDialog"
+							/>
+						</template>
+					</DraggableTarget>
+				</div>
+
+				<div :class="$style.output">
+					<div :class="$style.header">
+						<N8nText bold size="large">
+							{{ i18n.baseText('parameterInput.result') }}
+						</N8nText>
+						<OutputItemSelect />
+					</div>
+
+					<div :class="[$style.editorContainer, { 'ph-no-capture': redactValues }]">
+						<ExpressionOutput
+							ref="expressionResultRef"
+							:class="$style.editor"
+							:segments="segments"
+							:extensions="theme"
+							data-test-id="expression-modal-output"
+						/>
+					</div>
+				</div>
+			</div>
+		</div>
+	</el-dialog>
+</template>
+
+<script setup lang="ts">
+import ExpressionEditorModalInput from '@/components/ExpressionEditorModal/ExpressionEditorModalInput.vue';
+import { computed, ref, toRaw, watch } from 'vue';
+import Close from 'virtual:icons/mdi/close';
+
+import { useExternalHooks } from '@/composables/useExternalHooks';
+import { useNDVStore } from '@/stores/ndv.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { createExpressionTelemetryPayload } from '@/utils/telemetryUtils';
+
+import { useTelemetry } from '@/composables/useTelemetry';
+import type { Segment } from '@/types/expressions';
+import type { INodeProperties } from 'n8n-workflow';
+import { outputTheme } from './ExpressionEditorModal/theme';
+import ExpressionOutput from './InlineExpressionEditor/ExpressionOutput.vue';
+import RunDataSchema from './RunDataSchema.vue';
+import OutputItemSelect from './InlineExpressionEditor/OutputItemSelect.vue';
+import { useI18n } from '@/composables/useI18n';
+import { useDebounce } from '@/composables/useDebounce';
+import DraggableTarget from './DraggableTarget.vue';
+import { dropInEditor } from '@/plugins/codemirror/dragAndDrop';
+
+type Props = {
+	parameter: INodeProperties;
+	path: string;
+	modelValue: string;
+	dialogVisible?: boolean;
+	eventSource?: string;
+	redactValues?: boolean;
+	isReadOnly?: boolean;
+};
+
+const props = withDefaults(defineProps<Props>(), {
+	eventSource: '',
+	dialogVisible: false,
+	redactValues: false,
+	isReadOnly: false,
+});
+const emit = defineEmits<{
+	'update:model-value': [value: string];
+	closeDialog: [];
+}>();
+
+const ndvStore = useNDVStore();
+const workflowsStore = useWorkflowsStore();
+
+const telemetry = useTelemetry();
+const i18n = useI18n();
+const externalHooks = useExternalHooks();
+const { debounce } = useDebounce();
+
+const segments = ref<Segment[]>([]);
+const search = ref('');
+const appliedSearch = ref('');
+const expressionInputRef = ref<InstanceType<typeof ExpressionEditorModalInput>>();
+const expressionResultRef = ref<InstanceType<typeof ExpressionOutput>>();
+const theme = outputTheme();
+
+const activeNode = computed(() => ndvStore.activeNode);
+const workflow = computed(() => workflowsStore.getCurrentWorkflow());
+const inputEditor = computed(() => expressionInputRef.value?.editor);
+const parentNodes = computed(() => {
+	const node = activeNode.value;
+	if (!node) return [];
+	const nodes = workflow.value.getParentNodesByDepth(node.name);
+
+	return nodes.filter(({ name }) => name !== node.name);
+});
+
+watch(
+	() => props.dialogVisible,
+	(newValue) => {
+		const resolvedExpressionValue = expressionResultRef.value?.getValue() ?? '';
+
+		void externalHooks.run('expressionEdit.dialogVisibleChanged', {
+			dialogVisible: newValue,
+			parameter: props.parameter,
+			value: props.modelValue,
+			resolvedExpressionValue,
+		});
+
+		if (!newValue) {
+			const telemetryPayload = createExpressionTelemetryPayload(
+				segments.value,
+				props.modelValue,
+				workflowsStore.workflowId,
+				ndvStore.pushRef,
+				ndvStore.activeNode?.type ?? '',
+			);
+
+			telemetry.track('User closed Expression Editor', telemetryPayload);
+			void externalHooks.run('expressionEdit.closeDialog', telemetryPayload);
+		}
+	},
+);
+
+watch(
+	search,
+	debounce(
+		(newSearch: string) => {
+			appliedSearch.value = newSearch;
+		},
+		{ debounceTime: 500 },
+	),
+);
+
+function valueChanged(update: { value: string; segments: Segment[] }) {
+	segments.value = update.segments;
+	emit('update:model-value', update.value);
+}
+
+function closeDialog() {
+	emit('closeDialog');
+}
+
+async function onDrop(expression: string, event: MouseEvent) {
+	if (!inputEditor.value) return;
+
+	await dropInEditor(toRaw(inputEditor.value), event, expression);
+}
+</script>
+
+<style module lang="scss">
+.modal {
+	--dialog-close-top: var(--spacing-m);
+	display: flex;
+	flex-direction: column;
+	overflow: clip;
+	height: calc(100% - var(--spacing-4xl));
+	margin-bottom: 0;
+
+	:global(.el-dialog__body) {
+		background-color: var(--color-expression-editor-modal-background);
+		height: 100%;
+		padding: var(--spacing-s);
+	}
+
+	:global(.el-dialog__header) {
+		display: none;
+	}
+}
+
+.container {
+	display: flex;
+	flex-flow: row nowrap;
+	gap: var(--spacing-s);
+	height: 100%;
+}
+
+.sidebar {
+	display: flex;
+	flex-direction: column;
+	gap: var(--spacing-s);
+	flex-basis: 360px;
+	flex-shrink: 0;
+	height: 100%;
+}
+
+.schema {
+	height: 100%;
+	overflow-y: auto;
+	padding-right: var(--spacing-4xs);
+}
+
+.editor {
+	display: flex;
+	flex: 1 1 0;
+	font-size: var(--font-size-xs);
+
+	> div {
+		flex: 1 1 0;
+	}
+}
+
+.editorContainer {
+	display: flex;
+	flex: 1 1 0;
+	min-height: 0;
+}
+
+.io {
+	display: flex;
+	flex: 1 1 0;
+	gap: var(--spacing-s);
+}
+
+.input,
+.output {
+	display: flex;
+	flex-direction: column;
+	gap: var(--spacing-2xs);
+	flex: 1 1 0;
+}
+
+.output {
+	[aria-readonly] {
+		background: var(--color-background-light);
+	}
+}
+
+.header {
+	display: flex;
+	flex-direction: column;
+
+	gap: var(--spacing-5xs);
+}
+
+.tip {
+	min-height: 22px;
+}
+
+.close {
+	display: flex;
+	border: none;
+	background: none;
+	cursor: pointer;
+	padding: var(--spacing-4xs);
+	position: absolute;
+	right: var(--spacing-s);
+	top: var(--spacing-s);
+	color: var(--color-button-secondary-font);
+
+	&:hover,
+	&:active {
+		color: var(--color-primary);
+	}
+}
+
+@media (max-width: $breakpoint-md) {
+	.io {
+		flex-direction: column;
+	}
+
+	.input,
+	.output {
+		height: 50%;
+	}
+
+	.header {
+		flex-direction: row;
+		align-items: baseline;
+		gap: var(--spacing-2xs);
+	}
+}
+</style>
diff --git a/packages/editor-ui/src/components/ExpressionEditorModal/ExpressionEditorModalInput.vue b/packages/editor-ui/src/components/ExpressionEditorModal/ExpressionEditorModalInput.vue
index 78c4400030df3..68a65ada6e84f 100644
--- a/packages/editor-ui/src/components/ExpressionEditorModal/ExpressionEditorModalInput.vue
+++ b/packages/editor-ui/src/components/ExpressionEditorModal/ExpressionEditorModalInput.vue
@@ -5,8 +5,8 @@
 <script setup lang="ts">
 import { history } from '@codemirror/commands';
 import { Prec } from '@codemirror/state';
-import { EditorView, keymap } from '@codemirror/view';
-import { computed, onMounted, ref, toValue, watch } from 'vue';
+import { dropCursor, EditorView, keymap } from '@codemirror/view';
+import { computed, onMounted, ref, watch } from 'vue';
 
 import { expressionInputHandler } from '@/plugins/codemirror/inputHandlers/expression.inputHandler';
 import { n8nAutocompletion, n8nLang } from '@/plugins/codemirror/n8nLang';
@@ -14,7 +14,6 @@ import { forceParse } from '@/utils/forceParse';
 import { completionStatus } from '@codemirror/autocomplete';
 import { inputTheme } from './theme';
 
-import type { IVariableItemSelected } from '@/Interface';
 import { useExpressionEditor } from '@/composables/useExpressionEditor';
 import {
 	autocompleteKeyMap,
@@ -22,9 +21,10 @@ import {
 	historyKeyMap,
 	tabKeyMap,
 } from '@/plugins/codemirror/keymap';
+import { infoBoxTooltips } from '@/plugins/codemirror/tooltips/InfoBoxTooltip';
 import type { Segment } from '@/types/expressions';
 import { removeExpressionPrefix } from '@/utils/expressions';
-import { infoBoxTooltips } from '@/plugins/codemirror/tooltips/InfoBoxTooltip';
+import { mappingDropCursor } from '@/plugins/codemirror/dragAndDrop';
 
 type Props = {
 	modelValue: string;
@@ -44,7 +44,7 @@ const emit = defineEmits<{
 
 const root = ref<HTMLElement>();
 const extensions = computed(() => [
-	inputTheme(),
+	inputTheme(props.isReadOnly),
 	Prec.highest(
 		keymap.of([
 			...tabKeyMap(),
@@ -65,6 +65,8 @@ const extensions = computed(() => [
 	),
 	n8nLang(),
 	n8nAutocompletion(),
+	mappingDropCursor(),
+	dropCursor(),
 	history(),
 	expressionInputHandler(),
 	EditorView.lineWrapping,
@@ -72,14 +74,7 @@ const extensions = computed(() => [
 	infoBoxTooltips(),
 ]);
 const editorValue = ref<string>(removeExpressionPrefix(props.modelValue));
-const {
-	editor: editorRef,
-	segments,
-	readEditorValue,
-	setCursorPosition,
-	hasFocus,
-	focus,
-} = useExpressionEditor({
+const { segments, readEditorValue, editor, hasFocus, focus } = useExpressionEditor({
 	editorRef: root,
 	editorValue,
 	extensions,
@@ -111,45 +106,11 @@ onMounted(() => {
 	focus();
 });
 
-function itemSelected({ variable }: IVariableItemSelected) {
-	const editor = toValue(editorRef);
-
-	if (!editor || props.isReadOnly) return;
-
-	const OPEN_MARKER = '{{';
-	const CLOSE_MARKER = '}}';
-
-	const { selection, doc } = editor.state;
-	const { head } = selection.main;
-
-	const isInsideResolvable =
-		editor.state.sliceDoc(0, head).includes(OPEN_MARKER) &&
-		editor.state.sliceDoc(head, doc.length).includes(CLOSE_MARKER);
-
-	const insert = isInsideResolvable ? variable : [OPEN_MARKER, variable, CLOSE_MARKER].join(' ');
-
-	editor.dispatch({
-		changes: {
-			from: head,
-			insert,
-		},
-	});
-
-	focus();
-	setCursorPosition(head + insert.length);
-}
-
-defineExpose({ itemSelected });
+defineExpose({ editor });
 </script>
 
 <style lang="scss" module>
-.editor div[contenteditable='false'] {
-	background-color: var(--disabled-fill, var(--color-background-light));
-	cursor: not-allowed;
-}
-</style>
-<style lang="scss" scoped>
-:deep(.cm-content) {
+:global(.cm-content) {
 	border-radius: var(--border-radius-base);
 }
 </style>
diff --git a/packages/editor-ui/src/components/ExpressionEditorModal/theme.ts b/packages/editor-ui/src/components/ExpressionEditorModal/theme.ts
index f47f7c1535ec3..a35a18643f9be 100644
--- a/packages/editor-ui/src/components/ExpressionEditorModal/theme.ts
+++ b/packages/editor-ui/src/components/ExpressionEditorModal/theme.ts
@@ -1,7 +1,7 @@
 import { EditorView } from '@codemirror/view';
 import { highlighter } from '@/plugins/codemirror/resolvableHighlighter';
 
-const commonThemeProps = {
+const commonThemeProps = (isReadOnly = false) => ({
 	'&': {
 		borderWidth: 'var(--border-width-base)',
 		borderStyle: 'var(--input-border-style, var(--border-style-base))',
@@ -9,31 +9,33 @@ const commonThemeProps = {
 		borderRadius: 'var(--input-border-radius, var(--border-radius-base))',
 		backgroundColor: 'var(--color-expression-editor-background)',
 	},
+	'.cm-cursor, .cm-dropCursor': {
+		borderLeftColor: 'var(--color-code-caret)',
+	},
 	'&.cm-focused': {
 		borderColor: 'var(--color-secondary)',
 		outline: '0 !important',
 	},
 	'.cm-content': {
 		fontFamily: 'var(--font-family-monospace)',
-		height: '220px',
 		padding: 'var(--spacing-xs)',
 		color: 'var(--input-font-color, var(--color-text-dark))',
-		caretColor: 'var(--color-code-caret)',
+		caretColor: isReadOnly ? 'transparent' : 'var(--color-code-caret)',
 	},
 	'.cm-line': {
 		padding: '0',
 	},
-};
+});
 
-export const inputTheme = () => {
-	const theme = EditorView.theme(commonThemeProps);
+export const inputTheme = (isReadOnly = false) => {
+	const theme = EditorView.theme(commonThemeProps(isReadOnly));
 
 	return [theme, highlighter.resolvableStyle];
 };
 
 export const outputTheme = () => {
 	const theme = EditorView.theme({
-		...commonThemeProps,
+		...commonThemeProps(true),
 		'.cm-valid-resolvable': {
 			padding: '0 2px',
 			borderRadius: '2px',
diff --git a/packages/editor-ui/src/components/ExpressionParameterInput.vue b/packages/editor-ui/src/components/ExpressionParameterInput.vue
index 5618c3ae269d1..86e4c540a2ed9 100644
--- a/packages/editor-ui/src/components/ExpressionParameterInput.vue
+++ b/packages/editor-ui/src/components/ExpressionParameterInput.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { computed, ref, watch } from 'vue';
+import { computed, nextTick, onBeforeUnmount, onMounted, ref, toRaw, watch } from 'vue';
 
 import ExpressionFunctionIcon from '@/components/ExpressionFunctionIcon.vue';
 import InlineExpressionEditorInput from '@/components/InlineExpressionEditor/InlineExpressionEditorInput.vue';
@@ -9,10 +9,12 @@ import { useWorkflowsStore } from '@/stores/workflows.store';
 import { createExpressionTelemetryPayload } from '@/utils/telemetryUtils';
 
 import { useTelemetry } from '@/composables/useTelemetry';
+import { dropInEditor } from '@/plugins/codemirror/dragAndDrop';
 import type { Segment } from '@/types/expressions';
-import { createEventBus, type EventBus } from 'n8n-design-system/utils';
-import type { IDataObject } from 'n8n-workflow';
+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';
 
 const isFocused = ref(false);
 const segments = ref<Segment[]>([]);
@@ -25,9 +27,9 @@ type Props = {
 	modelValue: string;
 	rows?: number;
 	additionalExpressionData?: IDataObject;
-	eventBus?: EventBus;
 	isReadOnly?: boolean;
 	isAssignment?: boolean;
+	eventBus?: EventBus;
 };
 
 const props = withDefaults(defineProps<Props>(), {
@@ -109,6 +111,45 @@ function onSelectionChange({
 	selection.value = newSelection;
 }
 
+async function onDrop(value: string, event: MouseEvent) {
+	if (!inlineInput.value) return;
+	const { editor, setCursorPosition } = inlineInput.value;
+
+	if (!editor) return;
+
+	const droppedSelection = await dropInEditor(toRaw(editor), event, value);
+
+	if (!ndvStore.isAutocompleteOnboarded) {
+		setCursorPosition((droppedSelection.ranges.at(0)?.head ?? 3) - 3);
+		setTimeout(() => {
+			startCompletion(editor);
+		});
+	}
+}
+
+async function onDropOnFixedInput() {
+	await nextTick();
+
+	if (!inlineInput.value) return;
+	const { editor, setCursorPosition } = inlineInput.value;
+
+	if (!editor || ndvStore.isAutocompleteOnboarded) return;
+
+	setCursorPosition('lastExpression');
+	setTimeout(() => {
+		focus();
+		startCompletion(editor);
+	});
+}
+
+onMounted(() => {
+	props.eventBus.on('drop', onDropOnFixedInput);
+});
+
+onBeforeUnmount(() => {
+	props.eventBus.off('drop', onDropOnFixedInput);
+});
+
 watch(isDragging, (newIsDragging) => {
 	if (newIsDragging) {
 		onBlur();
@@ -134,19 +175,23 @@ defineExpose({ focus });
 				<span v-if="isAssignment">=</span>
 				<ExpressionFunctionIcon v-else />
 			</div>
-			<InlineExpressionEditorInput
-				ref="inlineInput"
-				:model-value="modelValue"
-				:path="path"
-				:is-read-only="isReadOnly"
-				:rows="rows"
-				:additional-data="additionalExpressionData"
-				:event-bus="eventBus"
-				@focus="onFocus"
-				@blur="onBlur"
-				@update:model-value="onValueChange"
-				@update:selection="onSelectionChange"
-			/>
+			<DraggableTarget type="mapping" :disabled="isReadOnly" @drop="onDrop">
+				<template #default="{ activeDrop, droppable }">
+					<InlineExpressionEditorInput
+						ref="inlineInput"
+						:model-value="modelValue"
+						:path="path"
+						:is-read-only="isReadOnly"
+						:rows="rows"
+						:additional-data="additionalExpressionData"
+						:class="{ [$style.activeDrop]: activeDrop, [$style.droppable]: droppable }"
+						@focus="onFocus"
+						@blur="onBlur"
+						@update:model-value="onValueChange"
+						@update:selection="onSelectionChange"
+					/>
+				</template>
+			</DraggableTarget>
 			<n8n-button
 				v-if="!isDragging"
 				square
@@ -240,4 +285,26 @@ defineExpose({ focus });
 	border-bottom-right-radius: 0;
 	background-color: var(--color-code-background);
 }
+
+.droppable {
+	--input-border-color: var(--color-ndv-droppable-parameter);
+	--input-border-right-color: var(--color-ndv-droppable-parameter);
+	--input-border-style: dashed;
+
+	:global(.cm-editor) {
+		border-width: 1.5px;
+	}
+}
+
+.activeDrop {
+	--input-border-color: var(--color-success);
+	--input-border-right-color: var(--color-success);
+	--input-background-color: var(--color-foreground-xlight);
+	--input-border-style: solid;
+
+	:global(.cm-editor) {
+		cursor: grabbing !important;
+		border-width: 1px;
+	}
+}
 </style>
diff --git a/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorInput.vue b/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorInput.vue
index 96f263fb03bdc..19a869b2e694d 100644
--- a/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorInput.vue
+++ b/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorInput.vue
@@ -1,11 +1,11 @@
 <script setup lang="ts">
-import { startCompletion } from '@codemirror/autocomplete';
 import { history } from '@codemirror/commands';
 import { type EditorState, Prec, type SelectionRange } from '@codemirror/state';
-import { EditorView, keymap } from '@codemirror/view';
-import { computed, nextTick, onBeforeUnmount, onMounted, ref, toValue, watch } from 'vue';
+import { dropCursor, EditorView, keymap } from '@codemirror/view';
+import { computed, ref, watch } from 'vue';
 
 import { useExpressionEditor } from '@/composables/useExpressionEditor';
+import { mappingDropCursor } from '@/plugins/codemirror/dragAndDrop';
 import { expressionInputHandler } from '@/plugins/codemirror/inputHandlers/expression.inputHandler';
 import {
 	autocompleteKeyMap,
@@ -14,13 +14,11 @@ import {
 	tabKeyMap,
 } from '@/plugins/codemirror/keymap';
 import { n8nAutocompletion, n8nLang } from '@/plugins/codemirror/n8nLang';
-import { useNDVStore } from '@/stores/ndv.store';
+import { infoBoxTooltips } from '@/plugins/codemirror/tooltips/InfoBoxTooltip';
 import type { Segment } from '@/types/expressions';
 import { removeExpressionPrefix } from '@/utils/expressions';
-import { createEventBus, type EventBus } from 'n8n-design-system/utils';
 import type { IDataObject } from 'n8n-workflow';
 import { inputTheme } from './theme';
-import { infoBoxTooltips } from '@/plugins/codemirror/tooltips/InfoBoxTooltip';
 
 type Props = {
 	modelValue: string;
@@ -28,14 +26,12 @@ type Props = {
 	rows?: number;
 	isReadOnly?: boolean;
 	additionalData?: IDataObject;
-	eventBus?: EventBus;
 };
 
 const props = withDefaults(defineProps<Props>(), {
 	rows: 5,
 	isReadOnly: false,
 	additionalData: () => ({}),
-	eventBus: () => createEventBus(),
 });
 
 const emit = defineEmits<{
@@ -44,8 +40,6 @@ const emit = defineEmits<{
 	focus: [];
 }>();
 
-const ndvStore = useNDVStore();
-
 const root = ref<HTMLElement>();
 const extensions = computed(() => [
 	Prec.highest(
@@ -55,6 +49,8 @@ const extensions = computed(() => [
 	n8nAutocompletion(),
 	inputTheme({ isReadOnly: props.isReadOnly, rows: props.rows }),
 	history(),
+	mappingDropCursor(),
+	dropCursor(),
 	expressionInputHandler(),
 	EditorView.lineWrapping,
 	infoBoxTooltips(),
@@ -77,32 +73,6 @@ const {
 	additionalData: props.additionalData,
 });
 
-defineExpose({
-	focus: () => {
-		if (!hasFocus.value) {
-			setCursorPosition('lastExpression');
-			focus();
-		}
-	},
-});
-
-async function onDrop() {
-	await nextTick();
-
-	const editor = toValue(editorRef);
-	if (!editor) return;
-
-	focus();
-
-	setCursorPosition('lastExpression');
-
-	if (!ndvStore.isAutocompleteOnboarded) {
-		setTimeout(() => {
-			startCompletion(editor);
-		});
-	}
-}
-
 watch(
 	() => props.modelValue,
 	(newValue) => {
@@ -130,12 +100,15 @@ watch(hasFocus, (focused) => {
 	if (focused) emit('focus');
 });
 
-onMounted(() => {
-	props.eventBus.on('drop', onDrop);
-});
-
-onBeforeUnmount(() => {
-	props.eventBus.off('drop', onDrop);
+defineExpose({
+	editor: editorRef,
+	setCursorPosition,
+	focus: () => {
+		if (!hasFocus.value) {
+			setCursorPosition('lastExpression');
+			focus();
+		}
+	},
 });
 </script>
 
diff --git a/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorOutput.vue b/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorOutput.vue
index ff0eaa673237f..634c8d340f201 100644
--- a/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorOutput.vue
+++ b/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorOutput.vue
@@ -2,13 +2,13 @@
 import type { EditorState, SelectionRange } from '@codemirror/state';
 
 import { useI18n } from '@/composables/useI18n';
+import { useNDVStore } from '@/stores/ndv.store';
 import type { Segment } from '@/types/expressions';
+import { onBeforeUnmount } from 'vue';
 import ExpressionOutput from './ExpressionOutput.vue';
+import OutputItemSelect from './OutputItemSelect.vue';
 import InlineExpressionTip from './InlineExpressionTip.vue';
 import { outputTheme } from './theme';
-import { computed, onBeforeUnmount } from 'vue';
-import { useNDVStore } from '@/stores/ndv.store';
-import { N8nTooltip } from 'n8n-design-system/components';
 
 interface InlineExpressionEditorOutputProps {
 	segments: Segment[];
@@ -29,31 +29,6 @@ const i18n = useI18n();
 const theme = outputTheme();
 const ndvStore = useNDVStore();
 
-const hideTableHoverHint = computed(() => ndvStore.isTableHoverOnboarded);
-const hoveringItem = computed(() => ndvStore.getHoveringItem);
-const hoveringItemIndex = computed(() => hoveringItem.value?.itemIndex);
-const isHoveringItem = computed(() => Boolean(hoveringItem.value));
-const itemsLength = computed(() => ndvStore.ndvInputDataWithPinnedData.length);
-const itemIndex = computed(() => hoveringItemIndex.value ?? ndvStore.expressionOutputItemIndex);
-const max = computed(() => Math.max(itemsLength.value - 1, 0));
-const isItemIndexEditable = computed(() => !isHoveringItem.value && itemsLength.value > 0);
-const canSelectPrevItem = computed(() => isItemIndexEditable.value && itemIndex.value !== 0);
-const canSelectNextItem = computed(
-	() => isItemIndexEditable.value && itemIndex.value < itemsLength.value - 1,
-);
-
-function updateItemIndex(index: number) {
-	ndvStore.expressionOutputItemIndex = index;
-}
-
-function nextItem() {
-	ndvStore.expressionOutputItemIndex = ndvStore.expressionOutputItemIndex + 1;
-}
-
-function prevItem() {
-	ndvStore.expressionOutputItemIndex = ndvStore.expressionOutputItemIndex - 1;
-}
-
 onBeforeUnmount(() => {
 	ndvStore.expressionOutputItemIndex = 0;
 });
@@ -66,48 +41,7 @@ onBeforeUnmount(() => {
 				{{ i18n.baseText('parameterInput.result') }}
 			</n8n-text>
 
-			<div :class="$style.item">
-				<n8n-text size="small" color="text-base" compact>
-					{{ i18n.baseText('parameterInput.item') }}
-				</n8n-text>
-
-				<div :class="$style.controls">
-					<N8nInputNumber
-						data-test-id="inline-expression-editor-item-input"
-						size="mini"
-						:controls="false"
-						:class="[$style.input, { [$style.hovering]: isHoveringItem }]"
-						:min="0"
-						:max="max"
-						:model-value="itemIndex"
-						@update:model-value="updateItemIndex"
-					></N8nInputNumber>
-					<N8nIconButton
-						data-test-id="inline-expression-editor-item-prev"
-						icon="chevron-left"
-						type="tertiary"
-						text
-						size="mini"
-						:disabled="!canSelectPrevItem"
-						@click="prevItem"
-					></N8nIconButton>
-
-					<N8nTooltip placement="right" :disabled="hideTableHoverHint">
-						<template #content>
-							<div>{{ i18n.baseText('parameterInput.hoverTableItemTip') }}</div>
-						</template>
-						<N8nIconButton
-							data-test-id="inline-expression-editor-item-next"
-							icon="chevron-right"
-							type="tertiary"
-							text
-							size="mini"
-							:disabled="!canSelectNextItem"
-							@click="nextItem"
-						></N8nIconButton>
-					</N8nTooltip>
-				</div>
-			</div>
+			<OutputItemSelect />
 		</div>
 		<n8n-text :class="$style.body">
 			<ExpressionOutput
@@ -164,12 +98,6 @@ onBeforeUnmount(() => {
 		padding-top: var(--spacing-2xs);
 	}
 
-	.item {
-		display: flex;
-		align-items: center;
-		gap: var(--spacing-4xs);
-	}
-
 	.body {
 		padding-top: 0;
 		padding-left: var(--spacing-2xs);
@@ -179,33 +107,5 @@ onBeforeUnmount(() => {
 			padding-top: var(--spacing-2xs);
 		}
 	}
-
-	.controls {
-		display: flex;
-		align-items: center;
-	}
-
-	.input {
-		--input-height: 22px;
-		--input-width: 26px;
-		--input-border-top-left-radius: var(--border-radius-base);
-		--input-border-bottom-left-radius: var(--border-radius-base);
-		--input-border-top-right-radius: var(--border-radius-base);
-		--input-border-bottom-right-radius: var(--border-radius-base);
-		max-width: var(--input-width);
-		line-height: calc(var(--input-height) - var(--spacing-4xs));
-
-		&.hovering {
-			--input-font-color: var(--color-secondary);
-		}
-
-		:global(.el-input__inner) {
-			height: var(--input-height);
-			min-height: var(--input-height);
-			line-height: var(--input-height);
-			text-align: center;
-			padding: 0 var(--spacing-4xs);
-		}
-	}
 }
 </style>
diff --git a/packages/editor-ui/src/components/InlineExpressionEditor/OutputItemSelect.vue b/packages/editor-ui/src/components/InlineExpressionEditor/OutputItemSelect.vue
new file mode 100644
index 0000000000000..6845b77bf5c74
--- /dev/null
+++ b/packages/editor-ui/src/components/InlineExpressionEditor/OutputItemSelect.vue
@@ -0,0 +1,114 @@
+<script setup lang="ts">
+import { useI18n } from '@/composables/useI18n';
+import { useNDVStore } from '@/stores/ndv.store';
+import { computed } from 'vue';
+
+const i18n = useI18n();
+const ndvStore = useNDVStore();
+
+const hoveringItem = computed(() => ndvStore.getHoveringItem);
+const hoveringItemIndex = computed(() => hoveringItem.value?.itemIndex);
+const isHoveringItem = computed(() => Boolean(hoveringItem.value));
+const itemsLength = computed(() => ndvStore.ndvInputDataWithPinnedData.length);
+const itemIndex = computed(() => hoveringItemIndex.value ?? ndvStore.expressionOutputItemIndex);
+const max = computed(() => Math.max(itemsLength.value - 1, 0));
+const isItemIndexEditable = computed(() => !isHoveringItem.value && itemsLength.value > 0);
+const hideTableHoverHint = computed(() => ndvStore.isTableHoverOnboarded);
+const canSelectPrevItem = computed(() => isItemIndexEditable.value && itemIndex.value !== 0);
+const canSelectNextItem = computed(
+	() => isItemIndexEditable.value && itemIndex.value < itemsLength.value - 1,
+);
+
+function updateItemIndex(index: number) {
+	ndvStore.expressionOutputItemIndex = index;
+}
+
+function nextItem() {
+	ndvStore.expressionOutputItemIndex = ndvStore.expressionOutputItemIndex + 1;
+}
+
+function prevItem() {
+	ndvStore.expressionOutputItemIndex = ndvStore.expressionOutputItemIndex - 1;
+}
+</script>
+
+<template>
+	<div :class="$style.item">
+		<n8n-text size="small" color="text-base" compact>
+			{{ i18n.baseText('parameterInput.item') }}
+		</n8n-text>
+
+		<div :class="$style.controls">
+			<N8nInputNumber
+				data-test-id="inline-expression-editor-item-input"
+				size="mini"
+				:controls="false"
+				:class="[$style.input, { [$style.hovering]: isHoveringItem }]"
+				:min="0"
+				:max="max"
+				:model-value="itemIndex"
+				@update:model-value="updateItemIndex"
+			></N8nInputNumber>
+			<N8nIconButton
+				data-test-id="inline-expression-editor-item-prev"
+				icon="chevron-left"
+				type="tertiary"
+				text
+				size="mini"
+				:disabled="!canSelectPrevItem"
+				@click="prevItem"
+			></N8nIconButton>
+
+			<N8nTooltip placement="right" :disabled="hideTableHoverHint">
+				<template #content>
+					<div>{{ i18n.baseText('parameterInput.hoverTableItemTip') }}</div>
+				</template>
+				<N8nIconButton
+					data-test-id="inline-expression-editor-item-next"
+					icon="chevron-right"
+					type="tertiary"
+					text
+					size="mini"
+					:disabled="!canSelectNextItem"
+					@click="nextItem"
+				></N8nIconButton>
+			</N8nTooltip>
+		</div>
+	</div>
+</template>
+
+<style lang="scss" module>
+.item {
+	display: flex;
+	align-items: center;
+	gap: var(--spacing-4xs);
+}
+
+.controls {
+	display: flex;
+	align-items: center;
+}
+
+.input {
+	--input-height: 22px;
+	--input-width: 26px;
+	--input-border-top-left-radius: var(--border-radius-base);
+	--input-border-bottom-left-radius: var(--border-radius-base);
+	--input-border-top-right-radius: var(--border-radius-base);
+	--input-border-bottom-right-radius: var(--border-radius-base);
+	max-width: var(--input-width);
+	line-height: calc(var(--input-height) - var(--spacing-4xs));
+
+	&.hovering {
+		--input-font-color: var(--color-secondary);
+	}
+
+	:global(.el-input__inner) {
+		height: var(--input-height);
+		min-height: var(--input-height);
+		line-height: var(--input-height);
+		text-align: center;
+		padding: 0 var(--spacing-4xs);
+	}
+}
+</style>
diff --git a/packages/editor-ui/src/components/InlineExpressionEditor/theme.ts b/packages/editor-ui/src/components/InlineExpressionEditor/theme.ts
index 384cf4a01f1a6..732996f6b7c74 100644
--- a/packages/editor-ui/src/components/InlineExpressionEditor/theme.ts
+++ b/packages/editor-ui/src/components/InlineExpressionEditor/theme.ts
@@ -41,6 +41,9 @@ export const inputTheme = ({ rows, isReadOnly } = { rows: 5, isReadOnly: false }
 				'var(--input-border-bottom-right-radius, var(--input-border-radius, var(--border-radius-base)))',
 			backgroundColor: 'white',
 		},
+		'.cm-cursor, .cm-dropCursor': {
+			borderLeftColor: 'var(--color-code-caret)',
+		},
 		'.cm-scroller': {
 			lineHeight: '1.68',
 		},
diff --git a/packages/editor-ui/src/components/ParameterInput.vue b/packages/editor-ui/src/components/ParameterInput.vue
index 0e6517ced65c5..533ad6c49d3cb 100644
--- a/packages/editor-ui/src/components/ParameterInput.vue
+++ b/packages/editor-ui/src/components/ParameterInput.vue
@@ -1,16 +1,18 @@
 <template>
 	<div ref="wrapper" :class="parameterInputClasses" @keydown.stop>
-		<ExpressionEdit
+		<ExpressionEditModal
 			:dialog-visible="expressionEditDialogVisible"
 			:model-value="modelValueExpressionEdit"
 			:parameter="parameter"
+			:node="node"
 			:path="path"
 			:event-source="eventSource || 'ndv'"
 			:is-read-only="isReadOnly"
 			:redact-values="shouldRedactValue"
 			@close-dialog="closeExpressionEditDialog"
 			@update:model-value="expressionUpdated"
-		></ExpressionEdit>
+		></ExpressionEditModal>
+
 		<div class="parameter-input ignore-key-press" :style="parameterInputWrapperStyle">
 			<ResourceLocator
 				v-if="isResourceLocatorParameter"
@@ -497,7 +499,7 @@ import { CREDENTIAL_EMPTY_VALUE, NodeHelpers } from 'n8n-workflow';
 
 import CodeNodeEditor from '@/components/CodeNodeEditor/CodeNodeEditor.vue';
 import CredentialsSelect from '@/components/CredentialsSelect.vue';
-import ExpressionEdit from '@/components/ExpressionEdit.vue';
+import ExpressionEditModal from '@/components/ExpressionEditModal.vue';
 import ExpressionParameterInput from '@/components/ExpressionParameterInput.vue';
 import HtmlEditor from '@/components/HtmlEditor/HtmlEditor.vue';
 import JsEditor from '@/components/JsEditor/JsEditor.vue';
diff --git a/packages/editor-ui/src/components/ParameterInputFull.vue b/packages/editor-ui/src/components/ParameterInputFull.vue
index 807eaa5e42139..f2107df7db988 100644
--- a/packages/editor-ui/src/components/ParameterInputFull.vue
+++ b/packages/editor-ui/src/components/ParameterInputFull.vue
@@ -24,13 +24,12 @@
 		<DraggableTarget
 			type="mapping"
 			:disabled="isDropDisabled"
-			:sticky="true"
-			:sticky-offset="isExpression ? [26, 3] : [3, 3]"
+			sticky
+			:sticky-offset="[3, 3]"
 			@drop="onDrop"
 		>
 			<template #default="{ droppable, activeDrop }">
 				<ParameterInputWrapper
-					ref="param"
 					:parameter="parameter"
 					:model-value="value"
 					:path="path"
@@ -79,7 +78,6 @@
 
 <script setup lang="ts">
 import { computed, ref } from 'vue';
-
 import type { IUpdateInformation } from '@/Interface';
 
 import DraggableTarget from '@/components/DraggableTarget.vue';
@@ -141,7 +139,11 @@ const isInputTypeString = computed(() => props.parameter.type === 'string');
 const isInputTypeNumber = computed(() => props.parameter.type === 'number');
 const isResourceLocator = computed(() => props.parameter.type === 'resourceLocator');
 const isDropDisabled = computed(
-	() => props.parameter.noDataExpression || props.isReadOnly || isResourceLocator.value,
+	() =>
+		props.parameter.noDataExpression ||
+		props.isReadOnly ||
+		isResourceLocator.value ||
+		isExpression.value,
 );
 const isExpression = computed(() => isValueExpression(props.parameter, props.value));
 const showExpressionSelector = computed(() =>
diff --git a/packages/editor-ui/src/components/RunData.vue b/packages/editor-ui/src/components/RunData.vue
index d1de4c2b3ec51..a9188f2358efc 100644
--- a/packages/editor-ui/src/components/RunData.vue
+++ b/packages/editor-ui/src/components/RunData.vue
@@ -435,6 +435,7 @@
 					:output-index="currentOutputIndex"
 					:total-runs="maxRunIndex"
 					:search="search"
+					:class="$style.schema"
 					@clear:search="onSearchClear"
 				/>
 			</Suspense>
@@ -2008,6 +2009,10 @@ export default defineComponent({
 	margin-left: var(--spacing-s);
 	margin-right: var(--spacing-s);
 }
+
+.schema {
+	padding: 0 var(--spacing-s);
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/packages/editor-ui/src/components/RunDataSchema.vue b/packages/editor-ui/src/components/RunDataSchema.vue
index 44fe4c683ae5a..c087c39ce0c45 100644
--- a/packages/editor-ui/src/components/RunDataSchema.vue
+++ b/packages/editor-ui/src/components/RunDataSchema.vue
@@ -7,11 +7,12 @@ import NodeIcon from '@/components/NodeIcon.vue';
 import Draggable from '@/components/Draggable.vue';
 import { useNDVStore } from '@/stores/ndv.store';
 import { telemetry } from '@/plugins/telemetry';
-import type {
-	ConnectionTypes,
-	IConnectedNode,
-	IDataObject,
-	INodeTypeDescription,
+import {
+	NodeConnectionType,
+	type ConnectionTypes,
+	type IConnectedNode,
+	type IDataObject,
+	type INodeTypeDescription,
 } from 'n8n-workflow';
 import { useExternalHooks } from '@/composables/useExternalHooks';
 import { i18n } from '@/plugins/i18n';
@@ -27,13 +28,13 @@ type Props = {
 	nodes?: IConnectedNode[];
 	node?: INodeUi | null;
 	data?: IDataObject[];
-	mappingEnabled: boolean;
-	runIndex: number;
-	outputIndex: number;
-	totalRuns: number;
+	mappingEnabled?: boolean;
+	runIndex?: number;
+	outputIndex?: number;
+	totalRuns?: number;
 	paneType: 'input' | 'output';
-	connectionType: ConnectionTypes;
-	search: string;
+	connectionType?: ConnectionTypes;
+	search?: string;
 };
 
 type SchemaNode = {
@@ -51,6 +52,12 @@ const props = withDefaults(defineProps<Props>(), {
 	distanceFromActive: 1,
 	node: null,
 	data: undefined,
+	runIndex: 0,
+	outputIndex: 0,
+	totalRuns: 1,
+	connectionType: NodeConnectionType.Main,
+	search: '',
+	mappingEnabled: false,
 });
 
 const draggingPath = ref<string>('');
@@ -414,9 +421,7 @@ watch(
 	--title-spacing-left: 38px;
 	display: flex;
 	flex-direction: column;
-	padding: 0 0 var(--spacing-s) var(--spacing-s);
 	container: schema / inline-size;
-	min-height: 100%;
 
 	&.animating {
 		overflow: hidden;
@@ -437,7 +442,6 @@ watch(
 
 .schema {
 	display: grid;
-	padding-right: var(--spacing-s);
 	grid-template-rows: 1fr;
 
 	&.animated {
@@ -480,7 +484,6 @@ watch(
 	top: 0;
 	z-index: 1;
 	padding-bottom: var(--spacing-2xs);
-	padding-right: var(--spacing-s);
 	background: var(--color-run-data-background);
 }
 
diff --git a/packages/editor-ui/src/components/VariableSelector.vue b/packages/editor-ui/src/components/VariableSelector.vue
deleted file mode 100644
index 9d380083f1da9..0000000000000
--- a/packages/editor-ui/src/components/VariableSelector.vue
+++ /dev/null
@@ -1,889 +0,0 @@
-<script setup lang="ts">
-import { ref, computed } from 'vue';
-import { useRouter } from 'vue-router';
-import { storeToRefs } from 'pinia';
-import { PLACEHOLDER_FILLED_AT_EXECUTION_TIME, STICKY_NODE_TYPE } from '@/constants';
-
-import type {
-	GenericValue,
-	IContextObject,
-	IDataObject,
-	INodeExecutionData,
-	IPinData,
-	IRunData,
-	IRunExecutionData,
-	IWorkflowDataProxyAdditionalKeys,
-	Workflow,
-} from 'n8n-workflow';
-import { NodeConnectionType, WorkflowDataProxy } from 'n8n-workflow';
-
-import VariableSelectorItem from '@/components/VariableSelectorItem.vue';
-import type { IVariableItemSelected, IVariableSelectorOption } from '@/Interface';
-
-import { useWorkflowsStore } from '@/stores/workflows.store';
-import { useNDVStore } from '@/stores/ndv.store';
-import { useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
-import { useI18n } from '@/composables/useI18n';
-import { escapeMappingString } from '@/utils/mappingUtils';
-
-// Node types that should not be displayed in variable selector
-const SKIPPED_NODE_TYPES = [STICKY_NODE_TYPE];
-
-const props = defineProps<{
-	path: string;
-	redactValues: boolean;
-}>();
-
-const emit = defineEmits<{
-	itemSelected: [value: IVariableItemSelected];
-}>();
-
-const router = useRouter();
-const i18n = useI18n();
-const workflowHelpers = useWorkflowHelpers({ router });
-
-const workflowsStore = useWorkflowsStore();
-const ndvStore = useNDVStore();
-
-const { activeNode } = storeToRefs(ndvStore);
-
-const variableFilter = ref('');
-
-const extendAll = computed(() => !!variableFilter.value);
-
-const currentResults = computed(() => getFilterResults(variableFilter.value.toLowerCase(), 0));
-
-const workflow = computed(() => workflowHelpers.getCurrentWorkflow());
-
-// Helper functions
-
-/**
- * Sorts the options alphabetically. Categories get sorted before items.
- */
-function sortOptions(options: IVariableSelectorOption[] | null): IVariableSelectorOption[] | null {
-	if (options === null) {
-		return null;
-	}
-	return options.sort((a: IVariableSelectorOption, b: IVariableSelectorOption) => {
-		const aHasOptions = a.hasOwnProperty('options');
-		const bHasOptions = b.hasOwnProperty('options');
-
-		if (bHasOptions && !aHasOptions) {
-			// When b has options but a not list it first
-			return 1;
-		} else if (!bHasOptions && aHasOptions) {
-			// When a has options but b not list it first
-			return -1;
-		}
-
-		// Else simply sort alphabetically
-		if (a.name < b.name) {
-			return -1;
-		}
-		if (a.name > b.name) {
-			return 1;
-		}
-		return 0;
-	});
-}
-
-/**
- * Removes all empty entries from the list
- */
-function removeEmptyEntries(
-	inputData: IVariableSelectorOption[] | IVariableSelectorOption | null,
-): IVariableSelectorOption[] | IVariableSelectorOption | null {
-	if (Array.isArray(inputData)) {
-		const newItems: IVariableSelectorOption[] = [];
-		let tempItem: IVariableSelectorOption;
-		inputData.forEach((item) => {
-			tempItem = removeEmptyEntries(item) as IVariableSelectorOption;
-			if (tempItem !== null) {
-				newItems.push(tempItem);
-			}
-		});
-		return newItems;
-	}
-
-	if (inputData?.options) {
-		const newOptions = removeEmptyEntries(inputData.options);
-		if (Array.isArray(newOptions) && newOptions.length) {
-			// Has still options left so return
-			inputData.options = newOptions;
-			return inputData;
-		} else if (Array.isArray(newOptions) && newOptions.length === 0) {
-			delete inputData.options;
-			return inputData;
-		}
-		// Has no options left so remove
-		return null;
-	} else {
-		// Is an item no category
-		return inputData;
-	}
-}
-
-/**
- * Normalizes the path so compare paths which have use dots or brakets
- */
-function getPathNormalized(path: string | undefined): string {
-	if (path === undefined) {
-		return '';
-	}
-	const pathArray = path.split('.');
-
-	const finalArray = [];
-	let item: string;
-	for (const pathPart of pathArray) {
-		const pathParts = pathPart.match(/\[.*?\]/g);
-		if (pathParts === null) {
-			// Does not have any brakets so add as it is
-			finalArray.push(pathPart);
-		} else {
-			// Has brakets so clean up the items and add them
-			if (pathPart.charAt(0) !== '[') {
-				// Does not start with a braket so there is a part before
-				// we have to add
-				finalArray.push(pathPart.substr(0, pathPart.indexOf('[')));
-			}
-
-			for (item of pathParts) {
-				item = item.slice(1, -1);
-				if (['"', "'"].includes(item.charAt(0))) {
-					// Is a string
-					item = item.slice(1, -1);
-					finalArray.push(item);
-				} else {
-					// Is a number
-					finalArray.push(`[${item}]`);
-				}
-			}
-		}
-	}
-
-	return finalArray.join('|');
-}
-
-function jsonDataToFilterOption(
-	inputData: IDataObject | GenericValue | IDataObject[] | GenericValue[] | null,
-	parentPath: string,
-	propertyName: string,
-	filterText?: string,
-	propertyIndex?: number,
-	displayName?: string,
-	skipKey?: string,
-): IVariableSelectorOption[] {
-	let fullpath = `${parentPath}["${propertyName}"]`;
-	if (propertyIndex !== undefined) {
-		fullpath += `[${propertyIndex}]`;
-	}
-
-	const returnData: IVariableSelectorOption[] = [];
-	if (inputData === null) {
-		returnData.push({
-			name: propertyName,
-			key: fullpath,
-			value: '[null]',
-		} as IVariableSelectorOption);
-		return returnData;
-	} else if (Array.isArray(inputData)) {
-		let newPropertyName = propertyName;
-		let newParentPath = parentPath;
-		if (propertyIndex !== undefined) {
-			newParentPath += `["${propertyName}"]`;
-			newPropertyName = propertyIndex.toString();
-		}
-
-		const arrayData: IVariableSelectorOption[] = [];
-
-		for (let i = 0; i < inputData.length; i++) {
-			arrayData.push(
-				...jsonDataToFilterOption(
-					inputData[i],
-					newParentPath,
-					newPropertyName,
-					filterText,
-					i,
-					`[Item: ${i}]`,
-					skipKey,
-				),
-			);
-		}
-
-		returnData.push({
-			name: displayName || propertyName,
-			options: arrayData,
-			key: fullpath,
-			allowParentSelect: true,
-			dataType: 'array',
-		} as IVariableSelectorOption);
-	} else if (typeof inputData === 'object') {
-		const tempValue: IVariableSelectorOption[] = [];
-
-		for (const key of Object.keys(inputData)) {
-			tempValue.push(
-				...jsonDataToFilterOption(
-					(inputData as IDataObject)[key],
-					fullpath,
-					key,
-					filterText,
-					undefined,
-					undefined,
-					skipKey,
-				),
-			);
-		}
-
-		if (tempValue.length) {
-			returnData.push({
-				name: displayName || propertyName,
-				options: sortOptions(tempValue),
-				key: fullpath,
-				allowParentSelect: true,
-				dataType: 'object',
-			} as IVariableSelectorOption);
-		}
-	} else {
-		if (filterText !== undefined && propertyName.toLowerCase().indexOf(filterText) === -1) {
-			// If filter is set apply it
-			return returnData;
-		}
-
-		// Skip is currently only needed for leafs so only check here
-		if (getPathNormalized(skipKey) !== getPathNormalized(fullpath)) {
-			returnData.push({
-				name: propertyName,
-				key: fullpath,
-				value: inputData,
-			} as IVariableSelectorOption);
-		}
-	}
-
-	return returnData;
-}
-
-/**
- * Get the node's output using runData
- *
- * @param {string} nodeName The name of the node to get the data of
- * @param {IRunData} runData The data of the run to get the data of
- * @param {string} filterText Filter text for parameters
- * @param {number} [itemIndex=0] The index of the item
- * @param {number} [runIndex=0] The index of the run
- * @param {string} [inputName=NodeConnectionType.Main] The name of the input
- * @param {number} [outputIndex=0] The index of the output
- * @param {boolean} [useShort=false] Use short notation $json vs. $('NodeName').json
- */
-function getNodeRunDataOutput(
-	nodeName: string,
-	runData: IRunData,
-	filterText: string,
-	itemIndex = 0,
-	runIndex = 0,
-	inputName = NodeConnectionType.Main,
-	outputIndex = 0,
-	useShort = false,
-): IVariableSelectorOption[] | null {
-	if (!runData.hasOwnProperty(nodeName)) {
-		// No data found for node
-		return null;
-	}
-
-	if (runData[nodeName].length <= runIndex) {
-		// No data for given runIndex
-		return null;
-	}
-
-	if (
-		!runData[nodeName][runIndex].hasOwnProperty('data') ||
-		runData[nodeName][runIndex].data === null ||
-		runData[nodeName][runIndex].data === undefined
-	) {
-		// Data property does not exist or is not set (even though it normally has to)
-		return null;
-	}
-
-	if (!runData[nodeName][runIndex].data.hasOwnProperty(inputName)) {
-		// No data found for inputName
-		return null;
-	}
-
-	if (runData[nodeName][runIndex].data[inputName].length <= outputIndex) {
-		// No data found for output Index
-		return null;
-	}
-
-	// The data should be identical no matter to which node it gets so always select the first one
-	if (
-		runData[nodeName][runIndex].data[inputName][outputIndex] === null ||
-		runData[nodeName][runIndex].data[inputName][outputIndex].length <= itemIndex
-	) {
-		// No data found for node connection found
-		return null;
-	}
-
-	const outputData = runData[nodeName][runIndex].data[inputName][outputIndex][itemIndex];
-
-	return getNodeOutput(nodeName, outputData, filterText, useShort);
-}
-
-/**
- * Get the node's output using pinData
- *
- * @param {string} nodeName The name of the node to get the data of
- * @param {IPinData[string]} pinData The node's pin data
- * @param {string} filterText Filter text for parameters
- * @param {boolean} [useShort=false] Use short notation $json vs. $('NodeName').json
- */
-function getNodePinDataOutput(
-	nodeName: string,
-	pinData: IPinData[string],
-	filterText: string,
-	useShort = false,
-): IVariableSelectorOption[] | null {
-	const outputData = pinData.map((data) => ({ json: data }) as INodeExecutionData)[0];
-
-	return getNodeOutput(nodeName, outputData, filterText, useShort);
-}
-
-/**
- * Returns the node's output data
- *
- * @param {string} nodeName The name of the node to get the data of
- * @param {INodeExecutionData} outputData The data of the run to get the data of
- * @param {string} filterText Filter text for parameters
- * @param {boolean} [useShort=false] Use short notation
- */
-function getNodeOutput(
-	nodeName: string,
-	outputData: INodeExecutionData,
-	filterText: string,
-	useShort = false,
-): IVariableSelectorOption[] | null {
-	const returnData: IVariableSelectorOption[] = [];
-
-	// Get json data
-	if (outputData.hasOwnProperty('json')) {
-		const jsonPropertyPrefix = useShort
-			? '$json'
-			: `$('${escapeMappingString(nodeName)}').item.json`;
-
-		const jsonDataOptions: IVariableSelectorOption[] = [];
-		for (const propertyName of Object.keys(outputData.json)) {
-			jsonDataOptions.push(
-				...jsonDataToFilterOption(
-					outputData.json[propertyName],
-					jsonPropertyPrefix,
-					propertyName,
-					filterText,
-				),
-			);
-		}
-
-		if (jsonDataOptions.length) {
-			returnData.push({
-				name: 'JSON',
-				options: sortOptions(jsonDataOptions),
-			});
-		}
-	}
-
-	// Get binary data
-	if (outputData.hasOwnProperty('binary')) {
-		const binaryPropertyPrefix = useShort
-			? '$binary'
-			: `$('${escapeMappingString(nodeName)}').item.binary`;
-
-		const binaryData = [];
-		let binaryPropertyData: IVariableSelectorOption[] = [];
-
-		for (const dataPropertyName of Object.keys(outputData.binary ?? {})) {
-			binaryPropertyData = [];
-			for (const propertyName in outputData.binary?.[dataPropertyName]) {
-				if (propertyName === 'data') {
-					continue;
-				}
-
-				if (filterText && propertyName.toLowerCase().indexOf(filterText) === -1) {
-					// If filter is set apply it
-					continue;
-				}
-
-				binaryPropertyData.push({
-					name: propertyName,
-					key: `${binaryPropertyPrefix}.${dataPropertyName}.${propertyName}`,
-					value: outputData.binary?.[dataPropertyName][propertyName]?.toString(),
-				});
-			}
-
-			if (binaryPropertyData.length) {
-				binaryData.push({
-					name: dataPropertyName,
-					key: `${binaryPropertyPrefix}.${dataPropertyName}`,
-					options: sortOptions(binaryPropertyData),
-					allowParentSelect: true,
-				});
-			}
-		}
-		if (binaryData.length) {
-			returnData.push({
-				name: 'Binary',
-				key: binaryPropertyPrefix,
-				options: sortOptions(binaryData),
-				allowParentSelect: true,
-			});
-		}
-	}
-
-	return returnData;
-}
-
-function getNodeContext(
-	workflow: Workflow,
-	runExecutionData: IRunExecutionData | null,
-	parentNode: string[],
-	nodeName: string,
-	filterText: string,
-): IVariableSelectorOption[] | null {
-	const itemIndex = 0;
-	const inputName = NodeConnectionType.Main;
-	const runIndex = 0;
-	const returnData: IVariableSelectorOption[] = [];
-
-	if (activeNode.value === null) {
-		return returnData;
-	}
-
-	const nodeConnection = workflow.getNodeConnectionIndexes(
-		activeNode.value.name,
-		parentNode[0],
-		inputName,
-	);
-	const connectionInputData = workflowHelpers.connectionInputData(
-		parentNode,
-		nodeName,
-		inputName,
-		runIndex,
-		nodeConnection,
-	);
-
-	if (connectionInputData === null) {
-		return returnData;
-	}
-
-	const additionalKeys: IWorkflowDataProxyAdditionalKeys = {
-		$execution: {
-			id: PLACEHOLDER_FILLED_AT_EXECUTION_TIME,
-			mode: 'test',
-			resumeUrl: PLACEHOLDER_FILLED_AT_EXECUTION_TIME,
-			resumeFormUrl: PLACEHOLDER_FILLED_AT_EXECUTION_TIME,
-		},
-
-		// deprecated
-		$executionId: PLACEHOLDER_FILLED_AT_EXECUTION_TIME,
-		$resumeWebhookUrl: PLACEHOLDER_FILLED_AT_EXECUTION_TIME,
-	};
-
-	const dataProxy = new WorkflowDataProxy(
-		workflow,
-		runExecutionData,
-		runIndex,
-		itemIndex,
-		nodeName,
-		connectionInputData,
-		{},
-		'manual',
-		additionalKeys,
-	);
-	const proxy = dataProxy.getDataProxy();
-
-	const nodeContext = proxy.$node[nodeName].context as IContextObject;
-	for (const key of Object.keys(nodeContext)) {
-		if (filterText !== undefined && key.toLowerCase().indexOf(filterText) === -1) {
-			// If filter is set apply it
-			continue;
-		}
-
-		returnData.push({
-			name: key,
-			key: `$('${escapeMappingString(nodeName)}').context['${escapeMappingString(key)}']`,
-			value: nodeContext[key],
-		});
-	}
-
-	return returnData;
-}
-
-/**
- * Returns all the node parameters with values
- *
- * @param {string} nodeName The name of the node to return data of
- * @param {string} path The path to the node to pretend to key
- * @param {string} [skipParameter] Parameter to skip
- * @param {string} [filterText] Filter text for parameters
- */
-function getNodeParameters(
-	nodeName: string,
-	path: string,
-	skipParameter?: string,
-	filterText?: string,
-): IVariableSelectorOption[] | null {
-	const node = workflow.value.getNode(nodeName);
-	if (node === null) {
-		return null;
-	}
-
-	const returnParameters: IVariableSelectorOption[] = [];
-	for (const parameterName in node.parameters) {
-		if (parameterName === skipParameter) {
-			// Skip the parameter
-			continue;
-		}
-
-		if (filterText !== undefined && parameterName.toLowerCase().indexOf(filterText) === -1) {
-			// If filter is set apply it
-			continue;
-		}
-
-		returnParameters.push(
-			...jsonDataToFilterOption(
-				node.parameters[parameterName],
-				path,
-				parameterName,
-				filterText,
-				undefined,
-				undefined,
-				skipParameter,
-			),
-		);
-	}
-
-	return returnParameters;
-}
-
-function getFilterResults(filterText: string, itemIndex: number): IVariableSelectorOption[] {
-	const inputName = NodeConnectionType.Main;
-
-	if (activeNode.value === null) {
-		return [];
-	}
-
-	const executionData = workflowsStore.getWorkflowExecution;
-	let parentNode = workflow.value.getParentNodes(activeNode.value.name, inputName, 1);
-	let runData = workflowsStore.getWorkflowRunData;
-
-	if (runData === null) {
-		runData = {};
-	}
-
-	let returnData: IVariableSelectorOption[] | null = [];
-	// -----------------------------------------
-	// Add the parameters of the current node
-	// -----------------------------------------
-
-	// Add the parameters
-	const currentNodeData: IVariableSelectorOption[] = [];
-
-	let tempOptions: IVariableSelectorOption[];
-
-	if (executionData?.data !== undefined) {
-		const runExecutionData: IRunExecutionData = executionData.data;
-
-		tempOptions = getNodeContext(
-			workflow.value,
-			runExecutionData,
-			parentNode,
-			activeNode.value.name,
-			filterText,
-		) as IVariableSelectorOption[];
-		if (tempOptions.length) {
-			currentNodeData.push({
-				name: 'Context',
-				options: sortOptions(tempOptions),
-			} as IVariableSelectorOption);
-		}
-	}
-
-	let tempOutputData: IVariableSelectorOption[] | null | undefined;
-
-	if (parentNode.length) {
-		// If the node has an input node add the input data
-
-		let ndvInputNodeName = ndvStore.ndvInputNodeName;
-		if (!ndvInputNodeName) {
-			// If no input node is set use the first parent one
-			// this is important for config-nodes which do not have
-			// a main input
-			ndvInputNodeName = parentNode[0];
-		}
-
-		const activeInputParentNode = parentNode.find((node) => node === ndvInputNodeName);
-		if (!activeInputParentNode) {
-			return [];
-		}
-		// Check from which output to read the data.
-		// Depends on how the nodes are connected.
-		// (example "IF" node. If node is connected to "true" or to "false" output)
-		const nodeConnection = workflow.value.getNodeConnectionIndexes(
-			activeNode.value.name,
-			activeInputParentNode,
-			inputName,
-		);
-		const outputIndex = nodeConnection === undefined ? 0 : nodeConnection.sourceIndex;
-
-		tempOutputData = getNodeRunDataOutput(
-			activeInputParentNode,
-			runData,
-			filterText,
-			itemIndex,
-			0,
-			inputName,
-			outputIndex,
-			true,
-		) as IVariableSelectorOption[];
-
-		const pinDataOptions: IVariableSelectorOption[] = [
-			{
-				name: 'JSON',
-				options: [],
-			},
-		];
-		parentNode.forEach((parentNodeName) => {
-			const pinData = workflowsStore.pinDataByNodeName(parentNodeName);
-
-			if (pinData) {
-				const output = getNodePinDataOutput(parentNodeName, pinData, filterText, true);
-
-				if (pinDataOptions[0].options) {
-					pinDataOptions[0].options = pinDataOptions[0].options.concat(output?.[0]?.options ?? []);
-				}
-			}
-		});
-
-		if ((pinDataOptions[0]?.options ?? []).length > 0) {
-			if (tempOutputData) {
-				const jsonTempOutputData = tempOutputData.find((tempData) => tempData.name === 'JSON');
-
-				if (jsonTempOutputData) {
-					if (!jsonTempOutputData.options) {
-						jsonTempOutputData.options = [];
-					}
-
-					(pinDataOptions[0].options ?? []).forEach((pinDataOption) => {
-						const existingOptionIndex = jsonTempOutputData.options!.findIndex(
-							(option) => option.name === pinDataOption.name,
-						);
-						if (existingOptionIndex !== -1) {
-							jsonTempOutputData.options![existingOptionIndex] = pinDataOption;
-						} else {
-							jsonTempOutputData.options!.push(pinDataOption);
-						}
-					});
-				} else {
-					tempOutputData.push(pinDataOptions[0]);
-				}
-			} else {
-				tempOutputData = pinDataOptions;
-			}
-		}
-
-		if (tempOutputData) {
-			if (JSON.stringify(tempOutputData).length < 102400) {
-				// Data is reasonable small (< 100kb) so add it
-				currentNodeData.push({
-					name: 'Input Data',
-					options: sortOptions(tempOutputData),
-				});
-			} else {
-				// Data is to large so do not add
-				currentNodeData.push({
-					name: 'Input Data',
-					options: [
-						{
-							name: '[Data to large]',
-						},
-					],
-				});
-			}
-		}
-	}
-
-	const initialPath = '$parameter';
-	let skipParameter = props.path;
-	if (skipParameter.startsWith('parameters.')) {
-		skipParameter = initialPath + skipParameter.substring(10);
-	}
-
-	currentNodeData.push({
-		name: i18n.baseText('variableSelector.parameters'),
-		options: sortOptions(
-			getNodeParameters(
-				activeNode.value.name,
-				initialPath,
-				skipParameter,
-				filterText,
-			) as IVariableSelectorOption[],
-		),
-	});
-
-	returnData.push({
-		name: i18n.baseText('variableSelector.currentNode'),
-		options: sortOptions(currentNodeData),
-	});
-
-	// Add the input data
-
-	// -----------------------------------------
-	// Add all the nodes and their data
-	// -----------------------------------------
-	const allNodesData: IVariableSelectorOption[] = [];
-	let nodeOptions: IVariableSelectorOption[];
-	const upstreamNodes = workflow.value.getParentNodes(activeNode.value.name, inputName);
-
-	const workflowNodes = Object.entries(workflow.value.nodes);
-
-	// Sort the nodes according to their position relative to the current node
-	workflowNodes.sort((a, b) => {
-		return upstreamNodes.indexOf(b[0]) - upstreamNodes.indexOf(a[0]);
-	});
-
-	for (const [nodeName, node] of workflowNodes) {
-		// Add the parameters of all nodes
-		// TODO: Later have to make sure that no parameters can be referenced which have expression which use input-data (for nodes which are not parent nodes)
-
-		if (nodeName === activeNode.value.name) {
-			// Skip the current node as this one get added separately
-			continue;
-		}
-		// If node type should be skipped, continue
-		if (SKIPPED_NODE_TYPES.includes(node.type)) {
-			continue;
-		}
-
-		nodeOptions = [
-			{
-				name: i18n.baseText('variableSelector.parameters'),
-				options: sortOptions(
-					getNodeParameters(
-						nodeName,
-						`$('${escapeMappingString(nodeName)}').params`,
-						undefined,
-						filterText,
-					),
-				),
-			} as IVariableSelectorOption,
-		];
-
-		if (executionData?.data !== undefined) {
-			const runExecutionData: IRunExecutionData = executionData.data;
-
-			parentNode = workflow.value.getParentNodes(nodeName, inputName, 1);
-			tempOptions = getNodeContext(
-				workflow.value,
-				runExecutionData,
-				parentNode,
-				nodeName,
-				filterText,
-			) as IVariableSelectorOption[];
-			if (tempOptions.length) {
-				nodeOptions = [
-					{
-						name: i18n.baseText('variableSelector.context'),
-						options: sortOptions(tempOptions),
-					} as IVariableSelectorOption,
-				];
-			}
-		}
-
-		if (upstreamNodes.includes(nodeName)) {
-			// If the node is an upstream node add also the output data which can be referenced
-			const pinData = workflowsStore.pinDataByNodeName(nodeName);
-			tempOutputData = pinData
-				? getNodePinDataOutput(nodeName, pinData, filterText)
-				: getNodeRunDataOutput(nodeName, runData, filterText, itemIndex);
-
-			if (tempOutputData) {
-				nodeOptions.push({
-					name: i18n.baseText('variableSelector.outputData'),
-					options: sortOptions(tempOutputData),
-				} as IVariableSelectorOption);
-			}
-		}
-
-		const shortNodeType = i18n.shortNodeType(node.type);
-
-		allNodesData.push({
-			name: i18n.headerText({
-				key: `headers.${shortNodeType}.displayName`,
-				fallback: nodeName,
-			}),
-			options: sortOptions(nodeOptions),
-		});
-	}
-
-	returnData.push({
-		name: i18n.baseText('variableSelector.nodes'),
-		options: allNodesData,
-	});
-
-	// Remove empty entries and return
-	returnData = removeEmptyEntries(returnData) as IVariableSelectorOption[] | null;
-
-	if (returnData === null) {
-		return [];
-	}
-
-	return returnData;
-}
-
-function forwardItemSelected(eventData: IVariableItemSelected) {
-	emit('itemSelected', eventData);
-}
-</script>
-
-<template>
-	<div class="variable-selector-wrapper" @keydown.stop>
-		<div class="input-wrapper">
-			<n8n-input
-				ref="inputField"
-				v-model="variableFilter"
-				:placeholder="i18n.baseText('variableSelector.variableFilter')"
-				size="small"
-				type="text"
-			></n8n-input>
-		</div>
-
-		<div class="result-wrapper">
-			<VariableSelectorItem
-				v-for="option in currentResults"
-				:key="option.key"
-				:item="option"
-				:extend-all="extendAll"
-				:redact-values="redactValues"
-				@item-selected="forwardItemSelected"
-			></VariableSelectorItem>
-		</div>
-	</div>
-</template>
-
-<style scoped lang="scss">
-.variable-selector-wrapper {
-	border-radius: 0 0 4px 4px;
-	width: 100%;
-	height: 100%;
-	position: relative;
-}
-
-.result-wrapper {
-	line-height: 1em;
-	height: 370px;
-	overflow-x: hidden;
-	overflow-y: auto;
-	margin: 0.5em 0;
-	width: 100%;
-}
-
-.result-item {
-	font-size: 0.7em;
-}
-</style>
diff --git a/packages/editor-ui/src/components/VariableSelectorItem.vue b/packages/editor-ui/src/components/VariableSelectorItem.vue
deleted file mode 100644
index cc633b40c94ea..0000000000000
--- a/packages/editor-ui/src/components/VariableSelectorItem.vue
+++ /dev/null
@@ -1,185 +0,0 @@
-<template>
-	<div class="item">
-		<div v-if="item.options" class="options">
-			<div v-if="item.options.length" class="headline clickable" @click="extended = !extended">
-				<div v-if="extendAll !== true" class="options-toggle">
-					<font-awesome-icon v-if="extended" icon="angle-down" />
-					<font-awesome-icon v-else icon="angle-right" />
-				</div>
-				<div class="option-title" :title="item.key">
-					{{ item.name }}
-
-					<el-dropdown
-						v-if="allowParentSelect === true"
-						trigger="click"
-						@click.stop
-						@command="optionSelected($event, item)"
-					>
-						<span class="el-dropdown-link clickable" @click.stop>
-							<font-awesome-icon
-								icon="dot-circle"
-								:title="$locale.baseText('variableSelectorItem.selectItem')"
-							/>
-						</span>
-						<template #dropdown>
-							<el-dropdown-menu>
-								<el-dropdown-item
-									v-for="operation in itemAddOperations"
-									:key="operation.command"
-									:command="operation.command"
-									>{{ operation.displayName }}</el-dropdown-item
-								>
-							</el-dropdown-menu>
-						</template>
-					</el-dropdown>
-				</div>
-			</div>
-			<div v-if="item.options && (extended === true || extendAll === true)">
-				<variable-selector-item
-					v-for="option in item.options"
-					:key="option.key"
-					:item="option"
-					:extend-all="extendAll"
-					:allow-parent-select="option.allowParentSelect"
-					:redact-values="redactValues"
-					class="sub-level"
-					@item-selected="forwardItemSelected"
-				></variable-selector-item>
-			</div>
-		</div>
-		<div v-else class="value clickable" @click="selectItem(item)">
-			<div class="item-title" :title="item.key">
-				{{ item.name }}:
-				<font-awesome-icon icon="dot-circle" title="Select Item" />
-			</div>
-			<div :class="{ 'ph-no-capture': redactValues, 'item-value': true }">
-				{{ item.value !== undefined ? item.value : $locale.baseText('variableSelectorItem.empty') }}
-			</div>
-		</div>
-	</div>
-</template>
-
-<script setup lang="ts">
-import { ref, computed, onMounted } from 'vue';
-import type { IVariableSelectorOption, IVariableItemSelected } from '@/Interface';
-
-const props = defineProps<{
-	allowParentSelect?: boolean;
-	extendAll?: boolean;
-	item: IVariableSelectorOption;
-	redactValues?: boolean;
-}>();
-
-const emit = defineEmits<{
-	itemSelected: [value: IVariableItemSelected];
-}>();
-
-const extended = ref(false);
-
-const itemAddOperations = computed(() => {
-	const returnOptions = [
-		{
-			command: 'raw',
-			displayName: 'Raw value',
-		},
-	];
-	if (props.item.dataType === 'array') {
-		returnOptions.push(
-			{
-				command: 'arrayLength',
-				displayName: 'Length',
-			},
-			{
-				command: 'arrayValues',
-				displayName: 'Values',
-			},
-		);
-	} else if (props.item.dataType === 'object') {
-		returnOptions.push(
-			{
-				command: 'objectKeys',
-				displayName: 'Keys',
-			},
-			{
-				command: 'objectValues',
-				displayName: 'Values',
-			},
-		);
-	}
-	return returnOptions;
-});
-
-onMounted(() => {
-	if (extended.value) return;
-
-	const shouldAutoExtend =
-		['Current Node', 'Input Data', 'Binary', 'JSON'].includes(props.item.name) &&
-		props.item.key === undefined;
-
-	if (shouldAutoExtend) {
-		extended.value = true;
-	}
-});
-
-const optionSelected = (command: string, item: IVariableSelectorOption) => {
-	let variable = item.key ?? '';
-	if (command === 'arrayValues') {
-		variable = `${item.key}.join(', ')`;
-	} else if (command === 'arrayLength') {
-		variable = `${item.key}.length`;
-	} else if (command === 'objectKeys') {
-		variable = `Object.keys(${item.key}).join(', ')`;
-	} else if (command === 'objectValues') {
-		variable = `Object.values(${item.key}).join(', ')`;
-	}
-	emit('itemSelected', { variable });
-};
-
-const selectItem = (item: IVariableSelectorOption) => {
-	emit('itemSelected', { variable: item.key ?? '' });
-};
-
-const forwardItemSelected = (eventData: IVariableItemSelected) => {
-	emit('itemSelected', eventData);
-};
-</script>
-
-<style scoped lang="scss">
-.option-title {
-	position: relative;
-	display: inline-block;
-	font-size: 0.9em;
-	font-weight: 600;
-	padding: 0.2em 1em 0.2em 0.4em;
-}
-.item-title {
-	font-weight: 600;
-	font-size: 0.8em;
-	white-space: nowrap;
-	overflow: hidden;
-	text-overflow: ellipsis;
-}
-.headline {
-	position: relative;
-	margin: 2px;
-	margin-top: 10px;
-	color: $color-primary;
-}
-.options-toggle {
-	position: relative;
-	top: 1px;
-	margin: 0 3px 0 8px;
-	display: inline;
-}
-.value {
-	margin: 0.2em;
-	padding: 0.1em 0.3em;
-}
-.item-value {
-	font-size: 0.6em;
-	overflow-x: auto;
-}
-.sub-level {
-	padding-left: 20px;
-}
-</style>
diff --git a/packages/editor-ui/src/plugins/codemirror/__tests__/dragAndDrop.test.ts b/packages/editor-ui/src/plugins/codemirror/__tests__/dragAndDrop.test.ts
new file mode 100644
index 0000000000000..512cc49109840
--- /dev/null
+++ b/packages/editor-ui/src/plugins/codemirror/__tests__/dragAndDrop.test.ts
@@ -0,0 +1,68 @@
+import { useNDVStore } from '@/stores/ndv.store';
+import { EditorState } from '@codemirror/state';
+import { EditorView } from '@codemirror/view';
+import { createTestingPinia } from '@pinia/testing';
+import { fireEvent } from '@testing-library/dom';
+import { setActivePinia } from 'pinia';
+import { mappingDropCursor } from '../dragAndDrop';
+import { n8nLang } from '../n8nLang';
+
+describe('CodeMirror drag and drop', () => {
+	beforeEach(() => {
+		const pinia = createTestingPinia({ stubActions: false });
+		setActivePinia(pinia);
+	});
+
+	describe('mappingDropCursor', () => {
+		const createEditor = () => {
+			const parent = document.createElement('div');
+			document.body.appendChild(parent);
+			const state = EditorState.create({
+				doc: 'test {{ $json.foo }} \n\nnewline',
+				extensions: [mappingDropCursor(), n8nLang()],
+			});
+			const editor = new EditorView({ parent, state });
+			return editor;
+		};
+
+		it('should render a drop cursor when dragging', async () => {
+			useNDVStore().draggableStartDragging({
+				type: 'mapping',
+				data: '{{ $json.bar }}',
+				dimensions: null,
+			});
+
+			const editor = createEditor();
+			const rect = editor.contentDOM.getBoundingClientRect();
+			fireEvent(
+				editor.contentDOM,
+				new MouseEvent('mousemove', {
+					clientX: rect.left,
+					clientY: rect.top,
+					bubbles: true,
+				}),
+			);
+
+			const cursor = editor.dom.querySelector('.cm-dropCursor');
+
+			expect(cursor).toBeInTheDocument();
+		});
+
+		it('should not render a drop cursor when not dragging', async () => {
+			const editor = createEditor();
+			const rect = editor.contentDOM.getBoundingClientRect();
+			fireEvent(
+				editor.contentDOM,
+				new MouseEvent('mousemove', {
+					clientX: rect.left,
+					clientY: rect.top,
+					bubbles: true,
+				}),
+			);
+
+			const cursor = editor.dom.querySelector('.cm-dropCursor');
+
+			expect(cursor).not.toBeInTheDocument();
+		});
+	});
+});
diff --git a/packages/editor-ui/src/plugins/codemirror/dragAndDrop.ts b/packages/editor-ui/src/plugins/codemirror/dragAndDrop.ts
new file mode 100644
index 0000000000000..20940add7c81d
--- /dev/null
+++ b/packages/editor-ui/src/plugins/codemirror/dragAndDrop.ts
@@ -0,0 +1,153 @@
+import { EditorSelection, StateEffect, StateField, type Extension } from '@codemirror/state';
+import { ViewPlugin, type EditorView, type ViewUpdate } from '@codemirror/view';
+import { syntaxTree } from '@codemirror/language';
+import { useNDVStore } from '@/stores/ndv.store';
+import { unwrapExpression } from '@/utils/expressions';
+
+const setDropCursorPos = StateEffect.define<number | null>({
+	map(pos, mapping) {
+		return pos === null ? null : mapping.mapPos(pos);
+	},
+});
+
+const dropCursorPos = StateField.define<number | null>({
+	create() {
+		return null;
+	},
+	update(pos, tr) {
+		if (pos !== null) pos = tr.changes.mapPos(pos);
+		return tr.effects.reduce((p, e) => (e.is(setDropCursorPos) ? e.value : p), pos);
+	},
+});
+
+interface MeasureRequest<T> {
+	read(view: EditorView): T;
+	write?(measure: T, view: EditorView): void;
+	key?: unknown;
+}
+
+// This is a modification of the CodeMirror dropCursor
+// This version hooks into the state of the NDV drag-n-drop
+//
+// We can't use CodeMirror's dropCursor because it depends on HTML drag events while our drag-and-drop uses mouse events
+// We could switch to drag events later but some features of the current drag-n-drop might not be possible with drag events
+const drawDropCursor = ViewPlugin.fromClass(
+	class {
+		cursor: HTMLElement | null = null;
+
+		measureReq: MeasureRequest<{ left: number; top: number; height: number } | null>;
+
+		ndvStore: ReturnType<typeof useNDVStore>;
+
+		constructor(readonly view: EditorView) {
+			this.measureReq = { read: this.readPos.bind(this), write: this.drawCursor.bind(this) };
+			this.ndvStore = useNDVStore();
+		}
+
+		update(update: ViewUpdate) {
+			const cursorPos = update.state.field(dropCursorPos);
+			if (cursorPos === null) {
+				if (this.cursor !== null) {
+					this.cursor?.remove();
+					this.cursor = null;
+				}
+			} else {
+				if (!this.cursor) {
+					this.cursor = this.view.scrollDOM.appendChild(document.createElement('div'));
+					this.cursor.className = 'cm-dropCursor';
+				}
+				if (
+					update.startState.field(dropCursorPos) !== cursorPos ||
+					update.docChanged ||
+					update.geometryChanged
+				)
+					this.view.requestMeasure(this.measureReq);
+			}
+		}
+
+		readPos(): { left: number; top: number; height: number } | null {
+			const { view } = this;
+			const pos = view.state.field(dropCursorPos);
+			const rect = pos !== null && view.coordsAtPos(pos);
+			if (!rect) return null;
+			const outer = view.scrollDOM.getBoundingClientRect();
+			return {
+				left: rect.left - outer.left + view.scrollDOM.scrollLeft * view.scaleX,
+				top: rect.top - outer.top + view.scrollDOM.scrollTop * view.scaleY,
+				height: rect.bottom - rect.top,
+			};
+		}
+
+		drawCursor(pos: { left: number; top: number; height: number } | null) {
+			if (this.cursor) {
+				const { scaleX, scaleY } = this.view;
+				if (pos) {
+					this.cursor.style.left = pos.left / scaleX + 'px';
+					this.cursor.style.top = pos.top / scaleY + 'px';
+					this.cursor.style.height = pos.height / scaleY + 'px';
+				} else {
+					this.cursor.style.left = '-100000px';
+				}
+			}
+		}
+
+		destroy() {
+			if (this.cursor) this.cursor.remove();
+		}
+
+		setDropPos(pos: number | null) {
+			if (this.view.state.field(dropCursorPos) !== pos)
+				this.view.dispatch({ effects: setDropCursorPos.of(pos) });
+		}
+	},
+	{
+		eventObservers: {
+			mousemove(event) {
+				if (!this.ndvStore.isDraggableDragging || this.ndvStore.draggableType !== 'mapping') return;
+				const pos = this.view.posAtCoords(eventToCoord(event), false);
+				this.setDropPos(pos);
+			},
+			mouseleave() {
+				this.setDropPos(null);
+			},
+			mouseup() {
+				this.setDropPos(null);
+			},
+		},
+	},
+);
+
+function eventToCoord(event: MouseEvent): { x: number; y: number } {
+	return { x: event.clientX, y: event.clientY };
+}
+
+export async function dropInEditor(view: EditorView, event: MouseEvent, value: string) {
+	const dropPos = view.posAtCoords(eventToCoord(event), false);
+
+	const node = syntaxTree(view.state).resolve(dropPos);
+	let valueToInsert = value;
+
+	// We are already in an expression, do not insert brackets
+	if (node.name === 'Resolvable') {
+		valueToInsert = unwrapExpression(value);
+	}
+
+	const changes = view.state.changes({ from: dropPos, insert: valueToInsert });
+	const anchor = changes.mapPos(dropPos, -1);
+	const head = changes.mapPos(dropPos, 1);
+	const selection = EditorSelection.single(anchor, head);
+
+	view.dispatch({
+		changes,
+		selection,
+		userEvent: 'input.drop',
+	});
+
+	setTimeout(() => view.focus());
+
+	return selection;
+}
+
+export function mappingDropCursor(): Extension {
+	return [dropCursorPos, drawDropCursor];
+}
diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json
index 48081770ad6e0..8e05b586fe59d 100644
--- a/packages/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/editor-ui/src/plugins/i18n/locales/en.json
@@ -769,7 +769,6 @@
 	"expressionEdit.editExpression": "Edit Expression",
 	"expressionEdit.expression": "Expression",
 	"expressionEdit.resultOfItem1": "Result of item 1",
-	"expressionEdit.variableSelector": "Variable Selector",
 	"expressionEditor.uncalledFunction": "[this is a function, please add ()]",
 	"expressionModalInput.empty": "[empty]",
 	"expressionModalInput.undefined": "[undefined]",
@@ -2018,18 +2017,6 @@
 	"updatesPanel.version": "{numberOfVersions} version{howManySuffix}",
 	"updatesPanel.weVeBeenBusy": "We’ve been busy ✨",
 	"updatesPanel.youReOnVersion": "You’re on {currentVersionName}, which was released",
-	"variableSelector.context": "Context",
-	"variableSelector.currentNode": "Current Node",
-	"variableSelector.nodes": "Nodes",
-	"variableSelector.outputData": "Output Data",
-	"variableSelector.parameters": "Parameters",
-	"variableSelector.variableFilter": "Variable filter...",
-	"variableSelectorItem.binary": "Binary",
-	"variableSelectorItem.currentNode": "Current Node",
-	"variableSelectorItem.empty": "--- EMPTY ---",
-	"variableSelectorItem.inputData": "Input Data",
-	"variableSelectorItem.json": "JSON",
-	"variableSelectorItem.selectItem": "Select Item",
 	"versionCard.breakingChanges": "Breaking changes",
 	"versionCard.released": "Released",
 	"versionCard.securityUpdate": "Security update",
diff --git a/packages/editor-ui/src/types/externalHooks.ts b/packages/editor-ui/src/types/externalHooks.ts
index cffc8a8c0a94b..005762e759606 100644
--- a/packages/editor-ui/src/types/externalHooks.ts
+++ b/packages/editor-ui/src/types/externalHooks.ts
@@ -44,15 +44,7 @@ interface UpdatedWorkflowSettingsEventData {
 interface NodeTypeChangedEventData {
 	nodeSubtitle?: string;
 }
-interface InsertedItemFromExpEditorEventData {
-	parameter: {
-		displayName: string;
-	};
-	value: string;
-	selectedItem: {
-		variable: string;
-	};
-}
+
 interface ExpressionEditorEventsData {
 	dialogVisible: boolean;
 	value: string;
@@ -180,7 +172,6 @@ export interface ExternalHooks {
 		>;
 	};
 	expressionEdit: {
-		itemSelected: Array<ExternalHooksMethod<InsertedItemFromExpEditorEventData>>;
 		dialogVisibleChanged: Array<ExternalHooksMethod<ExpressionEditorEventsData>>;
 		closeDialog: Array<ExternalHooksMethod<ITelemetryTrackProperties>>;
 		mounted: Array<
@@ -231,9 +222,6 @@ export interface ExternalHooks {
 	userInfo: {
 		mounted: Array<ExternalHooksMethod<{ userInfoRef: HTMLElement }>>;
 	};
-	variableSelectorItem: {
-		mounted: Array<ExternalHooksMethod<{ variableSelectorItemRef: HTMLElement }>>;
-	};
 	mainSidebar: {
 		mounted: Array<ExternalHooksMethod<{ userRef: Element }>>;
 	};
diff --git a/packages/editor-ui/src/utils/__tests__/expressions.test.ts b/packages/editor-ui/src/utils/__tests__/expressions.test.ts
index 3c00ce842028c..a6d1c408fe1cb 100644
--- a/packages/editor-ui/src/utils/__tests__/expressions.test.ts
+++ b/packages/editor-ui/src/utils/__tests__/expressions.test.ts
@@ -1,38 +1,46 @@
 import { ExpressionError } from 'n8n-workflow';
-import { stringifyExpressionResult } from '../expressions';
+import { stringifyExpressionResult, unwrapExpression } from '../expressions';
 
-describe('stringifyExpressionResult()', () => {
-	it('should return empty string for non-critical errors', () => {
-		expect(
-			stringifyExpressionResult({
-				ok: false,
-				error: new ExpressionError('error message', { type: 'no_execution_data' }),
-			}),
-		).toEqual('');
-	});
+describe('Utils: Expressions', () => {
+	describe('stringifyExpressionResult()', () => {
+		it('should return empty string for non-critical errors', () => {
+			expect(
+				stringifyExpressionResult({
+					ok: false,
+					error: new ExpressionError('error message', { type: 'no_execution_data' }),
+				}),
+			).toEqual('');
+		});
 
-	it('should return an error message for critical errors', () => {
-		expect(
-			stringifyExpressionResult({
-				ok: false,
-				error: new ExpressionError('error message', { type: 'no_input_connection' }),
-			}),
-		).toEqual('[ERROR: No input connected]');
-	});
+		it('should return an error message for critical errors', () => {
+			expect(
+				stringifyExpressionResult({
+					ok: false,
+					error: new ExpressionError('error message', { type: 'no_input_connection' }),
+				}),
+			).toEqual('[ERROR: No input connected]');
+		});
 
-	it('should return empty string when result is null', () => {
-		expect(stringifyExpressionResult({ ok: true, result: null })).toEqual('');
-	});
+		it('should return empty string when result is null', () => {
+			expect(stringifyExpressionResult({ ok: true, result: null })).toEqual('');
+		});
 
-	it('should return NaN when result is NaN', () => {
-		expect(stringifyExpressionResult({ ok: true, result: NaN })).toEqual('NaN');
-	});
+		it('should return NaN when result is NaN', () => {
+			expect(stringifyExpressionResult({ ok: true, result: NaN })).toEqual('NaN');
+		});
+
+		it('should return [empty] message when result is empty string', () => {
+			expect(stringifyExpressionResult({ ok: true, result: '' })).toEqual('[empty]');
+		});
 
-	it('should return [empty] message when result is empty string', () => {
-		expect(stringifyExpressionResult({ ok: true, result: '' })).toEqual('[empty]');
+		it('should return the result when it is a string', () => {
+			expect(stringifyExpressionResult({ ok: true, result: 'foo' })).toEqual('foo');
+		});
 	});
 
-	it('should return the result when it is a string', () => {
-		expect(stringifyExpressionResult({ ok: true, result: 'foo' })).toEqual('foo');
+	describe('unwrapExpression', () => {
+		it('should remove the brackets around an expression', () => {
+			expect(unwrapExpression('{{ $json.foo }}')).toBe('$json.foo');
+		});
 	});
 });
diff --git a/packages/editor-ui/src/utils/expressions.ts b/packages/editor-ui/src/utils/expressions.ts
index d980b3180297b..e19af3716e7bf 100644
--- a/packages/editor-ui/src/utils/expressions.ts
+++ b/packages/editor-ui/src/utils/expressions.ts
@@ -12,6 +12,10 @@ export const isEmptyExpression = (expr: string) => {
 	return /\{\{\s*\}\}/.test(expr);
 };
 
+export const unwrapExpression = (expr: string) => {
+	return expr.replace(/\{\{(.*)\}\}/, '$1').trim();
+};
+
 export const removeExpressionPrefix = (expr: string) => {
 	return expr.startsWith('=') ? expr.slice(1) : expr;
 };

From 5cac0f339d649cfe5857d33738210cbc1599370b Mon Sep 17 00:00:00 2001
From: Shireen Missi <94372015+ShireenMissi@users.noreply.github.com>
Date: Mon, 12 Aug 2024 16:49:06 +0100
Subject: [PATCH 128/168] feat(Okta Node): Add Okta Node (#10278)

Co-authored-by: Giulio Andreini <g.andreini@gmail.com>
Co-authored-by: Elias Meire <elias@meire.dev>
---
 packages/core/bin/generate-ui-types           |   7 +-
 .../editor-ui/src/stores/credentials.store.ts |   4 +-
 .../credentials/OktaApi.credentials.ts        |   3 +-
 packages/nodes-base/nodes/Okta/Okta.dark.svg  |   3 +
 packages/nodes-base/nodes/Okta/Okta.node.ts   |  56 ++
 packages/nodes-base/nodes/Okta/Okta.svg       |   3 +
 .../nodes-base/nodes/Okta/UserDescription.ts  | 795 ++++++++++++++++++
 .../nodes-base/nodes/Okta/UserFunctions.ts    | 170 ++++
 .../nodes/Okta/test/UserFunctions.test.ts     | 375 +++++++++
 packages/nodes-base/package.json              |   1 +
 packages/workflow/src/Interfaces.ts           |   1 +
 11 files changed, 1414 insertions(+), 4 deletions(-)
 create mode 100644 packages/nodes-base/nodes/Okta/Okta.dark.svg
 create mode 100644 packages/nodes-base/nodes/Okta/Okta.node.ts
 create mode 100644 packages/nodes-base/nodes/Okta/Okta.svg
 create mode 100644 packages/nodes-base/nodes/Okta/UserDescription.ts
 create mode 100644 packages/nodes-base/nodes/Okta/UserFunctions.ts
 create mode 100644 packages/nodes-base/nodes/Okta/test/UserFunctions.test.ts

diff --git a/packages/core/bin/generate-ui-types b/packages/core/bin/generate-ui-types
index 988462d604e08..8cecb6b054d74 100755
--- a/packages/core/bin/generate-ui-types
+++ b/packages/core/bin/generate-ui-types
@@ -33,8 +33,11 @@ function findReferencedMethods(obj, refs = {}, latestName = '') {
 	const knownCredentials = loader.known.credentials;
 	const credentialTypes = Object.values(loader.credentialTypes).map((data) => {
 		const credentialType = data.type;
-		if (knownCredentials[credentialType.name].supportedNodes?.length > 0) {
-			delete credentialType.httpRequestNode;
+		if (
+			knownCredentials[credentialType.name].supportedNodes?.length > 0 &&
+			credentialType.httpRequestNode
+		) {
+			credentialType.httpRequestNode.hidden = true;
 		}
 		return credentialType;
 	});
diff --git a/packages/editor-ui/src/stores/credentials.store.ts b/packages/editor-ui/src/stores/credentials.store.ts
index e5be582ea2b4c..f2e209370adbf 100644
--- a/packages/editor-ui/src/stores/credentials.store.ts
+++ b/packages/editor-ui/src/stores/credentials.store.ts
@@ -206,7 +206,9 @@ export const useCredentialsStore = defineStore(STORES.CREDENTIALS, () => {
 	});
 
 	const httpOnlyCredentialTypes = computed(() => {
-		return allCredentialTypes.value.filter((credentialType) => credentialType.httpRequestNode);
+		return allCredentialTypes.value.filter(
+			(credentialType) => credentialType.httpRequestNode && !credentialType.httpRequestNode.hidden,
+		);
 	});
 
 	// #endregion
diff --git a/packages/nodes-base/credentials/OktaApi.credentials.ts b/packages/nodes-base/credentials/OktaApi.credentials.ts
index c5b925c0718d8..2e690bfb77eac 100644
--- a/packages/nodes-base/credentials/OktaApi.credentials.ts
+++ b/packages/nodes-base/credentials/OktaApi.credentials.ts
@@ -30,12 +30,13 @@ export class OktaApi implements ICredentialType {
 			placeholder: 'https://dev-123456.okta.com',
 		},
 		{
-			displayName: 'SSWS Access Token',
+			displayName: 'Access Token',
 			name: 'accessToken',
 			type: 'string',
 			typeOptions: { password: true },
 			required: true,
 			default: '',
+			description: 'Secure Session Web Service Access Token',
 		},
 	];
 
diff --git a/packages/nodes-base/nodes/Okta/Okta.dark.svg b/packages/nodes-base/nodes/Okta/Okta.dark.svg
new file mode 100644
index 0000000000000..b6f1fd7e2b477
--- /dev/null
+++ b/packages/nodes-base/nodes/Okta/Okta.dark.svg
@@ -0,0 +1,3 @@
+<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M22.0066 0.27781L21.1838 10.411C20.7926 10.3663 20.3992 10.344 20.0054 10.3443C19.5049 10.3443 19.0157 10.3777 18.5378 10.4555L18.0706 5.54432C18.0678 5.50753 18.0727 5.47056 18.0849 5.43573C18.097 5.4009 18.1162 5.36894 18.1413 5.34185C18.1663 5.31476 18.1967 5.29312 18.2305 5.27828C18.2642 5.26344 18.3007 5.25571 18.3376 5.25557H19.1715L18.7712 0.288903C18.7601 0.13328 18.8823 0 19.027 0H21.751C21.9066 0 22.029 0.13328 22.0066 0.288903V0.27781ZM15.1355 0.777805C15.0909 0.633275 14.9353 0.54437 14.7908 0.599994L12.2335 1.53327C12.0889 1.58889 12.0222 1.75561 12.0889 1.88889L14.1681 6.42212L13.3788 6.71118C13.2341 6.76665 13.1675 6.93321 13.2341 7.06665L15.3578 11.5221C16.1362 11.0932 16.9707 10.7754 17.8372 10.5777L15.1467 0.777805H15.1355ZM8.86458 3.59996L14.7462 11.8888C14.0013 12.3777 13.3231 12.9555 12.7449 13.6221L9.22036 10.1555C9.19473 10.1297 9.17462 10.0989 9.16124 10.0651C9.14787 10.0312 9.1415 9.995 9.14254 9.95862C9.14358 9.92224 9.15199 9.88645 9.16728 9.85342C9.18256 9.82039 9.2044 9.79081 9.23146 9.76647L9.87629 9.23319L6.37398 5.68901C6.26289 5.57791 6.27398 5.4001 6.39617 5.3001L8.47537 3.55575C8.59771 3.45575 8.76443 3.47793 8.85349 3.60012L8.86458 3.59996ZM3.92791 8.39992C3.80557 8.31101 3.62776 8.35554 3.54979 8.48882L2.19356 10.8443C2.11559 10.9777 2.17121 11.1443 2.30449 11.211L6.81867 13.3442L6.39617 14.0666C6.31836 14.1999 6.37398 14.3775 6.51851 14.4331L11.0105 16.4887C11.3293 15.6615 11.7635 14.8834 12.3002 14.1777L3.92791 8.39992ZM0.603416 14.7999C0.625759 14.6442 0.781383 14.5555 0.925913 14.5888L10.7658 17.1555C10.5058 18.0061 10.3637 18.8884 10.3433 19.7776L5.41774 19.3776C5.3809 19.3752 5.34502 19.3648 5.31257 19.3472C5.28011 19.3296 5.25183 19.3052 5.22967 19.2756C5.20751 19.2461 5.19198 19.2121 5.18415 19.176C5.17632 19.1399 5.17638 19.1026 5.18431 19.0665L5.32884 18.2442L0.358887 17.7776C0.203264 17.7665 0.103108 17.622 0.125296 17.4665L0.592479 14.7888L0.603416 14.7999ZM0.236545 21.4442C0.0809212 21.4554 -0.0192341 21.5998 0.00310941 21.7554L0.48123 24.433C0.503417 24.5887 0.65904 24.6776 0.80357 24.6441L5.62899 23.3887L5.77352 24.2109C5.79586 24.3665 5.95149 24.4554 6.09602 24.4219L10.8547 23.111C10.5768 22.2887 10.3989 21.411 10.3544 20.511L0.225451 21.4442H0.236545ZM1.81559 28.4888C1.73778 28.3555 1.79325 28.1888 1.92668 28.1221L11.1107 23.7666C11.4553 24.5888 11.9224 25.3555 12.4783 26.0443L8.45303 28.9108C8.33068 28.9997 8.15287 28.9664 8.0749 28.833L7.65241 28.0997L3.54979 30.933C3.42745 31.022 3.24948 30.9775 3.17167 30.8441L1.80419 28.4886L1.81559 28.4888ZM12.9452 26.5777L5.79586 33.8106C5.68462 33.9217 5.69587 34.0995 5.81805 34.1995L7.90834 35.9439C8.03069 36.0439 8.1974 36.0217 8.28646 35.8995L11.1772 31.8328L11.8221 32.3773C11.9444 32.4773 12.1224 32.4551 12.2111 32.3217L15.0131 28.2552C14.257 27.7885 13.5566 27.2218 12.9561 26.5774L12.9452 26.5777ZM11.5332 38.1885C11.3886 38.1331 11.3219 37.9665 11.3886 37.8331L15.6248 28.5888C16.4029 28.9888 17.2481 29.2888 18.1264 29.4555L16.8811 34.2331C16.8478 34.3776 16.6811 34.4665 16.5365 34.4109L15.7472 34.122L14.4241 38.9331C14.3795 39.0776 14.2239 39.1665 14.0794 39.1109L11.5221 38.1776L11.5332 38.1885ZM18.8268 29.5777L18.0042 39.7109C17.9931 39.8665 18.1153 39.9998 18.26 39.9998H20.984C21.1396 39.9998 21.262 39.8665 21.2396 39.7109L20.8395 34.7442H21.6732C21.7101 34.744 21.7465 34.7363 21.7803 34.7214C21.8141 34.7066 21.8444 34.6849 21.8694 34.6579C21.8945 34.6308 21.9137 34.5988 21.9258 34.564C21.938 34.5292 21.9428 34.4922 21.9401 34.4554L21.4732 29.5442C20.9951 29.6221 20.5059 29.6555 20.0056 29.6555C19.6053 29.6555 19.216 29.6331 18.827 29.5777M28.6336 2.14451C28.7003 2.00014 28.6336 1.84451 28.4891 1.78904L25.9319 0.855773C25.7872 0.800148 25.6316 0.889054 25.5872 1.03343L24.2641 5.84447L23.4746 5.55573C23.3301 5.5001 23.1744 5.58901 23.1299 5.73338L21.8846 10.5111C22.7741 10.689 23.608 10.989 24.3863 11.3779L28.6336 2.14451ZM34.2151 6.17791L27.0657 13.4108C26.4602 12.7598 25.7681 12.1952 25.0086 11.733L27.8106 7.66649C27.8996 7.54414 28.0774 7.51086 28.1997 7.61086L28.8445 8.15539L31.7354 4.08871C31.8245 3.96652 32.0023 3.94418 32.1136 4.04418L34.2037 5.78869C34.3261 5.88869 34.326 6.0665 34.226 6.1776L34.2151 6.17791ZM38.0844 11.8668C38.229 11.8 38.2735 11.6333 38.1955 11.5L36.8277 9.14428C36.7499 9.011 36.572 8.97772 36.4496 9.05554L32.347 11.8888L31.9245 11.1666C31.8465 11.0332 31.6687 10.9888 31.5464 11.0888L27.5214 13.9555C28.0774 14.6442 28.5333 15.4109 28.8891 16.2331L38.073 11.8777L38.0844 11.8668ZM39.5297 15.5556L39.9969 18.2333C40.0191 18.3889 39.919 18.5223 39.7633 18.5443L29.6344 19.4889C29.5898 18.5778 29.4119 17.7111 29.1339 16.8889L33.8928 15.5778C34.0373 15.5333 34.1929 15.6333 34.2151 15.7888L34.3596 16.6111L39.1852 15.3556C39.3297 15.3222 39.4852 15.4111 39.5076 15.5666L39.5297 15.5556ZM39.074 25.3888C39.2185 25.4221 39.3741 25.3332 39.3965 25.1777L39.863 22.4998C39.8854 22.3442 39.7852 22.2109 39.6296 22.1887L34.6596 21.722L34.8042 20.8998C34.8264 20.7442 34.7264 20.6109 34.5706 20.5887L29.6452 20.1887C29.6248 21.078 29.4826 21.9602 29.2227 22.8109L39.0626 25.3776L39.074 25.3888ZM36.4496 31.4997C36.3718 31.633 36.194 31.6664 36.0717 31.5886L27.6994 25.8108C28.2361 25.1051 28.6702 24.3271 28.9891 23.4998L33.4811 25.5554C33.6256 25.6219 33.6811 25.7887 33.6034 25.9219L33.1809 26.6441L37.6949 28.7775C37.8284 28.8441 37.884 29.0108 37.8062 29.1441L36.4496 31.4997ZM25.2533 28.0886L31.135 36.3775C31.224 36.4996 31.4019 36.5218 31.5131 36.4218L33.5922 34.6775C33.7145 34.5775 33.7145 34.3997 33.6145 34.2884L30.1122 30.7441L30.757 30.2108C30.8794 30.1108 30.8794 29.933 30.768 29.8219L27.2435 26.3554C26.6543 27.0219 25.9872 27.6108 25.2422 28.0886H25.2533ZM25.1977 39.3774C25.0532 39.4329 24.8975 39.344 24.853 39.1996L22.1624 29.3997C23.0289 29.2021 23.8634 28.8842 24.6418 28.4553L26.7655 32.9108C26.8321 33.0553 26.7655 33.2219 26.6208 33.2664L25.8314 33.5553L27.9106 38.0885C27.9774 38.2329 27.9106 38.3885 27.7661 38.444L25.2088 39.3774H25.1977Z" fill="white"/>
+</svg>
diff --git a/packages/nodes-base/nodes/Okta/Okta.node.ts b/packages/nodes-base/nodes/Okta/Okta.node.ts
new file mode 100644
index 0000000000000..e9bd0185be3a7
--- /dev/null
+++ b/packages/nodes-base/nodes/Okta/Okta.node.ts
@@ -0,0 +1,56 @@
+import type { INodeType, INodeTypeDescription } from 'n8n-workflow';
+import { userFields, userOperations } from './UserDescription';
+import { getUsers } from './UserFunctions';
+
+export class Okta implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Okta',
+		name: 'okta',
+		icon: { light: 'file:Okta.svg', dark: 'file:Okta.dark.svg' },
+		group: ['transform'],
+		version: 1,
+		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
+		description: 'Use the Okta API',
+		defaults: {
+			name: 'Okta',
+		},
+		inputs: ['main'],
+		outputs: ['main'],
+		credentials: [
+			{
+				name: 'oktaApi',
+				required: true,
+			},
+		],
+		requestDefaults: {
+			returnFullResponse: true,
+			baseURL: '={{$credentials.url.replace(new RegExp("/$"), "")}}',
+			headers: {},
+		},
+		properties: [
+			{
+				displayName: 'Resource',
+				name: 'resource',
+				type: 'options',
+				noDataExpression: true,
+				options: [
+					{
+						name: 'User',
+						value: 'user',
+					},
+				],
+				default: 'user',
+			},
+
+			// USER
+			...userOperations,
+			...userFields,
+		],
+	};
+
+	methods = {
+		listSearch: {
+			getUsers,
+		},
+	};
+}
diff --git a/packages/nodes-base/nodes/Okta/Okta.svg b/packages/nodes-base/nodes/Okta/Okta.svg
new file mode 100644
index 0000000000000..4ba579621f863
--- /dev/null
+++ b/packages/nodes-base/nodes/Okta/Okta.svg
@@ -0,0 +1,3 @@
+<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M22.0066 0.27781L21.1838 10.411C20.7926 10.3663 20.3992 10.344 20.0054 10.3443C19.5049 10.3443 19.0157 10.3777 18.5378 10.4555L18.0706 5.54432C18.0678 5.50753 18.0727 5.47056 18.0849 5.43573C18.097 5.4009 18.1162 5.36894 18.1413 5.34185C18.1663 5.31476 18.1967 5.29312 18.2305 5.27828C18.2642 5.26344 18.3007 5.25571 18.3376 5.25557H19.1715L18.7712 0.288903C18.7601 0.13328 18.8823 0 19.027 0H21.751C21.9066 0 22.029 0.13328 22.0066 0.288903V0.27781ZM15.1355 0.777805C15.0909 0.633275 14.9353 0.54437 14.7908 0.599994L12.2335 1.53327C12.0889 1.58889 12.0222 1.75561 12.0889 1.88889L14.1681 6.42212L13.3788 6.71118C13.2341 6.76665 13.1675 6.93321 13.2341 7.06665L15.3578 11.5221C16.1362 11.0932 16.9707 10.7754 17.8372 10.5777L15.1467 0.777805H15.1355ZM8.86458 3.59996L14.7462 11.8888C14.0013 12.3777 13.3231 12.9555 12.7449 13.6221L9.22036 10.1555C9.19473 10.1297 9.17462 10.0989 9.16124 10.0651C9.14787 10.0312 9.1415 9.995 9.14254 9.95862C9.14358 9.92224 9.15199 9.88645 9.16728 9.85342C9.18256 9.82039 9.2044 9.79081 9.23146 9.76647L9.87629 9.23319L6.37398 5.68901C6.26289 5.57791 6.27398 5.4001 6.39617 5.3001L8.47537 3.55575C8.59771 3.45575 8.76443 3.47793 8.85349 3.60012L8.86458 3.59996ZM3.92791 8.39992C3.80557 8.31101 3.62776 8.35554 3.54979 8.48882L2.19356 10.8443C2.11559 10.9777 2.17121 11.1443 2.30449 11.211L6.81867 13.3442L6.39617 14.0666C6.31836 14.1999 6.37398 14.3775 6.51851 14.4331L11.0105 16.4887C11.3293 15.6615 11.7635 14.8834 12.3002 14.1777L3.92791 8.39992ZM0.603416 14.7999C0.625759 14.6442 0.781383 14.5555 0.925913 14.5888L10.7658 17.1555C10.5058 18.0061 10.3637 18.8884 10.3433 19.7776L5.41774 19.3776C5.3809 19.3752 5.34502 19.3648 5.31257 19.3472C5.28011 19.3296 5.25183 19.3052 5.22967 19.2756C5.20751 19.2461 5.19198 19.2121 5.18415 19.176C5.17632 19.1399 5.17638 19.1026 5.18431 19.0665L5.32884 18.2442L0.358887 17.7776C0.203264 17.7665 0.103108 17.622 0.125296 17.4665L0.592479 14.7888L0.603416 14.7999ZM0.236545 21.4442C0.0809212 21.4554 -0.0192341 21.5998 0.00310941 21.7554L0.48123 24.433C0.503417 24.5887 0.65904 24.6776 0.80357 24.6441L5.62899 23.3887L5.77352 24.2109C5.79586 24.3665 5.95149 24.4554 6.09602 24.4219L10.8547 23.111C10.5768 22.2887 10.3989 21.411 10.3544 20.511L0.225451 21.4442H0.236545ZM1.81559 28.4888C1.73778 28.3555 1.79325 28.1888 1.92668 28.1221L11.1107 23.7666C11.4553 24.5888 11.9224 25.3555 12.4783 26.0443L8.45303 28.9108C8.33068 28.9997 8.15287 28.9664 8.0749 28.833L7.65241 28.0997L3.54979 30.933C3.42745 31.022 3.24948 30.9775 3.17167 30.8441L1.80419 28.4886L1.81559 28.4888ZM12.9452 26.5777L5.79586 33.8106C5.68462 33.9217 5.69587 34.0995 5.81805 34.1995L7.90834 35.9439C8.03069 36.0439 8.1974 36.0217 8.28646 35.8995L11.1772 31.8328L11.8221 32.3773C11.9444 32.4773 12.1224 32.4551 12.2111 32.3217L15.0131 28.2552C14.257 27.7885 13.5566 27.2218 12.9561 26.5774L12.9452 26.5777ZM11.5332 38.1885C11.3886 38.1331 11.3219 37.9665 11.3886 37.8331L15.6248 28.5888C16.4029 28.9888 17.2481 29.2888 18.1264 29.4555L16.8811 34.2331C16.8478 34.3776 16.6811 34.4665 16.5365 34.4109L15.7472 34.122L14.4241 38.9331C14.3795 39.0776 14.2239 39.1665 14.0794 39.1109L11.5221 38.1776L11.5332 38.1885ZM18.8268 29.5777L18.0042 39.7109C17.9931 39.8665 18.1153 39.9998 18.26 39.9998H20.984C21.1396 39.9998 21.262 39.8665 21.2396 39.7109L20.8395 34.7442H21.6732C21.7101 34.744 21.7465 34.7363 21.7803 34.7214C21.8141 34.7066 21.8444 34.6849 21.8694 34.6579C21.8945 34.6308 21.9137 34.5988 21.9258 34.564C21.938 34.5292 21.9428 34.4922 21.9401 34.4554L21.4732 29.5442C20.9951 29.6221 20.5059 29.6555 20.0056 29.6555C19.6053 29.6555 19.216 29.6331 18.827 29.5777M28.6336 2.14451C28.7003 2.00014 28.6336 1.84451 28.4891 1.78904L25.9319 0.855773C25.7872 0.800148 25.6316 0.889054 25.5872 1.03343L24.2641 5.84447L23.4746 5.55573C23.3301 5.5001 23.1744 5.58901 23.1299 5.73338L21.8846 10.5111C22.7741 10.689 23.608 10.989 24.3863 11.3779L28.6336 2.14451ZM34.2151 6.17791L27.0657 13.4108C26.4602 12.7598 25.7681 12.1952 25.0086 11.733L27.8106 7.66649C27.8996 7.54414 28.0774 7.51086 28.1997 7.61086L28.8445 8.15539L31.7354 4.08871C31.8245 3.96652 32.0023 3.94418 32.1136 4.04418L34.2037 5.78869C34.3261 5.88869 34.326 6.0665 34.226 6.1776L34.2151 6.17791ZM38.0844 11.8668C38.229 11.8 38.2735 11.6333 38.1955 11.5L36.8277 9.14428C36.7499 9.011 36.572 8.97772 36.4496 9.05554L32.347 11.8888L31.9245 11.1666C31.8465 11.0332 31.6687 10.9888 31.5464 11.0888L27.5214 13.9555C28.0774 14.6442 28.5333 15.4109 28.8891 16.2331L38.073 11.8777L38.0844 11.8668ZM39.5297 15.5556L39.9969 18.2333C40.0191 18.3889 39.919 18.5223 39.7633 18.5443L29.6344 19.4889C29.5898 18.5778 29.4119 17.7111 29.1339 16.8889L33.8928 15.5778C34.0373 15.5333 34.1929 15.6333 34.2151 15.7888L34.3596 16.6111L39.1852 15.3556C39.3297 15.3222 39.4852 15.4111 39.5076 15.5666L39.5297 15.5556ZM39.074 25.3888C39.2185 25.4221 39.3741 25.3332 39.3965 25.1777L39.863 22.4998C39.8854 22.3442 39.7852 22.2109 39.6296 22.1887L34.6596 21.722L34.8042 20.8998C34.8264 20.7442 34.7264 20.6109 34.5706 20.5887L29.6452 20.1887C29.6248 21.078 29.4826 21.9602 29.2227 22.8109L39.0626 25.3776L39.074 25.3888ZM36.4496 31.4997C36.3718 31.633 36.194 31.6664 36.0717 31.5886L27.6994 25.8108C28.2361 25.1051 28.6702 24.3271 28.9891 23.4998L33.4811 25.5554C33.6256 25.6219 33.6811 25.7887 33.6034 25.9219L33.1809 26.6441L37.6949 28.7775C37.8284 28.8441 37.884 29.0108 37.8062 29.1441L36.4496 31.4997ZM25.2533 28.0886L31.135 36.3775C31.224 36.4996 31.4019 36.5218 31.5131 36.4218L33.5922 34.6775C33.7145 34.5775 33.7145 34.3997 33.6145 34.2884L30.1122 30.7441L30.757 30.2108C30.8794 30.1108 30.8794 29.933 30.768 29.8219L27.2435 26.3554C26.6543 27.0219 25.9872 27.6108 25.2422 28.0886H25.2533ZM25.1977 39.3774C25.0532 39.4329 24.8975 39.344 24.853 39.1996L22.1624 29.3997C23.0289 29.2021 23.8634 28.8842 24.6418 28.4553L26.7655 32.9108C26.8321 33.0553 26.7655 33.2219 26.6208 33.2664L25.8314 33.5553L27.9106 38.0885C27.9774 38.2329 27.9106 38.3885 27.7661 38.444L25.2088 39.3774H25.1977Z" fill="black"/>
+</svg>
diff --git a/packages/nodes-base/nodes/Okta/UserDescription.ts b/packages/nodes-base/nodes/Okta/UserDescription.ts
new file mode 100644
index 0000000000000..b10d580339a99
--- /dev/null
+++ b/packages/nodes-base/nodes/Okta/UserDescription.ts
@@ -0,0 +1,795 @@
+import type { INodeProperties } from 'n8n-workflow';
+import { getCursorPaginator, simplifyGetAllResponse, simplifyGetResponse } from './UserFunctions';
+const BASE_API_URL = '/api/v1/users/';
+export const userOperations: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		displayOptions: {
+			show: {
+				resource: ['user'],
+			},
+		},
+		options: [
+			// Create Operation
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a new user',
+				routing: {
+					request: {
+						method: 'POST',
+						url: BASE_API_URL,
+						qs: { activate: '={{$parameter["activate"]}}' },
+						returnFullResponse: true,
+					},
+				},
+				action: 'Create a new user',
+			},
+			// Delete Operation
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete an existing user',
+				routing: {
+					request: {
+						method: 'DELETE',
+						url: '={{"/api/v1/users/" + $parameter["userId"]}}',
+						returnFullResponse: true,
+					},
+					output: {
+						postReceive: [
+							{
+								type: 'set',
+								properties: {
+									value: '={{ { "success": true } }}',
+								},
+							},
+						],
+					},
+				},
+				action: 'Delete a user',
+			},
+			// Get Operation
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get details of a user',
+				routing: {
+					request: {
+						method: 'GET',
+						url: '={{"/api/v1/users/" + $parameter["userId"]}}',
+						returnFullResponse: true,
+						qs: {},
+					},
+					output: {
+						postReceive: [simplifyGetResponse],
+					},
+				},
+				action: 'Get a user',
+			},
+			// Get All Operation
+			{
+				name: 'Get Many',
+				value: 'getAll',
+				description: 'Get many users',
+				routing: {
+					request: {
+						method: 'GET',
+						url: BASE_API_URL,
+						qs: { search: '={{$parameter["searchQuery"]}}' },
+						returnFullResponse: true,
+					},
+					output: {
+						postReceive: [simplifyGetAllResponse],
+					},
+					send: {
+						paginate: true,
+					},
+					operations: {
+						pagination: getCursorPaginator(),
+					},
+				},
+				action: 'Get many users',
+			},
+			// Update Operation
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update an existing user',
+				routing: {
+					request: {
+						method: 'POST',
+						url: '={{"/api/v1/users/" + $parameter["userId"]}}',
+						returnFullResponse: true,
+					},
+				},
+				action: 'Update a user',
+			},
+		],
+		default: 'getAll',
+	},
+];
+const mainProfileFields: INodeProperties[] = [
+	{
+		displayName: 'First Name',
+		name: 'firstName',
+		type: 'string',
+		placeholder: 'e.g. Nathan',
+		default: '',
+		routing: {
+			send: {
+				property: 'profile.firstName',
+				type: 'body',
+			},
+		},
+	},
+	{
+		displayName: 'Last Name',
+		name: 'lastName',
+		type: 'string',
+		placeholder: 'e.g. Smith',
+		default: '',
+		routing: {
+			send: {
+				property: 'profile.lastName',
+				type: 'body',
+			},
+		},
+	},
+	{
+		displayName: 'Username',
+		name: 'login',
+		type: 'string',
+		placeholder: 'e.g. nathan@example.com',
+		hint: 'Unique identifier for the user, must be an email',
+		default: '',
+		routing: {
+			send: {
+				property: 'profile.login',
+				type: 'body',
+			},
+		},
+	},
+	{
+		displayName: 'Email',
+		name: 'email',
+		type: 'string',
+		placeholder: 'e.g. nathan@example.com',
+		default: '',
+		routing: {
+			send: {
+				property: 'profile.email',
+				type: 'body',
+			},
+		},
+	},
+];
+const createFields: INodeProperties[] = [
+	{
+		displayName: 'City',
+		name: 'city',
+		type: 'string',
+		default: '',
+		routing: {
+			send: {
+				property: 'profile.city',
+				type: 'body',
+			},
+		},
+	},
+	{
+		displayName: 'Cost Center',
+		name: 'costCenter',
+		type: 'string',
+		default: '',
+		routing: {
+			send: {
+				property: 'profile.costCenter',
+				type: 'body',
+			},
+		},
+	},
+	{
+		displayName: 'Country Code',
+		name: 'countryCode',
+		type: 'string',
+		default: '',
+		routing: {
+			send: {
+				property: 'profile.countryCode',
+				type: 'body',
+			},
+		},
+	},
+	{
+		displayName: 'Department',
+		name: 'department',
+		type: 'string',
+		default: '',
+		routing: {
+			send: {
+				property: 'profile.department',
+				type: 'body',
+			},
+		},
+	},
+	{
+		displayName: 'Display Name',
+		name: 'displayName',
+		type: 'string',
+		default: '',
+		routing: {
+			send: {
+				property: 'profile.displayName',
+				type: 'body',
+			},
+		},
+	},
+	{
+		displayName: 'Division',
+		name: 'division',
+		type: 'string',
+		default: '',
+		routing: {
+			send: {
+				property: 'profile.division',
+				type: 'body',
+			},
+		},
+	},
+	{
+		displayName: 'Employee Number',
+		name: 'employeeNumber',
+		type: 'string',
+		default: '',
+		routing: {
+			send: {
+				property: 'profile.employeeNumber',
+				type: 'body',
+			},
+		},
+	},
+	{
+		displayName: 'Honorific Prefix',
+		name: 'honorificPrefix',
+		type: 'string',
+		default: '',
+		routing: {
+			send: {
+				property: 'profile.honorificPrefix',
+				type: 'body',
+			},
+		},
+	},
+	{
+		displayName: 'Honorific Suffix',
+		name: 'honorificSuffix',
+		type: 'string',
+		default: '',
+		routing: {
+			send: {
+				property: 'profile.honorificSuffix',
+				type: 'body',
+			},
+		},
+	},
+	{
+		displayName: 'Locale',
+		name: 'locale',
+		type: 'string',
+		default: '',
+		routing: {
+			send: {
+				property: 'profile.locale',
+				type: 'body',
+			},
+		},
+	},
+	{
+		displayName: 'Manager',
+		name: 'manager',
+		type: 'string',
+		default: '',
+		routing: {
+			send: {
+				property: 'profile.manager',
+				type: 'body',
+			},
+		},
+	},
+	{
+		displayName: 'ManagerId',
+		name: 'managerId',
+		type: 'string',
+		default: '',
+		routing: {
+			send: {
+				property: 'profile.managerId',
+				type: 'body',
+			},
+		},
+	},
+	{
+		displayName: 'Middle Name',
+		name: 'middleName',
+		type: 'string',
+		default: '',
+		routing: {
+			send: {
+				property: 'profile.middleName',
+				type: 'body',
+			},
+		},
+	},
+	{
+		displayName: 'Mobile Phone',
+		name: 'mobilePhone',
+		type: 'string',
+		default: '',
+		routing: {
+			send: {
+				property: 'profile.mobilePhone',
+				type: 'body',
+			},
+		},
+	},
+	{
+		displayName: 'Nick Name',
+		name: 'nickName',
+		type: 'string',
+		default: '',
+		routing: {
+			send: {
+				property: 'profile.nickName',
+				type: 'body',
+			},
+		},
+	},
+	{
+		displayName: 'Password',
+		name: 'password',
+		type: 'string',
+		typeOptions: { password: true },
+		default: '',
+		routing: {
+			send: {
+				property: 'credentials.password.value',
+				type: 'body',
+			},
+		},
+	},
+	{
+		displayName: 'Organization',
+		name: 'organization',
+		type: 'string',
+		default: '',
+		routing: {
+			send: {
+				property: 'profile.organization',
+				type: 'body',
+			},
+		},
+	},
+	{
+		displayName: 'Postal Address',
+		name: 'postalAddress',
+		type: 'string',
+		default: '',
+		routing: {
+			send: {
+				property: 'profile.postalAddress',
+				type: 'body',
+			},
+		},
+	},
+	{
+		displayName: 'Preferred Language',
+		name: 'preferredLanguage',
+		type: 'string',
+		default: '',
+		routing: {
+			send: {
+				property: 'profile.preferredLanguage',
+				type: 'body',
+			},
+		},
+	},
+	{
+		displayName: 'Primary Phone',
+		name: 'primaryPhone',
+		type: 'string',
+		default: '',
+		routing: {
+			send: {
+				property: 'profile.primaryPhone',
+				type: 'body',
+			},
+		},
+	},
+	{
+		displayName: 'Profile Url',
+		name: 'profileUrl',
+		type: 'string',
+		default: '',
+		routing: {
+			send: {
+				property: 'profile.profileUrl',
+				type: 'body',
+			},
+		},
+	},
+	{
+		displayName: 'Recovery Question Answer',
+		name: 'recoveryQuestionAnswer',
+		type: 'string',
+		default: '',
+		routing: {
+			send: {
+				property: 'credentials.recovery_question.answer',
+				type: 'body',
+			},
+		},
+	},
+	{
+		displayName: 'Recovery Question Question',
+		name: 'recoveryQuestionQuestion',
+		type: 'string',
+		default: '',
+		routing: {
+			send: {
+				property: 'credentials.recovery_question.question',
+				type: 'body',
+			},
+		},
+	},
+	{
+		displayName: 'Second Email',
+		name: 'secondEmail',
+		type: 'string',
+		typeOptions: { email: true },
+		default: '',
+		routing: {
+			send: {
+				property: 'profile.secondEmail',
+				type: 'body',
+			},
+		},
+	},
+	{
+		displayName: 'State',
+		name: 'state',
+		type: 'string',
+		default: '',
+		routing: {
+			send: {
+				property: 'profile.state',
+				type: 'body',
+			},
+		},
+	},
+	{
+		displayName: 'Street Address',
+		name: 'streetAddress',
+		type: 'string',
+		default: '',
+		routing: {
+			send: {
+				property: 'profile.streetAddress',
+				type: 'body',
+			},
+		},
+	},
+	{
+		displayName: 'Timezone',
+		name: 'timezone',
+		type: 'string',
+		default: '',
+		routing: {
+			send: {
+				property: 'profile.timezone',
+				type: 'body',
+			},
+		},
+	},
+	{
+		displayName: 'Title',
+		name: 'title',
+		type: 'string',
+		default: '',
+		routing: {
+			send: {
+				property: 'profile.title',
+				type: 'body',
+			},
+		},
+	},
+	{
+		displayName: 'User Type',
+		name: 'userType',
+		type: 'string',
+		default: '',
+		routing: {
+			send: {
+				property: 'profile.userType',
+				type: 'body',
+			},
+		},
+	},
+	{
+		displayName: 'Zip Code',
+		name: 'zipCode',
+		type: 'string',
+		default: '',
+		routing: {
+			send: {
+				property: 'profile.zipCode',
+				type: 'body',
+			},
+		},
+	},
+];
+const updateFields: INodeProperties[] = createFields
+	.concat(mainProfileFields)
+	.sort((a, b) => a.displayName.localeCompare(b.displayName));
+
+export const userFields: INodeProperties[] = [
+	// Fields for 'get', 'update', and 'delete' operations
+
+	{
+		displayName: 'User',
+		name: 'userId',
+		type: 'resourceLocator',
+		default: { mode: 'list', value: '' },
+		required: true,
+		modes: [
+			{
+				displayName: 'From List',
+				name: 'list',
+				type: 'list',
+				placeholder: 'Select a user...',
+				typeOptions: {
+					searchListMethod: 'getUsers',
+					searchable: true,
+				},
+			},
+			{
+				displayName: 'By username',
+				name: 'login',
+				type: 'string',
+				placeholder: '',
+			},
+			{
+				displayName: 'ID',
+				name: 'id',
+				type: 'string',
+				placeholder: 'e.g. 00u1abcd2345EfGHIjk6',
+			},
+		],
+		displayOptions: {
+			show: {
+				resource: ['user'],
+				operation: ['get', 'update', 'delete'],
+			},
+		},
+		description: 'The user you want to operate on. Choose from the list, or specify an ID.',
+	},
+	//  Fields specific to 'create' operation
+	{
+		displayName: 'First Name',
+		name: 'firstName',
+		type: 'string',
+		required: true,
+		placeholder: 'e.g. Nathan',
+		displayOptions: {
+			show: {
+				resource: ['user'],
+				operation: ['create'],
+			},
+		},
+		default: '',
+		routing: {
+			send: {
+				property: 'profile.firstName',
+				type: 'body',
+			},
+		},
+	},
+	{
+		displayName: 'Last Name',
+		name: 'lastName',
+		type: 'string',
+		required: true,
+		placeholder: 'e.g. Smith',
+		displayOptions: {
+			show: {
+				resource: ['user'],
+				operation: ['create'],
+			},
+		},
+		default: '',
+		routing: {
+			send: {
+				property: 'profile.lastName',
+				type: 'body',
+			},
+		},
+	},
+	{
+		displayName: 'Username',
+		name: 'login',
+		type: 'string',
+		required: true,
+		placeholder: 'e.g. nathan@example.com',
+		hint: 'Unique identifier for the user, must be an email',
+		displayOptions: {
+			show: {
+				resource: ['user'],
+				operation: ['create'],
+			},
+		},
+		default: '',
+		routing: {
+			send: {
+				property: 'profile.login',
+				type: 'body',
+			},
+		},
+	},
+	{
+		displayName: 'Email',
+		name: 'email',
+		type: 'string',
+		required: true,
+		placeholder: 'e.g. nathan@example.com',
+		displayOptions: {
+			show: {
+				resource: ['user'],
+				operation: ['create'],
+			},
+		},
+		default: '',
+		routing: {
+			send: {
+				property: 'profile.email',
+				type: 'body',
+			},
+		},
+	},
+	{
+		displayName: 'Activate',
+		name: 'activate',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: ['user'],
+				operation: ['create'],
+			},
+		},
+		default: true,
+		description: 'Whether to activate the user and allow access to all assigned applications',
+	},
+	{
+		displayName: 'Fields',
+		name: 'getCreateFields',
+		type: 'collection',
+		displayOptions: {
+			show: {
+				resource: ['user'],
+				operation: ['create'],
+			},
+		},
+		default: {},
+		placeholder: 'Add field',
+		options: createFields,
+	},
+
+	// Fields for 'update' operations
+	{
+		displayName: 'Fields',
+		name: 'getUpdateFields',
+		type: 'collection',
+		displayOptions: {
+			show: {
+				resource: ['user'],
+				operation: ['update'],
+			},
+		},
+		default: {},
+		placeholder: 'Add field',
+		options: updateFields,
+	},
+
+	// Fields specific to 'getAll' operation
+	{
+		displayName: 'Search Query',
+		name: 'searchQuery',
+		type: 'string',
+		placeholder: 'e.g. profile.lastName sw "Smi"',
+		hint: 'Filter users by using the allowed syntax. <a href="https://developer.okta.com/docs/reference/core-okta-api/#filter" target="_blank">More info</a>.',
+		displayOptions: {
+			show: {
+				resource: ['user'],
+				operation: ['getAll'],
+			},
+		},
+		default: '',
+		routing: {
+			request: {
+				qs: {
+					prefix: '={{$value}}',
+				},
+			},
+		},
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		displayOptions: {
+			show: {
+				resource: ['user'],
+				operation: ['getAll'],
+				returnAll: [false],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 200,
+		},
+		default: 20,
+		routing: {
+			send: {
+				type: 'query',
+				property: 'limit',
+			},
+			output: {
+				maxResults: '={{$value}}', // Set maxResults to the value of current parameter
+			},
+		},
+		description: 'Max number of results to return',
+	},
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: ['user'],
+				operation: ['getAll'],
+			},
+		},
+		default: false,
+		description: 'Whether to return all results or only up to a given limit',
+	},
+	// Fields for 'get' and 'getAll' operations
+	{
+		displayName: 'Simplify',
+		name: 'simplify',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: ['user'],
+				operation: ['get', 'getAll'],
+			},
+		},
+		default: true,
+		description: 'Whether to return a simplified version of the response instead of the raw data',
+	},
+	// Fields specific to 'delete' operation
+	{
+		displayName: 'Send Email',
+		name: 'sendEmail',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: ['user'],
+				operation: ['delete'],
+			},
+		},
+		default: false,
+		description: 'Whether to send a deactivation email to the administrator',
+	},
+];
diff --git a/packages/nodes-base/nodes/Okta/UserFunctions.ts b/packages/nodes-base/nodes/Okta/UserFunctions.ts
new file mode 100644
index 0000000000000..6def8ea296ae9
--- /dev/null
+++ b/packages/nodes-base/nodes/Okta/UserFunctions.ts
@@ -0,0 +1,170 @@
+import type {
+	DeclarativeRestApiSettings,
+	IDataObject,
+	IExecuteFunctions,
+	IExecutePaginationFunctions,
+	IExecuteSingleFunctions,
+	IHookFunctions,
+	IHttpRequestMethods,
+	IHttpRequestOptions,
+	ILoadOptionsFunctions,
+	IN8nHttpFullResponse,
+	INodeExecutionData,
+	INodeListSearchResult,
+	INodePropertyOptions,
+} from 'n8n-workflow';
+
+type OktaUser = {
+	status: string;
+	created: string;
+	activated: string;
+	lastLogin: string;
+	lastUpdated: string;
+	passwordChanged: string;
+	profile: {
+		login: string;
+		email: string;
+		firstName: string;
+		lastName: string;
+	};
+	id: string;
+};
+
+export async function oktaApiRequest(
+	this: IExecuteFunctions | IExecuteSingleFunctions | IHookFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
+	resource: string,
+	body: IDataObject = {},
+	qs: IDataObject = {},
+	url?: string,
+	option: IDataObject = {},
+): Promise<OktaUser[]> {
+	const credentials = await this.getCredentials('oktaApi');
+	const baseUrl = `${credentials.url as string}/api/v1/${resource}`;
+	const options: IHttpRequestOptions = {
+		headers: {
+			'Content-Type': 'application/json',
+		},
+		method,
+		body: Object.keys(body).length ? body : undefined,
+		qs: Object.keys(qs).length ? qs : undefined,
+		url: url ?? baseUrl,
+		json: true,
+		...option,
+	};
+	return await (this.helpers.httpRequestWithAuthentication.call(
+		this,
+		'oktaApi',
+		options,
+	) as Promise<OktaUser[]>);
+}
+
+export async function getUsers(
+	this: ILoadOptionsFunctions,
+	filter?: string,
+): Promise<INodeListSearchResult> {
+	const responseData: OktaUser[] = await oktaApiRequest.call(this, 'GET', '/users/');
+	const filteredUsers = responseData.filter((user) => {
+		if (!filter) return true;
+		const username = `${user.profile.login}`.toLowerCase();
+		return username.includes(filter.toLowerCase());
+	});
+	const users: INodePropertyOptions[] = filteredUsers.map((user) => ({
+		name: `${user.profile.login}`,
+		value: user.id,
+	}));
+	return {
+		results: users,
+	};
+}
+
+function simplifyOktaUser(item: OktaUser): IDataObject {
+	return {
+		id: item.id,
+		status: item.status,
+		created: item.created,
+		activated: item.activated,
+		lastLogin: item.lastLogin,
+		lastUpdated: item.lastUpdated,
+		passwordChanged: item.passwordChanged,
+		profile: {
+			firstName: item.profile.firstName,
+			lastName: item.profile.lastName,
+			login: item.profile.login,
+			email: item.profile.email,
+		},
+	};
+}
+
+export async function simplifyGetAllResponse(
+	this: IExecuteSingleFunctions,
+	items: INodeExecutionData[],
+	_response: IN8nHttpFullResponse,
+): Promise<INodeExecutionData[]> {
+	if (items.length === 0) return items;
+	const simplify = this.getNodeParameter('simplify');
+	if (!simplify)
+		return ((items[0].json as unknown as IDataObject[]) ?? []).map((item: IDataObject) => ({
+			json: item,
+			headers: _response.headers,
+		})) as INodeExecutionData[];
+	let simplifiedItems: INodeExecutionData[] = [];
+	if (items[0].json) {
+		const jsonArray = items[0].json as unknown;
+		simplifiedItems = (jsonArray as OktaUser[]).map((item: OktaUser) => {
+			const simplifiedItem = simplifyOktaUser(item);
+			return {
+				json: simplifiedItem,
+				headers: _response.headers,
+			};
+		});
+	}
+
+	return simplifiedItems;
+}
+
+export async function simplifyGetResponse(
+	this: IExecuteSingleFunctions,
+	items: INodeExecutionData[],
+	_response: IN8nHttpFullResponse,
+): Promise<INodeExecutionData[]> {
+	const simplify = this.getNodeParameter('simplify');
+	if (!simplify) return items;
+	const item = items[0].json as OktaUser;
+	const simplifiedItem = simplifyOktaUser(item);
+
+	return [
+		{
+			json: simplifiedItem,
+		},
+	] as INodeExecutionData[];
+}
+
+export const getCursorPaginator = () => {
+	return async function cursorPagination(
+		this: IExecutePaginationFunctions,
+		requestOptions: DeclarativeRestApiSettings.ResultOptions,
+	): Promise<INodeExecutionData[]> {
+		if (!requestOptions.options.qs) {
+			requestOptions.options.qs = {};
+		}
+
+		let items: INodeExecutionData[] = [];
+		let responseData: INodeExecutionData[];
+		let nextCursor: string | undefined = undefined;
+		const returnAll = this.getNodeParameter('returnAll', true) as boolean;
+		do {
+			requestOptions.options.qs.limit = 200;
+			requestOptions.options.qs.after = nextCursor;
+			responseData = await this.makeRoutingRequest(requestOptions);
+			if (responseData.length > 0) {
+				const headers = responseData[responseData.length - 1].headers;
+				const headersLink = (headers as IDataObject)?.link as string | undefined;
+				nextCursor = headersLink?.split('after=')[1]?.split('&')[0]?.split('>')[0];
+			}
+			items = items.concat(responseData);
+		} while (returnAll && nextCursor);
+
+		return items;
+	};
+};
diff --git a/packages/nodes-base/nodes/Okta/test/UserFunctions.test.ts b/packages/nodes-base/nodes/Okta/test/UserFunctions.test.ts
new file mode 100644
index 0000000000000..9e5262db67a51
--- /dev/null
+++ b/packages/nodes-base/nodes/Okta/test/UserFunctions.test.ts
@@ -0,0 +1,375 @@
+import type {
+	DeclarativeRestApiSettings,
+	IDataObject,
+	IExecuteFunctions,
+	IExecutePaginationFunctions,
+	IExecuteSingleFunctions,
+	ILoadOptionsFunctions,
+	IN8nHttpFullResponse,
+	INodeExecutionData,
+} from 'n8n-workflow';
+import {
+	getCursorPaginator,
+	getUsers,
+	oktaApiRequest,
+	simplifyGetAllResponse,
+	simplifyGetResponse,
+} from '../UserFunctions';
+
+describe('oktaApiRequest', () => {
+	const mockGetCredentials = jest.fn();
+	const mockHttpRequestWithAuthentication = jest.fn();
+
+	const mockContext = {
+		getCredentials: mockGetCredentials,
+		helpers: {
+			httpRequestWithAuthentication: mockHttpRequestWithAuthentication,
+		},
+	} as unknown as IExecuteFunctions;
+
+	beforeEach(() => {
+		mockGetCredentials.mockClear();
+		mockHttpRequestWithAuthentication.mockClear();
+	});
+
+	it('should make a GET request and return data', async () => {
+		mockGetCredentials.mockResolvedValue({ url: 'https://okta.example.com' });
+		mockHttpRequestWithAuthentication.mockResolvedValue([
+			{ profile: { firstName: 'John', lastName: 'Doe' }, id: '1' },
+		]);
+
+		const response = await oktaApiRequest.call(mockContext, 'GET', 'users');
+
+		expect(mockGetCredentials).toHaveBeenCalledWith('oktaApi');
+		expect(mockHttpRequestWithAuthentication).toHaveBeenCalledWith('oktaApi', {
+			headers: { 'Content-Type': 'application/json' },
+			method: 'GET',
+			body: undefined,
+			qs: undefined,
+			url: 'https://okta.example.com/api/v1/users',
+			json: true,
+		});
+		expect(response).toEqual([{ profile: { firstName: 'John', lastName: 'Doe' }, id: '1' }]);
+	});
+
+	// Tests for error handling
+	it('should handle errors from oktaApiRequest', async () => {
+		mockHttpRequestWithAuthentication.mockRejectedValue(new Error('Network error'));
+
+		await expect(oktaApiRequest.call(mockContext, 'GET', 'users')).rejects.toThrow('Network error');
+	});
+});
+
+describe('getUsers', () => {
+	const mockOktaApiRequest = jest.fn();
+	const mockContext = {
+		getCredentials: jest.fn().mockResolvedValue({ url: 'https://okta.example.com' }),
+		helpers: {
+			httpRequestWithAuthentication: mockOktaApiRequest,
+		},
+	} as unknown as ILoadOptionsFunctions;
+
+	beforeEach(() => {
+		mockOktaApiRequest.mockClear();
+	});
+
+	it('should return users with filtering', async () => {
+		mockOktaApiRequest.mockResolvedValue([
+			{ profile: { login: 'John@example.com' }, id: '1' },
+			{ profile: { login: 'Jane@example.com' }, id: '2' },
+		]);
+
+		const response = await getUsers.call(mockContext, 'john');
+
+		expect(response).toEqual({
+			results: [{ name: 'John@example.com', value: '1' }],
+		});
+	});
+
+	it('should return all users when no filter is applied', async () => {
+		mockOktaApiRequest.mockResolvedValue([
+			{ profile: { login: 'John@example.com' }, id: '1' },
+			{ profile: { login: 'Jane@example.com' }, id: '2' },
+		]);
+
+		const response = await getUsers.call(mockContext);
+
+		expect(response).toEqual({
+			results: [
+				{ name: 'John@example.com', value: '1' },
+				{ name: 'Jane@example.com', value: '2' },
+			],
+		});
+	});
+
+	// Tests for empty results
+	it('should handle empty results from oktaApiRequest', async () => {
+		mockOktaApiRequest.mockResolvedValue([]);
+
+		const response = await getUsers.call(mockContext);
+
+		expect(response).toEqual({
+			results: [],
+		});
+	});
+});
+
+describe('simplifyGetAllResponse', () => {
+	const mockGetNodeParameter = jest.fn();
+	const mockContext = {
+		getNodeParameter: mockGetNodeParameter,
+	} as unknown as IExecuteSingleFunctions;
+	const mockResponse = jest.fn() as unknown as IN8nHttpFullResponse;
+
+	const items: INodeExecutionData[] = [
+		{
+			json: [
+				{
+					id: '01',
+					status: 'ACTIVE',
+					created: '2023-01-01T00:00:00.000Z',
+					activated: '2023-01-01T00:00:01.000Z',
+					lastLogin: null,
+					lastUpdated: '2023-01-01T00:00:01.000Z',
+					passwordChanged: null,
+					some_item: 'some_value',
+					profile: {
+						firstName: 'John',
+						lastName: 'Doe',
+						login: 'john.doe@example.com',
+						email: 'john.doe@example.com',
+						some_profile_item: 'some_profile_value',
+					},
+				},
+			] as unknown as IDataObject,
+		},
+	];
+
+	beforeEach(() => {
+		mockGetNodeParameter.mockClear();
+	});
+
+	it('should return items unchanged when simplify parameter is not set', async () => {
+		mockGetNodeParameter.mockReturnValueOnce(false);
+
+		const expectedResult: INodeExecutionData[] = [
+			{
+				json: {
+					id: '01',
+					status: 'ACTIVE',
+					created: '2023-01-01T00:00:00.000Z',
+					activated: '2023-01-01T00:00:01.000Z',
+					lastLogin: null,
+					lastUpdated: '2023-01-01T00:00:01.000Z',
+					passwordChanged: null,
+					some_item: 'some_value',
+					profile: {
+						firstName: 'John',
+						lastName: 'Doe',
+						login: 'john.doe@example.com',
+						email: 'john.doe@example.com',
+						some_profile_item: 'some_profile_value',
+					},
+				},
+			},
+		];
+
+		const result = await simplifyGetAllResponse.call(mockContext, items, mockResponse);
+		expect(result).toEqual(expectedResult);
+	});
+
+	it('should simplify items correctly', async () => {
+		mockGetNodeParameter.mockReturnValueOnce(true);
+
+		const expectedResult: INodeExecutionData[] = [
+			{
+				json: {
+					id: '01',
+					status: 'ACTIVE',
+					created: '2023-01-01T00:00:00.000Z',
+					activated: '2023-01-01T00:00:01.000Z',
+					lastLogin: null,
+					lastUpdated: '2023-01-01T00:00:01.000Z',
+					passwordChanged: null,
+					profile: {
+						firstName: 'John',
+						lastName: 'Doe',
+						login: 'john.doe@example.com',
+						email: 'john.doe@example.com',
+					},
+				},
+			},
+		];
+
+		const result = await simplifyGetAllResponse.call(mockContext, items, mockResponse);
+		expect(result).toEqual(expectedResult);
+	});
+
+	it('should return an empty array when items is an empty array', async () => {
+		mockGetNodeParameter.mockReturnValueOnce(false);
+
+		const emptyArrayItems: INodeExecutionData[] = [];
+
+		const result = await simplifyGetAllResponse.call(mockContext, emptyArrayItems, mockResponse);
+		expect(result).toEqual([]);
+	});
+});
+
+describe('simplifyGetResponse', () => {
+	const mockGetNodeParameter = jest.fn();
+	const mockContext = {
+		getNodeParameter: mockGetNodeParameter,
+	} as unknown as IExecuteSingleFunctions;
+	const mockResponse = jest.fn() as unknown as IN8nHttpFullResponse;
+
+	const items: INodeExecutionData[] = [
+		{
+			json: {
+				id: '01',
+				status: 'ACTIVE',
+				created: '2023-01-01T00:00:00.000Z',
+				activated: '2023-01-01T00:00:01.000Z',
+				lastLogin: null,
+				lastUpdated: '2023-01-01T00:00:01.000Z',
+				passwordChanged: null,
+				some_item: 'some_value',
+				profile: {
+					firstName: 'John',
+					lastName: 'Doe',
+					login: 'john.doe@example.com',
+					email: 'john.doe@example.com',
+					some_profile_item: 'some_profile_value',
+				},
+			} as unknown as IDataObject,
+		},
+	];
+	beforeEach(() => {
+		mockGetNodeParameter.mockClear();
+	});
+
+	it('should return the item unchanged when simplify parameter is not set', async () => {
+		mockGetNodeParameter.mockReturnValueOnce(false);
+
+		const expectedResult: INodeExecutionData[] = [
+			{
+				json: {
+					id: '01',
+					status: 'ACTIVE',
+					created: '2023-01-01T00:00:00.000Z',
+					activated: '2023-01-01T00:00:01.000Z',
+					lastLogin: null,
+					lastUpdated: '2023-01-01T00:00:01.000Z',
+					passwordChanged: null,
+					some_item: 'some_value',
+					profile: {
+						firstName: 'John',
+						lastName: 'Doe',
+						login: 'john.doe@example.com',
+						email: 'john.doe@example.com',
+						some_profile_item: 'some_profile_value',
+					},
+				},
+			},
+		];
+
+		const result = await simplifyGetResponse.call(mockContext, items, mockResponse);
+		expect(result).toEqual(expectedResult);
+	});
+
+	it('should simplify the item correctly', async () => {
+		mockGetNodeParameter.mockReturnValueOnce(true);
+
+		const expectedResult: INodeExecutionData[] = [
+			{
+				json: {
+					id: '01',
+					status: 'ACTIVE',
+					created: '2023-01-01T00:00:00.000Z',
+					activated: '2023-01-01T00:00:01.000Z',
+					lastLogin: null,
+					lastUpdated: '2023-01-01T00:00:01.000Z',
+					passwordChanged: null,
+					profile: {
+						firstName: 'John',
+						lastName: 'Doe',
+						login: 'john.doe@example.com',
+						email: 'john.doe@example.com',
+					},
+				},
+			},
+		];
+
+		const result = await simplifyGetResponse.call(mockContext, items, mockResponse);
+		expect(result).toEqual(expectedResult);
+	});
+});
+describe('getCursorPaginator', () => {
+	let mockContext: IExecutePaginationFunctions;
+	let mockRequestOptions: DeclarativeRestApiSettings.ResultOptions;
+	const baseUrl = 'https://api.example.com';
+
+	beforeEach(() => {
+		mockContext = {
+			getNodeParameter: jest.fn(),
+			makeRoutingRequest: jest.fn(),
+		} as unknown as IExecutePaginationFunctions;
+
+		mockRequestOptions = {
+			options: {
+				qs: {},
+			},
+		} as DeclarativeRestApiSettings.ResultOptions;
+	});
+
+	it('should return all items when returnAll is true', async () => {
+		const mockResponseData: INodeExecutionData[] = [
+			{ json: { id: 1 }, headers: { link: `<${baseUrl}?after=cursor1>` } },
+			{ json: { id: 2 }, headers: { link: `<${baseUrl}?after=cursor2>` } },
+			{ json: { id: 3 }, headers: { link: `<${baseUrl}>` } },
+		];
+
+		(mockContext.getNodeParameter as jest.Mock).mockReturnValue(true);
+		(mockContext.makeRoutingRequest as jest.Mock)
+			.mockResolvedValueOnce([mockResponseData[0]])
+			.mockResolvedValueOnce([mockResponseData[1]])
+			.mockResolvedValueOnce([mockResponseData[2]]);
+
+		const paginator = getCursorPaginator().bind(mockContext);
+		const result = await paginator(mockRequestOptions);
+
+		expect(result).toEqual(mockResponseData);
+		expect(mockContext.getNodeParameter).toHaveBeenCalledWith('returnAll', true);
+		expect(mockContext.makeRoutingRequest).toHaveBeenCalledTimes(3);
+	});
+
+	it('should return items until nextCursor is undefined', async () => {
+		const mockResponseData: INodeExecutionData[] = [
+			{ json: { id: 1 }, headers: { link: `<${baseUrl}?after=cursor1>` } },
+			{ json: { id: 2 }, headers: { link: `<${baseUrl}>` } },
+		];
+
+		(mockContext.getNodeParameter as jest.Mock).mockReturnValue(true);
+		(mockContext.makeRoutingRequest as jest.Mock)
+			.mockResolvedValueOnce([mockResponseData[0]])
+			.mockResolvedValueOnce([mockResponseData[1]]);
+
+		const paginator = getCursorPaginator().bind(mockContext);
+		const result = await paginator(mockRequestOptions);
+
+		expect(result).toEqual(mockResponseData);
+		expect(mockContext.getNodeParameter).toHaveBeenCalledWith('returnAll', true);
+		expect(mockContext.makeRoutingRequest).toHaveBeenCalledTimes(2);
+	});
+
+	it('should handle empty response data', async () => {
+		(mockContext.getNodeParameter as jest.Mock).mockReturnValue(true);
+		(mockContext.makeRoutingRequest as jest.Mock).mockResolvedValue([]);
+
+		const paginator = getCursorPaginator().bind(mockContext);
+		const result = await paginator(mockRequestOptions);
+
+		expect(result).toEqual([]);
+		expect(mockContext.getNodeParameter).toHaveBeenCalledWith('returnAll', true);
+		expect(mockContext.makeRoutingRequest).toHaveBeenCalledTimes(1);
+	});
+});
diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index 61f940d5cd353..5c36310965454 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -648,6 +648,7 @@
       "dist/nodes/Notion/NotionTrigger.node.js",
       "dist/nodes/Npm/Npm.node.js",
       "dist/nodes/Odoo/Odoo.node.js",
+      "dist/nodes/Okta/Okta.node.js",
       "dist/nodes/OneSimpleApi/OneSimpleApi.node.js",
       "dist/nodes/OpenAi/OpenAi.node.js",
       "dist/nodes/OpenThesaurus/OpenThesaurus.node.js",
diff --git a/packages/workflow/src/Interfaces.ts b/packages/workflow/src/Interfaces.ts
index c4607563db7f4..eb6c3ca07c3d4 100644
--- a/packages/workflow/src/Interfaces.ts
+++ b/packages/workflow/src/Interfaces.ts
@@ -308,6 +308,7 @@ export interface ICredentialTestRequestData {
 type ICredentialHttpRequestNode = {
 	name: string;
 	docsUrl: string;
+	hidden?: boolean;
 } & ({ apiBaseUrl: string } | { apiBaseUrlPlaceholder: string });
 
 export interface ICredentialType {

From 1668edd98cbf6b6f22ae1b7eee38e39cf2ef62ed 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: Mon, 12 Aug 2024 18:00:23 +0200
Subject: [PATCH 129/168] ci: Upgrade @apidevtools/json-schema-ref-parser to
 address  AIKIDO-2024-10043 (no-changelog) (#10363)

---
 packages/cli/package.json |  2 +-
 pnpm-lock.yaml            | 68 ++++++++++++++++++++++-----------------
 2 files changed, 39 insertions(+), 31 deletions(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index fb6983f4b407a..6a78dc733b8f7 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -113,7 +113,7 @@
     "express": "4.19.2",
     "express-async-errors": "3.1.1",
     "express-handlebars": "7.1.2",
-    "express-openapi-validator": "5.1.6",
+    "express-openapi-validator": "5.3.1",
     "express-prom-bundle": "6.6.0",
     "express-rate-limit": "7.2.0",
     "fast-glob": "catalog:",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index a392d7c5672fc..e672f3a38e7df 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -699,8 +699,8 @@ importers:
         specifier: 7.1.2
         version: 7.1.2
       express-openapi-validator:
-        specifier: 5.1.6
-        version: 5.1.6
+        specifier: 5.3.1
+        version: 5.3.1(express@4.19.2)
       express-prom-bundle:
         specifier: 6.6.0
         version: 6.6.0(prom-client@13.2.0)
@@ -1822,8 +1822,9 @@ packages:
   '@anthropic-ai/sdk@0.22.0':
     resolution: {integrity: sha512-dv4BCC6FZJw3w66WNLsHlUFjhu19fS1L/5jMPApwhZLa/Oy1j0A2i3RypmDtHEPp4Wwg3aZkSHksp7VzYWjzmw==}
 
-  '@apidevtools/json-schema-ref-parser@9.1.2':
-    resolution: {integrity: sha512-r1w81DpR+KyRWd3f+rk6TNqMgedmAxZP5v5KWlXQWlgMUUtyEJch0DKEci1SorPMiSeM8XPl7MZ3miJ60JIpQg==}
+  '@apidevtools/json-schema-ref-parser@11.7.0':
+    resolution: {integrity: sha512-pRrmXMCwnmrkS3MLgAIW5dXRzeTv6GLjkjb4HmxNnvAKXN1Nfzp4KmGADBQvlVUcqi+a5D+hfGDLLnd5NnYxog==}
+    engines: {node: '>= 16'}
 
   '@authenio/xml-encryption@2.0.2':
     resolution: {integrity: sha512-cTlrKttbrRHEw3W+0/I609A2Matj5JQaRvfLtEIGZvlN0RaPi+3ANsMeqAyCAVlH/lUIW2tmtBlSMni74lcXeg==}
@@ -5487,8 +5488,8 @@ packages:
   '@types/mssql@9.1.5':
     resolution: {integrity: sha512-Q9EsgXwuRoX5wvUSu24YfbKMbFChv7pZ/jeCzPkj47ehcuXYsBcfogwrtVFosSjinD4Q/MY2YPGk9Yy1cM2Ywg==}
 
-  '@types/multer@1.4.7':
-    resolution: {integrity: sha512-/SNsDidUFCvqqcWDwxv2feww/yqhNeTRL5CVoL3jU4Goc4kKEL10T7Eye65ZqPNi4HRx8sAEX59pV1aEH7drNA==}
+  '@types/multer@1.4.11':
+    resolution: {integrity: sha512-svK240gr6LVWvv3YGyhLlA+6LRRWA4mnGIU7RcNmgjBYFl6665wcXrRfxGp5tEPVHUNm5FMcmq7too9bxCwX/w==}
 
   '@types/node-fetch@2.6.4':
     resolution: {integrity: sha512-1ZX9fcN4Rvkvgv4E6PAY5WXUFWFcRWxZa3EW83UjycOB9ljJCedb2CupIP4RZMEwF/M3eTcCihbBRgwtGbg5Rg==}
@@ -6056,8 +6057,8 @@ packages:
   ajv@6.12.6:
     resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==}
 
-  ajv@8.12.0:
-    resolution: {integrity: sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==}
+  ajv@8.17.1:
+    resolution: {integrity: sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==}
 
   alasql@4.4.0:
     resolution: {integrity: sha512-EQOk3NEvKcQxoYeY0d4ePF0VHAcljx3pn5ZkEowMPRThjWXyDc/VHYqC8Sg+6BH2ZhKZBdeRqlvlgZmhfGBtDA==}
@@ -7850,8 +7851,10 @@ packages:
     resolution: {integrity: sha512-ss9d3mBChOLTEtyfzXCsxlItUxpgS3i4cb/F70G6Q5ohQzmD12XB4x/Y9U6YboeeYBJZt7WQ5yUNu7ZSQ/EGyQ==}
     engines: {node: '>=v16'}
 
-  express-openapi-validator@5.1.6:
-    resolution: {integrity: sha512-CF24Pef5uThjdsCbjo1UP2mYx2YCkQl1HFoikCFFafFpZBCZ0YErD/RbqlcnKbKM9tMwXZsjAuuO84b2hmdF4g==}
+  express-openapi-validator@5.3.1:
+    resolution: {integrity: sha512-Mlo3N1yvaZJlIs/nX0ig4xSu4g1CmLK/InRuqrXPmiqijfHa5qx/5ng92kq2dfTKd77XE7e9sPJqkI79asqNlQ==}
+    peerDependencies:
+      express: '*'
 
   express-prom-bundle@6.6.0:
     resolution: {integrity: sha512-tZh2P2p5a8/yxQ5VbRav011Poa4R0mHqdFwn9Swe/obXDe5F0jY9wtRAfNYnqk4LXY7akyvR/nrvAHxQPWUjsQ==}
@@ -7918,6 +7921,9 @@ packages:
     resolution: {integrity: sha512-7OnTFAVPefgw2eBJ1xj2PGGR9FwYzSUso9decayHgCDX4sJkHLdcsYTytTg+tYv+wKF3U8gJuSBz2jJpQV4u/g==}
     engines: {node: '>=16.1.0'}
 
+  fast-uri@3.0.1:
+    resolution: {integrity: sha512-MWipKbbYiYI0UC7cl8m/i/IWTqfC8YXsqjzybjddLsFjStroQzsHXkc73JutMvBiXmOvapk+axIl79ig5t55Bw==}
+
   fast-xml-parser@4.2.5:
     resolution: {integrity: sha512-B9/wizE4WngqQftFPmdaMYlXoJlJOYxGQOanC77fq9k8+Z0v5dDSVh+3glErdIROP//s/jgb7ZuxKfB8nVyo0g==}
     hasBin: true
@@ -10673,8 +10679,8 @@ packages:
   path-to-regexp@0.1.7:
     resolution: {integrity: sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==}
 
-  path-to-regexp@6.2.1:
-    resolution: {integrity: sha512-JLyh7xT1kizaEvcaXOQwOc2/Yhw6KZOvPf1S8401UyLk86CU79LN3vl7ztXGm/pZ+YjoyAJ4rxmHwbkBXJX+yw==}
+  path-to-regexp@6.2.2:
+    resolution: {integrity: sha512-GQX3SSMokngb36+whdpRXE+3f9V8UzyAorlYvOGx87ufGHehNTn5lCxrKtLyZ4Yl/wEKnNnr98ZzOwwDZV5ogw==}
 
   path-type@4.0.0:
     resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==}
@@ -13339,11 +13345,10 @@ snapshots:
       - encoding
       - supports-color
 
-  '@apidevtools/json-schema-ref-parser@9.1.2':
+  '@apidevtools/json-schema-ref-parser@11.7.0':
     dependencies:
       '@jsdevtools/ono': 7.1.3
       '@types/json-schema': 7.0.15
-      call-me-maybe: 1.0.1
       js-yaml: 4.1.0
 
   '@authenio/xml-encryption@2.0.2':
@@ -16810,7 +16815,7 @@ snapshots:
   '@pinecone-database/pinecone@3.0.0':
     dependencies:
       '@sinclair/typebox': 0.29.6
-      ajv: 8.12.0
+      ajv: 8.17.1
       cross-fetch: 3.1.8(encoding@0.1.13)
       encoding: 0.1.13
 
@@ -18683,7 +18688,7 @@ snapshots:
       '@types/tedious': 4.0.9
       tarn: 3.0.2
 
-  '@types/multer@1.4.7':
+  '@types/multer@1.4.11':
     dependencies:
       '@types/express': 4.17.21
 
@@ -19394,13 +19399,13 @@ snapshots:
       clean-stack: 2.2.0
       indent-string: 4.0.0
 
-  ajv-draft-04@1.0.0(ajv@8.12.0):
+  ajv-draft-04@1.0.0(ajv@8.17.1):
     optionalDependencies:
-      ajv: 8.12.0
+      ajv: 8.17.1
 
-  ajv-formats@2.1.1(ajv@8.12.0):
+  ajv-formats@2.1.1(ajv@8.17.1):
     optionalDependencies:
-      ajv: 8.12.0
+      ajv: 8.17.1
 
   ajv@6.12.6:
     dependencies:
@@ -19409,12 +19414,12 @@ snapshots:
       json-schema-traverse: 0.4.1
       uri-js: 4.4.1
 
-  ajv@8.12.0:
+  ajv@8.17.1:
     dependencies:
       fast-deep-equal: 3.1.3
+      fast-uri: 3.0.1
       json-schema-traverse: 1.0.0
       require-from-string: 2.0.2
-      uri-js: 4.4.1
 
   alasql@4.4.0(encoding@0.1.13):
     dependencies:
@@ -21603,21 +21608,22 @@ snapshots:
       graceful-fs: 4.2.11
       handlebars: 4.7.8
 
-  express-openapi-validator@5.1.6:
+  express-openapi-validator@5.3.1(express@4.19.2):
     dependencies:
-      '@apidevtools/json-schema-ref-parser': 9.1.2
-      '@types/multer': 1.4.7
-      ajv: 8.12.0
-      ajv-draft-04: 1.0.0(ajv@8.12.0)
-      ajv-formats: 2.1.1(ajv@8.12.0)
+      '@apidevtools/json-schema-ref-parser': 11.7.0
+      '@types/multer': 1.4.11
+      ajv: 8.17.1
+      ajv-draft-04: 1.0.0(ajv@8.17.1)
+      ajv-formats: 2.1.1(ajv@8.17.1)
       content-type: 1.0.5
+      express: 4.19.2
       json-schema-traverse: 1.0.0
       lodash.clonedeep: 4.5.0
       lodash.get: 4.4.2
       media-typer: 1.1.0
       multer: 1.4.5-lts.1
       ono: 7.1.3
-      path-to-regexp: 6.2.1
+      path-to-regexp: 6.2.2
 
   express-prom-bundle@6.6.0(prom-client@13.2.0):
     dependencies:
@@ -21720,6 +21726,8 @@ snapshots:
       '@babel/runtime': 7.24.7
       tslib: 2.6.2
 
+  fast-uri@3.0.1: {}
+
   fast-xml-parser@4.2.5:
     dependencies:
       strnum: 1.0.5
@@ -24872,7 +24880,7 @@ snapshots:
 
   path-to-regexp@0.1.7: {}
 
-  path-to-regexp@6.2.1: {}
+  path-to-regexp@6.2.2: {}
 
   path-type@4.0.0: {}
 

From 3df07dc0a5e410322c8332c9517a0292db5f073f Mon Sep 17 00:00:00 2001
From: Alex Grozav <alex@grozav.com>
Date: Mon, 12 Aug 2024 19:17:15 +0300
Subject: [PATCH 130/168] fix(editor): Fix bug causing connections to not get
 created on new canvas (no-changelog) (#10360)

---
 packages/editor-ui/src/views/NodeView.v2.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/editor-ui/src/views/NodeView.v2.vue b/packages/editor-ui/src/views/NodeView.v2.vue
index eb2928b3e898f..c25bca7e35bdf 100644
--- a/packages/editor-ui/src/views/NodeView.v2.vue
+++ b/packages/editor-ui/src/views/NodeView.v2.vue
@@ -800,6 +800,7 @@ async function onAddNodesAndConnections(
 	}
 
 	await addNodes(nodes, { dragAndDrop, position, trackHistory: true });
+	await nextTick();
 
 	const offsetIndex = editableWorkflow.value.nodes.length - nodes.length;
 	const mappedConnections: CanvasConnectionCreateData[] = connections.map(({ from, to }) => {

From 5d2405ee4084f38808adf191a3f11446d8cbf60a 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: Mon, 12 Aug 2024 18:24:51 +0200
Subject: [PATCH 131/168] ci: Upgrade mappersmith in the dependency tree
 (no-changelog) (#10361)

---
 pnpm-lock.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index e672f3a38e7df..8646cdafdda7b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -9823,8 +9823,8 @@ packages:
   map-stream@0.1.0:
     resolution: {integrity: sha512-CkYQrPYZfWnu/DAmVCpTSX/xHpKZ80eKh2lAkyA6AJTef6bW+6JpbQZN5rofum7da+SyN1bi5ctTm+lTfcCW3g==}
 
-  mappersmith@2.40.0:
-    resolution: {integrity: sha512-Es99fy0E52fxmhRvCyed7WVlSyuz6ME/wOsRpSmi0GcbMEZ6y5D2GL4+qNGPCc2P270J5yw8L2zg+K4BWACcHg==}
+  mappersmith@2.43.4:
+    resolution: {integrity: sha512-IyUw53aE3/SPH3eOkqSuD+Hcstpcl4dpxDDgZsPz65R2SlOikq0VHxo3kMPzUVvw7cCHunTmlpNXl5n/KzPcpg==}
 
   mark.js@8.11.1:
     resolution: {integrity: sha512-1I+1qpDt4idfgLQG+BNWmrqku+7/2bi5nLf4YwF8y8zXvmfiTBY3PV3ZibfrjBueCByROpuBjLLFCajqkgYoLQ==}
@@ -16214,7 +16214,7 @@ snapshots:
   '@kafkajs/confluent-schema-registry@1.0.6':
     dependencies:
       avsc: 5.7.6
-      mappersmith: 2.40.0
+      mappersmith: 2.43.4
 
   '@kurkle/color@0.3.2': {}
 
@@ -23978,7 +23978,7 @@ snapshots:
 
   map-stream@0.1.0: {}
 
-  mappersmith@2.40.0: {}
+  mappersmith@2.43.4: {}
 
   mark.js@8.11.1: {}
 

From 1ad7afbb82f25d05c739c38befe64e99e6d6797f 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: Mon, 12 Aug 2024 19:42:36 +0200
Subject: [PATCH 132/168] ci: Upgrade picocolors to address AIKIDO-2024-10093
 (no-changelog) (#10362)

---
 .github/scripts/package.json |  2 +-
 packages/cli/package.json    |  2 +-
 pnpm-lock.yaml               | 30 +++++++++++++++---------------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/.github/scripts/package.json b/.github/scripts/package.json
index cd67711fa4c29..80bf0baf11043 100644
--- a/.github/scripts/package.json
+++ b/.github/scripts/package.json
@@ -5,7 +5,7 @@
     "debug": "4.3.4",
     "glob": "10.3.10",
     "p-limit": "3.1.0",
-    "picocolors": "1.0.0",
+    "picocolors": "1.0.1",
     "semver": "7.5.4",
     "tempfile": "5.0.0",
     "typescript": "*"
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 6a78dc733b8f7..269d1562d675e 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -145,7 +145,7 @@
     "p-cancelable": "2.1.1",
     "p-lazy": "3.1.0",
     "pg": "8.11.3",
-    "picocolors": "1.0.0",
+    "picocolors": "1.0.1",
     "pkce-challenge": "3.0.0",
     "posthog-node": "3.2.1",
     "prom-client": "13.2.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 8646cdafdda7b..65752db37bea9 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -795,8 +795,8 @@ importers:
         specifier: 8.11.3
         version: 8.11.3
       picocolors:
-        specifier: 1.0.0
-        version: 1.0.0
+        specifier: 1.0.1
+        version: 1.0.1
       pkce-challenge:
         specifier: 3.0.0
         version: 3.0.0(patch_hash=dypouzb3lve7vncq25i5fuanki)
@@ -10789,8 +10789,8 @@ packages:
   pgpass@1.0.5:
     resolution: {integrity: sha512-FdW9r/jQZhSeohs1Z3sI1yxFQNFvMcnmfuj4WBMUTxOrAyLMaTcE1aAMBiTlbMNaXvBCQuVi0R7hd8udDSP7ug==}
 
-  picocolors@1.0.0:
-    resolution: {integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==}
+  picocolors@1.0.1:
+    resolution: {integrity: sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==}
 
   picomatch@2.3.1:
     resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==}
@@ -14404,7 +14404,7 @@ snapshots:
   '@babel/code-frame@7.24.6':
     dependencies:
       '@babel/highlight': 7.24.6
-      picocolors: 1.0.0
+      picocolors: 1.0.1
 
   '@babel/compat-data@7.23.5': {}
 
@@ -14733,7 +14733,7 @@ snapshots:
       '@babel/helper-validator-identifier': 7.24.6
       chalk: 2.4.2
       js-tokens: 4.0.0
-      picocolors: 1.0.0
+      picocolors: 1.0.1
 
   '@babel/parser@7.24.0':
     dependencies:
@@ -19044,7 +19044,7 @@ snapshots:
       istanbul-reports: 3.1.6
       magic-string: 0.30.10
       magicast: 0.3.3
-      picocolors: 1.0.0
+      picocolors: 1.0.1
       std-env: 3.6.0
       strip-literal: 2.0.0
       test-exclude: 6.0.0
@@ -19646,7 +19646,7 @@ snapshots:
       caniuse-lite: 1.0.30001617
       fraction.js: 4.3.7
       normalize-range: 0.1.2
-      picocolors: 1.0.0
+      picocolors: 1.0.1
       postcss: 8.4.38
       postcss-value-parser: 4.2.0
 
@@ -24996,7 +24996,7 @@ snapshots:
     dependencies:
       split2: 4.2.0
 
-  picocolors@1.0.0: {}
+  picocolors@1.0.1: {}
 
   picomatch@2.3.1: {}
 
@@ -25088,13 +25088,13 @@ snapshots:
   postcss@8.4.31:
     dependencies:
       nanoid: 3.3.7
-      picocolors: 1.0.0
+      picocolors: 1.0.1
       source-map-js: 1.2.0
 
   postcss@8.4.38:
     dependencies:
       nanoid: 3.3.7
-      picocolors: 1.0.0
+      picocolors: 1.0.1
       source-map-js: 1.2.0
 
   postgres-array@2.0.0: {}
@@ -26611,7 +26611,7 @@ snapshots:
       micromatch: 4.0.5
       normalize-path: 3.0.0
       object-hash: 3.0.0
-      picocolors: 1.0.0
+      picocolors: 1.0.1
       postcss: 8.4.38
       postcss-import: 15.1.0(postcss@8.4.38)
       postcss-js: 4.0.1(postcss@8.4.38)
@@ -27195,7 +27195,7 @@ snapshots:
     dependencies:
       browserslist: 4.23.0
       escalade: 3.1.1
-      picocolors: 1.0.0
+      picocolors: 1.0.1
 
   upper-case-first@2.0.2:
     dependencies:
@@ -27291,7 +27291,7 @@ snapshots:
       cac: 6.7.14
       debug: 4.3.5(supports-color@8.1.1)
       pathe: 1.1.2
-      picocolors: 1.0.0
+      picocolors: 1.0.1
       vite: 5.2.12(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1)
     transitivePeerDependencies:
       - '@types/node'
@@ -27351,7 +27351,7 @@ snapshots:
       local-pkg: 0.5.0
       magic-string: 0.30.10
       pathe: 1.1.2
-      picocolors: 1.0.0
+      picocolors: 1.0.1
       std-env: 3.6.0
       strip-literal: 2.0.0
       tinybench: 2.5.1

From 8ab3d6b62b2f957d1ab9f8558d25724f03eb1c5d 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: Mon, 12 Aug 2024 19:42:49 +0200
Subject: [PATCH 133/168]  ci: Upgrade axios to address CVE-2024-39338
 (no-changelog) (#10365)

---
 package.json              |   2 +-
 packages/cli/package.json |   2 +-
 pnpm-lock.yaml            | 289 ++++++++++++++++++++------------------
 pnpm-workspace.yaml       |   2 +-
 4 files changed, 156 insertions(+), 139 deletions(-)

diff --git a/package.json b/package.json
index d4a208385b4cd..5744497d771cd 100644
--- a/package.json
+++ b/package.json
@@ -63,7 +63,7 @@
     ],
     "overrides": {
       "@types/node": "^18.16.16",
-      "axios": "1.6.7",
+      "axios": "1.7.3",
       "chokidar": "3.5.2",
       "esbuild": "^0.20.2",
       "formidable": "3.5.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 269d1562d675e..0ecf4c795295d 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -86,7 +86,7 @@
     "@google-cloud/secret-manager": "^5.6.0",
     "@n8n/client-oauth2": "workspace:*",
     "@n8n/config": "workspace:*",
-    "@n8n/localtunnel": "2.1.0",
+    "@n8n/localtunnel": "3.0.0",
     "@n8n/n8n-nodes-langchain": "workspace:*",
     "@n8n/permissions": "workspace:*",
     "@n8n/typeorm": "0.3.20-10",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 65752db37bea9..608b0d808df5f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -70,7 +70,7 @@ catalogs:
 
 overrides:
   '@types/node': ^18.16.16
-  axios: 1.6.7
+  axios: 1.7.3
   chokidar: 3.5.2
   esbuild: ^0.20.2
   formidable: 3.5.1
@@ -256,8 +256,8 @@ importers:
   packages/@n8n/client-oauth2:
     dependencies:
       axios:
-        specifier: 1.6.7
-        version: 1.6.7(debug@3.2.7)
+        specifier: 1.7.3
+        version: 1.7.3(debug@3.2.7)
 
   packages/@n8n/codemirror-lang:
     dependencies:
@@ -349,10 +349,10 @@ importers:
         version: 0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))
       '@langchain/community':
         specifier: 0.2.20
-        version: 0.2.20(bl2awxa6z6ereahlcpz2dlbf6q)
+        version: 0.2.20(wowgvfxtiu4vww53wbp4ny5rre)
       '@langchain/core':
         specifier: 0.2.18
-        version: 0.2.18(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))
+        version: 0.2.18(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))
       '@langchain/google-genai':
         specifier: 0.0.23
         version: 0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8)
@@ -370,19 +370,19 @@ importers:
         version: 0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))
       '@langchain/openai':
         specifier: 0.2.5
-        version: 0.2.5(encoding@0.1.13)(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))
+        version: 0.2.5(encoding@0.1.13)(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))
       '@langchain/pinecone':
         specifier: 0.0.8
-        version: 0.0.8(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))
+        version: 0.0.8(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))
       '@langchain/qdrant':
         specifier: ^0.0.5
-        version: 0.0.5(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))(typescript@5.5.2)
+        version: 0.0.5(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))(typescript@5.5.2)
       '@langchain/redis':
         specifier: 0.0.5
-        version: 0.0.5(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))
+        version: 0.0.5(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))
       '@langchain/textsplitters':
         specifier: 0.0.3
-        version: 0.0.3(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))
+        version: 0.0.3(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))
       '@mozilla/readability':
         specifier: ^0.5.0
         version: 0.5.0
@@ -439,7 +439,7 @@ importers:
         version: 2.1.0
       langchain:
         specifier: 0.2.11
-        version: 0.2.11(3eonfu4fvxvjb5zdrprnb3pokq)
+        version: 0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4)
       lodash:
         specifier: 'catalog:'
         version: 4.17.21
@@ -618,8 +618,8 @@ importers:
         specifier: workspace:*
         version: link:../@n8n/config
       '@n8n/localtunnel':
-        specifier: 2.1.0
-        version: 2.1.0
+        specifier: 3.0.0
+        version: 3.0.0
       '@n8n/n8n-nodes-langchain':
         specifier: workspace:*
         version: link:../@n8n/nodes-langchain
@@ -648,8 +648,8 @@ importers:
         specifier: 1.11.0
         version: 1.11.0
       axios:
-        specifier: 1.6.7
-        version: 1.6.7(debug@3.2.7)
+        specifier: 1.7.3
+        version: 1.7.3(debug@3.2.7)
       bcryptjs:
         specifier: 2.4.3
         version: 2.4.3
@@ -973,8 +973,8 @@ importers:
         specifier: 1.11.0
         version: 1.11.0
       axios:
-        specifier: 1.6.7
-        version: 1.6.7(debug@3.2.7)
+        specifier: 1.7.3
+        version: 1.7.3(debug@3.2.7)
       concat-stream:
         specifier: 2.0.0
         version: 2.0.0
@@ -1251,8 +1251,8 @@ importers:
         specifier: ^10.11.0
         version: 10.11.0(vue@3.4.21(typescript@5.5.2))
       axios:
-        specifier: 1.6.7
-        version: 1.6.7(debug@3.2.7)
+        specifier: 1.7.3
+        version: 1.7.3(debug@3.2.7)
       chart.js:
         specifier: ^4.4.0
         version: 4.4.0
@@ -1719,8 +1719,8 @@ importers:
         specifier: 0.15.2
         version: 0.15.2
       axios:
-        specifier: 1.6.7
-        version: 1.6.7(debug@3.2.7)
+        specifier: 1.7.3
+        version: 1.7.3(debug@3.2.7)
       callsites:
         specifier: 3.1.0
         version: 3.1.0
@@ -1766,7 +1766,7 @@ importers:
     devDependencies:
       '@langchain/core':
         specifier: ^0.2.18
-        version: 0.2.18(langchain@0.2.11(axios@1.6.7)(openai@4.53.0))(openai@4.53.0)
+        version: 0.2.18(langchain@0.2.11(axios@1.7.3)(openai@4.53.0))(openai@4.53.0)
       '@types/deep-equal':
         specifier: ^1.0.1
         version: 1.0.1
@@ -4135,10 +4135,9 @@ packages:
   '@n8n/codemirror-lang-sql@1.0.2':
     resolution: {integrity: sha512-sOf/KyewSu3Ikij0CkRtzJJDhRDZcwNCEYl8UdH4U/riL0/XZGcBD7MYofCCcKszanJZiEWRZ2KU1sRp234iMg==}
 
-  '@n8n/localtunnel@2.1.0':
-    resolution: {integrity: sha512-k5mb+Aeb3+4cRfWaEsMSiTsF1oARFvAuI3EOvxitrgVmiWk592h4nCI7vtjq1nsVT+PWKmB6dBoTQ0+6HHIpug==}
+  '@n8n/localtunnel@3.0.0':
+    resolution: {integrity: sha512-0t/AUiZ8Oqo7AqYp2q2qmEC2p2lPP4CEdrGRB0J6nSC7ivOtr0p46Pw739UvUfJMU1bIKvzHIc5M9wCjH5Byjg==}
     engines: {node: '>=18.0.0'}
-    hasBin: true
 
   '@n8n/p-retry@6.2.0-2':
     resolution: {integrity: sha512-rbnMnSdEwq2yuYMgzOQ4jTXm+oH7yjN/0ISfB/7O6pUcEPsZt9UW60BYfQ1WWHkKa/evI8vgER2zV5/RC1BupQ==}
@@ -6296,8 +6295,8 @@ packages:
   axios-retry@3.7.0:
     resolution: {integrity: sha512-ZTnCkJbRtfScvwiRnoVskFAfvU0UG3xNcsjwTR0mawSbIJoothxn67gKsMaNAFHRXJ1RmuLhmZBzvyXi3+9WyQ==}
 
-  axios@1.6.7:
-    resolution: {integrity: sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA==}
+  axios@1.7.3:
+    resolution: {integrity: sha512-Ar7ND9pU99eJ9GpoGQKhKf58GpUOgnzuaB7ueNQ5BMi0p+LZ5oaEnfF999fAArcTIBwXTCHAmGcHOZJaWPq9Nw==}
 
   babel-core@7.0.0-bridge.0:
     resolution: {integrity: sha512-poPX9mZH/5CSanm50Q+1toVci6pv5KSRv/5TWCwtzQS5XEwn40BcCrgIeMFWP9CKKIniKXNxoIOnOq4VVlGXhg==}
@@ -7164,6 +7163,15 @@ packages:
       supports-color:
         optional: true
 
+  debug@4.3.6:
+    resolution: {integrity: sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==}
+    engines: {node: '>=6.0'}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
+
   decamelize@1.2.0:
     resolution: {integrity: sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==}
     engines: {node: '>=0.10.0'}
@@ -9344,7 +9352,7 @@ packages:
       '@xata.io/client': ^0.28.0
       apify-client: ^2.7.1
       assemblyai: ^4.6.0
-      axios: 1.6.7
+      axios: 1.7.3
       cheerio: ^1.0.0-rc.12
       chromadb: '*'
       convex: ^1.3.1
@@ -10507,9 +10515,6 @@ packages:
   openapi-types@12.1.3:
     resolution: {integrity: sha512-N4YtSYJqghVu4iek2ZUvcN/0aqH1kRDuNqzcycDxhOUpg7GdvLa2F3DgS6yBNhInhv2r/6I0Flkn7CqL8+nIcw==}
 
-  openurl@1.1.1:
-    resolution: {integrity: sha512-d/gTkTb1i1GKz5k3XE3XFV/PxQ1k45zDqGP2OA7YhgsaLoqm6qRvARAZOFer1fcXritWlGBRCu/UgeS4HAnXAA==}
-
   option@0.2.4:
     resolution: {integrity: sha512-pkEqbDyl8ou5cpq+VsnQbe/WlEy5qS7xPzMS1U55OCG9KPvwFD46zDbxQIj3egJSFc3D+XhYOPUzz49zQAVy7A==}
 
@@ -14443,7 +14448,7 @@ snapshots:
       '@babel/traverse': 7.24.6
       '@babel/types': 7.24.6
       convert-source-map: 2.0.0
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@8.1.1)
       gensync: 1.0.0-beta.2
       json5: 2.2.3
       semver: 7.6.0
@@ -15736,7 +15741,7 @@ snapshots:
   '@eslint/eslintrc@2.1.4':
     dependencies:
       ajv: 6.12.6
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@8.1.1)
       espree: 9.6.1
       globals: 13.20.0
       ignore: 5.2.4
@@ -15801,8 +15806,8 @@ snapshots:
       url-join: 4.0.1
       zod: 3.23.8
     optionalDependencies:
-      '@langchain/core': 0.2.18(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))
-      langchain: 0.2.11(3eonfu4fvxvjb5zdrprnb3pokq)
+      '@langchain/core': 0.2.18(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))
+      langchain: 0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4)
     transitivePeerDependencies:
       - encoding
 
@@ -15896,7 +15901,7 @@ snapshots:
   '@humanwhocodes/config-array@0.11.14':
     dependencies:
       '@humanwhocodes/object-schema': 2.0.2
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@8.1.1)
       minimatch: 3.1.2
     transitivePeerDependencies:
       - supports-color
@@ -16229,7 +16234,7 @@ snapshots:
   '@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))':
     dependencies:
       '@anthropic-ai/sdk': 0.22.0(encoding@0.1.13)
-      '@langchain/core': 0.2.18(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))
+      '@langchain/core': 0.2.18(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))
       fast-xml-parser: 4.3.5
       zod: 3.23.8
       zod-to-json-schema: 3.23.0(zod@3.23.8)
@@ -16241,23 +16246,23 @@ snapshots:
 
   '@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))':
     dependencies:
-      '@langchain/core': 0.2.18(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))
+      '@langchain/core': 0.2.18(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))
       cohere-ai: 7.10.1(encoding@0.1.13)
     transitivePeerDependencies:
       - encoding
       - langchain
       - openai
 
-  '@langchain/community@0.2.20(bl2awxa6z6ereahlcpz2dlbf6q)':
+  '@langchain/community@0.2.20(wowgvfxtiu4vww53wbp4ny5rre)':
     dependencies:
-      '@langchain/core': 0.2.18(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))
-      '@langchain/openai': 0.2.5(encoding@0.1.13)(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))
+      '@langchain/core': 0.2.18(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))
+      '@langchain/openai': 0.2.5(encoding@0.1.13)(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))
       binary-extensions: 2.2.0
       expr-eval: 2.0.2
       flat: 5.0.2
       js-yaml: 4.1.0
-      langchain: 0.2.11(3eonfu4fvxvjb5zdrprnb3pokq)
-      langsmith: 0.1.34(@langchain/core@0.2.18(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13)))(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))
+      langchain: 0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4)
+      langsmith: 0.1.34(@langchain/core@0.2.18(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13)))(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))
       uuid: 10.0.0
       zod: 3.23.8
       zod-to-json-schema: 3.23.0(zod@3.23.8)
@@ -16318,13 +16323,13 @@ snapshots:
       - pyodide
       - supports-color
 
-  '@langchain/core@0.2.18(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))':
+  '@langchain/core@0.2.18(langchain@0.2.11(axios@1.7.3)(openai@4.53.0))(openai@4.53.0)':
     dependencies:
       ansi-styles: 5.2.0
       camelcase: 6.3.0
       decamelize: 1.2.0
       js-tiktoken: 1.0.12
-      langsmith: 0.1.39(@langchain/core@0.2.18(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13)))(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))
+      langsmith: 0.1.39(@langchain/core@0.2.18(langchain@0.2.11(axios@1.7.3)(openai@4.53.0))(openai@4.53.0))(langchain@0.2.11(axios@1.7.3)(openai@4.53.0))(openai@4.53.0)
       ml-distance: 4.0.1
       mustache: 4.2.0
       p-queue: 6.6.2
@@ -16336,13 +16341,13 @@ snapshots:
       - langchain
       - openai
 
-  '@langchain/core@0.2.18(langchain@0.2.11(axios@1.6.7)(openai@4.53.0))(openai@4.53.0)':
+  '@langchain/core@0.2.18(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))':
     dependencies:
       ansi-styles: 5.2.0
       camelcase: 6.3.0
       decamelize: 1.2.0
       js-tiktoken: 1.0.12
-      langsmith: 0.1.39(@langchain/core@0.2.18(langchain@0.2.11(axios@1.6.7)(openai@4.53.0))(openai@4.53.0))(langchain@0.2.11(axios@1.6.7)(openai@4.53.0))(openai@4.53.0)
+      langsmith: 0.1.39(@langchain/core@0.2.18(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13)))(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))
       ml-distance: 4.0.1
       mustache: 4.2.0
       p-queue: 6.6.2
@@ -16354,9 +16359,9 @@ snapshots:
       - langchain
       - openai
 
-  '@langchain/google-common@0.0.22(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))(zod@3.23.8)':
+  '@langchain/google-common@0.0.22(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))(zod@3.23.8)':
     dependencies:
-      '@langchain/core': 0.2.18(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))
+      '@langchain/core': 0.2.18(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))
       uuid: 10.0.0
       zod-to-json-schema: 3.23.0(zod@3.23.8)
     transitivePeerDependencies:
@@ -16364,10 +16369,10 @@ snapshots:
       - openai
       - zod
 
-  '@langchain/google-gauth@0.0.21(encoding@0.1.13)(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))(zod@3.23.8)':
+  '@langchain/google-gauth@0.0.21(encoding@0.1.13)(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))(zod@3.23.8)':
     dependencies:
-      '@langchain/core': 0.2.18(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))
-      '@langchain/google-common': 0.0.22(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))(zod@3.23.8)
+      '@langchain/core': 0.2.18(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))
+      '@langchain/google-common': 0.0.22(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))(zod@3.23.8)
       google-auth-library: 8.9.0(encoding@0.1.13)
     transitivePeerDependencies:
       - encoding
@@ -16379,7 +16384,7 @@ snapshots:
   '@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8)':
     dependencies:
       '@google/generative-ai': 0.7.1
-      '@langchain/core': 0.2.18(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))
+      '@langchain/core': 0.2.18(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))
       zod-to-json-schema: 3.23.0(zod@3.23.8)
     transitivePeerDependencies:
       - langchain
@@ -16388,8 +16393,8 @@ snapshots:
 
   '@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8)':
     dependencies:
-      '@langchain/core': 0.2.18(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))
-      '@langchain/google-gauth': 0.0.21(encoding@0.1.13)(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))(zod@3.23.8)
+      '@langchain/core': 0.2.18(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))
+      '@langchain/google-gauth': 0.0.21(encoding@0.1.13)(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))(zod@3.23.8)
     transitivePeerDependencies:
       - encoding
       - langchain
@@ -16399,8 +16404,8 @@ snapshots:
 
   '@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))':
     dependencies:
-      '@langchain/core': 0.2.18(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))
-      '@langchain/openai': 0.2.5(encoding@0.1.13)(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))
+      '@langchain/core': 0.2.18(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))
+      '@langchain/openai': 0.2.5(encoding@0.1.13)(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))
       groq-sdk: 0.3.2(encoding@0.1.13)
       zod: 3.23.8
       zod-to-json-schema: 3.23.0(zod@3.23.8)
@@ -16412,7 +16417,7 @@ snapshots:
 
   '@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))':
     dependencies:
-      '@langchain/core': 0.2.18(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))
+      '@langchain/core': 0.2.18(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))
       '@mistralai/mistralai': 0.4.0(encoding@0.1.13)
       uuid: 10.0.0
       zod: 3.23.8
@@ -16424,16 +16429,16 @@ snapshots:
 
   '@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))':
     dependencies:
-      '@langchain/core': 0.2.18(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))
+      '@langchain/core': 0.2.18(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))
       ollama: 0.5.6
       uuid: 10.0.0
     transitivePeerDependencies:
       - langchain
       - openai
 
-  '@langchain/openai@0.2.5(encoding@0.1.13)(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))':
+  '@langchain/openai@0.2.5(encoding@0.1.13)(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))':
     dependencies:
-      '@langchain/core': 0.2.18(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))
+      '@langchain/core': 0.2.18(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))
       js-tiktoken: 1.0.12
       openai: 4.53.0(encoding@0.1.13)
       zod: 3.23.8
@@ -16443,9 +16448,9 @@ snapshots:
       - langchain
       - supports-color
 
-  '@langchain/openai@0.2.5(langchain@0.2.11(axios@1.6.7)(openai@4.53.0))':
+  '@langchain/openai@0.2.5(langchain@0.2.11(axios@1.7.3)(openai@4.53.0))':
     dependencies:
-      '@langchain/core': 0.2.18(langchain@0.2.11(axios@1.6.7)(openai@4.53.0))(openai@4.53.0)
+      '@langchain/core': 0.2.18(langchain@0.2.11(axios@1.7.3)(openai@4.53.0))(openai@4.53.0)
       js-tiktoken: 1.0.12
       openai: 4.53.0(encoding@0.1.13)
       zod: 3.23.8
@@ -16456,9 +16461,9 @@ snapshots:
       - supports-color
     optional: true
 
-  '@langchain/pinecone@0.0.8(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))':
+  '@langchain/pinecone@0.0.8(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))':
     dependencies:
-      '@langchain/core': 0.2.18(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))
+      '@langchain/core': 0.2.18(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))
       '@pinecone-database/pinecone': 3.0.0
       flat: 5.0.2
       uuid: 10.0.0
@@ -16466,9 +16471,9 @@ snapshots:
       - langchain
       - openai
 
-  '@langchain/qdrant@0.0.5(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))(typescript@5.5.2)':
+  '@langchain/qdrant@0.0.5(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))(typescript@5.5.2)':
     dependencies:
-      '@langchain/core': 0.2.18(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))
+      '@langchain/core': 0.2.18(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))
       '@qdrant/js-client-rest': 1.9.0(typescript@5.5.2)
       uuid: 9.0.1
     transitivePeerDependencies:
@@ -16476,30 +16481,30 @@ snapshots:
       - openai
       - typescript
 
-  '@langchain/redis@0.0.5(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))':
+  '@langchain/redis@0.0.5(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))':
     dependencies:
-      '@langchain/core': 0.2.18(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))
+      '@langchain/core': 0.2.18(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))
       redis: 4.6.13
     transitivePeerDependencies:
       - langchain
       - openai
 
-  '@langchain/textsplitters@0.0.3(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))':
+  '@langchain/textsplitters@0.0.3(langchain@0.2.11(axios@1.7.3)(openai@4.53.0))(openai@4.53.0)':
     dependencies:
-      '@langchain/core': 0.2.18(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))
+      '@langchain/core': 0.2.18(langchain@0.2.11(axios@1.7.3)(openai@4.53.0))(openai@4.53.0)
       js-tiktoken: 1.0.12
     transitivePeerDependencies:
       - langchain
       - openai
+    optional: true
 
-  '@langchain/textsplitters@0.0.3(langchain@0.2.11(axios@1.6.7)(openai@4.53.0))(openai@4.53.0)':
+  '@langchain/textsplitters@0.0.3(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))':
     dependencies:
-      '@langchain/core': 0.2.18(langchain@0.2.11(axios@1.6.7)(openai@4.53.0))(openai@4.53.0)
+      '@langchain/core': 0.2.18(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))
       js-tiktoken: 1.0.12
     transitivePeerDependencies:
       - langchain
       - openai
-    optional: true
 
   '@lezer/common@1.1.0': {}
 
@@ -16628,12 +16633,10 @@ snapshots:
       - '@codemirror/view'
       - '@lezer/common'
 
-  '@n8n/localtunnel@2.1.0':
+  '@n8n/localtunnel@3.0.0':
     dependencies:
-      axios: 1.6.7(debug@4.3.4)
-      debug: 4.3.4(supports-color@8.1.1)
-      openurl: 1.1.1
-      yargs: 17.7.2
+      axios: 1.7.3(debug@4.3.6)
+      debug: 4.3.6
     transitivePeerDependencies:
       - supports-color
 
@@ -17192,7 +17195,7 @@ snapshots:
 
   '@rudderstack/rudder-sdk-node@2.0.7(tslib@2.6.2)':
     dependencies:
-      axios: 1.6.7(debug@3.2.7)
+      axios: 1.7.3(debug@3.2.7)
       axios-retry: 3.7.0
       component-type: 1.2.1
       join-component: 1.1.0
@@ -18947,7 +18950,7 @@ snapshots:
     dependencies:
       '@typescript-eslint/typescript-estree': 7.2.0(typescript@5.5.2)
       '@typescript-eslint/utils': 7.2.0(eslint@8.57.0)(typescript@5.5.2)
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@8.1.1)
       eslint: 8.57.0
       ts-api-utils: 1.0.1(typescript@5.5.2)
     optionalDependencies:
@@ -18977,7 +18980,7 @@ snapshots:
     dependencies:
       '@typescript-eslint/types': 7.2.0
       '@typescript-eslint/visitor-keys': 7.2.0
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.5(supports-color@8.1.1)
       globby: 11.1.0
       is-glob: 4.0.3
       minimatch: 9.0.3
@@ -19669,7 +19672,7 @@ snapshots:
       '@babel/runtime': 7.23.6
       is-retry-allowed: 2.2.0
 
-  axios@1.6.7(debug@3.2.7):
+  axios@1.7.3(debug@3.2.7):
     dependencies:
       follow-redirects: 1.15.6(debug@3.2.7)
       form-data: 4.0.0
@@ -19677,7 +19680,7 @@ snapshots:
     transitivePeerDependencies:
       - debug
 
-  axios@1.6.7(debug@4.3.4):
+  axios@1.7.3(debug@4.3.4):
     dependencies:
       follow-redirects: 1.15.6(debug@4.3.4)
       form-data: 4.0.0
@@ -19685,6 +19688,14 @@ snapshots:
     transitivePeerDependencies:
       - debug
 
+  axios@1.7.3(debug@4.3.6):
+    dependencies:
+      follow-redirects: 1.15.6(debug@4.3.6)
+      form-data: 4.0.0
+      proxy-from-env: 1.1.0
+    transitivePeerDependencies:
+      - debug
+
   babel-core@7.0.0-bridge.0(@babel/core@7.24.6):
     dependencies:
       '@babel/core': 7.24.6
@@ -20704,6 +20715,10 @@ snapshots:
     optionalDependencies:
       supports-color: 8.1.1
 
+  debug@4.3.6:
+    dependencies:
+      ms: 2.1.2
+
   decamelize@1.2.0: {}
 
   decimal.js@10.4.3: {}
@@ -21868,6 +21883,10 @@ snapshots:
     optionalDependencies:
       debug: 4.3.4(supports-color@8.1.1)
 
+  follow-redirects@1.15.6(debug@4.3.6):
+    optionalDependencies:
+      debug: 4.3.6
+
   for-each@0.3.3:
     dependencies:
       is-callable: 1.2.7
@@ -22546,7 +22565,7 @@ snapshots:
 
   infisical-node@1.3.0:
     dependencies:
-      axios: 1.6.7(debug@3.2.7)
+      axios: 1.7.3(debug@3.2.7)
       dotenv: 16.3.1
       tweetnacl: 1.0.3
       tweetnacl-util: 0.15.1
@@ -23517,17 +23536,43 @@ snapshots:
 
   kuler@2.0.0: {}
 
-  langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq):
+  langchain@0.2.11(axios@1.7.3)(openai@4.53.0):
     dependencies:
-      '@langchain/core': 0.2.18(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))
-      '@langchain/openai': 0.2.5(encoding@0.1.13)(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))
-      '@langchain/textsplitters': 0.0.3(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))
+      '@langchain/core': 0.2.18(langchain@0.2.11(axios@1.7.3)(openai@4.53.0))(openai@4.53.0)
+      '@langchain/openai': 0.2.5(langchain@0.2.11(axios@1.7.3)(openai@4.53.0))
+      '@langchain/textsplitters': 0.0.3(langchain@0.2.11(axios@1.7.3)(openai@4.53.0))(openai@4.53.0)
       binary-extensions: 2.2.0
       js-tiktoken: 1.0.12
       js-yaml: 4.1.0
       jsonpointer: 5.0.1
       langchainhub: 0.0.8
-      langsmith: 0.1.34(@langchain/core@0.2.18(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13)))(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))
+      langsmith: 0.1.34(@langchain/core@0.2.18(langchain@0.2.11(axios@1.7.3)(openai@4.53.0))(openai@4.53.0))(langchain@0.2.11(axios@1.7.3)(openai@4.53.0))(openai@4.53.0)
+      ml-distance: 4.0.1
+      openapi-types: 12.1.3
+      p-retry: 4.6.2
+      uuid: 10.0.0
+      yaml: 2.3.4
+      zod: 3.23.8
+      zod-to-json-schema: 3.23.0(zod@3.23.8)
+    optionalDependencies:
+      axios: 1.7.3(debug@3.2.7)
+    transitivePeerDependencies:
+      - encoding
+      - openai
+      - supports-color
+    optional: true
+
+  langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4):
+    dependencies:
+      '@langchain/core': 0.2.18(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))
+      '@langchain/openai': 0.2.5(encoding@0.1.13)(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))
+      '@langchain/textsplitters': 0.0.3(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))
+      binary-extensions: 2.2.0
+      js-tiktoken: 1.0.12
+      js-yaml: 4.1.0
+      jsonpointer: 5.0.1
+      langchainhub: 0.0.8
+      langsmith: 0.1.34(@langchain/core@0.2.18(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13)))(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))
       ml-distance: 4.0.1
       openapi-types: 12.1.3
       p-retry: 4.6.2
@@ -23540,7 +23585,7 @@ snapshots:
       '@aws-sdk/credential-provider-node': 3.535.0
       '@langchain/anthropic': 0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))
       '@langchain/cohere': 0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))
-      '@langchain/community': 0.2.20(bl2awxa6z6ereahlcpz2dlbf6q)
+      '@langchain/community': 0.2.20(wowgvfxtiu4vww53wbp4ny5rre)
       '@langchain/google-genai': 0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8)
       '@langchain/google-vertexai': 0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8)
       '@langchain/groq': 0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))
@@ -23549,7 +23594,7 @@ snapshots:
       '@pinecone-database/pinecone': 3.0.0
       '@supabase/supabase-js': 2.43.4
       '@xata.io/client': 0.28.4(typescript@5.5.2)
-      axios: 1.6.7(debug@3.2.7)
+      axios: 1.7.3(debug@3.2.7)
       cheerio: 1.0.0-rc.12
       d3-dsv: 2.0.0
       epub2: 3.0.2(ts-toolbelt@9.6.0)
@@ -23568,35 +23613,9 @@ snapshots:
       - openai
       - supports-color
 
-  langchain@0.2.11(axios@1.6.7)(openai@4.53.0):
-    dependencies:
-      '@langchain/core': 0.2.18(langchain@0.2.11(axios@1.6.7)(openai@4.53.0))(openai@4.53.0)
-      '@langchain/openai': 0.2.5(langchain@0.2.11(axios@1.6.7)(openai@4.53.0))
-      '@langchain/textsplitters': 0.0.3(langchain@0.2.11(axios@1.6.7)(openai@4.53.0))(openai@4.53.0)
-      binary-extensions: 2.2.0
-      js-tiktoken: 1.0.12
-      js-yaml: 4.1.0
-      jsonpointer: 5.0.1
-      langchainhub: 0.0.8
-      langsmith: 0.1.34(@langchain/core@0.2.18(langchain@0.2.11(axios@1.6.7)(openai@4.53.0))(openai@4.53.0))(langchain@0.2.11(axios@1.6.7)(openai@4.53.0))(openai@4.53.0)
-      ml-distance: 4.0.1
-      openapi-types: 12.1.3
-      p-retry: 4.6.2
-      uuid: 10.0.0
-      yaml: 2.3.4
-      zod: 3.23.8
-      zod-to-json-schema: 3.23.0(zod@3.23.8)
-    optionalDependencies:
-      axios: 1.6.7(debug@3.2.7)
-    transitivePeerDependencies:
-      - encoding
-      - openai
-      - supports-color
-    optional: true
-
   langchainhub@0.0.8: {}
 
-  langsmith@0.1.34(@langchain/core@0.2.18(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13)))(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13)):
+  langsmith@0.1.34(@langchain/core@0.2.18(langchain@0.2.11(axios@1.7.3)(openai@4.53.0))(openai@4.53.0))(langchain@0.2.11(axios@1.7.3)(openai@4.53.0))(openai@4.53.0):
     dependencies:
       '@types/uuid': 9.0.7
       commander: 10.0.1
@@ -23605,11 +23624,12 @@ snapshots:
       p-retry: 4.6.2
       uuid: 9.0.1
     optionalDependencies:
-      '@langchain/core': 0.2.18(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))
-      langchain: 0.2.11(3eonfu4fvxvjb5zdrprnb3pokq)
+      '@langchain/core': 0.2.18(langchain@0.2.11(axios@1.7.3)(openai@4.53.0))(openai@4.53.0)
+      langchain: 0.2.11(axios@1.7.3)(openai@4.53.0)
       openai: 4.53.0(encoding@0.1.13)
+    optional: true
 
-  langsmith@0.1.34(@langchain/core@0.2.18(langchain@0.2.11(axios@1.6.7)(openai@4.53.0))(openai@4.53.0))(langchain@0.2.11(axios@1.6.7)(openai@4.53.0))(openai@4.53.0):
+  langsmith@0.1.34(@langchain/core@0.2.18(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13)))(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13)):
     dependencies:
       '@types/uuid': 9.0.7
       commander: 10.0.1
@@ -23618,12 +23638,11 @@ snapshots:
       p-retry: 4.6.2
       uuid: 9.0.1
     optionalDependencies:
-      '@langchain/core': 0.2.18(langchain@0.2.11(axios@1.6.7)(openai@4.53.0))(openai@4.53.0)
-      langchain: 0.2.11(axios@1.6.7)(openai@4.53.0)
+      '@langchain/core': 0.2.18(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))
+      langchain: 0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4)
       openai: 4.53.0(encoding@0.1.13)
-    optional: true
 
-  langsmith@0.1.39(@langchain/core@0.2.18(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13)))(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13)):
+  langsmith@0.1.39(@langchain/core@0.2.18(langchain@0.2.11(axios@1.7.3)(openai@4.53.0))(openai@4.53.0))(langchain@0.2.11(axios@1.7.3)(openai@4.53.0))(openai@4.53.0):
     dependencies:
       '@types/uuid': 9.0.7
       commander: 10.0.1
@@ -23631,11 +23650,11 @@ snapshots:
       p-retry: 4.6.2
       uuid: 9.0.1
     optionalDependencies:
-      '@langchain/core': 0.2.18(langchain@0.2.11(3eonfu4fvxvjb5zdrprnb3pokq))(openai@4.53.0(encoding@0.1.13))
-      langchain: 0.2.11(3eonfu4fvxvjb5zdrprnb3pokq)
+      '@langchain/core': 0.2.18(langchain@0.2.11(axios@1.7.3)(openai@4.53.0))(openai@4.53.0)
+      langchain: 0.2.11(axios@1.7.3)(openai@4.53.0)
       openai: 4.53.0(encoding@0.1.13)
 
-  langsmith@0.1.39(@langchain/core@0.2.18(langchain@0.2.11(axios@1.6.7)(openai@4.53.0))(openai@4.53.0))(langchain@0.2.11(axios@1.6.7)(openai@4.53.0))(openai@4.53.0):
+  langsmith@0.1.39(@langchain/core@0.2.18(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13)))(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13)):
     dependencies:
       '@types/uuid': 9.0.7
       commander: 10.0.1
@@ -23643,8 +23662,8 @@ snapshots:
       p-retry: 4.6.2
       uuid: 9.0.1
     optionalDependencies:
-      '@langchain/core': 0.2.18(langchain@0.2.11(axios@1.6.7)(openai@4.53.0))(openai@4.53.0)
-      langchain: 0.2.11(axios@1.6.7)(openai@4.53.0)
+      '@langchain/core': 0.2.18(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))
+      langchain: 0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4)
       openai: 4.53.0(encoding@0.1.13)
 
   lazy-ass@1.6.0: {}
@@ -24703,8 +24722,6 @@ snapshots:
 
   openapi-types@12.1.3: {}
 
-  openurl@1.1.1: {}
-
   option@0.2.4: {}
 
   optionator@0.8.3:
@@ -25121,7 +25138,7 @@ snapshots:
 
   posthog-node@3.2.1:
     dependencies:
-      axios: 1.6.7(debug@3.2.7)
+      axios: 1.7.3(debug@3.2.7)
       rusha: 0.8.14
     transitivePeerDependencies:
       - debug
@@ -26176,7 +26193,7 @@ snapshots:
       asn1.js: 5.4.1
       asn1.js-rfc2560: 5.0.1(asn1.js@5.4.1)
       asn1.js-rfc5280: 3.0.0
-      axios: 1.6.7(debug@3.2.7)
+      axios: 1.7.3(debug@3.2.7)
       big-integer: 1.6.51
       bignumber.js: 9.1.2
       binascii: 0.0.2
@@ -27519,7 +27536,7 @@ snapshots:
 
   wait-on@7.2.0(debug@4.3.4):
     dependencies:
-      axios: 1.6.7(debug@4.3.4)
+      axios: 1.7.3(debug@4.3.4)
       joi: 17.11.0
       lodash: 4.17.21
       minimist: 1.2.8
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 2ce2d3d7dfeec..99964c642bce1 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -10,7 +10,7 @@ catalog:
   '@types/lodash': ^4.14.195
   '@types/uuid': ^8.3.2
   '@types/xml2js': ^0.4.14
-  axios: 1.6.7
+  axios: 1.7.3
   basic-auth: 2.0.1
   fast-glob: 3.2.12
   form-data: 4.0.0

From 1acf6748688bf5531379f5c986f0533a60e02ca2 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: Mon, 12 Aug 2024 19:43:08 +0200
Subject: [PATCH 134/168] feat(editor): Upgrade markdown-it to address
 AIKIDO-2024-10034 (no-changelog) (#10358)

---
 packages/@n8n/chat/package.json     |   3 +-
 packages/design-system/package.json |   6 +-
 packages/editor-ui/package.json     |   2 +-
 pnpm-lock.yaml                      | 122 ++++++++++------------------
 pnpm-workspace.yaml                 |   1 +
 5 files changed, 50 insertions(+), 84 deletions(-)

diff --git a/packages/@n8n/chat/package.json b/packages/@n8n/chat/package.json
index f960f16783bb7..ea2cd454388b0 100644
--- a/packages/@n8n/chat/package.json
+++ b/packages/@n8n/chat/package.json
@@ -40,12 +40,11 @@
     "markdown-it-link-attributes": "^4.0.1",
     "uuid": "catalog:",
     "vue": "catalog:frontend",
-    "vue-markdown-render": "^2.1.1"
+    "vue-markdown-render": "catalog:frontend"
   },
   "devDependencies": {
     "@iconify-json/mdi": "^1.1.54",
     "@n8n/storybook": "workspace:*",
-    "@types/markdown-it": "^12.2.3",
     "@vitest/coverage-v8": "catalog:frontend",
     "unplugin-icons": "^0.19.0",
     "vite": "catalog:frontend",
diff --git a/packages/design-system/package.json b/packages/design-system/package.json
index 694aa546d54ee..055874a28ac37 100644
--- a/packages/design-system/package.json
+++ b/packages/design-system/package.json
@@ -22,9 +22,9 @@
     "@testing-library/jest-dom": "^6.1.5",
     "@testing-library/user-event": "^14.5.1",
     "@testing-library/vue": "^8.0.1",
-    "@types/markdown-it": "^12.2.3",
+    "@types/markdown-it": "^13.0.9",
     "@types/markdown-it-emoji": "^2.0.2",
-    "@types/markdown-it-link-attributes": "^3.0.1",
+    "@types/markdown-it-link-attributes": "^3.0.5",
     "@types/sanitize-html": "^2.11.0",
     "@vitejs/plugin-vue": "^5.0.4",
     "@vitest/coverage-v8": "catalog:frontend",
@@ -45,7 +45,7 @@
     "@fortawesome/free-solid-svg-icons": "^5.15.4",
     "@fortawesome/vue-fontawesome": "^3.0.3",
     "element-plus": "^2.3.6",
-    "markdown-it": "^13.0.1",
+    "markdown-it": "^13.0.2",
     "markdown-it-emoji": "^2.0.2",
     "markdown-it-link-attributes": "^4.0.1",
     "markdown-it-task-lists": "^2.1.1",
diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json
index 51507fe73eaae..956f5b361a4de 100644
--- a/packages/editor-ui/package.json
+++ b/packages/editor-ui/package.json
@@ -70,7 +70,7 @@
     "vue-chartjs": "^5.2.0",
     "vue-i18n": "^9.2.2",
     "vue-json-pretty": "2.2.4",
-    "vue-markdown-render": "^2.0.1",
+    "vue-markdown-render": "catalog:frontend",
     "vue-router": "^4.2.2",
     "vue3-touch-events": "^4.1.3",
     "xss": "^1.0.14"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 608b0d808df5f..db4c26d06b74d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -64,6 +64,9 @@ catalogs:
     vue:
       specifier: ^3.4.21
       version: 3.4.21
+    vue-markdown-render:
+      specifier: ^2.2.1
+      version: 2.2.1
     vue-tsc:
       specifier: ^2.0.19
       version: 2.0.19
@@ -222,8 +225,8 @@ importers:
         specifier: catalog:frontend
         version: 3.4.21(typescript@5.5.2)
       vue-markdown-render:
-        specifier: ^2.1.1
-        version: 2.1.1(vue@3.4.21(typescript@5.5.2))
+        specifier: catalog:frontend
+        version: 2.2.1(vue@3.4.21(typescript@5.5.2))
     devDependencies:
       '@iconify-json/mdi':
         specifier: ^1.1.54
@@ -231,9 +234,6 @@ importers:
       '@n8n/storybook':
         specifier: workspace:*
         version: link:../storybook
-      '@types/markdown-it':
-        specifier: ^12.2.3
-        version: 12.2.3
       '@vitest/coverage-v8':
         specifier: catalog:frontend
         version: 1.6.0(vitest@1.6.0(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1))
@@ -1064,8 +1064,8 @@ importers:
         specifier: ^2.3.6
         version: 2.3.6(vue@3.4.21(typescript@5.5.2))
       markdown-it:
-        specifier: ^13.0.1
-        version: 13.0.1
+        specifier: ^13.0.2
+        version: 13.0.2
       markdown-it-emoji:
         specifier: ^2.0.2
         version: 2.0.2
@@ -1104,14 +1104,14 @@ importers:
         specifier: ^8.0.1
         version: 8.0.1(@vue/compiler-sfc@3.4.21)(@vue/server-renderer@3.4.21(vue@3.4.21(typescript@5.5.2)))(vue@3.4.21(typescript@5.5.2))
       '@types/markdown-it':
-        specifier: ^12.2.3
-        version: 12.2.3
+        specifier: ^13.0.9
+        version: 13.0.9
       '@types/markdown-it-emoji':
         specifier: ^2.0.2
-        version: 2.0.2
+        version: 2.0.5
       '@types/markdown-it-link-attributes':
-        specifier: ^3.0.1
-        version: 3.0.1
+        specifier: ^3.0.5
+        version: 3.0.5
       '@types/sanitize-html':
         specifier: ^2.11.0
         version: 2.11.0
@@ -1332,8 +1332,8 @@ importers:
         specifier: 2.2.4
         version: 2.2.4(vue@3.4.21(typescript@5.5.2))
       vue-markdown-render:
-        specifier: ^2.0.1
-        version: 2.0.1(typescript@5.5.2)
+        specifier: catalog:frontend
+        version: 2.2.1(vue@3.4.21(typescript@5.5.2))
       vue-router:
         specifier: ^4.2.2
         version: 4.2.2(vue@3.4.21(typescript@5.5.2))
@@ -5427,8 +5427,8 @@ packages:
   '@types/jsonwebtoken@9.0.6':
     resolution: {integrity: sha512-/5hndP5dCjloafCXns6SZyESp3Ldq7YjH3zwzwczYnjxIT0Fqzk5ROSYVGfFyczIue7IUEj8hkvLbPoLQ18vQw==}
 
-  '@types/linkify-it@3.0.2':
-    resolution: {integrity: sha512-HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA==}
+  '@types/linkify-it@3.0.5':
+    resolution: {integrity: sha512-yg6E+u0/+Zjva+buc3EIb+29XEg4wltq7cSmd4Uc2EE/1nUVmxyzpX6gUXD0V8jIrG0r7YeOGVIbYRkxeooCtw==}
 
   '@types/lodash-es@4.17.6':
     resolution: {integrity: sha512-R+zTeVUKDdfoRxpAryaQNRKk3105Rrgx2CFRClIgRGaqDTdjsm8h6IYA8ir584W3ePzkZfst5xIgDwYrlh9HLg==}
@@ -5451,20 +5451,20 @@ packages:
   '@types/mailparser@3.4.4':
     resolution: {integrity: sha512-C6Znp2QVS25JqtuPyxj38Qh+QoFcLycdxsvcc6IZCGekhaMBzbdTXzwGzhGoYb3TfKu8IRCNV0sV1o3Od97cEQ==}
 
-  '@types/markdown-it-emoji@2.0.2':
-    resolution: {integrity: sha512-2ln8Wjbcj/0oRi/6VnuMeWEHHuK8uapFttvcLmDIe1GKCsFBLOLBX+D+xhDa9oWOQV0IpvxwrSfKKssAqqroog==}
+  '@types/markdown-it-emoji@2.0.5':
+    resolution: {integrity: sha512-iJLsmCNpSWKtV6Ia3mLSjcXJPEt7ubGG342z+hGvYx++TpM19oTUrJcI7XjbOqRQ+W2UQ323E7B0eCLwlgT/9g==}
 
-  '@types/markdown-it-link-attributes@3.0.1':
-    resolution: {integrity: sha512-K8RnNb1q8j7rDOJbMF7AnlhCC/45BjrQ8z3WZWOrvkBIl8u9RXvmBdG/hfpnmK1JhhEZcmFEKWt+ilW1Mly+2Q==}
+  '@types/markdown-it-link-attributes@3.0.5':
+    resolution: {integrity: sha512-VZ2BGN3ywUg7mBD8W6PwR8ChpOxaQSBDbLqPgvNI+uIra3zY2af1eG/3XzWTKjEraTWskMKnZqZd6m1fDF67Bg==}
 
-  '@types/markdown-it@12.2.3':
-    resolution: {integrity: sha512-GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ==}
+  '@types/markdown-it@13.0.9':
+    resolution: {integrity: sha512-1XPwR0+MgXLWfTn9gCsZ55AHOKW1WN+P9vr0PaQh5aerR9LLQXUbjfEAFhjmEmyoYFWAyuN2Mqkn40MZ4ukjBw==}
 
   '@types/md5@2.3.5':
     resolution: {integrity: sha512-/i42wjYNgE6wf0j2bcTX6kuowmdL/6PE4IVitMpm2eYKBUuYCprdcWVK+xEF0gcV6ufMCRhtxmReGfc6hIK7Jw==}
 
-  '@types/mdurl@1.0.2':
-    resolution: {integrity: sha512-eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA==}
+  '@types/mdurl@1.0.5':
+    resolution: {integrity: sha512-6L6VymKTzYSrEf4Nev4Xa1LCHKrlTlYCBMTlQKFuddo1CvQcE52I0mwfOJayueUC7MJuXOeHTcIU683lzd0cUA==}
 
   '@types/mdx@2.0.3':
     resolution: {integrity: sha512-IgHxcT3RC8LzFLhKwP3gbMPeaK7BM9eBH46OdapPA7yvuIUJ8H6zHZV53J8hGZcTSnt95jANt+rTBNUUc22ACQ==}
@@ -7481,9 +7481,6 @@ packages:
   ent@2.2.0:
     resolution: {integrity: sha512-GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA==}
 
-  entities@2.1.0:
-    resolution: {integrity: sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==}
-
   entities@2.2.0:
     resolution: {integrity: sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==}
 
@@ -9601,9 +9598,6 @@ packages:
   lines-and-columns@1.2.4:
     resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==}
 
-  linkify-it@3.0.3:
-    resolution: {integrity: sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==}
-
   linkify-it@4.0.1:
     resolution: {integrity: sha512-C7bfi1UZmoj8+PQx22XyeXCuBlokoyWQL5pWSP+EI6nzRylyThouddufc2c1NDIcP9k5agmN9fLpA7VNJfIiqw==}
 
@@ -9846,12 +9840,8 @@ packages:
   markdown-it-task-lists@2.1.1:
     resolution: {integrity: sha512-TxFAc76Jnhb2OUu+n3yz9RMu4CwGfaT788br6HhEDlvWfdeJcLUsxk1Hgw2yJio0OXsxv7pyIPmvECY7bMbluA==}
 
-  markdown-it@12.3.2:
-    resolution: {integrity: sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==}
-    hasBin: true
-
-  markdown-it@13.0.1:
-    resolution: {integrity: sha512-lTlxriVoy2criHP0JKRhO2VDG9c2ypWCsT237eDiLqi09rmbKoUetyGHq2uOIRoRS//kfoJckS0eUzzkDR+k2Q==}
+  markdown-it@13.0.2:
+    resolution: {integrity: sha512-FtwnEuuK+2yVU7goGn/MJ0WBZMM9ZPgU9spqlFs7/A/pDIUNSOQZhUgOqYCficIuR2QaFnrt8LHqBWsbTAoI5w==}
     hasBin: true
 
   markdown-to-jsx@7.3.2:
@@ -12526,8 +12516,8 @@ packages:
   uc.micro@1.0.6:
     resolution: {integrity: sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==}
 
-  uc.micro@2.0.0:
-    resolution: {integrity: sha512-DffL94LsNOccVn4hyfRe5rdKa273swqeA5DJpMOeFmEn1wCDc7nAbbB0gXlgBCL7TNzeTv6G7XVWzan7iJtfig==}
+  uc.micro@2.1.0:
+    resolution: {integrity: sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==}
 
   ufo@1.3.2:
     resolution: {integrity: sha512-o+ORpgGwaYQXgqGDwd+hkS4PuZ3QnmqMMxRuajK/a38L6fTpcE5GPIfrf+L/KemFzfUpeUQc1rRS1iDBozvnFA==}
@@ -12940,11 +12930,8 @@ packages:
     peerDependencies:
       vue: '>=3.0.0'
 
-  vue-markdown-render@2.0.1:
-    resolution: {integrity: sha512-/UBCu0OrZ9zzEDtiZVwlV/CQ+CgcwViServGis3TRXSVc6+6lJxcaOcD43vRoQzYfPa9r9WDt0Q7GyupOmpEWA==}
-
-  vue-markdown-render@2.1.1:
-    resolution: {integrity: sha512-szuJVbCwgIpVsggd8IHGB2lLo8BH8Ojd+wakaOTASNxdYcccKxoMcvDqUsLoGwgKDY8yJf0U/+ppffEYxsEHkA==}
+  vue-markdown-render@2.2.1:
+    resolution: {integrity: sha512-XkYnC0PMdbs6Vy6j/gZXSvCuOS0787Se5COwXlepRqiqPiunyCIeTPQAO2XnB4Yl04EOHXwLx5y6IuszMWSgyQ==}
     peerDependencies:
       vue: ^3.3.4
 
@@ -18635,7 +18622,7 @@ snapshots:
     dependencies:
       '@types/node': 18.16.16
 
-  '@types/linkify-it@3.0.2': {}
+  '@types/linkify-it@3.0.5': {}
 
   '@types/lodash-es@4.17.6':
     dependencies:
@@ -18656,22 +18643,22 @@ snapshots:
       '@types/node': 18.16.16
       iconv-lite: 0.6.3
 
-  '@types/markdown-it-emoji@2.0.2':
+  '@types/markdown-it-emoji@2.0.5':
     dependencies:
-      '@types/markdown-it': 12.2.3
+      '@types/markdown-it': 13.0.9
 
-  '@types/markdown-it-link-attributes@3.0.1':
+  '@types/markdown-it-link-attributes@3.0.5':
     dependencies:
-      '@types/markdown-it': 12.2.3
+      '@types/markdown-it': 13.0.9
 
-  '@types/markdown-it@12.2.3':
+  '@types/markdown-it@13.0.9':
     dependencies:
-      '@types/linkify-it': 3.0.2
-      '@types/mdurl': 1.0.2
+      '@types/linkify-it': 3.0.5
+      '@types/mdurl': 1.0.5
 
   '@types/md5@2.3.5': {}
 
-  '@types/mdurl@1.0.2': {}
+  '@types/mdurl@1.0.5': {}
 
   '@types/mdx@2.0.3': {}
 
@@ -21037,8 +21024,6 @@ snapshots:
 
   ent@2.2.0: {}
 
-  entities@2.1.0: {}
-
   entities@2.2.0: {}
 
   entities@3.0.1: {}
@@ -23736,17 +23721,13 @@ snapshots:
 
   lines-and-columns@1.2.4: {}
 
-  linkify-it@3.0.3:
-    dependencies:
-      uc.micro: 1.0.6
-
   linkify-it@4.0.1:
     dependencies:
       uc.micro: 1.0.6
 
   linkify-it@5.0.0:
     dependencies:
-      uc.micro: 2.0.0
+      uc.micro: 2.1.0
 
   listr2@3.14.0(enquirer@2.3.6):
     dependencies:
@@ -24007,15 +23988,7 @@ snapshots:
 
   markdown-it-task-lists@2.1.1: {}
 
-  markdown-it@12.3.2:
-    dependencies:
-      argparse: 2.0.1
-      entities: 2.1.0
-      linkify-it: 3.0.3
-      mdurl: 1.0.1
-      uc.micro: 1.0.6
-
-  markdown-it@13.0.1:
+  markdown-it@13.0.2:
     dependencies:
       argparse: 2.0.1
       entities: 3.0.1
@@ -27069,7 +27042,7 @@ snapshots:
 
   uc.micro@1.0.6: {}
 
-  uc.micro@2.0.0: {}
+  uc.micro@2.1.0: {}
 
   ufo@1.3.2: {}
 
@@ -27476,16 +27449,9 @@ snapshots:
     dependencies:
       vue: 3.4.21(typescript@5.5.2)
 
-  vue-markdown-render@2.0.1(typescript@5.5.2):
-    dependencies:
-      markdown-it: 12.3.2
-      vue: 3.4.21(typescript@5.5.2)
-    transitivePeerDependencies:
-      - typescript
-
-  vue-markdown-render@2.1.1(vue@3.4.21(typescript@5.5.2)):
+  vue-markdown-render@2.2.1(vue@3.4.21(typescript@5.5.2)):
     dependencies:
-      markdown-it: 12.3.2
+      markdown-it: 13.0.2
       vue: 3.4.21(typescript@5.5.2)
 
   vue-router@4.2.2(vue@3.4.21(typescript@5.5.2)):
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 99964c642bce1..cff49d01723b5 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -29,3 +29,4 @@ catalogs:
     vitest-mock-extended: ^1.3.1
     vue: ^3.4.21
     vue-tsc: ^2.0.19
+    vue-markdown-render: ^2.2.1

From 9b647a9837434e8b75e3ad754ff5136bb5ac760d Mon Sep 17 00:00:00 2001
From: Jon <jonathan.bennetts@gmail.com>
Date: Tue, 13 Aug 2024 07:34:55 +0100
Subject: [PATCH 135/168] fix(n8n Form Trigger Node): Fix issue preventing v1
 node from working (#10364)

---
 packages/nodes-base/nodes/Form/utils.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/nodes-base/nodes/Form/utils.ts b/packages/nodes-base/nodes/Form/utils.ts
index 2e79c5699ce5f..079ae4278c2d9 100644
--- a/packages/nodes-base/nodes/Form/utils.ts
+++ b/packages/nodes-base/nodes/Form/utils.ts
@@ -165,7 +165,9 @@ export async function formWebhook(
 		if (options.ignoreBots && isbot(req.headers['user-agent'])) {
 			throw new WebhookAuthorizationError(403);
 		}
-		await validateWebhookAuthentication(context, authProperty);
+		if (node.typeVersion > 1) {
+			await validateWebhookAuthentication(context, authProperty);
+		}
 	} catch (error) {
 		if (error instanceof WebhookAuthorizationError) {
 			res.writeHead(error.responseCode, { 'WWW-Authenticate': 'Basic realm="Webhook"' });

From cdd0ab40314a76d2c14110e0627fac66024a3021 Mon Sep 17 00:00:00 2001
From: Tomi Turtiainen <10324676+tomi@users.noreply.github.com>
Date: Tue, 13 Aug 2024 09:49:24 +0300
Subject: [PATCH 136/168] refactor(core): Rename ActiveWebhooks to LiveWebhooks
 (no-changelog) (#10355)

---
 packages/cli/src/AbstractServer.ts                   | 12 ++++++------
 .../webhooks/{ActiveWebhooks.ts => LiveWebhooks.ts}  |  4 ++--
 packages/cli/test/integration/webhooks.test.ts       |  6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)
 rename packages/cli/src/webhooks/{ActiveWebhooks.ts => LiveWebhooks.ts} (97%)

diff --git a/packages/cli/src/AbstractServer.ts b/packages/cli/src/AbstractServer.ts
index 676db8db0aa03..93ecb500c698c 100644
--- a/packages/cli/src/AbstractServer.ts
+++ b/packages/cli/src/AbstractServer.ts
@@ -17,7 +17,7 @@ import { WaitingForms } from '@/WaitingForms';
 import { TestWebhooks } from '@/webhooks/TestWebhooks';
 import { WaitingWebhooks } from '@/webhooks/WaitingWebhooks';
 import { createWebhookHandlerFor } from '@/webhooks/WebhookRequestHandler';
-import { ActiveWebhooks } from '@/webhooks/ActiveWebhooks';
+import { LiveWebhooks } from '@/webhooks/LiveWebhooks';
 import { generateHostInstanceId } from './databases/utils/generators';
 import { Logger } from '@/Logger';
 import { ServiceUnavailableError } from './errors/response-errors/service-unavailable.error';
@@ -181,12 +181,12 @@ export abstract class AbstractServer {
 
 		// Setup webhook handlers before bodyParser, to let the Webhook node handle binary data in requests
 		if (this.webhooksEnabled) {
-			const activeWebhooksRequestHandler = createWebhookHandlerFor(Container.get(ActiveWebhooks));
-			// Register a handler for active forms
-			this.app.all(`/${this.endpointForm}/:path(*)`, activeWebhooksRequestHandler);
+			const liveWebhooksRequestHandler = createWebhookHandlerFor(Container.get(LiveWebhooks));
+			// Register a handler for live forms
+			this.app.all(`/${this.endpointForm}/:path(*)`, liveWebhooksRequestHandler);
 
-			// Register a handler for active webhooks
-			this.app.all(`/${this.endpointWebhook}/:path(*)`, activeWebhooksRequestHandler);
+			// Register a handler for live webhooks
+			this.app.all(`/${this.endpointWebhook}/:path(*)`, liveWebhooksRequestHandler);
 
 			// Register a handler for waiting forms
 			this.app.all(
diff --git a/packages/cli/src/webhooks/ActiveWebhooks.ts b/packages/cli/src/webhooks/LiveWebhooks.ts
similarity index 97%
rename from packages/cli/src/webhooks/ActiveWebhooks.ts
rename to packages/cli/src/webhooks/LiveWebhooks.ts
index c18f949b88cca..3d66b7ee7f796 100644
--- a/packages/cli/src/webhooks/ActiveWebhooks.ts
+++ b/packages/cli/src/webhooks/LiveWebhooks.ts
@@ -20,12 +20,12 @@ import * as WebhookHelpers from '@/webhooks/WebhookHelpers';
 import { WorkflowStaticDataService } from '@/workflows/workflowStaticData.service';
 
 /**
- * Service for handling the execution of production webhooks, i.e. webhooks
+ * Service for handling the execution of live webhooks, i.e. webhooks
  * that belong to activated workflows and use the production URL
  * (https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.webhook/#webhook-urls)
  */
 @Service()
-export class ActiveWebhooks implements IWebhookManager {
+export class LiveWebhooks implements IWebhookManager {
 	constructor(
 		private readonly logger: Logger,
 		private readonly nodeTypes: NodeTypes,
diff --git a/packages/cli/test/integration/webhooks.test.ts b/packages/cli/test/integration/webhooks.test.ts
index 44bc32c1b5a62..a729f9515818a 100644
--- a/packages/cli/test/integration/webhooks.test.ts
+++ b/packages/cli/test/integration/webhooks.test.ts
@@ -3,7 +3,7 @@ import { agent as testAgent } from 'supertest';
 import { mock } from 'jest-mock-extended';
 
 import { AbstractServer } from '@/AbstractServer';
-import { ActiveWebhooks } from '@/webhooks/ActiveWebhooks';
+import { LiveWebhooks } from '@/webhooks/LiveWebhooks';
 import { ExternalHooks } from '@/ExternalHooks';
 import { TestWebhooks } from '@/webhooks/TestWebhooks';
 import { WaitingWebhooks } from '@/webhooks/WaitingWebhooks';
@@ -21,7 +21,7 @@ describe('WebhookServer', () => {
 
 	describe('CORS', () => {
 		const corsOrigin = 'https://example.com';
-		const activeWebhooks = mockInstance(ActiveWebhooks);
+		const liveWebhooks = mockInstance(LiveWebhooks);
 		const testWebhooks = mockInstance(TestWebhooks);
 		mockInstance(WaitingWebhooks);
 		mockInstance(WaitingForms);
@@ -35,7 +35,7 @@ describe('WebhookServer', () => {
 		});
 
 		const tests = [
-			['webhook', activeWebhooks],
+			['webhook', liveWebhooks],
 			['webhookTest', testWebhooks],
 			// TODO: enable webhookWaiting & waitingForms after CORS support is added
 			// ['webhookWaiting', waitingWebhooks],

From e071b73bab34edd4b3e6aef6497514acc504cdc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Tue, 13 Aug 2024 09:14:52 +0200
Subject: [PATCH 137/168] fix(core): Fix worker shutdown errors when active
 executions (#10353)

---
 packages/cli/src/commands/BaseCommand.ts      |  4 +++-
 packages/cli/src/commands/worker.ts           | 19 +-----------------
 .../scaling/__tests__/scaling.service.test.ts | 13 ++++++++----
 packages/cli/src/scaling/scaling.service.ts   | 20 +++++++++++++++++--
 4 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/packages/cli/src/commands/BaseCommand.ts b/packages/cli/src/commands/BaseCommand.ts
index d2cf986af23b8..af3958c25a4a0 100644
--- a/packages/cli/src/commands/BaseCommand.ts
+++ b/packages/cli/src/commands/BaseCommand.ts
@@ -333,7 +333,9 @@ export abstract class BaseCommand extends Command {
 			this.logger.info(`Received ${signal}. Shutting down...`);
 			this.shutdownService.shutdown();
 
-			await Promise.all([this.stopProcess(), this.shutdownService.waitForShutdown()]);
+			await this.shutdownService.waitForShutdown();
+
+			await this.stopProcess();
 
 			clearTimeout(forceShutdownTimer);
 		};
diff --git a/packages/cli/src/commands/worker.ts b/packages/cli/src/commands/worker.ts
index 1473ed13ffe16..5e75e4792d30d 100644
--- a/packages/cli/src/commands/worker.ts
+++ b/packages/cli/src/commands/worker.ts
@@ -2,7 +2,7 @@ import { Container } from 'typedi';
 import { Flags, type Config } from '@oclif/core';
 import express from 'express';
 import http from 'http';
-import { sleep, ApplicationError } from 'n8n-workflow';
+import { ApplicationError } from 'n8n-workflow';
 
 import * as Db from '@/Db';
 import * as ResponseHelper from '@/ResponseHelper';
@@ -61,23 +61,6 @@ export class Worker extends BaseCommand {
 
 		try {
 			await this.externalHooks?.run('n8n.stop', []);
-
-			const hardStopTimeMs = Date.now() + this.gracefulShutdownTimeoutInS * 1000;
-
-			// Wait for active workflow executions to finish
-			let count = 0;
-			while (this.jobProcessor.getRunningJobIds().length !== 0) {
-				if (count++ % 4 === 0) {
-					const waitLeft = Math.ceil((hardStopTimeMs - Date.now()) / 1000);
-					this.logger.info(
-						`Waiting for ${
-							Object.keys(this.jobProcessor.getRunningJobIds()).length
-						} active executions to finish... (max wait ${waitLeft} more seconds)`,
-					);
-				}
-
-				await sleep(500);
-			}
 		} catch (error) {
 			await this.exitWithCrash('There was an error shutting down n8n.', error);
 		}
diff --git a/packages/cli/src/scaling/__tests__/scaling.service.test.ts b/packages/cli/src/scaling/__tests__/scaling.service.test.ts
index 6883a96ffd69c..0603309e2039d 100644
--- a/packages/cli/src/scaling/__tests__/scaling.service.test.ts
+++ b/packages/cli/src/scaling/__tests__/scaling.service.test.ts
@@ -7,6 +7,7 @@ import type { Job, JobData, JobOptions, JobQueue } from '../types';
 import { ApplicationError } from 'n8n-workflow';
 import { mockInstance } from '@test/mocking';
 import { GlobalConfig } from '@n8n/config';
+import type { JobProcessor } from '../job-processor';
 
 const queue = mock<JobQueue>({
 	client: { ping: jest.fn() },
@@ -100,23 +101,27 @@ describe('ScalingService', () => {
 		});
 	});
 
-	describe('pauseQueue', () => {
-		it('should pause the queue', async () => {
+	describe('stop', () => {
+		it('should pause the queue and check for running jobs', async () => {
 			/**
 			 * Arrange
 			 */
-			const scalingService = new ScalingService(mock(), mock(), mock(), globalConfig);
+			const jobProcessor = mock<JobProcessor>();
+			const scalingService = new ScalingService(mock(), mock(), jobProcessor, globalConfig);
 			await scalingService.setupQueue();
+			jobProcessor.getRunningJobIds.mockReturnValue([]);
+			const getRunningJobsCountSpy = jest.spyOn(scalingService, 'getRunningJobsCount');
 
 			/**
 			 * Act
 			 */
-			await scalingService.pauseQueue();
+			await scalingService.stop();
 
 			/**
 			 * Assert
 			 */
 			expect(queue.pause).toHaveBeenCalledWith(true, true);
+			expect(getRunningJobsCountSpy).toHaveBeenCalled();
 		});
 	});
 
diff --git a/packages/cli/src/scaling/scaling.service.ts b/packages/cli/src/scaling/scaling.service.ts
index f26feebc58fd5..a30e797ccba48 100644
--- a/packages/cli/src/scaling/scaling.service.ts
+++ b/packages/cli/src/scaling/scaling.service.ts
@@ -1,5 +1,5 @@
 import Container, { Service } from 'typedi';
-import { ApplicationError, BINARY_ENCODING } from 'n8n-workflow';
+import { ApplicationError, BINARY_ENCODING, sleep } from 'n8n-workflow';
 import { ActiveExecutions } from '@/ActiveExecutions';
 import config from '@/config';
 import { Logger } from '@/Logger';
@@ -59,10 +59,22 @@ export class ScalingService {
 	}
 
 	@OnShutdown(HIGHEST_SHUTDOWN_PRIORITY)
-	async pauseQueue() {
+	async stop() {
 		await this.queue.pause(true, true);
 
 		this.logger.debug('[ScalingService] Queue paused');
+
+		let count = 0;
+
+		while (this.getRunningJobsCount() !== 0) {
+			if (count++ % 4 === 0) {
+				this.logger.info(
+					`Waiting for ${this.getRunningJobsCount()} active executions to finish...`,
+				);
+			}
+
+			await sleep(500);
+		}
 	}
 
 	async pingQueue() {
@@ -113,6 +125,10 @@ export class ScalingService {
 		}
 	}
 
+	getRunningJobsCount() {
+		return this.jobProcessor.getRunningJobIds().length;
+	}
+
 	// #endregion
 
 	// #region Listeners

From 413fc4584cc164197ea6c81e90042332d286d91d Mon Sep 17 00:00:00 2001
From: Shireen Missi <94372015+ShireenMissi@users.noreply.github.com>
Date: Tue, 13 Aug 2024 11:40:02 +0100
Subject: [PATCH 138/168] fix(Okta Node): Add missing codex file (no-changelog)
 (#10372)

---
 packages/nodes-base/nodes/Okta/Okta.node.json | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 packages/nodes-base/nodes/Okta/Okta.node.json

diff --git a/packages/nodes-base/nodes/Okta/Okta.node.json b/packages/nodes-base/nodes/Okta/Okta.node.json
new file mode 100644
index 0000000000000..682a247192098
--- /dev/null
+++ b/packages/nodes-base/nodes/Okta/Okta.node.json
@@ -0,0 +1,20 @@
+{
+	"node": "n8n-nodes-base.okta",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
+	"categories": ["Development"],
+	"alias": ["authentication", "users", "Security"],
+	"resources": {
+		"credentialDocumentation": [
+			{
+				"url": "https://docs.n8n.io/integrations/builtin/credentials/okta/"
+			}
+		],
+		"primaryDocumentation": [
+			{
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.okta/"
+			}
+		],
+		"generic": []
+	}
+}

From bae49d3198d4bcc27e7996cd4f7be3132becc98e Mon Sep 17 00:00:00 2001
From: Jon <jonathan.bennetts@gmail.com>
Date: Tue, 13 Aug 2024 11:40:20 +0100
Subject: [PATCH 139/168] fix(editor): Revert change that hid swagger docs in
 the ui (#10350)

---
 packages/editor-ui/src/views/SettingsApiView.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/editor-ui/src/views/SettingsApiView.vue b/packages/editor-ui/src/views/SettingsApiView.vue
index 22219ef339b35..d5b8bcb5a671c 100644
--- a/packages/editor-ui/src/views/SettingsApiView.vue
+++ b/packages/editor-ui/src/views/SettingsApiView.vue
@@ -49,7 +49,7 @@
 					/>
 				</div>
 			</n8n-card>
-			<div v-if="!isRedactedApiKey" :class="$style.hint">
+			<div :class="$style.hint">
 				<n8n-text size="small">
 					{{
 						$locale.baseText(`settings.api.view.${swaggerUIEnabled ? 'tryapi' : 'more-details'}`)

From bfa7075950e38acb32b954608cbcc170bf846e8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Tue, 13 Aug 2024 13:25:01 +0200
Subject: [PATCH 140/168] refactor(core): Remove unused constants in Redis
 channels (no-changelog) (#10369)

---
 packages/cli/src/services/redis/RedisConstants.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/cli/src/services/redis/RedisConstants.ts b/packages/cli/src/services/redis/RedisConstants.ts
index 281817b9c719f..038e94e9ce615 100644
--- a/packages/cli/src/services/redis/RedisConstants.ts
+++ b/packages/cli/src/services/redis/RedisConstants.ts
@@ -1,6 +1,2 @@
-export const EVENT_BUS_REDIS_STREAM = 'n8n:eventstream';
-export const COMMAND_REDIS_STREAM = 'n8n:commandstream';
-export const WORKER_RESPONSE_REDIS_STREAM = 'n8n:workerstream';
 export const COMMAND_REDIS_CHANNEL = 'n8n.commands';
 export const WORKER_RESPONSE_REDIS_CHANNEL = 'n8n.worker-response';
-export const WORKER_RESPONSE_REDIS_LIST = 'n8n:list:worker-response';

From b2e0f339590c2c1e3b6dc6f4e620e5293960761c Mon Sep 17 00:00:00 2001
From: Tomi Turtiainen <10324676+tomi@users.noreply.github.com>
Date: Tue, 13 Aug 2024 15:11:28 +0300
Subject: [PATCH 141/168] refactor(editor): Add typed event bus (no-changelog)
 (#10367)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: कारतोफ्फेलस्क्रिप्ट™ <aditya@netroy.in>
---
 .../src/components/N8nFormBox/FormBox.vue     |   4 +-
 .../components/N8nFormInputs/FormInputs.vue   |   8 +-
 .../src/utils/__tests__/event-bus.spec.ts     |  20 +++-
 packages/design-system/src/utils/event-bus.ts | 105 ++++++++++++------
 .../design-system/src/utils/form-event-bus.ts |  12 ++
 packages/design-system/src/utils/index.ts     |   1 +
 6 files changed, 104 insertions(+), 46 deletions(-)
 create mode 100644 packages/design-system/src/utils/form-event-bus.ts

diff --git a/packages/design-system/src/components/N8nFormBox/FormBox.vue b/packages/design-system/src/components/N8nFormBox/FormBox.vue
index ed01219eb914e..7881c4b5c9ba4 100644
--- a/packages/design-system/src/components/N8nFormBox/FormBox.vue
+++ b/packages/design-system/src/components/N8nFormBox/FormBox.vue
@@ -44,7 +44,7 @@ import N8nHeading from '../N8nHeading';
 import N8nLink from '../N8nLink';
 import N8nButton from '../N8nButton';
 import type { IFormInput } from 'n8n-design-system/types';
-import { createEventBus } from '../../utils';
+import { createFormEventBus } from '../../utils';
 
 interface FormBoxProps {
 	title?: string;
@@ -67,7 +67,7 @@ withDefaults(defineProps<FormBoxProps>(), {
 	redirectLink: '',
 });
 
-const formBus = createEventBus();
+const formBus = createFormEventBus();
 const emit = defineEmits<{
 	submit: [value: { [key: string]: Value }];
 	update: [value: { name: string; value: Value }];
diff --git a/packages/design-system/src/components/N8nFormInputs/FormInputs.vue b/packages/design-system/src/components/N8nFormInputs/FormInputs.vue
index 620778cd2cb9d..977a10a88fe16 100644
--- a/packages/design-system/src/components/N8nFormInputs/FormInputs.vue
+++ b/packages/design-system/src/components/N8nFormInputs/FormInputs.vue
@@ -3,12 +3,12 @@ import { computed, onMounted, reactive, ref, watch } from 'vue';
 import N8nFormInput from '../N8nFormInput';
 import type { IFormInput } from '../../types';
 import ResizeObserver from '../ResizeObserver';
-import type { EventBus } from '../../utils';
-import { createEventBus } from '../../utils';
+import type { FormEventBus } from '../../utils';
+import { createFormEventBus } from '../../utils';
 
 export type FormInputsProps = {
 	inputs?: IFormInput[];
-	eventBus?: EventBus;
+	eventBus?: FormEventBus;
 	columnView?: boolean;
 	verticalSpacing?: '' | 'xs' | 's' | 'm' | 'l' | 'xl';
 	teleported?: boolean;
@@ -19,7 +19,7 @@ type Value = string | number | boolean | null | undefined;
 
 const props = withDefaults(defineProps<FormInputsProps>(), {
 	inputs: () => [],
-	eventBus: createEventBus,
+	eventBus: createFormEventBus,
 	columnView: false,
 	verticalSpacing: '',
 	teleported: true,
diff --git a/packages/design-system/src/utils/__tests__/event-bus.spec.ts b/packages/design-system/src/utils/__tests__/event-bus.spec.ts
index e403b61008f4e..2fb0735404ee0 100644
--- a/packages/design-system/src/utils/__tests__/event-bus.spec.ts
+++ b/packages/design-system/src/utils/__tests__/event-bus.spec.ts
@@ -14,18 +14,30 @@ describe('createEventBus()', () => {
 
 			expect(handler).toHaveBeenCalled();
 		});
+	});
 
-		it('should return unregister fn', () => {
+	describe('once()', () => {
+		it('should register event handler', () => {
 			const handler = vi.fn();
 			const eventName = 'test';
 
-			const unregister = eventBus.on(eventName, handler);
+			eventBus.once(eventName, handler);
+
+			eventBus.emit(eventName, {});
+
+			expect(handler).toHaveBeenCalled();
+		});
+
+		it('should unregister event handler after first call', () => {
+			const handler = vi.fn();
+			const eventName = 'test';
 
-			unregister();
+			eventBus.once(eventName, handler);
 
+			eventBus.emit(eventName, {});
 			eventBus.emit(eventName, {});
 
-			expect(handler).not.toHaveBeenCalled();
+			expect(handler).toHaveBeenCalledTimes(1);
 		});
 	});
 
diff --git a/packages/design-system/src/utils/event-bus.ts b/packages/design-system/src/utils/event-bus.ts
index f6ffc597f5fd6..eb08228b47afe 100644
--- a/packages/design-system/src/utils/event-bus.ts
+++ b/packages/design-system/src/utils/event-bus.ts
@@ -1,51 +1,84 @@
 // eslint-disable-next-line @typescript-eslint/ban-types
 export type CallbackFn = Function;
-export type UnregisterFn = () => void;
 
-export interface EventBus {
-	on: (eventName: string, fn: CallbackFn) => UnregisterFn;
-	off: (eventName: string, fn: CallbackFn) => void;
-	emit: <T = Event>(eventName: string, event?: T) => void;
-}
+type Payloads<ListenerMap> = {
+	[E in keyof ListenerMap]: unknown;
+};
 
-export function createEventBus(): EventBus {
-	const handlers = new Map<string, CallbackFn[]>();
+type Listener<Payload> = (payload: Payload) => void;
 
-	function off(eventName: string, fn: CallbackFn) {
-		const eventFns = handlers.get(eventName);
+// 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>(
+		eventName: EventName,
+		fn: Listener<ListenerMap[EventName]>,
+	): void;
 
-		if (eventFns) {
-			eventFns.splice(eventFns.indexOf(fn) >>> 0, 1);
-		}
-	}
+	once<EventName extends keyof ListenerMap & string>(
+		eventName: EventName,
+		fn: Listener<ListenerMap[EventName]>,
+	): void;
 
-	function on(eventName: string, fn: CallbackFn): UnregisterFn {
-		let eventFns = handlers.get(eventName);
+	off<EventName extends keyof ListenerMap & string>(
+		eventName: EventName,
+		fn: Listener<ListenerMap[EventName]>,
+	): void;
 
-		if (!eventFns) {
-			eventFns = [fn];
-		} else {
-			eventFns.push(fn);
-		}
+	emit<EventName extends keyof ListenerMap & string>(
+		eventName: EventName,
+		event?: ListenerMap[EventName],
+	): void;
+}
 
-		handlers.set(eventName, eventFns);
+/**
+ * Creates an event bus with the given listener map.
+ *
+ * @example
+ * ```ts
+ * const eventBus = createEventBus<{
+ *   'user-logged-in': { username: string };
+ *   'user-logged-out': never;
+ * }>();
+ */
+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> {
+	const handlers = new Map<string, CallbackFn[]>();
 
-		return () => off(eventName, fn);
-	}
+	return {
+		on(eventName, fn) {
+			let eventFns = handlers.get(eventName);
+			if (!eventFns) {
+				eventFns = [fn];
+			} else {
+				eventFns.push(fn);
+			}
+			handlers.set(eventName, eventFns);
+		},
 
-	function emit<T = Event>(eventName: string, event?: T) {
-		const eventFns = handlers.get(eventName);
+		once(eventName, fn) {
+			const handler: typeof fn = (payload) => {
+				this.off(eventName, handler);
+				fn(payload);
+			};
+			this.on(eventName, handler);
+		},
 
-		if (eventFns) {
-			eventFns.slice().forEach(async (handler) => {
-				await handler(event);
-			});
-		}
-	}
+		off(eventName, fn) {
+			const eventFns = handlers.get(eventName);
+			if (eventFns) {
+				eventFns.splice(eventFns.indexOf(fn) >>> 0, 1);
+			}
+		},
 
-	return {
-		on,
-		off,
-		emit,
+		emit(eventName, event) {
+			const eventFns = handlers.get(eventName);
+			if (eventFns) {
+				eventFns.slice().forEach((handler) => handler(event));
+			}
+		},
 	};
 }
diff --git a/packages/design-system/src/utils/form-event-bus.ts b/packages/design-system/src/utils/form-event-bus.ts
new file mode 100644
index 0000000000000..5b518c8a4233d
--- /dev/null
+++ b/packages/design-system/src/utils/form-event-bus.ts
@@ -0,0 +1,12 @@
+import { createEventBus } from './event-bus';
+
+export interface FormEventBusEvents {
+	submit: never;
+}
+
+export type FormEventBus = ReturnType<typeof createFormEventBus>;
+
+/**
+ * Creates a new event bus to be used with the `FormInputs` component.
+ */
+export const createFormEventBus = createEventBus<FormEventBusEvents>;
diff --git a/packages/design-system/src/utils/index.ts b/packages/design-system/src/utils/index.ts
index cdc1b91597fa1..3f4ed339f0f73 100644
--- a/packages/design-system/src/utils/index.ts
+++ b/packages/design-system/src/utils/index.ts
@@ -1,4 +1,5 @@
 export * from './event-bus';
+export * from './form-event-bus';
 export * from './markdown';
 export * from './typeguards';
 export * from './uid';

From e950df0de88994f127b4a45380fee3f07d4db25b 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: Tue, 13 Aug 2024 14:44:36 +0200
Subject: [PATCH 142/168] ci: Disable turbo cache when running tests for
 coverage collection (no-changelog) (#10380)

---
 .github/workflows/units-tests-reusable.yml | 1 +
 turbo.json                                 | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.github/workflows/units-tests-reusable.yml b/.github/workflows/units-tests-reusable.yml
index fe270b1de004c..1f64b2e27c6c3 100644
--- a/.github/workflows/units-tests-reusable.yml
+++ b/.github/workflows/units-tests-reusable.yml
@@ -50,6 +50,7 @@ jobs:
         run: pnpm install --frozen-lockfile
 
       - name: Setup build cache
+        if: inputs.collectCoverage != true
         uses: rharkor/caching-for-turbo@v1.5
 
       - name: Build
diff --git a/turbo.json b/turbo.json
index 0da2b6e54d873..49fc3c4ff5012 100644
--- a/turbo.json
+++ b/turbo.json
@@ -1,6 +1,7 @@
 {
 	"$schema": "https://turbo.build/schema.json",
 	"ui": "stream",
+	"globalEnv": ["CI", "COVERAGE_ENABLED"],
 	"tasks": {
 		"clean": {
 			"cache": false

From 3384f52a35b835ba1d8633dc94bab0ad6e7023b3 Mon Sep 17 00:00:00 2001
From: Tomi Turtiainen <10324676+tomi@users.noreply.github.com>
Date: Tue, 13 Aug 2024 15:56:54 +0300
Subject: [PATCH 143/168] fix: Require mfa code to disable mfa (#10345)

---
 packages/cli/src/Mfa/mfa.service.ts           | 18 ++--
 .../__tests__/me.controller.test.ts           |  8 +-
 packages/cli/src/controllers/me.controller.ts |  4 +-
 .../cli/src/controllers/mfa.controller.ts     | 15 ++--
 .../response-errors/invalid-mfa-code.error.ts |  7 ++
 packages/cli/src/requests.ts                  |  1 +
 .../cli/test/integration/mfa/mfa.api.test.ts  | 26 +++++-
 packages/editor-ui/src/api/mfa.ts             |  8 +-
 packages/editor-ui/src/components/Modal.vue   | 10 ++-
 packages/editor-ui/src/components/Modals.vue  |  6 ++
 .../PromptMfaCodeModal/PromptMfaCodeModal.vue | 84 +++++++++++++++++++
 packages/editor-ui/src/constants.ts           |  1 +
 packages/editor-ui/src/event-bus/mfa.ts       | 15 ++++
 .../src/plugins/i18n/locales/en.json          |  1 +
 packages/editor-ui/src/stores/ui.store.ts     |  4 +-
 packages/editor-ui/src/stores/users.store.ts  | 13 +--
 .../src/views/SettingsPersonalView.vue        | 38 +++++++--
 17 files changed, 215 insertions(+), 44 deletions(-)
 create mode 100644 packages/cli/src/errors/response-errors/invalid-mfa-code.error.ts
 create mode 100644 packages/editor-ui/src/components/PromptMfaCodeModal/PromptMfaCodeModal.vue

diff --git a/packages/cli/src/Mfa/mfa.service.ts b/packages/cli/src/Mfa/mfa.service.ts
index 43b1d3438b22b..aa6fddb5a93ce 100644
--- a/packages/cli/src/Mfa/mfa.service.ts
+++ b/packages/cli/src/Mfa/mfa.service.ts
@@ -3,6 +3,7 @@ import { Service } from 'typedi';
 import { Cipher } from 'n8n-core';
 import { AuthUserRepository } from '@db/repositories/authUser.repository';
 import { TOTPService } from './totp.service';
+import { InvalidMfaCodeError } from '@/errors/response-errors/invalid-mfa-code.error';
 
 @Service()
 export class MfaService {
@@ -82,11 +83,16 @@ export class MfaService {
 		return await this.authUserRepository.save(user);
 	}
 
-	async disableMfa(userId: string) {
-		const user = await this.authUserRepository.findOneByOrFail({ id: userId });
-		user.mfaEnabled = false;
-		user.mfaSecret = null;
-		user.mfaRecoveryCodes = [];
-		return await this.authUserRepository.save(user);
+	async disableMfa(userId: string, mfaToken: string) {
+		const isValidToken = await this.validateMfa(userId, mfaToken, undefined);
+		if (!isValidToken) {
+			throw new InvalidMfaCodeError();
+		}
+
+		await this.authUserRepository.update(userId, {
+			mfaEnabled: false,
+			mfaSecret: null,
+			mfaRecoveryCodes: [],
+		});
 	}
 }
diff --git a/packages/cli/src/controllers/__tests__/me.controller.test.ts b/packages/cli/src/controllers/__tests__/me.controller.test.ts
index df22c377bca9b..3ff4c5bbe0860 100644
--- a/packages/cli/src/controllers/__tests__/me.controller.test.ts
+++ b/packages/cli/src/controllers/__tests__/me.controller.test.ts
@@ -17,7 +17,7 @@ import { badPasswords } from '@test/testData';
 import { mockInstance } from '@test/mocking';
 import { AuthUserRepository } from '@/databases/repositories/authUser.repository';
 import { MfaService } from '@/Mfa/mfa.service';
-import { ForbiddenError } from '@/errors/response-errors/forbidden.error';
+import { InvalidMfaCodeError } from '@/errors/response-errors/invalid-mfa-code.error';
 
 const browserId = 'test-browser-id';
 
@@ -230,16 +230,14 @@ describe('MeController', () => {
 				);
 			});
 
-			it('should throw ForbiddenError if invalid mfa code is given', async () => {
+			it('should throw InvalidMfaCodeError if invalid mfa code is given', async () => {
 				const req = mock<MeRequest.Password>({
 					user: mock({ password: passwordHash, mfaEnabled: true }),
 					body: { currentPassword: 'old_password', newPassword: 'NewPassword123', mfaCode: '123' },
 				});
 				mockMfaService.validateMfa.mockResolvedValue(false);
 
-				await expect(controller.updatePassword(req, mock())).rejects.toThrowError(
-					new ForbiddenError('Invalid two-factor code.'),
-				);
+				await expect(controller.updatePassword(req, mock())).rejects.toThrow(InvalidMfaCodeError);
 			});
 
 			it('should succeed when mfa code is correct', async () => {
diff --git a/packages/cli/src/controllers/me.controller.ts b/packages/cli/src/controllers/me.controller.ts
index 4089cd3523310..179076d25d224 100644
--- a/packages/cli/src/controllers/me.controller.ts
+++ b/packages/cli/src/controllers/me.controller.ts
@@ -24,7 +24,7 @@ import { UserRepository } from '@/databases/repositories/user.repository';
 import { isApiEnabled } from '@/PublicApi';
 import { EventService } from '@/events/event.service';
 import { MfaService } from '@/Mfa/mfa.service';
-import { ForbiddenError } from '@/errors/response-errors/forbidden.error';
+import { InvalidMfaCodeError } from '@/errors/response-errors/invalid-mfa-code.error';
 
 export const API_KEY_PREFIX = 'n8n_api_';
 
@@ -155,7 +155,7 @@ export class MeController {
 
 			const isMfaTokenValid = await this.mfaService.validateMfa(user.id, mfaCode, undefined);
 			if (!isMfaTokenValid) {
-				throw new ForbiddenError('Invalid two-factor code.');
+				throw new InvalidMfaCodeError();
 			}
 		}
 
diff --git a/packages/cli/src/controllers/mfa.controller.ts b/packages/cli/src/controllers/mfa.controller.ts
index 4d3c6c0d9f50c..6c228df47e90e 100644
--- a/packages/cli/src/controllers/mfa.controller.ts
+++ b/packages/cli/src/controllers/mfa.controller.ts
@@ -1,4 +1,4 @@
-import { Delete, Get, Post, RestController } from '@/decorators';
+import { Get, Post, RestController } from '@/decorators';
 import { AuthenticatedRequest, MFA } from '@/requests';
 import { MfaService } from '@/Mfa/mfa.service';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
@@ -71,11 +71,16 @@ export class MFAController {
 		await this.mfaService.enableMfa(id);
 	}
 
-	@Delete('/disable')
-	async disableMFA(req: AuthenticatedRequest) {
-		const { id } = req.user;
+	@Post('/disable', { rateLimit: true })
+	async disableMFA(req: MFA.Disable) {
+		const { id: userId } = req.user;
+		const { token = null } = req.body;
+
+		if (typeof token !== 'string' || !token) {
+			throw new BadRequestError('Token is required to disable MFA feature');
+		}
 
-		await this.mfaService.disableMfa(id);
+		await this.mfaService.disableMfa(userId, token);
 	}
 
 	@Post('/verify', { rateLimit: true })
diff --git a/packages/cli/src/errors/response-errors/invalid-mfa-code.error.ts b/packages/cli/src/errors/response-errors/invalid-mfa-code.error.ts
new file mode 100644
index 0000000000000..cc00976a84ef5
--- /dev/null
+++ b/packages/cli/src/errors/response-errors/invalid-mfa-code.error.ts
@@ -0,0 +1,7 @@
+import { ForbiddenError } from './forbidden.error';
+
+export class InvalidMfaCodeError extends ForbiddenError {
+	constructor(hint?: string) {
+		super('Invalid two-factor code.', hint);
+	}
+}
diff --git a/packages/cli/src/requests.ts b/packages/cli/src/requests.ts
index 5301351c770df..565020447c91d 100644
--- a/packages/cli/src/requests.ts
+++ b/packages/cli/src/requests.ts
@@ -353,6 +353,7 @@ export type LoginRequest = AuthlessRequest<
 export declare namespace MFA {
 	type Verify = AuthenticatedRequest<{}, {}, { token: string }, {}>;
 	type Activate = AuthenticatedRequest<{}, {}, { token: string }, {}>;
+	type Disable = AuthenticatedRequest<{}, {}, { token: string }, {}>;
 	type Config = AuthenticatedRequest<{}, {}, { login: { enabled: boolean } }, {}>;
 	type ValidateRecoveryCode = AuthenticatedRequest<
 		{},
diff --git a/packages/cli/test/integration/mfa/mfa.api.test.ts b/packages/cli/test/integration/mfa/mfa.api.test.ts
index 7755ad4e3ceab..792ad1cb8876c 100644
--- a/packages/cli/test/integration/mfa/mfa.api.test.ts
+++ b/packages/cli/test/integration/mfa/mfa.api.test.ts
@@ -48,7 +48,8 @@ describe('Enable MFA setup', () => {
 				secondCall.body.data.recoveryCodes.join(''),
 			);
 
-			await testServer.authAgentFor(owner).delete('/mfa/disable').expect(200);
+			const token = new TOTPService().generateTOTP(firstCall.body.data.secret);
+			await testServer.authAgentFor(owner).post('/mfa/disable').send({ token }).expect(200);
 
 			const thirdCall = await testServer.authAgentFor(owner).get('/mfa/qr').expect(200);
 
@@ -135,9 +136,16 @@ describe('Enable MFA setup', () => {
 
 describe('Disable MFA setup', () => {
 	test('POST /disable should disable login with MFA', async () => {
-		const { user } = await createUserWithMfaEnabled();
+		const { user, rawSecret } = await createUserWithMfaEnabled();
+		const token = new TOTPService().generateTOTP(rawSecret);
 
-		await testServer.authAgentFor(user).delete('/mfa/disable').expect(200);
+		await testServer
+			.authAgentFor(user)
+			.post('/mfa/disable')
+			.send({
+				token,
+			})
+			.expect(200);
 
 		const dbUser = await Container.get(AuthUserRepository).findOneOrFail({
 			where: { id: user.id },
@@ -147,6 +155,18 @@ describe('Disable MFA setup', () => {
 		expect(dbUser.mfaSecret).toBe(null);
 		expect(dbUser.mfaRecoveryCodes.length).toBe(0);
 	});
+
+	test('POST /disable should fail if invalid token is given', async () => {
+		const { user } = await createUserWithMfaEnabled();
+
+		await testServer
+			.authAgentFor(user)
+			.post('/mfa/disable')
+			.send({
+				token: 'invalid token',
+			})
+			.expect(403);
+	});
 });
 
 describe('Change password with MFA enabled', () => {
diff --git a/packages/editor-ui/src/api/mfa.ts b/packages/editor-ui/src/api/mfa.ts
index dcc5d2131399e..09cfb84df40bf 100644
--- a/packages/editor-ui/src/api/mfa.ts
+++ b/packages/editor-ui/src/api/mfa.ts
@@ -18,6 +18,10 @@ export async function verifyMfaToken(
 	return await makeRestApiRequest(context, 'POST', '/mfa/verify', data);
 }
 
-export async function disableMfa(context: IRestApiContext): Promise<void> {
-	return await makeRestApiRequest(context, 'DELETE', '/mfa/disable');
+export type DisableMfaParams = {
+	token: string;
+};
+
+export async function disableMfa(context: IRestApiContext, data: DisableMfaParams): Promise<void> {
+	return await makeRestApiRequest(context, 'POST', '/mfa/disable', data);
 }
diff --git a/packages/editor-ui/src/components/Modal.vue b/packages/editor-ui/src/components/Modal.vue
index 7a26314ad0dc8..141e93a521472 100644
--- a/packages/editor-ui/src/components/Modal.vue
+++ b/packages/editor-ui/src/components/Modal.vue
@@ -1,7 +1,7 @@
 <template>
 	<el-dialog
 		:model-value="uiStore.modalsById[name].open"
-		:before-close="closeDialog"
+		:before-close="onCloseDialog"
 		:class="{
 			'dialog-wrapper': true,
 			scrollable: scrollable,
@@ -34,7 +34,7 @@
 			class="modal-content"
 			@keydown.stop
 			@keydown.enter="handleEnter"
-			@keydown.esc="closeDialog"
+			@keydown.esc="onCloseDialog"
 		>
 			<slot v-if="!loading" name="content" />
 			<div v-else :class="$style.loader">
@@ -182,7 +182,10 @@ export default defineComponent({
 				this.$emit('enter');
 			}
 		},
-		async closeDialog() {
+		async onCloseDialog() {
+			await this.closeDialog();
+		},
+		async closeDialog(returnData?: unknown) {
 			if (this.beforeClose) {
 				const shouldClose = await this.beforeClose();
 				if (shouldClose === false) {
@@ -191,6 +194,7 @@ export default defineComponent({
 				}
 			}
 			this.uiStore.closeModal(this.name);
+			this.eventBus?.emit('closed', returnData);
 		},
 		getCustomClass() {
 			let classes = this.customClass || '';
diff --git a/packages/editor-ui/src/components/Modals.vue b/packages/editor-ui/src/components/Modals.vue
index 4e34daf40db9a..adf39802375f0 100644
--- a/packages/editor-ui/src/components/Modals.vue
+++ b/packages/editor-ui/src/components/Modals.vue
@@ -30,6 +30,7 @@ import {
 	SETUP_CREDENTIALS_MODAL_KEY,
 	PROJECT_MOVE_RESOURCE_MODAL,
 	PROJECT_MOVE_RESOURCE_CONFIRM_MODAL,
+	PROMPT_MFA_CODE_MODAL_KEY,
 } from '@/constants';
 
 import AboutModal from '@/components/AboutModal.vue';
@@ -63,6 +64,7 @@ import WorkflowHistoryVersionRestoreModal from '@/components/WorkflowHistory/Wor
 import SetupWorkflowCredentialsModal from '@/components/SetupWorkflowCredentialsModal/SetupWorkflowCredentialsModal.vue';
 import ProjectMoveResourceModal from '@/components/Projects/ProjectMoveResourceModal.vue';
 import ProjectMoveResourceConfirmModal from '@/components/Projects/ProjectMoveResourceConfirmModal.vue';
+import PromptMfaCodeModal from './PromptMfaCodeModal/PromptMfaCodeModal.vue';
 </script>
 
 <template>
@@ -144,6 +146,10 @@ import ProjectMoveResourceConfirmModal from '@/components/Projects/ProjectMoveRe
 			<MfaSetupModal />
 		</ModalRoot>
 
+		<ModalRoot :name="PROMPT_MFA_CODE_MODAL_KEY">
+			<PromptMfaCodeModal />
+		</ModalRoot>
+
 		<ModalRoot :name="WORKFLOW_SHARE_MODAL_KEY">
 			<template #default="{ modalName, active, data }">
 				<WorkflowShareModal :data="data" :is-active="active" :modal-name="modalName" />
diff --git a/packages/editor-ui/src/components/PromptMfaCodeModal/PromptMfaCodeModal.vue b/packages/editor-ui/src/components/PromptMfaCodeModal/PromptMfaCodeModal.vue
new file mode 100644
index 0000000000000..6580fc2d66b95
--- /dev/null
+++ b/packages/editor-ui/src/components/PromptMfaCodeModal/PromptMfaCodeModal.vue
@@ -0,0 +1,84 @@
+<template>
+	<Modal
+		width="460px"
+		height="300px"
+		max-height="640px"
+		:title="i18n.baseText('mfa.prompt.code.modal.title')"
+		:event-bus="promptMfaCodeBus"
+		:name="PROMPT_MFA_CODE_MODAL_KEY"
+		:center="true"
+	>
+		<template #content>
+			<div :class="[$style.formContainer]">
+				<n8n-form-inputs
+					data-test-id="mfa-code-form"
+					:inputs="formFields"
+					:event-bus="formBus"
+					@submit="onSubmit"
+					@ready="onFormReady"
+				/>
+			</div>
+		</template>
+		<template #footer>
+			<div>
+				<n8n-button
+					float="right"
+					:disabled="!readyToSubmit"
+					:label="i18n.baseText('settings.personal.save')"
+					size="large"
+					data-test-id="mfa-save-button"
+					@click="onClickSave"
+				/>
+			</div>
+		</template>
+	</Modal>
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue';
+import Modal from '../Modal.vue';
+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';
+
+const i18n = useI18n();
+
+const formBus = ref(createFormEventBus());
+const readyToSubmit = ref(false);
+
+const formFields: IFormInputs = [
+	{
+		name: 'mfaCode',
+		initialValue: '',
+		properties: {
+			label: i18n.baseText('mfa.code.input.label'),
+			placeholder: i18n.baseText('mfa.code.input.placeholder'),
+			focusInitially: true,
+			capitalize: true,
+			required: true,
+		},
+	},
+];
+
+function onSubmit(values: { mfaCode: string }) {
+	promptMfaCodeBus.emit('close', {
+		mfaCode: values.mfaCode,
+	});
+}
+
+function onClickSave() {
+	formBus.value.emit('submit');
+}
+
+function onFormReady(isReady: boolean) {
+	readyToSubmit.value = isReady;
+}
+</script>
+
+<style lang="scss" module>
+.formContainer {
+	padding-bottom: var(--spacing-xl);
+}
+</style>
diff --git a/packages/editor-ui/src/constants.ts b/packages/editor-ui/src/constants.ts
index ddcaf44efacd7..1878e7e89dec6 100644
--- a/packages/editor-ui/src/constants.ts
+++ b/packages/editor-ui/src/constants.ts
@@ -60,6 +60,7 @@ export const SOURCE_CONTROL_PUSH_MODAL_KEY = 'sourceControlPush';
 export const SOURCE_CONTROL_PULL_MODAL_KEY = 'sourceControlPull';
 export const DEBUG_PAYWALL_MODAL_KEY = 'debugPaywall';
 export const MFA_SETUP_MODAL_KEY = 'mfaSetup';
+export const PROMPT_MFA_CODE_MODAL_KEY = 'promptMfaCode';
 export const WORKFLOW_HISTORY_VERSION_RESTORE = 'workflowHistoryVersionRestore';
 export const SETUP_CREDENTIALS_MODAL_KEY = 'setupCredentials';
 export const PROJECT_MOVE_RESOURCE_MODAL = 'projectMoveResourceModal';
diff --git a/packages/editor-ui/src/event-bus/mfa.ts b/packages/editor-ui/src/event-bus/mfa.ts
index dbd264ff4c22a..a50b6512b7630 100644
--- a/packages/editor-ui/src/event-bus/mfa.ts
+++ b/packages/editor-ui/src/event-bus/mfa.ts
@@ -1,3 +1,18 @@
 import { createEventBus } from 'n8n-design-system/utils';
 
 export const mfaEventBus = createEventBus();
+
+export interface MfaModalClosedEventPayload {
+	mfaCode: string;
+}
+
+export interface MfaModalEvents {
+	close: MfaModalClosedEventPayload | undefined;
+
+	closed: MfaModalClosedEventPayload | undefined;
+}
+
+/**
+ * Event bus for transmitting the MFA code from a modal back to the view
+ */
+export const promptMfaCodeBus = createEventBus<MfaModalEvents>();
diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json
index 8e05b586fe59d..dc0734b041b71 100644
--- a/packages/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/editor-ui/src/plugins/i18n/locales/en.json
@@ -2521,6 +2521,7 @@
 	"mfa.setup.step2.toast.setupFinished.message": "Two-factor authentication enabled",
 	"mfa.setup.step2.toast.setupFinished.error.message": "Error enabling two-factor authentication",
 	"mfa.setup.step2.toast.tokenExpired.error.message": "MFA token expired. Close the modal and enable MFA again",
+	"mfa.prompt.code.modal.title": "Two-factor code required",
 	"settings.personal.mfa.section.title": "Two-factor authentication (2FA)",
 	"settings.personal.personalisation": "Personalisation",
 	"settings.personal.theme": "Theme",
diff --git a/packages/editor-ui/src/stores/ui.store.ts b/packages/editor-ui/src/stores/ui.store.ts
index e8571181587a2..ec2c154257cbc 100644
--- a/packages/editor-ui/src/stores/ui.store.ts
+++ b/packages/editor-ui/src/stores/ui.store.ts
@@ -35,6 +35,7 @@ import {
 	SETUP_CREDENTIALS_MODAL_KEY,
 	PROJECT_MOVE_RESOURCE_MODAL,
 	PROJECT_MOVE_RESOURCE_CONFIRM_MODAL,
+	PROMPT_MFA_CODE_MODAL_KEY,
 } from '@/constants';
 import type {
 	CloudUpdateLinkSourceType,
@@ -114,6 +115,7 @@ export const useUIStore = defineStore(STORES.UI, () => {
 				WORKFLOW_ACTIVE_MODAL_KEY,
 				COMMUNITY_PACKAGE_INSTALL_MODAL_KEY,
 				MFA_SETUP_MODAL_KEY,
+				PROMPT_MFA_CODE_MODAL_KEY,
 				SOURCE_CONTROL_PUSH_MODAL_KEY,
 				SOURCE_CONTROL_PULL_MODAL_KEY,
 				EXTERNAL_SECRETS_PROVIDER_MODAL_KEY,
@@ -696,7 +698,7 @@ export const useUIStore = defineStore(STORES.UI, () => {
 });
 
 /**
- * Helper function for listening to credential changes in the store
+ * Helper function for listening to model opening and closings in the store
  */
 export const listenForModalChanges = (opts: {
 	store: UiStore;
diff --git a/packages/editor-ui/src/stores/users.store.ts b/packages/editor-ui/src/stores/users.store.ts
index d0145b2cb03be..a07c40193dc5d 100644
--- a/packages/editor-ui/src/stores/users.store.ts
+++ b/packages/editor-ui/src/stores/users.store.ts
@@ -324,15 +324,11 @@ export const useUsersStore = defineStore(STORES.USERS, () => {
 		}
 	};
 
-	const disableMfa = async () => {
-		await mfaApi.disableMfa(rootStore.restApiContext);
-		if (currentUser.value) {
-			currentUser.value.mfaEnabled = false;
-		}
-	};
+	const disableMfa = async (mfaCode: string) => {
+		await mfaApi.disableMfa(rootStore.restApiContext, {
+			token: mfaCode,
+		});
 
-	const disabledMfa = async () => {
-		await mfaApi.disableMfa(rootStore.restApiContext);
 		if (currentUser.value) {
 			currentUser.value.mfaEnabled = false;
 		}
@@ -410,7 +406,6 @@ export const useUsersStore = defineStore(STORES.USERS, () => {
 		fetchUserCloudAccount,
 		confirmEmail,
 		updateGlobalRole,
-		disabledMfa,
 		reset,
 	};
 });
diff --git a/packages/editor-ui/src/views/SettingsPersonalView.vue b/packages/editor-ui/src/views/SettingsPersonalView.vue
index bbf5f7dbc7107..9f0146ef3cdfb 100644
--- a/packages/editor-ui/src/views/SettingsPersonalView.vue
+++ b/packages/editor-ui/src/views/SettingsPersonalView.vue
@@ -1,22 +1,27 @@
 <script lang="ts" setup>
+import { ref, computed, onMounted, onBeforeUnmount } from 'vue';
 import { useI18n } from '@/composables/useI18n';
 import { useToast } from '@/composables/useToast';
 import type { IFormInputs, IUser, ThemeOption } from '@/Interface';
-import { CHANGE_PASSWORD_MODAL_KEY, MFA_DOCS_URL, MFA_SETUP_MODAL_KEY } from '@/constants';
+import {
+	CHANGE_PASSWORD_MODAL_KEY,
+	MFA_DOCS_URL,
+	MFA_SETUP_MODAL_KEY,
+	PROMPT_MFA_CODE_MODAL_KEY,
+} from '@/constants';
 import { useUIStore } from '@/stores/ui.store';
 import { useUsersStore } from '@/stores/users.store';
 import { useSettingsStore } from '@/stores/settings.store';
-import { createEventBus } from 'n8n-design-system/utils';
-import { ref } from 'vue';
-import { computed } from 'vue';
-import { onMounted } from 'vue';
+import { createFormEventBus } from 'n8n-design-system/utils';
+import type { MfaModalEvents } from '@/event-bus/mfa';
+import { promptMfaCodeBus } from '@/event-bus/mfa';
 
 const i18n = useI18n();
 const { showToast, showError } = useToast();
 
 const hasAnyBasicInfoChanges = ref<boolean>(false);
 const formInputs = ref<null | IFormInputs>(null);
-const formBus = ref(createEventBus());
+const formBus = ref(createFormEventBus());
 const readyToSubmit = ref(false);
 const currentSelectedTheme = ref(useUIStore().theme);
 const themeOptions = ref<Array<{ name: ThemeOption; label: string }>>([
@@ -154,9 +159,16 @@ function openPasswordModal() {
 function onMfaEnableClick() {
 	uiStore.openModal(MFA_SETUP_MODAL_KEY);
 }
-async function onMfaDisableClick() {
+
+async function disableMfa(payload: MfaModalEvents['closed']) {
+	if (!payload) {
+		// User closed the modal without submitting the form
+		return;
+	}
+
 	try {
-		await usersStore.disabledMfa();
+		await usersStore.disableMfa(payload.mfaCode);
+
 		showToast({
 			title: i18n.baseText('settings.personal.mfa.toast.disabledMfa.title'),
 			message: i18n.baseText('settings.personal.mfa.toast.disabledMfa.message'),
@@ -167,6 +179,16 @@ async function onMfaDisableClick() {
 		showError(e, i18n.baseText('settings.personal.mfa.toast.disabledMfa.error.message'));
 	}
 }
+
+async function onMfaDisableClick() {
+	uiStore.openModal(PROMPT_MFA_CODE_MODAL_KEY);
+
+	promptMfaCodeBus.once('closed', disableMfa);
+}
+
+onBeforeUnmount(() => {
+	promptMfaCodeBus.off('closed', disableMfa);
+});
 </script>
 
 <template>

From 7ab38114dbf3881afba39287a061446ec4bf0431 Mon Sep 17 00:00:00 2001
From: oleg <me@olegivaniv.com>
Date: Tue, 13 Aug 2024 15:02:57 +0200
Subject: [PATCH 144/168] fix(editor): Fix rendering of SVG icons in public
 chat on iOS (#10381)

---
 packages/@n8n/chat/src/components/Input.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/@n8n/chat/src/components/Input.vue b/packages/@n8n/chat/src/components/Input.vue
index 04153960825b6..af4b3343b7a38 100644
--- a/packages/@n8n/chat/src/components/Input.vue
+++ b/packages/@n8n/chat/src/components/Input.vue
@@ -247,6 +247,10 @@ function onOpenFileDialog() {
 	justify-content: center;
 	transition: color var(--chat--transition-duration) ease;
 
+	svg {
+		min-width: fit-content;
+	}
+
 	&:hover,
 	&:focus {
 		background: var(

From 5ac65b36bcb1351c6233b951f064f60862f790a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Tue, 13 Aug 2024 15:05:40 +0200
Subject: [PATCH 145/168] fix(core): Account for owner when filtering by
 project ID in `GET /workflows` in Public API (#10379)

---
 .../handlers/workflows/workflows.handler.ts   | 13 ++++++++++
 .../integration/publicApi/workflows.test.ts   | 26 +++++++++++++++++--
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.handler.ts b/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.handler.ts
index d5abac95a1787..8515548dea16b 100644
--- a/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.handler.ts
+++ b/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.handler.ts
@@ -143,6 +143,19 @@ export = {
 					);
 					where.id = In(workflowIds);
 				}
+
+				if (projectId) {
+					const workflows = await Container.get(SharedWorkflowRepository).findAllWorkflowsForUser(
+						req.user,
+						['workflow:read'],
+					);
+
+					const workflowIds = workflows
+						.filter((workflow) => workflow.projectId === projectId)
+						.map((workflow) => workflow.id);
+
+					where.id = In(workflowIds);
+				}
 			} else {
 				const options: { workflowIds?: string[] } = {};
 
diff --git a/packages/cli/test/integration/publicApi/workflows.test.ts b/packages/cli/test/integration/publicApi/workflows.test.ts
index 1e292af64d92f..5185f3862de89 100644
--- a/packages/cli/test/integration/publicApi/workflows.test.ts
+++ b/packages/cli/test/integration/publicApi/workflows.test.ts
@@ -267,8 +267,30 @@ describe('GET /workflows', () => {
 		}
 	});
 
-	test('should return all user-accessible workflows filtered by `projectId`', async () => {
-		license.setQuota('quota:maxTeamProjects', 2);
+	test('for owner, should return all workflows filtered by `projectId`', async () => {
+		license.setQuota('quota:maxTeamProjects', -1);
+		const firstProject = await Container.get(ProjectService).createTeamProject('First', owner);
+		const secondProject = await Container.get(ProjectService).createTeamProject('Second', member);
+
+		await Promise.all([
+			createWorkflow({ name: 'First workflow' }, firstProject),
+			createWorkflow({ name: 'Second workflow' }, secondProject),
+		]);
+
+		const firstResponse = await authOwnerAgent.get(`/workflows?projectId=${firstProject.id}`);
+		const secondResponse = await authOwnerAgent.get(`/workflows?projectId=${secondProject.id}`);
+
+		expect(firstResponse.statusCode).toBe(200);
+		expect(firstResponse.body.data.length).toBe(1);
+		expect(firstResponse.body.data[0].name).toBe('First workflow');
+
+		expect(secondResponse.statusCode).toBe(200);
+		expect(secondResponse.body.data.length).toBe(1);
+		expect(secondResponse.body.data[0].name).toBe('Second workflow');
+	});
+
+	test('for member, should return all member-accessible workflows filtered by `projectId`', async () => {
+		license.setQuota('quota:maxTeamProjects', -1);
 		const otherProject = await Container.get(ProjectService).createTeamProject(
 			'Other project',
 			member,

From 56c4692c949080b2772ceaa6d55caa5369ae40f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Tue, 13 Aug 2024 15:06:47 +0200
Subject: [PATCH 146/168] refactor(core): Move queue recovery to scaling
 service (no-changelog) (#10368)

---
 packages/cli/src/commands/start.ts            |   2 -
 .../execution-recovery.service.test.ts        |  67 ----------
 .../executions/execution-recovery.service.ts  | 126 +-----------------
 .../cli/src/executions/execution.types.ts     |  17 ---
 .../scaling/__tests__/scaling.service.test.ts |  85 ++++++++++--
 packages/cli/src/scaling/scaling.service.ts   | 115 +++++++++++++++-
 packages/cli/src/scaling/types.ts             |  11 ++
 7 files changed, 196 insertions(+), 227 deletions(-)

diff --git a/packages/cli/src/commands/start.ts b/packages/cli/src/commands/start.ts
index 0ebfbbc1a6dae..cc4555dc5e65b 100644
--- a/packages/cli/src/commands/start.ts
+++ b/packages/cli/src/commands/start.ts
@@ -30,7 +30,6 @@ import type { IWorkflowExecutionDataProcess } from '@/Interfaces';
 import { ExecutionService } from '@/executions/execution.service';
 import { OwnershipService } from '@/services/ownership.service';
 import { WorkflowRunner } from '@/WorkflowRunner';
-import { ExecutionRecoveryService } from '@/executions/execution-recovery.service';
 import { EventService } from '@/events/event.service';
 
 // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-var-requires
@@ -305,7 +304,6 @@ export class Start extends BaseCommand {
 		await this.server.start();
 
 		Container.get(PruningService).init();
-		Container.get(ExecutionRecoveryService).init();
 
 		if (config.getEnv('executions.mode') === 'regular') {
 			await this.runEnqueuedExecutions();
diff --git a/packages/cli/src/executions/__tests__/execution-recovery.service.test.ts b/packages/cli/src/executions/__tests__/execution-recovery.service.test.ts
index 965e7da6fecda..f72c81a3cad53 100644
--- a/packages/cli/src/executions/__tests__/execution-recovery.service.test.ts
+++ b/packages/cli/src/executions/__tests__/execution-recovery.service.test.ts
@@ -9,8 +9,6 @@ import { createExecution } from '@test-integration/db/executions';
 import * as testDb from '@test-integration/testDb';
 
 import { mock } from 'jest-mock-extended';
-import { OrchestrationService } from '@/services/orchestration.service';
-import config from '@/config';
 import { ExecutionRecoveryService } from '@/executions/execution-recovery.service';
 import { ExecutionRepository } from '@/databases/repositories/execution.repository';
 import { Push } from '@/push';
@@ -28,20 +26,17 @@ describe('ExecutionRecoveryService', () => {
 	const instanceSettings = new InstanceSettings();
 
 	let executionRecoveryService: ExecutionRecoveryService;
-	let orchestrationService: OrchestrationService;
 	let executionRepository: ExecutionRepository;
 
 	beforeAll(async () => {
 		await testDb.init();
 		executionRepository = Container.get(ExecutionRepository);
-		orchestrationService = Container.get(OrchestrationService);
 
 		executionRecoveryService = new ExecutionRecoveryService(
 			mock(),
 			instanceSettings,
 			push,
 			executionRepository,
-			orchestrationService,
 			mock(),
 		);
 	});
@@ -53,74 +48,12 @@ describe('ExecutionRecoveryService', () => {
 	afterEach(async () => {
 		jest.restoreAllMocks();
 		await testDb.truncate(['Execution', 'ExecutionData', 'Workflow']);
-		executionRecoveryService.shutdown();
 	});
 
 	afterAll(async () => {
 		await testDb.terminate();
 	});
 
-	describe('scheduleQueueRecovery', () => {
-		describe('queue mode', () => {
-			it('if leader, should schedule queue recovery', () => {
-				/**
-				 * Arrange
-				 */
-				config.set('executions.mode', 'queue');
-				const scheduleSpy = jest.spyOn(executionRecoveryService, 'scheduleQueueRecovery');
-
-				/**
-				 * Act
-				 */
-				executionRecoveryService.init();
-
-				/**
-				 * Assert
-				 */
-				expect(scheduleSpy).toHaveBeenCalled();
-			});
-
-			it('if follower, should do nothing', () => {
-				/**
-				 * Arrange
-				 */
-				config.set('executions.mode', 'queue');
-				instanceSettings.markAsFollower();
-				const scheduleSpy = jest.spyOn(executionRecoveryService, 'scheduleQueueRecovery');
-
-				/**
-				 * Act
-				 */
-				executionRecoveryService.init();
-
-				/**
-				 * Assert
-				 */
-				expect(scheduleSpy).not.toHaveBeenCalled();
-			});
-		});
-
-		describe('regular mode', () => {
-			it('should do nothing', () => {
-				/**
-				 * Arrange
-				 */
-				config.set('executions.mode', 'regular');
-				const scheduleSpy = jest.spyOn(executionRecoveryService, 'scheduleQueueRecovery');
-
-				/**
-				 * Act
-				 */
-				executionRecoveryService.init();
-
-				/**
-				 * Assert
-				 */
-				expect(scheduleSpy).not.toHaveBeenCalled();
-			});
-		});
-	});
-
 	describe('recoverFromLogs', () => {
 		describe('if follower', () => {
 			test('should do nothing', async () => {
diff --git a/packages/cli/src/executions/execution-recovery.service.ts b/packages/cli/src/executions/execution-recovery.service.ts
index d691df1b3ce36..8e29127737792 100644
--- a/packages/cli/src/executions/execution-recovery.service.ts
+++ b/packages/cli/src/executions/execution-recovery.service.ts
@@ -1,6 +1,6 @@
-import Container, { Service } from 'typedi';
+import { Service } from 'typedi';
 import { Push } from '@/push';
-import { jsonStringify, sleep } from 'n8n-workflow';
+import { sleep } from 'n8n-workflow';
 import { ExecutionRepository } from '@db/repositories/execution.repository';
 import { getWorkflowHooksMain } from '@/WorkflowExecuteAdditionalData'; // @TODO: Dependency cycle
 import type { DateTime } from 'luxon';
@@ -12,10 +12,6 @@ import { NodeCrashedError } from '@/errors/node-crashed.error';
 import { WorkflowCrashedError } from '@/errors/workflow-crashed.error';
 import { ARTIFICIAL_TASK_DATA } from '@/constants';
 import { Logger } from '@/Logger';
-import config from '@/config';
-import { OnShutdown } from '@/decorators/OnShutdown';
-import type { QueueRecoverySettings } from './execution.types';
-import { OrchestrationService } from '@/services/orchestration.service';
 import { EventService } from '@/events/event.service';
 
 /**
@@ -28,34 +24,9 @@ export class ExecutionRecoveryService {
 		private readonly instanceSettings: InstanceSettings,
 		private readonly push: Push,
 		private readonly executionRepository: ExecutionRepository,
-		private readonly orchestrationService: OrchestrationService,
 		private readonly eventService: EventService,
 	) {}
 
-	/**
-	 * @important Requires `OrchestrationService` to be initialized on queue mode.
-	 */
-	init() {
-		if (config.getEnv('executions.mode') === 'regular') return;
-
-		const { isLeader } = this.instanceSettings;
-		if (isLeader) this.scheduleQueueRecovery();
-
-		const { isMultiMainSetupEnabled } = this.orchestrationService;
-		if (isMultiMainSetupEnabled) {
-			this.orchestrationService.multiMainSetup
-				.on('leader-takeover', () => this.scheduleQueueRecovery())
-				.on('leader-stepdown', () => this.stopQueueRecovery());
-		}
-	}
-
-	private readonly queueRecoverySettings: QueueRecoverySettings = {
-		batchSize: config.getEnv('executions.queueRecovery.batchSize'),
-		waitMs: config.getEnv('executions.queueRecovery.interval') * 60 * 1000,
-	};
-
-	private isShuttingDown = false;
-
 	/**
 	 * Recover key properties of a truncated execution using event logs.
 	 */
@@ -82,89 +53,10 @@ export class ExecutionRecoveryService {
 		return amendedExecution;
 	}
 
-	/**
-	 * Schedule a cycle to mark dangling executions as crashed in queue mode.
-	 */
-	scheduleQueueRecovery(waitMs = this.queueRecoverySettings.waitMs) {
-		if (!this.shouldScheduleQueueRecovery()) return;
-
-		this.queueRecoverySettings.timeout = setTimeout(async () => {
-			try {
-				const nextWaitMs = await this.recoverFromQueue();
-				this.scheduleQueueRecovery(nextWaitMs);
-			} catch (error) {
-				const msg = this.toErrorMsg(error);
-
-				this.logger.error('[Recovery] Failed to recover dangling executions from queue', { msg });
-				this.logger.error('[Recovery] Retrying...');
-
-				this.scheduleQueueRecovery();
-			}
-		}, waitMs);
-
-		const wait = [this.queueRecoverySettings.waitMs / (60 * 1000), 'min'].join(' ');
-
-		this.logger.debug(`[Recovery] Scheduled queue recovery check for next ${wait}`);
-	}
-
-	stopQueueRecovery() {
-		clearTimeout(this.queueRecoverySettings.timeout);
-	}
-
-	@OnShutdown()
-	shutdown() {
-		this.isShuttingDown = true;
-		this.stopQueueRecovery();
-	}
-
 	// ----------------------------------
 	//             private
 	// ----------------------------------
 
-	/**
-	 * Mark in-progress executions as `crashed` if stored in DB as `new` or `running`
-	 * but absent from the queue. Return time until next recovery cycle.
-	 */
-	private async recoverFromQueue() {
-		const { waitMs, batchSize } = this.queueRecoverySettings;
-
-		const storedIds = await this.executionRepository.getInProgressExecutionIds(batchSize);
-
-		if (storedIds.length === 0) {
-			this.logger.debug('[Recovery] Completed queue recovery check, no dangling executions');
-			return waitMs;
-		}
-
-		const { ScalingService } = await import('@/scaling/scaling.service');
-
-		const runningJobs = await Container.get(ScalingService).findJobsByStatus(['active', 'waiting']);
-
-		const queuedIds = new Set(runningJobs.map((job) => job.data.executionId));
-
-		if (queuedIds.size === 0) {
-			this.logger.debug('[Recovery] Completed queue recovery check, no dangling executions');
-			return waitMs;
-		}
-
-		const danglingIds = storedIds.filter((id) => !queuedIds.has(id));
-
-		if (danglingIds.length === 0) {
-			this.logger.debug('[Recovery] Completed queue recovery check, no dangling executions');
-			return waitMs;
-		}
-
-		await this.executionRepository.markAsCrashed(danglingIds);
-
-		this.logger.info('[Recovery] Completed queue recovery check, recovered dangling executions', {
-			danglingIds,
-		});
-
-		// if this cycle used up the whole batch size, it is possible for there to be
-		// dangling executions outside this check, so speed up next cycle
-
-		return storedIds.length >= this.queueRecoverySettings.batchSize ? waitMs / 2 : waitMs;
-	}
-
 	/**
 	 * Amend `status`, `stoppedAt`, and (if possible) `data` of an execution using event logs.
 	 */
@@ -313,18 +205,4 @@ export class ExecutionRecoveryService {
 
 		await externalHooks.executeHookFunctions('workflowExecuteAfter', [run]);
 	}
-
-	private toErrorMsg(error: unknown) {
-		return error instanceof Error
-			? error.message
-			: jsonStringify(error, { replaceCircularRefs: true });
-	}
-
-	private shouldScheduleQueueRecovery() {
-		return (
-			config.getEnv('executions.mode') === 'queue' &&
-			this.instanceSettings.isLeader &&
-			!this.isShuttingDown
-		);
-	}
 }
diff --git a/packages/cli/src/executions/execution.types.ts b/packages/cli/src/executions/execution.types.ts
index fd5024adbd718..15c27261fc1a3 100644
--- a/packages/cli/src/executions/execution.types.ts
+++ b/packages/cli/src/executions/execution.types.ts
@@ -93,23 +93,6 @@ export namespace ExecutionSummaries {
 	export type ExecutionSummaryWithScopes = ExecutionSummary & { scopes: Scope[] };
 }
 
-export type QueueRecoverySettings = {
-	/**
-	 * ID of timeout for next scheduled recovery cycle.
-	 */
-	timeout?: NodeJS.Timeout;
-
-	/**
-	 * Number of in-progress executions to check per cycle.
-	 */
-	batchSize: number;
-
-	/**
-	 * Time (in milliseconds) to wait before the next cycle.
-	 */
-	waitMs: number;
-};
-
 export type StopResult = {
 	mode: WorkflowExecuteMode;
 	startedAt: Date;
diff --git a/packages/cli/src/scaling/__tests__/scaling.service.test.ts b/packages/cli/src/scaling/__tests__/scaling.service.test.ts
index 0603309e2039d..adbf5ebde2f0e 100644
--- a/packages/cli/src/scaling/__tests__/scaling.service.test.ts
+++ b/packages/cli/src/scaling/__tests__/scaling.service.test.ts
@@ -7,6 +7,9 @@ import type { Job, JobData, JobOptions, JobQueue } from '../types';
 import { ApplicationError } from 'n8n-workflow';
 import { mockInstance } from '@test/mocking';
 import { GlobalConfig } from '@n8n/config';
+import { InstanceSettings } from 'n8n-core';
+import type { OrchestrationService } from '@/services/orchestration.service';
+import Container from 'typedi';
 import type { JobProcessor } from '../job-processor';
 
 const queue = mock<JobQueue>({
@@ -34,9 +37,27 @@ describe('ScalingService', () => {
 		},
 	});
 
+	const instanceSettings = Container.get(InstanceSettings);
+	const orchestrationService = mock<OrchestrationService>({ isMultiMainSetupEnabled: false });
+	const jobProcessor = mock<JobProcessor>();
+	let scalingService: ScalingService;
+
 	beforeEach(() => {
 		jest.clearAllMocks();
 		config.set('generic.instanceType', 'main');
+		scalingService = new ScalingService(
+			mock(),
+			mock(),
+			jobProcessor,
+			globalConfig,
+			mock(),
+			instanceSettings,
+			orchestrationService,
+		);
+	});
+
+	afterEach(() => {
+		scalingService.stopQueueRecovery();
 	});
 
 	describe('setupQueue', () => {
@@ -44,7 +65,6 @@ describe('ScalingService', () => {
 			/**
 			 * Arrange
 			 */
-			const scalingService = new ScalingService(mock(), mock(), mock(), globalConfig);
 			const { prefix, settings } = globalConfig.queue.bull;
 			const Bull = jest.mocked(BullModule.default);
 
@@ -72,7 +92,15 @@ describe('ScalingService', () => {
 			 * Arrange
 			 */
 			config.set('generic.instanceType', 'worker');
-			const scalingService = new ScalingService(mock(), mock(), mock(), globalConfig);
+			const scalingService = new ScalingService(
+				mock(),
+				mock(),
+				mock(),
+				globalConfig,
+				mock(),
+				instanceSettings,
+				orchestrationService,
+			);
 			await scalingService.setupQueue();
 			const concurrency = 5;
 
@@ -91,7 +119,6 @@ describe('ScalingService', () => {
 			/**
 			 * Arrange
 			 */
-			const scalingService = new ScalingService(mock(), mock(), mock(), globalConfig);
 			await scalingService.setupQueue();
 
 			/**
@@ -102,14 +129,13 @@ describe('ScalingService', () => {
 	});
 
 	describe('stop', () => {
-		it('should pause the queue and check for running jobs', async () => {
+		it('should pause the queue, check for running jobs, and stop queue recovery', async () => {
 			/**
 			 * Arrange
 			 */
-			const jobProcessor = mock<JobProcessor>();
-			const scalingService = new ScalingService(mock(), mock(), jobProcessor, globalConfig);
 			await scalingService.setupQueue();
 			jobProcessor.getRunningJobIds.mockReturnValue([]);
+			const stopQueueRecoverySpy = jest.spyOn(scalingService, 'stopQueueRecovery');
 			const getRunningJobsCountSpy = jest.spyOn(scalingService, 'getRunningJobsCount');
 
 			/**
@@ -121,6 +147,7 @@ describe('ScalingService', () => {
 			 * Assert
 			 */
 			expect(queue.pause).toHaveBeenCalledWith(true, true);
+			expect(stopQueueRecoverySpy).toHaveBeenCalled();
 			expect(getRunningJobsCountSpy).toHaveBeenCalled();
 		});
 	});
@@ -130,7 +157,6 @@ describe('ScalingService', () => {
 			/**
 			 * Arrange
 			 */
-			const scalingService = new ScalingService(mock(), mock(), mock(), globalConfig);
 			await scalingService.setupQueue();
 
 			/**
@@ -150,7 +176,6 @@ describe('ScalingService', () => {
 			/**
 			 * Arrange
 			 */
-			const scalingService = new ScalingService(mock(), mock(), mock(), globalConfig);
 			await scalingService.setupQueue();
 			queue.add.mockResolvedValue(mock<Job>({ id: '456' }));
 
@@ -173,7 +198,6 @@ describe('ScalingService', () => {
 			/**
 			 * Arrange
 			 */
-			const scalingService = new ScalingService(mock(), mock(), mock(), globalConfig);
 			await scalingService.setupQueue();
 			const jobId = '123';
 			queue.getJob.mockResolvedValue(mock<Job>({ id: jobId }));
@@ -196,7 +220,6 @@ describe('ScalingService', () => {
 			/**
 			 * Arrange
 			 */
-			const scalingService = new ScalingService(mock(), mock(), mock(), globalConfig);
 			await scalingService.setupQueue();
 			queue.getJobs.mockResolvedValue([mock<Job>({ id: '123' })]);
 
@@ -217,7 +240,6 @@ describe('ScalingService', () => {
 			/**
 			 * Arrange
 			 */
-			const scalingService = new ScalingService(mock(), mock(), mock(), globalConfig);
 			await scalingService.setupQueue();
 			// @ts-expect-error - Untyped but possible Redis response
 			queue.getJobs.mockResolvedValue([mock<Job>(), null]);
@@ -239,7 +261,6 @@ describe('ScalingService', () => {
 			/**
 			 * Arrange
 			 */
-			const scalingService = new ScalingService(mock(), mock(), mock(), globalConfig);
 			await scalingService.setupQueue();
 			const job = mock<Job>({ isActive: jest.fn().mockResolvedValue(true) });
 
@@ -259,7 +280,6 @@ describe('ScalingService', () => {
 			/**
 			 * Arrange
 			 */
-			const scalingService = new ScalingService(mock(), mock(), mock(), globalConfig);
 			await scalingService.setupQueue();
 			const job = mock<Job>({ isActive: jest.fn().mockResolvedValue(false) });
 
@@ -279,7 +299,6 @@ describe('ScalingService', () => {
 			/**
 			 * Arrange
 			 */
-			const scalingService = new ScalingService(mock(), mock(), mock(), globalConfig);
 			await scalingService.setupQueue();
 			const job = mock<Job>({
 				isActive: jest.fn().mockImplementation(() => {
@@ -298,4 +317,42 @@ describe('ScalingService', () => {
 			expect(result).toBe(false);
 		});
 	});
+
+	describe('scheduleQueueRecovery', () => {
+		it('if leader, should schedule queue recovery', async () => {
+			/**
+			 * Arrange
+			 */
+			const scheduleSpy = jest.spyOn(scalingService, 'scheduleQueueRecovery');
+			instanceSettings.markAsLeader();
+
+			/**
+			 * Act
+			 */
+			await scalingService.setupQueue();
+
+			/**
+			 * Assert
+			 */
+			expect(scheduleSpy).toHaveBeenCalled();
+		});
+
+		it('if follower, should not schedule queue recovery', async () => {
+			/**
+			 * Arrange
+			 */
+			const scheduleSpy = jest.spyOn(scalingService, 'scheduleQueueRecovery');
+			instanceSettings.markAsFollower();
+
+			/**
+			 * Act
+			 */
+			await scalingService.setupQueue();
+
+			/**
+			 * Assert
+			 */
+			expect(scheduleSpy).not.toHaveBeenCalled();
+		});
+	});
 });
diff --git a/packages/cli/src/scaling/scaling.service.ts b/packages/cli/src/scaling/scaling.service.ts
index a30e797ccba48..1a8bc9e173798 100644
--- a/packages/cli/src/scaling/scaling.service.ts
+++ b/packages/cli/src/scaling/scaling.service.ts
@@ -1,16 +1,28 @@
 import Container, { Service } from 'typedi';
-import { ApplicationError, BINARY_ENCODING, sleep } from 'n8n-workflow';
+import { ApplicationError, BINARY_ENCODING, sleep, jsonStringify } from 'n8n-workflow';
 import { ActiveExecutions } from '@/ActiveExecutions';
 import config from '@/config';
 import { Logger } from '@/Logger';
 import { MaxStalledCountError } from '@/errors/max-stalled-count.error';
-import { HIGHEST_SHUTDOWN_PRIORITY } from '@/constants';
+import { HIGHEST_SHUTDOWN_PRIORITY, Time } from '@/constants';
 import { OnShutdown } from '@/decorators/OnShutdown';
 import { JOB_TYPE_NAME, QUEUE_NAME } from './constants';
 import { JobProcessor } from './job-processor';
-import type { JobQueue, Job, JobData, JobOptions, JobMessage, JobStatus, JobId } from './types';
+import type {
+	JobQueue,
+	Job,
+	JobData,
+	JobOptions,
+	JobMessage,
+	JobStatus,
+	JobId,
+	QueueRecoveryContext,
+} from './types';
 import type { IExecuteResponsePromiseData } from 'n8n-workflow';
 import { GlobalConfig } from '@n8n/config';
+import { ExecutionRepository } from '@/databases/repositories/execution.repository';
+import { InstanceSettings } from 'n8n-core';
+import { OrchestrationService } from '@/services/orchestration.service';
 
 @Service()
 export class ScalingService {
@@ -23,6 +35,9 @@ export class ScalingService {
 		private readonly activeExecutions: ActiveExecutions,
 		private readonly jobProcessor: JobProcessor,
 		private readonly globalConfig: GlobalConfig,
+		private readonly executionRepository: ExecutionRepository,
+		private readonly instanceSettings: InstanceSettings,
+		private readonly orchestrationService: OrchestrationService,
 	) {}
 
 	// #region Lifecycle
@@ -43,6 +58,14 @@ export class ScalingService {
 
 		this.registerListeners();
 
+		if (this.instanceSettings.isLeader) this.scheduleQueueRecovery();
+
+		if (this.orchestrationService.isMultiMainSetupEnabled) {
+			this.orchestrationService.multiMainSetup
+				.on('leader-takeover', () => this.scheduleQueueRecovery())
+				.on('leader-stepdown', () => this.stopQueueRecovery());
+		}
+
 		this.logger.debug('[ScalingService] Queue setup completed');
 	}
 
@@ -64,6 +87,10 @@ export class ScalingService {
 
 		this.logger.debug('[ScalingService] Queue paused');
 
+		this.stopQueueRecovery();
+
+		this.logger.debug('[ScalingService] Queue recovery stopped');
+
 		let count = 0;
 
 		while (this.getRunningJobsCount() !== 0) {
@@ -230,4 +257,86 @@ export class ScalingService {
 
 		throw new ApplicationError('This method must be called on a `worker` instance');
 	}
+
+	// #region Queue recovery
+
+	private readonly queueRecoveryContext: QueueRecoveryContext = {
+		batchSize: config.getEnv('executions.queueRecovery.batchSize'),
+		waitMs: config.getEnv('executions.queueRecovery.interval') * 60 * 1000,
+	};
+
+	scheduleQueueRecovery(waitMs = this.queueRecoveryContext.waitMs) {
+		this.queueRecoveryContext.timeout = setTimeout(async () => {
+			try {
+				const nextWaitMs = await this.recoverFromQueue();
+				this.scheduleQueueRecovery(nextWaitMs);
+			} catch (error) {
+				this.logger.error('[ScalingService] Failed to recover dangling executions from queue', {
+					msg: this.toErrorMsg(error),
+				});
+				this.logger.error('[ScalingService] Retrying...');
+
+				this.scheduleQueueRecovery();
+			}
+		}, waitMs);
+
+		const wait = [this.queueRecoveryContext.waitMs / Time.minutes.toMilliseconds, 'min'].join(' ');
+
+		this.logger.debug(`[ScalingService] Scheduled queue recovery check for next ${wait}`);
+	}
+
+	stopQueueRecovery() {
+		clearTimeout(this.queueRecoveryContext.timeout);
+	}
+
+	/**
+	 * Mark in-progress executions as `crashed` if stored in DB as `new` or `running`
+	 * but absent from the queue. Return time until next recovery cycle.
+	 */
+	private async recoverFromQueue() {
+		const { waitMs, batchSize } = this.queueRecoveryContext;
+
+		const storedIds = await this.executionRepository.getInProgressExecutionIds(batchSize);
+
+		if (storedIds.length === 0) {
+			this.logger.debug('[ScalingService] Completed queue recovery check, no dangling executions');
+			return waitMs;
+		}
+
+		const runningJobs = await this.findJobsByStatus(['active', 'waiting']);
+
+		const queuedIds = new Set(runningJobs.map((job) => job.data.executionId));
+
+		if (queuedIds.size === 0) {
+			this.logger.debug('[ScalingService] Completed queue recovery check, no dangling executions');
+			return waitMs;
+		}
+
+		const danglingIds = storedIds.filter((id) => !queuedIds.has(id));
+
+		if (danglingIds.length === 0) {
+			this.logger.debug('[ScalingService] Completed queue recovery check, no dangling executions');
+			return waitMs;
+		}
+
+		await this.executionRepository.markAsCrashed(danglingIds);
+
+		this.logger.info(
+			'[ScalingService] Completed queue recovery check, recovered dangling executions',
+			{ danglingIds },
+		);
+
+		// if this cycle used up the whole batch size, it is possible for there to be
+		// dangling executions outside this check, so speed up next cycle
+
+		return storedIds.length >= this.queueRecoveryContext.batchSize ? waitMs / 2 : waitMs;
+	}
+
+	private toErrorMsg(error: unknown) {
+		return error instanceof Error
+			? error.message
+			: jsonStringify(error, { replaceCircularRefs: true });
+	}
+
+	// #endregion
 }
diff --git a/packages/cli/src/scaling/types.ts b/packages/cli/src/scaling/types.ts
index 55d49b8c48487..b35d1d109d7c4 100644
--- a/packages/cli/src/scaling/types.ts
+++ b/packages/cli/src/scaling/types.ts
@@ -53,3 +53,14 @@ export type RunningJob = {
 };
 
 export type RunningJobSummary = Omit<RunningJob, 'run'>;
+
+export type QueueRecoveryContext = {
+	/** ID of timeout for next scheduled recovery cycle. */
+	timeout?: NodeJS.Timeout;
+
+	/** Number of in-progress executions to check per cycle. */
+	batchSize: number;
+
+	/** Time (in milliseconds) to wait until the next cycle. */
+	waitMs: number;
+};

From 117e2d968fcc535f32c583ac8f2dc8a84e8cd6bd Mon Sep 17 00:00:00 2001
From: Csaba Tuncsik <csaba@n8n.io>
Date: Tue, 13 Aug 2024 15:45:28 +0200
Subject: [PATCH 147/168] fix(editor): Connect up new project viewer role to
 the FE (#9913)

---
 cypress/composables/projects.ts               |  21 +-
 cypress/e2e/12-canvas-actions.cy.ts           |  11 +-
 cypress/e2e/17-sharing.cy.ts                  |  39 +-
 cypress/e2e/39-projects.cy.ts                 | 110 ++++-
 packages/@n8n/permissions/src/constants.ts    |  23 +
 packages/@n8n/permissions/src/index.ts        |   1 +
 packages/@n8n/permissions/src/types.ts        |  26 +-
 .../src/components/N8nActionBox/ActionBox.vue |  22 +-
 .../__snapshots__/ActionBox.spec.ts.snap      |   4 +-
 .../N8nActionDropdown/ActionDropdown.vue      |   3 +
 packages/design-system/src/css/dropdown.scss  |   8 +
 .../src/components/CredentialCard.vue         |   4 +-
 .../CredentialEdit/CredentialConfig.vue       |   7 +-
 .../CredentialEdit/CredentialEdit.vue         |  17 +-
 .../CredentialEdit/CredentialSharing.ee.vue   |   5 +-
 .../components/MainHeader/WorkflowDetails.vue |  40 +-
 .../editor-ui/src/components/MainSidebar.vue  |   9 +-
 .../src/components/Projects/ProjectTabs.vue   |   7 +-
 .../editor-ui/src/components/VariablesRow.vue |   6 +-
 .../src/components/WorkflowActivator.vue      |  24 +-
 .../editor-ui/src/components/WorkflowCard.vue |   7 +-
 .../{__tests__ => }/WorkflowSettings.spec.ts  |   7 +
 .../src/components/WorkflowSettings.vue       |  54 ++-
 .../src/components/WorkflowShareModal.ee.vue  |   8 +-
 .../global/GlobalExecutionsList.test.ts       |   7 +
 .../global/GlobalExecutionsList.vue           |  10 +
 .../global/GlobalExecutionsListItem.test.ts   |  16 +-
 .../global/GlobalExecutionsListItem.vue       |   6 +
 .../workflow/WorkflowExecutionsCard.test.ts   | 116 +++--
 .../workflow/WorkflowExecutionsCard.vue       | 175 ++++----
 .../WorkflowExecutionsInfoAccordion.vue       | 407 +++++++++---------
 .../WorkflowExecutionsLandingPage.vue         |  99 ++---
 .../workflow/WorkflowExecutionsList.vue       |  63 +--
 .../WorkflowExecutionsPreview.test.ts         |  18 +-
 .../workflow/WorkflowExecutionsPreview.vue    | 323 +++++++-------
 .../workflow/WorkflowExecutionsSidebar.vue    | 348 ++++++++-------
 .../layouts/ResourcesListLayout.vue           |   7 +-
 .../__tests__/useContextMenu.test.ts          |   2 +
 .../src/composables/useContextMenu.ts         |  10 +-
 packages/editor-ui/src/permissions.spec.ts    | 222 +++++-----
 packages/editor-ui/src/permissions.ts         |  84 ++--
 .../src/plugins/i18n/locales/en.json          |   5 +
 packages/editor-ui/src/stores/canvas.store.ts |  14 +-
 .../editor-ui/src/stores/roles.store.test.ts  |   1 +
 packages/editor-ui/src/stores/roles.store.ts  |   6 +-
 packages/editor-ui/src/utils/typeGuards.ts    |   5 +
 .../editor-ui/src/views/CredentialsView.vue   |  10 +
 packages/editor-ui/src/views/NodeView.vue     | 134 ++++--
 .../editor-ui/src/views/ProjectSettings.vue   |   1 +
 .../editor-ui/src/views/VariablesView.vue     |   9 +-
 .../src/views/WorkflowExecutionsView.vue      |  12 +-
 .../editor-ui/src/views/WorkflowHistory.vue   |   8 +-
 .../editor-ui/src/views/WorkflowsView.vue     |  32 +-
 packages/workflow/package.json                |   1 +
 packages/workflow/src/Interfaces.ts           |   2 +
 pnpm-lock.yaml                                |   3 +
 56 files changed, 1473 insertions(+), 1146 deletions(-)
 create mode 100644 packages/@n8n/permissions/src/constants.ts
 rename packages/editor-ui/src/components/{__tests__ => }/WorkflowSettings.spec.ts (95%)

diff --git a/cypress/composables/projects.ts b/cypress/composables/projects.ts
index ed280b462f328..84379088d1a39 100644
--- a/cypress/composables/projects.ts
+++ b/cypress/composables/projects.ts
@@ -1,4 +1,5 @@
 import { CredentialsModal, WorkflowPage } from '../pages';
+import { getVisibleSelect } from '../utils';
 
 const workflowPage = new WorkflowPage();
 const credentialsModal = new CredentialsModal();
@@ -11,18 +12,25 @@ export const getProjectTabs = () => cy.getByTestId('project-tabs').find('a');
 export const getProjectTabWorkflows = () => getProjectTabs().filter('a[href$="/workflows"]');
 export const getProjectTabCredentials = () => getProjectTabs().filter('a[href$="/credentials"]');
 export const getProjectTabSettings = () => getProjectTabs().filter('a[href$="/settings"]');
-export const getProjectSettingsNameInput = () => cy.getByTestId('project-settings-name-input');
+export const getProjectSettingsNameInput = () =>
+	cy.getByTestId('project-settings-name-input').find('input');
 export const getProjectSettingsSaveButton = () => cy.getByTestId('project-settings-save-button');
 export const getProjectSettingsCancelButton = () =>
 	cy.getByTestId('project-settings-cancel-button');
 export const getProjectSettingsDeleteButton = () =>
 	cy.getByTestId('project-settings-delete-button');
 export const getProjectMembersSelect = () => cy.getByTestId('project-members-select');
-export const addProjectMember = (email: string) => {
+export const addProjectMember = (email: string, role?: string) => {
 	getProjectMembersSelect().click();
 	getProjectMembersSelect().get('.el-select-dropdown__item').contains(email.toLowerCase()).click();
+
+	if (role) {
+		cy.getByTestId(`user-list-item-${email}`)
+			.find('[data-test-id="projects-settings-user-role-select"]')
+			.click();
+		getVisibleSelect().find('li').contains(role).click();
+	}
 };
-export const getProjectNameInput = () => cy.get('#projectName').find('input');
 export const getResourceMoveModal = () => cy.getByTestId('project-move-resource-modal');
 export const getResourceMoveConfirmModal = () =>
 	cy.getByTestId('project-move-resource-confirm-modal');
@@ -31,12 +39,7 @@ export const getProjectMoveSelect = () => cy.getByTestId('project-move-resource-
 export function createProject(name: string) {
 	getAddProjectButton().click();
 
-	getProjectNameInput()
-		.should('be.visible')
-		.should('be.focused')
-		.should('have.value', 'My project')
-		.clear()
-		.type(name);
+	getProjectSettingsNameInput().should('be.visible').clear().type(name);
 	getProjectSettingsSaveButton().click();
 }
 
diff --git a/cypress/e2e/12-canvas-actions.cy.ts b/cypress/e2e/12-canvas-actions.cy.ts
index 9b05cb84d4130..53dad1cc89669 100644
--- a/cypress/e2e/12-canvas-actions.cy.ts
+++ b/cypress/e2e/12-canvas-actions.cy.ts
@@ -145,7 +145,16 @@ describe('Canvas Actions', () => {
 		});
 	});
 
-	it('should delete connections by pressing the delete button', () => {
+	it('should delete node by pressing keyboard backspace', () => {
+		WorkflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
+		WorkflowPage.getters.canvasNodeByName(MANUAL_TRIGGER_NODE_DISPLAY_NAME).click();
+		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
+		WorkflowPage.getters.canvasNodeByName(CODE_NODE_NAME).click();
+		cy.get('body').type('{backspace}');
+		WorkflowPage.getters.nodeConnections().should('have.length', 0);
+	});
+
+	it('should delete connections by clicking on the delete button', () => {
 		WorkflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
 		WorkflowPage.getters.canvasNodeByName(MANUAL_TRIGGER_NODE_DISPLAY_NAME).click();
 		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
diff --git a/cypress/e2e/17-sharing.cy.ts b/cypress/e2e/17-sharing.cy.ts
index ab1ee3955b1ac..64769ae1935b8 100644
--- a/cypress/e2e/17-sharing.cy.ts
+++ b/cypress/e2e/17-sharing.cy.ts
@@ -264,6 +264,7 @@ describe('Sharing', { disableAutoLogin: true }, () => {
 describe('Credential Usage in Cross Shared Workflows', () => {
 	beforeEach(() => {
 		cy.resetDatabase();
+		cy.enableFeature('sharing');
 		cy.enableFeature('advancedPermissions');
 		cy.enableFeature('projectRole:admin');
 		cy.enableFeature('projectRole:editor');
@@ -274,11 +275,6 @@ describe('Credential Usage in Cross Shared Workflows', () => {
 	});
 
 	it('should only show credentials from the same team project', () => {
-		cy.enableFeature('advancedPermissions');
-		cy.enableFeature('projectRole:admin');
-		cy.enableFeature('projectRole:editor');
-		cy.changeQuota('maxTeamProjects', -1);
-
 		// Create a notion credential in the home project
 		credentialsPage.getters.emptyListCreateCredentialButton().click();
 		credentialsModal.actions.createNewCredential('Notion API');
@@ -305,10 +301,36 @@ describe('Credential Usage in Cross Shared Workflows', () => {
 		getVisibleSelect().find('li').should('have.length', 2);
 	});
 
+	it('should only show credentials in their personal project for members', () => {
+		// Create a notion credential as the owner
+		credentialsPage.getters.emptyListCreateCredentialButton().click();
+		credentialsModal.actions.createNewCredential('Notion API');
+
+		// Create another notion credential as the owner, but share it with member
+		// 0
+		credentialsPage.getters.createCredentialButton().click();
+		credentialsModal.actions.createNewCredential('Notion API', false);
+		credentialsModal.actions.changeTab('Sharing');
+		credentialsModal.actions.addUser(INSTANCE_MEMBERS[0].email);
+		credentialsModal.actions.saveSharing();
+
+		// As the member, create a new notion credential and a workflow
+		cy.signinAsMember();
+		cy.visit(credentialsPage.url);
+		credentialsPage.getters.createCredentialButton().click();
+		credentialsModal.actions.createNewCredential('Notion API');
+		cy.visit(workflowsPage.url);
+		workflowsPage.actions.createWorkflowFromCard();
+		workflowPage.actions.addNodeToCanvas(NOTION_NODE_NAME, true, true);
+
+		// Only the own credential the shared one (+ the 'Create new' option)
+		// should be in the dropdown
+		workflowPage.getters.nodeCredentialsSelect().click();
+		getVisibleSelect().find('li').should('have.length', 3);
+	});
+
 	it('should only show credentials in their personal project for members if the workflow was shared with them', () => {
 		const workflowName = 'Test workflow';
-		cy.enableFeature('sharing');
-		cy.reload();
 
 		// Create a notion credential as the owner and a workflow that is shared
 		// with member 0
@@ -339,7 +361,6 @@ describe('Credential Usage in Cross Shared Workflows', () => {
 
 	it("should show all credentials from all personal projects the workflow's been shared into for the global owner", () => {
 		const workflowName = 'Test workflow';
-		cy.enableFeature('sharing');
 
 		// As member 1, create a new notion credential. This should not show up.
 		cy.signinAsMember(1);
@@ -384,8 +405,6 @@ describe('Credential Usage in Cross Shared Workflows', () => {
 	});
 
 	it('should show all personal credentials if the global owner owns the workflow', () => {
-		cy.enableFeature('sharing');
-
 		// As member 0, create a new notion credential.
 		cy.signinAsMember();
 		cy.visit(credentialsPage.url);
diff --git a/cypress/e2e/39-projects.cy.ts b/cypress/e2e/39-projects.cy.ts
index cbf7324e4b6b3..e2bf63df7dc46 100644
--- a/cypress/e2e/39-projects.cy.ts
+++ b/cypress/e2e/39-projects.cy.ts
@@ -1,9 +1,4 @@
-import {
-	INSTANCE_MEMBERS,
-	INSTANCE_OWNER,
-	MANUAL_TRIGGER_NODE_NAME,
-	NOTION_NODE_NAME,
-} from '../constants';
+import { INSTANCE_MEMBERS, MANUAL_TRIGGER_NODE_NAME, NOTION_NODE_NAME } from '../constants';
 import {
 	WorkflowsPage,
 	WorkflowPage,
@@ -11,9 +6,10 @@ import {
 	CredentialsPage,
 	WorkflowExecutionsTab,
 	NDV,
+	MainSidebar,
 } from '../pages';
 import * as projects from '../composables/projects';
-import { getVisibleSelect } from '../utils';
+import { getVisibleDropdown, getVisibleModalOverlay, getVisibleSelect } from '../utils';
 
 const workflowsPage = new WorkflowsPage();
 const workflowPage = new WorkflowPage();
@@ -21,6 +17,7 @@ const credentialsPage = new CredentialsPage();
 const credentialsModal = new CredentialsModal();
 const executionsTab = new WorkflowExecutionsTab();
 const ndv = new NDV();
+const mainSidebar = new MainSidebar();
 
 describe('Projects', { disableAutoLogin: true }, () => {
 	before(() => {
@@ -241,6 +238,26 @@ describe('Projects', { disableAutoLogin: true }, () => {
 		projects.getMenuItems().should('not.exist');
 	});
 
+	it('should not show viewer role if not licensed', () => {
+		cy.signinAsOwner();
+		cy.visit(workflowsPage.url);
+
+		projects.getMenuItems().first().click();
+		projects.getProjectTabSettings().click();
+
+		cy.get(
+			`[data-test-id="user-list-item-${INSTANCE_MEMBERS[0].email}"] [data-test-id="projects-settings-user-role-select"]`,
+		).click();
+
+		cy.get('.el-select-dropdown__item.is-disabled')
+			.should('contain.text', 'Viewer')
+			.get('span:contains("Upgrade")')
+			.filter(':visible')
+			.click();
+
+		getVisibleModalOverlay().should('contain.text', 'Upgrade to unlock additional roles');
+	});
+
 	describe('when starting from scratch', () => {
 		beforeEach(() => {
 			cy.resetDatabase();
@@ -257,7 +274,7 @@ describe('Projects', { disableAutoLogin: true }, () => {
 
 			// Create a project and add a credential to it
 			cy.intercept('POST', '/rest/projects').as('projectCreate');
-			projects.getAddProjectButton().should('contain', 'Add project').should('be.visible').click();
+			projects.getAddProjectButton().click();
 			cy.wait('@projectCreate');
 			projects.getMenuItems().should('have.length', 1);
 			projects.getMenuItems().first().click();
@@ -418,7 +435,7 @@ describe('Projects', { disableAutoLogin: true }, () => {
 		});
 
 		it('should move resources between projects', () => {
-			cy.signin(INSTANCE_OWNER);
+			cy.signinAsOwner();
 			cy.visit(workflowsPage.url);
 
 			// Create a workflow and a credential in the Home project
@@ -563,5 +580,80 @@ describe('Projects', { disableAutoLogin: true }, () => {
 			projects.getProjectTabCredentials().click();
 			credentialsPage.getters.credentialCards().should('have.length', 2);
 		});
+
+		it('should handle viewer role', () => {
+			cy.enableFeature('projectRole:viewer');
+			cy.signinAsOwner();
+			cy.visit(workflowsPage.url);
+
+			projects.createProject('Development');
+			projects.addProjectMember(INSTANCE_MEMBERS[0].email, 'Viewer');
+			projects.getProjectSettingsSaveButton().click();
+
+			projects.getProjectTabWorkflows().click();
+			workflowsPage.getters.newWorkflowButtonCard().click();
+			projects.createWorkflow('Test_workflow_4_executions_view.json', 'WF with random error');
+			executionsTab.actions.createManualExecutions(2);
+			executionsTab.actions.toggleNodeEnabled('Error');
+			executionsTab.actions.createManualExecutions(2);
+			workflowPage.actions.saveWorkflowUsingKeyboardShortcut();
+
+			projects.getMenuItems().first().click();
+			projects.getProjectTabCredentials().click();
+			credentialsPage.getters.emptyListCreateCredentialButton().click();
+			projects.createCredential('Notion API');
+
+			mainSidebar.actions.openUserMenu();
+			cy.getByTestId('user-menu-item-logout').click();
+
+			cy.get('input[name="email"]').type(INSTANCE_MEMBERS[0].email);
+			cy.get('input[name="password"]').type(INSTANCE_MEMBERS[0].password);
+			cy.getByTestId('form-submit-button').click();
+
+			mainSidebar.getters.executions().click();
+			cy.getByTestId('global-execution-list-item').first().find('td:last button').click();
+			getVisibleDropdown()
+				.find('li')
+				.filter(':contains("Retry")')
+				.should('have.class', 'is-disabled');
+			getVisibleDropdown()
+				.find('li')
+				.filter(':contains("Delete")')
+				.should('have.class', 'is-disabled');
+
+			projects.getMenuItems().first().click();
+			cy.getByTestId('workflow-card-name').should('be.visible').first().click();
+			workflowPage.getters.nodeViewRoot().should('be.visible');
+			workflowPage.getters.executeWorkflowButton().should('not.exist');
+			workflowPage.getters.nodeCreatorPlusButton().should('not.exist');
+			workflowPage.getters.canvasNodes().should('have.length', 3).last().click();
+			cy.get('body').type('{backspace}');
+			workflowPage.getters.canvasNodes().should('have.length', 3).last().rightclick();
+			getVisibleDropdown()
+				.find('li')
+				.should('be.visible')
+				.filter(
+					':contains("Open"), :contains("Copy"), :contains("Select all"), :contains("Clear selection")',
+				)
+				.should('not.have.class', 'is-disabled');
+			cy.get('body').type('{esc}');
+
+			executionsTab.actions.switchToExecutionsTab();
+			cy.getByTestId('retry-execution-button')
+				.should('be.visible')
+				.find('.is-disabled')
+				.should('exist');
+			cy.get('button:contains("Debug")').should('be.disabled');
+			cy.get('button[title="Retry execution"]').should('be.disabled');
+			cy.get('button[title="Delete this execution"]').should('be.disabled');
+
+			projects.getMenuItems().first().click();
+			projects.getProjectTabCredentials().click();
+			credentialsPage.getters.credentialCards().filter(':contains("Notion")').click();
+			cy.getByTestId('node-credentials-config-container')
+				.should('be.visible')
+				.find('input')
+				.should('not.have.length');
+		});
 	});
 });
diff --git a/packages/@n8n/permissions/src/constants.ts b/packages/@n8n/permissions/src/constants.ts
new file mode 100644
index 0000000000000..de027891c59e9
--- /dev/null
+++ b/packages/@n8n/permissions/src/constants.ts
@@ -0,0 +1,23 @@
+export const DEFAULT_OPERATIONS = ['create', 'read', 'update', 'delete', 'list'] as const;
+export const RESOURCES = {
+	auditLogs: ['manage'] as const,
+	banner: ['dismiss'] as const,
+	communityPackage: ['install', 'uninstall', 'update', 'list', 'manage'] as const,
+	credential: ['share', 'move', ...DEFAULT_OPERATIONS] as const,
+	externalSecretsProvider: ['sync', ...DEFAULT_OPERATIONS] as const,
+	externalSecret: ['list', 'use'] as const,
+	eventBusDestination: ['test', ...DEFAULT_OPERATIONS] as const,
+	ldap: ['sync', 'manage'] as const,
+	license: ['manage'] as const,
+	logStreaming: ['manage'] as const,
+	orchestration: ['read', 'list'] as const,
+	project: [...DEFAULT_OPERATIONS] as const,
+	saml: ['manage'] as const,
+	securityAudit: ['generate'] as const,
+	sourceControl: ['pull', 'push', 'manage'] as const,
+	tag: [...DEFAULT_OPERATIONS] as const,
+	user: ['resetPassword', 'changeRole', ...DEFAULT_OPERATIONS] as const,
+	variable: [...DEFAULT_OPERATIONS] as const,
+	workersView: ['manage'] as const,
+	workflow: ['share', 'execute', 'move', ...DEFAULT_OPERATIONS] as const,
+} as const;
diff --git a/packages/@n8n/permissions/src/index.ts b/packages/@n8n/permissions/src/index.ts
index 0d3e510abe67a..f04f2e4ef68ac 100644
--- a/packages/@n8n/permissions/src/index.ts
+++ b/packages/@n8n/permissions/src/index.ts
@@ -1,3 +1,4 @@
 export type * from './types';
+export * from './constants';
 export * from './hasScope';
 export * from './combineScopes';
diff --git a/packages/@n8n/permissions/src/types.ts b/packages/@n8n/permissions/src/types.ts
index 2720272e6fd75..bc714734d35aa 100644
--- a/packages/@n8n/permissions/src/types.ts
+++ b/packages/@n8n/permissions/src/types.ts
@@ -1,25 +1,7 @@
-export type DefaultOperations = 'create' | 'read' | 'update' | 'delete' | 'list';
-export type Resource =
-	| 'auditLogs'
-	| 'banner'
-	| 'communityPackage'
-	| 'credential'
-	| 'externalSecretsProvider'
-	| 'externalSecret'
-	| 'eventBusDestination'
-	| 'ldap'
-	| 'license'
-	| 'logStreaming'
-	| 'orchestration'
-	| 'project'
-	| 'saml'
-	| 'securityAudit'
-	| 'sourceControl'
-	| 'tag'
-	| 'user'
-	| 'variable'
-	| 'workersView'
-	| 'workflow';
+import type { DEFAULT_OPERATIONS, RESOURCES } from './constants';
+
+export type DefaultOperations = (typeof DEFAULT_OPERATIONS)[number];
+export type Resource = keyof typeof RESOURCES;
 
 export type ResourceScope<
 	R extends Resource,
diff --git a/packages/design-system/src/components/N8nActionBox/ActionBox.vue b/packages/design-system/src/components/N8nActionBox/ActionBox.vue
index 94f2e1376e702..575895ab1585b 100644
--- a/packages/design-system/src/components/N8nActionBox/ActionBox.vue
+++ b/packages/design-system/src/components/N8nActionBox/ActionBox.vue
@@ -15,13 +15,19 @@
 				</slot>
 			</N8nText>
 		</div>
-		<N8nButton
-			v-if="buttonText"
-			:label="buttonText"
-			:type="buttonType"
-			size="large"
-			@click="$emit('click:button', $event)"
-		/>
+		<N8nTooltip :disabled="!buttonDisabled">
+			<template #content>
+				<slot name="disabledButtonTooltip"></slot>
+			</template>
+			<N8nButton
+				v-if="buttonText"
+				:label="buttonText"
+				:type="buttonType"
+				:disabled="buttonDisabled"
+				size="large"
+				@click="$emit('click:button', $event)"
+			/>
+		</N8nTooltip>
 		<N8nCallout
 			v-if="calloutText"
 			:theme="calloutTheme"
@@ -41,12 +47,14 @@ import N8nHeading from '../N8nHeading';
 import N8nText from '../N8nText';
 import N8nCallout, { type CalloutTheme } from '../N8nCallout';
 import type { ButtonType } from 'n8n-design-system/types/button';
+import N8nTooltip from 'n8n-design-system/components/N8nTooltip/Tooltip.vue';
 
 interface ActionBoxProps {
 	emoji: string;
 	heading: string;
 	buttonText: string;
 	buttonType: ButtonType;
+	buttonDisabled?: boolean;
 	description: string;
 	calloutText?: string;
 	calloutTheme?: CalloutTheme;
diff --git a/packages/design-system/src/components/N8nActionBox/__tests__/__snapshots__/ActionBox.spec.ts.snap b/packages/design-system/src/components/N8nActionBox/__tests__/__snapshots__/ActionBox.spec.ts.snap
index 32b699e7d580a..9b56278cddfd8 100644
--- a/packages/design-system/src/components/N8nActionBox/__tests__/__snapshots__/ActionBox.spec.ts.snap
+++ b/packages/design-system/src/components/N8nActionBox/__tests__/__snapshots__/ActionBox.spec.ts.snap
@@ -9,7 +9,9 @@ exports[`N8NActionBox > should render correctly 1`] = `
   <div class="description">
     <n8n-text-stub color="text-base" bold="false" size="medium" compact="false" tag="span"></n8n-text-stub>
   </div>
-  <n8n-button-stub block="false" element="button" label="Do something" square="false" active="false" disabled="false" loading="false" outline="false" size="large" text="false" type="primary"></n8n-button-stub>
+  <n8n-button-stub block="false" element="button" label="Do something" square="false" active="false" disabled="false" loading="false" outline="false" size="large" text="false" type="primary" class="el-tooltip__trigger"></n8n-button-stub>
+  <!--teleport start-->
+  <!--teleport end-->
   <!--v-if-->
 </div>"
 `;
diff --git a/packages/design-system/src/components/N8nActionDropdown/ActionDropdown.vue b/packages/design-system/src/components/N8nActionDropdown/ActionDropdown.vue
index 79a8e883f9fb3..649d4bc570491 100644
--- a/packages/design-system/src/components/N8nActionDropdown/ActionDropdown.vue
+++ b/packages/design-system/src/components/N8nActionDropdown/ActionDropdown.vue
@@ -6,6 +6,7 @@
 			:trigger="trigger"
 			:popper-class="popperClass"
 			:teleported="teleported"
+			:disabled="disabled"
 			@command="onSelect"
 			@visible-change="onVisibleChange"
 		>
@@ -76,6 +77,7 @@ interface ActionDropdownProps {
 	trigger?: (typeof TRIGGER)[number];
 	hideArrow?: boolean;
 	teleported?: boolean;
+	disabled?: boolean;
 }
 
 const props = withDefaults(defineProps<ActionDropdownProps>(), {
@@ -86,6 +88,7 @@ const props = withDefaults(defineProps<ActionDropdownProps>(), {
 	trigger: 'click',
 	hideArrow: false,
 	teleported: true,
+	disabled: false,
 });
 
 const attrs = useAttrs();
diff --git a/packages/design-system/src/css/dropdown.scss b/packages/design-system/src/css/dropdown.scss
index a15d17f0268a4..e3ff966a4fcdf 100644
--- a/packages/design-system/src/css/dropdown.scss
+++ b/packages/design-system/src/css/dropdown.scss
@@ -19,6 +19,14 @@
 		}
 	}
 
+	@include mixins.when(disabled) {
+		.el-tooltip__trigger {
+			opacity: 0.25;
+			cursor: not-allowed;
+			background: unset;
+		}
+	}
+
 	& .el-dropdown__caret-button {
 		padding-left: 5px;
 		padding-right: 5px;
diff --git a/packages/editor-ui/src/components/CredentialCard.vue b/packages/editor-ui/src/components/CredentialCard.vue
index d9ac12ffd9a54..33ffefa37811f 100644
--- a/packages/editor-ui/src/components/CredentialCard.vue
+++ b/packages/editor-ui/src/components/CredentialCard.vue
@@ -5,7 +5,7 @@ import type { ICredentialsResponse } from '@/Interface';
 import { MODAL_CONFIRM, PROJECT_MOVE_RESOURCE_MODAL } from '@/constants';
 import { useMessage } from '@/composables/useMessage';
 import CredentialIcon from '@/components/CredentialIcon.vue';
-import { getCredentialPermissions } from '@/permissions';
+import { getResourcePermissions } from '@/permissions';
 import { useUIStore } from '@/stores/ui.store';
 import { useCredentialsStore } from '@/stores/credentials.store';
 import TimeAgo from '@/components/TimeAgo.vue';
@@ -48,7 +48,7 @@ const projectsStore = useProjectsStore();
 
 const resourceTypeLabel = computed(() => locale.baseText('generic.credential').toLowerCase());
 const credentialType = computed(() => credentialsStore.getCredentialTypeByName(props.data.type));
-const credentialPermissions = computed(() => getCredentialPermissions(props.data));
+const credentialPermissions = computed(() => getResourcePermissions(props.data.scopes).credential);
 const actions = computed(() => {
 	const items = [
 		{
diff --git a/packages/editor-ui/src/components/CredentialEdit/CredentialConfig.vue b/packages/editor-ui/src/components/CredentialEdit/CredentialConfig.vue
index 1bfda209de447..ca79b07f836dd 100644
--- a/packages/editor-ui/src/components/CredentialEdit/CredentialConfig.vue
+++ b/packages/editor-ui/src/components/CredentialEdit/CredentialConfig.vue
@@ -172,14 +172,13 @@ import EnterpriseEdition from '@/components/EnterpriseEdition.ee.vue';
 import { useI18n } from '@/composables/useI18n';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { BUILTIN_CREDENTIALS_DOCS_URL, DOCS_DOMAIN, EnterpriseEditionFeature } from '@/constants';
-import type { PermissionsMap } from '@/permissions';
+import type { PermissionsRecord } from '@/permissions';
 import { addCredentialTranslation } from '@/plugins/i18n';
 import { useCredentialsStore } from '@/stores/credentials.store';
 import { useNDVStore } from '@/stores/ndv.store';
 import { useRootStore } from '@/stores/root.store';
 import { useUIStore } from '@/stores/ui.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
-import type { CredentialScope } from '@n8n/permissions';
 import Banner from '../Banner.vue';
 import CopyInput from '../CopyInput.vue';
 import CredentialInputs from './CredentialInputs.vue';
@@ -194,7 +193,7 @@ type Props = {
 	credentialProperties: INodeProperties[];
 	credentialData: ICredentialDataDecryptedObject;
 	credentialId?: string;
-	credentialPermissions?: PermissionsMap<CredentialScope>;
+	credentialPermissions: PermissionsRecord['credential'];
 	parentTypes?: string[];
 	showValidationWarning?: boolean;
 	authError?: string;
@@ -212,7 +211,7 @@ const props = withDefaults(defineProps<Props>(), {
 	credentialId: '',
 	authError: '',
 	showValidationWarning: false,
-	credentialPermissions: () => ({}) as PermissionsMap<CredentialScope>,
+	credentialPermissions: () => ({}) as PermissionsRecord['credential'],
 });
 const emit = defineEmits<{
 	update: [value: IUpdateInformation];
diff --git a/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue b/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue
index bfeab0737ceb5..e2c7c428e5a36 100644
--- a/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue
+++ b/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue
@@ -145,8 +145,7 @@ import { useMessage } from '@/composables/useMessage';
 import { useNodeHelpers } from '@/composables/useNodeHelpers';
 import { useToast } from '@/composables/useToast';
 import { CREDENTIAL_EDIT_MODAL_KEY, EnterpriseEditionFeature, MODAL_CONFIRM } from '@/constants';
-import type { PermissionsMap } from '@/permissions';
-import { getCredentialPermissions } from '@/permissions';
+import { getResourcePermissions } from '@/permissions';
 import { useCredentialsStore } from '@/stores/credentials.store';
 import { useNDVStore } from '@/stores/ndv.store';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
@@ -169,7 +168,6 @@ import {
 	updateNodeAuthType,
 } from '@/utils/nodeTypesUtils';
 import { isCredentialModalState, isValidCredentialResponse } from '@/utils/typeGuards';
-import type { CredentialScope } from '@n8n/permissions';
 
 type Props = {
 	modalName: string;
@@ -395,14 +393,11 @@ const requiredPropertiesFilled = computed(() => {
 	return true;
 });
 
-const credentialPermissions = computed<PermissionsMap<CredentialScope>>(() => {
-	if (loading.value) {
-		return {} as PermissionsMap<CredentialScope>;
-	}
-
-	return getCredentialPermissions(
-		(credentialId.value ? currentCredential.value : credentialData.value) as ICredentialsResponse,
-	);
+const credentialPermissions = computed(() => {
+	return getResourcePermissions(
+		((credentialId.value ? currentCredential.value : credentialData.value) as ICredentialsResponse)
+			?.scopes,
+	).credential;
 });
 
 const sidebarItems = computed(() => {
diff --git a/packages/editor-ui/src/components/CredentialEdit/CredentialSharing.ee.vue b/packages/editor-ui/src/components/CredentialEdit/CredentialSharing.ee.vue
index 0d19cc3b4b191..f86e48a0c5a2c 100644
--- a/packages/editor-ui/src/components/CredentialEdit/CredentialSharing.ee.vue
+++ b/packages/editor-ui/src/components/CredentialEdit/CredentialSharing.ee.vue
@@ -68,8 +68,7 @@ import { useProjectsStore } from '@/stores/projects.store';
 import type { ProjectListItem, ProjectSharingData } from '@/types/projects.types';
 import { ProjectTypes } from '@/types/projects.types';
 import type { ICredentialDataDecryptedObject } from 'n8n-workflow';
-import type { PermissionsMap } from '@/permissions';
-import type { CredentialScope } from '@n8n/permissions';
+import type { PermissionsRecord } from '@/permissions';
 import type { EventBus } from 'n8n-design-system/utils';
 import { useRolesStore } from '@/stores/roles.store';
 import type { RoleMap } from '@/types/roles.types';
@@ -94,7 +93,7 @@ export default defineComponent({
 			required: true,
 		},
 		credentialPermissions: {
-			type: Object as PropType<PermissionsMap<CredentialScope>>,
+			type: Object as PropType<PermissionsRecord['credential']>,
 			required: true,
 		},
 		modalBus: {
diff --git a/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue b/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue
index c5a209fec9c59..12c9cc33a1c4b 100644
--- a/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue
+++ b/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue
@@ -13,9 +13,6 @@ import {
 	WORKFLOW_SETTINGS_MODAL_KEY,
 	WORKFLOW_SHARE_MODAL_KEY,
 } from '@/constants';
-import type { PermissionsMap } from '@/permissions';
-import type { WorkflowScope } from '@n8n/permissions';
-
 import ShortenName from '@/components/ShortenName.vue';
 import TagsContainer from '@/components/TagsContainer.vue';
 import PushConnectionTracker from '@/components/PushConnectionTracker.vue';
@@ -38,8 +35,7 @@ import { saveAs } from 'file-saver';
 import { useTitleChange } from '@/composables/useTitleChange';
 import { useMessage } from '@/composables/useMessage';
 import { useToast } from '@/composables/useToast';
-
-import { getWorkflowPermissions } from '@/permissions';
+import { getResourcePermissions } from '@/permissions';
 import { createEventBus } from 'n8n-design-system/utils';
 import { nodeViewEventBus } from '@/event-bus';
 import { hasPermission } from '@/utils/rbac/permissions';
@@ -55,7 +51,7 @@ import type {
 } from '@/Interface';
 import { useI18n } from '@/composables/useI18n';
 import { useTelemetry } from '@/composables/useTelemetry';
-import type { BaseTextKey } from '../../plugins/i18n';
+import type { BaseTextKey } from '@/plugins/i18n';
 import { useNpsSurveyStore } from '@/stores/npsSurvey.store';
 import { useLocalStorage } from '@vueuse/core';
 
@@ -140,9 +136,9 @@ const onExecutionsTab = computed(() => {
 	].includes((route.name as string) || '');
 });
 
-const workflowPermissions = computed<PermissionsMap<WorkflowScope>>(() => {
-	return getWorkflowPermissions(workflowsStore.getWorkflowById(props.workflow.id));
-});
+const workflowPermissions = computed(
+	() => getResourcePermissions(workflowsStore.getWorkflowById(props.workflow.id)?.scopes).workflow,
+);
 
 const workflowMenuItems = computed<ActionDropdownItem[]>(() => {
 	const actions: ActionDropdownItem[] = [
@@ -153,7 +149,7 @@ const workflowMenuItems = computed<ActionDropdownItem[]>(() => {
 		},
 	];
 
-	if (!props.readOnly) {
+	if ((workflowPermissions.value.delete && !props.readOnly) || isNewWorkflow.value) {
 		actions.unshift({
 			id: WORKFLOW_MENU_ACTIONS.DUPLICATE,
 			label: locale.baseText('menuActions.duplicate'),
@@ -631,7 +627,7 @@ function showCreateWorkflowSuccessToast(id?: string) {
 							:preview-value="shortenedName"
 							:is-edit-enabled="isNameEditEnabled"
 							:max-length="MAX_WORKFLOW_NAME_LENGTH"
-							:disabled="readOnly"
+							:disabled="readOnly || (!isNewWorkflow && !workflowPermissions.update)"
 							placeholder="Enter workflow name"
 							class="name"
 							@toggle="onNameToggle"
@@ -644,7 +640,7 @@ function showCreateWorkflowSuccessToast(id?: string) {
 
 		<span v-if="settingsStore.areTagsEnabled" class="tags" data-test-id="workflow-tags-container">
 			<TagsDropdown
-				v-if="isTagsEditEnabled && !readOnly"
+				v-if="isTagsEditEnabled && !readOnly && (isNewWorkflow || workflowPermissions.update)"
 				ref="dropdown"
 				v-model="appliedTagIds"
 				:event-bus="tagsEventBus"
@@ -654,7 +650,13 @@ function showCreateWorkflowSuccessToast(id?: string) {
 				@blur="onTagsBlur"
 				@esc="onTagsEditEsc"
 			/>
-			<div v-else-if="(workflow.tags ?? []).length === 0 && !readOnly">
+			<div
+				v-else-if="
+					(workflow.tags ?? []).length === 0 &&
+					!readOnly &&
+					(isNewWorkflow || workflowPermissions.update)
+				"
+			>
 				<span class="add-tag clickable" data-test-id="new-tag-link" @click="onTagsEditEnable">
 					+ {{ $locale.baseText('workflowDetails.addTag') }}
 				</span>
@@ -673,7 +675,11 @@ function showCreateWorkflowSuccessToast(id?: string) {
 
 		<PushConnectionTracker class="actions">
 			<span :class="`activator ${$style.group}`">
-				<WorkflowActivator :workflow-active="workflow.active" :workflow-id="workflow.id" />
+				<WorkflowActivator
+					:workflow-active="workflow.active"
+					:workflow-id="workflow.id"
+					:workflow-permissions="workflowPermissions"
+				/>
 			</span>
 			<EnterpriseEdition :features="[EnterpriseEditionFeature.Sharing]">
 				<div :class="$style.group">
@@ -717,9 +723,11 @@ function showCreateWorkflowSuccessToast(id?: string) {
 				<SaveButton
 					type="primary"
 					:saved="!uiStore.stateIsDirty && !isNewWorkflow"
-					:disabled="isWorkflowSaving || readOnly"
+					:disabled="
+						isWorkflowSaving || readOnly || (!isNewWorkflow && !workflowPermissions.update)
+					"
 					:is-saving="isWorkflowSaving"
-					with-shortcut
+					:with-shortcut="!readOnly && workflowPermissions.update"
 					:shortcut-tooltip="$locale.baseText('saveWorkflowButton.hint')"
 					data-test-id="workflow-save-button"
 					@click="onSaveButtonClick"
diff --git a/packages/editor-ui/src/components/MainSidebar.vue b/packages/editor-ui/src/components/MainSidebar.vue
index c66e0a89b5c68..08707e76ceae9 100644
--- a/packages/editor-ui/src/components/MainSidebar.vue
+++ b/packages/editor-ui/src/components/MainSidebar.vue
@@ -56,12 +56,7 @@
 				<div :class="$style.userArea">
 					<div class="ml-3xs" data-test-id="main-sidebar-user-menu">
 						<!-- This dropdown is only enabled when sidebar is collapsed -->
-						<el-dropdown
-							:disabled="!isCollapsed"
-							placement="right-end"
-							trigger="click"
-							@command="onUserActionToggle"
-						>
+						<el-dropdown placement="right-end" trigger="click" @command="onUserActionToggle">
 							<div :class="{ [$style.avatar]: true, ['clickable']: isCollapsed }">
 								<n8n-avatar
 									:first-name="usersStore.currentUser?.firstName"
@@ -69,7 +64,7 @@
 									size="small"
 								/>
 							</div>
-							<template #dropdown>
+							<template v-if="isCollapsed" #dropdown>
 								<el-dropdown-menu>
 									<el-dropdown-item command="settings">
 										{{ $locale.baseText('settings') }}
diff --git a/packages/editor-ui/src/components/Projects/ProjectTabs.vue b/packages/editor-ui/src/components/Projects/ProjectTabs.vue
index f7c0d275df26b..ddacebdddd77d 100644
--- a/packages/editor-ui/src/components/Projects/ProjectTabs.vue
+++ b/packages/editor-ui/src/components/Projects/ProjectTabs.vue
@@ -5,7 +5,7 @@ import { useRoute } from 'vue-router';
 import { VIEWS } from '@/constants';
 import { useI18n } from '@/composables/useI18n';
 import { useProjectsStore } from '@/stores/projects.store';
-import { getProjectPermissions } from '@/permissions';
+import { getResourcePermissions } from '@/permissions';
 
 const locale = useI18n();
 const route = useRoute();
@@ -13,6 +13,9 @@ const route = useRoute();
 const projectsStore = useProjectsStore();
 
 const selectedTab = ref<RouteRecordName | null | undefined>('');
+const projectPermissions = computed(
+	() => getResourcePermissions(projectsStore.currentProject?.scopes).project,
+);
 const options = computed(() => {
 	const projectId = route?.params?.projectId;
 	const to = projectId
@@ -47,7 +50,7 @@ const options = computed(() => {
 		},
 	];
 
-	if (projectId && getProjectPermissions(projectsStore.currentProject).update) {
+	if (projectId && projectPermissions.value.update) {
 		tabs.push({
 			label: locale.baseText('projects.settings'),
 			value: VIEWS.PROJECT_SETTINGS,
diff --git a/packages/editor-ui/src/components/VariablesRow.vue b/packages/editor-ui/src/components/VariablesRow.vue
index 3f45bda4f663f..f970bd91ae625 100644
--- a/packages/editor-ui/src/components/VariablesRow.vue
+++ b/packages/editor-ui/src/components/VariablesRow.vue
@@ -8,7 +8,7 @@ import { useClipboard } from '@/composables/useClipboard';
 import { EnterpriseEditionFeature } from '@/constants';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useUsersStore } from '@/stores/users.store';
-import { getVariablesPermissions } from '@/permissions';
+import { getResourcePermissions } from '@/permissions';
 import type { IResource } from './layouts/ResourcesListLayout.vue';
 
 const i18n = useI18n();
@@ -34,7 +34,9 @@ const props = withDefaults(
 	},
 );
 
-const permissions = computed(() => getVariablesPermissions(usersStore.currentUser));
+const permissions = computed(
+	() => getResourcePermissions(usersStore.currentUser?.globalScopes).variable,
+);
 const modelValue = ref<IResource>({ ...props.data });
 
 const formValidationStatus = ref<Record<string, boolean>>({
diff --git a/packages/editor-ui/src/components/WorkflowActivator.vue b/packages/editor-ui/src/components/WorkflowActivator.vue
index 8b7b55672af73..cc5d4cf2ad494 100644
--- a/packages/editor-ui/src/components/WorkflowActivator.vue
+++ b/packages/editor-ui/src/components/WorkflowActivator.vue
@@ -5,8 +5,14 @@ import { useWorkflowsStore } from '@/stores/workflows.store';
 import { getActivatableTriggerNodes } from '@/utils/nodeTypesUtils';
 import { computed } from 'vue';
 import { useI18n } from '@/composables/useI18n';
+import type { PermissionsRecord } from '@/permissions';
+import { PLACEHOLDER_EMPTY_WORKFLOW_ID } from '@/constants';
 
-const props = defineProps<{ workflowActive: boolean; workflowId: string }>();
+const props = defineProps<{
+	workflowActive: boolean;
+	workflowId: string;
+	workflowPermissions: PermissionsRecord['workflow'];
+}>();
 const { showMessage } = useToast();
 const workflowActivate = useWorkflowActivate();
 
@@ -35,9 +41,15 @@ const containsTrigger = computed((): boolean => {
 	return foundTriggers.length > 0;
 });
 
+const isNewWorkflow = computed(
+	() =>
+		!props.workflowId ||
+		props.workflowId === PLACEHOLDER_EMPTY_WORKFLOW_ID ||
+		props.workflowId === 'new',
+);
+
 const disabled = computed((): boolean => {
-	const isNewWorkflow = !props.workflowId;
-	if (isNewWorkflow || isCurrentWorkflow.value) {
+	if (isNewWorkflow.value || isCurrentWorkflow.value) {
 		return !props.workflowActive && !containsTrigger.value;
 	}
 
@@ -108,7 +120,11 @@ async function displayActivationError() {
 						? i18n.baseText('workflowActivator.deactivateWorkflow')
 						: i18n.baseText('workflowActivator.activateWorkflow')
 				"
-				:disabled="disabled || workflowActivate.updatingWorkflowActivation.value"
+				:disabled="
+					disabled ||
+					workflowActivate.updatingWorkflowActivation.value ||
+					(!isNewWorkflow && !workflowPermissions.update)
+				"
 				:active-color="getActiveColor"
 				inactive-color="#8899AA"
 				data-test-id="workflow-activate-switch"
diff --git a/packages/editor-ui/src/components/WorkflowCard.vue b/packages/editor-ui/src/components/WorkflowCard.vue
index 6cc73db627817..f929bea6298ef 100644
--- a/packages/editor-ui/src/components/WorkflowCard.vue
+++ b/packages/editor-ui/src/components/WorkflowCard.vue
@@ -10,7 +10,7 @@ import {
 } from '@/constants';
 import { useMessage } from '@/composables/useMessage';
 import { useToast } from '@/composables/useToast';
-import { getWorkflowPermissions } from '@/permissions';
+import { getResourcePermissions } from '@/permissions';
 import dateformat from 'dateformat';
 import WorkflowActivator from '@/components/WorkflowActivator.vue';
 import { useUIStore } from '@/stores/ui.store';
@@ -75,7 +75,7 @@ const projectsStore = useProjectsStore();
 
 const resourceTypeLabel = computed(() => locale.baseText('generic.workflow').toLowerCase());
 const currentUser = computed(() => usersStore.currentUser ?? ({} as IUser));
-const workflowPermissions = computed(() => getWorkflowPermissions(props.data));
+const workflowPermissions = computed(() => getResourcePermissions(props.data.scopes).workflow);
 const actions = computed(() => {
 	const items = [
 		{
@@ -88,7 +88,7 @@ const actions = computed(() => {
 		},
 	];
 
-	if (!props.readOnly) {
+	if (workflowPermissions.value.create && !props.readOnly) {
 		items.push({
 			label: locale.baseText('workflows.item.duplicate'),
 			value: WORKFLOW_LIST_ITEM_ACTIONS.DUPLICATE,
@@ -274,6 +274,7 @@ function moveResource() {
 					class="mr-s"
 					:workflow-active="data.active"
 					:workflow-id="data.id"
+					:workflow-permissions="workflowPermissions"
 					data-test-id="workflow-card-activator"
 				/>
 
diff --git a/packages/editor-ui/src/components/__tests__/WorkflowSettings.spec.ts b/packages/editor-ui/src/components/WorkflowSettings.spec.ts
similarity index 95%
rename from packages/editor-ui/src/components/__tests__/WorkflowSettings.spec.ts
rename to packages/editor-ui/src/components/WorkflowSettings.spec.ts
index 427ba49ef5866..04a3b824f8eab 100644
--- a/packages/editor-ui/src/components/__tests__/WorkflowSettings.spec.ts
+++ b/packages/editor-ui/src/components/WorkflowSettings.spec.ts
@@ -16,6 +16,8 @@ import { EnterpriseEditionFeature, WORKFLOW_SETTINGS_MODAL_KEY } from '@/constan
 
 import { nextTick } from 'vue';
 import type { IWorkflowDb } from '@/Interface';
+import * as permissions from '@/permissions';
+import type { PermissionsRecord } from '@/permissions';
 
 let pinia: ReturnType<typeof createPinia>;
 let workflowsStore: ReturnType<typeof useWorkflowsStore>;
@@ -52,6 +54,11 @@ describe('WorkflowSettingsVue', () => {
 			updatedAt: 1,
 			versionId: '123',
 		} as IWorkflowDb);
+		vi.spyOn(permissions, 'getResourcePermissions').mockReturnValue({
+			workflow: {
+				update: true,
+			},
+		} as PermissionsRecord);
 
 		uiStore.modalsById[WORKFLOW_SETTINGS_MODAL_KEY] = {
 			open: true,
diff --git a/packages/editor-ui/src/components/WorkflowSettings.vue b/packages/editor-ui/src/components/WorkflowSettings.vue
index 85a26bee70524..42eac67db091c 100644
--- a/packages/editor-ui/src/components/WorkflowSettings.vue
+++ b/packages/editor-ui/src/components/WorkflowSettings.vue
@@ -23,7 +23,7 @@
 							placeholder="Select Execution Order"
 							size="medium"
 							filterable
-							:disabled="readOnlyEnv"
+							:disabled="readOnlyEnv || !workflowPermissions.update"
 							:limit-popper-width="true"
 							data-test-id="workflow-settings-execution-order"
 						>
@@ -53,7 +53,7 @@
 							v-model="workflowSettings.errorWorkflow"
 							placeholder="Select Workflow"
 							filterable
-							:disabled="readOnlyEnv"
+							:disabled="readOnlyEnv || !workflowPermissions.update"
 							:limit-popper-width="true"
 							data-test-id="workflow-settings-error-workflow"
 						>
@@ -82,7 +82,7 @@
 						<el-col :span="14" class="ignore-key-press">
 							<n8n-select
 								v-model="workflowSettings.callerPolicy"
-								:disabled="readOnlyEnv"
+								:disabled="readOnlyEnv || !workflowPermissions.update"
 								:placeholder="$locale.baseText('workflowSettings.selectOption')"
 								filterable
 								:limit-popper-width="true"
@@ -110,7 +110,7 @@
 						<el-col :span="14">
 							<n8n-input
 								v-model="workflowSettings.callerIds"
-								:disabled="readOnlyEnv"
+								:disabled="readOnlyEnv || !workflowPermissions.update"
 								:placeholder="$locale.baseText('workflowSettings.callerIds.placeholder')"
 								type="text"
 								data-test-id="workflow-caller-policy-workflow-ids"
@@ -134,7 +134,7 @@
 							v-model="workflowSettings.timezone"
 							placeholder="Select Timezone"
 							filterable
-							:disabled="readOnlyEnv"
+							:disabled="readOnlyEnv || !workflowPermissions.update"
 							:limit-popper-width="true"
 							data-test-id="workflow-settings-timezone"
 						>
@@ -163,7 +163,7 @@
 							v-model="workflowSettings.saveDataErrorExecution"
 							:placeholder="$locale.baseText('workflowSettings.selectOption')"
 							filterable
-							:disabled="readOnlyEnv"
+							:disabled="readOnlyEnv || !workflowPermissions.update"
 							:limit-popper-width="true"
 							data-test-id="workflow-settings-save-failed-executions"
 						>
@@ -192,7 +192,7 @@
 							v-model="workflowSettings.saveDataSuccessExecution"
 							:placeholder="$locale.baseText('workflowSettings.selectOption')"
 							filterable
-							:disabled="readOnlyEnv"
+							:disabled="readOnlyEnv || !workflowPermissions.update"
 							:limit-popper-width="true"
 							data-test-id="workflow-settings-save-success-executions"
 						>
@@ -221,7 +221,7 @@
 							v-model="workflowSettings.saveManualExecutions"
 							:placeholder="$locale.baseText('workflowSettings.selectOption')"
 							filterable
-							:disabled="readOnlyEnv"
+							:disabled="readOnlyEnv || !workflowPermissions.update"
 							:limit-popper-width="true"
 							data-test-id="workflow-settings-save-manual-executions"
 						>
@@ -250,7 +250,7 @@
 							v-model="workflowSettings.saveExecutionProgress"
 							:placeholder="$locale.baseText('workflowSettings.selectOption')"
 							filterable
-							:disabled="readOnlyEnv"
+							:disabled="readOnlyEnv || !workflowPermissions.update"
 							:limit-popper-width="true"
 							data-test-id="workflow-settings-save-execution-progress"
 						>
@@ -278,7 +278,7 @@
 						<div>
 							<el-switch
 								ref="inputField"
-								:disabled="readOnlyEnv"
+								:disabled="readOnlyEnv || !workflowPermissions.update"
 								:model-value="(workflowSettings.executionTimeout ?? -1) > -1"
 								active-color="#13ce66"
 								data-test-id="workflow-settings-timeout-workflow"
@@ -303,7 +303,7 @@
 						</el-col>
 						<el-col :span="4">
 							<n8n-input
-								:disabled="readOnlyEnv"
+								:disabled="readOnlyEnv || !workflowPermissions.update"
 								:model-value="timeoutHMS.hours"
 								:min="0"
 								@update:model-value="(value: string) => setTimeout('hours', value)"
@@ -313,7 +313,7 @@
 						</el-col>
 						<el-col :span="4" class="timeout-input">
 							<n8n-input
-								:disabled="readOnlyEnv"
+								:disabled="readOnlyEnv || !workflowPermissions.update"
 								:model-value="timeoutHMS.minutes"
 								:min="0"
 								:max="60"
@@ -324,7 +324,7 @@
 						</el-col>
 						<el-col :span="4" class="timeout-input">
 							<n8n-input
-								:disabled="readOnlyEnv"
+								:disabled="readOnlyEnv || !workflowPermissions.update"
 								:model-value="timeoutHMS.seconds"
 								:min="0"
 								:max="60"
@@ -340,7 +340,7 @@
 		<template #footer>
 			<div class="action-buttons" data-test-id="workflow-settings-save-button">
 				<n8n-button
-					:disabled="readOnlyEnv"
+					:disabled="readOnlyEnv || !workflowPermissions.update"
 					:label="$locale.baseText('workflowSettings.save')"
 					size="large"
 					float="right"
@@ -379,12 +379,10 @@ 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 type { PermissionsMap } from '@/permissions';
-import type { WorkflowScope } from '@n8n/permissions';
-import { getWorkflowPermissions } from '@/permissions';
 import { useExternalHooks } from '@/composables/useExternalHooks';
 import { useSourceControlStore } from '@/stores/sourceControl.store';
 import { ProjectTypes } from '@/types/projects.types';
+import { getResourcePermissions } from '@/permissions';
 
 export default defineComponent({
 	name: 'WorkflowSettings',
@@ -489,8 +487,8 @@ export default defineComponent({
 
 			return this.workflowsEEStore.getWorkflowOwnerName(`${this.workflowId}`, fallback);
 		},
-		workflowPermissions(): PermissionsMap<WorkflowScope> {
-			return getWorkflowPermissions(this.workflow);
+		workflowPermissions() {
+			return getResourcePermissions(this.workflow?.scopes).workflow;
 		},
 	},
 	async mounted() {
@@ -515,17 +513,17 @@ export default defineComponent({
 		this.defaultValues.workflowCallerPolicy = this.settingsStore.workflowCallerPolicyDefaultOption;
 
 		this.isLoading = true;
-		const promises = [];
-		promises.push(this.loadWorkflows());
-		promises.push(this.loadSaveDataErrorExecutionOptions());
-		promises.push(this.loadSaveDataSuccessExecutionOptions());
-		promises.push(this.loadSaveExecutionProgressOptions());
-		promises.push(this.loadSaveManualOptions());
-		promises.push(this.loadTimezones());
-		promises.push(this.loadWorkflowCallerPolicyOptions());
 
 		try {
-			await Promise.all(promises);
+			await Promise.all([
+				this.loadWorkflows(),
+				this.loadSaveDataErrorExecutionOptions(),
+				this.loadSaveDataSuccessExecutionOptions(),
+				this.loadSaveExecutionProgressOptions(),
+				this.loadSaveManualOptions(),
+				this.loadTimezones(),
+				this.loadWorkflowCallerPolicyOptions(),
+			]);
 		} catch (error) {
 			this.showError(
 				error,
diff --git a/packages/editor-ui/src/components/WorkflowShareModal.ee.vue b/packages/editor-ui/src/components/WorkflowShareModal.ee.vue
index 8aa11f4b5abfb..886ac5017644b 100644
--- a/packages/editor-ui/src/components/WorkflowShareModal.ee.vue
+++ b/packages/editor-ui/src/components/WorkflowShareModal.ee.vue
@@ -130,9 +130,7 @@ import {
 	WORKFLOW_SHARE_MODAL_KEY,
 } from '@/constants';
 import type { IUser, IWorkflowDb } from '@/Interface';
-import type { PermissionsMap } from '@/permissions';
-import type { WorkflowScope } from '@n8n/permissions';
-import { getWorkflowPermissions } from '@/permissions';
+import { getResourcePermissions } from '@/permissions';
 import { useMessage } from '@/composables/useMessage';
 import { useToast } from '@/composables/useToast';
 import { nodeViewEventBus } from '@/event-bus';
@@ -224,8 +222,8 @@ export default defineComponent({
 		currentUser(): IUser | null {
 			return this.usersStore.currentUser;
 		},
-		workflowPermissions(): PermissionsMap<WorkflowScope> {
-			return getWorkflowPermissions(this.workflow);
+		workflowPermissions() {
+			return getResourcePermissions(this.workflow?.scopes).workflow;
 		},
 		workflowOwnerName(): string {
 			return this.workflowsEEStore.getWorkflowOwnerName(`${this.workflow.id}`);
diff --git a/packages/editor-ui/src/components/executions/global/GlobalExecutionsList.test.ts b/packages/editor-ui/src/components/executions/global/GlobalExecutionsList.test.ts
index 52bac78f2fd44..5b2c9c7486133 100644
--- a/packages/editor-ui/src/components/executions/global/GlobalExecutionsList.test.ts
+++ b/packages/editor-ui/src/components/executions/global/GlobalExecutionsList.test.ts
@@ -100,6 +100,9 @@ describe('GlobalExecutionsList', () => {
 		const { queryAllByTestId, queryByTestId, getByTestId } = renderComponent({
 			props: {
 				executions: [],
+				filters: {},
+				total: 0,
+				estimated: false,
 			},
 			pinia,
 		});
@@ -121,6 +124,8 @@ describe('GlobalExecutionsList', () => {
 					executions: executionsData[0].results,
 					total: executionsData[0].count,
 					filteredExecutions: executionsData[0].results,
+					filters: {},
+					estimated: false,
 				},
 				pinia,
 			});
@@ -185,6 +190,8 @@ describe('GlobalExecutionsList', () => {
 				executions: executionsData[0].results,
 				total: executionsData[0].count,
 				filteredExecutions: executionsData[0].results,
+				filters: {},
+				estimated: false,
 			},
 			pinia,
 		});
diff --git a/packages/editor-ui/src/components/executions/global/GlobalExecutionsList.vue b/packages/editor-ui/src/components/executions/global/GlobalExecutionsList.vue
index a9e98e52b791e..a0ec5726977c8 100644
--- a/packages/editor-ui/src/components/executions/global/GlobalExecutionsList.vue
+++ b/packages/editor-ui/src/components/executions/global/GlobalExecutionsList.vue
@@ -11,6 +11,8 @@ import type { ExecutionFilterType, IWorkflowDb } from '@/Interface';
 import type { ExecutionSummary } from 'n8n-workflow';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useExecutionsStore } from '@/stores/executions.store';
+import type { PermissionsRecord } from '@/permissions';
+import { getResourcePermissions } from '@/permissions';
 
 const props = withDefaults(
 	defineProps<{
@@ -162,6 +164,12 @@ function getExecutionWorkflowName(execution: ExecutionSummary): string {
 	);
 }
 
+function getExecutionWorkflowPermissions(
+	execution: ExecutionSummary,
+): PermissionsRecord['workflow'] {
+	return getResourcePermissions(execution.scopes).workflow;
+}
+
 function getWorkflowName(workflowId: string): string | undefined {
 	return workflows.value.find((data: IWorkflowDb) => data.id === workflowId)?.name;
 }
@@ -344,7 +352,9 @@ async function onAutoRefreshToggle(value: boolean) {
 						:key="execution.id"
 						:execution="execution"
 						:workflow-name="getExecutionWorkflowName(execution)"
+						:workflow-permissions="getExecutionWorkflowPermissions(execution)"
 						:selected="selectedItems[execution.id] || allExistingSelected"
+						data-test-id="global-execution-list-item"
 						@stop="stopExecution"
 						@delete="deleteExecution"
 						@select="toggleSelectExecution"
diff --git a/packages/editor-ui/src/components/executions/global/GlobalExecutionsListItem.test.ts b/packages/editor-ui/src/components/executions/global/GlobalExecutionsListItem.test.ts
index a1f7cb75b1721..5f15c9534f8c7 100644
--- a/packages/editor-ui/src/components/executions/global/GlobalExecutionsListItem.test.ts
+++ b/packages/editor-ui/src/components/executions/global/GlobalExecutionsListItem.test.ts
@@ -55,6 +55,9 @@ describe('GlobalExecutionsListItem', () => {
 					retrySuccessfulId: undefined,
 					waitTill: false,
 				},
+				workflowPermissions: {
+					execute: true,
+				},
 			},
 		});
 
@@ -73,6 +76,9 @@ describe('GlobalExecutionsListItem', () => {
 					id: 123,
 					stoppedAt: undefined,
 				},
+				workflowPermissions: {
+					update: true,
+				},
 			},
 		});
 
@@ -84,7 +90,10 @@ describe('GlobalExecutionsListItem', () => {
 		global.window.open = vi.fn();
 
 		const { getByText } = renderComponent({
-			props: { execution: { status: 'success', id: 123, workflowName: 'TestWorkflow' } },
+			props: {
+				execution: { status: 'success', id: 123, workflowName: 'TestWorkflow' },
+				workflowPermissions: {},
+			},
 		});
 
 		await fireEvent.click(getByText('TestWorkflow'));
@@ -94,7 +103,10 @@ describe('GlobalExecutionsListItem', () => {
 	it('should show formatted start date', () => {
 		const testDate = '2022-01-01T12:00:00Z';
 		const { getByText } = renderComponent({
-			props: { execution: { status: 'success', id: 123, startedAt: testDate } },
+			props: {
+				execution: { status: 'success', id: 123, startedAt: testDate },
+				workflowPermissions: {},
+			},
 		});
 
 		expect(
diff --git a/packages/editor-ui/src/components/executions/global/GlobalExecutionsListItem.vue b/packages/editor-ui/src/components/executions/global/GlobalExecutionsListItem.vue
index e6fc6dacf2677..43d85e8e277e6 100644
--- a/packages/editor-ui/src/components/executions/global/GlobalExecutionsListItem.vue
+++ b/packages/editor-ui/src/components/executions/global/GlobalExecutionsListItem.vue
@@ -8,6 +8,7 @@ import { convertToDisplayDate } from '@/utils/formatters/dateFormatter';
 import { i18n as locale } from '@/plugins/i18n';
 import ExecutionsTime from '@/components/executions/ExecutionsTime.vue';
 import { useExecutionHelpers } from '@/composables/useExecutionHelpers';
+import type { PermissionsRecord } from '@/permissions';
 
 type Command = 'retrySaved' | 'retryOriginal' | 'delete';
 
@@ -24,9 +25,11 @@ const props = withDefaults(
 		execution: ExecutionSummary;
 		selected?: boolean;
 		workflowName?: string;
+		workflowPermissions: PermissionsRecord['workflow'];
 	}>(),
 	{
 		selected: false,
+		workflowName: '',
 	},
 );
 
@@ -266,6 +269,7 @@ async function handleActionItemClick(commandData: Command) {
 							data-test-id="execution-retry-saved-dropdown-item"
 							:class="$style.retryAction"
 							command="retrySaved"
+							:disabled="!workflowPermissions.execute"
 						>
 							{{ i18n.baseText('executionsList.retryWithCurrentlySavedWorkflow') }}
 						</ElDropdownItem>
@@ -274,6 +278,7 @@ async function handleActionItemClick(commandData: Command) {
 							data-test-id="execution-retry-original-dropdown-item"
 							:class="$style.retryAction"
 							command="retryOriginal"
+							:disabled="!workflowPermissions.execute"
 						>
 							{{ i18n.baseText('executionsList.retryWithOriginalWorkflow') }}
 						</ElDropdownItem>
@@ -281,6 +286,7 @@ async function handleActionItemClick(commandData: Command) {
 							data-test-id="execution-delete-dropdown-item"
 							:class="$style.deleteAction"
 							command="delete"
+							:disabled="!workflowPermissions.update"
 						>
 							{{ i18n.baseText('generic.delete') }}
 						</ElDropdownItem>
diff --git a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsCard.test.ts b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsCard.test.ts
index 2d5449e93d2fa..182a5942af754 100644
--- a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsCard.test.ts
+++ b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsCard.test.ts
@@ -2,6 +2,13 @@ import { createComponentRenderer } from '@/__tests__/render';
 import WorkflowExecutionsCard from '@/components/executions/workflow/WorkflowExecutionsCard.vue';
 import { createPinia, setActivePinia } from 'pinia';
 
+vi.mock('vue-router', () => ({
+	useRoute: () => ({
+		params: {},
+	}),
+	RouterLink: vi.fn(),
+}));
+
 const renderComponent = createComponentRenderer(WorkflowExecutionsCard, {
 	global: {
 		stubs: {
@@ -25,53 +32,102 @@ describe('WorkflowExecutionsCard', () => {
 	test.each([
 		[
 			{
-				id: '1',
-				mode: 'manual',
-				status: 'success',
-				retryOf: null,
-				retrySuccessId: null,
+				execution: {
+					id: '1',
+					mode: 'manual',
+					status: 'success',
+					retryOf: null,
+					retrySuccessId: null,
+				},
+				workflowPermissions: {
+					execute: true,
+				},
 			},
 			false,
+			false,
 		],
 		[
 			{
-				id: '2',
-				mode: 'manual',
-				status: 'error',
-				retryOf: null,
-				retrySuccessId: null,
+				execution: {
+					id: '2',
+					mode: 'manual',
+					status: 'error',
+					retryOf: null,
+					retrySuccessId: null,
+				},
+				workflowPermissions: {
+					execute: true,
+				},
 			},
 			true,
+			false,
 		],
 		[
 			{
-				id: '3',
-				mode: 'manual',
-				status: 'error',
-				retryOf: '2',
-				retrySuccessId: null,
+				execution: {
+					id: '3',
+					mode: 'manual',
+					status: 'error',
+					retryOf: null,
+					retrySuccessId: '3',
+				},
+				workflowPermissions: {
+					execute: true,
+				},
 			},
-			true,
+			false,
+			false,
 		],
 		[
 			{
-				id: '4',
-				mode: 'manual',
-				status: 'error',
-				retryOf: null,
-				retrySuccessId: '3',
+				execution: {
+					id: '4',
+					mode: 'manual',
+					status: 'success',
+					retryOf: '4',
+					retrySuccessId: null,
+				},
+				workflowPermissions: {
+					execute: true,
+				},
 			},
 			false,
+			false,
 		],
-	])('with execution %j retry button visibility is %s', (execution, shouldRenderRetryBtn) => {
-		const { queryByTestId } = renderComponent({
-			props: {
-				execution,
+		[
+			{
+				execution: {
+					id: '2',
+					mode: 'manual',
+					status: 'error',
+					retryOf: null,
+					retrySuccessId: null,
+				},
+				workflowPermissions: {},
 			},
-		});
+			true,
+			true,
+		],
+	])(
+		'with execution %j retry button visibility is %s and if visible is disabled %s',
+		(props, shouldRenderRetryBtn, disabled) => {
+			const { queryByTestId } = renderComponent({
+				props,
+			});
 
-		expect(!!queryByTestId('retry-execution-button') && shouldRenderRetryBtn).toBe(
-			shouldRenderRetryBtn,
-		);
-	});
+			const retryButton = queryByTestId('retry-execution-button');
+
+			if (shouldRenderRetryBtn) {
+				expect(retryButton).toBeVisible();
+
+				if (disabled) {
+					expect(retryButton?.querySelector('.is-disabled')).toBeVisible();
+				} else {
+					expect(retryButton?.querySelector('.is-disabled')).toBe(null);
+				}
+			} else {
+				expect(retryButton).toBe(null);
+			}
+		},
+	);
 });
diff --git a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsCard.vue b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsCard.vue
index 4c84a270425b9..c1efe3c8d882a 100644
--- a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsCard.vue
+++ b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsCard.vue
@@ -1,3 +1,59 @@
+<script setup lang="ts">
+import { computed, onMounted } from 'vue';
+import { useRoute } from 'vue-router';
+import type { IExecutionUIData } from '@/composables/useExecutionHelpers';
+import { VIEWS } from '@/constants';
+import ExecutionsTime from '@/components/executions/ExecutionsTime.vue';
+import { useExecutionHelpers } from '@/composables/useExecutionHelpers';
+import type { ExecutionSummary } from 'n8n-workflow';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useI18n } from '@/composables/useI18n';
+import type { PermissionsRecord } from '@/permissions';
+
+const props = defineProps<{
+	execution: ExecutionSummary;
+	highlight?: boolean;
+	showGap?: boolean;
+	workflowPermissions: PermissionsRecord['workflow'];
+}>();
+
+const emit = defineEmits<{
+	retryExecution: [{ execution: ExecutionSummary; command: string }];
+	mounted: [string];
+}>();
+
+const route = useRoute();
+const locale = useI18n();
+
+const executionHelpers = useExecutionHelpers();
+const workflowsStore = useWorkflowsStore();
+
+const currentWorkflow = computed(() => (route.params.name as string) || workflowsStore.workflowId);
+const retryExecutionActions = computed(() => [
+	{
+		id: 'current-workflow',
+		label: locale.baseText('executionsList.retryWithCurrentlySavedWorkflow'),
+	},
+	{
+		id: 'original-workflow',
+		label: locale.baseText('executionsList.retryWithOriginalWorkflow'),
+	},
+]);
+const executionUIDetails = computed<IExecutionUIData>(() =>
+	executionHelpers.getUIDetails(props.execution),
+);
+const isActive = computed(() => props.execution.id === route.params.executionId);
+const isRetriable = computed(() => executionHelpers.isExecutionRetriable(props.execution));
+
+onMounted(() => {
+	emit('mounted', props.execution.id);
+});
+
+function onRetryMenuItemSelect(action: string): void {
+	emit('retryExecution', { execution: props.execution, command: action });
+}
+</script>
+
 <template>
 	<div
 		:class="{
@@ -12,153 +68,74 @@
 		<router-link
 			:class="$style.executionLink"
 			:to="{
-				name: executionPreviewViewName,
+				name: VIEWS.EXECUTION_PREVIEW,
 				params: { name: currentWorkflow, executionId: execution.id },
 			}"
 			:data-test-execution-status="executionUIDetails.name"
 		>
 			<div :class="$style.description">
-				<n8n-text color="text-dark" :bold="true" size="medium" data-test-id="execution-time">
+				<N8nText color="text-dark" :bold="true" size="medium" data-test-id="execution-time">
 					{{ executionUIDetails.startTime }}
-				</n8n-text>
+				</N8nText>
 				<div :class="$style.executionStatus">
-					<n8n-spinner
+					<N8nSpinner
 						v-if="executionUIDetails.name === 'running'"
 						size="small"
 						:class="[$style.spinner, 'mr-4xs']"
 					/>
-					<n8n-text :class="$style.statusLabel" size="small">{{
-						executionUIDetails.label
-					}}</n8n-text>
+					<N8nText :class="$style.statusLabel" size="small">{{ executionUIDetails.label }}</N8nText>
 					{{ ' ' }}
-					<n8n-text
+					<N8nText
 						v-if="executionUIDetails.name === 'running'"
 						:color="isActive ? 'text-dark' : 'text-base'"
 						size="small"
 					>
-						{{ $locale.baseText('executionDetails.runningTimeRunning') }}
+						{{ locale.baseText('executionDetails.runningTimeRunning') }}
 						<ExecutionsTime :start-time="execution.startedAt" />
-					</n8n-text>
-					<n8n-text
+					</N8nText>
+					<N8nText
 						v-else-if="executionUIDetails.runningTime !== ''"
 						:color="isActive ? 'text-dark' : 'text-base'"
 						size="small"
 					>
 						{{
-							$locale.baseText('executionDetails.runningTimeFinished', {
+							locale.baseText('executionDetails.runningTimeFinished', {
 								interpolate: { time: executionUIDetails?.runningTime },
 							})
 						}}
-					</n8n-text>
+					</N8nText>
 				</div>
 				<div v-if="execution.mode === 'retry'">
-					<n8n-text :color="isActive ? 'text-dark' : 'text-base'" size="small">
-						{{ $locale.baseText('executionDetails.retry') }} #{{ execution.retryOf }}
-					</n8n-text>
+					<N8nText :color="isActive ? 'text-dark' : 'text-base'" size="small">
+						{{ locale.baseText('executionDetails.retry') }} #{{ execution.retryOf }}
+					</N8nText>
 				</div>
 			</div>
 			<div :class="$style.icons">
-				<n8n-action-dropdown
+				<N8nActionDropdown
 					v-if="isRetriable"
 					:class="[$style.icon, $style.retry]"
 					:items="retryExecutionActions"
+					:disabled="!workflowPermissions.execute"
 					activator-icon="redo"
 					data-test-id="retry-execution-button"
 					@select="onRetryMenuItemSelect"
 				/>
-				<n8n-tooltip v-if="execution.mode === 'manual'" placement="top">
+				<N8nTooltip v-if="execution.mode === 'manual'" placement="top">
 					<template #content>
-						<span>{{ $locale.baseText('executionsList.test') }}</span>
+						<span>{{ locale.baseText('executionsList.test') }}</span>
 					</template>
-					<font-awesome-icon
+					<FontAwesomeIcon
 						v-if="execution.mode === 'manual'"
 						:class="[$style.icon, $style.manual]"
 						icon="flask"
 					/>
-				</n8n-tooltip>
+				</N8nTooltip>
 			</div>
 		</router-link>
 	</div>
 </template>
 
-<script lang="ts">
-import { defineComponent } from 'vue';
-import type { IExecutionUIData } from '@/composables/useExecutionHelpers';
-import { VIEWS } from '@/constants';
-import ExecutionsTime from '@/components/executions/ExecutionsTime.vue';
-import { useExecutionHelpers } from '@/composables/useExecutionHelpers';
-import type { ExecutionSummary } from 'n8n-workflow';
-import { mapStores } from 'pinia';
-import { useWorkflowsStore } from '@/stores/workflows.store';
-
-export default defineComponent({
-	name: 'WorkflowExecutionsCard',
-	components: {
-		ExecutionsTime,
-	},
-	props: {
-		execution: {
-			type: Object as () => ExecutionSummary,
-			required: true,
-		},
-		highlight: {
-			type: Boolean,
-			default: false,
-		},
-		showGap: {
-			type: Boolean,
-			default: false,
-		},
-	},
-	emits: ['retryExecution', 'mounted'],
-	setup() {
-		const executionHelpers = useExecutionHelpers();
-
-		return {
-			executionHelpers,
-		};
-	},
-	computed: {
-		...mapStores(useWorkflowsStore),
-		currentWorkflow(): string {
-			return (this.$route.params.name as string) || this.workflowsStore.workflowId;
-		},
-		retryExecutionActions(): object[] {
-			return [
-				{
-					id: 'current-workflow',
-					label: this.$locale.baseText('executionsList.retryWithCurrentlySavedWorkflow'),
-				},
-				{
-					id: 'original-workflow',
-					label: this.$locale.baseText('executionsList.retryWithOriginalWorkflow'),
-				},
-			];
-		},
-		executionUIDetails(): IExecutionUIData {
-			return this.executionHelpers.getUIDetails(this.execution);
-		},
-		isActive(): boolean {
-			return this.execution.id === this.$route.params.executionId;
-		},
-		isRetriable(): boolean {
-			return this.executionHelpers.isExecutionRetriable(this.execution);
-		},
-		executionPreviewViewName() {
-			return VIEWS.EXECUTION_PREVIEW;
-		},
-	},
-	mounted() {
-		this.$emit('mounted', this.execution.id);
-	},
-	methods: {
-		onRetryMenuItemSelect(action: string): void {
-			this.$emit('retryExecution', { execution: this.execution, command: action });
-		},
-	},
-});
-</script>
-
 <style module lang="scss">
 @import '@/styles/variables';
 
diff --git a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsInfoAccordion.vue b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsInfoAccordion.vue
index ed431fa84ee25..25c456d2ca6e7 100644
--- a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsInfoAccordion.vue
+++ b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsInfoAccordion.vue
@@ -1,5 +1,194 @@
+<script setup lang="ts">
+import { computed, ref, watch, onMounted } from 'vue';
+import { useRouter } from 'vue-router';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useUIStore } from '@/stores/ui.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { PLACEHOLDER_EMPTY_WORKFLOW_ID, WORKFLOW_SETTINGS_MODAL_KEY } from '@/constants';
+import type { IWorkflowSettings } from 'n8n-workflow';
+import { deepCopy } from 'n8n-workflow';
+import { useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
+import { useNpsSurveyStore } from '@/stores/npsSurvey.store';
+import { useI18n } from '@/composables/useI18n';
+
+interface IWorkflowSaveSettings {
+	saveFailedExecutions: boolean;
+	saveSuccessfulExecutions: boolean;
+	saveTestExecutions: boolean;
+}
+
+const props = withDefaults(
+	defineProps<{
+		initiallyExpanded: boolean;
+	}>(),
+	{
+		initiallyExpanded: false,
+	},
+);
+
+const router = useRouter();
+const workflowHelpers = useWorkflowHelpers({ router });
+const locale = useI18n();
+
+const settingsStore = useSettingsStore();
+const uiStore = useUIStore();
+const workflowsStore = useWorkflowsStore();
+const npsSurveyStore = useNpsSurveyStore();
+
+const defaultValues = ref({
+	saveFailedExecutions: 'all',
+	saveSuccessfulExecutions: 'all',
+	saveManualExecutions: false,
+});
+const workflowSaveSettings = ref({
+	saveFailedExecutions: false,
+	saveSuccessfulExecutions: false,
+	saveTestExecutions: false,
+} as IWorkflowSaveSettings);
+
+const accordionItems = computed(() => [
+	{
+		id: 'productionExecutions',
+		label: locale.baseText('executionsLandingPage.emptyState.accordion.productionExecutions'),
+		icon: productionExecutionsIcon.value.icon,
+		iconColor: productionExecutionsIcon.value.color,
+		tooltip:
+			productionExecutionsStatus.value === 'unknown'
+				? locale.baseText(
+						'executionsLandingPage.emptyState.accordion.productionExecutionsWarningTooltip',
+					)
+				: null,
+	},
+	{
+		id: 'manualExecutions',
+		label: locale.baseText('executionsLandingPage.emptyState.accordion.testExecutions'),
+		icon: workflowSaveSettings.value.saveTestExecutions ? 'check' : 'times',
+		iconColor: workflowSaveSettings.value.saveTestExecutions ? 'success' : 'danger',
+	},
+]);
+const shouldExpandAccordion = computed(() => {
+	if (!props.initiallyExpanded) {
+		return false;
+	}
+	return (
+		!workflowSaveSettings.value.saveFailedExecutions ||
+		!workflowSaveSettings.value.saveSuccessfulExecutions ||
+		!workflowSaveSettings.value.saveTestExecutions
+	);
+});
+const productionExecutionsIcon = computed(() => {
+	if (productionExecutionsStatus.value === 'saving') {
+		return { icon: 'check', color: 'success' };
+	} else if (productionExecutionsStatus.value === 'not-saving') {
+		return { icon: 'times', color: 'danger' };
+	}
+	return { icon: 'exclamation-triangle', color: 'warning' };
+});
+const productionExecutionsStatus = computed(() => {
+	if (
+		workflowSaveSettings.value.saveSuccessfulExecutions ===
+		workflowSaveSettings.value.saveFailedExecutions
+	) {
+		if (workflowSaveSettings.value.saveSuccessfulExecutions) {
+			return 'saving';
+		}
+		return 'not-saving';
+	} else {
+		return 'unknown';
+	}
+});
+const workflowSettings = computed(() => deepCopy(workflowsStore.workflowSettings));
+const accordionIcon = computed(() => {
+	if (
+		!workflowSaveSettings.value.saveTestExecutions ||
+		productionExecutionsStatus.value !== 'saving'
+	) {
+		return { icon: 'exclamation-triangle', color: 'warning' };
+	}
+	return null;
+});
+const currentWorkflowId = computed(() => workflowsStore.workflowId);
+const isNewWorkflow = computed(() => {
+	return (
+		!currentWorkflowId.value ||
+		currentWorkflowId.value === PLACEHOLDER_EMPTY_WORKFLOW_ID ||
+		currentWorkflowId.value === 'new'
+	);
+});
+const workflowName = computed(() => workflowsStore.workflowName);
+const currentWorkflowTagIds = computed(() => workflowsStore.workflowTags);
+
+watch(workflowSettings, (newSettings: IWorkflowSettings) => {
+	updateSettings(newSettings);
+});
+
+onMounted(() => {
+	defaultValues.value.saveFailedExecutions = settingsStore.saveDataErrorExecution;
+	defaultValues.value.saveSuccessfulExecutions = settingsStore.saveDataSuccessExecution;
+	defaultValues.value.saveManualExecutions = settingsStore.saveManualExecutions;
+	updateSettings(workflowSettings.value);
+});
+
+function updateSettings(wfSettings: IWorkflowSettings): void {
+	workflowSaveSettings.value.saveFailedExecutions =
+		wfSettings.saveDataErrorExecution === undefined
+			? defaultValues.value.saveFailedExecutions === 'all'
+			: wfSettings.saveDataErrorExecution === 'all';
+	workflowSaveSettings.value.saveSuccessfulExecutions =
+		wfSettings.saveDataSuccessExecution === undefined
+			? defaultValues.value.saveSuccessfulExecutions === 'all'
+			: wfSettings.saveDataSuccessExecution === 'all';
+	workflowSaveSettings.value.saveTestExecutions =
+		wfSettings.saveManualExecutions === undefined
+			? defaultValues.value.saveManualExecutions
+			: (wfSettings.saveManualExecutions as boolean);
+}
+
+function onAccordionClick(event: MouseEvent): void {
+	if (event.target instanceof HTMLAnchorElement) {
+		event.preventDefault();
+		uiStore.openModal(WORKFLOW_SETTINGS_MODAL_KEY);
+	}
+}
+
+function onItemTooltipClick(item: string, event: MouseEvent): void {
+	if (item === 'productionExecutions' && event.target instanceof HTMLAnchorElement) {
+		event.preventDefault();
+		uiStore.openModal(WORKFLOW_SETTINGS_MODAL_KEY);
+	}
+}
+
+function openWorkflowSettings(): void {
+	uiStore.openModal(WORKFLOW_SETTINGS_MODAL_KEY);
+}
+
+async function onSaveWorkflowClick(): Promise<void> {
+	let currentId: string | undefined = undefined;
+	if (currentWorkflowId.value !== PLACEHOLDER_EMPTY_WORKFLOW_ID) {
+		currentId = currentWorkflowId.value;
+	} else if (
+		router.currentRoute.value.params.name &&
+		router.currentRoute.value.params.name !== 'new'
+	) {
+		const routeName = router.currentRoute.value.params.name;
+		currentId = Array.isArray(routeName) ? routeName[0] : routeName;
+	}
+	if (!currentId) {
+		return;
+	}
+	const saved = await workflowHelpers.saveCurrentWorkflow({
+		id: currentId,
+		name: workflowName.value,
+		tags: currentWorkflowTagIds.value,
+	});
+	if (saved) {
+		await npsSurveyStore.fetchPromptsData();
+	}
+}
+</script>
+
 <template>
-	<n8n-info-accordion
+	<N8nInfoAccordion
 		:class="[$style.accordion, 'mt-2xl']"
 		:title="$locale.baseText('executionsLandingPage.emptyState.accordion.title')"
 		:items="accordionItems"
@@ -11,232 +200,30 @@
 		<template #customContent>
 			<footer class="mt-2xs">
 				{{ $locale.baseText('executionsLandingPage.emptyState.accordion.footer') }}
-				<n8n-tooltip :disabled="!isNewWorkflow">
+				<N8nTooltip :disabled="!isNewWorkflow">
 					<template #content>
 						<div>
-							<n8n-link @click.prevent="onSaveWorkflowClick">{{
+							<N8nLink @click.prevent="onSaveWorkflowClick">{{
 								$locale.baseText('executionsLandingPage.emptyState.accordion.footer.tooltipLink')
-							}}</n8n-link>
+							}}</N8nLink>
 							{{
 								$locale.baseText('executionsLandingPage.emptyState.accordion.footer.tooltipText')
 							}}
 						</div>
 					</template>
-					<n8n-link
+					<N8nLink
 						:class="{ [$style.disabled]: isNewWorkflow }"
 						size="small"
 						@click.prevent="openWorkflowSettings"
 					>
 						{{ $locale.baseText('executionsLandingPage.emptyState.accordion.footer.settingsLink') }}
-					</n8n-link>
-				</n8n-tooltip>
+					</N8nLink>
+				</N8nTooltip>
 			</footer>
 		</template>
-	</n8n-info-accordion>
+	</N8nInfoAccordion>
 </template>
 
-<script lang="ts">
-import { defineComponent } from 'vue';
-import { mapStores } from 'pinia';
-import { useRouter } from 'vue-router';
-import { useRootStore } from '@/stores/root.store';
-import { useSettingsStore } from '@/stores/settings.store';
-import { useUIStore } from '@/stores/ui.store';
-import { useWorkflowsStore } from '@/stores/workflows.store';
-import { PLACEHOLDER_EMPTY_WORKFLOW_ID, WORKFLOW_SETTINGS_MODAL_KEY } from '@/constants';
-import type { IWorkflowSettings } from 'n8n-workflow';
-import { deepCopy } from 'n8n-workflow';
-import { useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
-import { useNpsSurveyStore } from '@/stores/npsSurvey.store';
-
-interface IWorkflowSaveSettings {
-	saveFailedExecutions: boolean;
-	saveSuccessfulExecutions: boolean;
-	saveTestExecutions: boolean;
-}
-
-export default defineComponent({
-	name: 'WorkflowExecutionsInfoAccordion',
-	props: {
-		initiallyExpanded: {
-			type: Boolean,
-			default: false,
-		},
-	},
-	setup() {
-		const router = useRouter();
-		const workflowHelpers = useWorkflowHelpers({ router });
-
-		return {
-			workflowHelpers,
-		};
-	},
-	data() {
-		return {
-			defaultValues: {
-				saveFailedExecutions: 'all',
-				saveSuccessfulExecutions: 'all',
-				saveManualExecutions: false,
-			},
-			workflowSaveSettings: {
-				saveFailedExecutions: false,
-				saveSuccessfulExecutions: false,
-				saveTestExecutions: false,
-			} as IWorkflowSaveSettings,
-		};
-	},
-	computed: {
-		...mapStores(useRootStore, useSettingsStore, useUIStore, useWorkflowsStore, useNpsSurveyStore),
-		accordionItems(): object[] {
-			return [
-				{
-					id: 'productionExecutions',
-					label: this.$locale.baseText(
-						'executionsLandingPage.emptyState.accordion.productionExecutions',
-					),
-					icon: this.productionExecutionsIcon.icon,
-					iconColor: this.productionExecutionsIcon.color,
-					tooltip:
-						this.productionExecutionsStatus === 'unknown'
-							? this.$locale.baseText(
-									'executionsLandingPage.emptyState.accordion.productionExecutionsWarningTooltip',
-								)
-							: null,
-				},
-				{
-					id: 'manualExecutions',
-					label: this.$locale.baseText('executionsLandingPage.emptyState.accordion.testExecutions'),
-					icon: this.workflowSaveSettings.saveTestExecutions ? 'check' : 'times',
-					iconColor: this.workflowSaveSettings.saveTestExecutions ? 'success' : 'danger',
-				},
-			];
-		},
-		shouldExpandAccordion(): boolean {
-			if (!this.initiallyExpanded) {
-				return false;
-			}
-			return (
-				!this.workflowSaveSettings.saveFailedExecutions ||
-				!this.workflowSaveSettings.saveSuccessfulExecutions ||
-				!this.workflowSaveSettings.saveTestExecutions
-			);
-		},
-		productionExecutionsIcon(): { icon: string; color: string } {
-			if (this.productionExecutionsStatus === 'saving') {
-				return { icon: 'check', color: 'success' };
-			} else if (this.productionExecutionsStatus === 'not-saving') {
-				return { icon: 'times', color: 'danger' };
-			}
-			return { icon: 'exclamation-triangle', color: 'warning' };
-		},
-		productionExecutionsStatus(): string {
-			if (
-				this.workflowSaveSettings.saveSuccessfulExecutions ===
-				this.workflowSaveSettings.saveFailedExecutions
-			) {
-				if (this.workflowSaveSettings.saveSuccessfulExecutions) {
-					return 'saving';
-				}
-				return 'not-saving';
-			} else {
-				return 'unknown';
-			}
-		},
-		workflowSettings(): IWorkflowSettings {
-			const workflowSettings = deepCopy(this.workflowsStore.workflowSettings);
-			return workflowSettings;
-		},
-		accordionIcon(): { icon: string; color: string } | null {
-			if (
-				!this.workflowSaveSettings.saveTestExecutions ||
-				this.productionExecutionsStatus !== 'saving'
-			) {
-				return { icon: 'exclamation-triangle', color: 'warning' };
-			}
-			return null;
-		},
-		currentWorkflowId(): string {
-			return this.workflowsStore.workflowId;
-		},
-		isNewWorkflow(): boolean {
-			return (
-				!this.currentWorkflowId ||
-				this.currentWorkflowId === PLACEHOLDER_EMPTY_WORKFLOW_ID ||
-				this.currentWorkflowId === 'new'
-			);
-		},
-		workflowName(): string {
-			return this.workflowsStore.workflowName;
-		},
-		currentWorkflowTagIds(): string[] {
-			return this.workflowsStore.workflowTags;
-		},
-	},
-	watch: {
-		workflowSettings(newSettings: IWorkflowSettings) {
-			this.updateSettings(newSettings);
-		},
-	},
-	mounted() {
-		this.defaultValues.saveFailedExecutions = this.settingsStore.saveDataErrorExecution;
-		this.defaultValues.saveSuccessfulExecutions = this.settingsStore.saveDataSuccessExecution;
-		this.defaultValues.saveManualExecutions = this.settingsStore.saveManualExecutions;
-		this.updateSettings(this.workflowSettings);
-	},
-	methods: {
-		updateSettings(workflowSettings: IWorkflowSettings): void {
-			this.workflowSaveSettings.saveFailedExecutions =
-				workflowSettings.saveDataErrorExecution === undefined
-					? this.defaultValues.saveFailedExecutions === 'all'
-					: workflowSettings.saveDataErrorExecution === 'all';
-			this.workflowSaveSettings.saveSuccessfulExecutions =
-				workflowSettings.saveDataSuccessExecution === undefined
-					? this.defaultValues.saveSuccessfulExecutions === 'all'
-					: workflowSettings.saveDataSuccessExecution === 'all';
-			this.workflowSaveSettings.saveTestExecutions =
-				workflowSettings.saveManualExecutions === undefined
-					? this.defaultValues.saveManualExecutions
-					: (workflowSettings.saveManualExecutions as boolean);
-		},
-		onAccordionClick(event: MouseEvent): void {
-			if (event.target instanceof HTMLAnchorElement) {
-				event.preventDefault();
-				this.uiStore.openModal(WORKFLOW_SETTINGS_MODAL_KEY);
-			}
-		},
-		onItemTooltipClick(item: string, event: MouseEvent): void {
-			if (item === 'productionExecutions' && event.target instanceof HTMLAnchorElement) {
-				event.preventDefault();
-				this.uiStore.openModal(WORKFLOW_SETTINGS_MODAL_KEY);
-			}
-		},
-		openWorkflowSettings(): void {
-			this.uiStore.openModal(WORKFLOW_SETTINGS_MODAL_KEY);
-		},
-		async onSaveWorkflowClick(): Promise<void> {
-			let currentId: string | undefined = undefined;
-			if (this.currentWorkflowId !== PLACEHOLDER_EMPTY_WORKFLOW_ID) {
-				currentId = this.currentWorkflowId;
-			} else if (this.$route.params.name && this.$route.params.name !== 'new') {
-				const routeName = this.$route.params.name;
-				currentId = Array.isArray(routeName) ? routeName[0] : routeName;
-			}
-			if (!currentId) {
-				return;
-			}
-			const saved = await this.workflowHelpers.saveCurrentWorkflow({
-				id: currentId,
-				name: this.workflowName,
-				tags: this.currentWorkflowTagIds,
-			});
-			if (saved) {
-				await this.npsSurveyStore.fetchPromptsData();
-			}
-		},
-	},
-});
-</script>
-
 <style module lang="scss">
 .accordion {
 	background: none;
diff --git a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsLandingPage.vue b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsLandingPage.vue
index 59245e3a3eee0..1ac815c1b1f26 100644
--- a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsLandingPage.vue
+++ b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsLandingPage.vue
@@ -1,67 +1,62 @@
+<script setup lang="ts">
+import { computed } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+import { PLACEHOLDER_EMPTY_WORKFLOW_ID, VIEWS } from '@/constants';
+import { useUIStore } from '@/stores/ui.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import WorkflowExecutionsInfoAccordion from './WorkflowExecutionsInfoAccordion.vue';
+import { useI18n } from '@/composables/useI18n';
+
+const router = useRouter();
+const route = useRoute();
+const locale = useI18n();
+
+const uiStore = useUIStore();
+const workflowsStore = useWorkflowsStore();
+
+const executionCount = computed(() => workflowsStore.currentWorkflowExecutions.length);
+const containsTrigger = computed(() => workflowsStore.workflowTriggerNodes.length > 0);
+
+function onSetupFirstStep(): void {
+	uiStore.addFirstStepOnLoad = true;
+	const workflowRoute = getWorkflowRoute();
+	void router.push(workflowRoute);
+}
+
+function getWorkflowRoute(): { name: string; params: {} } {
+	const workflowId = workflowsStore.workflowId || route.params.name;
+	if (workflowId === PLACEHOLDER_EMPTY_WORKFLOW_ID) {
+		return { name: VIEWS.NEW_WORKFLOW, params: {} };
+	} else {
+		return { name: VIEWS.WORKFLOW, params: { name: workflowId } };
+	}
+}
+</script>
+
 <template>
 	<div :class="['workflow-executions-container', $style.container]">
 		<div v-if="executionCount === 0" :class="[$style.messageContainer, $style.noExecutionsMessage]">
 			<div v-if="!containsTrigger">
-				<n8n-heading tag="h2" size="xlarge" color="text-dark" class="mb-2xs">
-					{{ $locale.baseText('executionsLandingPage.emptyState.noTrigger.heading') }}
-				</n8n-heading>
-				<n8n-text size="medium">
-					{{ $locale.baseText('executionsLandingPage.emptyState.message') }}
-				</n8n-text>
-				<n8n-button class="mt-l" type="tertiary" size="large" @click="onSetupFirstStep">
-					{{ $locale.baseText('executionsLandingPage.emptyState.noTrigger.buttonText') }}
-				</n8n-button>
+				<N8nHeading tag="h2" size="xlarge" color="text-dark" class="mb-2xs">
+					{{ locale.baseText('executionsLandingPage.emptyState.noTrigger.heading') }}
+				</N8nHeading>
+				<N8nText size="medium">
+					{{ locale.baseText('executionsLandingPage.emptyState.message') }}
+				</N8nText>
+				<N8nButton class="mt-l" type="tertiary" size="large" @click="onSetupFirstStep">
+					{{ locale.baseText('executionsLandingPage.emptyState.noTrigger.buttonText') }}
+				</N8nButton>
 			</div>
 			<div v-else>
-				<n8n-heading tag="h2" size="xlarge" color="text-dark" class="mb-2xs">
-					{{ $locale.baseText('executionsLandingPage.emptyState.heading') }}
-				</n8n-heading>
+				<N8nHeading tag="h2" size="xlarge" color="text-dark" class="mb-2xs">
+					{{ locale.baseText('executionsLandingPage.emptyState.heading') }}
+				</N8nHeading>
 				<WorkflowExecutionsInfoAccordion />
 			</div>
 		</div>
 	</div>
 </template>
 
-<script lang="ts">
-import { PLACEHOLDER_EMPTY_WORKFLOW_ID, VIEWS } from '@/constants';
-import { useUIStore } from '@/stores/ui.store';
-import { useWorkflowsStore } from '@/stores/workflows.store';
-import { mapStores } from 'pinia';
-import { defineComponent } from 'vue';
-import WorkflowExecutionsInfoAccordion from './WorkflowExecutionsInfoAccordion.vue';
-
-export default defineComponent({
-	name: 'ExecutionsLandingPage',
-	components: {
-		WorkflowExecutionsInfoAccordion,
-	},
-	computed: {
-		...mapStores(useUIStore, useWorkflowsStore),
-		executionCount(): number {
-			return this.workflowsStore.currentWorkflowExecutions.length;
-		},
-		containsTrigger(): boolean {
-			return this.workflowsStore.workflowTriggerNodes.length > 0;
-		},
-	},
-	methods: {
-		onSetupFirstStep(): void {
-			this.uiStore.addFirstStepOnLoad = true;
-			const workflowRoute = this.getWorkflowRoute();
-			void this.$router.push(workflowRoute);
-		},
-		getWorkflowRoute(): { name: string; params: {} } {
-			const workflowId = this.workflowsStore.workflowId || this.$route.params.name;
-			if (workflowId === PLACEHOLDER_EMPTY_WORKFLOW_ID) {
-				return { name: VIEWS.NEW_WORKFLOW, params: {} };
-			} else {
-				return { name: VIEWS.WORKFLOW, params: { name: workflowId } };
-			}
-		},
-	},
-});
-</script>
-
 <style module lang="scss">
 .container {
 	width: 100%;
diff --git a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsList.vue b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsList.vue
index 9e66df8117baa..fda8e084876bb 100644
--- a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsList.vue
+++ b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsList.vue
@@ -1,30 +1,5 @@
-<template>
-	<div :class="$style.container">
-		<WorkflowExecutionsSidebar
-			:executions="executions"
-			:loading="loading && !executions.length"
-			:loading-more="loadingMore"
-			:temporary-execution="temporaryExecution"
-			@update:auto-refresh="emit('update:auto-refresh', $event)"
-			@reload-executions="emit('reload')"
-			@filter-updated="emit('update:filters', $event)"
-			@load-more="emit('load-more')"
-			@retry-execution="onRetryExecution"
-		/>
-		<div v-if="!hidePreview" :class="$style.content">
-			<router-view
-				name="executionPreview"
-				:execution="execution"
-				@delete-current-execution="onDeleteCurrentExecution"
-				@retry-execution="onRetryExecution"
-				@stop-execution="onStopExecution"
-			/>
-		</div>
-	</div>
-</template>
-
 <script setup lang="ts">
-import { computed } from 'vue';
+import { computed, watch } from 'vue';
 import { onBeforeRouteLeave, useRouter } from 'vue-router';
 import WorkflowExecutionsSidebar from '@/components/executions/workflow/WorkflowExecutionsSidebar.vue';
 import { MAIN_HEADER_TABS, VIEWS } from '@/constants';
@@ -32,7 +7,6 @@ import type { ExecutionFilterType, IWorkflowDb } from '@/Interface';
 import type { ExecutionSummary } from 'n8n-workflow';
 import { getNodeViewTab } from '@/utils/canvasUtils';
 import { useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
-import { watch } from 'vue';
 
 const props = withDefaults(
 	defineProps<{
@@ -62,10 +36,11 @@ const emit = defineEmits<{
 const workflowHelpers = useWorkflowHelpers({ router: useRouter() });
 const router = useRouter();
 
-const temporaryExecution = computed(() => {
-	const isTemporary = !props.executions.find((execution) => execution.id === props.execution?.id);
-	return isTemporary ? props.execution : undefined;
-});
+const temporaryExecution = computed<ExecutionSummary | undefined>(() =>
+	props.executions.find((execution) => execution.id === props.execution?.id)
+		? undefined
+		: props.execution ?? undefined,
+);
 
 const hidePreview = computed(() => {
 	return props.loading || (!props.execution && props.executions.length);
@@ -118,6 +93,32 @@ onBeforeRouteLeave(async (to, _, next) => {
 });
 </script>
 
+<template>
+	<div :class="$style.container">
+		<WorkflowExecutionsSidebar
+			:executions="executions"
+			:loading="loading && !executions.length"
+			:loading-more="loadingMore"
+			:temporary-execution="temporaryExecution"
+			:workflow="workflow"
+			@update:auto-refresh="emit('update:auto-refresh', $event)"
+			@reload-executions="emit('reload')"
+			@filter-updated="emit('update:filters', $event)"
+			@load-more="emit('load-more')"
+			@retry-execution="onRetryExecution"
+		/>
+		<div v-if="!hidePreview" :class="$style.content">
+			<router-view
+				name="executionPreview"
+				:execution="execution"
+				@delete-current-execution="onDeleteCurrentExecution"
+				@retry-execution="onRetryExecution"
+				@stop-execution="onStopExecution"
+			/>
+		</div>
+	</div>
+</template>
+
 <style module lang="scss">
 .container {
 	display: flex;
diff --git a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsPreview.test.ts b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsPreview.test.ts
index eb09c96974120..ce092dab46a8a 100644
--- a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsPreview.test.ts
+++ b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsPreview.test.ts
@@ -11,6 +11,8 @@ import { EnterpriseEditionFeature, VIEWS } from '@/constants';
 import { i18nInstance, I18nPlugin } from '@/plugins/i18n';
 import { FontAwesomePlugin } from '@/plugins/icons';
 import { GlobalComponentsPlugin } from '@/plugins/components';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import type { IWorkflowDb } from '@/Interface';
 
 let pinia: ReturnType<typeof createPinia>;
 
@@ -59,10 +61,12 @@ const executionDataFactory = (): ExecutionSummary => ({
 	nodeExecutionStatus: {},
 	retryOf: generateUndefinedNullOrString(),
 	retrySuccessId: generateUndefinedNullOrString(),
+	scopes: ['workflow:update'],
 });
 
 describe('WorkflowExecutionsPreview.vue', () => {
 	let settingsStore: ReturnType<typeof useSettingsStore>;
+	let workflowsStore: ReturnType<typeof useWorkflowsStore>;
 	const executionData: ExecutionSummary = executionDataFactory();
 
 	beforeEach(() => {
@@ -70,19 +74,25 @@ describe('WorkflowExecutionsPreview.vue', () => {
 		setActivePinia(pinia);
 
 		settingsStore = useSettingsStore();
+		workflowsStore = useWorkflowsStore();
 	});
 
 	test.each([
-		[false, '/'],
-		[true, `/workflow/${executionData.workflowId}/debug/${executionData.id}`],
+		[false, [], '/'],
+		[false, ['workflow:update'], '/'],
+		[true, [], '/'],
+		[true, ['workflow:read'], '/'],
+		[true, ['workflow:update'], `/workflow/${executionData.workflowId}/debug/${executionData.id}`],
 	])(
-		'when debug enterprise feature is %s it should handle debug link click accordingly',
-		async (availability, path) => {
+		'when debug enterprise feature is %s with workflow scopes %s it should handle debug link click accordingly',
+		async (availability, scopes, path) => {
 			settingsStore.settings.enterprise = {
 				...(settingsStore.settings.enterprise ?? {}),
 				[EnterpriseEditionFeature.DebugInEditor]: availability,
 			};
 
+			vi.spyOn(workflowsStore, 'getWorkflowById').mockReturnValue({ scopes } as IWorkflowDb);
+
 			// Not using createComponentRenderer helper here because this component should not stub `router-link`
 			const { getByTestId } = render(WorkflowExecutionsPreview, {
 				props: {
diff --git a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsPreview.vue b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsPreview.vue
index af5c725a716be..677046f4bdc79 100644
--- a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsPreview.vue
+++ b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsPreview.vue
@@ -1,22 +1,113 @@
+<script lang="ts" setup>
+import { computed, ref } from 'vue';
+import { useRoute } from 'vue-router';
+import { ElDropdown } from 'element-plus';
+import { useExecutionDebugging } from '@/composables/useExecutionDebugging';
+import { useMessage } from '@/composables/useMessage';
+import WorkflowPreview from '@/components/WorkflowPreview.vue';
+import { MODAL_CONFIRM, VIEWS } from '@/constants';
+import type { ExecutionSummary } from 'n8n-workflow';
+import type { IExecutionUIData } from '@/composables/useExecutionHelpers';
+import { useExecutionHelpers } from '@/composables/useExecutionHelpers';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useI18n } from '@/composables/useI18n';
+import { getResourcePermissions } from '@/permissions';
+
+type RetryDropdownRef = InstanceType<typeof ElDropdown>;
+
+const props = defineProps<{
+	execution: ExecutionSummary;
+}>();
+
+const emit = defineEmits<{
+	deleteCurrentExecution: [];
+	retryExecution: Array<{ execution: ExecutionSummary; command: string }>;
+	stopExecution: [];
+}>();
+
+const route = useRoute();
+const locale = useI18n();
+
+const executionHelpers = useExecutionHelpers();
+const message = useMessage();
+const executionDebugging = useExecutionDebugging();
+const workflowsStore = useWorkflowsStore();
+
+const retryDropdownRef = ref<RetryDropdownRef | null>(null);
+const workflowId = computed(() => route.params.name as string);
+const workflowPermissions = computed(
+	() => getResourcePermissions(workflowsStore.getWorkflowById(workflowId.value)?.scopes).workflow,
+);
+const executionId = computed(() => route.params.executionId as string);
+const executionUIDetails = computed<IExecutionUIData | null>(() =>
+	props.execution ? executionHelpers.getUIDetails(props.execution) : null,
+);
+const debugButtonData = computed(() =>
+	props.execution?.status === 'success'
+		? {
+				text: locale.baseText('executionsList.debug.button.copyToEditor'),
+				type: 'secondary',
+			}
+		: {
+				text: locale.baseText('executionsList.debug.button.debugInEditor'),
+				type: 'primary',
+			},
+);
+const isRetriable = computed(
+	() => !!props.execution && executionHelpers.isExecutionRetriable(props.execution),
+);
+
+async function onDeleteExecution(): Promise<void> {
+	const deleteConfirmed = await message.confirm(
+		locale.baseText('executionDetails.confirmMessage.message'),
+		locale.baseText('executionDetails.confirmMessage.headline'),
+		{
+			type: 'warning',
+			confirmButtonText: locale.baseText('executionDetails.confirmMessage.confirmButtonText'),
+			cancelButtonText: '',
+		},
+	);
+	if (deleteConfirmed !== MODAL_CONFIRM) {
+		return;
+	}
+	emit('deleteCurrentExecution');
+}
+
+function handleRetryClick(command: string) {
+	emit('retryExecution', { execution: props.execution, command });
+}
+
+function handleStopClick() {
+	emit('stopExecution');
+}
+
+function onRetryButtonBlur(event: FocusEvent) {
+	// Hide dropdown when clicking outside of current document
+	if (retryDropdownRef.value && event.relatedTarget === null) {
+		retryDropdownRef.value.handleClose();
+	}
+}
+</script>
+
 <template>
 	<div v-if="executionUIDetails?.name === 'new'" :class="$style.newInfo">
-		<n8n-text :class="$style.newMessage" color="text-light">
-			{{ $locale.baseText('executionDetails.newMessage') }}
-		</n8n-text>
-		<n8n-button class="mt-l" type="tertiary" @click="handleStopClick">
-			{{ $locale.baseText('executionsList.stopExecution') }}
-		</n8n-button>
+		<N8nText :class="$style.newMessage" color="text-light">
+			{{ locale.baseText('executionDetails.newMessage') }}
+		</N8nText>
+		<N8nButton class="mt-l" type="tertiary" @click="handleStopClick">
+			{{ locale.baseText('executionsList.stopExecution') }}
+		</N8nButton>
 	</div>
 	<div v-else-if="executionUIDetails?.name === 'running'" :class="$style.runningInfo">
 		<div :class="$style.spinner">
-			<n8n-spinner type="ring" />
+			<N8nSpinner type="ring" />
 		</div>
-		<n8n-text :class="$style.runningMessage" color="text-light">
-			{{ $locale.baseText('executionDetails.runningMessage') }}
-		</n8n-text>
-		<n8n-button class="mt-l" type="tertiary" @click="handleStopClick">
-			{{ $locale.baseText('executionsList.stopExecution') }}
-		</n8n-button>
+		<N8nText :class="$style.runningMessage" color="text-light">
+			{{ locale.baseText('executionDetails.runningMessage') }}
+		</N8nText>
+		<N8nButton class="mt-l" type="tertiary" @click="handleStopClick">
+			{{ locale.baseText('executionsList.stopExecution') }}
+		</N8nButton>
 	</div>
 	<div v-else-if="executionUIDetails" :class="$style.previewContainer">
 		<div
@@ -25,57 +116,53 @@
 			:data-test-id="`execution-preview-details-${executionId}`"
 		>
 			<div>
-				<n8n-text size="large" color="text-base" :bold="true" data-test-id="execution-time">{{
+				<N8nText size="large" color="text-base" :bold="true" data-test-id="execution-time">{{
 					executionUIDetails?.startTime
-				}}</n8n-text
+				}}</N8nText
 				><br />
-				<n8n-spinner
+				<N8nSpinner
 					v-if="executionUIDetails?.name === 'running'"
 					size="small"
 					:class="[$style.spinner, 'mr-4xs']"
 				/>
-				<n8n-text
+				<N8nText
 					size="medium"
 					:class="[$style.status, $style[executionUIDetails.name]]"
 					data-test-id="execution-preview-label"
 				>
 					{{ executionUIDetails.label }}
-				</n8n-text>
+				</N8nText>
 				{{ ' ' }}
-				<n8n-text
-					v-if="executionUIDetails?.showTimestamp === false"
-					color="text-base"
-					size="medium"
-				>
+				<N8nText v-if="executionUIDetails?.showTimestamp === false" color="text-base" size="medium">
 					| ID#{{ execution.id }}
-				</n8n-text>
-				<n8n-text v-else-if="executionUIDetails.name === 'running'" color="text-base" size="medium">
+				</N8nText>
+				<N8nText v-else-if="executionUIDetails.name === 'running'" color="text-base" size="medium">
 					{{
-						$locale.baseText('executionDetails.runningTimeRunning', {
+						locale.baseText('executionDetails.runningTimeRunning', {
 							interpolate: { time: executionUIDetails?.runningTime },
 						})
 					}}
 					| ID#{{ execution.id }}
-				</n8n-text>
-				<n8n-text
+				</N8nText>
+				<N8nText
 					v-else-if="executionUIDetails.name !== 'waiting'"
 					color="text-base"
 					size="medium"
 					data-test-id="execution-preview-id"
 				>
 					{{
-						$locale.baseText('executionDetails.runningTimeFinished', {
+						locale.baseText('executionDetails.runningTimeFinished', {
 							interpolate: { time: executionUIDetails?.runningTime ?? 'unknown' },
 						})
 					}}
 					| ID#{{ execution.id }}
-				</n8n-text>
-				<br /><n8n-text v-if="execution.mode === 'retry'" color="text-base" size="medium">
-					{{ $locale.baseText('executionDetails.retry') }}
+				</N8nText>
+				<br /><N8nText v-if="execution.mode === 'retry'" color="text-base" size="medium">
+					{{ locale.baseText('executionDetails.retry') }}
 					<router-link
 						:class="$style.executionLink"
 						:to="{
-							name: executionPreviewViewName,
+							name: VIEWS.EXECUTION_PREVIEW,
 							params: {
 								workflowId: execution.workflowId,
 								executionId: execution.retryOf,
@@ -84,24 +171,31 @@
 					>
 						#{{ execution.retryOf }}
 					</router-link>
-				</n8n-text>
+				</N8nText>
 			</div>
 			<div>
-				<n8n-button size="medium" :type="debugButtonData.type" :class="$style.debugLink">
-					<router-link
-						:to="{
-							name: executionDebugViewName,
-							params: {
-								name: execution.workflowId,
-								executionId: execution.id,
-							},
-						}"
+				<router-link
+					:to="{
+						name: VIEWS.EXECUTION_DEBUG,
+						params: {
+							name: execution.workflowId,
+							executionId: execution.id,
+						},
+					}"
+				>
+					<N8nButton
+						size="medium"
+						:type="debugButtonData.type"
+						:class="$style.debugLink"
+						:disabled="!workflowPermissions.update"
 					>
-						<span data-test-id="execution-debug-button" @click="handleDebugLinkClick">{{
-							debugButtonData.text
-						}}</span>
-					</router-link>
-				</n8n-button>
+						<span
+							data-test-id="execution-debug-button"
+							@click="executionDebugging.handleDebugLinkClick"
+							>{{ debugButtonData.text }}</span
+						>
+					</N8nButton>
+				</router-link>
 
 				<ElDropdown
 					v-if="isRetriable"
@@ -111,28 +205,30 @@
 					@command="handleRetryClick"
 				>
 					<span class="retry-button">
-						<n8n-icon-button
+						<N8nIconButton
 							size="medium"
 							type="tertiary"
-							:title="$locale.baseText('executionsList.retryExecution')"
+							:title="locale.baseText('executionsList.retryExecution')"
+							:disabled="!workflowPermissions.update"
 							icon="redo"
 							data-test-id="execution-preview-retry-button"
 							@blur="onRetryButtonBlur"
 						/>
 					</span>
 					<template #dropdown>
-						<el-dropdown-menu>
-							<el-dropdown-item command="current-workflow">
-								{{ $locale.baseText('executionsList.retryWithCurrentlySavedWorkflow') }}
-							</el-dropdown-item>
-							<el-dropdown-item command="original-workflow">
-								{{ $locale.baseText('executionsList.retryWithOriginalWorkflow') }}
-							</el-dropdown-item>
-						</el-dropdown-menu>
+						<ElDropdownMenu>
+							<ElDropdownItem command="current-workflow">
+								{{ locale.baseText('executionsList.retryWithCurrentlySavedWorkflow') }}
+							</ElDropdownItem>
+							<ElDropdownItem command="original-workflow">
+								{{ locale.baseText('executionsList.retryWithOriginalWorkflow') }}
+							</ElDropdownItem>
+						</ElDropdownMenu>
 					</template>
 				</ElDropdown>
-				<n8n-icon-button
-					:title="$locale.baseText('executionDetails.deleteExecution')"
+				<N8nIconButton
+					:title="locale.baseText('executionDetails.deleteExecution')"
+					:disabled="!workflowPermissions.update"
 					icon="trash"
 					size="medium"
 					type="tertiary"
@@ -145,115 +241,11 @@
 			mode="execution"
 			loader-type="spinner"
 			:execution-id="executionId"
-			:execution-mode="executionMode"
+			:execution-mode="execution?.mode || ''"
 		/>
 	</div>
 </template>
 
-<script lang="ts">
-import type { PropType } from 'vue';
-import { defineComponent } from 'vue';
-import { ElDropdown } from 'element-plus';
-import { useExecutionDebugging } from '@/composables/useExecutionDebugging';
-import { useMessage } from '@/composables/useMessage';
-import WorkflowPreview from '@/components/WorkflowPreview.vue';
-import { MODAL_CONFIRM, VIEWS } from '@/constants';
-import type { ExecutionSummary } from 'n8n-workflow';
-import type { IExecutionUIData } from '@/composables/useExecutionHelpers';
-import { useExecutionHelpers } from '@/composables/useExecutionHelpers';
-import { useWorkflowsStore } from '@/stores/workflows.store';
-import { mapStores } from 'pinia';
-
-type RetryDropdownRef = InstanceType<typeof ElDropdown> & { hide: () => void };
-
-export default defineComponent({
-	name: 'WorkflowExecutionsPreview',
-	components: {
-		ElDropdown,
-		WorkflowPreview,
-	},
-	props: {
-		execution: {
-			type: Object as PropType<ExecutionSummary>,
-			required: true,
-		},
-	},
-	setup() {
-		const executionHelpers = useExecutionHelpers();
-
-		return {
-			executionHelpers,
-			...useMessage(),
-			...useExecutionDebugging(),
-		};
-	},
-	computed: {
-		...mapStores(useWorkflowsStore),
-		executionId(): string {
-			return this.$route.params.executionId as string;
-		},
-		executionUIDetails(): IExecutionUIData | null {
-			return this.execution ? this.executionHelpers.getUIDetails(this.execution) : null;
-		},
-		executionMode(): string {
-			return this.execution?.mode || '';
-		},
-		debugButtonData(): Record<string, string> {
-			return this.execution?.status === 'success'
-				? {
-						text: this.$locale.baseText('executionsList.debug.button.copyToEditor'),
-						type: 'secondary',
-					}
-				: {
-						text: this.$locale.baseText('executionsList.debug.button.debugInEditor'),
-						type: 'primary',
-					};
-		},
-		isRetriable(): boolean {
-			return !!this.execution && this.executionHelpers.isExecutionRetriable(this.execution);
-		},
-		executionDebugViewName() {
-			return VIEWS.EXECUTION_DEBUG;
-		},
-		executionPreviewViewName() {
-			return VIEWS.EXECUTION_PREVIEW;
-		},
-	},
-	methods: {
-		async onDeleteExecution(): Promise<void> {
-			const deleteConfirmed = await this.confirm(
-				this.$locale.baseText('executionDetails.confirmMessage.message'),
-				this.$locale.baseText('executionDetails.confirmMessage.headline'),
-				{
-					type: 'warning',
-					confirmButtonText: this.$locale.baseText(
-						'executionDetails.confirmMessage.confirmButtonText',
-					),
-					cancelButtonText: '',
-				},
-			);
-			if (deleteConfirmed !== MODAL_CONFIRM) {
-				return;
-			}
-			this.$emit('deleteCurrentExecution');
-		},
-		handleRetryClick(command: string): void {
-			this.$emit('retryExecution', { execution: this.execution, command });
-		},
-		handleStopClick(): void {
-			this.$emit('stopExecution');
-		},
-		onRetryButtonBlur(event: FocusEvent): void {
-			// Hide dropdown when clicking outside of current document
-			const retryDropdownRef = this.$refs.retryDropdown as RetryDropdownRef | undefined;
-			if (retryDropdownRef && event.relatedTarget === null) {
-				retryDropdownRef.handleClose();
-			}
-		},
-	},
-});
-</script>
-
 <style module lang="scss">
 .previewContainer {
 	position: relative;
@@ -321,7 +313,6 @@ export default defineComponent({
 
 .debugLink {
 	margin-right: var(--spacing-xs);
-	padding: 0;
 
 	a > span {
 		display: block;
diff --git a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsSidebar.vue b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsSidebar.vue
index 0186ef4830a1a..fec95888ee43e 100644
--- a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsSidebar.vue
+++ b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsSidebar.vue
@@ -1,6 +1,170 @@
+<script setup lang="ts">
+import { ref, computed, watch } from 'vue';
+import type { ComponentPublicInstance } from 'vue';
+import type { RouteLocationNormalizedLoaded } from 'vue-router';
+import { useRoute, useRouter } from 'vue-router';
+import WorkflowExecutionsCard from '@/components/executions/workflow/WorkflowExecutionsCard.vue';
+import WorkflowExecutionsInfoAccordion from '@/components/executions/workflow/WorkflowExecutionsInfoAccordion.vue';
+import ExecutionsFilter from '@/components/executions/ExecutionsFilter.vue';
+import { VIEWS } from '@/constants';
+import type { ExecutionSummary } from 'n8n-workflow';
+import { useExecutionsStore } from '@/stores/executions.store';
+import type { ExecutionFilterType, IWorkflowDb } from '@/Interface';
+import { isComponentPublicInstance } from '@/utils/typeGuards';
+import { getResourcePermissions } from '@/permissions';
+
+type AutoScrollDeps = { activeExecutionSet: boolean; cardsMounted: boolean; scroll: boolean };
+
+const props = defineProps<{
+	workflow?: IWorkflowDb;
+	executions: ExecutionSummary[];
+	loading: boolean;
+	loadingMore: boolean;
+	temporaryExecution?: ExecutionSummary;
+}>();
+
+const emit = defineEmits<{
+	retryExecution: [payload: { execution: ExecutionSummary; command: string }];
+	loadMore: [amount: number];
+	filterUpdated: [filter: ExecutionFilterType];
+	'update:autoRefresh': [boolean];
+}>();
+
+const route = useRoute();
+const router = useRouter();
+
+const executionsStore = useExecutionsStore();
+
+const mountedItems = ref<string[]>([]);
+const autoScrollDeps = ref<AutoScrollDeps>({
+	activeExecutionSet: false,
+	cardsMounted: false,
+	scroll: true,
+});
+const currentWorkflowExecutionsCardRefs = ref<Record<string, ComponentPublicInstance>>({});
+const sidebarContainerRef = ref<HTMLElement | null>(null);
+const executionListRef = ref<HTMLElement | null>(null);
+
+const workflowPermissions = computed(() => getResourcePermissions(props.workflow?.scopes).workflow);
+
+watch(
+	() => route,
+	(to: RouteLocationNormalizedLoaded, from: RouteLocationNormalizedLoaded) => {
+		if (from.name === VIEWS.EXECUTION_PREVIEW && to.name === VIEWS.EXECUTION_HOME) {
+			// Skip parent route when navigating through executions with back button
+			router.go(-1);
+		}
+	},
+);
+
+watch(
+	() => executionsStore.activeExecution,
+	(newValue: ExecutionSummary | null, oldValue: ExecutionSummary | null) => {
+		if (newValue && newValue.id !== oldValue?.id) {
+			autoScrollDeps.value.activeExecutionSet = true;
+		}
+	},
+);
+
+watch(
+	autoScrollDeps,
+	(updatedDeps: AutoScrollDeps) => {
+		if (Object.values(updatedDeps).every(Boolean)) {
+			scrollToActiveCard();
+		}
+	},
+	{ deep: true },
+);
+
+function addCurrentWorkflowExecutionsCardRef(
+	comp: Element | ComponentPublicInstance | null,
+	id?: string,
+) {
+	if (comp && isComponentPublicInstance(comp) && id) {
+		currentWorkflowExecutionsCardRefs.value[id] = comp;
+	}
+}
+
+function onItemMounted(id: string): void {
+	mountedItems.value.push(id);
+	if (mountedItems.value.length === props.executions.length) {
+		autoScrollDeps.value.cardsMounted = true;
+		checkListSize();
+	}
+
+	if (executionsStore.activeExecution?.id === id) {
+		autoScrollDeps.value.activeExecutionSet = true;
+	}
+}
+
+function loadMore(limit = 20): void {
+	if (!props.loading) {
+		if (executionListRef.value) {
+			const diff =
+				executionListRef.value.offsetHeight -
+				(executionListRef.value.scrollHeight - executionListRef.value.scrollTop);
+			if (diff > -10 && diff < 10) {
+				emit('loadMore', limit);
+			}
+		}
+	}
+}
+
+function onRetryExecution(payload: { execution: ExecutionSummary; command: string }) {
+	emit('retryExecution', payload);
+}
+
+function onFilterChanged(filter: ExecutionFilterType) {
+	autoScrollDeps.value.activeExecutionSet = false;
+	autoScrollDeps.value.scroll = true;
+	mountedItems.value = [];
+	emit('filterUpdated', filter);
+}
+
+function onAutoRefreshChange(enabled: boolean) {
+	emit('update:autoRefresh', enabled);
+}
+
+function checkListSize(): void {
+	// Find out how many execution card can fit into list
+	// and load more if needed
+	const cards = Object.values(currentWorkflowExecutionsCardRefs.value);
+	if (sidebarContainerRef.value && cards.length) {
+		const cardElement = cards[0].$el as HTMLElement;
+		const listCapacity = Math.ceil(
+			sidebarContainerRef.value.clientHeight / cardElement.clientHeight,
+		);
+
+		if (listCapacity > props.executions.length) {
+			emit('loadMore', listCapacity - props.executions.length);
+		}
+	}
+}
+
+function scrollToActiveCard(): void {
+	if (
+		executionListRef.value &&
+		executionsStore.activeExecution &&
+		currentWorkflowExecutionsCardRefs.value[executionsStore.activeExecution.id]
+	) {
+		const cardElement =
+			currentWorkflowExecutionsCardRefs.value[executionsStore.activeExecution.id].$el;
+		const cardRect = cardElement.getBoundingClientRect();
+		const LIST_HEADER_OFFSET = 200;
+		if (cardRect.top > executionListRef.value.offsetHeight) {
+			autoScrollDeps.value.scroll = false;
+			executionListRef.value.scrollTo({
+				top: cardRect.top - LIST_HEADER_OFFSET,
+				behavior: 'smooth',
+			});
+		}
+	}
+}
+</script>
+
 <template>
 	<div
-		ref="container"
+		ref="sidebarContainerRef"
 		:class="['executions-sidebar', $style.container]"
 		data-test-id="executions-sidebar"
 	>
@@ -13,14 +177,14 @@
 			<el-checkbox
 				v-model="executionsStore.autoRefresh"
 				data-test-id="auto-refresh-checkbox"
-				@update:model-value="$emit('update:autoRefresh', $event)"
+				@update:model-value="onAutoRefreshChange"
 			>
 				{{ $locale.baseText('executionsList.autoRefresh') }}
 			</el-checkbox>
 			<ExecutionsFilter popover-placement="left-start" @filter-changed="onFilterChanged" />
 		</div>
 		<div
-			ref="executionList"
+			ref="executionListRef"
 			:class="$style.executionList"
 			data-test-id="current-executions-list"
 			@scroll="loadMore(20)"
@@ -39,18 +203,20 @@
 			</div>
 			<WorkflowExecutionsCard
 				v-else-if="temporaryExecution"
-				:ref="`execution-${temporaryExecution.id}`"
+				:ref="(el) => addCurrentWorkflowExecutionsCardRef(el, temporaryExecution?.id)"
 				:execution="temporaryExecution"
 				:data-test-id="`execution-details-${temporaryExecution.id}`"
 				:show-gap="true"
+				:workflow-permissions="workflowPermissions"
 				@retry-execution="onRetryExecution"
 			/>
 			<TransitionGroup name="executions-list">
 				<WorkflowExecutionsCard
 					v-for="execution in executions"
 					:key="execution.id"
-					:ref="`execution-${execution.id}`"
+					:ref="(el) => addCurrentWorkflowExecutionsCardRef(el, execution.id)"
 					:execution="execution"
+					:workflow-permissions="workflowPermissions"
 					:data-test-id="`execution-details-${execution.id}`"
 					@retry-execution="onRetryExecution"
 					@mounted="onItemMounted"
@@ -66,178 +232,6 @@
 	</div>
 </template>
 
-<script lang="ts">
-import WorkflowExecutionsCard from '@/components/executions/workflow/WorkflowExecutionsCard.vue';
-import WorkflowExecutionsInfoAccordion from '@/components/executions/workflow/WorkflowExecutionsInfoAccordion.vue';
-import ExecutionsFilter from '@/components/executions/ExecutionsFilter.vue';
-import { VIEWS } from '@/constants';
-import type { ExecutionSummary } from 'n8n-workflow';
-import type { RouteRecord } from 'vue-router';
-import { defineComponent } from 'vue';
-import type { PropType } from 'vue';
-import { mapStores } from 'pinia';
-import { useExecutionsStore } from '@/stores/executions.store';
-import { useWorkflowsStore } from '@/stores/workflows.store';
-import type { ExecutionFilterType } from '@/Interface';
-
-type WorkflowExecutionsCardRef = InstanceType<typeof WorkflowExecutionsCard>;
-type AutoScrollDeps = { activeExecutionSet: boolean; cardsMounted: boolean; scroll: boolean };
-
-export default defineComponent({
-	name: 'WorkflowExecutionsSidebar',
-	components: {
-		WorkflowExecutionsCard,
-		WorkflowExecutionsInfoAccordion,
-		ExecutionsFilter,
-	},
-	props: {
-		executions: {
-			type: Array as PropType<ExecutionSummary[]>,
-			required: true,
-		},
-		loading: {
-			type: Boolean,
-			default: true,
-		},
-		loadingMore: {
-			type: Boolean,
-			default: false,
-		},
-		temporaryExecution: {
-			type: Object as PropType<ExecutionSummary>,
-			default: null,
-		},
-	},
-	emits: {
-		retryExecution: null,
-		loadMore: null,
-		refresh: null,
-		filterUpdated: null,
-		reloadExecutions: null,
-		'update:autoRefresh': null,
-	},
-	data() {
-		return {
-			filter: {} as ExecutionFilterType,
-			mountedItems: [] as string[],
-			autoScrollDeps: {
-				activeExecutionSet: false,
-				cardsMounted: false,
-				scroll: true,
-			} as AutoScrollDeps,
-		};
-	},
-	computed: {
-		...mapStores(useExecutionsStore, useWorkflowsStore),
-	},
-	watch: {
-		$route(to: RouteRecord, from: RouteRecord) {
-			if (from.name === VIEWS.EXECUTION_PREVIEW && to.name === VIEWS.EXECUTION_HOME) {
-				// Skip parent route when navigating through executions with back button
-				this.$router.go(-1);
-			}
-		},
-		'executionsStore.activeExecution'(
-			newValue: ExecutionSummary | null,
-			oldValue: ExecutionSummary | null,
-		) {
-			if (newValue && newValue.id !== oldValue?.id) {
-				this.autoScrollDeps.activeExecutionSet = true;
-			}
-		},
-		autoScrollDeps: {
-			handler(updatedDeps: AutoScrollDeps) {
-				if (Object.values(updatedDeps).every(Boolean)) {
-					this.scrollToActiveCard();
-				}
-			},
-			deep: true,
-		},
-	},
-	methods: {
-		onItemMounted(id: string): void {
-			this.mountedItems.push(id);
-			if (this.mountedItems.length === this.executions.length) {
-				this.autoScrollDeps.cardsMounted = true;
-				this.checkListSize();
-			}
-
-			if (this.executionsStore.activeExecution?.id === id) {
-				this.autoScrollDeps.activeExecutionSet = true;
-			}
-		},
-		loadMore(limit = 20): void {
-			if (!this.loading) {
-				const executionsListRef = this.$refs.executionList as HTMLElement | undefined;
-				if (executionsListRef) {
-					const diff =
-						executionsListRef.offsetHeight -
-						(executionsListRef.scrollHeight - executionsListRef.scrollTop);
-					if (diff > -10 && diff < 10) {
-						this.$emit('loadMore', limit);
-					}
-				}
-			}
-		},
-		onRetryExecution(payload: object) {
-			this.$emit('retryExecution', payload);
-		},
-		onRefresh(): void {
-			this.$emit('refresh');
-		},
-		onFilterChanged(filter: ExecutionFilterType) {
-			this.autoScrollDeps.activeExecutionSet = false;
-			this.autoScrollDeps.scroll = true;
-			this.mountedItems = [];
-			this.$emit('filterUpdated', filter);
-		},
-		reloadExecutions(): void {
-			this.$emit('reloadExecutions');
-		},
-		checkListSize(): void {
-			const sidebarContainerRef = this.$refs.container as HTMLElement | undefined;
-			const currentWorkflowExecutionsCardRefs = this.$refs[
-				`execution-${this.mountedItems[this.mountedItems.length - 1]}`
-			] as WorkflowExecutionsCardRef[] | undefined;
-
-			// Find out how many execution card can fit into list
-			// and load more if needed
-			if (sidebarContainerRef && currentWorkflowExecutionsCardRefs?.length) {
-				const cardElement = currentWorkflowExecutionsCardRefs[0].$el as HTMLElement;
-				const listCapacity = Math.ceil(sidebarContainerRef.clientHeight / cardElement.clientHeight);
-
-				if (listCapacity > this.executions.length) {
-					this.$emit('loadMore', listCapacity - this.executions.length);
-				}
-			}
-		},
-		scrollToActiveCard(): void {
-			const executionsListRef = this.$refs.executionList as HTMLElement | undefined;
-			const currentWorkflowExecutionsCardRefs = this.$refs[
-				`execution-${this.executionsStore.activeExecution?.id}`
-			] as WorkflowExecutionsCardRef[] | undefined;
-
-			if (
-				executionsListRef &&
-				currentWorkflowExecutionsCardRefs?.length &&
-				this.executionsStore.activeExecution
-			) {
-				const cardElement = currentWorkflowExecutionsCardRefs[0].$el as HTMLElement;
-				const cardRect = cardElement.getBoundingClientRect();
-				const LIST_HEADER_OFFSET = 200;
-				if (cardRect.top > executionsListRef.offsetHeight) {
-					this.autoScrollDeps.scroll = false;
-					executionsListRef.scrollTo({
-						top: cardRect.top - LIST_HEADER_OFFSET,
-						behavior: 'smooth',
-					});
-				}
-			}
-		},
-	},
-});
-</script>
-
 <style module lang="scss">
 .container {
 	flex: 310px 0 0;
diff --git a/packages/editor-ui/src/components/layouts/ResourcesListLayout.vue b/packages/editor-ui/src/components/layouts/ResourcesListLayout.vue
index f242d6a9f9820..648b1d5eddd46 100644
--- a/packages/editor-ui/src/components/layouts/ResourcesListLayout.vue
+++ b/packages/editor-ui/src/components/layouts/ResourcesListLayout.vue
@@ -23,8 +23,13 @@
 						:description="i18n.baseText(`${resourceKey}.empty.description` as BaseTextKey)"
 						:button-text="i18n.baseText(`${resourceKey}.empty.button` as BaseTextKey)"
 						button-type="secondary"
+						:button-disabled="disabled"
 						@click:button="onAddButtonClick"
-					/>
+					>
+						<template #disabledButtonTooltip>
+							{{ i18n.baseText(`${resourceKey}.empty.button.disabled.tooltip` as BaseTextKey) }}
+						</template>
+					</n8n-action-box>
 				</slot>
 			</div>
 			<PageViewLayoutList v-else :overflow="type !== 'list'">
diff --git a/packages/editor-ui/src/composables/__tests__/useContextMenu.test.ts b/packages/editor-ui/src/composables/__tests__/useContextMenu.test.ts
index d37594c4881f3..74acb63ac73b7 100644
--- a/packages/editor-ui/src/composables/__tests__/useContextMenu.test.ts
+++ b/packages/editor-ui/src/composables/__tests__/useContextMenu.test.ts
@@ -38,6 +38,7 @@ describe('useContextMenu', () => {
 
 		workflowsStore = useWorkflowsStore();
 		workflowsStore.workflow.nodes = nodes;
+		workflowsStore.workflow.scopes = ['workflow:update'];
 		vi.spyOn(workflowsStore, 'getCurrentWorkflow').mockReturnValue({
 			nodes,
 			getNode: (_: string) => {
@@ -127,6 +128,7 @@ describe('useContextMenu', () => {
 	describe('Read-only mode', () => {
 		it('should return the correct actions when right clicking a sticky', () => {
 			vi.spyOn(uiStore, 'isReadOnlyView', 'get').mockReturnValue(true);
+			workflowsStore.workflow.scopes = ['workflow:read'];
 			const { open, isOpen, actions, targetNodeIds } = useContextMenu();
 			const sticky = nodeFactory({ type: STICKY_NODE_TYPE });
 			vi.spyOn(workflowsStore, 'getNodeById').mockReturnValue(sticky);
diff --git a/packages/editor-ui/src/composables/useContextMenu.ts b/packages/editor-ui/src/composables/useContextMenu.ts
index 6f80d6a2e4164..21322cc910d6b 100644
--- a/packages/editor-ui/src/composables/useContextMenu.ts
+++ b/packages/editor-ui/src/composables/useContextMenu.ts
@@ -10,6 +10,7 @@ import { getMousePosition } from '../utils/nodeViewUtils';
 import { useI18n } from './useI18n';
 import { usePinnedData } from './usePinnedData';
 import { isPresent } from '../utils/typesUtils';
+import { getResourcePermissions } from '@/permissions';
 
 export type ContextMenuTarget =
 	| { source: 'canvas'; nodeIds: string[] }
@@ -46,8 +47,15 @@ export const useContextMenu = (onAction: ContextMenuActionCallback = () => {}) =
 
 	const i18n = useI18n();
 
+	const workflowPermissions = computed(
+		() => getResourcePermissions(workflowsStore.workflow.scopes).workflow,
+	);
+
 	const isReadOnly = computed(
-		() => sourceControlStore.preferences.branchReadOnly || uiStore.isReadOnlyView,
+		() =>
+			sourceControlStore.preferences.branchReadOnly ||
+			uiStore.isReadOnlyView ||
+			!workflowPermissions.value.update,
 	);
 
 	const targetNodeIds = computed(() => {
diff --git a/packages/editor-ui/src/permissions.spec.ts b/packages/editor-ui/src/permissions.spec.ts
index 3e5a22123a7cc..bef37aa9a8e2f 100644
--- a/packages/editor-ui/src/permissions.spec.ts
+++ b/packages/editor-ui/src/permissions.spec.ts
@@ -1,120 +1,118 @@
-import {
-	getVariablesPermissions,
-	getProjectPermissions,
-	getCredentialPermissions,
-	getWorkflowPermissions,
-} from '@/permissions';
-import type { ICredentialsResponse, IUser, IWorkflowDb } from '@/Interface';
-import type { Project } from '@/types/projects.types';
+import type { PermissionsRecord } from '@/permissions';
+import { getResourcePermissions } from '@/permissions';
+import type { Scope } from '@n8n/permissions';
 
 describe('permissions', () => {
-	it('getVariablesPermissions', () => {
-		expect(getVariablesPermissions(null)).toEqual({
-			create: false,
-			read: false,
-			update: false,
-			delete: false,
-			list: false,
-		});
-
-		expect(
-			getVariablesPermissions({
-				globalScopes: [
-					'variable:create',
-					'variable:read',
-					'variable:update',
-					'variable:delete',
-					'variable:list',
-				],
-			} as IUser),
-		).toEqual({
-			create: true,
-			read: true,
-			update: true,
-			delete: true,
-			list: true,
-		});
-
-		expect(
-			getVariablesPermissions({
-				globalScopes: ['variable:read', 'variable:list'],
-			} as IUser),
-		).toEqual({
-			create: false,
-			read: true,
-			update: false,
-			delete: false,
-			list: true,
-		});
-	});
-
-	it('getProjectPermissions', () => {
-		expect(
-			getProjectPermissions({
-				scopes: [
-					'project:create',
-					'project:read',
-					'project:update',
-					'project:delete',
-					'project:list',
-				],
-			} as Project),
-		).toEqual({
-			create: true,
-			read: true,
-			update: true,
-			delete: true,
-			list: true,
+	it('getResourcePermissions for empty scopes', () => {
+		expect(getResourcePermissions()).toEqual({
+			auditLogs: {},
+			banner: {},
+			communityPackage: {},
+			credential: {},
+			externalSecretsProvider: {},
+			externalSecret: {},
+			eventBusDestination: {},
+			ldap: {},
+			license: {},
+			logStreaming: {},
+			orchestration: {},
+			project: {},
+			saml: {},
+			securityAudit: {},
+			sourceControl: {},
+			tag: {},
+			user: {},
+			variable: {},
+			workersView: {},
+			workflow: {},
 		});
 	});
+	it('getResourcePermissions', () => {
+		const scopes: Scope[] = [
+			'credential:create',
+			'credential:delete',
+			'credential:list',
+			'credential:move',
+			'credential:read',
+			'credential:share',
+			'credential:update',
+			'eventBusDestination:list',
+			'eventBusDestination:test',
+			'project:list',
+			'project:read',
+			'tag:create',
+			'tag:list',
+			'tag:read',
+			'tag:update',
+			'user:list',
+			'variable:list',
+			'variable:read',
+			'workflow:create',
+			'workflow:delete',
+			'workflow:execute',
+			'workflow:list',
+			'workflow:move',
+			'workflow:read',
+			'workflow:share',
+			'workflow:update',
+		];
 
-	it('getCredentialPermissions', () => {
-		expect(
-			getCredentialPermissions({
-				scopes: [
-					'credential:create',
-					'credential:read',
-					'credential:update',
-					'credential:delete',
-					'credential:list',
-					'credential:share',
-					'credential:move',
-				],
-			} as ICredentialsResponse),
-		).toEqual({
-			create: true,
-			read: true,
-			update: true,
-			delete: true,
-			list: true,
-			share: true,
-			move: true,
-		});
-	});
+		const permissionRecord: PermissionsRecord = {
+			auditLogs: {},
+			banner: {},
+			communityPackage: {},
+			credential: {
+				create: true,
+				delete: true,
+				list: true,
+				move: true,
+				read: true,
+				share: true,
+				update: true,
+			},
+			eventBusDestination: {
+				list: true,
+				test: true,
+			},
+			externalSecret: {},
+			externalSecretsProvider: {},
+			ldap: {},
+			license: {},
+			logStreaming: {},
+			orchestration: {},
+			project: {
+				list: true,
+				read: true,
+			},
+			saml: {},
+			securityAudit: {},
+			sourceControl: {},
+			tag: {
+				create: true,
+				list: true,
+				read: true,
+				update: true,
+			},
+			user: {
+				list: true,
+			},
+			variable: {
+				list: true,
+				read: true,
+			},
+			workersView: {},
+			workflow: {
+				create: true,
+				delete: true,
+				execute: true,
+				list: true,
+				move: true,
+				read: true,
+				share: true,
+				update: true,
+			},
+		};
 
-	it('getWorkflowPermissions', () => {
-		expect(
-			getWorkflowPermissions({
-				scopes: [
-					'workflow:create',
-					'workflow:read',
-					'workflow:update',
-					'workflow:delete',
-					'workflow:list',
-					'workflow:share',
-					'workflow:execute',
-					'workflow:move',
-				],
-			} as IWorkflowDb),
-		).toEqual({
-			create: true,
-			read: true,
-			update: true,
-			delete: true,
-			list: true,
-			share: true,
-			execute: true,
-			move: true,
-		});
+		expect(getResourcePermissions(scopes)).toEqual(permissionRecord);
 	});
 });
diff --git a/packages/editor-ui/src/permissions.ts b/packages/editor-ui/src/permissions.ts
index 38e27fa33f73d..b26c3b51df932 100644
--- a/packages/editor-ui/src/permissions.ts
+++ b/packages/editor-ui/src/permissions.ts
@@ -1,66 +1,32 @@
-import type { IUser, ICredentialsResponse, IWorkflowDb } from '@/Interface';
-import type {
-	CredentialScope,
-	ProjectScope,
-	Scope,
-	WorkflowScope,
-	VariableScope,
-} from '@n8n/permissions';
-import type { Project } from '@/types/projects.types';
+import type { Scope } from '@n8n/permissions';
+import { RESOURCES } from '@n8n/permissions';
 
-type ExtractAfterColon<T> = T extends `${infer _Prefix}:${infer Suffix}` ? Suffix : never;
-export type PermissionsMap<T> = {
-	[K in ExtractAfterColon<T>]: boolean;
+type ExtractScopePrefixSuffix<T> = T extends `${infer Prefix}:${infer Suffix}`
+	? [Prefix, Suffix]
+	: never;
+type ActionBooleans<T extends readonly string[]> = {
+	[K in T[number]]?: boolean;
+};
+export type PermissionsRecord = {
+	[K in keyof typeof RESOURCES]: ActionBooleans<(typeof RESOURCES)[K]>;
 };
 
-const mapScopesToPermissions = <T extends Scope>(scopes: T[], scopeSet: Set<T>) =>
-	scopes.reduce(
-		(permissions, scope) => ({
+export const getResourcePermissions = (resourceScopes: Scope[] = []): PermissionsRecord =>
+	Object.keys(RESOURCES).reduce(
+		(permissions, key) => ({
 			...permissions,
-			[scope.split(':')[1]]: scopeSet.has(scope),
-		}),
-		{} as PermissionsMap<T>,
-	);
+			[key]: resourceScopes.reduce((resourcePermissions, scope) => {
+				const [prefix, suffix] = scope.split(':') as ExtractScopePrefixSuffix<Scope>;
 
-export const getCredentialPermissions = (
-	credential: ICredentialsResponse,
-): PermissionsMap<CredentialScope> =>
-	mapScopesToPermissions(
-		[
-			'credential:create',
-			'credential:read',
-			'credential:update',
-			'credential:delete',
-			'credential:list',
-			'credential:share',
-			'credential:move',
-		],
-		new Set(credential?.scopes ?? []),
-	);
+				if (prefix === key) {
+					return {
+						...resourcePermissions,
+						[suffix]: true,
+					};
+				}
 
-export const getWorkflowPermissions = (workflow: IWorkflowDb): PermissionsMap<WorkflowScope> =>
-	mapScopesToPermissions(
-		[
-			'workflow:create',
-			'workflow:read',
-			'workflow:update',
-			'workflow:delete',
-			'workflow:list',
-			'workflow:share',
-			'workflow:execute',
-			'workflow:move',
-		],
-		new Set(workflow?.scopes ?? []),
-	);
-
-export const getProjectPermissions = (project: Project | null): PermissionsMap<ProjectScope> =>
-	mapScopesToPermissions(
-		['project:create', 'project:read', 'project:update', 'project:delete', 'project:list'],
-		new Set(project?.scopes ?? []),
-	);
-
-export const getVariablesPermissions = (user: IUser | null): PermissionsMap<VariableScope> =>
-	mapScopesToPermissions(
-		['variable:create', 'variable:read', 'variable:update', 'variable:delete', 'variable:list'],
-		new Set(user?.globalScopes ?? []),
+				return resourcePermissions;
+			}, {}),
+		}),
+		{} as PermissionsRecord,
 	);
diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json
index dc0734b041b71..2749a8b3502df 100644
--- a/packages/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/editor-ui/src/plugins/i18n/locales/en.json
@@ -574,6 +574,7 @@
 	"credentials.empty.heading.userNotSetup": "Set up a credential",
 	"credentials.empty.description": "Credentials let workflows interact with your apps and services",
 	"credentials.empty.button": "Add first credential",
+	"credentials.empty.button.disabled.tooltip": "Your current role in the project does not allow you to create credentials",
 	"credentials.item.open": "Open",
 	"credentials.item.delete": "Delete",
 	"credentials.item.move": "Move",
@@ -2189,8 +2190,10 @@
 	"workflows.empty.heading.userNotSetup": "👋 Welcome!",
 	"workflows.empty.description": "Create your first workflow",
 	"workflows.empty.description.readOnlyEnv": "No workflows here yet",
+	"workflows.empty.description.noPermission": "There are currently no workflows to view",
 	"workflows.empty.startFromScratch": "Start from scratch",
 	"workflows.empty.browseTemplates": "Browse {category} templates",
+	"workflows.empty.button.disabled.tooltip": "Your current role in the project does not allow you to create workflows",
 	"workflows.shareModal.title": "Share '{name}'",
 	"workflows.shareModal.title.static": "Shared with {projectName}",
 	"workflows.shareModal.select.placeholder": "Add users...",
@@ -2241,6 +2244,7 @@
 	"variables.empty.heading.userNotSetup": "Set up a variable",
 	"variables.empty.description": "Variables can be used to store data that can be referenced easily across multiple workflows.",
 	"variables.empty.button": "Add first variable",
+	"variables.empty.button.disabled.tooltip": "Your current role in the project does not allow you to create variables",
 	"variables.empty.notAllowedToCreate.heading": "{name}, start using variables",
 	"variables.empty.notAllowedToCreate.description": "Ask your n8n instance owner to create the variables you need. Once configured, you can utilize them in your workflows using the syntax $vars.MY_VAR.",
 	"variables.noResults": "No variables found",
@@ -2444,6 +2448,7 @@
 	"projects.settings.button.deleteProject": "Delete project",
 	"projects.settings.role.admin": "Admin",
 	"projects.settings.role.editor": "Editor",
+	"projects.settings.role.viewer": "Viewer",
 	"projects.settings.delete.title": "Delete {projectName}",
 	"projects.settings.delete.message": "What should we do with the project data?",
 	"projects.settings.delete.question.transfer.label": "Transfer its workflows and credentials to another project or user",
diff --git a/packages/editor-ui/src/stores/canvas.store.ts b/packages/editor-ui/src/stores/canvas.store.ts
index 01341c36359ab..252c06859ec2a 100644
--- a/packages/editor-ui/src/stores/canvas.store.ts
+++ b/packages/editor-ui/src/stores/canvas.store.ts
@@ -74,11 +74,13 @@ export const useCanvasStore = defineStore('canvas', () => {
 		() => lastSelectedConnection.value,
 	);
 
-	watch(readOnlyEnv, (readOnly) => {
+	const setReadOnly = (readOnly: boolean) => {
 		if (jsPlumbInstanceRef.value) {
 			jsPlumbInstanceRef.value.elementsDraggable = !readOnly;
+			jsPlumbInstanceRef.value.setDragConstrainFunction(((pos: PointXY) =>
+				readOnly ? null : pos) as ConstrainFunction);
 		}
-	});
+	};
 
 	const setLastSelectedConnection = (connection: Connection | undefined) => {
 		lastSelectedConnection.value = connection;
@@ -255,7 +257,7 @@ export const useCanvasStore = defineStore('canvas', () => {
 					if (!nodeName) return;
 					const nodeData = workflowStore.getNodeByName(nodeName);
 					isDragging.value = false;
-					if (uiStore.isActionActive['dragActive'] && nodeData) {
+					if (uiStore.isActionActive.dragActive && nodeData) {
 						const moveNodes = uiStore.getSelectedNodes.slice();
 						const selectedNodeNames = moveNodes.map((node: INodeUi) => node.name);
 						if (!selectedNodeNames.includes(nodeData.name)) {
@@ -300,7 +302,7 @@ export const useCanvasStore = defineStore('canvas', () => {
 						if (moveNodes.length > 1) {
 							historyStore.stopRecordingUndo();
 						}
-						if (uiStore.isActionActive['dragActive']) {
+						if (uiStore.isActionActive.dragActive) {
 							uiStore.removeActiveAction('dragActive');
 						}
 					}
@@ -319,6 +321,9 @@ export const useCanvasStore = defineStore('canvas', () => {
 	}
 
 	const jsPlumbInstance = computed(() => jsPlumbInstanceRef.value as BrowserJsPlumbInstance);
+
+	watch(readOnlyEnv, setReadOnly);
+
 	return {
 		isDemo,
 		nodeViewScale,
@@ -328,6 +333,7 @@ export const useCanvasStore = defineStore('canvas', () => {
 		isLoading: loadingService.isLoading,
 		aiNodes,
 		lastSelectedConnection: lastSelectedConnectionComputed,
+		setReadOnly,
 		setLastSelectedConnection,
 		startLoading: loadingService.startLoading,
 		setLoadingText: loadingService.setLoadingText,
diff --git a/packages/editor-ui/src/stores/roles.store.test.ts b/packages/editor-ui/src/stores/roles.store.test.ts
index 6914a1e43665b..e38ef4d434997 100644
--- a/packages/editor-ui/src/stores/roles.store.test.ts
+++ b/packages/editor-ui/src/stores/roles.store.test.ts
@@ -101,6 +101,7 @@ describe('roles store', () => {
 		});
 		await rolesStore.fetchRoles();
 		expect(rolesStore.processedProjectRoles.map(({ role }) => role)).toEqual([
+			'project:viewer',
 			'project:editor',
 			'project:admin',
 		]);
diff --git a/packages/editor-ui/src/stores/roles.store.ts b/packages/editor-ui/src/stores/roles.store.ts
index b927a0d8d3966..edfa491ab080c 100644
--- a/packages/editor-ui/src/stores/roles.store.ts
+++ b/packages/editor-ui/src/stores/roles.store.ts
@@ -13,7 +13,11 @@ export const useRolesStore = defineStore('roles', () => {
 		credential: [],
 		workflow: [],
 	});
-	const projectRoleOrder = ref<ProjectRole[]>(['project:editor', 'project:admin']);
+	const projectRoleOrder = ref<ProjectRole[]>([
+		'project:viewer',
+		'project:editor',
+		'project:admin',
+	]);
 	const projectRoleOrderMap = computed<Map<ProjectRole, number>>(
 		() => new Map(projectRoleOrder.value.map((role, idx) => [role, idx])),
 	);
diff --git a/packages/editor-ui/src/utils/typeGuards.ts b/packages/editor-ui/src/utils/typeGuards.ts
index 161c718bbae29..c7013ac3ea093 100644
--- a/packages/editor-ui/src/utils/typeGuards.ts
+++ b/packages/editor-ui/src/utils/typeGuards.ts
@@ -12,6 +12,7 @@ import type { Connection as VueFlowConnection } from '@vue-flow/core';
 import type { RouteLocationRaw } from 'vue-router';
 import type { CanvasConnectionMode } from '@/types';
 import { canvasConnectionModes } from '@/types';
+import type { ComponentPublicInstance } from 'vue';
 
 /*
 	Type guards used in editor-ui project
@@ -103,3 +104,7 @@ export function isRouteLocationRaw(value: unknown): value is RouteLocationRaw {
 		(typeof value === 'object' && value !== null && ('name' in value || 'path' in value))
 	);
 }
+
+export function isComponentPublicInstance(value: unknown): value is ComponentPublicInstance {
+	return value !== null && typeof value === 'object' && '$props' in value;
+}
diff --git a/packages/editor-ui/src/views/CredentialsView.vue b/packages/editor-ui/src/views/CredentialsView.vue
index fce0fb31257a7..fe71fcb8fff72 100644
--- a/packages/editor-ui/src/views/CredentialsView.vue
+++ b/packages/editor-ui/src/views/CredentialsView.vue
@@ -8,6 +8,7 @@
 		:additional-filters-handler="onFilter"
 		:type-props="{ itemSize: 77 }"
 		:loading="loading"
+		:disabled="readOnlyEnv || !projectPermissions.credential.create"
 		@click:add="addCredential"
 		@update:filters="filters = $event"
 	>
@@ -79,6 +80,7 @@ import { useProjectsStore } from '@/stores/projects.store';
 import ProjectTabs from '@/components/Projects/ProjectTabs.vue';
 import useEnvironmentsStore from '@/stores/environments.ee.store';
 import { useSettingsStore } from '@/stores/settings.store';
+import { getResourcePermissions } from '@/permissions';
 
 export default defineComponent({
 	name: 'CredentialsView',
@@ -131,6 +133,14 @@ export default defineComponent({
 				? this.$locale.baseText('credentials.project.add')
 				: this.$locale.baseText('credentials.add');
 		},
+		readOnlyEnv(): boolean {
+			return this.sourceControlStore.preferences.branchReadOnly;
+		},
+		projectPermissions() {
+			return getResourcePermissions(
+				this.projectsStore.currentProject?.scopes ?? this.projectsStore.personalProject?.scopes,
+			);
+		},
 	},
 	watch: {
 		'$route.params.projectId'() {
diff --git a/packages/editor-ui/src/views/NodeView.vue b/packages/editor-ui/src/views/NodeView.vue
index 5650be3b7acae..439f39b1ebe72 100644
--- a/packages/editor-ui/src/views/NodeView.vue
+++ b/packages/editor-ui/src/views/NodeView.vue
@@ -47,7 +47,11 @@
 						v-for="nodeData in nodesToRender"
 						:key="`${nodeData.id}_node`"
 						:name="nodeData.name"
-						:is-read-only="isReadOnlyRoute || readOnlyEnv"
+						:is-read-only="
+							isReadOnlyRoute ||
+							readOnlyEnv ||
+							!(workflowPermissions.update ?? projectPermissions.workflow.update)
+						"
 						:instance="instance"
 						:is-active="!!activeNode && activeNode.name === nodeData.name"
 						:hide-actions="pullConnActive"
@@ -75,7 +79,11 @@
 						:key="`${stickyData.id}_sticky`"
 						:name="stickyData.name"
 						:workflow="currentWorkflowObject"
-						:is-read-only="isReadOnlyRoute || readOnlyEnv"
+						:is-read-only="
+							isReadOnlyRoute ||
+							readOnlyEnv ||
+							!(workflowPermissions.update ?? projectPermissions.workflow.update)
+						"
 						:instance="instance"
 						:is-active="!!activeNode && activeNode.name === stickyData.name"
 						:node-view-scale="nodeViewScale"
@@ -90,7 +98,11 @@
 			</div>
 			<NodeDetailsView
 				:workflow-object="currentWorkflowObject"
-				:read-only="isReadOnlyRoute || readOnlyEnv"
+				:read-only="
+					isReadOnlyRoute ||
+					readOnlyEnv ||
+					!(workflowPermissions.update ?? projectPermissions.workflow.update)
+				"
 				:renaming="renamingActive"
 				:is-production-execution-preview="isProductionExecutionPreview"
 				@redraw-node="redrawNode"
@@ -107,7 +119,11 @@
 			</Suspense>
 			<Suspense>
 				<LazyNodeCreation
-					v-if="!isReadOnlyRoute && !readOnlyEnv"
+					v-if="
+						!isReadOnlyRoute &&
+						!readOnlyEnv &&
+						(workflowPermissions.update ?? projectPermissions.workflow.update)
+					"
 					:create-node-active="createNodeActive"
 					:node-view-scale="nodeViewScale"
 					@toggle-node-creator="onToggleNodeCreator"
@@ -120,7 +136,14 @@
 			<Suspense>
 				<ContextMenu @action="onContextMenuAction" />
 			</Suspense>
-			<div v-if="!isReadOnlyRoute && !readOnlyEnv" class="workflow-execute-wrapper">
+			<div
+				v-if="
+					!isReadOnlyRoute &&
+					!readOnlyEnv &&
+					(workflowPermissions.update ?? projectPermissions.workflow.update)
+				"
+				class="workflow-execute-wrapper"
+			>
 				<span
 					v-if="!isManualChatOnly"
 					@mouseenter="showTriggerMissingToltip(true)"
@@ -182,13 +205,7 @@
 				/>
 
 				<n8n-icon-button
-					v-if="
-						!isReadOnlyRoute &&
-						!readOnlyEnv &&
-						workflowExecution &&
-						!workflowRunning &&
-						!allTriggersDisabled
-					"
+					v-if="workflowExecution && !workflowRunning && !allTriggersDisabled"
 					:title="$locale.baseText('nodeView.deletesTheCurrentExecutionData')"
 					icon="trash"
 					size="large"
@@ -383,6 +400,7 @@ import type { ProjectSharingData } from '@/types/projects.types';
 import { isJSPlumbEndpointElement, isJSPlumbConnection } from '@/utils/typeGuards';
 import { usePostHog } from '@/stores/posthog.store';
 import { useNpsSurveyStore } from '@/stores/npsSurvey.store';
+import { getResourcePermissions } from '@/permissions';
 
 interface AddNodeOptions {
 	position?: XYPosition;
@@ -538,7 +556,13 @@ export default defineComponent({
 			return this.$route.name === VIEWS.DEMO;
 		},
 		showCanvasAddButton(): boolean {
-			return !this.isLoading && !this.containsTrigger && !this.isDemo && !this.readOnlyEnv;
+			return (
+				!this.isLoading &&
+				!this.containsTrigger &&
+				!this.isDemo &&
+				!this.readOnlyEnv &&
+				!!(this.workflowPermissions.update ?? this.projectPermissions.workflow.update)
+			);
 		},
 		lastSelectedNode(): INodeUi | null {
 			return this.uiStore.getLastSelectedNode;
@@ -579,7 +603,8 @@ export default defineComponent({
 			return NodeViewUtils.getBackgroundStyles(
 				this.nodeViewScale,
 				this.uiStore.nodeViewOffsetPosition,
-				this.isExecutionPreview,
+				this.isExecutionPreview ||
+					!(this.workflowPermissions.update ?? this.projectPermissions.workflow.update),
 			);
 		},
 		workflowClasses() {
@@ -687,11 +712,22 @@ export default defineComponent({
 		isProductionExecutionPreview(): boolean {
 			return this.nodeHelpers.isProductionExecutionPreview.value;
 		},
+		workflowPermissions() {
+			return getResourcePermissions(
+				this.workflowsStore.getWorkflowById(this.currentWorkflow)?.scopes,
+			).workflow;
+		},
+		projectPermissions() {
+			const project = this.$route.query?.projectId
+				? this.projectsStore.myProjects.find((p) => p.id === this.$route.query.projectId)
+				: this.projectsStore.currentProject ?? this.projectsStore.personalProject;
+			return getResourcePermissions(project?.scopes);
+		},
 	},
 	watch: {
 		// Listen to route changes and load the workflow accordingly
 		async $route(to: RouteLocation, from: RouteLocation) {
-			this.readOnlyEnvRouteCheck();
+			await this.readOnlyEnvRouteCheck();
 
 			const currentTab = getNodeViewTab(to);
 			const nodeViewNotInitialized = !this.uiStore.nodeViewInitialized;
@@ -858,7 +894,7 @@ export default defineComponent({
 			},
 		});
 
-		this.readOnlyEnvRouteCheck();
+		await this.readOnlyEnvRouteCheck();
 		this.canvasStore.isDemo = this.isDemo;
 	},
 	activated() {
@@ -1005,7 +1041,8 @@ export default defineComponent({
 
 				return false;
 			}
-			return true;
+
+			return !!(this.workflowPermissions.update ?? this.projectPermissions.workflow.update);
 		},
 		showTriggerMissingToltip(isVisible: boolean) {
 			this.showTriggerMissingTooltip = isVisible;
@@ -1405,14 +1442,17 @@ export default defineComponent({
 			const shiftModifier = e.shiftKey && !e.altKey && !this.deviceSupport.isCtrlKeyPressed(e);
 			const ctrlAltModifier = this.deviceSupport.isCtrlKeyPressed(e) && e.altKey && !e.shiftKey;
 			const noModifierKeys = !this.deviceSupport.isCtrlKeyPressed(e) && !e.shiftKey && !e.altKey;
-			const readOnly = this.isReadOnlyRoute || this.readOnlyEnv;
+			const readOnly =
+				this.isReadOnlyRoute ||
+				this.readOnlyEnv ||
+				!(this.workflowPermissions.update ?? this.projectPermissions.workflow.update);
 
 			if (e.key === 's' && ctrlModifier && !readOnly) {
 				e.stopPropagation();
 				e.preventDefault();
 				const workflowIsSaved = !this.uiStore.stateIsDirty;
 
-				if (this.isReadOnlyRoute || this.readOnlyEnv || workflowIsSaved) {
+				if (workflowIsSaved) {
 					return;
 				}
 
@@ -1538,7 +1578,9 @@ export default defineComponent({
 				if (lastSelectedNode !== null) {
 					if (
 						lastSelectedNode.type === STICKY_NODE_TYPE &&
-						(this.isReadOnlyRoute || this.readOnlyEnv)
+						(this.isReadOnlyRoute ||
+							this.readOnlyEnv ||
+							!(this.workflowPermissions.update ?? this.projectPermissions.workflow.update))
 					) {
 						return;
 					}
@@ -1825,7 +1867,10 @@ export default defineComponent({
 		},
 
 		cutNodes(nodes: INode[]) {
-			const deleteCopiedNodes = !this.isReadOnlyRoute && !this.readOnlyEnv;
+			const deleteCopiedNodes =
+				!this.isReadOnlyRoute &&
+				!this.readOnlyEnv &&
+				(this.workflowPermissions.update ?? this.projectPermissions.workflow.update);
 			this.copyNodes(nodes, deleteCopiedNodes);
 			if (deleteCopiedNodes) {
 				this.deleteNodes(nodes);
@@ -1959,7 +2004,11 @@ export default defineComponent({
 		 * This method gets called when data got pasted into the window
 		 */
 		async onClipboardPasteEvent(plainTextData: string): Promise<void> {
-			if (this.readOnlyEnv) {
+			if (
+				this.readOnlyEnv ||
+				this.isReadOnlyRoute ||
+				!(this.workflowPermissions.update ?? this.projectPermissions.workflow.update)
+			) {
 				return;
 			}
 
@@ -2704,7 +2753,10 @@ export default defineComponent({
 
 					this.instance?.connect({
 						uuids: [targetEndpoint, viableConnection?.uuid || ''],
-						detachable: !this.isReadOnlyRoute && !this.readOnlyEnv,
+						detachable:
+							!this.isReadOnlyRoute &&
+							!this.readOnlyEnv &&
+							(this.workflowPermissions.update ?? this.projectPermissions.workflow.update),
 					});
 					this.historyStore.stopRecordingUndo();
 					return;
@@ -3000,7 +3052,11 @@ export default defineComponent({
 				this.dropPrevented = true;
 				this.workflowsStore.addConnection({ connection: connectionData });
 
-				if (!this.isReadOnlyRoute && !this.readOnlyEnv) {
+				if (
+					!this.isReadOnlyRoute &&
+					!this.readOnlyEnv &&
+					(this.workflowPermissions.update ?? this.projectPermissions.workflow.update)
+				) {
 					NodeViewUtils.hideOutputNameLabel(info.sourceEndpoint);
 					NodeViewUtils.addConnectionActionsOverlay(
 						info.connection,
@@ -3087,6 +3143,7 @@ export default defineComponent({
 
 				if (
 					// eslint-disable-next-line no-constant-binary-expression
+					!(this.workflowPermissions.update ?? this.projectPermissions.workflow.update) ??
 					this.isReadOnlyRoute ??
 					this.readOnlyEnv ??
 					this.enterTimer ??
@@ -3125,6 +3182,7 @@ export default defineComponent({
 
 				if (
 					// eslint-disable-next-line no-constant-binary-expression
+					!(this.workflowPermissions.update ?? this.projectPermissions.workflow.update) ??
 					this.isReadOnlyRoute ??
 					this.readOnlyEnv ??
 					!connection ??
@@ -3537,7 +3595,12 @@ export default defineComponent({
 				const templateId = this.$route.params.id;
 				await this.openWorkflowTemplate(templateId.toString());
 			} else {
-				if (this.uiStore.stateIsDirty && !this.readOnlyEnv) {
+				if (
+					this.uiStore.stateIsDirty &&
+					!this.readOnlyEnv &&
+					!this.isReadOnlyRoute &&
+					(this.workflowPermissions.update ?? this.projectPermissions.workflow.update)
+				) {
 					const confirmModal = await this.confirm(
 						this.$locale.baseText('generic.unsavedWork.confirmMessage.message'),
 						{
@@ -3604,6 +3667,9 @@ export default defineComponent({
 			}
 
 			this.historyStore.reset();
+			if (!(this.workflowPermissions.update ?? this.projectPermissions.workflow.update)) {
+				this.canvasStore.setReadOnly(true);
+			}
 			this.uiStore.nodeViewInitialized = true;
 			document.addEventListener('keydown', this.keyDown);
 			document.addEventListener('keyup', this.keyUp);
@@ -4523,17 +4589,16 @@ export default defineComponent({
 				this.canvasStore.stopLoading();
 			}
 		},
-		readOnlyEnvRouteCheck() {
+		async readOnlyEnvRouteCheck() {
 			if (
-				this.readOnlyEnv &&
+				(this.readOnlyEnv || !this.projectPermissions.workflow.create) &&
 				(this.$route.name === VIEWS.NEW_WORKFLOW || this.$route.name === VIEWS.TEMPLATE_IMPORT)
 			) {
-				void this.$nextTick(async () => {
-					this.resetWorkspace();
-					this.uiStore.stateIsDirty = false;
+				await this.$nextTick();
+				this.resetWorkspace();
+				this.uiStore.stateIsDirty = false;
 
-					await this.$router.replace({ name: VIEWS.HOMEPAGE });
-				});
+				await this.$router.replace({ name: VIEWS.HOMEPAGE });
 			}
 		},
 		async checkAndInitDebugMode() {
@@ -4583,7 +4648,10 @@ export default defineComponent({
 				case 'add_node':
 					this.onToggleNodeCreator({
 						source: NODE_CREATOR_OPEN_SOURCES.CONTEXT_MENU,
-						createNodeActive: !this.isReadOnlyRoute && !this.readOnlyEnv,
+						createNodeActive:
+							!this.isReadOnlyRoute &&
+							!this.readOnlyEnv &&
+							!!(this.workflowPermissions.update ?? this.projectPermissions.workflow.update),
 					});
 					break;
 				case 'add_sticky':
diff --git a/packages/editor-ui/src/views/ProjectSettings.vue b/packages/editor-ui/src/views/ProjectSettings.vue
index b9e3a77314bb6..dffc077b48389 100644
--- a/packages/editor-ui/src/views/ProjectSettings.vue
+++ b/packages/editor-ui/src/views/ProjectSettings.vue
@@ -43,6 +43,7 @@ const formData = ref<Pick<Project, 'name' | 'relations'>>({
 	relations: [],
 });
 const projectRoleTranslations = ref<{ [key: string]: string }>({
+	'project:viewer': locale.baseText('projects.settings.role.viewer'),
 	'project:editor': locale.baseText('projects.settings.role.editor'),
 	'project:admin': locale.baseText('projects.settings.role.admin'),
 });
diff --git a/packages/editor-ui/src/views/VariablesView.vue b/packages/editor-ui/src/views/VariablesView.vue
index 4cd5c1a84a7c2..cd06b7e91cf6a 100644
--- a/packages/editor-ui/src/views/VariablesView.vue
+++ b/packages/editor-ui/src/views/VariablesView.vue
@@ -17,7 +17,7 @@ import VariablesRow from '@/components/VariablesRow.vue';
 import { EnterpriseEditionFeature, MODAL_CONFIRM } from '@/constants';
 import type { DatatableColumn, EnvironmentVariable } from '@/Interface';
 import { uid } from 'n8n-design-system/utils';
-import { getVariablesPermissions } from '@/permissions';
+import { getResourcePermissions } from '@/permissions';
 import type { BaseTextKey } from '@/plugins/i18n';
 
 const settingsStore = useSettingsStore();
@@ -39,7 +39,10 @@ const TEMPORARY_VARIABLE_UID_BASE = '@tmpvar';
 const allVariables = ref<EnvironmentVariable[]>([]);
 const editMode = ref<Record<string, boolean>>({});
 const loading = ref(false);
-const permissions = getVariablesPermissions(usersStore.currentUser);
+
+const permissions = computed(
+	() => getResourcePermissions(usersStore.currentUser?.globalScopes).variable,
+);
 
 const isFeatureEnabled = computed(
 	() => settingsStore.isEnterpriseFeatureEnabled[EnterpriseEditionFeature.Variables],
@@ -49,7 +52,7 @@ const variablesToResources = computed((): IResource[] =>
 	allVariables.value.map((v) => ({ id: v.id, name: v.key, value: v.value })),
 );
 
-const canCreateVariables = computed(() => isFeatureEnabled.value && permissions.create);
+const canCreateVariables = computed(() => isFeatureEnabled.value && permissions.value.create);
 
 const datatableColumns = computed<DatatableColumn[]>(() => [
 	{
diff --git a/packages/editor-ui/src/views/WorkflowExecutionsView.vue b/packages/editor-ui/src/views/WorkflowExecutionsView.vue
index 86a19f603ba20..f09619fdd7434 100644
--- a/packages/editor-ui/src/views/WorkflowExecutionsView.vue
+++ b/packages/editor-ui/src/views/WorkflowExecutionsView.vue
@@ -128,7 +128,7 @@ async function fetchWorkflow() {
 			toast.showError(error, i18n.baseText('nodeView.showError.openWorkflow.title'));
 		}
 	}
-	workflow.value = workflowsStore.workflow;
+	workflow.value = workflowsStore.getWorkflowById(workflowId.value);
 }
 
 async function onAutoRefreshToggle(value: boolean) {
@@ -172,7 +172,10 @@ async function onUpdateFilters(newFilters: ExecutionFilterType) {
 	await executionsStore.initialize(workflowId.value);
 }
 
-async function onExecutionStop(id: string) {
+async function onExecutionStop(id?: string) {
+	if (!id) {
+		return;
+	}
 	try {
 		await executionsStore.stopCurrentExecution(id);
 
@@ -190,7 +193,10 @@ async function onExecutionStop(id: string) {
 	}
 }
 
-async function onExecutionDelete(id: string) {
+async function onExecutionDelete(id?: string) {
+	if (!id) {
+		return;
+	}
 	loading.value = true;
 	try {
 		const executionIndex = executions.value.findIndex((e: ExecutionSummary) => e.id === id);
diff --git a/packages/editor-ui/src/views/WorkflowHistory.vue b/packages/editor-ui/src/views/WorkflowHistory.vue
index 3bddc865dd757..567cae9a41cd6 100644
--- a/packages/editor-ui/src/views/WorkflowHistory.vue
+++ b/packages/editor-ui/src/views/WorkflowHistory.vue
@@ -19,6 +19,7 @@ import { useUIStore } from '@/stores/ui.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { telemetry } from '@/plugins/telemetry';
 import { useRootStore } from '@/stores/root.store';
+import { getResourcePermissions } from '@/permissions';
 
 type WorkflowHistoryActionRecord = {
 	[K in Uppercase<WorkflowHistoryActionTypes[number]>]: Lowercase<K>;
@@ -65,10 +66,15 @@ const editorRoute = computed(() => ({
 		name: workflowId.value,
 	},
 }));
+const workflowPermissions = computed(
+	() => getResourcePermissions(workflowsStore.getWorkflowById(workflowId.value)?.scopes).workflow,
+);
 const actions = computed<UserAction[]>(() =>
 	workflowHistoryActionTypes.map((value) => ({
 		label: i18n.baseText(`workflowHistory.item.actions.${value}`),
-		disabled: false,
+		disabled:
+			(value === 'clone' && !workflowPermissions.value.create) ||
+			(value === 'restore' && !workflowPermissions.value.update),
 		value,
 	})),
 );
diff --git a/packages/editor-ui/src/views/WorkflowsView.vue b/packages/editor-ui/src/views/WorkflowsView.vue
index 252b64dda1c2d..55e61c4fb1973 100644
--- a/packages/editor-ui/src/views/WorkflowsView.vue
+++ b/packages/editor-ui/src/views/WorkflowsView.vue
@@ -8,7 +8,7 @@
 		:type-props="{ itemSize: 80 }"
 		:shareable="isShareable"
 		:initialize="initialize"
-		:disabled="readOnlyEnv"
+		:disabled="readOnlyEnv || !projectPermissions.workflow.create"
 		:loading="loading"
 		@click:add="addWorkflow"
 		@update:filters="onFiltersUpdated"
@@ -61,17 +61,12 @@
 							: $locale.baseText('workflows.empty.heading.userNotSetup')
 					}}
 				</n8n-heading>
-				<n8n-text size="large" color="text-base">
-					{{
-						$locale.baseText(
-							readOnlyEnv
-								? 'workflows.empty.description.readOnlyEnv'
-								: 'workflows.empty.description',
-						)
-					}}
-				</n8n-text>
+				<n8n-text size="large" color="text-base">{{ emptyListDescription }}</n8n-text>
 			</div>
-			<div v-if="!readOnlyEnv" :class="['text-center', 'mt-2xl', $style.actionsContainer]">
+			<div
+				v-if="!readOnlyEnv && projectPermissions.workflow.create"
+				:class="['text-center', 'mt-2xl', $style.actionsContainer]"
+			>
 				<a
 					v-if="isSalesUser"
 					:href="getTemplateRepositoryURL()"
@@ -162,6 +157,7 @@ import { useTagsStore } from '@/stores/tags.store';
 import { useProjectsStore } from '@/stores/projects.store';
 import ProjectTabs from '@/components/Projects/ProjectTabs.vue';
 import { useTemplatesStore } from '@/stores/templates.store';
+import { getResourcePermissions } from '@/permissions';
 
 interface Filters {
 	search: string;
@@ -260,6 +256,20 @@ const WorkflowsView = defineComponent({
 				? this.$locale.baseText('workflows.project.add')
 				: this.$locale.baseText('workflows.add');
 		},
+		projectPermissions() {
+			return getResourcePermissions(
+				this.projectsStore.currentProject?.scopes ?? this.projectsStore.personalProject?.scopes,
+			);
+		},
+		emptyListDescription() {
+			if (this.readOnlyEnv) {
+				return this.$locale.baseText('workflows.empty.description.readOnlyEnv');
+			} else if (!this.projectPermissions.workflow.create) {
+				return this.$locale.baseText('workflows.empty.description.noPermission');
+			} else {
+				return this.$locale.baseText('workflows.empty.description');
+			}
+		},
 	},
 	watch: {
 		filters: {
diff --git a/packages/workflow/package.json b/packages/workflow/package.json
index 96ad730e0fbfa..efec2d8acdecd 100644
--- a/packages/workflow/package.json
+++ b/packages/workflow/package.json
@@ -39,6 +39,7 @@
     "@types/xml2js": "catalog:"
   },
   "dependencies": {
+    "@n8n/permissions": "workspace:*",
     "@n8n/tournament": "1.0.3",
     "@n8n_io/riot-tmpl": "4.0.0",
     "ast-types": "0.15.2",
diff --git a/packages/workflow/src/Interfaces.ts b/packages/workflow/src/Interfaces.ts
index eb6c3ca07c3d4..1e6e5872ffbe9 100644
--- a/packages/workflow/src/Interfaces.ts
+++ b/packages/workflow/src/Interfaces.ts
@@ -10,6 +10,7 @@ import type { URLSearchParams } from 'url';
 import type { RequestBodyMatcher } from 'nock';
 import type { Client as SSHClient } from 'ssh2';
 
+import type { Scope } from '@n8n/permissions';
 import type { AuthenticationMethod } from './Authentication';
 import type { CODE_EXECUTION_MODES, CODE_LANGUAGES, LOG_LEVELS } from './Constants';
 import type { IDeferredPromise } from './DeferredPromise';
@@ -2463,6 +2464,7 @@ export interface ExecutionSummary {
 	nodeExecutionStatus?: {
 		[key: string]: IExecutionSummaryNodeExecutionResult;
 	};
+	scopes?: Scope[];
 }
 
 export interface IExecutionSummaryNodeExecutionResult {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index db4c26d06b74d..01f678904546c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1709,6 +1709,9 @@ importers:
 
   packages/workflow:
     dependencies:
+      '@n8n/permissions':
+        specifier: workspace:*
+        version: link:../@n8n/permissions
       '@n8n/tournament':
         specifier: 1.0.3
         version: 1.0.3

From 8e7d29ad3c4872b1cc147dfcfe9a864ba916692f Mon Sep 17 00:00:00 2001
From: Val <68596159+valya@users.noreply.github.com>
Date: Tue, 13 Aug 2024 16:57:01 +0100
Subject: [PATCH 148/168] fix(core): Filter out prototype and constructor
 lookups in expressions (#10382)

---
 packages/workflow/package.json                |  2 +-
 packages/workflow/src/Expression.ts           |  3 +
 .../workflow/src/ExpressionEvaluatorProxy.ts  |  7 +-
 packages/workflow/src/ExpressionSandboxing.ts | 58 +++++++++++++
 packages/workflow/test/Expression.test.ts     |  6 +-
 .../test/ExpressionSandboxing.test.ts         | 84 +++++++++++++++++++
 pnpm-lock.yaml                                | 12 +--
 7 files changed, 162 insertions(+), 10 deletions(-)
 create mode 100644 packages/workflow/src/ExpressionSandboxing.ts
 create mode 100644 packages/workflow/test/ExpressionSandboxing.test.ts

diff --git a/packages/workflow/package.json b/packages/workflow/package.json
index efec2d8acdecd..6bbdc59a1c96d 100644
--- a/packages/workflow/package.json
+++ b/packages/workflow/package.json
@@ -40,7 +40,7 @@
   },
   "dependencies": {
     "@n8n/permissions": "workspace:*",
-    "@n8n/tournament": "1.0.3",
+    "@n8n/tournament": "1.0.5",
     "@n8n_io/riot-tmpl": "4.0.0",
     "ast-types": "0.15.2",
     "axios": "catalog:",
diff --git a/packages/workflow/src/Expression.ts b/packages/workflow/src/Expression.ts
index ace4774c8fe43..018a8e9e2439e 100644
--- a/packages/workflow/src/Expression.ts
+++ b/packages/workflow/src/Expression.ts
@@ -26,6 +26,7 @@ import { extendSyntax } from './Extensions/ExpressionExtension';
 import { evaluateExpression, setErrorHandler } from './ExpressionEvaluatorProxy';
 import { getGlobalState } from './GlobalState';
 import { ApplicationError } from './errors/application.error';
+import { sanitizer, sanitizerName } from './ExpressionSandboxing';
 
 const IS_FRONTEND_IN_DEV_MODE =
 	typeof process === 'object' &&
@@ -306,6 +307,8 @@ export class Expression {
 		data.extend = extend;
 		data.extendOptional = extendOptional;
 
+		data[sanitizerName] = sanitizer;
+
 		Object.assign(data, extendedFunctions);
 
 		const constructorValidation = new RegExp(/\.\s*constructor/gm);
diff --git a/packages/workflow/src/ExpressionEvaluatorProxy.ts b/packages/workflow/src/ExpressionEvaluatorProxy.ts
index 60e33e5a7d15c..74d5c46e8f49b 100644
--- a/packages/workflow/src/ExpressionEvaluatorProxy.ts
+++ b/packages/workflow/src/ExpressionEvaluatorProxy.ts
@@ -3,6 +3,7 @@ import type { ReturnValue, TmplDifference } from '@n8n/tournament';
 import { Tournament } from '@n8n/tournament';
 import type { ExpressionEvaluatorType } from './Interfaces';
 import * as LoggerProxy from './LoggerProxy';
+import { PrototypeSanitizer } from './ExpressionSandboxing';
 
 type Evaluator = (expr: string, data: unknown) => tmpl.ReturnValue;
 type ErrorHandler = (error: Error) => void;
@@ -18,6 +19,7 @@ const differenceChecker = (diff: TmplDifference) => {
 		if (diff.same) {
 			return;
 		}
+		// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
 		if (diff.has?.function || diff.has?.templateString) {
 			return;
 		}
@@ -30,7 +32,10 @@ const differenceChecker = (diff: TmplDifference) => {
 		LoggerProxy.error('Expression evaluator difference checker failed');
 	}
 };
-const tournamentEvaluator = new Tournament(errorHandler, undefined);
+const tournamentEvaluator = new Tournament(errorHandler, undefined, undefined, {
+	before: [],
+	after: [PrototypeSanitizer],
+});
 let evaluator: Evaluator = tmpl.tmpl;
 let currentEvaluatorType: ExpressionEvaluatorType = 'tmpl';
 let diffExpressions = false;
diff --git a/packages/workflow/src/ExpressionSandboxing.ts b/packages/workflow/src/ExpressionSandboxing.ts
new file mode 100644
index 0000000000000..8240f8babbd46
--- /dev/null
+++ b/packages/workflow/src/ExpressionSandboxing.ts
@@ -0,0 +1,58 @@
+import { type ASTAfterHook, astBuilders as b, astVisit } from '@n8n/tournament';
+import { ExpressionError } from './errors';
+
+const forbiddenMembers = ['__proto__', 'prototype', 'constructor', 'getPrototypeOf'];
+export const sanitizerName = '__sanitize';
+const sanitizerIdentifier = b.identifier(sanitizerName);
+
+export const PrototypeSanitizer: ASTAfterHook = (ast, dataNode) => {
+	astVisit(ast, {
+		visitMemberExpression(path) {
+			this.traverse(path);
+			const node = path.node;
+			if (!node.computed) {
+				// This is static, so we're safe to error here
+				if (node.property.type !== 'Identifier') {
+					// eslint-disable-next-line n8n-local-rules/no-plain-errors
+					throw new ExpressionError(
+						`Unknown property type ${node.property.type} while sanitising expression`,
+					);
+				}
+
+				if (forbiddenMembers.includes(node.property.name)) {
+					throw new ExpressionError(
+						`Cannot access "${node.property.name}" due to security concerns`,
+					);
+				}
+			} else if (node.property.type === 'StringLiteral' || node.property.type === 'Literal') {
+				// Check any static strings against our forbidden list
+				if (forbiddenMembers.includes(node.property.value as string)) {
+					throw new ExpressionError(
+						`Cannot access "${node.property.value as string}" due to security concerns`,
+					);
+				}
+			} else if (!node.property.type.endsWith('Literal')) {
+				// This isn't a literal value, so we need to wrap it
+				path.replace(
+					b.memberExpression(
+						// eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-explicit-any
+						node.object as any,
+						// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+						b.callExpression(b.memberExpression(dataNode, sanitizerIdentifier), [
+							// eslint-disable-next-line @typescript-eslint/no-explicit-any
+							node.property as any,
+						]),
+						true,
+					),
+				);
+			}
+		},
+	});
+};
+
+export const sanitizer = (value: unknown): unknown => {
+	if (forbiddenMembers.includes(value as string)) {
+		throw new ExpressionError(`Cannot access "${value as string}" due to security concerns`);
+	}
+	return value;
+};
diff --git a/packages/workflow/test/Expression.test.ts b/packages/workflow/test/Expression.test.ts
index 2cd1632df7093..42cd682dbc023 100644
--- a/packages/workflow/test/Expression.test.ts
+++ b/packages/workflow/test/Expression.test.ts
@@ -74,7 +74,9 @@ for (const evaluator of ['tmpl', 'tournament'] as const) {
 				expect(evaluate('={{Reflect}}')).toEqual({});
 				expect(evaluate('={{Proxy}}')).toEqual({});
 
-				expect(evaluate('={{constructor}}')).toEqual({});
+				expect(() => evaluate('={{constructor}}')).toThrowError(
+					new ExpressionError('Cannot access "constructor" due to security concerns'),
+				);
 
 				expect(evaluate('={{escape}}')).toEqual({});
 				expect(evaluate('={{unescape}}')).toEqual({});
@@ -166,7 +168,7 @@ for (const evaluator of ['tmpl', 'tournament'] as const) {
 				const testFn = jest.fn();
 				Object.assign(global, { testFn });
 				expect(() => evaluate("={{ Date['constructor']('testFn()')()}}")).toThrowError(
-					new ExpressionError('Arbitrary code execution detected'),
+					new ExpressionError('Cannot access "constructor" due to security concerns'),
 				);
 				expect(testFn).not.toHaveBeenCalled();
 			});
diff --git a/packages/workflow/test/ExpressionSandboxing.test.ts b/packages/workflow/test/ExpressionSandboxing.test.ts
new file mode 100644
index 0000000000000..f2ba200f8eaf9
--- /dev/null
+++ b/packages/workflow/test/ExpressionSandboxing.test.ts
@@ -0,0 +1,84 @@
+import { PrototypeSanitizer, sanitizer } from '@/ExpressionSandboxing';
+import { Tournament } from '@n8n/tournament';
+
+const tournament = new Tournament(
+	(e) => {
+		throw e;
+	},
+	undefined,
+	undefined,
+	{
+		before: [],
+		after: [PrototypeSanitizer],
+	},
+);
+
+const errorRegex = /^Cannot access ".*" due to security concerns$/;
+
+describe('PrototypeSanitizer', () => {
+	describe('Static analysis', () => {
+		it('should not allow access to __proto__', () => {
+			expect(() => {
+				tournament.execute('{{ ({}).__proto__.__proto__ }}', {});
+			}).toThrowError(errorRegex);
+
+			expect(() => {
+				tournament.execute('{{ ({})["__proto__"]["__proto__"] }}', {});
+			}).toThrowError(errorRegex);
+		});
+
+		it('should not allow access to prototype', () => {
+			expect(() => {
+				tournament.execute('{{ Number.prototype }}', { Number });
+			}).toThrowError(errorRegex);
+
+			expect(() => {
+				tournament.execute('{{ Number["prototype"] }}', { Number });
+			}).toThrowError(errorRegex);
+		});
+
+		it('should not allow access to constructor', () => {
+			expect(() => {
+				tournament.execute('{{ Number.constructor }}', {
+					__sanitize: sanitizer,
+					Number,
+				});
+			}).toThrowError(errorRegex);
+
+			expect(() => {
+				tournament.execute('{{ Number["constructor"] }}', {
+					__sanitize: sanitizer,
+					Number,
+				});
+			}).toThrowError(errorRegex);
+		});
+	});
+
+	describe('Runtime', () => {
+		it('should not allow access to __proto__', () => {
+			expect(() => {
+				tournament.execute('{{ ({})["__" + (() => "proto")() + "__"] }}', {
+					__sanitize: sanitizer,
+				});
+			}).toThrowError(errorRegex);
+		});
+
+		it('should not allow access to prototype', () => {
+			expect(() => {
+				tournament.execute('{{ Number["pro" + (() => "toty")() + "pe"] }}', {
+					__sanitize: sanitizer,
+					Number,
+				});
+			}).toThrowError(errorRegex);
+		});
+
+		it('should not allow access to constructor', () => {
+			expect(() => {
+				tournament.execute('{{ Number["cons" + (() => "truc")() + "tor"] }}', {
+					__sanitize: sanitizer,
+					Number,
+				});
+			}).toThrowError(errorRegex);
+		});
+	});
+});
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 01f678904546c..3abf84c3bf924 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1713,8 +1713,8 @@ importers:
         specifier: workspace:*
         version: link:../@n8n/permissions
       '@n8n/tournament':
-        specifier: 1.0.3
-        version: 1.0.3
+        specifier: 1.0.5
+        version: 1.0.5
       '@n8n_io/riot-tmpl':
         specifier: 4.0.0
         version: 4.0.0
@@ -4146,9 +4146,9 @@ packages:
     resolution: {integrity: sha512-rbnMnSdEwq2yuYMgzOQ4jTXm+oH7yjN/0ISfB/7O6pUcEPsZt9UW60BYfQ1WWHkKa/evI8vgER2zV5/RC1BupQ==}
     engines: {node: '>=18.10'}
 
-  '@n8n/tournament@1.0.3':
-    resolution: {integrity: sha512-GnmDD5wKAxKfxnSzhENHPn5n91/1c3/psnuT7D+jHHVQdMe8qaCcSq15rcGRfDfTf2v+BZBT0yeyK8Cfexr9yw==}
-    engines: {node: '>=18.10', pnpm: '>=8.6'}
+  '@n8n/tournament@1.0.5':
+    resolution: {integrity: sha512-IPBHa7gC0wwHVct/dnBquHz+uMCDZaZ05cor1D/rjlwaOe/PVu5mtoZaPHYuR98R3W1/IyxC5PuBd0JizDP9gg==}
+    engines: {node: '>=20.15', pnpm: '>=9.5'}
 
   '@n8n/typeorm@0.3.20-10':
     resolution: {integrity: sha512-YYQKkafEGqNAG+VgtGbJOWpcyF4ZsRJ+Q7qXigTXZFQb4xpL/+t0BXEMhy8Gw0OEjnZI5cbLGHcQtj7Xlfg7dw==}
@@ -16636,7 +16636,7 @@ snapshots:
       '@types/retry': 0.12.5
       retry: 0.13.1
 
-  '@n8n/tournament@1.0.3':
+  '@n8n/tournament@1.0.5':
     dependencies:
       '@n8n_io/riot-tmpl': 4.0.1
       ast-types: 0.16.1

From 1e310f40f7c78fb2641ecbf06b0e55792a3c2c61 Mon Sep 17 00:00:00 2001
From: Jon <jonathan.bennetts@gmail.com>
Date: Tue, 13 Aug 2024 18:09:07 +0100
Subject: [PATCH 149/168] fix: Fix issue with some errors not being handled
 correctly (no-changelog) (#10371)

---
 .../src/errors/abstract/node.error.ts         |  2 +-
 packages/workflow/test/NodeErrors.test.ts     | 20 ++++++++++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/packages/workflow/src/errors/abstract/node.error.ts b/packages/workflow/src/errors/abstract/node.error.ts
index 460538fc0eb28..5d679507c7186 100644
--- a/packages/workflow/src/errors/abstract/node.error.ts
+++ b/packages/workflow/src/errors/abstract/node.error.ts
@@ -167,7 +167,7 @@ export abstract class NodeError extends ExecutionBaseError {
 		}
 
 		// if code is provided and it is in the list of common errors set the message and return early
-		if (code && COMMON_ERRORS[code.toUpperCase()]) {
+		if (code && typeof code === 'string' && COMMON_ERRORS[code.toUpperCase()]) {
 			newMessage = COMMON_ERRORS[code] as string;
 			messages.push(message);
 			return [newMessage, messages];
diff --git a/packages/workflow/test/NodeErrors.test.ts b/packages/workflow/test/NodeErrors.test.ts
index 405c5919325a3..12033fd28d720 100644
--- a/packages/workflow/test/NodeErrors.test.ts
+++ b/packages/workflow/test/NodeErrors.test.ts
@@ -1,4 +1,4 @@
-import type { INode } from '@/Interfaces';
+import type { INode, JsonObject } from '@/Interfaces';
 import { NodeOperationError } from '@/errors';
 import { NodeApiError } from '@/errors/node-api.error';
 import { UNKNOWN_ERROR_DESCRIPTION, UNKNOWN_ERROR_MESSAGE } from '../src/Constants';
@@ -260,4 +260,22 @@ describe('NodeApiError message and description logic', () => {
 		expect(nodeApiError.message).toEqual(UNKNOWN_ERROR_MESSAGE);
 		expect(nodeApiError.description).toEqual(UNKNOWN_ERROR_DESCRIPTION);
 	});
+
+	it('case: Error code sent as "any"', () => {
+		const error = {
+			code: 400,
+			message: "Invalid value 'test' for viewId parameter.",
+			status: 'INVALID_ARGUMENT',
+		};
+		const [message, ...rest] = error.message.split('\n');
+		const description = rest.join('\n');
+		const httpCode = error.code as any;
+		const nodeApiError = new NodeApiError(node, error as JsonObject, {
+			message,
+			description,
+			httpCode,
+		});
+
+		expect(nodeApiError.message).toEqual(error.message);
+	});
 });

From dfd712a45a5e3c880cb55deacf6137cab8136a46 Mon Sep 17 00:00:00 2001
From: Alex Grozav <alex@grozav.com>
Date: Tue, 13 Aug 2024 23:14:06 +0300
Subject: [PATCH 150/168] fix(editor): Fix bug causing workflow debugging to
 not work in new canvas (no-changelog) (#10384)

---
 packages/editor-ui/src/views/NodeView.v2.vue | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/packages/editor-ui/src/views/NodeView.v2.vue b/packages/editor-ui/src/views/NodeView.v2.vue
index c25bca7e35bdf..465505cc438d3 100644
--- a/packages/editor-ui/src/views/NodeView.v2.vue
+++ b/packages/editor-ui/src/views/NodeView.v2.vue
@@ -8,6 +8,7 @@ import {
 	onMounted,
 	ref,
 	useCssModule,
+	watch,
 } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import WorkflowCanvas from '@/components/canvas/WorkflowCanvas.vue';
@@ -288,6 +289,7 @@ async function initializeRoute() {
 	nodeHelpers.updateNodesParameterIssues();
 
 	await loadCredentials();
+	await initializeDebugMode();
 }
 
 async function initializeWorkspaceForNewWorkflow() {
@@ -306,7 +308,6 @@ async function initializeWorkspaceForExistingWorkflow(id: string) {
 		const workflowData = await workflowsStore.fetchWorkflow(id);
 
 		await openWorkflow(workflowData);
-		await initializeDebugMode();
 
 		if (workflowData.meta?.onboardingId) {
 			trackOpenWorkflowFromOnboardingTemplate();
@@ -748,6 +749,7 @@ async function importWorkflowExact({ workflow: workflowData }: { workflow: IWork
 
 	resetWorkspace();
 
+	await initializeData();
 	await initializeWorkspace({
 		...workflowData,
 		nodes: NodeViewUtils.getFixedNodesList<INodeUi>(workflowData.nodes),
@@ -1370,6 +1372,21 @@ function registerCustomActions() {
 	// });
 }
 
+/**
+ * Routing
+ */
+
+watch(
+	() => route.name,
+	async () => {
+		if (!checkIfEditingIsAllowed()) {
+			return;
+		}
+
+		await initializeRoute();
+	},
+);
+
 /**
  * Lifecycle
  */

From 838f13337f083636d38fbacceba9a512191c41a0 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: Wed, 14 Aug 2024 09:43:59 +0200
Subject: [PATCH 151/168] feat(core): Upgrade DB drivers (no-changelog)
 (#10370)

---
 packages/@n8n/nodes-langchain/package.json |   4 +-
 packages/cli/package.json                  |   4 +-
 packages/nodes-base/package.json           |   6 +-
 pnpm-lock.yaml                             | 351 ++++++++++-----------
 4 files changed, 168 insertions(+), 197 deletions(-)

diff --git a/packages/@n8n/nodes-langchain/package.json b/packages/@n8n/nodes-langchain/package.json
index b5d73d1862501..d1478e1d22347 100644
--- a/packages/@n8n/nodes-langchain/package.json
+++ b/packages/@n8n/nodes-langchain/package.json
@@ -157,7 +157,7 @@
     "@pinecone-database/pinecone": "3.0.0",
     "@qdrant/js-client-rest": "1.9.0",
     "@supabase/supabase-js": "2.43.4",
-    "@types/pg": "^8.11.3",
+    "@types/pg": "^8.11.6",
     "@xata.io/client": "0.28.4",
     "basic-auth": "catalog:",
     "cheerio": "1.0.0-rc.12",
@@ -176,7 +176,7 @@
     "n8n-workflow": "workspace:*",
     "openai": "4.53.0",
     "pdf-parse": "1.1.1",
-    "pg": "8.11.3",
+    "pg": "8.12.0",
     "redis": "4.6.12",
     "sqlite3": "5.1.7",
     "temp": "0.9.4",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 0ecf4c795295d..d0f1fc34c3f83 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -131,7 +131,7 @@
     "ldapts": "4.2.6",
     "lodash": "catalog:",
     "luxon": "catalog:",
-    "mysql2": "3.10.0",
+    "mysql2": "3.11.0",
     "n8n-core": "workspace:*",
     "n8n-editor-ui": "workspace:*",
     "n8n-nodes-base": "workspace:*",
@@ -144,7 +144,7 @@
     "otpauth": "9.1.1",
     "p-cancelable": "2.1.1",
     "p-lazy": "3.1.0",
-    "pg": "8.11.3",
+    "pg": "8.12.0",
     "picocolors": "1.0.1",
     "pkce-challenge": "3.0.0",
     "posthog-node": "3.2.1",
diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index 5c36310965454..a0d1fef217b68 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -866,15 +866,15 @@
     "mongodb": "6.3.0",
     "mqtt": "5.7.2",
     "mssql": "10.0.2",
-    "mysql2": "3.10.0",
+    "mysql2": "3.11.0",
     "n8n-workflow": "workspace:*",
     "node-html-markdown": "1.2.0",
     "node-ssh": "13.2.0",
     "nodemailer": "6.9.9",
     "otpauth": "9.1.1",
     "pdfjs-dist": "2.16.105",
-    "pg": "8.11.3",
-    "pg-promise": "10.15.4",
+    "pg": "8.12.0",
+    "pg-promise": "11.9.1",
     "promise-ftp": "1.3.5",
     "pyodide": "0.23.4",
     "redis": "4.6.14",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3abf84c3bf924..16ba572ac4a4a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -349,10 +349,10 @@ importers:
         version: 0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))
       '@langchain/community':
         specifier: 0.2.20
-        version: 0.2.20(wowgvfxtiu4vww53wbp4ny5rre)
+        version: 0.2.20(32xju6nqoe2wrsbntqq2x5vcke)
       '@langchain/core':
         specifier: 0.2.18
-        version: 0.2.18(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))
+        version: 0.2.18(langchain@0.2.11(6hdkxymucpmkiknmt5geracdu4))(openai@4.53.0(encoding@0.1.13))
       '@langchain/google-genai':
         specifier: 0.0.23
         version: 0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8)
@@ -370,25 +370,25 @@ importers:
         version: 0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))
       '@langchain/openai':
         specifier: 0.2.5
-        version: 0.2.5(encoding@0.1.13)(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))
+        version: 0.2.5(encoding@0.1.13)(langchain@0.2.11(6hdkxymucpmkiknmt5geracdu4))
       '@langchain/pinecone':
         specifier: 0.0.8
-        version: 0.0.8(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))
+        version: 0.0.8(langchain@0.2.11(6hdkxymucpmkiknmt5geracdu4))(openai@4.53.0(encoding@0.1.13))
       '@langchain/qdrant':
         specifier: ^0.0.5
-        version: 0.0.5(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))(typescript@5.5.2)
+        version: 0.0.5(langchain@0.2.11(6hdkxymucpmkiknmt5geracdu4))(openai@4.53.0(encoding@0.1.13))(typescript@5.5.2)
       '@langchain/redis':
         specifier: 0.0.5
-        version: 0.0.5(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))
+        version: 0.0.5(langchain@0.2.11(6hdkxymucpmkiknmt5geracdu4))(openai@4.53.0(encoding@0.1.13))
       '@langchain/textsplitters':
         specifier: 0.0.3
-        version: 0.0.3(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))
+        version: 0.0.3(langchain@0.2.11(6hdkxymucpmkiknmt5geracdu4))(openai@4.53.0(encoding@0.1.13))
       '@mozilla/readability':
         specifier: ^0.5.0
         version: 0.5.0
       '@n8n/typeorm':
         specifier: 0.3.20-10
-        version: 0.3.20-10(@sentry/node@7.87.0)(ioredis@5.3.2)(mssql@10.0.2)(mysql2@3.10.0)(pg@8.11.3)(redis@4.6.12)(sqlite3@5.1.7)
+        version: 0.3.20-10(@sentry/node@7.87.0)(ioredis@5.3.2)(mssql@10.0.2)(mysql2@3.11.0)(pg@8.12.0)(redis@4.6.12)(sqlite3@5.1.7)
       '@n8n/vm2':
         specifier: 3.9.25
         version: 3.9.25
@@ -402,7 +402,7 @@ importers:
         specifier: 2.43.4
         version: 2.43.4
       '@types/pg':
-        specifier: ^8.11.3
+        specifier: ^8.11.6
         version: 8.11.6
       '@xata.io/client':
         specifier: 0.28.4
@@ -439,7 +439,7 @@ importers:
         version: 2.1.0
       langchain:
         specifier: 0.2.11
-        version: 0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4)
+        version: 0.2.11(6hdkxymucpmkiknmt5geracdu4)
       lodash:
         specifier: 'catalog:'
         version: 4.17.21
@@ -459,8 +459,8 @@ importers:
         specifier: 1.1.1
         version: 1.1.1
       pg:
-        specifier: 8.11.3
-        version: 8.11.3
+        specifier: 8.12.0
+        version: 8.12.0
       redis:
         specifier: 4.6.12
         version: 4.6.12
@@ -628,7 +628,7 @@ importers:
         version: link:../@n8n/permissions
       '@n8n/typeorm':
         specifier: 0.3.20-10
-        version: 0.3.20-10(@sentry/node@7.87.0)(ioredis@5.3.2)(mssql@10.0.2)(mysql2@3.10.0)(pg@8.11.3)(redis@4.6.14)(sqlite3@5.1.7)
+        version: 0.3.20-10(@sentry/node@7.87.0)(ioredis@5.3.2)(mssql@10.0.2)(mysql2@3.11.0)(pg@8.12.0)(redis@4.6.14)(sqlite3@5.1.7)
       '@n8n_io/license-sdk':
         specifier: 2.13.0
         version: 2.13.0
@@ -753,8 +753,8 @@ importers:
         specifier: 'catalog:'
         version: 3.4.4
       mysql2:
-        specifier: 3.10.0
-        version: 3.10.0
+        specifier: 3.11.0
+        version: 3.11.0
       n8n-core:
         specifier: workspace:*
         version: link:../core
@@ -792,8 +792,8 @@ importers:
         specifier: 3.1.0
         version: 3.1.0
       pg:
-        specifier: 8.11.3
-        version: 8.11.3
+        specifier: 8.12.0
+        version: 8.12.0
       picocolors:
         specifier: 1.0.1
         version: 1.0.1
@@ -1550,8 +1550,8 @@ importers:
         specifier: 10.0.2
         version: 10.0.2
       mysql2:
-        specifier: 3.10.0
-        version: 3.10.0
+        specifier: 3.11.0
+        version: 3.11.0
       n8n-workflow:
         specifier: workspace:*
         version: link:../workflow
@@ -1571,11 +1571,11 @@ importers:
         specifier: 2.16.105
         version: 2.16.105
       pg:
-        specifier: 8.11.3
-        version: 8.11.3
+        specifier: 8.12.0
+        version: 8.12.0
       pg-promise:
-        specifier: 10.15.4
-        version: 10.15.4
+        specifier: 11.9.1
+        version: 11.9.1
       promise-ftp:
         specifier: 1.3.5
         version: 1.3.5(promise-ftp-common@1.1.5)
@@ -6221,8 +6221,8 @@ packages:
   assert-never@1.2.1:
     resolution: {integrity: sha512-TaTivMB6pYI1kXwrFlEhLeGfOqoDNdTxjCdwRfFFkEA30Eu+k48W34nlok2EYWJfFFzqaEmichdNM7th6M5HNw==}
 
-  assert-options@0.8.0:
-    resolution: {integrity: sha512-qSELrEaEz4sGwTs4Qh+swQkjiHAysC4rot21+jzXU86dJzNG+FDqBzyS3ohSoTRf4ZLA3FSwxQdiuNl5NXUtvA==}
+  assert-options@0.8.1:
+    resolution: {integrity: sha512-5lNGRB5g5i2bGIzb+J1QQE1iKU/WEMVBReFIc5pPDWjcPj23otPL0eI6PB2v7QPi0qU6Mhym5D3y0ZiSIOf3GA==}
     engines: {node: '>=10.0.0'}
 
   assert-plus@1.0.0:
@@ -6288,6 +6288,10 @@ packages:
   aws-sign2@0.7.0:
     resolution: {integrity: sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==}
 
+  aws-ssl-profiles@1.1.1:
+    resolution: {integrity: sha512-+H+kuK34PfMaI9PNU/NSjBKL5hh/KDM9J72kwYeYEm0A8B1AC4fuCy3qsjnA7lxklgyXsB68yn8Z2xoZEjgwCQ==}
+    engines: {node: '>= 6.0.0'}
+
   aws4@1.11.0:
     resolution: {integrity: sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==}
 
@@ -6485,10 +6489,6 @@ packages:
   buffer-more-ints@1.0.0:
     resolution: {integrity: sha512-EMetuGFz5SLsT0QTnXzINh4Ksr+oo4i+UGTXEshiGCQWnsgSs7ZhJ8fzlwQ+OzEMs0MpDAMr1hxnblp5a4vcHg==}
 
-  buffer-writer@2.0.0:
-    resolution: {integrity: sha512-a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw==}
-    engines: {node: '>=4'}
-
   buffer@5.7.1:
     resolution: {integrity: sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==}
 
@@ -10178,8 +10178,8 @@ packages:
     resolution: {integrity: sha512-+MrqnJRtxdF+xngFfUUkIMQrUUL0KsxbADUkn23Z/4ibGg192Q+z+CQyiYwvWTsYjJygmMR8+w3ZDa98Zh6ESg==}
     engines: {node: '>=12.0.0'}
 
-  mysql2@3.10.0:
-    resolution: {integrity: sha512-qx0mfWYt1DpTPkw8mAcHW/OwqqyNqBLBHvY5IjN8+icIYTjt6znrgYJ+gxqNNRpVknb5Wc/gcCM4XjbCR0j5tw==}
+  mysql2@3.11.0:
+    resolution: {integrity: sha512-J9phbsXGvTOcRVPR95YedzVSxJecpW5A5+cQ57rhHIFXteTP10HCs+VBjS7DHIKfEaI1zQ5tlVrquCd64A6YvA==}
     engines: {node: '>= 8.0'}
 
   mz@2.7.0:
@@ -10592,9 +10592,6 @@ packages:
     resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==}
     engines: {node: '>=6'}
 
-  packet-reader@1.0.0:
-    resolution: {integrity: sha512-HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ==}
-
   pako@0.2.9:
     resolution: {integrity: sha512-NUcwaKxUxWrZLpDG+z/xZaCgQITkA/Dv4V/T6bw7VON6l1Xz/VnrBqrYjZQ12TamKHzITTfOEIYUj48y2KXImA==}
 
@@ -10731,32 +10728,32 @@ packages:
   pg-cloudflare@1.1.1:
     resolution: {integrity: sha512-xWPagP/4B6BgFO+EKz3JONXv3YDgvkbVrGw2mTo3D6tVDQRh1e7cqVGvyR3BE+eQgAvx1XhW/iEASj4/jCWl3Q==}
 
-  pg-connection-string@2.6.2:
-    resolution: {integrity: sha512-ch6OwaeaPYcova4kKZ15sbJ2hKb/VP48ZD2gE7i1J+L4MspCtBMAx8nMgz7bksc7IojCIIWuEhHibSMFH8m8oA==}
+  pg-connection-string@2.6.4:
+    resolution: {integrity: sha512-v+Z7W/0EO707aNMaAEfiGnGL9sxxumwLl2fJvCQtMn9Fxsg+lPpPkdcyBSv/KFgpGdYkMfn+EI1Or2EHjpgLCA==}
 
   pg-int8@1.0.1:
     resolution: {integrity: sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==}
     engines: {node: '>=4.0.0'}
 
-  pg-minify@1.6.2:
-    resolution: {integrity: sha512-1KdmFGGTP6jplJoI8MfvRlfvMiyBivMRP7/ffh4a11RUFJ7kC2J0ZHlipoKiH/1hz+DVgceon9U2qbaHpPeyPg==}
-    engines: {node: '>=8.0'}
+  pg-minify@1.6.5:
+    resolution: {integrity: sha512-u0UE8veaCnMfJmoklqneeBBopOAPG3/6DHqGVHYAhz8DkJXh9dnjPlz25fRxn4e+6XVzdOp7kau63Rp52fZ3WQ==}
+    engines: {node: '>=14.0.0'}
 
   pg-numeric@1.0.2:
     resolution: {integrity: sha512-BM/Thnrw5jm2kKLE5uJkXqqExRUY/toLHda65XgFTBTFYZyopbKjBe29Ii3RbkvlsMoFwD+tHeGaCjjv0gHlyw==}
     engines: {node: '>=4'}
 
-  pg-pool@3.6.1:
-    resolution: {integrity: sha512-jizsIzhkIitxCGfPRzJn1ZdcosIt3pz9Sh3V01fm1vZnbnCMgmGl5wvGGdNN2EL9Rmb0EcFoCkixH4Pu+sP9Og==}
+  pg-pool@3.6.2:
+    resolution: {integrity: sha512-Htjbg8BlwXqSBQ9V8Vjtc+vzf/6fVUuak/3/XXKA9oxZprwW3IMDQTGHP+KDmVL7rtd+R1QjbnCFPuTHm3G4hg==}
     peerDependencies:
       pg: '>=8.0'
 
-  pg-promise@10.15.4:
-    resolution: {integrity: sha512-BKlHCMCdNUmF6gagVbehRWSEiVcZzPVltEx14OJExR9Iz9/1R6KETDWLLGv2l6yRqYFnEZZy1VDjRhArzeIGrw==}
-    engines: {node: '>=12.0'}
+  pg-promise@11.9.1:
+    resolution: {integrity: sha512-qvMmyDvWd64X0a25hCuWV40GLMbgeYf4z7ZmzxQqGHtUIlzMtxcMtaBHAMr7XVOL62wFv2ZVKW5pFruD/4ZAOg==}
+    engines: {node: '>=14.0'}
 
-  pg-protocol@1.6.0:
-    resolution: {integrity: sha512-M+PDm637OY5WM307051+bsDia5Xej6d9IR4GwJse1qA1DIhiKlksvrneZOYQq42OM+spubpcNYEo2FcKQrDk+Q==}
+  pg-protocol@1.6.1:
+    resolution: {integrity: sha512-jPIlvgoD63hrEuihvIg+tJhoGjUsLPn6poJY9N5CnlPd91c2T18T/9zBtLxZSb1EhYxBRoZJtzScCaWlYLtktg==}
 
   pg-types@2.2.0:
     resolution: {integrity: sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==}
@@ -10766,17 +10763,8 @@ packages:
     resolution: {integrity: sha512-cRL3JpS3lKMGsKaWndugWQoLOCoP+Cic8oseVcbr0qhPzYD5DWXK+RZ9LY9wxRf7RQia4SCwQlXk0q6FCPrVng==}
     engines: {node: '>=10'}
 
-  pg@8.11.3:
-    resolution: {integrity: sha512-+9iuvG8QfaaUrrph+kpF24cXkH1YOOUeArRNYIxq1viYHZagBxrTno7cecY1Fa44tJeZvaoG+Djpkc3JwehN5g==}
-    engines: {node: '>= 8.0.0'}
-    peerDependencies:
-      pg-native: '>=3.0.1'
-    peerDependenciesMeta:
-      pg-native:
-        optional: true
-
-  pg@8.8.0:
-    resolution: {integrity: sha512-UXYN0ziKj+AeNNP7VDMwrehpACThH7LUl/p8TDFpEUuSejCUIwGSfxpHsPvtM6/WXFy6SU4E5RG4IJV/TZAGjw==}
+  pg@8.12.0:
+    resolution: {integrity: sha512-A+LHUSnwnxrnL/tZ+OLfqR1SxLN3c/pgDztZ47Rpbsd4jUytsTtwQo/TLPRzPJMp/1pbhYVhH9cuSZLAajNfjQ==}
     engines: {node: '>= 8.0.0'}
     peerDependencies:
       pg-native: '>=3.0.1'
@@ -11817,9 +11805,9 @@ packages:
   spdx-license-ids@3.0.12:
     resolution: {integrity: sha512-rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA==}
 
-  spex@3.2.0:
-    resolution: {integrity: sha512-9srjJM7NaymrpwMHvSmpDeIK5GoRMX/Tq0E8aOlDPS54dDnDUIp30DrP9SphMPEETDLzEM9+4qo+KipmbtPecg==}
-    engines: {node: '>=4.5'}
+  spex@3.3.0:
+    resolution: {integrity: sha512-VNiXjFp6R4ldPbVRYbpxlD35yRHceecVXlct1J4/X80KuuPnW2AXMq3sGwhnJOhKkUsOxAT6nRGfGE5pocVw5w==}
+    engines: {node: '>=10.0.0'}
 
   split-on-first@1.1.0:
     resolution: {integrity: sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw==}
@@ -15796,8 +15784,8 @@ snapshots:
       url-join: 4.0.1
       zod: 3.23.8
     optionalDependencies:
-      '@langchain/core': 0.2.18(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))
-      langchain: 0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4)
+      '@langchain/core': 0.2.18(langchain@0.2.11(6hdkxymucpmkiknmt5geracdu4))(openai@4.53.0(encoding@0.1.13))
+      langchain: 0.2.11(6hdkxymucpmkiknmt5geracdu4)
     transitivePeerDependencies:
       - encoding
 
@@ -16224,7 +16212,7 @@ snapshots:
   '@langchain/anthropic@0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))':
     dependencies:
       '@anthropic-ai/sdk': 0.22.0(encoding@0.1.13)
-      '@langchain/core': 0.2.18(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))
+      '@langchain/core': 0.2.18(langchain@0.2.11(6hdkxymucpmkiknmt5geracdu4))(openai@4.53.0(encoding@0.1.13))
       fast-xml-parser: 4.3.5
       zod: 3.23.8
       zod-to-json-schema: 3.23.0(zod@3.23.8)
@@ -16236,23 +16224,23 @@ snapshots:
 
   '@langchain/cohere@0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))':
     dependencies:
-      '@langchain/core': 0.2.18(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))
+      '@langchain/core': 0.2.18(langchain@0.2.11(6hdkxymucpmkiknmt5geracdu4))(openai@4.53.0(encoding@0.1.13))
       cohere-ai: 7.10.1(encoding@0.1.13)
     transitivePeerDependencies:
       - encoding
       - langchain
       - openai
 
-  '@langchain/community@0.2.20(wowgvfxtiu4vww53wbp4ny5rre)':
+  '@langchain/community@0.2.20(32xju6nqoe2wrsbntqq2x5vcke)':
     dependencies:
-      '@langchain/core': 0.2.18(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))
-      '@langchain/openai': 0.2.5(encoding@0.1.13)(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))
+      '@langchain/core': 0.2.18(langchain@0.2.11(6hdkxymucpmkiknmt5geracdu4))(openai@4.53.0(encoding@0.1.13))
+      '@langchain/openai': 0.2.5(encoding@0.1.13)(langchain@0.2.11(6hdkxymucpmkiknmt5geracdu4))
       binary-extensions: 2.2.0
       expr-eval: 2.0.2
       flat: 5.0.2
       js-yaml: 4.1.0
-      langchain: 0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4)
-      langsmith: 0.1.34(@langchain/core@0.2.18(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13)))(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))
+      langchain: 0.2.11(6hdkxymucpmkiknmt5geracdu4)
+      langsmith: 0.1.34(@langchain/core@0.2.18(langchain@0.2.11(6hdkxymucpmkiknmt5geracdu4))(openai@4.53.0(encoding@0.1.13)))(langchain@0.2.11(6hdkxymucpmkiknmt5geracdu4))(openai@4.53.0(encoding@0.1.13))
       uuid: 10.0.0
       zod: 3.23.8
       zod-to-json-schema: 3.23.0(zod@3.23.8)
@@ -16288,9 +16276,9 @@ snapshots:
       jsonwebtoken: 9.0.2
       lodash: 4.17.21
       mammoth: 1.7.2
-      mysql2: 3.10.0
+      mysql2: 3.11.0
       pdf-parse: 1.1.1
-      pg: 8.11.3
+      pg: 8.12.0
       redis: 4.6.12
       ws: 8.17.1
     transitivePeerDependencies:
@@ -16313,13 +16301,13 @@ snapshots:
       - pyodide
       - supports-color
 
-  '@langchain/core@0.2.18(langchain@0.2.11(axios@1.7.3)(openai@4.53.0))(openai@4.53.0)':
+  '@langchain/core@0.2.18(langchain@0.2.11(6hdkxymucpmkiknmt5geracdu4))(openai@4.53.0(encoding@0.1.13))':
     dependencies:
       ansi-styles: 5.2.0
       camelcase: 6.3.0
       decamelize: 1.2.0
       js-tiktoken: 1.0.12
-      langsmith: 0.1.39(@langchain/core@0.2.18(langchain@0.2.11(axios@1.7.3)(openai@4.53.0))(openai@4.53.0))(langchain@0.2.11(axios@1.7.3)(openai@4.53.0))(openai@4.53.0)
+      langsmith: 0.1.39(@langchain/core@0.2.18(langchain@0.2.11(6hdkxymucpmkiknmt5geracdu4))(openai@4.53.0(encoding@0.1.13)))(langchain@0.2.11(6hdkxymucpmkiknmt5geracdu4))(openai@4.53.0(encoding@0.1.13))
       ml-distance: 4.0.1
       mustache: 4.2.0
       p-queue: 6.6.2
@@ -16331,13 +16319,13 @@ snapshots:
       - langchain
       - openai
 
-  '@langchain/core@0.2.18(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))':
+  '@langchain/core@0.2.18(langchain@0.2.11(axios@1.7.3)(openai@4.53.0))(openai@4.53.0)':
     dependencies:
       ansi-styles: 5.2.0
       camelcase: 6.3.0
       decamelize: 1.2.0
       js-tiktoken: 1.0.12
-      langsmith: 0.1.39(@langchain/core@0.2.18(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13)))(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))
+      langsmith: 0.1.39(@langchain/core@0.2.18(langchain@0.2.11(axios@1.7.3)(openai@4.53.0))(openai@4.53.0))(langchain@0.2.11(axios@1.7.3)(openai@4.53.0))(openai@4.53.0)
       ml-distance: 4.0.1
       mustache: 4.2.0
       p-queue: 6.6.2
@@ -16349,9 +16337,9 @@ snapshots:
       - langchain
       - openai
 
-  '@langchain/google-common@0.0.22(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))(zod@3.23.8)':
+  '@langchain/google-common@0.0.22(langchain@0.2.11(6hdkxymucpmkiknmt5geracdu4))(openai@4.53.0(encoding@0.1.13))(zod@3.23.8)':
     dependencies:
-      '@langchain/core': 0.2.18(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))
+      '@langchain/core': 0.2.18(langchain@0.2.11(6hdkxymucpmkiknmt5geracdu4))(openai@4.53.0(encoding@0.1.13))
       uuid: 10.0.0
       zod-to-json-schema: 3.23.0(zod@3.23.8)
     transitivePeerDependencies:
@@ -16359,10 +16347,10 @@ snapshots:
       - openai
       - zod
 
-  '@langchain/google-gauth@0.0.21(encoding@0.1.13)(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))(zod@3.23.8)':
+  '@langchain/google-gauth@0.0.21(encoding@0.1.13)(langchain@0.2.11(6hdkxymucpmkiknmt5geracdu4))(openai@4.53.0(encoding@0.1.13))(zod@3.23.8)':
     dependencies:
-      '@langchain/core': 0.2.18(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))
-      '@langchain/google-common': 0.0.22(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))(zod@3.23.8)
+      '@langchain/core': 0.2.18(langchain@0.2.11(6hdkxymucpmkiknmt5geracdu4))(openai@4.53.0(encoding@0.1.13))
+      '@langchain/google-common': 0.0.22(langchain@0.2.11(6hdkxymucpmkiknmt5geracdu4))(openai@4.53.0(encoding@0.1.13))(zod@3.23.8)
       google-auth-library: 8.9.0(encoding@0.1.13)
     transitivePeerDependencies:
       - encoding
@@ -16374,7 +16362,7 @@ snapshots:
   '@langchain/google-genai@0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8)':
     dependencies:
       '@google/generative-ai': 0.7.1
-      '@langchain/core': 0.2.18(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))
+      '@langchain/core': 0.2.18(langchain@0.2.11(6hdkxymucpmkiknmt5geracdu4))(openai@4.53.0(encoding@0.1.13))
       zod-to-json-schema: 3.23.0(zod@3.23.8)
     transitivePeerDependencies:
       - langchain
@@ -16383,8 +16371,8 @@ snapshots:
 
   '@langchain/google-vertexai@0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8)':
     dependencies:
-      '@langchain/core': 0.2.18(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))
-      '@langchain/google-gauth': 0.0.21(encoding@0.1.13)(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))(zod@3.23.8)
+      '@langchain/core': 0.2.18(langchain@0.2.11(6hdkxymucpmkiknmt5geracdu4))(openai@4.53.0(encoding@0.1.13))
+      '@langchain/google-gauth': 0.0.21(encoding@0.1.13)(langchain@0.2.11(6hdkxymucpmkiknmt5geracdu4))(openai@4.53.0(encoding@0.1.13))(zod@3.23.8)
     transitivePeerDependencies:
       - encoding
       - langchain
@@ -16394,8 +16382,8 @@ snapshots:
 
   '@langchain/groq@0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))':
     dependencies:
-      '@langchain/core': 0.2.18(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))
-      '@langchain/openai': 0.2.5(encoding@0.1.13)(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))
+      '@langchain/core': 0.2.18(langchain@0.2.11(6hdkxymucpmkiknmt5geracdu4))(openai@4.53.0(encoding@0.1.13))
+      '@langchain/openai': 0.2.5(encoding@0.1.13)(langchain@0.2.11(6hdkxymucpmkiknmt5geracdu4))
       groq-sdk: 0.3.2(encoding@0.1.13)
       zod: 3.23.8
       zod-to-json-schema: 3.23.0(zod@3.23.8)
@@ -16407,7 +16395,7 @@ snapshots:
 
   '@langchain/mistralai@0.0.27(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))':
     dependencies:
-      '@langchain/core': 0.2.18(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))
+      '@langchain/core': 0.2.18(langchain@0.2.11(6hdkxymucpmkiknmt5geracdu4))(openai@4.53.0(encoding@0.1.13))
       '@mistralai/mistralai': 0.4.0(encoding@0.1.13)
       uuid: 10.0.0
       zod: 3.23.8
@@ -16419,16 +16407,16 @@ snapshots:
 
   '@langchain/ollama@0.0.2(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))':
     dependencies:
-      '@langchain/core': 0.2.18(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))
+      '@langchain/core': 0.2.18(langchain@0.2.11(6hdkxymucpmkiknmt5geracdu4))(openai@4.53.0(encoding@0.1.13))
       ollama: 0.5.6
       uuid: 10.0.0
     transitivePeerDependencies:
       - langchain
       - openai
 
-  '@langchain/openai@0.2.5(encoding@0.1.13)(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))':
+  '@langchain/openai@0.2.5(encoding@0.1.13)(langchain@0.2.11(6hdkxymucpmkiknmt5geracdu4))':
     dependencies:
-      '@langchain/core': 0.2.18(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))
+      '@langchain/core': 0.2.18(langchain@0.2.11(6hdkxymucpmkiknmt5geracdu4))(openai@4.53.0(encoding@0.1.13))
       js-tiktoken: 1.0.12
       openai: 4.53.0(encoding@0.1.13)
       zod: 3.23.8
@@ -16451,9 +16439,9 @@ snapshots:
       - supports-color
     optional: true
 
-  '@langchain/pinecone@0.0.8(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))':
+  '@langchain/pinecone@0.0.8(langchain@0.2.11(6hdkxymucpmkiknmt5geracdu4))(openai@4.53.0(encoding@0.1.13))':
     dependencies:
-      '@langchain/core': 0.2.18(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))
+      '@langchain/core': 0.2.18(langchain@0.2.11(6hdkxymucpmkiknmt5geracdu4))(openai@4.53.0(encoding@0.1.13))
       '@pinecone-database/pinecone': 3.0.0
       flat: 5.0.2
       uuid: 10.0.0
@@ -16461,9 +16449,9 @@ snapshots:
       - langchain
       - openai
 
-  '@langchain/qdrant@0.0.5(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))(typescript@5.5.2)':
+  '@langchain/qdrant@0.0.5(langchain@0.2.11(6hdkxymucpmkiknmt5geracdu4))(openai@4.53.0(encoding@0.1.13))(typescript@5.5.2)':
     dependencies:
-      '@langchain/core': 0.2.18(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))
+      '@langchain/core': 0.2.18(langchain@0.2.11(6hdkxymucpmkiknmt5geracdu4))(openai@4.53.0(encoding@0.1.13))
       '@qdrant/js-client-rest': 1.9.0(typescript@5.5.2)
       uuid: 9.0.1
     transitivePeerDependencies:
@@ -16471,30 +16459,30 @@ snapshots:
       - openai
       - typescript
 
-  '@langchain/redis@0.0.5(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))':
+  '@langchain/redis@0.0.5(langchain@0.2.11(6hdkxymucpmkiknmt5geracdu4))(openai@4.53.0(encoding@0.1.13))':
     dependencies:
-      '@langchain/core': 0.2.18(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))
+      '@langchain/core': 0.2.18(langchain@0.2.11(6hdkxymucpmkiknmt5geracdu4))(openai@4.53.0(encoding@0.1.13))
       redis: 4.6.13
     transitivePeerDependencies:
       - langchain
       - openai
 
-  '@langchain/textsplitters@0.0.3(langchain@0.2.11(axios@1.7.3)(openai@4.53.0))(openai@4.53.0)':
+  '@langchain/textsplitters@0.0.3(langchain@0.2.11(6hdkxymucpmkiknmt5geracdu4))(openai@4.53.0(encoding@0.1.13))':
     dependencies:
-      '@langchain/core': 0.2.18(langchain@0.2.11(axios@1.7.3)(openai@4.53.0))(openai@4.53.0)
+      '@langchain/core': 0.2.18(langchain@0.2.11(6hdkxymucpmkiknmt5geracdu4))(openai@4.53.0(encoding@0.1.13))
       js-tiktoken: 1.0.12
     transitivePeerDependencies:
       - langchain
       - openai
-    optional: true
 
-  '@langchain/textsplitters@0.0.3(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))':
+  '@langchain/textsplitters@0.0.3(langchain@0.2.11(axios@1.7.3)(openai@4.53.0))(openai@4.53.0)':
     dependencies:
-      '@langchain/core': 0.2.18(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))
+      '@langchain/core': 0.2.18(langchain@0.2.11(axios@1.7.3)(openai@4.53.0))(openai@4.53.0)
       js-tiktoken: 1.0.12
     transitivePeerDependencies:
       - langchain
       - openai
+    optional: true
 
   '@lezer/common@1.1.0': {}
 
@@ -16643,7 +16631,7 @@ snapshots:
       esprima-next: 5.8.4
       recast: 0.22.0
 
-  '@n8n/typeorm@0.3.20-10(@sentry/node@7.87.0)(ioredis@5.3.2)(mssql@10.0.2)(mysql2@3.10.0)(pg@8.11.3)(redis@4.6.12)(sqlite3@5.1.7)':
+  '@n8n/typeorm@0.3.20-10(@sentry/node@7.87.0)(ioredis@5.3.2)(mssql@10.0.2)(mysql2@3.11.0)(pg@8.12.0)(redis@4.6.12)(sqlite3@5.1.7)':
     dependencies:
       '@n8n/p-retry': 6.2.0-2
       '@sqltools/formatter': 1.2.5
@@ -16666,14 +16654,14 @@ snapshots:
       '@sentry/node': 7.87.0
       ioredis: 5.3.2
       mssql: 10.0.2
-      mysql2: 3.10.0
-      pg: 8.11.3
+      mysql2: 3.11.0
+      pg: 8.12.0
       redis: 4.6.12
       sqlite3: 5.1.7
     transitivePeerDependencies:
       - supports-color
 
-  '@n8n/typeorm@0.3.20-10(@sentry/node@7.87.0)(ioredis@5.3.2)(mssql@10.0.2)(mysql2@3.10.0)(pg@8.11.3)(redis@4.6.14)(sqlite3@5.1.7)':
+  '@n8n/typeorm@0.3.20-10(@sentry/node@7.87.0)(ioredis@5.3.2)(mssql@10.0.2)(mysql2@3.11.0)(pg@8.12.0)(redis@4.6.14)(sqlite3@5.1.7)':
     dependencies:
       '@n8n/p-retry': 6.2.0-2
       '@sqltools/formatter': 1.2.5
@@ -16696,8 +16684,8 @@ snapshots:
       '@sentry/node': 7.87.0
       ioredis: 5.3.2
       mssql: 10.0.2
-      mysql2: 3.10.0
-      pg: 8.11.3
+      mysql2: 3.11.0
+      pg: 8.12.0
       redis: 4.6.14
       sqlite3: 5.1.7
     transitivePeerDependencies:
@@ -18701,7 +18689,7 @@ snapshots:
   '@types/pg@8.11.6':
     dependencies:
       '@types/node': 18.16.16
-      pg-protocol: 1.6.0
+      pg-protocol: 1.6.1
       pg-types: 4.0.2
 
   '@types/phoenix@1.6.4': {}
@@ -19593,7 +19581,7 @@ snapshots:
 
   assert-never@1.2.1: {}
 
-  assert-options@0.8.0: {}
+  assert-options@0.8.1: {}
 
   assert-plus@1.0.0: {}
 
@@ -19653,6 +19641,8 @@ snapshots:
 
   aws-sign2@0.7.0: {}
 
+  aws-ssl-profiles@1.1.1: {}
+
   aws4@1.11.0: {}
 
   axe-core@4.7.2: {}
@@ -19904,8 +19894,6 @@ snapshots:
 
   buffer-more-ints@1.0.0: {}
 
-  buffer-writer@2.0.0: {}
-
   buffer@5.7.1:
     dependencies:
       base64-js: 1.5.1
@@ -23524,43 +23512,17 @@ snapshots:
 
   kuler@2.0.0: {}
 
-  langchain@0.2.11(axios@1.7.3)(openai@4.53.0):
-    dependencies:
-      '@langchain/core': 0.2.18(langchain@0.2.11(axios@1.7.3)(openai@4.53.0))(openai@4.53.0)
-      '@langchain/openai': 0.2.5(langchain@0.2.11(axios@1.7.3)(openai@4.53.0))
-      '@langchain/textsplitters': 0.0.3(langchain@0.2.11(axios@1.7.3)(openai@4.53.0))(openai@4.53.0)
-      binary-extensions: 2.2.0
-      js-tiktoken: 1.0.12
-      js-yaml: 4.1.0
-      jsonpointer: 5.0.1
-      langchainhub: 0.0.8
-      langsmith: 0.1.34(@langchain/core@0.2.18(langchain@0.2.11(axios@1.7.3)(openai@4.53.0))(openai@4.53.0))(langchain@0.2.11(axios@1.7.3)(openai@4.53.0))(openai@4.53.0)
-      ml-distance: 4.0.1
-      openapi-types: 12.1.3
-      p-retry: 4.6.2
-      uuid: 10.0.0
-      yaml: 2.3.4
-      zod: 3.23.8
-      zod-to-json-schema: 3.23.0(zod@3.23.8)
-    optionalDependencies:
-      axios: 1.7.3(debug@3.2.7)
-    transitivePeerDependencies:
-      - encoding
-      - openai
-      - supports-color
-    optional: true
-
-  langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4):
+  langchain@0.2.11(6hdkxymucpmkiknmt5geracdu4):
     dependencies:
-      '@langchain/core': 0.2.18(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))
-      '@langchain/openai': 0.2.5(encoding@0.1.13)(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))
-      '@langchain/textsplitters': 0.0.3(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))
+      '@langchain/core': 0.2.18(langchain@0.2.11(6hdkxymucpmkiknmt5geracdu4))(openai@4.53.0(encoding@0.1.13))
+      '@langchain/openai': 0.2.5(encoding@0.1.13)(langchain@0.2.11(6hdkxymucpmkiknmt5geracdu4))
+      '@langchain/textsplitters': 0.0.3(langchain@0.2.11(6hdkxymucpmkiknmt5geracdu4))(openai@4.53.0(encoding@0.1.13))
       binary-extensions: 2.2.0
       js-tiktoken: 1.0.12
       js-yaml: 4.1.0
       jsonpointer: 5.0.1
       langchainhub: 0.0.8
-      langsmith: 0.1.34(@langchain/core@0.2.18(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13)))(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))
+      langsmith: 0.1.34(@langchain/core@0.2.18(langchain@0.2.11(6hdkxymucpmkiknmt5geracdu4))(openai@4.53.0(encoding@0.1.13)))(langchain@0.2.11(6hdkxymucpmkiknmt5geracdu4))(openai@4.53.0(encoding@0.1.13))
       ml-distance: 4.0.1
       openapi-types: 12.1.3
       p-retry: 4.6.2
@@ -23573,7 +23535,7 @@ snapshots:
       '@aws-sdk/credential-provider-node': 3.535.0
       '@langchain/anthropic': 0.2.9(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))
       '@langchain/cohere': 0.0.10(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))
-      '@langchain/community': 0.2.20(wowgvfxtiu4vww53wbp4ny5rre)
+      '@langchain/community': 0.2.20(32xju6nqoe2wrsbntqq2x5vcke)
       '@langchain/google-genai': 0.0.23(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8)
       '@langchain/google-vertexai': 0.0.21(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))(zod@3.23.8)
       '@langchain/groq': 0.0.15(encoding@0.1.13)(langchain@0.2.11)(openai@4.53.0(encoding@0.1.13))
@@ -23601,9 +23563,35 @@ snapshots:
       - openai
       - supports-color
 
+  langchain@0.2.11(axios@1.7.3)(openai@4.53.0):
+    dependencies:
+      '@langchain/core': 0.2.18(langchain@0.2.11(axios@1.7.3)(openai@4.53.0))(openai@4.53.0)
+      '@langchain/openai': 0.2.5(langchain@0.2.11(axios@1.7.3)(openai@4.53.0))
+      '@langchain/textsplitters': 0.0.3(langchain@0.2.11(axios@1.7.3)(openai@4.53.0))(openai@4.53.0)
+      binary-extensions: 2.2.0
+      js-tiktoken: 1.0.12
+      js-yaml: 4.1.0
+      jsonpointer: 5.0.1
+      langchainhub: 0.0.8
+      langsmith: 0.1.34(@langchain/core@0.2.18(langchain@0.2.11(axios@1.7.3)(openai@4.53.0))(openai@4.53.0))(langchain@0.2.11(axios@1.7.3)(openai@4.53.0))(openai@4.53.0)
+      ml-distance: 4.0.1
+      openapi-types: 12.1.3
+      p-retry: 4.6.2
+      uuid: 10.0.0
+      yaml: 2.3.4
+      zod: 3.23.8
+      zod-to-json-schema: 3.23.0(zod@3.23.8)
+    optionalDependencies:
+      axios: 1.7.3(debug@3.2.7)
+    transitivePeerDependencies:
+      - encoding
+      - openai
+      - supports-color
+    optional: true
+
   langchainhub@0.0.8: {}
 
-  langsmith@0.1.34(@langchain/core@0.2.18(langchain@0.2.11(axios@1.7.3)(openai@4.53.0))(openai@4.53.0))(langchain@0.2.11(axios@1.7.3)(openai@4.53.0))(openai@4.53.0):
+  langsmith@0.1.34(@langchain/core@0.2.18(langchain@0.2.11(6hdkxymucpmkiknmt5geracdu4))(openai@4.53.0(encoding@0.1.13)))(langchain@0.2.11(6hdkxymucpmkiknmt5geracdu4))(openai@4.53.0(encoding@0.1.13)):
     dependencies:
       '@types/uuid': 9.0.7
       commander: 10.0.1
@@ -23612,12 +23600,11 @@ snapshots:
       p-retry: 4.6.2
       uuid: 9.0.1
     optionalDependencies:
-      '@langchain/core': 0.2.18(langchain@0.2.11(axios@1.7.3)(openai@4.53.0))(openai@4.53.0)
-      langchain: 0.2.11(axios@1.7.3)(openai@4.53.0)
+      '@langchain/core': 0.2.18(langchain@0.2.11(6hdkxymucpmkiknmt5geracdu4))(openai@4.53.0(encoding@0.1.13))
+      langchain: 0.2.11(6hdkxymucpmkiknmt5geracdu4)
       openai: 4.53.0(encoding@0.1.13)
-    optional: true
 
-  langsmith@0.1.34(@langchain/core@0.2.18(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13)))(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13)):
+  langsmith@0.1.34(@langchain/core@0.2.18(langchain@0.2.11(axios@1.7.3)(openai@4.53.0))(openai@4.53.0))(langchain@0.2.11(axios@1.7.3)(openai@4.53.0))(openai@4.53.0):
     dependencies:
       '@types/uuid': 9.0.7
       commander: 10.0.1
@@ -23626,11 +23613,12 @@ snapshots:
       p-retry: 4.6.2
       uuid: 9.0.1
     optionalDependencies:
-      '@langchain/core': 0.2.18(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))
-      langchain: 0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4)
+      '@langchain/core': 0.2.18(langchain@0.2.11(axios@1.7.3)(openai@4.53.0))(openai@4.53.0)
+      langchain: 0.2.11(axios@1.7.3)(openai@4.53.0)
       openai: 4.53.0(encoding@0.1.13)
+    optional: true
 
-  langsmith@0.1.39(@langchain/core@0.2.18(langchain@0.2.11(axios@1.7.3)(openai@4.53.0))(openai@4.53.0))(langchain@0.2.11(axios@1.7.3)(openai@4.53.0))(openai@4.53.0):
+  langsmith@0.1.39(@langchain/core@0.2.18(langchain@0.2.11(6hdkxymucpmkiknmt5geracdu4))(openai@4.53.0(encoding@0.1.13)))(langchain@0.2.11(6hdkxymucpmkiknmt5geracdu4))(openai@4.53.0(encoding@0.1.13)):
     dependencies:
       '@types/uuid': 9.0.7
       commander: 10.0.1
@@ -23638,11 +23626,11 @@ snapshots:
       p-retry: 4.6.2
       uuid: 9.0.1
     optionalDependencies:
-      '@langchain/core': 0.2.18(langchain@0.2.11(axios@1.7.3)(openai@4.53.0))(openai@4.53.0)
-      langchain: 0.2.11(axios@1.7.3)(openai@4.53.0)
+      '@langchain/core': 0.2.18(langchain@0.2.11(6hdkxymucpmkiknmt5geracdu4))(openai@4.53.0(encoding@0.1.13))
+      langchain: 0.2.11(6hdkxymucpmkiknmt5geracdu4)
       openai: 4.53.0(encoding@0.1.13)
 
-  langsmith@0.1.39(@langchain/core@0.2.18(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13)))(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13)):
+  langsmith@0.1.39(@langchain/core@0.2.18(langchain@0.2.11(axios@1.7.3)(openai@4.53.0))(openai@4.53.0))(langchain@0.2.11(axios@1.7.3)(openai@4.53.0))(openai@4.53.0):
     dependencies:
       '@types/uuid': 9.0.7
       commander: 10.0.1
@@ -23650,8 +23638,8 @@ snapshots:
       p-retry: 4.6.2
       uuid: 9.0.1
     optionalDependencies:
-      '@langchain/core': 0.2.18(langchain@0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4))(openai@4.53.0(encoding@0.1.13))
-      langchain: 0.2.11(cv2sdxknx6u4tk4xue5ivzkdh4)
+      '@langchain/core': 0.2.18(langchain@0.2.11(axios@1.7.3)(openai@4.53.0))(openai@4.53.0)
+      langchain: 0.2.11(axios@1.7.3)(openai@4.53.0)
       openai: 4.53.0(encoding@0.1.13)
 
   lazy-ass@1.6.0: {}
@@ -24319,8 +24307,9 @@ snapshots:
 
   mylas@2.1.13: {}
 
-  mysql2@3.10.0:
+  mysql2@3.11.0:
     dependencies:
+      aws-ssl-profiles: 1.1.1
       denque: 2.1.0
       generate-function: 2.3.1
       iconv-lite: 0.6.3
@@ -24794,8 +24783,6 @@ snapshots:
 
   p-try@2.2.0: {}
 
-  packet-reader@1.0.0: {}
-
   pako@0.2.9: {}
 
   pako@1.0.11: {}
@@ -24868,7 +24855,7 @@ snapshots:
 
   path-scurry@1.10.1:
     dependencies:
-      lru-cache: 9.1.2
+      lru-cache: 10.2.2
       minipass: 7.0.2
 
   path-to-regexp@0.1.7: {}
@@ -24918,32 +24905,28 @@ snapshots:
   pg-cloudflare@1.1.1:
     optional: true
 
-  pg-connection-string@2.6.2: {}
+  pg-connection-string@2.6.4: {}
 
   pg-int8@1.0.1: {}
 
-  pg-minify@1.6.2: {}
+  pg-minify@1.6.5: {}
 
   pg-numeric@1.0.2: {}
 
-  pg-pool@3.6.1(pg@8.11.3):
+  pg-pool@3.6.2(pg@8.12.0):
     dependencies:
-      pg: 8.11.3
+      pg: 8.12.0
 
-  pg-pool@3.6.1(pg@8.8.0):
+  pg-promise@11.9.1:
     dependencies:
-      pg: 8.8.0
-
-  pg-promise@10.15.4:
-    dependencies:
-      assert-options: 0.8.0
-      pg: 8.8.0
-      pg-minify: 1.6.2
-      spex: 3.2.0
+      assert-options: 0.8.1
+      pg: 8.12.0
+      pg-minify: 1.6.5
+      spex: 3.3.0
     transitivePeerDependencies:
       - pg-native
 
-  pg-protocol@1.6.0: {}
+  pg-protocol@1.6.1: {}
 
   pg-types@2.2.0:
     dependencies:
@@ -24963,28 +24946,16 @@ snapshots:
       postgres-interval: 3.0.0
       postgres-range: 1.1.4
 
-  pg@8.11.3:
+  pg@8.12.0:
     dependencies:
-      buffer-writer: 2.0.0
-      packet-reader: 1.0.0
-      pg-connection-string: 2.6.2
-      pg-pool: 3.6.1(pg@8.11.3)
-      pg-protocol: 1.6.0
+      pg-connection-string: 2.6.4
+      pg-pool: 3.6.2(pg@8.12.0)
+      pg-protocol: 1.6.1
       pg-types: 2.2.0
       pgpass: 1.0.5
     optionalDependencies:
       pg-cloudflare: 1.1.1
 
-  pg@8.8.0:
-    dependencies:
-      buffer-writer: 2.0.0
-      packet-reader: 1.0.0
-      pg-connection-string: 2.6.2
-      pg-pool: 3.6.1(pg@8.8.0)
-      pg-protocol: 1.6.0
-      pg-types: 2.2.0
-      pgpass: 1.0.5
-
   pgpass@1.0.5:
     dependencies:
       split2: 4.2.0
@@ -26252,7 +26223,7 @@ snapshots:
 
   spdx-license-ids@3.0.12: {}
 
-  spex@3.2.0: {}
+  spex@3.3.0: {}
 
   split-on-first@1.1.0: {}
 

From 33a2703429d9eaa41f72d2e7d2da5be60b6c620f 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: Wed, 14 Aug 2024 09:44:19 +0200
Subject: [PATCH 152/168] feat(core): Allow overriding npm registry for
 community packages (#10325)

---
 packages/@n8n/config/src/configs/nodes.ts     |  4 ++
 packages/@n8n/config/test/config.test.ts      |  1 +
 packages/cli/src/License.ts                   |  4 ++
 packages/cli/src/constants.ts                 |  1 +
 .../cli/src/controllers/e2e.controller.ts     |  1 +
 .../communityPackages.service.test.ts         | 47 ++++++++++++++-----
 .../src/services/communityPackages.service.ts | 29 +++++++++---
 7 files changed, 68 insertions(+), 19 deletions(-)

diff --git a/packages/@n8n/config/src/configs/nodes.ts b/packages/@n8n/config/src/configs/nodes.ts
index 3837b0a99b258..cf8407762cb17 100644
--- a/packages/@n8n/config/src/configs/nodes.ts
+++ b/packages/@n8n/config/src/configs/nodes.ts
@@ -26,6 +26,10 @@ class CommunityPackagesConfig {
 	@Env('N8N_COMMUNITY_PACKAGES_ENABLED')
 	enabled: boolean = true;
 
+	/** NPM registry URL to pull community packages from */
+	@Env('N8N_COMMUNITY_PACKAGES_REGISTRY')
+	registry: string = 'https://registry.npmjs.org';
+
 	/** Whether to reinstall any missing community packages */
 	@Env('N8N_REINSTALL_MISSING_PACKAGES')
 	reinstallMissing: boolean = false;
diff --git a/packages/@n8n/config/test/config.test.ts b/packages/@n8n/config/test/config.test.ts
index 83edcc25afc43..b8e89d0ab7f0d 100644
--- a/packages/@n8n/config/test/config.test.ts
+++ b/packages/@n8n/config/test/config.test.ts
@@ -108,6 +108,7 @@ describe('GlobalConfig', () => {
 		nodes: {
 			communityPackages: {
 				enabled: true,
+				registry: 'https://registry.npmjs.org',
 				reinstallMissing: false,
 			},
 			errorTriggerType: 'n8n-nodes-base.errorTrigger',
diff --git a/packages/cli/src/License.ts b/packages/cli/src/License.ts
index 643da18fd26e9..fc0d2cd45a235 100644
--- a/packages/cli/src/License.ts
+++ b/packages/cli/src/License.ts
@@ -305,6 +305,10 @@ export class License {
 		return this.isFeatureEnabled(LICENSE_FEATURES.PROJECT_ROLE_VIEWER);
 	}
 
+	isCustomNpmRegistryEnabled() {
+		return this.isFeatureEnabled(LICENSE_FEATURES.COMMUNITY_NODES_CUSTOM_REGISTRY);
+	}
+
 	getCurrentEntitlements() {
 		return this.manager?.getCurrentEntitlements() ?? [];
 	}
diff --git a/packages/cli/src/constants.ts b/packages/cli/src/constants.ts
index 41c95cb01ace6..dfb072576aa9f 100644
--- a/packages/cli/src/constants.ts
+++ b/packages/cli/src/constants.ts
@@ -90,6 +90,7 @@ export const LICENSE_FEATURES = {
 	PROJECT_ROLE_ADMIN: 'feat:projectRole:admin',
 	PROJECT_ROLE_EDITOR: 'feat:projectRole:editor',
 	PROJECT_ROLE_VIEWER: 'feat:projectRole:viewer',
+	COMMUNITY_NODES_CUSTOM_REGISTRY: 'feat:communityNodes:customRegistry',
 } as const;
 
 export const LICENSE_QUOTAS = {
diff --git a/packages/cli/src/controllers/e2e.controller.ts b/packages/cli/src/controllers/e2e.controller.ts
index 3954bb1caf891..20224795052e8 100644
--- a/packages/cli/src/controllers/e2e.controller.ts
+++ b/packages/cli/src/controllers/e2e.controller.ts
@@ -87,6 +87,7 @@ export class E2EController {
 		[LICENSE_FEATURES.PROJECT_ROLE_ADMIN]: false,
 		[LICENSE_FEATURES.PROJECT_ROLE_EDITOR]: false,
 		[LICENSE_FEATURES.PROJECT_ROLE_VIEWER]: false,
+		[LICENSE_FEATURES.COMMUNITY_NODES_CUSTOM_REGISTRY]: false,
 	};
 
 	private numericFeatures: Record<NumericLicenseFeature, number> = {
diff --git a/packages/cli/src/services/__tests__/communityPackages.service.test.ts b/packages/cli/src/services/__tests__/communityPackages.service.test.ts
index 8d3289a8695b2..ec7ce61ba9c1c 100644
--- a/packages/cli/src/services/__tests__/communityPackages.service.test.ts
+++ b/packages/cli/src/services/__tests__/communityPackages.service.test.ts
@@ -20,6 +20,7 @@ import { InstalledNodesRepository } from '@db/repositories/installedNodes.reposi
 import { InstalledPackagesRepository } from '@db/repositories/installedPackages.repository';
 import { InstalledNodes } from '@db/entities/InstalledNodes';
 import type { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
+import type { License } from '@/License';
 
 import { mockInstance } from '@test/mocking';
 import { COMMUNITY_NODE_VERSION, COMMUNITY_PACKAGE_VERSION } from '@test-integration/constants';
@@ -39,19 +40,20 @@ const execMock = ((...args) => {
 }) as typeof exec;
 
 describe('CommunityPackagesService', () => {
+	const license = mock<License>();
 	const globalConfig = mock<GlobalConfig>({
 		nodes: {
 			communityPackages: {
 				reinstallMissing: false,
+				registry: 'some.random.host',
 			},
 		},
 	});
 	const loadNodesAndCredentials = mock<LoadNodesAndCredentials>();
 
+	const nodeName = randomName();
 	const installedNodesRepository = mockInstance(InstalledNodesRepository);
 	installedNodesRepository.create.mockImplementation(() => {
-		const nodeName = randomName();
-
 		return Object.assign(new InstalledNodes(), {
 			name: nodeName,
 			type: nodeName,
@@ -74,6 +76,7 @@ describe('CommunityPackagesService', () => {
 		mock(),
 		loadNodesAndCredentials,
 		mock(),
+		license,
 		globalConfig,
 	);
 
@@ -374,25 +377,23 @@ describe('CommunityPackagesService', () => {
 	};
 
 	describe('updateNpmModule', () => {
-		const packageDirectoryLoader = mock<PackageDirectoryLoader>();
+		const installedPackage = mock<InstalledPackages>({ packageName: mockPackageName() });
+		const packageDirectoryLoader = mock<PackageDirectoryLoader>({
+			loadedNodes: [{ name: nodeName, version: 1 }],
+		});
 
 		beforeEach(async () => {
 			jest.clearAllMocks();
 
 			loadNodesAndCredentials.loadPackage.mockResolvedValue(packageDirectoryLoader);
+			mocked(exec).mockImplementation(execMock);
 		});
 
-		test('should call `exec` with the correct command ', async () => {
+		test('should call `exec` with the correct command and registry', async () => {
 			//
 			// ARRANGE
 			//
-			const nodeName = randomName();
-			packageDirectoryLoader.loadedNodes = [{ name: nodeName, version: 1 }];
-
-			const installedPackage = new InstalledPackages();
-			installedPackage.packageName = mockPackageName();
-
-			mocked(exec).mockImplementation(execMock);
+			license.isCustomNpmRegistryEnabled.mockReturnValue(true);
 
 			//
 			// ACT
@@ -406,10 +407,32 @@ describe('CommunityPackagesService', () => {
 			expect(exec).toHaveBeenCalledTimes(1);
 			expect(exec).toHaveBeenNthCalledWith(
 				1,
-				`npm install ${installedPackage.packageName}@latest`,
+				`npm install ${installedPackage.packageName}@latest --registry=some.random.host`,
 				expect.any(Object),
 				expect.any(Function),
 			);
 		});
+
+		test('should throw when not licensed', async () => {
+			//
+			// ARRANGE
+			//
+			license.isCustomNpmRegistryEnabled.mockReturnValue(false);
+
+			//
+			// ACT
+			//
+			const promise = communityPackagesService.updatePackage(
+				installedPackage.packageName,
+				installedPackage,
+			);
+
+			//
+			// ASSERT
+			//
+			await expect(promise).rejects.toThrow(
+				'Your license does not allow for feat:communityNodes:customRegistry.',
+			);
+		});
 	});
 });
diff --git a/packages/cli/src/services/communityPackages.service.ts b/packages/cli/src/services/communityPackages.service.ts
index b1f46d52fb434..985fb44fabdc7 100644
--- a/packages/cli/src/services/communityPackages.service.ts
+++ b/packages/cli/src/services/communityPackages.service.ts
@@ -14,16 +14,21 @@ import { toError } from '@/utils';
 import { InstalledPackagesRepository } from '@db/repositories/installedPackages.repository';
 import type { InstalledPackages } from '@db/entities/InstalledPackages';
 import {
+	LICENSE_FEATURES,
 	NODE_PACKAGE_PREFIX,
 	NPM_COMMAND_TOKENS,
 	NPM_PACKAGE_STATUS_GOOD,
 	RESPONSE_ERROR_MESSAGES,
 	UNKNOWN_FAILURE_REASON,
 } from '@/constants';
+import { FeatureNotLicensedError } from '@/errors/feature-not-licensed.error';
 import type { CommunityPackages } from '@/Interfaces';
 import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
 import { Logger } from '@/Logger';
 import { OrchestrationService } from './orchestration.service';
+import { License } from '@/License';
+
+const DEFAULT_REGISTRY = 'https://registry.npmjs.org';
 
 const {
 	PACKAGE_NAME_NOT_PROVIDED,
@@ -57,10 +62,9 @@ export class CommunityPackagesService {
 		private readonly installedPackageRepository: InstalledPackagesRepository,
 		private readonly loadNodesAndCredentials: LoadNodesAndCredentials,
 		private readonly orchestrationService: OrchestrationService,
-		globalConfig: GlobalConfig,
-	) {
-		this.reinstallMissingPackages = globalConfig.nodes.communityPackages.reinstallMissing;
-	}
+		private readonly license: License,
+		private readonly globalConfig: GlobalConfig,
+	) {}
 
 	get hasMissingPackages() {
 		return this.missingPackages.length > 0;
@@ -279,7 +283,8 @@ export class CommunityPackagesService {
 
 		if (missingPackages.size === 0) return;
 
-		if (this.reinstallMissingPackages) {
+		const { reinstallMissing } = this.globalConfig.nodes.communityPackages;
+		if (reinstallMissing) {
 			this.logger.info('Attempting to reinstall missing packages', { missingPackages });
 			try {
 				// Optimistic approach - stop if any installation fails
@@ -321,13 +326,21 @@ export class CommunityPackagesService {
 		await this.orchestrationService.publish('community-package-uninstall', { packageName });
 	}
 
+	private getNpmRegistry() {
+		const { registry } = this.globalConfig.nodes.communityPackages;
+		if (registry !== DEFAULT_REGISTRY && !this.license.isCustomNpmRegistryEnabled()) {
+			throw new FeatureNotLicensedError(LICENSE_FEATURES.COMMUNITY_NODES_CUSTOM_REGISTRY);
+		}
+		return registry;
+	}
+
 	private async installOrUpdatePackage(
 		packageName: string,
 		options: { version?: string } | { installedPackage: InstalledPackages },
 	) {
 		const isUpdate = 'installedPackage' in options;
 		const packageVersion = isUpdate || !options.version ? 'latest' : options.version;
-		const command = `npm install ${packageName}@${packageVersion}`;
+		const command = `npm install ${packageName}@${packageVersion} --registry=${this.getNpmRegistry()}`;
 
 		try {
 			await this.executeNpmCommand(command);
@@ -379,7 +392,9 @@ export class CommunityPackagesService {
 	}
 
 	async installOrUpdateNpmPackage(packageName: string, packageVersion: string) {
-		await this.executeNpmCommand(`npm install ${packageName}@${packageVersion}`);
+		await this.executeNpmCommand(
+			`npm install ${packageName}@${packageVersion} --registry=${this.getNpmRegistry()}`,
+		);
 		await this.loadNodesAndCredentials.loadPackage(packageName);
 		await this.loadNodesAndCredentials.postProcessLoaders();
 		this.logger.info(`Community package installed: ${packageName}`);

From 45813debc963096f63cc0aabe82d9d9f853a39d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Wed, 14 Aug 2024 10:55:13 +0200
Subject: [PATCH 153/168] fix(core): Fix duplicate Redis publisher (#10392)

---
 packages/cli/src/services/redis/RedisServiceBaseClasses.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/cli/src/services/redis/RedisServiceBaseClasses.ts b/packages/cli/src/services/redis/RedisServiceBaseClasses.ts
index ba2cc41a91dce..d694a1a774ee6 100644
--- a/packages/cli/src/services/redis/RedisServiceBaseClasses.ts
+++ b/packages/cli/src/services/redis/RedisServiceBaseClasses.ts
@@ -45,6 +45,8 @@ class RedisServiceBase {
 				this.logger.warn('Error with Redis: ', error);
 			}
 		});
+
+		this.isInitialized = true;
 	}
 
 	async destroy(): Promise<void> {

From e640f1f42cad41d9849c2b3c057a9f8d0cb43b71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Wed, 14 Aug 2024 11:16:02 +0200
Subject: [PATCH 154/168] test(core): Cover telemetry event relay in tests
 (no-changelog) (#10391)

---
 .../__tests__/telemetry-event-relay.test.ts   | 1030 +++++++++++++++++
 1 file changed, 1030 insertions(+)
 create mode 100644 packages/cli/src/events/__tests__/telemetry-event-relay.test.ts

diff --git a/packages/cli/src/events/__tests__/telemetry-event-relay.test.ts b/packages/cli/src/events/__tests__/telemetry-event-relay.test.ts
new file mode 100644
index 0000000000000..e1841f172633a
--- /dev/null
+++ b/packages/cli/src/events/__tests__/telemetry-event-relay.test.ts
@@ -0,0 +1,1030 @@
+import { mock } from 'jest-mock-extended';
+import { TelemetryEventRelay } from '@/events/telemetry-event-relay';
+import { EventService } from '@/events/event.service';
+import config from '@/config';
+import type { IWorkflowBase } from 'n8n-workflow';
+import type { IWorkflowDb } from '@/Interfaces';
+import type { Telemetry } from '@/telemetry';
+import type { License } from '@/License';
+import type { GlobalConfig } from '@n8n/config';
+import type { WorkflowRepository } from '@/databases/repositories/workflow.repository';
+import type { NodeTypes } from '@/NodeTypes';
+import type { SharedWorkflowRepository } from '@/databases/repositories/sharedWorkflow.repository';
+import type { ProjectRelationRepository } from '@/databases/repositories/projectRelation.repository';
+import type { RelayEventMap } from '@/events/relay-event-map';
+import type { WorkflowEntity } from '@/databases/entities/WorkflowEntity';
+
+const flushPromises = async () => await new Promise((resolve) => setImmediate(resolve));
+
+describe('TelemetryEventRelay', () => {
+	const telemetry = mock<Telemetry>();
+	const license = mock<License>();
+	const globalConfig = mock<GlobalConfig>({ userManagement: { emails: { mode: 'smtp' } } });
+	const workflowRepository = mock<WorkflowRepository>();
+	const nodeTypes = mock<NodeTypes>();
+	const sharedWorkflowRepository = mock<SharedWorkflowRepository>();
+	const projectRelationRepository = mock<ProjectRelationRepository>();
+	const eventService = new EventService();
+
+	let telemetryEventRelay: TelemetryEventRelay;
+
+	beforeAll(async () => {
+		telemetryEventRelay = new TelemetryEventRelay(
+			eventService,
+			telemetry,
+			license,
+			globalConfig,
+			workflowRepository,
+			nodeTypes,
+			sharedWorkflowRepository,
+			projectRelationRepository,
+		);
+
+		await telemetryEventRelay.init();
+	});
+
+	beforeEach(() => {
+		config.set('diagnostics.enabled', true);
+	});
+
+	afterEach(() => {
+		jest.clearAllMocks();
+	});
+
+	describe('init', () => {
+		it('with diagnostics enabled, should init telemetry and register listeners', async () => {
+			config.set('diagnostics.enabled', true);
+			const telemetryEventRelay = new TelemetryEventRelay(
+				eventService,
+				telemetry,
+				license,
+				globalConfig,
+				workflowRepository,
+				nodeTypes,
+				sharedWorkflowRepository,
+				projectRelationRepository,
+			);
+			// @ts-expect-error Private method
+			const setupListenersSpy = jest.spyOn(telemetryEventRelay, 'setupListeners');
+
+			await telemetryEventRelay.init();
+
+			expect(telemetry.init).toHaveBeenCalled();
+			expect(setupListenersSpy).toHaveBeenCalled();
+		});
+
+		it('with diagnostics disabled, should neither init telemetry nor register listeners', async () => {
+			config.set('diagnostics.enabled', false);
+			const telemetryEventRelay = new TelemetryEventRelay(
+				eventService,
+				telemetry,
+				license,
+				globalConfig,
+				workflowRepository,
+				nodeTypes,
+				sharedWorkflowRepository,
+				projectRelationRepository,
+			);
+			// @ts-expect-error Private method
+			const setupListenersSpy = jest.spyOn(telemetryEventRelay, 'setupListeners');
+
+			await telemetryEventRelay.init();
+
+			expect(telemetry.init).not.toHaveBeenCalled();
+			expect(setupListenersSpy).not.toHaveBeenCalled();
+		});
+	});
+
+	describe('project events', () => {
+		it('should track on `team-project-updated` event', () => {
+			const event: RelayEventMap['team-project-updated'] = {
+				userId: 'user123',
+				role: 'global:owner',
+				members: [
+					{ userId: 'user456', role: 'project:admin' },
+					{ userId: 'user789', role: 'project:editor' },
+				],
+				projectId: 'project123',
+			};
+
+			eventService.emit('team-project-updated', event);
+
+			expect(telemetry.track).toHaveBeenCalledWith('Project settings updated', {
+				user_id: 'user123',
+				role: 'global:owner',
+				members: [
+					{ user_id: 'user456', role: 'project:admin' },
+					{ user_id: 'user789', role: 'project:editor' },
+				],
+				project_id: 'project123',
+			});
+		});
+
+		it('should track on `team-project-deleted` event', () => {
+			const event: RelayEventMap['team-project-deleted'] = {
+				userId: 'user123',
+				role: 'global:owner',
+				projectId: 'project123',
+				removalType: 'delete',
+			};
+
+			eventService.emit('team-project-deleted', event);
+
+			expect(telemetry.track).toHaveBeenCalledWith('User deleted project', {
+				user_id: 'user123',
+				role: 'global:owner',
+				project_id: 'project123',
+				removal_type: 'delete',
+				target_project_id: undefined,
+			});
+		});
+
+		it('should track on `team-project-created` event', () => {
+			const event: RelayEventMap['team-project-created'] = {
+				userId: 'user123',
+				role: 'global:owner',
+			};
+
+			eventService.emit('team-project-created', event);
+
+			expect(telemetry.track).toHaveBeenCalledWith('User created project', {
+				user_id: 'user123',
+				role: 'global:owner',
+			});
+		});
+	});
+
+	describe('source control events', () => {
+		it('should track on `source-control-settings-updated` event', () => {
+			const event: RelayEventMap['source-control-settings-updated'] = {
+				branchName: 'main',
+				readOnlyInstance: false,
+				repoType: 'github',
+				connected: true,
+			};
+
+			eventService.emit('source-control-settings-updated', event);
+
+			expect(telemetry.track).toHaveBeenCalledWith('User updated source control settings', {
+				branch_name: 'main',
+				read_only_instance: false,
+				repo_type: 'github',
+				connected: true,
+			});
+		});
+
+		it('should track on `source-control-user-started-pull-ui` event', () => {
+			const event: RelayEventMap['source-control-user-started-pull-ui'] = {
+				workflowUpdates: 5,
+				workflowConflicts: 2,
+				credConflicts: 1,
+			};
+
+			eventService.emit('source-control-user-started-pull-ui', event);
+
+			expect(telemetry.track).toHaveBeenCalledWith('User started pull via UI', {
+				workflow_updates: 5,
+				workflow_conflicts: 2,
+				cred_conflicts: 1,
+			});
+		});
+
+		it('should track on `source-control-user-finished-pull-ui` event', () => {
+			const event: RelayEventMap['source-control-user-finished-pull-ui'] = {
+				workflowUpdates: 3,
+			};
+
+			eventService.emit('source-control-user-finished-pull-ui', event);
+
+			expect(telemetry.track).toHaveBeenCalledWith('User finished pull via UI', {
+				workflow_updates: 3,
+			});
+		});
+
+		it('should track on `source-control-user-pulled-api` event', () => {
+			const event: RelayEventMap['source-control-user-pulled-api'] = {
+				workflowUpdates: 2,
+				forced: false,
+			};
+
+			eventService.emit('source-control-user-pulled-api', event);
+
+			expect(telemetry.track).toHaveBeenCalledWith('User pulled via API', {
+				workflow_updates: 2,
+				forced: false,
+			});
+		});
+
+		it('should track on `source-control-user-started-push-ui` event', () => {
+			const event: RelayEventMap['source-control-user-started-push-ui'] = {
+				workflowsEligible: 10,
+				workflowsEligibleWithConflicts: 2,
+				credsEligible: 5,
+				credsEligibleWithConflicts: 1,
+				variablesEligible: 3,
+			};
+
+			eventService.emit('source-control-user-started-push-ui', event);
+
+			expect(telemetry.track).toHaveBeenCalledWith('User started push via UI', {
+				workflows_eligible: 10,
+				workflows_eligible_with_conflicts: 2,
+				creds_eligible: 5,
+				creds_eligible_with_conflicts: 1,
+				variables_eligible: 3,
+			});
+		});
+
+		it('should track on `source-control-user-finished-push-ui` event', () => {
+			const event: RelayEventMap['source-control-user-finished-push-ui'] = {
+				workflowsEligible: 10,
+				workflowsPushed: 8,
+				credsPushed: 5,
+				variablesPushed: 3,
+			};
+
+			eventService.emit('source-control-user-finished-push-ui', event);
+
+			expect(telemetry.track).toHaveBeenCalledWith('User finished push via UI', {
+				workflows_eligible: 10,
+				workflows_pushed: 8,
+				creds_pushed: 5,
+				variables_pushed: 3,
+			});
+		});
+	});
+
+	describe('license events', () => {
+		it('should track on `license-renewal-attempted` event', () => {
+			const event: RelayEventMap['license-renewal-attempted'] = {
+				success: true,
+			};
+
+			eventService.emit('license-renewal-attempted', event);
+
+			expect(telemetry.track).toHaveBeenCalledWith('Instance attempted to refresh license', {
+				success: true,
+			});
+		});
+	});
+
+	describe('variable events', () => {
+		it('should track on `variable-created` event', () => {
+			eventService.emit('variable-created', {});
+
+			expect(telemetry.track).toHaveBeenCalledWith('User created variable');
+		});
+	});
+
+	describe('external secrets events', () => {
+		it('should track on `external-secrets-provider-settings-saved` event', () => {
+			const event: RelayEventMap['external-secrets-provider-settings-saved'] = {
+				userId: 'user123',
+				vaultType: 'aws',
+				isValid: true,
+				isNew: false,
+			};
+
+			eventService.emit('external-secrets-provider-settings-saved', event);
+
+			expect(telemetry.track).toHaveBeenCalledWith('User updated external secrets settings', {
+				user_id: 'user123',
+				vault_type: 'aws',
+				is_valid: true,
+				is_new: false,
+				error_message: undefined,
+			});
+		});
+	});
+
+	describe('public API events', () => {
+		it('should track on `public-api-invoked` event', () => {
+			const event: RelayEventMap['public-api-invoked'] = {
+				userId: 'user123',
+				path: '/api/v1/workflows',
+				method: 'GET',
+				apiVersion: 'v1',
+			};
+
+			eventService.emit('public-api-invoked', event);
+
+			expect(telemetry.track).toHaveBeenCalledWith('User invoked API', {
+				user_id: 'user123',
+				path: '/api/v1/workflows',
+				method: 'GET',
+				api_version: 'v1',
+			});
+		});
+
+		it('should track on `public-api-key-created` event', () => {
+			const event: RelayEventMap['public-api-key-created'] = {
+				user: {
+					id: 'user123',
+					email: 'user@example.com',
+					firstName: 'John',
+					lastName: 'Doe',
+					role: 'global:owner',
+				},
+				publicApi: true,
+			};
+
+			eventService.emit('public-api-key-created', event);
+
+			expect(telemetry.track).toHaveBeenCalledWith('API key created', {
+				user_id: 'user123',
+				public_api: true,
+			});
+		});
+
+		it('should track on `public-api-key-deleted` event', () => {
+			const event: RelayEventMap['public-api-key-deleted'] = {
+				user: {
+					id: 'user123',
+					email: 'user@example.com',
+					firstName: 'John',
+					lastName: 'Doe',
+					role: 'global:owner',
+				},
+				publicApi: true,
+			};
+
+			eventService.emit('public-api-key-deleted', event);
+
+			expect(telemetry.track).toHaveBeenCalledWith('API key deleted', {
+				user_id: 'user123',
+				public_api: true,
+			});
+		});
+	});
+
+	describe('community package events', () => {
+		it('should track on `community-package-installed` event', () => {
+			const event: RelayEventMap['community-package-installed'] = {
+				user: {
+					id: 'user123',
+					email: 'user@example.com',
+					firstName: 'John',
+					lastName: 'Doe',
+					role: 'global:owner',
+				},
+				inputString: 'n8n-nodes-package',
+				packageName: 'n8n-nodes-package',
+				success: true,
+				packageVersion: '1.0.0',
+				packageNodeNames: ['CustomNode1', 'CustomNode2'],
+				packageAuthor: 'John Smith',
+				packageAuthorEmail: 'john@example.com',
+			};
+
+			eventService.emit('community-package-installed', event);
+
+			expect(telemetry.track).toHaveBeenCalledWith('cnr package install finished', {
+				user_id: 'user123',
+				input_string: 'n8n-nodes-package',
+				package_name: 'n8n-nodes-package',
+				success: true,
+				package_version: '1.0.0',
+				package_node_names: ['CustomNode1', 'CustomNode2'],
+				package_author: 'John Smith',
+				package_author_email: 'john@example.com',
+				failure_reason: undefined,
+			});
+		});
+
+		it('should track on `community-package-updated` event', () => {
+			const event: RelayEventMap['community-package-updated'] = {
+				user: {
+					id: 'user123',
+					email: 'user@example.com',
+					firstName: 'John',
+					lastName: 'Doe',
+					role: 'global:owner',
+				},
+				packageName: 'n8n-nodes-package',
+				packageVersionCurrent: '1.0.0',
+				packageVersionNew: '1.1.0',
+				packageNodeNames: ['CustomNode1', 'CustomNode2'],
+				packageAuthor: 'John Smith',
+				packageAuthorEmail: 'john@example.com',
+			};
+
+			eventService.emit('community-package-updated', event);
+
+			expect(telemetry.track).toHaveBeenCalledWith('cnr package updated', {
+				user_id: 'user123',
+				package_name: 'n8n-nodes-package',
+				package_version_current: '1.0.0',
+				package_version_new: '1.1.0',
+				package_node_names: ['CustomNode1', 'CustomNode2'],
+				package_author: 'John Smith',
+				package_author_email: 'john@example.com',
+			});
+		});
+
+		it('should track on `community-package-deleted` event', () => {
+			const event: RelayEventMap['community-package-deleted'] = {
+				user: {
+					id: 'user123',
+					email: 'user@example.com',
+					firstName: 'John',
+					lastName: 'Doe',
+					role: 'global:owner',
+				},
+				packageName: 'n8n-nodes-package',
+				packageVersion: '1.0.0',
+				packageNodeNames: ['CustomNode1', 'CustomNode2'],
+				packageAuthor: 'John Smith',
+				packageAuthorEmail: 'john@example.com',
+			};
+
+			eventService.emit('community-package-deleted', event);
+
+			expect(telemetry.track).toHaveBeenCalledWith('cnr package deleted', {
+				user_id: 'user123',
+				package_name: 'n8n-nodes-package',
+				package_version: '1.0.0',
+				package_node_names: ['CustomNode1', 'CustomNode2'],
+				package_author: 'John Smith',
+				package_author_email: 'john@example.com',
+			});
+		});
+	});
+
+	describe('credentials events', () => {
+		it('should track on `credentials-created` event', () => {
+			const event: RelayEventMap['credentials-created'] = {
+				user: {
+					id: 'user123',
+					email: 'user@example.com',
+					firstName: 'John',
+					lastName: 'Doe',
+					role: 'global:owner',
+				},
+				credentialType: 'github',
+				credentialId: 'cred123',
+				publicApi: false,
+				projectId: 'project123',
+				projectType: 'personal',
+			};
+
+			eventService.emit('credentials-created', event);
+
+			expect(telemetry.track).toHaveBeenCalledWith('User created credentials', {
+				user_id: 'user123',
+				credential_type: 'github',
+				credential_id: 'cred123',
+				project_id: 'project123',
+				project_type: 'personal',
+			});
+		});
+
+		it('should track on `credentials-shared` event', () => {
+			const event: RelayEventMap['credentials-shared'] = {
+				user: {
+					id: 'user123',
+					email: 'user@example.com',
+					firstName: 'John',
+					lastName: 'Doe',
+					role: 'global:owner',
+				},
+				credentialType: 'github',
+				credentialId: 'cred123',
+				userIdSharer: 'user123',
+				userIdsShareesAdded: ['user456', 'user789'],
+				shareesRemoved: 1,
+			};
+
+			eventService.emit('credentials-shared', event);
+
+			expect(telemetry.track).toHaveBeenCalledWith('User updated cred sharing', {
+				user_id: 'user123',
+				credential_type: 'github',
+				credential_id: 'cred123',
+				user_id_sharer: 'user123',
+				user_ids_sharees_added: ['user456', 'user789'],
+				sharees_removed: 1,
+			});
+		});
+
+		it('should track on `credentials-updated` event', () => {
+			const event: RelayEventMap['credentials-updated'] = {
+				user: {
+					id: 'user123',
+					email: 'user@example.com',
+					firstName: 'John',
+					lastName: 'Doe',
+					role: 'global:owner',
+				},
+				credentialId: 'cred123',
+				credentialType: 'github',
+			};
+
+			eventService.emit('credentials-updated', event);
+
+			expect(telemetry.track).toHaveBeenCalledWith('User updated credentials', {
+				user_id: 'user123',
+				credential_type: 'github',
+				credential_id: 'cred123',
+			});
+		});
+
+		it('should track on `credentials-deleted` event', () => {
+			const event: RelayEventMap['credentials-deleted'] = {
+				user: {
+					id: 'user123',
+					email: 'user@example.com',
+					firstName: 'John',
+					lastName: 'Doe',
+					role: 'global:owner',
+				},
+				credentialId: 'cred123',
+				credentialType: 'github',
+			};
+
+			eventService.emit('credentials-deleted', event);
+
+			expect(telemetry.track).toHaveBeenCalledWith('User deleted credentials', {
+				user_id: 'user123',
+				credential_type: 'github',
+				credential_id: 'cred123',
+			});
+		});
+	});
+
+	describe('LDAP events', () => {
+		it('should track on `ldap-general-sync-finished` event', () => {
+			const event: RelayEventMap['ldap-general-sync-finished'] = {
+				type: 'full',
+				succeeded: true,
+				usersSynced: 10,
+				error: '',
+			};
+
+			eventService.emit('ldap-general-sync-finished', event);
+
+			expect(telemetry.track).toHaveBeenCalledWith('Ldap general sync finished', {
+				type: 'full',
+				succeeded: true,
+				users_synced: 10,
+				error: '',
+			});
+		});
+
+		it('should track on `ldap-settings-updated` event', () => {
+			const event: RelayEventMap['ldap-settings-updated'] = {
+				userId: 'user123',
+				loginIdAttribute: 'uid',
+				firstNameAttribute: 'givenName',
+				lastNameAttribute: 'sn',
+				emailAttribute: 'mail',
+				ldapIdAttribute: 'entryUUID',
+				searchPageSize: 100,
+				searchTimeout: 60,
+				synchronizationEnabled: true,
+				synchronizationInterval: 60,
+				loginLabel: 'LDAP Login',
+				loginEnabled: true,
+			};
+
+			eventService.emit('ldap-settings-updated', {
+				...event,
+			});
+
+			const { userId: _, ...rest } = event;
+
+			expect(telemetry.track).toHaveBeenCalledWith('User updated Ldap settings', {
+				user_id: 'user123',
+				...rest,
+			});
+		});
+
+		it('should track on `ldap-login-sync-failed` event', () => {
+			const event: RelayEventMap['ldap-login-sync-failed'] = {
+				error: 'Connection failed',
+			};
+
+			eventService.emit('ldap-login-sync-failed', event);
+
+			expect(telemetry.track).toHaveBeenCalledWith('Ldap login sync failed', {
+				error: 'Connection failed',
+			});
+		});
+
+		it('should track on `login-failed-due-to-ldap-disabled` event', () => {
+			const event: RelayEventMap['login-failed-due-to-ldap-disabled'] = {
+				userId: 'user123',
+			};
+
+			eventService.emit('login-failed-due-to-ldap-disabled', event);
+
+			expect(telemetry.track).toHaveBeenCalledWith('User login failed since ldap disabled', {
+				user_ud: 'user123',
+			});
+		});
+	});
+
+	describe('workflow events', () => {
+		it('should track on `workflow-created` event', async () => {
+			const event: RelayEventMap['workflow-created'] = {
+				user: {
+					id: 'user123',
+					email: 'user@example.com',
+					firstName: 'John',
+					lastName: 'Doe',
+					role: 'global:owner',
+				},
+				workflow: mock<IWorkflowBase>({ id: 'workflow123', name: 'Test Workflow', nodes: [] }),
+				publicApi: false,
+				projectId: 'project123',
+				projectType: 'personal',
+			};
+
+			eventService.emit('workflow-created', event);
+
+			await flushPromises();
+
+			expect(telemetry.track).toHaveBeenCalledWith('User created workflow', {
+				user_id: 'user123',
+				workflow_id: 'workflow123',
+				node_graph_string: expect.any(String),
+				public_api: false,
+				project_id: 'project123',
+				project_type: 'personal',
+			});
+		});
+
+		it('should track on `workflow-deleted` event', () => {
+			const event: RelayEventMap['workflow-deleted'] = {
+				user: {
+					id: 'user123',
+					email: 'user@example.com',
+					firstName: 'John',
+					lastName: 'Doe',
+					role: 'global:owner',
+				},
+				workflowId: 'workflow123',
+				publicApi: false,
+			};
+
+			eventService.emit('workflow-deleted', event);
+
+			expect(telemetry.track).toHaveBeenCalledWith('User deleted workflow', {
+				user_id: 'user123',
+				workflow_id: 'workflow123',
+				public_api: false,
+			});
+		});
+
+		it('should track on `workflow-post-execute` event', async () => {
+			const event: RelayEventMap['workflow-post-execute'] = {
+				workflow: mock<IWorkflowDb>({
+					id: 'workflow123',
+					name: 'Test Workflow',
+					nodes: [],
+				}),
+				userId: 'user123',
+				executionId: 'execution123',
+			};
+
+			eventService.emit('workflow-post-execute', event);
+
+			await flushPromises();
+
+			expect(telemetry.trackWorkflowExecution).toHaveBeenCalledWith({
+				is_manual: false,
+				success: false,
+				user_id: 'user123',
+				version_cli: '1.54.0',
+				workflow_id: 'workflow123',
+			});
+		});
+
+		it('should track on `workflow-saved` event', async () => {
+			const event: RelayEventMap['workflow-saved'] = {
+				user: {
+					id: 'user123',
+					email: 'user@example.com',
+					firstName: 'John',
+					lastName: 'Doe',
+					role: 'global:owner',
+				},
+				workflow: mock<IWorkflowDb>({ id: 'workflow123', name: 'Test Workflow', nodes: [] }),
+				publicApi: false,
+			};
+
+			eventService.emit('workflow-saved', event);
+
+			await flushPromises();
+
+			expect(telemetry.track).toHaveBeenCalledWith('User saved workflow', {
+				user_id: 'user123',
+				workflow_id: 'workflow123',
+				node_graph_string: expect.any(String),
+				notes_count_overlapping: 0,
+				notes_count_non_overlapping: 0,
+				version_cli: expect.any(String),
+				num_tags: 0,
+				public_api: false,
+				sharing_role: undefined,
+			});
+		});
+
+		it('should track on `workflow-sharing-updated` event', () => {
+			const event: RelayEventMap['workflow-sharing-updated'] = {
+				workflowId: 'workflow123',
+				userIdSharer: 'user123',
+				userIdList: ['user456', 'user789'],
+			};
+
+			eventService.emit('workflow-sharing-updated', event);
+
+			expect(telemetry.track).toHaveBeenCalledWith('User updated workflow sharing', {
+				workflow_id: 'workflow123',
+				user_id_sharer: 'user123',
+				user_id_list: ['user456', 'user789'],
+			});
+		});
+	});
+
+	describe('user events', () => {
+		it('should track on `user-updated` event', () => {
+			const event: RelayEventMap['user-updated'] = {
+				user: {
+					id: 'user123',
+					email: 'user@example.com',
+					firstName: 'John',
+					lastName: 'Doe',
+					role: 'global:owner',
+				},
+				fieldsChanged: ['firstName', 'lastName'],
+			};
+
+			eventService.emit('user-updated', event);
+
+			expect(telemetry.track).toHaveBeenCalledWith('User changed personal settings', {
+				user_id: 'user123',
+				fields_changed: ['firstName', 'lastName'],
+			});
+		});
+
+		it('should track on `user-deleted` event', () => {
+			const event: RelayEventMap['user-deleted'] = {
+				user: {
+					id: 'user123',
+					email: 'user@example.com',
+					firstName: 'John',
+					lastName: 'Doe',
+					role: 'global:owner',
+				},
+				publicApi: false,
+				targetUserOldStatus: 'active',
+				migrationStrategy: 'transfer_data',
+				targetUserId: 'user456',
+				migrationUserId: 'user789',
+			};
+
+			eventService.emit('user-deleted', event);
+
+			expect(telemetry.track).toHaveBeenCalledWith('User deleted user', {
+				user_id: 'user123',
+				public_api: false,
+				target_user_old_status: 'active',
+				migration_strategy: 'transfer_data',
+				target_user_id: 'user456',
+				migration_user_id: 'user789',
+			});
+		});
+
+		it('should track on `user-invited` event', () => {
+			const event: RelayEventMap['user-invited'] = {
+				user: {
+					id: 'user123',
+					email: 'user@example.com',
+					firstName: 'John',
+					lastName: 'Doe',
+					role: 'global:owner',
+				},
+				targetUserId: ['user456'],
+				publicApi: false,
+				emailSent: true,
+				inviteeRole: 'global:member',
+			};
+
+			eventService.emit('user-invited', event);
+
+			expect(telemetry.track).toHaveBeenCalledWith('User invited new user', {
+				user_id: 'user123',
+				target_user_id: ['user456'],
+				public_api: false,
+				email_sent: true,
+				invitee_role: 'global:member',
+			});
+		});
+
+		it('should track on `user-signed-up` event', () => {
+			const event: RelayEventMap['user-signed-up'] = {
+				user: {
+					id: 'user123',
+					email: 'user@example.com',
+					firstName: 'John',
+					lastName: 'Doe',
+					role: 'global:owner',
+				},
+				userType: 'email',
+				wasDisabledLdapUser: false,
+			};
+
+			eventService.emit('user-signed-up', event);
+
+			expect(telemetry.track).toHaveBeenCalledWith('User signed up', {
+				user_id: 'user123',
+				user_type: 'email',
+				was_disabled_ldap_user: false,
+			});
+		});
+
+		it('should track on `user-submitted-personalization-survey` event', () => {
+			const event: RelayEventMap['user-submitted-personalization-survey'] = {
+				userId: 'user123',
+				answers: {
+					companySize: '1-10',
+					workArea: 'IT',
+					automationGoal: 'Improve efficiency',
+					valueExpectation: 'Time savings',
+				},
+			};
+
+			eventService.emit('user-submitted-personalization-survey', event);
+
+			expect(telemetry.track).toHaveBeenCalledWith('User responded to personalization questions', {
+				user_id: 'user123',
+				company_size: '1-10',
+				work_area: 'IT',
+				automation_goal: 'Improve efficiency',
+				value_expectation: 'Time savings',
+			});
+		});
+
+		it('should track on `user-changed-role` event', () => {
+			const event: RelayEventMap['user-changed-role'] = {
+				userId: 'user123',
+				targetUserId: 'user456',
+				targetUserNewRole: 'global:member',
+				publicApi: false,
+			};
+
+			eventService.emit('user-changed-role', event);
+
+			expect(telemetry.track).toHaveBeenCalledWith('User changed role', {
+				user_id: 'user123',
+				target_user_id: 'user456',
+				target_user_new_role: 'global:member',
+				public_api: false,
+			});
+		});
+
+		it('should track on `user-retrieved-user` event', () => {
+			const event: RelayEventMap['user-retrieved-user'] = {
+				userId: 'user123',
+				publicApi: false,
+			};
+
+			eventService.emit('user-retrieved-user', event);
+
+			expect(telemetry.track).toHaveBeenCalledWith('User retrieved user', {
+				user_id: 'user123',
+				public_api: false,
+			});
+		});
+
+		it('should track on `user-retrieved-all-users` event', () => {
+			const event: RelayEventMap['user-retrieved-all-users'] = {
+				userId: 'user123',
+				publicApi: false,
+			};
+
+			eventService.emit('user-retrieved-all-users', event);
+
+			expect(telemetry.track).toHaveBeenCalledWith('User retrieved all users', {
+				user_id: 'user123',
+				public_api: false,
+			});
+		});
+	});
+
+	describe('lifecycle events', () => {
+		it('should track on `server-started` event', async () => {
+			const firstWorkflow = mock<WorkflowEntity>({ createdAt: new Date() });
+			workflowRepository.findOne.mockResolvedValue(firstWorkflow);
+
+			eventService.emit('server-started');
+
+			await flushPromises();
+
+			// expect(telemetry.identify).toHaveBeenCalled();
+			expect(telemetry.track).toHaveBeenCalledWith(
+				'Instance started',
+				expect.objectContaining({
+					earliest_workflow_created: firstWorkflow.createdAt,
+				}),
+			);
+		});
+
+		it('should track on `session-started` event', () => {
+			const event: RelayEventMap['session-started'] = {
+				pushRef: 'ref123',
+			};
+
+			eventService.emit('session-started', event);
+
+			expect(telemetry.track).toHaveBeenCalledWith('Session started', {
+				session_id: 'ref123',
+			});
+		});
+
+		it('should track on `instance-stopped` event', () => {
+			eventService.emit('instance-stopped', {});
+
+			expect(telemetry.track).toHaveBeenCalledWith('User instance stopped');
+		});
+
+		it('should track on `instance-owner-setup` event', () => {
+			const event: RelayEventMap['instance-owner-setup'] = {
+				userId: 'user123',
+			};
+
+			eventService.emit('instance-owner-setup', event);
+
+			expect(telemetry.track).toHaveBeenCalledWith('Owner finished instance setup', {
+				user_id: 'user123',
+			});
+		});
+	});
+
+	describe('workflow execution events', () => {
+		it('should track on `first-production-workflow-succeeded` event', () => {
+			const event: RelayEventMap['first-production-workflow-succeeded'] = {
+				projectId: 'project123',
+				workflowId: 'workflow123',
+				userId: 'user123',
+			};
+
+			eventService.emit('first-production-workflow-succeeded', event);
+
+			expect(telemetry.track).toHaveBeenCalledWith('Workflow first prod success', {
+				project_id: 'project123',
+				workflow_id: 'workflow123',
+				user_id: 'user123',
+			});
+		});
+
+		it('should track on `first-workflow-data-loaded` event', () => {
+			const event: RelayEventMap['first-workflow-data-loaded'] = {
+				userId: 'user123',
+				workflowId: 'workflow123',
+				nodeType: 'http',
+				nodeId: 'node123',
+				credentialType: 'oAuth2',
+				credentialId: 'cred123',
+			};
+
+			eventService.emit('first-workflow-data-loaded', event);
+
+			expect(telemetry.track).toHaveBeenCalledWith('Workflow first data fetched', {
+				user_id: 'user123',
+				workflow_id: 'workflow123',
+				node_type: 'http',
+				node_id: 'node123',
+				credential_type: 'oAuth2',
+				credential_id: 'cred123',
+			});
+		});
+	});
+
+	describe('email events', () => {
+		it('should track on `email-failed` event', () => {
+			const event: RelayEventMap['email-failed'] = {
+				user: {
+					id: 'user123',
+					email: 'user@example.com',
+					firstName: 'John',
+					lastName: 'Doe',
+					role: 'global:owner',
+				},
+				messageType: 'New user invite',
+				publicApi: false,
+			};
+
+			eventService.emit('email-failed', event);
+
+			expect(telemetry.track).toHaveBeenCalledWith(
+				'Instance failed to send transactional email to user',
+				{
+					user_id: 'user123',
+					message_type: 'New user invite',
+					public_api: false,
+				},
+			);
+		});
+	});
+});

From c0811b218a2d02d34d281003f03db9cf2b9415c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Wed, 14 Aug 2024 11:30:26 +0200
Subject: [PATCH 155/168] refactor(core): Make new configs consistent
 (no-changelog) (#10393)

---
 .../src/configs/{cache.ts => cache.config.ts} |  0
 .../{credentials.ts => credentials.config.ts} |  0
 .../{database.ts => database.config.ts}       |  0
 .../{endpoints.ts => endpoints.config.ts}     |  0
 .../{event-bus.ts => event-bus.config.ts}     |  0
 ...-secrets.ts => external-secrets.config.ts} |  0
 ...-storage.ts => external-storage.config.ts} |  0
 .../src/configs/{nodes.ts => nodes.config.ts} |  0
 .../{public-api.ts => public-api.config.ts}   |  0
 .../{templates.ts => templates.config.ts}     |  0
 .../{email.ts => user-management.config.ts}   | 12 +++-
 ...ons.ts => version-notifications.config.ts} |  0
 .../{workflows.ts => workflows.config.ts}     |  0
 packages/@n8n/config/src/index.ts             | 68 +++++++++----------
 14 files changed, 40 insertions(+), 40 deletions(-)
 rename packages/@n8n/config/src/configs/{cache.ts => cache.config.ts} (100%)
 rename packages/@n8n/config/src/configs/{credentials.ts => credentials.config.ts} (100%)
 rename packages/@n8n/config/src/configs/{database.ts => database.config.ts} (100%)
 rename packages/@n8n/config/src/configs/{endpoints.ts => endpoints.config.ts} (100%)
 rename packages/@n8n/config/src/configs/{event-bus.ts => event-bus.config.ts} (100%)
 rename packages/@n8n/config/src/configs/{external-secrets.ts => external-secrets.config.ts} (100%)
 rename packages/@n8n/config/src/configs/{external-storage.ts => external-storage.config.ts} (100%)
 rename packages/@n8n/config/src/configs/{nodes.ts => nodes.config.ts} (100%)
 rename packages/@n8n/config/src/configs/{public-api.ts => public-api.config.ts} (100%)
 rename packages/@n8n/config/src/configs/{templates.ts => templates.config.ts} (100%)
 rename packages/@n8n/config/src/configs/{email.ts => user-management.config.ts} (92%)
 rename packages/@n8n/config/src/configs/{version-notifications.ts => version-notifications.config.ts} (100%)
 rename packages/@n8n/config/src/configs/{workflows.ts => workflows.config.ts} (100%)

diff --git a/packages/@n8n/config/src/configs/cache.ts b/packages/@n8n/config/src/configs/cache.config.ts
similarity index 100%
rename from packages/@n8n/config/src/configs/cache.ts
rename to packages/@n8n/config/src/configs/cache.config.ts
diff --git a/packages/@n8n/config/src/configs/credentials.ts b/packages/@n8n/config/src/configs/credentials.config.ts
similarity index 100%
rename from packages/@n8n/config/src/configs/credentials.ts
rename to packages/@n8n/config/src/configs/credentials.config.ts
diff --git a/packages/@n8n/config/src/configs/database.ts b/packages/@n8n/config/src/configs/database.config.ts
similarity index 100%
rename from packages/@n8n/config/src/configs/database.ts
rename to packages/@n8n/config/src/configs/database.config.ts
diff --git a/packages/@n8n/config/src/configs/endpoints.ts b/packages/@n8n/config/src/configs/endpoints.config.ts
similarity index 100%
rename from packages/@n8n/config/src/configs/endpoints.ts
rename to packages/@n8n/config/src/configs/endpoints.config.ts
diff --git a/packages/@n8n/config/src/configs/event-bus.ts b/packages/@n8n/config/src/configs/event-bus.config.ts
similarity index 100%
rename from packages/@n8n/config/src/configs/event-bus.ts
rename to packages/@n8n/config/src/configs/event-bus.config.ts
diff --git a/packages/@n8n/config/src/configs/external-secrets.ts b/packages/@n8n/config/src/configs/external-secrets.config.ts
similarity index 100%
rename from packages/@n8n/config/src/configs/external-secrets.ts
rename to packages/@n8n/config/src/configs/external-secrets.config.ts
diff --git a/packages/@n8n/config/src/configs/external-storage.ts b/packages/@n8n/config/src/configs/external-storage.config.ts
similarity index 100%
rename from packages/@n8n/config/src/configs/external-storage.ts
rename to packages/@n8n/config/src/configs/external-storage.config.ts
diff --git a/packages/@n8n/config/src/configs/nodes.ts b/packages/@n8n/config/src/configs/nodes.config.ts
similarity index 100%
rename from packages/@n8n/config/src/configs/nodes.ts
rename to packages/@n8n/config/src/configs/nodes.config.ts
diff --git a/packages/@n8n/config/src/configs/public-api.ts b/packages/@n8n/config/src/configs/public-api.config.ts
similarity index 100%
rename from packages/@n8n/config/src/configs/public-api.ts
rename to packages/@n8n/config/src/configs/public-api.config.ts
diff --git a/packages/@n8n/config/src/configs/templates.ts b/packages/@n8n/config/src/configs/templates.config.ts
similarity index 100%
rename from packages/@n8n/config/src/configs/templates.ts
rename to packages/@n8n/config/src/configs/templates.config.ts
diff --git a/packages/@n8n/config/src/configs/email.ts b/packages/@n8n/config/src/configs/user-management.config.ts
similarity index 92%
rename from packages/@n8n/config/src/configs/email.ts
rename to packages/@n8n/config/src/configs/user-management.config.ts
index f0e130c3b48be..2c603a7148002 100644
--- a/packages/@n8n/config/src/configs/email.ts
+++ b/packages/@n8n/config/src/configs/user-management.config.ts
@@ -1,7 +1,7 @@
 import { Config, Env, Nested } from '../decorators';
 
 @Config
-export class SmtpAuth {
+class SmtpAuth {
 	/** SMTP login username */
 	@Env('N8N_SMTP_USER')
 	user = '';
@@ -20,7 +20,7 @@ export class SmtpAuth {
 }
 
 @Config
-export class SmtpConfig {
+class SmtpConfig {
 	/** SMTP server host */
 	@Env('N8N_SMTP_HOST')
 	host = '';
@@ -65,7 +65,7 @@ export class TemplateConfig {
 }
 
 @Config
-export class EmailConfig {
+class EmailConfig {
 	/** How to send emails */
 	@Env('N8N_EMAIL_MODE')
 	mode: '' | 'smtp' = 'smtp';
@@ -76,3 +76,9 @@ export class EmailConfig {
 	@Nested
 	template: TemplateConfig;
 }
+
+@Config
+export class UserManagementConfig {
+	@Nested
+	emails: EmailConfig;
+}
diff --git a/packages/@n8n/config/src/configs/version-notifications.ts b/packages/@n8n/config/src/configs/version-notifications.config.ts
similarity index 100%
rename from packages/@n8n/config/src/configs/version-notifications.ts
rename to packages/@n8n/config/src/configs/version-notifications.config.ts
diff --git a/packages/@n8n/config/src/configs/workflows.ts b/packages/@n8n/config/src/configs/workflows.config.ts
similarity index 100%
rename from packages/@n8n/config/src/configs/workflows.ts
rename to packages/@n8n/config/src/configs/workflows.config.ts
diff --git a/packages/@n8n/config/src/index.ts b/packages/@n8n/config/src/index.ts
index 88e6fb01170d8..a5b970eab4730 100644
--- a/packages/@n8n/config/src/index.ts
+++ b/packages/@n8n/config/src/index.ts
@@ -1,85 +1,79 @@
 import { Config, Env, Nested } from './decorators';
-import { CredentialsConfig } from './configs/credentials';
-import { DatabaseConfig } from './configs/database';
-import { EmailConfig } from './configs/email';
-import { VersionNotificationsConfig } from './configs/version-notifications';
-import { PublicApiConfig } from './configs/public-api';
-import { ExternalSecretsConfig } from './configs/external-secrets';
-import { TemplatesConfig } from './configs/templates';
-import { EventBusConfig } from './configs/event-bus';
-import { NodesConfig } from './configs/nodes';
-import { ExternalStorageConfig } from './configs/external-storage';
-import { WorkflowsConfig } from './configs/workflows';
-import { EndpointsConfig } from './configs/endpoints';
-import { CacheConfig } from './configs/cache';
+import { CredentialsConfig } from './configs/credentials.config';
+import { DatabaseConfig } from './configs/database.config';
+import { VersionNotificationsConfig } from './configs/version-notifications.config';
+import { PublicApiConfig } from './configs/public-api.config';
+import { ExternalSecretsConfig } from './configs/external-secrets.config';
+import { TemplatesConfig } from './configs/templates.config';
+import { EventBusConfig } from './configs/event-bus.config';
+import { NodesConfig } from './configs/nodes.config';
+import { ExternalStorageConfig } from './configs/external-storage.config';
+import { WorkflowsConfig } from './configs/workflows.config';
+import { EndpointsConfig } from './configs/endpoints.config';
+import { CacheConfig } from './configs/cache.config';
 import { ScalingModeConfig } from './configs/scaling-mode.config';
-
-@Config
-class UserManagementConfig {
-	@Nested
-	emails: EmailConfig;
-}
+import { UserManagementConfig } from './configs/user-management.config';
 
 @Config
 export class GlobalConfig {
 	@Nested
-	readonly database: DatabaseConfig;
+	database: DatabaseConfig;
 
 	@Nested
-	readonly credentials: CredentialsConfig;
+	credentials: CredentialsConfig;
 
 	@Nested
-	readonly userManagement: UserManagementConfig;
+	userManagement: UserManagementConfig;
 
 	@Nested
-	readonly versionNotifications: VersionNotificationsConfig;
+	versionNotifications: VersionNotificationsConfig;
 
 	@Nested
-	readonly publicApi: PublicApiConfig;
+	publicApi: PublicApiConfig;
 
 	@Nested
-	readonly externalSecrets: ExternalSecretsConfig;
+	externalSecrets: ExternalSecretsConfig;
 
 	@Nested
-	readonly templates: TemplatesConfig;
+	templates: TemplatesConfig;
 
 	@Nested
-	readonly eventBus: EventBusConfig;
+	eventBus: EventBusConfig;
 
 	@Nested
-	readonly nodes: NodesConfig;
+	nodes: NodesConfig;
 
 	@Nested
-	readonly externalStorage: ExternalStorageConfig;
+	externalStorage: ExternalStorageConfig;
 
 	@Nested
-	readonly workflows: WorkflowsConfig;
+	workflows: WorkflowsConfig;
 
 	/** Path n8n is deployed to */
 	@Env('N8N_PATH')
-	readonly path: string = '/';
+	path = '/';
 
 	/** Host name n8n can be reached */
 	@Env('N8N_HOST')
-	readonly host: string = 'localhost';
+	host = 'localhost';
 
 	/** HTTP port n8n can be reached */
 	@Env('N8N_PORT')
-	readonly port: number = 5678;
+	port = 5678;
 
 	/** IP address n8n should listen on */
 	@Env('N8N_LISTEN_ADDRESS')
-	readonly listen_address: string = '0.0.0.0';
+	listen_address = '0.0.0.0';
 
 	/** HTTP Protocol via which n8n can be reached */
 	@Env('N8N_PROTOCOL')
-	readonly protocol: 'http' | 'https' = 'http';
+	protocol: 'http' | 'https' = 'http';
 
 	@Nested
-	readonly endpoints: EndpointsConfig;
+	endpoints: EndpointsConfig;
 
 	@Nested
-	readonly cache: CacheConfig;
+	cache: CacheConfig;
 
 	@Nested
 	queue: ScalingModeConfig;

From c4fcbe40c585a5dbb5ac6510618dbb0cc88bdac2 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: Wed, 14 Aug 2024 12:52:19 +0200
Subject: [PATCH 156/168] fix(editor): Remove `@n8n/permissions` from
 `n8n-workflow` (no-changelog) (#10399)

---
 packages/editor-ui/src/Interface.ts                      | 4 +++-
 .../executions/global/GlobalExecutionsList.vue           | 6 +++---
 .../workflow/WorkflowExecutionsPreview.test.ts           | 4 ++--
 packages/editor-ui/src/stores/executions.store.ts        | 9 +++++----
 packages/workflow/package.json                           | 1 -
 packages/workflow/src/Interfaces.ts                      | 2 --
 pnpm-lock.yaml                                           | 3 ---
 7 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/packages/editor-ui/src/Interface.ts b/packages/editor-ui/src/Interface.ts
index 986336a396d64..05c40402f1c0a 100644
--- a/packages/editor-ui/src/Interface.ts
+++ b/packages/editor-ui/src/Interface.ts
@@ -385,9 +385,11 @@ export interface IExecutionResponse extends IExecutionBase {
 	executedNode?: string;
 }
 
+export type ExecutionSummaryWithScopes = ExecutionSummary & { scopes: Scope[] };
+
 export interface IExecutionsListResponse {
 	count: number;
-	results: ExecutionSummary[];
+	results: ExecutionSummaryWithScopes[];
 	estimated: boolean;
 }
 
diff --git a/packages/editor-ui/src/components/executions/global/GlobalExecutionsList.vue b/packages/editor-ui/src/components/executions/global/GlobalExecutionsList.vue
index a0ec5726977c8..321eb4753480b 100644
--- a/packages/editor-ui/src/components/executions/global/GlobalExecutionsList.vue
+++ b/packages/editor-ui/src/components/executions/global/GlobalExecutionsList.vue
@@ -7,7 +7,7 @@ import { useToast } from '@/composables/useToast';
 import { useMessage } from '@/composables/useMessage';
 import { useI18n } from '@/composables/useI18n';
 import { useTelemetry } from '@/composables/useTelemetry';
-import type { ExecutionFilterType, IWorkflowDb } from '@/Interface';
+import type { ExecutionFilterType, ExecutionSummaryWithScopes, IWorkflowDb } from '@/Interface';
 import type { ExecutionSummary } from 'n8n-workflow';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useExecutionsStore } from '@/stores/executions.store';
@@ -16,7 +16,7 @@ import { getResourcePermissions } from '@/permissions';
 
 const props = withDefaults(
 	defineProps<{
-		executions: ExecutionSummary[];
+		executions: ExecutionSummaryWithScopes[];
 		filters: ExecutionFilterType;
 		total: number;
 		estimated: boolean;
@@ -165,7 +165,7 @@ function getExecutionWorkflowName(execution: ExecutionSummary): string {
 }
 
 function getExecutionWorkflowPermissions(
-	execution: ExecutionSummary,
+	execution: ExecutionSummaryWithScopes,
 ): PermissionsRecord['workflow'] {
 	return getResourcePermissions(execution.scopes).workflow;
 }
diff --git a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsPreview.test.ts b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsPreview.test.ts
index ce092dab46a8a..f5646e1245ad2 100644
--- a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsPreview.test.ts
+++ b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsPreview.test.ts
@@ -12,7 +12,7 @@ import { i18nInstance, I18nPlugin } from '@/plugins/i18n';
 import { FontAwesomePlugin } from '@/plugins/icons';
 import { GlobalComponentsPlugin } from '@/plugins/components';
 import { useWorkflowsStore } from '@/stores/workflows.store';
-import type { IWorkflowDb } from '@/Interface';
+import type { ExecutionSummaryWithScopes, IWorkflowDb } from '@/Interface';
 
 let pinia: ReturnType<typeof createPinia>;
 
@@ -49,7 +49,7 @@ const generateUndefinedNullOrString = () => {
 	}
 };
 
-const executionDataFactory = (): ExecutionSummary => ({
+const executionDataFactory = (): ExecutionSummaryWithScopes => ({
 	id: faker.string.uuid(),
 	finished: faker.datatype.boolean(),
 	mode: faker.helpers.arrayElement(['manual', 'trigger']),
diff --git a/packages/editor-ui/src/stores/executions.store.ts b/packages/editor-ui/src/stores/executions.store.ts
index 756fdff6c4d97..af3850fd11304 100644
--- a/packages/editor-ui/src/stores/executions.store.ts
+++ b/packages/editor-ui/src/stores/executions.store.ts
@@ -4,6 +4,7 @@ import type { IDataObject, ExecutionSummary } from 'n8n-workflow';
 import type {
 	ExecutionFilterType,
 	ExecutionsQueryFilter,
+	ExecutionSummaryWithScopes,
 	IExecutionDeleteFilter,
 	IExecutionFlattedResponse,
 	IExecutionResponse,
@@ -34,7 +35,7 @@ export const useExecutionsStore = defineStore('executions', () => {
 	const autoRefreshTimeout = ref<NodeJS.Timeout | null>(null);
 	const autoRefreshDelay = ref(4 * 1000); // Refresh data every 4 secs
 
-	const executionsById = ref<Record<string, ExecutionSummary>>({});
+	const executionsById = ref<Record<string, ExecutionSummaryWithScopes>>({});
 	const executionsCount = ref(0);
 	const executionsCountEstimated = ref(false);
 	const executions = computed(() => {
@@ -57,7 +58,7 @@ export const useExecutionsStore = defineStore('executions', () => {
 		}, {}),
 	);
 
-	const currentExecutionsById = ref<Record<string, ExecutionSummary>>({});
+	const currentExecutionsById = ref<Record<string, ExecutionSummaryWithScopes>>({});
 	const currentExecutions = computed(() => {
 		const data = Object.values(currentExecutionsById.value);
 
@@ -80,14 +81,14 @@ export const useExecutionsStore = defineStore('executions', () => {
 
 	const allExecutions = computed(() => [...currentExecutions.value, ...executions.value]);
 
-	function addExecution(execution: ExecutionSummary) {
+	function addExecution(execution: ExecutionSummaryWithScopes) {
 		executionsById.value[execution.id] = {
 			...execution,
 			mode: execution.mode,
 		};
 	}
 
-	function addCurrentExecution(execution: ExecutionSummary) {
+	function addCurrentExecution(execution: ExecutionSummaryWithScopes) {
 		currentExecutionsById.value[execution.id] = {
 			...execution,
 			mode: execution.mode,
diff --git a/packages/workflow/package.json b/packages/workflow/package.json
index 6bbdc59a1c96d..ed434fe98f831 100644
--- a/packages/workflow/package.json
+++ b/packages/workflow/package.json
@@ -39,7 +39,6 @@
     "@types/xml2js": "catalog:"
   },
   "dependencies": {
-    "@n8n/permissions": "workspace:*",
     "@n8n/tournament": "1.0.5",
     "@n8n_io/riot-tmpl": "4.0.0",
     "ast-types": "0.15.2",
diff --git a/packages/workflow/src/Interfaces.ts b/packages/workflow/src/Interfaces.ts
index 1e6e5872ffbe9..eb6c3ca07c3d4 100644
--- a/packages/workflow/src/Interfaces.ts
+++ b/packages/workflow/src/Interfaces.ts
@@ -10,7 +10,6 @@ import type { URLSearchParams } from 'url';
 import type { RequestBodyMatcher } from 'nock';
 import type { Client as SSHClient } from 'ssh2';
 
-import type { Scope } from '@n8n/permissions';
 import type { AuthenticationMethod } from './Authentication';
 import type { CODE_EXECUTION_MODES, CODE_LANGUAGES, LOG_LEVELS } from './Constants';
 import type { IDeferredPromise } from './DeferredPromise';
@@ -2464,7 +2463,6 @@ export interface ExecutionSummary {
 	nodeExecutionStatus?: {
 		[key: string]: IExecutionSummaryNodeExecutionResult;
 	};
-	scopes?: Scope[];
 }
 
 export interface IExecutionSummaryNodeExecutionResult {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 16ba572ac4a4a..37fddb4bb3a1c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1709,9 +1709,6 @@ importers:
 
   packages/workflow:
     dependencies:
-      '@n8n/permissions':
-        specifier: workspace:*
-        version: link:../@n8n/permissions
       '@n8n/tournament':
         specifier: 1.0.5
         version: 1.0.5

From bae0116d78784dabd9c4c3143c15b241c03b1944 Mon Sep 17 00:00:00 2001
From: Shireen Missi <94372015+ShireenMissi@users.noreply.github.com>
Date: Wed, 14 Aug 2024 12:01:14 +0100
Subject: [PATCH 157/168] fix: Remove node AI Transform node (no-changelog)
 (#10400)

---
 .../ManualChatTrigger.node.ts                 |   4 +-
 .../dynamicNodeParameters.controller.ts       |  26 +-
 packages/cli/src/requests.ts                  |   6 -
 .../services/dynamicNodeParameters.service.ts |  27 +-
 packages/editor-ui/src/Interface.ts           |   5 -
 packages/editor-ui/src/api/nodeTypes.ts       |  13 -
 .../ButtonParameter/ButtonParameter.vue       | 281 ------------------
 .../src/components/ButtonParameter/utils.ts   |  46 ---
 .../CodeNodeEditor/CodeNodeEditor.vue         |  12 +-
 .../src/components/JsEditor/JsEditor.vue      |  32 +-
 .../src/components/Node/NodeCreator/utils.ts  |   8 -
 .../components/Node/NodeCreator/viewsData.ts  |  11 +-
 .../src/components/ParameterInput.vue         |   9 +-
 .../src/components/ParameterInputList.vue     |  26 +-
 .../__tests__/ButtonParameter.test.ts         | 136 ---------
 packages/editor-ui/src/constants.ts           |   7 +-
 .../editor-ui/src/stores/nodeTypes.store.ts   |   7 -
 .../editor-ui/src/stores/posthog.store.ts     |  15 +-
 .../nodes/AiTransform/AiTransform.node.json   |  18 --
 .../nodes/AiTransform/AiTransform.node.ts     | 148 ---------
 .../nodes/AiTransform/aitransform.svg         |  10 -
 packages/nodes-base/package.json              |   1 -
 packages/workflow/src/Interfaces.ts           |  21 +-
 23 files changed, 38 insertions(+), 831 deletions(-)
 delete mode 100644 packages/editor-ui/src/components/ButtonParameter/ButtonParameter.vue
 delete mode 100644 packages/editor-ui/src/components/ButtonParameter/utils.ts
 delete mode 100644 packages/editor-ui/src/components/__tests__/ButtonParameter.test.ts
 delete mode 100644 packages/nodes-base/nodes/AiTransform/AiTransform.node.json
 delete mode 100644 packages/nodes-base/nodes/AiTransform/AiTransform.node.ts
 delete mode 100644 packages/nodes-base/nodes/AiTransform/aitransform.svg

diff --git a/packages/@n8n/nodes-langchain/nodes/trigger/ManualChatTrigger/ManualChatTrigger.node.ts b/packages/@n8n/nodes-langchain/nodes/trigger/ManualChatTrigger/ManualChatTrigger.node.ts
index 816b56b59ad40..272213d5390c2 100644
--- a/packages/@n8n/nodes-langchain/nodes/trigger/ManualChatTrigger/ManualChatTrigger.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/trigger/ManualChatTrigger/ManualChatTrigger.node.ts
@@ -50,9 +50,7 @@ export class ManualChatTrigger implements INodeType {
 				name: 'openChat',
 				type: 'button',
 				typeOptions: {
-					buttonConfig: {
-						action: 'openChat',
-					},
+					action: 'openChat',
 				},
 				default: '',
 			},
diff --git a/packages/cli/src/controllers/dynamicNodeParameters.controller.ts b/packages/cli/src/controllers/dynamicNodeParameters.controller.ts
index bfd1cf651b875..c6a46aa3d4eed 100644
--- a/packages/cli/src/controllers/dynamicNodeParameters.controller.ts
+++ b/packages/cli/src/controllers/dynamicNodeParameters.controller.ts
@@ -1,4 +1,4 @@
-import type { INodePropertyOptions, NodeParameterValueType } from 'n8n-workflow';
+import type { INodePropertyOptions } from 'n8n-workflow';
 
 import { Post, RestController } from '@/decorators';
 import { getBase } from '@/WorkflowExecuteAdditionalData';
@@ -92,28 +92,4 @@ export class DynamicNodeParametersController {
 			credentials,
 		);
 	}
-
-	@Post('/action-result')
-	async getActionResult(
-		req: DynamicNodeParametersRequest.ActionResult,
-	): Promise<NodeParameterValueType> {
-		const { currentNodeParameters, nodeTypeAndVersion, path, credentials, handler, payload } =
-			req.body;
-
-		const additionalData = await getBase(req.user.id, currentNodeParameters);
-
-		if (handler) {
-			return await this.service.getActionResult(
-				handler,
-				path,
-				additionalData,
-				nodeTypeAndVersion,
-				currentNodeParameters,
-				payload,
-				credentials,
-			);
-		}
-
-		return;
-	}
 }
diff --git a/packages/cli/src/requests.ts b/packages/cli/src/requests.ts
index 565020447c91d..45ee15b76326e 100644
--- a/packages/cli/src/requests.ts
+++ b/packages/cli/src/requests.ts
@@ -419,12 +419,6 @@ export declare namespace DynamicNodeParametersRequest {
 	type ResourceMapperFields = BaseRequest<{
 		methodName: string;
 	}>;
-
-	/** POST /dynamic-node-parameters/action-result */
-	type ActionResult = BaseRequest<{
-		handler: string;
-		payload: IDataObject | string | undefined;
-	}>;
 }
 
 // ----------------------------------
diff --git a/packages/cli/src/services/dynamicNodeParameters.service.ts b/packages/cli/src/services/dynamicNodeParameters.service.ts
index f3b0f7e192ba3..1788bac6e1877 100644
--- a/packages/cli/src/services/dynamicNodeParameters.service.ts
+++ b/packages/cli/src/services/dynamicNodeParameters.service.ts
@@ -15,8 +15,6 @@ import type {
 	INodeCredentials,
 	INodeParameters,
 	INodeTypeNameVersion,
-	NodeParameterValueType,
-	IDataObject,
 } from 'n8n-workflow';
 import { Workflow, RoutingNode, ApplicationError } from 'n8n-workflow';
 import { NodeExecuteFunctions } from 'n8n-core';
@@ -158,24 +156,6 @@ export class DynamicNodeParametersService {
 		return method.call(thisArgs);
 	}
 
-	/** Returns the result of the action handler */
-	async getActionResult(
-		handler: string,
-		path: string,
-		additionalData: IWorkflowExecuteAdditionalData,
-		nodeTypeAndVersion: INodeTypeNameVersion,
-		currentNodeParameters: INodeParameters,
-		payload: IDataObject | string | undefined,
-		credentials?: INodeCredentials,
-	): Promise<NodeParameterValueType> {
-		const nodeType = this.getNodeType(nodeTypeAndVersion);
-		const method = this.getMethod('actionHandler', handler, nodeType);
-		const workflow = this.getWorkflow(nodeTypeAndVersion, currentNodeParameters, credentials);
-		const thisArgs = this.getThisArg(path, additionalData, workflow);
-		// eslint-disable-next-line @typescript-eslint/no-unsafe-return
-		return method.call(thisArgs, payload);
-	}
-
 	private getMethod(
 		type: 'resourceMapping',
 		methodName: string,
@@ -195,14 +175,9 @@ export class DynamicNodeParametersService {
 		methodName: string,
 		nodeType: INodeType,
 	): (this: ILoadOptionsFunctions) => Promise<INodePropertyOptions[]>;
-	private getMethod(
-		type: 'actionHandler',
-		methodName: string,
-		nodeType: INodeType,
-	): (this: ILoadOptionsFunctions, payload?: string) => Promise<NodeParameterValueType>;
 
 	private getMethod(
-		type: 'resourceMapping' | 'listSearch' | 'loadOptions' | 'actionHandler',
+		type: 'resourceMapping' | 'listSearch' | 'loadOptions',
 		methodName: string,
 		nodeType: INodeType,
 	) {
diff --git a/packages/editor-ui/src/Interface.ts b/packages/editor-ui/src/Interface.ts
index 05c40402f1c0a..04365662b28e4 100644
--- a/packages/editor-ui/src/Interface.ts
+++ b/packages/editor-ui/src/Interface.ts
@@ -1553,11 +1553,6 @@ export declare namespace DynamicNodeParameters {
 	interface ResourceMapperFieldsRequest extends BaseRequest {
 		methodName: string;
 	}
-
-	interface ActionResultRequest extends BaseRequest {
-		handler: string;
-		payload: IDataObject | string | undefined;
-	}
 }
 
 export interface EnvironmentVariable {
diff --git a/packages/editor-ui/src/api/nodeTypes.ts b/packages/editor-ui/src/api/nodeTypes.ts
index f4d516aaeff82..300b25390d121 100644
--- a/packages/editor-ui/src/api/nodeTypes.ts
+++ b/packages/editor-ui/src/api/nodeTypes.ts
@@ -5,7 +5,6 @@ import type {
 	INodePropertyOptions,
 	INodeTypeDescription,
 	INodeTypeNameVersion,
-	NodeParameterValueType,
 	ResourceMapperFields,
 } from 'n8n-workflow';
 import axios from 'axios';
@@ -58,15 +57,3 @@ export async function getResourceMapperFields(
 		sendData,
 	);
 }
-
-export async function getNodeParameterActionResult(
-	context: IRestApiContext,
-	sendData: DynamicNodeParameters.ActionResultRequest,
-): Promise<NodeParameterValueType> {
-	return await makeRestApiRequest(
-		context,
-		'POST',
-		'/dynamic-node-parameters/action-result',
-		sendData,
-	);
-}
diff --git a/packages/editor-ui/src/components/ButtonParameter/ButtonParameter.vue b/packages/editor-ui/src/components/ButtonParameter/ButtonParameter.vue
deleted file mode 100644
index d7e05b0f5bf85..0000000000000
--- a/packages/editor-ui/src/components/ButtonParameter/ButtonParameter.vue
+++ /dev/null
@@ -1,281 +0,0 @@
-<script setup lang="ts">
-import { ApplicationError, 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 { useI18n } from '@/composables/useI18n';
-import { useToast } from '@/composables/useToast';
-import { useNDVStore } from '@/stores/ndv.store';
-import { getSchemas, getParentNodes } from './utils';
-import { ASK_AI_EXPERIMENT } from '@/constants';
-import { usePostHog } from '@/stores/posthog.store';
-import { useRootStore } from '@/stores/root.store';
-import { generateCodeForPrompt } from '@/api/ai';
-
-import { format } from 'prettier';
-import jsParser from 'prettier/plugins/babel';
-import * as estree from 'prettier/plugins/estree';
-
-const emit = defineEmits<{
-	valueChanged: [value: IUpdateInformation];
-}>();
-
-const props = defineProps<{
-	parameter: INodeProperties;
-	value: string;
-	path: string;
-}>();
-
-const posthog = usePostHog();
-const rootStore = useRootStore();
-
-const i18n = useI18n();
-
-const isLoading = ref(false);
-const prompt = ref(props.value);
-const parentNodes = ref<INodeUi[]>([]);
-
-const hasExecutionData = computed(() => (useNDVStore().ndvInputData || []).length > 0);
-const hasInputField = computed(() => props.parameter.typeOptions?.buttonConfig?.hasInputField);
-const inputFieldMaxLength = computed(
-	() => props.parameter.typeOptions?.buttonConfig?.inputFieldMaxLength,
-);
-const buttonLabel = computed(
-	() => props.parameter.typeOptions?.buttonConfig?.label ?? props.parameter.displayName,
-);
-const isSubmitEnabled = computed(() => {
-	if (!hasExecutionData.value) return false;
-	if (!prompt.value) return false;
-
-	const maxlength = inputFieldMaxLength.value;
-	if (maxlength && prompt.value.length > maxlength) return false;
-
-	return true;
-});
-
-function startLoading() {
-	isLoading.value = true;
-}
-
-function stopLoading() {
-	setTimeout(() => {
-		isLoading.value = false;
-	}, 200);
-}
-
-function getPath(parameter: string) {
-	return (props.path ? `${props.path}.` : '') + parameter;
-}
-
-function createPrompt(prompt: string) {
-	return `
-Important! The original input must remain unchanged. If there is a risk of modifying the original input, create a copy of it before making any changes. Use appropriate methods to ensure that the properties of objects are not directly altered.
-
-Always return an array
-
-${prompt}
-`;
-}
-
-async function onSubmit() {
-	const { activeNode } = useNDVStore();
-	const { showMessage } = useToast();
-	const action: string | NodePropertyAction | undefined =
-		props.parameter.typeOptions?.buttonConfig?.action;
-
-	if (!action || !activeNode) return;
-
-	if (typeof action === 'string') {
-		switch (action) {
-			default:
-				return;
-		}
-	}
-
-	emit('valueChanged', {
-		name: getPath(props.parameter.name),
-		value: prompt.value,
-	});
-
-	const { type, target } = action;
-
-	startLoading();
-
-	try {
-		const schemas = getSchemas();
-		const version = rootStore.versionCli;
-		const model =
-			usePostHog().getVariant(ASK_AI_EXPERIMENT.name) === ASK_AI_EXPERIMENT.gpt4
-				? 'gpt-4'
-				: 'gpt-3.5-turbo-16k';
-
-		const payload = {
-			question: createPrompt(prompt.value),
-			context: {
-				schema: schemas.parentNodesSchemas,
-				inputSchema: schemas.inputSchema!,
-				ndvPushRef: useNDVStore().pushRef,
-				pushRef: rootStore.pushRef,
-			},
-			model,
-			n8nVersion: version,
-		};
-		switch (type) {
-			case 'askAiCodeGeneration':
-				let value;
-				if (posthog.isAiEnabled()) {
-					const { restApiContext } = useRootStore();
-					const { code } = await generateCodeForPrompt(restApiContext, payload);
-					value = code;
-				} else {
-					throw new ApplicationError('AI code generation is not enabled');
-				}
-
-				if (value === undefined) return;
-
-				const formattedCode = await format(String(value), {
-					parser: 'babel',
-					plugins: [jsParser, estree],
-				});
-
-				const updateInformation = {
-					name: getPath(target as string),
-					value: formattedCode,
-				};
-
-				emit('valueChanged', updateInformation);
-				break;
-			default:
-				return;
-		}
-
-		showMessage({
-			type: 'success',
-			title: i18n.baseText('codeNodeEditor.askAi.generationCompleted'),
-		});
-
-		stopLoading();
-	} catch (error) {
-		showMessage({
-			type: 'error',
-			title: i18n.baseText('codeNodeEditor.askAi.generationFailed'),
-			message: error.message,
-		});
-		stopLoading();
-	}
-}
-
-function onPromptInput(inputValue: string) {
-	prompt.value = inputValue;
-	emit('valueChanged', {
-		name: getPath(props.parameter.name),
-		value: inputValue,
-	});
-}
-
-onMounted(() => {
-	parentNodes.value = getParentNodes();
-});
-</script>
-
-<template>
-	<div>
-		<n8n-input-label
-			v-if="hasInputField"
-			:label="i18n.nodeText().inputLabelDisplayName(parameter, path)"
-			:tooltip-text="i18n.nodeText().inputLabelDescription(parameter, path)"
-			:bold="false"
-			size="small"
-			color="text-dark"
-		>
-		</n8n-input-label>
-		<div :class="$style.inputContainer" :hidden="!hasInputField">
-			<div :class="$style.meta">
-				<span
-					v-if="inputFieldMaxLength"
-					v-show="prompt.length > 1"
-					:class="$style.counter"
-					v-text="`${prompt.length} / ${inputFieldMaxLength}`"
-				/>
-			</div>
-			<N8nInput
-				v-model="prompt"
-				:class="$style.input"
-				style="border: 1px solid var(--color-foreground-base)"
-				type="textarea"
-				:rows="6"
-				:maxlength="inputFieldMaxLength"
-				:placeholder="parameter.placeholder"
-				@input="onPromptInput"
-			/>
-		</div>
-		<div :class="$style.controls">
-			<N8nTooltip :disabled="isSubmitEnabled">
-				<div>
-					<N8nButton
-						:disabled="!isSubmitEnabled"
-						size="small"
-						:loading="isLoading"
-						type="secondary"
-						@click="onSubmit"
-					>
-						{{ buttonLabel }}
-					</N8nButton>
-				</div>
-				<template #content>
-					<span
-						v-if="!hasExecutionData"
-						v-text="i18n.baseText('codeNodeEditor.askAi.noInputData')"
-					/>
-					<span
-						v-else-if="prompt.length === 0"
-						v-text="i18n.baseText('codeNodeEditor.askAi.noPrompt')"
-					/>
-				</template>
-			</N8nTooltip>
-		</div>
-	</div>
-</template>
-
-<style module lang="scss">
-.input * {
-	border: 0 !important;
-}
-.input textarea {
-	font-size: var(--font-size-2xs);
-	padding-bottom: var(--spacing-2xl);
-	font-family: var(--font-family);
-	resize: none;
-}
-.intro {
-	font-weight: var(--font-weight-bold);
-	font-size: var(--font-size-2xs);
-	color: var(--color-text-dark);
-	padding: var(--spacing-2xs) 0 0;
-}
-.inputContainer {
-	position: relative;
-}
-.meta {
-	display: flex;
-	justify-content: space-between;
-	position: absolute;
-	bottom: var(--spacing-2xs);
-	left: var(--spacing-xs);
-	right: var(--spacing-xs);
-	z-index: 1;
-
-	* {
-		font-size: var(--font-size-2xs);
-		line-height: 1;
-	}
-}
-.counter {
-	color: var(--color-text-light);
-}
-.controls {
-	padding: var(--spacing-2xs) 0;
-	display: flex;
-	justify-content: flex-end;
-}
-</style>
diff --git a/packages/editor-ui/src/components/ButtonParameter/utils.ts b/packages/editor-ui/src/components/ButtonParameter/utils.ts
deleted file mode 100644
index 14d3ca4d78334..0000000000000
--- a/packages/editor-ui/src/components/ButtonParameter/utils.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import type { Schema } from '@/Interface';
-import type { INodeExecutionData } from 'n8n-workflow';
-import { useWorkflowsStore } from '@/stores/workflows.store';
-import { useNDVStore } from '@/stores/ndv.store';
-import { useDataSchema } from '@/composables/useDataSchema';
-import { executionDataToJson } from '@/utils/nodeTypesUtils';
-
-export function getParentNodes() {
-	const activeNode = useNDVStore().activeNode;
-	const { getCurrentWorkflow, getNodeByName } = useWorkflowsStore();
-	const workflow = getCurrentWorkflow();
-
-	if (!activeNode || !workflow) return [];
-
-	return workflow
-		.getParentNodesByDepth(activeNode?.name)
-		.filter(({ name }, i, nodes) => {
-			return name !== activeNode.name && nodes.findIndex((node) => node.name === name) === i;
-		})
-		.map((n) => getNodeByName(n.name))
-		.filter((n) => n !== null);
-}
-
-export function getSchemas() {
-	const parentNodes = getParentNodes();
-	const parentNodesNames = parentNodes.map((node) => node?.name);
-	const { getSchemaForExecutionData, getInputDataWithPinned } = useDataSchema();
-	const parentNodesSchemas: Array<{ nodeName: string; schema: Schema }> = parentNodes
-		.map((node) => {
-			const inputData: INodeExecutionData[] = getInputDataWithPinned(node);
-
-			return {
-				nodeName: node?.name || '',
-				schema: getSchemaForExecutionData(executionDataToJson(inputData), true),
-			};
-		})
-		.filter((node) => node.schema?.value.length > 0);
-
-	const inputSchema = parentNodesSchemas.shift();
-
-	return {
-		parentNodesNames,
-		inputSchema,
-		parentNodesSchemas,
-	};
-}
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue b/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
index f4ba1febf2471..d59a13e98ee60 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
+++ b/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
@@ -60,12 +60,13 @@ import jsParser from 'prettier/plugins/babel';
 import * as estree from 'prettier/plugins/estree';
 import { type Ref, computed, nextTick, onBeforeUnmount, onMounted, ref, watch } from 'vue';
 
-import { CODE_NODE_TYPE } from '@/constants';
+import { ASK_AI_EXPERIMENT, CODE_NODE_TYPE } from '@/constants';
 import { codeNodeEditorEventBus } from '@/event-bus';
 import { useRootStore } from '@/stores/root.store';
 import { usePostHog } from '@/stores/posthog.store';
 
 import { useMessage } from '@/composables/useMessage';
+import { useSettingsStore } from '@/stores/settings.store';
 import AskAI from './AskAI/AskAI.vue';
 import { readOnlyEditorExtensions, writableEditorExtensions } from './baseExtensions';
 import { useCompleter } from './completer';
@@ -113,6 +114,7 @@ const { autocompletionExtension } = useCompleter(() => props.mode, editor);
 const { createLinter } = useLinter(() => props.mode, editor);
 
 const rootStore = useRootStore();
+const settingsStore = useSettingsStore();
 const posthog = usePostHog();
 const i18n = useI18n();
 const telemetry = useTelemetry();
@@ -189,7 +191,13 @@ onBeforeUnmount(() => {
 });
 
 const aiEnabled = computed(() => {
-	return posthog.isAiEnabled() && props.language === 'javaScript';
+	const isAiExperimentEnabled = [ASK_AI_EXPERIMENT.gpt3, ASK_AI_EXPERIMENT.gpt4].includes(
+		(posthog.getVariant(ASK_AI_EXPERIMENT.name) ?? '') as string,
+	);
+
+	return (
+		isAiExperimentEnabled && settingsStore.settings.ai.enabled && props.language === 'javaScript'
+	);
 });
 
 const placeholder = computed(() => {
diff --git a/packages/editor-ui/src/components/JsEditor/JsEditor.vue b/packages/editor-ui/src/components/JsEditor/JsEditor.vue
index 5a5f2cb411878..40692ab32392c 100644
--- a/packages/editor-ui/src/components/JsEditor/JsEditor.vue
+++ b/packages/editor-ui/src/components/JsEditor/JsEditor.vue
@@ -1,5 +1,5 @@
 <template>
-	<div :class="$style.editor" :style="isReadOnly ? 'opacity: 0.7' : ''">
+	<div :class="$style.editor">
 		<div ref="jsEditorRef" class="ph-no-capture js-editor"></div>
 		<slot name="suffix" />
 	</div>
@@ -21,7 +21,7 @@ import {
 	keymap,
 	lineNumbers,
 } from '@codemirror/view';
-import { computed, onMounted, ref, watch } from 'vue';
+import { computed, onMounted, ref } from 'vue';
 
 import {
 	autocompleteKeyMap,
@@ -45,37 +45,11 @@ const emit = defineEmits<{
 }>();
 
 onMounted(() => {
-	createEditor();
-});
-
-watch(
-	() => props.modelValue,
-	(newValue: string) => {
-		const editorValue = editor.value?.state?.doc.toString();
-
-		// If model value changes from outside the component
-		if (
-			editorValue !== undefined &&
-			editorValue.length !== newValue.length &&
-			editorValue !== newValue
-		) {
-			destroyEditor();
-			createEditor();
-		}
-	},
-);
-
-function createEditor() {
 	const state = EditorState.create({ doc: props.modelValue, extensions: extensions.value });
 	const parent = jsEditorRef.value;
-
 	editor.value = new EditorView({ parent, state });
 	editorState.value = editor.value.state;
-}
-
-function destroyEditor() {
-	editor.value?.destroy();
-}
+});
 
 const jsEditorRef = ref<HTMLDivElement>();
 const editor = ref<EditorView | null>(null);
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/utils.ts b/packages/editor-ui/src/components/Node/NodeCreator/utils.ts
index 7bacf6b701abf..a76c62a7ca97c 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/utils.ts
+++ b/packages/editor-ui/src/components/Node/NodeCreator/utils.ts
@@ -9,7 +9,6 @@ import type {
 import {
 	AI_CATEGORY_AGENTS,
 	AI_SUBCATEGORY,
-	AI_TRANSFORM_NODE_TYPE,
 	CORE_NODES_CATEGORY,
 	DEFAULT_SUBCATEGORY,
 } from '@/constants';
@@ -20,8 +19,6 @@ import type { NodeViewItemSection } from './viewsData';
 import { i18n } from '@/plugins/i18n';
 import { sortBy } from 'lodash-es';
 
-import { usePostHog } from '@/stores/posthog.store';
-
 export function transformNodeType(
 	node: SimplifiedNodeType,
 	subcategory?: string,
@@ -77,11 +74,6 @@ export function sortNodeCreateElements(nodes: INodeCreateElement[]) {
 }
 
 export function searchNodes(searchFilter: string, items: INodeCreateElement[]) {
-	const aiEnabled = usePostHog().isAiEnabled();
-	if (!aiEnabled) {
-		items = items.filter((item) => item.key !== AI_TRANSFORM_NODE_TYPE);
-	}
-
 	// In order to support the old search we need to remove the 'trigger' part
 	const trimmedFilter = searchFilter.toLowerCase().replace('trigger', '').trimEnd();
 
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/viewsData.ts b/packages/editor-ui/src/components/Node/NodeCreator/viewsData.ts
index 479a85f644739..ba9cb59c3aa05 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/viewsData.ts
+++ b/packages/editor-ui/src/components/Node/NodeCreator/viewsData.ts
@@ -1,5 +1,4 @@
 import {
-	AI_TRANSFORM_NODE_TYPE,
 	CORE_NODES_CATEGORY,
 	WEBHOOK_NODE_TYPE,
 	OTHER_TRIGGER_NODES_SUBCATEGORY,
@@ -64,7 +63,6 @@ import { NodeConnectionType } from 'n8n-workflow';
 import { useTemplatesStore } from '@/stores/templates.store';
 import type { BaseTextKey } from '@/plugins/i18n';
 import { camelCase } from 'lodash-es';
-import { usePostHog } from '@/stores/posthog.store';
 
 export interface NodeViewItemSection {
 	key: string;
@@ -431,13 +429,6 @@ export function TriggerView() {
 export function RegularView(nodes: SimplifiedNodeType[]) {
 	const i18n = useI18n();
 
-	const popularItemsSubcategory = [SET_NODE_TYPE, CODE_NODE_TYPE, DATETIME_NODE_TYPE];
-	const aiEnabled = usePostHog().isAiEnabled();
-
-	if (aiEnabled) {
-		popularItemsSubcategory.push(AI_TRANSFORM_NODE_TYPE);
-	}
-
 	const view: NodeView = {
 		value: REGULAR_NODE_CREATOR_VIEW,
 		title: i18n.baseText('nodeCreator.triggerHelperPanel.whatHappensNext'),
@@ -462,7 +453,7 @@ export function RegularView(nodes: SimplifiedNodeType[]) {
 						{
 							key: 'popular',
 							title: i18n.baseText('nodeCreator.sectionNames.popular'),
-							items: popularItemsSubcategory,
+							items: [SET_NODE_TYPE, CODE_NODE_TYPE, DATETIME_NODE_TYPE],
 						},
 						{
 							key: 'addOrRemove',
diff --git a/packages/editor-ui/src/components/ParameterInput.vue b/packages/editor-ui/src/components/ParameterInput.vue
index 533ad6c49d3cb..b0dabd57708b6 100644
--- a/packages/editor-ui/src/components/ParameterInput.vue
+++ b/packages/editor-ui/src/components/ParameterInput.vue
@@ -136,14 +136,13 @@
 					:model-value="modelValueString"
 					:default-value="parameter.default"
 					:language="editorLanguage"
-					:is-read-only="isReadOnly || editorIsReadOnly"
+					:is-read-only="isReadOnly"
 					:rows="editorRows"
 					:ai-button-enabled="settingsStore.isCloudDeployment"
 					@update:model-value="valueChangedDebounced"
 				>
 					<template #suffix>
 						<n8n-icon
-							v-if="!editorIsReadOnly"
 							data-test-id="code-editor-fullscreen-button"
 							icon="external-link-alt"
 							size="xsmall"
@@ -201,13 +200,12 @@
 					v-else-if="editorType === 'jsEditor'"
 					:key="'js-' + codeEditDialogVisible.toString()"
 					:model-value="modelValueString"
-					:is-read-only="isReadOnly || editorIsReadOnly"
+					:is-read-only="isReadOnly"
 					:rows="editorRows"
 					@update:model-value="valueChangedDebounced"
 				>
 					<template #suffix>
 						<n8n-icon
-							v-if="!editorIsReadOnly"
 							data-test-id="code-editor-fullscreen-button"
 							icon="external-link-alt"
 							size="xsmall"
@@ -863,9 +861,6 @@ const getIssues = computed<string[]>(() => {
 const editorType = computed<EditorType | 'json' | 'code'>(() => {
 	return getArgument<EditorType>('editor');
 });
-const editorIsReadOnly = computed<boolean>(() => {
-	return getArgument<boolean>('editorIsReadOnly') ?? false;
-});
 
 const editorLanguage = computed<CodeNodeEditorLanguage>(() => {
 	if (editorType.value === 'json' || props.parameter.type === 'json')
diff --git a/packages/editor-ui/src/components/ParameterInputList.vue b/packages/editor-ui/src/components/ParameterInputList.vue
index 3e27b8c96cd7b..1ff04da89cbfc 100644
--- a/packages/editor-ui/src/components/ParameterInputList.vue
+++ b/packages/editor-ui/src/components/ParameterInputList.vue
@@ -35,15 +35,14 @@
 				@action="onNoticeAction"
 			/>
 
-			<div v-else-if="parameter.type === 'button'" class="parameter-item">
-				<ButtonParameter
-					:parameter="parameter"
-					:path="path"
-					:value="getParameterValue(parameter.name)"
-					:is-read-only="isReadOnly"
-					@value-changed="valueChanged"
-				/>
-			</div>
+			<n8n-button
+				v-else-if="parameter.type === 'button'"
+				class="parameter-item"
+				block
+				@click="onButtonAction(parameter)"
+			>
+				{{ $locale.nodeText().inputLabelDisplayName(parameter, path) }}
+			</n8n-button>
 
 			<div
 				v-else-if="['collection', 'fixedCollection'].includes(parameter.type)"
@@ -178,7 +177,6 @@ import AssignmentCollection from '@/components/AssignmentCollection/AssignmentCo
 import FilterConditions from '@/components/FilterConditions/FilterConditions.vue';
 import ImportCurlParameter from '@/components/ImportCurlParameter.vue';
 import MultipleParameter from '@/components/MultipleParameter.vue';
-import ButtonParameter from '@/components/ButtonParameter/ButtonParameter.vue';
 import ParameterInputFull from '@/components/ParameterInputFull.vue';
 import ResourceMapper from '@/components/ResourceMapper/ResourceMapper.vue';
 import { useNodeHelpers } from '@/composables/useNodeHelpers';
@@ -485,6 +483,14 @@ function onNoticeAction(action: string) {
  * Handles default node button parameter type actions
  * @param parameter
  */
+function onButtonAction(parameter: INodeProperties) {
+	const action: string | undefined = parameter.typeOptions?.action;
+
+	switch (action) {
+		default:
+			return;
+	}
+}
 
 function shouldHideAuthRelatedParameter(parameter: INodeProperties): boolean {
 	// TODO: For now, hide all fields that are used in authentication fields displayOptions
diff --git a/packages/editor-ui/src/components/__tests__/ButtonParameter.test.ts b/packages/editor-ui/src/components/__tests__/ButtonParameter.test.ts
deleted file mode 100644
index 28e80091e5f19..0000000000000
--- a/packages/editor-ui/src/components/__tests__/ButtonParameter.test.ts
+++ /dev/null
@@ -1,136 +0,0 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { mount } from '@vue/test-utils';
-import { createTestingPinia } from '@pinia/testing';
-import ButtonParameter from '@/components/ButtonParameter/ButtonParameter.vue';
-import { useNDVStore } from '@/stores/ndv.store';
-import { useWorkflowsStore } from '@/stores/workflows.store';
-import { usePostHog } from '@/stores/posthog.store';
-import { useRootStore } from '@/stores/root.store';
-import { useI18n } from '@/composables/useI18n';
-import { useToast } from '@/composables/useToast';
-import type { INodeProperties } from 'n8n-workflow';
-
-vi.mock('@/stores/ndv.store');
-vi.mock('@/stores/workflows.store');
-vi.mock('@/stores/posthog.store');
-vi.mock('@/stores/root.store');
-vi.mock('@/api/ai');
-vi.mock('@/composables/useI18n');
-vi.mock('@/composables/useToast');
-
-describe('ButtonParameter', () => {
-	const defaultProps = {
-		parameter: {
-			name: 'testParam',
-			displayName: 'Test Parameter',
-			type: 'string',
-			default: '',
-			typeOptions: {
-				buttonConfig: {
-					label: 'Generate',
-					action: {
-						type: 'askAiCodeGeneration',
-						target: 'targetParam',
-					},
-					hasInputField: true,
-				},
-			},
-		} as INodeProperties,
-		value: '',
-		path: 'testPath',
-	};
-
-	beforeEach(() => {
-		vi.mocked(useNDVStore).mockReturnValue({
-			ndvInputData: [{}],
-			activeNode: { name: 'TestNode' },
-		} as any);
-
-		vi.mocked(useWorkflowsStore).mockReturnValue({
-			getCurrentWorkflow: vi.fn().mockReturnValue({
-				getParentNodesByDepth: vi.fn().mockReturnValue([]),
-			}),
-			getNodeByName: vi.fn().mockReturnValue({}),
-		} as any);
-
-		vi.mocked(usePostHog).mockReturnValue({
-			isAiEnabled: vi.fn().mockReturnValue(true),
-			getVariant: vi.fn().mockReturnValue('gpt-3.5-turbo-16k'),
-		} as any);
-
-		vi.mocked(useRootStore).mockReturnValue({
-			versionCli: '1.0.0',
-			pushRef: 'testPushRef',
-		} as any);
-
-		vi.mocked(useI18n).mockReturnValue({
-			baseText: vi.fn().mockReturnValue('Mocked Text'),
-			nodeText: () => ({
-				inputLabelDisplayName: vi.fn().mockReturnValue('Mocked Display Name'),
-				inputLabelDescription: vi.fn().mockReturnValue('Mocked Description'),
-			}),
-		} as any);
-
-		vi.mocked(useToast).mockReturnValue({
-			showMessage: vi.fn(),
-		} as any);
-	});
-
-	const mountComponent = (props = defaultProps) => {
-		return mount(ButtonParameter, {
-			props,
-			global: {
-				plugins: [createTestingPinia()],
-			},
-		});
-	};
-
-	it('renders correctly', () => {
-		const wrapper = mountComponent();
-		expect(wrapper.find('textarea').exists()).toBe(true);
-		expect(wrapper.find('button').text()).toBe('Generate');
-	});
-
-	it('emits valueChanged event on input', async () => {
-		const wrapper = mountComponent();
-		const input = wrapper.find('textarea');
-		await input.setValue('Test prompt');
-		expect(wrapper.emitted('valueChanged')).toBeTruthy();
-		expect(wrapper.emitted('valueChanged')![0][0]).toEqual({
-			name: 'testPath.testParam',
-			value: 'Test prompt',
-		});
-	});
-
-	it('disables submit button when there is no execution data', async () => {
-		vi.mocked(useNDVStore).mockReturnValue({
-			ndvInputData: [],
-		} as any);
-		const wrapper = mountComponent();
-		expect(wrapper.find('button').attributes('disabled')).toBeDefined();
-	});
-
-	it('disables submit button when prompt is empty', async () => {
-		const wrapper = mountComponent();
-		expect(wrapper.find('button').attributes('disabled')).toBeDefined();
-	});
-
-	it('enables submit button when there is execution data and prompt', async () => {
-		const wrapper = mountComponent();
-		await wrapper.find('textarea').setValue('Test prompt');
-		expect(wrapper.find('button').attributes('disabled')).toBeUndefined();
-	});
-
-	it('calls onSubmit when button is clicked', async () => {
-		const wrapper = mountComponent();
-		await wrapper.find('textarea').setValue('Test prompt');
-
-		const submitButton = wrapper.find('button');
-		expect(submitButton.attributes('disabled')).toBeUndefined();
-
-		await submitButton.trigger('click');
-
-		expect(useToast().showMessage).toHaveBeenCalled();
-	});
-});
diff --git a/packages/editor-ui/src/constants.ts b/packages/editor-ui/src/constants.ts
index 1878e7e89dec6..be53fcb64a82e 100644
--- a/packages/editor-ui/src/constants.ts
+++ b/packages/editor-ui/src/constants.ts
@@ -191,7 +191,6 @@ export const CHAIN_SUMMARIZATION_LANGCHAIN_NODE_TYPE =
 	'@n8n/n8n-nodes-langchain.chainSummarization';
 export const SIMULATE_NODE_TYPE = 'n8n-nodes-base.simulate';
 export const SIMULATE_TRIGGER_NODE_TYPE = 'n8n-nodes-base.simulateTrigger';
-export const AI_TRANSFORM_NODE_TYPE = 'n8n-nodes-base.aiTransform';
 
 export const CREDENTIAL_ONLY_NODE_PREFIX = 'n8n-creds-base';
 export const CREDENTIAL_ONLY_HTTP_NODE_VERSION = 4.1;
@@ -211,11 +210,7 @@ export const NON_ACTIVATABLE_TRIGGER_NODE_TYPES = [
 	MANUAL_CHAT_TRIGGER_NODE_TYPE,
 ];
 
-export const NODES_USING_CODE_NODE_EDITOR = [
-	CODE_NODE_TYPE,
-	AI_CODE_NODE_TYPE,
-	AI_TRANSFORM_NODE_TYPE,
-];
+export const NODES_USING_CODE_NODE_EDITOR = [CODE_NODE_TYPE, AI_CODE_NODE_TYPE];
 
 export const PIN_DATA_NODE_TYPES_DENYLIST = [SPLIT_IN_BATCHES_NODE_TYPE, STICKY_NODE_TYPE];
 
diff --git a/packages/editor-ui/src/stores/nodeTypes.store.ts b/packages/editor-ui/src/stores/nodeTypes.store.ts
index e8260fdedb8ae..8a5152d30deef 100644
--- a/packages/editor-ui/src/stores/nodeTypes.store.ts
+++ b/packages/editor-ui/src/stores/nodeTypes.store.ts
@@ -303,12 +303,6 @@ export const useNodeTypesStore = defineStore(STORES.NODE_TYPES, () => {
 		}
 	};
 
-	const getNodeParameterActionResult = async (
-		sendData: DynamicNodeParameters.ActionResultRequest,
-	) => {
-		return await nodeTypesApi.getNodeParameterActionResult(rootStore.restApiContext, sendData);
-	};
-
 	// #endregion
 
 	return {
@@ -327,7 +321,6 @@ export const useNodeTypesStore = defineStore(STORES.NODE_TYPES, () => {
 		visibleNodeTypesByInputConnectionTypeNames,
 		isConfigurableNode,
 		getResourceMapperFields,
-		getNodeParameterActionResult,
 		getResourceLocatorResults,
 		getNodeParameterOptions,
 		getNodesInformation,
diff --git a/packages/editor-ui/src/stores/posthog.store.ts b/packages/editor-ui/src/stores/posthog.store.ts
index 6a25ca5520fd9..b3c1f228af184 100644
--- a/packages/editor-ui/src/stores/posthog.store.ts
+++ b/packages/editor-ui/src/stores/posthog.store.ts
@@ -6,11 +6,7 @@ import { useUsersStore } from '@/stores/users.store';
 import { useRootStore } from '@/stores/root.store';
 import { useSettingsStore } from '@/stores/settings.store';
 import type { FeatureFlags, IDataObject } from 'n8n-workflow';
-import {
-	ASK_AI_EXPERIMENT,
-	EXPERIMENTS_TO_TRACK,
-	LOCAL_STORAGE_EXPERIMENT_OVERRIDES,
-} from '@/constants';
+import { EXPERIMENTS_TO_TRACK, LOCAL_STORAGE_EXPERIMENT_OVERRIDES } from '@/constants';
 import { useTelemetryStore } from './telemetry.store';
 import { useDebounce } from '@/composables/useDebounce';
 
@@ -42,14 +38,6 @@ export const usePostHog = defineStore('posthog', () => {
 		return overrides.value[experiment] ?? featureFlags.value?.[experiment];
 	};
 
-	const isAiEnabled = () => {
-		const isAiExperimentEnabled = [ASK_AI_EXPERIMENT.gpt3, ASK_AI_EXPERIMENT.gpt4].includes(
-			(getVariant(ASK_AI_EXPERIMENT.name) ?? '') as string,
-		);
-
-		return isAiExperimentEnabled && settingsStore.settings.ai.enabled;
-	};
-
 	const isVariantEnabled = (experiment: string, variant: string) => {
 		return getVariant(experiment) === variant;
 	};
@@ -195,7 +183,6 @@ export const usePostHog = defineStore('posthog', () => {
 
 	return {
 		init,
-		isAiEnabled,
 		isFeatureEnabled,
 		isVariantEnabled,
 		getVariant,
diff --git a/packages/nodes-base/nodes/AiTransform/AiTransform.node.json b/packages/nodes-base/nodes/AiTransform/AiTransform.node.json
deleted file mode 100644
index 0d13c13877fc5..0000000000000
--- a/packages/nodes-base/nodes/AiTransform/AiTransform.node.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"node": "n8n-nodes-base.aiTransform",
-	"nodeVersion": "1.0",
-	"codexVersion": "1.0",
-	"details": "Modify data by writing a prompt",
-	"categories": ["Development", "Core Nodes"],
-	"resources": {
-		"primaryDocumentation": [
-			{
-				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.aitransform/"
-			}
-		]
-	},
-	"alias": ["code", "Javascript", "JS", "Script", "Custom Code", "Function", "AI", "LLM"],
-	"subcategories": {
-		"Core Nodes": ["Data Transformation"]
-	}
-}
diff --git a/packages/nodes-base/nodes/AiTransform/AiTransform.node.ts b/packages/nodes-base/nodes/AiTransform/AiTransform.node.ts
deleted file mode 100644
index 8c41635555ca3..0000000000000
--- a/packages/nodes-base/nodes/AiTransform/AiTransform.node.ts
+++ /dev/null
@@ -1,148 +0,0 @@
-/* eslint-disable n8n-nodes-base/node-dirname-against-convention */
-import {
-	NodeOperationError,
-	type IExecuteFunctions,
-	type INodeExecutionData,
-	type INodeType,
-	type INodeTypeDescription,
-} from 'n8n-workflow';
-
-import set from 'lodash/set';
-
-import { JavaScriptSandbox } from '../Code/JavaScriptSandbox';
-import { getSandboxContext } from '../Code/Sandbox';
-import { standardizeOutput } from '../Code/utils';
-
-const { CODE_ENABLE_STDOUT } = process.env;
-
-export class AiTransform implements INodeType {
-	description: INodeTypeDescription = {
-		displayName: 'AI Transform',
-		name: 'aiTransform',
-		icon: 'file:aitransform.svg',
-		group: ['transform'],
-		version: 1,
-		description: 'Modify data based on instructions written in plain english',
-		defaults: {
-			name: 'AI Transform',
-		},
-		inputs: ['main'],
-		outputs: ['main'],
-		parameterPane: 'wide',
-		properties: [
-			{
-				displayName: 'Instructions',
-				name: 'generate',
-				type: 'button',
-				default: '',
-				description:
-					"Provide instructions on how you want to transform the data, then click 'Generate code'. Use dot notation to refer to nested fields (e.g. address.street).",
-				placeholder:
-					"Example: Merge 'firstname' and 'lastname' into a field 'details.name' and sort by 'email'",
-				typeOptions: {
-					buttonConfig: {
-						label: 'Generate code',
-						hasInputField: true,
-						inputFieldMaxLength: 500,
-						action: {
-							type: 'askAiCodeGeneration',
-							target: 'jsCode',
-						},
-					},
-				},
-			},
-			{
-				displayName: 'Transformation Code',
-				name: 'jsCode',
-				type: 'string',
-				typeOptions: {
-					editor: 'jsEditor',
-					editorIsReadOnly: true,
-				},
-				default: '',
-				description:
-					'Read-only. To edit this code, adjust the prompt or copy and paste it into a Code node.',
-				noDataExpression: true,
-			},
-			{
-				displayName:
-					"Click on 'Test step' to run the transformation code. Further executions will use the generated code (and not invoke AI again).",
-				name: 'hint',
-				type: 'notice',
-				default: '',
-				displayOptions: {
-					show: {
-						jsCode: [{ _cnd: { exists: true } }],
-					},
-				},
-			},
-		],
-	};
-
-	async execute(this: IExecuteFunctions) {
-		const workflowMode = this.getMode();
-
-		const node = this.getNode();
-
-		const codeParameterName = 'jsCode';
-
-		const getSandbox = (index = 0) => {
-			let code = '';
-			try {
-				code = this.getNodeParameter(codeParameterName, index) as string;
-
-				if (!code) {
-					const instructions = this.getNodeParameter('generate', index) as string;
-					if (!instructions) {
-						throw new NodeOperationError(node, 'Missing instructions to generate code', {
-							description:
-								"Enter your prompt in the 'Instructions' parameter and click 'Generate code'",
-						});
-					}
-					throw new NodeOperationError(node, 'Missing code for data transformation', {
-						description: "Click the 'Generate code' button to create the code",
-					});
-				}
-			} catch (error) {
-				if (error instanceof NodeOperationError) throw error;
-
-				throw new NodeOperationError(node, error);
-			}
-
-			const context = getSandboxContext.call(this, index);
-
-			context.items = context.$input.all();
-
-			const Sandbox = JavaScriptSandbox;
-			const sandbox = new Sandbox(context, code, index, this.helpers);
-			sandbox.on(
-				'output',
-				workflowMode === 'manual'
-					? this.sendMessageToUI
-					: CODE_ENABLE_STDOUT === 'true'
-						? (...args) =>
-								console.log(`[Workflow "${this.getWorkflow().id}"][Node "${node.name}"]`, ...args)
-						: () => {},
-			);
-			return sandbox;
-		};
-
-		const sandbox = getSandbox();
-		let items: INodeExecutionData[];
-		try {
-			items = (await sandbox.runCodeAllItems()) as INodeExecutionData[];
-		} catch (error) {
-			if (!this.continueOnFail(error)) {
-				set(error, 'node', node);
-				throw error;
-			}
-			items = [{ json: { error: error.message } }];
-		}
-
-		for (const item of items) {
-			standardizeOutput(item.json);
-		}
-
-		return [items];
-	}
-}
diff --git a/packages/nodes-base/nodes/AiTransform/aitransform.svg b/packages/nodes-base/nodes/AiTransform/aitransform.svg
deleted file mode 100644
index 699be8f28ed8e..0000000000000
--- a/packages/nodes-base/nodes/AiTransform/aitransform.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M39.4956 19.5195L34.8 18.006C31.7965 17.015 30.0369 14.5846 29.2111 11.5306L27.1447 1.46518C27.0908 1.2663 26.9593 1 26.5548 1C26.2144 1 26.0188 1.2663 25.9649 1.46518L23.8986 11.534C23.0693 14.588 21.3131 17.0184 18.3097 18.0094L13.6141 19.5229C12.95 19.7386 12.9399 20.6757 13.6006 20.9016L18.3299 22.5297C21.3232 23.5241 23.0693 25.9512 23.8986 28.9917L25.9683 38.9458C26.0222 39.1447 26.1335 39.502 26.5582 39.502C26.9977 39.502 27.0906 39.1585 27.1449 38.9577L27.1481 38.9458L29.2178 28.9917C30.047 25.9478 31.7931 23.5208 34.7865 22.5297L39.5158 20.9016C40.1697 20.6724 40.1596 19.7353 39.4956 19.5195ZM12.6028 28.277C9.82036 27.3584 9.54358 26.324 9.07959 24.5899L9.06681 24.5421L7.89038 20.4162C7.81959 20.1499 7.12519 20.1499 7.05103 20.4162L6.25214 24.2286C5.77684 25.9848 4.76558 27.3804 3.0397 27.9501L0.289074 29.1433C-0.0918337 29.2681 -0.0985755 29.8074 0.282332 29.9355L3.05318 30.9164C4.77233 31.4861 5.77684 32.8816 6.25551 34.6311L7.0544 38.2784C7.12856 38.5447 7.81959 38.5447 7.89038 38.2784L8.82748 34.648C9.30277 32.8884 10.0309 31.4895 12.3669 30.9164L14.9692 29.9355C15.3501 29.804 15.3467 29.2647 14.9625 29.14L12.6028 28.277ZM13.3255 2.03231C13.4169 1.65456 13.954 1.64852 14.0473 2.02833L14.0475 2.02889L15.0714 6.25591C15.2111 6.74054 15.5906 7.11618 16.0783 7.2487L18.6822 7.95026C19.0346 8.04918 19.0457 8.54279 18.7009 8.65979L18.7004 8.65996L15.97 9.57684C15.531 9.72415 15.1905 10.0756 15.0538 10.5179L14.0473 14.4327L14.0471 14.4337C13.9524 14.8153 13.4207 14.7996 13.3291 14.4333L12.3559 10.5303C12.2222 10.0878 11.8845 9.73333 11.4489 9.58314L8.72013 8.63869C8.37299 8.51471 8.40082 8.02141 8.75078 7.92932L8.75135 7.92917L11.3368 7.25837C11.8372 7.12876 12.2283 6.74382 12.3616 6.24505L13.3255 2.03231Z" fill="url(#paint0_linear_1373_20357)"/>
-<defs>
-<linearGradient id="paint0_linear_1373_20357" x1="0" y1="1" x2="47.0035" y2="13.8158" gradientUnits="userSpaceOnUse">
-<stop stop-color="#5B60E8"/>
-<stop offset="0.5" stop-color="#AA7BEC"/>
-<stop offset="1" stop-color="#EC7B8E"/>
-</linearGradient>
-</defs>
-</svg>
diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index a0d1fef217b68..cadf8adc322cc 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -390,7 +390,6 @@
       "dist/nodes/AgileCrm/AgileCrm.node.js",
       "dist/nodes/Airtable/Airtable.node.js",
       "dist/nodes/Airtable/AirtableTrigger.node.js",
-      "dist/nodes/AiTransform/AiTransform.node.js",
       "dist/nodes/Amqp/Amqp.node.js",
       "dist/nodes/Amqp/AmqpTrigger.node.js",
       "dist/nodes/ApiTemplateIo/ApiTemplateIo.node.js",
diff --git a/packages/workflow/src/Interfaces.ts b/packages/workflow/src/Interfaces.ts
index eb6c3ca07c3d4..91e7545c037cd 100644
--- a/packages/workflow/src/Interfaces.ts
+++ b/packages/workflow/src/Interfaces.ts
@@ -1229,25 +1229,12 @@ export interface ILoadOptions {
 	};
 }
 
-export type NodePropertyAction = {
-	type: 'askAiCodeGeneration';
-	handler?: string;
-	target?: string;
-};
-
 export interface INodePropertyTypeOptions {
-	// Supported by: button
-	buttonConfig?: {
-		action?: string | NodePropertyAction;
-		label?: string; // otherwise "displayName" is used
-		hasInputField?: boolean;
-		inputFieldMaxLength?: number; // Supported if hasInputField is true
-	};
+	action?: string; // Supported by: button
 	containerClass?: string; // Supported by: notice
 	alwaysOpenEditWindow?: boolean; // Supported by: json
 	codeAutocomplete?: CodeAutocompleteTypes; // Supported by: string
 	editor?: EditorType; // Supported by: string
-	editorIsReadOnly?: boolean; // Supported by: string
 	sqlDialect?: SQLDialect; // Supported by: sqlEditor
 	loadOptionsDependsOn?: string[]; // Supported by: options
 	loadOptionsMethod?: string; // Supported by: options
@@ -1539,12 +1526,6 @@ export interface INodeType {
 		resourceMapping?: {
 			[functionName: string]: (this: ILoadOptionsFunctions) => Promise<ResourceMapperFields>;
 		};
-		actionHandler?: {
-			[functionName: string]: (
-				this: ILoadOptionsFunctions,
-				payload: IDataObject | string | undefined,
-			) => Promise<NodeParameterValueType>;
-		};
 	};
 	webhookMethods?: {
 		[name in IWebhookDescription['name']]?: {

From e4c88e75f9d6a28d84489e298fe65e3b2fac5375 Mon Sep 17 00:00:00 2001
From: Tomi Turtiainen <10324676+tomi@users.noreply.github.com>
Date: Wed, 14 Aug 2024 15:00:38 +0300
Subject: [PATCH 158/168] refactor(editor): Use form event bus everywhere
 (no-changelog) (#10394)

---
 packages/editor-ui/src/components/ChangePasswordModal.vue     | 4 ++--
 packages/editor-ui/src/components/InviteUsersModal.vue        | 4 ++--
 packages/editor-ui/src/components/PersonalizationModal.vue    | 4 ++--
 .../src/components/PromptMfaCodeModal/PromptMfaCodeModal.vue  | 4 ++--
 packages/editor-ui/src/views/SettingsLdapView.vue             | 4 ++--
 packages/editor-ui/src/views/SettingsPersonalView.vue         | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/editor-ui/src/components/ChangePasswordModal.vue b/packages/editor-ui/src/components/ChangePasswordModal.vue
index 24de3b5dfb18c..dc6ace63edcb6 100644
--- a/packages/editor-ui/src/components/ChangePasswordModal.vue
+++ b/packages/editor-ui/src/components/ChangePasswordModal.vue
@@ -34,12 +34,12 @@ 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 { createEventBus } from 'n8n-design-system/utils';
+import { createFormEventBus, createEventBus } from 'n8n-design-system/utils';
 import type { IFormInputs, IFormInput } from '@/Interface';
 import { useI18n } from '@/composables/useI18n';
 
 const config = ref<IFormInputs | null>(null);
-const formBus = createEventBus();
+const formBus = createFormEventBus();
 const modalBus = createEventBus();
 const password = ref('');
 const loading = ref(false);
diff --git a/packages/editor-ui/src/components/InviteUsersModal.vue b/packages/editor-ui/src/components/InviteUsersModal.vue
index dab656c95364f..fd9c70443c15c 100644
--- a/packages/editor-ui/src/components/InviteUsersModal.vue
+++ b/packages/editor-ui/src/components/InviteUsersModal.vue
@@ -75,7 +75,7 @@ import {
 import { useUsersStore } from '@/stores/users.store';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useUIStore } from '@/stores/ui.store';
-import { createEventBus } from 'n8n-design-system/utils';
+import { createFormEventBus, createEventBus } from 'n8n-design-system/utils';
 import { useClipboard } from '@/composables/useClipboard';
 
 const NAME_EMAIL_FORMAT_REGEX = /^.* <(.*)>$/;
@@ -110,7 +110,7 @@ export default defineComponent({
 	data() {
 		return {
 			config: null as IFormInputs | null,
-			formBus: createEventBus(),
+			formBus: createFormEventBus(),
 			modalBus: createEventBus(),
 			emails: '',
 			role: ROLE.Member as InvitableRoleName,
diff --git a/packages/editor-ui/src/components/PersonalizationModal.vue b/packages/editor-ui/src/components/PersonalizationModal.vue
index a96ce34fb4e52..ce0c263dbde86 100644
--- a/packages/editor-ui/src/components/PersonalizationModal.vue
+++ b/packages/editor-ui/src/components/PersonalizationModal.vue
@@ -144,7 +144,7 @@ import { useUIStore } from '@/stores/ui.store';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useRootStore } from '@/stores/root.store';
 import { useUsersStore } from '@/stores/users.store';
-import { createEventBus } from 'n8n-design-system/utils';
+import { createEventBus, createFormEventBus } from 'n8n-design-system/utils';
 import { usePostHog } from '@/stores/posthog.store';
 import { useExternalHooks } from '@/composables/useExternalHooks';
 import { useUsageStore } from '@/stores/usage.store';
@@ -180,7 +180,7 @@ export default defineComponent({
 			showAllIndustryQuestions: true,
 			registerForEnterpriseTrial: false,
 			modalBus: createEventBus(),
-			formBus: createEventBus(),
+			formBus: createFormEventBus(),
 			domainBlocklist: [] as string[],
 		};
 	},
diff --git a/packages/editor-ui/src/components/PromptMfaCodeModal/PromptMfaCodeModal.vue b/packages/editor-ui/src/components/PromptMfaCodeModal/PromptMfaCodeModal.vue
index 6580fc2d66b95..a40343a8bb537 100644
--- a/packages/editor-ui/src/components/PromptMfaCodeModal/PromptMfaCodeModal.vue
+++ b/packages/editor-ui/src/components/PromptMfaCodeModal/PromptMfaCodeModal.vue
@@ -45,7 +45,7 @@ import { createFormEventBus } from 'n8n-design-system';
 
 const i18n = useI18n();
 
-const formBus = ref(createFormEventBus());
+const formBus = createFormEventBus();
 const readyToSubmit = ref(false);
 
 const formFields: IFormInputs = [
@@ -69,7 +69,7 @@ function onSubmit(values: { mfaCode: string }) {
 }
 
 function onClickSave() {
-	formBus.value.emit('submit');
+	formBus.emit('submit');
 }
 
 function onFormReady(isReady: boolean) {
diff --git a/packages/editor-ui/src/views/SettingsLdapView.vue b/packages/editor-ui/src/views/SettingsLdapView.vue
index 775967bb72e36..bdfd8247696b9 100644
--- a/packages/editor-ui/src/views/SettingsLdapView.vue
+++ b/packages/editor-ui/src/views/SettingsLdapView.vue
@@ -157,7 +157,7 @@ import { mapStores } from 'pinia';
 import { useUsersStore } from '@/stores/users.store';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useUIStore } from '@/stores/ui.store';
-import { createEventBus } from 'n8n-design-system/utils';
+import { createFormEventBus } from 'n8n-design-system/utils';
 import type { TableColumnCtx } from 'element-plus';
 
 type TableRow = {
@@ -222,7 +222,7 @@ export default defineComponent({
 			loadingTable: false,
 			hasAnyChanges: false,
 			formInputs: null as null | IFormInputs,
-			formBus: createEventBus(),
+			formBus: createFormEventBus(),
 			readyToSubmit: false,
 			page: 0,
 			loginEnabled: false,
diff --git a/packages/editor-ui/src/views/SettingsPersonalView.vue b/packages/editor-ui/src/views/SettingsPersonalView.vue
index 9f0146ef3cdfb..08cc4ed12896a 100644
--- a/packages/editor-ui/src/views/SettingsPersonalView.vue
+++ b/packages/editor-ui/src/views/SettingsPersonalView.vue
@@ -21,7 +21,7 @@ const { showToast, showError } = useToast();
 
 const hasAnyBasicInfoChanges = ref<boolean>(false);
 const formInputs = ref<null | IFormInputs>(null);
-const formBus = ref(createFormEventBus());
+const formBus = createFormEventBus();
 const readyToSubmit = ref(false);
 const currentSelectedTheme = ref(useUIStore().theme);
 const themeOptions = ref<Array<{ name: ThemeOption; label: string }>>([
@@ -151,7 +151,7 @@ async function updatePersonalisationSettings() {
 	uiStore.setTheme(currentSelectedTheme.value);
 }
 function onSaveClick() {
-	formBus.value.emit('submit');
+	formBus.emit('submit');
 }
 function openPasswordModal() {
 	uiStore.openModal(CHANGE_PASSWORD_MODAL_KEY);

From 5ed2a77740db1f02b27c571f4dfdfa206ebdb19c Mon Sep 17 00:00:00 2001
From: Mutasem Aldmour <4711238+mutdmour@users.noreply.github.com>
Date: Wed, 14 Aug 2024 14:59:11 +0200
Subject: [PATCH 159/168] feat: Add Ask assistant behind feature flag (#9995)

Co-authored-by: Ricardo Espinoza <ricardo@n8n.io>
Co-authored-by: Milorad Filipovic <milorad@n8n.io>
---
 cypress/e2e/19-execution.cy.ts                |   1 -
 packages/cli/package.json                     |   1 +
 packages/cli/src/License.ts                   |   4 +
 packages/cli/src/Server.ts                    |   1 +
 packages/cli/src/config/schema.ts             |   9 +
 packages/cli/src/constants.ts                 |   1 +
 .../src/controllers/aiAssistant.controller.ts |  44 ++
 .../cli/src/controllers/e2e.controller.ts     |   1 +
 packages/cli/src/requests.ts                  |  12 +
 .../cli/src/services/aiAsisstant.service.ts   |  54 ++
 packages/cli/src/services/frontend.service.ts |   8 +
 packages/design-system/package.json           |   1 +
 .../AssistantAvatar.stories.ts                |  25 +
 .../AskAssistantAvatar/AssistantAvatar.vue    |  33 ++
 .../AskAssistantButton.stories.ts             |  31 +
 .../AskAssistantButton/AskAssistantButton.vue |  95 +++
 .../AskAssistantChat.stories.ts               | 240 ++++++++
 .../AskAssistantChat/AskAssistantChat.vue     | 471 +++++++++++++++
 .../AskAssistantIcon/AssistantIcon.stories.ts |  49 ++
 .../AskAssistantIcon/AssistantIcon.vue        |  59 ++
 .../AskAssistantText/AssistantText.stories.ts |  40 ++
 .../AskAssistantText/AssistantText.vue        |  40 ++
 .../src/components/BetaTag/BetaTag.stories.ts |  19 +
 .../src/components/BetaTag/BetaTag.vue        |  22 +
 .../BlinkingCursor/BlinkingCursor.stories.ts  |  19 +
 .../BlinkingCursor/BlinkingCursor.vue         |  25 +
 .../components/CodeDiff/CodeDiff.stories.ts   |  96 +++
 .../src/components/CodeDiff/CodeDiff.vue      | 207 +++++++
 .../InlineAskAssistantButton.stories.ts       |  36 ++
 .../InlineAskAssistantButton.vue              | 125 ++++
 .../src/components/N8nAvatar/Avatar.vue       |  18 +-
 .../src/components/N8nButton/Button.vue       |   6 +-
 .../src/components/N8nSpinner/Spinner.vue     |   3 +-
 .../design-system/src/css/_primitives.scss    |   2 +
 .../design-system/src/css/_tokens.dark.scss   |  25 +-
 packages/design-system/src/css/_tokens.scss   |  33 ++
 .../design-system/src/css/notification.scss   |   4 +
 packages/design-system/src/locale/lang/en.ts  |  23 +
 packages/design-system/src/types/assistant.ts |  69 +++
 packages/design-system/src/types/button.ts    |   2 +-
 packages/editor-ui/src/App.vue                |  20 +-
 packages/editor-ui/src/__tests__/defaults.ts  |   3 +
 packages/editor-ui/src/api/assistant.ts       |  25 +
 .../AskAssistant/AskAssistantChat.vue         | 105 ++++
 .../AskAssistantFloatingButton.vue            |  98 ++++
 .../AskAssistant/NewAssistantSessionModal.vue |  98 ++++
 .../src/components/CanvasControls.vue         |   4 +-
 .../CodeNodeEditor/CodeNodeEditor.vue         |  45 ++
 .../src/components/Error/NodeErrorView.vue    | 114 +++-
 packages/editor-ui/src/components/Modals.vue  |   7 +
 .../src/components/Node/NodeCreation.vue      |  19 +-
 .../Node/NodeCreator/NodeCreator.vue          |   5 +-
 .../editor-ui/src/components/NodeSettings.vue |   3 +
 .../src/components/banners/BaseBanner.vue     |   5 +
 .../__snapshots__/V1Banner.spec.ts.snap       |   4 +-
 .../src/composables/usePushConnection.ts      |   3 +
 .../editor-ui/src/composables/useToast.ts     |   8 +-
 packages/editor-ui/src/constants.ts           |  10 +-
 .../src/plugins/i18n/locales/en.json          |  10 +
 .../editor-ui/src/plugins/icons/custom.ts     |  13 +
 packages/editor-ui/src/plugins/icons/index.ts |   5 +-
 .../editor-ui/src/stores/assistant.store.ts   | 554 ++++++++++++++++++
 .../editor-ui/src/stores/settings.store.ts    |   3 +
 packages/editor-ui/src/stores/ui.store.ts     |   2 +
 .../editor-ui/src/types/assistant.types.ts    | 123 ++++
 packages/editor-ui/src/utils/apiUtils.ts      |  63 +-
 .../editor-ui/src/utils/nodeTypesUtils.ts     | 102 ++++
 packages/editor-ui/src/views/NodeView.vue     |   2 +-
 packages/workflow/src/Interfaces.ts           |   3 +
 pnpm-lock.yaml                                |  64 +-
 70 files changed, 3414 insertions(+), 60 deletions(-)
 create mode 100644 packages/cli/src/controllers/aiAssistant.controller.ts
 create mode 100644 packages/cli/src/services/aiAsisstant.service.ts
 create mode 100644 packages/design-system/src/components/AskAssistantAvatar/AssistantAvatar.stories.ts
 create mode 100644 packages/design-system/src/components/AskAssistantAvatar/AssistantAvatar.vue
 create mode 100644 packages/design-system/src/components/AskAssistantButton/AskAssistantButton.stories.ts
 create mode 100644 packages/design-system/src/components/AskAssistantButton/AskAssistantButton.vue
 create mode 100644 packages/design-system/src/components/AskAssistantChat/AskAssistantChat.stories.ts
 create mode 100644 packages/design-system/src/components/AskAssistantChat/AskAssistantChat.vue
 create mode 100644 packages/design-system/src/components/AskAssistantIcon/AssistantIcon.stories.ts
 create mode 100644 packages/design-system/src/components/AskAssistantIcon/AssistantIcon.vue
 create mode 100644 packages/design-system/src/components/AskAssistantText/AssistantText.stories.ts
 create mode 100644 packages/design-system/src/components/AskAssistantText/AssistantText.vue
 create mode 100644 packages/design-system/src/components/BetaTag/BetaTag.stories.ts
 create mode 100644 packages/design-system/src/components/BetaTag/BetaTag.vue
 create mode 100644 packages/design-system/src/components/BlinkingCursor/BlinkingCursor.stories.ts
 create mode 100644 packages/design-system/src/components/BlinkingCursor/BlinkingCursor.vue
 create mode 100644 packages/design-system/src/components/CodeDiff/CodeDiff.stories.ts
 create mode 100644 packages/design-system/src/components/CodeDiff/CodeDiff.vue
 create mode 100644 packages/design-system/src/components/InlineAskAssistantButton/InlineAskAssistantButton.stories.ts
 create mode 100644 packages/design-system/src/components/InlineAskAssistantButton/InlineAskAssistantButton.vue
 create mode 100644 packages/design-system/src/types/assistant.ts
 create mode 100644 packages/editor-ui/src/api/assistant.ts
 create mode 100644 packages/editor-ui/src/components/AskAssistant/AskAssistantChat.vue
 create mode 100644 packages/editor-ui/src/components/AskAssistant/AskAssistantFloatingButton.vue
 create mode 100644 packages/editor-ui/src/components/AskAssistant/NewAssistantSessionModal.vue
 create mode 100644 packages/editor-ui/src/stores/assistant.store.ts
 create mode 100644 packages/editor-ui/src/types/assistant.types.ts

diff --git a/cypress/e2e/19-execution.cy.ts b/cypress/e2e/19-execution.cy.ts
index 804e81d4e605b..1f7d5c332eb50 100644
--- a/cypress/e2e/19-execution.cy.ts
+++ b/cypress/e2e/19-execution.cy.ts
@@ -275,7 +275,6 @@ describe('Execution', () => {
 			.within(() => cy.get('.fa-check').should('not.exist'));
 
 		successToast().should('be.visible');
-		clearNotifications();
 
 		// Clear execution data
 		workflowPage.getters.clearExecutionDataButton().should('be.visible');
diff --git a/packages/cli/package.json b/packages/cli/package.json
index d0f1fc34c3f83..8387f0ba41521 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -90,6 +90,7 @@
     "@n8n/n8n-nodes-langchain": "workspace:*",
     "@n8n/permissions": "workspace:*",
     "@n8n/typeorm": "0.3.20-10",
+    "@n8n_io/ai-assistant-sdk": "1.9.4",
     "@n8n_io/license-sdk": "2.13.0",
     "@oclif/core": "4.0.7",
     "@rudderstack/rudder-sdk-node": "2.0.7",
diff --git a/packages/cli/src/License.ts b/packages/cli/src/License.ts
index fc0d2cd45a235..8a5ed18e5808e 100644
--- a/packages/cli/src/License.ts
+++ b/packages/cli/src/License.ts
@@ -249,6 +249,10 @@ export class License {
 		return this.isFeatureEnabled(LICENSE_FEATURES.SAML);
 	}
 
+	isAiAssistantEnabled() {
+		return this.isFeatureEnabled(LICENSE_FEATURES.AI_ASSISTANT);
+	}
+
 	isAdvancedExecutionFiltersEnabled() {
 		return this.isFeatureEnabled(LICENSE_FEATURES.ADVANCED_EXECUTION_FILTERS);
 	}
diff --git a/packages/cli/src/Server.ts b/packages/cli/src/Server.ts
index 777472b99fa42..49b358f0f254c 100644
--- a/packages/cli/src/Server.ts
+++ b/packages/cli/src/Server.ts
@@ -41,6 +41,7 @@ import '@/controllers/activeWorkflows.controller';
 import '@/controllers/auth.controller';
 import '@/controllers/binaryData.controller';
 import '@/controllers/curl.controller';
+import '@/controllers/aiAssistant.controller';
 import '@/controllers/dynamicNodeParameters.controller';
 import '@/controllers/invitation.controller';
 import '@/controllers/me.controller';
diff --git a/packages/cli/src/config/schema.ts b/packages/cli/src/config/schema.ts
index a0db9a4c36d16..d3334d4ab1c57 100644
--- a/packages/cli/src/config/schema.ts
+++ b/packages/cli/src/config/schema.ts
@@ -569,6 +569,15 @@ export const schema = {
 		},
 	},
 
+	aiAssistant: {
+		baseUrl: {
+			doc: 'Base URL of the AI assistant service',
+			format: String,
+			default: '',
+			env: 'N8N_AI_ASSISTANT_BASE_URL',
+		},
+	},
+
 	expression: {
 		evaluator: {
 			doc: 'Expression evaluator to use',
diff --git a/packages/cli/src/constants.ts b/packages/cli/src/constants.ts
index dfb072576aa9f..045d5a30e1cba 100644
--- a/packages/cli/src/constants.ts
+++ b/packages/cli/src/constants.ts
@@ -90,6 +90,7 @@ export const LICENSE_FEATURES = {
 	PROJECT_ROLE_ADMIN: 'feat:projectRole:admin',
 	PROJECT_ROLE_EDITOR: 'feat:projectRole:editor',
 	PROJECT_ROLE_VIEWER: 'feat:projectRole:viewer',
+	AI_ASSISTANT: 'feat:aiAssistant',
 	COMMUNITY_NODES_CUSTOM_REGISTRY: 'feat:communityNodes:customRegistry',
 } as const;
 
diff --git a/packages/cli/src/controllers/aiAssistant.controller.ts b/packages/cli/src/controllers/aiAssistant.controller.ts
new file mode 100644
index 0000000000000..473c20a79dcad
--- /dev/null
+++ b/packages/cli/src/controllers/aiAssistant.controller.ts
@@ -0,0 +1,44 @@
+import { Post, RestController } from '@/decorators';
+import { AiAssistantService } from '@/services/aiAsisstant.service';
+import { AiAssistantRequest } from '@/requests';
+import { Response } from 'express';
+import type { AiAssistantSDK } from '@n8n_io/ai-assistant-sdk';
+import { Readable, promises } from 'node:stream';
+import { InternalServerError } from 'express-openapi-validator/dist/openapi.validator';
+import { strict as assert } from 'node:assert';
+import { ErrorReporterProxy } from 'n8n-workflow';
+
+@RestController('/ai-assistant')
+export class AiAssistantController {
+	constructor(private readonly aiAssistantService: AiAssistantService) {}
+
+	@Post('/chat', { rateLimit: { limit: 100 } })
+	async chat(req: AiAssistantRequest.Chat, res: Response) {
+		try {
+			const stream = await this.aiAssistantService.chat(req.body, req.user);
+
+			if (stream.body) {
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+				await promises.pipeline(Readable.fromWeb(stream.body), res);
+			}
+		} catch (e) {
+			// todo add sentry reporting
+			assert(e instanceof Error);
+			ErrorReporterProxy.error(e);
+			throw new InternalServerError({ message: `Something went wrong: ${e.message}` });
+		}
+	}
+
+	@Post('/chat/apply-suggestion')
+	async applySuggestion(
+		req: AiAssistantRequest.ApplySuggestion,
+	): Promise<AiAssistantSDK.ApplySuggestionResponse> {
+		try {
+			return await this.aiAssistantService.applySuggestion(req.body, req.user);
+		} catch (e) {
+			assert(e instanceof Error);
+			ErrorReporterProxy.error(e);
+			throw new InternalServerError({ message: `Something went wrong: ${e.message}` });
+		}
+	}
+}
diff --git a/packages/cli/src/controllers/e2e.controller.ts b/packages/cli/src/controllers/e2e.controller.ts
index 20224795052e8..2a93fe8edac16 100644
--- a/packages/cli/src/controllers/e2e.controller.ts
+++ b/packages/cli/src/controllers/e2e.controller.ts
@@ -87,6 +87,7 @@ export class E2EController {
 		[LICENSE_FEATURES.PROJECT_ROLE_ADMIN]: false,
 		[LICENSE_FEATURES.PROJECT_ROLE_EDITOR]: false,
 		[LICENSE_FEATURES.PROJECT_ROLE_VIEWER]: false,
+		[LICENSE_FEATURES.AI_ASSISTANT]: false,
 		[LICENSE_FEATURES.COMMUNITY_NODES_CUSTOM_REGISTRY]: false,
 	};
 
diff --git a/packages/cli/src/requests.ts b/packages/cli/src/requests.ts
index 45ee15b76326e..82cf7da30aeb2 100644
--- a/packages/cli/src/requests.ts
+++ b/packages/cli/src/requests.ts
@@ -25,6 +25,7 @@ import type { Project, ProjectType } from '@db/entities/Project';
 import type { ProjectRole } from './databases/entities/ProjectRelation';
 import type { Scope } from '@n8n/permissions';
 import type { ScopesField } from './services/role.service';
+import type { AiAssistantSDK } from '@n8n_io/ai-assistant-sdk';
 
 export class UserUpdatePayload implements Pick<User, 'email' | 'firstName' | 'lastName'> {
 	@Expose()
@@ -601,3 +602,14 @@ export declare namespace NpsSurveyRequest {
 	// once some schema validation is added
 	type NpsSurveyUpdate = AuthenticatedRequest<{}, {}, unknown>;
 }
+
+// ----------------------------------
+//             /ai-assistant
+// ----------------------------------
+
+export declare namespace AiAssistantRequest {
+	type Chat = AuthenticatedRequest<{}, {}, AiAssistantSDK.ChatRequestPayload>;
+
+	type SuggestionPayload = { sessionId: string; suggestionId: string };
+	type ApplySuggestion = AuthenticatedRequest<{}, {}, SuggestionPayload>;
+}
diff --git a/packages/cli/src/services/aiAsisstant.service.ts b/packages/cli/src/services/aiAsisstant.service.ts
new file mode 100644
index 0000000000000..39a2d950ef1b6
--- /dev/null
+++ b/packages/cli/src/services/aiAsisstant.service.ts
@@ -0,0 +1,54 @@
+import { Service } from 'typedi';
+import type { AiAssistantSDK } from '@n8n_io/ai-assistant-sdk';
+import { AiAssistantClient } from '@n8n_io/ai-assistant-sdk';
+import { assert, type IUser } from 'n8n-workflow';
+import { License } from '../License';
+import { N8N_VERSION } from '../constants';
+import config from '@/config';
+import type { AiAssistantRequest } from '@/requests';
+import type { Response } from 'undici';
+
+@Service()
+export class AiAssistantService {
+	private client: AiAssistantClient | undefined;
+
+	constructor(private readonly licenseService: License) {}
+
+	async init() {
+		const aiAssistantEnabled = this.licenseService.isAiAssistantEnabled();
+		if (!aiAssistantEnabled) {
+			return;
+		}
+
+		const licenseCert = await this.licenseService.loadCertStr();
+		const consumerId = this.licenseService.getConsumerId();
+		const baseUrl = config.get('aiAssistant.baseUrl');
+		const logLevel = config.getEnv('logs.level');
+
+		this.client = new AiAssistantClient({
+			licenseCert,
+			consumerId,
+			n8nVersion: N8N_VERSION,
+			baseUrl,
+			logLevel,
+		});
+	}
+
+	async chat(payload: AiAssistantSDK.ChatRequestPayload, user: IUser): Promise<Response> {
+		if (!this.client) {
+			await this.init();
+		}
+		assert(this.client, 'Assistant client not setup');
+
+		return await this.client.chat(payload, { id: user.id });
+	}
+
+	async applySuggestion(payload: AiAssistantRequest.SuggestionPayload, user: IUser) {
+		if (!this.client) {
+			await this.init();
+		}
+		assert(this.client, 'Assistant client not setup');
+
+		return await this.client.applySuggestion(payload, { id: user.id });
+	}
+}
diff --git a/packages/cli/src/services/frontend.service.ts b/packages/cli/src/services/frontend.service.ts
index fc38eb992e154..de0abdbfbbe37 100644
--- a/packages/cli/src/services/frontend.service.ts
+++ b/packages/cli/src/services/frontend.service.ts
@@ -160,6 +160,9 @@ export class FrontendService {
 			workflowTagsDisabled: config.getEnv('workflowTagsDisabled'),
 			logLevel: config.getEnv('logs.level'),
 			hiringBannerEnabled: config.getEnv('hiringBanner.enabled'),
+			aiAssistant: {
+				enabled: false,
+			},
 			templates: {
 				enabled: this.globalConfig.templates.enabled,
 				host: this.globalConfig.templates.host,
@@ -279,6 +282,7 @@ export class FrontendService {
 		const isS3Selected = config.getEnv('binaryDataManager.mode') === 's3';
 		const isS3Available = config.getEnv('binaryDataManager.availableModes').includes('s3');
 		const isS3Licensed = this.license.isBinaryDataS3Licensed();
+		const isAiAssistantEnabled = this.license.isAiAssistantEnabled();
 
 		this.settings.license.planName = this.license.getPlanName();
 		this.settings.license.consumerId = this.license.getConsumerId();
@@ -331,6 +335,10 @@ export class FrontendService {
 			this.settings.missingPackages = this.communityPackagesService.hasMissingPackages;
 		}
 
+		if (isAiAssistantEnabled) {
+			this.settings.aiAssistant.enabled = isAiAssistantEnabled;
+		}
+
 		this.settings.mfa.enabled = config.get('mfa.enabled');
 
 		this.settings.executionMode = config.getEnv('executions.mode');
diff --git a/packages/design-system/package.json b/packages/design-system/package.json
index 055874a28ac37..acb03f958b602 100644
--- a/packages/design-system/package.json
+++ b/packages/design-system/package.json
@@ -49,6 +49,7 @@
     "markdown-it-emoji": "^2.0.2",
     "markdown-it-link-attributes": "^4.0.1",
     "markdown-it-task-lists": "^2.1.1",
+    "parse-diff": "^0.11.1",
     "sanitize-html": "2.12.1",
     "vue": "catalog:frontend",
     "vue-boring-avatars": "^1.3.0",
diff --git a/packages/design-system/src/components/AskAssistantAvatar/AssistantAvatar.stories.ts b/packages/design-system/src/components/AskAssistantAvatar/AssistantAvatar.stories.ts
new file mode 100644
index 0000000000000..8bf85cca2c50e
--- /dev/null
+++ b/packages/design-system/src/components/AskAssistantAvatar/AssistantAvatar.stories.ts
@@ -0,0 +1,25 @@
+import AssistantAvatar from './AssistantAvatar.vue';
+import type { StoryFn } from '@storybook/vue3';
+
+export default {
+	title: 'Assistant/AssistantAvatar',
+	component: AssistantAvatar,
+	argTypes: {},
+};
+
+const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
+	props: Object.keys(argTypes),
+	components: {
+		AssistantAvatar,
+	},
+	template: '<AssistantAvatar v-bind="args" />',
+});
+
+export const Default = Template.bind({});
+Default.args = {};
+
+export const Mini = Template.bind({});
+Mini.args = {
+	size: 'mini',
+};
diff --git a/packages/design-system/src/components/AskAssistantAvatar/AssistantAvatar.vue b/packages/design-system/src/components/AskAssistantAvatar/AssistantAvatar.vue
new file mode 100644
index 0000000000000..9df650ce504f7
--- /dev/null
+++ b/packages/design-system/src/components/AskAssistantAvatar/AssistantAvatar.vue
@@ -0,0 +1,33 @@
+<script setup lang="ts">
+import AssistantIcon from '../AskAssistantIcon/AssistantIcon.vue';
+
+withDefaults(defineProps<{ size: 'small' | 'mini' }>(), {
+	size: 'small',
+});
+</script>
+
+<template>
+	<div :class="[$style.container, $style[size]]">
+		<AssistantIcon :size="size" theme="blank" />
+	</div>
+</template>
+
+<style lang="scss" module>
+.container {
+	background: var(--color-assistant-highlight-gradient);
+	border-radius: 50%;
+	display: inline-flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.small {
+	height: var(--spacing-m);
+	width: var(--spacing-m);
+}
+
+.mini {
+	height: var(--spacing-s);
+	width: var(--spacing-s);
+}
+</style>
diff --git a/packages/design-system/src/components/AskAssistantButton/AskAssistantButton.stories.ts b/packages/design-system/src/components/AskAssistantButton/AskAssistantButton.stories.ts
new file mode 100644
index 0000000000000..6d41905aed209
--- /dev/null
+++ b/packages/design-system/src/components/AskAssistantButton/AskAssistantButton.stories.ts
@@ -0,0 +1,31 @@
+import AskAssistantButton from './AskAssistantButton.vue';
+import { action } from '@storybook/addon-actions';
+import type { StoryFn } from '@storybook/vue3';
+
+export default {
+	title: 'Assistant/AskAssistantButton',
+	component: AskAssistantButton,
+	argTypes: {},
+};
+
+const methods = {
+	onClick: action('click'),
+};
+
+const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
+	props: Object.keys(argTypes),
+	components: {
+		AskAssistantButton,
+	},
+	template:
+		'<div style="display: flex; height: 50px; width: 300px; align-items: center; justify-content: center"><AskAssistantButton v-bind="args" @click="onClick" /></div>',
+	methods,
+});
+
+export const Button = Template.bind({});
+
+export const Notifications = Template.bind({});
+Notifications.args = {
+	unreadCount: 1,
+};
diff --git a/packages/design-system/src/components/AskAssistantButton/AskAssistantButton.vue b/packages/design-system/src/components/AskAssistantButton/AskAssistantButton.vue
new file mode 100644
index 0000000000000..5cb1824699db4
--- /dev/null
+++ b/packages/design-system/src/components/AskAssistantButton/AskAssistantButton.vue
@@ -0,0 +1,95 @@
+<script setup lang="ts">
+import { ref } from 'vue';
+import AssistantIcon from '../AskAssistantIcon/AssistantIcon.vue';
+import AssistantText from '../AskAssistantText/AssistantText.vue';
+import BetaTag from '../BetaTag/BetaTag.vue';
+import { useI18n } from '../../composables/useI18n';
+
+const { t } = useI18n();
+
+const hovering = ref(false);
+
+const props = defineProps<{ unreadCount?: number }>();
+
+const emit = defineEmits<{
+	click: [e: MouseEvent];
+}>();
+
+const onClick = (e: MouseEvent) => emit('click', e);
+
+function onMouseEnter() {
+	hovering.value = true;
+}
+
+function onMouseLeave() {
+	hovering.value = false;
+}
+</script>
+
+<template>
+	<button
+		:class="$style.button"
+		@mouseenter="onMouseEnter"
+		@mouseleave="onMouseLeave"
+		@click="onClick"
+	>
+		<div v-if="props.unreadCount" :class="$style.num">
+			{{ props.unreadCount }}
+		</div>
+		<AssistantIcon v-else size="large" :theme="hovering ? 'blank' : 'default'" />
+		<div v-show="hovering" :class="$style.text">
+			<div>
+				<AssistantText :text="t('askAssistantButton.askAssistant')" />
+			</div>
+			<div>
+				<BetaTag />
+			</div>
+		</div>
+	</button>
+</template>
+
+<style lang="scss" module>
+.button {
+	border: var(--border-base);
+	background: var(--color-foreground-xlight);
+	border-radius: var(--border-radius-base);
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	height: 42px;
+	width: 42px;
+	position: relative;
+
+	&:hover {
+		border: 0;
+		cursor: pointer;
+		background: var(--color-assistant-highlight-reverse);
+
+		> div {
+			background: transparent;
+		}
+	}
+}
+
+.num {
+	color: var(--prim-color-white);
+	background: var(--color-assistant-highlight-reverse);
+	border-radius: 50%;
+	width: var(--spacing-s);
+	height: var(--spacing-s);
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	font-size: var(--font-size-3xs);
+}
+
+.text {
+	position: absolute;
+	top: -1px;
+	display: flex;
+	flex-direction: column;
+	align-items: end;
+	width: 100px;
+	right: 48px;
+}
+</style>
diff --git a/packages/design-system/src/components/AskAssistantChat/AskAssistantChat.stories.ts b/packages/design-system/src/components/AskAssistantChat/AskAssistantChat.stories.ts
new file mode 100644
index 0000000000000..ec44622844afb
--- /dev/null
+++ b/packages/design-system/src/components/AskAssistantChat/AskAssistantChat.stories.ts
@@ -0,0 +1,240 @@
+import AskAssistantChat from './AskAssistantChat.vue';
+import type { StoryFn } from '@storybook/vue3';
+import type { ChatUI } from '../../types/assistant';
+
+export default {
+	title: 'Assistant/AskAssistantChat',
+	component: AskAssistantChat,
+	argTypes: {},
+};
+
+function getMessages(messages: ChatUI.AssistantMessage[]): ChatUI.AssistantMessage[] {
+	return messages;
+}
+
+const methods = {};
+
+const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
+	props: Object.keys(argTypes),
+	components: {
+		AskAssistantChat,
+	},
+	template: '<div style="width:275px; height:100%"><ask-assistant-chat v-bind="args" /></div>',
+	methods,
+});
+
+export const DefaultPlaceholderChat = Template.bind({});
+DefaultPlaceholderChat.args = {
+	user: {
+		firstName: 'Max',
+		lastName: 'Test',
+	},
+};
+
+export const Chat = Template.bind({});
+Chat.args = {
+	user: {
+		firstName: 'Max',
+		lastName: 'Test',
+	},
+	messages: getMessages([
+		{
+			id: '1',
+			type: 'text',
+			role: 'assistant',
+			content: 'Hi Max! Here is my top solution to fix the error in your **Transform data** node👇',
+			read: false,
+		},
+		{
+			id: '1',
+			type: 'code-diff',
+			role: 'assistant',
+			description: 'Short solution description here that can spill over to two lines',
+			codeDiff:
+				'@@ -1,7 +1,6 @@\n-The Way that can be told of is not the eternal Way;\n-The name that can be named is not the eternal name.\nThe Nameless is the origin of Heaven and Earth;\n-The Named is the mother of all things.\n+The named is the mother of all things.\n+\nTherefore let there always be non-being,\nso we may see their subtlety,\nAnd let there always be being,\n@@ -9,3 +8,6 @@\n The two are the same,\n But after they are produced,\n they have different names.\n+They both may be called deep and profound.\n+Deeper and more profound,\n+The door of all subtleties!',
+			suggestionId: 'test',
+			quickReplies: [
+				{
+					type: 'new-suggestion',
+					text: 'Give me another solution',
+				},
+				{
+					type: 'resolved',
+					text: 'All good',
+				},
+			],
+			read: false,
+		},
+		{
+			id: '2',
+			type: 'text',
+			role: 'user',
+			content: 'Give it to me **ignore this markdown**',
+			read: false,
+		},
+		{
+			id: '2',
+			type: 'block',
+			role: 'assistant',
+			title: 'Credential doesn’t have correct permissions to send a message',
+			content:
+				'Solution steps:\n1. Lorem ipsum dolor sit amet, consectetur **adipiscing** elit. Proin id nulla placerat, tristique ex at, euismod dui.\n2. Copy this into somewhere\n3. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin id nulla placerat, tristique ex at, euismod dui.\n4. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin id nulla placerat, tristique ex at, euismod dui. \n Testing more code \n - Unordered item 1 \n - Unordered item 2',
+			read: false,
+		},
+		{
+			id: '2',
+			type: 'code-diff',
+			role: 'assistant',
+			description: 'Short solution with min height',
+			codeDiff:
+				'@@ -1,7 +1,6 @@\n-The Way that can be told of is not the eternal Way;\n-The name that can be named is not the eternal name.\n+The door of all subtleties!',
+			quickReplies: [
+				{
+					type: 'new-suggestion',
+					text: 'Give me another solution',
+				},
+				{
+					type: 'resolved',
+					text: 'All good',
+				},
+			],
+			suggestionId: 'test',
+			read: false,
+		},
+	]),
+};
+
+export const JustSummary = Template.bind({});
+JustSummary.args = {
+	user: {
+		firstName: 'Max',
+		lastName: 'Test',
+	},
+	messages: getMessages([
+		{
+			id: '123',
+			role: 'assistant',
+			type: 'block',
+			title: 'Credential doesn’t have correct permissions to send a message',
+			content:
+				'Solution steps:\n1. Lorem ipsum dolor sit amet, consectetur **adipiscing** elit. Proin id nulla placerat, tristique ex at, euismod dui.\n2. Copy this into somewhere\n3. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin id nulla placerat, tristique ex at, euismod dui.\n4. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin id nulla placerat, tristique ex at, euismod dui. \n Testing more code \n - Unordered item 1 \n - Unordered item 2',
+			read: false,
+		},
+	]),
+};
+
+export const SummaryTitleStreaming = Template.bind({});
+SummaryTitleStreaming.args = {
+	user: {
+		firstName: 'Max',
+		lastName: 'Test',
+	},
+	messages: getMessages([
+		{
+			id: '123',
+			role: 'assistant',
+			type: 'block',
+			title: 'Credential doesn’t have',
+			content: '',
+			read: false,
+		},
+	]),
+	streaming: true,
+};
+
+export const SummaryContentStreaming = Template.bind({});
+SummaryContentStreaming.args = {
+	user: {
+		firstName: 'Max',
+		lastName: 'Test',
+	},
+	messages: getMessages([
+		{
+			id: '123',
+			role: 'assistant',
+			type: 'block',
+			title: 'Credential doesn’t have correct permissions to send a message',
+			content: 'Solution steps:\n1. Lorem ipsum dolor sit amet, consectetur',
+			read: false,
+		},
+	]),
+	streaming: true,
+};
+
+export const ErrorChat = Template.bind({});
+ErrorChat.args = {
+	user: {
+		firstName: 'Max',
+		lastName: 'Test',
+	},
+	messages: getMessages([
+		{
+			id: '123',
+			role: 'assistant',
+			type: 'error',
+			content: 'There was an error reaching the service',
+			read: false,
+		},
+	]),
+};
+
+export const EmptyStreamingChat = Template.bind({});
+EmptyStreamingChat.args = {
+	user: {
+		firstName: 'Max',
+		lastName: 'Test',
+	},
+	messages: getMessages([
+		{
+			id: '123',
+			type: 'text',
+			role: 'assistant',
+			content: '',
+			read: false,
+		},
+	]),
+	streaming: true,
+};
+
+export const StreamingChat = Template.bind({});
+StreamingChat.args = {
+	user: {
+		firstName: 'Max',
+		lastName: 'Test',
+	},
+	messages: getMessages([
+		{
+			id: '123',
+			type: 'text',
+			role: 'assistant',
+			content: 'I am thinking through this problem',
+			read: false,
+		},
+	]),
+	streaming: true,
+};
+
+export const EndOfSessionChat = Template.bind({});
+EndOfSessionChat.args = {
+	user: {
+		firstName: 'Max',
+		lastName: 'Test',
+	},
+	messages: getMessages([
+		{
+			id: '123',
+			type: 'text',
+			role: 'assistant',
+			content: "Great, glad I could help! I'm here whenever you need more help.",
+			read: false,
+		},
+		{
+			id: '123',
+			role: 'assistant',
+			type: 'event',
+			eventName: 'end-session',
+			read: false,
+		},
+	]),
+};
diff --git a/packages/design-system/src/components/AskAssistantChat/AskAssistantChat.vue b/packages/design-system/src/components/AskAssistantChat/AskAssistantChat.vue
new file mode 100644
index 0000000000000..30bdf81351334
--- /dev/null
+++ b/packages/design-system/src/components/AskAssistantChat/AskAssistantChat.vue
@@ -0,0 +1,471 @@
+<script setup lang="ts">
+import { computed, ref } from 'vue';
+import AssistantIcon from '../AskAssistantIcon/AssistantIcon.vue';
+import AssistantText from '../AskAssistantText/AssistantText.vue';
+import AssistantAvatar from '../AskAssistantAvatar/AssistantAvatar.vue';
+import CodeDiff from '../CodeDiff/CodeDiff.vue';
+import type { ChatUI } from '../../types/assistant';
+import BlinkingCursor from '../BlinkingCursor/BlinkingCursor.vue';
+
+import Markdown from 'markdown-it';
+import InlineAskAssistantButton from '../InlineAskAssistantButton/InlineAskAssistantButton.vue';
+import BetaTag from '../BetaTag/BetaTag.vue';
+import { useI18n } from '../../composables/useI18n';
+import markdownLink from 'markdown-it-link-attributes';
+
+const { t } = useI18n();
+
+const md = new Markdown({
+	breaks: true,
+}).use(markdownLink, {
+	attrs: {
+		target: '_blank',
+		rel: 'noopener',
+	},
+});
+
+const MAX_CHAT_INPUT_HEIGHT = 100;
+
+interface Props {
+	user?: {
+		firstName: string;
+		lastName: string;
+	};
+	messages?: ChatUI.AssistantMessage[];
+	streaming?: boolean;
+}
+
+const emit = defineEmits<{
+	close: [];
+	message: [string, string | undefined];
+	codeReplace: [number];
+	codeUndo: [number];
+}>();
+
+const onClose = () => emit('close');
+
+const props = defineProps<Props>();
+
+const textInputValue = ref<string>('');
+
+const chatInput = ref<HTMLTextAreaElement | null>(null);
+
+const sessionEnded = computed(() => {
+	return isEndOfSessionEvent(props.messages?.[props.messages.length - 1]);
+});
+
+const sendDisabled = computed(() => {
+	return !textInputValue.value || props.streaming || sessionEnded.value;
+});
+
+function isEndOfSessionEvent(event?: ChatUI.AssistantMessage) {
+	return event?.type === 'event' && event?.eventName === 'end-session';
+}
+
+function onQuickReply(opt: ChatUI.QuickReply) {
+	emit('message', opt.text, opt.type);
+}
+
+function onSendMessage() {
+	if (sendDisabled.value) return;
+	emit('message', textInputValue.value, undefined);
+	textInputValue.value = '';
+	if (chatInput.value) {
+		chatInput.value.style.height = 'auto';
+	}
+}
+
+function renderMarkdown(content: string) {
+	try {
+		return md.render(content);
+	} catch (e) {
+		console.error(`Error parsing markdown content ${content}`);
+		return `<p>${t('assistantChat.errorParsingMarkdown')}</p>`;
+	}
+}
+
+function growInput() {
+	if (!chatInput.value) return;
+	chatInput.value.style.height = 'auto';
+	const scrollHeight = chatInput.value.scrollHeight;
+	chatInput.value.style.height = `${Math.min(scrollHeight, MAX_CHAT_INPUT_HEIGHT)}px`;
+}
+</script>
+
+<template>
+	<div :class="$style.container">
+		<div :class="$style.header">
+			<div :class="$style.chatTitle">
+				<div :class="$style.headerText">
+					<AssistantIcon size="large" />
+					<AssistantText size="large" :text="t('assistantChat.aiAssistantLabel')" />
+				</div>
+				<BetaTag />
+			</div>
+			<div :class="$style.back" @click="onClose">
+				<n8n-icon icon="arrow-right" color="text-base" />
+			</div>
+		</div>
+		<div :class="$style.body">
+			<div v-if="messages?.length" :class="$style.messages">
+				<div v-for="(message, i) in messages" :key="i" :class="$style.message">
+					<div
+						v-if="
+							!isEndOfSessionEvent(message) && (i === 0 || message.role !== messages[i - 1].role)
+						"
+						:class="{ [$style.roleName]: true, [$style.userSection]: i > 0 }"
+					>
+						<AssistantAvatar v-if="message.role === 'assistant'" />
+						<n8n-avatar
+							v-else
+							:first-name="user?.firstName"
+							:last-name="user?.lastName"
+							size="xsmall"
+						/>
+
+						<span v-if="message.role === 'assistant'">{{
+							t('assistantChat.aiAssistantName')
+						}}</span>
+						<span v-else>{{ t('assistantChat.you') }}</span>
+					</div>
+					<div v-if="message.type === 'block'">
+						<div :class="$style.block">
+							<div :class="$style.blockTitle">
+								{{ message.title }}
+								<BlinkingCursor
+									v-if="streaming && i === messages?.length - 1 && !message.content"
+								/>
+							</div>
+							<div :class="$style.blockBody">
+								<!-- eslint-disable-next-line vue/no-v-html -->
+								<span v-html="renderMarkdown(message.content)"></span>
+								<BlinkingCursor
+									v-if="streaming && i === messages?.length - 1 && message.title && message.content"
+								/>
+							</div>
+						</div>
+					</div>
+					<div v-else-if="message.type === 'text'" :class="$style.textMessage">
+						<!-- eslint-disable-next-line vue/no-v-html -->
+						<span v-if="message.role === 'user'" v-html="renderMarkdown(message.content)"></span>
+						<!-- eslint-disable-next-line vue/no-v-html -->
+						<span
+							v-else
+							:class="$style.assistantText"
+							v-html="renderMarkdown(message.content)"
+						></span>
+						<BlinkingCursor
+							v-if="streaming && i === messages?.length - 1 && message.role === 'assistant'"
+						/>
+					</div>
+					<div v-else-if="message.type === 'error'" :class="$style.error">
+						<span>⚠️ {{ message.content }}</span>
+					</div>
+					<div v-else-if="message.type === 'code-diff'">
+						<CodeDiff
+							:title="message.description"
+							:content="message.codeDiff"
+							:replacing="message.replacing"
+							:replaced="message.replaced"
+							:error="message.error"
+							:streaming="streaming && i === messages?.length - 1"
+							@replace="() => emit('codeReplace', i)"
+							@undo="() => emit('codeUndo', i)"
+						/>
+					</div>
+					<div v-else-if="isEndOfSessionEvent(message)" :class="$style.endOfSessionText">
+						<span>
+							{{ t('assistantChat.sessionEndMessage.1') }}
+						</span>
+						<InlineAskAssistantButton size="small" :static="true" />
+						<span>
+							{{ t('assistantChat.sessionEndMessage.2') }}
+						</span>
+					</div>
+
+					<div
+						v-if="
+							!streaming &&
+							'quickReplies' in message &&
+							message.quickReplies?.length &&
+							i === messages?.length - 1
+						"
+						:class="$style.quickReplies"
+					>
+						<div :class="$style.quickRepliesTitle">{{ t('assistantChat.quickRepliesTitle') }}</div>
+						<div v-for="opt in message.quickReplies" :key="opt.type">
+							<n8n-button
+								v-if="opt.text"
+								type="secondary"
+								size="mini"
+								@click="() => onQuickReply(opt)"
+							>
+								{{ opt.text }}
+							</n8n-button>
+						</div>
+					</div>
+				</div>
+			</div>
+
+			<div v-else :class="$style.placeholder">
+				<div :class="$style.greeting">Hi {{ user?.firstName }} 👋</div>
+				<div :class="$style.info">
+					<p>
+						{{
+							t('assistantChat.placeholder.1', [
+								`${user?.firstName}`,
+								t('assistantChat.aiAssistantName'),
+							])
+						}}
+					</p>
+					<p>
+						{{ t('assistantChat.placeholder.2') }}
+						<InlineAskAssistantButton size="small" :static="true" />
+						{{ t('assistantChat.placeholder.3') }}
+					</p>
+					<p>
+						{{ t('assistantChat.placeholder.4') }}
+					</p>
+				</div>
+			</div>
+		</div>
+		<div
+			v-if="messages?.length"
+			:class="{ [$style.inputWrapper]: true, [$style.disabledInput]: sessionEnded }"
+		>
+			<textarea
+				ref="chatInput"
+				v-model="textInputValue"
+				:disabled="sessionEnded"
+				:placeholder="t('assistantChat.inputPlaceholder')"
+				rows="1"
+				wrap="hard"
+				@keydown.enter.exact.prevent="onSendMessage"
+				@input.prevent="growInput"
+				@keydown.stop
+			/>
+			<n8n-icon-button
+				:class="{ [$style.sendButton]: true }"
+				icon="paper-plane"
+				type="text"
+				size="large"
+				:disabled="sendDisabled"
+				@click="onSendMessage"
+			/>
+		</div>
+	</div>
+</template>
+
+<style lang="scss" module>
+.container {
+	height: 100%;
+	position: relative;
+}
+
+p {
+	line-height: var(--font-line-height-xloose);
+	margin: var(--spacing-2xs) 0;
+}
+
+.header {
+	height: 65px; // same as header height in editor
+	padding: 0 var(--spacing-l);
+	background-color: var(--color-background-xlight);
+	border: var(--border-base);
+	border-top: 0;
+	display: flex;
+
+	div {
+		display: flex;
+		align-items: center;
+	}
+
+	> div:first-of-type {
+		width: 100%;
+	}
+}
+
+.body {
+	background-color: var(--color-background-light);
+	border: var(--border-base);
+	border-top: 0;
+	height: 100%;
+	overflow: scroll;
+	padding-bottom: 250px; // make scrollable at the end
+	position: relative;
+
+	pre {
+		text-wrap: stable;
+	}
+}
+
+.placeholder {
+	padding: var(--spacing-s);
+}
+
+.messages {
+	padding: var(--spacing-xs);
+}
+
+.message {
+	margin-bottom: var(--spacing-xs);
+	font-size: var(--font-size-2xs);
+	line-height: var(--font-line-height-xloose);
+}
+
+.roleName {
+	display: flex;
+	align-items: center;
+	margin-bottom: var(--spacing-3xs);
+
+	font-weight: var(--font-weight-bold);
+	font-size: var(--font-size-2xs);
+
+	> * {
+		margin-right: var(--spacing-3xs);
+	}
+}
+
+.userSection {
+	margin-top: var(--spacing-l);
+}
+
+.chatTitle {
+	display: flex;
+	gap: var(--spacing-3xs);
+}
+
+.headerText {
+	gap: var(--spacing-xs);
+}
+
+.greeting {
+	color: var(--color-text-dark);
+	font-size: var(--font-size-m);
+	margin-bottom: var(--spacing-s);
+}
+
+.info {
+	font-size: var(--font-size-s);
+	color: var(--color-text-base);
+
+	button {
+		display: inline-flex;
+	}
+}
+
+.back:hover {
+	cursor: pointer;
+}
+
+.quickReplies {
+	margin-top: var(--spacing-s);
+	> * {
+		margin-bottom: var(--spacing-3xs);
+	}
+}
+
+.quickRepliesTitle {
+	font-size: var(--font-size-3xs);
+	color: var(--color-text-base);
+}
+
+.textMessage {
+	font-size: var(--font-size-2xs);
+}
+
+.block {
+	font-size: var(--font-size-2xs);
+	background-color: var(--color-foreground-xlight);
+	border: var(--border-base);
+	border-radius: var(--border-radius-base);
+	word-break: break-word;
+
+	li {
+		margin-left: var(--spacing-xs);
+	}
+}
+
+.blockTitle {
+	border-bottom: var(--border-base);
+	padding: var(--spacing-2xs);
+	font-weight: var(--font-weight-bold);
+}
+
+.blockBody {
+	padding: var(--spacing-xs);
+}
+
+.inputWrapper {
+	position: absolute;
+	display: flex;
+	bottom: 0;
+	background-color: var(--color-foreground-xlight);
+	border: var(--border-base);
+	width: 100%;
+	padding-top: 1px;
+
+	textarea {
+		border: none;
+		background-color: transparent;
+		width: 100%;
+		font-size: var(--spacing-xs);
+		padding: var(--spacing-xs);
+		outline: none;
+		color: var(--color-text-dark);
+		resize: none;
+		font-family: inherit;
+	}
+}
+
+.sendButton {
+	color: var(--color-text-base) !important;
+
+	&[disabled] {
+		color: var(--color-text-light) !important;
+	}
+}
+
+.error {
+	color: var(--color-danger);
+}
+
+.assistantText {
+	display: inline;
+
+	p {
+		display: inline;
+		line-height: 1.7;
+	}
+
+	ul,
+	ol {
+		list-style-position: inside;
+		margin: var(--spacing-xs) 0 var(--spacing-xs) var(--spacing-xs);
+	}
+}
+
+.endOfSessionText {
+	margin-top: var(--spacing-l);
+	padding-top: var(--spacing-3xs);
+	border-top: var(--border-base);
+	color: var(--color-text-base);
+
+	> button,
+	> span {
+		margin-right: var(--spacing-3xs);
+	}
+
+	button {
+		display: inline-flex;
+	}
+}
+
+.disabledInput {
+	cursor: not-allowed;
+
+	* {
+		cursor: not-allowed;
+	}
+}
+</style>
diff --git a/packages/design-system/src/components/AskAssistantIcon/AssistantIcon.stories.ts b/packages/design-system/src/components/AskAssistantIcon/AssistantIcon.stories.ts
new file mode 100644
index 0000000000000..976872d8db8ef
--- /dev/null
+++ b/packages/design-system/src/components/AskAssistantIcon/AssistantIcon.stories.ts
@@ -0,0 +1,49 @@
+import AssistantIcon from './AssistantIcon.vue';
+import type { StoryFn } from '@storybook/vue3';
+
+export default {
+	title: 'Assistant/AssistantIcon',
+	component: AssistantIcon,
+	argTypes: {},
+};
+
+const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
+	props: Object.keys(argTypes),
+	components: {
+		AssistantIcon,
+	},
+	template: '<div style="background: lightgray;"><AssistantIcon v-bind="args" /></div>',
+});
+
+export const Default = Template.bind({});
+Default.args = {
+	theme: 'default',
+};
+
+export const Blank = Template.bind({
+	template: '<div style="background=black;"><AssistantIcon v-bind="args" /></div>',
+});
+Blank.args = {
+	theme: 'blank',
+};
+
+export const Mini = Template.bind({});
+Mini.args = {
+	size: 'mini',
+};
+
+export const Small = Template.bind({});
+Small.args = {
+	size: 'small',
+};
+
+export const Medium = Template.bind({});
+Medium.args = {
+	size: 'medium',
+};
+
+export const Large = Template.bind({});
+Large.args = {
+	size: 'large',
+};
diff --git a/packages/design-system/src/components/AskAssistantIcon/AssistantIcon.vue b/packages/design-system/src/components/AskAssistantIcon/AssistantIcon.vue
new file mode 100644
index 0000000000000..6e79db0fd5cc7
--- /dev/null
+++ b/packages/design-system/src/components/AskAssistantIcon/AssistantIcon.vue
@@ -0,0 +1,59 @@
+<script setup lang="ts">
+import { computed } from 'vue';
+
+const props = withDefaults(
+	defineProps<{
+		size: 'mini' | 'small' | 'medium' | 'large';
+		theme: 'default' | 'blank' | 'disabled';
+	}>(),
+	{
+		size: 'medium',
+		theme: 'default',
+	},
+);
+
+const sizes = {
+	mini: 8,
+	small: 10,
+	medium: 12,
+	large: 18,
+};
+
+const svgFill = computed(() => {
+	if (props.theme === 'blank') {
+		return 'white';
+	} else if (props.theme === 'disabled') {
+		return 'var(--color-text-light)';
+	}
+	return 'url(#paint0_linear_173_12825)';
+});
+</script>
+
+<template>
+	<svg
+		:width="sizes[size]"
+		:height="sizes[size]"
+		viewBox="0 0 24 24"
+		fill="none"
+		xmlns="http://www.w3.org/2000/svg"
+	>
+		<path
+			d="M19.9658 14.0171C19.9679 14.3549 19.8654 14.6851 19.6722 14.9622C19.479 15.2393 19.2046 15.4497 18.8869 15.5645L13.5109 17.5451L11.5303 22.9211C11.4137 23.2376 11.2028 23.5107 10.9261 23.7037C10.6494 23.8966 10.3202 24 9.9829 24C9.64559 24 9.3164 23.8966 9.0397 23.7037C8.76301 23.5107 8.55212 23.2376 8.43549 22.9211L6.45487 17.5451L1.07888 15.5645C0.762384 15.4479 0.489262 15.237 0.296347 14.9603C0.103431 14.6836 0 14.3544 0 14.0171C0 13.6798 0.103431 13.3506 0.296347 13.0739C0.489262 12.7972 0.762384 12.5863 1.07888 12.4697L6.45487 10.4891L8.43549 5.11309C8.55212 4.79659 8.76301 4.52347 9.0397 4.33055C9.3164 4.13764 9.64559 4.0342 9.9829 4.0342C10.3202 4.0342 10.6494 4.13764 10.9261 4.33055C11.2028 4.52347 11.4137 4.79659 11.5303 5.11309L13.5109 10.4891L18.8869 12.4697C19.2046 12.5845 19.479 12.7949 19.6722 13.072C19.8654 13.3491 19.9679 13.6793 19.9658 14.0171ZM14.1056 4.12268H15.7546V5.77175C15.7546 5.99043 15.8415 6.20015 15.9961 6.35478C16.1508 6.50941 16.3605 6.59628 16.5792 6.59628C16.7979 6.59628 17.0076 6.50941 17.1622 6.35478C17.3168 6.20015 17.4037 5.99043 17.4037 5.77175V4.12268H19.0528C19.2715 4.12268 19.4812 4.03581 19.6358 3.88118C19.7905 3.72655 19.8773 3.51682 19.8773 3.29814C19.8773 3.07946 19.7905 2.86974 19.6358 2.71511C19.4812 2.56048 19.2715 2.47361 19.0528 2.47361H17.4037V0.824535C17.4037 0.605855 17.3168 0.396131 17.1622 0.241501C17.0076 0.0868704 16.7979 0 16.5792 0C16.3605 0 16.1508 0.0868704 15.9961 0.241501C15.8415 0.396131 15.7546 0.605855 15.7546 0.824535V2.47361H14.1056C13.8869 2.47361 13.6772 2.56048 13.5225 2.71511C13.3679 2.86974 13.281 3.07946 13.281 3.29814C13.281 3.51682 13.3679 3.72655 13.5225 3.88118C13.6772 4.03581 13.8869 4.12268 14.1056 4.12268ZM23.1755 7.42082H22.3509V6.59628C22.3509 6.3776 22.2641 6.16788 22.1094 6.01325C21.9548 5.85862 21.7451 5.77175 21.5264 5.77175C21.3077 5.77175 21.098 5.85862 20.9434 6.01325C20.7887 6.16788 20.7019 6.3776 20.7019 6.59628V7.42082H19.8773C19.6586 7.42082 19.4489 7.50769 19.2943 7.66232C19.1397 7.81695 19.0528 8.02667 19.0528 8.24535C19.0528 8.46404 19.1397 8.67376 19.2943 8.82839C19.4489 8.98302 19.6586 9.06989 19.8773 9.06989H20.7019V9.89443C20.7019 10.1131 20.7887 10.3228 20.9434 10.4775C21.098 10.6321 21.3077 10.719 21.5264 10.719C21.7451 10.719 21.9548 10.6321 22.1094 10.4775C22.2641 10.3228 22.3509 10.1131 22.3509 9.89443V9.06989H23.1755C23.3941 9.06989 23.6039 8.98302 23.7585 8.82839C23.9131 8.67376 24 8.46404 24 8.24535C24 8.02667 23.9131 7.81695 23.7585 7.66232C23.6039 7.50769 23.3941 7.42082 23.1755 7.42082Z"
+			:fill="svgFill"
+		/>
+		<defs>
+			<linearGradient
+				id="paint0_linear_173_12825"
+				x1="-3.67094e-07"
+				y1="-0.000120994"
+				x2="28.8315"
+				y2="9.82667"
+				gradientUnits="userSpaceOnUse"
+			>
+				<stop stop-color="var(--color-assistant-highlight-1)" />
+				<stop offset="0.495" stop-color="var(--color-assistant-highlight-2)" />
+				<stop offset="1" stop-color="var(--color-assistant-highlight-3)" />
+			</linearGradient>
+		</defs>
+	</svg>
+</template>
diff --git a/packages/design-system/src/components/AskAssistantText/AssistantText.stories.ts b/packages/design-system/src/components/AskAssistantText/AssistantText.stories.ts
new file mode 100644
index 0000000000000..cb6280e5797fc
--- /dev/null
+++ b/packages/design-system/src/components/AskAssistantText/AssistantText.stories.ts
@@ -0,0 +1,40 @@
+import AssistantText from './AssistantText.vue';
+import type { StoryFn } from '@storybook/vue3';
+
+export default {
+	title: 'Assistant/AssistantText',
+	component: AssistantText,
+	argTypes: {},
+};
+
+const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
+	props: Object.keys(argTypes),
+	components: {
+		AssistantText,
+	},
+	template: '<AssistantText v-bind="args" />',
+});
+
+export const Default = Template.bind({});
+Default.args = {
+	text: 'Ask me something!!!',
+};
+
+export const Small = Template.bind({});
+Small.args = {
+	text: 'Ask me something!!!',
+	size: 'small',
+};
+
+export const Medium = Template.bind({});
+Medium.args = {
+	text: 'Ask me something!!!',
+	size: 'medium',
+};
+
+export const Large = Template.bind({});
+Large.args = {
+	text: 'Ask me something!!!',
+	size: 'large',
+};
diff --git a/packages/design-system/src/components/AskAssistantText/AssistantText.vue b/packages/design-system/src/components/AskAssistantText/AssistantText.vue
new file mode 100644
index 0000000000000..4cb912552daba
--- /dev/null
+++ b/packages/design-system/src/components/AskAssistantText/AssistantText.vue
@@ -0,0 +1,40 @@
+<script setup lang="ts">
+withDefaults(defineProps<{ text: string; size: 'small' | 'medium' | 'large' | 'xlarge' }>(), {
+	text: '',
+	size: 'medium',
+});
+</script>
+
+<template>
+	<span :class="[$style.text, $style[size]]">{{ text }}</span>
+</template>
+
+<style lang="scss" module>
+.text {
+	background: var(--color-assistant-highlight-gradient);
+	-webkit-background-clip: text;
+	background-clip: text;
+	-webkit-text-fill-color: transparent;
+	font-weight: var(--font-weight-bold);
+}
+
+.small {
+	font-size: 9px;
+	line-height: var(--spacing-xs);
+}
+
+.medium {
+	font-size: var(--spacing-xs);
+	line-height: var(--spacing-s);
+}
+
+.large {
+	font-size: 14px;
+	line-height: 18px;
+}
+
+.xlarge {
+	font-size: var(--spacing-s);
+	line-height: var(--spacing-s);
+}
+</style>
diff --git a/packages/design-system/src/components/BetaTag/BetaTag.stories.ts b/packages/design-system/src/components/BetaTag/BetaTag.stories.ts
new file mode 100644
index 0000000000000..541ce06871be5
--- /dev/null
+++ b/packages/design-system/src/components/BetaTag/BetaTag.stories.ts
@@ -0,0 +1,19 @@
+import BetaTag from './BetaTag.vue';
+import type { StoryFn } from '@storybook/vue3';
+
+export default {
+	title: 'Assistant/BetaTag',
+	component: BetaTag,
+	argTypes: {},
+};
+
+const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
+	props: Object.keys(argTypes),
+	components: {
+		BetaTag,
+	},
+	template: '<BetaTag v-bind="args" />',
+});
+
+export const Beta = Template.bind({});
diff --git a/packages/design-system/src/components/BetaTag/BetaTag.vue b/packages/design-system/src/components/BetaTag/BetaTag.vue
new file mode 100644
index 0000000000000..393df5ea4dd09
--- /dev/null
+++ b/packages/design-system/src/components/BetaTag/BetaTag.vue
@@ -0,0 +1,22 @@
+<script lang="ts" setup>
+import { useI18n } from '../../composables/useI18n';
+
+const { t } = useI18n();
+</script>
+
+<template>
+	<div :class="$style.beta">{{ t('betaTag.beta') }}</div>
+</template>
+
+<style lang="scss" module>
+.beta {
+	display: inline-block;
+
+	color: var(--color-secondary);
+	font-size: var(--font-size-3xs);
+	font-weight: var(--font-weight-bold);
+	background-color: var(--color-secondary-tint-3);
+	padding: var(--spacing-5xs) var(--spacing-4xs);
+	border-radius: 16px;
+}
+</style>
diff --git a/packages/design-system/src/components/BlinkingCursor/BlinkingCursor.stories.ts b/packages/design-system/src/components/BlinkingCursor/BlinkingCursor.stories.ts
new file mode 100644
index 0000000000000..419aef4fcc4f6
--- /dev/null
+++ b/packages/design-system/src/components/BlinkingCursor/BlinkingCursor.stories.ts
@@ -0,0 +1,19 @@
+import BlinkingCursor from './BlinkingCursor.vue';
+import type { StoryFn } from '@storybook/vue3';
+
+export default {
+	title: 'Assistant/BlinkingCursor',
+	component: BlinkingCursor,
+	argTypes: {},
+};
+
+const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
+	props: Object.keys(argTypes),
+	components: {
+		BlinkingCursor,
+	},
+	template: '<blinking-cursor v-bind="args" />',
+});
+
+export const Cursor = Template.bind({});
diff --git a/packages/design-system/src/components/BlinkingCursor/BlinkingCursor.vue b/packages/design-system/src/components/BlinkingCursor/BlinkingCursor.vue
new file mode 100644
index 0000000000000..0ee505998a6aa
--- /dev/null
+++ b/packages/design-system/src/components/BlinkingCursor/BlinkingCursor.vue
@@ -0,0 +1,25 @@
+<template>
+	<span class="blinking-cursor"></span>
+</template>
+
+<style lang="scss">
+.blinking-cursor {
+	display: inline-block;
+	height: var(--font-size-m);
+	width: var(--spacing-3xs);
+	border-radius: var(--border-radius-small);
+	margin-left: var(--spacing-4xs);
+
+	animation: 1s blink step-end infinite;
+}
+
+@keyframes blink {
+	from,
+	to {
+		background-color: transparent;
+	}
+	50% {
+		background-color: var(--color-foreground-xdark);
+	}
+}
+</style>
diff --git a/packages/design-system/src/components/CodeDiff/CodeDiff.stories.ts b/packages/design-system/src/components/CodeDiff/CodeDiff.stories.ts
new file mode 100644
index 0000000000000..c2f09548ed5d1
--- /dev/null
+++ b/packages/design-system/src/components/CodeDiff/CodeDiff.stories.ts
@@ -0,0 +1,96 @@
+import CodeDiff from './CodeDiff.vue';
+import type { StoryFn } from '@storybook/vue3';
+
+export default {
+	title: 'Assistant/CodeDiff',
+	component: CodeDiff,
+	argTypes: {},
+};
+
+const methods = {};
+
+const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
+	props: Object.keys(argTypes),
+	components: {
+		CodeDiff,
+	},
+	template: '<div style="width:300px; height:100%"><code-diff v-bind="args" /></div>',
+	methods,
+});
+
+export const Example = Template.bind({});
+Example.args = {
+	title: 'Lao Tzu example unified diff',
+	content:
+		'@@ -1,7 +1,6 @@\n-The Way that can be told of is not the eternal Way;\n-The name that can be named is not the eternal name.\nThe Nameless is the origin of Heaven and Earth;\n-The Named is the mother of all things.\n+The named is the mother of all things.\n+\nTherefore let there always be non-being,\nso we may see their subtlety,\nAnd let there always be being,\n@@ -9,3 +8,6 @@\n The two are the same,\n But after they are produced,\n they have different names.\n+They both may be called deep and profound.\n+Deeper and more profound,\n+The door of all subtleties!',
+};
+
+export const Empty = Template.bind({});
+Empty.args = {};
+
+export const Code = Template.bind({});
+Code.args = {
+	title: "Fix reference to the node and remove unsupported 'require' statement.",
+	content:
+		"--- original.js\n+++ modified.js\n@@ -1,2 +1,2 @@\n-const SIGNING_SECRET = $input.first().json.slack_secret_signature;\n-const item = $('Webhook to call for Slack command').first();\n+const SIGNING_SECRET = items[0].json.slack_secret_signature;\n+const item = items[0];\n@@ -7,8 +7,6 @@\n}\n\n-const crypto = require('crypto');\n-\n const { binary: { data } } = item;\n\n if (\n@@ -22,7 +20,7 @@\n const rawBody = Buffer.from(data.data, 'base64').toString()\n \n // compute the ",
+	streaming: true,
+};
+
+export const StreamingTitleEmpty = Template.bind({});
+StreamingTitleEmpty.args = {
+	streaming: true,
+};
+
+export const StreamingTitle = Template.bind({});
+StreamingTitle.args = {
+	streaming: true,
+	title: 'Hello world',
+};
+
+export const StreamingContentWithOneLine = Template.bind({});
+StreamingContentWithOneLine.args = {
+	streaming: true,
+	title: 'Hello world',
+	content: '@@ -1,7 +1,6 @@\n-The Way that can be told of is not th',
+};
+
+export const StreamingContentWithMultipleLines = Template.bind({});
+StreamingContentWithMultipleLines.args = {
+	streaming: true,
+	title: 'Hello world',
+	content:
+		'@@ -1,7 +1,6 @@\n-The Way that can be told of is not the eternal Way;\n-The name that can b',
+};
+
+export const StreamingWithManyManyLines = Template.bind({});
+StreamingWithManyManyLines.args = {
+	title: 'Lao Tzu example unified diff',
+	content:
+		'@@ -1,7 +1,6 @@\n-The Way that can be told of is not the eternal Way;\n-The name that can be named is not the eternal name.\nThe Nameless is the origin of Heaven and Earth;\n-The Named is the mother of all things.\n+The named is the mother of all things.\n+\nTherefore let there always be non-being,\nso we may see their subtlety,\nAnd let there always be being,\n@@ -9,3 +8,6 @@\n The two are the same,\n But after they are produced,\n they have different names.\n+They both may be called deep and profound.\n+Deeper and more profound,\n+The door of all subtleties!',
+	streaming: true,
+};
+
+export const Replaced = Template.bind({});
+Replaced.args = {
+	title: 'Lao Tzu example unified diff',
+	content:
+		'@@ -1,7 +1,6 @@\n-The Way that can be told of is not the eternal Way;\n-The name that can be named is not the eternal name.\nThe Nameless is the origin of Heaven and Earth;\n-The Named is the mother of all things.\n+The named is the mother of all things.\n+\nTherefore let there always be non-being,\nso we may see their subtlety,\nAnd let there always be being,\n@@ -9,3 +8,6 @@\n The two are the same,\n But after they are produced,\n they have different names.\n+They both may be called deep and profound.\n+Deeper and more profound,\n+The door of all subtleties!',
+	replaced: true,
+};
+
+export const Replacing = Template.bind({});
+Replacing.args = {
+	title: 'Lao Tzu example unified diff',
+	content:
+		'@@ -1,7 +1,6 @@\n-The Way that can be told of is not the eternal Way;\n-The name that can be named is not the eternal name.\nThe Nameless is the origin of Heaven and Earth;\n-The Named is the mother of all things.\n+The named is the mother of all things.\n+\nTherefore let there always be non-being,\nso we may see their subtlety,\nAnd let there always be being,\n@@ -9,3 +8,6 @@\n The two are the same,\n But after they are produced,\n they have different names.\n+They both may be called deep and profound.\n+Deeper and more profound,\n+The door of all subtleties!',
+	replacing: true,
+};
+
+export const Error = Template.bind({});
+Error.args = {
+	title: 'Lao Tzu example unified diff',
+	content:
+		'@@ -1,7 +1,6 @@\n-The Way that can be told of is not the eternal Way;\n-The name that can be named is not the eternal name.\nThe Nameless is the origin of Heaven and Earth;\n-The Named is the mother of all things.\n+The named is the mother of all things.\n+\nTherefore let there always be non-being,\nso we may see their subtlety,\nAnd let there always be being,\n@@ -9,3 +8,6 @@\n The two are the same,\n But after they are produced,\n they have different names.\n+They both may be called deep and profound.\n+Deeper and more profound,\n+The door of all subtleties!',
+	error: true,
+};
diff --git a/packages/design-system/src/components/CodeDiff/CodeDiff.vue b/packages/design-system/src/components/CodeDiff/CodeDiff.vue
new file mode 100644
index 0000000000000..7f6acafcc25e6
--- /dev/null
+++ b/packages/design-system/src/components/CodeDiff/CodeDiff.vue
@@ -0,0 +1,207 @@
+<script setup lang="ts">
+import parseDiff from 'parse-diff';
+import { computed } from 'vue';
+import { useI18n } from 'n8n-design-system/composables/useI18n';
+
+const MIN_LINES = 4;
+
+interface Props {
+	title: string;
+	content: string;
+	replacing: boolean;
+	replaced: boolean;
+	error: boolean;
+	streaming: boolean;
+}
+
+type Line =
+	| parseDiff.Change
+	| {
+			type: 'filler' | 'seperator';
+			content: string;
+	  };
+
+const props = withDefaults(defineProps<Props>(), {
+	title: '',
+	content: '',
+	replacing: false,
+	replaced: false,
+	error: false,
+	streaming: false,
+});
+
+const emit = defineEmits<{
+	replace: [];
+	undo: [];
+}>();
+
+const { t } = useI18n();
+
+const diffs = computed(() => {
+	const parsed = parseDiff(props.content);
+
+	const file = parsed[0] ?? { chunks: [] };
+
+	const lines: Line[] = file.chunks.reduce((accu: Line[], chunk, i) => {
+		const changes: Line[] = chunk.changes.map((change) => {
+			let content = change.content;
+			if (change.type === 'add' && content.startsWith('+')) {
+				content = content.replace('+', '');
+			} else if (change.type === 'del' && content.startsWith('-')) {
+				content = content.replace('-', '');
+			}
+
+			return {
+				...change,
+				content,
+			};
+		});
+
+		if (i !== file.chunks.length - 1) {
+			changes.push({
+				type: 'seperator',
+				content: '...',
+			});
+		}
+		return [...accu, ...changes];
+	}, []);
+
+	const len = lines.length;
+	// why programmatic and not min height? to ensure numbers border goes all the way down.
+	if (len <= MIN_LINES) {
+		for (let i = 0; i < MIN_LINES - len; i++) {
+			lines.push({
+				type: 'filler',
+				content: '',
+			});
+		}
+	}
+
+	return lines;
+});
+</script>
+
+<template>
+	<div :class="$style.container">
+		<div :class="$style.title">
+			{{ title }}
+		</div>
+		<div :class="$style.diffSection">
+			<div v-for="(diff, i) in diffs" :key="i" :class="$style.diff">
+				<div :class="$style.lineNumber">
+					<!-- ln1 is line number in original text -->
+					<!-- ln2 is line number in updated text -->
+					{{ diff.type === 'normal' ? diff.ln2 : diff.type === 'add' ? diff.ln : '' }}
+				</div>
+				<div :class="[$style[diff.type], $style.diffContent]">
+					<span v-if="diff.type === 'add'">&nbsp;+&nbsp;</span>
+					<span v-else-if="diff.type === 'del'">&nbsp;-&nbsp;</span>
+					<span v-else>&nbsp;&nbsp;&nbsp;</span>
+					<span>
+						{{ diff.content }}
+					</span>
+				</div>
+			</div>
+		</div>
+		<div :class="$style.actions">
+			<div v-if="error">
+				<n8n-icon icon="exclamation-triangle" color="danger" class="mr-5xs" />
+				<span :class="$style.infoText">{{ t('codeDiff.couldNotReplace') }}</span>
+			</div>
+			<div v-else-if="replaced">
+				<n8n-button type="secondary" size="mini" icon="undo" @click="() => emit('undo')">{{
+					t('codeDiff.undo')
+				}}</n8n-button>
+				<n8n-icon icon="check" color="success" class="ml-xs" />
+				<span :class="$style.infoText">{{ t('codeDiff.codeReplaced') }}</span>
+			</div>
+			<n8n-button
+				v-else
+				:type="replacing ? 'secondary' : 'primary'"
+				size="mini"
+				icon="refresh"
+				:disabled="!content || streaming"
+				:loading="replacing"
+				@click="() => emit('replace')"
+				>{{ replacing ? t('codeDiff.replacing') : t('codeDiff.replaceMyCode') }}</n8n-button
+			>
+		</div>
+	</div>
+</template>
+
+<style lang="scss" module>
+.container {
+	border: var(--border-base);
+	background-color: var(--color-foreground-xlight);
+	border-radius: var(--border-radius-base);
+}
+
+.title {
+	padding: var(--spacing-2xs);
+	font-weight: var(--font-weight-bold);
+	font-size: var(--font-size-2xs);
+	// ensure consistent spacing even if title is empty
+	min-height: 32.5px;
+	line-height: normal;
+	display: flex;
+}
+
+.lineNumber {
+	font-size: var(--font-size-3xs);
+	min-width: 18px;
+	max-width: 18px;
+	text-align: center;
+	border-right: var(--border-base);
+}
+
+.diffSection {
+	overflow: scroll;
+	border-top: var(--border-base);
+	border-bottom: var(--border-base);
+	max-height: 218px; // 12 lines
+	background-color: var(--color-background-base);
+	font-family: var(--font-family-monospace);
+}
+
+.diff {
+	display: flex;
+	font-size: var(--font-size-3xs);
+	line-height: 18px; /* 100% */
+	height: 18px;
+	max-height: 18px;
+}
+
+.diffContent {
+	width: auto;
+	text-wrap: nowrap;
+	display: flex;
+
+	> span {
+		display: flex;
+	}
+}
+
+.add {
+	color: var(--color-success);
+	background-color: var(--color-success-tint-2);
+}
+
+.del {
+	color: var(--color-danger);
+	background-color: var(--color-danger-tint-2);
+}
+
+.normal {
+	background-color: var(--color-foreground-xlight);
+}
+
+.actions {
+	padding: var(--spacing-2xs);
+}
+
+.infoText {
+	color: var(--color-text-light);
+	font-size: var(--font-size-xs);
+	margin-left: var(--spacing-4xs);
+}
+</style>
diff --git a/packages/design-system/src/components/InlineAskAssistantButton/InlineAskAssistantButton.stories.ts b/packages/design-system/src/components/InlineAskAssistantButton/InlineAskAssistantButton.stories.ts
new file mode 100644
index 0000000000000..fddc922050adc
--- /dev/null
+++ b/packages/design-system/src/components/InlineAskAssistantButton/InlineAskAssistantButton.stories.ts
@@ -0,0 +1,36 @@
+import InlineAskAssistantButton from './InlineAskAssistantButton.vue';
+import { action } from '@storybook/addon-actions';
+import type { StoryFn } from '@storybook/vue3';
+
+export default {
+	title: 'Assistant/InlineAskAssistantButton',
+	component: InlineAskAssistantButton,
+	argTypes: {},
+};
+
+const methods = {
+	onClick: action('click'),
+};
+
+const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({ args }),
+	props: Object.keys(argTypes),
+	components: {
+		InlineAskAssistantButton,
+	},
+	template: '<InlineAskAssistantButton v-bind="args" @click="onClick" />',
+	methods,
+});
+
+export const Default = Template.bind({});
+
+export const AskedButton = Template.bind({});
+AskedButton.args = {
+	asked: true,
+};
+
+export const Small = Template.bind({});
+Small.args = { size: 'small' };
+
+export const Static = Template.bind({});
+Static.args = { static: true };
diff --git a/packages/design-system/src/components/InlineAskAssistantButton/InlineAskAssistantButton.vue b/packages/design-system/src/components/InlineAskAssistantButton/InlineAskAssistantButton.vue
new file mode 100644
index 0000000000000..b314ecbfc7d59
--- /dev/null
+++ b/packages/design-system/src/components/InlineAskAssistantButton/InlineAskAssistantButton.vue
@@ -0,0 +1,125 @@
+<script setup lang="ts">
+import { computed } from 'vue';
+import AssistantIcon from '../AskAssistantIcon/AssistantIcon.vue';
+import AssistantText from '../AskAssistantText/AssistantText.vue';
+import { useI18n } from '../../composables/useI18n';
+
+const { t } = useI18n();
+
+interface Props {
+	size: 'small' | 'medium';
+	static: boolean;
+	asked: boolean;
+}
+
+const props = withDefaults(defineProps<Props>(), {
+	size: 'medium',
+	static: false,
+	asked: false,
+});
+
+const emit = defineEmits<{
+	click: [];
+}>();
+
+const sizes = {
+	medium: {
+		padding: '0px 12px',
+		height: '28px',
+	},
+	small: {
+		padding: '0px 6px',
+		height: '18px',
+	},
+};
+
+const hoverable = computed(() => !props.static && !props.asked);
+
+const onClick = () => {
+	if (hoverable.value) {
+		emit('click');
+	}
+};
+// todo hoverable class not clean below
+</script>
+
+<template>
+	<button
+		:class="{ [$style.button]: true, [$style.hoverable]: hoverable, [$style.asked]: asked }"
+		:style="{ height: sizes[size].height }"
+		:disabled="asked"
+		:tabindex="static ? '-1' : ''"
+		@click="onClick"
+	>
+		<div>
+			<div :style="{ padding: sizes[size].padding }">
+				<AssistantIcon :size="size" :class="$style.icon" :theme="asked ? 'disabled' : 'default'" />
+				<span v-if="asked">{{ t('inlineAskAssistantButton.asked') }}</span>
+				<AssistantText v-else :size="size" :text="t('askAssistantButton.askAssistant')" />
+			</div>
+		</div>
+	</button>
+</template>
+
+<style lang="scss" module>
+.button {
+	border-radius: var(--border-radius-base);
+	position: relative;
+	border: 0;
+	padding: 1px;
+
+	background: var(--color-assistant-highlight-gradient);
+
+	> div {
+		background-color: var(--color-askAssistant-button-background);
+		border-radius: inherit;
+		height: 100%;
+		overflow: hidden;
+
+		> div {
+			height: 100%;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			line-height: unset;
+		}
+	}
+}
+
+.hoverable {
+	&:hover {
+		cursor: pointer;
+		background: var(--color-assistant-highlight-reverse);
+
+		> div {
+			background: var(--color-askAssistant-button-background-hover);
+		}
+
+		> div > div {
+			background: var(--color-assistant-inner-highlight-hover);
+		}
+	}
+
+	&:active {
+		background: var(--color-assistant-highlight-gradient);
+
+		> div {
+			background: var(--color-askAssistant-button-background-active);
+		}
+
+		> div > div {
+			background: var(--color-assistant-inner-highlight-active);
+		}
+	}
+}
+
+.asked {
+	cursor: not-allowed;
+	background: var(--color-foreground-base);
+	color: var(--color-text-light);
+}
+
+.icon {
+	margin-right: var(--spacing-3xs);
+}
+</style>
diff --git a/packages/design-system/src/components/N8nAvatar/Avatar.vue b/packages/design-system/src/components/N8nAvatar/Avatar.vue
index 348af6ed4784a..9ec104a7ea809 100644
--- a/packages/design-system/src/components/N8nAvatar/Avatar.vue
+++ b/packages/design-system/src/components/N8nAvatar/Avatar.vue
@@ -7,8 +7,10 @@
 			variant="marble"
 			:colors="getColors(colors)"
 		/>
-		<span v-else :class="[$style.empty, $style[size]]" />
-		<span v-if="name" :class="$style.initials">{{ initials }}</span>
+		<div v-else :class="[$style.empty, $style[size]]"></div>
+		<span v-if="firstName || lastName" :class="[$style.initials, $style[`text-${size}`]]">
+			{{ initials }}
+		</span>
 	</span>
 </template>
 
@@ -20,7 +22,7 @@ import { getInitials } from '../../utils/labelUtil';
 interface AvatarProps {
 	firstName: string;
 	lastName: string;
-	size?: string;
+	size?: 'xsmall' | 'small' | 'medium' | 'large';
 	colors?: string[];
 }
 
@@ -47,6 +49,7 @@ const getColors = (colors: string[]): string[] => {
 };
 
 const sizes: { [size: string]: number } = {
+	xsmall: 20,
 	small: 28,
 	large: 48,
 	medium: 40,
@@ -78,6 +81,15 @@ const getSize = (size: string): number => sizes[size];
 	text-transform: uppercase;
 }
 
+.text-xsmall {
+	font-size: 6px;
+}
+
+.xsmall {
+	height: var(--spacing-m);
+	width: var(--spacing-m);
+}
+
 .small {
 	height: 28px;
 	width: 28px;
diff --git a/packages/design-system/src/components/N8nButton/Button.vue b/packages/design-system/src/components/N8nButton/Button.vue
index 7ce9d64176830..b9387d0c7b47f 100644
--- a/packages/design-system/src/components/N8nButton/Button.vue
+++ b/packages/design-system/src/components/N8nButton/Button.vue
@@ -13,8 +13,8 @@
 		}"
 	>
 		<span v-if="loading || icon" :class="$style.icon">
-			<N8nSpinner v-if="loading" :size="size" />
-			<N8nIcon v-else-if="icon" :icon="icon" :size="size" />
+			<N8nSpinner v-if="loading" :size="iconSize" />
+			<N8nIcon v-else-if="icon" :icon="icon" :size="iconSize" />
 		</span>
 		<span v-if="label || $slots.default">
 			<slot>{{ label }}</slot>
@@ -56,6 +56,8 @@ const ariaBusy = computed(() => (props.loading ? 'true' : undefined));
 const ariaDisabled = computed(() => (props.disabled ? 'true' : undefined));
 const isDisabled = computed(() => props.disabled || props.loading);
 
+const iconSize = computed(() => (props.size === 'mini' ? 'xsmall' : props.size));
+
 const classes = computed(() => {
 	return (
 		`button ${$style.button} ${$style[props.type]}` +
diff --git a/packages/design-system/src/components/N8nSpinner/Spinner.vue b/packages/design-system/src/components/N8nSpinner/Spinner.vue
index 76ed2f7f392b6..497ae554a8f1c 100644
--- a/packages/design-system/src/components/N8nSpinner/Spinner.vue
+++ b/packages/design-system/src/components/N8nSpinner/Spinner.vue
@@ -17,13 +17,14 @@ import N8nIcon from '../N8nIcon';
 const TYPE = ['dots', 'ring'] as const;
 
 interface SpinnerProps {
-	size?: Exclude<TextSize, 'xsmall' | 'mini' | 'xlarge'>;
+	size?: Exclude<TextSize, 'mini' | 'xlarge'>;
 	type?: (typeof TYPE)[number];
 }
 
 defineOptions({ name: 'N8nSpinner' });
 withDefaults(defineProps<SpinnerProps>(), {
 	type: 'dots',
+	size: 'medium',
 });
 </script>
 
diff --git a/packages/design-system/src/css/_primitives.scss b/packages/design-system/src/css/_primitives.scss
index bf7d9728af4c5..71c6b4c10fa6e 100644
--- a/packages/design-system/src/css/_primitives.scss
+++ b/packages/design-system/src/css/_primitives.scss
@@ -465,6 +465,8 @@
 		var(--prim-color-alt-k-s),
 		var(--prim-color-alt-k-l)
 	);
+
+	--prim-color-white: hsl(0, 0%, 100%);
 }
 
 :root {
diff --git a/packages/design-system/src/css/_tokens.dark.scss b/packages/design-system/src/css/_tokens.dark.scss
index 15930499e4097..6a812552ac5dd 100644
--- a/packages/design-system/src/css/_tokens.dark.scss
+++ b/packages/design-system/src/css/_tokens.dark.scss
@@ -33,6 +33,29 @@
 
 	// Secondary tokens
 
+	// AI Assistant
+	--color-assistant-highlight-1: #8c90f2;
+	--color-assistant-highlight-2: #a977f0;
+	--color-assistant-highlight-3: #f0778b;
+	--color-askAssistant-button-background: #2E2E2E;
+	--color-askAssistant-button-background-hover: #383839;
+	--color-askAssistant-button-background-active: #414244;
+	--color-assistant-inner-highlight-hover: var(--color-askAssistant-button-background-hover);
+	--color-assistant-inner-highlight-active: var(--color-askAssistant-button-background-active);
+
+	--color-assistant-highlight-gradient: linear-gradient(
+		105deg,
+		var(--color-assistant-highlight-1) 0%,
+		var(--color-assistant-highlight-2) 50%,
+		var(--color-assistant-highlight-3) 100%
+	);
+	--color-assistant-highlight-reverse: linear-gradient(
+		105deg,
+		var(--color-assistant-highlight-3) 0%,
+		var(--color-assistant-highlight-2) 50%,
+		var(--color-assistant-highlight-1) 100%
+	);
+
 	// LangChain
 	--color-lm-chat-messages-background: var(--prim-gray-820);
 	--color-lm-chat-bot-background: var(--prim-gray-740);
@@ -196,7 +219,7 @@
 	--color-notice-font: var(--prim-gray-0);
 
 	// Callout
-	--color-callout-info-border: var(--prim-gray-420);
+	--color-callout-info-border: var(--prim-gray-670);
 	--color-callout-info-background: var(--prim-gray-740);
 	--color-callout-info-font: var(--prim-gray-0);
 	--color-callout-success-border: var(--color-success);
diff --git a/packages/design-system/src/css/_tokens.scss b/packages/design-system/src/css/_tokens.scss
index c63c5eb64baf5..e65856f1922d4 100644
--- a/packages/design-system/src/css/_tokens.scss
+++ b/packages/design-system/src/css/_tokens.scss
@@ -110,6 +110,39 @@
 	--color-sticky-background-7: var(--prim-gray-10);
 	--color-sticky-border-7: var(--prim-gray-120);
 
+	// AI Assistant
+	--color-askAssistant-button-background: var(--color-background-xlight);
+	--color-askAssistant-button-background-hover: var(--color-background-xlight);
+	--color-askAssistant-button-background-active: var(--color-background-xlight);
+
+	--color-assistant-highlight-1: #5b60e8;
+	--color-assistant-highlight-2: #aa7bec;
+	--color-assistant-highlight-3: #ec7b8e;
+	--color-assistant-highlight-gradient: linear-gradient(
+		105deg,
+		var(--color-assistant-highlight-1) 0%,
+		var(--color-assistant-highlight-2) 50%,
+		var(--color-assistant-highlight-3) 100%
+	);
+	--color-assistant-highlight-reverse: linear-gradient(
+		105deg,
+		var(--color-assistant-highlight-3) 0%,
+		var(--color-assistant-highlight-2) 50%,
+		var(--color-assistant-highlight-1) 100%
+	);
+	--color-assistant-inner-highlight-hover: linear-gradient(
+		108.82deg,
+		rgba(236, 123, 142, 0.12) 0%,
+		rgba(170, 123, 236, 0.12) 50.5%,
+		rgba(91, 96, 232, 0.12) 100%
+	);
+	--color-assistant-inner-highlight-active: linear-gradient(
+		108.82deg,
+		rgba(236, 123, 142, 0.25) 0%,
+		rgba(170, 123, 236, 0.25) 50.5%,
+		rgba(91, 96, 232, 0.25) 100%
+	);
+
 	// NodeIcon
 	--color-node-icon-gray: var(--prim-gray-420);
 	--color-node-icon-black: var(--prim-gray-780);
diff --git a/packages/design-system/src/css/notification.scss b/packages/design-system/src/css/notification.scss
index 9ddd12ef9e777..80f698d3e2fa4 100644
--- a/packages/design-system/src/css/notification.scss
+++ b/packages/design-system/src/css/notification.scss
@@ -28,6 +28,10 @@
 		left: 16px;
 	}
 
+	&.content-toast {
+		position: absolute;
+	}
+
 	@include mixins.e(group) {
 		margin-left: var.$notification-group-margin-left;
 		margin-right: var.$notification-group-margin-right;
diff --git a/packages/design-system/src/locale/lang/en.ts b/packages/design-system/src/locale/lang/en.ts
index 5db6856b8683b..444acc61c0ce3 100644
--- a/packages/design-system/src/locale/lang/en.ts
+++ b/packages/design-system/src/locale/lang/en.ts
@@ -23,4 +23,27 @@ export default {
 		'You can style with <a href="https://docs.n8n.io/workflows/sticky-notes/" target="_blank">Markdown</a>',
 	'tags.showMore': (count: number) => `+${count} more`,
 	'datatable.pageSize': 'Page size',
+	'codeDiff.couldNotReplace': 'Could not replace code',
+	'codeDiff.codeReplaced': 'Code replaced',
+	'codeDiff.replaceMyCode': 'Replace my code',
+	'codeDiff.replacing': 'Replacing...',
+	'codeDiff.undo': 'Undo',
+	'betaTag.beta': 'beta',
+	'askAssistantButton.askAssistant': 'Ask Assistant',
+	'assistantChat.errorParsingMarkdown': 'Error parsing markdown content',
+	'assistantChat.aiAssistantLabel': 'AI Assistant',
+	'assistantChat.aiAssistantName': 'Ava',
+	'assistantChat.sessionEndMessage.1':
+		'This Assistant session has ended. To start a new session with the Assistant, click an',
+	'assistantChat.sessionEndMessage.2': 'button in n8n',
+	'assistantChat.you': 'You',
+	'assistantChat.quickRepliesTitle': 'Quick reply 👇',
+	'assistantChat.placeholder.1': (options: string[]) =>
+		`Hi ${options[0][0] || 'there'}, I'm ${options[0][1]} and I'm here to assist you with building workflows.`,
+	'assistantChat.placeholder.2':
+		"Whenever you encounter a task that I can help with, you'll see the",
+	'assistantChat.placeholder.3': 'button.',
+	'assistantChat.placeholder.4': 'Clicking it starts a chat session with me.',
+	'assistantChat.inputPlaceholder': 'Enter your response...',
+	'inlineAskAssistantButton.asked': 'Asked',
 } as N8nLocale;
diff --git a/packages/design-system/src/types/assistant.ts b/packages/design-system/src/types/assistant.ts
new file mode 100644
index 0000000000000..40e1340d46a6a
--- /dev/null
+++ b/packages/design-system/src/types/assistant.ts
@@ -0,0 +1,69 @@
+export namespace ChatUI {
+	export interface TextMessage {
+		role: 'assistant' | 'user';
+		type: 'text';
+		content: string;
+	}
+
+	export interface SummaryBlock {
+		role: 'assistant';
+		type: 'block';
+		title: string;
+		content: string;
+	}
+
+	interface CodeDiffMessage {
+		role: 'assistant';
+		type: 'code-diff';
+		description?: string;
+		codeDiff?: string;
+		replacing?: boolean;
+		replaced?: boolean;
+		error?: boolean;
+		suggestionId: string;
+	}
+
+	interface EndSessionMessage {
+		role: 'assistant';
+		type: 'event';
+		eventName: 'end-session';
+	}
+
+	export interface QuickReply {
+		type: string;
+		text: string;
+	}
+
+	export interface ErrorMessage {
+		role: 'assistant';
+		type: 'error';
+		content: string;
+	}
+
+	export interface AgentSuggestionMessage {
+		role: 'assistant';
+		type: 'agent-suggestion';
+		title: string;
+		content: string;
+		suggestionId: string;
+	}
+
+	type MessagesWithReplies = (
+		| TextMessage
+		| CodeDiffMessage
+		| SummaryBlock
+		| AgentSuggestionMessage
+	) & {
+		quickReplies?: QuickReply[];
+	};
+
+	export type AssistantMessage = (
+		| MessagesWithReplies
+		| ErrorMessage
+		| EndSessionMessage
+		| AgentSuggestionMessage
+	) & {
+		id: string;
+		read: boolean;
+	};
+}
diff --git a/packages/design-system/src/types/button.ts b/packages/design-system/src/types/button.ts
index c42794db0dd73..6fdb29c5ef69f 100644
--- a/packages/design-system/src/types/button.ts
+++ b/packages/design-system/src/types/button.ts
@@ -6,7 +6,7 @@ export type ButtonElement = (typeof BUTTON_ELEMENT)[number];
 const BUTTON_TYPE = ['primary', 'secondary', 'tertiary', 'success', 'warning', 'danger'] as const;
 export type ButtonType = (typeof BUTTON_TYPE)[number];
 
-const BUTTON_SIZE = ['small', 'medium', 'large'] as const;
+const BUTTON_SIZE = ['mini', 'small', 'medium', 'large'] as const;
 export type ButtonSize = (typeof BUTTON_SIZE)[number];
 
 const BUTTON_NATIVE_TYPE = ['submit', 'reset', 'button'] as const;
diff --git a/packages/editor-ui/src/App.vue b/packages/editor-ui/src/App.vue
index d07062db187f8..835ddd11c052e 100644
--- a/packages/editor-ui/src/App.vue
+++ b/packages/editor-ui/src/App.vue
@@ -26,8 +26,10 @@
 					<component :is="Component" v-else />
 				</router-view>
 			</div>
+			<AskAssistantChat />
 			<Modals />
 			<Telemetry />
+			<AskAssistantFloatingButton v-if="showAssistantButton" />
 		</div>
 	</div>
 </template>
@@ -40,6 +42,8 @@ import BannerStack from '@/components/banners/BannerStack.vue';
 import Modals from '@/components/Modals.vue';
 import LoadingView from '@/views/LoadingView.vue';
 import Telemetry from '@/components/Telemetry.vue';
+import AskAssistantChat from '@/components/AskAssistant/AskAssistantChat.vue';
+import AskAssistantFloatingButton from '@/components/AskAssistant/AskAssistantFloatingButton.vue';
 import { HIRING_BANNER, VIEWS } from '@/constants';
 
 import { loadLanguage } from '@/plugins/i18n';
@@ -57,6 +61,7 @@ import { useUsageStore } from '@/stores/usage.store';
 import { useUsersStore } from '@/stores/users.store';
 import { useHistoryHelper } from '@/composables/useHistoryHelper';
 import { useRoute } from 'vue-router';
+import { useAssistantStore } from './stores/assistant.store';
 
 export default defineComponent({
 	name: 'App',
@@ -65,6 +70,8 @@ export default defineComponent({
 		LoadingView,
 		Telemetry,
 		Modals,
+		AskAssistantChat,
+		AskAssistantFloatingButton,
 	},
 	setup() {
 		return {
@@ -76,6 +83,7 @@ export default defineComponent({
 	},
 	computed: {
 		...mapStores(
+			useAssistantStore,
 			useNodeTypesStore,
 			useRootStore,
 			useSettingsStore,
@@ -92,6 +100,9 @@ export default defineComponent({
 		isDemoMode(): boolean {
 			return this.$route.name === VIEWS.DEMO;
 		},
+		showAssistantButton(): boolean {
+			return this.assistantStore.canShowAssistantButtons;
+		},
 	},
 	data() {
 		return {
@@ -127,10 +138,10 @@ export default defineComponent({
 .container {
 	display: grid;
 	grid-template-areas:
-		'banners banners'
-		'sidebar header'
-		'sidebar content';
-	grid-auto-columns: fit-content($sidebar-expanded-width) 1fr;
+		'banners banners rightsidebar'
+		'sidebar header rightsidebar'
+		'sidebar content rightsidebar';
+	grid-auto-columns: minmax(0, max-content) minmax(100px, auto) minmax(0, max-content);
 	grid-template-rows: auto fit-content($header-height) 1fr;
 	height: 100vh;
 }
@@ -143,6 +154,7 @@ export default defineComponent({
 .content {
 	display: flex;
 	grid-area: content;
+	position: relative;
 	overflow: auto;
 	height: 100%;
 	width: 100%;
diff --git a/packages/editor-ui/src/__tests__/defaults.ts b/packages/editor-ui/src/__tests__/defaults.ts
index b6c22cbf7e0e1..3328ac9100efa 100644
--- a/packages/editor-ui/src/__tests__/defaults.ts
+++ b/packages/editor-ui/src/__tests__/defaults.ts
@@ -121,4 +121,7 @@ export const defaultSettings: IN8nUISettings = {
 	security: {
 		blockFileAccessToN8nFiles: false,
 	},
+	aiAssistant: {
+		enabled: false,
+	},
 };
diff --git a/packages/editor-ui/src/api/assistant.ts b/packages/editor-ui/src/api/assistant.ts
new file mode 100644
index 0000000000000..d9e9ec0cded21
--- /dev/null
+++ b/packages/editor-ui/src/api/assistant.ts
@@ -0,0 +1,25 @@
+import type { IRestApiContext } from '@/Interface';
+import type { ChatRequest, ReplaceCodeRequest } from '@/types/assistant.types';
+import { makeRestApiRequest, streamRequest } from '@/utils/apiUtils';
+
+export function chatWithAssistant(
+	ctx: IRestApiContext,
+	payload: ChatRequest.RequestPayload,
+	onMessageUpdated: (data: ChatRequest.ResponsePayload) => void,
+	onDone: () => void,
+	onError: (e: Error) => void,
+): void {
+	void streamRequest(ctx, '/ai-assistant/chat', payload, onMessageUpdated, onDone, onError);
+}
+
+export async function replaceCode(
+	context: IRestApiContext,
+	data: ReplaceCodeRequest.RequestPayload,
+): Promise<ReplaceCodeRequest.ResponsePayload> {
+	return await makeRestApiRequest<ReplaceCodeRequest.ResponsePayload>(
+		context,
+		'POST',
+		'/ai-assistant/chat/apply-suggestion',
+		data,
+	);
+}
diff --git a/packages/editor-ui/src/components/AskAssistant/AskAssistantChat.vue b/packages/editor-ui/src/components/AskAssistant/AskAssistantChat.vue
new file mode 100644
index 0000000000000..073b7f937f003
--- /dev/null
+++ b/packages/editor-ui/src/components/AskAssistant/AskAssistantChat.vue
@@ -0,0 +1,105 @@
+<script lang="ts" setup>
+import { useAssistantStore } from '@/stores/assistant.store';
+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 { useTelemetry } from '@/composables/useTelemetry';
+
+const assistantStore = useAssistantStore();
+const usersStore = useUsersStore();
+const telemetry = useTelemetry();
+
+const user = computed(() => ({
+	firstName: usersStore.currentUser?.firstName ?? '',
+	lastName: usersStore.currentUser?.lastName ?? '',
+}));
+
+function onResize(data: { direction: string; x: number; width: number }) {
+	assistantStore.updateWindowWidth(data.width);
+}
+
+function onResizeDebounced(data: { direction: string; x: number; width: number }) {
+	void useDebounce().callDebounced(onResize, { debounceTime: 10, trailing: true }, data);
+}
+
+async function onUserMessage(content: string, quickReplyType?: string) {
+	await assistantStore.sendMessage({ text: content, quickReplyType });
+	const task = 'error';
+	const solutionCount =
+		task === 'error'
+			? assistantStore.chatMessages.filter(
+					(msg) => msg.role === 'assistant' && !['text', 'event'].includes(msg.type),
+				).length
+			: null;
+	if (quickReplyType === 'all-good' || quickReplyType === 'still-stuck') {
+		telemetry.track('User gave feedback', {
+			task,
+			is_quick_reply: !!quickReplyType,
+			is_positive: quickReplyType === 'all-good',
+			solution_count: solutionCount,
+			response: content,
+		});
+	}
+}
+
+async function onCodeReplace(index: number) {
+	await assistantStore.applyCodeDiff(index);
+	telemetry.track('User clicked solution card action', {
+		action: 'replace_code',
+	});
+}
+
+async function undoCodeDiff(index: number) {
+	await assistantStore.undoCodeDiff(index);
+	telemetry.track('User clicked solution card action', {
+		action: 'undo_code_replace',
+	});
+}
+
+function onClose() {
+	assistantStore.closeChat();
+	telemetry.track('User closed assistant', { source: 'top-toggle' });
+}
+</script>
+
+<template>
+	<SlideTransition>
+		<n8n-resize-wrapper
+			v-if="assistantStore.isAssistantOpen"
+			:supported-directions="['left']"
+			:width="assistantStore.chatWidth"
+			:class="$style.container"
+			@resize="onResizeDebounced"
+		>
+			<div
+				:style="{ width: `${assistantStore.chatWidth}px` }"
+				:class="$style.wrapper"
+				data-test-id="ask-assistant-chat"
+			>
+				<AskAssistantChat
+					:user="user"
+					:messages="assistantStore.chatMessages"
+					:streaming="assistantStore.streaming"
+					@close="onClose"
+					@message="onUserMessage"
+					@code-replace="onCodeReplace"
+					@code-undo="undoCodeDiff"
+				/>
+			</div>
+		</n8n-resize-wrapper>
+	</SlideTransition>
+</template>
+
+<style module>
+.container {
+	grid-area: rightsidebar;
+	height: 100%;
+	z-index: 3000; /* Above NDV, below notifications */
+}
+
+.wrapper {
+	height: 100%;
+}
+</style>
diff --git a/packages/editor-ui/src/components/AskAssistant/AskAssistantFloatingButton.vue b/packages/editor-ui/src/components/AskAssistant/AskAssistantFloatingButton.vue
new file mode 100644
index 0000000000000..533985396c03e
--- /dev/null
+++ b/packages/editor-ui/src/components/AskAssistant/AskAssistantFloatingButton.vue
@@ -0,0 +1,98 @@
+<script setup lang="ts">
+import { useI18n } from '@/composables/useI18n';
+import { useTelemetry } from '@/composables/useTelemetry';
+import { useAssistantStore } from '@/stores/assistant.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+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();
+const i18n = useI18n();
+const telemetry = useTelemetry();
+const workflowStore = useWorkflowsStore();
+
+const lastUnread = computed(() => {
+	const msg = assistantStore.lastUnread;
+	if (msg?.type === 'block') {
+		return msg.title;
+	}
+	if (msg?.type === 'text') {
+		return msg.content;
+	}
+	if (msg?.type === 'code-diff') {
+		return msg.description;
+	}
+	return '';
+});
+
+const onClick = () => {
+	assistantStore.openChat();
+	telemetry.track(
+		'User opened assistant',
+		{
+			source: 'canvas',
+			task: 'placeholder',
+			has_existing_session: !assistantStore.isSessionEnded,
+			workflow_id: workflowStore.workflowId,
+		},
+		{ withPostHog: true },
+	);
+};
+</script>
+
+<template>
+	<div
+		v-if="assistantStore.canShowAssistantButtons && !assistantStore.isAssistantOpen"
+		:class="$style.container"
+	>
+		<n8n-tooltip
+			:z-index="4000"
+			placement="top"
+			:visible="!!lastUnread"
+			:popper-class="$style.tooltip"
+		>
+			<template #content>
+				<div :class="$style.text">{{ lastUnread }}</div>
+				<div :class="$style.assistant">
+					<AssistantAvatar size="mini" />
+					<span>{{ i18n.baseText('aiAssistant.name') }}</span>
+				</div>
+			</template>
+			<AskAssistantButton :unread-count="assistantStore.unreadCount" @click="onClick" />
+		</n8n-tooltip>
+	</div>
+</template>
+
+<style lang="scss" module>
+.container {
+	position: absolute;
+	bottom: var(--spacing-s);
+	right: var(--spacing-s);
+	z-index: 3000;
+}
+
+.tooltip {
+	min-width: 150px;
+	max-width: 265px !important;
+	line-height: normal;
+}
+
+.assistant {
+	font-size: var(--font-size-3xs);
+	line-height: var(--spacing-s);
+	font-weight: var(--font-weight-bold);
+	margin-top: var(--spacing-xs);
+	> span {
+		margin-left: var(--spacing-4xs);
+	}
+}
+
+.text {
+	overflow: hidden;
+	display: -webkit-box;
+	-webkit-line-clamp: 2; /* number of lines to show */
+	line-clamp: 2;
+	-webkit-box-orient: vertical;
+}
+</style>
diff --git a/packages/editor-ui/src/components/AskAssistant/NewAssistantSessionModal.vue b/packages/editor-ui/src/components/AskAssistant/NewAssistantSessionModal.vue
new file mode 100644
index 0000000000000..173f8a1902eee
--- /dev/null
+++ b/packages/editor-ui/src/components/AskAssistant/NewAssistantSessionModal.vue
@@ -0,0 +1,98 @@
+<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 { useI18n } from '@/composables/useI18n';
+import { useUIStore } from '@/stores/ui.store';
+import type { ChatRequest } from '@/types/assistant.types';
+import { useAssistantStore } from '@/stores/assistant.store';
+import { useTelemetry } from '@/composables/useTelemetry';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+
+const i18n = useI18n();
+const uiStore = useUIStore();
+const assistantStore = useAssistantStore();
+const workflowsStore = useWorkflowsStore();
+const telemetry = useTelemetry();
+
+const props = defineProps<{
+	name: string;
+	data: {
+		context: ChatRequest.ErrorContext;
+	};
+}>();
+
+const close = () => {
+	uiStore.closeModal(NEW_ASSISTANT_SESSION_MODAL);
+};
+
+const startNewSession = async () => {
+	await assistantStore.initErrorHelper(props.data.context);
+	telemetry.track(
+		'User opened assistant',
+		{
+			source: 'error',
+			task: 'error',
+			has_existing_session: true,
+			workflow_id: workflowsStore.workflowId,
+			node_type: props.data.context.node.type,
+			error: props.data.context.error,
+			chat_session_id: assistantStore.currentSessionId,
+		},
+		{ withPostHog: true },
+	);
+	close();
+};
+</script>
+
+<template>
+	<Modal width="460px" height="250px" :name="NEW_ASSISTANT_SESSION_MODAL" :center="true">
+		<template #header>
+			{{ i18n.baseText('aiAssistant.newSessionModal.title.part1') }}
+			<span :class="$style.assistantIcon"><AssistantIcon size="medium" /></span>
+			<AssistantText size="xlarge" :text="i18n.baseText('aiAssistant.assistant')" />
+			{{ i18n.baseText('aiAssistant.newSessionModal.title.part2') }}
+		</template>
+		<template #content>
+			<div :class="$style.container">
+				<p>
+					<n8n-text>{{ i18n.baseText('aiAssistant.newSessionModal.message') }}</n8n-text>
+				</p>
+				<p>
+					<n8n-text>{{ i18n.baseText('aiAssistant.newSessionModal.question') }}</n8n-text>
+				</p>
+			</div>
+		</template>
+		<template #footer>
+			<div :class="$style.footer">
+				<n8n-button :label="$locale.baseText('generic.cancel')" type="secondary" @click="close" />
+				<n8n-button
+					:label="$locale.baseText('aiAssistant.newSessionModal.confirm')"
+					@click="startNewSession"
+				/>
+			</div>
+		</template>
+	</Modal>
+</template>
+
+<style lang="scss" module>
+.container {
+	p {
+		line-height: normal;
+	}
+	p + p {
+		margin-top: 10px;
+	}
+}
+
+.assistantIcon {
+	margin-right: var(--spacing-4xs);
+}
+
+.footer {
+	display: flex;
+	gap: 10px;
+	justify-content: flex-end;
+}
+</style>
diff --git a/packages/editor-ui/src/components/CanvasControls.vue b/packages/editor-ui/src/components/CanvasControls.vue
index de0ff8eb7cdbe..495a1ac8ed8d8 100644
--- a/packages/editor-ui/src/components/CanvasControls.vue
+++ b/packages/editor-ui/src/components/CanvasControls.vue
@@ -94,8 +94,8 @@ onBeforeUnmount(() => {
 <style lang="scss" module>
 .zoomMenu {
 	position: absolute;
-	bottom: var(--spacing-l);
-	left: var(--spacing-l);
+	bottom: var(--spacing-s);
+	left: var(--spacing-s);
 	line-height: 25px;
 	color: #444;
 	padding-right: 5px;
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue b/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
index d59a13e98ee60..fc141304f324b 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
+++ b/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
@@ -122,6 +122,8 @@ const telemetry = useTelemetry();
 onMounted(() => {
 	if (!props.isReadOnly) codeNodeEditorEventBus.on('error-line-number', highlightLine);
 
+	codeNodeEditorEventBus.on('codeDiffApplied', diffApplied);
+
 	const { isReadOnly, language } = props;
 	const extensions: Extension[] = [
 		...readOnlyEditorExtensions,
@@ -187,6 +189,7 @@ onMounted(() => {
 });
 
 onBeforeUnmount(() => {
+	codeNodeEditorEventBus.off('codeDiffApplied', diffApplied);
 	if (!props.isReadOnly) codeNodeEditorEventBus.off('error-line-number', highlightLine);
 });
 
@@ -214,6 +217,22 @@ const languageExtensions = computed<[LanguageSupport, ...Extension[]]>(() => {
 	}
 });
 
+watch(
+	() => props.modelValue,
+	(newValue) => {
+		if (!editor.value) {
+			return;
+		}
+		const current = editor.value.state.doc.toString();
+		if (current === newValue) {
+			return;
+		}
+		editor.value.dispatch({
+			changes: { from: 0, to: getCurrentEditorContent().length, insert: newValue },
+		});
+	},
+);
+
 watch(
 	() => props.mode,
 	(_newMode, previousMode: CodeExecutionMode) => {
@@ -331,6 +350,13 @@ function getLine(lineNumber: number): Line | null {
 	}
 }
 
+function diffApplied() {
+	codeNodeEditorContainerRef.value?.classList.add('flash-editor');
+	codeNodeEditorContainerRef.value?.addEventListener('animationend', () => {
+		codeNodeEditorContainerRef.value?.classList.remove('flash-editor');
+	});
+}
+
 function highlightLine(lineNumber: number | 'final') {
 	if (!editor.value) return;
 
@@ -399,6 +425,25 @@ function onAiLoadEnd() {
 		border: 0;
 	}
 }
+
+@keyframes backgroundAnimation {
+	0% {
+		background-color: none;
+	}
+	30% {
+		background-color: rgba(41, 163, 102, 0.1);
+	}
+	100% {
+		background-color: none;
+	}
+}
+
+.flash-editor {
+	:deep(.cm-editor),
+	:deep(.cm-gutter) {
+		animation: backgroundAnimation 1.5s ease-in-out;
+	}
+}
 </style>
 
 <style lang="scss" module>
diff --git a/packages/editor-ui/src/components/Error/NodeErrorView.vue b/packages/editor-ui/src/components/Error/NodeErrorView.vue
index 6b6238338d25e..2aff0307af5d7 100644
--- a/packages/editor-ui/src/components/Error/NodeErrorView.vue
+++ b/packages/editor-ui/src/components/Error/NodeErrorView.vue
@@ -16,10 +16,18 @@ import type {
 	NodeOperationError,
 } from 'n8n-workflow';
 import { sanitizeHtml } from '@/utils/htmlUtils';
-import { MAX_DISPLAY_DATA_SIZE } from '@/constants';
+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 { useUIStore } from '@/stores/ui.store';
+import { isCommunityPackageName } from '@/utils/nodeTypesUtils';
+import { useTelemetry } from '@/composables/useTelemetry';
+import { useWorkflowsStore } from '@/stores/workflows.store';
 
 type Props = {
+	// TODO: .node can be undefined
 	error: NodeError | NodeApiError | NodeOperationError;
 	compact?: boolean;
 };
@@ -32,17 +40,24 @@ const i18n = useI18n();
 const nodeTypesStore = useNodeTypesStore();
 const ndvStore = useNDVStore();
 const rootStore = useRootStore();
+const assistantStore = useAssistantStore();
+const workflowsStore = useWorkflowsStore();
+const uiStore = useUIStore();
+const telemetry = useTelemetry();
 
 const displayCause = computed(() => {
 	return JSON.stringify(props.error.cause ?? '').length < MAX_DISPLAY_DATA_SIZE;
 });
 
+const node = computed(() => {
+	return props.error.node || ndvStore.activeNode;
+});
+
 const parameters = computed<INodeProperties[]>(() => {
-	const node = ndvStore.activeNode;
-	if (!node) {
+	if (!node.value) {
 		return [];
 	}
-	const nodeType = nodeTypesStore.getNodeType(node.type, node.typeVersion);
+	const nodeType = nodeTypesStore.getNodeType(node.value.type, node.value.typeVersion);
 
 	if (nodeType === null) {
 		return [];
@@ -67,13 +82,12 @@ const hasManyInputItems = computed(() => {
 });
 
 const nodeDefaultName = computed(() => {
-	const node = props.error?.node;
-	if (!node) {
+	if (!node.value) {
 		return 'Node';
 	}
 
-	const nodeType = nodeTypesStore.getNodeType(node.type, node.typeVersion);
-	return nodeType?.defaults?.name || node.name;
+	const nodeType = nodeTypesStore.getNodeType(node.value.type, node.value.typeVersion);
+	return nodeType?.defaults?.name || node.value.name;
 });
 
 const prepareRawMessages = computed(() => {
@@ -104,6 +118,43 @@ const prepareRawMessages = computed(() => {
 	return returnData;
 });
 
+const isAskAssistantAvailable = computed(() => {
+	if (!node.value) {
+		return false;
+	}
+	const isCustomNode = node.value.type === undefined || isCommunityPackageName(node.value.type);
+	return assistantStore.canShowAssistantButtons && !isCustomNode;
+});
+
+const assistantAlreadyAsked = computed(() => {
+	return assistantStore.isNodeErrorActive({
+		error: simplifyErrorForAssistant(props.error),
+		node: props.error.node || ndvStore.activeNode,
+	});
+});
+
+function simplifyErrorForAssistant(
+	error: NodeError | NodeApiError | NodeOperationError,
+): ChatRequest.ErrorContext['error'] {
+	const simple: ChatRequest.ErrorContext['error'] = {
+		name: error.name,
+		message: error.message,
+	};
+	if ('type' in error) {
+		simple.type = error.type;
+	}
+	if ('description' in error && error.description) {
+		simple.description = error.description;
+	}
+	if (error.stack) {
+		simple.stack = error.stack;
+	}
+	if ('lineNumber' in error) {
+		simple.lineNumber = error.lineNumber;
+	}
+	return simple;
+}
+
 function nodeVersionTag(nodeType: NodeError['node']): string {
 	if (!nodeType || ('hidden' in nodeType && nodeType.hidden)) {
 		return i18n.baseText('nodeSettings.deprecated');
@@ -364,6 +415,41 @@ function copySuccess() {
 		type: 'info',
 	});
 }
+
+async function onAskAssistantClick() {
+	const { message, lineNumber, description } = props.error;
+	const sessionInProgress = !assistantStore.isSessionEnded;
+	const errorPayload: ChatRequest.ErrorContext = {
+		error: {
+			name: props.error.name,
+			message,
+			lineNumber,
+			description: description ?? getErrorDescription(),
+			type: 'type' in props.error ? props.error.type : undefined,
+		},
+		node: node.value,
+	};
+	if (sessionInProgress) {
+		uiStore.openModalWithData({
+			name: NEW_ASSISTANT_SESSION_MODAL,
+			data: { context: errorPayload },
+		});
+		return;
+	}
+	await assistantStore.initErrorHelper(errorPayload);
+	telemetry.track(
+		'User opened assistant',
+		{
+			source: 'error',
+			task: 'error',
+			has_existing_session: false,
+			workflow_id: workflowsStore.workflowId,
+			node_type: node.value.type,
+			error: props.error,
+		},
+		{ withPostHog: true },
+	);
+}
 </script>
 
 <template>
@@ -380,6 +466,9 @@ function copySuccess() {
 				class="node-error-view__header-description"
 				v-html="getErrorDescription()"
 			></div>
+			<div v-if="isAskAssistantAvailable" class="node-error-view__assistant-button">
+				<InlineAskAssistantButton :asked="assistantAlreadyAsked" @click="onAskAssistantClick" />
+			</div>
 		</div>
 
 		<div v-if="!compact" class="node-error-view__info">
@@ -636,6 +725,11 @@ function copySuccess() {
 		}
 	}
 
+	&__assistant-button {
+		margin-left: var(--spacing-s);
+		margin-bottom: var(--spacing-xs);
+	}
+
 	&__debugging {
 		font-size: var(--font-size-s);
 
@@ -765,4 +859,8 @@ function copySuccess() {
 		}
 	}
 }
+
+.node-error-view__assistant-button {
+	margin-top: var(--spacing-xs);
+}
 </style>
diff --git a/packages/editor-ui/src/components/Modals.vue b/packages/editor-ui/src/components/Modals.vue
index adf39802375f0..17fd5ea9c731e 100644
--- a/packages/editor-ui/src/components/Modals.vue
+++ b/packages/editor-ui/src/components/Modals.vue
@@ -14,6 +14,7 @@ import {
 	PERSONALIZATION_MODAL_KEY,
 	TAGS_MANAGER_MODAL_KEY,
 	NPS_SURVEY_MODAL_KEY,
+	NEW_ASSISTANT_SESSION_MODAL,
 	VERSIONS_MODAL_KEY,
 	WORKFLOW_ACTIVE_MODAL_KEY,
 	WORKFLOW_LM_CHAT_MODAL_KEY,
@@ -64,6 +65,7 @@ import WorkflowHistoryVersionRestoreModal from '@/components/WorkflowHistory/Wor
 import SetupWorkflowCredentialsModal from '@/components/SetupWorkflowCredentialsModal/SetupWorkflowCredentialsModal.vue';
 import ProjectMoveResourceModal from '@/components/Projects/ProjectMoveResourceModal.vue';
 import ProjectMoveResourceConfirmModal from '@/components/Projects/ProjectMoveResourceConfirmModal.vue';
+import NewAssistantSessionModal from '@/components/AskAssistant/NewAssistantSessionModal.vue';
 import PromptMfaCodeModal from './PromptMfaCodeModal/PromptMfaCodeModal.vue';
 </script>
 
@@ -250,5 +252,10 @@ import PromptMfaCodeModal from './PromptMfaCodeModal/PromptMfaCodeModal.vue';
 				/>
 			</template>
 		</ModalRoot>
+		<ModalRoot :name="NEW_ASSISTANT_SESSION_MODAL">
+			<template #default="{ modalName, data }">
+				<NewAssistantSessionModal :name="modalName" :data="data" />
+			</template>
+		</ModalRoot>
 	</div>
 </template>
diff --git a/packages/editor-ui/src/components/Node/NodeCreation.vue b/packages/editor-ui/src/components/Node/NodeCreation.vue
index 15c8193dc0d7b..dd6f876d30ee8 100644
--- a/packages/editor-ui/src/components/Node/NodeCreation.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreation.vue
@@ -112,7 +112,7 @@ function nodeTypeSelected(nodeTypes: string[]) {
 					placement="left"
 				>
 					<n8n-icon-button
-						size="xlarge"
+						size="large"
 						icon="plus"
 						type="tertiary"
 						:class="$style.nodeCreatorPlus"
@@ -173,24 +173,11 @@ function nodeTypeSelected(nodeTypes: string[]) {
 .nodeCreatorButton {
 	position: absolute;
 	text-align: center;
-	top: var(--spacing-l);
-	right: var(--spacing-l);
+	top: var(--spacing-s);
+	right: var(--spacing-s);
 	pointer-events: all !important;
-
-	button {
-		border-color: var(--color-button-node-creator-border-font);
-		color: var(--color-button-node-creator-border-font);
-
-		&:hover {
-			color: var(--color-button-node-creator-hover-font);
-			border-color: var(--color-button-node-creator-hover-border);
-			background: var(--color-button-node-creator-background);
-		}
-	}
 }
 .nodeCreatorPlus {
-	border-width: 2px;
-	border-radius: var(--border-radius-base);
 	width: 36px;
 	height: 36px;
 }
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/NodeCreator.vue b/packages/editor-ui/src/components/Node/NodeCreator/NodeCreator.vue
index 923a2234029b1..2f886b414c2ff 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/NodeCreator.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/NodeCreator.vue
@@ -38,6 +38,7 @@ import NodesListPanel from './Panel/NodesListPanel.vue';
 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';
 
 export interface Props {
 	active?: boolean;
@@ -52,6 +53,7 @@ const emit = defineEmits<{
 	nodeTypeSelected: [value: string[]];
 }>();
 const uiStore = useUIStore();
+const assistantStore = useAssistantStore();
 
 const { setShowScrim, setActions, setMergeNodes } = useNodeCreatorStore();
 const { generateMergedNodesAndActions } = useActionsGenerator();
@@ -66,7 +68,8 @@ const showScrim = computed(() => useNodeCreatorStore().showScrim);
 const viewStacksLength = computed(() => useViewStacks().viewStacks.length);
 
 const nodeCreatorInlineStyle = computed(() => {
-	return { top: `${uiStore.bannersHeight + uiStore.headerHeight}px` };
+	const rightPosition = assistantStore.isAssistantOpen ? assistantStore.chatWidth : 0;
+	return { top: `${uiStore.bannersHeight + uiStore.headerHeight}px`, right: `${rightPosition}px` };
 });
 function onMouseUpOutside() {
 	if (state.mousedownInsideEvent) {
diff --git a/packages/editor-ui/src/components/NodeSettings.vue b/packages/editor-ui/src/components/NodeSettings.vue
index 269d21235588d..f07dfd231c68b 100644
--- a/packages/editor-ui/src/components/NodeSettings.vue
+++ b/packages/editor-ui/src/components/NodeSettings.vue
@@ -237,6 +237,7 @@ import { useExternalHooks } from '@/composables/useExternalHooks';
 import { useNodeHelpers } from '@/composables/useNodeHelpers';
 import { importCurlEventBus } from '@/event-bus';
 import { useToast } from '@/composables/useToast';
+import { ndvEventBus } from '@/event-bus';
 
 export default defineComponent({
 	name: 'NodeSettings',
@@ -480,10 +481,12 @@ export default defineComponent({
 
 		this.nodeHelpers.updateNodeParameterIssues(this.node as INodeUi, this.nodeType);
 		importCurlEventBus.on('setHttpNodeParameters', this.setHttpNodeParameters);
+		ndvEventBus.on('updateParameterValue', this.valueChanged);
 	},
 	beforeUnmount() {
 		this.eventBus?.off('openSettings', this.openSettings);
 		importCurlEventBus.off('setHttpNodeParameters', this.setHttpNodeParameters);
+		ndvEventBus.off('updateParameterValue', this.valueChanged);
 	},
 	methods: {
 		setHttpNodeParameters(parameters: NodeParameterValueType) {
diff --git a/packages/editor-ui/src/components/banners/BaseBanner.vue b/packages/editor-ui/src/components/banners/BaseBanner.vue
index 050b35600f441..32af54cec0d90 100644
--- a/packages/editor-ui/src/components/banners/BaseBanner.vue
+++ b/packages/editor-ui/src/components/banners/BaseBanner.vue
@@ -33,6 +33,7 @@ async function onCloseClick() {
 </script>
 <template>
 	<n8n-callout
+		:class="$style.callout"
 		:theme="props.theme"
 		:icon="props.customIcon"
 		icon-size="medium"
@@ -60,6 +61,10 @@ async function onCloseClick() {
 </template>
 
 <style lang="scss" module>
+.callout {
+	height: calc(var(--header-height) * 1px);
+}
+
 .mainContent {
 	display: flex;
 	gap: var(--spacing-4xs);
diff --git a/packages/editor-ui/src/components/banners/__tests__/__snapshots__/V1Banner.spec.ts.snap b/packages/editor-ui/src/components/banners/__tests__/__snapshots__/V1Banner.spec.ts.snap
index 9f153ce0f58f3..afc0523e0cad7 100644
--- a/packages/editor-ui/src/components/banners/__tests__/__snapshots__/V1Banner.spec.ts.snap
+++ b/packages/editor-ui/src/components/banners/__tests__/__snapshots__/V1Banner.spec.ts.snap
@@ -3,7 +3,7 @@
 exports[`V1 Banner > should render banner 1`] = `
 <div>
   <n8n-callout
-    class="v1container"
+    class="callout v1container"
     data-test-id="banners-V1"
     icon="info-circle"
     icon-size="medium"
@@ -34,7 +34,7 @@ exports[`V1 Banner > should render banner 1`] = `
 exports[`V1 Banner > should render banner with dismiss call if user is owner 1`] = `
 <div>
   <n8n-callout
-    class="v1container"
+    class="callout v1container"
     data-test-id="banners-V1"
     icon="info-circle"
     icon-size="medium"
diff --git a/packages/editor-ui/src/composables/usePushConnection.ts b/packages/editor-ui/src/composables/usePushConnection.ts
index 8018f1bfed7da..7c5c229a19fed 100644
--- a/packages/editor-ui/src/composables/usePushConnection.ts
+++ b/packages/editor-ui/src/composables/usePushConnection.ts
@@ -41,6 +41,7 @@ import { useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
 import { useI18n } from '@/composables/useI18n';
 import { useTelemetry } from '@/composables/useTelemetry';
 import type { PushMessageQueueItem } from '@/types';
+import { useAssistantStore } from '@/stores/assistant.store';
 
 export function usePushConnection({ router }: { router: ReturnType<typeof useRouter> }) {
 	const workflowHelpers = useWorkflowHelpers({ router });
@@ -57,6 +58,7 @@ export function usePushConnection({ router }: { router: ReturnType<typeof useRou
 	const settingsStore = useSettingsStore();
 	const uiStore = useUIStore();
 	const workflowsStore = useWorkflowsStore();
+	const assistantStore = useAssistantStore();
 
 	const retryTimeout = ref<NodeJS.Timeout | null>(null);
 	const pushMessageQueue = ref<PushMessageQueueItem[]>([]);
@@ -535,6 +537,7 @@ export function usePushConnection({ router }: { router: ReturnType<typeof useRou
 			const pushData = receivedData.data;
 			workflowsStore.addNodeExecutionData(pushData);
 			workflowsStore.removeExecutingNode(pushData.nodeName);
+			void assistantStore.onNodeExecution(pushData);
 		} else if (receivedData.type === 'nodeExecuteBefore') {
 			// A node started to be executed. Set it as executing.
 			const pushData = receivedData.data;
diff --git a/packages/editor-ui/src/composables/useToast.ts b/packages/editor-ui/src/composables/useToast.ts
index f7b6df0f80575..7b8a22d15c7a7 100644
--- a/packages/editor-ui/src/composables/useToast.ts
+++ b/packages/editor-ui/src/composables/useToast.ts
@@ -20,6 +20,10 @@ export interface NotificationErrorWithNodeAndDescription extends ApplicationErro
 const messageDefaults: Partial<Omit<NotificationOptions, 'message'>> = {
 	dangerouslyUseHTMLString: false,
 	position: 'bottom-right',
+	zIndex: 3000, // above NDV and chat window
+	offset: 64,
+	appendTo: '#node-view-root',
+	customClass: 'content-toast',
 };
 
 const stickyNotificationQueue: NotificationHandle[] = [];
@@ -154,7 +158,9 @@ export function useToast() {
 	}
 
 	function showAlert(config: NotificationOptions): NotificationHandle {
-		return Notification(config);
+		return Notification({
+			...config,
+		});
 	}
 
 	function causedByCredential(message: string | undefined) {
diff --git a/packages/editor-ui/src/constants.ts b/packages/editor-ui/src/constants.ts
index be53fcb64a82e..264dc9fb7e349 100644
--- a/packages/editor-ui/src/constants.ts
+++ b/packages/editor-ui/src/constants.ts
@@ -65,7 +65,7 @@ export const WORKFLOW_HISTORY_VERSION_RESTORE = 'workflowHistoryVersionRestore';
 export const SETUP_CREDENTIALS_MODAL_KEY = 'setupCredentials';
 export const PROJECT_MOVE_RESOURCE_MODAL = 'projectMoveResourceModal';
 export const PROJECT_MOVE_RESOURCE_CONFIRM_MODAL = 'projectMoveResourceConfirmModal';
-
+export const NEW_ASSISTANT_SESSION_MODAL = 'newAssistantSession';
 export const EXTERNAL_SECRETS_PROVIDER_MODAL_KEY = 'externalSecretsProvider';
 
 export const COMMUNITY_PACKAGE_MANAGE_ACTIONS = {
@@ -628,6 +628,7 @@ export const enum STORES {
 	CLOUD_PLAN = 'cloudPlan',
 	RBAC = 'rbac',
 	PUSH = 'push',
+	ASSISTANT = 'assistant',
 	BECOME_TEMPLATE_CREATOR = 'becomeTemplateCreator',
 }
 
@@ -668,10 +669,17 @@ export const CANVAS_AUTO_ADD_MANUAL_TRIGGER_EXPERIMENT = {
 	variant: 'variant',
 };
 
+export const AI_ASSISTANT_EXPERIMENT = {
+	name: '021_ai_debug_helper',
+	control: 'control',
+	variant: 'variant',
+};
+
 export const EXPERIMENTS_TO_TRACK = [
 	ASK_AI_EXPERIMENT.name,
 	TEMPLATE_CREDENTIAL_SETUP_EXPERIMENT,
 	CANVAS_AUTO_ADD_MANUAL_TRIGGER_EXPERIMENT.name,
+	AI_ASSISTANT_EXPERIMENT.name,
 ];
 
 export const MFA_FORM = {
diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json
index 2749a8b3502df..b082675d2d077 100644
--- a/packages/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/editor-ui/src/plugins/i18n/locales/en.json
@@ -131,6 +131,16 @@
 	"auth.signup.setupYourAccount": "Set up your account",
 	"auth.signup.setupYourAccountError": "Problem setting up your account",
 	"auth.signup.tokenValidationError": "Issue validating invite token",
+	"aiAssistant.name": "Ava",
+	"aiAssistant.assistant": "AI Assistant",
+	"aiAssistant.newSessionModal.title.part1": "Start new",
+	"aiAssistant.newSessionModal.title.part2": "session",
+	"aiAssistant.newSessionModal.message": "You already have an active AI Assistant session. Starting a new session will clear your current conversation history.",
+	"aiAssistant.newSessionModal.question": "Are you sure you want to start a new session?",
+	"aiAssistant.newSessionModal.confirm": "Start new session",
+	"aiAssistant.serviceError.message": "Unable to connect to n8n's AI service",
+	"aiAssistant.codeUpdated.message.title": "Ava modified workflow",
+	"aiAssistant.codeUpdated.message.body": "Open the <a data-action='openNodeDetail' data-action-parameter-node='{nodeName}'>{nodeName}</a> node to see the changes",
 	"banners.confirmEmail.message.1": "To secure your account and prevent future access issues, please confirm your",
 	"banners.confirmEmail.message.2": "email address.",
 	"banners.confirmEmail.button": "Confirm email",
diff --git a/packages/editor-ui/src/plugins/icons/custom.ts b/packages/editor-ui/src/plugins/icons/custom.ts
index b8c0ac28003d4..63a247459d3c7 100644
--- a/packages/editor-ui/src/plugins/icons/custom.ts
+++ b/packages/editor-ui/src/plugins/icons/custom.ts
@@ -35,3 +35,16 @@ export const faXmark: IconDefinition = {
 		'M342.6 150.6c12.5-12.5 12.5-32.8 0-45.3s-32.8-12.5-45.3 0L192 210.7 86.6 105.4c-12.5-12.5-32.8-12.5-45.3 0s-12.5 32.8 0 45.3L146.7 256 41.4 361.4c-12.5 12.5-12.5 32.8 0 45.3s32.8 12.5 45.3 0L192 301.3 297.4 406.6c12.5 12.5 32.8 12.5 45.3 0s12.5-32.8 0-45.3L237.3 256 342.6 150.6z',
 	],
 };
+
+export const faRefresh: IconDefinition = {
+	prefix: 'fas' as IconPrefix,
+	iconName: 'refresh' as IconName,
+
+	icon: [
+		12,
+		13,
+		[],
+		'',
+		'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',
+	],
+};
diff --git a/packages/editor-ui/src/plugins/icons/index.ts b/packages/editor-ui/src/plugins/icons/index.ts
index 1275361e275b6..3ec66cb308058 100644
--- a/packages/editor-ui/src/plugins/icons/index.ts
+++ b/packages/editor-ui/src/plugins/icons/index.ts
@@ -159,8 +159,9 @@ import {
 	faProjectDiagram,
 	faStream,
 	faPowerOff,
+	faPaperPlane,
 } from '@fortawesome/free-solid-svg-icons';
-import { faVariable, faXmark, faVault } from './custom';
+import { faVariable, faXmark, faVault, faRefresh } from './custom';
 import { faStickyNote } from '@fortawesome/free-regular-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome';
 
@@ -331,6 +332,8 @@ export const FontAwesomePlugin: Plugin = {
 		addIcon(faXmark);
 		addIcon(faDownload);
 		addIcon(faPowerOff);
+		addIcon(faPaperPlane);
+		addIcon(faRefresh);
 
 		app.component('FontAwesomeIcon', FontAwesomeIcon);
 	},
diff --git a/packages/editor-ui/src/stores/assistant.store.ts b/packages/editor-ui/src/stores/assistant.store.ts
new file mode 100644
index 0000000000000..229e2227f5a9b
--- /dev/null
+++ b/packages/editor-ui/src/stores/assistant.store.ts
@@ -0,0 +1,554 @@
+import { chatWithAssistant, replaceCode } from '@/api/assistant';
+import { VIEWS, EDITABLE_CANVAS_VIEWS, STORES, AI_ASSISTANT_EXPERIMENT } from '@/constants';
+import type { ChatRequest } from '@/types/assistant.types';
+import type { ChatUI } from 'n8n-design-system/types/assistant';
+import { defineStore } from 'pinia';
+import { computed, ref, watch } from 'vue';
+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 { useWorkflowsStore } from './workflows.store';
+import type { INodeParameters } from 'n8n-workflow';
+import { deepCopy } from 'n8n-workflow';
+import { ndvEventBus, codeNodeEditorEventBus } from '@/event-bus';
+import { useNDVStore } from './ndv.store';
+import type { IPushDataNodeExecuteAfter, IUpdateInformation } from '@/Interface';
+import {
+	getMainAuthField,
+	getNodeAuthOptions,
+	getReferencedNodes,
+	getNodesSchemas,
+	pruneNodeProperties,
+} from '@/utils/nodeTypesUtils';
+import { useNodeTypesStore } from './nodeTypes.store';
+import { usePostHog } from './posthog.store';
+import { useI18n } from '@/composables/useI18n';
+import { useTelemetry } from '@/composables/useTelemetry';
+import { useToast } from '@/composables/useToast';
+
+const MAX_CHAT_WIDTH = 425;
+const MIN_CHAT_WIDTH = 250;
+const ENABLED_VIEWS = [...EDITABLE_CANVAS_VIEWS, VIEWS.EXECUTION_PREVIEW];
+const READABLE_TYPES = ['code-diff', 'text', 'block'];
+
+export const useAssistantStore = defineStore(STORES.ASSISTANT, () => {
+	const chatWidth = ref<number>(325);
+
+	const settings = useSettingsStore();
+	const rootStore = useRootStore();
+	const chatMessages = ref<ChatUI.AssistantMessage[]>([]);
+	const chatWindowOpen = ref<boolean>(false);
+	const usersStore = useUsersStore();
+	const workflowsStore = useWorkflowsStore();
+	const route = useRoute();
+	const streaming = ref<boolean>();
+	const ndvStore = useNDVStore();
+	const { getVariant } = usePostHog();
+	const locale = useI18n();
+	const telemetry = useTelemetry();
+
+	const suggestions = ref<{
+		[suggestionId: string]: {
+			previous: INodeParameters;
+			suggested: INodeParameters;
+		};
+	}>({});
+	const chatSessionError = ref<ChatRequest.ErrorContext | undefined>();
+	const currentSessionId = ref<string | undefined>();
+	const currentSessionActiveExecutionId = ref<string | undefined>();
+	const currentSessionWorkflowId = ref<string | undefined>();
+	const lastUnread = ref<ChatUI.AssistantMessage | undefined>();
+
+	const isExperimentEnabled = computed(
+		() => getVariant(AI_ASSISTANT_EXPERIMENT.name) === AI_ASSISTANT_EXPERIMENT.variant,
+	);
+
+	const canShowAssistant = computed(
+		() =>
+			isExperimentEnabled.value &&
+			settings.isAiAssistantEnabled &&
+			ENABLED_VIEWS.includes(route.name as VIEWS),
+	);
+
+	const isSessionEnded = computed(() => {
+		const assistantMessages = chatMessages.value.filter((msg) => msg.role === 'assistant');
+		const lastAssistantMessage = assistantMessages[assistantMessages.length - 1];
+
+		const sessionExplicitlyEnded =
+			lastAssistantMessage?.type === 'event' && lastAssistantMessage?.eventName === 'end-session';
+		const sessionStarted = currentSessionId.value !== undefined;
+
+		return !sessionStarted || sessionExplicitlyEnded;
+	});
+
+	const isAssistantOpen = computed(() => canShowAssistant.value && chatWindowOpen.value);
+
+	const canShowAssistantButtons = computed(
+		() =>
+			isExperimentEnabled.value &&
+			settings.isAiAssistantEnabled &&
+			EDITABLE_CANVAS_VIEWS.includes(route.name as VIEWS),
+	);
+
+	const unreadCount = computed(
+		() =>
+			chatMessages.value.filter(
+				(msg) => READABLE_TYPES.includes(msg.type) && msg.role === 'assistant' && !msg.read,
+			).length,
+	);
+
+	watch(route, () => {
+		const activeWorkflowId = workflowsStore.workflowId;
+		if (!currentSessionId.value || currentSessionWorkflowId.value === activeWorkflowId) {
+			return;
+		}
+		resetAssistantChat();
+	});
+
+	function resetAssistantChat() {
+		clearMessages();
+		currentSessionId.value = undefined;
+		chatSessionError.value = undefined;
+		lastUnread.value = undefined;
+		currentSessionActiveExecutionId.value = undefined;
+		suggestions.value = {};
+	}
+
+	function closeChat() {
+		chatWindowOpen.value = false;
+	}
+
+	function openChat() {
+		chatWindowOpen.value = true;
+		chatMessages.value = chatMessages.value.map((msg) => ({ ...msg, read: true }));
+	}
+
+	function addAssistantMessages(assistantMessages: ChatRequest.MessageResponse[], id: string) {
+		const read = chatWindowOpen.value;
+		const messages = [...chatMessages.value].filter(
+			(msg) => !(msg.id === id && msg.role === 'assistant'),
+		);
+		// TODO: simplify
+		assistantMessages.forEach((msg) => {
+			if (msg.type === 'message') {
+				messages.push({
+					id,
+					type: 'text',
+					role: 'assistant',
+					content: msg.text,
+					quickReplies: msg.quickReplies,
+					read,
+				});
+			} else if (msg.type === 'code-diff') {
+				messages.push({
+					id,
+					role: 'assistant',
+					type: 'code-diff',
+					description: msg.description,
+					codeDiff: msg.codeDiff,
+					suggestionId: msg.suggestionId,
+					quickReplies: msg.quickReplies,
+					read,
+				});
+			} else if (msg.type === 'summary') {
+				messages.push({
+					id,
+					type: 'block',
+					role: 'assistant',
+					title: msg.title,
+					content: msg.content,
+					quickReplies: msg.quickReplies,
+					read,
+				});
+			} else if (msg.type === 'event') {
+				messages.push({
+					id,
+					type: 'event',
+					role: 'assistant',
+					eventName: msg.eventName,
+					read: true,
+				});
+			} else if (msg.type === 'agent-suggestion') {
+				messages.push({
+					id,
+					type: 'block',
+					role: 'assistant',
+					title: msg.title,
+					content: msg.text,
+					quickReplies: msg.quickReplies,
+					read,
+				});
+			}
+		});
+		chatMessages.value = messages;
+	}
+
+	function updateWindowWidth(width: number) {
+		chatWidth.value = Math.min(Math.max(width, MIN_CHAT_WIDTH), MAX_CHAT_WIDTH);
+	}
+
+	function isNodeErrorActive(context: ChatRequest.ErrorContext) {
+		const targetNode = context.node.name;
+
+		return (
+			workflowsStore.activeExecutionId === currentSessionActiveExecutionId.value &&
+			targetNode === chatSessionError.value?.node.name
+		);
+	}
+
+	function clearMessages() {
+		chatMessages.value = [];
+	}
+
+	function stopStreaming() {
+		streaming.value = false;
+	}
+
+	function addAssistantError(content: string, id: string) {
+		chatMessages.value.push({
+			id,
+			role: 'assistant',
+			type: 'error',
+			content,
+			read: true,
+		});
+	}
+
+	function addEmptyAssistantMessage(id: string) {
+		chatMessages.value.push({
+			id,
+			role: 'assistant',
+			type: 'text',
+			content: '',
+			read: false,
+		});
+	}
+
+	function addUserMessage(content: string, id: string) {
+		chatMessages.value.push({
+			id,
+			role: 'user',
+			type: 'text',
+			content,
+			read: true,
+		});
+	}
+
+	function handleServiceError(e: unknown, id: string) {
+		assert(e instanceof Error);
+		stopStreaming();
+		addAssistantError(`${locale.baseText('aiAssistant.serviceError.message')}: (${e.message})`, id);
+	}
+
+	function onEachStreamingMessage(response: ChatRequest.ResponsePayload, id: string) {
+		if (response.sessionId && !currentSessionId.value) {
+			currentSessionId.value = response.sessionId;
+			telemetry.track('Assistant session started', {
+				chat_session_id: currentSessionId.value,
+				task: 'error',
+			});
+		} else if (currentSessionId.value !== response.sessionId) {
+			return;
+		}
+		addAssistantMessages(response.messages, id);
+	}
+
+	function getRandomId() {
+		return `${Math.floor(Math.random() * 100000000)}`;
+	}
+
+	function onDoneStreaming(id: string) {
+		stopStreaming();
+		lastUnread.value = chatMessages.value.find(
+			(msg) =>
+				msg.id === id && !msg.read && msg.role === 'assistant' && READABLE_TYPES.includes(msg.type),
+		);
+		setTimeout(() => {
+			if (lastUnread.value?.id === id) {
+				lastUnread.value = undefined;
+			}
+		}, 4000);
+	}
+
+	async function initErrorHelper(context: ChatRequest.ErrorContext) {
+		const id = getRandomId();
+		if (chatSessionError.value) {
+			if (isNodeErrorActive(context)) {
+				// context has not changed
+				return;
+			}
+		}
+
+		resetAssistantChat();
+		chatSessionError.value = context;
+		currentSessionWorkflowId.value = workflowsStore.workflowId;
+
+		if (workflowsStore.activeExecutionId) {
+			currentSessionActiveExecutionId.value = workflowsStore.activeExecutionId;
+		}
+
+		// Get all referenced nodes and their schemas
+		const referencedNodeNames = getReferencedNodes(context.node);
+		const schemas = getNodesSchemas(referencedNodeNames);
+
+		// Get node credentials details for the ai assistant
+		const nodeType = useNodeTypesStore().getNodeType(context.node.type);
+		let authType = undefined;
+		if (nodeType) {
+			const authField = getMainAuthField(nodeType);
+			const credentialInUse = context.node.parameters[authField?.name ?? ''];
+			const availableAuthOptions = getNodeAuthOptions(nodeType);
+			authType = availableAuthOptions.find((option) => option.value === credentialInUse);
+		}
+		addEmptyAssistantMessage(id);
+		openChat();
+
+		streaming.value = true;
+		chatWithAssistant(
+			rootStore.restApiContext,
+			{
+				payload: {
+					role: 'user',
+					type: 'init-error-helper',
+					user: {
+						firstName: usersStore.currentUser?.firstName ?? '',
+					},
+					error: context.error,
+					node: pruneNodeProperties(context.node, ['position']),
+					executionSchema: schemas,
+					authType,
+				},
+			},
+			(msg) => onEachStreamingMessage(msg, id),
+			() => onDoneStreaming(id),
+			(e) => handleServiceError(e, id),
+		);
+	}
+
+	async function sendEvent(
+		eventName: ChatRequest.InteractionEventName,
+		error?: ChatRequest.ErrorContext['error'],
+	) {
+		if (isSessionEnded.value || streaming.value) {
+			return;
+		}
+		assert(currentSessionId.value);
+
+		const id = getRandomId();
+		addEmptyAssistantMessage(id);
+		streaming.value = true;
+		chatWithAssistant(
+			rootStore.restApiContext,
+			{
+				payload: {
+					role: 'user',
+					type: 'event',
+					eventName,
+					error,
+				},
+				sessionId: currentSessionId.value,
+			},
+			(msg) => onEachStreamingMessage(msg, id),
+			() => onDoneStreaming(id),
+			(e) => handleServiceError(e, id),
+		);
+	}
+
+	async function onNodeExecution(pushEvent: IPushDataNodeExecuteAfter) {
+		if (!chatSessionError.value || pushEvent.nodeName !== chatSessionError.value.node.name) {
+			return;
+		}
+		if (pushEvent.data.error) {
+			await sendEvent('node-execution-errored', pushEvent.data.error);
+		} else if (pushEvent.data.executionStatus === 'success') {
+			await sendEvent('node-execution-succeeded');
+		}
+		telemetry.track('User executed node after assistant suggestion', {
+			task: 'error',
+			chat_session_id: currentSessionId.value,
+			success: pushEvent.data.executionStatus === 'success',
+		});
+	}
+
+	async function sendMessage(
+		chatMessage: Pick<ChatRequest.UserChatMessage, 'text' | 'quickReplyType'>,
+	) {
+		if (isSessionEnded.value || streaming.value) {
+			return;
+		}
+
+		const id = getRandomId();
+		try {
+			addUserMessage(chatMessage.text, id);
+			addEmptyAssistantMessage(id);
+
+			streaming.value = true;
+			assert(currentSessionId.value);
+			chatWithAssistant(
+				rootStore.restApiContext,
+				{
+					payload: {
+						role: 'user',
+						type: 'message',
+						text: chatMessage.text,
+						quickReplyType: chatMessage.quickReplyType,
+					},
+					sessionId: currentSessionId.value,
+				},
+				(msg) => onEachStreamingMessage(msg, id),
+				() => onDoneStreaming(id),
+				(e) => handleServiceError(e, id),
+			);
+		} catch (e: unknown) {
+			// in case of assert
+			handleServiceError(e, id);
+		}
+	}
+
+	function updateParameters(nodeName: string, parameters: INodeParameters) {
+		if (ndvStore.activeNodeName === nodeName) {
+			Object.keys(parameters).forEach((key) => {
+				const update: IUpdateInformation = {
+					node: nodeName,
+					name: `parameters.${key}`,
+					value: parameters[key],
+				};
+
+				ndvEventBus.emit('updateParameterValue', update);
+			});
+		} else {
+			workflowsStore.setNodeParameters(
+				{
+					name: nodeName,
+					value: parameters,
+				},
+				true,
+			);
+		}
+	}
+
+	function getRelevantParameters(
+		parameters: INodeParameters,
+		keysToKeep: string[],
+	): INodeParameters {
+		return keysToKeep.reduce((accu: INodeParameters, key: string) => {
+			accu[key] = deepCopy(parameters[key]);
+			return accu;
+		}, {} as INodeParameters);
+	}
+
+	async function applyCodeDiff(index: number) {
+		const codeDiffMessage = chatMessages.value[index];
+		if (!codeDiffMessage || codeDiffMessage.type !== 'code-diff') {
+			throw new Error('No code diff to apply');
+		}
+
+		try {
+			assert(chatSessionError.value);
+			assert(currentSessionId.value);
+
+			codeDiffMessage.replacing = true;
+			const suggestionId = codeDiffMessage.suggestionId;
+
+			const currentWorkflow = workflowsStore.getCurrentWorkflow();
+			const activeNode = currentWorkflow.getNode(chatSessionError.value.node.name);
+			assert(activeNode);
+
+			const cached = suggestions.value[suggestionId];
+			if (cached) {
+				updateParameters(activeNode.name, cached.suggested);
+			} else {
+				const { parameters: suggested } = await replaceCode(rootStore.restApiContext, {
+					suggestionId: codeDiffMessage.suggestionId,
+					sessionId: currentSessionId.value,
+				});
+
+				suggestions.value[suggestionId] = {
+					previous: getRelevantParameters(activeNode.parameters, Object.keys(suggested)),
+					suggested,
+				};
+				updateParameters(activeNode.name, suggested);
+			}
+
+			codeDiffMessage.replaced = true;
+			codeNodeEditorEventBus.emit('codeDiffApplied');
+			checkIfNodeNDVIsOpen(activeNode.name);
+		} catch (e) {
+			console.error(e);
+			codeDiffMessage.error = true;
+		}
+		codeDiffMessage.replacing = false;
+	}
+
+	async function undoCodeDiff(index: number) {
+		const codeDiffMessage = chatMessages.value[index];
+		if (!codeDiffMessage || codeDiffMessage.type !== 'code-diff') {
+			throw new Error('No code diff to apply');
+		}
+
+		try {
+			assert(chatSessionError.value);
+			assert(currentSessionId.value);
+
+			codeDiffMessage.replacing = true;
+			const suggestionId = codeDiffMessage.suggestionId;
+
+			const suggestion = suggestions.value[suggestionId];
+			assert(suggestion);
+
+			const currentWorkflow = workflowsStore.getCurrentWorkflow();
+			const activeNode = currentWorkflow.getNode(chatSessionError.value.node.name);
+			assert(activeNode);
+
+			const suggested = suggestion.previous;
+			updateParameters(activeNode.name, suggested);
+
+			codeDiffMessage.replaced = false;
+			codeNodeEditorEventBus.emit('codeDiffApplied');
+			checkIfNodeNDVIsOpen(activeNode.name);
+		} catch (e) {
+			console.error(e);
+			codeDiffMessage.error = true;
+		}
+		codeDiffMessage.replacing = false;
+	}
+
+	function checkIfNodeNDVIsOpen(errorNodeName: string) {
+		if (errorNodeName !== ndvStore.activeNodeName) {
+			useToast().showMessage({
+				type: 'success',
+				title: locale.baseText('aiAssistant.codeUpdated.message.title'),
+				message: locale.baseText('aiAssistant.codeUpdated.message.body', {
+					interpolate: { nodeName: errorNodeName },
+				}),
+				dangerouslyUseHTMLString: true,
+				duration: 4000,
+			});
+		}
+	}
+
+	return {
+		chatWidth,
+		chatMessages,
+		unreadCount,
+		streaming,
+		isAssistantOpen,
+		canShowAssistant,
+		canShowAssistantButtons,
+		currentSessionId,
+		lastUnread,
+		isSessionEnded,
+		onNodeExecution,
+		closeChat,
+		openChat,
+		updateWindowWidth,
+		isNodeErrorActive,
+		initErrorHelper,
+		sendMessage,
+		applyCodeDiff,
+		undoCodeDiff,
+		resetAssistantChat,
+	};
+});
diff --git a/packages/editor-ui/src/stores/settings.store.ts b/packages/editor-ui/src/stores/settings.store.ts
index 1739af1bcb31e..0275a87047759 100644
--- a/packages/editor-ui/src/stores/settings.store.ts
+++ b/packages/editor-ui/src/stores/settings.store.ts
@@ -88,6 +88,8 @@ export const useSettingsStore = defineStore(STORES.SETTINGS, () => {
 
 	const isSamlLoginEnabled = computed(() => saml.value.loginEnabled);
 
+	const isAiAssistantEnabled = computed(() => settings.value.aiAssistant?.enabled);
+
 	const showSetupPage = computed(() => userManagement.value.showSetupOnFirstLoad);
 
 	const deploymentType = computed(() => settings.value.deployment?.type || 'default');
@@ -401,6 +403,7 @@ export const useSettingsStore = defineStore(STORES.SETTINGS, () => {
 		logLevel,
 		isTelemetryEnabled,
 		isMfaFeatureEnabled,
+		isAiAssistantEnabled,
 		areTagsEnabled,
 		isHiringBannerEnabled,
 		isTemplatesEnabled,
diff --git a/packages/editor-ui/src/stores/ui.store.ts b/packages/editor-ui/src/stores/ui.store.ts
index ec2c154257cbc..e872b96e3e99b 100644
--- a/packages/editor-ui/src/stores/ui.store.ts
+++ b/packages/editor-ui/src/stores/ui.store.ts
@@ -35,6 +35,7 @@ import {
 	SETUP_CREDENTIALS_MODAL_KEY,
 	PROJECT_MOVE_RESOURCE_MODAL,
 	PROJECT_MOVE_RESOURCE_CONFIRM_MODAL,
+	NEW_ASSISTANT_SESSION_MODAL,
 	PROMPT_MFA_CODE_MODAL_KEY,
 } from '@/constants';
 import type {
@@ -124,6 +125,7 @@ export const useUIStore = defineStore(STORES.UI, () => {
 				SETUP_CREDENTIALS_MODAL_KEY,
 				PROJECT_MOVE_RESOURCE_MODAL,
 				PROJECT_MOVE_RESOURCE_CONFIRM_MODAL,
+				NEW_ASSISTANT_SESSION_MODAL,
 			].map((modalKey) => [modalKey, { open: false }]),
 		),
 		[DELETE_USER_MODAL_KEY]: {
diff --git a/packages/editor-ui/src/types/assistant.types.ts b/packages/editor-ui/src/types/assistant.types.ts
new file mode 100644
index 0000000000000..86f3576afe430
--- /dev/null
+++ b/packages/editor-ui/src/types/assistant.types.ts
@@ -0,0 +1,123 @@
+import type { Schema } from '@/Interface';
+import type { INode, INodeParameters } from 'n8n-workflow';
+
+export namespace ChatRequest {
+	interface NodeExecutionSchema {
+		nodeName: string;
+		schema: Schema;
+	}
+
+	export interface WorkflowContext {
+		executionSchema?: NodeExecutionSchema[];
+	}
+
+	export interface ErrorContext {
+		error: {
+			name: string;
+			message: string;
+			type?: string;
+			description?: string | null;
+			lineNumber?: number;
+			stack?: string;
+		};
+		node: INode;
+	}
+
+	export interface InitErrorHelper extends ErrorContext, WorkflowContext {
+		role: 'user';
+		type: 'init-error-helper';
+		user: {
+			firstName: string;
+		};
+		authType?: { name: string; value: string };
+	}
+
+	export type InteractionEventName = 'node-execution-succeeded' | 'node-execution-errored';
+
+	interface EventRequestPayload {
+		role: 'user';
+		type: 'event';
+		eventName: InteractionEventName;
+		error?: ErrorContext['error'];
+	}
+
+	export interface UserChatMessage {
+		role: 'user';
+		type: 'message';
+		text: string;
+		quickReplyType?: string;
+	}
+
+	export type RequestPayload =
+		| {
+				payload: InitErrorHelper;
+		  }
+		| {
+				payload: EventRequestPayload | UserChatMessage;
+				sessionId: string;
+		  };
+
+	interface CodeDiffMessage {
+		role: 'assistant';
+		type: 'code-diff';
+		description?: string;
+		codeDiff?: string;
+		suggestionId: string;
+		solution_count: number;
+	}
+
+	interface QuickReplyOption {
+		text: string;
+		type: string;
+		isFeedback?: boolean;
+	}
+
+	interface AssistantChatMessage {
+		role: 'assistant';
+		type: 'message';
+		text: string;
+	}
+
+	interface AssistantSummaryMessage {
+		role: 'assistant';
+		type: 'summary';
+		title: string;
+		content: string;
+	}
+
+	interface EndSessionMessage {
+		role: 'assistant';
+		type: 'event';
+		eventName: 'end-session';
+	}
+
+	interface AgentChatMessage {
+		role: 'assistant';
+		type: 'agent-suggestion';
+		title: string;
+		text: string;
+	}
+
+	export type MessageResponse =
+		| ((AssistantChatMessage | CodeDiffMessage | AssistantSummaryMessage | AgentChatMessage) & {
+				quickReplies?: QuickReplyOption[];
+		  })
+		| EndSessionMessage;
+
+	export interface ResponsePayload {
+		sessionId?: string;
+		messages: MessageResponse[];
+	}
+}
+
+export namespace ReplaceCodeRequest {
+	export interface RequestPayload {
+		sessionId: string;
+		suggestionId: string;
+	}
+
+	export interface ResponsePayload {
+		sessionId: string;
+		parameters: INodeParameters;
+	}
+}
diff --git a/packages/editor-ui/src/utils/apiUtils.ts b/packages/editor-ui/src/utils/apiUtils.ts
index 140d713e256d8..64f6ec259927b 100644
--- a/packages/editor-ui/src/utils/apiUtils.ts
+++ b/packages/editor-ui/src/utils/apiUtils.ts
@@ -1,8 +1,9 @@
 import type { AxiosRequestConfig, Method, RawAxiosRequestHeaders } from 'axios';
 import axios from 'axios';
-import { ApplicationError, type GenericValue, type IDataObject } from 'n8n-workflow';
+import { ApplicationError, jsonParse, type GenericValue, type IDataObject } from 'n8n-workflow';
 import type { IExecutionFlattedResponse, IExecutionResponse, IRestApiContext } from '@/Interface';
 import { parse } from 'flatted';
+import type { ChatRequest } from '@/types/assistant.types';
 
 const BROWSER_ID_STORAGE_KEY = 'n8n-browserId';
 let browserId = localStorage.getItem(BROWSER_ID_STORAGE_KEY);
@@ -191,3 +192,63 @@ export function unflattenExecutionData(fullExecutionData: IExecutionFlattedRespo
 
 	return returnData;
 }
+
+export const streamRequest = async (
+	context: IRestApiContext,
+	apiEndpoint: string,
+	payload: ChatRequest.RequestPayload,
+	onChunk?: (chunk: ChatRequest.ResponsePayload) => void,
+	onDone?: () => void,
+	onError?: (e: Error) => void,
+	separator = '⧉⇋⇋➽⌑⧉§§\n',
+): Promise<void> => {
+	const headers: Record<string, string> = {
+		'Content-Type': 'application/json',
+	};
+	if (browserId) {
+		headers['browser-id'] = browserId;
+	}
+	const assistantRequest: RequestInit = {
+		headers,
+		method: 'POST',
+		credentials: 'include',
+		body: JSON.stringify(payload),
+	};
+	const response = await fetch(`${context.baseUrl}${apiEndpoint}`, assistantRequest);
+
+	if (response.ok && response.body) {
+		// Handle the streaming response
+		const reader = response.body.getReader();
+		const decoder = new TextDecoder('utf-8');
+
+		async function readStream() {
+			const { done, value } = await reader.read();
+			if (done) {
+				onDone?.();
+				return;
+			}
+
+			const chunk = decoder.decode(value);
+			const splitChunks = chunk.split(separator);
+
+			for (const splitChunk of splitChunks) {
+				if (splitChunk && onChunk) {
+					try {
+						onChunk(jsonParse(splitChunk, { errorMessage: 'Invalid json chunk in stream' }));
+					} catch (e: unknown) {
+						if (e instanceof Error) {
+							console.log(`${e.message}: ${splitChunk}`);
+							onError?.(e);
+						}
+					}
+				}
+			}
+			await readStream();
+		}
+
+		// Start reading the stream
+		await readStream();
+	} else if (onError) {
+		onError(new Error(response.statusText));
+	}
+};
diff --git a/packages/editor-ui/src/utils/nodeTypesUtils.ts b/packages/editor-ui/src/utils/nodeTypesUtils.ts
index 91fe812e4ece5..70fa803411f12 100644
--- a/packages/editor-ui/src/utils/nodeTypesUtils.ts
+++ b/packages/editor-ui/src/utils/nodeTypesUtils.ts
@@ -5,8 +5,10 @@ import type {
 	ITemplatesNode,
 	IVersionNode,
 	NodeAuthenticationOption,
+	Schema,
 	SimplifiedNodeType,
 } from '@/Interface';
+import { useDataSchema } from '@/composables/useDataSchema';
 import {
 	CORE_NODES_CATEGORY,
 	MAIN_AUTH_FIELD_NAME,
@@ -21,7 +23,9 @@ import { useWorkflowsStore } from '@/stores/workflows.store';
 import { isResourceLocatorValue } from '@/utils/typeGuards';
 import { isJsonKeyObject } from '@/utils/typesUtils';
 import type {
+	AssignmentCollectionValue,
 	IDataObject,
+	INode,
 	INodeCredentialDescription,
 	INodeExecutionData,
 	INodeProperties,
@@ -496,3 +500,101 @@ export const getNodeIconColor = (
 	}
 	return nodeType?.defaults?.color?.toString();
 };
+
+/**
+	Regular expression to extract the node names from the expressions in the template.
+	Example: $(expression) => expression
+*/
+const entityRegex = /\$\((['"])(.*?)\1\)/g;
+
+/**
+ * Extract the node names from the expressions in the template.
+ */
+function extractNodeNames(template: string): string[] {
+	let matches;
+	const nodeNames: string[] = [];
+	while ((matches = entityRegex.exec(template)) !== null) {
+		nodeNames.push(matches[2]);
+	}
+	return nodeNames;
+}
+
+/**
+ * Extract the node names from the expressions in the node parameters.
+ */
+export function getReferencedNodes(node: INode): string[] {
+	const referencedNodes: string[] = [];
+	if (!node) {
+		return referencedNodes;
+	}
+	// Special case for code node
+	if (node.type === 'n8n-nodes-base.set' && node.parameters.assignments) {
+		const assignments = node.parameters.assignments as AssignmentCollectionValue;
+		if (assignments.assignments?.length) {
+			assignments.assignments.forEach((assignment) => {
+				if (assignment.name && assignment.value && String(assignment.value).startsWith('=')) {
+					const nodeNames = extractNodeNames(String(assignment.value));
+					if (nodeNames.length) {
+						referencedNodes.push(...nodeNames);
+					}
+				}
+			});
+		}
+	} else {
+		Object.values(node.parameters).forEach((value) => {
+			if (!value) {
+				return;
+			}
+			let strValue = String(value);
+			// Handle resource locator
+			if (typeof value === 'object' && 'value' in value) {
+				strValue = String(value.value);
+			}
+			if (strValue.startsWith('=')) {
+				const nodeNames = extractNodeNames(strValue);
+				if (nodeNames.length) {
+					referencedNodes.push(...nodeNames);
+				}
+			}
+		});
+	}
+	return referencedNodes;
+}
+
+/**
+ * Remove properties from a node based on the provided list of property names.
+ * Reruns a new node object with the properties removed.
+ */
+export function pruneNodeProperties(node: INode, propsToRemove: string[]): INode {
+	const prunedNode = { ...node };
+	propsToRemove.forEach((key) => {
+		delete prunedNode[key as keyof INode];
+	});
+	return prunedNode;
+}
+
+/**
+ * Get the schema for the referenced nodes as expected by the AI assistant
+ * @param nodeNames The names of the nodes to get the schema for
+ * @returns An array of objects containing the node name and the schema
+ */
+export function getNodesSchemas(nodeNames: string[]) {
+	return nodeNames.map((name) => {
+		const node = useWorkflowsStore().getNodeByName(name);
+		if (!node) {
+			return {
+				nodeName: name,
+				schema: {} as Schema,
+			};
+		}
+		const { getSchemaForExecutionData, getInputDataWithPinned } = useDataSchema();
+		const schema = getSchemaForExecutionData(
+			executionDataToJson(getInputDataWithPinned(node)),
+			true,
+		);
+		return {
+			nodeName: node.name,
+			schema,
+		};
+	});
+}
diff --git a/packages/editor-ui/src/views/NodeView.vue b/packages/editor-ui/src/views/NodeView.vue
index 439f39b1ebe72..4ef91b2b1a875 100644
--- a/packages/editor-ui/src/views/NodeView.vue
+++ b/packages/editor-ui/src/views/NodeView.vue
@@ -4746,7 +4746,7 @@ export default defineComponent({
 	align-items: center;
 	left: 50%;
 	transform: translateX(-50%);
-	bottom: var(--spacing-l);
+	bottom: var(--spacing-s);
 	width: auto;
 
 	@media (max-width: $breakpoint-2xs) {
diff --git a/packages/workflow/src/Interfaces.ts b/packages/workflow/src/Interfaces.ts
index 91e7545c037cd..638ff0513aaa7 100644
--- a/packages/workflow/src/Interfaces.ts
+++ b/packages/workflow/src/Interfaces.ts
@@ -2679,6 +2679,9 @@ export interface IN8nUISettings {
 	executionMode: 'regular' | 'queue';
 	pushBackend: 'sse' | 'websocket';
 	communityNodesEnabled: boolean;
+	aiAssistant: {
+		enabled: boolean;
+	};
 	deployment: {
 		type: string | 'default' | 'n8n-internal' | 'cloud' | 'desktop_mac' | 'desktop_win';
 	};
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 37fddb4bb3a1c..e3b834bfa4025 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -629,6 +629,9 @@ importers:
       '@n8n/typeorm':
         specifier: 0.3.20-10
         version: 0.3.20-10(@sentry/node@7.87.0)(ioredis@5.3.2)(mssql@10.0.2)(mysql2@3.11.0)(pg@8.12.0)(redis@4.6.14)(sqlite3@5.1.7)
+      '@n8n_io/ai-assistant-sdk':
+        specifier: 1.9.4
+        version: 1.9.4
       '@n8n_io/license-sdk':
         specifier: 2.13.0
         version: 2.13.0
@@ -1075,6 +1078,9 @@ importers:
       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
@@ -3405,6 +3411,7 @@ packages:
   '@humanwhocodes/config-array@0.11.14':
     resolution: {integrity: sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==}
     engines: {node: '>=10.10.0'}
+    deprecated: Use @eslint/config-array instead
 
   '@humanwhocodes/module-importer@1.0.1':
     resolution: {integrity: sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==}
@@ -3412,6 +3419,7 @@ packages:
 
   '@humanwhocodes/object-schema@2.0.2':
     resolution: {integrity: sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==}
+    deprecated: Use @eslint/object-schema instead
 
   '@icetee/ftp@0.3.15':
     resolution: {integrity: sha512-RxSa9VjcDWgWCYsaLdZItdCnJj7p4LxggaEk+Y3MP0dHKoxez8ioG07DVekVbZZqccsrL+oPB/N9AzVPxj4blg==}
@@ -4216,6 +4224,10 @@ packages:
     engines: {node: '>=18.10', pnpm: '>=9.6'}
     hasBin: true
 
+  '@n8n_io/ai-assistant-sdk@1.9.4':
+    resolution: {integrity: sha512-jFBT3SNPQuPTiJceCVIO0VB06ALa6Az1nfsRnZYdm+HMIle1ZFZDIjf32tqYoa2VvrqitfR/fs7CiMlVQUkIRg==}
+    engines: {node: '>=20.15', pnpm: '>=8.14'}
+
   '@n8n_io/license-sdk@2.13.0':
     resolution: {integrity: sha512-iVER9RjR6pP4ujceG7rSMoHU0IMI5HvwNHhC8ezq1VwbRq8W1ecYQpTbIrUTgK6gNMyeLRfySkNlVGejKXJ3MQ==}
     engines: {node: '>=18.12.1'}
@@ -5979,6 +5991,7 @@ packages:
 
   abab@2.0.6:
     resolution: {integrity: sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==}
+    deprecated: Use your platform's native atob() and btoa() methods instead
 
   abbrev@1.1.1:
     resolution: {integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==}
@@ -6130,6 +6143,7 @@ packages:
   are-we-there-yet@3.0.1:
     resolution: {integrity: sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==}
     engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
+    deprecated: This package is no longer supported.
 
   arg@5.0.2:
     resolution: {integrity: sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==}
@@ -7356,6 +7370,7 @@ packages:
   domexception@4.0.0:
     resolution: {integrity: sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==}
     engines: {node: '>=12'}
+    deprecated: Use your platform's native DOMException instead
 
   domhandler@4.3.1:
     resolution: {integrity: sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==}
@@ -8169,6 +8184,7 @@ packages:
   gauge@4.0.4:
     resolution: {integrity: sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==}
     engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
+    deprecated: This package is no longer supported.
 
   gaxios@5.1.0:
     resolution: {integrity: sha512-aezGIjb+/VfsJtIcHGcBSerNEDdfdHeMros+RbYbGpmonKWQCOVOes0LVZhn1lDtIgq55qq0HaxymIoae3Fl/A==}
@@ -8300,10 +8316,12 @@ packages:
 
   glob@7.2.3:
     resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==}
+    deprecated: Glob versions prior to v9 are no longer supported
 
   glob@8.1.0:
     resolution: {integrity: sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==}
     engines: {node: '>=12'}
+    deprecated: Glob versions prior to v9 are no longer supported
 
   glob@9.3.2:
     resolution: {integrity: sha512-BTv/JhKXFEHsErMte/AnfiSv8yYOLLiyH2lTg8vn02O21zWFgHPTfxtgn1QRe7NRgggUhC8hacR2Re94svHqeA==}
@@ -8617,12 +8635,14 @@ packages:
 
   infisical-node@1.3.0:
     resolution: {integrity: sha512-tTnnExRAO/ZyqiRdnSlBisErNToYWgtunMWh+8opClEt5qjX7l6HC/b4oGo2AuR2Pf41IR+oqo+dzkM1TCvlUA==}
+    deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.
 
   inflected@2.1.0:
     resolution: {integrity: sha512-hAEKNxvHf2Iq3H60oMBHkB4wl5jn3TPF3+fXek/sRwAB5gP9xWs4r7aweSF95f99HFoz69pnZTcu8f0SIHV18w==}
 
   inflight@1.0.6:
     resolution: {integrity: sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==}
+    deprecated: This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.
 
   inherits@2.0.4:
     resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==}
@@ -10362,6 +10382,7 @@ packages:
   npmlog@6.0.2:
     resolution: {integrity: sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==}
     engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
+    deprecated: This package is no longer supported.
 
   nth-check@2.1.1:
     resolution: {integrity: sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==}
@@ -10602,6 +10623,9 @@ packages:
     resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==}
     engines: {node: '>=6'}
 
+  parse-diff@0.11.1:
+    resolution: {integrity: sha512-Oq4j8LAOPOcssanQkIjxosjATBIEJhCxMCxPhMu+Ci4wdNmAEdx0O+a7gzbR2PyKXgKPvRLIN5g224+dJAsKHA==}
+
   parse-json@5.2.0:
     resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==}
     engines: {node: '>=8'}
@@ -11476,10 +11500,12 @@ packages:
 
   rimraf@2.6.3:
     resolution: {integrity: sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==}
+    deprecated: Rimraf versions prior to v4 are no longer supported
     hasBin: true
 
   rimraf@3.0.2:
     resolution: {integrity: sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==}
+    deprecated: Rimraf versions prior to v4 are no longer supported
     hasBin: true
 
   rimraf@5.0.1:
@@ -12542,6 +12568,10 @@ packages:
     resolution: {integrity: sha512-/0BWqR8rJNRysS5lqVmfc7eeOErcOP4tZpATVjJOojjHZ71gSYVAtFhEmadcIjwMIUehh5NFyKGsXCnXIajtbA==}
     engines: {node: '>=18.17'}
 
+  undici@6.19.7:
+    resolution: {integrity: sha512-HR3W/bMGPSr90i8AAp2C4DM3wChFdJPLrWYpIS++LxS8K+W535qftjt+4MyjNYHeWabMj1nvtmLIi7l++iq91A==}
+    engines: {node: '>=18.17'}
+
   unicode-canonical-property-names-ecmascript@2.0.0:
     resolution: {integrity: sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==}
     engines: {node: '>=4'}
@@ -14403,7 +14433,7 @@ snapshots:
       '@babel/traverse': 7.24.0
       '@babel/types': 7.24.6
       convert-source-map: 2.0.0
-      debug: 4.3.5(supports-color@8.1.1)
+      debug: 4.3.6
       gensync: 1.0.0-beta.2
       json5: 2.2.3
       semver: 7.6.0
@@ -14524,7 +14554,7 @@ snapshots:
       '@babel/core': 7.24.6
       '@babel/helper-compilation-targets': 7.24.6
       '@babel/helper-plugin-utils': 7.24.6
-      debug: 4.3.5(supports-color@8.1.1)
+      debug: 4.3.6
       lodash.debounce: 4.0.8
       resolve: 1.22.8
     transitivePeerDependencies:
@@ -14535,7 +14565,7 @@ snapshots:
       '@babel/core': 7.24.6
       '@babel/helper-compilation-targets': 7.24.6
       '@babel/helper-plugin-utils': 7.24.6
-      debug: 4.3.5(supports-color@8.1.1)
+      debug: 4.3.6
       lodash.debounce: 4.0.8
       resolve: 1.22.8
     transitivePeerDependencies:
@@ -15419,7 +15449,7 @@ snapshots:
       '@babel/helper-split-export-declaration': 7.22.6
       '@babel/parser': 7.24.6
       '@babel/types': 7.24.6
-      debug: 4.3.5(supports-color@8.1.1)
+      debug: 4.3.6
       globals: 11.12.0
     transitivePeerDependencies:
       - supports-color
@@ -16637,7 +16667,7 @@ snapshots:
       buffer: 6.0.3
       chalk: 4.1.2
       dayjs: 1.11.10
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.6
       dotenv: 16.3.1
       glob: 10.3.10
       mkdirp: 2.1.3
@@ -16667,7 +16697,7 @@ snapshots:
       buffer: 6.0.3
       chalk: 4.1.2
       dayjs: 1.11.10
-      debug: 4.3.4(supports-color@8.1.1)
+      debug: 4.3.6
       dotenv: 16.3.1
       glob: 10.3.10
       mkdirp: 2.1.3
@@ -16693,6 +16723,10 @@ snapshots:
       acorn: 8.12.1
       acorn-walk: 8.3.2
 
+  '@n8n_io/ai-assistant-sdk@1.9.4':
+    dependencies:
+      undici: 6.19.7
+
   '@n8n_io/license-sdk@2.13.0':
     dependencies:
       crypto-js: 4.2.0
@@ -18941,7 +18975,7 @@ snapshots:
     dependencies:
       '@typescript-eslint/types': 6.7.5
       '@typescript-eslint/visitor-keys': 6.7.5
-      debug: 4.3.5(supports-color@8.1.1)
+      debug: 4.3.6
       globby: 11.1.0
       is-glob: 4.0.3
       semver: 7.6.0
@@ -22122,7 +22156,7 @@ snapshots:
     dependencies:
       foreground-child: 3.1.1
       jackspeak: 2.3.6
-      minimatch: 9.0.3
+      minimatch: 9.0.5
       minipass: 7.0.2
       path-scurry: 1.10.1
 
@@ -22431,7 +22465,7 @@ snapshots:
     dependencies:
       '@tootallnate/once': 1.1.2
       agent-base: 6.0.2
-      debug: 4.3.5(supports-color@8.1.1)
+      debug: 4.3.6
     transitivePeerDependencies:
       - supports-color
     optional: true
@@ -22440,7 +22474,7 @@ snapshots:
     dependencies:
       '@tootallnate/once': 2.0.0
       agent-base: 6.0.2
-      debug: 4.3.5(supports-color@8.1.1)
+      debug: 4.3.6
     transitivePeerDependencies:
       - supports-color
 
@@ -22841,7 +22875,7 @@ snapshots:
 
   istanbul-lib-source-maps@4.0.1:
     dependencies:
-      debug: 4.3.5(supports-color@8.1.1)
+      debug: 4.3.6
       istanbul-lib-coverage: 3.2.2
       source-map: 0.6.1
     transitivePeerDependencies:
@@ -24793,6 +24827,8 @@ snapshots:
     dependencies:
       callsites: 3.1.0
 
+  parse-diff@0.11.1: {}
+
   parse-json@5.2.0:
     dependencies:
       '@babel/code-frame': 7.24.6
@@ -25741,7 +25777,7 @@ snapshots:
 
   retry-request@5.0.2:
     dependencies:
-      debug: 4.3.5(supports-color@8.1.1)
+      debug: 4.3.6
       extend: 3.0.2
     transitivePeerDependencies:
       - supports-color
@@ -26170,7 +26206,7 @@ snapshots:
   socks-proxy-agent@6.2.1:
     dependencies:
       agent-base: 6.0.2
-      debug: 4.3.5(supports-color@8.1.1)
+      debug: 4.3.6
       socks: 2.7.1
     transitivePeerDependencies:
       - supports-color
@@ -27045,6 +27081,8 @@ snapshots:
 
   undici@6.18.1: {}
 
+  undici@6.19.7: {}
+
   unicode-canonical-property-names-ecmascript@2.0.0: {}
 
   unicode-match-property-ecmascript@2.0.0:

From 4d222ac19d943b69fd9f87abe5e5c5f5141eed8d Mon Sep 17 00:00:00 2001
From: Michael Kret <88898367+michael-radency@users.noreply.github.com>
Date: Wed, 14 Aug 2024 16:20:02 +0300
Subject: [PATCH 160/168] feat(AI Transform Node): New node (#10405)

Co-authored-by: Giulio Andreini <g.andreini@gmail.com>
Co-authored-by: Shireen Missi <94372015+ShireenMissi@users.noreply.github.com>
---
 .../ManualChatTrigger.node.ts                 |   4 +-
 .../dynamicNodeParameters.controller.ts       |  26 +-
 packages/cli/src/requests.ts                  |   6 +
 .../services/dynamicNodeParameters.service.ts |  27 +-
 packages/editor-ui/src/Interface.ts           |   5 +
 packages/editor-ui/src/api/nodeTypes.ts       |  13 +
 .../ButtonParameter/ButtonParameter.vue       | 281 ++++++++++++++++++
 .../src/components/ButtonParameter/utils.ts   |  46 +++
 .../CodeNodeEditor/CodeNodeEditor.vue         |  12 +-
 .../src/components/JsEditor/JsEditor.vue      |  32 +-
 .../src/components/Node/NodeCreator/utils.ts  |   8 +
 .../components/Node/NodeCreator/viewsData.ts  |  11 +-
 .../src/components/ParameterInput.vue         |   9 +-
 .../src/components/ParameterInputList.vue     |  26 +-
 .../__tests__/ButtonParameter.test.ts         | 136 +++++++++
 packages/editor-ui/src/constants.ts           |   7 +-
 .../editor-ui/src/stores/nodeTypes.store.ts   |   7 +
 .../editor-ui/src/stores/posthog.store.ts     |  15 +-
 .../nodes/AiTransform/AiTransform.node.json   |  18 ++
 .../nodes/AiTransform/AiTransform.node.ts     | 148 +++++++++
 .../nodes/AiTransform/aitransform.svg         |  10 +
 packages/nodes-base/package.json              |   1 +
 packages/workflow/src/Constants.ts            |   9 +-
 packages/workflow/src/Interfaces.ts           |  21 +-
 24 files changed, 839 insertions(+), 39 deletions(-)
 create mode 100644 packages/editor-ui/src/components/ButtonParameter/ButtonParameter.vue
 create mode 100644 packages/editor-ui/src/components/ButtonParameter/utils.ts
 create mode 100644 packages/editor-ui/src/components/__tests__/ButtonParameter.test.ts
 create mode 100644 packages/nodes-base/nodes/AiTransform/AiTransform.node.json
 create mode 100644 packages/nodes-base/nodes/AiTransform/AiTransform.node.ts
 create mode 100644 packages/nodes-base/nodes/AiTransform/aitransform.svg

diff --git a/packages/@n8n/nodes-langchain/nodes/trigger/ManualChatTrigger/ManualChatTrigger.node.ts b/packages/@n8n/nodes-langchain/nodes/trigger/ManualChatTrigger/ManualChatTrigger.node.ts
index 272213d5390c2..816b56b59ad40 100644
--- a/packages/@n8n/nodes-langchain/nodes/trigger/ManualChatTrigger/ManualChatTrigger.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/trigger/ManualChatTrigger/ManualChatTrigger.node.ts
@@ -50,7 +50,9 @@ export class ManualChatTrigger implements INodeType {
 				name: 'openChat',
 				type: 'button',
 				typeOptions: {
-					action: 'openChat',
+					buttonConfig: {
+						action: 'openChat',
+					},
 				},
 				default: '',
 			},
diff --git a/packages/cli/src/controllers/dynamicNodeParameters.controller.ts b/packages/cli/src/controllers/dynamicNodeParameters.controller.ts
index c6a46aa3d4eed..bfd1cf651b875 100644
--- a/packages/cli/src/controllers/dynamicNodeParameters.controller.ts
+++ b/packages/cli/src/controllers/dynamicNodeParameters.controller.ts
@@ -1,4 +1,4 @@
-import type { INodePropertyOptions } from 'n8n-workflow';
+import type { INodePropertyOptions, NodeParameterValueType } from 'n8n-workflow';
 
 import { Post, RestController } from '@/decorators';
 import { getBase } from '@/WorkflowExecuteAdditionalData';
@@ -92,4 +92,28 @@ export class DynamicNodeParametersController {
 			credentials,
 		);
 	}
+
+	@Post('/action-result')
+	async getActionResult(
+		req: DynamicNodeParametersRequest.ActionResult,
+	): Promise<NodeParameterValueType> {
+		const { currentNodeParameters, nodeTypeAndVersion, path, credentials, handler, payload } =
+			req.body;
+
+		const additionalData = await getBase(req.user.id, currentNodeParameters);
+
+		if (handler) {
+			return await this.service.getActionResult(
+				handler,
+				path,
+				additionalData,
+				nodeTypeAndVersion,
+				currentNodeParameters,
+				payload,
+				credentials,
+			);
+		}
+
+		return;
+	}
 }
diff --git a/packages/cli/src/requests.ts b/packages/cli/src/requests.ts
index 82cf7da30aeb2..436c0b1b18d94 100644
--- a/packages/cli/src/requests.ts
+++ b/packages/cli/src/requests.ts
@@ -420,6 +420,12 @@ export declare namespace DynamicNodeParametersRequest {
 	type ResourceMapperFields = BaseRequest<{
 		methodName: string;
 	}>;
+
+	/** POST /dynamic-node-parameters/action-result */
+	type ActionResult = BaseRequest<{
+		handler: string;
+		payload: IDataObject | string | undefined;
+	}>;
 }
 
 // ----------------------------------
diff --git a/packages/cli/src/services/dynamicNodeParameters.service.ts b/packages/cli/src/services/dynamicNodeParameters.service.ts
index 1788bac6e1877..f3b0f7e192ba3 100644
--- a/packages/cli/src/services/dynamicNodeParameters.service.ts
+++ b/packages/cli/src/services/dynamicNodeParameters.service.ts
@@ -15,6 +15,8 @@ import type {
 	INodeCredentials,
 	INodeParameters,
 	INodeTypeNameVersion,
+	NodeParameterValueType,
+	IDataObject,
 } from 'n8n-workflow';
 import { Workflow, RoutingNode, ApplicationError } from 'n8n-workflow';
 import { NodeExecuteFunctions } from 'n8n-core';
@@ -156,6 +158,24 @@ export class DynamicNodeParametersService {
 		return method.call(thisArgs);
 	}
 
+	/** Returns the result of the action handler */
+	async getActionResult(
+		handler: string,
+		path: string,
+		additionalData: IWorkflowExecuteAdditionalData,
+		nodeTypeAndVersion: INodeTypeNameVersion,
+		currentNodeParameters: INodeParameters,
+		payload: IDataObject | string | undefined,
+		credentials?: INodeCredentials,
+	): Promise<NodeParameterValueType> {
+		const nodeType = this.getNodeType(nodeTypeAndVersion);
+		const method = this.getMethod('actionHandler', handler, nodeType);
+		const workflow = this.getWorkflow(nodeTypeAndVersion, currentNodeParameters, credentials);
+		const thisArgs = this.getThisArg(path, additionalData, workflow);
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-return
+		return method.call(thisArgs, payload);
+	}
+
 	private getMethod(
 		type: 'resourceMapping',
 		methodName: string,
@@ -175,9 +195,14 @@ export class DynamicNodeParametersService {
 		methodName: string,
 		nodeType: INodeType,
 	): (this: ILoadOptionsFunctions) => Promise<INodePropertyOptions[]>;
+	private getMethod(
+		type: 'actionHandler',
+		methodName: string,
+		nodeType: INodeType,
+	): (this: ILoadOptionsFunctions, payload?: string) => Promise<NodeParameterValueType>;
 
 	private getMethod(
-		type: 'resourceMapping' | 'listSearch' | 'loadOptions',
+		type: 'resourceMapping' | 'listSearch' | 'loadOptions' | 'actionHandler',
 		methodName: string,
 		nodeType: INodeType,
 	) {
diff --git a/packages/editor-ui/src/Interface.ts b/packages/editor-ui/src/Interface.ts
index 04365662b28e4..05c40402f1c0a 100644
--- a/packages/editor-ui/src/Interface.ts
+++ b/packages/editor-ui/src/Interface.ts
@@ -1553,6 +1553,11 @@ export declare namespace DynamicNodeParameters {
 	interface ResourceMapperFieldsRequest extends BaseRequest {
 		methodName: string;
 	}
+
+	interface ActionResultRequest extends BaseRequest {
+		handler: string;
+		payload: IDataObject | string | undefined;
+	}
 }
 
 export interface EnvironmentVariable {
diff --git a/packages/editor-ui/src/api/nodeTypes.ts b/packages/editor-ui/src/api/nodeTypes.ts
index 300b25390d121..f4d516aaeff82 100644
--- a/packages/editor-ui/src/api/nodeTypes.ts
+++ b/packages/editor-ui/src/api/nodeTypes.ts
@@ -5,6 +5,7 @@ import type {
 	INodePropertyOptions,
 	INodeTypeDescription,
 	INodeTypeNameVersion,
+	NodeParameterValueType,
 	ResourceMapperFields,
 } from 'n8n-workflow';
 import axios from 'axios';
@@ -57,3 +58,15 @@ export async function getResourceMapperFields(
 		sendData,
 	);
 }
+
+export async function getNodeParameterActionResult(
+	context: IRestApiContext,
+	sendData: DynamicNodeParameters.ActionResultRequest,
+): Promise<NodeParameterValueType> {
+	return await makeRestApiRequest(
+		context,
+		'POST',
+		'/dynamic-node-parameters/action-result',
+		sendData,
+	);
+}
diff --git a/packages/editor-ui/src/components/ButtonParameter/ButtonParameter.vue b/packages/editor-ui/src/components/ButtonParameter/ButtonParameter.vue
new file mode 100644
index 0000000000000..d7e05b0f5bf85
--- /dev/null
+++ b/packages/editor-ui/src/components/ButtonParameter/ButtonParameter.vue
@@ -0,0 +1,281 @@
+<script setup lang="ts">
+import { ApplicationError, 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 { useI18n } from '@/composables/useI18n';
+import { useToast } from '@/composables/useToast';
+import { useNDVStore } from '@/stores/ndv.store';
+import { getSchemas, getParentNodes } from './utils';
+import { ASK_AI_EXPERIMENT } from '@/constants';
+import { usePostHog } from '@/stores/posthog.store';
+import { useRootStore } from '@/stores/root.store';
+import { generateCodeForPrompt } from '@/api/ai';
+
+import { format } from 'prettier';
+import jsParser from 'prettier/plugins/babel';
+import * as estree from 'prettier/plugins/estree';
+
+const emit = defineEmits<{
+	valueChanged: [value: IUpdateInformation];
+}>();
+
+const props = defineProps<{
+	parameter: INodeProperties;
+	value: string;
+	path: string;
+}>();
+
+const posthog = usePostHog();
+const rootStore = useRootStore();
+
+const i18n = useI18n();
+
+const isLoading = ref(false);
+const prompt = ref(props.value);
+const parentNodes = ref<INodeUi[]>([]);
+
+const hasExecutionData = computed(() => (useNDVStore().ndvInputData || []).length > 0);
+const hasInputField = computed(() => props.parameter.typeOptions?.buttonConfig?.hasInputField);
+const inputFieldMaxLength = computed(
+	() => props.parameter.typeOptions?.buttonConfig?.inputFieldMaxLength,
+);
+const buttonLabel = computed(
+	() => props.parameter.typeOptions?.buttonConfig?.label ?? props.parameter.displayName,
+);
+const isSubmitEnabled = computed(() => {
+	if (!hasExecutionData.value) return false;
+	if (!prompt.value) return false;
+
+	const maxlength = inputFieldMaxLength.value;
+	if (maxlength && prompt.value.length > maxlength) return false;
+
+	return true;
+});
+
+function startLoading() {
+	isLoading.value = true;
+}
+
+function stopLoading() {
+	setTimeout(() => {
+		isLoading.value = false;
+	}, 200);
+}
+
+function getPath(parameter: string) {
+	return (props.path ? `${props.path}.` : '') + parameter;
+}
+
+function createPrompt(prompt: string) {
+	return `
+Important! The original input must remain unchanged. If there is a risk of modifying the original input, create a copy of it before making any changes. Use appropriate methods to ensure that the properties of objects are not directly altered.
+
+Always return an array
+
+${prompt}
+`;
+}
+
+async function onSubmit() {
+	const { activeNode } = useNDVStore();
+	const { showMessage } = useToast();
+	const action: string | NodePropertyAction | undefined =
+		props.parameter.typeOptions?.buttonConfig?.action;
+
+	if (!action || !activeNode) return;
+
+	if (typeof action === 'string') {
+		switch (action) {
+			default:
+				return;
+		}
+	}
+
+	emit('valueChanged', {
+		name: getPath(props.parameter.name),
+		value: prompt.value,
+	});
+
+	const { type, target } = action;
+
+	startLoading();
+
+	try {
+		const schemas = getSchemas();
+		const version = rootStore.versionCli;
+		const model =
+			usePostHog().getVariant(ASK_AI_EXPERIMENT.name) === ASK_AI_EXPERIMENT.gpt4
+				? 'gpt-4'
+				: 'gpt-3.5-turbo-16k';
+
+		const payload = {
+			question: createPrompt(prompt.value),
+			context: {
+				schema: schemas.parentNodesSchemas,
+				inputSchema: schemas.inputSchema!,
+				ndvPushRef: useNDVStore().pushRef,
+				pushRef: rootStore.pushRef,
+			},
+			model,
+			n8nVersion: version,
+		};
+		switch (type) {
+			case 'askAiCodeGeneration':
+				let value;
+				if (posthog.isAiEnabled()) {
+					const { restApiContext } = useRootStore();
+					const { code } = await generateCodeForPrompt(restApiContext, payload);
+					value = code;
+				} else {
+					throw new ApplicationError('AI code generation is not enabled');
+				}
+
+				if (value === undefined) return;
+
+				const formattedCode = await format(String(value), {
+					parser: 'babel',
+					plugins: [jsParser, estree],
+				});
+
+				const updateInformation = {
+					name: getPath(target as string),
+					value: formattedCode,
+				};
+
+				emit('valueChanged', updateInformation);
+				break;
+			default:
+				return;
+		}
+
+		showMessage({
+			type: 'success',
+			title: i18n.baseText('codeNodeEditor.askAi.generationCompleted'),
+		});
+
+		stopLoading();
+	} catch (error) {
+		showMessage({
+			type: 'error',
+			title: i18n.baseText('codeNodeEditor.askAi.generationFailed'),
+			message: error.message,
+		});
+		stopLoading();
+	}
+}
+
+function onPromptInput(inputValue: string) {
+	prompt.value = inputValue;
+	emit('valueChanged', {
+		name: getPath(props.parameter.name),
+		value: inputValue,
+	});
+}
+
+onMounted(() => {
+	parentNodes.value = getParentNodes();
+});
+</script>
+
+<template>
+	<div>
+		<n8n-input-label
+			v-if="hasInputField"
+			:label="i18n.nodeText().inputLabelDisplayName(parameter, path)"
+			:tooltip-text="i18n.nodeText().inputLabelDescription(parameter, path)"
+			:bold="false"
+			size="small"
+			color="text-dark"
+		>
+		</n8n-input-label>
+		<div :class="$style.inputContainer" :hidden="!hasInputField">
+			<div :class="$style.meta">
+				<span
+					v-if="inputFieldMaxLength"
+					v-show="prompt.length > 1"
+					:class="$style.counter"
+					v-text="`${prompt.length} / ${inputFieldMaxLength}`"
+				/>
+			</div>
+			<N8nInput
+				v-model="prompt"
+				:class="$style.input"
+				style="border: 1px solid var(--color-foreground-base)"
+				type="textarea"
+				:rows="6"
+				:maxlength="inputFieldMaxLength"
+				:placeholder="parameter.placeholder"
+				@input="onPromptInput"
+			/>
+		</div>
+		<div :class="$style.controls">
+			<N8nTooltip :disabled="isSubmitEnabled">
+				<div>
+					<N8nButton
+						:disabled="!isSubmitEnabled"
+						size="small"
+						:loading="isLoading"
+						type="secondary"
+						@click="onSubmit"
+					>
+						{{ buttonLabel }}
+					</N8nButton>
+				</div>
+				<template #content>
+					<span
+						v-if="!hasExecutionData"
+						v-text="i18n.baseText('codeNodeEditor.askAi.noInputData')"
+					/>
+					<span
+						v-else-if="prompt.length === 0"
+						v-text="i18n.baseText('codeNodeEditor.askAi.noPrompt')"
+					/>
+				</template>
+			</N8nTooltip>
+		</div>
+	</div>
+</template>
+
+<style module lang="scss">
+.input * {
+	border: 0 !important;
+}
+.input textarea {
+	font-size: var(--font-size-2xs);
+	padding-bottom: var(--spacing-2xl);
+	font-family: var(--font-family);
+	resize: none;
+}
+.intro {
+	font-weight: var(--font-weight-bold);
+	font-size: var(--font-size-2xs);
+	color: var(--color-text-dark);
+	padding: var(--spacing-2xs) 0 0;
+}
+.inputContainer {
+	position: relative;
+}
+.meta {
+	display: flex;
+	justify-content: space-between;
+	position: absolute;
+	bottom: var(--spacing-2xs);
+	left: var(--spacing-xs);
+	right: var(--spacing-xs);
+	z-index: 1;
+
+	* {
+		font-size: var(--font-size-2xs);
+		line-height: 1;
+	}
+}
+.counter {
+	color: var(--color-text-light);
+}
+.controls {
+	padding: var(--spacing-2xs) 0;
+	display: flex;
+	justify-content: flex-end;
+}
+</style>
diff --git a/packages/editor-ui/src/components/ButtonParameter/utils.ts b/packages/editor-ui/src/components/ButtonParameter/utils.ts
new file mode 100644
index 0000000000000..14d3ca4d78334
--- /dev/null
+++ b/packages/editor-ui/src/components/ButtonParameter/utils.ts
@@ -0,0 +1,46 @@
+import type { Schema } from '@/Interface';
+import type { INodeExecutionData } from 'n8n-workflow';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useNDVStore } from '@/stores/ndv.store';
+import { useDataSchema } from '@/composables/useDataSchema';
+import { executionDataToJson } from '@/utils/nodeTypesUtils';
+
+export function getParentNodes() {
+	const activeNode = useNDVStore().activeNode;
+	const { getCurrentWorkflow, getNodeByName } = useWorkflowsStore();
+	const workflow = getCurrentWorkflow();
+
+	if (!activeNode || !workflow) return [];
+
+	return workflow
+		.getParentNodesByDepth(activeNode?.name)
+		.filter(({ name }, i, nodes) => {
+			return name !== activeNode.name && nodes.findIndex((node) => node.name === name) === i;
+		})
+		.map((n) => getNodeByName(n.name))
+		.filter((n) => n !== null);
+}
+
+export function getSchemas() {
+	const parentNodes = getParentNodes();
+	const parentNodesNames = parentNodes.map((node) => node?.name);
+	const { getSchemaForExecutionData, getInputDataWithPinned } = useDataSchema();
+	const parentNodesSchemas: Array<{ nodeName: string; schema: Schema }> = parentNodes
+		.map((node) => {
+			const inputData: INodeExecutionData[] = getInputDataWithPinned(node);
+
+			return {
+				nodeName: node?.name || '',
+				schema: getSchemaForExecutionData(executionDataToJson(inputData), true),
+			};
+		})
+		.filter((node) => node.schema?.value.length > 0);
+
+	const inputSchema = parentNodesSchemas.shift();
+
+	return {
+		parentNodesNames,
+		inputSchema,
+		parentNodesSchemas,
+	};
+}
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue b/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
index fc141304f324b..36a5d169e1ec9 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
+++ b/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
@@ -60,13 +60,12 @@ import jsParser from 'prettier/plugins/babel';
 import * as estree from 'prettier/plugins/estree';
 import { type Ref, computed, nextTick, onBeforeUnmount, onMounted, ref, watch } from 'vue';
 
-import { ASK_AI_EXPERIMENT, CODE_NODE_TYPE } from '@/constants';
+import { CODE_NODE_TYPE } from '@/constants';
 import { codeNodeEditorEventBus } from '@/event-bus';
 import { useRootStore } from '@/stores/root.store';
 import { usePostHog } from '@/stores/posthog.store';
 
 import { useMessage } from '@/composables/useMessage';
-import { useSettingsStore } from '@/stores/settings.store';
 import AskAI from './AskAI/AskAI.vue';
 import { readOnlyEditorExtensions, writableEditorExtensions } from './baseExtensions';
 import { useCompleter } from './completer';
@@ -114,7 +113,6 @@ const { autocompletionExtension } = useCompleter(() => props.mode, editor);
 const { createLinter } = useLinter(() => props.mode, editor);
 
 const rootStore = useRootStore();
-const settingsStore = useSettingsStore();
 const posthog = usePostHog();
 const i18n = useI18n();
 const telemetry = useTelemetry();
@@ -194,13 +192,7 @@ onBeforeUnmount(() => {
 });
 
 const aiEnabled = computed(() => {
-	const isAiExperimentEnabled = [ASK_AI_EXPERIMENT.gpt3, ASK_AI_EXPERIMENT.gpt4].includes(
-		(posthog.getVariant(ASK_AI_EXPERIMENT.name) ?? '') as string,
-	);
-
-	return (
-		isAiExperimentEnabled && settingsStore.settings.ai.enabled && props.language === 'javaScript'
-	);
+	return posthog.isAiEnabled() && props.language === 'javaScript';
 });
 
 const placeholder = computed(() => {
diff --git a/packages/editor-ui/src/components/JsEditor/JsEditor.vue b/packages/editor-ui/src/components/JsEditor/JsEditor.vue
index 40692ab32392c..5a5f2cb411878 100644
--- a/packages/editor-ui/src/components/JsEditor/JsEditor.vue
+++ b/packages/editor-ui/src/components/JsEditor/JsEditor.vue
@@ -1,5 +1,5 @@
 <template>
-	<div :class="$style.editor">
+	<div :class="$style.editor" :style="isReadOnly ? 'opacity: 0.7' : ''">
 		<div ref="jsEditorRef" class="ph-no-capture js-editor"></div>
 		<slot name="suffix" />
 	</div>
@@ -21,7 +21,7 @@ import {
 	keymap,
 	lineNumbers,
 } from '@codemirror/view';
-import { computed, onMounted, ref } from 'vue';
+import { computed, onMounted, ref, watch } from 'vue';
 
 import {
 	autocompleteKeyMap,
@@ -45,11 +45,37 @@ const emit = defineEmits<{
 }>();
 
 onMounted(() => {
+	createEditor();
+});
+
+watch(
+	() => props.modelValue,
+	(newValue: string) => {
+		const editorValue = editor.value?.state?.doc.toString();
+
+		// If model value changes from outside the component
+		if (
+			editorValue !== undefined &&
+			editorValue.length !== newValue.length &&
+			editorValue !== newValue
+		) {
+			destroyEditor();
+			createEditor();
+		}
+	},
+);
+
+function createEditor() {
 	const state = EditorState.create({ doc: props.modelValue, extensions: extensions.value });
 	const parent = jsEditorRef.value;
+
 	editor.value = new EditorView({ parent, state });
 	editorState.value = editor.value.state;
-});
+}
+
+function destroyEditor() {
+	editor.value?.destroy();
+}
 
 const jsEditorRef = ref<HTMLDivElement>();
 const editor = ref<EditorView | null>(null);
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/utils.ts b/packages/editor-ui/src/components/Node/NodeCreator/utils.ts
index a76c62a7ca97c..7bacf6b701abf 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/utils.ts
+++ b/packages/editor-ui/src/components/Node/NodeCreator/utils.ts
@@ -9,6 +9,7 @@ import type {
 import {
 	AI_CATEGORY_AGENTS,
 	AI_SUBCATEGORY,
+	AI_TRANSFORM_NODE_TYPE,
 	CORE_NODES_CATEGORY,
 	DEFAULT_SUBCATEGORY,
 } from '@/constants';
@@ -19,6 +20,8 @@ import type { NodeViewItemSection } from './viewsData';
 import { i18n } from '@/plugins/i18n';
 import { sortBy } from 'lodash-es';
 
+import { usePostHog } from '@/stores/posthog.store';
+
 export function transformNodeType(
 	node: SimplifiedNodeType,
 	subcategory?: string,
@@ -74,6 +77,11 @@ export function sortNodeCreateElements(nodes: INodeCreateElement[]) {
 }
 
 export function searchNodes(searchFilter: string, items: INodeCreateElement[]) {
+	const aiEnabled = usePostHog().isAiEnabled();
+	if (!aiEnabled) {
+		items = items.filter((item) => item.key !== AI_TRANSFORM_NODE_TYPE);
+	}
+
 	// In order to support the old search we need to remove the 'trigger' part
 	const trimmedFilter = searchFilter.toLowerCase().replace('trigger', '').trimEnd();
 
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/viewsData.ts b/packages/editor-ui/src/components/Node/NodeCreator/viewsData.ts
index ba9cb59c3aa05..479a85f644739 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/viewsData.ts
+++ b/packages/editor-ui/src/components/Node/NodeCreator/viewsData.ts
@@ -1,4 +1,5 @@
 import {
+	AI_TRANSFORM_NODE_TYPE,
 	CORE_NODES_CATEGORY,
 	WEBHOOK_NODE_TYPE,
 	OTHER_TRIGGER_NODES_SUBCATEGORY,
@@ -63,6 +64,7 @@ import { NodeConnectionType } from 'n8n-workflow';
 import { useTemplatesStore } from '@/stores/templates.store';
 import type { BaseTextKey } from '@/plugins/i18n';
 import { camelCase } from 'lodash-es';
+import { usePostHog } from '@/stores/posthog.store';
 
 export interface NodeViewItemSection {
 	key: string;
@@ -429,6 +431,13 @@ export function TriggerView() {
 export function RegularView(nodes: SimplifiedNodeType[]) {
 	const i18n = useI18n();
 
+	const popularItemsSubcategory = [SET_NODE_TYPE, CODE_NODE_TYPE, DATETIME_NODE_TYPE];
+	const aiEnabled = usePostHog().isAiEnabled();
+
+	if (aiEnabled) {
+		popularItemsSubcategory.push(AI_TRANSFORM_NODE_TYPE);
+	}
+
 	const view: NodeView = {
 		value: REGULAR_NODE_CREATOR_VIEW,
 		title: i18n.baseText('nodeCreator.triggerHelperPanel.whatHappensNext'),
@@ -453,7 +462,7 @@ export function RegularView(nodes: SimplifiedNodeType[]) {
 						{
 							key: 'popular',
 							title: i18n.baseText('nodeCreator.sectionNames.popular'),
-							items: [SET_NODE_TYPE, CODE_NODE_TYPE, DATETIME_NODE_TYPE],
+							items: popularItemsSubcategory,
 						},
 						{
 							key: 'addOrRemove',
diff --git a/packages/editor-ui/src/components/ParameterInput.vue b/packages/editor-ui/src/components/ParameterInput.vue
index b0dabd57708b6..533ad6c49d3cb 100644
--- a/packages/editor-ui/src/components/ParameterInput.vue
+++ b/packages/editor-ui/src/components/ParameterInput.vue
@@ -136,13 +136,14 @@
 					:model-value="modelValueString"
 					:default-value="parameter.default"
 					:language="editorLanguage"
-					:is-read-only="isReadOnly"
+					:is-read-only="isReadOnly || editorIsReadOnly"
 					:rows="editorRows"
 					:ai-button-enabled="settingsStore.isCloudDeployment"
 					@update:model-value="valueChangedDebounced"
 				>
 					<template #suffix>
 						<n8n-icon
+							v-if="!editorIsReadOnly"
 							data-test-id="code-editor-fullscreen-button"
 							icon="external-link-alt"
 							size="xsmall"
@@ -200,12 +201,13 @@
 					v-else-if="editorType === 'jsEditor'"
 					:key="'js-' + codeEditDialogVisible.toString()"
 					:model-value="modelValueString"
-					:is-read-only="isReadOnly"
+					:is-read-only="isReadOnly || editorIsReadOnly"
 					:rows="editorRows"
 					@update:model-value="valueChangedDebounced"
 				>
 					<template #suffix>
 						<n8n-icon
+							v-if="!editorIsReadOnly"
 							data-test-id="code-editor-fullscreen-button"
 							icon="external-link-alt"
 							size="xsmall"
@@ -861,6 +863,9 @@ const getIssues = computed<string[]>(() => {
 const editorType = computed<EditorType | 'json' | 'code'>(() => {
 	return getArgument<EditorType>('editor');
 });
+const editorIsReadOnly = computed<boolean>(() => {
+	return getArgument<boolean>('editorIsReadOnly') ?? false;
+});
 
 const editorLanguage = computed<CodeNodeEditorLanguage>(() => {
 	if (editorType.value === 'json' || props.parameter.type === 'json')
diff --git a/packages/editor-ui/src/components/ParameterInputList.vue b/packages/editor-ui/src/components/ParameterInputList.vue
index 1ff04da89cbfc..3e27b8c96cd7b 100644
--- a/packages/editor-ui/src/components/ParameterInputList.vue
+++ b/packages/editor-ui/src/components/ParameterInputList.vue
@@ -35,14 +35,15 @@
 				@action="onNoticeAction"
 			/>
 
-			<n8n-button
-				v-else-if="parameter.type === 'button'"
-				class="parameter-item"
-				block
-				@click="onButtonAction(parameter)"
-			>
-				{{ $locale.nodeText().inputLabelDisplayName(parameter, path) }}
-			</n8n-button>
+			<div v-else-if="parameter.type === 'button'" class="parameter-item">
+				<ButtonParameter
+					:parameter="parameter"
+					:path="path"
+					:value="getParameterValue(parameter.name)"
+					:is-read-only="isReadOnly"
+					@value-changed="valueChanged"
+				/>
+			</div>
 
 			<div
 				v-else-if="['collection', 'fixedCollection'].includes(parameter.type)"
@@ -177,6 +178,7 @@ import AssignmentCollection from '@/components/AssignmentCollection/AssignmentCo
 import FilterConditions from '@/components/FilterConditions/FilterConditions.vue';
 import ImportCurlParameter from '@/components/ImportCurlParameter.vue';
 import MultipleParameter from '@/components/MultipleParameter.vue';
+import ButtonParameter from '@/components/ButtonParameter/ButtonParameter.vue';
 import ParameterInputFull from '@/components/ParameterInputFull.vue';
 import ResourceMapper from '@/components/ResourceMapper/ResourceMapper.vue';
 import { useNodeHelpers } from '@/composables/useNodeHelpers';
@@ -483,14 +485,6 @@ function onNoticeAction(action: string) {
  * Handles default node button parameter type actions
  * @param parameter
  */
-function onButtonAction(parameter: INodeProperties) {
-	const action: string | undefined = parameter.typeOptions?.action;
-
-	switch (action) {
-		default:
-			return;
-	}
-}
 
 function shouldHideAuthRelatedParameter(parameter: INodeProperties): boolean {
 	// TODO: For now, hide all fields that are used in authentication fields displayOptions
diff --git a/packages/editor-ui/src/components/__tests__/ButtonParameter.test.ts b/packages/editor-ui/src/components/__tests__/ButtonParameter.test.ts
new file mode 100644
index 0000000000000..28e80091e5f19
--- /dev/null
+++ b/packages/editor-ui/src/components/__tests__/ButtonParameter.test.ts
@@ -0,0 +1,136 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { mount } from '@vue/test-utils';
+import { createTestingPinia } from '@pinia/testing';
+import ButtonParameter from '@/components/ButtonParameter/ButtonParameter.vue';
+import { useNDVStore } from '@/stores/ndv.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { usePostHog } from '@/stores/posthog.store';
+import { useRootStore } from '@/stores/root.store';
+import { useI18n } from '@/composables/useI18n';
+import { useToast } from '@/composables/useToast';
+import type { INodeProperties } from 'n8n-workflow';
+
+vi.mock('@/stores/ndv.store');
+vi.mock('@/stores/workflows.store');
+vi.mock('@/stores/posthog.store');
+vi.mock('@/stores/root.store');
+vi.mock('@/api/ai');
+vi.mock('@/composables/useI18n');
+vi.mock('@/composables/useToast');
+
+describe('ButtonParameter', () => {
+	const defaultProps = {
+		parameter: {
+			name: 'testParam',
+			displayName: 'Test Parameter',
+			type: 'string',
+			default: '',
+			typeOptions: {
+				buttonConfig: {
+					label: 'Generate',
+					action: {
+						type: 'askAiCodeGeneration',
+						target: 'targetParam',
+					},
+					hasInputField: true,
+				},
+			},
+		} as INodeProperties,
+		value: '',
+		path: 'testPath',
+	};
+
+	beforeEach(() => {
+		vi.mocked(useNDVStore).mockReturnValue({
+			ndvInputData: [{}],
+			activeNode: { name: 'TestNode' },
+		} as any);
+
+		vi.mocked(useWorkflowsStore).mockReturnValue({
+			getCurrentWorkflow: vi.fn().mockReturnValue({
+				getParentNodesByDepth: vi.fn().mockReturnValue([]),
+			}),
+			getNodeByName: vi.fn().mockReturnValue({}),
+		} as any);
+
+		vi.mocked(usePostHog).mockReturnValue({
+			isAiEnabled: vi.fn().mockReturnValue(true),
+			getVariant: vi.fn().mockReturnValue('gpt-3.5-turbo-16k'),
+		} as any);
+
+		vi.mocked(useRootStore).mockReturnValue({
+			versionCli: '1.0.0',
+			pushRef: 'testPushRef',
+		} as any);
+
+		vi.mocked(useI18n).mockReturnValue({
+			baseText: vi.fn().mockReturnValue('Mocked Text'),
+			nodeText: () => ({
+				inputLabelDisplayName: vi.fn().mockReturnValue('Mocked Display Name'),
+				inputLabelDescription: vi.fn().mockReturnValue('Mocked Description'),
+			}),
+		} as any);
+
+		vi.mocked(useToast).mockReturnValue({
+			showMessage: vi.fn(),
+		} as any);
+	});
+
+	const mountComponent = (props = defaultProps) => {
+		return mount(ButtonParameter, {
+			props,
+			global: {
+				plugins: [createTestingPinia()],
+			},
+		});
+	};
+
+	it('renders correctly', () => {
+		const wrapper = mountComponent();
+		expect(wrapper.find('textarea').exists()).toBe(true);
+		expect(wrapper.find('button').text()).toBe('Generate');
+	});
+
+	it('emits valueChanged event on input', async () => {
+		const wrapper = mountComponent();
+		const input = wrapper.find('textarea');
+		await input.setValue('Test prompt');
+		expect(wrapper.emitted('valueChanged')).toBeTruthy();
+		expect(wrapper.emitted('valueChanged')![0][0]).toEqual({
+			name: 'testPath.testParam',
+			value: 'Test prompt',
+		});
+	});
+
+	it('disables submit button when there is no execution data', async () => {
+		vi.mocked(useNDVStore).mockReturnValue({
+			ndvInputData: [],
+		} as any);
+		const wrapper = mountComponent();
+		expect(wrapper.find('button').attributes('disabled')).toBeDefined();
+	});
+
+	it('disables submit button when prompt is empty', async () => {
+		const wrapper = mountComponent();
+		expect(wrapper.find('button').attributes('disabled')).toBeDefined();
+	});
+
+	it('enables submit button when there is execution data and prompt', async () => {
+		const wrapper = mountComponent();
+		await wrapper.find('textarea').setValue('Test prompt');
+		expect(wrapper.find('button').attributes('disabled')).toBeUndefined();
+	});
+
+	it('calls onSubmit when button is clicked', async () => {
+		const wrapper = mountComponent();
+		await wrapper.find('textarea').setValue('Test prompt');
+
+		const submitButton = wrapper.find('button');
+		expect(submitButton.attributes('disabled')).toBeUndefined();
+
+		await submitButton.trigger('click');
+
+		expect(useToast().showMessage).toHaveBeenCalled();
+	});
+});
diff --git a/packages/editor-ui/src/constants.ts b/packages/editor-ui/src/constants.ts
index 264dc9fb7e349..daf788eb21d45 100644
--- a/packages/editor-ui/src/constants.ts
+++ b/packages/editor-ui/src/constants.ts
@@ -191,6 +191,7 @@ export const CHAIN_SUMMARIZATION_LANGCHAIN_NODE_TYPE =
 	'@n8n/n8n-nodes-langchain.chainSummarization';
 export const SIMULATE_NODE_TYPE = 'n8n-nodes-base.simulate';
 export const SIMULATE_TRIGGER_NODE_TYPE = 'n8n-nodes-base.simulateTrigger';
+export const AI_TRANSFORM_NODE_TYPE = 'n8n-nodes-base.aiTransform';
 
 export const CREDENTIAL_ONLY_NODE_PREFIX = 'n8n-creds-base';
 export const CREDENTIAL_ONLY_HTTP_NODE_VERSION = 4.1;
@@ -210,7 +211,11 @@ export const NON_ACTIVATABLE_TRIGGER_NODE_TYPES = [
 	MANUAL_CHAT_TRIGGER_NODE_TYPE,
 ];
 
-export const NODES_USING_CODE_NODE_EDITOR = [CODE_NODE_TYPE, AI_CODE_NODE_TYPE];
+export const NODES_USING_CODE_NODE_EDITOR = [
+	CODE_NODE_TYPE,
+	AI_CODE_NODE_TYPE,
+	AI_TRANSFORM_NODE_TYPE,
+];
 
 export const PIN_DATA_NODE_TYPES_DENYLIST = [SPLIT_IN_BATCHES_NODE_TYPE, STICKY_NODE_TYPE];
 
diff --git a/packages/editor-ui/src/stores/nodeTypes.store.ts b/packages/editor-ui/src/stores/nodeTypes.store.ts
index 8a5152d30deef..e8260fdedb8ae 100644
--- a/packages/editor-ui/src/stores/nodeTypes.store.ts
+++ b/packages/editor-ui/src/stores/nodeTypes.store.ts
@@ -303,6 +303,12 @@ export const useNodeTypesStore = defineStore(STORES.NODE_TYPES, () => {
 		}
 	};
 
+	const getNodeParameterActionResult = async (
+		sendData: DynamicNodeParameters.ActionResultRequest,
+	) => {
+		return await nodeTypesApi.getNodeParameterActionResult(rootStore.restApiContext, sendData);
+	};
+
 	// #endregion
 
 	return {
@@ -321,6 +327,7 @@ export const useNodeTypesStore = defineStore(STORES.NODE_TYPES, () => {
 		visibleNodeTypesByInputConnectionTypeNames,
 		isConfigurableNode,
 		getResourceMapperFields,
+		getNodeParameterActionResult,
 		getResourceLocatorResults,
 		getNodeParameterOptions,
 		getNodesInformation,
diff --git a/packages/editor-ui/src/stores/posthog.store.ts b/packages/editor-ui/src/stores/posthog.store.ts
index b3c1f228af184..6a25ca5520fd9 100644
--- a/packages/editor-ui/src/stores/posthog.store.ts
+++ b/packages/editor-ui/src/stores/posthog.store.ts
@@ -6,7 +6,11 @@ import { useUsersStore } from '@/stores/users.store';
 import { useRootStore } from '@/stores/root.store';
 import { useSettingsStore } from '@/stores/settings.store';
 import type { FeatureFlags, IDataObject } from 'n8n-workflow';
-import { EXPERIMENTS_TO_TRACK, LOCAL_STORAGE_EXPERIMENT_OVERRIDES } from '@/constants';
+import {
+	ASK_AI_EXPERIMENT,
+	EXPERIMENTS_TO_TRACK,
+	LOCAL_STORAGE_EXPERIMENT_OVERRIDES,
+} from '@/constants';
 import { useTelemetryStore } from './telemetry.store';
 import { useDebounce } from '@/composables/useDebounce';
 
@@ -38,6 +42,14 @@ export const usePostHog = defineStore('posthog', () => {
 		return overrides.value[experiment] ?? featureFlags.value?.[experiment];
 	};
 
+	const isAiEnabled = () => {
+		const isAiExperimentEnabled = [ASK_AI_EXPERIMENT.gpt3, ASK_AI_EXPERIMENT.gpt4].includes(
+			(getVariant(ASK_AI_EXPERIMENT.name) ?? '') as string,
+		);
+
+		return isAiExperimentEnabled && settingsStore.settings.ai.enabled;
+	};
+
 	const isVariantEnabled = (experiment: string, variant: string) => {
 		return getVariant(experiment) === variant;
 	};
@@ -183,6 +195,7 @@ export const usePostHog = defineStore('posthog', () => {
 
 	return {
 		init,
+		isAiEnabled,
 		isFeatureEnabled,
 		isVariantEnabled,
 		getVariant,
diff --git a/packages/nodes-base/nodes/AiTransform/AiTransform.node.json b/packages/nodes-base/nodes/AiTransform/AiTransform.node.json
new file mode 100644
index 0000000000000..0d13c13877fc5
--- /dev/null
+++ b/packages/nodes-base/nodes/AiTransform/AiTransform.node.json
@@ -0,0 +1,18 @@
+{
+	"node": "n8n-nodes-base.aiTransform",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
+	"details": "Modify data by writing a prompt",
+	"categories": ["Development", "Core Nodes"],
+	"resources": {
+		"primaryDocumentation": [
+			{
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.aitransform/"
+			}
+		]
+	},
+	"alias": ["code", "Javascript", "JS", "Script", "Custom Code", "Function", "AI", "LLM"],
+	"subcategories": {
+		"Core Nodes": ["Data Transformation"]
+	}
+}
diff --git a/packages/nodes-base/nodes/AiTransform/AiTransform.node.ts b/packages/nodes-base/nodes/AiTransform/AiTransform.node.ts
new file mode 100644
index 0000000000000..8c41635555ca3
--- /dev/null
+++ b/packages/nodes-base/nodes/AiTransform/AiTransform.node.ts
@@ -0,0 +1,148 @@
+/* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import {
+	NodeOperationError,
+	type IExecuteFunctions,
+	type INodeExecutionData,
+	type INodeType,
+	type INodeTypeDescription,
+} from 'n8n-workflow';
+
+import set from 'lodash/set';
+
+import { JavaScriptSandbox } from '../Code/JavaScriptSandbox';
+import { getSandboxContext } from '../Code/Sandbox';
+import { standardizeOutput } from '../Code/utils';
+
+const { CODE_ENABLE_STDOUT } = process.env;
+
+export class AiTransform implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'AI Transform',
+		name: 'aiTransform',
+		icon: 'file:aitransform.svg',
+		group: ['transform'],
+		version: 1,
+		description: 'Modify data based on instructions written in plain english',
+		defaults: {
+			name: 'AI Transform',
+		},
+		inputs: ['main'],
+		outputs: ['main'],
+		parameterPane: 'wide',
+		properties: [
+			{
+				displayName: 'Instructions',
+				name: 'generate',
+				type: 'button',
+				default: '',
+				description:
+					"Provide instructions on how you want to transform the data, then click 'Generate code'. Use dot notation to refer to nested fields (e.g. address.street).",
+				placeholder:
+					"Example: Merge 'firstname' and 'lastname' into a field 'details.name' and sort by 'email'",
+				typeOptions: {
+					buttonConfig: {
+						label: 'Generate code',
+						hasInputField: true,
+						inputFieldMaxLength: 500,
+						action: {
+							type: 'askAiCodeGeneration',
+							target: 'jsCode',
+						},
+					},
+				},
+			},
+			{
+				displayName: 'Transformation Code',
+				name: 'jsCode',
+				type: 'string',
+				typeOptions: {
+					editor: 'jsEditor',
+					editorIsReadOnly: true,
+				},
+				default: '',
+				description:
+					'Read-only. To edit this code, adjust the prompt or copy and paste it into a Code node.',
+				noDataExpression: true,
+			},
+			{
+				displayName:
+					"Click on 'Test step' to run the transformation code. Further executions will use the generated code (and not invoke AI again).",
+				name: 'hint',
+				type: 'notice',
+				default: '',
+				displayOptions: {
+					show: {
+						jsCode: [{ _cnd: { exists: true } }],
+					},
+				},
+			},
+		],
+	};
+
+	async execute(this: IExecuteFunctions) {
+		const workflowMode = this.getMode();
+
+		const node = this.getNode();
+
+		const codeParameterName = 'jsCode';
+
+		const getSandbox = (index = 0) => {
+			let code = '';
+			try {
+				code = this.getNodeParameter(codeParameterName, index) as string;
+
+				if (!code) {
+					const instructions = this.getNodeParameter('generate', index) as string;
+					if (!instructions) {
+						throw new NodeOperationError(node, 'Missing instructions to generate code', {
+							description:
+								"Enter your prompt in the 'Instructions' parameter and click 'Generate code'",
+						});
+					}
+					throw new NodeOperationError(node, 'Missing code for data transformation', {
+						description: "Click the 'Generate code' button to create the code",
+					});
+				}
+			} catch (error) {
+				if (error instanceof NodeOperationError) throw error;
+
+				throw new NodeOperationError(node, error);
+			}
+
+			const context = getSandboxContext.call(this, index);
+
+			context.items = context.$input.all();
+
+			const Sandbox = JavaScriptSandbox;
+			const sandbox = new Sandbox(context, code, index, this.helpers);
+			sandbox.on(
+				'output',
+				workflowMode === 'manual'
+					? this.sendMessageToUI
+					: CODE_ENABLE_STDOUT === 'true'
+						? (...args) =>
+								console.log(`[Workflow "${this.getWorkflow().id}"][Node "${node.name}"]`, ...args)
+						: () => {},
+			);
+			return sandbox;
+		};
+
+		const sandbox = getSandbox();
+		let items: INodeExecutionData[];
+		try {
+			items = (await sandbox.runCodeAllItems()) as INodeExecutionData[];
+		} catch (error) {
+			if (!this.continueOnFail(error)) {
+				set(error, 'node', node);
+				throw error;
+			}
+			items = [{ json: { error: error.message } }];
+		}
+
+		for (const item of items) {
+			standardizeOutput(item.json);
+		}
+
+		return [items];
+	}
+}
diff --git a/packages/nodes-base/nodes/AiTransform/aitransform.svg b/packages/nodes-base/nodes/AiTransform/aitransform.svg
new file mode 100644
index 0000000000000..699be8f28ed8e
--- /dev/null
+++ b/packages/nodes-base/nodes/AiTransform/aitransform.svg
@@ -0,0 +1,10 @@
+<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M39.4956 19.5195L34.8 18.006C31.7965 17.015 30.0369 14.5846 29.2111 11.5306L27.1447 1.46518C27.0908 1.2663 26.9593 1 26.5548 1C26.2144 1 26.0188 1.2663 25.9649 1.46518L23.8986 11.534C23.0693 14.588 21.3131 17.0184 18.3097 18.0094L13.6141 19.5229C12.95 19.7386 12.9399 20.6757 13.6006 20.9016L18.3299 22.5297C21.3232 23.5241 23.0693 25.9512 23.8986 28.9917L25.9683 38.9458C26.0222 39.1447 26.1335 39.502 26.5582 39.502C26.9977 39.502 27.0906 39.1585 27.1449 38.9577L27.1481 38.9458L29.2178 28.9917C30.047 25.9478 31.7931 23.5208 34.7865 22.5297L39.5158 20.9016C40.1697 20.6724 40.1596 19.7353 39.4956 19.5195ZM12.6028 28.277C9.82036 27.3584 9.54358 26.324 9.07959 24.5899L9.06681 24.5421L7.89038 20.4162C7.81959 20.1499 7.12519 20.1499 7.05103 20.4162L6.25214 24.2286C5.77684 25.9848 4.76558 27.3804 3.0397 27.9501L0.289074 29.1433C-0.0918337 29.2681 -0.0985755 29.8074 0.282332 29.9355L3.05318 30.9164C4.77233 31.4861 5.77684 32.8816 6.25551 34.6311L7.0544 38.2784C7.12856 38.5447 7.81959 38.5447 7.89038 38.2784L8.82748 34.648C9.30277 32.8884 10.0309 31.4895 12.3669 30.9164L14.9692 29.9355C15.3501 29.804 15.3467 29.2647 14.9625 29.14L12.6028 28.277ZM13.3255 2.03231C13.4169 1.65456 13.954 1.64852 14.0473 2.02833L14.0475 2.02889L15.0714 6.25591C15.2111 6.74054 15.5906 7.11618 16.0783 7.2487L18.6822 7.95026C19.0346 8.04918 19.0457 8.54279 18.7009 8.65979L18.7004 8.65996L15.97 9.57684C15.531 9.72415 15.1905 10.0756 15.0538 10.5179L14.0473 14.4327L14.0471 14.4337C13.9524 14.8153 13.4207 14.7996 13.3291 14.4333L12.3559 10.5303C12.2222 10.0878 11.8845 9.73333 11.4489 9.58314L8.72013 8.63869C8.37299 8.51471 8.40082 8.02141 8.75078 7.92932L8.75135 7.92917L11.3368 7.25837C11.8372 7.12876 12.2283 6.74382 12.3616 6.24505L13.3255 2.03231Z" fill="url(#paint0_linear_1373_20357)"/>
+<defs>
+<linearGradient id="paint0_linear_1373_20357" x1="0" y1="1" x2="47.0035" y2="13.8158" gradientUnits="userSpaceOnUse">
+<stop stop-color="#5B60E8"/>
+<stop offset="0.5" stop-color="#AA7BEC"/>
+<stop offset="1" stop-color="#EC7B8E"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index cadf8adc322cc..a0d1fef217b68 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -390,6 +390,7 @@
       "dist/nodes/AgileCrm/AgileCrm.node.js",
       "dist/nodes/Airtable/Airtable.node.js",
       "dist/nodes/Airtable/AirtableTrigger.node.js",
+      "dist/nodes/AiTransform/AiTransform.node.js",
       "dist/nodes/Amqp/Amqp.node.js",
       "dist/nodes/Amqp/AmqpTrigger.node.js",
       "dist/nodes/ApiTemplateIo/ApiTemplateIo.node.js",
diff --git a/packages/workflow/src/Constants.ts b/packages/workflow/src/Constants.ts
index 2ecd550b31f28..48bd06e521690 100644
--- a/packages/workflow/src/Constants.ts
+++ b/packages/workflow/src/Constants.ts
@@ -37,6 +37,7 @@ export const CODE_NODE_TYPE = 'n8n-nodes-base.code';
 export const FUNCTION_NODE_TYPE = 'n8n-nodes-base.function';
 export const FUNCTION_ITEM_NODE_TYPE = 'n8n-nodes-base.functionItem';
 export const MERGE_NODE_TYPE = 'n8n-nodes-base.merge';
+export const AI_TRANSFORM_NODE_TYPE = 'n8n-nodes-base.aiTransform';
 
 export const STARTING_NODE_TYPES = [
 	MANUAL_TRIGGER_NODE_TYPE,
@@ -45,7 +46,12 @@ export const STARTING_NODE_TYPES = [
 	START_NODE_TYPE,
 ];
 
-export const SCRIPTING_NODE_TYPES = [FUNCTION_NODE_TYPE, FUNCTION_ITEM_NODE_TYPE, CODE_NODE_TYPE];
+export const SCRIPTING_NODE_TYPES = [
+	FUNCTION_NODE_TYPE,
+	FUNCTION_ITEM_NODE_TYPE,
+	CODE_NODE_TYPE,
+	AI_TRANSFORM_NODE_TYPE,
+];
 
 /**
  * Nodes whose parameter values may refer to other nodes without expressions.
@@ -55,6 +61,7 @@ export const NODES_WITH_RENAMABLE_CONTENT = new Set([
 	CODE_NODE_TYPE,
 	FUNCTION_NODE_TYPE,
 	FUNCTION_ITEM_NODE_TYPE,
+	AI_TRANSFORM_NODE_TYPE,
 ]);
 
 //@n8n/n8n-nodes-langchain
diff --git a/packages/workflow/src/Interfaces.ts b/packages/workflow/src/Interfaces.ts
index 638ff0513aaa7..3faa825f7beed 100644
--- a/packages/workflow/src/Interfaces.ts
+++ b/packages/workflow/src/Interfaces.ts
@@ -1229,12 +1229,25 @@ export interface ILoadOptions {
 	};
 }
 
+export type NodePropertyAction = {
+	type: 'askAiCodeGeneration';
+	handler?: string;
+	target?: string;
+};
+
 export interface INodePropertyTypeOptions {
-	action?: string; // Supported by: button
+	// Supported by: button
+	buttonConfig?: {
+		action?: string | NodePropertyAction;
+		label?: string; // otherwise "displayName" is used
+		hasInputField?: boolean;
+		inputFieldMaxLength?: number; // Supported if hasInputField is true
+	};
 	containerClass?: string; // Supported by: notice
 	alwaysOpenEditWindow?: boolean; // Supported by: json
 	codeAutocomplete?: CodeAutocompleteTypes; // Supported by: string
 	editor?: EditorType; // Supported by: string
+	editorIsReadOnly?: boolean; // Supported by: string
 	sqlDialect?: SQLDialect; // Supported by: sqlEditor
 	loadOptionsDependsOn?: string[]; // Supported by: options
 	loadOptionsMethod?: string; // Supported by: options
@@ -1526,6 +1539,12 @@ export interface INodeType {
 		resourceMapping?: {
 			[functionName: string]: (this: ILoadOptionsFunctions) => Promise<ResourceMapperFields>;
 		};
+		actionHandler?: {
+			[functionName: string]: (
+				this: ILoadOptionsFunctions,
+				payload: IDataObject | string | undefined,
+			) => Promise<NodeParameterValueType>;
+		};
 	};
 	webhookMethods?: {
 		[name in IWebhookDescription['name']]?: {

From 4dc34ba7451602d5e1c8687c4810d872423c5082 Mon Sep 17 00:00:00 2001
From: Michael Kret <88898367+michael-radency@users.noreply.github.com>
Date: Wed, 14 Aug 2024 16:41:35 +0300
Subject: [PATCH 161/168] feat(AI Transform Node): Telemetry (no-changelog)
 (#10398)

---
 .../components/ButtonParameter/ButtonParameter.vue | 11 +++++++++++
 packages/editor-ui/src/plugins/telemetry/index.ts  | 14 ++++++++++++++
 .../nodes/AiTransform/AiTransform.node.ts          |  4 ++--
 packages/workflow/src/TelemetryHelpers.ts          |  5 ++++-
 4 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/packages/editor-ui/src/components/ButtonParameter/ButtonParameter.vue b/packages/editor-ui/src/components/ButtonParameter/ButtonParameter.vue
index d7e05b0f5bf85..0708a4ea0d9ff 100644
--- a/packages/editor-ui/src/components/ButtonParameter/ButtonParameter.vue
+++ b/packages/editor-ui/src/components/ButtonParameter/ButtonParameter.vue
@@ -10,6 +10,7 @@ import { getSchemas, getParentNodes } from './utils';
 import { ASK_AI_EXPERIMENT } from '@/constants';
 import { usePostHog } from '@/stores/posthog.store';
 import { useRootStore } from '@/stores/root.store';
+import { useTelemetry } from '@/composables/useTelemetry';
 import { generateCodeForPrompt } from '@/api/ai';
 
 import { format } from 'prettier';
@@ -144,6 +145,11 @@ async function onSubmit() {
 				};
 
 				emit('valueChanged', updateInformation);
+
+				useTelemetry().trackAiTransform('generationFinished', {
+					prompt: prompt.value,
+					code: formattedCode,
+				});
 				break;
 			default:
 				return;
@@ -156,6 +162,11 @@ async function onSubmit() {
 
 		stopLoading();
 	} catch (error) {
+		useTelemetry().trackAiTransform('generationFinished', {
+			prompt: prompt.value,
+			code: '',
+			hasError: true,
+		});
 		showMessage({
 			type: 'error',
 			title: i18n.baseText('codeNodeEditor.askAi.generationFailed'),
diff --git a/packages/editor-ui/src/plugins/telemetry/index.ts b/packages/editor-ui/src/plugins/telemetry/index.ts
index 524ddc4a3d1e1..d6cc3bbc69f32 100644
--- a/packages/editor-ui/src/plugins/telemetry/index.ts
+++ b/packages/editor-ui/src/plugins/telemetry/index.ts
@@ -167,6 +167,20 @@ export class Telemetry {
 		}
 	}
 
+	trackAiTransform(event: string, properties: IDataObject = {}) {
+		if (this.rudderStack) {
+			properties.session_id = useRootStore().pushRef;
+			properties.ndv_session_id = useNDVStore().pushRef;
+
+			switch (event) {
+				case 'generationFinished':
+					this.track('Ai Transform code generation finished', properties, { withPostHog: true });
+				default:
+					break;
+			}
+		}
+	}
+
 	trackNodesPanel(event: string, properties: IDataObject = {}) {
 		if (this.rudderStack) {
 			properties.nodes_panel_session_id = this.userNodesPanelSession.pushRef;
diff --git a/packages/nodes-base/nodes/AiTransform/AiTransform.node.ts b/packages/nodes-base/nodes/AiTransform/AiTransform.node.ts
index 8c41635555ca3..3042267a446c2 100644
--- a/packages/nodes-base/nodes/AiTransform/AiTransform.node.ts
+++ b/packages/nodes-base/nodes/AiTransform/AiTransform.node.ts
@@ -32,7 +32,7 @@ export class AiTransform implements INodeType {
 		properties: [
 			{
 				displayName: 'Instructions',
-				name: 'generate',
+				name: 'instructions',
 				type: 'button',
 				default: '',
 				description:
@@ -92,7 +92,7 @@ export class AiTransform implements INodeType {
 				code = this.getNodeParameter(codeParameterName, index) as string;
 
 				if (!code) {
-					const instructions = this.getNodeParameter('generate', index) as string;
+					const instructions = this.getNodeParameter('instructions', index) as string;
 					if (!instructions) {
 						throw new NodeOperationError(node, 'Missing instructions to generate code', {
 							description:
diff --git a/packages/workflow/src/TelemetryHelpers.ts b/packages/workflow/src/TelemetryHelpers.ts
index 4cb107ea2cb6a..b28a59f654392 100644
--- a/packages/workflow/src/TelemetryHelpers.ts
+++ b/packages/workflow/src/TelemetryHelpers.ts
@@ -13,6 +13,7 @@ import type {
 import { ApplicationError } from './errors/application.error';
 import {
 	AGENT_LANGCHAIN_NODE_TYPE,
+	AI_TRANSFORM_NODE_TYPE,
 	CHAIN_LLM_LANGCHAIN_NODE_TYPE,
 	CHAIN_SUMMARIZATION_LANGCHAIN_NODE_TYPE,
 	EXECUTE_WORKFLOW_NODE_TYPE,
@@ -207,7 +208,9 @@ export function generateNodesGraph(
 			nodeItem.src_node_id = options.nodeIdMap[node.id];
 		}
 
-		if (node.type === AGENT_LANGCHAIN_NODE_TYPE) {
+		if (node.type === AI_TRANSFORM_NODE_TYPE && options?.isCloudDeployment) {
+			nodeItem.prompts = { instructions: node.parameters.instructions as string };
+		} else if (node.type === AGENT_LANGCHAIN_NODE_TYPE) {
 			nodeItem.agent = (node.parameters.agent as string) ?? 'conversationalAgent';
 		} else if (node.type === MERGE_NODE_TYPE) {
 			nodeItem.operation = node.parameters.mode as string;

From 51a1eddbf00393f3881c340cf37cfcca59566c99 Mon Sep 17 00:00:00 2001
From: oleg <me@olegivaniv.com>
Date: Wed, 14 Aug 2024 15:45:50 +0200
Subject: [PATCH 162/168] fix(AI Agent Node): Fix issues with some tools not
 populating (#10406)

---
 packages/@n8n/nodes-langchain/utils/helpers.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packages/@n8n/nodes-langchain/utils/helpers.ts b/packages/@n8n/nodes-langchain/utils/helpers.ts
index 673fa0402c483..05b4a5cadc6f7 100644
--- a/packages/@n8n/nodes-langchain/utils/helpers.ts
+++ b/packages/@n8n/nodes-langchain/utils/helpers.ts
@@ -13,7 +13,6 @@ import type { BaseLLM } from '@langchain/core/language_models/llms';
 import type { BaseChatMemory } from 'langchain/memory';
 import type { BaseChatMessageHistory } from '@langchain/core/chat_history';
 import { N8nTool } from './N8nTool';
-import { DynamicTool } from '@langchain/core/tools';
 
 function hasMethods<T>(obj: unknown, ...methodNames: Array<string | symbol>): obj is T {
 	return methodNames.every(
@@ -195,8 +194,6 @@ export const getConnectedTools = async (
 	const finalTools = [];
 
 	for (const tool of connectedTools) {
-		if (!(tool instanceof DynamicTool) && !(tool instanceof N8nTool)) continue;
-
 		const { name } = tool;
 		if (seenNames.has(name)) {
 			throw new NodeOperationError(

From 80c96a3dccdcbf186d2a2e16a56155f39d3988b8 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: Wed, 14 Aug 2024 16:07:38 +0200
Subject: [PATCH 163/168] ci: Trigger Docker releases on tag creation instead
 of release publishing (no-changelog) (#10409)

---
 .github/workflows/docker-images.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker-images.yml b/.github/workflows/docker-images.yml
index 5c91f3832d134..fe5770252b214 100644
--- a/.github/workflows/docker-images.yml
+++ b/.github/workflows/docker-images.yml
@@ -1,8 +1,9 @@
 name: Docker Image CI
 
 on:
-  release:
-    types: [published]
+  push:
+    tags:
+      - 'n8n@*'
 
 jobs:
   build:

From f82b6e4ba9bf527b3a4c17872162d9ae124ead0d Mon Sep 17 00:00:00 2001
From: Mutasem Aldmour <4711238+mutdmour@users.noreply.github.com>
Date: Wed, 14 Aug 2024 16:17:32 +0200
Subject: [PATCH 164/168] fix: Add better error handling for chat errors
 (#10408)

---
 packages/editor-ui/src/utils/apiUtils.ts | 64 +++++++++++++-----------
 1 file changed, 35 insertions(+), 29 deletions(-)

diff --git a/packages/editor-ui/src/utils/apiUtils.ts b/packages/editor-ui/src/utils/apiUtils.ts
index 64f6ec259927b..e9201b7c331ea 100644
--- a/packages/editor-ui/src/utils/apiUtils.ts
+++ b/packages/editor-ui/src/utils/apiUtils.ts
@@ -4,6 +4,7 @@ import { ApplicationError, jsonParse, type GenericValue, type IDataObject } from
 import type { IExecutionFlattedResponse, IExecutionResponse, IRestApiContext } from '@/Interface';
 import { parse } from 'flatted';
 import type { ChatRequest } from '@/types/assistant.types';
+import { assert } from '@/utils/assert';
 
 const BROWSER_ID_STORAGE_KEY = 'n8n-browserId';
 let browserId = localStorage.getItem(BROWSER_ID_STORAGE_KEY);
@@ -214,41 +215,46 @@ export const streamRequest = async (
 		credentials: 'include',
 		body: JSON.stringify(payload),
 	};
-	const response = await fetch(`${context.baseUrl}${apiEndpoint}`, assistantRequest);
-
-	if (response.ok && response.body) {
-		// Handle the streaming response
-		const reader = response.body.getReader();
-		const decoder = new TextDecoder('utf-8');
-
-		async function readStream() {
-			const { done, value } = await reader.read();
-			if (done) {
-				onDone?.();
-				return;
-			}
+	try {
+		const response = await fetch(`${context.baseUrl}${apiEndpoint}`, assistantRequest);
+
+		if (response.ok && response.body) {
+			// Handle the streaming response
+			const reader = response.body.getReader();
+			const decoder = new TextDecoder('utf-8');
+
+			async function readStream() {
+				const { done, value } = await reader.read();
+				if (done) {
+					onDone?.();
+					return;
+				}
+
+				const chunk = decoder.decode(value);
+				const splitChunks = chunk.split(separator);
 
-			const chunk = decoder.decode(value);
-			const splitChunks = chunk.split(separator);
-
-			for (const splitChunk of splitChunks) {
-				if (splitChunk && onChunk) {
-					try {
-						onChunk(jsonParse(splitChunk, { errorMessage: 'Invalid json chunk in stream' }));
-					} catch (e: unknown) {
-						if (e instanceof Error) {
-							console.log(`${e.message}: ${splitChunk}`);
-							onError?.(e);
+				for (const splitChunk of splitChunks) {
+					if (splitChunk && onChunk) {
+						try {
+							onChunk(jsonParse(splitChunk, { errorMessage: 'Invalid json chunk in stream' }));
+						} catch (e: unknown) {
+							if (e instanceof Error) {
+								console.log(`${e.message}: ${splitChunk}`);
+								onError?.(e);
+							}
 						}
 					}
 				}
+				await readStream();
 			}
+
+			// Start reading the stream
 			await readStream();
+		} else if (onError) {
+			onError(new Error(response.statusText));
 		}
-
-		// Start reading the stream
-		await readStream();
-	} else if (onError) {
-		onError(new Error(response.statusText));
+	} catch (e: unknown) {
+		assert(e instanceof Error);
+		onError?.(e);
 	}
 };

From 387fa0324d8227451b56b4e93d98e028510e8aed Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 14 Aug 2024 16:48:45 +0200
Subject: [PATCH 165/168] :rocket: Release 1.55.0 (#10411)

Co-authored-by: mutdmour <mutdmour@users.noreply.github.com>
---
 CHANGELOG.md                               | 38 ++++++++++++++++++++++
 package.json                               |  2 +-
 packages/@n8n/chat/package.json            |  2 +-
 packages/@n8n/config/package.json          |  2 +-
 packages/@n8n/nodes-langchain/package.json |  2 +-
 packages/@n8n/permissions/package.json     |  2 +-
 packages/cli/package.json                  |  2 +-
 packages/core/package.json                 |  2 +-
 packages/design-system/package.json        |  2 +-
 packages/editor-ui/package.json            |  2 +-
 packages/node-dev/package.json             |  2 +-
 packages/nodes-base/package.json           |  2 +-
 packages/workflow/package.json             |  2 +-
 13 files changed, 50 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 99120642fe416..06ded0c1cad1d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,41 @@
+# [1.55.0](https://github.com/n8n-io/n8n/compare/n8n@1.54.0...n8n@1.55.0) (2024-08-14)
+
+
+### Bug Fixes
+
+* Add better error handling for chat errors ([#10408](https://github.com/n8n-io/n8n/issues/10408)) ([f82b6e4](https://github.com/n8n-io/n8n/commit/f82b6e4ba9bf527b3a4c17872162d9ae124ead0d))
+* **AI Agent Node:** Fix issues with some tools not populating ([#10406](https://github.com/n8n-io/n8n/issues/10406)) ([51a1edd](https://github.com/n8n-io/n8n/commit/51a1eddbf00393f3881c340cf37cfcca59566c99))
+* **core:** Account for cancelling an execution with no workers available ([#10343](https://github.com/n8n-io/n8n/issues/10343)) ([b044e78](https://github.com/n8n-io/n8n/commit/b044e783e73a499dbd7532a5d489a782d3d021da))
+* **core:** Account for owner when filtering by project ID in `GET /workflows` in Public API ([#10379](https://github.com/n8n-io/n8n/issues/10379)) ([5ac65b3](https://github.com/n8n-io/n8n/commit/5ac65b36bcb1351c6233b951f064f60862f790a5))
+* **core:** Enforce shutdown timer and sequence on `SIGINT` for main ([#10346](https://github.com/n8n-io/n8n/issues/10346)) ([5255793](https://github.com/n8n-io/n8n/commit/5255793afee5653d8356b8e4d2e1009d5cf36164))
+* **core:** Filter out prototype and constructor lookups in expressions ([#10382](https://github.com/n8n-io/n8n/issues/10382)) ([8e7d29a](https://github.com/n8n-io/n8n/commit/8e7d29ad3c4872b1cc147dfcfe9a864ba916692f))
+* **core:** Fix duplicate Redis publisher ([#10392](https://github.com/n8n-io/n8n/issues/10392)) ([45813de](https://github.com/n8n-io/n8n/commit/45813debc963096f63cc0aabe82d9d9f853a39d7))
+* **core:** Fix worker shutdown errors when active executions ([#10353](https://github.com/n8n-io/n8n/issues/10353)) ([e071b73](https://github.com/n8n-io/n8n/commit/e071b73bab34edd4b3e6aef6497514acc504cdc6))
+* **core:** Prevent XSS in user update endpoints ([#10338](https://github.com/n8n-io/n8n/issues/10338)) ([7898498](https://github.com/n8n-io/n8n/commit/78984986a6b4add89df9743b94c113046f1d5ee8))
+* **core:** Prevent XSS via static cache dir ([#10339](https://github.com/n8n-io/n8n/issues/10339)) ([4f392b5](https://github.com/n8n-io/n8n/commit/4f392b5e3e0ee166e85a2e060b3ec7fcf145229b))
+* **core:** Rate limit MFA activation and verification endpoints ([#10330](https://github.com/n8n-io/n8n/issues/10330)) ([b6c47c0](https://github.com/n8n-io/n8n/commit/b6c47c0e3214878d42980d5c9535df52b3984b3c))
+* **editor:** Connect up new project viewer role to the FE ([#9913](https://github.com/n8n-io/n8n/issues/9913)) ([117e2d9](https://github.com/n8n-io/n8n/commit/117e2d968fcc535f32c583ac8f2dc8a84e8cd6bd))
+* **editor:** Enable credential sharing between all types of projects ([#10233](https://github.com/n8n-io/n8n/issues/10233)) ([1cf48cc](https://github.com/n8n-io/n8n/commit/1cf48cc3019c1cf27e2f3c9affd18426237e9064))
+* **editor:** Fix rendering of SVG icons in public chat on iOS ([#10381](https://github.com/n8n-io/n8n/issues/10381)) ([7ab3811](https://github.com/n8n-io/n8n/commit/7ab38114dbf3881afba39287a061446ec4bf0431))
+* **editor:** Fixing XSS vulnerability in toast messages ([#10329](https://github.com/n8n-io/n8n/issues/10329)) ([38bdd9f](https://github.com/n8n-io/n8n/commit/38bdd9f5d0d9ca06fab1a7e1a3e7a4a648a6a89a))
+* **editor:** Revert change that hid swagger docs in the ui ([#10350](https://github.com/n8n-io/n8n/issues/10350)) ([bae49d3](https://github.com/n8n-io/n8n/commit/bae49d3198d4bcc27e7996cd4f7be3132becc98e))
+* **n8n Form Trigger Node:** Fix issue preventing v1 node from working ([#10364](https://github.com/n8n-io/n8n/issues/10364)) ([9b647a9](https://github.com/n8n-io/n8n/commit/9b647a9837434e8b75e3ad754ff5136bb5ac760d))
+* Require mfa code for password change if its enabled ([#10341](https://github.com/n8n-io/n8n/issues/10341)) ([9d7caac](https://github.com/n8n-io/n8n/commit/9d7caacc699f10962783393925a980ec6f1ca975))
+* Require mfa code to disable mfa ([#10345](https://github.com/n8n-io/n8n/issues/10345)) ([3384f52](https://github.com/n8n-io/n8n/commit/3384f52a35b835ba1d8633dc94bab0ad6e7023b3))
+
+
+### Features
+
+* Add Ask assistant behind feature flag ([#9995](https://github.com/n8n-io/n8n/issues/9995)) ([5ed2a77](https://github.com/n8n-io/n8n/commit/5ed2a77740db1f02b27c571f4dfdfa206ebdb19c))
+* **AI Transform Node:** New node ([#10405](https://github.com/n8n-io/n8n/issues/10405)) ([4d222ac](https://github.com/n8n-io/n8n/commit/4d222ac19d943b69fd9f87abe5e5c5f5141eed8d))
+* **AI Transform Node:** New node ([#9990](https://github.com/n8n-io/n8n/issues/9990)) ([0de9d56](https://github.com/n8n-io/n8n/commit/0de9d56619ed1c055407353046b8a9ebe78da527))
+* **core:** Allow overriding npm registry for community packages ([#10325](https://github.com/n8n-io/n8n/issues/10325)) ([33a2703](https://github.com/n8n-io/n8n/commit/33a2703429d9eaa41f72d2e7d2da5be60b6c620f))
+* **editor:** Add schema view to expression modal ([#9976](https://github.com/n8n-io/n8n/issues/9976)) ([71b6c67](https://github.com/n8n-io/n8n/commit/71b6c671797024d7b516352fa9b7ecda101ce3b2))
+* **MySQL Node:** Return decimal types as numbers ([#10313](https://github.com/n8n-io/n8n/issues/10313)) ([f744d7c](https://github.com/n8n-io/n8n/commit/f744d7c100be68669d9a3efd0033dd371a3cfaf7))
+* **Okta Node:** Add Okta Node ([#10278](https://github.com/n8n-io/n8n/issues/10278)) ([5cac0f3](https://github.com/n8n-io/n8n/commit/5cac0f339d649cfe5857d33738210cbc1599370b))
+
+
+
 # [1.54.0](https://github.com/n8n-io/n8n/compare/n8n@1.53.0...n8n@1.54.0) (2024-08-07)
 
 
diff --git a/package.json b/package.json
index 5744497d771cd..e7d55c64455ad 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-monorepo",
-  "version": "1.54.0",
+  "version": "1.55.0",
   "private": true,
   "engines": {
     "node": ">=20.15",
diff --git a/packages/@n8n/chat/package.json b/packages/@n8n/chat/package.json
index ea2cd454388b0..6508081f45553 100644
--- a/packages/@n8n/chat/package.json
+++ b/packages/@n8n/chat/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@n8n/chat",
-  "version": "0.23.0",
+  "version": "0.24.0",
   "scripts": {
     "dev": "pnpm run storybook",
     "build": "pnpm build:vite && pnpm build:bundle",
diff --git a/packages/@n8n/config/package.json b/packages/@n8n/config/package.json
index e28090e49b9d2..1ee3fb9160b9a 100644
--- a/packages/@n8n/config/package.json
+++ b/packages/@n8n/config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@n8n/config",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "scripts": {
     "clean": "rimraf dist .turbo",
     "dev": "pnpm watch",
diff --git a/packages/@n8n/nodes-langchain/package.json b/packages/@n8n/nodes-langchain/package.json
index d1478e1d22347..acec252253c6c 100644
--- a/packages/@n8n/nodes-langchain/package.json
+++ b/packages/@n8n/nodes-langchain/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@n8n/n8n-nodes-langchain",
-  "version": "1.54.0",
+  "version": "1.55.0",
   "description": "",
   "main": "index.js",
   "scripts": {
diff --git a/packages/@n8n/permissions/package.json b/packages/@n8n/permissions/package.json
index e3b1c7b27697e..7b02f5ef028c5 100644
--- a/packages/@n8n/permissions/package.json
+++ b/packages/@n8n/permissions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@n8n/permissions",
-  "version": "0.11.0",
+  "version": "0.12.0",
   "scripts": {
     "clean": "rimraf dist .turbo",
     "dev": "pnpm watch",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 8387f0ba41521..317d72325d30e 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n",
-  "version": "1.54.0",
+  "version": "1.55.0",
   "description": "n8n Workflow Automation Tool",
   "main": "dist/index",
   "types": "dist/index.d.ts",
diff --git a/packages/core/package.json b/packages/core/package.json
index 1f857b47e5ea5..24da0bf137b64 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-core",
-  "version": "1.54.0",
+  "version": "1.55.0",
   "description": "Core functionality of n8n",
   "main": "dist/index",
   "types": "dist/index.d.ts",
diff --git a/packages/design-system/package.json b/packages/design-system/package.json
index acb03f958b602..f6f0a128ab091 100644
--- a/packages/design-system/package.json
+++ b/packages/design-system/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-design-system",
-  "version": "1.44.0",
+  "version": "1.45.0",
   "main": "src/main.ts",
   "import": "src/main.ts",
   "scripts": {
diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json
index 956f5b361a4de..279233c94f178 100644
--- a/packages/editor-ui/package.json
+++ b/packages/editor-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-editor-ui",
-  "version": "1.54.0",
+  "version": "1.55.0",
   "description": "Workflow Editor UI for n8n",
   "main": "index.js",
   "scripts": {
diff --git a/packages/node-dev/package.json b/packages/node-dev/package.json
index cd77936f1376d..87083a81cd506 100644
--- a/packages/node-dev/package.json
+++ b/packages/node-dev/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-node-dev",
-  "version": "1.54.0",
+  "version": "1.55.0",
   "description": "CLI to simplify n8n credentials/node development",
   "main": "dist/src/index",
   "types": "dist/src/index.d.ts",
diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index a0d1fef217b68..b4c524520b1c3 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-nodes-base",
-  "version": "1.54.0",
+  "version": "1.55.0",
   "description": "Base nodes of n8n",
   "main": "index.js",
   "scripts": {
diff --git a/packages/workflow/package.json b/packages/workflow/package.json
index ed434fe98f831..49d904bdf2f79 100644
--- a/packages/workflow/package.json
+++ b/packages/workflow/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-workflow",
-  "version": "1.53.0",
+  "version": "1.54.0",
   "description": "Workflow base code of n8n",
   "main": "dist/index.js",
   "module": "src/index.ts",

From 67a10983df8cbabda484b240eb528b93e6edcabc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Wed, 14 Aug 2024 17:09:43 +0200
Subject: [PATCH 166/168] refactor(editor): Remove deleted event name from UI
 (#10402)

---
 packages/cli/src/eventbus/EventMessageClasses/index.ts           | 1 -
 .../eventbus/MessageEventBusWriter/MessageEventBusLogWriter.ts   | 1 -
 2 files changed, 2 deletions(-)

diff --git a/packages/cli/src/eventbus/EventMessageClasses/index.ts b/packages/cli/src/eventbus/EventMessageClasses/index.ts
index 461394d378d94..2e4d78560d9da 100644
--- a/packages/cli/src/eventbus/EventMessageClasses/index.ts
+++ b/packages/cli/src/eventbus/EventMessageClasses/index.ts
@@ -10,7 +10,6 @@ export const eventNamesWorkflow = [
 	'n8n.workflow.started',
 	'n8n.workflow.success',
 	'n8n.workflow.failed',
-	'n8n.workflow.crashed',
 ] as const;
 export const eventNamesGeneric = ['n8n.worker.started', 'n8n.worker.stopped'] as const;
 export const eventNamesNode = ['n8n.node.started', 'n8n.node.finished'] as const;
diff --git a/packages/cli/src/eventbus/MessageEventBusWriter/MessageEventBusLogWriter.ts b/packages/cli/src/eventbus/MessageEventBusWriter/MessageEventBusLogWriter.ts
index 08899c0e0902d..0e49ff3fb7613 100644
--- a/packages/cli/src/eventbus/MessageEventBusWriter/MessageEventBusLogWriter.ts
+++ b/packages/cli/src/eventbus/MessageEventBusWriter/MessageEventBusLogWriter.ts
@@ -225,7 +225,6 @@ export class MessageEventBusLogWriter {
 										break;
 									case 'n8n.workflow.success':
 									case 'n8n.workflow.failed':
-									case 'n8n.workflow.crashed':
 									case 'n8n.execution.throttled':
 									case 'n8n.execution.started-during-bootup':
 										delete results.unfinishedExecutions[executionId];

From 483e324d4c77c671f48126920527d65408c39c70 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: Wed, 14 Aug 2024 17:30:45 +0200
Subject: [PATCH 167/168] ci: Remove hard-coded package version in unit tests
 (no-changelog) (#10414)

---
 .../cli/src/events/__tests__/telemetry-event-relay.test.ts     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/cli/src/events/__tests__/telemetry-event-relay.test.ts b/packages/cli/src/events/__tests__/telemetry-event-relay.test.ts
index e1841f172633a..387a60e6256db 100644
--- a/packages/cli/src/events/__tests__/telemetry-event-relay.test.ts
+++ b/packages/cli/src/events/__tests__/telemetry-event-relay.test.ts
@@ -13,6 +13,7 @@ import type { SharedWorkflowRepository } from '@/databases/repositories/sharedWo
 import type { ProjectRelationRepository } from '@/databases/repositories/projectRelation.repository';
 import type { RelayEventMap } from '@/events/relay-event-map';
 import type { WorkflowEntity } from '@/databases/entities/WorkflowEntity';
+import { N8N_VERSION } from '@/constants';
 
 const flushPromises = async () => await new Promise((resolve) => setImmediate(resolve));
 
@@ -694,7 +695,7 @@ describe('TelemetryEventRelay', () => {
 				is_manual: false,
 				success: false,
 				user_id: 'user123',
-				version_cli: '1.54.0',
+				version_cli: N8N_VERSION,
 				workflow_id: 'workflow123',
 			});
 		});

From 39c8e50ad0513649f5a8cef911b7d6cdd61c2372 Mon Sep 17 00:00:00 2001
From: Tomi Turtiainen <10324676+tomi@users.noreply.github.com>
Date: Thu, 15 Aug 2024 10:36:04 +0300
Subject: [PATCH 168/168] fix: Require mfa code to change email (#10354)

---
 .../__tests__/me.controller.test.ts           | 96 +++++++++++++++++--
 packages/cli/src/controllers/me.controller.ts | 39 +++++---
 packages/cli/src/requests.ts                  |  5 +
 packages/editor-ui/src/api/users.ts           | 15 +--
 packages/editor-ui/src/event-bus/mfa.ts       |  2 +
 packages/editor-ui/src/stores/users.store.ts  |  7 +-
 .../src/views/SettingsPersonalView.vue        | 54 +++++++++--
 .../__tests__/SettingsPersonalView.test.ts    |  4 +
 8 files changed, 181 insertions(+), 41 deletions(-)

diff --git a/packages/cli/src/controllers/__tests__/me.controller.test.ts b/packages/cli/src/controllers/__tests__/me.controller.test.ts
index 3ff4c5bbe0860..71a6d693842cf 100644
--- a/packages/cli/src/controllers/__tests__/me.controller.test.ts
+++ b/packages/cli/src/controllers/__tests__/me.controller.test.ts
@@ -53,9 +53,14 @@ describe('MeController', () => {
 				password: 'password',
 				authIdentities: [],
 				role: 'global:owner',
+				mfaEnabled: false,
 			});
-			const reqBody = { email: 'valid@email.com', firstName: 'John', lastName: 'Potato' };
-			const req = mock<MeRequest.UserUpdate>({ user, body: reqBody, browserId });
+			const req = mock<MeRequest.UserUpdate>({ user, browserId });
+			req.body = {
+				email: 'valid@email.com',
+				firstName: 'John',
+				lastName: 'Potato',
+			};
 			const res = mock<Response>();
 			userRepository.findOneByOrFail.mockResolvedValue(user);
 			userRepository.findOneOrFail.mockResolvedValue(user);
@@ -67,7 +72,7 @@ describe('MeController', () => {
 			expect(externalHooks.run).toHaveBeenCalledWith('user.profile.beforeUpdate', [
 				user.id,
 				user.email,
-				reqBody,
+				req.body,
 			]);
 
 			expect(userService.update).toHaveBeenCalled();
@@ -98,25 +103,25 @@ describe('MeController', () => {
 				password: 'password',
 				authIdentities: [],
 				role: 'global:member',
+				mfaEnabled: false,
 			});
-			const reqBody = { email: 'valid@email.com', firstName: 'John', lastName: 'Potato' };
 			const req = mock<MeRequest.UserUpdate>({ user, browserId });
-			req.body = reqBody;
+			req.body = { email: 'valid@email.com', firstName: 'John', lastName: 'Potato' };
 			const res = mock<Response>();
 			userRepository.findOneOrFail.mockResolvedValue(user);
 			jest.spyOn(jwt, 'sign').mockImplementation(() => 'signed-token');
 
 			// Add invalid data to the request payload
-			Object.assign(reqBody, { id: '0', role: 'global:owner' });
+			Object.assign(req.body, { id: '0', role: 'global:owner' });
 
 			await controller.updateCurrentUser(req, res);
 
 			expect(userService.update).toHaveBeenCalled();
 
 			const updatePayload = userService.update.mock.calls[0][1];
-			expect(updatePayload.email).toBe(reqBody.email);
-			expect(updatePayload.firstName).toBe(reqBody.firstName);
-			expect(updatePayload.lastName).toBe(reqBody.lastName);
+			expect(updatePayload.email).toBe(req.body.email);
+			expect(updatePayload.firstName).toBe(req.body.firstName);
+			expect(updatePayload.lastName).toBe(req.body.lastName);
 			expect(updatePayload.id).toBeUndefined();
 			expect(updatePayload.role).toBeUndefined();
 		});
@@ -127,10 +132,11 @@ describe('MeController', () => {
 				password: 'password',
 				authIdentities: [],
 				role: 'global:owner',
+				mfaEnabled: false,
 			});
 			const reqBody = { email: 'valid@email.com', firstName: 'John', lastName: 'Potato' };
 			const req = mock<MeRequest.UserUpdate>({ user, body: reqBody });
-			// userService.findOneOrFail.mockResolvedValue(user);
+			req.body = reqBody; // We don't want the body to be a mock object
 
 			externalHooks.run.mockImplementationOnce(async (hookName) => {
 				if (hookName === 'user.profile.beforeUpdate') {
@@ -142,6 +148,76 @@ describe('MeController', () => {
 				new BadRequestError('Invalid email address'),
 			);
 		});
+
+		describe('when mfa is enabled', () => {
+			it('should throw BadRequestError if mfa code is missing', async () => {
+				const user = mock<User>({
+					id: '123',
+					email: 'valid@email.com',
+					password: 'password',
+					authIdentities: [],
+					role: 'global:owner',
+					mfaEnabled: true,
+				});
+				const req = mock<MeRequest.UserUpdate>({ user, browserId });
+				req.body = { email: 'new@email.com', firstName: 'John', lastName: 'Potato' };
+
+				await expect(controller.updateCurrentUser(req, mock())).rejects.toThrowError(
+					new BadRequestError('Two-factor code is required to change email'),
+				);
+			});
+
+			it('should throw InvalidMfaCodeError if mfa code is invalid', async () => {
+				const user = mock<User>({
+					id: '123',
+					email: 'valid@email.com',
+					password: 'password',
+					authIdentities: [],
+					role: 'global:owner',
+					mfaEnabled: true,
+				});
+				const req = mock<MeRequest.UserUpdate>({ user, browserId });
+				req.body = {
+					email: 'new@email.com',
+					firstName: 'John',
+					lastName: 'Potato',
+					mfaCode: 'invalid',
+				};
+				mockMfaService.validateMfa.mockResolvedValue(false);
+
+				await expect(controller.updateCurrentUser(req, mock())).rejects.toThrow(
+					InvalidMfaCodeError,
+				);
+			});
+
+			it("should update the user's email if mfa code is valid", async () => {
+				const user = mock<User>({
+					id: '123',
+					email: 'valid@email.com',
+					password: 'password',
+					authIdentities: [],
+					role: 'global:owner',
+					mfaEnabled: true,
+				});
+				const req = mock<MeRequest.UserUpdate>({ user, browserId });
+				req.body = {
+					email: 'new@email.com',
+					firstName: 'John',
+					lastName: 'Potato',
+					mfaCode: '123456',
+				};
+				const res = mock<Response>();
+				userRepository.findOneByOrFail.mockResolvedValue(user);
+				userRepository.findOneOrFail.mockResolvedValue(user);
+				jest.spyOn(jwt, 'sign').mockImplementation(() => 'signed-token');
+				userService.toPublic.mockResolvedValue({} as unknown as PublicUser);
+				mockMfaService.validateMfa.mockResolvedValue(true);
+
+				const result = await controller.updateCurrentUser(req, res);
+
+				expect(result).toEqual({});
+			});
+		});
 	});
 
 	describe('updatePassword', () => {
diff --git a/packages/cli/src/controllers/me.controller.ts b/packages/cli/src/controllers/me.controller.ts
index 179076d25d224..19429228edead 100644
--- a/packages/cli/src/controllers/me.controller.ts
+++ b/packages/cli/src/controllers/me.controller.ts
@@ -54,7 +54,8 @@ export class MeController {
 	 */
 	@Patch('/')
 	async updateCurrentUser(req: MeRequest.UserUpdate, res: Response): Promise<PublicUser> {
-		const { id: userId, email: currentEmail } = req.user;
+		const { id: userId, email: currentEmail, mfaEnabled } = req.user;
+
 		const payload = plainToInstance(UserUpdatePayload, req.body, { excludeExtraneousValues: true });
 
 		const { email } = payload;
@@ -76,17 +77,28 @@ export class MeController {
 
 		await validateEntity(payload);
 
+		const isEmailBeingChanged = email !== currentEmail;
+
 		// If SAML is enabled, we don't allow the user to change their email address
-		if (isSamlLicensedAndEnabled()) {
-			if (email !== currentEmail) {
-				this.logger.debug(
-					'Request to update user failed because SAML user may not change their email',
-					{
-						userId,
-						payload,
-					},
-				);
-				throw new BadRequestError('SAML user may not change their email');
+		if (isSamlLicensedAndEnabled() && isEmailBeingChanged) {
+			this.logger.debug(
+				'Request to update user failed because SAML user may not change their email',
+				{
+					userId,
+					payload,
+				},
+			);
+			throw new BadRequestError('SAML user may not change their email');
+		}
+
+		if (mfaEnabled && isEmailBeingChanged) {
+			if (!payload.mfaCode) {
+				throw new BadRequestError('Two-factor code is required to change email');
+			}
+
+			const isMfaTokenValid = await this.mfaService.validateMfa(userId, payload.mfaCode, undefined);
+			if (!isMfaTokenValid) {
+				throw new InvalidMfaCodeError();
 			}
 		}
 
@@ -102,8 +114,9 @@ export class MeController {
 
 		this.authService.issueCookie(res, user, req.browserId);
 
-		const fieldsChanged = (Object.keys(payload) as Array<keyof UserUpdatePayload>).filter(
-			(key) => payload[key] !== preUpdateUser[key],
+		const changeableFields = ['email', 'firstName', 'lastName'] as const;
+		const fieldsChanged = changeableFields.filter(
+			(key) => key in payload && payload[key] !== preUpdateUser[key],
 		);
 
 		this.eventService.emit('user-updated', { user, fieldsChanged });
diff --git a/packages/cli/src/requests.ts b/packages/cli/src/requests.ts
index 436c0b1b18d94..581ad920ea82d 100644
--- a/packages/cli/src/requests.ts
+++ b/packages/cli/src/requests.ts
@@ -43,6 +43,11 @@ export class UserUpdatePayload implements Pick<User, 'email' | 'firstName' | 'la
 	@IsString({ message: 'Last name must be of type string.' })
 	@Length(1, 32, { message: 'Last name must be $constraint1 to $constraint2 characters long.' })
 	lastName: string;
+
+	@IsOptional()
+	@Expose()
+	@IsString({ message: 'Two factor code must be a string.' })
+	mfaCode?: string;
 }
 
 export class UserSettingsUpdatePayload {
diff --git a/packages/editor-ui/src/api/users.ts b/packages/editor-ui/src/api/users.ts
index bb730c671c70a..a27faea7b788a 100644
--- a/packages/editor-ui/src/api/users.ts
+++ b/packages/editor-ui/src/api/users.ts
@@ -89,14 +89,17 @@ export async function changePassword(
 	await makeRestApiRequest(context, 'POST', '/change-password', params);
 }
 
+export type UpdateCurrentUserParams = {
+	id?: string;
+	firstName?: string;
+	lastName?: string;
+	email: string;
+	mfaCode?: string;
+};
+
 export async function updateCurrentUser(
 	context: IRestApiContext,
-	params: {
-		id?: string;
-		firstName?: string;
-		lastName?: string;
-		email: string;
-	},
+	params: UpdateCurrentUserParams,
 ): Promise<IUserResponse> {
 	return await makeRestApiRequest(context, 'PATCH', '/me', params);
 }
diff --git a/packages/editor-ui/src/event-bus/mfa.ts b/packages/editor-ui/src/event-bus/mfa.ts
index a50b6512b7630..290ac46ca67e6 100644
--- a/packages/editor-ui/src/event-bus/mfa.ts
+++ b/packages/editor-ui/src/event-bus/mfa.ts
@@ -7,8 +7,10 @@ export interface MfaModalClosedEventPayload {
 }
 
 export interface MfaModalEvents {
+	/** Command to request closing of the modal */
 	close: MfaModalClosedEventPayload | undefined;
 
+	/** Event that the modal has been closed */
 	closed: MfaModalClosedEventPayload | undefined;
 }
 
diff --git a/packages/editor-ui/src/stores/users.store.ts b/packages/editor-ui/src/stores/users.store.ts
index a07c40193dc5d..ef153bb4b7e5e 100644
--- a/packages/editor-ui/src/stores/users.store.ts
+++ b/packages/editor-ui/src/stores/users.store.ts
@@ -224,12 +224,7 @@ export const useUsersStore = defineStore(STORES.USERS, () => {
 		await usersApi.changePassword(rootStore.restApiContext, params);
 	};
 
-	const updateUser = async (params: {
-		id: string;
-		firstName: string;
-		lastName: string;
-		email: string;
-	}) => {
+	const updateUser = async (params: usersApi.UpdateCurrentUserParams) => {
 		const user = await usersApi.updateCurrentUser(rootStore.restApiContext, params);
 		addUsers([user]);
 	};
diff --git a/packages/editor-ui/src/views/SettingsPersonalView.vue b/packages/editor-ui/src/views/SettingsPersonalView.vue
index 08cc4ed12896a..60b40fb6863ff 100644
--- a/packages/editor-ui/src/views/SettingsPersonalView.vue
+++ b/packages/editor-ui/src/views/SettingsPersonalView.vue
@@ -16,6 +16,16 @@ import { createFormEventBus } from 'n8n-design-system/utils';
 import type { MfaModalEvents } from '@/event-bus/mfa';
 import { promptMfaCodeBus } from '@/event-bus/mfa';
 
+type UserBasicDetailsForm = {
+	firstName: string;
+	lastName: string;
+	email: string;
+};
+
+type UserBasicDetailsWithMfa = UserBasicDetailsForm & {
+	mfaCode?: string;
+};
+
 const i18n = useI18n();
 const { showToast, showError } = useToast();
 
@@ -114,12 +124,17 @@ onMounted(() => {
 function onInput() {
 	hasAnyBasicInfoChanges.value = true;
 }
+
 function onReadyToSubmit(ready: boolean) {
 	readyToSubmit.value = ready;
 }
-async function onSubmit(form: { firstName: string; lastName: string; email: string }) {
+
+/** Saves users basic info and personalization settings */
+async function saveUserSettings(params: UserBasicDetailsWithMfa) {
 	try {
-		await Promise.all([updateUserBasicInfo(form), updatePersonalisationSettings()]);
+		// The MFA code might be invalid so we update the user's basic info first
+		await updateUserBasicInfo(params);
+		await updatePersonalisationSettings();
 
 		showToast({
 			title: i18n.baseText('settings.personal.personalSettingsUpdated'),
@@ -130,19 +145,43 @@ async function onSubmit(form: { firstName: string; lastName: string; email: stri
 		showError(e, i18n.baseText('settings.personal.personalSettingsUpdatedError'));
 	}
 }
-async function updateUserBasicInfo(form: { firstName: string; lastName: string; email: string }) {
+
+async function onSubmit(form: UserBasicDetailsForm) {
+	if (!usersStore.currentUser?.mfaEnabled) {
+		await saveUserSettings(form);
+		return;
+	}
+
+	uiStore.openModal(PROMPT_MFA_CODE_MODAL_KEY);
+
+	promptMfaCodeBus.once('closed', async (payload: MfaModalEvents['closed']) => {
+		if (!payload) {
+			// User closed the modal without submitting the form
+			return;
+		}
+
+		await saveUserSettings({
+			...form,
+			mfaCode: payload.mfaCode,
+		});
+	});
+}
+
+async function updateUserBasicInfo(userBasicInfo: UserBasicDetailsWithMfa) {
 	if (!hasAnyBasicInfoChanges.value || !usersStore.currentUserId) {
 		return;
 	}
 
 	await usersStore.updateUser({
 		id: usersStore.currentUserId,
-		firstName: form.firstName,
-		lastName: form.lastName,
-		email: form.email,
+		firstName: userBasicInfo.firstName,
+		lastName: userBasicInfo.lastName,
+		email: userBasicInfo.email,
+		mfaCode: userBasicInfo.mfaCode,
 	});
 	hasAnyBasicInfoChanges.value = false;
 }
+
 async function updatePersonalisationSettings() {
 	if (!hasAnyPersonalisationChanges.value) {
 		return;
@@ -150,12 +189,15 @@ async function updatePersonalisationSettings() {
 
 	uiStore.setTheme(currentSelectedTheme.value);
 }
+
 function onSaveClick() {
 	formBus.emit('submit');
 }
+
 function openPasswordModal() {
 	uiStore.openModal(CHANGE_PASSWORD_MODAL_KEY);
 }
+
 function onMfaEnableClick() {
 	uiStore.openModal(MFA_SETUP_MODAL_KEY);
 }
diff --git a/packages/editor-ui/src/views/__tests__/SettingsPersonalView.test.ts b/packages/editor-ui/src/views/__tests__/SettingsPersonalView.test.ts
index e62812e9066f5..9c8a330f6ee98 100644
--- a/packages/editor-ui/src/views/__tests__/SettingsPersonalView.test.ts
+++ b/packages/editor-ui/src/views/__tests__/SettingsPersonalView.test.ts
@@ -92,6 +92,7 @@ describe('SettingsPersonalView', () => {
 		});
 
 		it('should commit the theme change after clicking save', async () => {
+			vi.spyOn(usersStore, 'updateUser').mockReturnValue(Promise.resolve());
 			const { getByPlaceholderText, findByText, getByTestId } = renderComponent({ pinia });
 			await waitAllPromises();
 
@@ -102,6 +103,9 @@ describe('SettingsPersonalView', () => {
 			await waitAllPromises();
 
 			getByTestId('save-settings-button').click();
+
+			await waitAllPromises();
+
 			expect(uiStore.theme).toBe('dark');
 		});
 	});